gnunet-svn
[Top][All Lists]
Advanced

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

[GNUnet-SVN] r38216 - gnunet/po


From: gnunet
Subject: [GNUnet-SVN] r38216 - gnunet/po
Date: Wed, 26 Oct 2016 16:25:30 +0200

Author: amatus
Date: 2016-10-26 16:25:30 +0200 (Wed, 26 Oct 2016)
New Revision: 38216

Modified:
   gnunet/po/POTFILES.in
   gnunet/po/de.po
   gnunet/po/es.po
   gnunet/po/fr.po
   gnunet/po/sv.po
   gnunet/po/vi.po
   gnunet/po/zh_CN.po
Log:
Update po files


Modified: gnunet/po/POTFILES.in
===================================================================
--- gnunet/po/POTFILES.in       2016-10-26 04:21:00 UTC (rev 38215)
+++ gnunet/po/POTFILES.in       2016-10-26 14:25:30 UTC (rev 38216)
@@ -35,7 +35,6 @@
 src/cadet/cadet_common.c
 src/cadet/cadet_path.c
 src/cadet/cadet_test_lib.c
-src/cadet/cadet_tunnel_tree.c
 src/cadet/gnunet-cadet.c
 src/cadet/gnunet-cadet-profiler.c
 src/cadet/gnunet-service-cadet.c
@@ -413,7 +412,6 @@
 src/tun/tun.c
 src/util/bandwidth.c
 src/util/bio.c
-src/util/client.c
 src/util/client_new.c
 src/util/common_allocation.c
 src/util/common_endian.c

Modified: gnunet/po/de.po
===================================================================
--- gnunet/po/de.po     2016-10-26 04:21:00 UTC (rev 38215)
+++ gnunet/po/de.po     2016-10-26 14:25:30 UTC (rev 38216)
@@ -10,7 +10,7 @@
 msgstr ""
 "Project-Id-Version: gnunet 0.10.1\n"
 "Report-Msgid-Bugs-To: address@hidden"
-"POT-Creation-Date: 2016-05-19 13:54+0200\n"
+"POT-Creation-Date: 2016-10-26 09:18-0500\n"
 "PO-Revision-Date: 2015-03-08 16:16+0100\n"
 "Last-Translator: Mario Blättermann <address@hidden>\n"
 "Language-Team: German <address@hidden>\n"
@@ -21,30 +21,21 @@
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: Poedit 1.7.4\n"
 
-#: src/arm/arm_api.c:338
-msgid "Client was disconnected from arm service, trying to reconnect.\n"
-msgstr ""
-
-#: src/arm/arm_monitor_api.c:324
-msgid ""
-"Monitoring client was disconnected from arm service, trying to reconnect.\n"
-msgstr ""
-
-#: src/arm/gnunet-arm.c:169
+#: src/arm/gnunet-arm.c:152
 #, fuzzy, c-format
 msgid "Failed to remove configuration file %s\n"
 msgstr "Fehler beim Speichern der Konfigurationsdatei `%s':"
 
-#: src/arm/gnunet-arm.c:175
+#: src/arm/gnunet-arm.c:158
 #, fuzzy, c-format
 msgid "Failed to remove servicehome directory %s\n"
 msgstr "Dateiformat fehlerhaft (kein GNUnet Verzeichnis?)\n"
 
-#: src/arm/gnunet-arm.c:225 src/testbed/gnunet-service-testbed_peers.c:1013
+#: src/arm/gnunet-arm.c:213 src/testbed/gnunet-service-testbed_peers.c:1139
 msgid "Message was sent successfully"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:227
+#: src/arm/gnunet-arm.c:215
 #, fuzzy
 msgid "Misconfiguration (can not connect to the ARM service)"
 msgstr ""
@@ -51,283 +42,327 @@
 "Konfiguration oder die GNUnet Version hat sich geändert. Sie müssen `%s' "
 "ausführen!\n"
 
-#: src/arm/gnunet-arm.c:229 src/testbed/gnunet-service-testbed_peers.c:1017
+#: src/arm/gnunet-arm.c:217 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:231 src/testbed/gnunet-service-testbed_peers.c:1019
+#: src/arm/gnunet-arm.c:219 src/testbed/gnunet-service-testbed_peers.c:1145
 msgid "ARM API is busy"
 msgstr "ARM-API ist belegt"
 
-#: src/arm/gnunet-arm.c:233
-msgid "Request does not fit into a message"
-msgstr "Anfrage passt nicht in eine Meldung"
-
-#: src/arm/gnunet-arm.c:235 src/testbed/gnunet-service-testbed_peers.c:1023
+#: src/arm/gnunet-arm.c:221 src/testbed/gnunet-service-testbed_peers.c:1147
 msgid "Request timed out"
 msgstr "Zeitüberschreitung der Anfrage"
 
-#: src/arm/gnunet-arm.c:237 src/testbed/gnunet-service-testbed_peers.c:1025
+#: src/arm/gnunet-arm.c:223 src/testbed/gnunet-service-testbed_peers.c:1149
 msgid "Unknown request status"
 msgstr "Unbekannter Anfragestatus"
 
-#: src/arm/gnunet-arm.c:253 src/testbed/gnunet-service-testbed_peers.c:1041
+#: src/arm/gnunet-arm.c:239 src/testbed/gnunet-service-testbed_peers.c:1165
 #, c-format
 msgid "%s is stopped"
 msgstr "%s wurde gestoppt"
 
-#: src/arm/gnunet-arm.c:255 src/testbed/gnunet-service-testbed_peers.c:1043
+#: src/arm/gnunet-arm.c:241 src/testbed/gnunet-service-testbed_peers.c:1167
 #, c-format
 msgid "%s is starting"
 msgstr "%s startet"
 
-#: src/arm/gnunet-arm.c:257 src/testbed/gnunet-service-testbed_peers.c:1045
+#: src/arm/gnunet-arm.c:243 src/testbed/gnunet-service-testbed_peers.c:1169
 #, c-format
 msgid "%s is stopping"
 msgstr "%s wird gestoppt"
 
-#: src/arm/gnunet-arm.c:259 src/testbed/gnunet-service-testbed_peers.c:1047
+#: src/arm/gnunet-arm.c:245 src/testbed/gnunet-service-testbed_peers.c:1171
 #, c-format
 msgid "%s is starting already"
 msgstr "%s ist bereits gestartet"
 
-#: src/arm/gnunet-arm.c:261 src/testbed/gnunet-service-testbed_peers.c:1049
+#: src/arm/gnunet-arm.c:247 src/testbed/gnunet-service-testbed_peers.c:1173
 #, c-format
 msgid "%s is stopping already"
 msgstr "%s wird bereits gestoppt"
 
-#: src/arm/gnunet-arm.c:263 src/testbed/gnunet-service-testbed_peers.c:1051
+#: src/arm/gnunet-arm.c:249 src/testbed/gnunet-service-testbed_peers.c:1175
 #, c-format
 msgid "%s is started already"
 msgstr "%s ist bereits gestartet"
 
-#: src/arm/gnunet-arm.c:265 src/testbed/gnunet-service-testbed_peers.c:1053
+#: src/arm/gnunet-arm.c:251 src/testbed/gnunet-service-testbed_peers.c:1177
 #, c-format
 msgid "%s is stopped already"
 msgstr "%s ist bereits gestoppt"
 
-#: src/arm/gnunet-arm.c:267 src/testbed/gnunet-service-testbed_peers.c:1055
+#: src/arm/gnunet-arm.c:253 src/testbed/gnunet-service-testbed_peers.c:1179
 #, c-format
 msgid "%s service is not known to ARM"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:269 src/testbed/gnunet-service-testbed_peers.c:1057
+#: src/arm/gnunet-arm.c:255 src/testbed/gnunet-service-testbed_peers.c:1181
 #, c-format
 msgid "%s service failed to start"
 msgstr "%s-Dienst konnte nicht gestartet werden"
 
-#: src/arm/gnunet-arm.c:271
+#: src/arm/gnunet-arm.c:257
 #, c-format
 msgid "%s service cannot be started because ARM is shutting down"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:273 src/testbed/gnunet-service-testbed_peers.c:1061
+#: src/arm/gnunet-arm.c:259 src/testbed/gnunet-service-testbed_peers.c:1185
 #, c-format
 msgid "%.s Unknown result code."
 msgstr ""
 
-#: src/arm/gnunet-arm.c:305
+#: src/arm/gnunet-arm.c:291
 msgid "Fatal error initializing ARM API.\n"
 msgstr "Schwerwiegender Fehler bei der Initialisierung der ARM-API.\n"
 
-#: src/arm/gnunet-arm.c:335 src/arm/gnunet-arm.c:344
+#: src/arm/gnunet-arm.c:320 src/arm/gnunet-arm.c:329
 #, 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:380
+#: src/arm/gnunet-arm.c:364
 #, 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:391
+#: src/arm/gnunet-arm.c:375
 #, 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:434
+#: src/arm/gnunet-arm.c:417
 #, 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:444
+#: src/arm/gnunet-arm.c:428
 #, 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:482
+#: src/arm/gnunet-arm.c:467
 #, 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:493
+#: src/arm/gnunet-arm.c:478
 #, 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:533
+#: src/arm/gnunet-arm.c:519
 #, 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:542
+#: src/arm/gnunet-arm.c:528
 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:547
+#: src/arm/gnunet-arm.c:534
 msgid "Running services:\n"
 msgstr "Laufende Dienste:\n"
 
-#: src/arm/gnunet-arm.c:633
+#: src/arm/gnunet-arm.c:622
 #, c-format
 msgid "Now only monitoring, press CTRL-C to stop.\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:665
+#: src/arm/gnunet-arm.c:654
 #, c-format
 msgid "Stopped %s.\n"
 msgstr "%s wurde gestoppt.\n"
 
-#: src/arm/gnunet-arm.c:668
+#: src/arm/gnunet-arm.c:657
 #, c-format
 msgid "Starting %s...\n"
 msgstr "%s wird gestartet …\n"
 
-#: src/arm/gnunet-arm.c:671
+#: src/arm/gnunet-arm.c:660
 #, c-format
 msgid "Stopping %s...\n"
 msgstr "%s wird gestoppt …\n"
 
-#: src/arm/gnunet-arm.c:682
+#: src/arm/gnunet-arm.c:674
 #, fuzzy, c-format
 msgid "Unknown status %u for service %s.\n"
 msgstr "`%s': unbekannter Dienst: %s\n"
 
-#: src/arm/gnunet-arm.c:745
+#: src/arm/gnunet-arm.c:756
 msgid "stop all GNUnet services"
 msgstr "Alle GNUnet-Dienste stoppen"
 
-#: src/arm/gnunet-arm.c:747
+#: src/arm/gnunet-arm.c:758
 msgid "start a particular service"
 msgstr "Einen bestimmten Dienst starten"
 
-#: src/arm/gnunet-arm.c:749
+#: src/arm/gnunet-arm.c:760
 msgid "stop a particular service"
 msgstr "Einen bestimmten Dienst stoppen"
 
-#: src/arm/gnunet-arm.c:751
+#: src/arm/gnunet-arm.c:762
 msgid "start all GNUnet default services"
 msgstr "Alle Standard-GNUnet-Dienste starten"
 
-#: src/arm/gnunet-arm.c:754
+#: src/arm/gnunet-arm.c:765
 msgid "stop and start all GNUnet default services"
 msgstr "Alle Standard-GNUnet-Dienste stoppen und starten"
 
-#: src/arm/gnunet-arm.c:757
+#: src/arm/gnunet-arm.c:768
 msgid "delete config file and directory on exit"
 msgstr "Konfigurationsdatei und Verzeichnis beim Beenden löschen"
 
-#: src/arm/gnunet-arm.c:760
+#: src/arm/gnunet-arm.c:771
 msgid "monitor ARM activities"
 msgstr "ARM-Aktivitäten überwachen"
 
-#: src/arm/gnunet-arm.c:762
+#: src/arm/gnunet-arm.c:773
 msgid "don't print status messages"
 msgstr "Keine Statusmeldungen ausgeben"
 
-#: src/arm/gnunet-arm.c:765
+#: src/arm/gnunet-arm.c:776
 msgid "exit with error status if operation does not finish after DELAY"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:767
+#: src/arm/gnunet-arm.c:778
 msgid "list currently running services"
 msgstr "Alle derzeit laufenden Dienste auflisten"
 
-#: src/arm/gnunet-arm.c:769
+#: src/arm/gnunet-arm.c:780
 msgid "don't let gnunet-service-arm inherit standard output"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:771
+#: src/arm/gnunet-arm.c:782
 msgid "don't let gnunet-service-arm inherit standard error"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:782
+#: src/arm/gnunet-arm.c:794
 msgid "Control services and the Automated Restart Manager (ARM)"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:279
-#, fuzzy
-msgid "Could not send status result to client\n"
-msgstr "Anfrage konnte nicht an gnunetd gesendet werden.\n"
+#: src/arm/gnunet-service-arm.c:374 src/transport/plugin_transport_tcp.c:633
+#: src/util/service.c:565 src/util/service_new.c:604
+#, c-format
+msgid ""
+"Disabling IPv6 support for service `%s', failed to create IPv6 socket: %s\n"
+msgstr ""
 
-#: src/arm/gnunet-service-arm.c:315
-#, fuzzy
-msgid "Could not send list result to client\n"
-msgstr "Anfrage konnte nicht an gnunetd gesendet werden.\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:658
+#: src/transport/plugin_transport_tcp.c:3299 src/util/service.c:584
+#: src/util/service.c:590 src/util/service_new.c:629 src/util/service_new.c:635
+#, c-format
+msgid "Require valid port number for service `%s' in configuration!\n"
+msgstr ""
 
-#: src/arm/gnunet-service-arm.c:555
+#: src/arm/gnunet-service-arm.c:430 src/transport/plugin_transport_tcp.c:689
+#: src/util/client_new.c:464 src/util/service.c:621 src/util/service_new.c:674
+#, 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/util/client_new.c:469 src/util/service.c:625 src/util/service_new.c:679
+#, c-format
+msgid "Using `%s' instead\n"
+msgstr ""
+
+#: src/arm/gnunet-service-arm.c:465 src/transport/plugin_transport_tcp.c:724
+#: src/util/service.c:656 src/util/service_new.c:715
+#, 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/util/service.c:673 src/util/service_new.c:733
+#, 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:2617
+#: src/transport/plugin_transport_tcp.c:772 src/util/service.c:704
+#: src/util/service_new.c:774
+#, 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:2635
+#: src/transport/plugin_transport_tcp.c:791 src/util/service.c:723
+#: src/util/service_new.c:794
 #, 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
+#, 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:566
+#: src/arm/gnunet-service-arm.c:943
 #, fuzzy, c-format
 msgid "Starting service `%s'\n"
 msgstr "Collection `%s' begonnen.\n"
 
-#: src/arm/gnunet-service-arm.c:663
+#: src/arm/gnunet-service-arm.c:1055
 #, 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:687
+#: src/arm/gnunet-service-arm.c:1090
 #, c-format
 msgid "Unable to bind listening socket for service `%s' to address `%s': %s\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:723
+#: src/arm/gnunet-service-arm.c:1133
 #, c-format
 msgid "ARM now monitors connections to service `%s' at `%s'\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:863
+#: src/arm/gnunet-service-arm.c:1309
 #, fuzzy, c-format
 msgid "Preparing to stop `%s'\n"
 msgstr "Collection `%s' begonnen.\n"
 
-#: src/arm/gnunet-service-arm.c:1145
+#: src/arm/gnunet-service-arm.c:1611
 #, c-format
 msgid "Restarting service `%s'.\n"
 msgstr "Dienst »%s« wird neu gestartet.\n"
 
-#: src/arm/gnunet-service-arm.c:1299
+#: src/arm/gnunet-service-arm.c:1771
 msgid "exit"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:1304
+#: src/arm/gnunet-service-arm.c:1776
 msgid "signal"
 msgstr "Signal"
 
-#: src/arm/gnunet-service-arm.c:1309
+#: src/arm/gnunet-service-arm.c:1781
 msgid "unknown"
 msgstr "Unbekannt"
 
-#: src/arm/gnunet-service-arm.c:1315
+#: src/arm/gnunet-service-arm.c:1787
 #, 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:1342
+#: src/arm/gnunet-service-arm.c:1813
 #, 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:1358
+#: src/arm/gnunet-service-arm.c:1829
 #, c-format
 msgid "Service `%s' terminated with status %s/%d, will restart in %s\n"
 msgstr ""
 
-#: src/arm/mockup-service.c:41
+#: src/arm/mockup-service.c:42
 msgid "Initiating shutdown as requested by client.\n"
 msgstr ""
 
@@ -352,14 +387,12 @@
 "%llu\n"
 msgstr ""
 
-#: src/ats/gnunet-ats-solver-eval.c:3293
-#: src/ats-tests/gnunet-solver-eval.c:921
+#: src/ats/gnunet-ats-solver-eval.c:3293 src/ats-tests/gnunet-solver-eval.c:935
 msgid "solver to use"
 msgstr ""
 
-#: src/ats/gnunet-ats-solver-eval.c:3296
-#: src/ats-tests/gnunet-solver-eval.c:924
-#: src/ats-tests/gnunet-solver-eval.c:927
+#: 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 ""
 
@@ -463,54 +496,26 @@
 msgid "Invalid %s configuration %f\n"
 msgstr " gconfig\tGTK Konfiguration\n"
 
-#: src/ats-tests/ats-testing.c:72
-msgid "Benchmarking done\n"
-msgstr ""
-
-#: src/ats-tests/ats-testing.c:105
-#, fuzzy, c-format
-msgid "Failed to connect peer 0 and %u\n"
-msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
-
-#: src/ats-tests/ats-testing.c:413
+#: src/ats-tests/ats-testing.c:441
 #, c-format
 msgid "Connected master [%u] with slave [%u]\n"
 msgstr ""
 
-#: src/ats-tests/ats-testing.c:419
+#: src/ats-tests/ats-testing.c:448
 #, fuzzy, c-format
 msgid "Failed to connect master peer [%u] with slave [%u]\n"
 msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
 
-#: src/ats-tests/ats-testing.c:450
-msgid "Connecting peers on CORE level\n"
-msgstr ""
-
-#: src/ats-tests/ats-testing.c:461
-#, c-format
-msgid "Connecting master [%u] with slave [%u]\n"
-msgstr ""
-
-#: src/ats-tests/ats-testing.c:470
-#, fuzzy, c-format
-msgid "Could not connect master [%u] and slave [%u]\n"
-msgstr "Verbindung zu gnunetd konnte nicht hergestellt werden.\n"
-
-#: src/ats-tests/ats-testing.c:490 src/ats-tests/ats-testing.c:634
-#, fuzzy
-msgid "Initialization failed, shutdown\n"
-msgstr " Verbindung fehlgeschlagen\n"
-
-#: src/ats-tests/ats-testing-log.c:836
+#: src/ats-tests/ats-testing-log.c:837
 msgid "Stop logging\n"
 msgstr "Protokollierung stoppen\n"
 
-#: src/ats-tests/ats-testing-log.c:887
+#: src/ats-tests/ats-testing-log.c:892
 #, fuzzy, c-format
 msgid "Start logging `%s'\n"
 msgstr "Collection `%s' begonnen.\n"
 
-#: src/ats-tests/gnunet-ats-sim.c:86
+#: src/ats-tests/gnunet-ats-sim.c:88
 #, c-format
 msgid ""
 "Master [%u]: sent: %u KiB in %u sec. = %u KiB/s, received: %u KiB in %u sec. "
@@ -553,8 +558,7 @@
 msgstr ""
 
 #: src/ats-tool/gnunet-ats.c:748 src/ats-tool/gnunet-ats.c:761
-#: src/transport/gnunet-transport.c:1780
-#: src/transport/gnunet-transport-profiler.c:516
+#: src/transport/gnunet-transport.c:1536
 #, fuzzy, c-format
 msgid "Failed to parse peer identity `%s'\n"
 msgstr "Fehler beim Parsen der Gerätedaten von `%s' bei %s:%d.\n"
@@ -636,109 +640,104 @@
 msgid "Print information about ATS state"
 msgstr "Informationen über andere GNUnet Knoten ausgeben."
 
-#: src/cadet/gnunet-cadet.c:476
+#: src/cadet/gnunet-cadet.c:511
 #, fuzzy, c-format
 msgid "Invalid target `%s'\n"
 msgstr "Ungültiger Parameter: `%s'\n"
 
-#: src/cadet/gnunet-cadet.c:751
+#: src/cadet/gnunet-cadet.c:787
 #, fuzzy, c-format
 msgid "Invalid peer ID `%s'\n"
 msgstr "Ungültige Antwort auf `%s'.\n"
 
-#: src/cadet/gnunet-cadet.c:789
+#: src/cadet/gnunet-cadet.c:825
 #, fuzzy, c-format
 msgid "Invalid tunnel owner `%s'\n"
 msgstr "Ungültiger Parameter: `%s'\n"
 
-#: src/cadet/gnunet-cadet.c:857
+#: src/cadet/gnunet-cadet.c:892
 msgid "You must NOT give a TARGET when using 'request all' options\n"
 msgstr ""
 
-#: src/cadet/gnunet-cadet.c:952
+#: src/cadet/gnunet-cadet.c:982
 msgid "provide information about a particular connection"
 msgstr ""
 
-#: src/cadet/gnunet-cadet.c:955
+#: src/cadet/gnunet-cadet.c:985
 msgid "activate echo mode"
 msgstr ""
 
-#: src/cadet/gnunet-cadet.c:958
+#: src/cadet/gnunet-cadet.c:988
 msgid "dump debug information to STDERR"
 msgstr ""
 
-#: src/cadet/gnunet-cadet.c:964
-msgid "port to listen to (default; 0)"
+#: src/cadet/gnunet-cadet.c:994
+msgid "port to listen to"
 msgstr ""
 
-#: src/cadet/gnunet-cadet.c:967
+#: src/cadet/gnunet-cadet.c:997
 #, fuzzy
 msgid "provide information about a patricular peer"
 msgstr "Informationen über andere GNUnet Knoten ausgeben."
 
-#: src/cadet/gnunet-cadet.c:970
+#: src/cadet/gnunet-cadet.c:1000
 #, fuzzy
 msgid "provide information about all peers"
 msgstr "Informationen über andere GNUnet Knoten ausgeben."
 
-#: src/cadet/gnunet-cadet.c:973
+#: src/cadet/gnunet-cadet.c:1003
 msgid "provide information about a particular tunnel"
 msgstr ""
 
-#: src/cadet/gnunet-cadet.c:976
+#: src/cadet/gnunet-cadet.c:1006
 #, fuzzy
 msgid "provide information about all tunnels"
 msgstr "Informationen über andere GNUnet Knoten ausgeben."
 
-#: src/cadet/gnunet-service-cadet_peer.c:562
+#: src/cadet/gnunet-service-cadet_peer.c:707
 msgid "Wrong CORE service\n"
 msgstr ""
 
-#: src/consensus/gnunet-consensus-profiler.c:496
+#: src/consensus/gnunet-consensus-profiler.c:499
 #: src/secretsharing/gnunet-secretsharing-profiler.c:607
 #, fuzzy
 msgid "number of peers in consensus"
 msgstr "Anzahl an Durchläufen"
 
-#: src/consensus/gnunet-consensus-profiler.c:499
+#: src/consensus/gnunet-consensus-profiler.c:502
 msgid ""
 "how many peers (random selection without replacement) receive one value?"
 msgstr ""
 
-#: src/consensus/gnunet-consensus-profiler.c:502
-#: src/set/gnunet-set-profiler.c:377 src/set/gnunet-set-profiler.c:380
-#: src/set/gnunet-set-profiler.c:383
+#: src/consensus/gnunet-consensus-profiler.c:505
+#: src/set/gnunet-set-profiler.c:378 src/set/gnunet-set-profiler.c:381
+#: src/set/gnunet-set-profiler.c:384
 msgid "number of values"
 msgstr "Anzahl der Werte"
 
-#: src/consensus/gnunet-consensus-profiler.c:505
+#: src/consensus/gnunet-consensus-profiler.c:508
 msgid "consensus timeout"
 msgstr ""
 
-#: src/consensus/gnunet-consensus-profiler.c:508
+#: src/consensus/gnunet-consensus-profiler.c:511
 msgid "delay until consensus starts"
 msgstr ""
 
-#: src/consensus/gnunet-consensus-profiler.c:511
-#: src/set/gnunet-set-profiler.c:389
+#: src/consensus/gnunet-consensus-profiler.c:514
+#: src/set/gnunet-set-profiler.c:390
 msgid "write statistics to file"
 msgstr ""
 
-#: src/consensus/gnunet-consensus-profiler.c:514
+#: src/consensus/gnunet-consensus-profiler.c:517
 #: src/secretsharing/gnunet-secretsharing-profiler.c:622
 msgid "be more verbose (print received values)"
 msgstr "Ausführlicherer Modus (empfangene Werte ausgeben)"
 
-#: src/conversation/conversation_api.c:493
-#: src/conversation/conversation_api_call.c:475
+#: src/conversation/conversation_api.c:513
+#: src/conversation/conversation_api_call.c:490
 msgid "Connection to conversation service lost, trying to reconnect\n"
 msgstr ""
 
-#: src/conversation/conversation_api.c:617
-#, fuzzy
-msgid "number too large"
-msgstr "Anzahl der Werte"
-
 #: src/conversation/gnunet-conversation.c:269
 #, c-format
 msgid "Incoming call from `%s'. Please /accept %u or /cancel %u the call.\n"
@@ -764,236 +763,235 @@
 msgid "Ego `%s' no longer available, phone is now down.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:366
+#: src/conversation/gnunet-conversation.c:367
 msgid "Failed to setup phone (internal error)\n"
 msgstr "Telefon konnte nicht eingerichtet werden (interner Fehler)\n"
 
-#: src/conversation/gnunet-conversation.c:378
+#: src/conversation/gnunet-conversation.c:379
 #, c-format
-msgid ""
-"Phone active on line %u.  Type `/help' for a list of available commands\n"
+msgid "Phone active at `%s'.  Type `/help' for a list of available commands\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:400
+#: src/conversation/gnunet-conversation.c:401
 #, c-format
 msgid "Resolved address of `%s'. Now ringing other party.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:407
+#: src/conversation/gnunet-conversation.c:408
 #, fuzzy, c-format
 msgid "Connection established to `%s'\n"
 msgstr " Verbindung fehlgeschlagen\n"
 
-#: src/conversation/gnunet-conversation.c:414
+#: src/conversation/gnunet-conversation.c:415
 #, c-format
 msgid "Failed to resolve `%s'\n"
 msgstr "»%s« konnte nicht aufgelöst werden\n"
 
-#: src/conversation/gnunet-conversation.c:422
+#: src/conversation/gnunet-conversation.c:423
 #, fuzzy, c-format
 msgid "Call to `%s' terminated\n"
 msgstr "Aufruf von `%s' gibt %d zurück.\n"
 
-#: src/conversation/gnunet-conversation.c:431
+#: src/conversation/gnunet-conversation.c:432
 #, c-format
 msgid "Connection to `%s' suspended (by other user)\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:437
+#: src/conversation/gnunet-conversation.c:438
 #, c-format
 msgid "Connection to `%s' resumed (by other user)\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:442
+#: src/conversation/gnunet-conversation.c:443
 msgid "Error with the call, restarting it\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:511
+#: src/conversation/gnunet-conversation.c:512
 #, c-format
 msgid "Unknown command `%s'\n"
 msgstr "Unbekannter Befehl »%s«\n"
 
-#: src/conversation/gnunet-conversation.c:527
-#: src/conversation/gnunet-conversation.c:541
+#: src/conversation/gnunet-conversation.c:528
+#: src/conversation/gnunet-conversation.c:542
 #, fuzzy, c-format
 msgid "Ego `%s' not available\n"
 msgstr "`%s' ist nicht verfügbar."
 
-#: src/conversation/gnunet-conversation.c:534
-#: src/conversation/gnunet-conversation.c:591
+#: src/conversation/gnunet-conversation.c:535
+#: src/conversation/gnunet-conversation.c:592
 msgid "You are calling someone else already, hang up first!\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:549
-#: src/conversation/gnunet-conversation.c:604
+#: src/conversation/gnunet-conversation.c:550
+#: src/conversation/gnunet-conversation.c:605
 #, c-format
 msgid "You are answering call from `%s', hang up or suspend that call first!\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:559
+#: src/conversation/gnunet-conversation.c:560
 msgid "Call recipient missing.\n"
 msgstr "Anzurufender Teilnehmer fehlt.\n"
 
-#: src/conversation/gnunet-conversation.c:615
+#: src/conversation/gnunet-conversation.c:616
 msgid "There is no incoming call to accept here!\n"
 msgstr "Es gibt keinen eingehenden Anruf, der angenommen werden könnte!\n"
 
-#: src/conversation/gnunet-conversation.c:632
+#: src/conversation/gnunet-conversation.c:633
 #, c-format
 msgid "There is no incoming call `%s' to accept right now!\n"
 msgstr ""
 "Es gibt keinen eingehenden Anruf »%s«, der jetzt angenommen werden könnte!\n"
 
-#: src/conversation/gnunet-conversation.c:662
+#: src/conversation/gnunet-conversation.c:663
 msgid "We currently do not have an address.\n"
 msgstr "Derzeit keine Adresse vorhanden.\n"
 
-#: src/conversation/gnunet-conversation.c:685
+#: src/conversation/gnunet-conversation.c:686
 #, c-format
 msgid "We are currently trying to locate the private key for the ego `%s'.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:690
+#: src/conversation/gnunet-conversation.c:691
 #, c-format
-msgid "We are listening for incoming calls for ego `%s' on line %u.\n"
+msgid "We are listening for incoming calls for ego `%s' on line `%s'.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:696
-#: src/conversation/gnunet-conversation.c:720
+#: src/conversation/gnunet-conversation.c:697
+#: src/conversation/gnunet-conversation.c:721
 #, c-format
 msgid "You are having a conversation with `%s'.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:701
+#: src/conversation/gnunet-conversation.c:702
 msgid ""
 "We had an internal error setting up our phone line. You can still make "
 "calls.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:710
+#: src/conversation/gnunet-conversation.c:711
 #, c-format
 msgid "We are trying to find the network address to call `%s'.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:715
+#: src/conversation/gnunet-conversation.c:716
 #, c-format
 msgid "We are calling `%s', his phone should be ringing.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:734
+#: src/conversation/gnunet-conversation.c:735
 msgid "Calls waiting:\n"
 msgstr "Anruf wartet:\n"
 
-#: src/conversation/gnunet-conversation.c:740
+#: src/conversation/gnunet-conversation.c:741
 #, c-format
 msgid "#%u: `%s'\n"
 msgstr "#%u: »%s«\n"
 
-#: src/conversation/gnunet-conversation.c:768
-#: src/conversation/gnunet-conversation.c:783
+#: src/conversation/gnunet-conversation.c:769
+#: src/conversation/gnunet-conversation.c:784
 msgid "There is no call that could be suspended right now.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:816
-#: src/conversation/gnunet-conversation.c:832
+#: src/conversation/gnunet-conversation.c:817
+#: src/conversation/gnunet-conversation.c:833
 msgid "There is no call that could be resumed right now.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:839
+#: src/conversation/gnunet-conversation.c:840
 #, c-format
 msgid "Already talking with `%s', cannot resume a call right now.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:848
+#: src/conversation/gnunet-conversation.c:849
 msgid "There is no incoming call to resume here!\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:865
+#: src/conversation/gnunet-conversation.c:866
 #, c-format
 msgid "There is no incoming call `%s' to resume right now!\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:900
+#: src/conversation/gnunet-conversation.c:901
 msgid "There is no call that could be cancelled right now.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:908
+#: src/conversation/gnunet-conversation.c:909
 msgid "There is no incoming call to refuse here!\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:925
+#: src/conversation/gnunet-conversation.c:926
 #, c-format
 msgid "There is no incoming call `%s' to refuse right now!\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:951
+#: src/conversation/gnunet-conversation.c:952
 msgid "Use `/address' to find out which address this phone should have in GNS"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:953
+#: src/conversation/gnunet-conversation.c:954
 msgid "Use `/call USER.gnu' to call USER"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:955
+#: src/conversation/gnunet-conversation.c:956
 msgid "Use `/accept #NUM' to accept incoming call #NUM"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:957
+#: src/conversation/gnunet-conversation.c:958
 msgid "Use `/suspend' to suspend the active call"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:959
+#: src/conversation/gnunet-conversation.c:960
 msgid ""
 "Use `/resume [#NUM]' to resume a call, #NUM is needed to resume incoming "
 "calls, no argument is needed to resume the current outgoing call."
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:961
+#: src/conversation/gnunet-conversation.c:962
 msgid "Use `/cancel' to reject or terminate a call"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:963
+#: src/conversation/gnunet-conversation.c:964
 msgid "Use `/status' to print status information"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:965
+#: src/conversation/gnunet-conversation.c:966
 #, fuzzy
 msgid "Use `/quit' to terminate gnunet-conversation"
 msgstr "Erlaubt es Clients die Konfiguration von gnunetd abzufragen"
 
-#: src/conversation/gnunet-conversation.c:967
+#: src/conversation/gnunet-conversation.c:968
 msgid "Use `/help command' to get help for a specific command"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:1171
+#: src/conversation/gnunet-conversation.c:1172
 #, c-format
 msgid "Name of our ego changed to `%s'\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:1184
+#: src/conversation/gnunet-conversation.c:1185
 #, fuzzy, c-format
 msgid "Our ego `%s' was deleted!\n"
 msgstr "Pseudonym `%s' wurde gelöscht.\n"
 
-#: src/conversation/gnunet-conversation.c:1219
+#: src/conversation/gnunet-conversation.c:1220
 #, fuzzy
 msgid "You must specify the NAME of an ego to use\n"
 msgstr "Sie müssen eine Liste von Dateien zum Einfügen angeben.\n"
 
-#: src/conversation/gnunet-conversation.c:1243
+#: src/conversation/gnunet-conversation.c:1244
 #, fuzzy
 msgid "Failed to start gnunet-helper-w32-console\n"
 msgstr "Fehler beim Starten der Collection.\n"
 
-#: src/conversation/gnunet-conversation.c:1269
+#: src/conversation/gnunet-conversation.c:1270
 msgid "sets the NAME of the ego to use for the phone (and name resolution)"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:1272
+#: src/conversation/gnunet-conversation.c:1273
 msgid "sets the LINE to use for the phone"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:1298
+#: src/conversation/gnunet-conversation.c:1299
 msgid "Enables having a conversation with other GNUnet users."
 msgstr ""
 
@@ -1020,8 +1018,7 @@
 msgstr ""
 
 #: src/conversation/gnunet-conversation-test.c:243
-#: src/multicast/gnunet-multicast.c:70 src/revocation/gnunet-revocation.c:548
-#: src/template/gnunet-template.c:70
+#: src/revocation/gnunet-revocation.c:550 src/template/gnunet-template.c:76
 msgid "help text"
 msgstr "Hilfetext"
 
@@ -1151,27 +1148,18 @@
 msgid "Failed to allocate %u bytes for second packet\n"
 msgstr "UDP-Sockets können nicht geöffnet werden\n"
 
-#: src/conversation/gnunet-service-conversation.c:855
-msgid "Cadet audio channel not ready; audio data dropped\n"
+#: src/conversation/microphone.c:121
+msgid "Could not start record audio helper\n"
 msgstr ""
 
-#: src/conversation/gnunet-service-conversation.c:946
+#: src/conversation/plugin_gnsrecord_conversation.c:71
 #, c-format
-msgid ""
-"No available phone for incoming call on line %u, sending HANG_UP signal\n"
+msgid "PHONE version %u not supported\n"
 msgstr ""
 
-#: src/conversation/gnunet-service-conversation.c:1360
+#: src/conversation/plugin_gnsrecord_conversation.c:133
+#: src/conversation/plugin_gnsrecord_conversation.c:147
 #, c-format
-msgid "Received incoming Cadet channel on port %u\n"
-msgstr ""
-
-#: src/conversation/microphone.c:121
-msgid "Could not start record audio helper\n"
-msgstr ""
-
-#: src/conversation/plugin_gnsrecord_conversation.c:116
-#, c-format
 msgid "Unable to parse PHONE record `%s'\n"
 msgstr ""
 
@@ -1179,10 +1167,6 @@
 msgid "Could not start playback audio helper.\n"
 msgstr ""
 
-#: src/core/core_api.c:725
-msgid "Client was disconnected from core service, trying to reconnect.\n"
-msgstr ""
-
 #: src/core/gnunet-core.c:90
 #, fuzzy
 msgid "fresh connection"
@@ -1225,7 +1209,7 @@
 msgid "%24s: %-30s %4s (timeout in %6s)\n"
 msgstr "%24s: %-17s %4s   (%u Verbindungen insgesamt)\n"
 
-#: src/core/gnunet-core.c:144 src/peerinfo-tool/gnunet-peerinfo.c:790
+#: src/core/gnunet-core.c:144 src/peerinfo-tool/gnunet-peerinfo.c:728
 #, c-format
 msgid "Invalid command line argument `%s'\n"
 msgstr "Ungültiges Befehlszeilenargument »%s«\n"
@@ -1235,7 +1219,7 @@
 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:1990
+#: src/core/gnunet-core.c:176 src/transport/gnunet-transport.c:1737
 msgid "provide information about all current connections (continuously)"
 msgstr ""
 
@@ -1243,60 +1227,64 @@
 msgid "Print information about connected peers."
 msgstr "Informationen über verbundene Knoten ausgeben."
 
-#: src/core/gnunet-service-core.c:104
-msgid "Core service is lacking HOSTKEY configuration setting.  Exiting.\n"
-msgstr ""
-
-#: src/core/gnunet-service-core.c:127
-#, c-format
-msgid "Core service of `%4s' ready.\n"
-msgstr ""
-
-#: src/core/gnunet-service-core_clients.c:380
+#: src/core/gnunet-service-core.c:339
 #, fuzzy
 msgid "# send requests dropped (disconnected)"
 msgstr "# gap Anfragen verworfen: Kollision in RT"
 
-#: src/core/gnunet-service-core_clients.c:498
-msgid "# messages discarded (session disconnected)"
+#: src/core/gnunet-service-core.c:363
+msgid "# dequeuing CAR (duplicate request)"
 msgstr ""
 
-#: src/core/gnunet-service-core_clients.c:561
+#: src/core/gnunet-service-core.c:432
 #, fuzzy, c-format
 msgid "# bytes of messages of type %u received"
 msgstr "# Bytes Rauschen empfangen"
 
-#: src/core/gnunet-service-core_kx.c:571
+#: src/core/gnunet-service-core.c:530
+msgid "# messages discarded (session disconnected)"
+msgstr ""
+
+#: src/core/gnunet-service-core.c:928
+msgid "Core service is lacking HOSTKEY configuration setting.  Exiting.\n"
+msgstr ""
+
+#: src/core/gnunet-service-core.c:949
+#, fuzzy, c-format
+msgid "Core service of `%s' ready.\n"
+msgstr "Dienst »%s« wird neu gestartet.\n"
+
+#: src/core/gnunet-service-core_kx.c:566
 msgid "# bytes encrypted"
 msgstr "# Bytes verschlüsselt"
 
-#: src/core/gnunet-service-core_kx.c:630
+#: src/core/gnunet-service-core_kx.c:626
 msgid "# bytes decrypted"
 msgstr "# Bytes entschlüsselt"
 
-#: src/core/gnunet-service-core_kx.c:719
+#: src/core/gnunet-service-core_kx.c:726
 msgid "# key exchanges initiated"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:766
+#: src/core/gnunet-service-core_kx.c:786
 msgid "# key exchanges stopped"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:796
+#: src/core/gnunet-service-core_kx.c:819
 #, fuzzy
 msgid "# PING messages transmitted"
 msgstr "# PING Nachrichten erstellt"
 
-#: src/core/gnunet-service-core_kx.c:871
+#: src/core/gnunet-service-core_kx.c:886
 msgid "# old ephemeral keys ignored"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:878
+#: src/core/gnunet-service-core_kx.c:893
 #, fuzzy
 msgid "# ephemeral keys received"
 msgstr "# verschlüsselter PONG Nachrichten empfangen"
 
-#: src/core/gnunet-service-core_kx.c:917
+#: src/core/gnunet-service-core_kx.c:932
 #, c-format
 msgid ""
 "Ephemeral key message from peer `%s' rejected as its validity range does not "
@@ -1303,151 +1291,133 @@
 "match our system time (%llu not in [%llu,%llu]).\n"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:928
+#: src/core/gnunet-service-core_kx.c:943
 #, fuzzy
 msgid "# EPHEMERAL_KEY messages received"
 msgstr "# verschlüsselter PONG Nachrichten empfangen"
 
-#: src/core/gnunet-service-core_kx.c:1030
-#: src/transport/gnunet-service-transport_validation.c:1080
+#: src/core/gnunet-service-core_kx.c:1039
+#: src/transport/gnunet-service-transport_validation.c:1119
 #, fuzzy
 msgid "# PING messages received"
 msgstr "# PING Nachrichten erstellt"
 
-#: src/core/gnunet-service-core_kx.c:1039
+#: src/core/gnunet-service-core_kx.c:1048
 #, fuzzy
 msgid "# PING messages dropped (out of order)"
 msgstr "# PING Nachrichten erstellt"
 
-#: src/core/gnunet-service-core_kx.c:1092
+#: src/core/gnunet-service-core_kx.c:1106
 #, fuzzy
 msgid "# PONG messages created"
 msgstr "# PING Nachrichten erstellt"
 
-#: src/core/gnunet-service-core_kx.c:1119
+#: src/core/gnunet-service-core_kx.c:1132
 msgid "# sessions terminated by timeout"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1132
+#: src/core/gnunet-service-core_kx.c:1145
 #, fuzzy
 msgid "# keepalive messages sent"
 msgstr "# Klartext PING Nachrichten gesendet"
 
-#: src/core/gnunet-service-core_kx.c:1203
-#: src/transport/gnunet-service-transport_validation.c:1403
+#: src/core/gnunet-service-core_kx.c:1209
+#: 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:1210
+#: src/core/gnunet-service-core_kx.c:1216
 msgid "# PONG messages dropped (connection down)"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1215
+#: src/core/gnunet-service-core_kx.c:1221
 #, fuzzy
 msgid "# PONG messages dropped (out of order)"
 msgstr "# PING Nachrichten erstellt"
 
-#: src/core/gnunet-service-core_kx.c:1251
+#: src/core/gnunet-service-core_kx.c:1256
 #, fuzzy
 msgid "# PONG messages decrypted"
 msgstr "# PING Nachrichten erstellt"
 
-#: src/core/gnunet-service-core_kx.c:1289
+#: src/core/gnunet-service-core_kx.c:1294
 #, fuzzy
 msgid "# session keys confirmed via PONG"
 msgstr "# Knotenankündigungen empfangen"
 
-#: src/core/gnunet-service-core_kx.c:1300
+#: src/core/gnunet-service-core_kx.c:1305
 #, fuzzy
 msgid "# timeouts prevented via PONG"
 msgstr "# Bytes empfangen über TCP"
 
-#: src/core/gnunet-service-core_kx.c:1307
+#: src/core/gnunet-service-core_kx.c:1312
 #, fuzzy
 msgid "# rekey operations confirmed via PONG"
 msgstr "# Knotenankündigungen empfangen"
 
-#: src/core/gnunet-service-core_kx.c:1463
+#: src/core/gnunet-service-core_kx.c:1485
 msgid "# DATA message dropped (out of order)"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1471
+#: src/core/gnunet-service-core_kx.c:1493
 #, 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:1474
+#: src/core/gnunet-service-core_kx.c:1496
 msgid "# sessions terminated by key expiration"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1532
-#: src/core/gnunet-service-core_kx.c:1558
+#: src/core/gnunet-service-core_kx.c:1554
+#: src/core/gnunet-service-core_kx.c:1580
 #, fuzzy
 msgid "# bytes dropped (duplicates)"
 msgstr "# Bytes verworfen von TCP (ausgehend)"
 
-#: src/core/gnunet-service-core_kx.c:1545
+#: src/core/gnunet-service-core_kx.c:1567
 #, fuzzy
 msgid "# bytes dropped (out of sequence)"
 msgstr "# Bytes verworfen von TCP (ausgehend)"
 
-#: src/core/gnunet-service-core_kx.c:1587
+#: src/core/gnunet-service-core_kx.c:1609
 #, fuzzy
 msgid "# bytes dropped (ancient message)"
 msgstr "# Bytes verworfen von TCP (ausgehend)"
 
-#: src/core/gnunet-service-core_kx.c:1595
+#: src/core/gnunet-service-core_kx.c:1617
 #, fuzzy
 msgid "# bytes of payload decrypted"
 msgstr "# Bytes entschlüsselt"
 
-#: src/core/gnunet-service-core_kx.c:1629
+#: src/core/gnunet-service-core_kx.c:1674
 msgid "# PAYLOAD dropped (out of order)"
 msgstr ""
 
-#: src/core/gnunet-service-core_neighbours.c:183
-msgid "# sessions terminated by transport disconnect"
-msgstr ""
-
-#: src/core/gnunet-service-core_neighbours.c:199
-#: src/core/gnunet-service-core_neighbours.c:387
-msgid "# neighbour entries allocated"
-msgstr ""
-
-#: src/core/gnunet-service-core_neighbours.c:291
-msgid "# encrypted bytes given to transport"
-msgstr ""
-
-#: src/core/gnunet-service-core_neighbours.c:486
-#, fuzzy, c-format
-msgid "Unsupported message of type %u (%u bytes) received from peer `%s'\n"
-msgstr "Ungültige `%s' Nachricht von Knoten `%s' empfangen.\n"
-
-#: src/core/gnunet-service-core_sessions.c:253
-#: src/core/gnunet-service-core_sessions.c:337
-#: src/dht/gnunet-service-dht_neighbours.c:789
-#: src/dht/gnunet-service-dht_neighbours.c:863
-#: src/fs/gnunet-service-fs_cp.c:662 src/fs/gnunet-service-fs_cp.c:1715
-#: src/topology/gnunet-daemon-topology.c:611
-#: src/topology/gnunet-daemon-topology.c:723
-#: src/transport/gnunet-service-transport_neighbours.c:720
-#: src/transport/gnunet-service-transport_neighbours.c:728
+#: src/core/gnunet-service-core_sessions.c:256
+#: src/core/gnunet-service-core_sessions.c:341
+#: src/dht/gnunet-service-dht_neighbours.c:741
+#: src/dht/gnunet-service-dht_neighbours.c:803
+#: 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
+#: src/transport/gnunet-service-transport_neighbours.c:719
+#: src/transport/gnunet-service-transport_neighbours.c:727
 msgid "# peers connected"
 msgstr "# verbundener Knoten"
 
-#: src/core/gnunet-service-core_sessions.c:284
+#: src/core/gnunet-service-core_sessions.c:287
 #, fuzzy
 msgid "# type map refreshes sent"
 msgstr "# p2p Trace-Antworten gesendet"
 
-#: src/core/gnunet-service-core_sessions.c:403
+#: src/core/gnunet-service-core_sessions.c:407
 #, fuzzy
 msgid "# outdated typemap confirmations received"
 msgstr "# Bytes empfangen über TCP"
 
-#: src/core/gnunet-service-core_sessions.c:414
+#: src/core/gnunet-service-core_sessions.c:418
 #, fuzzy
 msgid "# valid typemap confirmations received"
 msgstr "# Bytes empfangen über TCP"
@@ -1463,7 +1433,7 @@
 msgstr ""
 
 #: src/datacache/datacache.c:119 src/datacache/datacache.c:294
-#: src/datastore/gnunet-service-datastore.c:865
+#: src/datastore/gnunet-service-datastore.c:770
 msgid "# bytes stored"
 msgstr "# gespeicherte Bytes"
 
@@ -1499,29 +1469,28 @@
 msgid "# proximity search requests received"
 msgstr "# Klartext PONG Nachrichten empfangen"
 
-#: src/datacache/plugin_datacache_heap.c:466
+#: src/datacache/plugin_datacache_heap.c:467
 msgid "Heap datacache running\n"
 msgstr ""
 
 #: src/datacache/plugin_datacache_sqlite.c:77
 #: src/datacache/plugin_datacache_sqlite.c:86
-#: src/datastore/plugin_datastore_mysql.c:818
-#: src/datastore/plugin_datastore_mysql.c:834
+#: src/datastore/plugin_datastore_mysql.c:1027
 #: src/datastore/plugin_datastore_sqlite.c:57
-#: src/datastore/plugin_datastore_sqlite.c:65 src/my/my.c:74 src/my/my.c:84
-#: src/mysql/mysql.c:41 src/mysql/mysql.c:48 src/mysql/mysql.c:522
-#: src/mysql/mysql.c:531 src/mysql/mysql.c:591 src/mysql/mysql.c:607
+#: src/datastore/plugin_datastore_sqlite.c:65 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/namestore/plugin_namestore_postgres.c:53
 #: src/namestore/plugin_namestore_sqlite.c:52
 #: src/peerstore/plugin_peerstore_sqlite.c:50
+#: src/psycstore/plugin_psycstore_mysql.c:62
 #: src/testbed/generate-underlay-topology.c:47
 #: src/testbed/gnunet-daemon-latency-logger.c:52
-#: src/testbed/gnunet-daemon-testbed-underlay.c:55
+#: src/testbed/gnunet-daemon-testbed-underlay.c:56
 #: src/testbed/testbed_api_hosts.c:69 src/util/crypto_ecc.c:52
 #: src/util/crypto_ecc_setup.c:41 src/util/crypto_mpi.c:39
-#: src/include/gnunet_common.h:677 src/include/gnunet_common.h:686
+#: src/include/gnunet_common.h:681 src/include/gnunet_common.h:690
 #: src/scalarproduct/scalarproduct.h:35
 #, c-format
 msgid "`%s' failed at %s:%d with error: %s\n"
@@ -1530,102 +1499,74 @@
 #: src/datacache/plugin_datacache_sqlite.c:749
 #: src/datastore/plugin_datastore_sqlite.c:409
 #: src/namecache/plugin_namecache_sqlite.c:292
-#: src/namestore/plugin_namestore_sqlite.c:324
+#: src/namestore/plugin_namestore_sqlite.c:343
 msgid "Tried to close sqlite without finalizing all prepared statements.\n"
 msgstr ""
 
-#: src/datastore/datastore_api.c:308
+#: src/datastore/datastore_api.c:309
 #, fuzzy
-msgid "Failed to transmit request to drop database.\n"
-msgstr "Fehler beim Senden einer `%s' Anfrage an den SMTP Server.\n"
+msgid "DATASTORE disconnected"
+msgstr "# verbundener Freunde"
 
-#: src/datastore/datastore_api.c:392
-msgid "# queue entry timeouts"
-msgstr ""
+#: src/datastore/datastore_api.c:425
+#, fuzzy
+msgid "Disconnected from DATASTORE"
+msgstr "# verbundener Knoten"
 
-#: src/datastore/datastore_api.c:447
+#: src/datastore/datastore_api.c:513
 msgid "# queue overflows"
 msgstr ""
 
-#: src/datastore/datastore_api.c:475
+#: src/datastore/datastore_api.c:543
 #, fuzzy
 msgid "# queue entries created"
 msgstr "# PING Nachrichten erstellt"
 
-#: src/datastore/datastore_api.c:495
-msgid "# Requests dropped from datastore queue"
-msgstr ""
+#: src/datastore/datastore_api.c:680
+msgid "# status messages received"
+msgstr "# empfangene Statusmeldungen"
 
-#: src/datastore/datastore_api.c:536
+#: src/datastore/datastore_api.c:754
+msgid "# Results received"
+msgstr "# empfangene Ergebnisse"
+
+#: src/datastore/datastore_api.c:879
 msgid "# datastore connections (re)created"
 msgstr ""
 
-#: src/datastore/datastore_api.c:624
+#: src/datastore/datastore_api.c:995
 #, fuzzy
-msgid "# transmission request failures"
-msgstr "# Klartext PONG Nachrichten empfangen"
-
-#: src/datastore/datastore_api.c:648
-#, fuzzy
-msgid "# bytes sent to datastore"
-msgstr "# bytes in der Datenbank"
-
-#: src/datastore/datastore_api.c:790
-#, fuzzy
-msgid "Failed to receive status response from database."
-msgstr ""
-"\n"
-"Fehler beim Empfangen der Antwort von gnunetd.\n"
-
-#: src/datastore/datastore_api.c:804
-msgid "Error reading response from datastore service"
-msgstr ""
-
-#: src/datastore/datastore_api.c:816 src/datastore/datastore_api.c:822
-msgid "Invalid error message received from datastore service"
-msgstr "Ungültige Fehlermeldung vom Datenspeicherdienst empfangen"
-
-#: src/datastore/datastore_api.c:826
-msgid "# status messages received"
-msgstr "# empfangene Statusmeldungen"
-
-#: src/datastore/datastore_api.c:905
-#, fuzzy
 msgid "# PUT requests executed"
 msgstr "# dht Anfragen weitergeleitet"
 
-#: src/datastore/datastore_api.c:971
+#: src/datastore/datastore_api.c:1056
 #, fuzzy
 msgid "# RESERVE requests executed"
 msgstr "# dht Anfragen weitergeleitet"
 
-#: src/datastore/datastore_api.c:1032
+#: src/datastore/datastore_api.c:1121
 msgid "# RELEASE RESERVE requests executed"
 msgstr ""
 
-#: src/datastore/datastore_api.c:1092
+#: src/datastore/datastore_api.c:1187
 #, fuzzy
 msgid "# UPDATE requests executed"
 msgstr "# dht Anfragen weitergeleitet"
 
-#: src/datastore/datastore_api.c:1156
+#: src/datastore/datastore_api.c:1271
 #, fuzzy
 msgid "# REMOVE requests executed"
 msgstr "# dht Anfragen weitergeleitet"
 
-#: src/datastore/datastore_api.c:1260
-msgid "# Results received"
-msgstr "# empfangene Ergebnisse"
-
-#: src/datastore/datastore_api.c:1327
+#: src/datastore/datastore_api.c:1331
 msgid "# GET REPLICATION requests executed"
 msgstr ""
 
-#: src/datastore/datastore_api.c:1390
+#: src/datastore/datastore_api.c:1397
 msgid "# GET ZERO ANONYMITY requests executed"
 msgstr ""
 
-#: src/datastore/datastore_api.c:1459
+#: src/datastore/datastore_api.c:1477
 msgid "# GET requests executed"
 msgstr "# ausgeführte GET-Anfragen"
 
@@ -1650,36 +1591,26 @@
 msgid "Manipulate GNUnet datastore"
 msgstr "sqlite Datenspeicher"
 
-#: src/datastore/gnunet-service-datastore.c:370
+#: src/datastore/gnunet-service-datastore.c:336
 msgid "# bytes expired"
 msgstr "# abgelaufene Bytes"
 
-#: src/datastore/gnunet-service-datastore.c:446
+#: src/datastore/gnunet-service-datastore.c:416
 msgid "# bytes purged (low-priority)"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:504
-#: src/gns/gnunet-gns-helper-service-w32.c:221
-msgid "Transmission to client failed!\n"
-msgstr ""
-
-#: src/datastore/gnunet-service-datastore.c:535
-#: src/gns/gnunet-gns-helper-service-w32.c:260
-msgid "Shutdown in progress, aborting transmission.\n"
-msgstr ""
-
-#: src/datastore/gnunet-service-datastore.c:651
+#: src/datastore/gnunet-service-datastore.c:557
 msgid "# results found"
 msgstr "# gefundene Ergebnisse"
 
-#: src/datastore/gnunet-service-datastore.c:696
+#: src/datastore/gnunet-service-datastore.c:598
 #, c-format
 msgid ""
-"Insufficient space (%llu bytes are available) to satisfy `%s' request for "
+"Insufficient space (%llu bytes are available) to satisfy RESERVE request for "
 "%llu bytes\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:707
+#: src/datastore/gnunet-service-datastore.c:609
 #, c-format
 msgid ""
 "The requested amount (%llu bytes) is larger than the cache size (%llu "
@@ -1686,134 +1617,133 @@
 "bytes)\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:711
+#: src/datastore/gnunet-service-datastore.c:615
 msgid ""
 "Insufficient space to satisfy request and requested amount is larger than "
 "cache size"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:717
+#: src/datastore/gnunet-service-datastore.c:622
 msgid "Insufficient space to satisfy request"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:723
-#: src/datastore/gnunet-service-datastore.c:778
-#: src/datastore/gnunet-service-datastore.c:1039
-#: src/datastore/gnunet-service-datastore.c:1673
+#: src/datastore/gnunet-service-datastore.c:629
+#: src/datastore/gnunet-service-datastore.c:684
+#: src/datastore/gnunet-service-datastore.c:969
+#: src/datastore/gnunet-service-datastore.c:1668
 msgid "# reserved"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:792
+#: src/datastore/gnunet-service-datastore.c:702
 msgid "Could not find matching reservation"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:879
+#: src/datastore/gnunet-service-datastore.c:787
 #, c-format
 msgid "Need %llu bytes more space (%llu allowed, using %llu)\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1094
+#: src/datastore/gnunet-service-datastore.c:1017
 #, fuzzy
 msgid "# GET requests received"
 msgstr "# Client Trace-Anfragen empfangen"
 
-#: src/datastore/gnunet-service-datastore.c:1107
+#: src/datastore/gnunet-service-datastore.c:1048
+#, fuzzy
+msgid "# GET KEY requests received"
+msgstr "# Client Trace-Anfragen empfangen"
+
+#: src/datastore/gnunet-service-datastore.c:1061
 msgid "# requests filtered by bloomfilter"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1155
+#: src/datastore/gnunet-service-datastore.c:1115
 #, fuzzy
 msgid "# UPDATE requests received"
 msgstr "# Client Trace-Anfragen empfangen"
 
-#: src/datastore/gnunet-service-datastore.c:1187
+#: src/datastore/gnunet-service-datastore.c:1146
 #, fuzzy
 msgid "# GET REPLICATION requests received"
 msgstr "# Client Trace-Anfragen empfangen"
 
-#: src/datastore/gnunet-service-datastore.c:1223
+#: src/datastore/gnunet-service-datastore.c:1179
 #, fuzzy
 msgid "# GET ZERO ANONYMITY requests received"
 msgstr "# Client Trace-Anfragen empfangen"
 
-#: src/datastore/gnunet-service-datastore.c:1269
+#: src/datastore/gnunet-service-datastore.c:1226
 msgid "Content not found"
 msgstr "Kein Inhalt gefunden"
 
-#: src/datastore/gnunet-service-datastore.c:1279
+#: src/datastore/gnunet-service-datastore.c:1235
 msgid "# bytes removed (explicit request)"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1311
+#: src/datastore/gnunet-service-datastore.c:1282
 #, fuzzy
 msgid "# REMOVE requests received"
 msgstr "# Client Trace-Anfragen empfangen"
 
-#: src/datastore/gnunet-service-datastore.c:1364
+#: src/datastore/gnunet-service-datastore.c:1336
 #, c-format
 msgid ""
 "Datastore payload must have been inaccurate (%lld < %lld). Recomputing it.\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1369
+#: src/datastore/gnunet-service-datastore.c:1342
+#: src/datastore/gnunet-service-datastore.c:1517
 #, c-format
 msgid "New payload: %lld\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1423
+#: src/datastore/gnunet-service-datastore.c:1396
 #, c-format
 msgid "Loading `%s' datastore plugin\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1434
+#: src/datastore/gnunet-service-datastore.c:1408
 #, 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:1503
-#: src/datastore/gnunet-service-datastore.c:1566
+#: src/datastore/gnunet-service-datastore.c:1468
 msgid "Bloomfilter construction complete.\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1553
+#: src/datastore/gnunet-service-datastore.c:1524
 msgid "Rebuilding bloomfilter.  Please be patient.\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1563
+#: src/datastore/gnunet-service-datastore.c:1535
 msgid "Plugin does not support get_keys function. Please fix!\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1704
-#: src/datastore/gnunet-service-datastore.c:1716
+#: src/datastore/gnunet-service-datastore.c:1705
 #, fuzzy, c-format
-msgid "No `%s' specified for `%s' in configuration!\n"
-msgstr "In der Konfigurationsdatei wurden keine Anwendungen definiert!\n"
-
-#: src/datastore/gnunet-service-datastore.c:1710
-#, fuzzy, c-format
 msgid "# bytes used in file-sharing datastore `%s'"
 msgstr "# bytes erlaubt in der Datenbank"
 
-#: src/datastore/gnunet-service-datastore.c:1722
+#: src/datastore/gnunet-service-datastore.c:1721
 msgid "# quota"
 msgstr "# Kontingent"
 
-#: src/datastore/gnunet-service-datastore.c:1724
+#: src/datastore/gnunet-service-datastore.c:1726
 msgid "# cache size"
 msgstr "# Zwischenspeichergröße"
 
-#: src/datastore/gnunet-service-datastore.c:1739
+#: src/datastore/gnunet-service-datastore.c:1742
 #, c-format
 msgid "Could not use specified filename `%s' for bloomfilter.\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1757
-#: src/datastore/gnunet-service-datastore.c:1773
+#: src/datastore/gnunet-service-datastore.c:1760
+#: src/datastore/gnunet-service-datastore.c:1776
 #, 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:1803
+#: src/datastore/gnunet-service-datastore.c:1808
 msgid "Failed to initialize bloomfilter.\n"
 msgstr "Bloomfilter konnte nicht initialisiert werden.\n"
 
@@ -1821,27 +1751,23 @@
 msgid "Heap database running\n"
 msgstr "Heap-Datenbank läuft\n"
 
-#: src/datastore/plugin_datastore_mysql.c:309
+#: src/datastore/plugin_datastore_mysql.c:347
 #: src/datastore/plugin_datastore_sqlite.c:507
 #, fuzzy
 msgid "Data too large"
 msgstr "Anzahl der Werte"
 
-#: src/datastore/plugin_datastore_mysql.c:328
+#: src/datastore/plugin_datastore_mysql.c:363
 msgid "MySQL statement run failure"
 msgstr ""
 
-#: src/datastore/plugin_datastore_mysql.c:793
+#: src/datastore/plugin_datastore_mysql.c:983
 #, fuzzy, c-format
-msgid "Failed to prepare statement `%s'\n"
-msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
-
-#: src/datastore/plugin_datastore_mysql.c:802
-#, 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:1036
+#: src/datastore/plugin_datastore_mysql.c:1257
+#: src/psycstore/plugin_psycstore_mysql.c:1936
 msgid "Mysql database running\n"
 msgstr "MySQL-Datenbank läuft\n"
 
@@ -1857,6 +1783,7 @@
 #: src/datastore/plugin_datastore_postgres.c:1012
 #: 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"
 
@@ -1863,7 +1790,7 @@
 #: src/datastore/plugin_datastore_sqlite.c:65
 #: src/testbed/generate-underlay-topology.c:50
 #: src/testbed/gnunet-daemon-latency-logger.c:55
-#: src/testbed/gnunet-daemon-testbed-underlay.c:58
+#: src/testbed/gnunet-daemon-testbed-underlay.c:59
 #, fuzzy, c-format
 msgid "`%s' failed at %s:%u with error: %s"
 msgstr "`%s' schlug bei %s:%d mit dem Fehler %s fehl\n"
@@ -1870,7 +1797,7 @@
 
 #: src/datastore/plugin_datastore_sqlite.c:263
 #: src/namecache/plugin_namecache_sqlite.c:193
-#: src/namestore/plugin_namestore_sqlite.c:204
+#: src/namestore/plugin_namestore_sqlite.c:213
 #: src/peerstore/plugin_peerstore_sqlite.c:479
 #: src/psycstore/plugin_psycstore_sqlite.c:325
 #, c-format
@@ -1895,7 +1822,7 @@
 
 #: src/datastore/plugin_datastore_sqlite.c:1245
 #: src/namecache/plugin_namecache_sqlite.c:580
-#: src/namestore/plugin_namestore_sqlite.c:716
+#: src/namestore/plugin_namestore_sqlite.c:766
 msgid "Sqlite database running\n"
 msgstr "Sqlite-Datenbank läuft\n"
 
@@ -1903,10 +1830,6 @@
 msgid "Template database running\n"
 msgstr ""
 
-#: src/dht/dht_api.c:403
-msgid "Failed to connect to the DHT service!\n"
-msgstr "Verbindung zum DHT-Dienst ist fehlgeschlagen!\n"
-
 #: src/dht/gnunet-dht-get.c:155
 #, c-format
 msgid ""
@@ -1927,7 +1850,7 @@
 msgstr ""
 
 #: src/dht/gnunet-dht-get.c:212 src/dht/gnunet-dht-monitor.c:289
-#: src/dht/gnunet-dht-put.c:202
+#: src/dht/gnunet-dht-put.c:198
 msgid "the query key"
 msgstr ""
 
@@ -1939,18 +1862,18 @@
 msgid "the type of data to look for"
 msgstr ""
 
-#: src/dht/gnunet-dht-get.c:221 src/dht/gnunet-dht-put.c:214
+#: src/dht/gnunet-dht-get.c:221
 msgid "how long to execute this query before giving up?"
 msgstr ""
 
-#: src/dht/gnunet-dht-get.c:224 src/dht/gnunet-dht-put.c:205
+#: src/dht/gnunet-dht-get.c:224 src/dht/gnunet-dht-put.c:201
 msgid "use DHT's demultiplex everywhere option"
 msgstr ""
 
 #: src/dht/gnunet-dht-get.c:227 src/dht/gnunet-dht-monitor.c:298
-#: src/dht/gnunet-dht-put.c:217 src/fs/gnunet-auto-share.c:780
+#: src/dht/gnunet-dht-put.c:210 src/fs/gnunet-auto-share.c:780
 #: src/fs/gnunet-download.c:327 src/fs/gnunet-publish.c:951
-#: src/fs/gnunet-search.c:318 src/fs/gnunet-unindex.c:167
+#: src/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 ""
@@ -1967,357 +1890,295 @@
 msgid "Prints all packets that go through the DHT."
 msgstr ""
 
-#: src/dht/gnunet_dht_profiler.c:1392
-#: src/testbed/gnunet-testbed-profiler.c:255
+#: src/dht/gnunet_dht_profiler.c:1161 src/testbed/gnunet-testbed-profiler.c:255
 #, c-format
 msgid "Exiting as the number of peers is %u\n"
 msgstr ""
 
-#: src/dht/gnunet_dht_profiler.c:1417
+#: src/dht/gnunet_dht_profiler.c:1186
 #, fuzzy
 msgid "number of peers to start"
 msgstr "Anzahl an Durchläufen"
 
-#: src/dht/gnunet_dht_profiler.c:1420
+#: src/dht/gnunet_dht_profiler.c:1189
 msgid ""
 "maximum number of times we try to search for successor circle formation (0 "
 "for R5N)"
 msgstr ""
 
-#: src/dht/gnunet_dht_profiler.c:1423 src/nse/gnunet-nse-profiler.c:846
+#: src/dht/gnunet_dht_profiler.c:1192 src/nse/gnunet-nse-profiler.c:846
 #: src/testbed/gnunet-testbed-profiler.c:294
 msgid "name of the file with the login information for the testbed"
 msgstr ""
 
-#: src/dht/gnunet_dht_profiler.c:1426
+#: src/dht/gnunet_dht_profiler.c:1195
 msgid "delay between rounds for collecting statistics (default: 30 sec)"
 msgstr ""
 
-#: src/dht/gnunet_dht_profiler.c:1429
+#: src/dht/gnunet_dht_profiler.c:1198
 msgid "delay to start doing PUTs (default: 1 sec)"
 msgstr ""
 
-#: src/dht/gnunet_dht_profiler.c:1432
+#: src/dht/gnunet_dht_profiler.c:1201
 msgid "delay to start doing GETs (default: 5 min)"
 msgstr ""
 
-#: src/dht/gnunet_dht_profiler.c:1435
+#: src/dht/gnunet_dht_profiler.c:1204
 msgid "replication degree for DHT PUTs"
 msgstr ""
 
-#: src/dht/gnunet_dht_profiler.c:1438
+#: src/dht/gnunet_dht_profiler.c:1207
 msgid "timeout for DHT PUT and GET requests (default: 1 min)"
 msgstr ""
 
-#: src/dht/gnunet_dht_profiler.c:1456
+#: src/dht/gnunet_dht_profiler.c:1225
 msgid "Measure quality and performance of the DHT service."
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:120
+#: src/dht/gnunet-dht-put.c:115
 msgid "PUT request sent with key"
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:123
+#: src/dht/gnunet-dht-put.c:118
 msgid "Timeout sending PUT request!\n"
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:126
+#: src/dht/gnunet-dht-put.c:121
 msgid "PUT request not confirmed!\n"
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:157
+#: src/dht/gnunet-dht-put.c:151
 msgid "Must provide KEY and DATA for DHT put!\n"
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:164
+#: src/dht/gnunet-dht-put.c:158
 #, c-format
 msgid "Could not connect to %s service!\n"
 msgstr "Verbindung zum %s-Dienst ist fehlgeschlagen!\n"
 
-#: src/dht/gnunet-dht-put.c:180
+#: src/dht/gnunet-dht-put.c:172
 #, c-format
 msgid "Issuing put request for `%s' with data `%s'!\n"
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:196
+#: src/dht/gnunet-dht-put.c:192
 msgid "the data to insert under the key"
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:199
+#: src/dht/gnunet-dht-put.c:195
 msgid "how long to store this entry in the dht (in seconds)"
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:208
+#: src/dht/gnunet-dht-put.c:204
 msgid "how many replicas to create"
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:211
+#: src/dht/gnunet-dht-put.c:207
 msgid "the type to insert data as"
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:240
+#: src/dht/gnunet-dht-put.c:232
 msgid "Issue a PUT request to the GNUnet DHT insert DATA under KEY."
 msgstr ""
 
-#: src/dht/gnunet-service-dht.c:171
-msgid "Failed to connect to transport service!\n"
-msgstr "Verbindung zum Transportdienst ist fehlgeschlagen!\n"
-
-#: src/dht/gnunet-service-dht_clients.c:417
-#: src/dht/gnunet-service-wdht_clients.c:857
-#: src/dht/gnunet-service-xdht_clients.c:854
+#: src/dht/gnunet-service-dht_clients.c:370
+#: 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:509
-#: src/dht/gnunet-service-wdht_clients.c:938
-#: src/dht/gnunet-service-xdht_clients.c:934
+#: src/dht/gnunet-service-dht_clients.c:481
+#: 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:593
-#: src/dht/gnunet-service-wdht_clients.c:1004
-#: src/dht/gnunet-service-xdht_clients.c:999
+#: src/dht/gnunet-service-dht_clients.c:620
+#: 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:794
-#: src/dht/gnunet-service-wdht_clients.c:1213
-#: src/dht/gnunet-service-xdht_clients.c:1201
+#: src/dht/gnunet-service-dht_clients.c:847
+#: 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:1041
+#: src/dht/gnunet-service-dht_clients.c:1032
 #: src/dht/gnunet-service-wdht_clients.c:510
-#: src/dht/gnunet-service-xdht_clients.c:508
 msgid "# Key match, type mismatches in REPLY to CLIENT"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_clients.c:1054
+#: src/dht/gnunet-service-dht_clients.c:1047
 #: src/dht/gnunet-service-wdht_clients.c:524
-#: src/dht/gnunet-service-xdht_clients.c:522
 msgid "# Duplicate REPLIES to CLIENT request dropped"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_clients.c:1099
+#: src/dht/gnunet-service-dht_clients.c:1094
 #: src/dht/gnunet-service-wdht_clients.c:566
-#: src/dht/gnunet-service-xdht_clients.c:564
 #, c-format
 msgid "Unsupported block type (%u) in request!\n"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_clients.c:1122
+#: src/dht/gnunet-service-dht_clients.c:1101
 #: src/dht/gnunet-service-wdht_clients.c:589
-#: src/dht/gnunet-service-xdht_clients.c:587
 msgid "# RESULTS queued for clients"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_clients.c:1176
-#: src/dht/gnunet-service-dht_clients.c:1219
+#: src/dht/gnunet-service-dht_clients.c:1179
 #: src/dht/gnunet-service-wdht_clients.c:643
-#: src/dht/gnunet-service-wdht_clients.c:686
-#: src/dht/gnunet-service-xdht_clients.c:641
-#: src/dht/gnunet-service-xdht_clients.c:684
+#: src/dht/gnunet-service-wdht_clients.c:693
 msgid "# REPLIES ignored for CLIENTS (no match)"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_clients.c:1186
-#: src/dht/gnunet-service-wdht_clients.c:653
-#: src/dht/gnunet-service-xdht_clients.c:651
-#, fuzzy
-msgid "Could not pass reply to client, message too big!\n"
-msgstr "'join' Nachricht konnte nicht an gnunetd gesendet werden.\n"
-
-#: src/dht/gnunet-service-dht_datacache.c:68
+#: src/dht/gnunet-service-dht_datacache.c:72
 #, c-format
 msgid "%s request received, but have no datacache!\n"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_datacache.c:78
-#: src/dht/gnunet-service-wdht_datacache.c:107
-#: src/dht/gnunet-service-xdht_datacache.c:91
+#: src/dht/gnunet-service-dht_datacache.c:82
 msgid "# ITEMS stored in datacache"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_datacache.c:184
-#: src/dht/gnunet-service-wdht_datacache.c:216
-#: src/dht/gnunet-service-xdht_datacache.c:238
+#: src/dht/gnunet-service-dht_datacache.c:199
 msgid "# Good RESULTS found in datacache"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_datacache.c:201
-#: src/dht/gnunet-service-wdht_datacache.c:231
-#: src/dht/gnunet-service-xdht_datacache.c:267
+#: src/dht/gnunet-service-dht_datacache.c:211
 msgid "# Duplicate RESULTS found in datacache"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_datacache.c:207
-#: src/dht/gnunet-service-wdht_datacache.c:237
-#: src/dht/gnunet-service-xdht_datacache.c:273
+#: src/dht/gnunet-service-dht_datacache.c:217
 msgid "# Invalid RESULTS found in datacache"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_datacache.c:213
-#: src/dht/gnunet-service-wdht_datacache.c:243
-#: src/dht/gnunet-service-xdht_datacache.c:279
+#: src/dht/gnunet-service-dht_datacache.c:223
 msgid "# Irrelevant RESULTS found in datacache"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_datacache.c:225
-#: src/dht/gnunet-service-wdht_datacache.c:255
-#: src/dht/gnunet-service-xdht_datacache.c:291
+#: src/dht/gnunet-service-dht_datacache.c:235
 msgid "# Unsupported RESULTS found in datacache"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_datacache.c:229
-#: src/dht/gnunet-service-wdht_datacache.c:258
-#: src/dht/gnunet-service-xdht_datacache.c:294
+#: src/dht/gnunet-service-dht_datacache.c:239
 #, c-format
 msgid "Unsupported block type (%u) in local response!\n"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_datacache.c:262
-#: src/dht/gnunet-service-wdht_datacache.c:295
-#: src/dht/gnunet-service-xdht_datacache.c:334
+#: src/dht/gnunet-service-dht_datacache.c:276
 msgid "# GET requests given to datacache"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_hello.c:84
-#: src/dht/gnunet-service-xdht_hello.c:82
+#: src/dht/gnunet-service-dht_hello.c:84 src/dht/gnunet-service-xdht_hello.c:82
 msgid "# HELLOs obtained from peerinfo"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:735
+#: src/dht/gnunet-service-dht_neighbours.c:685
 #, fuzzy
 msgid "# FIND PEER messages initiated"
 msgstr "# PING Nachrichten erstellt"
 
-#: src/dht/gnunet-service-dht_neighbours.c:900
-#: src/dht/gnunet-service-xdht_neighbours.c:6062
-msgid "# Queued messages discarded (peer disconnected)"
-msgstr ""
-
-#: src/dht/gnunet-service-dht_neighbours.c:933
-#: src/dht/gnunet-service-xdht_neighbours.c:986
+#: src/dht/gnunet-service-dht_neighbours.c:851
 #, fuzzy
-msgid "# Messages dropped (CORE timeout)"
-msgstr "# gap Anfragen verworfen: Kollision in RT"
-
-#: src/dht/gnunet-service-dht_neighbours.c:963
-#: src/dht/gnunet-service-xdht_neighbours.c:1018
-#, fuzzy
-msgid "# Bytes transmitted to other peers"
-msgstr "# Bytes des Typs %d übertragen"
-
-#: src/dht/gnunet-service-dht_neighbours.c:1009
-msgid "# Bytes of bandwidth requested from core"
-msgstr ""
-
-#: src/dht/gnunet-service-dht_neighbours.c:1043
-#, fuzzy
 msgid "# requests TTL-dropped"
 msgstr "# dht Anfragen weitergeleitet"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1248
-#: src/dht/gnunet-service-dht_neighbours.c:1285
+#: src/dht/gnunet-service-dht_neighbours.c:1054
+#: src/dht/gnunet-service-dht_neighbours.c:1091
 msgid "# Peers excluded from routing due to Bloomfilter"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1263
-#: src/dht/gnunet-service-dht_neighbours.c:1300
+#: src/dht/gnunet-service-dht_neighbours.c:1071
+#: src/dht/gnunet-service-dht_neighbours.c:1107
 #, fuzzy
 msgid "# Peer selection failed"
 msgstr " Verbindung fehlgeschlagen\n"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1447
+#: src/dht/gnunet-service-dht_neighbours.c:1255
 #, fuzzy
 msgid "# PUT requests routed"
 msgstr "# dht Anfragen weitergeleitet"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1476
+#: src/dht/gnunet-service-dht_neighbours.c:1288
 msgid "# PUT messages queued for transmission"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1486
-#: src/dht/gnunet-service-dht_neighbours.c:1610
-#: src/dht/gnunet-service-dht_neighbours.c:1717
-#: src/dht/gnunet-service-xdht_neighbours.c:1128
-#: src/dht/gnunet-service-xdht_neighbours.c:1197
-#: src/dht/gnunet-service-xdht_neighbours.c:1247
-#: src/dht/gnunet-service-xdht_neighbours.c:1311
-#: src/dht/gnunet-service-xdht_neighbours.c:1378
-#: src/dht/gnunet-service-xdht_neighbours.c:1440
-#: src/dht/gnunet-service-xdht_neighbours.c:1502
-#: src/dht/gnunet-service-xdht_neighbours.c:1564
-#: src/dht/gnunet-service-xdht_neighbours.c:1624
+#: src/dht/gnunet-service-dht_neighbours.c:1299
+#: src/dht/gnunet-service-dht_neighbours.c:1427
+#: src/dht/gnunet-service-dht_neighbours.c:1532
+#: 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:1572
+#: src/dht/gnunet-service-dht_neighbours.c:1383
 #, fuzzy
 msgid "# GET requests routed"
 msgstr "# dht Anfragen weitergeleitet"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1599
+#: src/dht/gnunet-service-dht_neighbours.c:1415
 msgid "# GET messages queued for transmission"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1724
+#: src/dht/gnunet-service-dht_neighbours.c:1547
 msgid "# RESULT messages queued for transmission"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1811
+#: src/dht/gnunet-service-dht_neighbours.c:1646
 #, fuzzy
 msgid "# P2P PUT requests received"
 msgstr "# Client Trace-Anfragen empfangen"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1814
+#: src/dht/gnunet-service-dht_neighbours.c:1650
 #, fuzzy
 msgid "# P2P PUT bytes received"
 msgstr "# Bytes empfangen über TCP"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1986
+#: src/dht/gnunet-service-dht_neighbours.c:1854
 msgid "# FIND PEER requests ignored due to Bloomfilter"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1994
+#: src/dht/gnunet-service-dht_neighbours.c:1862
 msgid "# FIND PEER requests ignored due to lack of HELLO"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:2089
+#: src/dht/gnunet-service-dht_neighbours.c:2018
 #, fuzzy
 msgid "# P2P GET requests received"
 msgstr "# Client Trace-Anfragen empfangen"
 
-#: src/dht/gnunet-service-dht_neighbours.c:2092
+#: src/dht/gnunet-service-dht_neighbours.c:2022
 #, fuzzy
 msgid "# P2P GET bytes received"
 msgstr "# Bytes empfangen über TCP"
 
-#: src/dht/gnunet-service-dht_neighbours.c:2157
+#: src/dht/gnunet-service-dht_neighbours.c:2097
 msgid "# P2P FIND PEER requests processed"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:2171
+#: src/dht/gnunet-service-dht_neighbours.c:2120
 #, fuzzy
 msgid "# P2P GET requests ONLY routed"
 msgstr "# dht Anfragen weitergeleitet"
 
-#: src/dht/gnunet-service-dht_neighbours.c:2257
+#: src/dht/gnunet-service-dht_neighbours.c:2222
 msgid "# P2P RESULTS received"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:2260
+#: src/dht/gnunet-service-dht_neighbours.c:2226
 #, fuzzy
 msgid "# P2P RESULT bytes received"
 msgstr "# Bytes empfangen über TCP"
 
-#: src/dht/gnunet-service-dht_nse.c:59 src/dht/gnunet-service-wdht_nse.c:59
-#: src/dht/gnunet-service-xdht_nse.c:59
+#: src/dht/gnunet-service-dht_nse.c:59
 #, fuzzy
 msgid "# Network size estimates received"
 msgstr "# verschlüsselter PING Nachrichten empfangen"
@@ -2342,25 +2203,25 @@
 msgid "# Unsupported REPLIES matched against routing table"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_routing.c:324
+#: src/dht/gnunet-service-dht_routing.c:327
 msgid "# Entries removed from routing table"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_routing.c:406
+#: src/dht/gnunet-service-dht_routing.c:409
 msgid "# Entries added to routing table"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_routing.c:424
+#: src/dht/gnunet-service-dht_routing.c:427
 #, fuzzy
 msgid "# DHT requests combined"
 msgstr "# dht Anfragen weitergeleitet"
 
-#: src/dht/gnunet-service-wdht_datacache.c:82
+#: src/dht/gnunet-service-wdht_clients.c:653
 #, fuzzy
-msgid "PUT request received, but have no datacache!\n"
-msgstr "Die `%s' Anfrage, die vom Client empfangen wurde, ist beschädigt.\n"
+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:1831
+#: src/dht/gnunet-service-xdht_neighbours.c:1572
 #, c-format
 msgid ""
 "\n"
@@ -2367,7 +2228,7 @@
 "SUPU %s, %s, %d,trail_length = %d"
 msgstr ""
 
-#: src/dht/gnunet-service-xdht_neighbours.c:1836
+#: src/dht/gnunet-service-xdht_neighbours.c:1577
 #, c-format
 msgid ""
 "\n"
@@ -2374,7 +2235,7 @@
 "SUPU %s, %s, %d,trail[%d]=%s"
 msgstr ""
 
-#: src/dht/gnunet-service-xdht_neighbours.c:1856
+#: src/dht/gnunet-service-xdht_neighbours.c:1597
 #, c-format
 msgid ""
 "\n"
@@ -2381,7 +2242,7 @@
 "SUPU************  FRIEND_PEERMAP of %s"
 msgstr ""
 
-#: src/dht/gnunet-service-xdht_neighbours.c:1866
+#: src/dht/gnunet-service-xdht_neighbours.c:1607
 #, c-format
 msgid ""
 "\n"
@@ -2388,7 +2249,7 @@
 "SUPU %s, %s, %d, friend = %s, friend->trails_count = %d"
 msgstr ""
 
-#: src/dht/gnunet-service-xdht_neighbours.c:1887
+#: src/dht/gnunet-service-xdht_neighbours.c:1628
 #, c-format
 msgid ""
 "\n"
@@ -2395,7 +2256,7 @@
 "SUPU************  FINGER_TABLE of %s"
 msgstr ""
 
-#: src/dht/gnunet-service-xdht_neighbours.c:1896
+#: src/dht/gnunet-service-xdht_neighbours.c:1637
 #, c-format
 msgid ""
 "\n"
@@ -2402,7 +2263,7 @@
 "SUPU %s, %s, %d, finger_table[%d] = %s, trails_count = %d"
 msgstr ""
 
-#: src/dht/gnunet-service-xdht_neighbours.c:1903
+#: src/dht/gnunet-service-xdht_neighbours.c:1644
 #, c-format
 msgid ""
 "\n"
@@ -2409,7 +2270,7 @@
 "SUPU %s, %s, %d, trail_id[%d]=%s"
 msgstr ""
 
-#: src/dht/gnunet-service-xdht_neighbours.c:1909
+#: src/dht/gnunet-service-xdht_neighbours.c:1650
 #, c-format
 msgid ""
 "\n"
@@ -2416,27 +2277,27 @@
 "SUPU %s, %s, %d,trail[%d] = %s "
 msgstr ""
 
-#: src/dht/gnunet-service-xdht_neighbours.c:3557
+#: src/dht/gnunet-service-xdht_neighbours.c:3366
 msgid "# FINGERS_COUNT"
 msgstr ""
 
-#: src/dht/gnunet-service-xdht_neighbours.c:3698
-#: src/dht/gnunet-service-xdht_neighbours.c:3936
-#: src/dht/gnunet-service-xdht_neighbours.c:4088
-#: src/dht/gnunet-service-xdht_neighbours.c:4240
-#: src/dht/gnunet-service-xdht_neighbours.c:4421
-#: src/dht/gnunet-service-xdht_neighbours.c:4934
-#: src/dht/gnunet-service-xdht_neighbours.c:5325
-#: src/dht/gnunet-service-xdht_neighbours.c:5420
-#: src/dht/gnunet-service-xdht_neighbours.c:5510
-#: src/dht/gnunet-service-xdht_neighbours.c:5614
-#: src/dht/gnunet-service-xdht_neighbours.c:5758
-#: src/dht/gnunet-service-xdht_neighbours.c:5849
+#: 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:256
+#: src/dht/gnunet-service-xdht_routing.c:261
 #, c-format
 msgid ""
 "\n"
@@ -2443,7 +2304,7 @@
 "SUPU ***PRINTING ROUTING TABLE ***** of =%s"
 msgstr ""
 
-#: src/dht/gnunet-service-xdht_routing.c:264
+#: src/dht/gnunet-service-xdht_routing.c:269
 #, c-format
 msgid ""
 "\n"
@@ -2450,7 +2311,7 @@
 "SUPU %s, %s, %d, trail->trail_id = %s"
 msgstr ""
 
-#: src/dht/gnunet-service-xdht_routing.c:267
+#: src/dht/gnunet-service-xdht_routing.c:272
 #, c-format
 msgid ""
 "\n"
@@ -2457,7 +2318,7 @@
 "SUPU %s, %s, %d, trail->next_hop = %s"
 msgstr ""
 
-#: src/dht/gnunet-service-xdht_routing.c:270
+#: src/dht/gnunet-service-xdht_routing.c:275
 #, c-format
 msgid ""
 "\n"
@@ -2488,27 +2349,27 @@
 msgid "Failed to convert UTF-8 name `%s' to DNS IDNA format: %s\n"
 msgstr ""
 
-#: src/dns/dnsstub.c:175
+#: src/dns/dnsstub.c:176
 #, fuzzy, c-format
 msgid "Could not bind to any port: %s\n"
 msgstr "IP des Hosts `%s' konnte nicht ermittelt werden: %s\n"
 
-#: src/dns/dnsstub.c:293 src/dns/dnsstub.c:381
+#: src/dns/dnsstub.c:294 src/dns/dnsstub.c:382
 #, fuzzy, c-format
 msgid "Failed to send DNS request to %s\n"
 msgstr "HTTP Anfrage konnte nicht an Host `%s' gesendet werden: %s\n"
 
-#: src/dns/dnsstub.c:297
+#: src/dns/dnsstub.c:298
 #, c-format
 msgid "Sent DNS request to %s\n"
 msgstr ""
 
-#: src/dns/dnsstub.c:366
+#: src/dns/dnsstub.c:367
 #, c-format
 msgid "Configured DNS exit `%s' is not working / valid.\n"
 msgstr ""
 
-#: src/dns/dnsstub.c:438
+#: src/dns/dnsstub.c:437
 #, c-format
 msgid "Received DNS response that is too small (%u bytes)"
 msgstr ""
@@ -2537,48 +2398,52 @@
 msgid "Change DNS replies to point elsewhere."
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:457
+#: src/dns/gnunet-service-dns.c:462
 msgid "# DNS requests answered via TUN interface"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:604
+#: src/dns/gnunet-service-dns.c:608
 msgid "# DNS exit failed (failed to open socket)"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:715
+#: src/dns/gnunet-service-dns.c:738
 msgid "# External DNS response discarded (no matching request)"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:793
+#: src/dns/gnunet-service-dns.c:813
 msgid "# Client response discarded (no matching request)"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:908
+#: src/dns/gnunet-service-dns.c:929
 msgid "Received malformed IPv4-UDP packet on TUN interface.\n"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:924
+#: src/dns/gnunet-service-dns.c:945
 msgid "Received malformed IPv6-UDP packet on TUN interface.\n"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:933
+#: src/dns/gnunet-service-dns.c:954
 #, c-format
 msgid "Got non-IP packet with %u bytes and protocol %u from TUN\n"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:943
+#: src/dns/gnunet-service-dns.c:964
+msgid "DNS interceptor got non-DNS packet (dropped)\n"
+msgstr ""
+
+#: src/dns/gnunet-service-dns.c:966
 msgid "# Non-DNS UDP packet received via TUN interface"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:1010
+#: src/dns/gnunet-service-dns.c:1033
 msgid "# DNS requests received via TUN interface"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:1062 src/exit/gnunet-daemon-exit.c:3607
+#: src/dns/gnunet-service-dns.c:1078 src/exit/gnunet-daemon-exit.c:3643
 msgid "need a valid IPv4 or IPv6 address\n"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:1080
+#: src/dns/gnunet-service-dns.c:1091
 #, c-format
 msgid "`%s' must be installed SUID, will not run DNS interceptor\n"
 msgstr ""
@@ -2592,230 +2457,214 @@
 msgid "Print information about DV state"
 msgstr "Informationen über andere GNUnet Knoten ausgeben."
 
-#: src/exit/gnunet-daemon-exit.c:807
+#: src/exit/gnunet-daemon-exit.c:805 src/exit/gnunet-daemon-exit.c:3109
+#, fuzzy
+msgid "# Inbound CADET channels created"
+msgstr "# PING Nachrichten erstellt"
+
+#: src/exit/gnunet-daemon-exit.c:861
 #, c-format
 msgid "Got duplicate service records for `%s:%u'\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:858
+#: src/exit/gnunet-daemon-exit.c:914
 #, fuzzy
 msgid "# Bytes transmitted via cadet channels"
 msgstr "# Bytes des Typs %d übertragen"
 
-#: src/exit/gnunet-daemon-exit.c:975 src/exit/gnunet-daemon-exit.c:2408
-#: src/exit/gnunet-daemon-exit.c:2666 src/vpn/gnunet-service-vpn.c:1446
-#: src/vpn/gnunet-service-vpn.c:1837 src/vpn/gnunet-service-vpn.c:2000
+#: src/exit/gnunet-daemon-exit.c:1033 src/exit/gnunet-daemon-exit.c:2493
+#: src/exit/gnunet-daemon-exit.c:2746 src/vpn/gnunet-service-vpn.c:1455
+#: src/vpn/gnunet-service-vpn.c:1846 src/vpn/gnunet-service-vpn.c:2009
 msgid "# ICMPv4 packets dropped (type not allowed)"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:1012 src/exit/gnunet-daemon-exit.c:2467
-#: src/exit/gnunet-daemon-exit.c:2725 src/vpn/gnunet-service-vpn.c:1502
-#: src/vpn/gnunet-service-vpn.c:1896 src/vpn/gnunet-service-vpn.c:2033
+#: src/exit/gnunet-daemon-exit.c:1070 src/exit/gnunet-daemon-exit.c:2552
+#: src/exit/gnunet-daemon-exit.c:2805 src/vpn/gnunet-service-vpn.c:1511
+#: src/vpn/gnunet-service-vpn.c:1905 src/vpn/gnunet-service-vpn.c:2042
 msgid "# ICMPv6 packets dropped (type not allowed)"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:1052
+#: src/exit/gnunet-daemon-exit.c:1118
 msgid "# ICMP packets dropped (not allowed)"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:1059
+#: src/exit/gnunet-daemon-exit.c:1126
 msgid "ICMP Packet dropped, have no matching connection information\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:1135
+#: src/exit/gnunet-daemon-exit.c:1203
 msgid "UDP Packet dropped, have no matching connection information\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:1209
+#: src/exit/gnunet-daemon-exit.c:1278
 msgid "TCP Packet dropped, have no matching connection information\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:1262
+#: src/exit/gnunet-daemon-exit.c:1331
 #, fuzzy
 msgid "# Packets received from TUN"
 msgstr "# Bytes empfangen über TCP"
 
-#: src/exit/gnunet-daemon-exit.c:1276
+#: src/exit/gnunet-daemon-exit.c:1345
 #, fuzzy
 msgid "# Bytes received from TUN"
 msgstr "# Bytes empfangen über TCP"
 
-#: src/exit/gnunet-daemon-exit.c:1302
+#: src/exit/gnunet-daemon-exit.c:1371
 msgid "IPv4 packet options received.  Ignored.\n"
 msgstr "IPv4-Paketoptionen empfangen, werden ignoriert.\n"
 
-#: src/exit/gnunet-daemon-exit.c:1329
+#: src/exit/gnunet-daemon-exit.c:1398
 #, c-format
 msgid "IPv4 packet with unsupported next header %u received.  Ignored.\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:1375
+#: src/exit/gnunet-daemon-exit.c:1444
 #, c-format
 msgid "IPv6 packet with unsupported next header %d received.  Ignored.\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:1383
+#: src/exit/gnunet-daemon-exit.c:1452
 #, c-format
 msgid "Packet from unknown protocol %u received.  Ignored.\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:1765
+#: src/exit/gnunet-daemon-exit.c:1853
 #, fuzzy
 msgid "# TCP packets sent via TUN"
 msgstr "# Bytes gesendet über TCP"
 
-#: src/exit/gnunet-daemon-exit.c:1878
+#: src/exit/gnunet-daemon-exit.c:1977
 #, fuzzy
 msgid "# TCP service creation requests received via cadet"
 msgstr "# Client Trace-Anfragen empfangen"
 
-#: src/exit/gnunet-daemon-exit.c:1881 src/exit/gnunet-daemon-exit.c:1975
-#: src/exit/gnunet-daemon-exit.c:2082 src/exit/gnunet-daemon-exit.c:2332
-#: src/exit/gnunet-daemon-exit.c:2582 src/exit/gnunet-daemon-exit.c:2872
-#: src/exit/gnunet-daemon-exit.c:2980
+#: src/exit/gnunet-daemon-exit.c:1981 src/exit/gnunet-daemon-exit.c:2060
+#: src/exit/gnunet-daemon-exit.c:2167 src/exit/gnunet-daemon-exit.c:2417
+#: src/exit/gnunet-daemon-exit.c:2667 src/exit/gnunet-daemon-exit.c:2954
+#: src/exit/gnunet-daemon-exit.c:3057
 #, fuzzy
 msgid "# Bytes received from CADET"
 msgstr "# Bytes empfangen über TCP"
 
-#: src/exit/gnunet-daemon-exit.c:1915 src/exit/gnunet-daemon-exit.c:3004
-#, c-format
-msgid "No service %s found for %s on port %d!\n"
-msgstr "Kein %s-Dienst gefunden für %s auf Port %d!\n"
-
-#: src/exit/gnunet-daemon-exit.c:1920
+#: src/exit/gnunet-daemon-exit.c:2063
 #, fuzzy
-msgid "# TCP requests dropped (no such service)"
-msgstr "# gap Anfragen verworfen: Kollision in RT"
-
-#: src/exit/gnunet-daemon-exit.c:1978
-#, fuzzy
 msgid "# TCP IP-exit creation requests received via cadet"
 msgstr "# Client Trace-Anfragen empfangen"
 
-#: src/exit/gnunet-daemon-exit.c:2085
+#: src/exit/gnunet-daemon-exit.c:2170
 #, fuzzy
 msgid "# TCP data requests received via cadet"
 msgstr "# Client Trace-Anfragen empfangen"
 
-#: src/exit/gnunet-daemon-exit.c:2099
+#: src/exit/gnunet-daemon-exit.c:2184
 #, fuzzy
 msgid "# TCP DATA requests dropped (no session)"
 msgstr "# gap Anfragen verworfen: Kollision in RT"
 
-#: src/exit/gnunet-daemon-exit.c:2161
+#: src/exit/gnunet-daemon-exit.c:2246
 #, fuzzy
 msgid "# ICMP packets sent via TUN"
 msgstr "# Bytes gesendet über TCP"
 
-#: src/exit/gnunet-daemon-exit.c:2335
+#: src/exit/gnunet-daemon-exit.c:2420
 #, fuzzy
 msgid "# ICMP IP-exit requests received via cadet"
 msgstr "# Client Trace-Anfragen empfangen"
 
-#: src/exit/gnunet-daemon-exit.c:2585
+#: src/exit/gnunet-daemon-exit.c:2670
 #, fuzzy
 msgid "# ICMP service requests received via cadet"
 msgstr "# Client Trace-Anfragen empfangen"
 
-#: src/exit/gnunet-daemon-exit.c:2651 src/vpn/gnunet-service-vpn.c:1436
-#: src/vpn/gnunet-service-vpn.c:1994
+#: src/exit/gnunet-daemon-exit.c:2731 src/vpn/gnunet-service-vpn.c:1445
+#: src/vpn/gnunet-service-vpn.c:2003
 msgid "# ICMPv4 packets dropped (impossible PT to v6)"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:2710 src/vpn/gnunet-service-vpn.c:1472
-#: src/vpn/gnunet-service-vpn.c:1484 src/vpn/gnunet-service-vpn.c:1884
+#: src/exit/gnunet-daemon-exit.c:2790 src/vpn/gnunet-service-vpn.c:1481
+#: src/vpn/gnunet-service-vpn.c:1493 src/vpn/gnunet-service-vpn.c:1893
 msgid "# ICMPv6 packets dropped (impossible PT to v4)"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:2761
+#: src/exit/gnunet-daemon-exit.c:2841
 #, fuzzy
 msgid "# UDP packets sent via TUN"
 msgstr "# Bytes gesendet über TCP"
 
-#: src/exit/gnunet-daemon-exit.c:2875
+#: src/exit/gnunet-daemon-exit.c:2957
 #, fuzzy
 msgid "# UDP IP-exit requests received via cadet"
 msgstr "# Client Trace-Anfragen empfangen"
 
-#: src/exit/gnunet-daemon-exit.c:2983
+#: src/exit/gnunet-daemon-exit.c:3060
 #, fuzzy
 msgid "# UDP service requests received via cadet"
 msgstr "# Client Trace-Anfragen empfangen"
 
-#: src/exit/gnunet-daemon-exit.c:3009
-#, fuzzy
-msgid "# UDP requests dropped (no such service)"
-msgstr "# gap Anfragen verworfen: Kollision in RT"
-
-#: src/exit/gnunet-daemon-exit.c:3047
-#, fuzzy
-msgid "# Inbound CADET channels created"
-msgstr "# PING Nachrichten erstellt"
-
-#: src/exit/gnunet-daemon-exit.c:3268 src/exit/gnunet-daemon-exit.c:3278
+#: src/exit/gnunet-daemon-exit.c:3327 src/exit/gnunet-daemon-exit.c:3337
 #, 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:3292 src/exit/gnunet-daemon-exit.c:3300
+#: src/exit/gnunet-daemon-exit.c:3351 src/exit/gnunet-daemon-exit.c:3359
 #, c-format
 msgid "`%s' is not a valid port number (for domain `%s')!"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3333
+#: src/exit/gnunet-daemon-exit.c:3400
 #, c-format
 msgid "No addresses found for hostname `%s' of service `%s'!\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3347 src/exit/gnunet-daemon-exit.c:3359
+#: src/exit/gnunet-daemon-exit.c:3414 src/exit/gnunet-daemon-exit.c:3427
 #, c-format
 msgid "Service `%s' configured for IPv4, but IPv4 is disabled!\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3370
+#: src/exit/gnunet-daemon-exit.c:3439
 #, c-format
 msgid "No IP addresses found for hostname `%s' of service `%s'!\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3548
-#, c-format
-msgid "`%s' must be installed SUID, EXIT will not work\n"
-msgstr ""
-
-#: src/exit/gnunet-daemon-exit.c:3563
+#: src/exit/gnunet-daemon-exit.c:3584
 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:3571
+#: src/exit/gnunet-daemon-exit.c:3592
 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:3578
+#: src/exit/gnunet-daemon-exit.c:3599
 msgid ""
 "Cannot enable IPv4 exit but disable IPv4 on TUN interface, will use "
 "ENABLE_IPv4=YES\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3584
+#: src/exit/gnunet-daemon-exit.c:3605
 msgid ""
 "Cannot enable IPv6 exit but disable IPv6 on TUN interface, will use "
 "ENABLE_IPv6=YES\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3590 src/exit/gnunet-daemon-exit.c:3754
-#: src/pt/gnunet-daemon-pt.c:1243
+#: src/exit/gnunet-daemon-exit.c:3765
+msgid "Must be a number"
+msgstr "Muss eine Zahl sein"
+
+#: src/exit/gnunet-daemon-exit.c:3872
+#, c-format
+msgid "`%s' must be installed SUID, EXIT will not work\n"
+msgstr ""
+
+#: src/exit/gnunet-daemon-exit.c:3884 src/pt/gnunet-daemon-pt.c:1279
 msgid "No useful service enabled.  Exiting.\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3701
-msgid "Must be a number"
-msgstr "Muss eine Zahl sein"
-
-#: src/exit/gnunet-daemon-exit.c:3852
+#: src/exit/gnunet-daemon-exit.c:4029
 msgid "Daemon to run to provide an IP exit node for the VPN"
 msgstr ""
 
@@ -2875,71 +2724,71 @@
 msgid "# fragmentation transmissions completed"
 msgstr "# Klartext PONG Nachrichten empfangen"
 
-#: src/fs/fs_api.c:493
+#: src/fs/fs_api.c:499
 #, fuzzy, c-format
 msgid "Could not open file `%s': %s"
 msgstr "Konfigurationsdatei `%s' konnte nicht geöffnet werden.\n"
 
-#: src/fs/fs_api.c:504
+#: src/fs/fs_api.c:510
 #, fuzzy, c-format
 msgid "Could not read file `%s': %s"
 msgstr "`%s' konnte nicht aufgelöst werden: %s\n"
 
-#: src/fs/fs_api.c:512
+#: src/fs/fs_api.c:518
 #, c-format
 msgid "Short read reading from file `%s'!"
 msgstr ""
 
-#: src/fs/fs_api.c:1120
+#: src/fs/fs_api.c:1126
 #, fuzzy, c-format
 msgid "Failed to resume publishing information `%s': %s\n"
 msgstr "Datei wurde als `%s' gespeichert.\n"
 
-#: src/fs/fs_api.c:1640
+#: src/fs/fs_api.c:1646
 #, c-format
 msgid "Failure while resuming publishing operation `%s': %s\n"
 msgstr ""
 
-#: src/fs/fs_api.c:1654
+#: src/fs/fs_api.c:1660
 #, fuzzy, c-format
 msgid "Failed to resume publishing operation `%s': %s\n"
 msgstr "Datei wurde als `%s' gespeichert.\n"
 
-#: src/fs/fs_api.c:2312
+#: src/fs/fs_api.c:2318
 #, c-format
 msgid "Failure while resuming unindexing operation `%s': %s\n"
 msgstr ""
 
-#: src/fs/fs_api.c:2322
+#: src/fs/fs_api.c:2328
 #, fuzzy, c-format
 msgid "Failed to resume unindexing operation `%s': %s\n"
 msgstr "Datei wurde als `%s' gespeichert.\n"
 
-#: src/fs/fs_api.c:2450 src/fs/fs_api.c:2698
+#: src/fs/fs_api.c:2456 src/fs/fs_api.c:2703
 #, fuzzy, c-format
 msgid "Failed to resume sub-download `%s': %s\n"
 msgstr "Datei wurde als `%s' gespeichert.\n"
 
-#: src/fs/fs_api.c:2468
+#: src/fs/fs_api.c:2474
 #, fuzzy, c-format
 msgid "Failed to resume sub-search `%s': %s\n"
 msgstr "Datei wurde als `%s' gespeichert.\n"
 
-#: src/fs/fs_api.c:2483 src/fs/fs_api.c:2502 src/fs/fs_api.c:2994
+#: src/fs/fs_api.c:2489 src/fs/fs_api.c:2508 src/fs/fs_api.c:3006
 #, c-format
 msgid "Failure while resuming search operation `%s': %s\n"
 msgstr ""
 
-#: src/fs/fs_api.c:2688
+#: src/fs/fs_api.c:2693
 #, c-format
 msgid "Failed to resume sub-download `%s': could not open file `%s'\n"
 msgstr ""
 
-#: src/fs/fs_api.c:2937
+#: src/fs/fs_api.c:2949
 msgid "Could not resume running search, will resume as paused search\n"
 msgstr ""
 
-#: src/fs/fs_api.c:3032
+#: src/fs/fs_api.c:3044
 #, c-format
 msgid "Failure while resuming download operation `%s': %s\n"
 msgstr ""
@@ -2949,7 +2798,7 @@
 msgid "MAGIC mismatch.  This is not a GNUnet directory.\n"
 msgstr "Dateiformat fehlerhaft (kein GNUnet Verzeichnis?)\n"
 
-#: src/fs/fs_download.c:322
+#: src/fs/fs_download.c:308
 #, fuzzy
 msgid ""
 "Recursive downloads of directories larger than 4 GB are not supported on 32-"
@@ -2956,21 +2805,21 @@
 "bit systems\n"
 msgstr "Rekursiver Download des Verzeichnisses `%s' bei %llu von %llu Bytes.\n"
 
-#: src/fs/fs_download.c:342
+#: src/fs/fs_download.c:328
 msgid "Directory too large for system address space\n"
 msgstr ""
 
-#: src/fs/fs_download.c:523 src/fs/fs_download.c:535
+#: src/fs/fs_download.c:509 src/fs/fs_download.c:521
 #, fuzzy, c-format
 msgid "Failed to open file `%s' for writing"
 msgstr "Datei wurde als `%s' gespeichert.\n"
 
-#: src/fs/fs_download.c:905
+#: src/fs/fs_download.c:926
 #, 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:987
+#: src/fs/fs_download.c:1011
 #, c-format
 msgid ""
 "Internal error or bogus download URI (expected %u bytes at depth %u and "
@@ -2977,30 +2826,30 @@
 "offset %llu/%llu, got %u bytes)"
 msgstr ""
 
-#: src/fs/fs_download.c:1013
+#: src/fs/fs_download.c:1039
 msgid "internal error decrypting content"
 msgstr ""
 
-#: src/fs/fs_download.c:1036
+#: src/fs/fs_download.c:1063
 #, fuzzy, c-format
 msgid "Download failed: could not open file `%s': %s"
 msgstr "Datei wurde als `%s' gespeichert.\n"
 
-#: src/fs/fs_download.c:1046
+#: src/fs/fs_download.c:1075
 #, 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:1055
+#: src/fs/fs_download.c:1084
 #, c-format
 msgid "Failed to write block of %u bytes at offset %llu in file `%s': %s"
 msgstr ""
 
-#: src/fs/fs_download.c:1153
+#: src/fs/fs_download.c:1184
 msgid "internal error decoding tree"
 msgstr ""
 
-#: src/fs/fs_download.c:1939
+#: src/fs/fs_download.c:1838
 #, fuzzy
 msgid "Invalid URI"
 msgstr "Ungültiger Parameter: `%s'\n"
@@ -3012,18 +2861,13 @@
 "`unknown' instead.\n"
 msgstr ""
 
-#: src/fs/fs_list_indexed.c:90
+#: src/fs/fs_list_indexed.c:152
 #, fuzzy, c-format
-msgid "Failed to receive response for `%s' request from `%s' service.\n"
+msgid "Failed to receive response from `%s' service.\n"
 msgstr "Fehler beim Empfangen der Antwort von gnunetd auf die `%s' Nachricht\n"
 
-#: src/fs/fs_list_indexed.c:113
+#: src/fs/fs_list_indexed.c:196
 #, fuzzy, c-format
-msgid "Failed to receive valid response for `%s' request from `%s' service.\n"
-msgstr "Fehler beim Empfangen der Antwort von gnunetd auf die `%s' Nachricht\n"
-
-#: src/fs/fs_list_indexed.c:151
-#, fuzzy, c-format
 msgid "Failed to not connect to `%s' service.\n"
 msgstr "`%s' Dienst konnte nicht initialisiert werden.\n"
 
@@ -3052,7 +2896,7 @@
 msgid "Failed to connect to datastore."
 msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden."
 
-#: src/fs/fs_publish.c:127 src/fs/fs_publish.c:439
+#: src/fs/fs_publish.c:127 src/fs/fs_publish.c:438
 #, fuzzy, c-format
 msgid "Publishing failed: %s"
 msgstr ""
@@ -3059,49 +2903,45 @@
 "\n"
 "Fehler beim Uploaden der Datei: %s\n"
 
-#: src/fs/fs_publish.c:706 src/fs/fs_publish.c:723 src/fs/fs_publish.c:762
-#: src/fs/fs_publish.c:783 src/fs/fs_publish.c:807 src/fs/fs_publish.c:1055
+#: src/fs/fs_publish.c:724 src/fs/fs_publish.c:778 src/fs/fs_publish.c:823
+#: src/fs/fs_publish.c:844 src/fs/fs_publish.c:874 src/fs/fs_publish.c:1140
 #, fuzzy, c-format
 msgid "Can not index file `%s': %s.  Will try to insert instead.\n"
 msgstr "Indizieren der Datei `%s' schlug fehl.  Versuch Datei einzufügen...\n"
 
-#: src/fs/fs_publish.c:708
-msgid "timeout on index-start request to `fs' service"
-msgstr ""
-
-#: src/fs/fs_publish.c:720
+#: src/fs/fs_publish.c:780
 #, fuzzy
-msgid "unknown error"
-msgstr "Unbekannter Fehler"
+msgid "error on index-start request to `fs' service"
+msgstr "Anfrage an den Transportdienst konnte nicht gestellt werden\n"
 
-#: src/fs/fs_publish.c:764
+#: src/fs/fs_publish.c:825
 msgid "failed to compute hash"
 msgstr ""
 
-#: src/fs/fs_publish.c:784
+#: src/fs/fs_publish.c:845
 msgid "filename too long"
 msgstr "Dateiname zu lang"
 
-#: src/fs/fs_publish.c:809
+#: src/fs/fs_publish.c:876
 #, fuzzy
 msgid "could not connect to `fs' service"
 msgstr "Verbindung zu gnunetd konnte nicht hergestellt werden.\n"
 
-#: src/fs/fs_publish.c:832
+#: src/fs/fs_publish.c:902
 #, fuzzy, c-format
 msgid "Failed to get file identifiers for `%s'\n"
 msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
 
-#: src/fs/fs_publish.c:896 src/fs/fs_publish.c:937
+#: src/fs/fs_publish.c:991 src/fs/fs_publish.c:1027
 msgid "Can not create LOC URI. Will continue with CHK instead.\n"
 msgstr ""
 
-#: src/fs/fs_publish.c:1009
+#: src/fs/fs_publish.c:1094
 #, fuzzy, c-format
 msgid "Recursive upload failed at `%s': %s"
 msgstr "`%s' schlug fehl bei %s:%d mit dem Fehler: `%s'.\n"
 
-#: src/fs/fs_publish.c:1017
+#: src/fs/fs_publish.c:1102
 #, fuzzy, c-format
 msgid "Recursive upload failed: %s"
 msgstr ""
@@ -3108,17 +2948,17 @@
 "\n"
 "Fehler beim Uploaden der Datei: %s\n"
 
-#: src/fs/fs_publish.c:1057
+#: src/fs/fs_publish.c:1142
 #, fuzzy
 msgid "needs to be an actual file"
 msgstr "`%s' ist keine normale Datei.\n"
 
-#: src/fs/fs_publish.c:1296
+#: src/fs/fs_publish.c:1381
 #, fuzzy, c-format
 msgid "Datastore failure: %s"
 msgstr "Verbindung fehlgeschlagen: %s\n"
 
-#: src/fs/fs_publish.c:1387
+#: src/fs/fs_publish.c:1472
 #, c-format
 msgid "Reserving space for %u entries and %llu bytes for publication\n"
 msgstr ""
@@ -3133,12 +2973,12 @@
 msgid "Internal error."
 msgstr "Unbekannter Fehler.\n"
 
-#: src/fs/fs_search.c:806 src/fs/fs_search.c:876
+#: src/fs/fs_search.c:809 src/fs/fs_search.c:879
 #, fuzzy, c-format
 msgid "Failed to parse URI `%s': %s\n"
 msgstr "Datei wurde als `%s' gespeichert.\n"
 
-#: src/fs/fs_search.c:935
+#: src/fs/fs_search.c:966
 #, c-format
 msgid "Got result with unknown block type `%d', ignoring"
 msgstr ""
@@ -3152,50 +2992,42 @@
 msgid "Failed to read file"
 msgstr "Zustellung der Nachricht `%s' fehlgeschlagen.\n"
 
-#: src/fs/fs_unindex.c:245
-msgid "Unexpected time for a response from `fs' service."
-msgstr ""
-
-#: src/fs/fs_unindex.c:253
-msgid "Timeout waiting for `fs' service."
-msgstr ""
-
-#: src/fs/fs_unindex.c:261
+#: src/fs/fs_unindex.c:275
 #, fuzzy
-msgid "Invalid response from `fs' service."
-msgstr "Ungültige Antwort auf `%s'.\n"
+msgid "Error communicating with `fs' service."
+msgstr "Informationen über andere GNUnet Knoten ausgeben."
 
-#: src/fs/fs_unindex.c:304
+#: src/fs/fs_unindex.c:328
 #, fuzzy
 msgid "Failed to connect to FS service for unindexing."
 msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden."
 
-#: src/fs/fs_unindex.c:360 src/fs/fs_unindex.c:372
+#: src/fs/fs_unindex.c:378 src/fs/fs_unindex.c:390
 #, fuzzy
 msgid "Failed to get KSKs from directory scan."
 msgstr "Dateiformat fehlerhaft (kein GNUnet Verzeichnis?)\n"
 
-#: src/fs/fs_unindex.c:368
+#: src/fs/fs_unindex.c:386
 #, fuzzy, c-format
 msgid "Internal error scanning `%s'.\n"
 msgstr "Absicherung fehlgeschlagen bei %s:%d.\n"
 
-#: src/fs/fs_unindex.c:427
+#: src/fs/fs_unindex.c:445
 #, fuzzy, c-format
 msgid "Failed to remove UBlock: %s\n"
 msgstr "Datei wurde als `%s' gespeichert.\n"
 
-#: src/fs/fs_unindex.c:590 src/fs/fs_unindex.c:654
+#: src/fs/fs_unindex.c:606 src/fs/fs_unindex.c:669
 #, fuzzy
 msgid "Failed to connect to `datastore' service."
 msgstr "`%s' Dienst konnte nicht initialisiert werden.\n"
 
-#: src/fs/fs_unindex.c:667
+#: src/fs/fs_unindex.c:682
 #, fuzzy
 msgid "Failed to open file for unindexing."
 msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden."
 
-#: src/fs/fs_unindex.c:706
+#: src/fs/fs_unindex.c:721
 #, fuzzy
 msgid "Failed to compute hash of file."
 msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden."
@@ -3416,7 +3248,7 @@
 msgstr "Dateien aus dem GNUnet herunterladen."
 
 #: src/fs/gnunet-download.c:208 src/fs/gnunet-publish.c:295
-#: src/fs/gnunet-search.c:208 src/fs/gnunet-unindex.c:107
+#: src/fs/gnunet-search.c:212 src/fs/gnunet-unindex.c:107
 #, c-format
 msgid "Unexpected status: %d\n"
 msgstr ""
@@ -3440,12 +3272,12 @@
 msgstr ""
 
 #: src/fs/gnunet-download.c:267 src/fs/gnunet-publish.c:870
-#: src/fs/gnunet-search.c:266 src/fs/gnunet-unindex.c:139
+#: src/fs/gnunet-search.c:270 src/fs/gnunet-unindex.c:139
 #, fuzzy, c-format
 msgid "Could not initialize `%s' subsystem.\n"
 msgstr "`%s' Dienst konnte nicht initialisiert werden.\n"
 
-#: src/fs/gnunet-download.c:304 src/fs/gnunet-search.c:306
+#: src/fs/gnunet-download.c:304 src/fs/gnunet-search.c:310
 msgid "set the desired LEVEL of receiver-anonymity"
 msgstr "Den Grad LEVEL der gewünschten Empfänger-Anonymität setzen"
 
@@ -3453,7 +3285,7 @@
 msgid "delete incomplete downloads (when aborted with CTRL-C)"
 msgstr ""
 
-#: src/fs/gnunet-download.c:310 src/fs/gnunet-search.c:309
+#: src/fs/gnunet-download.c:310 src/fs/gnunet-search.c:313
 msgid "only search the local peer (no P2P network search)"
 msgstr ""
 
@@ -3635,7 +3467,7 @@
 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:1811 src/transport/gnunet-transport.c:1835
+#: src/transport/gnunet-transport.c:1577 src/transport/gnunet-transport.c:1602
 #, c-format
 msgid "Option `%s' makes no sense without option `%s'.\n"
 msgstr "Die Option »%s« ergibt keinen Sinn ohne die Option »%s«.\n"
@@ -3707,67 +3539,89 @@
 msgid "Publish a file or directory on GNUnet"
 msgstr ""
 
-#: src/fs/gnunet-search.c:123
+#: src/fs/gnunet-search.c:127
 #, c-format
 msgid "Failed to write directory with search results to `%s'\n"
 msgstr ""
 
-#: src/fs/gnunet-search.c:200
+#: src/fs/gnunet-search.c:204
 #, fuzzy, c-format
 msgid "Error searching: %s.\n"
 msgstr "Fehler beim Verlassen der DHT.\n"
 
-#: src/fs/gnunet-search.c:256
+#: src/fs/gnunet-search.c:260
 msgid "Could not create keyword URI from arguments.\n"
 msgstr ""
 
-#: src/fs/gnunet-search.c:280
+#: src/fs/gnunet-search.c:284
 #, fuzzy
 msgid "Could not start searching.\n"
 msgstr "Fehler beim Starten der Collection.\n"
 
-#: src/fs/gnunet-search.c:312
+#: src/fs/gnunet-search.c:316
 msgid "write search results to file starting with PREFIX"
 msgstr ""
 
-#: src/fs/gnunet-search.c:315
+#: src/fs/gnunet-search.c:319
 msgid "automatically terminate search after DELAY"
 msgstr ""
 
-#: src/fs/gnunet-search.c:322
+#: src/fs/gnunet-search.c:326
 msgid "automatically terminate search after VALUE results are found"
 msgstr ""
 
-#: src/fs/gnunet-search.c:333
+#: src/fs/gnunet-search.c:337
 msgid "Search GNUnet for files that were published on GNUnet"
 msgstr ""
 
-#: src/fs/gnunet-service-fs.c:273
+#: src/fs/gnunet-service-fs.c:378 src/fs/gnunet-service-fs.c:883
+msgid "# client searches active"
+msgstr ""
+
+#: src/fs/gnunet-service-fs.c:437
+#, fuzzy
+msgid "# replies received for local clients"
+msgstr "Empfangene Client-Nachricht ist ungültig.\n"
+
+#: src/fs/gnunet-service-fs.c:606
 msgid "# running average P2P latency (ms)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs.c:331 src/fs/gnunet-service-fs.c:603
+#: src/fs/gnunet-service-fs.c:658 src/fs/gnunet-service-fs_cp.c:564
 msgid "# Loopback routes suppressed"
 msgstr ""
 
-#: src/fs/gnunet-service-fs.c:730
+#: src/fs/gnunet-service-fs.c:837
 #, fuzzy
+msgid "# client searches received"
+msgstr "# Klartext PONG Nachrichten empfangen"
+
+#: src/fs/gnunet-service-fs.c:876
+msgid "# client searches updated (merged content seen list)"
+msgstr ""
+
+#: src/fs/gnunet-service-fs.c:1047
+#, c-format
+msgid "Hash mismatch trying to index file `%s' which does not have hash `%s'\n"
+msgstr ""
+
+#: src/fs/gnunet-service-fs.c:1288
+#, fuzzy
 msgid "FS service is lacking HOSTKEY configuration setting.  Exiting.\n"
 msgstr "GNUnet Konfiguration"
 
-#: src/fs/gnunet-service-fs.c:756 src/hostlist/gnunet-daemon-hostlist.c:308
-#: src/topology/gnunet-daemon-topology.c:1245
-#: src/topology/gnunet-daemon-topology.c:1253
+#: src/fs/gnunet-service-fs.c:1313 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"
 msgstr "`%s' Dienst konnte nicht initialisiert werden.\n"
 
-#: src/fs/gnunet-service-fs_cadet_client.c:490
+#: src/fs/gnunet-service-fs_cadet_client.c:494
 #, fuzzy
 msgid "# replies received via cadet"
 msgstr "# Bytes empfangen über TCP"
 
-#: src/fs/gnunet-service-fs_cadet_client.c:504
+#: src/fs/gnunet-service-fs_cadet_client.c:508
 #, fuzzy
 msgid "# replies received via cadet dropped"
 msgstr "# Bytes empfangen über TCP"
@@ -3776,218 +3630,177 @@
 msgid "# Blocks transferred via cadet"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cadet_server.c:359
+#: src/fs/gnunet-service-fs_cadet_server.c:360
 #, fuzzy
 msgid "# queries received via CADET not answered"
 msgstr "# Bytes empfangen über TCP"
 
-#: src/fs/gnunet-service-fs_cadet_server.c:439
+#: src/fs/gnunet-service-fs_cadet_server.c:440
 #, fuzzy
 msgid "# queries received via cadet"
 msgstr "# Bytes empfangen über TCP"
 
-#: src/fs/gnunet-service-fs_cadet_server.c:483
+#: src/fs/gnunet-service-fs_cadet_server.c:484
 #, fuzzy
 msgid "# cadet client connections rejected"
 msgstr "# Sitzungsschlüssel abgelehnt"
 
-#: src/fs/gnunet-service-fs_cadet_server.c:489
-#: src/fs/gnunet-service-fs_cadet_server.c:529
+#: src/fs/gnunet-service-fs_cadet_server.c:490
+#: src/fs/gnunet-service-fs_cadet_server.c:530
 #, fuzzy
 msgid "# cadet connections active"
 msgstr " Verbindung fehlgeschlagen\n"
 
-#: src/fs/gnunet-service-fs_cp.c:743
+#: src/fs/gnunet-service-fs_cp.c:686
 #, fuzzy
 msgid "# migration stop messages received"
 msgstr "# verschlüsselter PING Nachrichten empfangen"
 
-#: src/fs/gnunet-service-fs_cp.c:747
+#: src/fs/gnunet-service-fs_cp.c:690
 #, c-format
 msgid "Migration of content to peer `%s' blocked for %s\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:785
-#, fuzzy
-msgid "# replies transmitted to other peers"
-msgstr "# Bytes des Typs %d übertragen"
-
-#: src/fs/gnunet-service-fs_cp.c:793
-#, fuzzy
-msgid "# replies dropped"
-msgstr "# gap falsche Antworten"
-
-#: src/fs/gnunet-service-fs_cp.c:820 src/fs/gnunet-service-fs_cp.c:1472
+#: src/fs/gnunet-service-fs_cp.c:723 src/fs/gnunet-service-fs_cp.c:1343
 msgid "# P2P searches active"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:918
+#: src/fs/gnunet-service-fs_cp.c:818
 msgid "# artificial delays introduced (ms)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:974
+#: src/fs/gnunet-service-fs_cp.c:875
 msgid "# replies dropped due to type mismatch"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:982
+#: src/fs/gnunet-service-fs_cp.c:883
 #, fuzzy
 msgid "# replies received for other peers"
 msgstr "# Bytes des Typs %d empfangen"
 
-#: src/fs/gnunet-service-fs_cp.c:996
+#: src/fs/gnunet-service-fs_cp.c:897
 msgid "# replies dropped due to insufficient cover traffic"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1044
+#: src/fs/gnunet-service-fs_cp.c:944
 msgid "# P2P searches destroyed due to ultimate reply"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1115
+#: src/fs/gnunet-service-fs_cp.c:1015
 msgid "# requests done for free (low load)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1140
+#: src/fs/gnunet-service-fs_cp.c:1040
 #, fuzzy
 msgid "# request dropped, priority insufficient"
 msgstr "# gap Anfragen verworfen: Kollision in RT"
 
-#: src/fs/gnunet-service-fs_cp.c:1150
+#: src/fs/gnunet-service-fs_cp.c:1050
 msgid "# requests done for a price (normal load)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1248
+#: src/fs/gnunet-service-fs_cp.c:1148
 msgid "# requests dropped due to higher-TTL request"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1302
+#: src/fs/gnunet-service-fs_cp.c:1205
 msgid "# GET requests received (from other peers)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1337
-msgid "# requests dropped due to initiator not being connected"
-msgstr ""
-
-#: src/fs/gnunet-service-fs_cp.c:1358
+#: src/fs/gnunet-service-fs_cp.c:1228
 #, fuzzy
 msgid "# requests dropped due to missing reverse route"
 msgstr "# gap Anfragen verworfen: Kollision in RT"
 
-#: src/fs/gnunet-service-fs_cp.c:1369
+#: src/fs/gnunet-service-fs_cp.c:1239
 #, fuzzy
 msgid "# requests dropped due to full reply queue"
 msgstr "# gap Anfragen verworfen: Kollision in RT"
 
-#: src/fs/gnunet-service-fs_cp.c:1424
+#: src/fs/gnunet-service-fs_cp.c:1295
 msgid "# requests dropped due TTL underflow"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1468
+#: src/fs/gnunet-service-fs_cp.c:1339
 #, fuzzy
 msgid "# P2P query messages received and processed"
 msgstr "# verschlüsselter PING Nachrichten empfangen"
 
-#: src/fs/gnunet-service-fs_cp.c:1913
+#: src/fs/gnunet-service-fs_cp.c:1706
 #, fuzzy
 msgid "# migration stop messages sent"
 msgstr "# verschlüsselter PING Nachrichten empfangen"
 
-#: src/fs/gnunet-service-fs_indexing.c:130
-#: src/fs/gnunet-service-fs_indexing.c:181
+#: src/fs/gnunet-service-fs_indexing.c:134
+#: src/fs/gnunet-service-fs_indexing.c:195
 #, fuzzy, c-format
 msgid "Could not open `%s'.\n"
 msgstr "`%s' konnte nicht aufgelöst werden: %s\n"
 
-#: src/fs/gnunet-service-fs_indexing.c:142
+#: src/fs/gnunet-service-fs_indexing.c:151
 #, fuzzy, c-format
 msgid "Error writing `%s'.\n"
 msgstr "Fehler beim Anlegen des Benutzers"
 
-#: src/fs/gnunet-service-fs_indexing.c:237
-#, c-format
-msgid ""
-"Index request received for file `%s' is already indexed as `%s'.  Permitting "
-"anyway.\n"
-msgstr ""
-
-#: src/fs/gnunet-service-fs_indexing.c:275
-#, c-format
-msgid "Hash mismatch trying to index file `%s' which has hash `%s'\n"
-msgstr ""
-
-#: src/fs/gnunet-service-fs_indexing.c:477
+#: src/fs/gnunet-service-fs_indexing.c:253
 #, fuzzy, c-format
 msgid "Failed to delete bogus block: %s\n"
 msgstr "Datei wurde als `%s' gespeichert.\n"
 
-#: src/fs/gnunet-service-fs_indexing.c:542
+#: src/fs/gnunet-service-fs_indexing.c:329
 msgid "# index blocks removed: original file inaccessible"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_indexing.c:557
+#: src/fs/gnunet-service-fs_indexing.c:355
 #, 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:559
+#: src/fs/gnunet-service-fs_indexing.c:359
 #, fuzzy
 msgid "not indexed"
 msgstr "Deindizierung schlug fehl."
 
-#: src/fs/gnunet-service-fs_indexing.c:574
+#: src/fs/gnunet-service-fs_indexing.c:392
 #, 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_lc.c:202 src/fs/gnunet-service-fs_lc.c:378
-msgid "# client searches active"
+#: src/fs/gnunet-service-fs_indexing.c:515
+#, c-format
+msgid ""
+"Index request received for file `%s' is already indexed as `%s'.  Permitting "
+"anyway.\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_lc.c:261
-#, fuzzy
-msgid "# replies received for local clients"
-msgstr "Empfangene Client-Nachricht ist ungültig.\n"
-
-#: src/fs/gnunet-service-fs_lc.c:332
-#, fuzzy
-msgid "# client searches received"
-msgstr "# Klartext PONG Nachrichten empfangen"
-
-#: src/fs/gnunet-service-fs_lc.c:372
-msgid "# client searches updated (merged content seen list)"
+#: src/fs/gnunet-service-fs_pe.c:265
+msgid "# average retransmission delay (ms)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pe.c:273
-msgid "# average retransmission delay (ms)"
+#: src/fs/gnunet-service-fs_pe.c:427
+msgid "# delay heap timeout (ms)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pe.c:412
-msgid "# transmission failed (core has no bandwidth)"
+#: src/fs/gnunet-service-fs_pe.c:438
+msgid "# query plans executed"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pe.c:447
+#: src/fs/gnunet-service-fs_pe.c:466
 msgid "# query messages sent to other peers"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pe.c:501
-msgid "# delay heap timeout (ms)"
-msgstr ""
-
-#: src/fs/gnunet-service-fs_pe.c:511
-msgid "# query plans executed"
-msgstr ""
-
-#: src/fs/gnunet-service-fs_pe.c:593
+#: src/fs/gnunet-service-fs_pe.c:536
 #, fuzzy
 msgid "# requests merged"
 msgstr "# dht Anfragen weitergeleitet"
 
-#: src/fs/gnunet-service-fs_pe.c:603
+#: src/fs/gnunet-service-fs_pe.c:546
 #, fuzzy
 msgid "# requests refreshed"
 msgstr "# dht Anfragen weitergeleitet"
 
-#: src/fs/gnunet-service-fs_pe.c:661 src/fs/gnunet-service-fs_pe.c:769
-#: src/fs/gnunet-service-fs_pe.c:848
+#: src/fs/gnunet-service-fs_pe.c:606 src/fs/gnunet-service-fs_pe.c:709
+#: src/fs/gnunet-service-fs_pe.c:788
 msgid "# query plan entries"
 msgstr ""
 
@@ -3996,114 +3809,114 @@
 msgid "# Pending requests created"
 msgstr "# dht Anfragen weitergeleitet"
 
-#: src/fs/gnunet-service-fs_pr.c:411 src/fs/gnunet-service-fs_pr.c:671
+#: src/fs/gnunet-service-fs_pr.c:411 src/fs/gnunet-service-fs_pr.c:661
 #, fuzzy
 msgid "# Pending requests active"
 msgstr "# Client Trace-Anfragen empfangen"
 
-#: src/fs/gnunet-service-fs_pr.c:852
+#: src/fs/gnunet-service-fs_pr.c:842
 #, fuzzy
 msgid "# replies received and matched"
 msgstr "# Bytes empfangen über TCP"
 
-#: src/fs/gnunet-service-fs_pr.c:889
+#: src/fs/gnunet-service-fs_pr.c:879
 msgid "# duplicate replies discarded (bloomfilter)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:898
+#: src/fs/gnunet-service-fs_pr.c:888
 #, fuzzy
 msgid "# irrelevant replies discarded"
 msgstr "# verworfener Nachrichten"
 
-#: src/fs/gnunet-service-fs_pr.c:913
+#: src/fs/gnunet-service-fs_pr.c:903
 #, c-format
 msgid "Unsupported block type %u\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:930
+#: src/fs/gnunet-service-fs_pr.c:920
 msgid "# results found locally"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1060
+#: src/fs/gnunet-service-fs_pr.c:1050
 msgid "# Datastore `PUT' failures"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1088
+#: src/fs/gnunet-service-fs_pr.c:1078
 #, fuzzy
 msgid "# storage requests dropped due to high load"
 msgstr "# Knotenankündigungen empfangen"
 
-#: src/fs/gnunet-service-fs_pr.c:1126
+#: src/fs/gnunet-service-fs_pr.c:1116
 #, fuzzy
 msgid "# Replies received from DHT"
 msgstr "# Bytes empfangen über HTTP"
 
-#: src/fs/gnunet-service-fs_pr.c:1258
+#: src/fs/gnunet-service-fs_pr.c:1247
 #, fuzzy
 msgid "# Replies received from CADET"
 msgstr "# Bytes empfangen über HTTP"
 
-#: src/fs/gnunet-service-fs_pr.c:1310
+#: src/fs/gnunet-service-fs_pr.c:1299
 #, c-format
 msgid "Datastore lookup already took %s!\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1331
+#: src/fs/gnunet-service-fs_pr.c:1320
 #, c-format
 msgid "On-demand lookup already took %s!\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1383
+#: src/fs/gnunet-service-fs_pr.c:1372
 msgid "# Datastore lookups concluded (no results)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1398
+#: src/fs/gnunet-service-fs_pr.c:1387
 msgid "# Datastore lookups concluded (seen all)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1407
+#: src/fs/gnunet-service-fs_pr.c:1396
 msgid "# Datastore lookups aborted (more than MAX_RESULTS)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1422
+#: src/fs/gnunet-service-fs_pr.c:1411
 msgid "# requested DBLOCK or IBLOCK not found"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1436
+#: src/fs/gnunet-service-fs_pr.c:1425
 msgid "# on-demand blocks matched requests"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1449
+#: src/fs/gnunet-service-fs_pr.c:1438
 msgid "# on-demand lookups performed successfully"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1454
+#: src/fs/gnunet-service-fs_pr.c:1443
 msgid "# on-demand lookups failed"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1481 src/fs/gnunet-service-fs_pr.c:1521
-#: src/fs/gnunet-service-fs_pr.c:1690
+#: src/fs/gnunet-service-fs_pr.c:1469 src/fs/gnunet-service-fs_pr.c:1508
+#: src/fs/gnunet-service-fs_pr.c:1675
 msgid "# Datastore lookups concluded (error queueing)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1540
+#: src/fs/gnunet-service-fs_pr.c:1527
 msgid "# Datastore lookups concluded (found last result)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1552
+#: src/fs/gnunet-service-fs_pr.c:1539
 msgid "# Datastore lookups concluded (load too high)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1666
+#: src/fs/gnunet-service-fs_pr.c:1652
 msgid "# Datastore lookups initiated"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1755
+#: src/fs/gnunet-service-fs_pr.c:1732
 #, fuzzy
 msgid "# GAP PUT messages received"
 msgstr "# verschlüsselter PONG Nachrichten empfangen"
 
-#: src/fs/gnunet-service-fs_push.c:678
+#: src/fs/gnunet-service-fs_push.c:642
 msgid "time required, content pushing disabled"
 msgstr ""
 
@@ -4138,13 +3951,6 @@
 msgid "Unindex a file that was previously indexed with gnunet-publish."
 msgstr ""
 
-#: src/gns/gns_api.c:393
-#, fuzzy
-msgid "Failed to deserialize lookup reply from GNS service!\n"
-msgstr ""
-"\n"
-"Fehler beim Empfangen der Antwort von gnunetd.\n"
-
 #: src/gns/gnunet-bcd.c:127
 #, fuzzy, c-format
 msgid "Refusing `%s' request to HTTP server\n"
@@ -4230,22 +4036,22 @@
 msgid "GNUnet DNS-to-GNS proxy (a DNS server)"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:236 src/gns/plugin_rest_gns.c:347
+#: src/gns/gnunet-gns.c:269 src/gns/plugin_rest_gns.c:347
 #, c-format
 msgid "Invalid typename specified, assuming `ANY'\n"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:254
+#: src/gns/gnunet-gns.c:295
 #, c-format
 msgid "Please specify name to lookup!\n"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:335
+#: src/gns/gnunet-gns.c:376
 #, c-format
 msgid "Ego for `%s' not found, cannot perform lookup.\n"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:374 src/gns/gnunet-gns-helper-service-w32.c:796
+#: src/gns/gnunet-gns.c:415 src/gns/gnunet-gns-helper-service-w32.c:796
 #: src/gns/plugin_rest_gns.c:472
 #, c-format
 msgid ""
@@ -4253,46 +4059,64 @@
 "gns-import.sh?\n"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:415 src/gns/gnunet-gns-helper-service-w32.c:826
+#: src/gns/gnunet-gns.c:456 src/gns/gnunet-gns-helper-service-w32.c:826
 #, fuzzy, c-format
 msgid "Failed to connect to GNS\n"
 msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
 
-#: src/gns/gnunet-gns.c:429
+#: src/gns/gnunet-gns.c:470 src/gns/gnunet-gns.c:500
 #, 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:479
+#: src/gns/gnunet-gns.c:548
 msgid "Lookup a record for the given name"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:482
+#: src/gns/gnunet-gns.c:551
 #, fuzzy
 msgid "Specify the type of the record to lookup"
 msgstr "Die Priorität des Inhalts angeben"
 
-#: src/gns/gnunet-gns.c:485
+#: src/gns/gnunet-gns.c:554
 msgid "Specify timeout for the lookup"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:488
+#: src/gns/gnunet-gns.c:557
 msgid "No unneeded output"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:491
+#: src/gns/gnunet-gns.c:560
 msgid "Specify the public key of the zone to lookup the record in"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:494
+#: src/gns/gnunet-gns.c:563
 msgid "Specify the name of the ego of the zone to lookup the record in"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:508
+#: src/gns/gnunet-gns.c:566
 #, 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
+msgid "Transmission to client failed!\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 ""
@@ -4311,14 +4135,14 @@
 msgstr ""
 
 #: src/gns/gnunet-gns-proxy.c:109
-#: src/hostlist/gnunet-daemon-hostlist_client.c:529
-#: src/hostlist/gnunet-daemon-hostlist_client.c:747
-#: src/hostlist/gnunet-daemon-hostlist_client.c:753
-#: src/hostlist/gnunet-daemon-hostlist_client.c:805
-#: src/hostlist/gnunet-daemon-hostlist_client.c:814
-#: src/hostlist/gnunet-daemon-hostlist_client.c:925
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1020
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1025
+#: src/hostlist/gnunet-daemon-hostlist_client.c:569
+#: src/hostlist/gnunet-daemon-hostlist_client.c:787
+#: src/hostlist/gnunet-daemon-hostlist_client.c:793
+#: src/hostlist/gnunet-daemon-hostlist_client.c:845
+#: src/hostlist/gnunet-daemon-hostlist_client.c:854
+#: src/hostlist/gnunet-daemon-hostlist_client.c:965
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1060
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1065
 #: src/transport/plugin_transport_http_client.c:598
 #: src/transport/plugin_transport_http_client.c:616
 #, c-format
@@ -4325,127 +4149,128 @@
 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:846
+#: src/gns/gnunet-gns-proxy.c:887
 #, c-format
 msgid "Unsupported CURL SSL backend %d\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:869
+#: src/gns/gnunet-gns-proxy.c:910
 #, 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:892
+#: src/gns/gnunet-gns-proxy.c:933
 #, fuzzy, c-format
 msgid "Failed to initialize DANE: %s\n"
 msgstr "SQLite Datenbank konnte nicht initialisiert werden.\n"
 
-#: src/gns/gnunet-gns-proxy.c:905
+#: src/gns/gnunet-gns-proxy.c:946
 #, fuzzy, c-format
 msgid "Failed to parse DANE record: %s\n"
 msgstr "Dateiformat fehlerhaft (kein GNUnet Verzeichnis?)\n"
 
-#: src/gns/gnunet-gns-proxy.c:920
+#: src/gns/gnunet-gns-proxy.c:961
 #, 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:930
+#: src/gns/gnunet-gns-proxy.c:971
 #, c-format
 msgid "Failed DANE verification failed with GnuTLS verify status code: %u\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:954
+#: src/gns/gnunet-gns-proxy.c:995
 #, c-format
 msgid "SSL certificate subject name (%s) does not match `%s'\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:1099
+#: src/gns/gnunet-gns-proxy.c:1104
 #, c-format
 msgid "Cookie domain `%s' supplied by server is invalid\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:1631
+#: src/gns/gnunet-gns-proxy.c:1708
 #, 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:1997
+#: src/gns/gnunet-gns-proxy.c:2167
 #, 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:2027
+#: src/gns/gnunet-gns-proxy.c:2197
 #, 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:2199
+#: src/gns/gnunet-gns-proxy.c:2370
 #, 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:2218 src/rest/gnunet-rest-server.c:529
+#: src/gns/gnunet-gns-proxy.c:2389 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:2538
+#: src/gns/gnunet-gns-proxy.c:2709
 #, c-format
 msgid "Unsupported socks version %d\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:2567
+#: src/gns/gnunet-gns-proxy.c:2738
 #, 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:2585 src/gns/gnunet-gns-proxy.c:2614
+#: src/gns/gnunet-gns-proxy.c:2756 src/gns/gnunet-gns-proxy.c:2785
 msgid "SSL connection to plain IPv4 address requested\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:2665
+#: src/gns/gnunet-gns-proxy.c:2836
 #, c-format
 msgid "Unsupported socks address type %d\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:2999
+#: src/gns/gnunet-gns-proxy.c:3171
 msgid "No ego configured for `shorten-zone`\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:3039 src/gns/gnunet-service-gns.c:887
+#: src/gns/gnunet-gns-proxy.c:3211 src/gns/gnunet-service-gns.c:1093
+#: src/gns/gnunet-service-gns.c:1149
 #, c-format
 msgid "No ego configured for `%s`\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:3101
+#: src/gns/gnunet-gns-proxy.c:3273
 #, 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:3141
+#: src/gns/gnunet-gns-proxy.c:3313
 msgid "listen on specified port (default: 7777)"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:3144
+#: src/gns/gnunet-gns-proxy.c:3316
 msgid "pem file to use as CA"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:3163
+#: src/gns/gnunet-gns-proxy.c:3335
 msgid "GNUnet GNS proxy"
 msgstr ""
 
-#: src/gns/gnunet-service-gns.c:928
+#: src/gns/gnunet-service-gns.c:1187
 #, 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:936
+#: src/gns/gnunet-service-gns.c:1195
 #, 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:969
+#: src/gns/gnunet-service-gns.c:1228
 #, fuzzy
 msgid "Could not connect to DHT!\n"
 msgstr "Verbindung zu gnunetd konnte nicht hergestellt werden.\n"
@@ -4455,7 +4280,7 @@
 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:369
+#: src/gns/gnunet-service-gns_interceptor.c:371
 #, fuzzy
 msgid "Failed to connect to the DNS service!\n"
 msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
@@ -4480,55 +4305,60 @@
 msgid "Skipping record of unsupported type %d\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns_resolver.c:1353
+#: src/gns/gnunet-service-gns_resolver.c:1354
 #, c-format
 msgid "GNS lookup resulted in DNS name that is too long (`%s')\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns_resolver.c:1888
+#: src/gns/gnunet-service-gns_resolver.c:1889
 msgid "GNS lookup recursion failed (no delegation record found)\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns_resolver.c:1912
+#: src/gns/gnunet-service-gns_resolver.c:1913
 #, 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:2194
+#: src/gns/gnunet-service-gns_resolver.c:2195
 #, c-format
 msgid "Zone %s was revoked, resolution fails\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns_resolver.c:2341
+#: src/gns/gnunet-service-gns_resolver.c:2342
 #, c-format
 msgid "Hostname `%s' is not well-formed, resolution fails\n"
 msgstr ""
 
-#: src/gns/plugin_gnsrecord_gns.c:172
+#: src/gns/plugin_gnsrecord_gns.c:203
 #, c-format
 msgid "Unable to parse PKEY record `%s'\n"
 msgstr ""
 
-#: src/gns/plugin_gnsrecord_gns.c:201
+#: src/gns/plugin_gnsrecord_gns.c:232
 #, fuzzy, c-format
 msgid "Unable to parse GNS2DNS record `%s'\n"
 msgstr "Dateiformat fehlerhaft (kein GNUnet Verzeichnis?)\n"
 
-#: src/gns/plugin_gnsrecord_gns.c:222
+#: src/gns/plugin_gnsrecord_gns.c:253
 #, c-format
 msgid "Failed to serialize GNS2DNS record with value `%s'\n"
 msgstr ""
 
-#: src/gns/plugin_gnsrecord_gns.c:245
+#: src/gns/plugin_gnsrecord_gns.c:276
 #, fuzzy, c-format
 msgid "Unable to parse VPN record string `%s'\n"
 msgstr "Fehler beim Speichern der Konfigurationsdatei `%s':"
 
-#: src/gns/plugin_gnsrecord_gns.c:280
+#: src/gns/plugin_gnsrecord_gns.c:311
 #, 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
+#, 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
 msgid "Ego for not found, cannot perform lookup.\n"
 msgstr ""
@@ -4553,53 +4383,53 @@
 msgid "Failed to serialize CNAME record with value `%s'\n"
 msgstr ""
 
-#: src/gnsrecord/plugin_gnsrecord_dns.c:486
+#: src/gnsrecord/plugin_gnsrecord_dns.c:487
 #, c-format
 msgid "Failed to serialize CERT record with %u bytes\n"
 msgstr ""
 
-#: src/gnsrecord/plugin_gnsrecord_dns.c:522
+#: src/gnsrecord/plugin_gnsrecord_dns.c:523
 #, fuzzy, c-format
 msgid "Unable to parse SOA record `%s'\n"
 msgstr "Dateiformat fehlerhaft (kein GNUnet Verzeichnis?)\n"
 
-#: src/gnsrecord/plugin_gnsrecord_dns.c:541
+#: src/gnsrecord/plugin_gnsrecord_dns.c:542
 #, c-format
 msgid "Failed to serialize SOA record with mname `%s' and rname `%s'\n"
 msgstr ""
 
-#: src/gnsrecord/plugin_gnsrecord_dns.c:564
+#: src/gnsrecord/plugin_gnsrecord_dns.c:565
 #, fuzzy, c-format
 msgid "Failed to serialize PTR record with value `%s'\n"
 msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
 
-#: src/gnsrecord/plugin_gnsrecord_dns.c:587
+#: src/gnsrecord/plugin_gnsrecord_dns.c:588
 #, fuzzy, c-format
 msgid "Unable to parse MX record `%s'\n"
 msgstr "Dateiformat fehlerhaft (kein GNUnet Verzeichnis?)\n"
 
-#: src/gnsrecord/plugin_gnsrecord_dns.c:602
+#: src/gnsrecord/plugin_gnsrecord_dns.c:603
 #, fuzzy, c-format
 msgid "Failed to serialize MX record with hostname `%s'\n"
 msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
 
-#: src/gnsrecord/plugin_gnsrecord_dns.c:629
+#: src/gnsrecord/plugin_gnsrecord_dns.c:630
 #, fuzzy, c-format
 msgid "Unable to parse SRV record `%s'\n"
 msgstr "Dateiformat fehlerhaft (kein GNUnet Verzeichnis?)\n"
 
-#: src/gnsrecord/plugin_gnsrecord_dns.c:645
+#: src/gnsrecord/plugin_gnsrecord_dns.c:646
 #, fuzzy, c-format
 msgid "Failed to serialize SRV record with target `%s'\n"
 msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
 
-#: src/gnsrecord/plugin_gnsrecord_dns.c:662
+#: src/gnsrecord/plugin_gnsrecord_dns.c:663
 #, c-format
 msgid "Unable to parse IPv6 address `%s'\n"
 msgstr ""
 
-#: src/gnsrecord/plugin_gnsrecord_dns.c:686
-#: src/gnsrecord/plugin_gnsrecord_dns.c:702
+#: src/gnsrecord/plugin_gnsrecord_dns.c:687
+#: src/gnsrecord/plugin_gnsrecord_dns.c:703
 #, fuzzy, c-format
 msgid "Unable to parse TLSA record string `%s'\n"
 msgstr "Fehler beim Speichern der Konfigurationsdatei `%s':"
@@ -4645,98 +4475,98 @@
 msgid "Modified %u addresses, wrote %u bytes\n"
 msgstr ""
 
-#: src/hello/hello.c:1139
+#: src/hello/hello.c:1103
 msgid "Failed to parse HELLO message: missing expiration time\n"
 msgstr ""
 
-#: src/hello/hello.c:1148
+#: src/hello/hello.c:1112
 msgid "Failed to parse HELLO message: invalid expiration time\n"
 msgstr ""
 
-#: src/hello/hello.c:1158
+#: src/hello/hello.c:1122
 #, fuzzy
 msgid "Failed to parse HELLO message: malformed\n"
 msgstr "Fehler beim Senden der `%s' Nachricht an gnunetd\n"
 
-#: src/hello/hello.c:1169
+#: src/hello/hello.c:1133
 msgid "Failed to parse HELLO message: missing transport plugin\n"
 msgstr ""
 
-#: src/hello/hello.c:1187
+#: src/hello/hello.c:1151
 #, fuzzy, c-format
 msgid "Plugin `%s' not found, skipping address\n"
 msgstr "Kommando `%s' wurde nicht gefunden!\n"
 
-#: src/hello/hello.c:1195
+#: src/hello/hello.c:1159
 #, c-format
 msgid "Plugin `%s' does not support URIs yet\n"
 msgstr ""
 
-#: src/hello/hello.c:1210
+#: src/hello/hello.c:1174
 #, fuzzy, c-format
 msgid "Failed to parse `%s' as an address for plugin `%s'\n"
 msgstr "Fehler beim Aktualisieren der Daten des Moduls `%s'\n"
 
-#: src/hostlist/gnunet-daemon-hostlist.c:272
+#: src/hostlist/gnunet-daemon-hostlist.c:316
 msgid ""
 "None of the functions for the hostlist daemon were enabled.  I have no "
 "reason to run!\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist.c:328
+#: src/hostlist/gnunet-daemon-hostlist.c:375
 msgid "advertise our hostlist to other peers"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist.c:333
+#: src/hostlist/gnunet-daemon-hostlist.c:380
 msgid ""
 "bootstrap using hostlists (it is highly recommended that you always use this "
 "option)"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist.c:336
+#: src/hostlist/gnunet-daemon-hostlist.c:383
 msgid "enable learning about hostlist servers from other peers"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist.c:340
+#: src/hostlist/gnunet-daemon-hostlist.c:387
 msgid "provide a hostlist server"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist.c:356
+#: src/hostlist/gnunet-daemon-hostlist.c:403
 msgid "GNUnet hostlist server and client"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:348
+#: src/hostlist/gnunet-daemon-hostlist_client.c:371
 msgid "# bytes downloaded from hostlist servers"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:369
-#: src/hostlist/gnunet-daemon-hostlist_client.c:399
+#: src/hostlist/gnunet-daemon-hostlist_client.c:392
+#: src/hostlist/gnunet-daemon-hostlist_client.c:437
 #, fuzzy
 msgid "# invalid HELLOs downloaded from hostlist servers"
 msgstr "# Hellos per HTTP heruntergeladen"
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:372
-#: src/hostlist/gnunet-daemon-hostlist_client.c:402
+#: src/hostlist/gnunet-daemon-hostlist_client.c:395
+#: src/hostlist/gnunet-daemon-hostlist_client.c:440
 #, fuzzy, c-format
 msgid "Invalid `%s' message received from hostlist at `%s'\n"
 msgstr "Ungültige `%s' Nachricht von Knoten `%s' empfangen.\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:390
+#: src/hostlist/gnunet-daemon-hostlist_client.c:413
 #, fuzzy
 msgid "# valid HELLOs downloaded from hostlist servers"
 msgstr "# Hellos per HTTP heruntergeladen"
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:655
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1386
+#: src/hostlist/gnunet-daemon-hostlist_client.c:695
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1441
 msgid "# advertised hostlist URIs"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:685
+#: src/hostlist/gnunet-daemon-hostlist_client.c:725
 #, c-format
 msgid "# advertised URI `%s' downloaded"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:728
+#: src/hostlist/gnunet-daemon-hostlist_client.c:768
 #, c-format
 msgid ""
 "Advertised hostlist with URI `%s' could not be downloaded. Advertised URI "
@@ -4743,233 +4573,228 @@
 "gets dismissed.\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:856
+#: src/hostlist/gnunet-daemon-hostlist_client.c:896
 #, fuzzy, c-format
 msgid "Timeout trying to download hostlist from `%s'\n"
 msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:870
+#: src/hostlist/gnunet-daemon-hostlist_client.c:910
 #, c-format
 msgid "Download limit of %u bytes exceeded, stopping download\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:890
+#: src/hostlist/gnunet-daemon-hostlist_client.c:930
 #, fuzzy, c-format
 msgid "Download of hostlist from `%s' failed: `%s'\n"
 msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:896
+#: src/hostlist/gnunet-daemon-hostlist_client.c:936
 #, c-format
 msgid "Download of hostlist `%s' completed.\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:904
+#: src/hostlist/gnunet-daemon-hostlist_client.c:944
 #, c-format
 msgid "Adding successfully tested hostlist `%s' datastore.\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:957
+#: src/hostlist/gnunet-daemon-hostlist_client.c:997
 #, c-format
 msgid "Bootstrapping using hostlist at `%s'.\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:965
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1005
 msgid "# hostlist downloads initiated"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1092
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1639
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1132
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1698
 msgid "# milliseconds between hostlist downloads"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1101
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1141
 #, c-format
 msgid "Have %u/%u connections.  Will consider downloading hostlist in %s\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1156
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1172
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1200
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1221
 #, fuzzy
 msgid "# active connections"
 msgstr "GNUnet Konfiguration"
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1332
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1387
 #, fuzzy, c-format
 msgid "Loading saved hostlist entries from file `%s' \n"
 msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1337
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1392
 #, fuzzy, c-format
 msgid "Hostlist file `%s' does not exist\n"
 msgstr "Fehler beim Löschen des Pseudonyms `%s' (existiert nicht?).\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1346
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1401
 #, fuzzy, c-format
 msgid "Could not open file `%s' for reading to load hostlists: %s\n"
 msgstr ""
 "`%s' konnte nicht aufgelöst werden, um unsere IP-Adresse zu ermitteln: %s\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1380
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1435
 #, c-format
 msgid "%u hostlist URIs loaded from file\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1383
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1438
 msgid "# hostlist URIs read from file"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1429
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1484
 #, fuzzy, c-format
 msgid "Could not open file `%s' for writing to save hostlists: %s\n"
 msgstr ""
 "Datei `%s' konnte nicht zu `%s' umbenannt werden: Datei existiert bereits\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1436
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1491
 #, fuzzy, c-format
 msgid "Writing %u hostlist URIs to `%s'\n"
 msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1460
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1477
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1515
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1532
 #, c-format
 msgid "Error writing hostlist URIs to file `%s'\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1472
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1527
 msgid "# hostlist URIs written to file"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1572
-#: src/transport/plugin_transport_http_client.c:2273
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1628
+#: src/transport/plugin_transport_http_client.c:2277
 #, c-format
 msgid "Invalid proxy type: `%s', disabling proxy! Check configuration!\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1601
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1657
 msgid "Learning is enabled on this peer\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1614
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1671
 msgid "Learning is not enabled on this peer\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1625
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1684
 #, c-format
 msgid ""
 "Since learning is not enabled on this peer, hostlist file `%s' was removed\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:182
+#: src/hostlist/gnunet-daemon-hostlist_server.c:176
 #, fuzzy
 msgid "bytes in hostlist"
 msgstr "# bytes in der Datenbank"
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:207
+#: src/hostlist/gnunet-daemon-hostlist_server.c:201
 msgid "expired addresses encountered"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:243
-#: src/hostlist/gnunet-daemon-hostlist_server.c:590
-#: src/peerinfo-tool/gnunet-peerinfo.c:389
-#: src/peerinfo-tool/gnunet-peerinfo.c:538
-#: src/topology/gnunet-daemon-topology.c:866
+#: src/hostlist/gnunet-daemon-hostlist_server.c:237
+#: src/hostlist/gnunet-daemon-hostlist_server.c:531
+#: src/peerinfo-tool/gnunet-peerinfo.c:385
+#: src/peerinfo-tool/gnunet-peerinfo.c:534
+#: src/topology/gnunet-daemon-topology.c:857
 #, fuzzy, c-format
 msgid "Error in communication with PEERINFO service: %s\n"
 msgstr "Informationen über andere GNUnet Knoten ausgeben."
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:267
+#: src/hostlist/gnunet-daemon-hostlist_server.c:261
 msgid "HELLOs without addresses encountered (ignored)"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:284
+#: src/hostlist/gnunet-daemon-hostlist_server.c:278
 msgid "bytes not included in hostlist (size limit)"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:388
+#: src/hostlist/gnunet-daemon-hostlist_server.c:382
 #, fuzzy, c-format
 msgid "Refusing `%s' request to hostlist server\n"
 msgstr "Fehler beim Senden einer `%s' Anfrage an den SMTP Server.\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:391
+#: src/hostlist/gnunet-daemon-hostlist_server.c:385
 msgid "hostlist requests refused (not HTTP GET)"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:403
+#: src/hostlist/gnunet-daemon-hostlist_server.c:397
 #, c-format
 msgid "Refusing `%s' request with %llu bytes of upload data\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:407
+#: src/hostlist/gnunet-daemon-hostlist_server.c:401
 msgid "hostlist requests refused (upload data)"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:414
+#: src/hostlist/gnunet-daemon-hostlist_server.c:408
 msgid "Could not handle hostlist request since I do not have a response yet\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:417
+#: src/hostlist/gnunet-daemon-hostlist_server.c:411
 msgid "hostlist requests refused (not ready)"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:422
+#: src/hostlist/gnunet-daemon-hostlist_server.c:416
 msgid "Received request for our hostlist\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:424
+#: src/hostlist/gnunet-daemon-hostlist_server.c:418
 #, fuzzy
 msgid "hostlist requests processed"
 msgstr "# dht Anfragen weitergeleitet"
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:485
+#: src/hostlist/gnunet-daemon-hostlist_server.c:466
 #, fuzzy
 msgid "# hostlist advertisements send"
 msgstr "# Bekanntmachungen von anderen übertragen"
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:535
-msgid "Advertisement message could not be queued by core\n"
-msgstr ""
-
-#: src/hostlist/gnunet-daemon-hostlist_server.c:743
-#: src/peerinfo-tool/gnunet-peerinfo.c:741
-#: src/transport/gnunet-service-transport.c:856
+#: src/hostlist/gnunet-daemon-hostlist_server.c:679
+#: src/transport/gnunet-service-transport.c:2802
 #, fuzzy
 msgid "Could not access PEERINFO service.  Exiting.\n"
 msgstr "Auf die Namespace Informationen konnte nicht zugegriffen werden.\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:755
+#: src/hostlist/gnunet-daemon-hostlist_server.c:691
 #, fuzzy, c-format
 msgid "Invalid port number %llu.  Exiting.\n"
 msgstr "Ungültige Parameter. Abbruch.\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:767
+#: src/hostlist/gnunet-daemon-hostlist_server.c:703
 #, c-format
 msgid "Hostlist service starts on %s:%llu\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:782
+#: src/hostlist/gnunet-daemon-hostlist_server.c:718
 #, fuzzy, c-format
 msgid "Address to obtain hostlist: `%s'\n"
 msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:795
+#: src/hostlist/gnunet-daemon-hostlist_server.c:731
 msgid "BINDTOIP does not a valid IPv4 address! Ignoring BINDTOIPV4.\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:808
+#: src/hostlist/gnunet-daemon-hostlist_server.c:748
 msgid "BINDTOIP does not a valid IPv4 address! Ignoring BINDTOIPV6.\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:829
+#: src/hostlist/gnunet-daemon-hostlist_server.c:769
 #, fuzzy, c-format
 msgid "`%s' is not a valid IPv4 address! Ignoring BINDTOIPV4.\n"
 msgstr "»%s« ist keine gültige IP-Adresse.\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:849
+#: src/hostlist/gnunet-daemon-hostlist_server.c:789
 #, fuzzy, c-format
 msgid "`%s' is not a valid IPv6 address! Ignoring BINDTOIPV6.\n"
 msgstr "»%s« ist keine gültige IP-Adresse.\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:889
+#: src/hostlist/gnunet-daemon-hostlist_server.c:829
 #, fuzzy, c-format
 msgid "Could not start hostlist HTTP server on port %u\n"
 msgstr "Der Transportdienst auf Port %d konnte nicht gestartet werden.\n"
@@ -5014,76 +4839,95 @@
 msgid "Maintain egos"
 msgstr ""
 
-#: src/identity/gnunet-service-identity.c:337
+#: src/identity/gnunet-service-identity.c:390
 msgid "no default known"
 msgstr ""
 
-#: src/identity/gnunet-service-identity.c:361
+#: src/identity/gnunet-service-identity.c:412
 msgid "default configured, but ego unknown (internal error)"
 msgstr ""
 
-#: src/identity/gnunet-service-identity.c:438
-#: src/identity/gnunet-service-identity.c:669
-#: src/identity/gnunet-service-identity.c:777
+#: src/identity/gnunet-service-identity.c:501
+#: src/identity/gnunet-service-identity.c:773
+#: src/identity/gnunet-service-identity.c:895
 #, fuzzy, c-format
 msgid "Failed to write subsystem default identifier map to `%s'.\n"
 msgstr "Fehler beim Aktualisieren der Daten des Moduls `%s'\n"
 
-#: src/identity/gnunet-service-identity.c:445
+#: src/identity/gnunet-service-identity.c:508
 msgid "Unknown ego specified for service (internal error)"
 msgstr ""
 
-#: src/identity/gnunet-service-identity.c:515
+#: src/identity/gnunet-service-identity.c:601
 msgid "identifier already in use for another ego"
 msgstr ""
 
-#: src/identity/gnunet-service-identity.c:646
+#: src/identity/gnunet-service-identity.c:750
 msgid "target name already exists"
 msgstr ""
 
-#: src/identity/gnunet-service-identity.c:685
-#: src/identity/gnunet-service-identity.c:794
+#: src/identity/gnunet-service-identity.c:789
+#: src/identity/gnunet-service-identity.c:912
 msgid "no matching ego found"
 msgstr ""
 
-#: src/identity/gnunet-service-identity.c:828
+#: src/identity/gnunet-service-identity.c:946
 #, fuzzy, c-format
 msgid "Failed to parse ego information in `%s'\n"
 msgstr "Fehler beim Parsen der Gerätedaten von `%s' bei %s:%d.\n"
 
-#: src/identity/gnunet-service-identity.c:901
+#: src/identity/gnunet-service-identity.c:1004
 #, fuzzy, c-format
 msgid "Failed to parse subsystem identity configuration file `%s'\n"
 msgstr "Fehler beim Speichern der Konfigurationsdatei `%s':"
 
-#: src/identity/gnunet-service-identity.c:913
+#: src/identity/gnunet-service-identity.c:1014
 #, fuzzy, c-format
 msgid "Failed to create directory `%s' for storing egos\n"
 msgstr "Dateiformat fehlerhaft (kein GNUnet Verzeichnis?)\n"
 
-#: src/identity/plugin_rest_identity.c:938
+#: src/identity/plugin_rest_identity.c:967
 msgid "Identity REST API initialized\n"
 msgstr ""
 
-#: src/identity-provider/gnunet-identity-token.c:101
+#: src/identity-provider/gnunet-identity-token.c:66
+#, fuzzy
+msgid "Option `-t' is required\n"
+msgstr "Option `%s' macht keinen Sinn ohne die Option `%s'.\n"
+
+#: src/identity-provider/gnunet-identity-token.c:77
+#, fuzzy, c-format
+msgid "Token `%s' is malformed\n"
+msgstr "Schlüssel »%s« ist gültig\n"
+
+#: src/identity-provider/gnunet-identity-token.c:163
 msgid "GNUid token"
 msgstr ""
 
-#: src/identity-provider/gnunet-identity-token.c:104
+#: src/identity-provider/gnunet-identity-token.c:166
 msgid "Print token contents"
 msgstr ""
 
-#: src/identity-provider/plugin_rest_identity_provider.c:1126
+#: src/identity-provider/plugin_rest_identity_provider.c:1163
 #, fuzzy
 msgid "Identity Token REST API initialized\n"
 msgstr " Verbindung fehlgeschlagen\n"
 
-#: src/mysql/mysql.c:174
+#: src/multicast/gnunet-multicast.c:48 src/multicast/gnunet-multicast.c:72
+msgid "This command doesn't do anything yet."
+msgstr ""
+
+#: src/my/my.c:198 src/my/my.c:217
+#, fuzzy, c-format
+msgid "%s failed at %s:%d with error: %s\n"
+msgstr "»%s« schlug bei %s:%d mit dem Fehler %s fehl\n"
+
+#: src/mysql/mysql.c:180
 #, c-format
 msgid "Trying to use file `%s' for MySQL configuration.\n"
 msgstr "Versuchen, Datei »%s« für MySQL-Konfiguration zu verwenden.\n"
 
-#: src/mysql/mysql.c:181
+#: src/mysql/mysql.c:187
 #, fuzzy, c-format
 msgid "Could not access file `%s': %s\n"
 msgstr "`%s' konnte nicht aufgelöst werden: %s\n"
@@ -5093,7 +4937,7 @@
 msgid "No records found for `%s'"
 msgstr "Dienst `%s' konnte nicht ordentlich entladen werden!\n"
 
-#: src/namecache/gnunet-namecache.c:122 src/namestore/gnunet-namestore.c:395
+#: src/namecache/gnunet-namecache.c:122 src/namestore/gnunet-namestore.c:415
 #, c-format
 msgid "\tCorrupt or unsupported record of type %u\n"
 msgstr ""
@@ -5113,7 +4957,7 @@
 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:1081
+#: src/namecache/gnunet-namecache.c:230 src/namestore/gnunet-namestore.c:1153
 msgid "name of the record to add/delete/display"
 msgstr ""
 
@@ -5122,19 +4966,26 @@
 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:1113
+#: src/namecache/gnunet-namecache.c:244 src/namestore/gnunet-namestore.c:1189
 #, fuzzy
 msgid "GNUnet zone manipulation tool"
 msgstr "GNUnet Konfiguration"
 
-#: src/namecache/namecache_api.c:276
+#: src/namecache/namecache_api.c:296
 msgid "Namecache failed to cache block"
 msgstr ""
 
+#: src/namecache/namecache_api.c:383
+#, fuzzy
+msgid "Error communicating with namecache service"
+msgstr "Informationen über andere GNUnet Knoten ausgeben."
+
 #: src/namecache/plugin_namecache_flat.c:119
-#: src/namecache/plugin_namecache_flat.c:244
+#: src/namecache/plugin_namecache_flat.c:253
 #: src/namestore/plugin_namestore_flat.c:179
-#: src/namestore/plugin_namestore_flat.c:351
+#: src/namestore/plugin_namestore_flat.c:375
+#: src/peerstore/plugin_peerstore_flat.c:379
+#: src/peerstore/plugin_peerstore_flat.c:527
 #, fuzzy, c-format
 msgid "Unable to initialize file: %s.\n"
 msgstr "SQLite-Datenbank konnte nicht initialisiert werden: %s.\n"
@@ -5141,17 +4992,19 @@
 
 #: src/namecache/plugin_namecache_flat.c:130
 #: src/namestore/plugin_namestore_flat.c:190
+#: src/peerstore/plugin_peerstore_flat.c:394
 #, fuzzy, c-format
 msgid "Unable to get filesize: %s.\n"
 msgstr "Zustellung der Nachricht `%s' fehlgeschlagen.\n"
 
-#: src/namecache/plugin_namecache_flat.c:145
-#: src/namestore/plugin_namestore_flat.c:202
+#: src/namecache/plugin_namecache_flat.c:149
+#: src/namestore/plugin_namestore_flat.c:203
+#: src/peerstore/plugin_peerstore_flat.c:406
 #, fuzzy, c-format
 msgid "Unable to read file: %s.\n"
 msgstr "Zustellung der Nachricht `%s' fehlgeschlagen.\n"
 
-#: src/namecache/plugin_namecache_flat.c:399
+#: src/namecache/plugin_namecache_flat.c:408
 #, fuzzy
 msgid "flat plugin running\n"
 msgstr "Sqlite-Datenbank läuft\n"
@@ -5168,260 +5021,245 @@
 msgstr ""
 
 #: src/namestore/gnunet-namestore.c:330
-#: src/namestore/plugin_rest_namestore.c:547
+#: src/namestore/plugin_rest_namestore.c:562
 #, c-format
 msgid "Deleting record failed, record does not exist%s%s\n"
 msgstr ""
 
 #: src/namestore/gnunet-namestore.c:337
-#: src/namestore/plugin_rest_namestore.c:556
+#: src/namestore/plugin_rest_namestore.c:571
 #, c-format
 msgid "Deleting record failed%s%s\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:475 src/namestore/gnunet-namestore.c:483
-#: src/namestore/gnunet-namestore.c:491
+#: src/namestore/gnunet-namestore.c:519 src/namestore/gnunet-namestore.c:527
+#: src/namestore/gnunet-namestore.c:535
 #, c-format
 msgid "A %s record exists already under `%s', no other records can be added.\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:505 src/namestore/gnunet-namestore.c:517
-#: src/namestore/gnunet-namestore.c:529
+#: src/namestore/gnunet-namestore.c:549 src/namestore/gnunet-namestore.c:561
+#: src/namestore/gnunet-namestore.c:573
 #, c-format
 msgid "Records already exist under `%s', cannot add `%s' record.\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:626
-#: src/namestore/plugin_rest_namestore.c:580
+#: src/namestore/gnunet-namestore.c:698
+#: src/namestore/plugin_rest_namestore.c:597
 #, c-format
 msgid "There are no records under label `%s' that could be deleted.\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:665
+#: src/namestore/gnunet-namestore.c:739
 #, c-format
 msgid ""
 "There are no records under label `%s' that match the request for deletion.\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:698
-#: src/namestore/plugin_rest_namestore.c:954
-#: src/transport/gnunet-transport.c:1769
-#: src/transport/gnunet-transport-profiler.c:497
-#, c-format
-msgid "Service `%s' is not running\n"
-msgstr "Dienst »%s« läuft nicht\n"
+#: src/namestore/gnunet-namestore.c:776
+#: src/namestore/plugin_rest_namestore.c:1003
+#, fuzzy, c-format
+msgid "Ego `%s' not known to identity service\n"
+msgstr "`%s': unbekannter Dienst: %s\n"
 
-#: src/namestore/gnunet-namestore.c:706
+#: src/namestore/gnunet-namestore.c:791
 #, c-format
 msgid "No options given\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:717
-#: src/namestore/gnunet-namestore-fcfsd.c:978
-#: src/namestore/plugin_rest_namestore.c:963
+#: src/namestore/gnunet-namestore.c:802
+#: src/namestore/gnunet-namestore-fcfsd.c:1034
+#: src/namestore/plugin_rest_namestore.c:1016
 #, fuzzy
 msgid "Failed to connect to namestore\n"
 msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
 
-#: src/namestore/gnunet-namestore.c:725 src/namestore/gnunet-namestore.c:734
-#: src/namestore/gnunet-namestore.c:751 src/namestore/gnunet-namestore.c:773
-#: src/namestore/gnunet-namestore.c:813
+#: src/namestore/gnunet-namestore.c:810 src/namestore/gnunet-namestore.c:819
+#: src/namestore/gnunet-namestore.c:838 src/namestore/gnunet-namestore.c:861
+#: src/namestore/gnunet-namestore.c:915
 #, fuzzy, c-format
 msgid "Missing option `%s' for operation `%s'\n"
 msgstr "Unbekannte Operation `%s'\n"
 
-#: src/namestore/gnunet-namestore.c:726 src/namestore/gnunet-namestore.c:735
-#: src/namestore/gnunet-namestore.c:752 src/namestore/gnunet-namestore.c:774
+#: src/namestore/gnunet-namestore.c:811 src/namestore/gnunet-namestore.c:820
+#: src/namestore/gnunet-namestore.c:839 src/namestore/gnunet-namestore.c:863
 msgid "add"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:743
-#: src/namestore/plugin_rest_namestore.c:650
+#: src/namestore/gnunet-namestore.c:829
+#: src/namestore/plugin_rest_namestore.c:671
 #, fuzzy, c-format
 msgid "Unsupported type `%s'\n"
 msgstr "Kommando `%s' wird nicht unterstützt. Vorgang wird abgebrochen.\n"
 
-#: src/namestore/gnunet-namestore.c:763
-#: src/namestore/plugin_rest_namestore.c:668
-#: src/namestore/plugin_rest_namestore.c:708
+#: src/namestore/gnunet-namestore.c:851
+#: src/namestore/plugin_rest_namestore.c:689
+#: src/namestore/plugin_rest_namestore.c:729
 #, fuzzy, c-format
 msgid "Value `%s' invalid for record type `%s'\n"
 msgstr "%s: Symbolwert `%s' ist ungültig für %s\n"
 
-#: src/namestore/gnunet-namestore.c:799
+#: src/namestore/gnunet-namestore.c:896
 #, fuzzy, c-format
 msgid "Invalid time format `%s'\n"
 msgstr "Ungültiger Parameter: `%s'\n"
 
-#: src/namestore/gnunet-namestore.c:814
+#: src/namestore/gnunet-namestore.c:916
 msgid "del"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:842
+#: src/namestore/gnunet-namestore.c:950
 #, c-format
 msgid "Invalid public key for reverse lookup `%s'\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:866
-#: src/peerinfo-tool/gnunet-peerinfo.c:819
+#: src/namestore/gnunet-namestore.c:979 src/peerinfo-tool/gnunet-peerinfo.c:775
 #, fuzzy, c-format
 msgid "Invalid URI `%s'\n"
 msgstr "Ungültiger Parameter: `%s'\n"
 
-#: src/namestore/gnunet-namestore.c:901
+#: src/namestore/gnunet-namestore.c:1014
 #, fuzzy, c-format
 msgid "Invalid nick `%s'\n"
 msgstr "Ungültiger Parameter: `%s'\n"
 
-#: src/namestore/gnunet-namestore.c:941
-#: src/namestore/plugin_rest_namestore.c:999
-#, fuzzy, c-format
-msgid "Ego `%s' not known to identity service\n"
-msgstr "`%s': unbekannter Dienst: %s\n"
-
-#: src/namestore/gnunet-namestore.c:968
-#: src/namestore/plugin_rest_namestore.c:1026
+#: src/namestore/gnunet-namestore.c:1051
+#: src/namestore/plugin_rest_namestore.c:1046
 #, c-format
 msgid "No default ego configured in identity service\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1004
-#: src/namestore/plugin_rest_namestore.c:1066
-#, c-format
-msgid "Identity service is not running\n"
-msgstr ""
-
-#: src/namestore/gnunet-namestore.c:1015
-#: src/namestore/plugin_rest_namestore.c:1107
+#: src/namestore/gnunet-namestore.c:1108
+#: src/namestore/plugin_rest_namestore.c:1142
 #, 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:1063
+#: src/namestore/gnunet-namestore.c:1135
 msgid "add record"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1066
+#: src/namestore/gnunet-namestore.c:1138
 msgid "delete record"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1069
+#: src/namestore/gnunet-namestore.c:1141
 msgid "display records"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1072
+#: src/namestore/gnunet-namestore.c:1144
 msgid ""
 "expiration time for record to use (for adding only), \"never\" is possible"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1075
+#: src/namestore/gnunet-namestore.c:1147
 msgid "set the desired nick name for the zone"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1078
+#: src/namestore/gnunet-namestore.c:1150
 msgid "monitor changes in the namestore"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1084
+#: src/namestore/gnunet-namestore.c:1156
 msgid "determine our name for the given PKEY"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1087
+#: src/namestore/gnunet-namestore.c:1159
 msgid "type of the record to add/delete/display"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1090
+#: src/namestore/gnunet-namestore.c:1162
 msgid "URI to import into our zone"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1093
+#: src/namestore/gnunet-namestore.c:1165
 msgid "value of the record to add/delete"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1096
+#: src/namestore/gnunet-namestore.c:1168
 msgid "create or list public record"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1099
+#: src/namestore/gnunet-namestore.c:1171
 msgid ""
 "create shadow record (only valid if all other records of the same type have "
 "expired"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1102
+#: src/namestore/gnunet-namestore.c:1174
 msgid "name of the ego controlling the zone"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:476
+#: src/namestore/gnunet-namestore-fcfsd.c:508
 #, fuzzy, c-format
 msgid "Unsupported form value `%s'\n"
 msgstr "Kommando `%s' wird nicht unterstützt. Vorgang wird abgebrochen.\n"
 
-#: src/namestore/gnunet-namestore-fcfsd.c:503
+#: src/namestore/gnunet-namestore-fcfsd.c:535
 #, fuzzy, c-format
 msgid "Failed to create record for domain `%s': %s\n"
 msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
 
-#: src/namestore/gnunet-namestore-fcfsd.c:537
+#: src/namestore/gnunet-namestore-fcfsd.c:555
+msgid "Error when mapping zone to name\n"
+msgstr ""
+
+#: src/namestore/gnunet-namestore-fcfsd.c:585
 #, c-format
 msgid "Found existing name `%s' for the given key\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:546
-msgid "Error when mapping zone to name\n"
-msgstr ""
-
-#: src/namestore/gnunet-namestore-fcfsd.c:608
+#: src/namestore/gnunet-namestore-fcfsd.c:662
 #, c-format
 msgid "Found %u existing records for domain `%s'\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:664
+#: src/namestore/gnunet-namestore-fcfsd.c:718
 #, fuzzy, c-format
 msgid "Failed to create page for `%s'\n"
 msgstr "Fehler beim Aktualisieren der Daten des Moduls `%s'\n"
 
-#: src/namestore/gnunet-namestore-fcfsd.c:680
+#: src/namestore/gnunet-namestore-fcfsd.c:734
 #, fuzzy, c-format
 msgid "Failed to setup post processor for `%s'\n"
 msgstr "Fehler beim Aktualisieren der Daten des Moduls `%s'\n"
 
-#: src/namestore/gnunet-namestore-fcfsd.c:716
+#: src/namestore/gnunet-namestore-fcfsd.c:770
 msgid "Domain name must not contain `.'\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:724
+#: src/namestore/gnunet-namestore-fcfsd.c:778
 msgid "Domain name must not contain `+'\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:918
+#: src/namestore/gnunet-namestore-fcfsd.c:974
 msgid "No ego configured for `fcfsd` subsystem\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:944
+#: src/namestore/gnunet-namestore-fcfsd.c:1000
 #, fuzzy
 msgid "Failed to start HTTP server\n"
 msgstr "Fehler beim Senden einer `%s' Anfrage an den SMTP Server.\n"
 
-#: src/namestore/gnunet-namestore-fcfsd.c:986
+#: src/namestore/gnunet-namestore-fcfsd.c:1042
 #, fuzzy
 msgid "Failed to connect to identity\n"
 msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
 
-#: src/namestore/gnunet-namestore-fcfsd.c:1018
+#: src/namestore/gnunet-namestore-fcfsd.c:1074
 msgid "GNU Name System First Come First Serve name registration service"
 msgstr ""
 
-#: src/namestore/gnunet-service-namestore.c:655
+#: src/namestore/gnunet-service-namestore.c:612
 #, c-format
 msgid "Failed to replicate block in namecache: %s\n"
 msgstr ""
 
-#: src/namestore/namestore_api.c:275
+#: src/namestore/namestore_api.c:379
 msgid "Namestore failed to store record\n"
 msgstr ""
 
-#: src/namestore/plugin_namestore_flat.c:632
+#: src/namestore/plugin_namestore_flat.c:656
 #, fuzzy
 msgid "flat file database running\n"
 msgstr "Sqlite-Datenbank läuft\n"
@@ -5435,68 +5273,68 @@
 msgid "GNUnet NAT traversal autoconfigure daemon"
 msgstr ""
 
-#: src/nat/gnunet-nat-server.c:279
+#: src/nat/gnunet-nat-server.c:321
 #, c-format
 msgid "Please pass valid port number as the first argument! (got `%s')\n"
 msgstr ""
 
-#: src/nat/gnunet-nat-server.c:321
+#: src/nat/gnunet-nat-server.c:363
 msgid "GNUnet NAT traversal test helper daemon"
 msgstr ""
 
-#: src/nat/nat_auto.c:388
+#: src/nat/nat_auto.c:385
 msgid "NAT traversal with ICMP Server succeeded.\n"
 msgstr ""
 
-#: src/nat/nat_auto.c:389
+#: src/nat/nat_auto.c:386
 msgid "NAT traversal with ICMP Server failed.\n"
 msgstr ""
 
-#: src/nat/nat_auto.c:408
+#: src/nat/nat_auto.c:405
 msgid "Testing connection reversal with ICMP server.\n"
 msgstr ""
 
-#: src/nat/nat_auto.c:440
+#: src/nat/nat_auto.c:437
 #, fuzzy, c-format
 msgid "Detected external IP `%s'\n"
 msgstr "Ungültiger RPC `%s' empfangen.\n"
 
-#: src/nat/nat_auto.c:574
+#: src/nat/nat_auto.c:572
 msgid "This system has a global IPv6 address, setting IPv6 to supported.\n"
 msgstr ""
 
-#: src/nat/nat_auto.c:592
+#: src/nat/nat_auto.c:590
 #, c-format
 msgid "Detected internal network address `%s'.\n"
 msgstr ""
 
-#: src/nat/nat_auto.c:662 src/nat/nat_test.c:360
+#: src/nat/nat_auto.c:681 src/nat/nat_test.c:403
 #, fuzzy
 msgid "Failed to connect to `gnunet-nat-server'\n"
 msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
 
-#: src/nat/nat_auto.c:709
+#: src/nat/nat_auto.c:724
 msgid "upnpc found, enabling its use\n"
 msgstr ""
 
-#: src/nat/nat_auto.c:710
+#: src/nat/nat_auto.c:725
 #, fuzzy
 msgid "upnpc not found\n"
 msgstr "Kommando `%s' wurde nicht gefunden!\n"
 
-#: src/nat/nat_auto.c:742
+#: src/nat/nat_auto.c:762
 msgid "test_icmp_server not possible, as we have no public IPv4 address\n"
 msgstr ""
 
-#: src/nat/nat_auto.c:750 src/nat/nat_auto.c:796
+#: src/nat/nat_auto.c:774 src/nat/nat_auto.c:834
 msgid "test_icmp_server not possible, as we are not behind NAT\n"
 msgstr ""
 
-#: src/nat/nat_auto.c:758 src/nat/nat_auto.c:805
+#: src/nat/nat_auto.c:786 src/nat/nat_auto.c:846
 msgid "No working gnunet-helper-nat-server found\n"
 msgstr ""
 
-#: src/nat/nat_auto.c:788
+#: src/nat/nat_auto.c:823
 msgid "test_icmp_client not possible, as we have no internal IPv4 address\n"
 msgstr ""
 
@@ -5510,26 +5348,26 @@
 msgid "Failed to start %s\n"
 msgstr "Fehler beim Starten der Collection.\n"
 
-#: src/nat/nat.c:1321
+#: src/nat/nat.c:1327
 msgid "Error while running upnp client:\n"
 msgstr ""
 
-#: src/nat/nat.c:1396
+#: src/nat/nat.c:1402
 #, fuzzy, c-format
 msgid "Failed to run upnp client for port %u\n"
 msgstr "SQLite Datenbank konnte nicht initialisiert werden.\n"
 
-#: src/nat/nat.c:1540
+#: src/nat/nat.c:1546
 msgid "malformed"
 msgstr ""
 
-#: src/nat/nat.c:1594
+#: src/nat/nat.c:1600
 msgid ""
 "UPnP enabled in configuration, but UPnP client `upnpc` command not found, "
 "disabling UPnP \n"
 msgstr ""
 
-#: src/nat/nat.c:1723 src/nat/nat.c:1736
+#: src/nat/nat.c:1726 src/nat/nat.c:1739
 #, c-format
 msgid ""
 "Configuration requires `%s', but binary is not installed properly (SUID bit "
@@ -5536,93 +5374,93 @@
 "not set).  Option disabled.\n"
 msgstr ""
 
-#: src/nat/nat.c:1891
+#: src/nat/nat.c:1903
 msgid "Internal IP address not known, cannot use ICMP NAT traversal method\n"
 msgstr ""
 
-#: src/nat/nat.c:1907
+#: src/nat/nat.c:1919
 #, c-format
 msgid "Running gnunet-helper-nat-client %s %s %u\n"
 msgstr ""
 
-#: src/nat/nat.c:1998
+#: src/nat/nat.c:2010
 msgid "Operation Successful"
 msgstr ""
 
-#: src/nat/nat.c:2000
+#: src/nat/nat.c:2012
 msgid "Internal Failure (IPC, ...)"
 msgstr ""
 
-#: src/nat/nat.c:2002
+#: src/nat/nat.c:2014
 msgid "Failure in network subsystem, check permissions."
 msgstr ""
 
-#: src/nat/nat.c:2004
+#: src/nat/nat.c:2016
 msgid "Encountered timeout while performing operation"
 msgstr ""
 
-#: src/nat/nat.c:2006
+#: src/nat/nat.c:2018
 msgid "detected that we are offline"
 msgstr ""
 
-#: src/nat/nat.c:2008
+#: src/nat/nat.c:2020
 #, fuzzy
 msgid "`upnpc` command not found"
 msgstr "Kommando `%s' wurde nicht gefunden!\n"
 
-#: src/nat/nat.c:2010
+#: src/nat/nat.c:2022
 #, fuzzy
 msgid "Failed to run `upnpc` command"
 msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
 
-#: src/nat/nat.c:2012
+#: src/nat/nat.c:2024
 msgid "`upnpc' command took too long, process killed"
 msgstr ""
 
-#: src/nat/nat.c:2014
+#: src/nat/nat.c:2026
 msgid "`upnpc' command failed to establish port mapping"
 msgstr ""
 
-#: src/nat/nat.c:2016
+#: src/nat/nat.c:2028
 msgid "`external-ip' command not found"
 msgstr ""
 
-#: src/nat/nat.c:2018
+#: src/nat/nat.c:2030
 #, fuzzy
 msgid "Failed to run `external-ip` command"
 msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
 
-#: src/nat/nat.c:2020
+#: src/nat/nat.c:2032
 #, fuzzy
 msgid "`external-ip' command output invalid"
 msgstr "Kommando `%s' wurde nicht gefunden!\n"
 
-#: src/nat/nat.c:2022
+#: src/nat/nat.c:2034
 msgid "no valid address was returned by `external-ip'"
 msgstr ""
 
-#: src/nat/nat.c:2024
+#: src/nat/nat.c:2036
 #, fuzzy
 msgid "Could not determine interface with internal/local network address"
 msgstr "Öffentliche IP-Adresse konnte nicht ermittelt werden.\n"
 
-#: src/nat/nat.c:2026
+#: src/nat/nat.c:2038
 msgid "No functioning gnunet-helper-nat-server installation found"
 msgstr ""
 
-#: src/nat/nat.c:2028
+#: src/nat/nat.c:2040
 msgid "NAT test could not be initialized"
 msgstr ""
 
-#: src/nat/nat.c:2030
+#: src/nat/nat.c:2042
 msgid "NAT test timeout reached"
 msgstr ""
 
-#: src/nat/nat.c:2032
+#: src/nat/nat.c:2044
 msgid "could not register NAT"
 msgstr ""
 
-#: src/nat/nat.c:2034
+#: src/nat/nat.c:2046
 msgid "No working gnunet-helper-nat-client installation found"
 msgstr ""
 
@@ -5636,25 +5474,17 @@
 msgid "`upnpc' command not found\n"
 msgstr "Kommando `%s' wurde nicht gefunden!\n"
 
-#: src/nat/nat_test.c:460
+#: src/nat/nat_test.c:518
 #, c-format
 msgid "Failed to create listen socket bound to `%s' for NAT test: %s\n"
 msgstr ""
 
-#: src/nat/nat_test.c:497
+#: src/nat/nat_test.c:568
 #, fuzzy
 msgid "NAT test failed to start NAT library\n"
 msgstr "Fehler beim Senden einer `%s' Anfrage an den SMTP Server.\n"
 
-#: src/nse/gnunet-nse.c:116
-msgid "NSE service is not running\n"
-msgstr ""
-
-#: src/nse/gnunet-nse.c:121
-msgid "Error while checking if NSE service is running or not\n"
-msgstr ""
-
-#: src/nse/gnunet-nse.c:167
+#: src/nse/gnunet-nse.c:122
 msgid "Show network size estimates from NSE service."
 msgstr ""
 
@@ -5682,32 +5512,32 @@
 msgid "Measure quality and performance of the NSE service."
 msgstr ""
 
-#: src/nse/gnunet-service-nse.c:1535
-#: src/revocation/gnunet-service-revocation.c:844 src/util/gnunet-scrypt.c:276
+#: src/nse/gnunet-service-nse.c:1536
+#: src/revocation/gnunet-service-revocation.c:832 src/util/gnunet-scrypt.c:276
 msgid "Value is too large.\n"
 msgstr ""
 
-#: src/peerinfo/gnunet-service-peerinfo.c:225
+#: src/peerinfo/gnunet-service-peerinfo.c:178
 #, fuzzy, c-format
 msgid "Removing expired address of transport `%s'\n"
 msgstr "Verfügbare(r) Transport(e): %s\n"
 
-#: src/peerinfo/gnunet-service-peerinfo.c:362
+#: src/peerinfo/gnunet-service-peerinfo.c:310
 #, fuzzy, c-format
 msgid "Failed to parse HELLO in file `%s': %s\n"
 msgstr "Datei wurde als `%s' gespeichert.\n"
 
-#: src/peerinfo/gnunet-service-peerinfo.c:382
-#: src/peerinfo/gnunet-service-peerinfo.c:411
+#: src/peerinfo/gnunet-service-peerinfo.c:331
+#: src/peerinfo/gnunet-service-peerinfo.c:362
 #, fuzzy, c-format
 msgid "Failed to parse HELLO in file `%s'\n"
 msgstr "Datei wurde als `%s' gespeichert.\n"
 
-#: src/peerinfo/gnunet-service-peerinfo.c:491
+#: src/peerinfo/gnunet-service-peerinfo.c:446
 msgid "# peers known"
 msgstr ""
 
-#: src/peerinfo/gnunet-service-peerinfo.c:529
+#: src/peerinfo/gnunet-service-peerinfo.c:489
 #, c-format
 msgid ""
 "File `%s' in directory `%s' does not match naming convention. Removed.\n"
@@ -5715,143 +5545,103 @@
 "Die Datei »%s« im Verzeichnis »%s« entspricht nicht der Namenskonvention. "
 "Die Datei wurde entfernt.\n"
 
-#: src/peerinfo/gnunet-service-peerinfo.c:683
+#: src/peerinfo/gnunet-service-peerinfo.c:655
 #, fuzzy, c-format
 msgid "Scanning directory `%s'\n"
 msgstr "==> Verzeichnis `%s':\n"
 
-#: src/peerinfo/gnunet-service-peerinfo.c:689
+#: src/peerinfo/gnunet-service-peerinfo.c:663
 #, fuzzy, c-format
 msgid "Still no peers found in `%s'!\n"
 msgstr "Dienst `%s' konnte nicht ordentlich entladen werden!\n"
 
-#: src/peerinfo/gnunet-service-peerinfo.c:1061
+#: src/peerinfo/gnunet-service-peerinfo.c:1076
 #, fuzzy, c-format
 msgid "Cleaning up directory `%s'\n"
 msgstr "==> Verzeichnis `%s':\n"
 
-#: src/peerinfo/gnunet-service-peerinfo.c:1391
+#: src/peerinfo/gnunet-service-peerinfo.c:1405
 #, c-format
 msgid "Importing HELLOs from `%s'\n"
 msgstr ""
 
-#: src/peerinfo/gnunet-service-peerinfo.c:1404
+#: src/peerinfo/gnunet-service-peerinfo.c:1418
 msgid "Skipping import of included HELLOs\n"
 msgstr ""
 
-#: src/peerinfo/peerinfo_api.c:237
-msgid "aborted due to explicit disconnect request"
-msgstr ""
-
-#: src/peerinfo/peerinfo_api.c:361
+#: src/peerinfo/peerinfo_api.c:220
 #, fuzzy
-msgid "failed to transmit request (service down?)"
-msgstr "Der Transportdienst auf Port %d konnte nicht gestartet werden.\n"
-
-#: src/peerinfo/peerinfo_api.c:516
-#, fuzzy
 msgid "Failed to receive response from `PEERINFO' service."
 msgstr "Fehler beim Empfangen der Antwort von gnunetd auf die `%s' Nachricht\n"
 
-#: src/peerinfo/peerinfo_api.c:560 src/peerinfo/peerinfo_api.c:583
-#: src/peerinfo/peerinfo_api.c:600 src/peerinfo/peerinfo_api.c:613
-#: src/peerinfo/peerinfo_api.c:628
-#, fuzzy
-msgid "Received invalid message from `PEERINFO' service."
-msgstr "Ungültige `%s' Anfrage von `%s' empfangen.\n"
-
-#: src/peerinfo/peerinfo_api.c:715
-msgid "Timeout transmitting iteration request to `PEERINFO' service."
-msgstr ""
-
-#: src/peerinfo/peerinfo_api_notify.c:268
+#: src/peerinfo-tool/gnunet-peerinfo.c:239
 #, fuzzy, c-format
-msgid "Could not connect to `%s' service.\n"
-msgstr "Verbindung zu gnunetd konnte nicht hergestellt werden.\n"
-
-#: src/peerinfo-tool/gnunet-peerinfo.c:243
-#, fuzzy, c-format
 msgid "%sPeer `%s'\n"
 msgstr "Ich bin Peer `%s'.\n"
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:250
+#: src/peerinfo-tool/gnunet-peerinfo.c:246
 #, c-format
 msgid "\tExpires: %s \t %s\n"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:303
+#: src/peerinfo-tool/gnunet-peerinfo.c:299
 #, fuzzy, c-format
 msgid "Failure: Cannot convert address to string for peer `%s'\n"
 msgstr "Adresse des Knotens `%s' konnte nicht ermittelt werden.\n"
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:470
+#: src/peerinfo-tool/gnunet-peerinfo.c:466
 #, fuzzy, c-format
 msgid "Failure: Received invalid %s\n"
 msgstr "Ungültiger RPC `%s' empfangen.\n"
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:484
+#: src/peerinfo-tool/gnunet-peerinfo.c:480
 #, c-format
 msgid "Failed to write HELLO with %u bytes to file `%s'\n"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:503
+#: src/peerinfo-tool/gnunet-peerinfo.c:499
 #, c-format
 msgid "Wrote %s HELLO containing %u addresses with %u bytes to file `%s'\n"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:573
-#, fuzzy, c-format
-msgid "Failure adding HELLO: %s\n"
-msgstr "Fehler bei %s:%d.\n"
-
-#: src/peerinfo-tool/gnunet-peerinfo.c:700
-#, fuzzy, c-format
-msgid "Failed to get my own HELLO from this peer!\n"
-msgstr "Statistiken über den Netzwerkverkehr konnten nicht ermittelt werden.\n"
-
-#: src/peerinfo-tool/gnunet-peerinfo.c:732
+#: src/peerinfo-tool/gnunet-peerinfo.c:799
 #, c-format
-msgid "Service `%s' is not running, please start GNUnet\n"
-msgstr ""
-
-#: src/peerinfo-tool/gnunet-peerinfo.c:843
-#, c-format
 msgid "I am peer `%s'.\n"
 msgstr "Ich bin Knoten »%s«.\n"
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:884
+#: src/peerinfo-tool/gnunet-peerinfo.c:842
 msgid "don't resolve host names"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:887
+#: src/peerinfo-tool/gnunet-peerinfo.c:845
 msgid "output only the identity strings"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:890
+#: src/peerinfo-tool/gnunet-peerinfo.c:848
 msgid "include friend-only information"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:893
+#: src/peerinfo-tool/gnunet-peerinfo.c:851
 msgid "output our own identity only"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:896
+#: src/peerinfo-tool/gnunet-peerinfo.c:854
 msgid "list all known peers"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:899
+#: src/peerinfo-tool/gnunet-peerinfo.c:857
 msgid "dump hello to file"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:902
+#: src/peerinfo-tool/gnunet-peerinfo.c:860
 msgid "also output HELLO uri(s)"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:905
+#: src/peerinfo-tool/gnunet-peerinfo.c:863
 msgid "add given HELLO uri to the database"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:919
+#: src/peerinfo-tool/gnunet-peerinfo.c:880
 #, fuzzy
 msgid "Print information about peers."
 msgstr "Informationen über andere GNUnet Knoten ausgeben."
@@ -5878,67 +5668,30 @@
 msgid "peerstore"
 msgstr ""
 
-#: src/peerstore/gnunet-service-peerstore.c:395
-#, fuzzy
-msgid "Malformed iterate request.\n"
-msgstr "GNUnet Konfiguration"
-
-#: src/peerstore/gnunet-service-peerstore.c:402
-msgid "Sub system not supplied in client iterate request.\n"
-msgstr ""
-
-#: src/peerstore/gnunet-service-peerstore.c:462
-#, fuzzy
-msgid "Malformed store request from client\n"
-msgstr "Beschädigte Antwort auf `%s' von Knoten `%s' empfangen.\n"
-
-#: src/peerstore/gnunet-service-peerstore.c:470
-msgid "Full key not supplied in client store request\n"
-msgstr ""
-
-#: src/peerstore/gnunet-service-peerstore.c:489
-#, fuzzy
-msgid "Failed to store requested value, database error."
-msgstr "Fehler beim Senden einer `%s' Anfrage an den SMTP Server.\n"
-
-#: src/peerstore/gnunet-service-peerstore.c:568
-msgid "No database backend configured\n"
-msgstr ""
-
-#: src/peerstore/gnunet-service-peerstore.c:579
+#: src/peerstore/gnunet-service-peerstore.c:588
 #, 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:329
+#: src/peerstore/peerstore_api.c:296
 #, c-format
 msgid "Received an error notification from MQ of type: %d\n"
 msgstr ""
 
-#: src/peerstore/peerstore_api.c:376
+#: src/peerstore/peerstore_api.c:344
 msgid "timeout"
 msgstr ""
 
-#: src/peerstore/peerstore_api.c:679
+#: src/peerstore/peerstore_api.c:560 src/peerstore/peerstore_api.c:609
 msgid "Unexpected iteration response, this should not happen.\n"
 msgstr ""
 
-#: src/peerstore/peerstore_api.c:690
+#: src/peerstore/peerstore_api.c:623
 #, fuzzy
-msgid "Error communicating with `PEERSTORE' service."
-msgstr "Informationen über andere GNUnet Knoten ausgeben."
-
-#: src/peerstore/peerstore_api.c:709
-#, fuzzy
 msgid "Received a malformed response from service."
 msgstr "Beschädigte Antwort auf `%s' von Knoten `%s' empfangen.\n"
 
-#: src/peerstore/peerstore_api.c:821
-msgid ""
-"Problem receiving a watch response, no way to determine which request.\n"
-msgstr ""
-
-#: src/peerstore/peerstore_api.c:833
+#: src/peerstore/peerstore_api.c:768
 msgid "Received a watch result for a non existing watch.\n"
 msgstr ""
 
@@ -5951,6 +5704,7 @@
 msgstr ""
 
 #: src/peerstore/plugin_peerstore_sqlite.c:422
+#: src/psycstore/plugin_psycstore_mysql.c:250
 #: src/psycstore/plugin_psycstore_sqlite.c:259
 #, c-format
 msgid ""
@@ -5963,97 +5717,112 @@
 msgid "Unable to create indices: %s.\n"
 msgstr "Zustellung der Nachricht `%s' fehlgeschlagen.\n"
 
-#: src/postgres/postgres.c:63
+#: src/postgres/postgres.c:67
 #, fuzzy, c-format
-msgid "`%s:%s' failed at %s:%d with error: %s"
+msgid "`%s:%s' failed at %s:%d with error: %s\n"
 msgstr "`%s' schlug bei %s:%d mit dem Fehler %s fehl\n"
 
-#: src/postgres/postgres.c:166
+#: src/postgres/postgres.c:195
 #, fuzzy, c-format
-msgid "Unable to initialize Postgres: %s"
+msgid "Unable to initialize Postgres: %s\n"
 msgstr "SQLite Datenbank konnte nicht initialisiert werden: %s.\n"
 
-#: src/psycstore/gnunet-service-psycstore.c:260
+#: src/psycstore/gnunet-service-psycstore.c:249
 #, fuzzy
 msgid "Failed to store membership information!\n"
 msgstr "Fehler beim Speichern der Konfiguration!"
 
-#: src/psycstore/gnunet-service-psycstore.c:284
+#: src/psycstore/gnunet-service-psycstore.c:271
 #, fuzzy
 msgid "Failed to test membership!\n"
 msgstr "Zustellung der Nachricht `%s' fehlgeschlagen.\n"
 
-#: src/psycstore/gnunet-service-psycstore.c:306
+#: src/psycstore/gnunet-service-psycstore.c:300
 #, fuzzy
-msgid "Failed to store fragment!\n"
+msgid "Dropping invalid fragment\n"
+msgstr "Ungültiges Argument »%s«\n"
+
+#: src/psycstore/gnunet-service-psycstore.c:311
+#, fuzzy
+msgid "Failed to store fragment\n"
 msgstr "Zustellung der Nachricht `%s' fehlgeschlagen.\n"
 
-#: src/psycstore/gnunet-service-psycstore.c:364
+#: src/psycstore/gnunet-service-psycstore.c:368
 #, fuzzy
 msgid "Failed to get fragment!\n"
 msgstr "Statistiken über den Netzwerkverkehr konnten nicht ermittelt werden.\n"
 
-#: src/psycstore/gnunet-service-psycstore.c:423
+#: src/psycstore/gnunet-service-psycstore.c:434
 #, fuzzy
 msgid "Failed to get message!\n"
 msgstr "Zustellung der Nachricht `%s' fehlgeschlagen.\n"
 
-#: src/psycstore/gnunet-service-psycstore.c:454
+#: src/psycstore/gnunet-service-psycstore.c:464
 #, fuzzy
 msgid "Failed to get message fragment!\n"
 msgstr "Zustellung der Nachricht `%s' fehlgeschlagen.\n"
 
-#: src/psycstore/gnunet-service-psycstore.c:482
+#: src/psycstore/gnunet-service-psycstore.c:494
 #, fuzzy
 msgid "Failed to get master counters!\n"
 msgstr "Statistiken über den Netzwerkverkehr konnten nicht ermittelt werden.\n"
 
-#: src/psycstore/gnunet-service-psycstore.c:665
+#: src/psycstore/gnunet-service-psycstore.c:675
 #, fuzzy, c-format
 msgid "Failed to begin modifying state: %d\n"
 msgstr "Statistiken über den Netzwerkverkehr konnten nicht ermittelt werden.\n"
 
-#: src/psycstore/gnunet-service-psycstore.c:675
+#: src/psycstore/gnunet-service-psycstore.c:685
 #, fuzzy, c-format
 msgid "Failed to modify state: %d\n"
 msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
 
-#: src/psycstore/gnunet-service-psycstore.c:683
+#: src/psycstore/gnunet-service-psycstore.c:693
 #, fuzzy
 msgid "Failed to end modifying state!\n"
 msgstr "Zustellung der Nachricht `%s' fehlgeschlagen.\n"
 
-#: src/psycstore/gnunet-service-psycstore.c:714
+#: src/psycstore/gnunet-service-psycstore.c:730
 msgid "Tried to set invalid state variable name!\n"
 msgstr ""
 
-#: src/psycstore/gnunet-service-psycstore.c:728
+#: src/psycstore/gnunet-service-psycstore.c:744
 #, fuzzy
 msgid "Failed to begin synchronizing state!\n"
 msgstr "Statistiken über den Netzwerkverkehr konnten nicht ermittelt werden.\n"
 
-#: src/psycstore/gnunet-service-psycstore.c:745
+#: src/psycstore/gnunet-service-psycstore.c:761
 #, fuzzy
 msgid "Failed to end synchronizing state!\n"
 msgstr "Zustellung der Nachricht `%s' fehlgeschlagen.\n"
 
-#: src/psycstore/gnunet-service-psycstore.c:765
-#: src/psycstore/gnunet-service-psycstore.c:784
+#: src/psycstore/gnunet-service-psycstore.c:779
+#: src/psycstore/gnunet-service-psycstore.c:795
 #, fuzzy
 msgid "Failed to reset state!\n"
 msgstr "Zustellung der Nachricht `%s' fehlgeschlagen.\n"
 
-#: src/psycstore/gnunet-service-psycstore.c:807
-#: src/psycstore/gnunet-service-psycstore.c:858
+#: src/psycstore/gnunet-service-psycstore.c:824
+#: src/psycstore/gnunet-service-psycstore.c:881
 msgid "Tried to get invalid state variable name!\n"
 msgstr ""
 
-#: src/psycstore/gnunet-service-psycstore.c:834
-#: src/psycstore/gnunet-service-psycstore.c:873
+#: src/psycstore/gnunet-service-psycstore.c:851
+#: src/psycstore/gnunet-service-psycstore.c:896
 #, fuzzy
 msgid "Failed to get state variable!\n"
 msgstr "Statistiken über den Netzwerkverkehr konnten nicht ermittelt werden.\n"
 
+#: src/psycstore/plugin_psycstore_mysql.c:281
+#, fuzzy
+msgid "Unable to initialize Mysql.\n"
+msgstr "SQLite-Datenbank konnte nicht initialisiert werden: %s.\n"
+
+#: src/psycstore/plugin_psycstore_mysql.c:291
+#, fuzzy, c-format
+msgid "Failed to run SQL statement `%s'\n"
+msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
+
 #: src/psycstore/plugin_psycstore_sqlite.c:61
 #, fuzzy, c-format
 msgid "`%s' failed at %s:%d with error: %s (%d)\n"
@@ -6064,66 +5833,66 @@
 msgid "SQLite database running\n"
 msgstr "SQL Datenbank beschädigt, Ergebnis wird ignoriert.\n"
 
-#: src/pt/gnunet-daemon-pt.c:482
+#: src/pt/gnunet-daemon-pt.c:493
 msgid "Failed to pack DNS request.  Dropping.\n"
 msgstr ""
 
-#: src/pt/gnunet-daemon-pt.c:488
+#: src/pt/gnunet-daemon-pt.c:499
 msgid "# DNS requests mapped to VPN"
 msgstr ""
 
-#: src/pt/gnunet-daemon-pt.c:541
+#: src/pt/gnunet-daemon-pt.c:553
 msgid "# DNS records modified"
 msgstr ""
 
-#: src/pt/gnunet-daemon-pt.c:717
+#: src/pt/gnunet-daemon-pt.c:737
 #, fuzzy
 msgid "# DNS replies intercepted"
 msgstr "# Bytes empfangen über TCP"
 
-#: src/pt/gnunet-daemon-pt.c:723
+#: src/pt/gnunet-daemon-pt.c:744
 #, 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:824
+#: src/pt/gnunet-daemon-pt.c:851
 #, fuzzy
 msgid "# DNS requests dropped (timeout)"
 msgstr "# gap Anfragen verworfen: Kollision in RT"
 
-#: src/pt/gnunet-daemon-pt.c:881
+#: src/pt/gnunet-daemon-pt.c:909
 #, fuzzy
 msgid "# DNS requests intercepted"
 msgstr "# dht Anfragen weitergeleitet"
 
-#: src/pt/gnunet-daemon-pt.c:886
+#: src/pt/gnunet-daemon-pt.c:914
 #, fuzzy
 msgid "# DNS requests dropped (DNS cadet channel down)"
 msgstr "# gap Anfragen verworfen: Kollision in RT"
 
-#: src/pt/gnunet-daemon-pt.c:894
+#: src/pt/gnunet-daemon-pt.c:922
 #, fuzzy
 msgid "# DNS requests dropped (malformed)"
 msgstr "# gap Anfragen verworfen: Kollision in RT"
 
-#: src/pt/gnunet-daemon-pt.c:967
+#: src/pt/gnunet-daemon-pt.c:995
 #, fuzzy
 msgid "# DNS replies received"
 msgstr "# Bytes empfangen über TCP"
 
-#: src/pt/gnunet-daemon-pt.c:983
+#: src/pt/gnunet-daemon-pt.c:1011
 msgid "# DNS replies dropped (too late?)"
 msgstr ""
 
-#: src/pt/gnunet-daemon-pt.c:1257 src/pt/gnunet-daemon-pt.c:1266
-#: src/pt/gnunet-daemon-pt.c:1286 src/pt/gnunet-daemon-pt.c:1297
-#: src/pt/gnunet-daemon-pt.c:1306
+#: src/pt/gnunet-daemon-pt.c:1294 src/pt/gnunet-daemon-pt.c:1303
+#: src/pt/gnunet-daemon-pt.c:1324 src/pt/gnunet-daemon-pt.c:1336
+#: src/pt/gnunet-daemon-pt.c:1345
 #, 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:1343
+#: src/pt/gnunet-daemon-pt.c:1390
 msgid "Daemon to run to perform IP protocol translation to GNUnet"
 msgstr ""
 
@@ -6136,81 +5905,86 @@
 msgid "Daemon to announce regular expressions for the peer using cadet."
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1301
+#: src/regex/gnunet-regex-profiler.c:1314
 msgid "No configuration file given. Exiting\n"
 msgstr "Keine Konfigurationsdatei angegeben. Abbruch\n"
 
-#: src/regex/gnunet-regex-profiler.c:1342
-#: src/regex/gnunet-regex-simulation-profiler.c:638
+#: src/regex/gnunet-regex-profiler.c:1355
+#: src/regex/gnunet-regex-simulation-profiler.c:630
 #, c-format
 msgid "No policy directory specified on command line. Exiting.\n"
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1348
-#: src/regex/gnunet-regex-simulation-profiler.c:646
+#: src/regex/gnunet-regex-profiler.c:1361
+#: src/regex/gnunet-regex-simulation-profiler.c:638
 #, c-format
 msgid "Specified policies directory does not exist. Exiting.\n"
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1355
+#: src/regex/gnunet-regex-profiler.c:1368
 #, c-format
 msgid "No files found in `%s'\n"
 msgstr "Keine Dateien in »%s« gefunden\n"
 
-#: src/regex/gnunet-regex-profiler.c:1364
+#: src/regex/gnunet-regex-profiler.c:1377
 msgid "No search strings file given. Exiting.\n"
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1384
+#: src/regex/gnunet-regex-profiler.c:1397
 msgid "Error loading search strings. Exiting.\n"
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1469
+#: src/regex/gnunet-regex-profiler.c:1482
 msgid "name of the file for writing statistics"
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1472
+#: src/regex/gnunet-regex-profiler.c:1485
 msgid "wait TIMEOUT before ending the experiment"
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1475
+#: src/regex/gnunet-regex-profiler.c:1488
 msgid "directory with policy files"
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1478
+#: src/regex/gnunet-regex-profiler.c:1491
 msgid "name of file with input strings"
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1481
+#: src/regex/gnunet-regex-profiler.c:1494
 msgid "name of file with hosts' names"
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1493
+#: src/regex/gnunet-regex-profiler.c:1506
 msgid "Profiler for regex"
 msgstr ""
 
-#: src/regex/gnunet-regex-simulation-profiler.c:704
+#: src/regex/gnunet-regex-simulation-profiler.c:696
 msgid "name of the table to write DFAs"
 msgstr ""
 
-#: src/regex/gnunet-regex-simulation-profiler.c:707
+#: src/regex/gnunet-regex-simulation-profiler.c:699
 msgid "maximum path compression length"
 msgstr ""
 
-#: src/regex/gnunet-regex-simulation-profiler.c:720
+#: src/regex/gnunet-regex-simulation-profiler.c:712
 msgid "Profiler for regex library"
 msgstr ""
 
-#: src/regex/regex_api.c:131
+#: src/regex/regex_api_announce.c:152
 #, c-format
 msgid "Regex `%s' is too long!\n"
 msgstr ""
 
-#: src/rest/gnunet-rest-server.c:784
+#: src/regex/regex_api_search.c:212
+#, fuzzy, c-format
+msgid "Search string `%s' is too long!\n"
+msgstr "Dienst »%s« läuft nicht\n"
+
+#: src/rest/gnunet-rest-server.c:788
 msgid "listen on specified port (default: 7776)"
 msgstr ""
 
-#: src/rest/gnunet-rest-server.c:801
+#: src/rest/gnunet-rest-server.c:805
 #, fuzzy
 msgid "GNUnet REST server"
 msgstr "GNUnet Netzwerk Topologie tracen."
@@ -6251,101 +6025,101 @@
 msgid "Internal error, key revocation might have failed\n"
 msgstr ""
 
-#: src/revocation/gnunet-revocation.c:320
+#: src/revocation/gnunet-revocation.c:323
 #, c-format
 msgid "Revocation certificate for `%s' stored in `%s'\n"
 msgstr ""
 
-#: src/revocation/gnunet-revocation.c:350
+#: src/revocation/gnunet-revocation.c:352
 #, fuzzy, c-format
 msgid "Ego `%s' not found.\n"
 msgstr "Kommando `%s' wurde nicht gefunden!\n"
 
-#: src/revocation/gnunet-revocation.c:371
+#: src/revocation/gnunet-revocation.c:373
 #, c-format
 msgid "Error: revocation certificate in `%s' is not for `%s'\n"
 msgstr ""
 
-#: src/revocation/gnunet-revocation.c:391
+#: src/revocation/gnunet-revocation.c:393
 msgid "Revocation certificate ready\n"
 msgstr ""
 
-#: src/revocation/gnunet-revocation.c:401
+#: src/revocation/gnunet-revocation.c:403
 msgid "Revocation certificate not ready, calculating proof of work\n"
 msgstr ""
 
-#: src/revocation/gnunet-revocation.c:435
+#: src/revocation/gnunet-revocation.c:437 src/social/gnunet-social.c:1159
 #, c-format
 msgid "Public key `%s' malformed\n"
 msgstr ""
 
-#: src/revocation/gnunet-revocation.c:448
+#: src/revocation/gnunet-revocation.c:450
 msgid ""
 "Testing and revoking at the same time is not allowed, only executing test.\n"
 msgstr ""
 
-#: src/revocation/gnunet-revocation.c:468
+#: src/revocation/gnunet-revocation.c:470
 msgid "No filename to store revocation certificate given.\n"
 msgstr ""
 
-#: src/revocation/gnunet-revocation.c:489
+#: src/revocation/gnunet-revocation.c:491
 #, fuzzy, c-format
 msgid "Failed to read revocation certificate from `%s'\n"
 msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
 
-#: src/revocation/gnunet-revocation.c:514
+#: src/revocation/gnunet-revocation.c:516
 #, fuzzy
 msgid "No action specified. Nothing to do.\n"
 msgstr "Keine Kommandos angegeben.\n"
 
-#: src/revocation/gnunet-revocation.c:530
+#: src/revocation/gnunet-revocation.c:532
 msgid "use NAME for the name of the revocation file"
 msgstr ""
 
-#: src/revocation/gnunet-revocation.c:533
+#: src/revocation/gnunet-revocation.c:535
 msgid ""
 "revoke the private key associated for the the private key associated with "
 "the ego NAME "
 msgstr ""
 
-#: src/revocation/gnunet-revocation.c:536
+#: src/revocation/gnunet-revocation.c:538
 msgid "actually perform revocation, otherwise we just do the precomputation"
 msgstr ""
 
-#: src/revocation/gnunet-revocation.c:539
+#: src/revocation/gnunet-revocation.c:541
 msgid "test if the public key KEY has been revoked"
 msgstr ""
 
-#: src/revocation/gnunet-service-revocation.c:481
+#: src/revocation/gnunet-service-revocation.c:456
 msgid "# unsupported revocations received via set union"
 msgstr ""
 
-#: src/revocation/gnunet-service-revocation.c:490
+#: src/revocation/gnunet-service-revocation.c:464
 #, fuzzy
 msgid "# revocation messages received via set union"
 msgstr "# verschlüsselter PING Nachrichten empfangen"
 
-#: src/revocation/gnunet-service-revocation.c:495
+#: src/revocation/gnunet-service-revocation.c:469
 #, c-format
 msgid "Error computing revocation set union with %s\n"
 msgstr ""
 
-#: src/revocation/gnunet-service-revocation.c:499
+#: src/revocation/gnunet-service-revocation.c:473
 #, fuzzy
 msgid "# revocation set unions failed"
 msgstr " Verbindung fehlgeschlagen\n"
 
-#: src/revocation/gnunet-service-revocation.c:508
+#: src/revocation/gnunet-service-revocation.c:482
 #, fuzzy
 msgid "# revocation set unions completed"
 msgstr "# Klartext PONG Nachrichten empfangen"
 
-#: src/revocation/gnunet-service-revocation.c:545
-#: src/revocation/gnunet-service-revocation.c:776
+#: src/revocation/gnunet-service-revocation.c:519
+#: src/revocation/gnunet-service-revocation.c:765
 msgid "SET service crashed, terminating revocation service\n"
 msgstr ""
 
-#: src/revocation/gnunet-service-revocation.c:868
+#: src/revocation/gnunet-service-revocation.c:856
 #, fuzzy
 msgid "Could not open revocation database file!"
 msgstr "Knoten `%s' konnte nicht in der Routing Tabelle gefunden werden!\n"
@@ -6408,15 +6182,15 @@
 msgid "Calculate the Vectorproduct with a GNUnet peer."
 msgstr ""
 
-#: src/scalarproduct/gnunet-service-scalarproduct_alice.c:1417
-#: src/scalarproduct/gnunet-service-scalarproduct_bob.c:1546
-#: src/scalarproduct/gnunet-service-scalarproduct-ecc_alice.c:1192
-#: src/scalarproduct/gnunet-service-scalarproduct-ecc_bob.c:1249
+#: src/scalarproduct/gnunet-service-scalarproduct_alice.c:1415
+#: src/scalarproduct/gnunet-service-scalarproduct_bob.c:1553
+#: src/scalarproduct/gnunet-service-scalarproduct-ecc_alice.c:1191
+#: src/scalarproduct/gnunet-service-scalarproduct-ecc_bob.c:1259
 #, fuzzy
 msgid "Connect to CADET failed\n"
 msgstr " Verbindung fehlgeschlagen\n"
 
-#: src/scalarproduct/scalarproduct_api.c:296
+#: src/scalarproduct/scalarproduct_api.c:185
 msgid "Keys given to SCALARPRODUCT not unique!\n"
 msgstr ""
 
@@ -6436,7 +6210,7 @@
 msgid "also profile decryption"
 msgstr ""
 
-#: src/set/gnunet-service-set.c:2008
+#: src/set/gnunet-service-set.c:1991
 #, fuzzy
 msgid "Could not connect to cadet service\n"
 msgstr "Verbindung zu gnunetd konnte nicht hergestellt werden.\n"
@@ -6463,235 +6237,224 @@
 msgid "ibf size"
 msgstr ""
 
-#: src/set/gnunet-set-profiler.c:386
+#: src/set/gnunet-set-profiler.c:387
 msgid "operation to execute"
 msgstr ""
 
-#: src/social/gnunet-social.c:1138
+#: src/social/gnunet-social.c:1146
 #, fuzzy
 msgid "--place missing or invalid.\n"
 msgstr "Ungültige Antwort auf `%s'.\n"
 
-#: src/social/gnunet-social.c:1180
+#: src/social/gnunet-social.c:1195
 msgid "assign --name in state to --data"
 msgstr ""
 
-#: src/social/gnunet-social.c:1184
+#: src/social/gnunet-social.c:1199
 msgid "say good-bye and leave somebody else's place"
 msgstr ""
 
-#: src/social/gnunet-social.c:1188
+#: src/social/gnunet-social.c:1203
 msgid "create a place"
 msgstr ""
 
-#: src/social/gnunet-social.c:1192
+#: src/social/gnunet-social.c:1207
 msgid "destroy a place we were hosting"
 msgstr ""
 
-#: src/social/gnunet-social.c:1196
+#: src/social/gnunet-social.c:1211
 msgid "enter somebody else's place"
 msgstr ""
 
-#: src/social/gnunet-social.c:1200
+#: src/social/gnunet-social.c:1215
 msgid "find state matching name prefix"
 msgstr ""
 
-#: src/social/gnunet-social.c:1204
+#: src/social/gnunet-social.c:1219
 msgid "replay history of messages up to the given --limit"
 msgstr ""
 
-#: src/social/gnunet-social.c:1208
+#: src/social/gnunet-social.c:1223
 msgid "reconnect to a previously created place"
 msgstr ""
 
-#: src/social/gnunet-social.c:1212
+#: src/social/gnunet-social.c:1227
 msgid "publish something to a place we are hosting"
 msgstr ""
 
-#: src/social/gnunet-social.c:1216
+#: src/social/gnunet-social.c:1231
 msgid "reconnect to a previously entered place"
 msgstr ""
 
-#: src/social/gnunet-social.c:1220
+#: src/social/gnunet-social.c:1235
 msgid "search for state matching exact name"
 msgstr ""
 
-#: src/social/gnunet-social.c:1224
+#: src/social/gnunet-social.c:1239
 msgid "submit something to somebody's place"
 msgstr ""
 
-#: src/social/gnunet-social.c:1228
+#: src/social/gnunet-social.c:1243
 msgid "list of egos and subscribed places"
 msgstr ""
 
-#: src/social/gnunet-social.c:1232
+#: src/social/gnunet-social.c:1247
 msgid "extract and replay history between message IDs --start and --until"
 msgstr ""
 
-#: src/social/gnunet-social.c:1239
+#: src/social/gnunet-social.c:1254
 msgid "application ID to use when connecting"
 msgstr ""
 
-#: src/social/gnunet-social.c:1243
+#: src/social/gnunet-social.c:1258
 msgid "message body or state value"
 msgstr ""
 
-#: src/social/gnunet-social.c:1247
+#: src/social/gnunet-social.c:1262
 #, fuzzy
 msgid "name or public key of ego"
 msgstr "Ungültiger Parameter: `%s'\n"
 
-#: src/social/gnunet-social.c:1251
+#: src/social/gnunet-social.c:1266
 msgid "wait for incoming messages"
 msgstr ""
 
-#: src/social/gnunet-social.c:1255
+#: src/social/gnunet-social.c:1270
 msgid "GNS name"
 msgstr ""
 
-#: src/social/gnunet-social.c:1259
+#: src/social/gnunet-social.c:1274
 msgid "peer ID for --guest-enter"
 msgstr ""
 
-#: src/social/gnunet-social.c:1263
+#: src/social/gnunet-social.c:1278
 msgid "name (key) to query from state"
 msgstr ""
 
-#: src/social/gnunet-social.c:1267
+#: src/social/gnunet-social.c:1282
 msgid "method name"
 msgstr ""
 
-#: src/social/gnunet-social.c:1271
+#: src/social/gnunet-social.c:1286
 #, fuzzy
 msgid "number of messages to replay from history"
 msgstr "Anzahl an Durchläufen"
 
-#: src/social/gnunet-social.c:1275
+#: src/social/gnunet-social.c:1290
 msgid "key address of place"
 msgstr ""
 
-#: src/social/gnunet-social.c:1279
+#: src/social/gnunet-social.c:1294
 msgid "start message ID for history replay"
 msgstr ""
 
-#: src/social/gnunet-social.c:1283
+#: src/social/gnunet-social.c:1298
 msgid "respond to entry requests by admitting all guests"
 msgstr ""
 
-#: src/social/gnunet-social.c:1287
+#: src/social/gnunet-social.c:1302
 msgid "end message ID for history replay"
 msgstr ""
 
-#: src/social/gnunet-social.c:1291
+#: src/social/gnunet-social.c:1306
 msgid "respond to entry requests by refusing all guests"
 msgstr ""
 
-#: src/social/gnunet-social.c:1301
+#: src/social/gnunet-social.c:1316
 msgid ""
 "gnunet-social - Interact with the social service: enter/leave, send/receive "
 "messages, access history and state.\n"
 msgstr ""
 
-#: src/statistics/gnunet-service-statistics.c:323
+#: src/statistics/gnunet-service-statistics.c:338
 #, fuzzy, c-format
-msgid "Loading %llu bytes of statistics from `%s'\n"
+msgid "Wrote %llu bytes of statistics to `%s'\n"
 msgstr "Dateien aus dem GNUnet herunterladen."
 
-#: src/statistics/gnunet-service-statistics.c:434
+#: src/statistics/gnunet-service-statistics.c:1083
 #, fuzzy, c-format
-msgid "Wrote %llu bytes of statistics to `%s'\n"
+msgid "Loading %llu bytes of statistics from `%s'\n"
 msgstr "Dateien aus dem GNUnet herunterladen."
 
-#: src/statistics/gnunet-statistics.c:145
+#: src/statistics/gnunet-statistics.c:158
 #, fuzzy
 msgid "Failed to obtain statistics.\n"
 msgstr "Statistiken über den Netzwerkverkehr konnten nicht ermittelt werden.\n"
 
-#: src/statistics/gnunet-statistics.c:148
+#: src/statistics/gnunet-statistics.c:161
 #, fuzzy, c-format
 msgid "Failed to obtain statistics from host `%s:%llu'\n"
 msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
 
-#: src/statistics/gnunet-statistics.c:194
+#: src/statistics/gnunet-statistics.c:219
 msgid "Missing argument: subsystem \n"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:200
+#: src/statistics/gnunet-statistics.c:227
 msgid "Missing argument: name\n"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:232
+#: src/statistics/gnunet-statistics.c:270
 #, c-format
 msgid "No subsystem or name given\n"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:241
+#: src/statistics/gnunet-statistics.c:285
 #, fuzzy, c-format
 msgid "Failed to initialize watch routine\n"
 msgstr "`%s' Dienst konnte nicht initialisiert werden.\n"
 
-#: src/statistics/gnunet-statistics.c:266
+#: src/statistics/gnunet-statistics.c:321
 #, c-format
-msgid "Trying to connect to remote host, but service `%s' is not running\n"
-msgstr ""
+msgid "Invalid argument `%s'\n"
+msgstr "Ungültiges Argument »%s«\n"
 
-#: src/statistics/gnunet-statistics.c:279
+#: src/statistics/gnunet-statistics.c:339
 #, c-format
 msgid "A port is required to connect to host `%s'\n"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:287
+#: src/statistics/gnunet-statistics.c:347
 #, c-format
 msgid "A port has to be between 1 and 65535 to connect to host `%s'\n"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:320
-#, c-format
-msgid "Invalid argument `%s'\n"
-msgstr "Ungültiges Argument »%s«\n"
-
-#: src/statistics/gnunet-statistics.c:346
+#: src/statistics/gnunet-statistics.c:383
 msgid "limit output to statistics for the given NAME"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:349
+#: src/statistics/gnunet-statistics.c:386
 msgid "make the value being set persistent"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:352
+#: src/statistics/gnunet-statistics.c:389
 msgid "limit output to the given SUBSYSTEM"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:355
+#: src/statistics/gnunet-statistics.c:392
 msgid "just print the statistics value"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:358
+#: src/statistics/gnunet-statistics.c:395
 msgid "watch value continuously"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:361
+#: src/statistics/gnunet-statistics.c:398
 msgid "connect to remote host"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:364
+#: src/statistics/gnunet-statistics.c:401
 msgid "port for remote host"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:376
+#: src/statistics/gnunet-statistics.c:417
 msgid "Print statistics about GNUnet operations."
 msgstr "Statistiken der GNUnet-Aktivitäten ausgeben."
 
-#: src/statistics/statistics_api.c:515
+#: src/statistics/statistics_api.c:753
 msgid "Could not save some persistent statistics\n"
 msgstr ""
 
-#: src/statistics/statistics_api.c:1082
-msgid ""
-"Failed to receive acknowledgement from statistics service, some statistics "
-"might have been lost!\n"
-msgstr ""
-
 #: src/testbed/generate-underlay-topology.c:225
 #, fuzzy
 msgid "Need at least 2 arguments\n"
@@ -6735,12 +6498,12 @@
 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:338
+#: src/testbed/generate-underlay-topology.c:339
 #: src/testbed/gnunet-testbed-profiler.c:281
 msgid "create COUNT number of peers"
 msgstr ""
 
-#: src/testbed/generate-underlay-topology.c:347
+#: src/testbed/generate-underlay-topology.c:348
 msgid ""
 "Generates SQLite3 database representing a given underlay topology.\n"
 "Usage: gnunet-underlay-topology [OPTIONS] db-filename TOPO [TOPOOPTS]\n"
@@ -6768,19 +6531,19 @@
 msgid "Daemon to log latency values of connections to neighbours"
 msgstr ""
 
-#: src/testbed/gnunet-daemon-testbed-blacklist.c:248
+#: src/testbed/gnunet-daemon-testbed-blacklist.c:247
 msgid ""
 "Daemon to restrict incoming transport layer connections during testbed "
 "deployments"
 msgstr ""
 
-#: src/testbed/gnunet-daemon-testbed-underlay.c:230 src/testing/list-keys.c:50
-#: src/testing/testing.c:293 src/util/gnunet-ecc.c:298
+#: src/testbed/gnunet-daemon-testbed-underlay.c:231 src/testing/list-keys.c:50
+#: src/testing/testing.c:288 src/util/gnunet-ecc.c:298
 #, c-format
 msgid "Incorrect hostkey file format: %s\n"
 msgstr ""
 
-#: src/testbed/gnunet-daemon-testbed-underlay.c:468
+#: src/testbed/gnunet-daemon-testbed-underlay.c:469
 msgid "Daemon to restrict underlay network in testbed deployments"
 msgstr ""
 
@@ -6790,15 +6553,11 @@
 "Cannot open %s for writing load statistics.  Not logging load statistics\n"
 msgstr ""
 
-#: src/testbed/gnunet-service-testbed_peers.c:1015
+#: src/testbed/gnunet-service-testbed_peers.c:1141
 msgid "Misconfiguration (can't connect to the ARM service)"
 msgstr ""
 
-#: src/testbed/gnunet-service-testbed_peers.c:1021
-msgid "Request doesn't fit into a message"
-msgstr ""
-
-#: src/testbed/gnunet-service-testbed_peers.c:1059
+#: src/testbed/gnunet-service-testbed_peers.c:1183
 #, c-format
 msgid "%s service can't be started because ARM is shutting down"
 msgstr ""
@@ -6826,31 +6585,31 @@
 "signal is received"
 msgstr ""
 
-#: src/testbed/testbed_api_hosts.c:415
+#: src/testbed/testbed_api.c:410
 #, fuzzy, c-format
+msgid "Adding host %u failed with error: %s\n"
+msgstr "`%s' an `%s' schlug fehl bei %s:%d mit dem Fehler: %s\n"
+
+#: src/testbed/testbed_api_hosts.c:413
+#, fuzzy, c-format
 msgid "Hosts file %s not found\n"
 msgstr "`%s' fehlgeschlagen: Tabelle nicht gefunden!\n"
 
-#: src/testbed/testbed_api_hosts.c:423
+#: src/testbed/testbed_api_hosts.c:421
 #, c-format
 msgid "Hosts file %s has no data\n"
 msgstr ""
 
-#: src/testbed/testbed_api_hosts.c:430
+#: src/testbed/testbed_api_hosts.c:428
 #, c-format
 msgid "Hosts file %s cannot be read\n"
 msgstr ""
 
-#: src/testbed/testbed_api_hosts.c:570
+#: src/testbed/testbed_api_hosts.c:569
 #, c-format
 msgid "The function %s is only available when compiled with (--with-ll)\n"
 msgstr ""
 
-#: src/testbed/testbed_api_hosts.c:1590
-#, fuzzy, c-format
-msgid "Adding host %u failed with error: %s\n"
-msgstr "`%s' an `%s' schlug fehl bei %s:%d mit dem Fehler: %s\n"
-
 #: src/testbed/testbed_api_testbed.c:818
 msgid "Linking controllers failed. Exiting"
 msgstr ""
@@ -6908,44 +6667,44 @@
 "free topology cannot be more than %u.  Given `%s = %llu'"
 msgstr ""
 
-#: src/testbed/testbed_api_topology.c:966
+#: src/testbed/testbed_api_topology.c:1028
 #, c-format
 msgid "Topology file %s not found\n"
 msgstr ""
 
-#: src/testbed/testbed_api_topology.c:974
+#: src/testbed/testbed_api_topology.c:1036
 #, c-format
 msgid "Topology file %s has no data\n"
 msgstr ""
 
-#: src/testbed/testbed_api_topology.c:982
+#: src/testbed/testbed_api_topology.c:1044
 #, c-format
 msgid "Topology file %s cannot be read\n"
 msgstr ""
 
-#: src/testbed/testbed_api_topology.c:1004
+#: src/testbed/testbed_api_topology.c:1066
 #, fuzzy, c-format
 msgid "Failed to read peer index from toology file: %s"
 msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
 
-#: src/testbed/testbed_api_topology.c:1013
-#: src/testbed/testbed_api_topology.c:1037
+#: src/testbed/testbed_api_topology.c:1075
+#: src/testbed/testbed_api_topology.c:1099
 #, c-format
 msgid "Value in given topology file: %s out of range\n"
 msgstr ""
 
-#: src/testbed/testbed_api_topology.c:1019
-#: src/testbed/testbed_api_topology.c:1043
+#: src/testbed/testbed_api_topology.c:1081
+#: src/testbed/testbed_api_topology.c:1105
 #, fuzzy, c-format
 msgid "Failed to read peer index from topology file: %s"
 msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
 
-#: src/testbed/testbed_api_topology.c:1025
-#: src/testbed/testbed_api_topology.c:1049
+#: src/testbed/testbed_api_topology.c:1087
+#: src/testbed/testbed_api_topology.c:1111
 msgid "Topology file needs more peers than given ones\n"
 msgstr ""
 
-#: src/testbed/testbed_api_topology.c:1083
+#: src/testbed/testbed_api_topology.c:1145
 #, c-format
 msgid "Ignoring to connect peer %u to peer %u\n"
 msgstr ""
@@ -6988,25 +6747,25 @@
 msgid "Command line tool to access the testing library"
 msgstr ""
 
-#: src/testing/list-keys.c:90
+#: src/testing/list-keys.c:91
 msgid "list COUNT number of keys"
 msgstr ""
 
-#: src/testing/list-keys.c:93
+#: src/testing/list-keys.c:94
 msgid "skip COUNT number of keys in the beginning"
 msgstr ""
 
-#: src/testing/testing.c:277
+#: src/testing/testing.c:272
 #, c-format
 msgid "Hostkeys file not found: %s\n"
 msgstr ""
 
-#: src/testing/testing.c:720
+#: src/testing/testing.c:715
 #, c-format
 msgid "Key number %u does not exist\n"
 msgstr ""
 
-#: src/testing/testing.c:1163
+#: src/testing/testing.c:1158
 #, c-format
 msgid ""
 "You attempted to create a testbed with more than %u hosts.  Please "
@@ -7013,40 +6772,40 @@
 "precompute more hostkeys first.\n"
 msgstr ""
 
-#: src/testing/testing.c:1172
+#: src/testing/testing.c:1167
 #, fuzzy, c-format
 msgid "Failed to initialize hostkey for peer %u\n"
 msgstr "SQLite Datenbank konnte nicht initialisiert werden.\n"
 
-#: src/testing/testing.c:1182
+#: src/testing/testing.c:1177
 msgid "PRIVATE_KEY option in PEER section missing in configuration\n"
 msgstr ""
 
-#: src/testing/testing.c:1195
+#: src/testing/testing.c:1190
 msgid "Failed to create configuration for peer (not enough free ports?)\n"
 msgstr ""
 
-#: src/testing/testing.c:1209
+#: src/testing/testing.c:1204
 #, fuzzy, c-format
 msgid "Cannot open hostkey file `%s': %s\n"
 msgstr "Konfigurationsdatei `%s' konnte nicht geöffnet werden.\n"
 
-#: src/testing/testing.c:1221
+#: src/testing/testing.c:1216
 #, 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:1246
+#: src/testing/testing.c:1241
 #, 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:1348
+#: src/testing/testing.c:1343
 #, c-format
 msgid "Failed to start `%s': %s\n"
 msgstr "»%s« konnte nicht gestartet werden: %s\n"
 
-#: src/testing/testing.c:1710
+#: src/testing/testing.c:1644
 #, c-format
 msgid "Failed to load configuration from %s\n"
 msgstr "Konfiguration konnte nicht aus %s geladen werden\n"
@@ -7061,64 +6820,64 @@
 msgid "Directory for file `%s' does not seem to be writable.\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:230
+#: src/topology/gnunet-daemon-topology.c:225
 msgid "# peers blacklisted"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:349
+#: src/topology/gnunet-daemon-topology.c:339
 #, fuzzy
 msgid "# connect requests issued to ATS"
 msgstr "# geschlossener Verbindungen (HANGUP gesendet)"
 
-#: src/topology/gnunet-daemon-topology.c:634
-#: src/topology/gnunet-daemon-topology.c:730
+#: src/topology/gnunet-daemon-topology.c:533
+#, fuzzy
+msgid "# HELLO messages gossipped"
+msgstr "# ausgehender Nachrichten verworfen"
+
+#: src/topology/gnunet-daemon-topology.c:635
+#: src/topology/gnunet-daemon-topology.c:721
 msgid "# friends connected"
 msgstr "# verbundener Freunde"
 
-#: src/topology/gnunet-daemon-topology.c:927
+#: src/topology/gnunet-daemon-topology.c:918
 msgid "Failed to connect to core service, can not manage topology!\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:960
+#: src/topology/gnunet-daemon-topology.c:951
 #, c-format
 msgid "Found myself `%s' in friend list (useless, ignored)\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:967
+#: src/topology/gnunet-daemon-topology.c:958
 #, fuzzy, c-format
 msgid "Found friend `%s' in configuration\n"
 msgstr " gconfig\tGTK Konfiguration\n"
 
-#: src/topology/gnunet-daemon-topology.c:989
+#: src/topology/gnunet-daemon-topology.c:980
 msgid "Encountered errors parsing friends list!\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:992
+#: src/topology/gnunet-daemon-topology.c:983
 msgid "# friends in configuration"
 msgstr "# Freunde in Konfiguration"
 
-#: src/topology/gnunet-daemon-topology.c:999
+#: src/topology/gnunet-daemon-topology.c:990
 msgid ""
 "Fewer friends specified than required by minimum friend count. Will only "
 "connect to friends.\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:1005
+#: src/topology/gnunet-daemon-topology.c:996
 msgid ""
 "More friendly connections required than target total number of connections.\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:1039
+#: src/topology/gnunet-daemon-topology.c:1059
 #: src/transport/plugin_transport_wlan.c:1491
 msgid "# HELLO messages received"
 msgstr "# HELLO-Meldungen empfangen"
 
-#: src/topology/gnunet-daemon-topology.c:1112
-#, fuzzy
-msgid "# HELLO messages gossipped"
-msgstr "# ausgehender Nachrichten verworfen"
-
-#: src/topology/gnunet-daemon-topology.c:1283
+#: src/topology/gnunet-daemon-topology.c:1233
 msgid "GNUnet topology control"
 msgstr ""
 
@@ -7126,255 +6885,255 @@
 msgid "# Addresses given to ATS"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_blacklist.c:284
-#, c-format
-msgid "Adding blacklisting entry for peer `%s'\n"
+#: src/transport/gnunet-service-transport.c:448
+msgid "# messages dropped due to slow client"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_blacklist.c:293
-#, c-format
-msgid "Adding blacklisting entry for peer `%s':`%s'\n"
+#: src/transport/gnunet-service-transport.c:809
+msgid "# bytes payload dropped (other peer was not connected)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_blacklist.c:500
-#: src/transport/gnunet-service-transport_blacklist.c:851
-msgid "# disconnects due to blacklist"
-msgstr ""
-
-#: src/transport/gnunet-service-transport_blacklist.c:855
-#, fuzzy, c-format
-msgid "Disallowing connection to peer `%s' on transport %s\n"
-msgstr "Anwendung `%s' konnte nicht initialisiert werden.\n"
-
-#: src/transport/gnunet-service-transport.c:231
+#: src/transport/gnunet-service-transport.c:1539
 msgid "# bytes payload discarded due to not connected peer"
 msgstr ""
 
-#: src/transport/gnunet-service-transport.c:383
+#: src/transport/gnunet-service-transport.c:1698
 msgid "# bytes total received"
 msgstr "# Bytes insgesamt empfangen"
 
-#: src/transport/gnunet-service-transport.c:478
+#: src/transport/gnunet-service-transport.c:1795
 msgid "# bytes payload received"
 msgstr "# Bytes Nutzdaten empfangen"
 
-#: src/transport/gnunet-service-transport.c:823
-msgid "Transport service is lacking key configuration settings. Exiting.\n"
+#: src/transport/gnunet-service-transport.c:2112
+#: src/transport/gnunet-service-transport.c:2584
+msgid "# disconnects due to blacklist"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_clients.c:523
-msgid "# messages dropped due to slow client"
+#: src/transport/gnunet-service-transport.c:2588
+#, fuzzy, c-format
+msgid "Disallowing connection to peer `%s' on transport %s\n"
+msgstr "Anwendung `%s' konnte nicht initialisiert werden.\n"
+
+#: src/transport/gnunet-service-transport.c:2696
+#, c-format
+msgid "Adding blacklisting entry for peer `%s'\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_clients.c:845
-msgid "# bytes payload dropped (other peer was not connected)"
+#: src/transport/gnunet-service-transport.c:2705
+#, c-format
+msgid "Adding blacklisting entry for peer `%s':`%s'\n"
 msgstr ""
 
+#: src/transport/gnunet-service-transport.c:2770
+msgid "Transport service is lacking key configuration settings. Exiting.\n"
+msgstr ""
+
 #: src/transport/gnunet-service-transport_hello.c:195
 msgid "# refreshed my HELLO"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:805
+#: src/transport/gnunet-service-transport_neighbours.c:804
 #, fuzzy
 msgid "# session creation failed"
 msgstr " Verbindung fehlgeschlagen\n"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1048
+#: src/transport/gnunet-service-transport_neighbours.c:1047
 msgid "# DISCONNECT messages sent"
 msgstr "# DISCONNECT-Meldungen empfangen"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1168
+#: src/transport/gnunet-service-transport_neighbours.c:1167
 msgid "# disconnects due to quota of 0"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1311
-#: src/transport/gnunet-service-transport_neighbours.c:1764
+#: src/transport/gnunet-service-transport_neighbours.c:1310
+#: src/transport/gnunet-service-transport_neighbours.c:1763
 #, fuzzy
 msgid "# bytes in message queue for other peers"
 msgstr "# Bytes ausgehender Nachrichten verworfen"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1316
+#: src/transport/gnunet-service-transport_neighbours.c:1315
 #, fuzzy
 msgid "# messages transmitted to other peers"
 msgstr "# Bytes des Typs %d übertragen"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1322
+#: src/transport/gnunet-service-transport_neighbours.c:1321
 msgid "# transmission failures for messages to other peers"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1382
+#: src/transport/gnunet-service-transport_neighbours.c:1381
 msgid "# messages timed out while in transport queue"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1458
+#: src/transport/gnunet-service-transport_neighbours.c:1457
 msgid "# KEEPALIVES sent"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1494
+#: src/transport/gnunet-service-transport_neighbours.c:1493
 msgid "# KEEPALIVE messages discarded (peer unknown)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1502
+#: src/transport/gnunet-service-transport_neighbours.c:1501
 msgid "# KEEPALIVE messages discarded (no session)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1512
+#: src/transport/gnunet-service-transport_neighbours.c:1511
 msgid "# KEEPALIVES received in good order"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1557
+#: src/transport/gnunet-service-transport_neighbours.c:1556
 msgid "# KEEPALIVE_RESPONSEs discarded (not connected)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1566
+#: src/transport/gnunet-service-transport_neighbours.c:1565
 msgid "# KEEPALIVE_RESPONSEs discarded (not expected)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1574
+#: src/transport/gnunet-service-transport_neighbours.c:1573
 msgid "# KEEPALIVE_RESPONSEs discarded (address changed)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1583
+#: src/transport/gnunet-service-transport_neighbours.c:1582
 msgid "# KEEPALIVE_RESPONSEs discarded (no nonce)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1588
+#: src/transport/gnunet-service-transport_neighbours.c:1587
 msgid "# KEEPALIVE_RESPONSEs discarded (bad nonce)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1594
+#: src/transport/gnunet-service-transport_neighbours.c:1593
 msgid "# KEEPALIVE_RESPONSEs received (OK)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1661
+#: src/transport/gnunet-service-transport_neighbours.c:1660
 msgid "# messages discarded due to lack of neighbour record"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1695
+#: src/transport/gnunet-service-transport_neighbours.c:1694
 #, fuzzy
 msgid "# bandwidth quota violations by other peers"
 msgstr "Verfolgt die Bandbreitennutzung von gnunetd"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1710
+#: src/transport/gnunet-service-transport_neighbours.c:1709
 msgid "# ms throttling suggested"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1830
+#: src/transport/gnunet-service-transport_neighbours.c:1829
 #, 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:1850
+#: src/transport/gnunet-service-transport_neighbours.c:1849
 msgid "# Failed attempts to switch addresses (failed to send SYN CONT)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1889
+#: src/transport/gnunet-service-transport_neighbours.c:1888
 #, fuzzy
 msgid "# SYN messages sent"
 msgstr "# DISCONNECT-Meldungen empfangen"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1906
+#: src/transport/gnunet-service-transport_neighbours.c:1905
 #, 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:1936
+#: src/transport/gnunet-service-transport_neighbours.c:1935
 msgid "# Failed attempts to switch addresses (failed to send SYN)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:2001
+#: src/transport/gnunet-service-transport_neighbours.c:2000
 #, 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:2055
+#: src/transport/gnunet-service-transport_neighbours.c:2054
 #, fuzzy
 msgid "# SYN_ACK messages sent"
 msgstr "# verschlüsselter PONG Nachrichten gesendet"
 
-#: src/transport/gnunet-service-transport_neighbours.c:2072
+#: src/transport/gnunet-service-transport_neighbours.c:2071
 #, 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:2228
+#: src/transport/gnunet-service-transport_neighbours.c:2227
 #, fuzzy
 msgid "# SYN messages received"
 msgstr "# PING Nachrichten erstellt"
 
-#: src/transport/gnunet-service-transport_neighbours.c:2233
+#: src/transport/gnunet-service-transport_neighbours.c:2232
 #, c-format
 msgid "SYN request from peer `%s' ignored due impending shutdown\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:2599
+#: src/transport/gnunet-service-transport_neighbours.c:2598
 msgid "# Attempts to switch addresses"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3081
+#: src/transport/gnunet-service-transport_neighbours.c:3080
 #, fuzzy
 msgid "# SYN_ACK messages received"
 msgstr "# SESSION_ACK-Meldungen empfangen"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3089
+#: src/transport/gnunet-service-transport_neighbours.c:3088
 #, fuzzy
 msgid "# unexpected SYN_ACK messages (no peer)"
 msgstr "# verschlüsselter PONG Nachrichten gesendet"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3107
-#: src/transport/gnunet-service-transport_neighbours.c:3131
+#: src/transport/gnunet-service-transport_neighbours.c:3106
+#: src/transport/gnunet-service-transport_neighbours.c:3130
 #, fuzzy
 msgid "# unexpected SYN_ACK messages (not ready)"
 msgstr "# verschlüsselter PONG Nachrichten gesendet"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3143
+#: src/transport/gnunet-service-transport_neighbours.c:3142
 #, fuzzy
 msgid "# unexpected SYN_ACK messages (waiting on ATS)"
 msgstr "# verschlüsselter PONG Nachrichten gesendet"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3168
+#: src/transport/gnunet-service-transport_neighbours.c:3167
 msgid "# Successful attempts to switch addresses"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3181
+#: src/transport/gnunet-service-transport_neighbours.c:3180
 #, fuzzy
 msgid "# unexpected SYN_ACK messages (disconnecting)"
 msgstr "# verschlüsselter PONG Nachrichten gesendet"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3353
+#: src/transport/gnunet-service-transport_neighbours.c:3352
 #, fuzzy
 msgid "# ACK messages received"
 msgstr "# CONNECT_ACK-Meldungen empfangen"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3389
+#: src/transport/gnunet-service-transport_neighbours.c:3388
 #, fuzzy
 msgid "# unexpected ACK messages"
 msgstr "# verschlüsselter PONG Nachrichten gesendet"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3477
+#: src/transport/gnunet-service-transport_neighbours.c:3476
 #, fuzzy
 msgid "# quota messages ignored (malformed)"
 msgstr "# gap Anfragen verworfen: Kollision in RT"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3484
+#: src/transport/gnunet-service-transport_neighbours.c:3483
 #, fuzzy
 msgid "# QUOTA messages received"
 msgstr "# verschlüsselter PONG Nachrichten empfangen"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3524
+#: src/transport/gnunet-service-transport_neighbours.c:3523
 msgid "# disconnect messages ignored (malformed)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3531
+#: src/transport/gnunet-service-transport_neighbours.c:3530
 #, fuzzy
 msgid "# DISCONNECT messages received"
 msgstr "# verschlüsselter PONG Nachrichten empfangen"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3542
+#: src/transport/gnunet-service-transport_neighbours.c:3541
 msgid "# disconnect messages ignored (timestamp)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3676
+#: src/transport/gnunet-service-transport_neighbours.c:3675
 msgid "# disconnected from peer upon explicit request"
 msgstr ""
 
@@ -7402,64 +7161,64 @@
 msgid "Did not load plugin `%s' due to missing functions\n"
 msgstr "Fehler beim Laden des Plugins `%s' bei %s:%d. Plugin wird entladen.\n"
 
-#: src/transport/gnunet-service-transport_validation.c:343
+#: src/transport/gnunet-service-transport_validation.c:388
 msgid "# Addresses in validation map"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:452
-#: src/transport/gnunet-service-transport_validation.c:638
-#: src/transport/gnunet-service-transport_validation.c:949
-#: src/transport/gnunet-service-transport_validation.c:1551
+#: src/transport/gnunet-service-transport_validation.c:491
+#: src/transport/gnunet-service-transport_validation.c:677
+#: src/transport/gnunet-service-transport_validation.c:988
+#: src/transport/gnunet-service-transport_validation.c:1590
 #, fuzzy
 msgid "# validations running"
 msgstr "Sqlite-Datenbank läuft\n"
 
-#: src/transport/gnunet-service-transport_validation.c:493
+#: src/transport/gnunet-service-transport_validation.c:532
 #, fuzzy
 msgid "# address records discarded (timeout)"
 msgstr "# verworfener Adressdatensätze"
 
-#: src/transport/gnunet-service-transport_validation.c:541
+#: src/transport/gnunet-service-transport_validation.c:580
 #, fuzzy
 msgid "# address records discarded (blacklist)"
 msgstr "# verworfener Adressdatensätze"
 
-#: src/transport/gnunet-service-transport_validation.c:629
+#: src/transport/gnunet-service-transport_validation.c:668
 msgid "# PINGs for address validation sent"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:709
+#: src/transport/gnunet-service-transport_validation.c:748
 msgid "# validations delayed by global throttle"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:746
+#: src/transport/gnunet-service-transport_validation.c:785
 msgid "# address revalidations started"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1075
+#: src/transport/gnunet-service-transport_validation.c:1114
 #, fuzzy
 msgid "# PING message for different peer received"
 msgstr "# PING Nachrichten erstellt"
 
-#: src/transport/gnunet-service-transport_validation.c:1126
+#: src/transport/gnunet-service-transport_validation.c:1165
 #, c-format
 msgid "Plugin `%s' not available, cannot confirm having this address\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1139
+#: src/transport/gnunet-service-transport_validation.c:1178
 msgid "# failed address checks during validation"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1142
+#: src/transport/gnunet-service-transport_validation.c:1181
 #, c-format
 msgid "Address `%s' is not one of my addresses, not confirming PING\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1150
+#: src/transport/gnunet-service-transport_validation.c:1189
 msgid "# successful address checks during validation"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1163
+#: src/transport/gnunet-service-transport_validation.c:1202
 #, c-format
 msgid ""
 "Not confirming PING from peer `%s' with address `%s' since I cannot confirm "
@@ -7466,58 +7225,57 @@
 "having this address.\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1218
+#: src/transport/gnunet-service-transport_validation.c:1257
 #, c-format
 msgid "Failed to create PONG signature for peer `%s'\n"
 msgstr "PONG-Signatur für Knoten »%s« konnte nicht erstellt werden\n"
 
-#: src/transport/gnunet-service-transport_validation.c:1269
+#: src/transport/gnunet-service-transport_validation.c:1308
 msgid "# PONGs unicast via reliable transport"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1278
+#: src/transport/gnunet-service-transport_validation.c:1317
 msgid "# PONGs multicast to all available addresses"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1441
+#: src/transport/gnunet-service-transport_validation.c:1480
 msgid "# PONGs dropped, no matching pending validation"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1459
+#: src/transport/gnunet-service-transport_validation.c:1498
 msgid "# PONGs dropped, signature expired"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1514
+#: src/transport/gnunet-service-transport_validation.c:1553
 msgid "# validations succeeded"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:558
+#: src/transport/gnunet-transport.c:518
 #, c-format
 msgid "Transmitted %llu bytes/s (%llu bytes in %s)\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:567
-#: src/transport/gnunet-transport-profiler.c:277
+#: src/transport/gnunet-transport.c:528
 #, c-format
 msgid "Received %llu bytes/s (%llu bytes in %s)\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:608
+#: src/transport/gnunet-transport.c:572
 #, 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:621
+#: src/transport/gnunet-transport.c:585
 #, 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:633
+#: src/transport/gnunet-transport.c:597
 #, fuzzy
 msgid "Failed to list connections, timeout occured\n"
 msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
 
-#: src/transport/gnunet-transport.c:658 src/transport/gnunet-transport.c:683
+#: src/transport/gnunet-transport.c:622 src/transport/gnunet-transport.c:647
 #, fuzzy, c-format
 msgid "Configuration for plugin `%s' did not work!\n"
 msgstr ""
@@ -7524,65 +7282,46 @@
 "Die Konfigurationsdatei muss in der Sektion `%s' unter `%s' ein Verzeichnis "
 "angeben, in dem FS Daten gespeichert werden.\n"
 
-#: src/transport/gnunet-transport.c:663
+#: src/transport/gnunet-transport.c:627
 #, fuzzy, c-format
 msgid "Configuration for plugin `%s' did work!\n"
 msgstr "GNUnet wurde erfolgreich heruntergefahren.\n"
 
-#: src/transport/gnunet-transport.c:668
+#: src/transport/gnunet-transport.c:632
 #, fuzzy, c-format
 msgid "Internal NAT error while running test for plugin `%s'\n"
 msgstr "Absicherung fehlgeschlagen bei %s:%d.\n"
 
-#: src/transport/gnunet-transport.c:673
+#: src/transport/gnunet-transport.c:637
 #, fuzzy, c-format
 msgid "Failed to start NAT test for plugin `%s'\n"
 msgstr "Der Transportdienst auf Port %d konnte nicht gestartet werden.\n"
 
-#: src/transport/gnunet-transport.c:678
+#: src/transport/gnunet-transport.c:642
 #, c-format
 msgid "Timeout while waiting for result of NAT test for plugin `%s'\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:803
-#, c-format
-msgid ""
-"Peer `%s' %s %s\n"
-"\t%s%s\n"
-"\t%s%s\n"
-"\t%s%s\n"
-msgstr ""
-
-#: src/transport/gnunet-transport.c:838
-#, c-format
-msgid "Peer `%s' %s `%s' \n"
-msgstr "Knoten »%s« %s »%s« \n"
-
-#: src/transport/gnunet-transport.c:927 src/transport/gnunet-transport.c:1673
-#, fuzzy
-msgid "Monitor disconnected from transport service. Reconnecting.\n"
-msgstr "Verbindung zum Transportdienst konnte nicht hergestellt werden\n"
-
-#: src/transport/gnunet-transport.c:982
+#: src/transport/gnunet-transport.c:735
 msgid "No transport plugins configured, peer will never communicate\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:996
+#: src/transport/gnunet-transport.c:749
 #, c-format
 msgid "No port configured for plugin `%s', cannot test it\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1021
+#: src/transport/gnunet-transport.c:774
 #, fuzzy
 msgid "Failed to start resolver!\n"
 msgstr "Fehler beim Starten der Collection.\n"
 
-#: src/transport/gnunet-transport.c:1067
+#: src/transport/gnunet-transport.c:810
 #, c-format
-msgid "Transmitting %u bytes to %s\n"
+msgid "Transmitting %u bytes\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1096
+#: src/transport/gnunet-transport.c:844
 #, c-format
 msgid ""
 "Successfully connected to `%s', starting to send benchmark data in %u Kb "
@@ -7589,42 +7328,45 @@
 "blocks\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1133
-#: src/transport/gnunet-transport-profiler.c:432
+#: src/transport/gnunet-transport.c:875
 #, c-format
 msgid "Disconnected from peer `%s' while benchmarking\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1158 src/transport/gnunet-transport.c:1184
+#: src/transport/gnunet-transport.c:899 src/transport/gnunet-transport.c:928
 #, c-format
 msgid "%24s: %-17s %4s   (%u connections in total)\n"
 msgstr "%24s: %-17s %4s   (%u Verbindungen insgesamt)\n"
 
-#: src/transport/gnunet-transport.c:1160
+#: src/transport/gnunet-transport.c:901
 msgid "Connected to"
 msgstr "Verbunden mit"
 
-#: src/transport/gnunet-transport.c:1186
+#: src/transport/gnunet-transport.c:930
 msgid "Disconnected from"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1210
-#: src/transport/gnunet-transport-profiler.c:457
+#: src/transport/gnunet-transport.c:965
 #, fuzzy, c-format
-msgid "Received %u bytes from %s\n"
+msgid "Received %u bytes\n"
 msgstr "Dateien aus dem GNUnet herunterladen."
 
-#: src/transport/gnunet-transport.c:1250
+#: src/transport/gnunet-transport.c:1002
 #, c-format
 msgid "Peer `%s': %s %s in state `%s' until %s\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1262
+#: src/transport/gnunet-transport.c:1014
 #, c-format
 msgid "Peer `%s': %s %s\n"
 msgstr "Knoten »%s«: %s %s\n"
 
-#: src/transport/gnunet-transport.c:1792
+#: src/transport/gnunet-transport.c:1426
+#, fuzzy
+msgid "Monitor disconnected from transport service. Reconnecting.\n"
+msgstr "Verbindung zum Transportdienst konnte nicht hergestellt werden\n"
+
+#: src/transport/gnunet-transport.c:1548
 #, c-format
 msgid ""
 "Multiple operations given. Please choose only one operation: %s, %s, %s, %s, "
@@ -7631,214 +7373,136 @@
 "%s, %s %s\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1800
+#: src/transport/gnunet-transport.c:1561
 #, c-format
 msgid ""
 "No operation given. Please choose one operation: %s, %s, %s, %s, %s, %s, %s\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1823
+#: src/transport/gnunet-transport.c:1589
 #, 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:1829
+#: src/transport/gnunet-transport.c:1595
 msgid "Blacklisting request in place, stop with CTRL-C\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1848 src/transport/gnunet-transport.c:1867
-#: src/transport/gnunet-transport.c:1925
-#: src/transport/gnunet-transport-profiler.c:553
+#: src/transport/gnunet-transport.c:1618 src/transport/gnunet-transport.c:1648
+#: src/transport/gnunet-transport.c:1701
 msgid "Failed to connect to transport service\n"
 msgstr "Verbindung zum Transportdienst konnte nicht hergestellt werden\n"
 
-#: src/transport/gnunet-transport.c:1872
+#: src/transport/gnunet-transport.c:1655
 msgid "Starting to receive benchmark data\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1972
+#: src/transport/gnunet-transport.c:1725
 #, fuzzy
 msgid "print information for all peers (instead of only connected peers)"
 msgstr "Informationen über verbundene Knoten ausgeben."
 
-#: src/transport/gnunet-transport.c:1975
+#: src/transport/gnunet-transport.c:1728
 msgid "measure how fast we are receiving data from all peers (until CTRL-C)"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1978
+#: src/transport/gnunet-transport.c:1731
 msgid "disconnect from a peer"
 msgstr "Verbindung zu einem Knoten trennen"
 
-#: src/transport/gnunet-transport.c:1981
-msgid "print information for all pending validations "
-msgstr ""
-
-#: src/transport/gnunet-transport.c:1984
-msgid "print information for all pending validations continuously"
-msgstr ""
-
-#: src/transport/gnunet-transport.c:1987
+#: src/transport/gnunet-transport.c:1734
 msgid "provide information about all current connections (once)"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1993
+#: src/transport/gnunet-transport.c:1740
 msgid ""
 "provide information about all connects and disconnect events (continuously)"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1996
+#: src/transport/gnunet-transport.c:1743
 msgid "do not resolve hostnames"
 msgstr "Keine Rechnernamen auflösen"
 
-#: src/transport/gnunet-transport.c:1999
-#: src/transport/gnunet-transport-profiler.c:618
+#: src/transport/gnunet-transport.c:1746
+#: src/transport/gnunet-transport-profiler.c:631
 msgid "peer identity"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:2002
+#: src/transport/gnunet-transport.c:1749
 msgid "monitor plugin sessions"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:2005
+#: src/transport/gnunet-transport.c:1752
 msgid "send data for benchmarking to the other peer (until CTRL-C)"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:2008
+#: src/transport/gnunet-transport.c:1755
 msgid "test transport configuration (involves external server)"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:2019
-#: src/transport/gnunet-transport-profiler.c:629
+#: src/transport/gnunet-transport.c:1766
+#: src/transport/gnunet-transport-profiler.c:642
 msgid "Direct access to transport service."
 msgstr "Direkter Zugriff auf den Transportdienst"
 
-#: src/transport/gnunet-transport-profiler.c:221
+#: src/transport/gnunet-transport-profiler.c:219
 #, c-format
 msgid "%llu B in %llu ms == %.2f KB/s!\n"
 msgstr ""
 
-#: src/transport/gnunet-transport-profiler.c:257
-#, c-format
-msgid "%u;%u;%llu;%llu;%.2f;%.2f"
-msgstr ""
-
-#: src/transport/gnunet-transport-profiler.c:266
-#, c-format
-msgid ";%llu;%.2f"
-msgstr ""
-
-#: src/transport/gnunet-transport-profiler.c:283
-msgid "\n"
-msgstr ""
-
-#: src/transport/gnunet-transport-profiler.c:336
-msgid "."
-msgstr ""
-
-#: src/transport/gnunet-transport-profiler.c:356
-#, c-format
-msgid ""
-"\n"
-"Starting benchmark to `%s', starting to send %u messages in %u byte blocks\n"
-msgstr ""
-
-#: src/transport/gnunet-transport-profiler.c:404
-#, fuzzy, c-format
-msgid "Connected to different peer `%s'\n"
-msgstr "# verbundener Knoten"
-
-#: src/transport/gnunet-transport-profiler.c:411
-#, c-format
-msgid "Successfully connected to `%s'\n"
-msgstr "Mit »%s« wurde erfolgreich verbunden.\n"
-
-#: src/transport/gnunet-transport-profiler.c:473
-#, fuzzy, c-format
-msgid "Denying connection to `%s'\n"
-msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
-
-#: src/transport/gnunet-transport-profiler.c:503
-msgid "Message size too big!\n"
-msgstr ""
-
-#: src/transport/gnunet-transport-profiler.c:509
-#, fuzzy
-msgid "No peer identity given\n"
-msgstr "Kein Knoten angegeben!\n"
-
-#: src/transport/gnunet-transport-profiler.c:524
-#, c-format
-msgid "Trying to send %u messages with size %u to peer `%s'\n"
-msgstr ""
-
-#: src/transport/gnunet-transport-profiler.c:530
-#, fuzzy, c-format
-msgid "Trying to receive messages from peer `%s'\n"
-msgstr "Fehler beim Parsen der Gerätedaten von `%s' bei %s:%d.\n"
-
-#: src/transport/gnunet-transport-profiler.c:535
-#, fuzzy
-msgid "No operation given\n"
-msgstr "Kein Knoten angegeben!\n"
-
-#: src/transport/gnunet-transport-profiler.c:542
-#, fuzzy
-msgid "Failed to connect to ATS service\n"
-msgstr "Verbindung zum DHT-Dienst ist fehlgeschlagen!\n"
-
-#: src/transport/gnunet-transport-profiler.c:603
+#: src/transport/gnunet-transport-profiler.c:616
 msgid "send data to peer"
 msgstr ""
 
-#: src/transport/gnunet-transport-profiler.c:606
+#: src/transport/gnunet-transport-profiler.c:619
 #, fuzzy
 msgid "receive data from peer"
 msgstr "# Bytes des Typs %d empfangen"
 
-#: src/transport/gnunet-transport-profiler.c:609
+#: src/transport/gnunet-transport-profiler.c:622
 msgid "iterations"
 msgstr ""
 
-#: src/transport/gnunet-transport-profiler.c:612
+#: src/transport/gnunet-transport-profiler.c:625
 #, fuzzy
 msgid "number of messages to send"
 msgstr "Anzahl an Durchläufen"
 
-#: src/transport/gnunet-transport-profiler.c:615
+#: src/transport/gnunet-transport-profiler.c:628
 msgid "message size to use"
 msgstr ""
 
-#: src/transport/plugin_transport_http_client.c:1473
-#: src/transport/plugin_transport_http_server.c:2237
-#: src/transport/plugin_transport_http_server.c:3427
-#: src/transport/plugin_transport_tcp.c:2985
-#: src/transport/plugin_transport_tcp.c:2992
+#: src/transport/plugin_transport_http_client.c:1477
+#: src/transport/plugin_transport_http_server.c:2248
+#: src/transport/plugin_transport_http_server.c:3457
+#: src/transport/plugin_transport_tcp.c:3365
+#: src/transport/plugin_transport_tcp.c:3372
 msgid "TCP_STEALTH not supported on this platform.\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_client.c:2114
+#: src/transport/plugin_transport_http_client.c:2118
 #, c-format
 msgid "Could not initialize curl multi handle, failed to start %s plugin!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_client.c:2163
-#: src/transport/plugin_transport_http_server.c:3142
+#: src/transport/plugin_transport_http_client.c:2167
+#: src/transport/plugin_transport_http_server.c:3172
 #, fuzzy, c-format
 msgid "Shutting down plugin `%s'\n"
 msgstr "Collection `%s' begonnen.\n"
 
-#: src/transport/plugin_transport_http_client.c:2180
-#: src/transport/plugin_transport_http_server.c:3212
+#: src/transport/plugin_transport_http_client.c:2184
+#: src/transport/plugin_transport_http_server.c:3242
 #, fuzzy, c-format
 msgid "Shutdown for plugin `%s' complete\n"
 msgstr "GNUnet wurde erfolgreich heruntergefahren.\n"
 
-#: src/transport/plugin_transport_http_client.c:2214
+#: src/transport/plugin_transport_http_client.c:2218
 #, 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:1721
+#: src/transport/plugin_transport_http_server.c:1729
 #, c-format
 msgid ""
 "Access from connection %p (%u of %u) for `%s' `%s' url `%s' with upload data "
@@ -7845,116 +7509,96 @@
 "size %u\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:1955
+#: src/transport/plugin_transport_http_server.c:1966
 #, c-format
 msgid "Accepting connection (%u of %u) from `%s'\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:1963
+#: src/transport/plugin_transport_http_server.c:1974
 #, c-format
 msgid ""
 "Server reached maximum number connections (%u), rejecting new connection\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:2113
+#: src/transport/plugin_transport_http_server.c:2124
 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:2136
+#: src/transport/plugin_transport_http_server.c:2147
 #, c-format
 msgid "No usable TLS certificate found and creating one at `%s/%s' failed!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:2263
+#: src/transport/plugin_transport_http_server.c:2274
 msgid "Could not load or create server certificate! Loading plugin failed!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:2572
+#: src/transport/plugin_transport_http_server.c:2583
 msgid "Require valid port number for service in configuration!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:2606 src/util/service.c:704
+#: src/transport/plugin_transport_http_server.c:2748
 #, c-format
-msgid "Failed to resolve `%s': %s\n"
-msgstr "»%s« konnte nicht aufgelöst werden: %s\n"
-
-#: src/transport/plugin_transport_http_server.c:2624 src/util/service.c:723
-#, fuzzy, c-format
-msgid "Failed to find %saddress for `%s'.\n"
-msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
-
-#: src/transport/plugin_transport_http_server.c:2737
-#, c-format
 msgid "Found %u addresses to report to NAT service\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:2815
+#: src/transport/plugin_transport_http_server.c:2832
 #: src/transport/plugin_transport_udp.c:3600
 msgid "Disabling IPv6 since it is not supported on this system!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:2918
+#: src/transport/plugin_transport_http_server.c:2938
 #, c-format
 msgid "IPv4 support is %s\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:2933
+#: src/transport/plugin_transport_http_server.c:2953
 #, c-format
 msgid "IPv6 support is %s\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:2939
+#: src/transport/plugin_transport_http_server.c:2959
 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:2950
+#: src/transport/plugin_transport_http_server.c:2970
 msgid "Port is required! Fix in configuration\n"
 msgstr "Port ist erforderlich! Bearbeiten Sie die Konfiguration\n"
 
-#: src/transport/plugin_transport_http_server.c:2956
+#: src/transport/plugin_transport_http_server.c:2976
 #, c-format
 msgid "Using port %u\n"
 msgstr "Port %u wird verwendet\n"
 
-#: src/transport/plugin_transport_http_server.c:2970
+#: src/transport/plugin_transport_http_server.c:2995
 #, c-format
 msgid "Specific IPv4 address `%s' in configuration file is invalid!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:2980
+#: src/transport/plugin_transport_http_server.c:3030
 #, c-format
-msgid "Binding to IPv4 address %s\n"
-msgstr ""
-
-#: src/transport/plugin_transport_http_server.c:3002
-#, c-format
 msgid "Specific IPv6 address `%s' in configuration file is invalid!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:3012
+#: src/transport/plugin_transport_http_server.c:3105
 #, c-format
-msgid "Binding to IPv6 address %s\n"
-msgstr ""
-
-#: src/transport/plugin_transport_http_server.c:3075
-#, c-format
 msgid "Using external hostname `%s'\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:3096
+#: src/transport/plugin_transport_http_server.c:3126
 #, fuzzy, c-format
 msgid "Notifying transport only about hostname `%s'\n"
 msgstr "Teste Transport(e) %s\n"
 
-#: src/transport/plugin_transport_http_server.c:3113
+#: src/transport/plugin_transport_http_server.c:3143
 #, 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:3439
+#: src/transport/plugin_transport_http_server.c:3469
 msgid "Unable to compile URL regex\n"
 msgstr ""
 
@@ -8004,104 +7648,98 @@
 msgid "# bytes dropped by SMTP (outgoing)"
 msgstr "# Bytes verworfen von SMTP (ausgehend)"
 
-#: src/transport/plugin_transport_tcp.c:672
-#: src/transport/plugin_transport_tcp.c:1983
+#: src/transport/plugin_transport_tcp.c:1051
+#: src/transport/plugin_transport_tcp.c:2362
 #, c-format
 msgid "Unexpected address length: %u bytes\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:855
-#: src/transport/plugin_transport_tcp.c:1079
-#: src/transport/plugin_transport_tcp.c:2253
-#: src/transport/plugin_transport_tcp.c:3106
+#: src/transport/plugin_transport_tcp.c:1234
+#: src/transport/plugin_transport_tcp.c:1458
+#: src/transport/plugin_transport_tcp.c:2633
+#: src/transport/plugin_transport_tcp.c:3490
 msgid "# TCP sessions active"
 msgstr "# aktive TCP-Sitzungen"
 
-#: src/transport/plugin_transport_tcp.c:897
-#: src/transport/plugin_transport_tcp.c:1061
-#: src/transport/plugin_transport_tcp.c:1185
-#: src/transport/plugin_transport_tcp.c:1258
-#: src/transport/plugin_transport_tcp.c:1358
-#: src/transport/plugin_transport_tcp.c:1383
+#: src/transport/plugin_transport_tcp.c:1276
+#: src/transport/plugin_transport_tcp.c:1440
+#: src/transport/plugin_transport_tcp.c:1564
+#: src/transport/plugin_transport_tcp.c:1637
+#: src/transport/plugin_transport_tcp.c:1737
+#: src/transport/plugin_transport_tcp.c:1762
 msgid "# bytes currently in TCP buffers"
 msgstr "# Bytes derzeit in TCP-Puffern"
 
-#: src/transport/plugin_transport_tcp.c:900
+#: src/transport/plugin_transport_tcp.c:1279
 msgid "# bytes discarded by TCP (disconnect)"
 msgstr "# Bytes verworfen von TCP (unterbrochen)"
 
-#: src/transport/plugin_transport_tcp.c:1188
+#: src/transport/plugin_transport_tcp.c:1567
 msgid "# bytes discarded by TCP (timeout)"
 msgstr "# Bytes verworfen von TCP (Zeitüberschreitung)"
 
-#: src/transport/plugin_transport_tcp.c:1262
+#: src/transport/plugin_transport_tcp.c:1641
 msgid "# bytes transmitted via TCP"
 msgstr "# Bytes über TCP übertragen"
 
-#: src/transport/plugin_transport_tcp.c:1653
+#: src/transport/plugin_transport_tcp.c:2032
 msgid "# requests to create session with invalid address"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:1821
+#: src/transport/plugin_transport_tcp.c:2200
 msgid "# transport-service disconnect requests for TCP"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2312
+#: src/transport/plugin_transport_tcp.c:2692
 #, fuzzy
 msgid "# TCP WELCOME messages received"
 msgstr "# verschlüsselter PONG Nachrichten empfangen"
 
-#: src/transport/plugin_transport_tcp.c:2503
+#: src/transport/plugin_transport_tcp.c:2883
 msgid "# bytes received via TCP"
 msgstr "# Bytes empfangen über TCP"
 
-#: src/transport/plugin_transport_tcp.c:2554
-#: src/transport/plugin_transport_tcp.c:2612
+#: src/transport/plugin_transport_tcp.c:2934
+#: src/transport/plugin_transport_tcp.c:2992
 #, fuzzy
 msgid "# TCP server connections active"
 msgstr " Verbindung fehlgeschlagen\n"
 
-#: src/transport/plugin_transport_tcp.c:2558
+#: src/transport/plugin_transport_tcp.c:2938
 #, fuzzy
 msgid "# TCP server connect events"
 msgstr "# verbundener Knoten"
 
-#: src/transport/plugin_transport_tcp.c:2564
+#: src/transport/plugin_transport_tcp.c:2944
 msgid "TCP connection limit reached, suspending server\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2566
+#: src/transport/plugin_transport_tcp.c:2946
 msgid "# TCP service suspended"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2606
+#: src/transport/plugin_transport_tcp.c:2986
 msgid "# TCP service resumed"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2616
+#: src/transport/plugin_transport_tcp.c:2996
 msgid "# network-level TCP disconnect events"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2919 src/util/service.c:584
-#: src/util/service.c:590
-#, c-format
-msgid "Require valid port number for service `%s' in configuration!\n"
-msgstr ""
-
-#: src/transport/plugin_transport_tcp.c:2935
+#: src/transport/plugin_transport_tcp.c:3315
 msgid "Failed to start service.\n"
 msgstr "Fehler beim Starten des Dienstes.\n"
 
-#: src/transport/plugin_transport_tcp.c:3094
+#: src/transport/plugin_transport_tcp.c:3478
 #, c-format
 msgid "TCP transport listening on port %llu\n"
 msgstr "TCP-Transportdienst wartet auf Port %llu\n"
 
-#: src/transport/plugin_transport_tcp.c:3098
+#: src/transport/plugin_transport_tcp.c:3482
 msgid "TCP transport not listening on any port (client only)\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:3102
+#: src/transport/plugin_transport_tcp.c:3486
 #, c-format
 msgid "TCP transport advertises itself as being on port %llu\n"
 msgstr ""
@@ -8210,7 +7848,7 @@
 
 #: src/transport/plugin_transport_wlan.c:1167
 #: src/transport/plugin_transport_wlan.c:1258
-#: src/transport/plugin_transport_wlan.c:2279
+#: src/transport/plugin_transport_wlan.c:2280
 #, fuzzy
 msgid "# MAC endpoints allocated"
 msgstr "# Sitzungsschlüssel akzeptiert"
@@ -8239,130 +7877,97 @@
 msgid "# DATA messages processed"
 msgstr "# PING Nachrichten erstellt"
 
-#: src/transport/plugin_transport_wlan.c:2254
+#: src/transport/plugin_transport_wlan.c:2255
 #, c-format
 msgid "Helper binary `%s' not SUID, cannot run WLAN transport\n"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:2276
+#: src/transport/plugin_transport_wlan.c:2277
 #, fuzzy
 msgid "# sessions allocated"
 msgstr "# Sitzungsschlüssel akzeptiert"
 
-#: src/transport/transport_api.c:816
-#, fuzzy, c-format
-msgid "Received unexpected message of type %u in %s:%u\n"
-msgstr "Es wurde eine unbekannte Testbed Nachricht des Typs %u empfangen.\n"
-
-#: src/transport/transport-testing.c:676
-#, fuzzy
-msgid "Failed to initialize testing library!\n"
-msgstr "SQLite Datenbank konnte nicht initialisiert werden.\n"
-
 #: src/tun/regex.c:134
 #, c-format
 msgid "Bad mask: %d\n"
 msgstr ""
 
-#: src/util/bio.c:170 src/util/bio.c:178
+#: src/util/bio.c:177 src/util/bio.c:185
 #, fuzzy, c-format
 msgid "Error reading `%s': %s"
 msgstr "Fehler beim Anlegen des Benutzers"
 
-#: src/util/bio.c:180
+#: src/util/bio.c:187
 msgid "End of file"
 msgstr "Dateiende"
 
-#: src/util/bio.c:237
+#: src/util/bio.c:244
 #, c-format
 msgid "Error reading length of string `%s'"
 msgstr ""
 
-#: src/util/bio.c:247
+#: src/util/bio.c:254
 #, c-format
 msgid "String `%s' longer than allowed (%u > %u)"
 msgstr ""
 
-#: src/util/bio.c:293
+#: src/util/bio.c:300
 #, c-format
 msgid "Serialized metadata `%s' larger than allowed (%u>%u)"
 msgstr ""
 
-#: src/util/bio.c:307
+#: src/util/bio.c:314
 #, c-format
 msgid "Metadata `%s' failed to deserialize"
 msgstr ""
 
-#: src/util/client.c:264 src/util/client.c:892 src/util/service.c:621
+#: src/util/client_new.c:863
 #, c-format
-msgid "UNIXPATH `%s' too long, maximum length is %llu\n"
-msgstr ""
-
-#: src/util/client.c:268 src/util/client.c:897 src/util/service.c:625
-#, c-format
-msgid "Using `%s' instead\n"
-msgstr ""
-
-#: src/util/client.c:367
-#, c-format
-msgid ""
-"Could not determine valid hostname and port for service `%s' from "
-"configuration.\n"
-msgstr ""
-
-#: src/util/client.c:375
-#, c-format
 msgid "Need a non-empty hostname for service `%s'.\n"
 msgstr ""
 
-#: src/util/client.c:1042
-#, fuzzy, c-format
-msgid "Could not connect to service `%s', configuration broken.\n"
-msgstr "Verbindung zu gnunetd konnte nicht hergestellt werden.\n"
-
-#: src/util/client.c:1054
-#, fuzzy, c-format
-msgid "Failure to transmit request to service `%s'\n"
-msgstr "Fehler beim Senden einer `%s' Anfrage an den SMTP Server.\n"
-
-#: src/util/common_logging.c:255 src/util/common_logging.c:1062
+#: src/util/common_logging.c:256 src/util/common_logging.c:1129
 msgid "DEBUG"
 msgstr "DEBUG"
 
-#: src/util/common_logging.c:257 src/util/common_logging.c:1060
+#: src/util/common_logging.c:258 src/util/common_logging.c:1127
 msgid "INFO"
 msgstr "INFO"
 
-#: src/util/common_logging.c:259 src/util/common_logging.c:1058
+#: src/util/common_logging.c:260 src/util/common_logging.c:1125
+msgid "MESSAGE"
+msgstr ""
+
+#: src/util/common_logging.c:262 src/util/common_logging.c:1123
 msgid "WARNING"
 msgstr "WARNUNG"
 
-#: src/util/common_logging.c:261 src/util/common_logging.c:1056
+#: src/util/common_logging.c:264 src/util/common_logging.c:1121
 msgid "ERROR"
 msgstr "FEHLER"
 
-#: src/util/common_logging.c:263 src/util/common_logging.c:1064
+#: src/util/common_logging.c:266 src/util/common_logging.c:1131
 msgid "NONE"
 msgstr ""
 
-#: src/util/common_logging.c:840
+#: src/util/common_logging.c:879
 #, c-format
 msgid "Message `%.*s' repeated %u times in the last %s\n"
 msgstr ""
 
-#: src/util/common_logging.c:1065
+#: src/util/common_logging.c:1132
 msgid "INVALID"
 msgstr ""
 
-#: src/util/common_logging.c:1181
+#: src/util/common_logging.c:1248
 msgid "unknown address"
 msgstr "Unbekannte Adresse"
 
-#: src/util/common_logging.c:1223
+#: src/util/common_logging.c:1290
 msgid "invalid address"
 msgstr "Ungültige Adresse"
 
-#: src/util/common_logging.c:1241
+#: src/util/common_logging.c:1308
 #, fuzzy, c-format
 msgid "Configuration fails to specify option `%s' in section `%s'!\n"
 msgstr ""
@@ -8369,7 +7974,7 @@
 "Die Konfigurationsdatei muss in der Sektion `%s' unter `%s' ein Verzeichnis "
 "angeben, in dem FS Daten gespeichert werden.\n"
 
-#: src/util/common_logging.c:1262
+#: src/util/common_logging.c:1329
 #, fuzzy, c-format
 msgid ""
 "Configuration specifies invalid value for option `%s' in section `%s': %s\n"
@@ -8377,12 +7982,17 @@
 "Die Konfigurationsdatei muss in der Sektion `%s' unter `%s' ein Verzeichnis "
 "angeben, in dem FS Daten gespeichert werden.\n"
 
-#: src/util/configuration.c:291
+#: src/util/configuration.c:286
 #, fuzzy, c-format
 msgid "Syntax error while deserializing in line %u\n"
 msgstr "Syntaxfehler in Konfigurationsdatei `%s' in Zeile %d.\n"
 
-#: src/util/configuration.c:1028
+#: src/util/configuration.c:344
+#, fuzzy, c-format
+msgid "Error while reading file `%s'\n"
+msgstr "Konfigurationsdatei `%s' konnte nicht geöffnet werden.\n"
+
+#: src/util/configuration.c:1017
 #, c-format
 msgid ""
 "Configuration value '%s' for '%s' in section '%s' is not in set of legal "
@@ -8389,17 +7999,17 @@
 "choices\n"
 msgstr ""
 
-#: src/util/configuration.c:1147
+#: src/util/configuration.c:1136
 #, c-format
 msgid "Recursive expansion suspected, aborting $-expansion for term `%s'\n"
 msgstr ""
 
-#: src/util/configuration.c:1179
+#: src/util/configuration.c:1169
 #, c-format
 msgid "Missing closing `%s' in option `%s'\n"
 msgstr ""
 
-#: src/util/configuration.c:1253
+#: src/util/configuration.c:1237
 #, c-format
 msgid ""
 "Failed to expand `%s' in `%s' as it is neither found in [PATHS] nor defined "
@@ -8479,17 +8089,22 @@
 msgstr ""
 "libgcrypt hat nicht die erwartete Version (Version %s wird vorausgesetzt).\n"
 
-#: src/util/crypto_rsa.c:1146
+#: src/util/crypto_rsa.c:835
 #, fuzzy, c-format
+msgid "RSA signing failed at %s:%d: %s\n"
+msgstr "`%s' schlug fehl bei %s:%d mit dem Fehler: `%s'.\n"
+
+#: src/util/crypto_rsa.c:1166
+#, fuzzy, c-format
 msgid "RSA signature verification failed at %s:%d: %s\n"
 msgstr "RSA Signaturüberprüfung fehlgeschlagen bei %s:%d: %s\n"
 
-#: src/util/disk.c:1227
+#: src/util/disk.c:1245
 #, fuzzy, c-format
 msgid "Expected `%s' to be a directory!\n"
 msgstr "`%s' erwartet, dass `%s' ein Verzeichnis ist!\n"
 
-#: src/util/disk.c:1450 src/util/service.c:1322
+#: src/util/disk.c:1486 src/util/service.c:1322 src/util/service_new.c:1371
 #, fuzzy, c-format
 msgid "Cannot obtain information about user `%s': %s\n"
 msgstr "Fehler beim Speichern der Konfigurationsdatei: `%s': %s.\n"
@@ -8737,13 +8352,13 @@
 msgid "Manipulate GNUnet proof of work files"
 msgstr ""
 
-#: src/util/gnunet-service-resolver.c:327
+#: src/util/gnunet-service-resolver.c:371
 #, fuzzy, c-format
 msgid "Could not resolve `%s' (%s): %s\n"
 msgstr "`%s' konnte nicht aufgelöst werden: %s\n"
 
-#: src/util/gnunet-service-resolver.c:401
-#: src/util/gnunet-service-resolver.c:442
+#: src/util/gnunet-service-resolver.c:460
+#: src/util/gnunet-service-resolver.c:512
 #, c-format
 msgid "Could not find IP of host `%s': %s\n"
 msgstr "IP des Hosts »%s« konnte nicht ermittelt werden: %s\n"
@@ -8792,7 +8407,7 @@
 msgid "Unable to shorten unix path `%s' while keeping name unique\n"
 msgstr ""
 
-#: src/util/network.c:1731 src/util/network.c:1907
+#: src/util/network.c:1737 src/util/network.c:1913
 #, c-format
 msgid ""
 "Fatal internal logic error, process hangs in `%s' (abort with CTRL-C)!\n"
@@ -8841,17 +8456,17 @@
 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/program.c:244 src/util/service.c:1456 src/util/service_new.c:1801
 #, 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/program.c:256 src/util/service.c:1471 src/util/service_new.c:1818
 #, 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/program.c:261 src/util/service.c:1466 src/util/service_new.c:1812
 #, fuzzy
 msgid "Malformed configuration, exit ...\n"
 msgstr "GNUnet Konfiguration"
@@ -8871,38 +8486,38 @@
 "Sie müssen für `%s' in der Sektion `%s' der Konfigurationsdatei eine "
 "positive Zahl angeben.\n"
 
-#: src/util/resolver_api.c:357
+#: src/util/resolver_api.c:815
+#, fuzzy, c-format
+msgid "Timeout trying to resolve hostname `%s'.\n"
+msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
+
+#: src/util/resolver_api.c:827
 #, c-format
 msgid "Timeout trying to resolve IP address `%s'.\n"
 msgstr ""
 
-#: src/util/resolver_api.c:364
-#, fuzzy, c-format
-msgid "Timeout trying to resolve hostname `%s'.\n"
-msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
-
-#: src/util/resolver_api.c:950
+#: src/util/resolver_api.c:1004
 #, fuzzy
 msgid "Resolver not configured correctly.\n"
 msgstr "Standarddienst »%s« ist nicht korrekt eingerichtet!\n"
 
-#: src/util/resolver_api.c:1026 src/util/resolver_api.c:1047
-#: src/util/resolver_api.c:1061
+#: src/util/resolver_api.c:1086 src/util/resolver_api.c:1107
+#: src/util/resolver_api.c:1121
 #, fuzzy, c-format
 msgid "Could not resolve our FQDN: %s\n"
 msgstr "`%s' konnte nicht aufgelöst werden: %s\n"
 
-#: src/util/server.c:478
+#: src/util/server.c:478 src/util/service_new.c:1103
 #, 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/server.c:488 src/util/service_new.c:1113
 #, 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/server.c:494 src/util/service_new.c:1119
 #, 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"
@@ -8914,7 +8529,7 @@
 "`GNUNET_SERVER_receive_done' after %s\n"
 msgstr ""
 
-#: src/util/service.c:347
+#: src/util/service.c:347 src/util/service_new.c:2335
 #, c-format
 msgid "Unknown address family %d\n"
 msgstr ""
@@ -8924,44 +8539,26 @@
 msgid "Access from `%s' denied to service `%s'\n"
 msgstr ""
 
-#: src/util/service.c:410
+#: src/util/service.c:410 src/util/service_new.c:431
 #, c-format
 msgid "Could not parse IPv4 network specification `%s' for `%s:%s'\n"
 msgstr ""
 
-#: src/util/service.c:448
+#: src/util/service.c:448 src/util/service_new.c:474
 #, c-format
 msgid "Could not parse IPv6 network specification `%s' for `%s:%s'\n"
 msgstr ""
 
-#: src/util/service.c:565
-#, c-format
-msgid ""
-"Disabling IPv6 support for service `%s', failed to create IPv6 socket: %s\n"
-msgstr ""
-
-#: src/util/service.c:656
-#, c-format
-msgid ""
-"Disabling UNIX domain socket support for service `%s', failed to create UNIX "
-"domain socket: %s\n"
-msgstr ""
-
-#: src/util/service.c:673
-#, c-format
-msgid "Have neither PORT nor UNIXPATH for service `%s', but one is required\n"
-msgstr ""
-
-#: src/util/service.c:912
+#: src/util/service.c:912 src/util/service_new.c:1034
 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.c:961 src/util/service.c:979 src/util/service_new.c:1186
 #, c-format
 msgid "Specified value for `%s' of service `%s' is invalid\n"
 msgstr ""
 
-#: src/util/service.c:1004
+#: src/util/service.c:1004 src/util/service_new.c:1218
 #, c-format
 msgid "Could not access pre-bound socket %u, will try to bind myself\n"
 msgstr ""
@@ -8976,31 +8573,43 @@
 msgid "Service `%s' runs at %s\n"
 msgstr "Dienst »%s« läuft auf %s\n"
 
-#: src/util/service.c:1260
+#: src/util/service.c:1260 src/util/service_new.c:1493
 msgid "Service process failed to initialize\n"
 msgstr ""
 
-#: src/util/service.c:1264
+#: src/util/service.c:1264 src/util/service_new.c:1497
 msgid "Service process could not initialize server function\n"
 msgstr ""
 
-#: src/util/service.c:1268
+#: src/util/service.c:1268 src/util/service_new.c:1501
 msgid "Service process failed to report status\n"
 msgstr ""
 
-#: src/util/service.c:1323
+#: src/util/service.c:1323 src/util/service_new.c:1373
 msgid "No such user"
 msgstr ""
 
-#: src/util/service.c:1336
+#: src/util/service.c:1336 src/util/service_new.c:1392
 #, 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.c:1406 src/util/service_new.c:1729
 msgid "do daemonize (detach from terminal)"
 msgstr ""
 
+#: src/util/service_new.c:1298
+msgid ""
+"Could not bind to any of the ports I was supposed to, refusing to run!\n"
+msgstr ""
+
+#: src/util/service_new.c:2085
+#, c-format
+msgid ""
+"Processing code for message of type %u did not call "
+"`GNUNET_SERVICE_client_continue' after %s\n"
+msgstr ""
+
 #: src/util/signal.c:89
 #, fuzzy, c-format
 msgid "signal (%d, %p) returned %d.\n"
@@ -9020,158 +8629,153 @@
 msgid "b"
 msgstr "b"
 
-#: src/util/strings.c:437
+#: src/util/strings.c:441
 #, c-format
 msgid "Character sets requested were `%s'->`%s'\n"
 msgstr ""
 
-#: src/util/strings.c:565
+#: src/util/strings.c:568
 msgid "Failed to expand `$HOME': environment variable `HOME' not set"
 msgstr ""
 
-#: src/util/strings.c:662
+#: src/util/strings.c:672
 msgid "µs"
 msgstr "µs"
 
-#: src/util/strings.c:666
+#: src/util/strings.c:676
 msgid "forever"
 msgstr ""
 
-#: src/util/strings.c:668
+#: src/util/strings.c:678
 msgid "0 ms"
 msgstr "0 ms"
 
-#: src/util/strings.c:674
+#: src/util/strings.c:684
 msgid "ms"
 msgstr "ms"
 
-#: src/util/strings.c:680
+#: src/util/strings.c:690
 msgid "s"
 msgstr "s"
 
-#: src/util/strings.c:686
+#: src/util/strings.c:696
 msgid "m"
 msgstr "m"
 
-#: src/util/strings.c:692
+#: src/util/strings.c:702
 msgid "h"
 msgstr "h"
 
-#: src/util/strings.c:699
+#: src/util/strings.c:709
 msgid "day"
 msgstr "Tag"
 
-#: src/util/strings.c:701
+#: src/util/strings.c:711
 msgid "days"
 msgstr "Tage"
 
-#: src/util/strings.c:730
+#: src/util/strings.c:740
 msgid "end of time"
 msgstr ""
 
-#: src/util/strings.c:1229
+#: src/util/strings.c:1239
 msgid "IPv6 address did not start with `['\n"
 msgstr "IPv6-Adresse beginnt nicht mit »[«\n"
 
-#: src/util/strings.c:1237
+#: src/util/strings.c:1247
 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:1243
+#: src/util/strings.c:1253
 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:1250
+#: src/util/strings.c:1260
 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:1259
+#: src/util/strings.c:1269
 #, fuzzy, c-format
 msgid "Invalid IPv6 address `%s': %s\n"
 msgstr "Ungültige Antwort auf `%s' von `%s'\n"
 
-#: src/util/strings.c:1465 src/util/strings.c:1481
+#: src/util/strings.c:1475 src/util/strings.c:1491
 msgid "Port not in range\n"
 msgstr "Port außerhalb des Bereichs\n"
 
-#: src/util/strings.c:1490
+#: src/util/strings.c:1500
 #, c-format
 msgid "Malformed port policy `%s'\n"
 msgstr ""
 
-#: src/util/strings.c:1573 src/util/strings.c:1604 src/util/strings.c:1652
-#: src/util/strings.c:1673
+#: src/util/strings.c:1583 src/util/strings.c:1614 src/util/strings.c:1662
+#: src/util/strings.c:1683
 #, c-format
 msgid "Invalid format for IP: `%s'\n"
 msgstr "Ungültiges Format für IP: »%s«\n"
 
-#: src/util/strings.c:1630
+#: src/util/strings.c:1640
 #, 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:1682
+#: src/util/strings.c:1692
 #, fuzzy, c-format
 msgid "Invalid format: `%s'\n"
 msgstr "Ungültiges Format für IP: `%s'\n"
 
-#: src/util/strings.c:1734
+#: src/util/strings.c:1744
 #, 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:1784
+#: src/util/strings.c:1794
 #, fuzzy, c-format
 msgid "Wrong format `%s' for netmask\n"
 msgstr "Falsches Format `%s' für Netzmaske: %s\n"
 
-#: src/util/strings.c:1815
+#: src/util/strings.c:1825
 #, 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:556 src/vpn/gnunet-service-vpn.c:1113
+#: src/vpn/gnunet-service-vpn.c:550 src/vpn/gnunet-service-vpn.c:1125
 msgid "# Active channels"
 msgstr "# aktive Kanäle"
 
-#: src/vpn/gnunet-service-vpn.c:632
+#: src/vpn/gnunet-service-vpn.c:629
 msgid "# Bytes given to cadet for transmission"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:670
+#: src/vpn/gnunet-service-vpn.c:667
 #, fuzzy
 msgid "# Bytes dropped in cadet queue (overflow)"
 msgstr "# Bytes verworfen von TCP (ausgehend)"
 
-#: src/vpn/gnunet-service-vpn.c:781
+#: src/vpn/gnunet-service-vpn.c:783
 #, fuzzy
 msgid "# Cadet channels created"
 msgstr "# PING Nachrichten erstellt"
 
-#: src/vpn/gnunet-service-vpn.c:809
-#, fuzzy
-msgid "Failed to setup cadet channel!\n"
-msgstr "Zustellung der Nachricht `%s' fehlgeschlagen.\n"
-
-#: src/vpn/gnunet-service-vpn.c:1008
+#: src/vpn/gnunet-service-vpn.c:1005
 #, c-format
 msgid "Protocol %u not supported, dropping\n"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:1133
+#: src/vpn/gnunet-service-vpn.c:1145
 #, fuzzy
 msgid "# Packets dropped (channel not yet online)"
 msgstr "# Bytes verworfen von TCP (ausgehend)"
 
-#: src/vpn/gnunet-service-vpn.c:1344
+#: src/vpn/gnunet-service-vpn.c:1353
 msgid "# ICMPv4 packets dropped (not allowed)"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:1365
+#: src/vpn/gnunet-service-vpn.c:1374
 msgid "# ICMPv6 packets dropped (not allowed)"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:1571
+#: src/vpn/gnunet-service-vpn.c:1580
 #, fuzzy
 msgid "# Packets received from TUN interface"
 msgstr ""
@@ -9178,73 +8782,73 @@
 "Die Formatüberprüfung des Pakets, das von %s:%d (UDP6) empfangen wurde, "
 "schlug fehl."
 
-#: src/vpn/gnunet-service-vpn.c:1604 src/vpn/gnunet-service-vpn.c:1640
+#: src/vpn/gnunet-service-vpn.c:1613 src/vpn/gnunet-service-vpn.c:1649
 #, c-format
 msgid "Packet received for unmapped destination `%s' (dropping it)\n"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:1650
+#: src/vpn/gnunet-service-vpn.c:1659
 msgid "Received IPv4 packet with options (dropping it)\n"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:1664
+#: src/vpn/gnunet-service-vpn.c:1673
 #, c-format
 msgid "Received packet of unknown protocol %d from TUN (dropping it)\n"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:1746
+#: src/vpn/gnunet-service-vpn.c:1755
 #, fuzzy
 msgid "# ICMP packets received from cadet"
 msgstr "# Bytes empfangen über TCP"
 
-#: src/vpn/gnunet-service-vpn.c:2086
+#: src/vpn/gnunet-service-vpn.c:2095
 #, fuzzy
 msgid "# UDP packets received from cadet"
 msgstr "# Bytes empfangen über TCP"
 
-#: src/vpn/gnunet-service-vpn.c:2242
+#: src/vpn/gnunet-service-vpn.c:2251
 #, fuzzy
 msgid "# TCP packets received from cadet"
 msgstr "# Bytes empfangen über TCP"
 
-#: src/vpn/gnunet-service-vpn.c:2394
+#: src/vpn/gnunet-service-vpn.c:2403
 msgid "Failed to find unallocated IPv4 address in VPN's range\n"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:2449
+#: src/vpn/gnunet-service-vpn.c:2458
 #, 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:2491 src/vpn/gnunet-service-vpn.c:2702
+#: src/vpn/gnunet-service-vpn.c:2500 src/vpn/gnunet-service-vpn.c:2722
 msgid "# Active destinations"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:2753
+#: src/vpn/gnunet-service-vpn.c:2771
 msgid "Failed to allocate IP address for new destination\n"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:3017
+#: src/vpn/gnunet-service-vpn.c:3063
 msgid "Must specify valid IPv6 address"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:3041
+#: src/vpn/gnunet-service-vpn.c:3087
 msgid "Must specify valid IPv6 mask"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:3049
+#: src/vpn/gnunet-service-vpn.c:3095
 msgid "IPv6 support disabled as this system does not support IPv6\n"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:3062
+#: src/vpn/gnunet-service-vpn.c:3108
 msgid "Must specify valid IPv4 address"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:3075
+#: src/vpn/gnunet-service-vpn.c:3121
 msgid "Must specify valid IPv4 mask"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:3085
+#: src/vpn/gnunet-service-vpn.c:3131
 msgid "IPv4 support disabled as this system does not support IPv4\n"
 msgstr ""
 
@@ -9313,23 +8917,224 @@
 msgid "Setup tunnels via VPN."
 msgstr "Tunnel über VPN einrichten."
 
-#: src/include/gnunet_common.h:641 src/include/gnunet_common.h:648
-#: src/include/gnunet_common.h:656
+#: src/include/gnunet_common.h:645 src/include/gnunet_common.h:652
+#: src/include/gnunet_common.h:660
 #, fuzzy, c-format
 msgid "Assertion failed at %s:%d.\n"
 msgstr "`%s' schlug fehl bei %s:%d mit dem Fehler: `%s'.\n"
 
-#: src/include/gnunet_common.h:668
+#: src/include/gnunet_common.h:672
 #, fuzzy, c-format
 msgid "External protocol violation detected at %s:%d.\n"
 msgstr "Protokollverletzung auf Socket. Kommando erwartet.\n"
 
-#: src/include/gnunet_common.h:695 src/include/gnunet_common.h:704
+#: src/include/gnunet_common.h:699 src/include/gnunet_common.h:708
 #, fuzzy, c-format
 msgid "`%s' failed on file `%s' at %s:%d with error: %s\n"
 msgstr "`%s' schlug bei Datei `%s' fehl. Ort: %s:%d. Fehler: %s\n"
 
+#~ msgid "Request does not fit into a message"
+#~ msgstr "Anfrage passt nicht in eine Meldung"
+
 #, fuzzy
+#~ msgid "Could not send status result to client\n"
+#~ msgstr "Anfrage konnte nicht an gnunetd gesendet werden.\n"
+
+#, fuzzy
+#~ msgid "Could not send list result to client\n"
+#~ msgstr "Anfrage konnte nicht an gnunetd gesendet werden.\n"
+
+#, fuzzy
+#~ msgid "Failed to connect peer 0 and %u\n"
+#~ msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
+
+#, fuzzy
+#~ msgid "Could not connect master [%u] and slave [%u]\n"
+#~ msgstr "Verbindung zu gnunetd konnte nicht hergestellt werden.\n"
+
+#, fuzzy
+#~ msgid "Initialization failed, shutdown\n"
+#~ msgstr " Verbindung fehlgeschlagen\n"
+
+#, fuzzy
+#~ msgid "number too large"
+#~ msgstr "Anzahl der Werte"
+
+#, fuzzy
+#~ msgid "Unsupported message of type %u (%u bytes) received from peer `%s'\n"
+#~ msgstr "Ungültige `%s' Nachricht von Knoten `%s' empfangen.\n"
+
+#, fuzzy
+#~ msgid "Failed to transmit request to drop database.\n"
+#~ msgstr "Fehler beim Senden einer `%s' Anfrage an den SMTP Server.\n"
+
+#, fuzzy
+#~ msgid "# transmission request failures"
+#~ msgstr "# Klartext PONG Nachrichten empfangen"
+
+#, fuzzy
+#~ msgid "# bytes sent to datastore"
+#~ msgstr "# bytes in der Datenbank"
+
+#, fuzzy
+#~ msgid "Failed to receive status response from database."
+#~ msgstr ""
+#~ "\n"
+#~ "Fehler beim Empfangen der Antwort von gnunetd.\n"
+
+#~ msgid "Invalid error message received from datastore service"
+#~ msgstr "Ungültige Fehlermeldung vom Datenspeicherdienst empfangen"
+
+#, fuzzy
+#~ msgid "No `%s' specified for `%s' in configuration!\n"
+#~ msgstr "In der Konfigurationsdatei wurden keine Anwendungen definiert!\n"
+
+#~ msgid "Failed to connect to the DHT service!\n"
+#~ msgstr "Verbindung zum DHT-Dienst ist fehlgeschlagen!\n"
+
+#~ msgid "Failed to connect to transport service!\n"
+#~ msgstr "Verbindung zum Transportdienst ist fehlgeschlagen!\n"
+
+#, fuzzy
+#~ msgid "# Messages dropped (CORE timeout)"
+#~ msgstr "# gap Anfragen verworfen: Kollision in RT"
+
+#, fuzzy
+#~ msgid "# Bytes transmitted to other peers"
+#~ msgstr "# Bytes des Typs %d übertragen"
+
+#, fuzzy
+#~ msgid "PUT request received, but have no datacache!\n"
+#~ msgstr "Die `%s' Anfrage, die vom Client empfangen wurde, ist beschädigt.\n"
+
+#~ msgid "No service %s found for %s on port %d!\n"
+#~ msgstr "Kein %s-Dienst gefunden für %s auf Port %d!\n"
+
+#, fuzzy
+#~ msgid "# TCP requests dropped (no such service)"
+#~ msgstr "# gap Anfragen verworfen: Kollision in RT"
+
+#, fuzzy
+#~ msgid "# UDP requests dropped (no such service)"
+#~ msgstr "# gap Anfragen verworfen: Kollision in RT"
+
+#, fuzzy
+#~ msgid "Failed to receive response for `%s' request from `%s' service.\n"
+#~ msgstr ""
+#~ "Fehler beim Empfangen der Antwort von gnunetd auf die `%s' Nachricht\n"
+
+#, fuzzy
+#~ msgid ""
+#~ "Failed to receive valid response for `%s' request from `%s' service.\n"
+#~ msgstr ""
+#~ "Fehler beim Empfangen der Antwort von gnunetd auf die `%s' Nachricht\n"
+
+#, fuzzy
+#~ msgid "unknown error"
+#~ msgstr "Unbekannter Fehler"
+
+#, fuzzy
+#~ msgid "Invalid response from `fs' service."
+#~ msgstr "Ungültige Antwort auf `%s'.\n"
+
+#, fuzzy
+#~ msgid "# replies transmitted to other peers"
+#~ msgstr "# Bytes des Typs %d übertragen"
+
+#, fuzzy
+#~ msgid "# replies dropped"
+#~ msgstr "# gap falsche Antworten"
+
+#, fuzzy
+#~ msgid "Failed to deserialize lookup reply from GNS service!\n"
+#~ msgstr ""
+#~ "\n"
+#~ "Fehler beim Empfangen der Antwort von gnunetd.\n"
+
+#, fuzzy
+#~ msgid "failed to transmit request (service down?)"
+#~ msgstr "Der Transportdienst auf Port %d konnte nicht gestartet werden.\n"
+
+#, fuzzy
+#~ msgid "Received invalid message from `PEERINFO' service."
+#~ msgstr "Ungültige `%s' Anfrage von `%s' empfangen.\n"
+
+#, fuzzy
+#~ msgid "Could not connect to `%s' service.\n"
+#~ msgstr "Verbindung zu gnunetd konnte nicht hergestellt werden.\n"
+
+#, fuzzy
+#~ msgid "Failure adding HELLO: %s\n"
+#~ msgstr "Fehler bei %s:%d.\n"
+
+#, fuzzy
+#~ msgid "Failed to get my own HELLO from this peer!\n"
+#~ msgstr ""
+#~ "Statistiken über den Netzwerkverkehr konnten nicht ermittelt werden.\n"
+
+#, fuzzy
+#~ msgid "Malformed iterate request.\n"
+#~ msgstr "GNUnet Konfiguration"
+
+#, fuzzy
+#~ msgid "Malformed store request from client\n"
+#~ msgstr "Beschädigte Antwort auf `%s' von Knoten `%s' empfangen.\n"
+
+#, fuzzy
+#~ msgid "Failed to store requested value, database error."
+#~ msgstr "Fehler beim Senden einer `%s' Anfrage an den SMTP Server.\n"
+
+#~ msgid "Peer `%s' %s `%s' \n"
+#~ msgstr "Knoten »%s« %s »%s« \n"
+
+#, fuzzy
+#~ msgid "Connected to different peer `%s'\n"
+#~ msgstr "# verbundener Knoten"
+
+#~ msgid "Successfully connected to `%s'\n"
+#~ msgstr "Mit »%s« wurde erfolgreich verbunden.\n"
+
+#, fuzzy
+#~ msgid "Denying connection to `%s'\n"
+#~ msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
+
+#, fuzzy
+#~ msgid "No peer identity given\n"
+#~ msgstr "Kein Knoten angegeben!\n"
+
+#, fuzzy
+#~ msgid "Trying to receive messages from peer `%s'\n"
+#~ msgstr "Fehler beim Parsen der Gerätedaten von `%s' bei %s:%d.\n"
+
+#, fuzzy
+#~ msgid "No operation given\n"
+#~ msgstr "Kein Knoten angegeben!\n"
+
+#, fuzzy
+#~ msgid "Failed to connect to ATS service\n"
+#~ msgstr "Verbindung zum DHT-Dienst ist fehlgeschlagen!\n"
+
+#, fuzzy
+#~ msgid "Received unexpected message of type %u in %s:%u\n"
+#~ msgstr "Es wurde eine unbekannte Testbed Nachricht des Typs %u empfangen.\n"
+
+#, fuzzy
+#~ msgid "Failed to initialize testing library!\n"
+#~ msgstr "SQLite Datenbank konnte nicht initialisiert werden.\n"
+
+#, fuzzy
+#~ msgid "Could not connect to service `%s', configuration broken.\n"
+#~ msgstr "Verbindung zu gnunetd konnte nicht hergestellt werden.\n"
+
+#, fuzzy
+#~ msgid "Failure to transmit request to service `%s'\n"
+#~ msgstr "Fehler beim Senden einer `%s' Anfrage an den SMTP Server.\n"
+
+#, fuzzy
+#~ msgid "Failed to setup cadet channel!\n"
+#~ msgstr "Zustellung der Nachricht `%s' fehlgeschlagen.\n"
+
+#, fuzzy
 #~ msgid "Error trying to send a message to peer `%s'.\n"
 #~ msgstr "Fehler beim Parsen der Gerätedaten von `%s' bei %s:%d.\n"
 
@@ -9450,9 +9255,6 @@
 #~ msgid "Failed to send disconnect request to transport service\n"
 #~ msgstr "Fehler beim Senden einer `%s' Anfrage an den SMTP Server.\n"
 
-#~ msgid "Failed to send request to transport service\n"
-#~ msgstr "Anfrage an den Transportdienst konnte nicht gestellt werden\n"
-
 #, fuzzy
 #~ msgid "Retrying to connect to `%s'\n"
 #~ msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
@@ -9527,11 +9329,6 @@
 #~ msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
 
 #, fuzzy
-#~| msgid "# of connected peers"
-#~ msgid "Disconnected from peer %s\n"
-#~ msgstr "# verbundener Knoten"
-
-#, fuzzy
 #~| msgid "Received corrupt message from peer `%s'in %s:%d.\n"
 #~ msgid "Received %s message from peer %s for experiment `%s'\n"
 #~ msgstr "Beschädigte Nachricht von Knoten `%s' in %s:%d empfangen.\n"

Modified: gnunet/po/es.po
===================================================================
--- gnunet/po/es.po     2016-10-26 04:21:00 UTC (rev 38215)
+++ gnunet/po/es.po     2016-10-26 14:25:30 UTC (rev 38216)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: gnunet 0.9.5a\n"
 "Report-Msgid-Bugs-To: address@hidden"
-"POT-Creation-Date: 2016-05-19 13:54+0200\n"
+"POT-Creation-Date: 2016-10-26 09:18-0500\n"
 "PO-Revision-Date: 2013-02-23 17:50+0100\n"
 "Last-Translator: Miguel Ángel Arruga Vivas <address@hidden>\n"
 "Language-Team: Spanish <address@hidden>\n"
@@ -17,96 +17,78 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: src/arm/arm_api.c:338
-#, fuzzy
-msgid "Client was disconnected from arm service, trying to reconnect.\n"
-msgstr ""
-"El cliente se desconectó del servicio principal, tratando de reconectar.\n"
-
-#: src/arm/arm_monitor_api.c:324
-#, fuzzy
-msgid ""
-"Monitoring client was disconnected from arm service, trying to reconnect.\n"
-msgstr ""
-"El cliente se desconectó del servicio principal, tratando de reconectar.\n"
-
-#: src/arm/gnunet-arm.c:169
+#: src/arm/gnunet-arm.c:152
 #, c-format
 msgid "Failed to remove configuration file %s\n"
 msgstr "Se produjo un fallo al borrar el fichero de configuración %s\n"
 
-#: src/arm/gnunet-arm.c:175
+#: src/arm/gnunet-arm.c:158
 #, c-format
 msgid "Failed to remove servicehome directory %s\n"
 msgstr "Se produjo un fallo al eliminar el directorio «servicehome» %s.\n"
 
-#: src/arm/gnunet-arm.c:225 src/testbed/gnunet-service-testbed_peers.c:1013
+#: src/arm/gnunet-arm.c:213 src/testbed/gnunet-service-testbed_peers.c:1139
 #, fuzzy
 msgid "Message was sent successfully"
 msgstr "El almacén de nombres añadió el registro satisfactoriamente"
 
-#: src/arm/gnunet-arm.c:227
+#: src/arm/gnunet-arm.c:215
 #, 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:229 src/testbed/gnunet-service-testbed_peers.c:1017
+#: src/arm/gnunet-arm.c:217 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:231 src/testbed/gnunet-service-testbed_peers.c:1019
+#: src/arm/gnunet-arm.c:219 src/testbed/gnunet-service-testbed_peers.c:1145
 msgid "ARM API is busy"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:233
-#, fuzzy
-msgid "Request does not fit into a message"
-msgstr "no imprime mensajes de estado"
-
 # Miguel: "timeout" lo he traducido como plazo, pero no se
 # si hay alguna palabra que lo describa mejor.
-#: src/arm/gnunet-arm.c:235 src/testbed/gnunet-service-testbed_peers.c:1023
+#: src/arm/gnunet-arm.c:221 src/testbed/gnunet-service-testbed_peers.c:1147
 #, fuzzy
 msgid "Request timed out"
 msgstr "plazo de consenso"
 
-#: src/arm/gnunet-arm.c:237 src/testbed/gnunet-service-testbed_peers.c:1025
+#: src/arm/gnunet-arm.c:223 src/testbed/gnunet-service-testbed_peers.c:1149
 #, fuzzy
 msgid "Unknown request status"
 msgstr "Usuario desconocido «%s»\n"
 
-#: src/arm/gnunet-arm.c:253 src/testbed/gnunet-service-testbed_peers.c:1041
+#: src/arm/gnunet-arm.c:239 src/testbed/gnunet-service-testbed_peers.c:1165
 #, fuzzy, c-format
 msgid "%s is stopped"
 msgstr "# elementos almacenados"
 
-#: src/arm/gnunet-arm.c:255 src/testbed/gnunet-service-testbed_peers.c:1043
+#: src/arm/gnunet-arm.c:241 src/testbed/gnunet-service-testbed_peers.c:1167
 #, fuzzy, c-format
 msgid "%s is starting"
 msgstr "'%s' comenzando\n"
 
-#: src/arm/gnunet-arm.c:257 src/testbed/gnunet-service-testbed_peers.c:1045
+#: src/arm/gnunet-arm.c:243 src/testbed/gnunet-service-testbed_peers.c:1169
 #, c-format
 msgid "%s is stopping"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:259 src/testbed/gnunet-service-testbed_peers.c:1047
+#: src/arm/gnunet-arm.c:245 src/testbed/gnunet-service-testbed_peers.c:1171
 #, fuzzy, c-format
 msgid "%s is starting already"
 msgstr "'%s' comenzando\n"
 
-#: src/arm/gnunet-arm.c:261 src/testbed/gnunet-service-testbed_peers.c:1049
+#: src/arm/gnunet-arm.c:247 src/testbed/gnunet-service-testbed_peers.c:1173
 #, c-format
 msgid "%s is stopping already"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:263 src/testbed/gnunet-service-testbed_peers.c:1051
+#: src/arm/gnunet-arm.c:249 src/testbed/gnunet-service-testbed_peers.c:1175
 #, c-format
 msgid "%s is started already"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:265 src/testbed/gnunet-service-testbed_peers.c:1053
+#: src/arm/gnunet-arm.c:251 src/testbed/gnunet-service-testbed_peers.c:1177
 #, c-format
 msgid "%s is stopped already"
 msgstr ""
@@ -114,187 +96,242 @@
 # 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:267 src/testbed/gnunet-service-testbed_peers.c:1055
+#: src/arm/gnunet-arm.c:253 src/testbed/gnunet-service-testbed_peers.c:1179
 #, fuzzy, c-format
 msgid "%s service is not known to ARM"
 msgstr "El servicio «%s» es desconocido para el ARM.\n"
 
-#: src/arm/gnunet-arm.c:269 src/testbed/gnunet-service-testbed_peers.c:1057
+#: src/arm/gnunet-arm.c:255 src/testbed/gnunet-service-testbed_peers.c:1181
 #, fuzzy, c-format
 msgid "%s service failed to start"
 msgstr "El proceso del servicio no devolvió un estado\n"
 
 # Miguel: ¿Es mejor «ya que» que «porque» o «debido al apagado»?
-#: src/arm/gnunet-arm.c:271
+#: src/arm/gnunet-arm.c:257
 #, fuzzy, c-format
 msgid "%s service cannot be started because ARM is shutting down"
 msgstr "Petición ignorada porque el ARM se está apagando.\n"
 
-#: src/arm/gnunet-arm.c:273 src/testbed/gnunet-service-testbed_peers.c:1061
+#: src/arm/gnunet-arm.c:259 src/testbed/gnunet-service-testbed_peers.c:1185
 #, fuzzy, c-format
 msgid "%.s Unknown result code."
 msgstr "Código de respuesta del ARM desconocido.\n"
 
-#: src/arm/gnunet-arm.c:305
+#: src/arm/gnunet-arm.c:291
 msgid "Fatal error initializing ARM API.\n"
 msgstr "Error fatal al inicializar la API del ARM.\n"
 
-#: src/arm/gnunet-arm.c:335 src/arm/gnunet-arm.c:344
+#: src/arm/gnunet-arm.c:320 src/arm/gnunet-arm.c:329
 #, 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:380
+#: src/arm/gnunet-arm.c:364
 #, 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:391
+#: src/arm/gnunet-arm.c:375
 #, fuzzy, c-format
 msgid "Failed to stop the ARM service: %s\n"
 msgstr "Fichero almacenado en '%s'.\n"
 
-#: src/arm/gnunet-arm.c:434
+#: src/arm/gnunet-arm.c:417
 #, 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:444
+#: src/arm/gnunet-arm.c:428
 #, 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:482
+#: src/arm/gnunet-arm.c:467
 #, 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:493
+#: src/arm/gnunet-arm.c:478
 #, 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:533
+#: src/arm/gnunet-arm.c:519
 #, 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:542
+#: src/arm/gnunet-arm.c:528
 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:547
+#: src/arm/gnunet-arm.c:534
 msgid "Running services:\n"
 msgstr "Servicios en ejecución:\n"
 
-#: src/arm/gnunet-arm.c:633
+#: src/arm/gnunet-arm.c:622
 #, c-format
 msgid "Now only monitoring, press CTRL-C to stop.\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:665
+#: src/arm/gnunet-arm.c:654
 #, c-format
 msgid "Stopped %s.\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:668
+#: src/arm/gnunet-arm.c:657
 #, fuzzy, c-format
 msgid "Starting %s...\n"
 msgstr "Iniciando descarga «%s».\n"
 
-#: src/arm/gnunet-arm.c:671
+#: src/arm/gnunet-arm.c:660
 #, c-format
 msgid "Stopping %s...\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:682
+#: src/arm/gnunet-arm.c:674
 #, fuzzy, c-format
 msgid "Unknown status %u for service %s.\n"
 msgstr "Solicitando incio del servicio «%s».\n"
 
-#: src/arm/gnunet-arm.c:745
+#: src/arm/gnunet-arm.c:756
 msgid "stop all GNUnet services"
 msgstr "detiene todos los servicios de GNUnet"
 
-#: src/arm/gnunet-arm.c:747
+#: src/arm/gnunet-arm.c:758
 msgid "start a particular service"
 msgstr "inicia un servicio particular"
 
-#: src/arm/gnunet-arm.c:749
+#: src/arm/gnunet-arm.c:760
 msgid "stop a particular service"
 msgstr "detiene un servicio particular"
 
-#: src/arm/gnunet-arm.c:751
+#: src/arm/gnunet-arm.c:762
 msgid "start all GNUnet default services"
 msgstr "inicia todos los servicios predeterminados de GNUnet"
 
-#: src/arm/gnunet-arm.c:754
+#: src/arm/gnunet-arm.c:765
 msgid "stop and start all GNUnet default services"
 msgstr "detiene e inicia todos los servicios predeterminados de GNUnet"
 
-#: src/arm/gnunet-arm.c:757
+#: src/arm/gnunet-arm.c:768
 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:760
+#: src/arm/gnunet-arm.c:771
 msgid "monitor ARM activities"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:762
+#: src/arm/gnunet-arm.c:773
 msgid "don't print status messages"
 msgstr "no imprime mensajes de estado"
 
-#: src/arm/gnunet-arm.c:765
+#: src/arm/gnunet-arm.c:776
 msgid "exit with error status if operation does not finish after DELAY"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:767
+#: src/arm/gnunet-arm.c:778
 msgid "list currently running services"
 msgstr "lista de servicios actualmente en ejecución"
 
-#: src/arm/gnunet-arm.c:769
+#: src/arm/gnunet-arm.c:780
 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:771
+#: src/arm/gnunet-arm.c:782
 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:782
+#: src/arm/gnunet-arm.c:794
 msgid "Control services and the Automated Restart Manager (ARM)"
 msgstr ""
 "Servicios de control y el Gestor de Reinicio Automático (ARM en inglés)"
 
-# Miguel: Si no me equivoco, "status result" es un
-# resultado de tipo estado.
-#: src/arm/gnunet-service-arm.c:279
-msgid "Could not send status result to client\n"
-msgstr "No se pudo mandar el resultado (estado) al cliente\n"
+#: src/arm/gnunet-service-arm.c:374 src/transport/plugin_transport_tcp.c:633
+#: src/util/service.c:565 src/util/service_new.c:604
+#, c-format
+msgid ""
+"Disabling IPv6 support for service `%s', failed to create IPv6 socket: %s\n"
+msgstr ""
+"Deshabilitando el soporte para IPv6 para el servicio «%s», se produjo un "
+"fallo al crear un «socket» IPv6: %s\n"
 
-# Miguel: Si no me equivoco, "list result" es un resultado
-# de tipo lista.
-#: src/arm/gnunet-service-arm.c:315
-msgid "Could not send list result to client\n"
-msgstr "No se pudo mandar el resultado (lista) al cliente\n"
+#: src/arm/gnunet-service-arm.c:393 src/arm/gnunet-service-arm.c:399
+#: src/transport/plugin_transport_tcp.c:652
+#: src/transport/plugin_transport_tcp.c:658
+#: src/transport/plugin_transport_tcp.c:3299 src/util/service.c:584
+#: src/util/service.c:590 src/util/service_new.c:629 src/util/service_new.c:635
+#, 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:555
+#: src/arm/gnunet-service-arm.c:430 src/transport/plugin_transport_tcp.c:689
+#: src/util/client_new.c:464 src/util/service.c:621 src/util/service_new.c:674
 #, 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/util/client_new.c:469 src/util/service.c:625 src/util/service_new.c:679
+#, 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/util/service.c:656 src/util/service_new.c:715
+#, c-format
+msgid ""
+"Disabling UNIX domain socket support for service `%s', failed to create UNIX "
+"domain socket: %s\n"
+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/util/service.c:673 src/util/service_new.c:733
+#, c-format
+msgid "Have neither PORT nor UNIXPATH for service `%s', but one is required\n"
+msgstr ""
+"No hay ni puerto (PORT) ni ruta unix (UNIXPATH) para el servicio «%s», pero "
+"uno es necesario\n"
+
+#: src/arm/gnunet-service-arm.c:513
+#: src/transport/plugin_transport_http_server.c:2617
+#: src/transport/plugin_transport_tcp.c:772 src/util/service.c:704
+#: src/util/service_new.c:774
+#, 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:2635
+#: src/transport/plugin_transport_tcp.c:791 src/util/service.c:723
+#: src/util/service_new.c:794
+#, 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
+#, 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:566
+#: src/arm/gnunet-service-arm.c:943
 #, c-format
 msgid "Starting service `%s'\n"
 msgstr "Iniciando el servicio «%s»\n"
 
 # Miguel: ¿Alguna idea para "socket"?
-#: src/arm/gnunet-service-arm.c:663
+#: src/arm/gnunet-service-arm.c:1055
 #, 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:687
+#: src/arm/gnunet-service-arm.c:1090
 #, c-format
 msgid "Unable to bind listening socket for service `%s' to address `%s': %s\n"
 msgstr ""
@@ -305,49 +342,49 @@
 # 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:723
+#: src/arm/gnunet-service-arm.c:1133
 #, 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:863
+#: src/arm/gnunet-service-arm.c:1309
 #, c-format
 msgid "Preparing to stop `%s'\n"
 msgstr "Preparando para parar «%s»\n"
 
-#: src/arm/gnunet-service-arm.c:1145
+#: src/arm/gnunet-service-arm.c:1611
 #, c-format
 msgid "Restarting service `%s'.\n"
 msgstr "Reiniciando el servicio «%s»\n"
 
-#: src/arm/gnunet-service-arm.c:1299
+#: src/arm/gnunet-service-arm.c:1771
 msgid "exit"
 msgstr "salida"
 
-#: src/arm/gnunet-service-arm.c:1304
+#: src/arm/gnunet-service-arm.c:1776
 msgid "signal"
 msgstr "señal"
 
-#: src/arm/gnunet-service-arm.c:1309
+#: src/arm/gnunet-service-arm.c:1781
 msgid "unknown"
 msgstr "desconocido"
 
-#: src/arm/gnunet-service-arm.c:1315
+#: src/arm/gnunet-service-arm.c:1787
 #, 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:1342
+#: src/arm/gnunet-service-arm.c:1813
 #, 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:1358
+#: src/arm/gnunet-service-arm.c:1829
 #, 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"
 
-#: src/arm/mockup-service.c:41
+#: src/arm/mockup-service.c:42
 msgid "Initiating shutdown as requested by client.\n"
 msgstr "Iniciando apagado bajo petición del cliente.\n"
 
@@ -378,15 +415,13 @@
 "No hay configurada una cuota de salida para la red «%s», asignando el ancho "
 "de banda predeterminado %llu\n"
 
-#: src/ats/gnunet-ats-solver-eval.c:3293
-#: src/ats-tests/gnunet-solver-eval.c:921
+#: src/ats/gnunet-ats-solver-eval.c:3293 src/ats-tests/gnunet-solver-eval.c:935
 #, fuzzy
 msgid "solver to use"
 msgstr "valor a establecer"
 
-#: src/ats/gnunet-ats-solver-eval.c:3296
-#: src/ats-tests/gnunet-solver-eval.c:924
-#: src/ats-tests/gnunet-solver-eval.c:927
+#: 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 ""
 
@@ -502,54 +537,26 @@
 msgid "Invalid %s configuration %f\n"
 msgstr "Se produjo un fallo al cargar la configuración de %s\n"
 
-#: src/ats-tests/ats-testing.c:72
-msgid "Benchmarking done\n"
-msgstr ""
-
-#: src/ats-tests/ats-testing.c:105
-#, fuzzy, c-format
-msgid "Failed to connect peer 0 and %u\n"
-msgstr "Se produjo un fallo al conectar con «%s»\n"
-
-#: src/ats-tests/ats-testing.c:413
+#: src/ats-tests/ats-testing.c:441
 #, c-format
 msgid "Connected master [%u] with slave [%u]\n"
 msgstr ""
 
-#: src/ats-tests/ats-testing.c:419
+#: src/ats-tests/ats-testing.c:448
 #, fuzzy, c-format
 msgid "Failed to connect master peer [%u] with slave [%u]\n"
 msgstr "Fallo al conectar a gnunetd.\n"
 
-#: src/ats-tests/ats-testing.c:450
-msgid "Connecting peers on CORE level\n"
-msgstr ""
-
-#: src/ats-tests/ats-testing.c:461
-#, c-format
-msgid "Connecting master [%u] with slave [%u]\n"
-msgstr ""
-
-#: src/ats-tests/ats-testing.c:470
-#, fuzzy, c-format
-msgid "Could not connect master [%u] and slave [%u]\n"
-msgstr "¡No se pudo conectar al servicio %s!\n"
-
-#: src/ats-tests/ats-testing.c:490 src/ats-tests/ats-testing.c:634
-#, fuzzy
-msgid "Initialization failed, shutdown\n"
-msgstr "¡La inicialización del mecanismo de módulos falló: %s!\n"
-
-#: src/ats-tests/ats-testing-log.c:836
+#: src/ats-tests/ats-testing-log.c:837
 msgid "Stop logging\n"
 msgstr ""
 
-#: src/ats-tests/ats-testing-log.c:887
+#: src/ats-tests/ats-testing-log.c:892
 #, fuzzy, c-format
 msgid "Start logging `%s'\n"
 msgstr "Iniciando descarga «%s».\n"
 
-#: src/ats-tests/gnunet-ats-sim.c:86
+#: src/ats-tests/gnunet-ats-sim.c:88
 #, c-format
 msgid ""
 "Master [%u]: sent: %u KiB in %u sec. = %u KiB/s, received: %u KiB in %u sec. "
@@ -600,8 +607,7 @@
 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:1780
-#: src/transport/gnunet-transport-profiler.c:516
+#: src/transport/gnunet-transport.c:1536
 #, c-format
 msgid "Failed to parse peer identity `%s'\n"
 msgstr "Se produjo un fallo al procesar la identidad del par «%s»\n"
@@ -692,115 +698,110 @@
 msgid "Print information about ATS state"
 msgstr "Imprime información acerca del estado del ATS"
 
-#: src/cadet/gnunet-cadet.c:476
+#: src/cadet/gnunet-cadet.c:511
 #, fuzzy, c-format
 msgid "Invalid target `%s'\n"
 msgstr "Parámetro no válido «%s»\n"
 
-#: src/cadet/gnunet-cadet.c:751
+#: src/cadet/gnunet-cadet.c:787
 #, fuzzy, c-format
 msgid "Invalid peer ID `%s'\n"
 msgstr "URI no válida: «%s»\n"
 
-#: src/cadet/gnunet-cadet.c:789
+#: src/cadet/gnunet-cadet.c:825
 #, fuzzy, c-format
 msgid "Invalid tunnel owner `%s'\n"
 msgstr "Formato de tiempo no válido «%s»\n"
 
-#: src/cadet/gnunet-cadet.c:857
+#: src/cadet/gnunet-cadet.c:892
 msgid "You must NOT give a TARGET when using 'request all' options\n"
 msgstr ""
 
-#: src/cadet/gnunet-cadet.c:952
+#: src/cadet/gnunet-cadet.c:982
 #, fuzzy
 msgid "provide information about a particular connection"
 msgstr "proveer información acerca de un túnel en particular"
 
-#: src/cadet/gnunet-cadet.c:955
+#: src/cadet/gnunet-cadet.c:985
 msgid "activate echo mode"
 msgstr ""
 
-#: src/cadet/gnunet-cadet.c:958
+#: src/cadet/gnunet-cadet.c:988
 msgid "dump debug information to STDERR"
 msgstr ""
 
-#: src/cadet/gnunet-cadet.c:964
-msgid "port to listen to (default; 0)"
+#: src/cadet/gnunet-cadet.c:994
+msgid "port to listen to"
 msgstr ""
 
-#: src/cadet/gnunet-cadet.c:967
+#: src/cadet/gnunet-cadet.c:997
 #, fuzzy
 msgid "provide information about a patricular peer"
 msgstr "proveer información acerca de un túnel en particular"
 
-#: src/cadet/gnunet-cadet.c:970
+#: src/cadet/gnunet-cadet.c:1000
 #, fuzzy
 msgid "provide information about all peers"
 msgstr "proveer información acerca de un túnel en particular"
 
-#: src/cadet/gnunet-cadet.c:973
+#: src/cadet/gnunet-cadet.c:1003
 msgid "provide information about a particular tunnel"
 msgstr "proveer información acerca de un túnel en particular"
 
-#: src/cadet/gnunet-cadet.c:976
+#: src/cadet/gnunet-cadet.c:1006
 #, fuzzy
 msgid "provide information about all tunnels"
 msgstr "proveer información acerca de un túnel en particular"
 
-#: src/cadet/gnunet-service-cadet_peer.c:562
+#: src/cadet/gnunet-service-cadet_peer.c:707
 msgid "Wrong CORE service\n"
 msgstr "Servicio principal (CORE) erróneo\n"
 
-#: src/consensus/gnunet-consensus-profiler.c:496
+#: 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:499
+#: src/consensus/gnunet-consensus-profiler.c:502
 #, 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:502
-#: src/set/gnunet-set-profiler.c:377 src/set/gnunet-set-profiler.c:380
-#: src/set/gnunet-set-profiler.c:383
+#: src/consensus/gnunet-consensus-profiler.c:505
+#: src/set/gnunet-set-profiler.c:378 src/set/gnunet-set-profiler.c:381
+#: src/set/gnunet-set-profiler.c:384
 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:505
+#: src/consensus/gnunet-consensus-profiler.c:508
 msgid "consensus timeout"
 msgstr "plazo de consenso"
 
-#: src/consensus/gnunet-consensus-profiler.c:508
+#: src/consensus/gnunet-consensus-profiler.c:511
 msgid "delay until consensus starts"
 msgstr ""
 
-#: src/consensus/gnunet-consensus-profiler.c:511
-#: src/set/gnunet-set-profiler.c:389
+#: src/consensus/gnunet-consensus-profiler.c:514
+#: src/set/gnunet-set-profiler.c:390
 #, fuzzy
 msgid "write statistics to file"
 msgstr "imprime el valor de las estadísticas"
 
-#: src/consensus/gnunet-consensus-profiler.c:514
+#: src/consensus/gnunet-consensus-profiler.c:517
 #: src/secretsharing/gnunet-secretsharing-profiler.c:622
 msgid "be more verbose (print received values)"
 msgstr ""
 
-#: src/conversation/conversation_api.c:493
-#: src/conversation/conversation_api_call.c:475
+#: src/conversation/conversation_api.c:513
+#: src/conversation/conversation_api_call.c:490
 #, fuzzy
 msgid "Connection to conversation service lost, trying to reconnect\n"
 msgstr ""
 "El cliente se desconectó del servicio principal, tratando de reconectar.\n"
 
-#: src/conversation/conversation_api.c:617
-#, fuzzy
-msgid "number too large"
-msgstr "número de valores"
-
 #: src/conversation/gnunet-conversation.c:269
 #, c-format
 msgid "Incoming call from `%s'. Please /accept %u or /cancel %u the call.\n"
@@ -826,237 +827,236 @@
 msgid "Ego `%s' no longer available, phone is now down.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:366
+#: src/conversation/gnunet-conversation.c:367
 #, fuzzy
 msgid "Failed to setup phone (internal error)\n"
 msgstr "¡Se produjo un fallo al configurar el túnel mesh!\n"
 
-#: src/conversation/gnunet-conversation.c:378
+#: src/conversation/gnunet-conversation.c:379
 #, c-format
-msgid ""
-"Phone active on line %u.  Type `/help' for a list of available commands\n"
+msgid "Phone active at `%s'.  Type `/help' for a list of available commands\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:400
+#: src/conversation/gnunet-conversation.c:401
 #, c-format
 msgid "Resolved address of `%s'. Now ringing other party.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:407
+#: src/conversation/gnunet-conversation.c:408
 #, fuzzy, c-format
 msgid "Connection established to `%s'\n"
 msgstr "'%s' falló en %s: %d con error: '%s'.\n"
 
-#: src/conversation/gnunet-conversation.c:414
+#: src/conversation/gnunet-conversation.c:415
 #, fuzzy, c-format
 msgid "Failed to resolve `%s'\n"
 msgstr "Se produjo un fallo al resolver «%s»: %s\n"
 
-#: src/conversation/gnunet-conversation.c:422
+#: src/conversation/gnunet-conversation.c:423
 #, c-format
 msgid "Call to `%s' terminated\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:431
+#: src/conversation/gnunet-conversation.c:432
 #, c-format
 msgid "Connection to `%s' suspended (by other user)\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:437
+#: src/conversation/gnunet-conversation.c:438
 #, c-format
 msgid "Connection to `%s' resumed (by other user)\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:442
+#: src/conversation/gnunet-conversation.c:443
 msgid "Error with the call, restarting it\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:511
+#: src/conversation/gnunet-conversation.c:512
 #, c-format
 msgid "Unknown command `%s'\n"
 msgstr "Comando desconocido «%s»\n"
 
-#: src/conversation/gnunet-conversation.c:527
-#: src/conversation/gnunet-conversation.c:541
+#: src/conversation/gnunet-conversation.c:528
+#: src/conversation/gnunet-conversation.c:542
 #, c-format
 msgid "Ego `%s' not available\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:534
-#: src/conversation/gnunet-conversation.c:591
+#: src/conversation/gnunet-conversation.c:535
+#: src/conversation/gnunet-conversation.c:592
 msgid "You are calling someone else already, hang up first!\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:549
-#: src/conversation/gnunet-conversation.c:604
+#: src/conversation/gnunet-conversation.c:550
+#: src/conversation/gnunet-conversation.c:605
 #, c-format
 msgid "You are answering call from `%s', hang up or suspend that call first!\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:559
+#: src/conversation/gnunet-conversation.c:560
 msgid "Call recipient missing.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:615
+#: src/conversation/gnunet-conversation.c:616
 msgid "There is no incoming call to accept here!\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:632
+#: src/conversation/gnunet-conversation.c:633
 #, c-format
 msgid "There is no incoming call `%s' to accept right now!\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:662
+#: src/conversation/gnunet-conversation.c:663
 msgid "We currently do not have an address.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:685
+#: src/conversation/gnunet-conversation.c:686
 #, c-format
 msgid "We are currently trying to locate the private key for the ego `%s'.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:690
+#: src/conversation/gnunet-conversation.c:691
 #, c-format
-msgid "We are listening for incoming calls for ego `%s' on line %u.\n"
+msgid "We are listening for incoming calls for ego `%s' on line `%s'.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:696
-#: src/conversation/gnunet-conversation.c:720
+#: src/conversation/gnunet-conversation.c:697
+#: src/conversation/gnunet-conversation.c:721
 #, c-format
 msgid "You are having a conversation with `%s'.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:701
+#: src/conversation/gnunet-conversation.c:702
 msgid ""
 "We had an internal error setting up our phone line. You can still make "
 "calls.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:710
+#: src/conversation/gnunet-conversation.c:711
 #, fuzzy, c-format
 msgid "We are trying to find the network address to call `%s'.\n"
 msgstr "Detectada dirección de la red interna «%s».\n"
 
-#: src/conversation/gnunet-conversation.c:715
+#: src/conversation/gnunet-conversation.c:716
 #, c-format
 msgid "We are calling `%s', his phone should be ringing.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:734
+#: src/conversation/gnunet-conversation.c:735
 msgid "Calls waiting:\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:740
+#: src/conversation/gnunet-conversation.c:741
 #, fuzzy, c-format
 msgid "#%u: `%s'\n"
 msgstr "Par «%s»\n"
 
-#: src/conversation/gnunet-conversation.c:768
-#: src/conversation/gnunet-conversation.c:783
+#: src/conversation/gnunet-conversation.c:769
+#: src/conversation/gnunet-conversation.c:784
 msgid "There is no call that could be suspended right now.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:816
-#: src/conversation/gnunet-conversation.c:832
+#: src/conversation/gnunet-conversation.c:817
+#: src/conversation/gnunet-conversation.c:833
 msgid "There is no call that could be resumed right now.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:839
+#: src/conversation/gnunet-conversation.c:840
 #, c-format
 msgid "Already talking with `%s', cannot resume a call right now.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:848
+#: src/conversation/gnunet-conversation.c:849
 msgid "There is no incoming call to resume here!\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:865
+#: src/conversation/gnunet-conversation.c:866
 #, c-format
 msgid "There is no incoming call `%s' to resume right now!\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:900
+#: src/conversation/gnunet-conversation.c:901
 msgid "There is no call that could be cancelled right now.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:908
+#: src/conversation/gnunet-conversation.c:909
 msgid "There is no incoming call to refuse here!\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:925
+#: src/conversation/gnunet-conversation.c:926
 #, c-format
 msgid "There is no incoming call `%s' to refuse right now!\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:951
+#: src/conversation/gnunet-conversation.c:952
 msgid "Use `/address' to find out which address this phone should have in GNS"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:953
+#: src/conversation/gnunet-conversation.c:954
 msgid "Use `/call USER.gnu' to call USER"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:955
+#: src/conversation/gnunet-conversation.c:956
 msgid "Use `/accept #NUM' to accept incoming call #NUM"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:957
+#: src/conversation/gnunet-conversation.c:958
 msgid "Use `/suspend' to suspend the active call"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:959
+#: src/conversation/gnunet-conversation.c:960
 msgid ""
 "Use `/resume [#NUM]' to resume a call, #NUM is needed to resume incoming "
 "calls, no argument is needed to resume the current outgoing call."
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:961
+#: src/conversation/gnunet-conversation.c:962
 msgid "Use `/cancel' to reject or terminate a call"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:963
+#: src/conversation/gnunet-conversation.c:964
 #, fuzzy
 msgid "Use `/status' to print status information"
 msgstr "ser prolijo (imprime información de progreso)"
 
-#: src/conversation/gnunet-conversation.c:965
+#: src/conversation/gnunet-conversation.c:966
 #, fuzzy
 msgid "Use `/quit' to terminate gnunet-conversation"
 msgstr "Use «/quit» para finalizar «gnunet-chat»"
 
-#: src/conversation/gnunet-conversation.c:967
+#: src/conversation/gnunet-conversation.c:968
 msgid "Use `/help command' to get help for a specific command"
 msgstr "Use «/help comando» para obtener ayuda sobre un comando específico"
 
-#: src/conversation/gnunet-conversation.c:1171
+#: src/conversation/gnunet-conversation.c:1172
 #, fuzzy, c-format
 msgid "Name of our ego changed to `%s'\n"
 msgstr "Se produjo un fallo al crear la página para «%s»\n"
 
-#: src/conversation/gnunet-conversation.c:1184
+#: src/conversation/gnunet-conversation.c:1185
 #, fuzzy, c-format
 msgid "Our ego `%s' was deleted!\n"
 msgstr "El pseudónimo '%s' fue borrado.\n"
 
-#: src/conversation/gnunet-conversation.c:1219
+#: src/conversation/gnunet-conversation.c:1220
 #, fuzzy
 msgid "You must specify the NAME of an ego to use\n"
 msgstr "Debes especificar un fichero a inspeccionar.\n"
 
-#: src/conversation/gnunet-conversation.c:1243
+#: src/conversation/gnunet-conversation.c:1244
 #, fuzzy
 msgid "Failed to start gnunet-helper-w32-console\n"
 msgstr "Se produjo un fallo al iniciar el proceso «gnunet-peerinfo».\n"
 
-#: src/conversation/gnunet-conversation.c:1269
+#: src/conversation/gnunet-conversation.c:1270
 msgid "sets the NAME of the ego to use for the phone (and name resolution)"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:1272
+#: src/conversation/gnunet-conversation.c:1273
 msgid "sets the LINE to use for the phone"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:1298
+#: src/conversation/gnunet-conversation.c:1299
 msgid "Enables having a conversation with other GNUnet users."
 msgstr ""
 
@@ -1083,8 +1083,7 @@
 msgstr ""
 
 #: src/conversation/gnunet-conversation-test.c:243
-#: src/multicast/gnunet-multicast.c:70 src/revocation/gnunet-revocation.c:548
-#: src/template/gnunet-template.c:70
+#: src/revocation/gnunet-revocation.c:550 src/template/gnunet-template.c:76
 msgid "help text"
 msgstr "texto de ayuda"
 
@@ -1221,28 +1220,19 @@
 msgstr ""
 "Se produjo un fallo al alojar las direcciones IP para el nuevo destino\n"
 
-#: src/conversation/gnunet-service-conversation.c:855
-msgid "Cadet audio channel not ready; audio data dropped\n"
-msgstr ""
-
-#: src/conversation/gnunet-service-conversation.c:946
-#, c-format
-msgid ""
-"No available phone for incoming call on line %u, sending HANG_UP signal\n"
-msgstr ""
-
-#: src/conversation/gnunet-service-conversation.c:1360
-#, fuzzy, c-format
-msgid "Received incoming Cadet channel on port %u\n"
-msgstr "Desconectado de %s\n"
-
 #: src/conversation/microphone.c:121
 #, fuzzy
 msgid "Could not start record audio helper\n"
 msgstr "No se pudo empezar la operación de desindexado.\n"
 
-#: src/conversation/plugin_gnsrecord_conversation.c:116
+#: src/conversation/plugin_gnsrecord_conversation.c:71
 #, fuzzy, c-format
+msgid "PHONE version %u not supported\n"
+msgstr "Protocolo %u no soportado, omitiendo\n"
+
+#: src/conversation/plugin_gnsrecord_conversation.c:133
+#: src/conversation/plugin_gnsrecord_conversation.c:147
+#, fuzzy, c-format
 msgid "Unable to parse PHONE record `%s'\n"
 msgstr "No se pudo procesar el registro PKEY «%s»\n"
 
@@ -1251,11 +1241,6 @@
 msgid "Could not start playback audio helper.\n"
 msgstr "No se pudo empezar a publicar.\n"
 
-#: src/core/core_api.c:725
-msgid "Client was disconnected from core service, trying to reconnect.\n"
-msgstr ""
-"El cliente se desconectó del servicio principal, tratando de reconectar.\n"
-
 #: src/core/gnunet-core.c:90
 #, fuzzy
 msgid "fresh connection"
@@ -1300,7 +1285,7 @@
 msgid "%24s: %-30s %4s (timeout in %6s)\n"
 msgstr "%24s: %-17s %4s   (%u conexiones en total)\n"
 
-#: src/core/gnunet-core.c:144 src/peerinfo-tool/gnunet-peerinfo.c:790
+#: src/core/gnunet-core.c:144 src/peerinfo-tool/gnunet-peerinfo.c:728
 #, c-format
 msgid "Invalid command line argument `%s'\n"
 msgstr "Parámetro no válido «%s» en la línea de comandos\n"
@@ -1311,7 +1296,7 @@
 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:1990
+#: src/core/gnunet-core.c:176 src/transport/gnunet-transport.c:1737
 msgid "provide information about all current connections (continuously)"
 msgstr ""
 "provee información sobre todas las conexiones actuales (de forma continua)"
@@ -1320,61 +1305,65 @@
 msgid "Print information about connected peers."
 msgstr "Imprime información sobre los pares conectados."
 
-#: src/core/gnunet-service-core.c:104
-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:127
-#, c-format
-msgid "Core service of `%4s' ready.\n"
-msgstr "El servicio principal de «%4s» está listo.\n"
-
-#: src/core/gnunet-service-core_clients.c:380
+#: src/core/gnunet-service-core.c:339
 msgid "# send requests dropped (disconnected)"
 msgstr "# peticiones de envío descartadas (desconectado)"
 
-#: src/core/gnunet-service-core_clients.c:498
-msgid "# messages discarded (session disconnected)"
-msgstr "# mensajes descartados (sesión desconectada)"
+#: src/core/gnunet-service-core.c:363
+msgid "# dequeuing CAR (duplicate request)"
+msgstr ""
 
-#: src/core/gnunet-service-core_clients.c:561
+#: src/core/gnunet-service-core.c:432
 #, c-format
 msgid "# bytes of messages of type %u received"
 msgstr "# bytes de mensajes del tipo %u recibidos"
 
-#: src/core/gnunet-service-core_kx.c:571
+#: src/core/gnunet-service-core.c:530
+msgid "# messages discarded (session disconnected)"
+msgstr "# mensajes descartados (sesión desconectada)"
+
+#: src/core/gnunet-service-core.c:928
+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:949
+#, fuzzy, c-format
+msgid "Core service of `%s' ready.\n"
+msgstr "El servicio principal de «%4s» está listo.\n"
+
+#: src/core/gnunet-service-core_kx.c:566
 msgid "# bytes encrypted"
 msgstr "# bytes cifrados"
 
-#: src/core/gnunet-service-core_kx.c:630
+#: src/core/gnunet-service-core_kx.c:626
 msgid "# bytes decrypted"
 msgstr "# bytes descifrados"
 
-#: src/core/gnunet-service-core_kx.c:719
+#: src/core/gnunet-service-core_kx.c:726
 msgid "# key exchanges initiated"
 msgstr "# intercambio de claves iniciados"
 
-#: src/core/gnunet-service-core_kx.c:766
+#: src/core/gnunet-service-core_kx.c:786
 msgid "# key exchanges stopped"
 msgstr "# intercambio de claves parados"
 
-#: src/core/gnunet-service-core_kx.c:796
+#: src/core/gnunet-service-core_kx.c:819
 #, fuzzy
 msgid "# PING messages transmitted"
 msgstr "# mensajes PONG creados"
 
-#: src/core/gnunet-service-core_kx.c:871
+#: src/core/gnunet-service-core_kx.c:886
 msgid "# old ephemeral keys ignored"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:878
+#: src/core/gnunet-service-core_kx.c:893
 #, fuzzy
 msgid "# ephemeral keys received"
 msgstr "# mapas de tipos recibidos"
 
-#: src/core/gnunet-service-core_kx.c:917
+#: src/core/gnunet-service-core_kx.c:932
 #, c-format
 msgid ""
 "Ephemeral key message from peer `%s' rejected as its validity range does not "
@@ -1381,143 +1370,125 @@
 "match our system time (%llu not in [%llu,%llu]).\n"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:928
+#: src/core/gnunet-service-core_kx.c:943
 #, fuzzy
 msgid "# EPHEMERAL_KEY messages received"
 msgstr "# mensajes «SET_KEY» descifrados"
 
-#: src/core/gnunet-service-core_kx.c:1030
-#: src/transport/gnunet-service-transport_validation.c:1080
+#: src/core/gnunet-service-core_kx.c:1039
+#: src/transport/gnunet-service-transport_validation.c:1119
 msgid "# PING messages received"
 msgstr "# mensajes PING recibidos"
 
-#: src/core/gnunet-service-core_kx.c:1039
+#: src/core/gnunet-service-core_kx.c:1048
 #, 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:1092
+#: src/core/gnunet-service-core_kx.c:1106
 msgid "# PONG messages created"
 msgstr "# mensajes PONG creados"
 
-#: src/core/gnunet-service-core_kx.c:1119
+#: src/core/gnunet-service-core_kx.c:1132
 msgid "# sessions terminated by timeout"
 msgstr "# sesiones terminadas por plazo de expiración"
 
-#: src/core/gnunet-service-core_kx.c:1132
+#: src/core/gnunet-service-core_kx.c:1145
 msgid "# keepalive messages sent"
 msgstr "# mensajes «keepalive» enviados"
 
-#: src/core/gnunet-service-core_kx.c:1203
-#: src/transport/gnunet-service-transport_validation.c:1403
+#: src/core/gnunet-service-core_kx.c:1209
+#: src/transport/gnunet-service-transport_validation.c:1442
 msgid "# PONG messages received"
 msgstr "# mensajes PONG recibidos"
 
-#: src/core/gnunet-service-core_kx.c:1210
+#: src/core/gnunet-service-core_kx.c:1216
 #, fuzzy
 msgid "# PONG messages dropped (connection down)"
 msgstr "# mensajes PONG recibidos"
 
-#: src/core/gnunet-service-core_kx.c:1215
+#: src/core/gnunet-service-core_kx.c:1221
 #, 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:1251
+#: src/core/gnunet-service-core_kx.c:1256
 msgid "# PONG messages decrypted"
 msgstr "# mensajes PONG descifrados"
 
-#: src/core/gnunet-service-core_kx.c:1289
+#: src/core/gnunet-service-core_kx.c:1294
 msgid "# session keys confirmed via PONG"
 msgstr "# claves de sesión confirmadas vía PONG"
 
-#: src/core/gnunet-service-core_kx.c:1300
+#: src/core/gnunet-service-core_kx.c:1305
 #, fuzzy
 msgid "# timeouts prevented via PONG"
 msgstr "# bytes recibidos vía TCP"
 
-#: src/core/gnunet-service-core_kx.c:1307
+#: src/core/gnunet-service-core_kx.c:1312
 msgid "# rekey operations confirmed via PONG"
 msgstr "# operaciones de cambio de clave confirmadas vía PONG"
 
-#: src/core/gnunet-service-core_kx.c:1463
+#: src/core/gnunet-service-core_kx.c:1485
 #, fuzzy
 msgid "# DATA message dropped (out of order)"
 msgstr "# bytes omitidos (fuera de secuencia)"
 
-#: src/core/gnunet-service-core_kx.c:1471
+#: src/core/gnunet-service-core_kx.c:1493
 #, 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:1474
+#: src/core/gnunet-service-core_kx.c:1496
 #, fuzzy
 msgid "# sessions terminated by key expiration"
 msgstr "# sesiones terminadas por plazo de expiración"
 
-#: src/core/gnunet-service-core_kx.c:1532
-#: src/core/gnunet-service-core_kx.c:1558
+#: src/core/gnunet-service-core_kx.c:1554
+#: src/core/gnunet-service-core_kx.c:1580
 msgid "# bytes dropped (duplicates)"
 msgstr "# bytes omitidos (duplicados)"
 
-#: src/core/gnunet-service-core_kx.c:1545
+#: src/core/gnunet-service-core_kx.c:1567
 msgid "# bytes dropped (out of sequence)"
 msgstr "# bytes omitidos (fuera de secuencia)"
 
-#: src/core/gnunet-service-core_kx.c:1587
+#: src/core/gnunet-service-core_kx.c:1609
 msgid "# bytes dropped (ancient message)"
 msgstr "# bytes omitidos (mensaje antiguo)"
 
-#: src/core/gnunet-service-core_kx.c:1595
+#: src/core/gnunet-service-core_kx.c:1617
 msgid "# bytes of payload decrypted"
 msgstr "# bytes de «payload» descifrados"
 
-#: src/core/gnunet-service-core_kx.c:1629
+#: src/core/gnunet-service-core_kx.c:1674
 #, fuzzy
 msgid "# PAYLOAD dropped (out of order)"
 msgstr "# bytes omitidos (fuera de secuencia)"
 
-#: src/core/gnunet-service-core_neighbours.c:183
-msgid "# sessions terminated by transport disconnect"
-msgstr "# sesiones terminadas por desconexión de transporte"
-
-#: src/core/gnunet-service-core_neighbours.c:199
-#: src/core/gnunet-service-core_neighbours.c:387
-msgid "# neighbour entries allocated"
-msgstr "# entradas de vecinos alojadas"
-
-#: src/core/gnunet-service-core_neighbours.c:291
-msgid "# encrypted bytes given to transport"
-msgstr "# bytes cifrados dados al transporte"
-
-#: src/core/gnunet-service-core_neighbours.c:486
-#, c-format
-msgid "Unsupported message of type %u (%u bytes) received from peer `%s'\n"
-msgstr "Mensaje no soportado del tipo %u (%u bytes) recibido del par «%s»\n"
-
-#: src/core/gnunet-service-core_sessions.c:253
-#: src/core/gnunet-service-core_sessions.c:337
-#: src/dht/gnunet-service-dht_neighbours.c:789
-#: src/dht/gnunet-service-dht_neighbours.c:863
-#: src/fs/gnunet-service-fs_cp.c:662 src/fs/gnunet-service-fs_cp.c:1715
-#: src/topology/gnunet-daemon-topology.c:611
-#: src/topology/gnunet-daemon-topology.c:723
-#: src/transport/gnunet-service-transport_neighbours.c:720
-#: src/transport/gnunet-service-transport_neighbours.c:728
+#: src/core/gnunet-service-core_sessions.c:256
+#: src/core/gnunet-service-core_sessions.c:341
+#: src/dht/gnunet-service-dht_neighbours.c:741
+#: src/dht/gnunet-service-dht_neighbours.c:803
+#: 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
+#: src/transport/gnunet-service-transport_neighbours.c:719
+#: src/transport/gnunet-service-transport_neighbours.c:727
 msgid "# peers connected"
 msgstr "# pares conectados"
 
-#: src/core/gnunet-service-core_sessions.c:284
+#: src/core/gnunet-service-core_sessions.c:287
 msgid "# type map refreshes sent"
 msgstr "# envíos de refrescos del mapa de tipos"
 
-#: src/core/gnunet-service-core_sessions.c:403
+#: src/core/gnunet-service-core_sessions.c:407
 #, fuzzy
 msgid "# outdated typemap confirmations received"
 msgstr "Se produjo un fallo al encolar una confirmación de recepción\n"
 
-#: src/core/gnunet-service-core_sessions.c:414
+#: src/core/gnunet-service-core_sessions.c:418
 #, fuzzy
 msgid "# valid typemap confirmations received"
 msgstr "Se produjo un fallo al encolar una confirmación de recepción\n"
@@ -1532,7 +1503,7 @@
 msgstr "# actualizaciones de mi mapa de tipos"
 
 #: src/datacache/datacache.c:119 src/datacache/datacache.c:294
-#: src/datastore/gnunet-service-datastore.c:865
+#: src/datastore/gnunet-service-datastore.c:770
 msgid "# bytes stored"
 msgstr "# bytes almacenados"
 
@@ -1569,29 +1540,28 @@
 msgid "# proximity search requests received"
 msgstr "# búsquedas de clientes recibidas"
 
-#: src/datacache/plugin_datacache_heap.c:466
+#: src/datacache/plugin_datacache_heap.c:467
 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:86
-#: src/datastore/plugin_datastore_mysql.c:818
-#: src/datastore/plugin_datastore_mysql.c:834
+#: src/datastore/plugin_datastore_mysql.c:1027
 #: src/datastore/plugin_datastore_sqlite.c:57
-#: src/datastore/plugin_datastore_sqlite.c:65 src/my/my.c:74 src/my/my.c:84
-#: src/mysql/mysql.c:41 src/mysql/mysql.c:48 src/mysql/mysql.c:522
-#: src/mysql/mysql.c:531 src/mysql/mysql.c:591 src/mysql/mysql.c:607
+#: src/datastore/plugin_datastore_sqlite.c:65 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/namestore/plugin_namestore_postgres.c:53
 #: src/namestore/plugin_namestore_sqlite.c:52
 #: src/peerstore/plugin_peerstore_sqlite.c:50
+#: src/psycstore/plugin_psycstore_mysql.c:62
 #: src/testbed/generate-underlay-topology.c:47
 #: src/testbed/gnunet-daemon-latency-logger.c:52
-#: src/testbed/gnunet-daemon-testbed-underlay.c:55
+#: src/testbed/gnunet-daemon-testbed-underlay.c:56
 #: src/testbed/testbed_api_hosts.c:69 src/util/crypto_ecc.c:52
 #: src/util/crypto_ecc_setup.c:41 src/util/crypto_mpi.c:39
-#: src/include/gnunet_common.h:677 src/include/gnunet_common.h:686
+#: src/include/gnunet_common.h:681 src/include/gnunet_common.h:690
 #: src/scalarproduct/scalarproduct.h:35
 #, c-format
 msgid "`%s' failed at %s:%d with error: %s\n"
@@ -1600,98 +1570,70 @@
 #: src/datacache/plugin_datacache_sqlite.c:749
 #: src/datastore/plugin_datastore_sqlite.c:409
 #: src/namecache/plugin_namecache_sqlite.c:292
-#: src/namestore/plugin_namestore_sqlite.c:324
+#: src/namestore/plugin_namestore_sqlite.c:343
 msgid "Tried to close sqlite without finalizing all prepared statements.\n"
 msgstr ""
 "Se intentó cerrar sqlite sin finalizar todas las sentencias preparadas.\n"
 
-# Miguel: "Drop" en bases de datos es eliminar una tabla
-# del modelo.
-#: src/datastore/datastore_api.c:308
-msgid "Failed to transmit request to drop database.\n"
-msgstr ""
-"Se produjo un fallo al transmitir la petición de eliminación a la base de "
-"datos.\n"
+#: src/datastore/datastore_api.c:309
+#, fuzzy
+msgid "DATASTORE disconnected"
+msgstr "Desconectado de"
 
-#: src/datastore/datastore_api.c:392
-msgid "# queue entry timeouts"
-msgstr "# expiraciones de plazo en la cola de entradas"
+#: src/datastore/datastore_api.c:425
+#, fuzzy
+msgid "Disconnected from DATASTORE"
+msgstr "# reconexiones al almacén de datos (DATASTORE)"
 
-#: src/datastore/datastore_api.c:447
+#: src/datastore/datastore_api.c:513
 msgid "# queue overflows"
 msgstr "# desbordamientos de la cola"
 
-#: src/datastore/datastore_api.c:475
+#: src/datastore/datastore_api.c:543
 msgid "# queue entries created"
 msgstr "# entradas creadas en la cola"
 
-#: src/datastore/datastore_api.c:495
-msgid "# Requests dropped from datastore queue"
-msgstr "# Peticiones omitidas de la cola del almacén de datos"
+#: src/datastore/datastore_api.c:680
+msgid "# status messages received"
+msgstr "# mensajes de estado recibidos"
 
-#: src/datastore/datastore_api.c:536
+#: src/datastore/datastore_api.c:754
+msgid "# Results received"
+msgstr "# Resultados recibidos"
+
+#: src/datastore/datastore_api.c:879
 msgid "# datastore connections (re)created"
 msgstr "# conexiones a almacenes de datos (re)creadas"
 
-#: src/datastore/datastore_api.c:624
-msgid "# transmission request failures"
-msgstr "# fallos en peticiones de transmisión"
-
-#: src/datastore/datastore_api.c:648
-msgid "# bytes sent to datastore"
-msgstr "# bytes mandados al almacén de datos"
-
-#: src/datastore/datastore_api.c:790
-msgid "Failed to receive status response from database."
-msgstr ""
-"Se produjo un fallo al recibir el estado de respuesta de la base de datos."
-
-#: src/datastore/datastore_api.c:804
-msgid "Error reading response from datastore service"
-msgstr "Error leyendo respuesta del servicio de almacenamiento de datos"
-
-#: src/datastore/datastore_api.c:816 src/datastore/datastore_api.c:822
-msgid "Invalid error message received from datastore service"
-msgstr ""
-"Mensaje de error no válido recibido del servicio de almacenamiento de datos"
-
-#: src/datastore/datastore_api.c:826
-msgid "# status messages received"
-msgstr "# mensajes de estado recibidos"
-
-#: src/datastore/datastore_api.c:905
+#: src/datastore/datastore_api.c:995
 msgid "# PUT requests executed"
 msgstr "# peticiones «PUT» ejecutadas"
 
-#: src/datastore/datastore_api.c:971
+#: src/datastore/datastore_api.c:1056
 msgid "# RESERVE requests executed"
 msgstr "# peticiones «RESERVE» ejecutadas"
 
-#: src/datastore/datastore_api.c:1032
+#: src/datastore/datastore_api.c:1121
 msgid "# RELEASE RESERVE requests executed"
 msgstr "# Peticiones «RELEASE RESERVE» ejecutadas"
 
-#: src/datastore/datastore_api.c:1092
+#: src/datastore/datastore_api.c:1187
 msgid "# UPDATE requests executed"
 msgstr "# peticiones «UPDATE» ejecutadas"
 
-#: src/datastore/datastore_api.c:1156
+#: src/datastore/datastore_api.c:1271
 msgid "# REMOVE requests executed"
 msgstr "# peticiones «REMOVE» ejecutadas"
 
-#: src/datastore/datastore_api.c:1260
-msgid "# Results received"
-msgstr "# Resultados recibidos"
-
-#: src/datastore/datastore_api.c:1327
+#: src/datastore/datastore_api.c:1331
 msgid "# GET REPLICATION requests executed"
 msgstr "# peticiones «GET REPLICATION» ejecutadas"
 
-#: src/datastore/datastore_api.c:1390
+#: src/datastore/datastore_api.c:1397
 msgid "# GET ZERO ANONYMITY requests executed"
 msgstr "# peticiones «GET ZERO ANONYMITY» ejecutadas"
 
-#: src/datastore/datastore_api.c:1459
+#: src/datastore/datastore_api.c:1477
 msgid "# GET requests executed"
 msgstr "# peticiones «GET» ejecutadas"
 
@@ -1716,38 +1658,28 @@
 msgid "Manipulate GNUnet datastore"
 msgstr "Manipular ficheros de configuración de GNUnet"
 
-#: src/datastore/gnunet-service-datastore.c:370
+#: src/datastore/gnunet-service-datastore.c:336
 msgid "# bytes expired"
 msgstr "# bytes expirados"
 
-#: src/datastore/gnunet-service-datastore.c:446
+#: src/datastore/gnunet-service-datastore.c:416
 msgid "# bytes purged (low-priority)"
 msgstr "# bytes purgados (baja prioridad)"
 
-#: src/datastore/gnunet-service-datastore.c:504
-#: src/gns/gnunet-gns-helper-service-w32.c:221
-msgid "Transmission to client failed!\n"
-msgstr "¡La transmisión con el cliente ha fallado!\n"
-
-#: src/datastore/gnunet-service-datastore.c:535
-#: src/gns/gnunet-gns-helper-service-w32.c:260
-msgid "Shutdown in progress, aborting transmission.\n"
-msgstr "Apagado en proceso, abortando transmisión.\n"
-
-#: src/datastore/gnunet-service-datastore.c:651
+#: src/datastore/gnunet-service-datastore.c:557
 msgid "# results found"
 msgstr "# resultados encontrados"
 
-#: src/datastore/gnunet-service-datastore.c:696
-#, c-format
+#: src/datastore/gnunet-service-datastore.c:598
+#, fuzzy, c-format
 msgid ""
-"Insufficient space (%llu bytes are available) to satisfy `%s' request for "
+"Insufficient space (%llu bytes are available) to satisfy RESERVE request for "
 "%llu bytes\n"
 msgstr ""
 "Espacio insuficiente (%llu bytes están disponibles) para satisfacer la "
 "petición «%s» de %llu bytes\n"
 
-#: src/datastore/gnunet-service-datastore.c:707
+#: src/datastore/gnunet-service-datastore.c:609
 #, c-format
 msgid ""
 "The requested amount (%llu bytes) is larger than the cache size (%llu "
@@ -1756,7 +1688,7 @@
 "La cantidad solicitada (%llu bytes) es mayor que el tamaño de la caché (%llu "
 "bytes)\n"
 
-#: src/datastore/gnunet-service-datastore.c:711
+#: src/datastore/gnunet-service-datastore.c:615
 msgid ""
 "Insufficient space to satisfy request and requested amount is larger than "
 "cache size"
@@ -1764,61 +1696,66 @@
 "Espacio insuficiente para satisfacer la petición y la cantidad pedida es "
 "mayor que el tamaño de la caché"
 
-#: src/datastore/gnunet-service-datastore.c:717
+#: src/datastore/gnunet-service-datastore.c:622
 msgid "Insufficient space to satisfy request"
 msgstr "Espacio insuficiente para satisfacer la petición"
 
-#: src/datastore/gnunet-service-datastore.c:723
-#: src/datastore/gnunet-service-datastore.c:778
-#: src/datastore/gnunet-service-datastore.c:1039
-#: src/datastore/gnunet-service-datastore.c:1673
+#: src/datastore/gnunet-service-datastore.c:629
+#: src/datastore/gnunet-service-datastore.c:684
+#: src/datastore/gnunet-service-datastore.c:969
+#: src/datastore/gnunet-service-datastore.c:1668
 msgid "# reserved"
 msgstr "# reservado"
 
-#: src/datastore/gnunet-service-datastore.c:792
+#: src/datastore/gnunet-service-datastore.c:702
 msgid "Could not find matching reservation"
 msgstr "No se pudo encontrar una reserva coincidente"
 
-#: src/datastore/gnunet-service-datastore.c:879
+#: src/datastore/gnunet-service-datastore.c:787
 #, 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:1094
+#: src/datastore/gnunet-service-datastore.c:1017
 msgid "# GET requests received"
 msgstr "# peticiones «GET» recibidas"
 
-#: src/datastore/gnunet-service-datastore.c:1107
+#: src/datastore/gnunet-service-datastore.c:1048
+#, fuzzy
+msgid "# GET KEY requests received"
+msgstr "# peticiones «GET» recibidas"
+
+#: src/datastore/gnunet-service-datastore.c:1061
 msgid "# requests filtered by bloomfilter"
 msgstr "# peticiones filtradas por el «bloomfilter»"
 
-#: src/datastore/gnunet-service-datastore.c:1155
+#: src/datastore/gnunet-service-datastore.c:1115
 msgid "# UPDATE requests received"
 msgstr "# peticiones «UPDATE» recibidas"
 
-#: src/datastore/gnunet-service-datastore.c:1187
+#: src/datastore/gnunet-service-datastore.c:1146
 msgid "# GET REPLICATION requests received"
 msgstr "# peticiones «GET REPLICATION» recibidas"
 
-#: src/datastore/gnunet-service-datastore.c:1223
+#: src/datastore/gnunet-service-datastore.c:1179
 msgid "# GET ZERO ANONYMITY requests received"
 msgstr "# peticiones «GET ZERO ANONYMITY» recibidas"
 
-#: src/datastore/gnunet-service-datastore.c:1269
+#: src/datastore/gnunet-service-datastore.c:1226
 msgid "Content not found"
 msgstr "Contenido no encontrado"
 
-#: src/datastore/gnunet-service-datastore.c:1279
+#: src/datastore/gnunet-service-datastore.c:1235
 msgid "# bytes removed (explicit request)"
 msgstr "# bytes eliminados (petición explícita)"
 
-#: src/datastore/gnunet-service-datastore.c:1311
+#: src/datastore/gnunet-service-datastore.c:1282
 msgid "# REMOVE requests received"
 msgstr "# peticiones «REMOVE» recibidas"
 
 # Miguel: ¿Cómo traducir «payload»? ¿Código cargado?
-#: src/datastore/gnunet-service-datastore.c:1364
+#: src/datastore/gnunet-service-datastore.c:1336
 #, fuzzy, c-format
 msgid ""
 "Datastore payload must have been inaccurate (%lld < %lld). Recomputing it.\n"
@@ -1826,62 +1763,56 @@
 "El «payload» del almacén de datos es impreciso (%lld < %lld).  Intentando "
 "repararlo.\n"
 
-#: src/datastore/gnunet-service-datastore.c:1369
+#: src/datastore/gnunet-service-datastore.c:1342
+#: src/datastore/gnunet-service-datastore.c:1517
 #, c-format
 msgid "New payload: %lld\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1423
+#: src/datastore/gnunet-service-datastore.c:1396
 #, 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:1434
+#: src/datastore/gnunet-service-datastore.c:1408
 #, 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:1503
-#: src/datastore/gnunet-service-datastore.c:1566
+#: src/datastore/gnunet-service-datastore.c:1468
 msgid "Bloomfilter construction complete.\n"
 msgstr "Construcción de «bloomfilter» completa.\n"
 
-#: src/datastore/gnunet-service-datastore.c:1553
+#: src/datastore/gnunet-service-datastore.c:1524
 msgid "Rebuilding bloomfilter.  Please be patient.\n"
 msgstr "Reconstruyendo «bloomfilter».  Por favor, tenga paciencia.\n"
 
-#: src/datastore/gnunet-service-datastore.c:1563
+#: src/datastore/gnunet-service-datastore.c:1535
 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:1704
-#: src/datastore/gnunet-service-datastore.c:1716
+#: src/datastore/gnunet-service-datastore.c:1705
 #, c-format
-msgid "No `%s' specified for `%s' in configuration!\n"
-msgstr "¡No se ha especificado ningún «%s» para «%s» en la configuración!\n"
-
-#: src/datastore/gnunet-service-datastore.c:1710
-#, c-format
 msgid "# bytes used in file-sharing datastore `%s'"
 msgstr "# bytes usados en el almacén de ficheros compartidos «%s»"
 
-#: src/datastore/gnunet-service-datastore.c:1722
+#: src/datastore/gnunet-service-datastore.c:1721
 msgid "# quota"
 msgstr "# cuota"
 
-#: src/datastore/gnunet-service-datastore.c:1724
+#: src/datastore/gnunet-service-datastore.c:1726
 msgid "# cache size"
 msgstr "# tamaño de la caché"
 
-#: src/datastore/gnunet-service-datastore.c:1739
+#: src/datastore/gnunet-service-datastore.c:1742
 #, 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:1757
-#: src/datastore/gnunet-service-datastore.c:1773
+#: src/datastore/gnunet-service-datastore.c:1760
+#: src/datastore/gnunet-service-datastore.c:1776
 #, c-format
 msgid "Failed to remove bogus bloomfilter file `%s'\n"
 msgstr ""
@@ -1888,7 +1819,7 @@
 "Se produjo un fallo al borrar el fichero de configuración defectuoso de "
 "«bloomfilter» «%s»:\n"
 
-#: src/datastore/gnunet-service-datastore.c:1803
+#: src/datastore/gnunet-service-datastore.c:1808
 msgid "Failed to initialize bloomfilter.\n"
 msgstr "Se produjo un fallo al inicializar «bloomfilter».\n"
 
@@ -1896,27 +1827,23 @@
 msgid "Heap database running\n"
 msgstr "Base de datos de montículo ejecutándose\n"
 
-#: src/datastore/plugin_datastore_mysql.c:309
+#: src/datastore/plugin_datastore_mysql.c:347
 #: src/datastore/plugin_datastore_sqlite.c:507
 #, fuzzy
 msgid "Data too large"
 msgstr "número de valores"
 
-#: src/datastore/plugin_datastore_mysql.c:328
+#: src/datastore/plugin_datastore_mysql.c:363
 msgid "MySQL statement run failure"
 msgstr ""
 
-#: src/datastore/plugin_datastore_mysql.c:793
+#: src/datastore/plugin_datastore_mysql.c:983
 #, c-format
-msgid "Failed to prepare statement `%s'\n"
-msgstr "Se produjo un fallo al preparar la sentencia «%s»\n"
-
-#: src/datastore/plugin_datastore_mysql.c:802
-#, 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:1036
+#: src/datastore/plugin_datastore_mysql.c:1257
+#: src/psycstore/plugin_psycstore_mysql.c:1936
 msgid "Mysql database running\n"
 msgstr "Base de datos Mysql ejecutándose\n"
 
@@ -1931,6 +1858,7 @@
 #: src/datastore/plugin_datastore_postgres.c:1012
 #: 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"
 
@@ -1937,7 +1865,7 @@
 #: src/datastore/plugin_datastore_sqlite.c:65
 #: src/testbed/generate-underlay-topology.c:50
 #: src/testbed/gnunet-daemon-latency-logger.c:55
-#: src/testbed/gnunet-daemon-testbed-underlay.c:58
+#: src/testbed/gnunet-daemon-testbed-underlay.c:59
 #, c-format
 msgid "`%s' failed at %s:%u with error: %s"
 msgstr "«%s» falló en %s:%u con el error: %s"
@@ -1944,7 +1872,7 @@
 
 #: src/datastore/plugin_datastore_sqlite.c:263
 #: src/namecache/plugin_namecache_sqlite.c:193
-#: src/namestore/plugin_namestore_sqlite.c:204
+#: src/namestore/plugin_namestore_sqlite.c:213
 #: src/peerstore/plugin_peerstore_sqlite.c:479
 #: src/psycstore/plugin_psycstore_sqlite.c:325
 #, c-format
@@ -1974,7 +1902,7 @@
 
 #: src/datastore/plugin_datastore_sqlite.c:1245
 #: src/namecache/plugin_namecache_sqlite.c:580
-#: src/namestore/plugin_namestore_sqlite.c:716
+#: src/namestore/plugin_namestore_sqlite.c:766
 msgid "Sqlite database running\n"
 msgstr "Base de datos sqlite ejecutándose\n"
 
@@ -1982,10 +1910,6 @@
 msgid "Template database running\n"
 msgstr "Base de datos de plantilla ejecutándose\n"
 
-#: src/dht/dht_api.c:403
-msgid "Failed to connect to the DHT service!\n"
-msgstr "¡Se produjo un fallo al conectar con el servicio DHT!\n"
-
 #: src/dht/gnunet-dht-get.c:155
 #, c-format
 msgid ""
@@ -2008,7 +1932,7 @@
 msgstr "Enviando un «GET» DHT con clave"
 
 #: src/dht/gnunet-dht-get.c:212 src/dht/gnunet-dht-monitor.c:289
-#: src/dht/gnunet-dht-put.c:202
+#: src/dht/gnunet-dht-put.c:198
 msgid "the query key"
 msgstr "la clave de búsqueda"
 
@@ -2020,18 +1944,18 @@
 msgid "the type of data to look for"
 msgstr "el tipo de datos a buscar"
 
-#: src/dht/gnunet-dht-get.c:221 src/dht/gnunet-dht-put.c:214
+#: src/dht/gnunet-dht-get.c:221
 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:224 src/dht/gnunet-dht-put.c:205
+#: src/dht/gnunet-dht-get.c:224 src/dht/gnunet-dht-put.c:201
 msgid "use DHT's demultiplex everywhere option"
 msgstr "opción para usar el demultiplexado de la DHT siempre"
 
 #: src/dht/gnunet-dht-get.c:227 src/dht/gnunet-dht-monitor.c:298
-#: src/dht/gnunet-dht-put.c:217 src/fs/gnunet-auto-share.c:780
+#: src/dht/gnunet-dht-put.c:210 src/fs/gnunet-auto-share.c:780
 #: src/fs/gnunet-download.c:327 src/fs/gnunet-publish.c:951
-#: src/fs/gnunet-search.c:318 src/fs/gnunet-unindex.c:167
+#: src/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)"
@@ -2049,23 +1973,22 @@
 msgid "Prints all packets that go through the DHT."
 msgstr "Imprime todos los paquetes que pasan por la DHT."
 
-#: src/dht/gnunet_dht_profiler.c:1392
-#: src/testbed/gnunet-testbed-profiler.c:255
+#: src/dht/gnunet_dht_profiler.c:1161 src/testbed/gnunet-testbed-profiler.c:255
 #, fuzzy, c-format
 msgid "Exiting as the number of peers is %u\n"
 msgstr "El número máximo de conexiones es %u\n"
 
-#: src/dht/gnunet_dht_profiler.c:1417
+#: src/dht/gnunet_dht_profiler.c:1186
 msgid "number of peers to start"
 msgstr "número de pares para empezar"
 
-#: src/dht/gnunet_dht_profiler.c:1420
+#: src/dht/gnunet_dht_profiler.c:1189
 msgid ""
 "maximum number of times we try to search for successor circle formation (0 "
 "for R5N)"
 msgstr ""
 
-#: src/dht/gnunet_dht_profiler.c:1423 src/nse/gnunet-nse-profiler.c:846
+#: src/dht/gnunet_dht_profiler.c:1192 src/nse/gnunet-nse-profiler.c:846
 #: src/testbed/gnunet-testbed-profiler.c:294
 msgid "name of the file with the login information for the testbed"
 msgstr ""
@@ -2072,330 +1995,270 @@
 "nombre del fichero con la información de acceso usada para la batería de "
 "pruebas"
 
-#: src/dht/gnunet_dht_profiler.c:1426
+#: src/dht/gnunet_dht_profiler.c:1195
 msgid "delay between rounds for collecting statistics (default: 30 sec)"
 msgstr ""
 
-#: src/dht/gnunet_dht_profiler.c:1429
+#: src/dht/gnunet_dht_profiler.c:1198
 msgid "delay to start doing PUTs (default: 1 sec)"
 msgstr ""
 
-#: src/dht/gnunet_dht_profiler.c:1432
+#: src/dht/gnunet_dht_profiler.c:1201
 msgid "delay to start doing GETs (default: 5 min)"
 msgstr ""
 
-#: src/dht/gnunet_dht_profiler.c:1435
+#: src/dht/gnunet_dht_profiler.c:1204
 msgid "replication degree for DHT PUTs"
 msgstr ""
 
-#: src/dht/gnunet_dht_profiler.c:1438
+#: src/dht/gnunet_dht_profiler.c:1207
 msgid "timeout for DHT PUT and GET requests (default: 1 min)"
 msgstr ""
 
-#: src/dht/gnunet_dht_profiler.c:1456
+#: src/dht/gnunet_dht_profiler.c:1225
 #, fuzzy
 msgid "Measure quality and performance of the DHT service."
 msgstr "Medir la calidad y rendimiento del servicio NSE."
 
-#: src/dht/gnunet-dht-put.c:120
+#: src/dht/gnunet-dht-put.c:115
 msgid "PUT request sent with key"
 msgstr "Petición «PUT» enviada con clave"
 
-#: src/dht/gnunet-dht-put.c:123
+#: src/dht/gnunet-dht-put.c:118
 msgid "Timeout sending PUT request!\n"
 msgstr "¡Expiró el plazo enviando una petición «PUT»!\n"
 
-#: src/dht/gnunet-dht-put.c:126
+#: src/dht/gnunet-dht-put.c:121
 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:151
 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:158
 #, 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:180
+#: src/dht/gnunet-dht-put.c:172
 #, 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:196
+#: src/dht/gnunet-dht-put.c:192
 msgid "the data to insert under the key"
 msgstr "los datos a insertar bajo la clave"
 
-#: src/dht/gnunet-dht-put.c:199
+#: src/dht/gnunet-dht-put.c:195
 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:208
+#: src/dht/gnunet-dht-put.c:204
 msgid "how many replicas to create"
 msgstr "cuantas réplicas crear"
 
-#: src/dht/gnunet-dht-put.c:211
+#: src/dht/gnunet-dht-put.c:207
 msgid "the type to insert data as"
 msgstr "el tipo de datos a insertar"
 
-#: src/dht/gnunet-dht-put.c:240
+#: src/dht/gnunet-dht-put.c:232
 msgid "Issue a PUT request to the GNUnet DHT insert DATA under KEY."
 msgstr ""
 "Inicianco una petición «PUT» a la DHT de GNUnet para insertar «DATA» bajo "
 "«KEY»."
 
-#: src/dht/gnunet-service-dht.c:171
-msgid "Failed to connect to transport service!\n"
-msgstr "¡Se produjo un fallo al conectar con el servicio de transporte!\n"
-
-#: src/dht/gnunet-service-dht_clients.c:417
-#: src/dht/gnunet-service-wdht_clients.c:857
-#: src/dht/gnunet-service-xdht_clients.c:854
+#: src/dht/gnunet-service-dht_clients.c:370
+#: 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:509
-#: src/dht/gnunet-service-wdht_clients.c:938
-#: src/dht/gnunet-service-xdht_clients.c:934
+#: src/dht/gnunet-service-dht_clients.c:481
+#: 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:593
-#: src/dht/gnunet-service-wdht_clients.c:1004
-#: src/dht/gnunet-service-xdht_clients.c:999
+#: src/dht/gnunet-service-dht_clients.c:620
+#: 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:794
-#: src/dht/gnunet-service-wdht_clients.c:1213
-#: src/dht/gnunet-service-xdht_clients.c:1201
+#: src/dht/gnunet-service-dht_clients.c:847
+#: 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:1041
+#: src/dht/gnunet-service-dht_clients.c:1032
 #: src/dht/gnunet-service-wdht_clients.c:510
-#: src/dht/gnunet-service-xdht_clients.c:508
 msgid "# Key match, type mismatches in REPLY to CLIENT"
 msgstr ""
 "# Coincidencias de clave, diferencias de tipo en la respuesta (REPLY) del "
 "cliente (CLIENT)"
 
-#: src/dht/gnunet-service-dht_clients.c:1054
+#: src/dht/gnunet-service-dht_clients.c:1047
 #: src/dht/gnunet-service-wdht_clients.c:524
-#: src/dht/gnunet-service-xdht_clients.c:522
 msgid "# Duplicate REPLIES to CLIENT request dropped"
 msgstr ""
 "# Peticiones duplicadas de respuestas (REPLIES) a clientes (CLIENT) omitidas"
 
-#: src/dht/gnunet-service-dht_clients.c:1099
+#: src/dht/gnunet-service-dht_clients.c:1094
 #: src/dht/gnunet-service-wdht_clients.c:566
-#: src/dht/gnunet-service-xdht_clients.c:564
 #, c-format
 msgid "Unsupported block type (%u) in request!\n"
 msgstr "¡Tipo de bloque no soportado (%u) en la petición!\n"
 
-#: src/dht/gnunet-service-dht_clients.c:1122
+#: src/dht/gnunet-service-dht_clients.c:1101
 #: src/dht/gnunet-service-wdht_clients.c:589
-#: src/dht/gnunet-service-xdht_clients.c:587
 msgid "# RESULTS queued for clients"
 msgstr "# Resultados (RESULTS) encolados para clientes"
 
-#: src/dht/gnunet-service-dht_clients.c:1176
-#: src/dht/gnunet-service-dht_clients.c:1219
+#: src/dht/gnunet-service-dht_clients.c:1179
 #: src/dht/gnunet-service-wdht_clients.c:643
-#: src/dht/gnunet-service-wdht_clients.c:686
-#: src/dht/gnunet-service-xdht_clients.c:641
-#: src/dht/gnunet-service-xdht_clients.c:684
+#: src/dht/gnunet-service-wdht_clients.c:693
 msgid "# REPLIES ignored for CLIENTS (no match)"
 msgstr ""
 "# Respuestas (REPLIES) ignoradas para clientes (CLIENTS) (sin coincidencia)"
 
-#: src/dht/gnunet-service-dht_clients.c:1186
-#: src/dht/gnunet-service-wdht_clients.c:653
-#: src/dht/gnunet-service-xdht_clients.c:651
-msgid "Could not pass reply to client, message too big!\n"
-msgstr ""
-"¡No se pudo enviar respuesta al cliente, el mensaje es demasiado grande!\n"
-
-#: src/dht/gnunet-service-dht_datacache.c:68
+#: src/dht/gnunet-service-dht_datacache.c:72
 #, c-format
 msgid "%s request received, but have no datacache!\n"
 msgstr "¡Petición %s recibida, pero no tiene caché de datos!\n"
 
-#: src/dht/gnunet-service-dht_datacache.c:78
-#: src/dht/gnunet-service-wdht_datacache.c:107
-#: src/dht/gnunet-service-xdht_datacache.c:91
+#: src/dht/gnunet-service-dht_datacache.c:82
 msgid "# ITEMS stored in datacache"
 msgstr "# Elementos (ITEMS) almacenados en la caché de datos"
 
-#: src/dht/gnunet-service-dht_datacache.c:184
-#: src/dht/gnunet-service-wdht_datacache.c:216
-#: src/dht/gnunet-service-xdht_datacache.c:238
+#: src/dht/gnunet-service-dht_datacache.c:199
 msgid "# Good RESULTS found in datacache"
 msgstr "# Buenos resultados (RESULTS) encontrados en la caché de datos"
 
-#: src/dht/gnunet-service-dht_datacache.c:201
-#: src/dht/gnunet-service-wdht_datacache.c:231
-#: src/dht/gnunet-service-xdht_datacache.c:267
+#: src/dht/gnunet-service-dht_datacache.c:211
 msgid "# Duplicate RESULTS found in datacache"
 msgstr "# Resultados (RESULTS) duplicados encontrados en la caché de datos"
 
-#: src/dht/gnunet-service-dht_datacache.c:207
-#: src/dht/gnunet-service-wdht_datacache.c:237
-#: src/dht/gnunet-service-xdht_datacache.c:273
+#: src/dht/gnunet-service-dht_datacache.c:217
 msgid "# Invalid RESULTS found in datacache"
 msgstr "# Resultados (RESULTS) no válidos encontrados en la caché de datos"
 
-#: src/dht/gnunet-service-dht_datacache.c:213
-#: src/dht/gnunet-service-wdht_datacache.c:243
-#: src/dht/gnunet-service-xdht_datacache.c:279
+#: src/dht/gnunet-service-dht_datacache.c:223
 msgid "# Irrelevant RESULTS found in datacache"
 msgstr "# Resultados (RESULTS) irrelevantes encontrados en la caché de datos"
 
-#: src/dht/gnunet-service-dht_datacache.c:225
-#: src/dht/gnunet-service-wdht_datacache.c:255
-#: src/dht/gnunet-service-xdht_datacache.c:291
+#: src/dht/gnunet-service-dht_datacache.c:235
 msgid "# Unsupported RESULTS found in datacache"
 msgstr "# Resultados (RESULTS) no soportados encontrados en la caché de datos"
 
-#: src/dht/gnunet-service-dht_datacache.c:229
-#: src/dht/gnunet-service-wdht_datacache.c:258
-#: src/dht/gnunet-service-xdht_datacache.c:294
+#: src/dht/gnunet-service-dht_datacache.c:239
 #, c-format
 msgid "Unsupported block type (%u) in local response!\n"
 msgstr "¡Tipo de bloque no soportado (%u) en respuesta local!\n"
 
-#: src/dht/gnunet-service-dht_datacache.c:262
-#: src/dht/gnunet-service-wdht_datacache.c:295
-#: src/dht/gnunet-service-xdht_datacache.c:334
+#: src/dht/gnunet-service-dht_datacache.c:276
 msgid "# GET requests given to datacache"
 msgstr "# Peticiones «GET» realizadas a la caché de datos"
 
-#: src/dht/gnunet-service-dht_hello.c:84
-#: src/dht/gnunet-service-xdht_hello.c:82
+#: src/dht/gnunet-service-dht_hello.c:84 src/dht/gnunet-service-xdht_hello.c:82
 msgid "# HELLOs obtained from peerinfo"
 msgstr "# «HELLO» obtenidos de «peerinfo»"
 
-#: src/dht/gnunet-service-dht_neighbours.c:735
+#: src/dht/gnunet-service-dht_neighbours.c:685
 msgid "# FIND PEER messages initiated"
 msgstr "# mensajes «FIND PEER» iniciados"
 
-#: src/dht/gnunet-service-dht_neighbours.c:900
-#: src/dht/gnunet-service-xdht_neighbours.c:6062
-msgid "# Queued messages discarded (peer disconnected)"
-msgstr "# Mensajes encolados descartados (par desconectado)"
-
-#: src/dht/gnunet-service-dht_neighbours.c:933
-#: src/dht/gnunet-service-xdht_neighbours.c:986
+#: src/dht/gnunet-service-dht_neighbours.c:851
 #, fuzzy
-msgid "# Messages dropped (CORE timeout)"
-msgstr "# Peticiones DNS omitidas (expiradas)"
-
-#: src/dht/gnunet-service-dht_neighbours.c:963
-#: src/dht/gnunet-service-xdht_neighbours.c:1018
-msgid "# Bytes transmitted to other peers"
-msgstr "# Bytes transmitidos a otros pares"
-
-#: src/dht/gnunet-service-dht_neighbours.c:1009
-msgid "# Bytes of bandwidth requested from core"
-msgstr "# Bytes de ancho de banda solicitados por el servicio principal"
-
-#: src/dht/gnunet-service-dht_neighbours.c:1043
-#, fuzzy
 msgid "# requests TTL-dropped"
 msgstr "# peticiones unidas"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1248
-#: src/dht/gnunet-service-dht_neighbours.c:1285
+#: src/dht/gnunet-service-dht_neighbours.c:1054
+#: src/dht/gnunet-service-dht_neighbours.c:1091
 msgid "# Peers excluded from routing due to Bloomfilter"
 msgstr "# Pares excluidos del encaminado debido a «Bloomfilter»"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1263
-#: src/dht/gnunet-service-dht_neighbours.c:1300
+#: src/dht/gnunet-service-dht_neighbours.c:1071
+#: src/dht/gnunet-service-dht_neighbours.c:1107
 msgid "# Peer selection failed"
 msgstr "# Selecciones de pares fallidas"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1447
+#: src/dht/gnunet-service-dht_neighbours.c:1255
 msgid "# PUT requests routed"
 msgstr "# Peticiones «PUT» encaminadas"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1476
+#: src/dht/gnunet-service-dht_neighbours.c:1288
 msgid "# PUT messages queued for transmission"
 msgstr "# mensajes «PUT» encolados para transmisión"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1486
-#: src/dht/gnunet-service-dht_neighbours.c:1610
-#: src/dht/gnunet-service-dht_neighbours.c:1717
-#: src/dht/gnunet-service-xdht_neighbours.c:1128
-#: src/dht/gnunet-service-xdht_neighbours.c:1197
-#: src/dht/gnunet-service-xdht_neighbours.c:1247
-#: src/dht/gnunet-service-xdht_neighbours.c:1311
-#: src/dht/gnunet-service-xdht_neighbours.c:1378
-#: src/dht/gnunet-service-xdht_neighbours.c:1440
-#: src/dht/gnunet-service-xdht_neighbours.c:1502
-#: src/dht/gnunet-service-xdht_neighbours.c:1564
-#: src/dht/gnunet-service-xdht_neighbours.c:1624
+#: src/dht/gnunet-service-dht_neighbours.c:1299
+#: src/dht/gnunet-service-dht_neighbours.c:1427
+#: src/dht/gnunet-service-dht_neighbours.c:1532
+#: 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:1572
+#: src/dht/gnunet-service-dht_neighbours.c:1383
 msgid "# GET requests routed"
 msgstr "# Peticiones «GET» encaminadas"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1599
+#: src/dht/gnunet-service-dht_neighbours.c:1415
 msgid "# GET messages queued for transmission"
 msgstr "# Mensajes «GET» encolados para transmisión"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1724
+#: src/dht/gnunet-service-dht_neighbours.c:1547
 msgid "# RESULT messages queued for transmission"
 msgstr "# Mensajes «RESULT» encolados para transmisión"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1811
+#: src/dht/gnunet-service-dht_neighbours.c:1646
 msgid "# P2P PUT requests received"
 msgstr "# Peticiones «PUT» P2P recibidas"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1814
+#: src/dht/gnunet-service-dht_neighbours.c:1650
 #, fuzzy
 msgid "# P2P PUT bytes received"
 msgstr "# Peticiones «PUT» P2P recibidas"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1986
+#: src/dht/gnunet-service-dht_neighbours.c:1854
 msgid "# FIND PEER requests ignored due to Bloomfilter"
 msgstr "# Peticiones «FIND PEER» ignoradas debido a «Bloomfilter»"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1994
+#: src/dht/gnunet-service-dht_neighbours.c:1862
 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:2089
+#: src/dht/gnunet-service-dht_neighbours.c:2018
 msgid "# P2P GET requests received"
 msgstr "# Peticiones «GET» P2P recibidas"
 
-#: src/dht/gnunet-service-dht_neighbours.c:2092
+#: src/dht/gnunet-service-dht_neighbours.c:2022
 #, fuzzy
 msgid "# P2P GET bytes received"
 msgstr "# Peticiones «GET» P2P recibidas"
 
-#: src/dht/gnunet-service-dht_neighbours.c:2157
+#: src/dht/gnunet-service-dht_neighbours.c:2097
 msgid "# P2P FIND PEER requests processed"
 msgstr "# Peticiones «FIND PEER» P2P procesadas"
 
-#: src/dht/gnunet-service-dht_neighbours.c:2171
+#: src/dht/gnunet-service-dht_neighbours.c:2120
 msgid "# P2P GET requests ONLY routed"
 msgstr "# Peticiones «GET» P2P SOLAMENTE encaminadas"
 
-#: src/dht/gnunet-service-dht_neighbours.c:2257
+#: src/dht/gnunet-service-dht_neighbours.c:2222
 msgid "# P2P RESULTS received"
 msgstr "# Resultados (RESULTS) P2P recibidos"
 
-#: src/dht/gnunet-service-dht_neighbours.c:2260
+#: src/dht/gnunet-service-dht_neighbours.c:2226
 #, fuzzy
 msgid "# P2P RESULT bytes received"
 msgstr "# Resultados (RESULTS) P2P recibidos"
 
-#: src/dht/gnunet-service-dht_nse.c:59 src/dht/gnunet-service-wdht_nse.c:59
-#: src/dht/gnunet-service-xdht_nse.c:59
+#: src/dht/gnunet-service-dht_nse.c:59
 msgid "# Network size estimates received"
 msgstr "# Estimaciones del tamaño de red recibidas"
 
@@ -2425,24 +2288,24 @@
 "# Respuestas (REPLIES) no soportadas encontradas en la tabla de "
 "encaminamiento"
 
-#: src/dht/gnunet-service-dht_routing.c:324
+#: src/dht/gnunet-service-dht_routing.c:327
 msgid "# Entries removed from routing table"
 msgstr "# Entradas eliminadas de la tabla de encaminamiento"
 
-#: src/dht/gnunet-service-dht_routing.c:406
+#: src/dht/gnunet-service-dht_routing.c:409
 msgid "# Entries added to routing table"
 msgstr "# Entradas añadidas a la tabla de encaminamiento"
 
-#: src/dht/gnunet-service-dht_routing.c:424
+#: src/dht/gnunet-service-dht_routing.c:427
 msgid "# DHT requests combined"
 msgstr "# Peticiones a la DHT combinadas"
 
-#: src/dht/gnunet-service-wdht_datacache.c:82
-#, fuzzy
-msgid "PUT request received, but have no datacache!\n"
-msgstr "¡Petición %s recibida, pero no tiene caché de datos!\n"
+#: src/dht/gnunet-service-wdht_clients.c:653
+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:1831
+#: src/dht/gnunet-service-xdht_neighbours.c:1572
 #, c-format
 msgid ""
 "\n"
@@ -2449,7 +2312,7 @@
 "SUPU %s, %s, %d,trail_length = %d"
 msgstr ""
 
-#: src/dht/gnunet-service-xdht_neighbours.c:1836
+#: src/dht/gnunet-service-xdht_neighbours.c:1577
 #, c-format
 msgid ""
 "\n"
@@ -2456,7 +2319,7 @@
 "SUPU %s, %s, %d,trail[%d]=%s"
 msgstr ""
 
-#: src/dht/gnunet-service-xdht_neighbours.c:1856
+#: src/dht/gnunet-service-xdht_neighbours.c:1597
 #, c-format
 msgid ""
 "\n"
@@ -2463,7 +2326,7 @@
 "SUPU************  FRIEND_PEERMAP of %s"
 msgstr ""
 
-#: src/dht/gnunet-service-xdht_neighbours.c:1866
+#: src/dht/gnunet-service-xdht_neighbours.c:1607
 #, c-format
 msgid ""
 "\n"
@@ -2470,7 +2333,7 @@
 "SUPU %s, %s, %d, friend = %s, friend->trails_count = %d"
 msgstr ""
 
-#: src/dht/gnunet-service-xdht_neighbours.c:1887
+#: src/dht/gnunet-service-xdht_neighbours.c:1628
 #, c-format
 msgid ""
 "\n"
@@ -2477,7 +2340,7 @@
 "SUPU************  FINGER_TABLE of %s"
 msgstr ""
 
-#: src/dht/gnunet-service-xdht_neighbours.c:1896
+#: src/dht/gnunet-service-xdht_neighbours.c:1637
 #, c-format
 msgid ""
 "\n"
@@ -2484,7 +2347,7 @@
 "SUPU %s, %s, %d, finger_table[%d] = %s, trails_count = %d"
 msgstr ""
 
-#: src/dht/gnunet-service-xdht_neighbours.c:1903
+#: src/dht/gnunet-service-xdht_neighbours.c:1644
 #, c-format
 msgid ""
 "\n"
@@ -2491,7 +2354,7 @@
 "SUPU %s, %s, %d, trail_id[%d]=%s"
 msgstr ""
 
-#: src/dht/gnunet-service-xdht_neighbours.c:1909
+#: src/dht/gnunet-service-xdht_neighbours.c:1650
 #, c-format
 msgid ""
 "\n"
@@ -2498,27 +2361,27 @@
 "SUPU %s, %s, %d,trail[%d] = %s "
 msgstr ""
 
-#: src/dht/gnunet-service-xdht_neighbours.c:3557
+#: src/dht/gnunet-service-xdht_neighbours.c:3366
 msgid "# FINGERS_COUNT"
 msgstr ""
 
-#: src/dht/gnunet-service-xdht_neighbours.c:3698
-#: src/dht/gnunet-service-xdht_neighbours.c:3936
-#: src/dht/gnunet-service-xdht_neighbours.c:4088
-#: src/dht/gnunet-service-xdht_neighbours.c:4240
-#: src/dht/gnunet-service-xdht_neighbours.c:4421
-#: src/dht/gnunet-service-xdht_neighbours.c:4934
-#: src/dht/gnunet-service-xdht_neighbours.c:5325
-#: src/dht/gnunet-service-xdht_neighbours.c:5420
-#: src/dht/gnunet-service-xdht_neighbours.c:5510
-#: src/dht/gnunet-service-xdht_neighbours.c:5614
-#: src/dht/gnunet-service-xdht_neighbours.c:5758
-#: src/dht/gnunet-service-xdht_neighbours.c:5849
+#: 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:256
+#: src/dht/gnunet-service-xdht_routing.c:261
 #, c-format
 msgid ""
 "\n"
@@ -2525,7 +2388,7 @@
 "SUPU ***PRINTING ROUTING TABLE ***** of =%s"
 msgstr ""
 
-#: src/dht/gnunet-service-xdht_routing.c:264
+#: src/dht/gnunet-service-xdht_routing.c:269
 #, c-format
 msgid ""
 "\n"
@@ -2532,7 +2395,7 @@
 "SUPU %s, %s, %d, trail->trail_id = %s"
 msgstr ""
 
-#: src/dht/gnunet-service-xdht_routing.c:267
+#: src/dht/gnunet-service-xdht_routing.c:272
 #, c-format
 msgid ""
 "\n"
@@ -2539,7 +2402,7 @@
 "SUPU %s, %s, %d, trail->next_hop = %s"
 msgstr ""
 
-#: src/dht/gnunet-service-xdht_routing.c:270
+#: src/dht/gnunet-service-xdht_routing.c:275
 #, c-format
 msgid ""
 "\n"
@@ -2574,27 +2437,27 @@
 "Se produjo un fallo al convertir el nombre en UTF-8 «%s» al formato DNS "
 "IDNA: %s\n"
 
-#: src/dns/dnsstub.c:175
+#: src/dns/dnsstub.c:176
 #, c-format
 msgid "Could not bind to any port: %s\n"
 msgstr "No se pudo asociar con ningún puerto: %s\n"
 
-#: src/dns/dnsstub.c:293 src/dns/dnsstub.c:381
+#: src/dns/dnsstub.c:294 src/dns/dnsstub.c:382
 #, c-format
 msgid "Failed to send DNS request to %s\n"
 msgstr "Se produjo un fallo al mandar la petición DNS a %s\n"
 
-#: src/dns/dnsstub.c:297
+#: src/dns/dnsstub.c:298
 #, c-format
 msgid "Sent DNS request to %s\n"
 msgstr "Petición DNS enviada a %s\n"
 
-#: src/dns/dnsstub.c:366
+#: src/dns/dnsstub.c:367
 #, c-format
 msgid "Configured DNS exit `%s' is not working / valid.\n"
 msgstr "La salida DNS configurada «%s» no funciona o no es válida.\n"
 
-#: src/dns/dnsstub.c:438
+#: src/dns/dnsstub.c:437
 #, c-format
 msgid "Received DNS response that is too small (%u bytes)"
 msgstr "Recibida respuesta DNS demasiado pequeña (%u bytes)"
@@ -2623,48 +2486,52 @@
 msgid "Change DNS replies to point elsewhere."
 msgstr "Cambiar las respuestas DNS apuntando a cualquier otro lado."
 
-#: src/dns/gnunet-service-dns.c:457
+#: src/dns/gnunet-service-dns.c:462
 msgid "# DNS requests answered via TUN interface"
 msgstr "# Peticiones DNS contestadas vía interfaz TUN"
 
-#: src/dns/gnunet-service-dns.c:604
+#: src/dns/gnunet-service-dns.c:608
 msgid "# DNS exit failed (failed to open socket)"
 msgstr "# Salidas DNS fallidas (se produjo un fallo al abrir el «socket»)"
 
-#: src/dns/gnunet-service-dns.c:715
+#: src/dns/gnunet-service-dns.c:738
 msgid "# External DNS response discarded (no matching request)"
 msgstr "# Respuestas DNS externas descartadas (ninguna petición coincidente)"
 
-#: src/dns/gnunet-service-dns.c:793
+#: src/dns/gnunet-service-dns.c:813
 msgid "# Client response discarded (no matching request)"
 msgstr "# Respuestas de cliente descartadas (ninguna petición coincidente)"
 
-#: src/dns/gnunet-service-dns.c:908
+#: src/dns/gnunet-service-dns.c:929
 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:924
+#: src/dns/gnunet-service-dns.c:945
 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:933
+#: src/dns/gnunet-service-dns.c:954
 #, 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:943
+#: src/dns/gnunet-service-dns.c:964
+msgid "DNS interceptor got non-DNS packet (dropped)\n"
+msgstr ""
+
+#: src/dns/gnunet-service-dns.c:966
 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:1010
+#: src/dns/gnunet-service-dns.c:1033
 msgid "# DNS requests received via TUN interface"
 msgstr "# Peticiones DNS recibidas vía interfaz TUN"
 
-#: src/dns/gnunet-service-dns.c:1062 src/exit/gnunet-daemon-exit.c:3607
+#: src/dns/gnunet-service-dns.c:1078 src/exit/gnunet-daemon-exit.c:3643
 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:1080
+#: src/dns/gnunet-service-dns.c:1091
 #, 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"
@@ -2678,171 +2545,158 @@
 msgid "Print information about DV state"
 msgstr "Imprime información acerca del estado del ATS"
 
-#: src/exit/gnunet-daemon-exit.c:807
+#: src/exit/gnunet-daemon-exit.c:805 src/exit/gnunet-daemon-exit.c:3109
+#, fuzzy
+msgid "# Inbound CADET channels created"
+msgstr "# Túneles interiores MESH creados"
+
+#: src/exit/gnunet-daemon-exit.c:861
 #, 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:858
+#: src/exit/gnunet-daemon-exit.c:914
 #, fuzzy
 msgid "# Bytes transmitted via cadet channels"
 msgstr "# Bytes transmitidos vía túneles MESH"
 
-#: src/exit/gnunet-daemon-exit.c:975 src/exit/gnunet-daemon-exit.c:2408
-#: src/exit/gnunet-daemon-exit.c:2666 src/vpn/gnunet-service-vpn.c:1446
-#: src/vpn/gnunet-service-vpn.c:1837 src/vpn/gnunet-service-vpn.c:2000
+#: src/exit/gnunet-daemon-exit.c:1033 src/exit/gnunet-daemon-exit.c:2493
+#: src/exit/gnunet-daemon-exit.c:2746 src/vpn/gnunet-service-vpn.c:1455
+#: src/vpn/gnunet-service-vpn.c:1846 src/vpn/gnunet-service-vpn.c:2009
 msgid "# ICMPv4 packets dropped (type not allowed)"
 msgstr "# Paquetes ICMPv4 omitidos (tipo no permitido)"
 
-#: src/exit/gnunet-daemon-exit.c:1012 src/exit/gnunet-daemon-exit.c:2467
-#: src/exit/gnunet-daemon-exit.c:2725 src/vpn/gnunet-service-vpn.c:1502
-#: src/vpn/gnunet-service-vpn.c:1896 src/vpn/gnunet-service-vpn.c:2033
+#: src/exit/gnunet-daemon-exit.c:1070 src/exit/gnunet-daemon-exit.c:2552
+#: src/exit/gnunet-daemon-exit.c:2805 src/vpn/gnunet-service-vpn.c:1511
+#: src/vpn/gnunet-service-vpn.c:1905 src/vpn/gnunet-service-vpn.c:2042
 msgid "# ICMPv6 packets dropped (type not allowed)"
 msgstr "# Paquetes ICMPv6 omitidos (tipo no permitido)"
 
-#: src/exit/gnunet-daemon-exit.c:1052
+#: src/exit/gnunet-daemon-exit.c:1118
 msgid "# ICMP packets dropped (not allowed)"
 msgstr "# Paquetes ICMP omitidos (tipo no permitido)"
 
-#: src/exit/gnunet-daemon-exit.c:1059
+#: src/exit/gnunet-daemon-exit.c:1126
 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:1135
+#: src/exit/gnunet-daemon-exit.c:1203
 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:1209
+#: src/exit/gnunet-daemon-exit.c:1278
 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:1262
+#: src/exit/gnunet-daemon-exit.c:1331
 msgid "# Packets received from TUN"
 msgstr "# Paquetes recibidos de TUN"
 
-#: src/exit/gnunet-daemon-exit.c:1276
+#: src/exit/gnunet-daemon-exit.c:1345
 msgid "# Bytes received from TUN"
 msgstr "# Bytes recibidos de TUN"
 
-#: src/exit/gnunet-daemon-exit.c:1302
+#: src/exit/gnunet-daemon-exit.c:1371
 msgid "IPv4 packet options received.  Ignored.\n"
 msgstr "Opciones de paquete IPv4 recibidas.  Ignoradas.\n"
 
-#: src/exit/gnunet-daemon-exit.c:1329
+#: src/exit/gnunet-daemon-exit.c:1398
 #, 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:1375
+#: src/exit/gnunet-daemon-exit.c:1444
 #, 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:1383
+#: src/exit/gnunet-daemon-exit.c:1452
 #, 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:1765
+#: src/exit/gnunet-daemon-exit.c:1853
 msgid "# TCP packets sent via TUN"
 msgstr "# Paquetes TCP enviados vía TUN"
 
-#: src/exit/gnunet-daemon-exit.c:1878
+#: src/exit/gnunet-daemon-exit.c:1977
 #, 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:1881 src/exit/gnunet-daemon-exit.c:1975
-#: src/exit/gnunet-daemon-exit.c:2082 src/exit/gnunet-daemon-exit.c:2332
-#: src/exit/gnunet-daemon-exit.c:2582 src/exit/gnunet-daemon-exit.c:2872
-#: src/exit/gnunet-daemon-exit.c:2980
+#: src/exit/gnunet-daemon-exit.c:1981 src/exit/gnunet-daemon-exit.c:2060
+#: src/exit/gnunet-daemon-exit.c:2167 src/exit/gnunet-daemon-exit.c:2417
+#: src/exit/gnunet-daemon-exit.c:2667 src/exit/gnunet-daemon-exit.c:2954
+#: src/exit/gnunet-daemon-exit.c:3057
 #, fuzzy
 msgid "# Bytes received from CADET"
 msgstr "# Bytes recibidos de TUN"
 
-#: src/exit/gnunet-daemon-exit.c:1915 src/exit/gnunet-daemon-exit.c:3004
-#, fuzzy, c-format
-msgid "No service %s found for %s on port %d!\n"
-msgstr "¡Ningún servicio encontrado para %s en el puerto %d!\n"
-
-#: src/exit/gnunet-daemon-exit.c:1920
-msgid "# TCP requests dropped (no such service)"
-msgstr "# Peticiones TCP omitidas (no existe tal servicio)"
-
-#: src/exit/gnunet-daemon-exit.c:1978
+#: src/exit/gnunet-daemon-exit.c:2063
 #, 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:2085
+#: src/exit/gnunet-daemon-exit.c:2170
 #, fuzzy
 msgid "# TCP data requests received via cadet"
 msgstr "# Peticiones de datos TCP recibidas vía mesh"
 
-#: src/exit/gnunet-daemon-exit.c:2099
+#: src/exit/gnunet-daemon-exit.c:2184
 msgid "# TCP DATA requests dropped (no session)"
 msgstr "# Peticiones de datos (DATA) TCP omitidas (no hay sesión)"
 
-#: src/exit/gnunet-daemon-exit.c:2161
+#: src/exit/gnunet-daemon-exit.c:2246
 msgid "# ICMP packets sent via TUN"
 msgstr "# Paquetes ICMP enviados vía TUN"
 
-#: src/exit/gnunet-daemon-exit.c:2335
+#: src/exit/gnunet-daemon-exit.c:2420
 #, 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:2585
+#: src/exit/gnunet-daemon-exit.c:2670
 #, fuzzy
 msgid "# ICMP service requests received via cadet"
 msgstr "# Peticiones de servicio ICMP recibidas vía mesh"
 
-#: src/exit/gnunet-daemon-exit.c:2651 src/vpn/gnunet-service-vpn.c:1436
-#: src/vpn/gnunet-service-vpn.c:1994
+#: src/exit/gnunet-daemon-exit.c:2731 src/vpn/gnunet-service-vpn.c:1445
+#: src/vpn/gnunet-service-vpn.c:2003
 msgid "# ICMPv4 packets dropped (impossible PT to v6)"
 msgstr "# Paquetes ICMPv4 omitidos (imposible atravesar v6)"
 
-#: src/exit/gnunet-daemon-exit.c:2710 src/vpn/gnunet-service-vpn.c:1472
-#: src/vpn/gnunet-service-vpn.c:1484 src/vpn/gnunet-service-vpn.c:1884
+#: src/exit/gnunet-daemon-exit.c:2790 src/vpn/gnunet-service-vpn.c:1481
+#: src/vpn/gnunet-service-vpn.c:1493 src/vpn/gnunet-service-vpn.c:1893
 msgid "# ICMPv6 packets dropped (impossible PT to v4)"
 msgstr "# Paquetes ICMPv6 omitidos (imposible atravesar v4)"
 
-#: src/exit/gnunet-daemon-exit.c:2761
+#: src/exit/gnunet-daemon-exit.c:2841
 msgid "# UDP packets sent via TUN"
 msgstr "# Paquetes UDP enviados vía TUN"
 
-#: src/exit/gnunet-daemon-exit.c:2875
+#: src/exit/gnunet-daemon-exit.c:2957
 #, 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:2983
+#: src/exit/gnunet-daemon-exit.c:3060
 #, fuzzy
 msgid "# UDP service requests received via cadet"
 msgstr "# Peticiones de servicio UDP recibidas vía mesh"
 
-#: src/exit/gnunet-daemon-exit.c:3009
-msgid "# UDP requests dropped (no such service)"
-msgstr "# Peticiones UDP omitidas (no existe tal servicio)"
-
-#: src/exit/gnunet-daemon-exit.c:3047
-#, fuzzy
-msgid "# Inbound CADET channels created"
-msgstr "# Túneles interiores MESH creados"
-
-#: src/exit/gnunet-daemon-exit.c:3268 src/exit/gnunet-daemon-exit.c:3278
+#: src/exit/gnunet-daemon-exit.c:3327 src/exit/gnunet-daemon-exit.c:3337
 #, 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:3292 src/exit/gnunet-daemon-exit.c:3300
+#: src/exit/gnunet-daemon-exit.c:3351 src/exit/gnunet-daemon-exit.c:3359
 #, c-format
 msgid "`%s' is not a valid port number (for domain `%s')!"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3333
+#: src/exit/gnunet-daemon-exit.c:3400
 #, c-format
 msgid "No addresses found for hostname `%s' of service `%s'!\n"
 msgstr ""
@@ -2849,12 +2703,12 @@
 "¡No se encontraron direcciones para el nombre de máquina «%s» del servicio "
 "«%s»!\n"
 
-#: src/exit/gnunet-daemon-exit.c:3347 src/exit/gnunet-daemon-exit.c:3359
+#: src/exit/gnunet-daemon-exit.c:3414 src/exit/gnunet-daemon-exit.c:3427
 #, 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:3370
+#: src/exit/gnunet-daemon-exit.c:3439
 #, c-format
 msgid "No IP addresses found for hostname `%s' of service `%s'!\n"
 msgstr ""
@@ -2861,12 +2715,7 @@
 "¡No se encontraron direcciones IP para el nombre de máquina «%s» del "
 "servicio «%s»!\n"
 
-#: src/exit/gnunet-daemon-exit.c:3548
-#, fuzzy, c-format
-msgid "`%s' must be installed SUID, EXIT will not work\n"
-msgstr "«%s» debe ser instalado con SUID, se niega a arrancar\n"
-
-#: src/exit/gnunet-daemon-exit.c:3563
+#: src/exit/gnunet-daemon-exit.c:3584
 msgid ""
 "This system does not support IPv4, will disable IPv4 functions despite them "
 "being enabled in the configuration\n"
@@ -2874,7 +2723,7 @@
 "Este sistema no soporta IPv4, se deshabilitarán las funciones IPv4 aunque "
 "estén habilitadas en la configuración\n"
 
-#: src/exit/gnunet-daemon-exit.c:3571
+#: src/exit/gnunet-daemon-exit.c:3592
 msgid ""
 "This system does not support IPv6, will disable IPv6 functions despite them "
 "being enabled in the configuration\n"
@@ -2882,7 +2731,7 @@
 "Este sistema no soporta IPv6, se deshabilitarán las funciones IPv6 aunque "
 "estén habilitadas en la configuración\n"
 
-#: src/exit/gnunet-daemon-exit.c:3578
+#: src/exit/gnunet-daemon-exit.c:3599
 msgid ""
 "Cannot enable IPv4 exit but disable IPv4 on TUN interface, will use "
 "ENABLE_IPv4=YES\n"
@@ -2890,7 +2739,7 @@
 "No se puede habilitar salida IPv4 pero se deshabilita IPv4 sobre interfaz "
 "TUN, se usará ENABLE_IPv4=YES\n"
 
-#: src/exit/gnunet-daemon-exit.c:3584
+#: src/exit/gnunet-daemon-exit.c:3605
 msgid ""
 "Cannot enable IPv6 exit but disable IPv6 on TUN interface, will use "
 "ENABLE_IPv6=YES\n"
@@ -2898,16 +2747,20 @@
 "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:3590 src/exit/gnunet-daemon-exit.c:3754
-#: src/pt/gnunet-daemon-pt.c:1243
+#: src/exit/gnunet-daemon-exit.c:3765
+msgid "Must be a number"
+msgstr ""
+
+#: src/exit/gnunet-daemon-exit.c:3872
+#, 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:3884 src/pt/gnunet-daemon-pt.c:1279
 msgid "No useful service enabled.  Exiting.\n"
 msgstr "Ningún servicio útil habilitado.  Saliendo.\n"
 
-#: src/exit/gnunet-daemon-exit.c:3701
-msgid "Must be a number"
-msgstr ""
-
-#: src/exit/gnunet-daemon-exit.c:3852
+#: src/exit/gnunet-daemon-exit.c:4029
 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"
 
@@ -2960,38 +2813,38 @@
 msgid "# fragmentation transmissions completed"
 msgstr "# transmisiones de fragmentos completadas"
 
-#: src/fs/fs_api.c:493
+#: src/fs/fs_api.c:499
 #, c-format
 msgid "Could not open file `%s': %s"
 msgstr "No se pudo abrir el fichero «%s»: %s"
 
-#: src/fs/fs_api.c:504
+#: src/fs/fs_api.c:510
 #, c-format
 msgid "Could not read file `%s': %s"
 msgstr "No se pudo leer el fichero «%s»: %s"
 
 # Short read??
-#: src/fs/fs_api.c:512
+#: src/fs/fs_api.c:518
 #, c-format
 msgid "Short read reading from file `%s'!"
 msgstr "¡Lectura corta leyendo del fichero «%s»!"
 
-#: src/fs/fs_api.c:1120
+#: src/fs/fs_api.c:1126
 #, c-format
 msgid "Failed to resume publishing information `%s': %s\n"
 msgstr "Se produjo un fallo al retomar la operación de publicación «%s»: %s\n"
 
-#: src/fs/fs_api.c:1640
+#: src/fs/fs_api.c:1646
 #, c-format
 msgid "Failure while resuming publishing operation `%s': %s\n"
 msgstr "Fallo mientras se reiniciaba la operación de publicación «%s»: %s\n"
 
-#: src/fs/fs_api.c:1654
+#: src/fs/fs_api.c:1660
 #, c-format
 msgid "Failed to resume publishing operation `%s': %s\n"
 msgstr "Se produjo un fallo al retomar la operación de publicación «%s»: %s\n"
 
-#: src/fs/fs_api.c:2312
+#: src/fs/fs_api.c:2318
 #, c-format
 msgid "Failure while resuming unindexing operation `%s': %s\n"
 msgstr ""
@@ -2998,28 +2851,28 @@
 "Se produjo un fallo mientras se retomaba la operación de publicación «%s»: "
 "%s\n"
 
-#: src/fs/fs_api.c:2322
+#: src/fs/fs_api.c:2328
 #, c-format
 msgid "Failed to resume unindexing operation `%s': %s\n"
 msgstr "Se produjo un fallo al retomar la operación de desindexado «%s»: %s\n"
 
-#: src/fs/fs_api.c:2450 src/fs/fs_api.c:2698
+#: src/fs/fs_api.c:2456 src/fs/fs_api.c:2703
 #, c-format
 msgid "Failed to resume sub-download `%s': %s\n"
 msgstr "Se produjo un fallo al retomar la sub-descarga «%s»: %s\n"
 
-#: src/fs/fs_api.c:2468
+#: src/fs/fs_api.c:2474
 #, c-format
 msgid "Failed to resume sub-search `%s': %s\n"
 msgstr "Se produjo un fallo al retomar la sub-búsqueda «%s»: %s\n"
 
-#: src/fs/fs_api.c:2483 src/fs/fs_api.c:2502 src/fs/fs_api.c:2994
+#: src/fs/fs_api.c:2489 src/fs/fs_api.c:2508 src/fs/fs_api.c:3006
 #, c-format
 msgid "Failure while resuming search operation `%s': %s\n"
 msgstr ""
 "Se produjo un fallo mientras se retomaba la operación de búsqueda «%s»: %s\n"
 
-#: src/fs/fs_api.c:2688
+#: src/fs/fs_api.c:2693
 #, c-format
 msgid "Failed to resume sub-download `%s': could not open file `%s'\n"
 msgstr ""
@@ -3026,13 +2879,13 @@
 "Se produjo un fallo al retomar la sub-descarga «%s»: no se pudo abrir el "
 "fichero «%s»\n"
 
-#: src/fs/fs_api.c:2937
+#: src/fs/fs_api.c:2949
 msgid "Could not resume running search, will resume as paused search\n"
 msgstr ""
 "No se pudo retomar la búsqueda en ejecución, se retomará como una búsqueda "
 "en pausa\n"
 
-#: src/fs/fs_api.c:3032
+#: src/fs/fs_api.c:3044
 #, c-format
 msgid "Failure while resuming download operation `%s': %s\n"
 msgstr ""
@@ -3043,7 +2896,7 @@
 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:322
+#: src/fs/fs_download.c:308
 msgid ""
 "Recursive downloads of directories larger than 4 GB are not supported on 32-"
 "bit systems\n"
@@ -3051,17 +2904,17 @@
 "Las descargas recursivas de directorios mayores de 4GB no están soportadas "
 "en sistemas de 32 bits\n"
 
-#: src/fs/fs_download.c:342
+#: src/fs/fs_download.c:328
 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:523 src/fs/fs_download.c:535
+#: src/fs/fs_download.c:509 src/fs/fs_download.c:521
 #, 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:905
+#: src/fs/fs_download.c:926
 #, c-format
 msgid "Failed to create directory for recursive download of `%s'\n"
 msgstr ""
@@ -3068,7 +2921,7 @@
 "Se produjo un fallo al crear el directorio para la descarga recursiva de "
 "«%s»\n"
 
-#: src/fs/fs_download.c:987
+#: src/fs/fs_download.c:1011
 #, c-format
 msgid ""
 "Internal error or bogus download URI (expected %u bytes at depth %u and "
@@ -3077,22 +2930,22 @@
 "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:1013
+#: src/fs/fs_download.c:1039
 msgid "internal error decrypting content"
 msgstr "error interno descifrando el contenido"
 
-#: src/fs/fs_download.c:1036
+#: src/fs/fs_download.c:1063
 #, 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:1046
+#: src/fs/fs_download.c:1075
 #, 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:1055
+#: src/fs/fs_download.c:1084
 #, c-format
 msgid "Failed to write block of %u bytes at offset %llu in file `%s': %s"
 msgstr ""
@@ -3099,11 +2952,11 @@
 "Se produjo un fallo al escribir el bloque de %u bytes en el desplazamiento "
 "%llu del fichero «%s»: %s"
 
-#: src/fs/fs_download.c:1153
+#: src/fs/fs_download.c:1184
 msgid "internal error decoding tree"
 msgstr "error interno decodificando árbol"
 
-#: src/fs/fs_download.c:1939
+#: src/fs/fs_download.c:1838
 msgid "Invalid URI"
 msgstr "URI no válida"
 
@@ -3116,25 +2969,16 @@
 "Tipo de metadatos desconocido en la opción de metadatos «%s».  Usando el "
 "tipo de metadatos desconocido (unknown) en su lugar.\n"
 
-# Miguel: "Failed to receive (valid) response" no lo he traducido
-# "por se produjo un fallo al recibir una respuesta", sino
-# como "no se ha recibido una respuesta" puesto que es
-# más claro.
-#: src/fs/fs_list_indexed.c:90
-#, c-format
-msgid "Failed to receive response for `%s' request from `%s' service.\n"
+# Miguel: "Failed to receive" también aquí está traducido como
+# "no se obtuvo respuesta" por claridad.
+#: src/fs/fs_list_indexed.c:152
+#, fuzzy, c-format
+msgid "Failed to receive response from `%s' service.\n"
 msgstr ""
-"No se ha recibido la respuesta para la petición «%s» del servicio «%s».\n"
+"No se obtuvo respuesta del servicio de información de pares (PEERINFO)."
 
-#: src/fs/fs_list_indexed.c:113
+#: src/fs/fs_list_indexed.c:196
 #, c-format
-msgid "Failed to receive valid response for `%s' request from `%s' service.\n"
-msgstr ""
-"No se ha recibido una respuesta válida para la petición «%s» del servicio "
-"«%s».\n"
-
-#: src/fs/fs_list_indexed.c:151
-#, c-format
 msgid "Failed to not connect to `%s' service.\n"
 msgstr "Se produjo un fallo al conectar con el servicio «%s».\n"
 
@@ -3162,69 +3006,66 @@
 msgid "Failed to connect to datastore."
 msgstr "Se produjo un fallo al conectar con el almacén de datos."
 
-#: src/fs/fs_publish.c:127 src/fs/fs_publish.c:439
+#: src/fs/fs_publish.c:127 src/fs/fs_publish.c:438
 #, c-format
 msgid "Publishing failed: %s"
 msgstr "Publicación fallida: %s"
 
-#: src/fs/fs_publish.c:706 src/fs/fs_publish.c:723 src/fs/fs_publish.c:762
-#: src/fs/fs_publish.c:783 src/fs/fs_publish.c:807 src/fs/fs_publish.c:1055
+#: src/fs/fs_publish.c:724 src/fs/fs_publish.c:778 src/fs/fs_publish.c:823
+#: src/fs/fs_publish.c:844 src/fs/fs_publish.c:874 src/fs/fs_publish.c:1140
 #, c-format
 msgid "Can not index file `%s': %s.  Will try to insert instead.\n"
 msgstr "No se pudo indexar el fichero «%s»: %s.  Se intentará insertar.\n"
 
-#: src/fs/fs_publish.c:708
-msgid "timeout on index-start request to `fs' service"
+#: src/fs/fs_publish.c:780
+#, fuzzy
+msgid "error on index-start request to `fs' service"
 msgstr ""
 "expiración del plazo en la petición de inicio de indexado (index-start) al "
 "servicio «fs»"
 
-#: src/fs/fs_publish.c:720
-msgid "unknown error"
-msgstr "error desconocido"
-
-#: src/fs/fs_publish.c:764
+#: src/fs/fs_publish.c:825
 msgid "failed to compute hash"
 msgstr "se produjo un fallo al calcular el hash"
 
-#: src/fs/fs_publish.c:784
+#: src/fs/fs_publish.c:845
 msgid "filename too long"
 msgstr "nombre de fichero demasiado largo"
 
-#: src/fs/fs_publish.c:809
+#: src/fs/fs_publish.c:876
 msgid "could not connect to `fs' service"
 msgstr "no se pudo conectar con el servicio «fs»"
 
-#: src/fs/fs_publish.c:832
+#: src/fs/fs_publish.c:902
 #, c-format
 msgid "Failed to get file identifiers for `%s'\n"
 msgstr ""
 "Se produjo un fallo al obtener los identificadores de fichero para «%s»\n"
 
-#: src/fs/fs_publish.c:896 src/fs/fs_publish.c:937
+#: src/fs/fs_publish.c:991 src/fs/fs_publish.c:1027
 msgid "Can not create LOC URI. Will continue with CHK instead.\n"
 msgstr ""
 
-#: src/fs/fs_publish.c:1009
+#: src/fs/fs_publish.c:1094
 #, c-format
 msgid "Recursive upload failed at `%s': %s"
 msgstr "La subida recursiva falló en «%s»: %s"
 
-#: src/fs/fs_publish.c:1017
+#: src/fs/fs_publish.c:1102
 #, c-format
 msgid "Recursive upload failed: %s"
 msgstr "Subida recursiva fallida: %s"
 
-#: src/fs/fs_publish.c:1057
+#: src/fs/fs_publish.c:1142
 msgid "needs to be an actual file"
 msgstr "tiene que ser un fichero de verdad"
 
-#: src/fs/fs_publish.c:1296
+#: src/fs/fs_publish.c:1381
 #, fuzzy, c-format
 msgid "Datastore failure: %s"
 msgstr "# «PUT» en el almacén de datos fallidos"
 
-#: src/fs/fs_publish.c:1387
+#: src/fs/fs_publish.c:1472
 #, c-format
 msgid "Reserving space for %u entries and %llu bytes for publication\n"
 msgstr "Reservando espacio para %u entradas y %llu bytes para publicación\n"
@@ -3237,12 +3078,12 @@
 msgid "Internal error."
 msgstr "Error interno."
 
-#: src/fs/fs_search.c:806 src/fs/fs_search.c:876
+#: src/fs/fs_search.c:809 src/fs/fs_search.c:879
 #, fuzzy, c-format
 msgid "Failed to parse URI `%s': %s\n"
 msgstr "Se produjo un fallo al procesar la URI: %s\n"
 
-#: src/fs/fs_search.c:935
+#: src/fs/fs_search.c:966
 #, c-format
 msgid "Got result with unknown block type `%d', ignoring"
 msgstr ""
@@ -3256,48 +3097,42 @@
 msgid "Failed to read file"
 msgstr "No se pudo leer el fichero"
 
-#: src/fs/fs_unindex.c:245
-msgid "Unexpected time for a response from `fs' service."
-msgstr "Tiempo inesperado para una respuesta del servicio «fs»."
+# Miguel: ¿Conectar y conexión?
+#: src/fs/fs_unindex.c:275
+#, fuzzy
+msgid "Error communicating with `fs' service."
+msgstr "Error al comunicar con el servicio ARM.\n"
 
-#: src/fs/fs_unindex.c:253
-msgid "Timeout waiting for `fs' service."
-msgstr "Esperando al servicio «fs»."
-
-#: src/fs/fs_unindex.c:261
-msgid "Invalid response from `fs' service."
-msgstr "Respuesta no válida del servicio «fs»."
-
-#: src/fs/fs_unindex.c:304
+#: src/fs/fs_unindex.c:328
 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:360 src/fs/fs_unindex.c:372
+#: src/fs/fs_unindex.c:378 src/fs/fs_unindex.c:390
 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:368
+#: src/fs/fs_unindex.c:386
 #, c-format
 msgid "Internal error scanning `%s'.\n"
 msgstr "Error interno escaneando «%s».\n"
 
-#: src/fs/fs_unindex.c:427
+#: src/fs/fs_unindex.c:445
 #, 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:590 src/fs/fs_unindex.c:654
+#: src/fs/fs_unindex.c:606 src/fs/fs_unindex.c:669
 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:667
+#: src/fs/fs_unindex.c:682
 msgid "Failed to open file for unindexing."
 msgstr "Se produjo un fallo al abrir el fichero para desindexado."
 
-#: src/fs/fs_unindex.c:706
+#: src/fs/fs_unindex.c:721
 msgid "Failed to compute hash of file."
 msgstr "Se produjo un fallo al calcular el hash del fichero."
 
@@ -3532,7 +3367,7 @@
 msgstr "Finalizada descarga «%s» (%s/s).\n"
 
 #: src/fs/gnunet-download.c:208 src/fs/gnunet-publish.c:295
-#: src/fs/gnunet-search.c:208 src/fs/gnunet-unindex.c:107
+#: src/fs/gnunet-search.c:212 src/fs/gnunet-unindex.c:107
 #, c-format
 msgid "Unexpected status: %d\n"
 msgstr "Estado inesperado: %d\n"
@@ -3555,12 +3390,12 @@
 msgstr "El nombre de fichero de destino debe ser especificado.\n"
 
 #: src/fs/gnunet-download.c:267 src/fs/gnunet-publish.c:870
-#: src/fs/gnunet-search.c:266 src/fs/gnunet-unindex.c:139
+#: src/fs/gnunet-search.c:270 src/fs/gnunet-unindex.c:139
 #, c-format
 msgid "Could not initialize `%s' subsystem.\n"
 msgstr "No se pudo inicializar el subsistema «%s».\n"
 
-#: src/fs/gnunet-download.c:304 src/fs/gnunet-search.c:306
+#: src/fs/gnunet-download.c:304 src/fs/gnunet-search.c:310
 msgid "set the desired LEVEL of receiver-anonymity"
 msgstr "establece el nivel LEVEL deseado de anonimato del receptor"
 
@@ -3568,7 +3403,7 @@
 msgid "delete incomplete downloads (when aborted with CTRL-C)"
 msgstr "borra descargas incompletas (cuando fueron abortadas con CTRL-C="
 
-#: src/fs/gnunet-download.c:310 src/fs/gnunet-search.c:309
+#: src/fs/gnunet-download.c:310 src/fs/gnunet-search.c:313
 msgid "only search the local peer (no P2P network search)"
 msgstr "únicamente buscar en el par local (no buscar en la red P2P)"
 
@@ -3753,7 +3588,7 @@
 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:1811 src/transport/gnunet-transport.c:1835
+#: src/transport/gnunet-transport.c:1577 src/transport/gnunet-transport.c:1602
 #, 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"
@@ -3827,7 +3662,7 @@
 msgid "Publish a file or directory on GNUnet"
 msgstr "Publicar un fichero o un directorio en GNUnet"
 
-#: src/fs/gnunet-search.c:123
+#: src/fs/gnunet-search.c:127
 #, c-format
 msgid "Failed to write directory with search results to `%s'\n"
 msgstr ""
@@ -3834,44 +3669,67 @@
 "Se produjo un fallo al escribir el directorio con los resultados de búsqueda "
 "de «%s»\n"
 
-#: src/fs/gnunet-search.c:200
+#: src/fs/gnunet-search.c:204
 #, c-format
 msgid "Error searching: %s.\n"
 msgstr "Error buscando: %s.\n"
 
-#: src/fs/gnunet-search.c:256
+#: src/fs/gnunet-search.c:260
 msgid "Could not create keyword URI from arguments.\n"
 msgstr "No se pudo crear URI de palabra clave a partir de los parámetros.\n"
 
-#: src/fs/gnunet-search.c:280
+#: src/fs/gnunet-search.c:284
 msgid "Could not start searching.\n"
 msgstr "No se pudo empezar a buscar.\n"
 
-#: src/fs/gnunet-search.c:312
+#: src/fs/gnunet-search.c:316
 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:315
+#: src/fs/gnunet-search.c:319
 msgid "automatically terminate search after DELAY"
 msgstr "terminar búsqueda automáticamente después de «DELAY»"
 
-#: src/fs/gnunet-search.c:322
+#: src/fs/gnunet-search.c:326
 msgid "automatically terminate search after VALUE results are found"
 msgstr "terminar búsqueda después de «VALUE» resultados encontrados"
 
-#: src/fs/gnunet-search.c:333
+#: src/fs/gnunet-search.c:337
 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:273
+#: src/fs/gnunet-service-fs.c:378 src/fs/gnunet-service-fs.c:883
+msgid "# client searches active"
+msgstr "# búsquedas de clientes activas"
+
+#: src/fs/gnunet-service-fs.c:437
+msgid "# replies received for local clients"
+msgstr "# respuestas recibidas de clientes locales"
+
+#: src/fs/gnunet-service-fs.c:606
 msgid "# running average P2P latency (ms)"
 msgstr "# latencia media de P2P en ejecución (ms)"
 
-#: src/fs/gnunet-service-fs.c:331 src/fs/gnunet-service-fs.c:603
+#: src/fs/gnunet-service-fs.c:658 src/fs/gnunet-service-fs_cp.c:564
 msgid "# Loopback routes suppressed"
 msgstr "# Rutas en bucle local eliminadas"
 
-#: src/fs/gnunet-service-fs.c:730
+#: src/fs/gnunet-service-fs.c:837
+msgid "# client searches received"
+msgstr "# búsquedas de clientes recibidas"
+
+#: src/fs/gnunet-service-fs.c:876
+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
+#, 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:1288
 #, fuzzy
 msgid "FS service is lacking HOSTKEY configuration setting.  Exiting.\n"
 msgstr ""
@@ -3878,19 +3736,18 @@
 "Al servicio principal le falta la configuración de la clave de máquina "
 "(HOSTKEY).  Saliendo.\n"
 
-#: src/fs/gnunet-service-fs.c:756 src/hostlist/gnunet-daemon-hostlist.c:308
-#: src/topology/gnunet-daemon-topology.c:1245
-#: src/topology/gnunet-daemon-topology.c:1253
+#: src/fs/gnunet-service-fs.c:1313 src/hostlist/gnunet-daemon-hostlist.c:355
+#: src/topology/gnunet-daemon-topology.c:1203
 #, c-format
 msgid "Failed to connect to `%s' service.\n"
 msgstr "Se produjo un fallo al conectar con el servicio «%s».\n"
 
-#: src/fs/gnunet-service-fs_cadet_client.c:490
+#: src/fs/gnunet-service-fs_cadet_client.c:494
 #, fuzzy
 msgid "# replies received via cadet"
 msgstr "# respuestas recibidas vía «stream»"
 
-#: src/fs/gnunet-service-fs_cadet_client.c:504
+#: src/fs/gnunet-service-fs_cadet_client.c:508
 #, fuzzy
 msgid "# replies received via cadet dropped"
 msgstr "# respuestas recibidas omitidas vía «stream»"
@@ -3900,149 +3757,122 @@
 msgid "# Blocks transferred via cadet"
 msgstr "# Bloques transferidos vía «stream»"
 
-#: src/fs/gnunet-service-fs_cadet_server.c:359
+#: src/fs/gnunet-service-fs_cadet_server.c:360
 #, fuzzy
 msgid "# queries received via CADET not answered"
 msgstr "# consultas recibidas vía «stream»"
 
-#: src/fs/gnunet-service-fs_cadet_server.c:439
+#: src/fs/gnunet-service-fs_cadet_server.c:440
 #, fuzzy
 msgid "# queries received via cadet"
 msgstr "# consultas recibidas vía «stream»"
 
-#: src/fs/gnunet-service-fs_cadet_server.c:483
+#: src/fs/gnunet-service-fs_cadet_server.c:484
 #, fuzzy
 msgid "# cadet client connections rejected"
 msgstr "# conexiones de clientes «stream» rechazadas"
 
-#: src/fs/gnunet-service-fs_cadet_server.c:489
-#: src/fs/gnunet-service-fs_cadet_server.c:529
+#: src/fs/gnunet-service-fs_cadet_server.c:490
+#: src/fs/gnunet-service-fs_cadet_server.c:530
 #, fuzzy
 msgid "# cadet connections active"
 msgstr "# conexiones «stream» activas"
 
-#: src/fs/gnunet-service-fs_cp.c:743
+#: src/fs/gnunet-service-fs_cp.c:686
 msgid "# migration stop messages received"
 msgstr "# mensajes de detención de migración recibidos"
 
-#: src/fs/gnunet-service-fs_cp.c:747
+#: src/fs/gnunet-service-fs_cp.c:690
 #, c-format
 msgid "Migration of content to peer `%s' blocked for %s\n"
 msgstr "Migración de contenido al par «%s» bloqueada durante %s\n"
 
-#: src/fs/gnunet-service-fs_cp.c:785
-msgid "# replies transmitted to other peers"
-msgstr "# respuestas transmitidas a otros pares"
-
-#: src/fs/gnunet-service-fs_cp.c:793
-msgid "# replies dropped"
-msgstr "# respuestas omitidas"
-
-#: src/fs/gnunet-service-fs_cp.c:820 src/fs/gnunet-service-fs_cp.c:1472
+#: src/fs/gnunet-service-fs_cp.c:723 src/fs/gnunet-service-fs_cp.c:1343
 msgid "# P2P searches active"
 msgstr "# busquedas P2P activas"
 
-#: src/fs/gnunet-service-fs_cp.c:918
+#: src/fs/gnunet-service-fs_cp.c:818
 msgid "# artificial delays introduced (ms)"
 msgstr "# retardos artificiales introducidos (ms)"
 
-#: src/fs/gnunet-service-fs_cp.c:974
+#: src/fs/gnunet-service-fs_cp.c:875
 msgid "# replies dropped due to type mismatch"
 msgstr "# respuestas omitidas debido a incompatibilidad de tipos"
 
-#: src/fs/gnunet-service-fs_cp.c:982
+#: src/fs/gnunet-service-fs_cp.c:883
 msgid "# replies received for other peers"
 msgstr "# respuestas recibidas de otros pares"
 
-#: src/fs/gnunet-service-fs_cp.c:996
+#: src/fs/gnunet-service-fs_cp.c:897
 msgid "# replies dropped due to insufficient cover traffic"
 msgstr "# respuestas omitidas debido a insuficiente tráfico de cobertura"
 
-#: src/fs/gnunet-service-fs_cp.c:1044
+#: src/fs/gnunet-service-fs_cp.c:944
 msgid "# P2P searches destroyed due to ultimate reply"
 msgstr "# búsquedas P2P destruidas debido a respuesta definitiva"
 
-#: src/fs/gnunet-service-fs_cp.c:1115
+#: src/fs/gnunet-service-fs_cp.c:1015
 msgid "# requests done for free (low load)"
 msgstr "# peticiones realizadas gratuitamente (baja carga)"
 
-#: src/fs/gnunet-service-fs_cp.c:1140
+#: src/fs/gnunet-service-fs_cp.c:1040
 msgid "# request dropped, priority insufficient"
 msgstr "# peticiones omitidas, prioridad insuficiente"
 
-#: src/fs/gnunet-service-fs_cp.c:1150
+#: src/fs/gnunet-service-fs_cp.c:1050
 msgid "# requests done for a price (normal load)"
 msgstr "# peticiones realizadas por un precio (carga normal)"
 
-#: src/fs/gnunet-service-fs_cp.c:1248
+#: src/fs/gnunet-service-fs_cp.c:1148
 msgid "# requests dropped due to higher-TTL request"
 msgstr "# peticiones omitidas debido a una petición de mayor TTL"
 
-#: src/fs/gnunet-service-fs_cp.c:1302
+#: src/fs/gnunet-service-fs_cp.c:1205
 msgid "# GET requests received (from other peers)"
 msgstr "# peticiones «GET» recibidas (de otros pares)"
 
-#: src/fs/gnunet-service-fs_cp.c:1337
-msgid "# requests dropped due to initiator not being connected"
-msgstr "# peticiones omitidas debido a que el iniciador no está conectado"
-
-#: src/fs/gnunet-service-fs_cp.c:1358
+#: src/fs/gnunet-service-fs_cp.c:1228
 msgid "# requests dropped due to missing reverse route"
 msgstr "# peticiones omitidas debido a falta de ruta inversa"
 
-#: src/fs/gnunet-service-fs_cp.c:1369
+#: src/fs/gnunet-service-fs_cp.c:1239
 #, fuzzy
 msgid "# requests dropped due to full reply queue"
 msgstr "# Mensajes P2P omitidos debido a saturación de la cola"
 
-#: src/fs/gnunet-service-fs_cp.c:1424
+#: src/fs/gnunet-service-fs_cp.c:1295
 msgid "# requests dropped due TTL underflow"
 msgstr "# peticiones omitidas debido a expiración del TTL"
 
-#: src/fs/gnunet-service-fs_cp.c:1468
+#: src/fs/gnunet-service-fs_cp.c:1339
 msgid "# P2P query messages received and processed"
 msgstr "# mensajes de búsqueda P2P recibidos y procesados"
 
-#: src/fs/gnunet-service-fs_cp.c:1913
+#: src/fs/gnunet-service-fs_cp.c:1706
 msgid "# migration stop messages sent"
 msgstr "# mensajes de detención de migración enviados"
 
-#: src/fs/gnunet-service-fs_indexing.c:130
-#: src/fs/gnunet-service-fs_indexing.c:181
+#: src/fs/gnunet-service-fs_indexing.c:134
+#: src/fs/gnunet-service-fs_indexing.c:195
 #, c-format
 msgid "Could not open `%s'.\n"
 msgstr "No se pudo abrir «%s».\n"
 
-#: src/fs/gnunet-service-fs_indexing.c:142
+#: src/fs/gnunet-service-fs_indexing.c:151
 #, c-format
 msgid "Error writing `%s'.\n"
 msgstr "Error escribiendo «%s».\n"
 
-#: src/fs/gnunet-service-fs_indexing.c:237
+#: src/fs/gnunet-service-fs_indexing.c:253
 #, c-format
-msgid ""
-"Index request received for file `%s' is already indexed as `%s'.  Permitting "
-"anyway.\n"
-msgstr ""
-"La petición de indexado recibida para el fichero «%s» ya está indexada como "
-"«%s».  Se permite de todos modos.\n"
-
-#: src/fs/gnunet-service-fs_indexing.c:275
-#, c-format
-msgid "Hash mismatch trying to index file `%s' which has hash `%s'\n"
-msgstr ""
-"Hash no asociado intentando indexar el fichero «%s» que tiene hash «%s»\n"
-
-#: src/fs/gnunet-service-fs_indexing.c:477
-#, c-format
 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:542
+#: src/fs/gnunet-service-fs_indexing.c:329
 msgid "# index blocks removed: original file inaccessible"
 msgstr "# bloques de índice eliminados: fichero original inaccesible"
 
-#: src/fs/gnunet-service-fs_indexing.c:557
+#: src/fs/gnunet-service-fs_indexing.c:355
 #, c-format
 msgid "Could not access indexed file `%s' (%s) at offset %llu: %s\n"
 msgstr ""
@@ -4049,64 +3879,52 @@
 "No se pudo acceder al fichero indexado «%s» (%s) en el desplazamiento %llu: "
 "%s\n"
 
-#: src/fs/gnunet-service-fs_indexing.c:559
+#: src/fs/gnunet-service-fs_indexing.c:359
 msgid "not indexed"
 msgstr "no indexado"
 
-#: src/fs/gnunet-service-fs_indexing.c:574
+#: src/fs/gnunet-service-fs_indexing.c:392
 #, 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_lc.c:202 src/fs/gnunet-service-fs_lc.c:378
-msgid "# client searches active"
-msgstr "# búsquedas de clientes activas"
-
-#: src/fs/gnunet-service-fs_lc.c:261
-msgid "# replies received for local clients"
-msgstr "# respuestas recibidas de clientes locales"
-
-#: src/fs/gnunet-service-fs_lc.c:332
-msgid "# client searches received"
-msgstr "# búsquedas de clientes recibidas"
-
-#: src/fs/gnunet-service-fs_lc.c:372
-msgid "# client searches updated (merged content seen list)"
+#: src/fs/gnunet-service-fs_indexing.c:515
+#, c-format
+msgid ""
+"Index request received for file `%s' is already indexed as `%s'.  Permitting "
+"anyway.\n"
 msgstr ""
-"# búsquedas de clientes actualizadas (contenido unido visto en la lista)"
+"La petición de indexado recibida para el fichero «%s» ya está indexada como "
+"«%s».  Se permite de todos modos.\n"
 
-#: src/fs/gnunet-service-fs_pe.c:273
+#: src/fs/gnunet-service-fs_pe.c:265
 msgid "# average retransmission delay (ms)"
 msgstr "# retardo de retransmisión medio (ms)"
 
-#: src/fs/gnunet-service-fs_pe.c:412
-msgid "# transmission failed (core has no bandwidth)"
-msgstr "# transmisión fallida (el servicio principal no tiene ancho de banda)"
-
-#: src/fs/gnunet-service-fs_pe.c:447
-msgid "# query messages sent to other peers"
-msgstr "# mensajes de búsqueda enviados a otros pares"
-
 # ???
-#: src/fs/gnunet-service-fs_pe.c:501
+#: src/fs/gnunet-service-fs_pe.c:427
 #, fuzzy
 msgid "# delay heap timeout (ms)"
 msgstr "# plazo del retraso del montículo"
 
-#: src/fs/gnunet-service-fs_pe.c:511
+#: src/fs/gnunet-service-fs_pe.c:438
 msgid "# query plans executed"
 msgstr "# planes de búsqueda ejecutados"
 
-#: src/fs/gnunet-service-fs_pe.c:593
+#: src/fs/gnunet-service-fs_pe.c:466
+msgid "# query messages sent to other peers"
+msgstr "# mensajes de búsqueda enviados a otros pares"
+
+#: src/fs/gnunet-service-fs_pe.c:536
 msgid "# requests merged"
 msgstr "# peticiones unidas"
 
-#: src/fs/gnunet-service-fs_pe.c:603
+#: src/fs/gnunet-service-fs_pe.c:546
 msgid "# requests refreshed"
 msgstr "# peticiones refrescadas"
 
-#: src/fs/gnunet-service-fs_pe.c:661 src/fs/gnunet-service-fs_pe.c:769
-#: src/fs/gnunet-service-fs_pe.c:848
+#: src/fs/gnunet-service-fs_pe.c:606 src/fs/gnunet-service-fs_pe.c:709
+#: src/fs/gnunet-service-fs_pe.c:788
 msgid "# query plan entries"
 msgstr "# entradas de planes de búsqueda"
 
@@ -4114,109 +3932,109 @@
 msgid "# Pending requests created"
 msgstr "# Peticiones pendientes creadas"
 
-#: src/fs/gnunet-service-fs_pr.c:411 src/fs/gnunet-service-fs_pr.c:671
+#: src/fs/gnunet-service-fs_pr.c:411 src/fs/gnunet-service-fs_pr.c:661
 msgid "# Pending requests active"
 msgstr "# Peticiones pendientes activas"
 
-#: src/fs/gnunet-service-fs_pr.c:852
+#: src/fs/gnunet-service-fs_pr.c:842
 msgid "# replies received and matched"
 msgstr "# respuestas recibidas y asociadas"
 
-#: src/fs/gnunet-service-fs_pr.c:889
+#: src/fs/gnunet-service-fs_pr.c:879
 msgid "# duplicate replies discarded (bloomfilter)"
 msgstr "# respuestas duplicadas descartadas (bloomfilter)"
 
-#: src/fs/gnunet-service-fs_pr.c:898
+#: src/fs/gnunet-service-fs_pr.c:888
 msgid "# irrelevant replies discarded"
 msgstr "# respuestas irrelevantes descartadas"
 
-#: src/fs/gnunet-service-fs_pr.c:913
+#: src/fs/gnunet-service-fs_pr.c:903
 #, c-format
 msgid "Unsupported block type %u\n"
 msgstr "Tipo de bloque %u no soportado\n"
 
-#: src/fs/gnunet-service-fs_pr.c:930
+#: src/fs/gnunet-service-fs_pr.c:920
 msgid "# results found locally"
 msgstr "# resultados hallados localmente"
 
-#: src/fs/gnunet-service-fs_pr.c:1060
+#: src/fs/gnunet-service-fs_pr.c:1050
 msgid "# Datastore `PUT' failures"
 msgstr "# «PUT» en el almacén de datos fallidos"
 
-#: src/fs/gnunet-service-fs_pr.c:1088
+#: src/fs/gnunet-service-fs_pr.c:1078
 msgid "# storage requests dropped due to high load"
 msgstr "# peticiones de almacenamiento omitidas debido a alta carga"
 
-#: src/fs/gnunet-service-fs_pr.c:1126
+#: src/fs/gnunet-service-fs_pr.c:1116
 msgid "# Replies received from DHT"
 msgstr "# Respuestas recibidas de la DHT"
 
-#: src/fs/gnunet-service-fs_pr.c:1258
+#: src/fs/gnunet-service-fs_pr.c:1247
 #, fuzzy
 msgid "# Replies received from CADET"
 msgstr "# Respuestas recibidas de la DHT"
 
-#: src/fs/gnunet-service-fs_pr.c:1310
+#: src/fs/gnunet-service-fs_pr.c:1299
 #, 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:1331
+#: src/fs/gnunet-service-fs_pr.c:1320
 #, 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:1383
+#: src/fs/gnunet-service-fs_pr.c:1372
 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:1398
+#: src/fs/gnunet-service-fs_pr.c:1387
 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:1407
+#: src/fs/gnunet-service-fs_pr.c:1396
 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:1422
+#: src/fs/gnunet-service-fs_pr.c:1411
 msgid "# requested DBLOCK or IBLOCK not found"
 msgstr "# «DBLOCK» o «IBLOCK» pedido no encontrado"
 
-#: src/fs/gnunet-service-fs_pr.c:1436
+#: src/fs/gnunet-service-fs_pr.c:1425
 msgid "# on-demand blocks matched requests"
 msgstr "# peticiones asociadas de bloques bajo demanda"
 
-#: src/fs/gnunet-service-fs_pr.c:1449
+#: src/fs/gnunet-service-fs_pr.c:1438
 msgid "# on-demand lookups performed successfully"
 msgstr "# búsquedas satisfactorias de bloques bajo demanda"
 
-#: src/fs/gnunet-service-fs_pr.c:1454
+#: src/fs/gnunet-service-fs_pr.c:1443
 msgid "# on-demand lookups failed"
 msgstr "# búsquedas fallidas de bloques bajo demanda"
 
-#: src/fs/gnunet-service-fs_pr.c:1481 src/fs/gnunet-service-fs_pr.c:1521
-#: src/fs/gnunet-service-fs_pr.c:1690
+#: src/fs/gnunet-service-fs_pr.c:1469 src/fs/gnunet-service-fs_pr.c:1508
+#: src/fs/gnunet-service-fs_pr.c:1675
 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
+#: src/fs/gnunet-service-fs_pr.c:1527
 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:1539
 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:1666
+#: src/fs/gnunet-service-fs_pr.c:1652
 msgid "# Datastore lookups initiated"
 msgstr "# Búsquedas en el almacén de datos iniciadas"
 
-#: src/fs/gnunet-service-fs_pr.c:1755
+#: src/fs/gnunet-service-fs_pr.c:1732
 msgid "# GAP PUT messages received"
 msgstr "# Mensajes «GAP PUT» recibidos"
 
-#: src/fs/gnunet-service-fs_push.c:678
+#: src/fs/gnunet-service-fs_push.c:642
 msgid "time required, content pushing disabled"
 msgstr "se requiere tiempo, publicación de contenido deshabilitada"
 
@@ -4247,13 +4065,6 @@
 msgid "Unindex a file that was previously indexed with gnunet-publish."
 msgstr "Desindexa un fichero previamente indexado con «gnunet-publish»."
 
-#: src/gns/gns_api.c:393
-#, fuzzy
-msgid "Failed to deserialize lookup reply from GNS service!\n"
-msgstr ""
-"¡Se produjo un fallo al serializar la respuesta de la búsqueda desde el "
-"servicio GNS!\n"
-
 #: src/gns/gnunet-bcd.c:127
 #, fuzzy, c-format
 msgid "Refusing `%s' request to HTTP server\n"
@@ -4345,22 +4156,22 @@
 msgid "GNUnet DNS-to-GNS proxy (a DNS server)"
 msgstr "Pasarela GNUnet DNS-a-GNS (un servidor DNS)"
 
-#: src/gns/gnunet-gns.c:236 src/gns/plugin_rest_gns.c:347
+#: src/gns/gnunet-gns.c:269 src/gns/plugin_rest_gns.c:347
 #, c-format
 msgid "Invalid typename specified, assuming `ANY'\n"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:254
+#: src/gns/gnunet-gns.c:295
 #, c-format
 msgid "Please specify name to lookup!\n"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:335
+#: src/gns/gnunet-gns.c:376
 #, c-format
 msgid "Ego for `%s' not found, cannot perform lookup.\n"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:374 src/gns/gnunet-gns-helper-service-w32.c:796
+#: src/gns/gnunet-gns.c:415 src/gns/gnunet-gns-helper-service-w32.c:796
 #: src/gns/plugin_rest_gns.c:472
 #, c-format
 msgid ""
@@ -4368,48 +4179,66 @@
 "gns-import.sh?\n"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:415 src/gns/gnunet-gns-helper-service-w32.c:826
+#: src/gns/gnunet-gns.c:456 src/gns/gnunet-gns-helper-service-w32.c:826
 #, c-format
 msgid "Failed to connect to GNS\n"
 msgstr "Se produjo un fallo al conectar con GNS\n"
 
-#: src/gns/gnunet-gns.c:429
+#: src/gns/gnunet-gns.c:470 src/gns/gnunet-gns.c:500
 #, 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:479
+#: src/gns/gnunet-gns.c:548
 msgid "Lookup a record for the given name"
 msgstr "Buscar el registro para el nombre dado"
 
-#: src/gns/gnunet-gns.c:482
+#: src/gns/gnunet-gns.c:551
 msgid "Specify the type of the record to lookup"
 msgstr "Especificar el tipo del registro a buscar"
 
-#: src/gns/gnunet-gns.c:485
+#: src/gns/gnunet-gns.c:554
 #, fuzzy
 msgid "Specify timeout for the lookup"
 msgstr "Especificar el tipo del registro a buscar"
 
-#: src/gns/gnunet-gns.c:488
+#: src/gns/gnunet-gns.c:557
 msgid "No unneeded output"
 msgstr "Sin salida innecesaria"
 
-#: src/gns/gnunet-gns.c:491
+#: src/gns/gnunet-gns.c:560
 #, 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:494
+#: src/gns/gnunet-gns.c:563
 #, 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:508
+#: src/gns/gnunet-gns.c:566
 #, 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
+msgid "Transmission to client failed!\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 ""
@@ -4428,14 +4257,14 @@
 msgstr ""
 
 #: src/gns/gnunet-gns-proxy.c:109
-#: src/hostlist/gnunet-daemon-hostlist_client.c:529
-#: src/hostlist/gnunet-daemon-hostlist_client.c:747
-#: src/hostlist/gnunet-daemon-hostlist_client.c:753
-#: src/hostlist/gnunet-daemon-hostlist_client.c:805
-#: src/hostlist/gnunet-daemon-hostlist_client.c:814
-#: src/hostlist/gnunet-daemon-hostlist_client.c:925
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1020
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1025
+#: src/hostlist/gnunet-daemon-hostlist_client.c:569
+#: src/hostlist/gnunet-daemon-hostlist_client.c:787
+#: src/hostlist/gnunet-daemon-hostlist_client.c:793
+#: src/hostlist/gnunet-daemon-hostlist_client.c:845
+#: src/hostlist/gnunet-daemon-hostlist_client.c:854
+#: src/hostlist/gnunet-daemon-hostlist_client.c:965
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1060
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1065
 #: src/transport/plugin_transport_http_client.c:598
 #: src/transport/plugin_transport_http_client.c:616
 #, c-format
@@ -4442,127 +4271,128 @@
 msgid "%s failed at %s:%d: `%s'\n"
 msgstr "%s falló en %s:%d: «%s».\n"
 
-#: src/gns/gnunet-gns-proxy.c:846
+#: src/gns/gnunet-gns-proxy.c:887
 #, fuzzy, c-format
 msgid "Unsupported CURL SSL backend %d\n"
 msgstr "Tipo de bloque %u no soportado\n"
 
-#: src/gns/gnunet-gns-proxy.c:869
+#: src/gns/gnunet-gns-proxy.c:910
 #, 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:892
+#: src/gns/gnunet-gns-proxy.c:933
 #, fuzzy, c-format
 msgid "Failed to initialize DANE: %s\n"
 msgstr "¡No se puede inicializar el resolvedor!\n"
 
-#: src/gns/gnunet-gns-proxy.c:905
+#: src/gns/gnunet-gns-proxy.c:946
 #, 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:920
+#: src/gns/gnunet-gns-proxy.c:961
 #, 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:930
+#: src/gns/gnunet-gns-proxy.c:971
 #, c-format
 msgid "Failed DANE verification failed with GnuTLS verify status code: %u\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:954
+#: src/gns/gnunet-gns-proxy.c:995
 #, c-format
 msgid "SSL certificate subject name (%s) does not match `%s'\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:1099
+#: src/gns/gnunet-gns-proxy.c:1104
 #, c-format
 msgid "Cookie domain `%s' supplied by server is invalid\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:1631
+#: src/gns/gnunet-gns-proxy.c:1708
 #, fuzzy, c-format
 msgid "Unsupported HTTP method `%s'\n"
 msgstr "Tipo no soportado «%s»\n"
 
-#: src/gns/gnunet-gns-proxy.c:1997
+#: src/gns/gnunet-gns-proxy.c:2167
 #, 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:2027
+#: src/gns/gnunet-gns-proxy.c:2197
 #, c-format
 msgid "Unable to import certificate %s\n"
 msgstr "No se pudo importar el certificado %s\n"
 
-#: src/gns/gnunet-gns-proxy.c:2199
+#: src/gns/gnunet-gns-proxy.c:2370
 #, 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:2218 src/rest/gnunet-rest-server.c:529
+#: src/gns/gnunet-gns-proxy.c:2389 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:2538
+#: src/gns/gnunet-gns-proxy.c:2709
 #, fuzzy, c-format
 msgid "Unsupported socks version %d\n"
 msgstr "Tipo de bloque %u no soportado\n"
 
-#: src/gns/gnunet-gns-proxy.c:2567
+#: src/gns/gnunet-gns-proxy.c:2738
 #, fuzzy, c-format
 msgid "Unsupported socks command %d\n"
 msgstr "Tipo de bloque %u no soportado\n"
 
-#: src/gns/gnunet-gns-proxy.c:2585 src/gns/gnunet-gns-proxy.c:2614
+#: src/gns/gnunet-gns-proxy.c:2756 src/gns/gnunet-gns-proxy.c:2785
 msgid "SSL connection to plain IPv4 address requested\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:2665
+#: src/gns/gnunet-gns-proxy.c:2836
 #, fuzzy, c-format
 msgid "Unsupported socks address type %d\n"
 msgstr "Tipo de bloque %u no soportado\n"
 
-#: src/gns/gnunet-gns-proxy.c:2999
+#: src/gns/gnunet-gns-proxy.c:3171
 msgid "No ego configured for `shorten-zone`\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:3039 src/gns/gnunet-service-gns.c:887
+#: src/gns/gnunet-gns-proxy.c:3211 src/gns/gnunet-service-gns.c:1093
+#: src/gns/gnunet-service-gns.c:1149
 #, 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:3101
+#: src/gns/gnunet-gns-proxy.c:3273
 #, 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:3141
+#: src/gns/gnunet-gns-proxy.c:3313
 msgid "listen on specified port (default: 7777)"
 msgstr "escuchar en el puerto especificado (predeterminado: 7777)"
 
-#: src/gns/gnunet-gns-proxy.c:3144
+#: src/gns/gnunet-gns-proxy.c:3316
 msgid "pem file to use as CA"
 msgstr "fichero pem para usar como autoridad de certificación (CA)"
 
-#: src/gns/gnunet-gns-proxy.c:3163
+#: src/gns/gnunet-gns-proxy.c:3335
 msgid "GNUnet GNS proxy"
 msgstr "Proxy GNUnet GNS"
 
-#: src/gns/gnunet-service-gns.c:928
+#: src/gns/gnunet-service-gns.c:1187
 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:936
+#: src/gns/gnunet-service-gns.c:1195
 #, 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:969
+#: src/gns/gnunet-service-gns.c:1228
 msgid "Could not connect to DHT!\n"
 msgstr "¡No se pudo conectar a la DHT!\n"
 
@@ -4571,7 +4401,7 @@
 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:369
+#: src/gns/gnunet-service-gns_interceptor.c:371
 #, fuzzy
 msgid "Failed to connect to the DNS service!\n"
 msgstr "¡Se produjo un fallo al conectar con el servicio GNS!\n"
@@ -4596,41 +4426,41 @@
 msgid "Skipping record of unsupported type %d\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns_resolver.c:1353
+#: src/gns/gnunet-service-gns_resolver.c:1354
 #, c-format
 msgid "GNS lookup resulted in DNS name that is too long (`%s')\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns_resolver.c:1888
+#: src/gns/gnunet-service-gns_resolver.c:1889
 msgid "GNS lookup recursion failed (no delegation record found)\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns_resolver.c:1912
+#: src/gns/gnunet-service-gns_resolver.c:1913
 #, 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:2194
+#: src/gns/gnunet-service-gns_resolver.c:2195
 #, c-format
 msgid "Zone %s was revoked, resolution fails\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns_resolver.c:2341
+#: src/gns/gnunet-service-gns_resolver.c:2342
 #, c-format
 msgid "Hostname `%s' is not well-formed, resolution fails\n"
 msgstr ""
 
-#: src/gns/plugin_gnsrecord_gns.c:172
+#: src/gns/plugin_gnsrecord_gns.c:203
 #, c-format
 msgid "Unable to parse PKEY record `%s'\n"
 msgstr "No se pudo procesar el registro PKEY «%s»\n"
 
-#: src/gns/plugin_gnsrecord_gns.c:201
+#: src/gns/plugin_gnsrecord_gns.c:232
 #, fuzzy, c-format
 msgid "Unable to parse GNS2DNS record `%s'\n"
 msgstr "No se pudo procesar el registro SOA «%s»\n"
 
-#: src/gns/plugin_gnsrecord_gns.c:222
+#: src/gns/plugin_gnsrecord_gns.c:253
 #, fuzzy, c-format
 msgid "Failed to serialize GNS2DNS record with value `%s'\n"
 msgstr ""
@@ -4637,16 +4467,21 @@
 "Se produjo un fallo al escribir el directorio con los resultados de búsqueda "
 "de «%s»\n"
 
-#: src/gns/plugin_gnsrecord_gns.c:245
+#: src/gns/plugin_gnsrecord_gns.c:276
 #, c-format
 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:280
+#: src/gns/plugin_gnsrecord_gns.c:311
 #, 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
+#, 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
 msgid "Ego for not found, cannot perform lookup.\n"
 msgstr ""
@@ -4675,7 +4510,7 @@
 "Se produjo un fallo al escribir el directorio con los resultados de búsqueda "
 "de «%s»\n"
 
-#: src/gnsrecord/plugin_gnsrecord_dns.c:486
+#: src/gnsrecord/plugin_gnsrecord_dns.c:487
 #, fuzzy, c-format
 msgid "Failed to serialize CERT record with %u bytes\n"
 msgstr ""
@@ -4682,17 +4517,17 @@
 "Se produjo un fallo al escribir el directorio con los resultados de búsqueda "
 "de «%s»\n"
 
-#: src/gnsrecord/plugin_gnsrecord_dns.c:522
+#: src/gnsrecord/plugin_gnsrecord_dns.c:523
 #, c-format
 msgid "Unable to parse SOA record `%s'\n"
 msgstr "No se pudo procesar el registro SOA «%s»\n"
 
-#: src/gnsrecord/plugin_gnsrecord_dns.c:541
+#: src/gnsrecord/plugin_gnsrecord_dns.c:542
 #, fuzzy, c-format
 msgid "Failed to serialize SOA record with mname `%s' and rname `%s'\n"
 msgstr "Se produjo un fallo al crear un registro para el dominio «%s»: %s\n"
 
-#: src/gnsrecord/plugin_gnsrecord_dns.c:564
+#: src/gnsrecord/plugin_gnsrecord_dns.c:565
 #, fuzzy, c-format
 msgid "Failed to serialize PTR record with value `%s'\n"
 msgstr ""
@@ -4699,12 +4534,12 @@
 "Se produjo un fallo al escribir el directorio con los resultados de búsqueda "
 "de «%s»\n"
 
-#: src/gnsrecord/plugin_gnsrecord_dns.c:587
+#: src/gnsrecord/plugin_gnsrecord_dns.c:588
 #, c-format
 msgid "Unable to parse MX record `%s'\n"
 msgstr "No se pudo procesar el registro MX «%s»\n"
 
-#: src/gnsrecord/plugin_gnsrecord_dns.c:602
+#: src/gnsrecord/plugin_gnsrecord_dns.c:603
 #, fuzzy, c-format
 msgid "Failed to serialize MX record with hostname `%s'\n"
 msgstr ""
@@ -4711,12 +4546,12 @@
 "Se produjo un fallo al escribir el directorio con los resultados de búsqueda "
 "de «%s»\n"
 
-#: src/gnsrecord/plugin_gnsrecord_dns.c:629
+#: src/gnsrecord/plugin_gnsrecord_dns.c:630
 #, fuzzy, c-format
 msgid "Unable to parse SRV record `%s'\n"
 msgstr "No se pudo procesar el registro SOA «%s»\n"
 
-#: src/gnsrecord/plugin_gnsrecord_dns.c:645
+#: src/gnsrecord/plugin_gnsrecord_dns.c:646
 #, fuzzy, c-format
 msgid "Failed to serialize SRV record with target `%s'\n"
 msgstr ""
@@ -4723,13 +4558,13 @@
 "Se produjo un fallo al escribir el directorio con los resultados de búsqueda "
 "de «%s»\n"
 
-#: src/gnsrecord/plugin_gnsrecord_dns.c:662
+#: src/gnsrecord/plugin_gnsrecord_dns.c:663
 #, c-format
 msgid "Unable to parse IPv6 address `%s'\n"
 msgstr "No se pudo procesar dirección IPv4 «%s»\n"
 
-#: src/gnsrecord/plugin_gnsrecord_dns.c:686
-#: src/gnsrecord/plugin_gnsrecord_dns.c:702
+#: src/gnsrecord/plugin_gnsrecord_dns.c:687
+#: src/gnsrecord/plugin_gnsrecord_dns.c:703
 #, c-format
 msgid "Unable to parse TLSA record string `%s'\n"
 msgstr "No se pudo procesar la cadena de registro TLSA «%s»\n"
@@ -4773,45 +4608,45 @@
 msgid "Modified %u addresses, wrote %u bytes\n"
 msgstr ""
 
-#: src/hello/hello.c:1139
+#: src/hello/hello.c:1103
 msgid "Failed to parse HELLO message: missing expiration time\n"
 msgstr ""
 "Se produjo un fallo al procesar un mensaje «HELLO»: falta el tiempo de "
 "expiración\n"
 
-#: src/hello/hello.c:1148
+#: src/hello/hello.c:1112
 msgid "Failed to parse HELLO message: invalid expiration time\n"
 msgstr ""
 "Se produjo un fallo al procesar un mensaje «HELLO»: tiempo de expiración no "
 "válido\n"
 
-#: src/hello/hello.c:1158
+#: src/hello/hello.c:1122
 msgid "Failed to parse HELLO message: malformed\n"
 msgstr "Se produjo un fallo al procesar un mensaje «HELLO»: mal formado\n"
 
-#: src/hello/hello.c:1169
+#: src/hello/hello.c:1133
 msgid "Failed to parse HELLO message: missing transport plugin\n"
 msgstr ""
 "Se produjo un fallo al procesar un mensaje «HELLO»: falta el módulo de "
 "transporte\n"
 
-#: src/hello/hello.c:1187
+#: src/hello/hello.c:1151
 #, fuzzy, c-format
 msgid "Plugin `%s' not found, skipping address\n"
 msgstr "Módulo «%s» no encontrado\n"
 
-#: src/hello/hello.c:1195
+#: src/hello/hello.c:1159
 #, c-format
 msgid "Plugin `%s' does not support URIs yet\n"
 msgstr "El módulo «%s» no soporta URI todavía\n"
 
-#: src/hello/hello.c:1210
+#: src/hello/hello.c:1174
 #, c-format
 msgid "Failed to parse `%s' as an address for plugin `%s'\n"
 msgstr ""
 "Se produjo un fallo al procesar «%s» como una dirección para el módulo «%s»\n"
 
-#: src/hostlist/gnunet-daemon-hostlist.c:272
+#: src/hostlist/gnunet-daemon-hostlist.c:316
 msgid ""
 "None of the functions for the hostlist daemon were enabled.  I have no "
 "reason to run!\n"
@@ -4819,11 +4654,11 @@
 "Ninguna de las funciones para el demonio de listas de máquinas fue "
 "activada.  ¡No tengo razón para ejecutarme!\n"
 
-#: src/hostlist/gnunet-daemon-hostlist.c:328
+#: src/hostlist/gnunet-daemon-hostlist.c:375
 msgid "advertise our hostlist to other peers"
 msgstr "anuncia nuestra lista de máquinas a otros pares"
 
-#: src/hostlist/gnunet-daemon-hostlist.c:333
+#: src/hostlist/gnunet-daemon-hostlist.c:380
 msgid ""
 "bootstrap using hostlists (it is highly recommended that you always use this "
 "option)"
@@ -4831,49 +4666,49 @@
 "realizar inicialización usando listas de máquinas (es altamente recomendable "
 "que siempre se use esta opción)"
 
-#: src/hostlist/gnunet-daemon-hostlist.c:336
+#: src/hostlist/gnunet-daemon-hostlist.c:383
 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:340
+#: src/hostlist/gnunet-daemon-hostlist.c:387
 msgid "provide a hostlist server"
 msgstr "proveer un servidor de listas de máquinas"
 
-#: src/hostlist/gnunet-daemon-hostlist.c:356
+#: src/hostlist/gnunet-daemon-hostlist.c:403
 msgid "GNUnet hostlist server and client"
 msgstr "Servidor y cliente GNUnet de listas de máquinas"
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:348
+#: src/hostlist/gnunet-daemon-hostlist_client.c:371
 msgid "# bytes downloaded from hostlist servers"
 msgstr "# bytes descargados de servidores de listas de máquinas"
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:369
-#: src/hostlist/gnunet-daemon-hostlist_client.c:399
+#: src/hostlist/gnunet-daemon-hostlist_client.c:392
+#: src/hostlist/gnunet-daemon-hostlist_client.c:437
 msgid "# invalid HELLOs downloaded from hostlist servers"
 msgstr "# «HELLO» no válidos descargados de servidores de listas de máquinas"
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:372
-#: src/hostlist/gnunet-daemon-hostlist_client.c:402
+#: src/hostlist/gnunet-daemon-hostlist_client.c:395
+#: src/hostlist/gnunet-daemon-hostlist_client.c:440
 #, c-format
 msgid "Invalid `%s' message received from hostlist at `%s'\n"
 msgstr "Mensaje «%s» no válido recibido de la lista de máquinas en «%s»\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:390
+#: src/hostlist/gnunet-daemon-hostlist_client.c:413
 msgid "# valid HELLOs downloaded from hostlist servers"
 msgstr "# «HELLO» válidos descargados de servidores de listas de máquinas"
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:655
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1386
+#: src/hostlist/gnunet-daemon-hostlist_client.c:695
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1441
 msgid "# advertised hostlist URIs"
 msgstr "# URI de listas de máquinas anunciadas"
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:685
+#: src/hostlist/gnunet-daemon-hostlist_client.c:725
 #, c-format
 msgid "# advertised URI `%s' downloaded"
 msgstr "# URI anunciadas «%s» descargadas"
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:728
+#: src/hostlist/gnunet-daemon-hostlist_client.c:768
 #, c-format
 msgid ""
 "Advertised hostlist with URI `%s' could not be downloaded. Advertised URI "
@@ -4882,68 +4717,68 @@
 "Lista de máquinas anunciada con la URI «%s» no pudo ser descargada. La URI "
 "anunciada es descartada.\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:856
+#: src/hostlist/gnunet-daemon-hostlist_client.c:896
 #, c-format
 msgid "Timeout trying to download hostlist from `%s'\n"
 msgstr ""
 "Finalizado el plazo mientras se intentaba bajar lista de máquinas de «%s»\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:870
+#: src/hostlist/gnunet-daemon-hostlist_client.c:910
 #, c-format
 msgid "Download limit of %u bytes exceeded, stopping download\n"
 msgstr "Límite de descarga de %u bytes superado, parando descarga\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:890
+#: src/hostlist/gnunet-daemon-hostlist_client.c:930
 #, c-format
 msgid "Download of hostlist from `%s' failed: `%s'\n"
 msgstr "Descarga de lista de máquinas de «%s» fallida: «%s»\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:896
+#: src/hostlist/gnunet-daemon-hostlist_client.c:936
 #, c-format
 msgid "Download of hostlist `%s' completed.\n"
 msgstr "Descarga de lista de máquinas «%s» completada.\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:904
+#: src/hostlist/gnunet-daemon-hostlist_client.c:944
 #, c-format
 msgid "Adding successfully tested hostlist `%s' datastore.\n"
 msgstr "Añadiendo el almacén de datos de la lista de máquinas probada «%s».\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:957
+#: src/hostlist/gnunet-daemon-hostlist_client.c:997
 #, c-format
 msgid "Bootstrapping using hostlist at `%s'.\n"
 msgstr "Inicializando usando lista de máquinas en «%s».\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:965
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1005
 msgid "# hostlist downloads initiated"
 msgstr "# descargas de listas de máquinas iniciadas"
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1092
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1639
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1132
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1698
 msgid "# milliseconds between hostlist downloads"
 msgstr "# milisegundos entre descargas de listas de máquinas"
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1101
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1141
 #, c-format
 msgid "Have %u/%u connections.  Will consider downloading hostlist in %s\n"
 msgstr ""
 "Hay %u/%u conexiones.  Se considerará descargar una lista de máquinas en %s\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1156
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1172
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1200
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1221
 msgid "# active connections"
 msgstr "# conexiones activas"
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1332
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1387
 #, c-format
 msgid "Loading saved hostlist entries from file `%s' \n"
 msgstr "Cargando entradas guardadas de listas de máquinas del fichero «%s»\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1337
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1392
 #, c-format
 msgid "Hostlist file `%s' does not exist\n"
 msgstr "El fichero de listas de máquinas «%s» no existe\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1346
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1401
 #, c-format
 msgid "Could not open file `%s' for reading to load hostlists: %s\n"
 msgstr ""
@@ -4950,16 +4785,16 @@
 "No se pudo abrir el fichero «%s» en modo lectura para cargar las listas de "
 "máquinas: %s\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1380
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1435
 #, c-format
 msgid "%u hostlist URIs loaded from file\n"
 msgstr "%u URI de listas de máquinas cargadas del fichero\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1383
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1438
 msgid "# hostlist URIs read from file"
 msgstr "# URI de listas de máquinas leídas de fichero"
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1429
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1484
 #, c-format
 msgid "Could not open file `%s' for writing to save hostlists: %s\n"
 msgstr ""
@@ -4966,36 +4801,36 @@
 "No se pudo abrir el fichero «%s» en modo escritura para almacenar las listas "
 "de máquinas: %s\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1436
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1491
 #, c-format
 msgid "Writing %u hostlist URIs to `%s'\n"
 msgstr "Escribiendo %u URI de listas de máquinas a «%s»\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1460
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1477
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1515
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1532
 #, c-format
 msgid "Error writing hostlist URIs to file `%s'\n"
 msgstr "Error escribiendo URI de listas de máquinas al fichero «%s»\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1472
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1527
 msgid "# hostlist URIs written to file"
 msgstr "# URI de listas de máquinas escritas a fichero"
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1572
-#: src/transport/plugin_transport_http_client.c:2273
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1628
+#: src/transport/plugin_transport_http_client.c:2277
 #, c-format
 msgid "Invalid proxy type: `%s', disabling proxy! Check configuration!\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1601
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1657
 msgid "Learning is enabled on this peer\n"
 msgstr "El aprendizaje está habilitado en este par\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1614
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1671
 msgid "Learning is not enabled on this peer\n"
 msgstr "El aprendizaje no está habilitado en este par\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1625
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1684
 #, c-format
 msgid ""
 "Since learning is not enabled on this peer, hostlist file `%s' was removed\n"
@@ -5003,19 +4838,19 @@
 "La lista de máquinas «%s» fue eliminada puesto que el aprendizaje no está "
 "habilitado en este par\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:182
+#: src/hostlist/gnunet-daemon-hostlist_server.c:176
 msgid "bytes in hostlist"
 msgstr "bytes en la lista de máquinas"
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:207
+#: src/hostlist/gnunet-daemon-hostlist_server.c:201
 msgid "expired addresses encountered"
 msgstr "direcciones expiradas encontradas"
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:243
-#: src/hostlist/gnunet-daemon-hostlist_server.c:590
-#: src/peerinfo-tool/gnunet-peerinfo.c:389
-#: src/peerinfo-tool/gnunet-peerinfo.c:538
-#: src/topology/gnunet-daemon-topology.c:866
+#: src/hostlist/gnunet-daemon-hostlist_server.c:237
+#: src/hostlist/gnunet-daemon-hostlist_server.c:531
+#: src/peerinfo-tool/gnunet-peerinfo.c:385
+#: src/peerinfo-tool/gnunet-peerinfo.c:534
+#: src/topology/gnunet-daemon-topology.c:857
 #, c-format
 msgid "Error in communication with PEERINFO service: %s\n"
 msgstr ""
@@ -5022,103 +4857,97 @@
 "Error en la comunicación con el servicio de información de pares (PEERINFO): "
 "%s\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:267
+#: src/hostlist/gnunet-daemon-hostlist_server.c:261
 msgid "HELLOs without addresses encountered (ignored)"
 msgstr "«HELLO» sin dirección encontrados (ignorados)"
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:284
+#: src/hostlist/gnunet-daemon-hostlist_server.c:278
 msgid "bytes not included in hostlist (size limit)"
 msgstr "bytes no incluidos en la lista de máquinas (límite de tamaño)"
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:388
+#: src/hostlist/gnunet-daemon-hostlist_server.c:382
 #, c-format
 msgid "Refusing `%s' request to hostlist server\n"
 msgstr "Rechazando petición «%s» al servidor de listas de máquinas\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:391
+#: src/hostlist/gnunet-daemon-hostlist_server.c:385
 msgid "hostlist requests refused (not HTTP GET)"
 msgstr "Peticiones de listas de máquinas rechazadas (no HTTP GET)"
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:403
+#: src/hostlist/gnunet-daemon-hostlist_server.c:397
 #, c-format
 msgid "Refusing `%s' request with %llu bytes of upload data\n"
 msgstr "Rechazando petición «%s» con %llu bytes de datos de subida\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:407
+#: src/hostlist/gnunet-daemon-hostlist_server.c:401
 msgid "hostlist requests refused (upload data)"
 msgstr "Peticiones de listas de máquinas rechazadas (datos de subida)"
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:414
+#: src/hostlist/gnunet-daemon-hostlist_server.c:408
 msgid "Could not handle hostlist request since I do not have a response yet\n"
 msgstr ""
 "No se pudo manejar una petición de lista de máquinas debido a que no hay una "
 "respuesta todavía\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:417
+#: src/hostlist/gnunet-daemon-hostlist_server.c:411
 msgid "hostlist requests refused (not ready)"
 msgstr "Peticiones de listas de máquinas rechazadas (no preparados)"
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:422
+#: src/hostlist/gnunet-daemon-hostlist_server.c:416
 msgid "Received request for our hostlist\n"
 msgstr "Peticiones recibidas de nuestra lista de máquinas\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:424
+#: src/hostlist/gnunet-daemon-hostlist_server.c:418
 msgid "hostlist requests processed"
 msgstr "Peticiones de lista de máquinas procesadas"
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:485
+#: src/hostlist/gnunet-daemon-hostlist_server.c:466
 msgid "# hostlist advertisements send"
 msgstr "# anuncios de listas de máquinas enviados"
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:535
-msgid "Advertisement message could not be queued by core\n"
-msgstr ""
-"Los mensajes de anuncio no pudieron encolarse por el servicio principal\n"
-
-#: src/hostlist/gnunet-daemon-hostlist_server.c:743
-#: src/peerinfo-tool/gnunet-peerinfo.c:741
-#: src/transport/gnunet-service-transport.c:856
+#: src/hostlist/gnunet-daemon-hostlist_server.c:679
+#: src/transport/gnunet-service-transport.c:2802
 msgid "Could not access PEERINFO service.  Exiting.\n"
 msgstr ""
 "No se pudo acceder al servicio de información de pares (PEERINFO).  "
 "Saliendo.\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:755
+#: src/hostlist/gnunet-daemon-hostlist_server.c:691
 #, c-format
 msgid "Invalid port number %llu.  Exiting.\n"
 msgstr "Número de puerto %llu no válido.  Saliendo.\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:767
+#: src/hostlist/gnunet-daemon-hostlist_server.c:703
 #, c-format
 msgid "Hostlist service starts on %s:%llu\n"
 msgstr "Servicio de listas de máquinas arranca en %s:%llu\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:782
+#: src/hostlist/gnunet-daemon-hostlist_server.c:718
 #, c-format
 msgid "Address to obtain hostlist: `%s'\n"
 msgstr "Dirección para obtener la lista de máquinas: «%s»\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:795
+#: src/hostlist/gnunet-daemon-hostlist_server.c:731
 #, fuzzy
 msgid "BINDTOIP does not a valid IPv4 address! Ignoring BINDTOIPV4.\n"
 msgstr "¡«%s» no es una dirección IP válida! Ignorando «BINDTOIP».\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:808
+#: src/hostlist/gnunet-daemon-hostlist_server.c:748
 #, fuzzy
 msgid "BINDTOIP does not a valid IPv4 address! Ignoring BINDTOIPV6.\n"
 msgstr "¡«%s» no es una dirección IP válida! Ignorando «BINDTOIP».\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:829
+#: src/hostlist/gnunet-daemon-hostlist_server.c:769
 #, fuzzy, c-format
 msgid "`%s' is not a valid IPv4 address! Ignoring BINDTOIPV4.\n"
 msgstr "¡«%s» no es una dirección IP válida! Ignorando «BINDTOIP».\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:849
+#: src/hostlist/gnunet-daemon-hostlist_server.c:789
 #, fuzzy, c-format
 msgid "`%s' is not a valid IPv6 address! Ignoring BINDTOIPV6.\n"
 msgstr "¡«%s» no es una dirección IP válida! Ignorando «BINDTOIP».\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:889
+#: src/hostlist/gnunet-daemon-hostlist_server.c:829
 #, c-format
 msgid "Could not start hostlist HTTP server on port %u\n"
 msgstr ""
@@ -5169,79 +4998,98 @@
 msgid "Maintain egos"
 msgstr ""
 
-#: src/identity/gnunet-service-identity.c:337
+#: src/identity/gnunet-service-identity.c:390
 msgid "no default known"
 msgstr ""
 
-#: src/identity/gnunet-service-identity.c:361
+#: src/identity/gnunet-service-identity.c:412
 msgid "default configured, but ego unknown (internal error)"
 msgstr ""
 
-#: src/identity/gnunet-service-identity.c:438
-#: src/identity/gnunet-service-identity.c:669
-#: src/identity/gnunet-service-identity.c:777
+#: src/identity/gnunet-service-identity.c:501
+#: src/identity/gnunet-service-identity.c:773
+#: src/identity/gnunet-service-identity.c:895
 #, fuzzy, c-format
 msgid "Failed to write subsystem default identifier map to `%s'.\n"
 msgstr ""
 "Se produjo un fallo al obtener los identificadores de fichero para «%s»\n"
 
-#: src/identity/gnunet-service-identity.c:445
+#: src/identity/gnunet-service-identity.c:508
 msgid "Unknown ego specified for service (internal error)"
 msgstr ""
 
-#: src/identity/gnunet-service-identity.c:515
+#: src/identity/gnunet-service-identity.c:601
 msgid "identifier already in use for another ego"
 msgstr ""
 
-#: src/identity/gnunet-service-identity.c:646
+#: src/identity/gnunet-service-identity.c:750
 #, fuzzy
 msgid "target name already exists"
 msgstr "El registro ya existía en el almacén de nombres"
 
-#: src/identity/gnunet-service-identity.c:685
-#: src/identity/gnunet-service-identity.c:794
+#: src/identity/gnunet-service-identity.c:789
+#: src/identity/gnunet-service-identity.c:912
 msgid "no matching ego found"
 msgstr ""
 
-#: src/identity/gnunet-service-identity.c:828
+#: src/identity/gnunet-service-identity.c:946
 #, fuzzy, c-format
 msgid "Failed to parse ego information in `%s'\n"
 msgstr "Se produjo un fallo al procesar la identidad del par «%s»\n"
 
-#: src/identity/gnunet-service-identity.c:901
+#: src/identity/gnunet-service-identity.c:1004
 #, fuzzy, c-format
 msgid "Failed to parse subsystem identity configuration file `%s'\n"
 msgstr "Se produjo un fallo al borrar el fichero de configuración %s\n"
 
-#: src/identity/gnunet-service-identity.c:913
+#: src/identity/gnunet-service-identity.c:1014
 #, fuzzy, c-format
 msgid "Failed to create directory `%s' for storing egos\n"
 msgstr "Se produjo un fallo al leer el directorio «%s»\n"
 
-#: src/identity/plugin_rest_identity.c:938
+#: src/identity/plugin_rest_identity.c:967
 #, fuzzy
 msgid "Identity REST API initialized\n"
 msgstr "Conexión fallida\n"
 
-#: src/identity-provider/gnunet-identity-token.c:101
+#: src/identity-provider/gnunet-identity-token.c:66
+#, fuzzy
+msgid "Option `-t' is required\n"
+msgstr "Las opción «%s» o «%s» es necesaria.\n"
+
+#: src/identity-provider/gnunet-identity-token.c:77
+#, fuzzy, c-format
+msgid "Token `%s' is malformed\n"
+msgstr "El bloque del tipo %u está mal formado\n"
+
+#: src/identity-provider/gnunet-identity-token.c:163
 msgid "GNUid token"
 msgstr ""
 
-#: src/identity-provider/gnunet-identity-token.c:104
+#: src/identity-provider/gnunet-identity-token.c:166
 msgid "Print token contents"
 msgstr ""
 
-#: src/identity-provider/plugin_rest_identity_provider.c:1126
+#: src/identity-provider/plugin_rest_identity_provider.c:1163
 #, fuzzy
 msgid "Identity Token REST API initialized\n"
 msgstr "Conexión fallida\n"
 
-#: src/mysql/mysql.c:174
+#: src/multicast/gnunet-multicast.c:48 src/multicast/gnunet-multicast.c:72
+msgid "This command doesn't do anything yet."
+msgstr ""
+
+#: src/my/my.c:198 src/my/my.c:217
+#, fuzzy, c-format
+msgid "%s failed at %s:%d with error: %s\n"
+msgstr "«%s» falló en %s: %d con el error: %s\n"
+
+#: src/mysql/mysql.c:180
 #, c-format
 msgid "Trying to use file `%s' for MySQL configuration.\n"
 msgstr "Intentando usar el fichero «%s» para la configuración de MySQL.\n"
 
-#: src/mysql/mysql.c:181
+#: src/mysql/mysql.c:187
 #, c-format
 msgid "Could not access file `%s': %s\n"
 msgstr "No se pudo acceder al fichero «%s»: %s\n"
@@ -5251,7 +5099,7 @@
 msgid "No records found for `%s'"
 msgstr "No se han encontrado ficheros en «%s»\n"
 
-#: src/namecache/gnunet-namecache.c:122 src/namestore/gnunet-namestore.c:395
+#: src/namecache/gnunet-namecache.c:122 src/namestore/gnunet-namestore.c:415
 #, c-format
 msgid "\tCorrupt or unsupported record of type %u\n"
 msgstr "\tRegistro corrupto o no soportado del tipo %u\n"
@@ -5271,7 +5119,7 @@
 msgid "You must specify a name\n"
 msgstr "¡Debes especificar un receptor!\n"
 
-#: src/namecache/gnunet-namecache.c:230 src/namestore/gnunet-namestore.c:1081
+#: src/namecache/gnunet-namecache.c:230 src/namestore/gnunet-namestore.c:1153
 msgid "name of the record to add/delete/display"
 msgstr "nombre del registro a añadir/borrar/mostrar"
 
@@ -5280,19 +5128,27 @@
 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:1113
+#: src/namecache/gnunet-namecache.c:244 src/namestore/gnunet-namestore.c:1189
 msgid "GNUnet zone manipulation tool"
 msgstr "Herramienta de manipulación de zona de GNUnet"
 
-#: src/namecache/namecache_api.c:276
+#: src/namecache/namecache_api.c:296
 #, fuzzy
 msgid "Namecache failed to cache block"
 msgstr "El almacén de nombres no pudo añadir el registro"
 
+# Miguel: ¿Conectar y conexión?
+#: src/namecache/namecache_api.c:383
+#, fuzzy
+msgid "Error communicating with namecache service"
+msgstr "Error al comunicar con el servicio ARM.\n"
+
 #: src/namecache/plugin_namecache_flat.c:119
-#: src/namecache/plugin_namecache_flat.c:244
+#: src/namecache/plugin_namecache_flat.c:253
 #: src/namestore/plugin_namestore_flat.c:179
-#: src/namestore/plugin_namestore_flat.c:351
+#: src/namestore/plugin_namestore_flat.c:375
+#: src/peerstore/plugin_peerstore_flat.c:379
+#: src/peerstore/plugin_peerstore_flat.c:527
 #, fuzzy, c-format
 msgid "Unable to initialize file: %s.\n"
 msgstr "Imposible inicializar SQLite: %s.\n"
@@ -5299,17 +5155,19 @@
 
 #: src/namecache/plugin_namecache_flat.c:130
 #: src/namestore/plugin_namestore_flat.c:190
+#: src/peerstore/plugin_peerstore_flat.c:394
 #, fuzzy, c-format
 msgid "Unable to get filesize: %s.\n"
 msgstr "Se produjo un fallo al crear los índices\n"
 
-#: src/namecache/plugin_namecache_flat.c:145
-#: src/namestore/plugin_namestore_flat.c:202
+#: src/namecache/plugin_namecache_flat.c:149
+#: src/namestore/plugin_namestore_flat.c:203
+#: src/peerstore/plugin_peerstore_flat.c:406
 #, fuzzy, c-format
 msgid "Unable to read file: %s.\n"
 msgstr "Se produjo un fallo al crear los índices\n"
 
-#: src/namecache/plugin_namecache_flat.c:399
+#: src/namecache/plugin_namecache_flat.c:408
 #, fuzzy
 msgid "flat plugin running\n"
 msgstr "Base de datos sqlite ejecutándose\n"
@@ -5325,147 +5183,132 @@
 msgstr "No se pudo añadir el registro: %s\n"
 
 #: src/namestore/gnunet-namestore.c:330
-#: src/namestore/plugin_rest_namestore.c:547
+#: src/namestore/plugin_rest_namestore.c:562
 #, fuzzy, c-format
 msgid "Deleting record failed, record does not exist%s%s\n"
 msgstr "No se pudo borrar el registro: %s\n"
 
 #: src/namestore/gnunet-namestore.c:337
-#: src/namestore/plugin_rest_namestore.c:556
+#: src/namestore/plugin_rest_namestore.c:571
 #, fuzzy, c-format
 msgid "Deleting record failed%s%s\n"
 msgstr "No se pudo borrar el registro: %s\n"
 
-#: src/namestore/gnunet-namestore.c:475 src/namestore/gnunet-namestore.c:483
-#: src/namestore/gnunet-namestore.c:491
+#: src/namestore/gnunet-namestore.c:519 src/namestore/gnunet-namestore.c:527
+#: src/namestore/gnunet-namestore.c:535
 #, c-format
 msgid "A %s record exists already under `%s', no other records can be added.\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:505 src/namestore/gnunet-namestore.c:517
-#: src/namestore/gnunet-namestore.c:529
+#: src/namestore/gnunet-namestore.c:549 src/namestore/gnunet-namestore.c:561
+#: src/namestore/gnunet-namestore.c:573
 #, c-format
 msgid "Records already exist under `%s', cannot add `%s' record.\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:626
-#: src/namestore/plugin_rest_namestore.c:580
+#: src/namestore/gnunet-namestore.c:698
+#: src/namestore/plugin_rest_namestore.c:597
 #, c-format
 msgid "There are no records under label `%s' that could be deleted.\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:665
+#: src/namestore/gnunet-namestore.c:739
 #, c-format
 msgid ""
 "There are no records under label `%s' that match the request for deletion.\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:698
-#: src/namestore/plugin_rest_namestore.c:954
-#: src/transport/gnunet-transport.c:1769
-#: src/transport/gnunet-transport-profiler.c:497
-#, c-format
-msgid "Service `%s' is not running\n"
-msgstr "El servicio «%s» no está ejecutandose\n"
+#: src/namestore/gnunet-namestore.c:776
+#: src/namestore/plugin_rest_namestore.c:1003
+#, fuzzy, c-format
+msgid "Ego `%s' not known to identity service\n"
+msgstr "'%s': servicio desconocido: %s\n"
 
-#: src/namestore/gnunet-namestore.c:706
+#: src/namestore/gnunet-namestore.c:791
 #, c-format
 msgid "No options given\n"
 msgstr "No se han proporcionado opciones\n"
 
-#: src/namestore/gnunet-namestore.c:717
-#: src/namestore/gnunet-namestore-fcfsd.c:978
-#: src/namestore/plugin_rest_namestore.c:963
+#: src/namestore/gnunet-namestore.c:802
+#: src/namestore/gnunet-namestore-fcfsd.c:1034
+#: src/namestore/plugin_rest_namestore.c:1016
 msgid "Failed to connect to namestore\n"
 msgstr "Se produjo un fallo al conectar con el almacén de nombres\n"
 
-#: src/namestore/gnunet-namestore.c:725 src/namestore/gnunet-namestore.c:734
-#: src/namestore/gnunet-namestore.c:751 src/namestore/gnunet-namestore.c:773
-#: src/namestore/gnunet-namestore.c:813
+#: src/namestore/gnunet-namestore.c:810 src/namestore/gnunet-namestore.c:819
+#: src/namestore/gnunet-namestore.c:838 src/namestore/gnunet-namestore.c:861
+#: src/namestore/gnunet-namestore.c:915
 #, c-format
 msgid "Missing option `%s' for operation `%s'\n"
 msgstr "Falta la opción «%s» para la operación «%s»\n"
 
-#: src/namestore/gnunet-namestore.c:726 src/namestore/gnunet-namestore.c:735
-#: src/namestore/gnunet-namestore.c:752 src/namestore/gnunet-namestore.c:774
+#: src/namestore/gnunet-namestore.c:811 src/namestore/gnunet-namestore.c:820
+#: src/namestore/gnunet-namestore.c:839 src/namestore/gnunet-namestore.c:863
 msgid "add"
 msgstr "añadir"
 
-#: src/namestore/gnunet-namestore.c:743
-#: src/namestore/plugin_rest_namestore.c:650
+#: src/namestore/gnunet-namestore.c:829
+#: src/namestore/plugin_rest_namestore.c:671
 #, c-format
 msgid "Unsupported type `%s'\n"
 msgstr "Tipo no soportado «%s»\n"
 
-#: src/namestore/gnunet-namestore.c:763
-#: src/namestore/plugin_rest_namestore.c:668
-#: src/namestore/plugin_rest_namestore.c:708
+#: src/namestore/gnunet-namestore.c:851
+#: src/namestore/plugin_rest_namestore.c:689
+#: src/namestore/plugin_rest_namestore.c:729
 #, c-format
 msgid "Value `%s' invalid for record type `%s'\n"
 msgstr "Valor «%s» no válido para el tipo de registro «%s»\n"
 
-#: src/namestore/gnunet-namestore.c:799
+#: src/namestore/gnunet-namestore.c:896
 #, c-format
 msgid "Invalid time format `%s'\n"
 msgstr "Formato de tiempo no válido «%s»\n"
 
-#: src/namestore/gnunet-namestore.c:814
+#: src/namestore/gnunet-namestore.c:916
 msgid "del"
 msgstr "borrar"
 
-#: src/namestore/gnunet-namestore.c:842
+#: src/namestore/gnunet-namestore.c:950
 #, fuzzy, c-format
 msgid "Invalid public key for reverse lookup `%s'\n"
 msgstr "Parámetro no válido «%s»\n"
 
-#: src/namestore/gnunet-namestore.c:866
-#: src/peerinfo-tool/gnunet-peerinfo.c:819
+#: src/namestore/gnunet-namestore.c:979 src/peerinfo-tool/gnunet-peerinfo.c:775
 #, c-format
 msgid "Invalid URI `%s'\n"
 msgstr "URI no válida: «%s»\n"
 
-#: src/namestore/gnunet-namestore.c:901
+#: src/namestore/gnunet-namestore.c:1014
 #, fuzzy, c-format
 msgid "Invalid nick `%s'\n"
 msgstr "URI no válida: «%s»\n"
 
-#: src/namestore/gnunet-namestore.c:941
-#: src/namestore/plugin_rest_namestore.c:999
+#: src/namestore/gnunet-namestore.c:1051
+#: src/namestore/plugin_rest_namestore.c:1046
 #, fuzzy, c-format
-msgid "Ego `%s' not known to identity service\n"
-msgstr "'%s': servicio desconocido: %s\n"
-
-#: src/namestore/gnunet-namestore.c:968
-#: src/namestore/plugin_rest_namestore.c:1026
-#, fuzzy, c-format
 msgid "No default ego configured in identity service\n"
 msgstr "'%s': servicio desconocido: %s\n"
 
-#: src/namestore/gnunet-namestore.c:1004
-#: src/namestore/plugin_rest_namestore.c:1066
+#: src/namestore/gnunet-namestore.c:1108
+#: src/namestore/plugin_rest_namestore.c:1142
 #, fuzzy, c-format
-msgid "Identity service is not running\n"
-msgstr "El servicio «%s» no está ejecutandose\n"
-
-#: src/namestore/gnunet-namestore.c:1015
-#: src/namestore/plugin_rest_namestore.c:1107
-#, fuzzy, c-format
 msgid "Cannot connect to identity service\n"
 msgstr "¡No se pudo conectar al servicio %s!\n"
 
-#: src/namestore/gnunet-namestore.c:1063
+#: src/namestore/gnunet-namestore.c:1135
 msgid "add record"
 msgstr "añadir registro"
 
-#: src/namestore/gnunet-namestore.c:1066
+#: src/namestore/gnunet-namestore.c:1138
 msgid "delete record"
 msgstr "borrar registro"
 
-#: src/namestore/gnunet-namestore.c:1069
+#: src/namestore/gnunet-namestore.c:1141
 msgid "display records"
 msgstr "mostrar registros"
 
-#: src/namestore/gnunet-namestore.c:1072
+#: src/namestore/gnunet-namestore.c:1144
 msgid ""
 "expiration time for record to use (for adding only), \"never\" is possible"
 msgstr ""
@@ -5472,120 +5315,120 @@
 "tiempo de expiración del registro a usar (únicamente para añadir), nunca "
 "(\"never\") es posible"
 
-#: src/namestore/gnunet-namestore.c:1075
+#: src/namestore/gnunet-namestore.c:1147
 #, fuzzy
 msgid "set the desired nick name for the zone"
 msgstr "establece el nivel LEVEL deseado de replicación"
 
-#: src/namestore/gnunet-namestore.c:1078
+#: src/namestore/gnunet-namestore.c:1150
 #, 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:1084
+#: src/namestore/gnunet-namestore.c:1156
 #, fuzzy
 msgid "determine our name for the given PKEY"
 msgstr "establece las preferencias para el par dado"
 
-#: src/namestore/gnunet-namestore.c:1087
+#: src/namestore/gnunet-namestore.c:1159
 msgid "type of the record to add/delete/display"
 msgstr "tipo del registro a añadir/borrar/mostrar"
 
-#: src/namestore/gnunet-namestore.c:1090
+#: src/namestore/gnunet-namestore.c:1162
 msgid "URI to import into our zone"
 msgstr "URI a importar a nuestra zona"
 
-#: src/namestore/gnunet-namestore.c:1093
+#: src/namestore/gnunet-namestore.c:1165
 msgid "value of the record to add/delete"
 msgstr "valor del registro a añadir/borrar"
 
-#: src/namestore/gnunet-namestore.c:1096
+#: src/namestore/gnunet-namestore.c:1168
 msgid "create or list public record"
 msgstr "crear o listar registros públicos"
 
-#: src/namestore/gnunet-namestore.c:1099
+#: src/namestore/gnunet-namestore.c:1171
 msgid ""
 "create shadow record (only valid if all other records of the same type have "
 "expired"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1102
+#: src/namestore/gnunet-namestore.c:1174
 #, fuzzy
 msgid "name of the ego controlling the zone"
 msgstr "nombre de la sección a la que acceder"
 
 # form??
-#: src/namestore/gnunet-namestore-fcfsd.c:476
+#: src/namestore/gnunet-namestore-fcfsd.c:508
 #, c-format
 msgid "Unsupported form value `%s'\n"
 msgstr "Forma de valor no soportada «%s»\n"
 
-#: src/namestore/gnunet-namestore-fcfsd.c:503
+#: src/namestore/gnunet-namestore-fcfsd.c:535
 #, c-format
 msgid "Failed to create record for domain `%s': %s\n"
 msgstr "Se produjo un fallo al crear un registro para el dominio «%s»: %s\n"
 
-#: src/namestore/gnunet-namestore-fcfsd.c:537
+#: src/namestore/gnunet-namestore-fcfsd.c:555
+msgid "Error when mapping zone to name\n"
+msgstr ""
+
+#: src/namestore/gnunet-namestore-fcfsd.c:585
 #, c-format
 msgid "Found existing name `%s' for the given key\n"
 msgstr "Encontrado nombre «%s» para la clave dada\n"
 
-#: src/namestore/gnunet-namestore-fcfsd.c:546
-msgid "Error when mapping zone to name\n"
-msgstr ""
-
-#: src/namestore/gnunet-namestore-fcfsd.c:608
+#: src/namestore/gnunet-namestore-fcfsd.c:662
 #, c-format
 msgid "Found %u existing records for domain `%s'\n"
 msgstr "Encontrados %u registros para el dominio «%s»\n"
 
-#: src/namestore/gnunet-namestore-fcfsd.c:664
+#: src/namestore/gnunet-namestore-fcfsd.c:718
 #, c-format
 msgid "Failed to create page for `%s'\n"
 msgstr "Se produjo un fallo al crear la página para «%s»\n"
 
-#: src/namestore/gnunet-namestore-fcfsd.c:680
+#: src/namestore/gnunet-namestore-fcfsd.c:734
 #, c-format
 msgid "Failed to setup post processor for `%s'\n"
 msgstr "Se produjo un fallo al configurar el post-procesador para «%s»\n"
 
-#: src/namestore/gnunet-namestore-fcfsd.c:716
+#: src/namestore/gnunet-namestore-fcfsd.c:770
 msgid "Domain name must not contain `.'\n"
 msgstr "El nombre de dominio no puede contener «.»\n"
 
-#: src/namestore/gnunet-namestore-fcfsd.c:724
+#: src/namestore/gnunet-namestore-fcfsd.c:778
 msgid "Domain name must not contain `+'\n"
 msgstr "El nombre de dominio no puede contener «+»\n"
 
-#: src/namestore/gnunet-namestore-fcfsd.c:918
+#: src/namestore/gnunet-namestore-fcfsd.c:974
 msgid "No ego configured for `fcfsd` subsystem\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:944
+#: src/namestore/gnunet-namestore-fcfsd.c:1000
 msgid "Failed to start HTTP server\n"
 msgstr "Se produjo un fallo al iniciar el servidor HTTP\n"
 
-#: src/namestore/gnunet-namestore-fcfsd.c:986
+#: src/namestore/gnunet-namestore-fcfsd.c:1042
 #, fuzzy
 msgid "Failed to connect to identity\n"
 msgstr "Se produjo un fallo al conectar con GNS\n"
 
-#: src/namestore/gnunet-namestore-fcfsd.c:1018
+#: src/namestore/gnunet-namestore-fcfsd.c:1074
 #, fuzzy
 msgid "GNU Name System First Come First Serve name registration service"
 msgstr "Servicio de registro GNUnet GNS primero en llegar, primero en servirse"
 
-#: src/namestore/gnunet-service-namestore.c:655
+#: src/namestore/gnunet-service-namestore.c:612
 #, fuzzy, c-format
 msgid "Failed to replicate block in namecache: %s\n"
 msgstr "Se produjo un fallo al crear el espacio de nombres «%s»\n"
 
-#: src/namestore/namestore_api.c:275
+#: src/namestore/namestore_api.c:379
 #, fuzzy
 msgid "Namestore failed to store record\n"
 msgstr "El almacén de nombres no pudo añadir el registro\n"
 
-#: src/namestore/plugin_namestore_flat.c:632
+#: src/namestore/plugin_namestore_flat.c:656
 #, fuzzy
 msgid "flat file database running\n"
 msgstr "Base de datos de plantilla ejecutándose\n"
@@ -5600,7 +5443,7 @@
 msgid "GNUnet NAT traversal autoconfigure daemon"
 msgstr "Demonio de ayuda en las pruebas de recorrido NAT de GNUnet"
 
-#: src/nat/gnunet-nat-server.c:279
+#: src/nat/gnunet-nat-server.c:321
 #, c-format
 msgid "Please pass valid port number as the first argument! (got `%s')\n"
 msgstr ""
@@ -5607,62 +5450,62 @@
 "¡Por favor, pase un número de puerto válido como primer parámetro! (se "
 "obtuvo «%s»)\n"
 
-#: src/nat/gnunet-nat-server.c:321
+#: src/nat/gnunet-nat-server.c:363
 msgid "GNUnet NAT traversal test helper daemon"
 msgstr "Demonio de ayuda en las pruebas de recorrido NAT de GNUnet"
 
-#: src/nat/nat_auto.c:388
+#: src/nat/nat_auto.c:385
 msgid "NAT traversal with ICMP Server succeeded.\n"
 msgstr "Recorrido NAT con servidor ICMP satisfactorio.\n"
 
-#: src/nat/nat_auto.c:389
+#: src/nat/nat_auto.c:386
 msgid "NAT traversal with ICMP Server failed.\n"
 msgstr "Recorrido NAT con servidor ICMP fallido.\n"
 
-#: src/nat/nat_auto.c:408
+#: src/nat/nat_auto.c:405
 msgid "Testing connection reversal with ICMP server.\n"
 msgstr "Probando conexión inversa con el servidor ICMP.\n"
 
-#: src/nat/nat_auto.c:440
+#: src/nat/nat_auto.c:437
 #, c-format
 msgid "Detected external IP `%s'\n"
 msgstr "Detectada IP externa «%s»\n"
 
-#: src/nat/nat_auto.c:574
+#: src/nat/nat_auto.c:572
 msgid "This system has a global IPv6 address, setting IPv6 to supported.\n"
 msgstr ""
 "Este sistema tiene una dirección IPv6 global, fijando IPv6 a habilitado.\n"
 
-#: src/nat/nat_auto.c:592
+#: src/nat/nat_auto.c:590
 #, c-format
 msgid "Detected internal network address `%s'.\n"
 msgstr "Detectada dirección de la red interna «%s».\n"
 
-#: src/nat/nat_auto.c:662 src/nat/nat_test.c:360
+#: src/nat/nat_auto.c:681 src/nat/nat_test.c:403
 msgid "Failed to connect to `gnunet-nat-server'\n"
 msgstr "Se produjo un fallo al conectar con «gnunet-nat-server»\n"
 
-#: src/nat/nat_auto.c:709
+#: src/nat/nat_auto.c:724
 msgid "upnpc found, enabling its use\n"
 msgstr "«upnpc» encontrado, habilitando su uso\n"
 
-#: src/nat/nat_auto.c:710
+#: src/nat/nat_auto.c:725
 msgid "upnpc not found\n"
 msgstr "«upnpc» no encontrado\n"
 
-#: src/nat/nat_auto.c:742
+#: src/nat/nat_auto.c:762
 msgid "test_icmp_server not possible, as we have no public IPv4 address\n"
 msgstr ""
 
-#: src/nat/nat_auto.c:750 src/nat/nat_auto.c:796
+#: src/nat/nat_auto.c:774 src/nat/nat_auto.c:834
 msgid "test_icmp_server not possible, as we are not behind NAT\n"
 msgstr ""
 
-#: src/nat/nat_auto.c:758 src/nat/nat_auto.c:805
+#: src/nat/nat_auto.c:786 src/nat/nat_auto.c:846
 msgid "No working gnunet-helper-nat-server found\n"
 msgstr "No se ha encontrado un «gnunet-helper-nat-server» funcional\n"
 
-#: src/nat/nat_auto.c:788
+#: src/nat/nat_auto.c:823
 msgid "test_icmp_client not possible, as we have no internal IPv4 address\n"
 msgstr ""
 
@@ -5676,27 +5519,27 @@
 msgid "Failed to start %s\n"
 msgstr "Se produjo un fallo al arrancar %s\n"
 
-#: src/nat/nat.c:1321
+#: src/nat/nat.c:1327
 msgid "Error while running upnp client:\n"
 msgstr ""
 
-#: src/nat/nat.c:1396
+#: src/nat/nat.c:1402
 #, fuzzy, c-format
 msgid "Failed to run upnp client for port %u\n"
 msgstr ""
 "Se produjo un fallo al inicializar la clave de la máquina desde el par %u\n"
 
-#: src/nat/nat.c:1540
+#: src/nat/nat.c:1546
 msgid "malformed"
 msgstr "mal formado"
 
-#: src/nat/nat.c:1594
+#: src/nat/nat.c:1600
 msgid ""
 "UPnP enabled in configuration, but UPnP client `upnpc` command not found, "
 "disabling UPnP \n"
 msgstr ""
 
-#: src/nat/nat.c:1723 src/nat/nat.c:1736
+#: src/nat/nat.c:1726 src/nat/nat.c:1739
 #, c-format
 msgid ""
 "Configuration requires `%s', but binary is not installed properly (SUID bit "
@@ -5705,98 +5548,98 @@
 "La configuración requiere «%s», pero el binario no está instalado de forma "
 "correcta (SUID bit no activado).  Opción deshabilitada.\n"
 
-#: src/nat/nat.c:1891
+#: src/nat/nat.c:1903
 msgid "Internal IP address not known, cannot use ICMP NAT traversal method\n"
 msgstr ""
 "Direcciones internas IP no conocidas, no se puede usar el método del "
 "recorrido NAT ICMP\n"
 
-#: src/nat/nat.c:1907
+#: src/nat/nat.c:1919
 #, c-format
 msgid "Running gnunet-helper-nat-client %s %s %u\n"
 msgstr "Ejecutando gnunet-helper-nat-client %s %s %u\n"
 
-#: src/nat/nat.c:1998
+#: src/nat/nat.c:2010
 msgid "Operation Successful"
 msgstr ""
 
-#: src/nat/nat.c:2000
+#: src/nat/nat.c:2012
 msgid "Internal Failure (IPC, ...)"
 msgstr ""
 
-#: src/nat/nat.c:2002
+#: src/nat/nat.c:2014
 msgid "Failure in network subsystem, check permissions."
 msgstr ""
 
-#: src/nat/nat.c:2004
+#: src/nat/nat.c:2016
 msgid "Encountered timeout while performing operation"
 msgstr ""
 
-#: src/nat/nat.c:2006
+#: src/nat/nat.c:2018
 msgid "detected that we are offline"
 msgstr ""
 
-#: src/nat/nat.c:2008
+#: src/nat/nat.c:2020
 #, fuzzy
 msgid "`upnpc` command not found"
 msgstr "comando «upnpc» no encontrado\n"
 
-#: src/nat/nat.c:2010
+#: src/nat/nat.c:2022
 #, fuzzy
 msgid "Failed to run `upnpc` command"
 msgstr "Se produjo un fallo al ejecutar «%s»\n"
 
-#: src/nat/nat.c:2012
+#: src/nat/nat.c:2024
 #, fuzzy
 msgid "`upnpc' command took too long, process killed"
 msgstr "comando «upnpc» no encontrado\n"
 
-#: src/nat/nat.c:2014
+#: src/nat/nat.c:2026
 msgid "`upnpc' command failed to establish port mapping"
 msgstr ""
 
-#: src/nat/nat.c:2016
+#: src/nat/nat.c:2028
 #, fuzzy
 msgid "`external-ip' command not found"
 msgstr "comando «external-ip» no encontrado\n"
 
-#: src/nat/nat.c:2018
+#: src/nat/nat.c:2030
 #, fuzzy
 msgid "Failed to run `external-ip` command"
 msgstr "Se produjo un fallo al ejecutar «%s»\n"
 
-#: src/nat/nat.c:2020
+#: src/nat/nat.c:2032
 #, fuzzy
 msgid "`external-ip' command output invalid"
 msgstr "comando «external-ip» no encontrado\n"
 
-#: src/nat/nat.c:2022
+#: src/nat/nat.c:2034
 msgid "no valid address was returned by `external-ip'"
 msgstr ""
 
-#: src/nat/nat.c:2024
+#: src/nat/nat.c:2036
 #, fuzzy
 msgid "Could not determine interface with internal/local network address"
 msgstr "No se pudo determinar la ruta de instalación de los módulos.\n"
 
-#: src/nat/nat.c:2026
+#: src/nat/nat.c:2038
 #, fuzzy
 msgid "No functioning gnunet-helper-nat-server installation found"
 msgstr "No se ha encontrado un «gnunet-helper-nat-server» funcional\n"
 
-#: src/nat/nat.c:2028
+#: src/nat/nat.c:2040
 msgid "NAT test could not be initialized"
 msgstr ""
 
-#: src/nat/nat.c:2030
+#: src/nat/nat.c:2042
 msgid "NAT test timeout reached"
 msgstr ""
 
-#: src/nat/nat.c:2032
+#: src/nat/nat.c:2044
 msgid "could not register NAT"
 msgstr ""
 
-#: src/nat/nat.c:2034
+#: src/nat/nat.c:2046
 #, fuzzy
 msgid "No working gnunet-helper-nat-client installation found"
 msgstr "No se ha encontrado un «gnunet-helper-nat-server» funcional\n"
@@ -5809,7 +5652,7 @@
 msgid "`upnpc' command not found\n"
 msgstr "comando «upnpc» no encontrado\n"
 
-#: src/nat/nat_test.c:460
+#: src/nat/nat_test.c:518
 #, c-format
 msgid "Failed to create listen socket bound to `%s' for NAT test: %s\n"
 msgstr ""
@@ -5816,22 +5659,13 @@
 "Se produjo un fallo al crear el «socket» de escucha asociado a «%s» para "
 "pruebas NAT: %s\n"
 
-#: src/nat/nat_test.c:497
+#: src/nat/nat_test.c:568
 #, fuzzy
 msgid "NAT test failed to start NAT library\n"
 msgstr "El almacén de nombres no pudo añadir el registro\n"
 
-#: src/nse/gnunet-nse.c:116
+#: src/nse/gnunet-nse.c:122
 #, fuzzy
-msgid "NSE service is not running\n"
-msgstr "El servicio «%s» no está ejecutandose\n"
-
-#: src/nse/gnunet-nse.c:121
-msgid "Error while checking if NSE service is running or not\n"
-msgstr ""
-
-#: src/nse/gnunet-nse.c:167
-#, fuzzy
 msgid "Show network size estimates from NSE service."
 msgstr "# Estimaciones del tamaño de red recibidas"
 
@@ -5860,32 +5694,32 @@
 msgid "Measure quality and performance of the NSE service."
 msgstr "Medir la calidad y rendimiento del servicio NSE."
 
-#: src/nse/gnunet-service-nse.c:1535
-#: src/revocation/gnunet-service-revocation.c:844 src/util/gnunet-scrypt.c:276
+#: src/nse/gnunet-service-nse.c:1536
+#: src/revocation/gnunet-service-revocation.c:832 src/util/gnunet-scrypt.c:276
 msgid "Value is too large.\n"
 msgstr ""
 
-#: src/peerinfo/gnunet-service-peerinfo.c:225
+#: src/peerinfo/gnunet-service-peerinfo.c:178
 #, c-format
 msgid "Removing expired address of transport `%s'\n"
 msgstr "Eliminando dirección de transporte «%s»\n"
 
-#: src/peerinfo/gnunet-service-peerinfo.c:362
+#: src/peerinfo/gnunet-service-peerinfo.c:310
 #, fuzzy, c-format
 msgid "Failed to parse HELLO in file `%s': %s\n"
 msgstr "Se produjo un fallo al procesar «HELLO» en el fichero «%s»\n"
 
-#: src/peerinfo/gnunet-service-peerinfo.c:382
-#: src/peerinfo/gnunet-service-peerinfo.c:411
+#: src/peerinfo/gnunet-service-peerinfo.c:331
+#: src/peerinfo/gnunet-service-peerinfo.c:362
 #, fuzzy, c-format
 msgid "Failed to parse HELLO in file `%s'\n"
 msgstr "Se produjo un fallo al procesar «HELLO» en el fichero «%s»\n"
 
-#: src/peerinfo/gnunet-service-peerinfo.c:491
+#: src/peerinfo/gnunet-service-peerinfo.c:446
 msgid "# peers known"
 msgstr "# pares conocidos"
 
-#: src/peerinfo/gnunet-service-peerinfo.c:529
+#: src/peerinfo/gnunet-service-peerinfo.c:489
 #, c-format
 msgid ""
 "File `%s' in directory `%s' does not match naming convention. Removed.\n"
@@ -5893,147 +5727,105 @@
 "El fichero «%s» en el directorio «%s» no sigue la convención de nombres. "
 "Eliminado.\n"
 
-#: src/peerinfo/gnunet-service-peerinfo.c:683
+#: src/peerinfo/gnunet-service-peerinfo.c:655
 #, fuzzy, c-format
 msgid "Scanning directory `%s'\n"
 msgstr "Escaneando directorio «%s».\n"
 
-#: src/peerinfo/gnunet-service-peerinfo.c:689
+#: src/peerinfo/gnunet-service-peerinfo.c:663
 #, c-format
 msgid "Still no peers found in `%s'!\n"
 msgstr "¡Aún no se han encontrado pares en «%s»!\n"
 
-#: src/peerinfo/gnunet-service-peerinfo.c:1061
+#: src/peerinfo/gnunet-service-peerinfo.c:1076
 #, fuzzy, c-format
 msgid "Cleaning up directory `%s'\n"
 msgstr "Escaneando directorio «%s».\n"
 
-#: src/peerinfo/gnunet-service-peerinfo.c:1391
+#: src/peerinfo/gnunet-service-peerinfo.c:1405
 #, c-format
 msgid "Importing HELLOs from `%s'\n"
 msgstr "Importando HELLO de «%s»\n"
 
-#: src/peerinfo/gnunet-service-peerinfo.c:1404
+#: src/peerinfo/gnunet-service-peerinfo.c:1418
 msgid "Skipping import of included HELLOs\n"
 msgstr ""
 
-#: src/peerinfo/peerinfo_api.c:237
-msgid "aborted due to explicit disconnect request"
-msgstr "abortado debido a petición de desconexión explícita"
-
-#: src/peerinfo/peerinfo_api.c:361
-msgid "failed to transmit request (service down?)"
-msgstr ""
-"se produjo un fallo al transmitir la petición (¿está caido el servicio?)"
-
 # Miguel: "Failed to receive" también aquí está traducido como
 # "no se obtuvo respuesta" por claridad.
-#: src/peerinfo/peerinfo_api.c:516
+#: src/peerinfo/peerinfo_api.c:220
 msgid "Failed to receive response from `PEERINFO' service."
 msgstr ""
 "No se obtuvo respuesta del servicio de información de pares (PEERINFO)."
 
-#: src/peerinfo/peerinfo_api.c:560 src/peerinfo/peerinfo_api.c:583
-#: src/peerinfo/peerinfo_api.c:600 src/peerinfo/peerinfo_api.c:613
-#: src/peerinfo/peerinfo_api.c:628
-msgid "Received invalid message from `PEERINFO' service."
-msgstr ""
-"Recibido mensaje no válido del servicio de información de pares (PEERINFO)."
-
-#: src/peerinfo/peerinfo_api.c:715
-msgid "Timeout transmitting iteration request to `PEERINFO' service."
-msgstr ""
-"Petición de transmisión de iteración de expiración al servicio de "
-"información de pares (PEERINFO)."
-
-#: src/peerinfo/peerinfo_api_notify.c:268
-#, c-format
-msgid "Could not connect to `%s' service.\n"
-msgstr "No se pudo conectar al servicio %s.\n"
-
-#: src/peerinfo-tool/gnunet-peerinfo.c:243
+#: src/peerinfo-tool/gnunet-peerinfo.c:239
 #, fuzzy, c-format
 msgid "%sPeer `%s'\n"
 msgstr "Par «%s»\n"
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:250
+#: src/peerinfo-tool/gnunet-peerinfo.c:246
 #, c-format
 msgid "\tExpires: %s \t %s\n"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:303
+#: src/peerinfo-tool/gnunet-peerinfo.c:299
 #, fuzzy, c-format
 msgid "Failure: Cannot convert address to string for peer `%s'\n"
 msgstr "Se produjo un fallo al resolver la dirección para el par «%s»\n"
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:470
+#: src/peerinfo-tool/gnunet-peerinfo.c:466
 #, fuzzy, c-format
 msgid "Failure: Received invalid %s\n"
 msgstr "recibido mensaje '%s' no válido: %s.\n"
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:484
+#: src/peerinfo-tool/gnunet-peerinfo.c:480
 #, fuzzy, c-format
 msgid "Failed to write HELLO with %u bytes to file `%s'\n"
 msgstr "Se produjo un fallo al procesar «HELLO» en el fichero «%s»\n"
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:503
+#: src/peerinfo-tool/gnunet-peerinfo.c:499
 #, c-format
 msgid "Wrote %s HELLO containing %u addresses with %u bytes to file `%s'\n"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:573
+#: src/peerinfo-tool/gnunet-peerinfo.c:799
 #, c-format
-msgid "Failure adding HELLO: %s\n"
-msgstr "Fallo añadiendo «HELLO»: %s\n"
-
-#: src/peerinfo-tool/gnunet-peerinfo.c:700
-#, fuzzy, c-format
-msgid "Failed to get my own HELLO from this peer!\n"
-msgstr "¡Se produjo un fallo al obtener la clave de máquina!\n"
-
-#: src/peerinfo-tool/gnunet-peerinfo.c:732
-#, fuzzy, c-format
-msgid "Service `%s' is not running, please start GNUnet\n"
-msgstr "El servicio «%s» no está ejecutandose\n"
-
-#: src/peerinfo-tool/gnunet-peerinfo.c:843
-#, c-format
 msgid "I am peer `%s'.\n"
 msgstr "Yo soy el par «%s».\n"
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:884
+#: src/peerinfo-tool/gnunet-peerinfo.c:842
 msgid "don't resolve host names"
 msgstr "no resolver nombres de máquina"
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:887
+#: src/peerinfo-tool/gnunet-peerinfo.c:845
 msgid "output only the identity strings"
 msgstr "mostrar únicamente las cadenas de identidad"
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:890
+#: src/peerinfo-tool/gnunet-peerinfo.c:848
 msgid "include friend-only information"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:893
+#: src/peerinfo-tool/gnunet-peerinfo.c:851
 msgid "output our own identity only"
 msgstr "muestra únicamente nuestra propia identidad"
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:896
+#: src/peerinfo-tool/gnunet-peerinfo.c:854
 msgid "list all known peers"
 msgstr "mostrar todos los pares conocidos"
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:899
+#: src/peerinfo-tool/gnunet-peerinfo.c:857
 msgid "dump hello to file"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:902
+#: src/peerinfo-tool/gnunet-peerinfo.c:860
 msgid "also output HELLO uri(s)"
 msgstr "también mostrar las URI de «HELLO»"
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:905
+#: src/peerinfo-tool/gnunet-peerinfo.c:863
 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:919
+#: src/peerinfo-tool/gnunet-peerinfo.c:880
 msgid "Print information about peers."
 msgstr "Imprimir información sobre los pares."
 
@@ -6059,77 +5851,31 @@
 msgid "peerstore"
 msgstr ""
 
-#: src/peerstore/gnunet-service-peerstore.c:395
-#, fuzzy
-msgid "Malformed iterate request.\n"
-msgstr "Se produjo un fallo al borrar el fichero de configuración %s\n"
-
-#: src/peerstore/gnunet-service-peerstore.c:402
-msgid "Sub system not supplied in client iterate request.\n"
-msgstr ""
-
-# Miguel: "shutdown request" se refiere a finalizar el
-# que hace de cliente.
-#: src/peerstore/gnunet-service-peerstore.c:462
-#, fuzzy
-msgid "Malformed store request from client\n"
-msgstr ""
-"Se produjo un fallo al transmitir una petición de apagado al cliente.\n"
-
-#: src/peerstore/gnunet-service-peerstore.c:470
-msgid "Full key not supplied in client store request\n"
-msgstr ""
-
-# Miguel: "Drop" en bases de datos es eliminar una tabla
-# del modelo.
-#: src/peerstore/gnunet-service-peerstore.c:489
-#, fuzzy
-msgid "Failed to store requested value, database error."
-msgstr ""
-"Se produjo un fallo al transmitir la petición de eliminación a la base de "
-"datos.\n"
-
-#: src/peerstore/gnunet-service-peerstore.c:568
-#, fuzzy
-msgid "No database backend configured\n"
-msgstr "No hay nombre de máquina externo configurado\n"
-
-#: src/peerstore/gnunet-service-peerstore.c:579
+#: src/peerstore/gnunet-service-peerstore.c:588
 #, 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:329
+#: src/peerstore/peerstore_api.c:296
 #, c-format
 msgid "Received an error notification from MQ of type: %d\n"
 msgstr ""
 
-#: src/peerstore/peerstore_api.c:376
+#: src/peerstore/peerstore_api.c:344
 msgid "timeout"
 msgstr ""
 
-#: src/peerstore/peerstore_api.c:679
+#: src/peerstore/peerstore_api.c:560 src/peerstore/peerstore_api.c:609
 #, fuzzy
 msgid "Unexpected iteration response, this should not happen.\n"
 msgstr "El formato de salida es desconocido, ésto no debería pasar.\n"
 
-# Miguel: ¿Conectar y conexión?
-#: src/peerstore/peerstore_api.c:690
+#: src/peerstore/peerstore_api.c:623
 #, fuzzy
-msgid "Error communicating with `PEERSTORE' service."
-msgstr "Error al comunicar con el servicio ARM.\n"
-
-#: src/peerstore/peerstore_api.c:709
-#, fuzzy
 msgid "Received a malformed response from service."
 msgstr "Recibida petición DNS mal formada de %s\n"
 
-#: src/peerstore/peerstore_api.c:821
-msgid ""
-"Problem receiving a watch response, no way to determine which request.\n"
-msgstr ""
-
-#: src/peerstore/peerstore_api.c:833
+#: src/peerstore/peerstore_api.c:768
 msgid "Received a watch result for a non existing watch.\n"
 msgstr ""
 
@@ -6142,6 +5888,7 @@
 msgstr "Error abriendo fichero «%s»: %s\n"
 
 #: src/peerstore/plugin_peerstore_sqlite.c:422
+#: src/psycstore/plugin_psycstore_mysql.c:250
 #: src/psycstore/plugin_psycstore_sqlite.c:259
 #, fuzzy, c-format
 msgid ""
@@ -6154,97 +5901,112 @@
 msgid "Unable to create indices: %s.\n"
 msgstr "Se produjo un fallo al crear los índices\n"
 
-#: src/postgres/postgres.c:63
-#, c-format
-msgid "`%s:%s' failed at %s:%d with error: %s"
+#: src/postgres/postgres.c:67
+#, fuzzy, c-format
+msgid "`%s:%s' failed at %s:%d with error: %s\n"
 msgstr "«%s:%s» falló en %s:%d con error: %s"
 
-#: src/postgres/postgres.c:166
-#, c-format
-msgid "Unable to initialize Postgres: %s"
+#: src/postgres/postgres.c:195
+#, fuzzy, c-format
+msgid "Unable to initialize Postgres: %s\n"
 msgstr "No se pudo inicializar Postgres: %s"
 
-#: src/psycstore/gnunet-service-psycstore.c:260
+#: src/psycstore/gnunet-service-psycstore.c:249
 #, fuzzy
 msgid "Failed to store membership information!\n"
 msgstr "Se produjo un fallo al retomar la operación de publicación «%s»: %s\n"
 
-#: src/psycstore/gnunet-service-psycstore.c:284
+#: src/psycstore/gnunet-service-psycstore.c:271
 #, fuzzy
 msgid "Failed to test membership!\n"
 msgstr "¡Se produjo un fallo al configurar el túnel mesh!\n"
 
-#: src/psycstore/gnunet-service-psycstore.c:306
+#: src/psycstore/gnunet-service-psycstore.c:300
 #, fuzzy
-msgid "Failed to store fragment!\n"
+msgid "Dropping invalid fragment\n"
+msgstr "Parámetro no válido «%s»\n"
+
+#: src/psycstore/gnunet-service-psycstore.c:311
+#, fuzzy
+msgid "Failed to store fragment\n"
 msgstr "Se produjo un fallo al iniciar el demonio: %s\n"
 
-#: src/psycstore/gnunet-service-psycstore.c:364
+#: src/psycstore/gnunet-service-psycstore.c:368
 #, fuzzy
 msgid "Failed to get fragment!\n"
 msgstr "¡Se produjo un fallo al obtener la clave de máquina!\n"
 
-#: src/psycstore/gnunet-service-psycstore.c:423
+#: src/psycstore/gnunet-service-psycstore.c:434
 #, fuzzy
 msgid "Failed to get message!\n"
 msgstr "¡Se produjo un fallo al obtener la clave de máquina!\n"
 
-#: src/psycstore/gnunet-service-psycstore.c:454
+#: src/psycstore/gnunet-service-psycstore.c:464
 #, fuzzy
 msgid "Failed to get message fragment!\n"
 msgstr "Se produjo un fallo al procesar un mensaje «HELLO»: mal formado\n"
 
-#: src/psycstore/gnunet-service-psycstore.c:482
+#: src/psycstore/gnunet-service-psycstore.c:494
 #, fuzzy
 msgid "Failed to get master counters!\n"
 msgstr "¡Se produjo un fallo al obtener la clave de máquina!\n"
 
-#: src/psycstore/gnunet-service-psycstore.c:665
+#: src/psycstore/gnunet-service-psycstore.c:675
 #, fuzzy, c-format
 msgid "Failed to begin modifying state: %d\n"
 msgstr "Se produjo un fallo al cargar el estado: %s\n"
 
-#: src/psycstore/gnunet-service-psycstore.c:675
+#: src/psycstore/gnunet-service-psycstore.c:685
 #, fuzzy, c-format
 msgid "Failed to modify state: %d\n"
 msgstr "Se produjo un fallo al cargar el estado: %s\n"
 
-#: src/psycstore/gnunet-service-psycstore.c:683
+#: src/psycstore/gnunet-service-psycstore.c:693
 #, fuzzy
 msgid "Failed to end modifying state!\n"
 msgstr "Se produjo un fallo al cargar el estado: %s\n"
 
-#: src/psycstore/gnunet-service-psycstore.c:714
+#: src/psycstore/gnunet-service-psycstore.c:730
 msgid "Tried to set invalid state variable name!\n"
 msgstr ""
 
-#: src/psycstore/gnunet-service-psycstore.c:728
+#: src/psycstore/gnunet-service-psycstore.c:744
 #, fuzzy
 msgid "Failed to begin synchronizing state!\n"
 msgstr "¡Se produjo un fallo al obtener la clave de máquina!\n"
 
-#: src/psycstore/gnunet-service-psycstore.c:745
+#: src/psycstore/gnunet-service-psycstore.c:761
 #, fuzzy
 msgid "Failed to end synchronizing state!\n"
 msgstr "¡Se produjo un fallo al obtener la clave de máquina!\n"
 
-#: src/psycstore/gnunet-service-psycstore.c:765
-#: src/psycstore/gnunet-service-psycstore.c:784
+#: src/psycstore/gnunet-service-psycstore.c:779
+#: src/psycstore/gnunet-service-psycstore.c:795
 #, fuzzy
 msgid "Failed to reset state!\n"
 msgstr "¡Se produjo un fallo al obtener la clave de máquina!\n"
 
-#: src/psycstore/gnunet-service-psycstore.c:807
-#: src/psycstore/gnunet-service-psycstore.c:858
+#: src/psycstore/gnunet-service-psycstore.c:824
+#: src/psycstore/gnunet-service-psycstore.c:881
 msgid "Tried to get invalid state variable name!\n"
 msgstr ""
 
-#: src/psycstore/gnunet-service-psycstore.c:834
-#: src/psycstore/gnunet-service-psycstore.c:873
+#: src/psycstore/gnunet-service-psycstore.c:851
+#: src/psycstore/gnunet-service-psycstore.c:896
 #, fuzzy
 msgid "Failed to get state variable!\n"
 msgstr "¡Se produjo un fallo al obtener la clave de máquina!\n"
 
+#: src/psycstore/plugin_psycstore_mysql.c:281
+#, fuzzy
+msgid "Unable to initialize Mysql.\n"
+msgstr "Imposible inicializar SQLite: %s.\n"
+
+#: src/psycstore/plugin_psycstore_mysql.c:291
+#, fuzzy, c-format
+msgid "Failed to run SQL statement `%s'\n"
+msgstr "Se produjo un fallo al preparar la sentencia «%s»\n"
+
 #: src/psycstore/plugin_psycstore_sqlite.c:61
 #, fuzzy, c-format
 msgid "`%s' failed at %s:%d with error: %s (%d)\n"
@@ -6255,59 +6017,59 @@
 msgid "SQLite database running\n"
 msgstr "Base de datos sqlite ejecutándose\n"
 
-#: src/pt/gnunet-daemon-pt.c:482
+#: src/pt/gnunet-daemon-pt.c:493
 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:488
+#: src/pt/gnunet-daemon-pt.c:499
 msgid "# DNS requests mapped to VPN"
 msgstr "# Peticiones DNS asociadas a la VPN"
 
-#: src/pt/gnunet-daemon-pt.c:541
+#: src/pt/gnunet-daemon-pt.c:553
 msgid "# DNS records modified"
 msgstr "# Registros DNS modificados"
 
-#: src/pt/gnunet-daemon-pt.c:717
+#: src/pt/gnunet-daemon-pt.c:737
 msgid "# DNS replies intercepted"
 msgstr "# Respuestas DNS interceptadas"
 
-#: src/pt/gnunet-daemon-pt.c:723
+#: src/pt/gnunet-daemon-pt.c:744
 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:824
+#: src/pt/gnunet-daemon-pt.c:851
 msgid "# DNS requests dropped (timeout)"
 msgstr "# Peticiones DNS omitidas (expiradas)"
 
-#: src/pt/gnunet-daemon-pt.c:881
+#: src/pt/gnunet-daemon-pt.c:909
 msgid "# DNS requests intercepted"
 msgstr "# Peticiones DNS interceptadas"
 
-#: src/pt/gnunet-daemon-pt.c:886
+#: src/pt/gnunet-daemon-pt.c:914
 #, 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:894
+#: src/pt/gnunet-daemon-pt.c:922
 msgid "# DNS requests dropped (malformed)"
 msgstr "# Peticiones DNS omitidas (mal formadas)"
 
-#: src/pt/gnunet-daemon-pt.c:967
+#: src/pt/gnunet-daemon-pt.c:995
 msgid "# DNS replies received"
 msgstr "# Respuestas DNS recibidas"
 
-#: src/pt/gnunet-daemon-pt.c:983
+#: src/pt/gnunet-daemon-pt.c:1011
 msgid "# DNS replies dropped (too late?)"
 msgstr "# Respuestas DNS (¿demasiado tarde?)"
 
-#: src/pt/gnunet-daemon-pt.c:1257 src/pt/gnunet-daemon-pt.c:1266
-#: src/pt/gnunet-daemon-pt.c:1286 src/pt/gnunet-daemon-pt.c:1297
-#: src/pt/gnunet-daemon-pt.c:1306
+#: src/pt/gnunet-daemon-pt.c:1294 src/pt/gnunet-daemon-pt.c:1303
+#: src/pt/gnunet-daemon-pt.c:1324 src/pt/gnunet-daemon-pt.c:1336
+#: src/pt/gnunet-daemon-pt.c:1345
 #, 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:1343
+#: src/pt/gnunet-daemon-pt.c:1390
 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"
@@ -6324,12 +6086,12 @@
 msgid "Daemon to announce regular expressions for the peer using cadet."
 msgstr "Demonio para anunciar expresiones regulares para el par usando mesh."
 
-#: src/regex/gnunet-regex-profiler.c:1301
+#: src/regex/gnunet-regex-profiler.c:1314
 msgid "No configuration file given. Exiting\n"
 msgstr "No se ha introducido ningún fichero de configuración. Saliendo\n"
 
-#: src/regex/gnunet-regex-profiler.c:1342
-#: src/regex/gnunet-regex-simulation-profiler.c:638
+#: src/regex/gnunet-regex-profiler.c:1355
+#: src/regex/gnunet-regex-simulation-profiler.c:630
 #, c-format
 msgid "No policy directory specified on command line. Exiting.\n"
 msgstr ""
@@ -6336,30 +6098,30 @@
 "No se ha especificado una política de directorios en la línea de comandos. "
 "Saliendo.\n"
 
-#: src/regex/gnunet-regex-profiler.c:1348
-#: src/regex/gnunet-regex-simulation-profiler.c:646
+#: src/regex/gnunet-regex-profiler.c:1361
+#: src/regex/gnunet-regex-simulation-profiler.c:638
 #, c-format
 msgid "Specified policies directory does not exist. Exiting.\n"
 msgstr "Las políticas de directorio especificadas no existen. Saliendo.\n"
 
-#: src/regex/gnunet-regex-profiler.c:1355
+#: src/regex/gnunet-regex-profiler.c:1368
 #, c-format
 msgid "No files found in `%s'\n"
 msgstr "No se han encontrado ficheros en «%s»\n"
 
-#: src/regex/gnunet-regex-profiler.c:1364
+#: src/regex/gnunet-regex-profiler.c:1377
 msgid "No search strings file given. Exiting.\n"
 msgstr "No se ha proporcionado un fichero de cadenas de búsqueda. Saliendo.\n"
 
-#: src/regex/gnunet-regex-profiler.c:1384
+#: src/regex/gnunet-regex-profiler.c:1397
 msgid "Error loading search strings. Exiting.\n"
 msgstr "Error cargando cadenas de búsqueda. Saliendo.\n"
 
-#: src/regex/gnunet-regex-profiler.c:1469
+#: src/regex/gnunet-regex-profiler.c:1482
 msgid "name of the file for writing statistics"
 msgstr "nombre del fichero para escribir las estadísticas"
 
-#: src/regex/gnunet-regex-profiler.c:1472
+#: src/regex/gnunet-regex-profiler.c:1485
 #, fuzzy
 msgid "wait TIMEOUT before ending the experiment"
 msgstr ""
@@ -6366,48 +6128,53 @@
 "esperar «TIMEOUT» antes de considerar que una coincidencia de cadenas como "
 "fallida"
 
-#: src/regex/gnunet-regex-profiler.c:1475
+#: src/regex/gnunet-regex-profiler.c:1488
 msgid "directory with policy files"
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1478
+#: src/regex/gnunet-regex-profiler.c:1491
 #, fuzzy
 msgid "name of file with input strings"
 msgstr "nombre del fichero para escribir las estadísticas"
 
-#: src/regex/gnunet-regex-profiler.c:1481
+#: src/regex/gnunet-regex-profiler.c:1494
 #, fuzzy
 msgid "name of file with hosts' names"
 msgstr "nombre del fichero para escribir las estadísticas"
 
-#: src/regex/gnunet-regex-profiler.c:1493
+#: src/regex/gnunet-regex-profiler.c:1506
 msgid "Profiler for regex"
 msgstr "Perfilador para expresiones regulares."
 
-#: src/regex/gnunet-regex-simulation-profiler.c:704
+#: src/regex/gnunet-regex-simulation-profiler.c:696
 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:707
+#: src/regex/gnunet-regex-simulation-profiler.c:699
 msgid "maximum path compression length"
 msgstr "longitud de la máxima compresión de rutas"
 
-#: src/regex/gnunet-regex-simulation-profiler.c:720
+#: src/regex/gnunet-regex-simulation-profiler.c:712
 msgid "Profiler for regex library"
 msgstr "Analizador de rendimiento para la biblioteca de expresiones regulares"
 
-#: src/regex/regex_api.c:131
+#: src/regex/regex_api_announce.c:152
 #, fuzzy, c-format
 msgid "Regex `%s' is too long!\n"
 msgstr "El servicio «%s» no está ejecutandose\n"
 
-#: src/rest/gnunet-rest-server.c:784
+#: src/regex/regex_api_search.c:212
+#, fuzzy, c-format
+msgid "Search string `%s' is too long!\n"
+msgstr "El servicio «%s» no está ejecutandose\n"
+
+#: src/rest/gnunet-rest-server.c:788
 #, fuzzy
 msgid "listen on specified port (default: 7776)"
 msgstr "escuchar en el puerto especificado (predeterminado: 7777)"
 
-#: src/rest/gnunet-rest-server.c:801
+#: src/rest/gnunet-rest-server.c:805
 #, fuzzy
 msgid "GNUnet REST server"
 msgstr "Herramienta de acceso GNUnet GNS"
@@ -6452,103 +6219,103 @@
 msgid "Internal error, key revocation might have failed\n"
 msgstr ""
 
-#: src/revocation/gnunet-revocation.c:320
+#: src/revocation/gnunet-revocation.c:323
 #, c-format
 msgid "Revocation certificate for `%s' stored in `%s'\n"
 msgstr ""
 
-#: src/revocation/gnunet-revocation.c:350
+#: src/revocation/gnunet-revocation.c:352
 #, fuzzy, c-format
 msgid "Ego `%s' not found.\n"
 msgstr "Módulo «%s» no encontrado\n"
 
-#: src/revocation/gnunet-revocation.c:371
+#: src/revocation/gnunet-revocation.c:373
 #, c-format
 msgid "Error: revocation certificate in `%s' is not for `%s'\n"
 msgstr ""
 
-#: src/revocation/gnunet-revocation.c:391
+#: src/revocation/gnunet-revocation.c:393
 msgid "Revocation certificate ready\n"
 msgstr ""
 
-#: src/revocation/gnunet-revocation.c:401
+#: src/revocation/gnunet-revocation.c:403
 msgid "Revocation certificate not ready, calculating proof of work\n"
 msgstr ""
 
-#: src/revocation/gnunet-revocation.c:435
+#: src/revocation/gnunet-revocation.c:437 src/social/gnunet-social.c:1159
 #, fuzzy, c-format
 msgid "Public key `%s' malformed\n"
 msgstr "El bloque del tipo %u está mal formado\n"
 
-#: src/revocation/gnunet-revocation.c:448
+#: src/revocation/gnunet-revocation.c:450
 msgid ""
 "Testing and revoking at the same time is not allowed, only executing test.\n"
 msgstr ""
 
-#: src/revocation/gnunet-revocation.c:468
+#: src/revocation/gnunet-revocation.c:470
 #, fuzzy
 msgid "No filename to store revocation certificate given.\n"
 msgstr "Se produjo un fallo al leer la lista de amigos de «%s»\n"
 
-#: src/revocation/gnunet-revocation.c:489
+#: src/revocation/gnunet-revocation.c:491
 #, fuzzy, c-format
 msgid "Failed to read revocation certificate from `%s'\n"
 msgstr "Se produjo un fallo al leer la lista de amigos de «%s»\n"
 
-#: src/revocation/gnunet-revocation.c:514
+#: src/revocation/gnunet-revocation.c:516
 #, fuzzy
 msgid "No action specified. Nothing to do.\n"
 msgstr "Ninguna interfaz especificada, usando la marcada por defecto\n"
 
-#: src/revocation/gnunet-revocation.c:530
+#: src/revocation/gnunet-revocation.c:532
 msgid "use NAME for the name of the revocation file"
 msgstr ""
 
-#: src/revocation/gnunet-revocation.c:533
+#: src/revocation/gnunet-revocation.c:535
 msgid ""
 "revoke the private key associated for the the private key associated with "
 "the ego NAME "
 msgstr ""
 
-#: src/revocation/gnunet-revocation.c:536
+#: src/revocation/gnunet-revocation.c:538
 msgid "actually perform revocation, otherwise we just do the precomputation"
 msgstr ""
 
-#: src/revocation/gnunet-revocation.c:539
+#: src/revocation/gnunet-revocation.c:541
 msgid "test if the public key KEY has been revoked"
 msgstr ""
 
-#: src/revocation/gnunet-service-revocation.c:481
+#: src/revocation/gnunet-service-revocation.c:456
 #, fuzzy
 msgid "# unsupported revocations received via set union"
 msgstr "Opciones de paquete IPv4 recibidas.  Ignoradas.\n"
 
-#: src/revocation/gnunet-service-revocation.c:490
+#: src/revocation/gnunet-service-revocation.c:464
 #, fuzzy
 msgid "# revocation messages received via set union"
 msgstr "# mensajes «DATA» recibidos vía WLAN"
 
-#: src/revocation/gnunet-service-revocation.c:495
+#: src/revocation/gnunet-service-revocation.c:469
 #, c-format
 msgid "Error computing revocation set union with %s\n"
 msgstr ""
 
-#: src/revocation/gnunet-service-revocation.c:499
+#: src/revocation/gnunet-service-revocation.c:473
 #, fuzzy
 msgid "# revocation set unions failed"
 msgstr "# sesiones wlan creadas"
 
-#: src/revocation/gnunet-service-revocation.c:508
+#: src/revocation/gnunet-service-revocation.c:482
 #, fuzzy
 msgid "# revocation set unions completed"
 msgstr "# transmisiones de fragmentos completadas"
 
-#: src/revocation/gnunet-service-revocation.c:545
-#: src/revocation/gnunet-service-revocation.c:776
+#: src/revocation/gnunet-service-revocation.c:519
+#: src/revocation/gnunet-service-revocation.c:765
 msgid "SET service crashed, terminating revocation service\n"
 msgstr ""
 
-#: src/revocation/gnunet-service-revocation.c:868
+#: src/revocation/gnunet-service-revocation.c:856
 #, fuzzy
 msgid "Could not open revocation database file!"
 msgstr "No se pudo conectar con el almacén de datos."
@@ -6611,15 +6378,15 @@
 msgid "Calculate the Vectorproduct with a GNUnet peer."
 msgstr ""
 
-#: src/scalarproduct/gnunet-service-scalarproduct_alice.c:1417
-#: src/scalarproduct/gnunet-service-scalarproduct_bob.c:1546
-#: src/scalarproduct/gnunet-service-scalarproduct-ecc_alice.c:1192
-#: src/scalarproduct/gnunet-service-scalarproduct-ecc_bob.c:1249
+#: src/scalarproduct/gnunet-service-scalarproduct_alice.c:1415
+#: src/scalarproduct/gnunet-service-scalarproduct_bob.c:1553
+#: src/scalarproduct/gnunet-service-scalarproduct-ecc_alice.c:1191
+#: src/scalarproduct/gnunet-service-scalarproduct-ecc_bob.c:1259
 #, fuzzy
 msgid "Connect to CADET failed\n"
 msgstr "Conexión fallida (¿bug?)\n"
 
-#: src/scalarproduct/scalarproduct_api.c:296
+#: src/scalarproduct/scalarproduct_api.c:185
 msgid "Keys given to SCALARPRODUCT not unique!\n"
 msgstr ""
 
@@ -6639,7 +6406,7 @@
 msgid "also profile decryption"
 msgstr ""
 
-#: src/set/gnunet-service-set.c:2008
+#: src/set/gnunet-service-set.c:1991
 #, fuzzy
 msgid "Could not connect to cadet service\n"
 msgstr "¡No se pudo conectar al servicio %s!\n"
@@ -6667,242 +6434,227 @@
 msgid "ibf size"
 msgstr "tamaño ibf"
 
-#: src/set/gnunet-set-profiler.c:386
+#: src/set/gnunet-set-profiler.c:387
 msgid "operation to execute"
 msgstr ""
 
-#: src/social/gnunet-social.c:1138
+#: src/social/gnunet-social.c:1146
 #, fuzzy
 msgid "--place missing or invalid.\n"
 msgstr "Parámetro no válido «%s»\n"
 
-#: src/social/gnunet-social.c:1180
+#: src/social/gnunet-social.c:1195
 msgid "assign --name in state to --data"
 msgstr ""
 
-#: src/social/gnunet-social.c:1184
+#: src/social/gnunet-social.c:1199
 msgid "say good-bye and leave somebody else's place"
 msgstr ""
 
-#: src/social/gnunet-social.c:1188
+#: src/social/gnunet-social.c:1203
 msgid "create a place"
 msgstr ""
 
-#: src/social/gnunet-social.c:1192
+#: src/social/gnunet-social.c:1207
 msgid "destroy a place we were hosting"
 msgstr ""
 
-#: src/social/gnunet-social.c:1196
+#: src/social/gnunet-social.c:1211
 msgid "enter somebody else's place"
 msgstr ""
 
-#: src/social/gnunet-social.c:1200
+#: src/social/gnunet-social.c:1215
 msgid "find state matching name prefix"
 msgstr ""
 
-#: src/social/gnunet-social.c:1204
+#: src/social/gnunet-social.c:1219
 msgid "replay history of messages up to the given --limit"
 msgstr ""
 
-#: src/social/gnunet-social.c:1208
+#: src/social/gnunet-social.c:1223
 msgid "reconnect to a previously created place"
 msgstr ""
 
-#: src/social/gnunet-social.c:1212
+#: src/social/gnunet-social.c:1227
 msgid "publish something to a place we are hosting"
 msgstr ""
 
-#: src/social/gnunet-social.c:1216
+#: src/social/gnunet-social.c:1231
 msgid "reconnect to a previously entered place"
 msgstr ""
 
-#: src/social/gnunet-social.c:1220
+#: src/social/gnunet-social.c:1235
 msgid "search for state matching exact name"
 msgstr ""
 
-#: src/social/gnunet-social.c:1224
+#: src/social/gnunet-social.c:1239
 msgid "submit something to somebody's place"
 msgstr ""
 
-#: src/social/gnunet-social.c:1228
+#: src/social/gnunet-social.c:1243
 msgid "list of egos and subscribed places"
 msgstr ""
 
-#: src/social/gnunet-social.c:1232
+#: src/social/gnunet-social.c:1247
 msgid "extract and replay history between message IDs --start and --until"
 msgstr ""
 
-#: src/social/gnunet-social.c:1239
+#: src/social/gnunet-social.c:1254
 msgid "application ID to use when connecting"
 msgstr ""
 
-#: src/social/gnunet-social.c:1243
+#: src/social/gnunet-social.c:1258
 msgid "message body or state value"
 msgstr ""
 
-#: src/social/gnunet-social.c:1247
+#: src/social/gnunet-social.c:1262
 #, fuzzy
 msgid "name or public key of ego"
 msgstr "Parámetro no válido «%s»\n"
 
-#: src/social/gnunet-social.c:1251
+#: src/social/gnunet-social.c:1266
 #, fuzzy
 msgid "wait for incoming messages"
 msgstr "Falló al entregar el mensaje '%s'.\n"
 
-#: src/social/gnunet-social.c:1255
+#: src/social/gnunet-social.c:1270
 #, fuzzy
 msgid "GNS name"
 msgstr "Mostrar el _nombre"
 
-#: src/social/gnunet-social.c:1259
+#: src/social/gnunet-social.c:1274
 msgid "peer ID for --guest-enter"
 msgstr ""
 
-#: src/social/gnunet-social.c:1263
+#: src/social/gnunet-social.c:1278
 msgid "name (key) to query from state"
 msgstr ""
 
-#: src/social/gnunet-social.c:1267
+#: src/social/gnunet-social.c:1282
 #, fuzzy
 msgid "method name"
 msgstr "Mostrar el _nombre"
 
-#: src/social/gnunet-social.c:1271
+#: src/social/gnunet-social.c:1286
 #, fuzzy
 msgid "number of messages to replay from history"
 msgstr "número de mensajes a usar por iteración"
 
-#: src/social/gnunet-social.c:1275
+#: src/social/gnunet-social.c:1290
 msgid "key address of place"
 msgstr ""
 
-#: src/social/gnunet-social.c:1279
+#: src/social/gnunet-social.c:1294
 msgid "start message ID for history replay"
 msgstr ""
 
-#: src/social/gnunet-social.c:1283
+#: src/social/gnunet-social.c:1298
 msgid "respond to entry requests by admitting all guests"
 msgstr ""
 
-#: src/social/gnunet-social.c:1287
+#: src/social/gnunet-social.c:1302
 msgid "end message ID for history replay"
 msgstr ""
 
-#: src/social/gnunet-social.c:1291
+#: src/social/gnunet-social.c:1306
 msgid "respond to entry requests by refusing all guests"
 msgstr ""
 
-#: src/social/gnunet-social.c:1301
+#: src/social/gnunet-social.c:1316
 msgid ""
 "gnunet-social - Interact with the social service: enter/leave, send/receive "
 "messages, access history and state.\n"
 msgstr ""
 
-#: src/statistics/gnunet-service-statistics.c:323
+#: 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
+#, c-format
 msgid "Loading %llu bytes of statistics from `%s'\n"
 msgstr "Cargando %llu bytes de estadísticas de «%s»\n"
 
-#: src/statistics/gnunet-service-statistics.c:434
-#, c-format
-msgid "Wrote %llu bytes of statistics to `%s'\n"
-msgstr "Escritos %llu bytes de estadísticas a «%s»\n"
-
-#: src/statistics/gnunet-statistics.c:145
+#: src/statistics/gnunet-statistics.c:158
 msgid "Failed to obtain statistics.\n"
 msgstr "Se produjo un fallo al obtener las estadísticas.\n"
 
-#: src/statistics/gnunet-statistics.c:148
+#: src/statistics/gnunet-statistics.c:161
 #, c-format
 msgid "Failed to obtain statistics from host `%s:%llu'\n"
 msgstr ""
 "Se produjo un fallo al obtener las estadísticas de la máquina «%s:%llu»\n"
 
-#: src/statistics/gnunet-statistics.c:194
+#: src/statistics/gnunet-statistics.c:219
 msgid "Missing argument: subsystem \n"
 msgstr "Falta el parámetro: subsistema\n"
 
-#: src/statistics/gnunet-statistics.c:200
+#: src/statistics/gnunet-statistics.c:227
 msgid "Missing argument: name\n"
 msgstr "Falta el argumento: nombre\n"
 
-#: src/statistics/gnunet-statistics.c:232
+#: src/statistics/gnunet-statistics.c:270
 #, c-format
 msgid "No subsystem or name given\n"
 msgstr "No se proporcionó un subsistema o un nombre\n"
 
-#: src/statistics/gnunet-statistics.c:241
+#: src/statistics/gnunet-statistics.c:285
 #, c-format
 msgid "Failed to initialize watch routine\n"
 msgstr "Se produjo un fallo al inicializar la rutina de visualización\n"
 
-#: src/statistics/gnunet-statistics.c:266
+#: src/statistics/gnunet-statistics.c:321
 #, c-format
-msgid "Trying to connect to remote host, but service `%s' is not running\n"
-msgstr ""
-"Intentando conectar con máquina remota, pero el servicio «%s» no se está "
-"ejecutando\n"
+msgid "Invalid argument `%s'\n"
+msgstr "Parámetro no válido «%s»\n"
 
-#: src/statistics/gnunet-statistics.c:279
+#: src/statistics/gnunet-statistics.c:339
 #, c-format
 msgid "A port is required to connect to host `%s'\n"
 msgstr "Se necesita un puerto para conectar con la máquina «%s»\n"
 
-#: src/statistics/gnunet-statistics.c:287
+#: src/statistics/gnunet-statistics.c:347
 #, c-format
 msgid "A port has to be between 1 and 65535 to connect to host `%s'\n"
 msgstr "Un puerto debe estar entre 1 y 65534 para conectar a la máquina «%s»\n"
 
-#: src/statistics/gnunet-statistics.c:320
-#, c-format
-msgid "Invalid argument `%s'\n"
-msgstr "Parámetro no válido «%s»\n"
-
-#: src/statistics/gnunet-statistics.c:346
+#: src/statistics/gnunet-statistics.c:383
 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:349
+#: src/statistics/gnunet-statistics.c:386
 msgid "make the value being set persistent"
 msgstr "hacer el valor persistente"
 
-#: src/statistics/gnunet-statistics.c:352
+#: src/statistics/gnunet-statistics.c:389
 msgid "limit output to the given SUBSYSTEM"
 msgstr "límite de salida para el subsistema (SUBSYSTEM) dado"
 
-#: src/statistics/gnunet-statistics.c:355
+#: src/statistics/gnunet-statistics.c:392
 msgid "just print the statistics value"
 msgstr "imprime el valor de las estadísticas"
 
-#: src/statistics/gnunet-statistics.c:358
+#: src/statistics/gnunet-statistics.c:395
 msgid "watch value continuously"
 msgstr "visualiza el valor continuamente"
 
-#: src/statistics/gnunet-statistics.c:361
+#: src/statistics/gnunet-statistics.c:398
 msgid "connect to remote host"
 msgstr "conectar a equipo remoto"
 
-#: src/statistics/gnunet-statistics.c:364
+#: src/statistics/gnunet-statistics.c:401
 msgid "port for remote host"
 msgstr "puerto del equipo remoto"
 
-#: src/statistics/gnunet-statistics.c:376
+#: src/statistics/gnunet-statistics.c:417
 msgid "Print statistics about GNUnet operations."
 msgstr "Imprime estadísticas acerca de las operaciones de GNUnet."
 
-#: src/statistics/statistics_api.c:515
+#: src/statistics/statistics_api.c:753
 msgid "Could not save some persistent statistics\n"
 msgstr "No se pudieron guardar algunas estadísticas persistentes\n"
 
-#: src/statistics/statistics_api.c:1082
-msgid ""
-"Failed to receive acknowledgement from statistics service, some statistics "
-"might have been lost!\n"
-msgstr ""
-"¡No se ha recibido el reconocimiento del servicio de estadísticas, algunas "
-"estadísticas se pueden haber perdido!\n"
-
 #: src/testbed/generate-underlay-topology.c:225
 #, fuzzy
 msgid "Need at least 2 arguments\n"
@@ -6947,12 +6699,12 @@
 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:338
+#: src/testbed/generate-underlay-topology.c:339
 #: src/testbed/gnunet-testbed-profiler.c:281
 msgid "create COUNT number of peers"
 msgstr "crea «COUNT» número de pares"
 
-#: src/testbed/generate-underlay-topology.c:347
+#: src/testbed/generate-underlay-topology.c:348
 msgid ""
 "Generates SQLite3 database representing a given underlay topology.\n"
 "Usage: gnunet-underlay-topology [OPTIONS] db-filename TOPO [TOPOOPTS]\n"
@@ -6980,19 +6732,19 @@
 msgid "Daemon to log latency values of connections to neighbours"
 msgstr ""
 
-#: src/testbed/gnunet-daemon-testbed-blacklist.c:248
+#: src/testbed/gnunet-daemon-testbed-blacklist.c:247
 msgid ""
 "Daemon to restrict incoming transport layer connections during testbed "
 "deployments"
 msgstr ""
 
-#: src/testbed/gnunet-daemon-testbed-underlay.c:230 src/testing/list-keys.c:50
-#: src/testing/testing.c:293 src/util/gnunet-ecc.c:298
+#: src/testbed/gnunet-daemon-testbed-underlay.c:231 src/testing/list-keys.c:50
+#: src/testing/testing.c:288 src/util/gnunet-ecc.c:298
 #, c-format
 msgid "Incorrect hostkey file format: %s\n"
 msgstr "El fichero de máquinas no tiene el formato correcto: %s\n"
 
-#: src/testbed/gnunet-daemon-testbed-underlay.c:468
+#: src/testbed/gnunet-daemon-testbed-underlay.c:469
 msgid "Daemon to restrict underlay network in testbed deployments"
 msgstr ""
 
@@ -7002,18 +6754,13 @@
 "Cannot open %s for writing load statistics.  Not logging load statistics\n"
 msgstr ""
 
-#: src/testbed/gnunet-service-testbed_peers.c:1015
+#: src/testbed/gnunet-service-testbed_peers.c:1141
 #, fuzzy
 msgid "Misconfiguration (can't connect to the ARM service)"
 msgstr "¡Se produjo un fallo al conectar con el servicio dv!\n"
 
-#: src/testbed/gnunet-service-testbed_peers.c:1021
-#, fuzzy
-msgid "Request doesn't fit into a message"
-msgstr "no imprime mensajes de estado"
-
 # Miguel: ¿Es mejor «ya que» que «porque» o «debido al apagado»?
-#: src/testbed/gnunet-service-testbed_peers.c:1059
+#: src/testbed/gnunet-service-testbed_peers.c:1183
 #, 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"
@@ -7039,31 +6786,31 @@
 "signal is received"
 msgstr ""
 
-#: src/testbed/testbed_api_hosts.c:415
+#: src/testbed/testbed_api.c:410
 #, c-format
+msgid "Adding host %u failed with error: %s\n"
+msgstr "No se pudo añadir la máquina %u por el error: %s\n"
+
+#: src/testbed/testbed_api_hosts.c:413
+#, c-format
 msgid "Hosts file %s not found\n"
 msgstr "El fichero de máquinas %s no fue encontrado\n"
 
-#: src/testbed/testbed_api_hosts.c:423
+#: src/testbed/testbed_api_hosts.c:421
 #, c-format
 msgid "Hosts file %s has no data\n"
 msgstr "El archivo de máquinas %s no tiene datos\n"
 
-#: src/testbed/testbed_api_hosts.c:430
+#: src/testbed/testbed_api_hosts.c:428
 #, c-format
 msgid "Hosts file %s cannot be read\n"
 msgstr "El archivo de máquinas %s no puede leerse\n"
 
-#: src/testbed/testbed_api_hosts.c:570
+#: src/testbed/testbed_api_hosts.c:569
 #, c-format
 msgid "The function %s is only available when compiled with (--with-ll)\n"
 msgstr ""
 
-#: src/testbed/testbed_api_hosts.c:1590
-#, c-format
-msgid "Adding host %u failed with error: %s\n"
-msgstr "No se pudo añadir la máquina %u por el error: %s\n"
-
 #: src/testbed/testbed_api_testbed.c:818
 msgid "Linking controllers failed. Exiting"
 msgstr "Los controladores de enlazado fallaron. Saliendo"
@@ -7122,46 +6869,46 @@
 "free topology cannot be more than %u.  Given `%s = %llu'"
 msgstr ""
 
-#: src/testbed/testbed_api_topology.c:966
+#: src/testbed/testbed_api_topology.c:1028
 #, c-format
 msgid "Topology file %s not found\n"
 msgstr "El fichero de topología %s no fue encontrado\n"
 
-#: src/testbed/testbed_api_topology.c:974
+#: src/testbed/testbed_api_topology.c:1036
 #, c-format
 msgid "Topology file %s has no data\n"
 msgstr "El fichero de topología %s no tiene datos\n"
 
-#: src/testbed/testbed_api_topology.c:982
+#: src/testbed/testbed_api_topology.c:1044
 #, c-format
 msgid "Topology file %s cannot be read\n"
 msgstr "El fichero de topología %s no puede ser leido\n"
 
-#: src/testbed/testbed_api_topology.c:1004
+#: src/testbed/testbed_api_topology.c:1066
 #, c-format
 msgid "Failed to read peer index from toology file: %s"
 msgstr ""
 "Se produjo un fallo al leer el índice de pares del archivo de topología: %s"
 
-#: src/testbed/testbed_api_topology.c:1013
-#: src/testbed/testbed_api_topology.c:1037
+#: src/testbed/testbed_api_topology.c:1075
+#: src/testbed/testbed_api_topology.c:1099
 #, c-format
 msgid "Value in given topology file: %s out of range\n"
 msgstr "Valor en el fichero de topología dato: %s está fuera de rango\n"
 
-#: src/testbed/testbed_api_topology.c:1019
-#: src/testbed/testbed_api_topology.c:1043
+#: src/testbed/testbed_api_topology.c:1081
+#: src/testbed/testbed_api_topology.c:1105
 #, c-format
 msgid "Failed to read peer index from topology file: %s"
 msgstr ""
 "Se produjo un fallo al leer índice de pares del fichero de topología: %s"
 
-#: src/testbed/testbed_api_topology.c:1025
-#: src/testbed/testbed_api_topology.c:1049
+#: src/testbed/testbed_api_topology.c:1087
+#: src/testbed/testbed_api_topology.c:1111
 msgid "Topology file needs more peers than given ones\n"
 msgstr "El fichero de topología necesita más pares que los dados\n"
 
-#: src/testbed/testbed_api_topology.c:1083
+#: src/testbed/testbed_api_topology.c:1145
 #, c-format
 msgid "Ignoring to connect peer %u to peer %u\n"
 msgstr "Ignorando conexión del par %u al par %u\n"
@@ -7209,21 +6956,21 @@
 msgstr ""
 "Herramienta de línea de comandos para acceder a la biblioteca de pruebas"
 
-#: src/testing/list-keys.c:90
+#: src/testing/list-keys.c:91
 #, fuzzy
 msgid "list COUNT number of keys"
 msgstr "crea «COUNT» número de pares"
 
-#: src/testing/list-keys.c:93
+#: src/testing/list-keys.c:94
 msgid "skip COUNT number of keys in the beginning"
 msgstr ""
 
-#: src/testing/testing.c:277
+#: src/testing/testing.c:272
 #, c-format
 msgid "Hostkeys file not found: %s\n"
 msgstr "El fichero de máquinas no fue encontrado: %s\n"
 
-#: src/testing/testing.c:720
+#: src/testing/testing.c:715
 #, c-format
 msgid "Key number %u does not exist\n"
 msgstr "El número de clave %u no existe\n"
@@ -7230,7 +6977,7 @@
 
 # Miguel: "testbed" lo he traducido como batería de pruebas, pero
 # no es una traducción muy literal.
-#: src/testing/testing.c:1163
+#: src/testing/testing.c:1158
 #, c-format
 msgid ""
 "You attempted to create a testbed with more than %u hosts.  Please "
@@ -7239,35 +6986,35 @@
 "Se ha intentado crear una batería de pruebas con más de %u máquinas.  Por "
 "favor, pre-compute más claves de máquinas primero.\n"
 
-#: src/testing/testing.c:1172
+#: src/testing/testing.c:1167
 #, 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:1182
+#: src/testing/testing.c:1177
 #, 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:1195
+#: src/testing/testing.c:1190
 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:1209
+#: src/testing/testing.c:1204
 #, 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:1221
+#: src/testing/testing.c:1216
 #, 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:1246
+#: src/testing/testing.c:1241
 #, c-format
 msgid "Failed to write configuration file `%s' for peer %u: %s\n"
 msgstr ""
@@ -7274,12 +7021,12 @@
 "Se produjo un fallo al escribir el fichero de configuración «%s» para el par "
 "%u: %s\n"
 
-#: src/testing/testing.c:1348
+#: src/testing/testing.c:1343
 #, c-format
 msgid "Failed to start `%s': %s\n"
 msgstr "Se produjo un fallo al arrancar «%s»: %s\n"
 
-#: src/testing/testing.c:1710
+#: src/testing/testing.c:1644
 #, c-format
 msgid "Failed to load configuration from %s\n"
 msgstr "Se produjo un fallo al cargar la configuración de %s\n"
@@ -7296,45 +7043,50 @@
 msgid "Directory for file `%s' does not seem to be writable.\n"
 msgstr "«gnunet-arm» o «ssh» no parecen terminar.\n"
 
-#: src/topology/gnunet-daemon-topology.c:230
+#: src/topology/gnunet-daemon-topology.c:225
 msgid "# peers blacklisted"
 msgstr "# pares en la lista negra"
 
-#: src/topology/gnunet-daemon-topology.c:349
+#: src/topology/gnunet-daemon-topology.c:339
 #, fuzzy
 msgid "# connect requests issued to ATS"
 msgstr "# peticiones de conexión requeridas al servicio de transporte"
 
-#: src/topology/gnunet-daemon-topology.c:634
-#: src/topology/gnunet-daemon-topology.c:730
+# gossiped??
+#: src/topology/gnunet-daemon-topology.c:533
+msgid "# HELLO messages gossipped"
+msgstr "# Mensajes «HELLO» rumoreados"
+
+#: src/topology/gnunet-daemon-topology.c:635
+#: src/topology/gnunet-daemon-topology.c:721
 msgid "# friends connected"
 msgstr "# amigos conectados"
 
-#: src/topology/gnunet-daemon-topology.c:927
+#: src/topology/gnunet-daemon-topology.c:918
 msgid "Failed to connect to core service, can not manage topology!\n"
 msgstr ""
 "¡Se produjo un fallo al conectar con el servicio principal, no se puede "
 "gestionar la topología!\n"
 
-#: src/topology/gnunet-daemon-topology.c:960
+#: src/topology/gnunet-daemon-topology.c:951
 #, c-format
 msgid "Found myself `%s' in friend list (useless, ignored)\n"
 msgstr "Me he encontrado «%s» en mi lista de amigos (inútil, ignorado)\n"
 
-#: src/topology/gnunet-daemon-topology.c:967
+#: src/topology/gnunet-daemon-topology.c:958
 #, c-format
 msgid "Found friend `%s' in configuration\n"
 msgstr "Encontrado amigo «%s» en la configuración\n"
 
-#: src/topology/gnunet-daemon-topology.c:989
+#: src/topology/gnunet-daemon-topology.c:980
 msgid "Encountered errors parsing friends list!\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:992
+#: src/topology/gnunet-daemon-topology.c:983
 msgid "# friends in configuration"
 msgstr "# amigos en configuración"
 
-#: src/topology/gnunet-daemon-topology.c:999
+#: src/topology/gnunet-daemon-topology.c:990
 msgid ""
 "Fewer friends specified than required by minimum friend count. Will only "
 "connect to friends.\n"
@@ -7342,7 +7094,7 @@
 "Menos amigos especificados que los requeridos por el contador mínimo de "
 "amigos. Sólo me conectaré a amigos.\n"
 
-#: src/topology/gnunet-daemon-topology.c:1005
+#: src/topology/gnunet-daemon-topology.c:996
 msgid ""
 "More friendly connections required than target total number of connections.\n"
 msgstr ""
@@ -7349,17 +7101,12 @@
 "Más conexiones amistosas requeridas que el número objetivo total de "
 "conexiones.\n"
 
-#: src/topology/gnunet-daemon-topology.c:1039
+#: src/topology/gnunet-daemon-topology.c:1059
 #: src/transport/plugin_transport_wlan.c:1491
 msgid "# HELLO messages received"
 msgstr "# mensajes «HELLO» recibidos"
 
-# gossiped??
-#: src/topology/gnunet-daemon-topology.c:1112
-msgid "# HELLO messages gossipped"
-msgstr "# Mensajes «HELLO» rumoreados"
-
-#: src/topology/gnunet-daemon-topology.c:1283
+#: src/topology/gnunet-daemon-topology.c:1233
 msgid "GNUnet topology control"
 msgstr ""
 
@@ -7367,40 +7114,48 @@
 msgid "# Addresses given to ATS"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_blacklist.c:284
-#, fuzzy, c-format
-msgid "Adding blacklisting entry for peer `%s'\n"
-msgstr "Añadiendo «%s» sin direcciones para el par «%s»\n"
+#: src/transport/gnunet-service-transport.c:448
+msgid "# messages dropped due to slow client"
+msgstr "# mensajes omitidos debido a un cliente lento"
 
-#: src/transport/gnunet-service-transport_blacklist.c:293
-#, c-format
-msgid "Adding blacklisting entry for peer `%s':`%s'\n"
-msgstr ""
+#: src/transport/gnunet-service-transport.c:809
+msgid "# bytes payload dropped (other peer was not connected)"
+msgstr "# bytes de «payload» omitidos (el otro par no estaba conectado)"
 
-#: src/transport/gnunet-service-transport_blacklist.c:500
-#: src/transport/gnunet-service-transport_blacklist.c:851
-msgid "# disconnects due to blacklist"
-msgstr "# desconexiones debido a la lista negra"
-
-#: src/transport/gnunet-service-transport_blacklist.c:855
-#, fuzzy, c-format
-msgid "Disallowing connection to peer `%s' on transport %s\n"
-msgstr "Se produjo un fallo al cargar el módulo del transporte para «%s»\n"
-
-#: src/transport/gnunet-service-transport.c:231
+#: src/transport/gnunet-service-transport.c:1539
 #, fuzzy
 msgid "# bytes payload discarded due to not connected peer"
 msgstr "# bytes de «payload» descartados debido a par no conectado"
 
-#: src/transport/gnunet-service-transport.c:383
+#: src/transport/gnunet-service-transport.c:1698
 msgid "# bytes total received"
 msgstr "# total de bytes recibidos"
 
-#: src/transport/gnunet-service-transport.c:478
+#: src/transport/gnunet-service-transport.c:1795
 msgid "# bytes payload received"
 msgstr "# bytes de «payload» recibidos"
 
-#: src/transport/gnunet-service-transport.c:823
+#: src/transport/gnunet-service-transport.c:2112
+#: src/transport/gnunet-service-transport.c:2584
+msgid "# disconnects due to blacklist"
+msgstr "# desconexiones debido a la lista negra"
+
+#: src/transport/gnunet-service-transport.c:2588
+#, fuzzy, c-format
+msgid "Disallowing connection to peer `%s' on transport %s\n"
+msgstr "Se produjo un fallo al cargar el módulo del transporte para «%s»\n"
+
+#: src/transport/gnunet-service-transport.c:2696
+#, fuzzy, c-format
+msgid "Adding blacklisting entry for peer `%s'\n"
+msgstr "Añadiendo «%s» sin direcciones para el par «%s»\n"
+
+#: src/transport/gnunet-service-transport.c:2705
+#, c-format
+msgid "Adding blacklisting entry for peer `%s':`%s'\n"
+msgstr ""
+
+#: src/transport/gnunet-service-transport.c:2770
 #, fuzzy
 msgid "Transport service is lacking key configuration settings. Exiting.\n"
 msgstr ""
@@ -7407,108 +7162,100 @@
 "El servicio de transporte carece de opciones de configuración de clave.  "
 "Saliendo.\n"
 
-#: src/transport/gnunet-service-transport_clients.c:523
-msgid "# messages dropped due to slow client"
-msgstr "# mensajes omitidos debido a un cliente lento"
-
-#: src/transport/gnunet-service-transport_clients.c:845
-msgid "# bytes payload dropped (other peer was not connected)"
-msgstr "# bytes de «payload» omitidos (el otro par no estaba conectado)"
-
 #: src/transport/gnunet-service-transport_hello.c:195
 msgid "# refreshed my HELLO"
 msgstr "# refrescos de mi «HELLO»"
 
-#: src/transport/gnunet-service-transport_neighbours.c:805
+#: src/transport/gnunet-service-transport_neighbours.c:804
 #, fuzzy
 msgid "# session creation failed"
 msgstr "# sesiones wlan creadas"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1048
+#: src/transport/gnunet-service-transport_neighbours.c:1047
 msgid "# DISCONNECT messages sent"
 msgstr "# Mensajes «DISCONNECT» enviados"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1168
+#: src/transport/gnunet-service-transport_neighbours.c:1167
 msgid "# disconnects due to quota of 0"
 msgstr "# desconexiones debido a una cuota de 0"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1311
-#: src/transport/gnunet-service-transport_neighbours.c:1764
+#: src/transport/gnunet-service-transport_neighbours.c:1310
+#: src/transport/gnunet-service-transport_neighbours.c:1763
 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:1316
+#: src/transport/gnunet-service-transport_neighbours.c:1315
 msgid "# messages transmitted to other peers"
 msgstr "# mensajes transmitidos a otros pares"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1322
+#: src/transport/gnunet-service-transport_neighbours.c:1321
 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:1382
+#: src/transport/gnunet-service-transport_neighbours.c:1381
 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:1458
+#: src/transport/gnunet-service-transport_neighbours.c:1457
 msgid "# KEEPALIVES sent"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1494
+#: src/transport/gnunet-service-transport_neighbours.c:1493
 msgid "# KEEPALIVE messages discarded (peer unknown)"
 msgstr "# Mensajes «KEEPALIVE» descartados (par desconocido)"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1502
+#: src/transport/gnunet-service-transport_neighbours.c:1501
 msgid "# KEEPALIVE messages discarded (no session)"
 msgstr "# mensajes «KEEPALIVE» descartados (no hay sesión)"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1512
+#: src/transport/gnunet-service-transport_neighbours.c:1511
 msgid "# KEEPALIVES received in good order"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1557
+#: src/transport/gnunet-service-transport_neighbours.c:1556
 #, fuzzy
 msgid "# KEEPALIVE_RESPONSEs discarded (not connected)"
 msgstr "# mensajes «KEEPALIVE_RESPONSE» descartados (no conectado)"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1566
+#: src/transport/gnunet-service-transport_neighbours.c:1565
 #, fuzzy
 msgid "# KEEPALIVE_RESPONSEs discarded (not expected)"
 msgstr "# Mensajes «KEEPALIVE_RESPONSE» descartados (no esperado)"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1574
+#: src/transport/gnunet-service-transport_neighbours.c:1573
 #, fuzzy
 msgid "# KEEPALIVE_RESPONSEs discarded (address changed)"
 msgstr "# mensajes «KEEPALIVE_RESPONSE» descartados (no conectado)"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1583
+#: src/transport/gnunet-service-transport_neighbours.c:1582
 #, fuzzy
 msgid "# KEEPALIVE_RESPONSEs discarded (no nonce)"
 msgstr "# mensajes «KEEPALIVE_RESPONSE» descartados (no conectado)"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1588
+#: src/transport/gnunet-service-transport_neighbours.c:1587
 #, fuzzy
 msgid "# KEEPALIVE_RESPONSEs discarded (bad nonce)"
 msgstr "# mensajes «KEEPALIVE_RESPONSE» descartados (no conectado)"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1594
+#: src/transport/gnunet-service-transport_neighbours.c:1593
 #, fuzzy
 msgid "# KEEPALIVE_RESPONSEs received (OK)"
 msgstr "# mensajes «KEEPALIVE_RESPONSE» descartados (no conectado)"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1661
+#: src/transport/gnunet-service-transport_neighbours.c:1660
 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:1695
+#: src/transport/gnunet-service-transport_neighbours.c:1694
 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:1710
+#: src/transport/gnunet-service-transport_neighbours.c:1709
 msgid "# ms throttling suggested"
 msgstr "# ms de impulso sugeridos"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1830
+#: src/transport/gnunet-service-transport_neighbours.c:1829
 #, fuzzy, c-format
 msgid "Failed to send SYN message to peer `%s'\n"
 msgstr ""
@@ -7515,120 +7262,120 @@
 "Se produjo un fallo al procesar el mensaje interno del programa auxiliar "
 "«%s»\n"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1850
+#: src/transport/gnunet-service-transport_neighbours.c:1849
 #, 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:1889
+#: src/transport/gnunet-service-transport_neighbours.c:1888
 #, fuzzy
 msgid "# SYN messages sent"
 msgstr "# Mensajes «DISCONNECT» enviados"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1906
+#: src/transport/gnunet-service-transport_neighbours.c:1905
 #, 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:1936
+#: src/transport/gnunet-service-transport_neighbours.c:1935
 #, 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:2001
+#: src/transport/gnunet-service-transport_neighbours.c:2000
 #, 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:2055
+#: src/transport/gnunet-service-transport_neighbours.c:2054
 #, fuzzy
 msgid "# SYN_ACK messages sent"
 msgstr "# Mensajes «DISCONNECT» enviados"
 
-#: src/transport/gnunet-service-transport_neighbours.c:2072
+#: src/transport/gnunet-service-transport_neighbours.c:2071
 #, 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:2228
+#: src/transport/gnunet-service-transport_neighbours.c:2227
 #, fuzzy
 msgid "# SYN messages received"
 msgstr "# mensajes PING recibidos"
 
-#: src/transport/gnunet-service-transport_neighbours.c:2233
+#: src/transport/gnunet-service-transport_neighbours.c:2232
 #, c-format
 msgid "SYN request from peer `%s' ignored due impending shutdown\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:2599
+#: src/transport/gnunet-service-transport_neighbours.c:2598
 msgid "# Attempts to switch addresses"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3081
+#: src/transport/gnunet-service-transport_neighbours.c:3080
 #, fuzzy
 msgid "# SYN_ACK messages received"
 msgstr "# mensajes SET QUOTA recibidos"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3089
+#: src/transport/gnunet-service-transport_neighbours.c:3088
 #, fuzzy
 msgid "# unexpected SYN_ACK messages (no peer)"
 msgstr "# Mensajes «CONNECT_ACK» inesperados (sin par)"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3107
-#: src/transport/gnunet-service-transport_neighbours.c:3131
+#: src/transport/gnunet-service-transport_neighbours.c:3106
+#: src/transport/gnunet-service-transport_neighbours.c:3130
 #, fuzzy
 msgid "# unexpected SYN_ACK messages (not ready)"
 msgstr "# Mensajes «CONNECT_ACK» inesperados (no estaba preparado)"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3143
+#: src/transport/gnunet-service-transport_neighbours.c:3142
 #, 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:3168
+#: src/transport/gnunet-service-transport_neighbours.c:3167
 msgid "# Successful attempts to switch addresses"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3181
+#: src/transport/gnunet-service-transport_neighbours.c:3180
 #, fuzzy
 msgid "# unexpected SYN_ACK messages (disconnecting)"
 msgstr "# Mensajes «CONNECT_ACK» inesperados (desconectando)"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3353
+#: src/transport/gnunet-service-transport_neighbours.c:3352
 #, fuzzy
 msgid "# ACK messages received"
 msgstr "# mensajes «REQUEST CONNECT» recibidos"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3389
+#: src/transport/gnunet-service-transport_neighbours.c:3388
 #, fuzzy
 msgid "# unexpected ACK messages"
 msgstr "# Mensajes «SESSION ACK» inesperados"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3477
+#: src/transport/gnunet-service-transport_neighbours.c:3476
 #, fuzzy
 msgid "# quota messages ignored (malformed)"
 msgstr "# mensajes de desconexión ignorados (formato antiguo)"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3484
+#: src/transport/gnunet-service-transport_neighbours.c:3483
 #, fuzzy
 msgid "# QUOTA messages received"
 msgstr "# Mensajes «GAP PUT» recibidos"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3524
+#: src/transport/gnunet-service-transport_neighbours.c:3523
 #, fuzzy
 msgid "# disconnect messages ignored (malformed)"
 msgstr "# mensajes de desconexión ignorados (formato antiguo)"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3531
+#: src/transport/gnunet-service-transport_neighbours.c:3530
 #, fuzzy
 msgid "# DISCONNECT messages received"
 msgstr "# mensajes «REQUEST CONNECT» recibidos"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3542
+#: src/transport/gnunet-service-transport_neighbours.c:3541
 msgid "# disconnect messages ignored (timestamp)"
 msgstr "# mensajes de desconexión ignorados (marca temporal)"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3676
+#: src/transport/gnunet-service-transport_neighbours.c:3675
 msgid "# disconnected from peer upon explicit request"
 msgstr "# desconexiones del par debido a una petición explícita"
 
@@ -7656,47 +7403,47 @@
 msgid "Did not load plugin `%s' due to missing functions\n"
 msgstr "Falló al cargar el plugin '%s' en %s:%d. Descargando plugin.\n"
 
-#: src/transport/gnunet-service-transport_validation.c:343
+#: src/transport/gnunet-service-transport_validation.c:388
 #, fuzzy
 msgid "# Addresses in validation map"
 msgstr "# revalidaciones de direcciones iniciadas"
 
-#: src/transport/gnunet-service-transport_validation.c:452
-#: src/transport/gnunet-service-transport_validation.c:638
-#: src/transport/gnunet-service-transport_validation.c:949
-#: src/transport/gnunet-service-transport_validation.c:1551
+#: src/transport/gnunet-service-transport_validation.c:491
+#: src/transport/gnunet-service-transport_validation.c:677
+#: src/transport/gnunet-service-transport_validation.c:988
+#: src/transport/gnunet-service-transport_validation.c:1590
 #, fuzzy
 msgid "# validations running"
 msgstr "Base de datos sqlite ejecutándose\n"
 
-#: src/transport/gnunet-service-transport_validation.c:493
+#: src/transport/gnunet-service-transport_validation.c:532
 #, fuzzy
 msgid "# address records discarded (timeout)"
 msgstr "# registros de direcciones descartados"
 
-#: src/transport/gnunet-service-transport_validation.c:541
+#: src/transport/gnunet-service-transport_validation.c:580
 #, fuzzy
 msgid "# address records discarded (blacklist)"
 msgstr "# registros de direcciones descartados"
 
-#: src/transport/gnunet-service-transport_validation.c:629
+#: src/transport/gnunet-service-transport_validation.c:668
 #, fuzzy
 msgid "# PINGs for address validation sent"
 msgstr "# revalidaciones de direcciones iniciadas"
 
-#: src/transport/gnunet-service-transport_validation.c:709
+#: src/transport/gnunet-service-transport_validation.c:748
 msgid "# validations delayed by global throttle"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:746
+#: src/transport/gnunet-service-transport_validation.c:785
 msgid "# address revalidations started"
 msgstr "# revalidaciones de direcciones iniciadas"
 
-#: src/transport/gnunet-service-transport_validation.c:1075
+#: src/transport/gnunet-service-transport_validation.c:1114
 msgid "# PING message for different peer received"
 msgstr "# Mensajes PING recibidos para un par diferente"
 
-#: src/transport/gnunet-service-transport_validation.c:1126
+#: src/transport/gnunet-service-transport_validation.c:1165
 #, fuzzy, c-format
 msgid "Plugin `%s' not available, cannot confirm having this address\n"
 msgstr ""
@@ -7703,20 +7450,20 @@
 "No confirmando el PING con dirección «%s» ya que no puedo confirmar tener "
 "esa dirección.\n"
 
-#: src/transport/gnunet-service-transport_validation.c:1139
+#: src/transport/gnunet-service-transport_validation.c:1178
 msgid "# failed address checks during validation"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1142
+#: src/transport/gnunet-service-transport_validation.c:1181
 #, c-format
 msgid "Address `%s' is not one of my addresses, not confirming PING\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1150
+#: src/transport/gnunet-service-transport_validation.c:1189
 msgid "# successful address checks during validation"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1163
+#: src/transport/gnunet-service-transport_validation.c:1202
 #, fuzzy, c-format
 msgid ""
 "Not confirming PING from peer `%s' with address `%s' since I cannot confirm "
@@ -7725,49 +7472,48 @@
 "No confirmando el PING con dirección «%s» ya que no puedo confirmar tener "
 "esa dirección.\n"
 
-#: src/transport/gnunet-service-transport_validation.c:1218
+#: src/transport/gnunet-service-transport_validation.c:1257
 #, fuzzy, c-format
 msgid "Failed to create PONG signature for peer `%s'\n"
 msgstr "Se produjo un fallo al crear la página para «%s»\n"
 
-#: src/transport/gnunet-service-transport_validation.c:1269
+#: src/transport/gnunet-service-transport_validation.c:1308
 msgid "# PONGs unicast via reliable transport"
 msgstr "# unicast de PONG vía transporte confiable"
 
-#: src/transport/gnunet-service-transport_validation.c:1278
+#: src/transport/gnunet-service-transport_validation.c:1317
 msgid "# PONGs multicast to all available addresses"
 msgstr "# multicast de PONG a todas las direcciones disponibles"
 
-#: src/transport/gnunet-service-transport_validation.c:1441
+#: src/transport/gnunet-service-transport_validation.c:1480
 msgid "# PONGs dropped, no matching pending validation"
 msgstr "# PONG omitidos, no hay una validación pendiente coincidente"
 
-#: src/transport/gnunet-service-transport_validation.c:1459
+#: src/transport/gnunet-service-transport_validation.c:1498
 msgid "# PONGs dropped, signature expired"
 msgstr "# Mensajes PONG omitidos, firma expirada"
 
-#: src/transport/gnunet-service-transport_validation.c:1514
+#: src/transport/gnunet-service-transport_validation.c:1553
 #, fuzzy
 msgid "# validations succeeded"
 msgstr "# revalidaciones de direcciones iniciadas"
 
-#: src/transport/gnunet-transport.c:558
+#: src/transport/gnunet-transport.c:518
 #, 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:567
-#: src/transport/gnunet-transport-profiler.c:277
+#: src/transport/gnunet-transport.c:528
 #, 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:608
+#: src/transport/gnunet-transport.c:572
 #, c-format
 msgid "Failed to connect to `%s'\n"
 msgstr "Se produjo un fallo al conectar con «%s»\n"
 
-#: src/transport/gnunet-transport.c:621
+#: src/transport/gnunet-transport.c:585
 #, 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"
@@ -7774,77 +7520,57 @@
 
 # Miguel: La traducción no es literal, pero me parece más correcta
 # en castellano.
-#: src/transport/gnunet-transport.c:633
+#: src/transport/gnunet-transport.c:597
 msgid "Failed to list connections, timeout occured\n"
 msgstr "No se pudieron listar las conexiones, expiró el plazo\n"
 
-#: src/transport/gnunet-transport.c:658 src/transport/gnunet-transport.c:683
+#: src/transport/gnunet-transport.c:622 src/transport/gnunet-transport.c:647
 #, fuzzy, c-format
 msgid "Configuration for plugin `%s' did not work!\n"
 msgstr "El fichero de configuración debe especificar «%s» en la sección «%s»\n"
 
-#: src/transport/gnunet-transport.c:663
+#: src/transport/gnunet-transport.c:627
 #, fuzzy, c-format
 msgid "Configuration for plugin `%s' did work!\n"
 msgstr "El fichero de configuración debe especificar «%s» en la sección «%s»\n"
 
-#: src/transport/gnunet-transport.c:668
+#: src/transport/gnunet-transport.c:632
 #, fuzzy, c-format
 msgid "Internal NAT error while running test for plugin `%s'\n"
 msgstr "Error interno escaneando «%s».\n"
 
-#: src/transport/gnunet-transport.c:673
+#: src/transport/gnunet-transport.c:637
 #, fuzzy, c-format
 msgid "Failed to start NAT test for plugin `%s'\n"
 msgstr "Se produjo un fallo al iniciar el servidor HTTP\n"
 
-#: src/transport/gnunet-transport.c:678
+#: src/transport/gnunet-transport.c:642
 #, c-format
 msgid "Timeout while waiting for result of NAT test for plugin `%s'\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:803
-#, fuzzy, c-format
-msgid ""
-"Peer `%s' %s %s\n"
-"\t%s%s\n"
-"\t%s%s\n"
-"\t%s%s\n"
-msgstr "Par «%s»: %s %s\n"
-
-#: src/transport/gnunet-transport.c:838
-#, fuzzy, c-format
-msgid "Peer `%s' %s `%s' \n"
-msgstr "Par «%s»: %s %s\n"
-
-#: src/transport/gnunet-transport.c:927 src/transport/gnunet-transport.c:1673
-#, fuzzy
-msgid "Monitor disconnected from transport service. Reconnecting.\n"
-msgstr ""
-"El cliente se desconectó del servicio principal, tratando de reconectar.\n"
-
-#: src/transport/gnunet-transport.c:982
+#: src/transport/gnunet-transport.c:735
 msgid "No transport plugins configured, peer will never communicate\n"
 msgstr ""
 "No hay módulos de transporte configurados, el par nunca se comunicará\n"
 
-#: src/transport/gnunet-transport.c:996
+#: src/transport/gnunet-transport.c:749
 #, c-format
 msgid "No port configured for plugin `%s', cannot test it\n"
 msgstr ""
 "Ningún puerto fue configurado para el módulo «%s», no se puede probar\n"
 
-#: src/transport/gnunet-transport.c:1021
+#: src/transport/gnunet-transport.c:774
 #, fuzzy
 msgid "Failed to start resolver!\n"
 msgstr "Se produjo un fallo al arrancar %s\n"
 
-#: src/transport/gnunet-transport.c:1067
-#, c-format
-msgid "Transmitting %u bytes to %s\n"
+#: src/transport/gnunet-transport.c:810
+#, fuzzy, c-format
+msgid "Transmitting %u bytes\n"
 msgstr "Transmitiendo %u bytes a %s\n"
 
-#: src/transport/gnunet-transport.c:1096
+#: src/transport/gnunet-transport.c:844
 #, c-format
 msgid ""
 "Successfully connected to `%s', starting to send benchmark data in %u Kb "
@@ -7853,42 +7579,46 @@
 "Conectado satisfactoriamente a «%s», empezando a mandar datos de prueba en "
 "bloques de %u Kb\n"
 
-#: src/transport/gnunet-transport.c:1133
-#: src/transport/gnunet-transport-profiler.c:432
+#: src/transport/gnunet-transport.c:875
 #, c-format
 msgid "Disconnected from peer `%s' while benchmarking\n"
 msgstr "Desconectado del par «%s» mientras probaba\n"
 
-#: src/transport/gnunet-transport.c:1158 src/transport/gnunet-transport.c:1184
+#: src/transport/gnunet-transport.c:899 src/transport/gnunet-transport.c:928
 #, 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:1160
+#: src/transport/gnunet-transport.c:901
 msgid "Connected to"
 msgstr "Conectado a"
 
-#: src/transport/gnunet-transport.c:1186
+#: src/transport/gnunet-transport.c:930
 msgid "Disconnected from"
 msgstr "Desconectado de"
 
-#: src/transport/gnunet-transport.c:1210
-#: src/transport/gnunet-transport-profiler.c:457
-#, c-format
-msgid "Received %u bytes from %s\n"
+#: src/transport/gnunet-transport.c:965
+#, fuzzy, c-format
+msgid "Received %u bytes\n"
 msgstr "Recibidos %u bytes de %s\n"
 
-#: src/transport/gnunet-transport.c:1250
+#: src/transport/gnunet-transport.c:1002
 #, c-format
 msgid "Peer `%s': %s %s in state `%s' until %s\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1262
+#: src/transport/gnunet-transport.c:1014
 #, c-format
 msgid "Peer `%s': %s %s\n"
 msgstr "Par «%s»: %s %s\n"
 
-#: src/transport/gnunet-transport.c:1792
+#: src/transport/gnunet-transport.c:1426
+#, 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:1548
 #, fuzzy, c-format
 msgid ""
 "Multiple operations given. Please choose only one operation: %s, %s, %s, %s, "
@@ -7897,7 +7627,7 @@
 "Múltiples operaciones introducidas. Por favor, seleccione únicamente una "
 "operación: %s, %s, %s, %s, %s, %s\n"
 
-#: src/transport/gnunet-transport.c:1800
+#: src/transport/gnunet-transport.c:1561
 #, fuzzy, c-format
 msgid ""
 "No operation given. Please choose one operation: %s, %s, %s, %s, %s, %s, %s\n"
@@ -7905,56 +7635,43 @@
 "Ninguna operación introducida. Por favor, seleccione alguna operación: %s, "
 "%s, %s, %s, %s, %s\n"
 
-#: src/transport/gnunet-transport.c:1823
+#: src/transport/gnunet-transport.c:1589
 #, 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:1829
+#: src/transport/gnunet-transport.c:1595
 msgid "Blacklisting request in place, stop with CTRL-C\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1848 src/transport/gnunet-transport.c:1867
-#: src/transport/gnunet-transport.c:1925
-#: src/transport/gnunet-transport-profiler.c:553
+#: src/transport/gnunet-transport.c:1618 src/transport/gnunet-transport.c:1648
+#: src/transport/gnunet-transport.c:1701
 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:1872
+#: src/transport/gnunet-transport.c:1655
 msgid "Starting to receive benchmark data\n"
 msgstr "Empezando a recibir datos de prueba\n"
 
-#: src/transport/gnunet-transport.c:1972
+#: src/transport/gnunet-transport.c:1725
 #, 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:1975
+#: src/transport/gnunet-transport.c:1728
 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:1978
+#: src/transport/gnunet-transport.c:1731
 #, fuzzy
 msgid "disconnect from a peer"
 msgstr "conectar a un par"
 
-#: src/transport/gnunet-transport.c:1981
-#, fuzzy
-msgid "print information for all pending validations "
-msgstr "Imprime información de los pares de GNUnet."
-
-# Miguel: ¿Quizá continuamente fuese mejor?
-#: src/transport/gnunet-transport.c:1984
-#, fuzzy
-msgid "print information for all pending validations continuously"
-msgstr ""
-"provee información sobre todas las conexiones actuales (de forma continua)"
-
-#: src/transport/gnunet-transport.c:1987
+#: src/transport/gnunet-transport.c:1734
 msgid "provide information about all current connections (once)"
 msgstr "provee información sobre todas las conexiones actuales (una vez)"
 
-#: src/transport/gnunet-transport.c:1993
+#: src/transport/gnunet-transport.c:1740
 msgid ""
 "provide information about all connects and disconnect events (continuously)"
 msgstr ""
@@ -7961,145 +7678,71 @@
 "provee información sobre todas los eventos de conexión y desconexión "
 "(continuamente)"
 
-#: src/transport/gnunet-transport.c:1996
+#: src/transport/gnunet-transport.c:1743
 msgid "do not resolve hostnames"
 msgstr "no resolver nombres de máquinas"
 
-#: src/transport/gnunet-transport.c:1999
-#: src/transport/gnunet-transport-profiler.c:618
+#: src/transport/gnunet-transport.c:1746
+#: src/transport/gnunet-transport-profiler.c:631
 msgid "peer identity"
 msgstr "identidad del par"
 
-#: src/transport/gnunet-transport.c:2002
+#: src/transport/gnunet-transport.c:1749
 #, fuzzy
 msgid "monitor plugin sessions"
 msgstr "# sesiones wlan pendientes"
 
-#: src/transport/gnunet-transport.c:2005
+#: src/transport/gnunet-transport.c:1752
 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:2008
+#: src/transport/gnunet-transport.c:1755
 msgid "test transport configuration (involves external server)"
 msgstr "probar configuración de transporte (requiere un servidor externo)"
 
-#: src/transport/gnunet-transport.c:2019
-#: src/transport/gnunet-transport-profiler.c:629
+#: src/transport/gnunet-transport.c:1766
+#: src/transport/gnunet-transport-profiler.c:642
 msgid "Direct access to transport service."
 msgstr "Acceso directo al servicio de transporte."
 
-#: src/transport/gnunet-transport-profiler.c:221
+#: src/transport/gnunet-transport-profiler.c:219
 #, c-format
 msgid "%llu B in %llu ms == %.2f KB/s!\n"
 msgstr ""
 
-#: src/transport/gnunet-transport-profiler.c:257
-#, c-format
-msgid "%u;%u;%llu;%llu;%.2f;%.2f"
-msgstr ""
-
-#: src/transport/gnunet-transport-profiler.c:266
-#, c-format
-msgid ";%llu;%.2f"
-msgstr ""
-
-#: src/transport/gnunet-transport-profiler.c:283
-msgid "\n"
-msgstr ""
-
-#: src/transport/gnunet-transport-profiler.c:336
-msgid "."
-msgstr ""
-
-#: src/transport/gnunet-transport-profiler.c:356
-#, fuzzy, c-format
-msgid ""
-"\n"
-"Starting benchmark to `%s', starting to send %u messages in %u byte blocks\n"
-msgstr ""
-"Conectado satisfactoriamente a «%s», empezando a mandar datos de prueba en "
-"bloques de %u Kb\n"
-
-#: src/transport/gnunet-transport-profiler.c:404
-#, fuzzy, c-format
-msgid "Connected to different peer `%s'\n"
-msgstr "Conectado a %s.\n"
-
-#: src/transport/gnunet-transport-profiler.c:411
-#, c-format
-msgid "Successfully connected to `%s'\n"
-msgstr "Conectado satisfactoriamente a «%s»\n"
-
-#: src/transport/gnunet-transport-profiler.c:473
-#, fuzzy, c-format
-msgid "Denying connection to `%s'\n"
-msgstr "Aceptando conexión desde «%s»: %p\n"
-
-#: src/transport/gnunet-transport-profiler.c:503
-#, fuzzy
-msgid "Message size too big!\n"
-msgstr "tamaño del mensaje"
-
-#: src/transport/gnunet-transport-profiler.c:509
-#, fuzzy
-msgid "No peer identity given\n"
-msgstr "No se han proporcionado opciones\n"
-
-#: src/transport/gnunet-transport-profiler.c:524
-#, fuzzy, c-format
-msgid "Trying to send %u messages with size %u to peer `%s'\n"
-msgstr "Usando %u mensajes de un tamaño de %u durante %u veces.\n"
-
-#: src/transport/gnunet-transport-profiler.c:530
-#, fuzzy, c-format
-msgid "Trying to receive messages from peer `%s'\n"
-msgstr ""
-"Se produjo un fallo al procesar el mensaje interno del programa auxiliar "
-"«%s»\n"
-
-#: src/transport/gnunet-transport-profiler.c:535
-#, fuzzy
-msgid "No operation given\n"
-msgstr "No se han proporcionado opciones\n"
-
-#: src/transport/gnunet-transport-profiler.c:542
-#, fuzzy
-msgid "Failed to connect to ATS service\n"
-msgstr "¡Se produjo un fallo al conectar con el servicio DHT!\n"
-
-#: src/transport/gnunet-transport-profiler.c:603
+#: src/transport/gnunet-transport-profiler.c:616
 msgid "send data to peer"
 msgstr ""
 
-#: src/transport/gnunet-transport-profiler.c:606
+#: src/transport/gnunet-transport-profiler.c:619
 #, fuzzy
 msgid "receive data from peer"
 msgstr "# respuestas recibidas de otros pares"
 
-#: src/transport/gnunet-transport-profiler.c:609
+#: src/transport/gnunet-transport-profiler.c:622
 #, fuzzy
 msgid "iterations"
 msgstr "Otras configuraciones"
 
-#: src/transport/gnunet-transport-profiler.c:612
+#: src/transport/gnunet-transport-profiler.c:625
 #, fuzzy
 msgid "number of messages to send"
 msgstr "número de mensajes a usar por iteración"
 
-#: src/transport/gnunet-transport-profiler.c:615
+#: src/transport/gnunet-transport-profiler.c:628
 #, fuzzy
 msgid "message size to use"
 msgstr "tamaño del mensaje"
 
-#: src/transport/plugin_transport_http_client.c:1473
-#: src/transport/plugin_transport_http_server.c:2237
-#: src/transport/plugin_transport_http_server.c:3427
-#: src/transport/plugin_transport_tcp.c:2985
-#: src/transport/plugin_transport_tcp.c:2992
+#: src/transport/plugin_transport_http_client.c:1477
+#: src/transport/plugin_transport_http_server.c:2248
+#: src/transport/plugin_transport_http_server.c:3457
+#: src/transport/plugin_transport_tcp.c:3365
+#: src/transport/plugin_transport_tcp.c:3372
 msgid "TCP_STEALTH not supported on this platform.\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_client.c:2114
+#: src/transport/plugin_transport_http_client.c:2118
 #, c-format
 msgid "Could not initialize curl multi handle, failed to start %s plugin!\n"
 msgstr ""
@@ -8106,24 +7749,24 @@
 "¡No se pudo inicializar el multi-manejador de curl, no se pudo iniciar el "
 "módulo %s!\n"
 
-#: src/transport/plugin_transport_http_client.c:2163
-#: src/transport/plugin_transport_http_server.c:3142
+#: src/transport/plugin_transport_http_client.c:2167
+#: src/transport/plugin_transport_http_server.c:3172
 #, c-format
 msgid "Shutting down plugin `%s'\n"
 msgstr "Finalizando el módulo «%s»\n"
 
-#: src/transport/plugin_transport_http_client.c:2180
-#: src/transport/plugin_transport_http_server.c:3212
+#: src/transport/plugin_transport_http_client.c:2184
+#: src/transport/plugin_transport_http_server.c:3242
 #, 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:2214
+#: src/transport/plugin_transport_http_client.c:2218
 #, 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:1721
+#: src/transport/plugin_transport_http_server.c:1729
 #, c-format
 msgid ""
 "Access from connection %p (%u of %u) for `%s' `%s' url `%s' with upload data "
@@ -8132,12 +7775,12 @@
 "Acceso desde la conexión %p (%u de %u) para «%s» «%s» URL «%s» con tamaño de "
 "los datos de subida %u\n"
 
-#: src/transport/plugin_transport_http_server.c:1955
+#: src/transport/plugin_transport_http_server.c:1966
 #, 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:1963
+#: src/transport/plugin_transport_http_server.c:1974
 #, c-format
 msgid ""
 "Server reached maximum number connections (%u), rejecting new connection\n"
@@ -8145,7 +7788,7 @@
 "El servidor ha alcanzado el número máximo de conexiones (%u), rechazando "
 "nueva conexión\n"
 
-#: src/transport/plugin_transport_http_server.c:2113
+#: src/transport/plugin_transport_http_server.c:2124
 msgid ""
 "Could not create a new TLS certificate, program `gnunet-transport-"
 "certificate-creation' could not be started!\n"
@@ -8153,7 +7796,7 @@
 "¡No se pudo crear un certificado TLS nuevo, el programa «gnunet-transport-"
 "certificate-creation» no pudo ser iniciado!\n"
 
-#: src/transport/plugin_transport_http_server.c:2136
+#: src/transport/plugin_transport_http_server.c:2147
 #, fuzzy, c-format
 msgid "No usable TLS certificate found and creating one at `%s/%s' failed!\n"
 msgstr ""
@@ -8160,58 +7803,48 @@
 "¡No se encontró ningún certificado TLS útil y se produjo un fallo al crear "
 "uno!\n"
 
-#: src/transport/plugin_transport_http_server.c:2263
+#: src/transport/plugin_transport_http_server.c:2274
 msgid "Could not load or create server certificate! Loading plugin failed!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:2572
+#: src/transport/plugin_transport_http_server.c:2583
 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:2606 src/util/service.c:704
+#: src/transport/plugin_transport_http_server.c:2748
 #, c-format
-msgid "Failed to resolve `%s': %s\n"
-msgstr "Se produjo un fallo al resolver «%s»: %s\n"
-
-#: src/transport/plugin_transport_http_server.c:2624 src/util/service.c:723
-#, c-format
-msgid "Failed to find %saddress for `%s'.\n"
-msgstr "No se encontró la dirección %s para «%s».\n"
-
-#: src/transport/plugin_transport_http_server.c:2737
-#, c-format
 msgid "Found %u addresses to report to NAT service\n"
 msgstr "Encontradas %u direcciones para comunicar al servicio NAT\n"
 
-#: src/transport/plugin_transport_http_server.c:2815
+#: src/transport/plugin_transport_http_server.c:2832
 #: src/transport/plugin_transport_udp.c:3600
 msgid "Disabling IPv6 since it is not supported on this system!\n"
 msgstr "¡Deshabilitando IPv6 ya que no está soportado en este sistema!\n"
 
-#: src/transport/plugin_transport_http_server.c:2918
+#: src/transport/plugin_transport_http_server.c:2938
 #, c-format
 msgid "IPv4 support is %s\n"
 msgstr "El soporte IPv4 es %s\n"
 
-#: src/transport/plugin_transport_http_server.c:2933
+#: src/transport/plugin_transport_http_server.c:2953
 #, c-format
 msgid "IPv6 support is %s\n"
 msgstr "El soporte IPv6 es %s\n"
 
-#: src/transport/plugin_transport_http_server.c:2939
+#: src/transport/plugin_transport_http_server.c:2959
 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:2950
+#: src/transport/plugin_transport_http_server.c:2970
 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:2956
+#: src/transport/plugin_transport_http_server.c:2976
 #, c-format
 msgid "Using port %u\n"
 msgstr "Usando puerto %u\n"
 
-#: src/transport/plugin_transport_http_server.c:2970
+#: src/transport/plugin_transport_http_server.c:2995
 #, c-format
 msgid "Specific IPv4 address `%s' in configuration file is invalid!\n"
 msgstr ""
@@ -8218,39 +7851,29 @@
 "¡La dirección IPv4 «%s» especificada en el fichero de configuración no es "
 "válida!\n"
 
-#: src/transport/plugin_transport_http_server.c:2980
+#: src/transport/plugin_transport_http_server.c:3030
 #, c-format
-msgid "Binding to IPv4 address %s\n"
-msgstr "Asociando a la dirección IPv4 %s\n"
-
-#: src/transport/plugin_transport_http_server.c:3002
-#, 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:3012
+#: src/transport/plugin_transport_http_server.c:3105
 #, c-format
-msgid "Binding to IPv6 address %s\n"
-msgstr "Asociando a la dirección IPv6 %s\n"
-
-#: src/transport/plugin_transport_http_server.c:3075
-#, c-format
 msgid "Using external hostname `%s'\n"
 msgstr "Usando nombre de máquina externo «%s»\n"
 
-#: src/transport/plugin_transport_http_server.c:3096
+#: src/transport/plugin_transport_http_server.c:3126
 #, 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:3113
+#: src/transport/plugin_transport_http_server.c:3143
 #, 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:3439
+#: src/transport/plugin_transport_http_server.c:3469
 #, fuzzy
 msgid "Unable to compile URL regex\n"
 msgstr "¡Imposible obtener «HELLO» del par!\n"
@@ -8300,105 +7923,97 @@
 msgid "# bytes dropped by SMTP (outgoing)"
 msgstr "# bytes omitidos por SMTP (salientes)"
 
-#: src/transport/plugin_transport_tcp.c:672
-#: src/transport/plugin_transport_tcp.c:1983
+#: src/transport/plugin_transport_tcp.c:1051
+#: src/transport/plugin_transport_tcp.c:2362
 #, c-format
 msgid "Unexpected address length: %u bytes\n"
 msgstr "Longitud de dirección inesperada: %u bytes\n"
 
-#: src/transport/plugin_transport_tcp.c:855
-#: src/transport/plugin_transport_tcp.c:1079
-#: src/transport/plugin_transport_tcp.c:2253
-#: src/transport/plugin_transport_tcp.c:3106
+#: src/transport/plugin_transport_tcp.c:1234
+#: src/transport/plugin_transport_tcp.c:1458
+#: src/transport/plugin_transport_tcp.c:2633
+#: src/transport/plugin_transport_tcp.c:3490
 msgid "# TCP sessions active"
 msgstr "# Sesiones TCP activas"
 
-#: src/transport/plugin_transport_tcp.c:897
-#: src/transport/plugin_transport_tcp.c:1061
-#: src/transport/plugin_transport_tcp.c:1185
-#: src/transport/plugin_transport_tcp.c:1258
-#: src/transport/plugin_transport_tcp.c:1358
-#: src/transport/plugin_transport_tcp.c:1383
+#: src/transport/plugin_transport_tcp.c:1276
+#: src/transport/plugin_transport_tcp.c:1440
+#: src/transport/plugin_transport_tcp.c:1564
+#: src/transport/plugin_transport_tcp.c:1637
+#: src/transport/plugin_transport_tcp.c:1737
+#: src/transport/plugin_transport_tcp.c:1762
 msgid "# bytes currently in TCP buffers"
 msgstr "# bytes actualmente en los buffer TCP"
 
-#: src/transport/plugin_transport_tcp.c:900
+#: src/transport/plugin_transport_tcp.c:1279
 msgid "# bytes discarded by TCP (disconnect)"
 msgstr "# bytes descartados por TCP (desconectado)"
 
-#: src/transport/plugin_transport_tcp.c:1188
+#: src/transport/plugin_transport_tcp.c:1567
 msgid "# bytes discarded by TCP (timeout)"
 msgstr "# bytes omitidos por TCP (expirados)"
 
-#: src/transport/plugin_transport_tcp.c:1262
+#: src/transport/plugin_transport_tcp.c:1641
 msgid "# bytes transmitted via TCP"
 msgstr "# bytes recibidos vía TCP"
 
-#: src/transport/plugin_transport_tcp.c:1653
+#: src/transport/plugin_transport_tcp.c:2032
 msgid "# requests to create session with invalid address"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:1821
+#: src/transport/plugin_transport_tcp.c:2200
 msgid "# transport-service disconnect requests for TCP"
 msgstr "# peticiones de desconexión del servicio de transporte por TCP"
 
-#: src/transport/plugin_transport_tcp.c:2312
+#: src/transport/plugin_transport_tcp.c:2692
 msgid "# TCP WELCOME messages received"
 msgstr "# Mensajes «WELCOME» TCP recibidos"
 
-#: src/transport/plugin_transport_tcp.c:2503
+#: src/transport/plugin_transport_tcp.c:2883
 msgid "# bytes received via TCP"
 msgstr "# bytes recibidos vía TCP"
 
-#: src/transport/plugin_transport_tcp.c:2554
-#: src/transport/plugin_transport_tcp.c:2612
+#: src/transport/plugin_transport_tcp.c:2934
+#: src/transport/plugin_transport_tcp.c:2992
 #, fuzzy
 msgid "# TCP server connections active"
 msgstr "# conexiones «stream» activas"
 
-#: src/transport/plugin_transport_tcp.c:2558
+#: src/transport/plugin_transport_tcp.c:2938
 #, fuzzy
 msgid "# TCP server connect events"
 msgstr "# Pares conectados"
 
-#: src/transport/plugin_transport_tcp.c:2564
+#: src/transport/plugin_transport_tcp.c:2944
 msgid "TCP connection limit reached, suspending server\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2566
+#: src/transport/plugin_transport_tcp.c:2946
 msgid "# TCP service suspended"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2606
+#: src/transport/plugin_transport_tcp.c:2986
 msgid "# TCP service resumed"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2616
+#: src/transport/plugin_transport_tcp.c:2996
 msgid "# network-level TCP disconnect events"
 msgstr "# eventos de desconexión TCP a nivel de red"
 
-#: src/transport/plugin_transport_tcp.c:2919 src/util/service.c:584
-#: src/util/service.c:590
-#, c-format
-msgid "Require valid port number for service `%s' in configuration!\n"
-msgstr ""
-"¡Se requiere un número de puerto válido para el servicio «%s» en la "
-"configuración!\n"
-
-#: src/transport/plugin_transport_tcp.c:2935
+#: src/transport/plugin_transport_tcp.c:3315
 msgid "Failed to start service.\n"
 msgstr "Se produjo un fallo al iniciar el servicio.\n"
 
-#: src/transport/plugin_transport_tcp.c:3094
+#: src/transport/plugin_transport_tcp.c:3478
 #, 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:3098
+#: src/transport/plugin_transport_tcp.c:3482
 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:3102
+#: src/transport/plugin_transport_tcp.c:3486
 #, 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"
@@ -8517,7 +8132,7 @@
 
 #: src/transport/plugin_transport_wlan.c:1167
 #: src/transport/plugin_transport_wlan.c:1258
-#: src/transport/plugin_transport_wlan.c:2279
+#: src/transport/plugin_transport_wlan.c:2280
 #, fuzzy
 msgid "# MAC endpoints allocated"
 msgstr "# MAC de destino WLAN alojadas"
@@ -8547,7 +8162,7 @@
 msgid "# DATA messages processed"
 msgstr "# mensajes «DATA» WLAN procesados"
 
-#: src/transport/plugin_transport_wlan.c:2254
+#: src/transport/plugin_transport_wlan.c:2255
 #, c-format
 msgid "Helper binary `%s' not SUID, cannot run WLAN transport\n"
 msgstr ""
@@ -8554,132 +8169,97 @@
 "El ejecutable auxiliar «%s» no tiene activado el bit SUID, no se puede "
 "ejecutar el transporte WLAN\n"
 
-#: src/transport/plugin_transport_wlan.c:2276
+#: src/transport/plugin_transport_wlan.c:2277
 #, fuzzy
 msgid "# sessions allocated"
 msgstr "# sesiones WLAN alojadas"
 
-#: src/transport/transport_api.c:816
-#, c-format
-msgid "Received unexpected message of type %u in %s:%u\n"
-msgstr "Recibido mensaje inesperado del tipo %u en %s:%u\n"
-
-#: src/transport/transport-testing.c:676
-msgid "Failed to initialize testing library!\n"
-msgstr "¡Se produjo un fallo al inicializar la biblioteca de pruebas!\n"
-
 #: src/tun/regex.c:134
 #, c-format
 msgid "Bad mask: %d\n"
 msgstr ""
 
-#: src/util/bio.c:170 src/util/bio.c:178
+#: src/util/bio.c:177 src/util/bio.c:185
 #, c-format
 msgid "Error reading `%s': %s"
 msgstr "Error leyendo «%s»: %s"
 
-#: src/util/bio.c:180
+#: src/util/bio.c:187
 msgid "End of file"
 msgstr "Fin del fichero"
 
-#: src/util/bio.c:237
+#: src/util/bio.c:244
 #, c-format
 msgid "Error reading length of string `%s'"
 msgstr "Se produjo un error leyendo la cadena «%s»"
 
-#: src/util/bio.c:247
+#: src/util/bio.c:254
 #, c-format
 msgid "String `%s' longer than allowed (%u > %u)"
 msgstr "La cadena «%s» es mayor de lo permitido (%u > %u)"
 
-#: src/util/bio.c:293
+#: src/util/bio.c:300
 #, c-format
 msgid "Serialized metadata `%s' larger than allowed (%u>%u)"
 msgstr "Los metadatos serializados «%s» son mayores de lo permitido (%u>%u)"
 
-#: src/util/bio.c:307
+#: src/util/bio.c:314
 #, c-format
 msgid "Metadata `%s' failed to deserialize"
 msgstr "Se produjo un fallo al deserializar los metadatos «%s»"
 
-#: src/util/client.c:264 src/util/client.c:892 src/util/service.c:621
+#: src/util/client_new.c:863
 #, c-format
-msgid "UNIXPATH `%s' too long, maximum length is %llu\n"
-msgstr ""
-"La ruta tipo UNIX «%s» es demasiado larga, la longitud máxima es %llu\n"
-
-#: src/util/client.c:268 src/util/client.c:897 src/util/service.c:625
-#, c-format
-msgid "Using `%s' instead\n"
-msgstr "Usando «%s» en su defecto\n"
-
-#: src/util/client.c:367
-#, c-format
-msgid ""
-"Could not determine valid hostname and port for service `%s' from "
-"configuration.\n"
-msgstr ""
-"No se pudo determinar un nombre de máquina y un puerto válidos para el "
-"servicio «%s» a partir de la configuración.\n"
-
-#: src/util/client.c:375
-#, 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"
 
-#: src/util/client.c:1042
-#, fuzzy, c-format
-msgid "Could not connect to service `%s', configuration broken.\n"
-msgstr "No se pudo conectar con el servicio «%s», no debe estar corriendo.\n"
-
-#: src/util/client.c:1054
-#, c-format
-msgid "Failure to transmit request to service `%s'\n"
-msgstr "Se produjo un fallo al transmitir la petición al servicio «%s»\n"
-
-#: src/util/common_logging.c:255 src/util/common_logging.c:1062
+#: src/util/common_logging.c:256 src/util/common_logging.c:1129
 msgid "DEBUG"
 msgstr "DEPURACIÓN"
 
-#: src/util/common_logging.c:257 src/util/common_logging.c:1060
+#: src/util/common_logging.c:258 src/util/common_logging.c:1127
 msgid "INFO"
 msgstr "INFORMACIÓN"
 
-#: src/util/common_logging.c:259 src/util/common_logging.c:1058
+#: src/util/common_logging.c:260 src/util/common_logging.c:1125
+msgid "MESSAGE"
+msgstr "MENSAJE"
+
+#: src/util/common_logging.c:262 src/util/common_logging.c:1123
 msgid "WARNING"
 msgstr "PELIGRO"
 
-#: src/util/common_logging.c:261 src/util/common_logging.c:1056
+#: src/util/common_logging.c:264 src/util/common_logging.c:1121
 msgid "ERROR"
 msgstr "ERROR"
 
-#: src/util/common_logging.c:263 src/util/common_logging.c:1064
+#: src/util/common_logging.c:266 src/util/common_logging.c:1131
 msgid "NONE"
 msgstr "NINGUNO"
 
-#: src/util/common_logging.c:840
+#: src/util/common_logging.c:879
 #, c-format
 msgid "Message `%.*s' repeated %u times in the last %s\n"
 msgstr "Mensaje `%.*s» repetido %u veces en el último %s\n"
 
-#: src/util/common_logging.c:1065
+#: src/util/common_logging.c:1132
 msgid "INVALID"
 msgstr "NO VÁLIDO"
 
-#: src/util/common_logging.c:1181
+#: src/util/common_logging.c:1248
 msgid "unknown address"
 msgstr "dirección desconocida"
 
-#: src/util/common_logging.c:1223
+#: src/util/common_logging.c:1290
 msgid "invalid address"
 msgstr "dirección no válida"
 
-#: src/util/common_logging.c:1241
+#: src/util/common_logging.c:1308
 #, c-format
 msgid "Configuration fails to specify option `%s' in section `%s'!\n"
 msgstr "¡La configuración no especifica la opción «%s» en la sección «%s»!\n"
 
-#: src/util/common_logging.c:1262
+#: src/util/common_logging.c:1329
 #, c-format
 msgid ""
 "Configuration specifies invalid value for option `%s' in section `%s': %s\n"
@@ -8687,12 +8267,17 @@
 "La configuración especifica un valor no válido en la opción «%s» de la "
 "sección «%s»: %s\n"
 
-#: src/util/configuration.c:291
+#: src/util/configuration.c:286
 #, c-format
 msgid "Syntax error while deserializing in line %u\n"
 msgstr "Error de sintaxis en la línea %u mientras se deserializaba\n"
 
-#: src/util/configuration.c:1028
+#: src/util/configuration.c:344
+#, fuzzy, c-format
+msgid "Error while reading file `%s'\n"
+msgstr "Error decodificando clave %u\n"
+
+#: src/util/configuration.c:1017
 #, c-format
 msgid ""
 "Configuration value '%s' for '%s' in section '%s' is not in set of legal "
@@ -8701,17 +8286,17 @@
 "El valor de configuración «%s» para «%s» de la sección «%s» no está dentro "
 "de las opciones legales\n"
 
-#: src/util/configuration.c:1147
+#: src/util/configuration.c:1136
 #, c-format
 msgid "Recursive expansion suspected, aborting $-expansion for term `%s'\n"
 msgstr ""
 
-#: src/util/configuration.c:1179
+#: src/util/configuration.c:1169
 #, fuzzy, c-format
 msgid "Missing closing `%s' in option `%s'\n"
 msgstr "Falta la opción «%s» para la operación «%s»\n"
 
-#: src/util/configuration.c:1253
+#: src/util/configuration.c:1237
 #, c-format
 msgid ""
 "Failed to expand `%s' in `%s' as it is neither found in [PATHS] nor defined "
@@ -8797,17 +8382,22 @@
 msgid "libgcrypt has not the expected version (version %s is required).\n"
 msgstr "libgcrypt no tiene la versión esperada (se necesita la versión %s).\n"
 
-#: src/util/crypto_rsa.c:1146
+#: src/util/crypto_rsa.c:835
+#, fuzzy, c-format
+msgid "RSA signing failed at %s:%d: %s\n"
+msgstr "El firmado ECC falló en %s:%d: %s\n"
+
+#: src/util/crypto_rsa.c:1166
 #, c-format
 msgid "RSA signature verification failed at %s:%d: %s\n"
 msgstr "La verificación de la firma RSA fallo en %s:%d: %s\n"
 
-#: src/util/disk.c:1227
+#: src/util/disk.c:1245
 #, c-format
 msgid "Expected `%s' to be a directory!\n"
 msgstr "¡Se esperaba que «%s» fuera un directorio!\n"
 
-#: src/util/disk.c:1450 src/util/service.c:1322
+#: src/util/disk.c:1486 src/util/service.c:1322 src/util/service_new.c:1371
 #, c-format
 msgid "Cannot obtain information about user `%s': %s\n"
 msgstr "No se pudo obtener información acerca del usuario «%s»: %s\n"
@@ -9055,13 +8645,13 @@
 msgid "Manipulate GNUnet proof of work files"
 msgstr "Manipular los ficheros de clave privada ECC de GNUnet"
 
-#: src/util/gnunet-service-resolver.c:327
+#: src/util/gnunet-service-resolver.c:371
 #, c-format
 msgid "Could not resolve `%s' (%s): %s\n"
 msgstr "No se pudo resolver «%s» (%s): %s\n"
 
-#: src/util/gnunet-service-resolver.c:401
-#: src/util/gnunet-service-resolver.c:442
+#: src/util/gnunet-service-resolver.c:460
+#: src/util/gnunet-service-resolver.c:512
 #, c-format
 msgid "Could not find IP of host `%s': %s\n"
 msgstr "No se encontró la IP del host «%s»: %s\n"
@@ -9112,7 +8702,7 @@
 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:1731 src/util/network.c:1907
+#: src/util/network.c:1737 src/util/network.c:1913
 #, c-format
 msgid ""
 "Fatal internal logic error, process hangs in `%s' (abort with CTRL-C)!\n"
@@ -9163,17 +8753,17 @@
 msgid "Could not determine plugin installation path.\n"
 msgstr "No se pudo determinar la ruta de instalación de los módulos.\n"
 
-#: src/util/program.c:244 src/util/service.c:1456
+#: src/util/program.c:244 src/util/service.c:1456 src/util/service_new.c:1801
 #, 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/program.c:256 src/util/service.c:1471 src/util/service_new.c:1818
 #, 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/program.c:261 src/util/service.c:1466 src/util/service_new.c:1812
 #, fuzzy
 msgid "Malformed configuration, exit ...\n"
 msgstr "Se produjo un fallo al borrar el fichero de configuración %s\n"
@@ -9193,42 +8783,42 @@
 "¡Se debe especificar «%s» o una dirección numérica IP para «%s» de «%s» en "
 "la configuración!\n"
 
-#: src/util/resolver_api.c:357
+#: src/util/resolver_api.c:815
 #, c-format
+msgid "Timeout trying to resolve hostname `%s'.\n"
+msgstr "Expiración de plazo intentando resolver el nombre de máquina «%s».\n"
+
+#: src/util/resolver_api.c:827
+#, c-format
 msgid "Timeout trying to resolve IP address `%s'.\n"
 msgstr "Expiración de plazo intentando resolver la dirección IP «%s».\n"
 
-#: src/util/resolver_api.c:364
-#, c-format
-msgid "Timeout trying to resolve hostname `%s'.\n"
-msgstr "Expiración de plazo intentando resolver el nombre de máquina «%s».\n"
-
 # Miguel: He traducido "default" por "predeterminado", la locución
 # "por defecto" no tiene sentido en sitios como este y he tratado
 # de ser consistente.
-#: src/util/resolver_api.c:950
+#: src/util/resolver_api.c:1004
 #, fuzzy
 msgid "Resolver not configured correctly.\n"
 msgstr "¡El servicio predeterminado «%s» no está configurado correctamente!\n"
 
-#: src/util/resolver_api.c:1026 src/util/resolver_api.c:1047
-#: src/util/resolver_api.c:1061
+#: src/util/resolver_api.c:1086 src/util/resolver_api.c:1107
+#: src/util/resolver_api.c:1121
 #, fuzzy, c-format
 msgid "Could not resolve our FQDN: %s\n"
 msgstr ""
 "No se pudo resolver nuestro nombre de dominio cualificado (FQDN) : %s\n"
 
-#: src/util/server.c:478
+#: src/util/server.c:478 src/util/service_new.c:1103
 #, 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/server.c:488 src/util/service_new.c:1113
 #, 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/server.c:494 src/util/service_new.c:1119
 #, fuzzy, c-format
 msgid "`%s' failed for `%s': address already in use\n"
 msgstr "«%s» falló para «%.*s»: dirección en uso actualmente\n"
@@ -9242,7 +8832,7 @@
 "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.c:347 src/util/service_new.c:2335
 #, c-format
 msgid "Unknown address family %d\n"
 msgstr "Familia de direcciones %d desconocida\n"
@@ -9252,52 +8842,28 @@
 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.c:410 src/util/service_new.c:431
 #, 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.c:448 src/util/service_new.c:474
 #, 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:565
-#, c-format
-msgid ""
-"Disabling IPv6 support for service `%s', failed to create IPv6 socket: %s\n"
-msgstr ""
-"Deshabilitando el soporte para IPv6 para el servicio «%s», se produjo un "
-"fallo al crear un «socket» IPv6: %s\n"
-
-#: src/util/service.c:656
-#, c-format
-msgid ""
-"Disabling UNIX domain socket support for service `%s', failed to create UNIX "
-"domain socket: %s\n"
-msgstr ""
-"Deshabilitando el soporte de dominio de «sockets» UNIX para el servicio "
-"«%s», no se pudo crear un «socket» UNIX: %s\n"
-
-#: src/util/service.c:673
-#, c-format
-msgid "Have neither PORT nor UNIXPATH for service `%s', but one is required\n"
-msgstr ""
-"No hay ni puerto (PORT) ni ruta unix (UNIXPATH) para el servicio «%s», pero "
-"uno es necesario\n"
-
-#: src/util/service.c:912
+#: src/util/service.c:912 src/util/service_new.c:1034
 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.c:961 src/util/service.c:979 src/util/service_new.c:1186
 #, 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.c:1004 src/util/service_new.c:1218
 #, c-format
 msgid "Could not access pre-bound socket %u, will try to bind myself\n"
 msgstr ""
@@ -9314,32 +8880,46 @@
 msgid "Service `%s' runs at %s\n"
 msgstr "El servicio «%s» se ejecuta en %s\n"
 
-#: src/util/service.c:1260
+#: src/util/service.c:1260 src/util/service_new.c:1493
 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.c:1264 src/util/service_new.c:1497
 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.c:1268 src/util/service_new.c:1501
 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.c:1323 src/util/service_new.c:1373
 msgid "No such user"
 msgstr "No existe tal usuario"
 
-#: src/util/service.c:1336
+#: src/util/service.c:1336 src/util/service_new.c:1392
 #, 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.c:1406 src/util/service_new.c:1729
 msgid "do daemonize (detach from terminal)"
 msgstr "demonizar (desasociar del terminal)"
 
+#: src/util/service_new.c:1298
+msgid ""
+"Could not bind to any of the ports I was supposed to, refusing to run!\n"
+msgstr ""
+
+#: src/util/service_new.c:2085
+#, fuzzy, c-format
+msgid ""
+"Processing code for message of type %u did not call "
+"`GNUNET_SERVICE_client_continue' 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/signal.c:89
 #, c-format
 msgid "signal (%d, %p) returned %d.\n"
@@ -9359,239 +8939,234 @@
 msgid "b"
 msgstr "b"
 
-#: src/util/strings.c:437
+#: src/util/strings.c:441
 #, c-format
 msgid "Character sets requested were `%s'->`%s'\n"
 msgstr "Los conjuntos de caracteres pedidos fueron «%s»->«%s»\n"
 
-#: src/util/strings.c:565
+#: src/util/strings.c:568
 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:662
+#: src/util/strings.c:672
 msgid "µs"
 msgstr ""
 
-#: src/util/strings.c:666
+#: src/util/strings.c:676
 msgid "forever"
 msgstr "para siempre"
 
-#: src/util/strings.c:668
+#: src/util/strings.c:678
 msgid "0 ms"
 msgstr "0 ms"
 
-#: src/util/strings.c:674
+#: src/util/strings.c:684
 msgid "ms"
 msgstr "ms"
 
-#: src/util/strings.c:680
+#: src/util/strings.c:690
 msgid "s"
 msgstr "s"
 
-#: src/util/strings.c:686
+#: src/util/strings.c:696
 msgid "m"
 msgstr "m"
 
-#: src/util/strings.c:692
+#: src/util/strings.c:702
 msgid "h"
 msgstr "h"
 
-#: src/util/strings.c:699
+#: src/util/strings.c:709
 msgid "day"
 msgstr "día"
 
-#: src/util/strings.c:701
+#: src/util/strings.c:711
 msgid "days"
 msgstr "días"
 
-#: src/util/strings.c:730
+#: src/util/strings.c:740
 msgid "end of time"
 msgstr "fin del plazo"
 
-#: src/util/strings.c:1229
+#: src/util/strings.c:1239
 msgid "IPv6 address did not start with `['\n"
 msgstr "La dirección IPv6 no empezaba con «[»\n"
 
-#: src/util/strings.c:1237
+#: src/util/strings.c:1247
 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:1243
+#: src/util/strings.c:1253
 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:1250
+#: src/util/strings.c:1260
 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:1259
+#: src/util/strings.c:1269
 #, c-format
 msgid "Invalid IPv6 address `%s': %s\n"
 msgstr "Dirección IPv6 «%s» no válida: %s\n"
 
-#: src/util/strings.c:1465 src/util/strings.c:1481
+#: src/util/strings.c:1475 src/util/strings.c:1491
 msgid "Port not in range\n"
 msgstr ""
 
-#: src/util/strings.c:1490
+#: src/util/strings.c:1500
 #, fuzzy, c-format
 msgid "Malformed port policy `%s'\n"
 msgstr "Se produjo un fallo al iniciar el servicio «%s»\n"
 
-#: src/util/strings.c:1573 src/util/strings.c:1604 src/util/strings.c:1652
-#: src/util/strings.c:1673
+#: src/util/strings.c:1583 src/util/strings.c:1614 src/util/strings.c:1662
+#: src/util/strings.c:1683
 #, c-format
 msgid "Invalid format for IP: `%s'\n"
 msgstr "Formato no válido para la IP: «%s»\n"
 
-#: src/util/strings.c:1630
+#: src/util/strings.c:1640
 #, 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:1682
+#: src/util/strings.c:1692
 #, fuzzy, c-format
 msgid "Invalid format: `%s'\n"
 msgstr "Formato de tiempo no válido «%s»\n"
 
-#: src/util/strings.c:1734
+#: src/util/strings.c:1744
 #, 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:1784
+#: src/util/strings.c:1794
 #, c-format
 msgid "Wrong format `%s' for netmask\n"
 msgstr "Formato «%s» erroneo para máscara de red\n"
 
-#: src/util/strings.c:1815
+#: src/util/strings.c:1825
 #, c-format
 msgid "Wrong format `%s' for network\n"
 msgstr "Formato «%s» erroneo para red\n"
 
-#: src/vpn/gnunet-service-vpn.c:556 src/vpn/gnunet-service-vpn.c:1113
+#: src/vpn/gnunet-service-vpn.c:550 src/vpn/gnunet-service-vpn.c:1125
 #, fuzzy
 msgid "# Active channels"
 msgstr "# Túneles activos"
 
-#: src/vpn/gnunet-service-vpn.c:632
+#: src/vpn/gnunet-service-vpn.c:629
 #, fuzzy
 msgid "# Bytes given to cadet for transmission"
 msgstr "# Bytes dados para transmisión a mesh"
 
-#: src/vpn/gnunet-service-vpn.c:670
+#: src/vpn/gnunet-service-vpn.c:667
 #, fuzzy
 msgid "# Bytes dropped in cadet queue (overflow)"
 msgstr "# Bytes omitidos en la cola mesh (desbordamiento)"
 
-#: src/vpn/gnunet-service-vpn.c:781
+#: src/vpn/gnunet-service-vpn.c:783
 #, fuzzy
 msgid "# Cadet channels created"
 msgstr "# Túneles mesh creados"
 
-#: src/vpn/gnunet-service-vpn.c:809
-#, fuzzy
-msgid "Failed to setup cadet channel!\n"
-msgstr "¡Se produjo un fallo al configurar el túnel mesh!\n"
-
-#: src/vpn/gnunet-service-vpn.c:1008
+#: src/vpn/gnunet-service-vpn.c:1005
 #, c-format
 msgid "Protocol %u not supported, dropping\n"
 msgstr "Protocolo %u no soportado, omitiendo\n"
 
-#: src/vpn/gnunet-service-vpn.c:1133
+#: src/vpn/gnunet-service-vpn.c:1145
 #, fuzzy
 msgid "# Packets dropped (channel not yet online)"
 msgstr "# Paquetes ICMP omitidos (tipo no permitido)"
 
-#: src/vpn/gnunet-service-vpn.c:1344
+#: src/vpn/gnunet-service-vpn.c:1353
 msgid "# ICMPv4 packets dropped (not allowed)"
 msgstr "# Paquetes ICMPv4 omitidos (no permitido)"
 
-#: src/vpn/gnunet-service-vpn.c:1365
+#: src/vpn/gnunet-service-vpn.c:1374
 msgid "# ICMPv6 packets dropped (not allowed)"
 msgstr "# Paquetes ICMPv6 omitidos (no permitido)"
 
-#: src/vpn/gnunet-service-vpn.c:1571
+#: src/vpn/gnunet-service-vpn.c:1580
 msgid "# Packets received from TUN interface"
 msgstr "# Paquetes recibidos de la interfaz TUN"
 
-#: src/vpn/gnunet-service-vpn.c:1604 src/vpn/gnunet-service-vpn.c:1640
+#: src/vpn/gnunet-service-vpn.c:1613 src/vpn/gnunet-service-vpn.c:1649
 #, 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:1650
+#: src/vpn/gnunet-service-vpn.c:1659
 msgid "Received IPv4 packet with options (dropping it)\n"
 msgstr "Recibido paquete IPv4 con opciones (omitiéndolo)\n"
 
-#: src/vpn/gnunet-service-vpn.c:1664
+#: src/vpn/gnunet-service-vpn.c:1673
 #, 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:1746
+#: src/vpn/gnunet-service-vpn.c:1755
 #, fuzzy
 msgid "# ICMP packets received from cadet"
 msgstr "# Paquetes ICMP recibidos de mesh"
 
-#: src/vpn/gnunet-service-vpn.c:2086
+#: src/vpn/gnunet-service-vpn.c:2095
 #, fuzzy
 msgid "# UDP packets received from cadet"
 msgstr "# Paquetes UDP recibidos de mesh"
 
-#: src/vpn/gnunet-service-vpn.c:2242
+#: src/vpn/gnunet-service-vpn.c:2251
 #, fuzzy
 msgid "# TCP packets received from cadet"
 msgstr "# Paquetes TCP recibidos de mesh"
 
-#: src/vpn/gnunet-service-vpn.c:2394
+#: src/vpn/gnunet-service-vpn.c:2403
 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:2449
+#: src/vpn/gnunet-service-vpn.c:2458
 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:2491 src/vpn/gnunet-service-vpn.c:2702
+#: src/vpn/gnunet-service-vpn.c:2500 src/vpn/gnunet-service-vpn.c:2722
 msgid "# Active destinations"
 msgstr "# Destinos activos"
 
-#: src/vpn/gnunet-service-vpn.c:2753
+#: src/vpn/gnunet-service-vpn.c:2771
 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:3017
+#: src/vpn/gnunet-service-vpn.c:3063
 #, fuzzy
 msgid "Must specify valid IPv6 address"
 msgstr "«%s» no es una dirección IP válida.\n"
 
-#: src/vpn/gnunet-service-vpn.c:3041
+#: src/vpn/gnunet-service-vpn.c:3087
 msgid "Must specify valid IPv6 mask"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:3049
+#: src/vpn/gnunet-service-vpn.c:3095
 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:3062
+#: src/vpn/gnunet-service-vpn.c:3108
 #, fuzzy
 msgid "Must specify valid IPv4 address"
 msgstr "«%s» no es una dirección IP válida.\n"
 
-#: src/vpn/gnunet-service-vpn.c:3075
+#: src/vpn/gnunet-service-vpn.c:3121
 msgid "Must specify valid IPv4 mask"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:3085
+#: src/vpn/gnunet-service-vpn.c:3131
 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"
@@ -9661,23 +9236,381 @@
 msgid "Setup tunnels via VPN."
 msgstr "Configurar túneles vía VPN."
 
-#: src/include/gnunet_common.h:641 src/include/gnunet_common.h:648
-#: src/include/gnunet_common.h:656
+#: src/include/gnunet_common.h:645 src/include/gnunet_common.h:652
+#: src/include/gnunet_common.h:660
 #, c-format
 msgid "Assertion failed at %s:%d.\n"
 msgstr "Aserción fallida en %s:%d.\n"
 
-#: src/include/gnunet_common.h:668
+#: src/include/gnunet_common.h:672
 #, c-format
 msgid "External protocol violation detected at %s:%d.\n"
 msgstr "Violación externa del protocolo detectada en %s:%d.\n"
 
-#: src/include/gnunet_common.h:695 src/include/gnunet_common.h:704
+#: src/include/gnunet_common.h:699 src/include/gnunet_common.h:708
 #, c-format
 msgid "`%s' failed on file `%s' at %s:%d with error: %s\n"
 msgstr "«%s» falló en el fichero «%s» en %s:%d con el error: %s\n"
 
 #, fuzzy
+#~ msgid "Client was disconnected from arm service, trying to reconnect.\n"
+#~ msgstr ""
+#~ "El cliente se desconectó del servicio principal, tratando de reconectar.\n"
+
+#, fuzzy
+#~ msgid ""
+#~ "Monitoring client was disconnected from arm service, trying to "
+#~ "reconnect.\n"
+#~ msgstr ""
+#~ "El cliente se desconectó del servicio principal, tratando de reconectar.\n"
+
+#, fuzzy
+#~ msgid "Request does not fit into a message"
+#~ msgstr "no imprime mensajes de estado"
+
+# Miguel: Si no me equivoco, "status result" es un
+# resultado de tipo estado.
+#~ msgid "Could not send status result to client\n"
+#~ msgstr "No se pudo mandar el resultado (estado) al cliente\n"
+
+# Miguel: Si no me equivoco, "list result" es un resultado
+# de tipo lista.
+#~ msgid "Could not send list result to client\n"
+#~ msgstr "No se pudo mandar el resultado (lista) al cliente\n"
+
+#, fuzzy
+#~ msgid "Failed to connect peer 0 and %u\n"
+#~ msgstr "Se produjo un fallo al conectar con «%s»\n"
+
+#, fuzzy
+#~ msgid "Could not connect master [%u] and slave [%u]\n"
+#~ msgstr "¡No se pudo conectar al servicio %s!\n"
+
+#, fuzzy
+#~ msgid "Initialization failed, shutdown\n"
+#~ msgstr "¡La inicialización del mecanismo de módulos falló: %s!\n"
+
+#, fuzzy
+#~ msgid "number too large"
+#~ msgstr "número de valores"
+
+#, fuzzy
+#~ msgid "Received incoming Cadet channel on port %u\n"
+#~ msgstr "Desconectado de %s\n"
+
+#~ msgid "Client was disconnected from core service, trying to reconnect.\n"
+#~ msgstr ""
+#~ "El cliente se desconectó del servicio principal, tratando de reconectar.\n"
+
+#~ msgid "# sessions terminated by transport disconnect"
+#~ msgstr "# sesiones terminadas por desconexión de transporte"
+
+#~ msgid "# neighbour entries allocated"
+#~ msgstr "# entradas de vecinos alojadas"
+
+#~ msgid "# encrypted bytes given to transport"
+#~ msgstr "# bytes cifrados dados al transporte"
+
+#~ msgid "Unsupported message of type %u (%u bytes) received from peer `%s'\n"
+#~ msgstr "Mensaje no soportado del tipo %u (%u bytes) recibido del par «%s»\n"
+
+# Miguel: "Drop" en bases de datos es eliminar una tabla
+# del modelo.
+#~ msgid "Failed to transmit request to drop database.\n"
+#~ msgstr ""
+#~ "Se produjo un fallo al transmitir la petición de eliminación a la base de "
+#~ "datos.\n"
+
+#~ msgid "# queue entry timeouts"
+#~ msgstr "# expiraciones de plazo en la cola de entradas"
+
+#~ msgid "# Requests dropped from datastore queue"
+#~ msgstr "# Peticiones omitidas de la cola del almacén de datos"
+
+#~ msgid "# transmission request failures"
+#~ msgstr "# fallos en peticiones de transmisión"
+
+#~ msgid "# bytes sent to datastore"
+#~ msgstr "# bytes mandados al almacén de datos"
+
+#~ msgid "Failed to receive status response from database."
+#~ msgstr ""
+#~ "Se produjo un fallo al recibir el estado de respuesta de la base de datos."
+
+#~ msgid "Error reading response from datastore service"
+#~ msgstr "Error leyendo respuesta del servicio de almacenamiento de datos"
+
+#~ msgid "Invalid error message received from datastore service"
+#~ msgstr ""
+#~ "Mensaje de error no válido recibido del servicio de almacenamiento de "
+#~ "datos"
+
+#~ msgid "No `%s' specified for `%s' in configuration!\n"
+#~ msgstr "¡No se ha especificado ningún «%s» para «%s» en la configuración!\n"
+
+#~ msgid "Failed to connect to the DHT service!\n"
+#~ msgstr "¡Se produjo un fallo al conectar con el servicio DHT!\n"
+
+#~ msgid "Failed to connect to transport service!\n"
+#~ msgstr "¡Se produjo un fallo al conectar con el servicio de transporte!\n"
+
+#~ msgid "# Queued messages discarded (peer disconnected)"
+#~ msgstr "# Mensajes encolados descartados (par desconectado)"
+
+#, fuzzy
+#~ msgid "# Messages dropped (CORE timeout)"
+#~ msgstr "# Peticiones DNS omitidas (expiradas)"
+
+#~ msgid "# Bytes transmitted to other peers"
+#~ msgstr "# Bytes transmitidos a otros pares"
+
+#~ msgid "# Bytes of bandwidth requested from core"
+#~ msgstr "# Bytes de ancho de banda solicitados por el servicio principal"
+
+#, fuzzy
+#~ msgid "PUT request received, but have no datacache!\n"
+#~ msgstr "¡Petición %s recibida, pero no tiene caché de datos!\n"
+
+#, fuzzy
+#~ msgid "No service %s found for %s on port %d!\n"
+#~ msgstr "¡Ningún servicio encontrado para %s en el puerto %d!\n"
+
+#~ msgid "# TCP requests dropped (no such service)"
+#~ msgstr "# Peticiones TCP omitidas (no existe tal servicio)"
+
+#~ msgid "# UDP requests dropped (no such service)"
+#~ msgstr "# Peticiones UDP omitidas (no existe tal servicio)"
+
+# Miguel: "Failed to receive (valid) response" no lo he traducido
+# "por se produjo un fallo al recibir una respuesta", sino
+# como "no se ha recibido una respuesta" puesto que es
+# más claro.
+#~ msgid "Failed to receive response for `%s' request from `%s' service.\n"
+#~ msgstr ""
+#~ "No se ha recibido la respuesta para la petición «%s» del servicio «%s».\n"
+
+#~ msgid ""
+#~ "Failed to receive valid response for `%s' request from `%s' service.\n"
+#~ msgstr ""
+#~ "No se ha recibido una respuesta válida para la petición «%s» del servicio "
+#~ "«%s».\n"
+
+#~ msgid "unknown error"
+#~ msgstr "error desconocido"
+
+#~ msgid "Unexpected time for a response from `fs' service."
+#~ msgstr "Tiempo inesperado para una respuesta del servicio «fs»."
+
+#~ msgid "Timeout waiting for `fs' service."
+#~ msgstr "Esperando al servicio «fs»."
+
+#~ msgid "Invalid response from `fs' service."
+#~ msgstr "Respuesta no válida del servicio «fs»."
+
+#~ msgid "# replies transmitted to other peers"
+#~ msgstr "# respuestas transmitidas a otros pares"
+
+#~ msgid "# replies dropped"
+#~ msgstr "# respuestas omitidas"
+
+#~ msgid "# requests dropped due to initiator not being connected"
+#~ msgstr "# peticiones omitidas debido a que el iniciador no está conectado"
+
+#~ msgid "# transmission failed (core has no bandwidth)"
+#~ msgstr ""
+#~ "# transmisión fallida (el servicio principal no tiene ancho de banda)"
+
+#, fuzzy
+#~ msgid "Failed to deserialize lookup reply from GNS service!\n"
+#~ msgstr ""
+#~ "¡Se produjo un fallo al serializar la respuesta de la búsqueda desde el "
+#~ "servicio GNS!\n"
+
+#~ msgid "Advertisement message could not be queued by core\n"
+#~ msgstr ""
+#~ "Los mensajes de anuncio no pudieron encolarse por el servicio principal\n"
+
+#~ msgid "Service `%s' is not running\n"
+#~ msgstr "El servicio «%s» no está ejecutandose\n"
+
+#, fuzzy
+#~ msgid "Identity service is not running\n"
+#~ msgstr "El servicio «%s» no está ejecutandose\n"
+
+#, fuzzy
+#~ msgid "NSE service is not running\n"
+#~ msgstr "El servicio «%s» no está ejecutandose\n"
+
+#~ msgid "aborted due to explicit disconnect request"
+#~ msgstr "abortado debido a petición de desconexión explícita"
+
+#~ msgid "failed to transmit request (service down?)"
+#~ msgstr ""
+#~ "se produjo un fallo al transmitir la petición (¿está caido el servicio?)"
+
+#~ msgid "Received invalid message from `PEERINFO' service."
+#~ msgstr ""
+#~ "Recibido mensaje no válido del servicio de información de pares "
+#~ "(PEERINFO)."
+
+#~ msgid "Timeout transmitting iteration request to `PEERINFO' service."
+#~ msgstr ""
+#~ "Petición de transmisión de iteración de expiración al servicio de "
+#~ "información de pares (PEERINFO)."
+
+#~ msgid "Could not connect to `%s' service.\n"
+#~ msgstr "No se pudo conectar al servicio %s.\n"
+
+#~ msgid "Failure adding HELLO: %s\n"
+#~ msgstr "Fallo añadiendo «HELLO»: %s\n"
+
+#, fuzzy
+#~ msgid "Failed to get my own HELLO from this peer!\n"
+#~ msgstr "¡Se produjo un fallo al obtener la clave de máquina!\n"
+
+#, fuzzy
+#~ msgid "Service `%s' is not running, please start GNUnet\n"
+#~ msgstr "El servicio «%s» no está ejecutandose\n"
+
+#, fuzzy
+#~ msgid "Malformed iterate request.\n"
+#~ msgstr "Se produjo un fallo al borrar el fichero de configuración %s\n"
+
+# Miguel: "shutdown request" se refiere a finalizar el
+# que hace de cliente.
+#, fuzzy
+#~ msgid "Malformed store request from client\n"
+#~ msgstr ""
+#~ "Se produjo un fallo al transmitir una petición de apagado al cliente.\n"
+
+# Miguel: "Drop" en bases de datos es eliminar una tabla
+# del modelo.
+#, fuzzy
+#~ msgid "Failed to store requested value, database error."
+#~ msgstr ""
+#~ "Se produjo un fallo al transmitir la petición de eliminación a la base de "
+#~ "datos.\n"
+
+#, fuzzy
+#~ msgid "No database backend configured\n"
+#~ msgstr "No hay nombre de máquina externo configurado\n"
+
+#~ msgid "Trying to connect to remote host, but service `%s' is not running\n"
+#~ msgstr ""
+#~ "Intentando conectar con máquina remota, pero el servicio «%s» no se está "
+#~ "ejecutando\n"
+
+#~ msgid ""
+#~ "Failed to receive acknowledgement from statistics service, some "
+#~ "statistics might have been lost!\n"
+#~ msgstr ""
+#~ "¡No se ha recibido el reconocimiento del servicio de estadísticas, "
+#~ "algunas estadísticas se pueden haber perdido!\n"
+
+#, fuzzy
+#~ msgid "Request doesn't fit into a message"
+#~ msgstr "no imprime mensajes de estado"
+
+#, fuzzy
+#~ msgid ""
+#~ "Peer `%s' %s %s\n"
+#~ "\t%s%s\n"
+#~ "\t%s%s\n"
+#~ "\t%s%s\n"
+#~ msgstr "Par «%s»: %s %s\n"
+
+#, fuzzy
+#~ msgid "Peer `%s' %s `%s' \n"
+#~ msgstr "Par «%s»: %s %s\n"
+
+#, fuzzy
+#~ msgid "print information for all pending validations "
+#~ msgstr "Imprime información de los pares de GNUnet."
+
+# Miguel: ¿Quizá continuamente fuese mejor?
+#, fuzzy
+#~ msgid "print information for all pending validations continuously"
+#~ msgstr ""
+#~ "provee información sobre todas las conexiones actuales (de forma continua)"
+
+#, fuzzy
+#~ msgid ""
+#~ "\n"
+#~ "Starting benchmark to `%s', starting to send %u messages in %u byte "
+#~ "blocks\n"
+#~ msgstr ""
+#~ "Conectado satisfactoriamente a «%s», empezando a mandar datos de prueba "
+#~ "en bloques de %u Kb\n"
+
+#, fuzzy
+#~ msgid "Connected to different peer `%s'\n"
+#~ msgstr "Conectado a %s.\n"
+
+#~ msgid "Successfully connected to `%s'\n"
+#~ msgstr "Conectado satisfactoriamente a «%s»\n"
+
+#, fuzzy
+#~ msgid "Denying connection to `%s'\n"
+#~ msgstr "Aceptando conexión desde «%s»: %p\n"
+
+#, fuzzy
+#~ msgid "Message size too big!\n"
+#~ msgstr "tamaño del mensaje"
+
+#, fuzzy
+#~ msgid "No peer identity given\n"
+#~ msgstr "No se han proporcionado opciones\n"
+
+#, fuzzy
+#~ msgid "Trying to send %u messages with size %u to peer `%s'\n"
+#~ msgstr "Usando %u mensajes de un tamaño de %u durante %u veces.\n"
+
+#, fuzzy
+#~ msgid "Trying to receive messages from peer `%s'\n"
+#~ msgstr ""
+#~ "Se produjo un fallo al procesar el mensaje interno del programa auxiliar "
+#~ "«%s»\n"
+
+#, fuzzy
+#~ msgid "No operation given\n"
+#~ msgstr "No se han proporcionado opciones\n"
+
+#, fuzzy
+#~ msgid "Failed to connect to ATS service\n"
+#~ msgstr "¡Se produjo un fallo al conectar con el servicio DHT!\n"
+
+#~ msgid "Binding to IPv4 address %s\n"
+#~ msgstr "Asociando a la dirección IPv4 %s\n"
+
+#~ msgid "Binding to IPv6 address %s\n"
+#~ msgstr "Asociando a la dirección IPv6 %s\n"
+
+#~ msgid "Received unexpected message of type %u in %s:%u\n"
+#~ msgstr "Recibido mensaje inesperado del tipo %u en %s:%u\n"
+
+#~ msgid "Failed to initialize testing library!\n"
+#~ msgstr "¡Se produjo un fallo al inicializar la biblioteca de pruebas!\n"
+
+#~ msgid ""
+#~ "Could not determine valid hostname and port for service `%s' from "
+#~ "configuration.\n"
+#~ msgstr ""
+#~ "No se pudo determinar un nombre de máquina y un puerto válidos para el "
+#~ "servicio «%s» a partir de la configuración.\n"
+
+#, fuzzy
+#~ msgid "Could not connect to service `%s', configuration broken.\n"
+#~ msgstr ""
+#~ "No se pudo conectar con el servicio «%s», no debe estar corriendo.\n"
+
+#~ msgid "Failure to transmit request to service `%s'\n"
+#~ msgstr "Se produjo un fallo al transmitir la petición al servicio «%s»\n"
+
+#, fuzzy
+#~ msgid "Failed to setup cadet channel!\n"
+#~ msgstr "¡Se produjo un fallo al configurar el túnel mesh!\n"
+
+#, fuzzy
 #~ msgid "Configuration option \"regex_prefix\" missing. Exiting\n"
 #~ msgstr "Falta una opción de configuración (regex_prefix). Saliendo\n"
 
@@ -10140,14 +10073,7 @@
 #~ msgid "Loaded %d sensors from directory `%s'\n"
 #~ msgstr "Descarga los ficheros de GNUnet"
 
-# Miguel: "Failed to receive" también aquí está traducido como
-# "no se obtuvo respuesta" por claridad.
 #, fuzzy
-#~ msgid "Failed to receive response from `SENSOR' service."
-#~ msgstr ""
-#~ "No se obtuvo respuesta del servicio de información de pares (PEERINFO)."
-
-#, fuzzy
 #~ msgid "Received invalid message from `SENSOR' service."
 #~ msgstr ""
 #~ "Recibido mensaje no válido del servicio de información de pares "
@@ -10423,9 +10349,6 @@
 #~ msgid "Job command file not given. Exiting\n"
 #~ msgstr "Fichero de configuración de trabajos no proporcionado. Saliendo\n"
 
-#~ msgid "Error while decoding key %u\n"
-#~ msgstr "Error decodificando clave %u\n"
-
 #~ msgid "Could not read friends list `%s'\n"
 #~ msgstr "No se pudo leer la lista de amigos «%s»\n"
 
@@ -11172,9 +11095,6 @@
 #~ msgid "# entries in session map"
 #~ msgstr "# entradas en el mapa de sesiones"
 
-#~ msgid "# reconnected to DATASTORE"
-#~ msgstr "# reconexiones al almacén de datos (DATASTORE)"
-
 #~ msgid "Unable to initialize Postgres with configuration `%s': %s"
 #~ msgstr "No se pudo inicializar Postgres con la configuración «%s»: %s"
 
@@ -14477,9 +14397,6 @@
 #~ msgid "FAILURE"
 #~ msgstr "FALLO"
 
-#~ msgid "MESSAGE"
-#~ msgstr "MENSAJE"
-
 #~ msgid "CRON"
 #~ msgstr "CRON"
 

Modified: gnunet/po/fr.po
===================================================================
--- gnunet/po/fr.po     2016-10-26 04:21:00 UTC (rev 38215)
+++ gnunet/po/fr.po     2016-10-26 14:25:30 UTC (rev 38216)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: gnunet 0.10.1\n"
 "Report-Msgid-Bugs-To: address@hidden"
-"POT-Creation-Date: 2016-05-19 13:54+0200\n"
+"POT-Creation-Date: 2016-10-26 09:18-0500\n"
 "PO-Revision-Date: 2015-12-24 01:20+0100\n"
 "Last-Translator: Stéphane  Aulery <address@hidden>\n"
 "Language-Team: French <address@hidden>\n"
@@ -16,308 +16,345 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: src/arm/arm_api.c:338
-msgid "Client was disconnected from arm service, trying to reconnect.\n"
-msgstr ""
-
-#: src/arm/arm_monitor_api.c:324
-msgid ""
-"Monitoring client was disconnected from arm service, trying to reconnect.\n"
-msgstr ""
-
-#: src/arm/gnunet-arm.c:169
+#: src/arm/gnunet-arm.c:152
 #, c-format
 msgid "Failed to remove configuration file %s\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:175
+#: src/arm/gnunet-arm.c:158
 #, c-format
 msgid "Failed to remove servicehome directory %s\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:225 src/testbed/gnunet-service-testbed_peers.c:1013
+#: src/arm/gnunet-arm.c:213 src/testbed/gnunet-service-testbed_peers.c:1139
 msgid "Message was sent successfully"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:227
+#: src/arm/gnunet-arm.c:215
 msgid "Misconfiguration (can not connect to the ARM service)"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:229 src/testbed/gnunet-service-testbed_peers.c:1017
+#: src/arm/gnunet-arm.c:217 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:231 src/testbed/gnunet-service-testbed_peers.c:1019
+#: src/arm/gnunet-arm.c:219 src/testbed/gnunet-service-testbed_peers.c:1145
 msgid "ARM API is busy"
 msgstr "API ARM occupé"
 
-#: src/arm/gnunet-arm.c:233
-msgid "Request does not fit into a message"
-msgstr ""
-
-#: src/arm/gnunet-arm.c:235 src/testbed/gnunet-service-testbed_peers.c:1023
+#: src/arm/gnunet-arm.c:221 src/testbed/gnunet-service-testbed_peers.c:1147
 msgid "Request timed out"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:237 src/testbed/gnunet-service-testbed_peers.c:1025
+#: src/arm/gnunet-arm.c:223 src/testbed/gnunet-service-testbed_peers.c:1149
 msgid "Unknown request status"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:253 src/testbed/gnunet-service-testbed_peers.c:1041
+#: src/arm/gnunet-arm.c:239 src/testbed/gnunet-service-testbed_peers.c:1165
 #, c-format
 msgid "%s is stopped"
 msgstr "%s est arrêté"
 
-#: src/arm/gnunet-arm.c:255 src/testbed/gnunet-service-testbed_peers.c:1043
+#: src/arm/gnunet-arm.c:241 src/testbed/gnunet-service-testbed_peers.c:1167
 #, c-format
 msgid "%s is starting"
 msgstr "%s est en cours de démarrage"
 
-#: src/arm/gnunet-arm.c:257 src/testbed/gnunet-service-testbed_peers.c:1045
+#: src/arm/gnunet-arm.c:243 src/testbed/gnunet-service-testbed_peers.c:1169
 #, c-format
 msgid "%s is stopping"
 msgstr "%s est en cours d'arrêt"
 
-#: src/arm/gnunet-arm.c:259 src/testbed/gnunet-service-testbed_peers.c:1047
+#: src/arm/gnunet-arm.c:245 src/testbed/gnunet-service-testbed_peers.c:1171
 #, c-format
 msgid "%s is starting already"
 msgstr "%s est déjà en cours de démarrage"
 
-#: src/arm/gnunet-arm.c:261 src/testbed/gnunet-service-testbed_peers.c:1049
+#: src/arm/gnunet-arm.c:247 src/testbed/gnunet-service-testbed_peers.c:1173
 #, c-format
 msgid "%s is stopping already"
 msgstr "%s est déjà arrêté"
 
-#: src/arm/gnunet-arm.c:263 src/testbed/gnunet-service-testbed_peers.c:1051
+#: src/arm/gnunet-arm.c:249 src/testbed/gnunet-service-testbed_peers.c:1175
 #, c-format
 msgid "%s is started already"
 msgstr "%s est déjà démarré"
 
-#: src/arm/gnunet-arm.c:265 src/testbed/gnunet-service-testbed_peers.c:1053
+#: src/arm/gnunet-arm.c:251 src/testbed/gnunet-service-testbed_peers.c:1177
 #, c-format
 msgid "%s is stopped already"
 msgstr "%s est déjà arrêté"
 
-#: src/arm/gnunet-arm.c:267 src/testbed/gnunet-service-testbed_peers.c:1055
+#: src/arm/gnunet-arm.c:253 src/testbed/gnunet-service-testbed_peers.c:1179
 #, c-format
 msgid "%s service is not known to ARM"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:269 src/testbed/gnunet-service-testbed_peers.c:1057
+#: src/arm/gnunet-arm.c:255 src/testbed/gnunet-service-testbed_peers.c:1181
 #, c-format
 msgid "%s service failed to start"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:271
+#: src/arm/gnunet-arm.c:257
 #, c-format
 msgid "%s service cannot be started because ARM is shutting down"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:273 src/testbed/gnunet-service-testbed_peers.c:1061
+#: src/arm/gnunet-arm.c:259 src/testbed/gnunet-service-testbed_peers.c:1185
 #, c-format
 msgid "%.s Unknown result code."
 msgstr "%.s Code d'erreur inconnu"
 
-#: src/arm/gnunet-arm.c:305
+#: src/arm/gnunet-arm.c:291
 msgid "Fatal error initializing ARM API.\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:335 src/arm/gnunet-arm.c:344
+#: src/arm/gnunet-arm.c:320 src/arm/gnunet-arm.c:329
 #, c-format
 msgid "Failed to start the ARM service: %s\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:380
+#: src/arm/gnunet-arm.c:364
 #, c-format
 msgid "Failed to send a stop request to the ARM service: %s\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:391
+#: src/arm/gnunet-arm.c:375
 #, c-format
 msgid "Failed to stop the ARM service: %s\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:434
+#: src/arm/gnunet-arm.c:417
 #, c-format
 msgid "Failed to send a request to start the `%s' service: %%s\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:444
+#: src/arm/gnunet-arm.c:428
 #, c-format
 msgid "Failed to start the `%s' service: %s\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:482
+#: src/arm/gnunet-arm.c:467
 #, c-format
 msgid "Failed to send a request to kill the `%s' service: %%s\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:493
+#: src/arm/gnunet-arm.c:478
 #, c-format
 msgid "Failed to kill the `%s' service: %s\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:533
+#: src/arm/gnunet-arm.c:519
 #, c-format
 msgid "Failed to request a list of services: %s\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:542
+#: src/arm/gnunet-arm.c:528
 msgid "Error communicating with ARM. ARM not running?\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:547
+#: src/arm/gnunet-arm.c:534
 msgid "Running services:\n"
 msgstr "Services en exécution :\n"
 
-#: src/arm/gnunet-arm.c:633
+#: src/arm/gnunet-arm.c:622
 #, c-format
 msgid "Now only monitoring, press CTRL-C to stop.\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:665
+#: src/arm/gnunet-arm.c:654
 #, c-format
 msgid "Stopped %s.\n"
 msgstr "Arrêté %s.\n"
 
-#: src/arm/gnunet-arm.c:668
+#: src/arm/gnunet-arm.c:657
 #, c-format
 msgid "Starting %s...\n"
 msgstr "En cous de démarrage %s…\n"
 
-#: src/arm/gnunet-arm.c:671
+#: src/arm/gnunet-arm.c:660
 #, c-format
 msgid "Stopping %s...\n"
 msgstr "En cour d'arrêt %s…\n"
 
-#: src/arm/gnunet-arm.c:682
+#: src/arm/gnunet-arm.c:674
 #, c-format
 msgid "Unknown status %u for service %s.\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:745
+#: src/arm/gnunet-arm.c:756
 msgid "stop all GNUnet services"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:747
+#: src/arm/gnunet-arm.c:758
 msgid "start a particular service"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:749
+#: src/arm/gnunet-arm.c:760
 msgid "stop a particular service"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:751
+#: src/arm/gnunet-arm.c:762
 msgid "start all GNUnet default services"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:754
+#: src/arm/gnunet-arm.c:765
 msgid "stop and start all GNUnet default services"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:757
+#: src/arm/gnunet-arm.c:768
 msgid "delete config file and directory on exit"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:760
+#: src/arm/gnunet-arm.c:771
 msgid "monitor ARM activities"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:762
+#: src/arm/gnunet-arm.c:773
 msgid "don't print status messages"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:765
+#: src/arm/gnunet-arm.c:776
 msgid "exit with error status if operation does not finish after DELAY"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:767
+#: src/arm/gnunet-arm.c:778
 msgid "list currently running services"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:769
+#: src/arm/gnunet-arm.c:780
 msgid "don't let gnunet-service-arm inherit standard output"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:771
+#: src/arm/gnunet-arm.c:782
 msgid "don't let gnunet-service-arm inherit standard error"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:782
+#: src/arm/gnunet-arm.c:794
 msgid "Control services and the Automated Restart Manager (ARM)"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:279
-msgid "Could not send status result to client\n"
+#: src/arm/gnunet-service-arm.c:374 src/transport/plugin_transport_tcp.c:633
+#: src/util/service.c:565 src/util/service_new.c:604
+#, c-format
+msgid ""
+"Disabling IPv6 support for service `%s', failed to create IPv6 socket: %s\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:315
-msgid "Could not send list result to client\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:658
+#: src/transport/plugin_transport_tcp.c:3299 src/util/service.c:584
+#: src/util/service.c:590 src/util/service_new.c:629 src/util/service_new.c:635
+#, c-format
+msgid "Require valid port number for service `%s' in configuration!\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:555
+#: src/arm/gnunet-service-arm.c:430 src/transport/plugin_transport_tcp.c:689
+#: src/util/client_new.c:464 src/util/service.c:621 src/util/service_new.c:674
 #, 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/util/client_new.c:469 src/util/service.c:625 src/util/service_new.c:679
+#, c-format
+msgid "Using `%s' instead\n"
+msgstr ""
+
+#: src/arm/gnunet-service-arm.c:465 src/transport/plugin_transport_tcp.c:724
+#: src/util/service.c:656 src/util/service_new.c:715
+#, 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/util/service.c:673 src/util/service_new.c:733
+#, 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:2617
+#: src/transport/plugin_transport_tcp.c:772 src/util/service.c:704
+#: src/util/service_new.c:774
+#, 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:2635
+#: src/transport/plugin_transport_tcp.c:791 src/util/service.c:723
+#: src/util/service_new.c:794
+#, c-format
+msgid "Failed to find %saddress for `%s'.\n"
+msgstr ""
+
+#: src/arm/gnunet-service-arm.c:932
+#, c-format
 msgid "Failed to start service `%s'\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:566
+#: src/arm/gnunet-service-arm.c:943
 #, c-format
 msgid "Starting service `%s'\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:663
+#: src/arm/gnunet-service-arm.c:1055
 #, c-format
 msgid "Unable to create socket for service `%s': %s\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:687
+#: src/arm/gnunet-service-arm.c:1090
 #, c-format
 msgid "Unable to bind listening socket for service `%s' to address `%s': %s\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:723
+#: src/arm/gnunet-service-arm.c:1133
 #, c-format
 msgid "ARM now monitors connections to service `%s' at `%s'\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:863
+#: src/arm/gnunet-service-arm.c:1309
 #, c-format
 msgid "Preparing to stop `%s'\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:1145
+#: src/arm/gnunet-service-arm.c:1611
 #, c-format
 msgid "Restarting service `%s'.\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:1299
+#: src/arm/gnunet-service-arm.c:1771
 msgid "exit"
 msgstr "exit"
 
-#: src/arm/gnunet-service-arm.c:1304
+#: src/arm/gnunet-service-arm.c:1776
 msgid "signal"
 msgstr "signal"
 
-#: src/arm/gnunet-service-arm.c:1309
+#: src/arm/gnunet-service-arm.c:1781
 msgid "unknown"
 msgstr "inconnu"
 
-#: src/arm/gnunet-service-arm.c:1315
+#: src/arm/gnunet-service-arm.c:1787
 #, c-format
 msgid "Service `%s' took %s to terminate\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:1342
+#: src/arm/gnunet-service-arm.c:1813
 #, c-format
 msgid "Service `%s' terminated normally, will restart at any time\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:1358
+#: src/arm/gnunet-service-arm.c:1829
 #, c-format
 msgid "Service `%s' terminated with status %s/%d, will restart in %s\n"
 msgstr ""
 
-#: src/arm/mockup-service.c:41
+#: src/arm/mockup-service.c:42
 msgid "Initiating shutdown as requested by client.\n"
 msgstr ""
 
@@ -342,14 +379,12 @@
 "%llu\n"
 msgstr ""
 
-#: src/ats/gnunet-ats-solver-eval.c:3293
-#: src/ats-tests/gnunet-solver-eval.c:921
+#: src/ats/gnunet-ats-solver-eval.c:3293 src/ats-tests/gnunet-solver-eval.c:935
 msgid "solver to use"
 msgstr "solveur utilisé"
 
-#: src/ats/gnunet-ats-solver-eval.c:3296
-#: src/ats-tests/gnunet-solver-eval.c:924
-#: src/ats-tests/gnunet-solver-eval.c:927
+#: 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 ""
 
@@ -453,53 +488,26 @@
 msgid "Invalid %s configuration %f\n"
 msgstr "fornat invalide : « %s »\n"
 
-#: src/ats-tests/ats-testing.c:72
-msgid "Benchmarking done\n"
-msgstr "Benchmark terminé\n"
-
-#: src/ats-tests/ats-testing.c:105
+#: src/ats-tests/ats-testing.c:441
 #, c-format
-msgid "Failed to connect peer 0 and %u\n"
-msgstr ""
-
-#: src/ats-tests/ats-testing.c:413
-#, c-format
 msgid "Connected master [%u] with slave [%u]\n"
 msgstr ""
 
-#: src/ats-tests/ats-testing.c:419
+#: src/ats-tests/ats-testing.c:448
 #, c-format
 msgid "Failed to connect master peer [%u] with slave [%u]\n"
 msgstr ""
 
-#: src/ats-tests/ats-testing.c:450
-msgid "Connecting peers on CORE level\n"
-msgstr ""
-
-#: src/ats-tests/ats-testing.c:461
-#, c-format
-msgid "Connecting master [%u] with slave [%u]\n"
-msgstr ""
-
-#: src/ats-tests/ats-testing.c:470
-#, c-format
-msgid "Could not connect master [%u] and slave [%u]\n"
-msgstr ""
-
-#: src/ats-tests/ats-testing.c:490 src/ats-tests/ats-testing.c:634
-msgid "Initialization failed, shutdown\n"
-msgstr ""
-
-#: src/ats-tests/ats-testing-log.c:836
+#: src/ats-tests/ats-testing-log.c:837
 msgid "Stop logging\n"
 msgstr "Arrêter la journalisation\n"
 
-#: src/ats-tests/ats-testing-log.c:887
+#: src/ats-tests/ats-testing-log.c:892
 #, c-format
 msgid "Start logging `%s'\n"
 msgstr "Démarrer la journalisation « %s »\n"
 
-#: src/ats-tests/gnunet-ats-sim.c:86
+#: src/ats-tests/gnunet-ats-sim.c:88
 #, c-format
 msgid ""
 "Master [%u]: sent: %u KiB in %u sec. = %u KiB/s, received: %u KiB in %u sec. "
@@ -542,8 +550,7 @@
 msgstr ""
 
 #: src/ats-tool/gnunet-ats.c:748 src/ats-tool/gnunet-ats.c:761
-#: src/transport/gnunet-transport.c:1780
-#: src/transport/gnunet-transport-profiler.c:516
+#: src/transport/gnunet-transport.c:1536
 #, c-format
 msgid "Failed to parse peer identity `%s'\n"
 msgstr ""
@@ -623,105 +630,100 @@
 msgid "Print information about ATS state"
 msgstr ""
 
-#: src/cadet/gnunet-cadet.c:476
+#: src/cadet/gnunet-cadet.c:511
 #, c-format
 msgid "Invalid target `%s'\n"
 msgstr ""
 
-#: src/cadet/gnunet-cadet.c:751
+#: src/cadet/gnunet-cadet.c:787
 #, c-format
 msgid "Invalid peer ID `%s'\n"
 msgstr ""
 
-#: src/cadet/gnunet-cadet.c:789
+#: src/cadet/gnunet-cadet.c:825
 #, c-format
 msgid "Invalid tunnel owner `%s'\n"
 msgstr ""
 
-#: src/cadet/gnunet-cadet.c:857
+#: src/cadet/gnunet-cadet.c:892
 msgid "You must NOT give a TARGET when using 'request all' options\n"
 msgstr ""
 
-#: src/cadet/gnunet-cadet.c:952
+#: src/cadet/gnunet-cadet.c:982
 msgid "provide information about a particular connection"
 msgstr ""
 
-#: src/cadet/gnunet-cadet.c:955
+#: src/cadet/gnunet-cadet.c:985
 msgid "activate echo mode"
 msgstr ""
 
-#: src/cadet/gnunet-cadet.c:958
+#: src/cadet/gnunet-cadet.c:988
 msgid "dump debug information to STDERR"
 msgstr ""
 
-#: src/cadet/gnunet-cadet.c:964
-msgid "port to listen to (default; 0)"
+#: src/cadet/gnunet-cadet.c:994
+msgid "port to listen to"
 msgstr ""
 
-#: src/cadet/gnunet-cadet.c:967
+#: src/cadet/gnunet-cadet.c:997
 msgid "provide information about a patricular peer"
 msgstr ""
 
-#: src/cadet/gnunet-cadet.c:970
+#: src/cadet/gnunet-cadet.c:1000
 msgid "provide information about all peers"
 msgstr ""
 
-#: src/cadet/gnunet-cadet.c:973
+#: src/cadet/gnunet-cadet.c:1003
 msgid "provide information about a particular tunnel"
 msgstr ""
 
-#: src/cadet/gnunet-cadet.c:976
+#: src/cadet/gnunet-cadet.c:1006
 msgid "provide information about all tunnels"
 msgstr ""
 
-#: src/cadet/gnunet-service-cadet_peer.c:562
+#: src/cadet/gnunet-service-cadet_peer.c:707
 msgid "Wrong CORE service\n"
 msgstr ""
 
-#: src/consensus/gnunet-consensus-profiler.c:496
+#: src/consensus/gnunet-consensus-profiler.c:499
 #: src/secretsharing/gnunet-secretsharing-profiler.c:607
 msgid "number of peers in consensus"
 msgstr ""
 
-#: src/consensus/gnunet-consensus-profiler.c:499
+#: src/consensus/gnunet-consensus-profiler.c:502
 msgid ""
 "how many peers (random selection without replacement) receive one value?"
 msgstr ""
 
-#: src/consensus/gnunet-consensus-profiler.c:502
-#: src/set/gnunet-set-profiler.c:377 src/set/gnunet-set-profiler.c:380
-#: src/set/gnunet-set-profiler.c:383
+#: src/consensus/gnunet-consensus-profiler.c:505
+#: src/set/gnunet-set-profiler.c:378 src/set/gnunet-set-profiler.c:381
+#: src/set/gnunet-set-profiler.c:384
 msgid "number of values"
 msgstr "nombre de valeurs"
 
-#: src/consensus/gnunet-consensus-profiler.c:505
+#: src/consensus/gnunet-consensus-profiler.c:508
 msgid "consensus timeout"
 msgstr ""
 
-#: src/consensus/gnunet-consensus-profiler.c:508
+#: src/consensus/gnunet-consensus-profiler.c:511
 msgid "delay until consensus starts"
 msgstr ""
 
-#: src/consensus/gnunet-consensus-profiler.c:511
-#: src/set/gnunet-set-profiler.c:389
+#: src/consensus/gnunet-consensus-profiler.c:514
+#: src/set/gnunet-set-profiler.c:390
 msgid "write statistics to file"
 msgstr ""
 
-#: src/consensus/gnunet-consensus-profiler.c:514
+#: src/consensus/gnunet-consensus-profiler.c:517
 #: src/secretsharing/gnunet-secretsharing-profiler.c:622
 msgid "be more verbose (print received values)"
 msgstr ""
 
-#: src/conversation/conversation_api.c:493
-#: src/conversation/conversation_api_call.c:475
+#: src/conversation/conversation_api.c:513
+#: src/conversation/conversation_api_call.c:490
 msgid "Connection to conversation service lost, trying to reconnect\n"
 msgstr ""
 
-#: src/conversation/conversation_api.c:617
-#, fuzzy
-msgid "number too large"
-msgstr "nombre de valeurs"
-
 #: src/conversation/gnunet-conversation.c:269
 #, c-format
 msgid "Incoming call from `%s'. Please /accept %u or /cancel %u the call.\n"
@@ -747,232 +749,231 @@
 msgid "Ego `%s' no longer available, phone is now down.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:366
+#: src/conversation/gnunet-conversation.c:367
 msgid "Failed to setup phone (internal error)\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:378
+#: src/conversation/gnunet-conversation.c:379
 #, c-format
-msgid ""
-"Phone active on line %u.  Type `/help' for a list of available commands\n"
+msgid "Phone active at `%s'.  Type `/help' for a list of available commands\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:400
+#: src/conversation/gnunet-conversation.c:401
 #, c-format
 msgid "Resolved address of `%s'. Now ringing other party.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:407
+#: src/conversation/gnunet-conversation.c:408
 #, c-format
 msgid "Connection established to `%s'\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:414
+#: src/conversation/gnunet-conversation.c:415
 #, c-format
 msgid "Failed to resolve `%s'\n"
 msgstr "Résolution de « %s » échouée\n"
 
-#: src/conversation/gnunet-conversation.c:422
+#: src/conversation/gnunet-conversation.c:423
 #, fuzzy, c-format
 msgid "Call to `%s' terminated\n"
 msgstr "Appel terminé\n"
 
-#: src/conversation/gnunet-conversation.c:431
+#: src/conversation/gnunet-conversation.c:432
 #, c-format
 msgid "Connection to `%s' suspended (by other user)\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:437
+#: src/conversation/gnunet-conversation.c:438
 #, c-format
 msgid "Connection to `%s' resumed (by other user)\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:442
+#: src/conversation/gnunet-conversation.c:443
 msgid "Error with the call, restarting it\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:511
+#: src/conversation/gnunet-conversation.c:512
 #, c-format
 msgid "Unknown command `%s'\n"
 msgstr "Commande « %s » inconnue\n"
 
-#: src/conversation/gnunet-conversation.c:527
-#: src/conversation/gnunet-conversation.c:541
+#: src/conversation/gnunet-conversation.c:528
+#: src/conversation/gnunet-conversation.c:542
 #, c-format
 msgid "Ego `%s' not available\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:534
-#: src/conversation/gnunet-conversation.c:591
+#: src/conversation/gnunet-conversation.c:535
+#: src/conversation/gnunet-conversation.c:592
 msgid "You are calling someone else already, hang up first!\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:549
-#: src/conversation/gnunet-conversation.c:604
+#: src/conversation/gnunet-conversation.c:550
+#: src/conversation/gnunet-conversation.c:605
 #, c-format
 msgid "You are answering call from `%s', hang up or suspend that call first!\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:559
+#: src/conversation/gnunet-conversation.c:560
 msgid "Call recipient missing.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:615
+#: src/conversation/gnunet-conversation.c:616
 msgid "There is no incoming call to accept here!\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:632
+#: src/conversation/gnunet-conversation.c:633
 #, c-format
 msgid "There is no incoming call `%s' to accept right now!\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:662
+#: src/conversation/gnunet-conversation.c:663
 msgid "We currently do not have an address.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:685
+#: src/conversation/gnunet-conversation.c:686
 #, c-format
 msgid "We are currently trying to locate the private key for the ego `%s'.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:690
+#: src/conversation/gnunet-conversation.c:691
 #, c-format
-msgid "We are listening for incoming calls for ego `%s' on line %u.\n"
+msgid "We are listening for incoming calls for ego `%s' on line `%s'.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:696
-#: src/conversation/gnunet-conversation.c:720
+#: src/conversation/gnunet-conversation.c:697
+#: src/conversation/gnunet-conversation.c:721
 #, c-format
 msgid "You are having a conversation with `%s'.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:701
+#: src/conversation/gnunet-conversation.c:702
 msgid ""
 "We had an internal error setting up our phone line. You can still make "
 "calls.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:710
+#: src/conversation/gnunet-conversation.c:711
 #, c-format
 msgid "We are trying to find the network address to call `%s'.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:715
+#: src/conversation/gnunet-conversation.c:716
 #, c-format
 msgid "We are calling `%s', his phone should be ringing.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:734
+#: src/conversation/gnunet-conversation.c:735
 msgid "Calls waiting:\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:740
+#: src/conversation/gnunet-conversation.c:741
 #, c-format
 msgid "#%u: `%s'\n"
 msgstr "#%u : « %s »\n"
 
-#: src/conversation/gnunet-conversation.c:768
-#: src/conversation/gnunet-conversation.c:783
+#: src/conversation/gnunet-conversation.c:769
+#: src/conversation/gnunet-conversation.c:784
 msgid "There is no call that could be suspended right now.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:816
-#: src/conversation/gnunet-conversation.c:832
+#: src/conversation/gnunet-conversation.c:817
+#: src/conversation/gnunet-conversation.c:833
 msgid "There is no call that could be resumed right now.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:839
+#: src/conversation/gnunet-conversation.c:840
 #, c-format
 msgid "Already talking with `%s', cannot resume a call right now.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:848
+#: src/conversation/gnunet-conversation.c:849
 msgid "There is no incoming call to resume here!\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:865
+#: src/conversation/gnunet-conversation.c:866
 #, c-format
 msgid "There is no incoming call `%s' to resume right now!\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:900
+#: src/conversation/gnunet-conversation.c:901
 msgid "There is no call that could be cancelled right now.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:908
+#: src/conversation/gnunet-conversation.c:909
 msgid "There is no incoming call to refuse here!\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:925
+#: src/conversation/gnunet-conversation.c:926
 #, c-format
 msgid "There is no incoming call `%s' to refuse right now!\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:951
+#: src/conversation/gnunet-conversation.c:952
 msgid "Use `/address' to find out which address this phone should have in GNS"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:953
+#: src/conversation/gnunet-conversation.c:954
 msgid "Use `/call USER.gnu' to call USER"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:955
+#: src/conversation/gnunet-conversation.c:956
 msgid "Use `/accept #NUM' to accept incoming call #NUM"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:957
+#: src/conversation/gnunet-conversation.c:958
 msgid "Use `/suspend' to suspend the active call"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:959
+#: src/conversation/gnunet-conversation.c:960
 msgid ""
 "Use `/resume [#NUM]' to resume a call, #NUM is needed to resume incoming "
 "calls, no argument is needed to resume the current outgoing call."
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:961
+#: src/conversation/gnunet-conversation.c:962
 msgid "Use `/cancel' to reject or terminate a call"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:963
+#: src/conversation/gnunet-conversation.c:964
 msgid "Use `/status' to print status information"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:965
+#: src/conversation/gnunet-conversation.c:966
 msgid "Use `/quit' to terminate gnunet-conversation"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:967
+#: src/conversation/gnunet-conversation.c:968
 msgid "Use `/help command' to get help for a specific command"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:1171
+#: src/conversation/gnunet-conversation.c:1172
 #, c-format
 msgid "Name of our ego changed to `%s'\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:1184
+#: src/conversation/gnunet-conversation.c:1185
 #, c-format
 msgid "Our ego `%s' was deleted!\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:1219
+#: src/conversation/gnunet-conversation.c:1220
 msgid "You must specify the NAME of an ego to use\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:1243
+#: src/conversation/gnunet-conversation.c:1244
 msgid "Failed to start gnunet-helper-w32-console\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:1269
+#: src/conversation/gnunet-conversation.c:1270
 msgid "sets the NAME of the ego to use for the phone (and name resolution)"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:1272
+#: src/conversation/gnunet-conversation.c:1273
 msgid "sets the LINE to use for the phone"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:1298
+#: src/conversation/gnunet-conversation.c:1299
 msgid "Enables having a conversation with other GNUnet users."
 msgstr ""
 
@@ -999,8 +1000,7 @@
 msgstr ""
 
 #: src/conversation/gnunet-conversation-test.c:243
-#: src/multicast/gnunet-multicast.c:70 src/revocation/gnunet-revocation.c:548
-#: src/template/gnunet-template.c:70
+#: src/revocation/gnunet-revocation.c:550 src/template/gnunet-template.c:76
 msgid "help text"
 msgstr ""
 
@@ -1129,27 +1129,18 @@
 msgid "Failed to allocate %u bytes for second packet\n"
 msgstr ""
 
-#: src/conversation/gnunet-service-conversation.c:855
-msgid "Cadet audio channel not ready; audio data dropped\n"
+#: src/conversation/microphone.c:121
+msgid "Could not start record audio helper\n"
 msgstr ""
 
-#: src/conversation/gnunet-service-conversation.c:946
+#: src/conversation/plugin_gnsrecord_conversation.c:71
 #, c-format
-msgid ""
-"No available phone for incoming call on line %u, sending HANG_UP signal\n"
+msgid "PHONE version %u not supported\n"
 msgstr ""
 
-#: src/conversation/gnunet-service-conversation.c:1360
+#: src/conversation/plugin_gnsrecord_conversation.c:133
+#: src/conversation/plugin_gnsrecord_conversation.c:147
 #, c-format
-msgid "Received incoming Cadet channel on port %u\n"
-msgstr ""
-
-#: src/conversation/microphone.c:121
-msgid "Could not start record audio helper\n"
-msgstr ""
-
-#: src/conversation/plugin_gnsrecord_conversation.c:116
-#, c-format
 msgid "Unable to parse PHONE record `%s'\n"
 msgstr ""
 
@@ -1157,10 +1148,6 @@
 msgid "Could not start playback audio helper.\n"
 msgstr ""
 
-#: src/core/core_api.c:725
-msgid "Client was disconnected from core service, trying to reconnect.\n"
-msgstr ""
-
 #: src/core/gnunet-core.c:90
 msgid "fresh connection"
 msgstr ""
@@ -1200,7 +1187,7 @@
 msgid "%24s: %-30s %4s (timeout in %6s)\n"
 msgstr ""
 
-#: src/core/gnunet-core.c:144 src/peerinfo-tool/gnunet-peerinfo.c:790
+#: src/core/gnunet-core.c:144 src/peerinfo-tool/gnunet-peerinfo.c:728
 #, c-format
 msgid "Invalid command line argument `%s'\n"
 msgstr ""
@@ -1209,7 +1196,7 @@
 msgid "Failed to connect to CORE service!\n"
 msgstr ""
 
-#: src/core/gnunet-core.c:176 src/transport/gnunet-transport.c:1990
+#: src/core/gnunet-core.c:176 src/transport/gnunet-transport.c:1737
 msgid "provide information about all current connections (continuously)"
 msgstr ""
 
@@ -1217,57 +1204,61 @@
 msgid "Print information about connected peers."
 msgstr ""
 
-#: src/core/gnunet-service-core.c:104
-msgid "Core service is lacking HOSTKEY configuration setting.  Exiting.\n"
+#: src/core/gnunet-service-core.c:339
+msgid "# send requests dropped (disconnected)"
 msgstr ""
 
-#: src/core/gnunet-service-core.c:127
-#, c-format
-msgid "Core service of `%4s' ready.\n"
+#: src/core/gnunet-service-core.c:363
+msgid "# dequeuing CAR (duplicate request)"
 msgstr ""
 
-#: src/core/gnunet-service-core_clients.c:380
-msgid "# send requests dropped (disconnected)"
+#: src/core/gnunet-service-core.c:432
+#, c-format
+msgid "# bytes of messages of type %u received"
 msgstr ""
 
-#: src/core/gnunet-service-core_clients.c:498
+#: src/core/gnunet-service-core.c:530
 msgid "# messages discarded (session disconnected)"
 msgstr ""
 
-#: src/core/gnunet-service-core_clients.c:561
+#: src/core/gnunet-service-core.c:928
+msgid "Core service is lacking HOSTKEY configuration setting.  Exiting.\n"
+msgstr ""
+
+#: src/core/gnunet-service-core.c:949
 #, c-format
-msgid "# bytes of messages of type %u received"
+msgid "Core service of `%s' ready.\n"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:571
+#: src/core/gnunet-service-core_kx.c:566
 msgid "# bytes encrypted"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:630
+#: src/core/gnunet-service-core_kx.c:626
 msgid "# bytes decrypted"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:719
+#: src/core/gnunet-service-core_kx.c:726
 msgid "# key exchanges initiated"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:766
+#: src/core/gnunet-service-core_kx.c:786
 msgid "# key exchanges stopped"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:796
+#: src/core/gnunet-service-core_kx.c:819
 msgid "# PING messages transmitted"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:871
+#: src/core/gnunet-service-core_kx.c:886
 msgid "# old ephemeral keys ignored"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:878
+#: src/core/gnunet-service-core_kx.c:893
 msgid "# ephemeral keys received"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:917
+#: src/core/gnunet-service-core_kx.c:932
 #, c-format
 msgid ""
 "Ephemeral key message from peer `%s' rejected as its validity range does not "
@@ -1274,134 +1265,116 @@
 "match our system time (%llu not in [%llu,%llu]).\n"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:928
+#: src/core/gnunet-service-core_kx.c:943
 msgid "# EPHEMERAL_KEY messages received"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1030
-#: src/transport/gnunet-service-transport_validation.c:1080
+#: src/core/gnunet-service-core_kx.c:1039
+#: src/transport/gnunet-service-transport_validation.c:1119
 msgid "# PING messages received"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1039
+#: src/core/gnunet-service-core_kx.c:1048
 msgid "# PING messages dropped (out of order)"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1092
+#: src/core/gnunet-service-core_kx.c:1106
 msgid "# PONG messages created"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1119
+#: src/core/gnunet-service-core_kx.c:1132
 msgid "# sessions terminated by timeout"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1132
+#: src/core/gnunet-service-core_kx.c:1145
 msgid "# keepalive messages sent"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1203
-#: src/transport/gnunet-service-transport_validation.c:1403
+#: src/core/gnunet-service-core_kx.c:1209
+#: src/transport/gnunet-service-transport_validation.c:1442
 msgid "# PONG messages received"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1210
+#: src/core/gnunet-service-core_kx.c:1216
 msgid "# PONG messages dropped (connection down)"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1215
+#: src/core/gnunet-service-core_kx.c:1221
 msgid "# PONG messages dropped (out of order)"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1251
+#: src/core/gnunet-service-core_kx.c:1256
 msgid "# PONG messages decrypted"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1289
+#: src/core/gnunet-service-core_kx.c:1294
 msgid "# session keys confirmed via PONG"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1300
+#: src/core/gnunet-service-core_kx.c:1305
 msgid "# timeouts prevented via PONG"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1307
+#: src/core/gnunet-service-core_kx.c:1312
 msgid "# rekey operations confirmed via PONG"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1463
+#: src/core/gnunet-service-core_kx.c:1485
 msgid "# DATA message dropped (out of order)"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1471
+#: src/core/gnunet-service-core_kx.c:1493
 #, 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:1474
+#: src/core/gnunet-service-core_kx.c:1496
 msgid "# sessions terminated by key expiration"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1532
-#: src/core/gnunet-service-core_kx.c:1558
+#: src/core/gnunet-service-core_kx.c:1554
+#: src/core/gnunet-service-core_kx.c:1580
 msgid "# bytes dropped (duplicates)"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1545
+#: src/core/gnunet-service-core_kx.c:1567
 msgid "# bytes dropped (out of sequence)"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1587
+#: src/core/gnunet-service-core_kx.c:1609
 msgid "# bytes dropped (ancient message)"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1595
+#: src/core/gnunet-service-core_kx.c:1617
 msgid "# bytes of payload decrypted"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1629
+#: src/core/gnunet-service-core_kx.c:1674
 msgid "# PAYLOAD dropped (out of order)"
 msgstr ""
 
-#: src/core/gnunet-service-core_neighbours.c:183
-msgid "# sessions terminated by transport disconnect"
-msgstr ""
-
-#: src/core/gnunet-service-core_neighbours.c:199
-#: src/core/gnunet-service-core_neighbours.c:387
-msgid "# neighbour entries allocated"
-msgstr ""
-
-#: src/core/gnunet-service-core_neighbours.c:291
-msgid "# encrypted bytes given to transport"
-msgstr ""
-
-#: src/core/gnunet-service-core_neighbours.c:486
-#, c-format
-msgid "Unsupported message of type %u (%u bytes) received from peer `%s'\n"
-msgstr ""
-
-#: src/core/gnunet-service-core_sessions.c:253
-#: src/core/gnunet-service-core_sessions.c:337
-#: src/dht/gnunet-service-dht_neighbours.c:789
-#: src/dht/gnunet-service-dht_neighbours.c:863
-#: src/fs/gnunet-service-fs_cp.c:662 src/fs/gnunet-service-fs_cp.c:1715
-#: src/topology/gnunet-daemon-topology.c:611
-#: src/topology/gnunet-daemon-topology.c:723
-#: src/transport/gnunet-service-transport_neighbours.c:720
-#: src/transport/gnunet-service-transport_neighbours.c:728
+#: src/core/gnunet-service-core_sessions.c:256
+#: src/core/gnunet-service-core_sessions.c:341
+#: src/dht/gnunet-service-dht_neighbours.c:741
+#: src/dht/gnunet-service-dht_neighbours.c:803
+#: 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
+#: src/transport/gnunet-service-transport_neighbours.c:719
+#: src/transport/gnunet-service-transport_neighbours.c:727
 msgid "# peers connected"
 msgstr ""
 
-#: src/core/gnunet-service-core_sessions.c:284
+#: src/core/gnunet-service-core_sessions.c:287
 msgid "# type map refreshes sent"
 msgstr ""
 
-#: src/core/gnunet-service-core_sessions.c:403
+#: src/core/gnunet-service-core_sessions.c:407
 msgid "# outdated typemap confirmations received"
 msgstr ""
 
-#: src/core/gnunet-service-core_sessions.c:414
+#: src/core/gnunet-service-core_sessions.c:418
 msgid "# valid typemap confirmations received"
 msgstr ""
 
@@ -1415,7 +1388,7 @@
 msgstr ""
 
 #: src/datacache/datacache.c:119 src/datacache/datacache.c:294
-#: src/datastore/gnunet-service-datastore.c:865
+#: src/datastore/gnunet-service-datastore.c:770
 msgid "# bytes stored"
 msgstr ""
 
@@ -1449,29 +1422,28 @@
 msgid "# proximity search requests received"
 msgstr ""
 
-#: src/datacache/plugin_datacache_heap.c:466
+#: src/datacache/plugin_datacache_heap.c:467
 msgid "Heap datacache running\n"
 msgstr ""
 
 #: src/datacache/plugin_datacache_sqlite.c:77
 #: src/datacache/plugin_datacache_sqlite.c:86
-#: src/datastore/plugin_datastore_mysql.c:818
-#: src/datastore/plugin_datastore_mysql.c:834
+#: src/datastore/plugin_datastore_mysql.c:1027
 #: src/datastore/plugin_datastore_sqlite.c:57
-#: src/datastore/plugin_datastore_sqlite.c:65 src/my/my.c:74 src/my/my.c:84
-#: src/mysql/mysql.c:41 src/mysql/mysql.c:48 src/mysql/mysql.c:522
-#: src/mysql/mysql.c:531 src/mysql/mysql.c:591 src/mysql/mysql.c:607
+#: src/datastore/plugin_datastore_sqlite.c:65 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/namestore/plugin_namestore_postgres.c:53
 #: src/namestore/plugin_namestore_sqlite.c:52
 #: src/peerstore/plugin_peerstore_sqlite.c:50
+#: src/psycstore/plugin_psycstore_mysql.c:62
 #: src/testbed/generate-underlay-topology.c:47
 #: src/testbed/gnunet-daemon-latency-logger.c:52
-#: src/testbed/gnunet-daemon-testbed-underlay.c:55
+#: src/testbed/gnunet-daemon-testbed-underlay.c:56
 #: src/testbed/testbed_api_hosts.c:69 src/util/crypto_ecc.c:52
 #: src/util/crypto_ecc_setup.c:41 src/util/crypto_mpi.c:39
-#: src/include/gnunet_common.h:677 src/include/gnunet_common.h:686
+#: src/include/gnunet_common.h:681 src/include/gnunet_common.h:690
 #: src/scalarproduct/scalarproduct.h:35
 #, c-format
 msgid "`%s' failed at %s:%d with error: %s\n"
@@ -1480,91 +1452,69 @@
 #: src/datacache/plugin_datacache_sqlite.c:749
 #: src/datastore/plugin_datastore_sqlite.c:409
 #: src/namecache/plugin_namecache_sqlite.c:292
-#: src/namestore/plugin_namestore_sqlite.c:324
+#: src/namestore/plugin_namestore_sqlite.c:343
 msgid "Tried to close sqlite without finalizing all prepared statements.\n"
 msgstr ""
 
-#: src/datastore/datastore_api.c:308
-msgid "Failed to transmit request to drop database.\n"
-msgstr ""
+#: src/datastore/datastore_api.c:309
+#, fuzzy
+msgid "DATASTORE disconnected"
+msgstr "Déconnecté de"
 
-#: src/datastore/datastore_api.c:392
-msgid "# queue entry timeouts"
-msgstr ""
+#: src/datastore/datastore_api.c:425
+#, fuzzy
+msgid "Disconnected from DATASTORE"
+msgstr "Déconnecté de"
 
-#: src/datastore/datastore_api.c:447
+#: src/datastore/datastore_api.c:513
 msgid "# queue overflows"
 msgstr ""
 
-#: src/datastore/datastore_api.c:475
+#: src/datastore/datastore_api.c:543
 msgid "# queue entries created"
 msgstr ""
 
-#: src/datastore/datastore_api.c:495
-msgid "# Requests dropped from datastore queue"
+#: src/datastore/datastore_api.c:680
+msgid "# status messages received"
 msgstr ""
 
-#: src/datastore/datastore_api.c:536
-msgid "# datastore connections (re)created"
+#: src/datastore/datastore_api.c:754
+msgid "# Results received"
 msgstr ""
 
-#: src/datastore/datastore_api.c:624
-msgid "# transmission request failures"
+#: src/datastore/datastore_api.c:879
+msgid "# datastore connections (re)created"
 msgstr ""
 
-#: src/datastore/datastore_api.c:648
-msgid "# bytes sent to datastore"
-msgstr ""
-
-#: src/datastore/datastore_api.c:790
-msgid "Failed to receive status response from database."
-msgstr ""
-
-#: src/datastore/datastore_api.c:804
-msgid "Error reading response from datastore service"
-msgstr ""
-
-#: src/datastore/datastore_api.c:816 src/datastore/datastore_api.c:822
-msgid "Invalid error message received from datastore service"
-msgstr ""
-
-#: src/datastore/datastore_api.c:826
-msgid "# status messages received"
-msgstr ""
-
-#: src/datastore/datastore_api.c:905
+#: src/datastore/datastore_api.c:995
 msgid "# PUT requests executed"
 msgstr ""
 
-#: src/datastore/datastore_api.c:971
+#: src/datastore/datastore_api.c:1056
 msgid "# RESERVE requests executed"
 msgstr ""
 
-#: src/datastore/datastore_api.c:1032
+#: src/datastore/datastore_api.c:1121
 msgid "# RELEASE RESERVE requests executed"
 msgstr ""
 
-#: src/datastore/datastore_api.c:1092
+#: src/datastore/datastore_api.c:1187
 msgid "# UPDATE requests executed"
 msgstr ""
 
-#: src/datastore/datastore_api.c:1156
+#: src/datastore/datastore_api.c:1271
 msgid "# REMOVE requests executed"
 msgstr ""
 
-#: src/datastore/datastore_api.c:1260
-msgid "# Results received"
-msgstr ""
-
-#: src/datastore/datastore_api.c:1327
+#: src/datastore/datastore_api.c:1331
 msgid "# GET REPLICATION requests executed"
 msgstr ""
 
-#: src/datastore/datastore_api.c:1390
+#: src/datastore/datastore_api.c:1397
 msgid "# GET ZERO ANONYMITY requests executed"
 msgstr ""
 
-#: src/datastore/datastore_api.c:1459
+#: src/datastore/datastore_api.c:1477
 msgid "# GET requests executed"
 msgstr ""
 
@@ -1588,36 +1538,26 @@
 msgid "Manipulate GNUnet datastore"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:370
+#: src/datastore/gnunet-service-datastore.c:336
 msgid "# bytes expired"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:446
+#: src/datastore/gnunet-service-datastore.c:416
 msgid "# bytes purged (low-priority)"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:504
-#: src/gns/gnunet-gns-helper-service-w32.c:221
-msgid "Transmission to client failed!\n"
-msgstr ""
-
-#: src/datastore/gnunet-service-datastore.c:535
-#: src/gns/gnunet-gns-helper-service-w32.c:260
-msgid "Shutdown in progress, aborting transmission.\n"
-msgstr ""
-
-#: src/datastore/gnunet-service-datastore.c:651
+#: src/datastore/gnunet-service-datastore.c:557
 msgid "# results found"
 msgstr "# résultats introuvables"
 
-#: src/datastore/gnunet-service-datastore.c:696
+#: src/datastore/gnunet-service-datastore.c:598
 #, c-format
 msgid ""
-"Insufficient space (%llu bytes are available) to satisfy `%s' request for "
+"Insufficient space (%llu bytes are available) to satisfy RESERVE request for "
 "%llu bytes\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:707
+#: src/datastore/gnunet-service-datastore.c:609
 #, c-format
 msgid ""
 "The requested amount (%llu bytes) is larger than the cache size (%llu "
@@ -1624,129 +1564,127 @@
 "bytes)\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:711
+#: src/datastore/gnunet-service-datastore.c:615
 msgid ""
 "Insufficient space to satisfy request and requested amount is larger than "
 "cache size"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:717
+#: src/datastore/gnunet-service-datastore.c:622
 msgid "Insufficient space to satisfy request"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:723
-#: src/datastore/gnunet-service-datastore.c:778
-#: src/datastore/gnunet-service-datastore.c:1039
-#: src/datastore/gnunet-service-datastore.c:1673
+#: src/datastore/gnunet-service-datastore.c:629
+#: src/datastore/gnunet-service-datastore.c:684
+#: src/datastore/gnunet-service-datastore.c:969
+#: src/datastore/gnunet-service-datastore.c:1668
 msgid "# reserved"
 msgstr "# réservé"
 
-#: src/datastore/gnunet-service-datastore.c:792
+#: src/datastore/gnunet-service-datastore.c:702
 msgid "Could not find matching reservation"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:879
+#: src/datastore/gnunet-service-datastore.c:787
 #, c-format
 msgid "Need %llu bytes more space (%llu allowed, using %llu)\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1094
+#: src/datastore/gnunet-service-datastore.c:1017
 msgid "# GET requests received"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1107
+#: src/datastore/gnunet-service-datastore.c:1048
+msgid "# GET KEY requests received"
+msgstr ""
+
+#: src/datastore/gnunet-service-datastore.c:1061
 msgid "# requests filtered by bloomfilter"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1155
+#: src/datastore/gnunet-service-datastore.c:1115
 msgid "# UPDATE requests received"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1187
+#: src/datastore/gnunet-service-datastore.c:1146
 msgid "# GET REPLICATION requests received"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1223
+#: src/datastore/gnunet-service-datastore.c:1179
 msgid "# GET ZERO ANONYMITY requests received"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1269
+#: src/datastore/gnunet-service-datastore.c:1226
 msgid "Content not found"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1279
+#: src/datastore/gnunet-service-datastore.c:1235
 msgid "# bytes removed (explicit request)"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1311
+#: src/datastore/gnunet-service-datastore.c:1282
 msgid "# REMOVE requests received"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1364
+#: src/datastore/gnunet-service-datastore.c:1336
 #, c-format
 msgid ""
 "Datastore payload must have been inaccurate (%lld < %lld). Recomputing it.\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1369
+#: src/datastore/gnunet-service-datastore.c:1342
+#: src/datastore/gnunet-service-datastore.c:1517
 #, c-format
 msgid "New payload: %lld\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1423
+#: src/datastore/gnunet-service-datastore.c:1396
 #, c-format
 msgid "Loading `%s' datastore plugin\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1434
+#: src/datastore/gnunet-service-datastore.c:1408
 #, c-format
 msgid "Failed to load datastore plugin for `%s'\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1503
-#: src/datastore/gnunet-service-datastore.c:1566
+#: src/datastore/gnunet-service-datastore.c:1468
 msgid "Bloomfilter construction complete.\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1553
+#: src/datastore/gnunet-service-datastore.c:1524
 msgid "Rebuilding bloomfilter.  Please be patient.\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1563
+#: src/datastore/gnunet-service-datastore.c:1535
 msgid "Plugin does not support get_keys function. Please fix!\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1704
-#: src/datastore/gnunet-service-datastore.c:1716
+#: src/datastore/gnunet-service-datastore.c:1705
 #, c-format
-msgid "No `%s' specified for `%s' in configuration!\n"
-msgstr ""
-
-#: src/datastore/gnunet-service-datastore.c:1710
-#, c-format
 msgid "# bytes used in file-sharing datastore `%s'"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1722
+#: src/datastore/gnunet-service-datastore.c:1721
 msgid "# quota"
 msgstr "# quota"
 
-#: src/datastore/gnunet-service-datastore.c:1724
+#: src/datastore/gnunet-service-datastore.c:1726
 msgid "# cache size"
 msgstr "# taille du cache"
 
-#: src/datastore/gnunet-service-datastore.c:1739
+#: src/datastore/gnunet-service-datastore.c:1742
 #, c-format
 msgid "Could not use specified filename `%s' for bloomfilter.\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1757
-#: src/datastore/gnunet-service-datastore.c:1773
+#: src/datastore/gnunet-service-datastore.c:1760
+#: src/datastore/gnunet-service-datastore.c:1776
 #, c-format
 msgid "Failed to remove bogus bloomfilter file `%s'\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1803
+#: src/datastore/gnunet-service-datastore.c:1808
 msgid "Failed to initialize bloomfilter.\n"
 msgstr ""
 
@@ -1754,26 +1692,22 @@
 msgid "Heap database running\n"
 msgstr ""
 
-#: src/datastore/plugin_datastore_mysql.c:309
+#: src/datastore/plugin_datastore_mysql.c:347
 #: src/datastore/plugin_datastore_sqlite.c:507
 msgid "Data too large"
 msgstr ""
 
-#: src/datastore/plugin_datastore_mysql.c:328
+#: src/datastore/plugin_datastore_mysql.c:363
 msgid "MySQL statement run failure"
 msgstr ""
 
-#: src/datastore/plugin_datastore_mysql.c:793
+#: src/datastore/plugin_datastore_mysql.c:983
 #, c-format
-msgid "Failed to prepare statement `%s'\n"
-msgstr ""
-
-#: src/datastore/plugin_datastore_mysql.c:802
-#, c-format
 msgid "`%s' for `%s' failed at %s:%d with error: %s\n"
 msgstr ""
 
-#: src/datastore/plugin_datastore_mysql.c:1036
+#: src/datastore/plugin_datastore_mysql.c:1257
+#: src/psycstore/plugin_psycstore_mysql.c:1936
 msgid "Mysql database running\n"
 msgstr ""
 
@@ -1788,6 +1722,7 @@
 #: src/datastore/plugin_datastore_postgres.c:1012
 #: 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 ""
 
@@ -1794,7 +1729,7 @@
 #: src/datastore/plugin_datastore_sqlite.c:65
 #: src/testbed/generate-underlay-topology.c:50
 #: src/testbed/gnunet-daemon-latency-logger.c:55
-#: src/testbed/gnunet-daemon-testbed-underlay.c:58
+#: src/testbed/gnunet-daemon-testbed-underlay.c:59
 #, c-format
 msgid "`%s' failed at %s:%u with error: %s"
 msgstr ""
@@ -1801,7 +1736,7 @@
 
 #: src/datastore/plugin_datastore_sqlite.c:263
 #: src/namecache/plugin_namecache_sqlite.c:193
-#: src/namestore/plugin_namestore_sqlite.c:204
+#: src/namestore/plugin_namestore_sqlite.c:213
 #: src/peerstore/plugin_peerstore_sqlite.c:479
 #: src/psycstore/plugin_psycstore_sqlite.c:325
 #, c-format
@@ -1825,7 +1760,7 @@
 
 #: src/datastore/plugin_datastore_sqlite.c:1245
 #: src/namecache/plugin_namecache_sqlite.c:580
-#: src/namestore/plugin_namestore_sqlite.c:716
+#: src/namestore/plugin_namestore_sqlite.c:766
 msgid "Sqlite database running\n"
 msgstr ""
 
@@ -1833,10 +1768,6 @@
 msgid "Template database running\n"
 msgstr ""
 
-#: src/dht/dht_api.c:403
-msgid "Failed to connect to the DHT service!\n"
-msgstr ""
-
 #: src/dht/gnunet-dht-get.c:155
 #, c-format
 msgid ""
@@ -1859,7 +1790,7 @@
 msgstr ""
 
 #: src/dht/gnunet-dht-get.c:212 src/dht/gnunet-dht-monitor.c:289
-#: src/dht/gnunet-dht-put.c:202
+#: src/dht/gnunet-dht-put.c:198
 msgid "the query key"
 msgstr ""
 
@@ -1871,18 +1802,18 @@
 msgid "the type of data to look for"
 msgstr ""
 
-#: src/dht/gnunet-dht-get.c:221 src/dht/gnunet-dht-put.c:214
+#: src/dht/gnunet-dht-get.c:221
 msgid "how long to execute this query before giving up?"
 msgstr ""
 
-#: src/dht/gnunet-dht-get.c:224 src/dht/gnunet-dht-put.c:205
+#: src/dht/gnunet-dht-get.c:224 src/dht/gnunet-dht-put.c:201
 msgid "use DHT's demultiplex everywhere option"
 msgstr ""
 
 #: src/dht/gnunet-dht-get.c:227 src/dht/gnunet-dht-monitor.c:298
-#: src/dht/gnunet-dht-put.c:217 src/fs/gnunet-auto-share.c:780
+#: src/dht/gnunet-dht-put.c:210 src/fs/gnunet-auto-share.c:780
 #: src/fs/gnunet-download.c:327 src/fs/gnunet-publish.c:951
-#: src/fs/gnunet-search.c:318 src/fs/gnunet-unindex.c:167
+#: src/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 ""
@@ -1899,339 +1830,280 @@
 msgid "Prints all packets that go through the DHT."
 msgstr ""
 
-#: src/dht/gnunet_dht_profiler.c:1392
-#: src/testbed/gnunet-testbed-profiler.c:255
+#: src/dht/gnunet_dht_profiler.c:1161 src/testbed/gnunet-testbed-profiler.c:255
 #, c-format
 msgid "Exiting as the number of peers is %u\n"
 msgstr ""
 
-#: src/dht/gnunet_dht_profiler.c:1417
+#: src/dht/gnunet_dht_profiler.c:1186
 #, fuzzy
 msgid "number of peers to start"
 msgstr "nombre de valeurs"
 
-#: src/dht/gnunet_dht_profiler.c:1420
+#: src/dht/gnunet_dht_profiler.c:1189
 msgid ""
 "maximum number of times we try to search for successor circle formation (0 "
 "for R5N)"
 msgstr ""
 
-#: src/dht/gnunet_dht_profiler.c:1423 src/nse/gnunet-nse-profiler.c:846
+#: src/dht/gnunet_dht_profiler.c:1192 src/nse/gnunet-nse-profiler.c:846
 #: src/testbed/gnunet-testbed-profiler.c:294
 msgid "name of the file with the login information for the testbed"
 msgstr ""
 
-#: src/dht/gnunet_dht_profiler.c:1426
+#: src/dht/gnunet_dht_profiler.c:1195
 msgid "delay between rounds for collecting statistics (default: 30 sec)"
 msgstr ""
 
-#: src/dht/gnunet_dht_profiler.c:1429
+#: src/dht/gnunet_dht_profiler.c:1198
 msgid "delay to start doing PUTs (default: 1 sec)"
 msgstr ""
 
-#: src/dht/gnunet_dht_profiler.c:1432
+#: src/dht/gnunet_dht_profiler.c:1201
 msgid "delay to start doing GETs (default: 5 min)"
 msgstr ""
 
-#: src/dht/gnunet_dht_profiler.c:1435
+#: src/dht/gnunet_dht_profiler.c:1204
 msgid "replication degree for DHT PUTs"
 msgstr ""
 
-#: src/dht/gnunet_dht_profiler.c:1438
+#: src/dht/gnunet_dht_profiler.c:1207
 msgid "timeout for DHT PUT and GET requests (default: 1 min)"
 msgstr ""
 
-#: src/dht/gnunet_dht_profiler.c:1456
+#: src/dht/gnunet_dht_profiler.c:1225
 msgid "Measure quality and performance of the DHT service."
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:120
+#: src/dht/gnunet-dht-put.c:115
 msgid "PUT request sent with key"
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:123
+#: src/dht/gnunet-dht-put.c:118
 msgid "Timeout sending PUT request!\n"
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:126
+#: src/dht/gnunet-dht-put.c:121
 msgid "PUT request not confirmed!\n"
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:157
+#: src/dht/gnunet-dht-put.c:151
 msgid "Must provide KEY and DATA for DHT put!\n"
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:164
+#: src/dht/gnunet-dht-put.c:158
 #, c-format
 msgid "Could not connect to %s service!\n"
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:180
+#: src/dht/gnunet-dht-put.c:172
 #, c-format
 msgid "Issuing put request for `%s' with data `%s'!\n"
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:196
+#: src/dht/gnunet-dht-put.c:192
 msgid "the data to insert under the key"
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:199
+#: src/dht/gnunet-dht-put.c:195
 msgid "how long to store this entry in the dht (in seconds)"
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:208
+#: src/dht/gnunet-dht-put.c:204
 msgid "how many replicas to create"
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:211
+#: src/dht/gnunet-dht-put.c:207
 msgid "the type to insert data as"
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:240
+#: src/dht/gnunet-dht-put.c:232
 msgid "Issue a PUT request to the GNUnet DHT insert DATA under KEY."
 msgstr ""
 
-#: src/dht/gnunet-service-dht.c:171
-msgid "Failed to connect to transport service!\n"
-msgstr ""
-
-#: src/dht/gnunet-service-dht_clients.c:417
-#: src/dht/gnunet-service-wdht_clients.c:857
-#: src/dht/gnunet-service-xdht_clients.c:854
+#: src/dht/gnunet-service-dht_clients.c:370
+#: src/dht/gnunet-service-wdht_clients.c:864
 msgid "# GET requests from clients injected"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_clients.c:509
-#: src/dht/gnunet-service-wdht_clients.c:938
-#: src/dht/gnunet-service-xdht_clients.c:934
+#: src/dht/gnunet-service-dht_clients.c:481
+#: src/dht/gnunet-service-wdht_clients.c:945
 msgid "# PUT requests received from clients"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_clients.c:593
-#: src/dht/gnunet-service-wdht_clients.c:1004
-#: src/dht/gnunet-service-xdht_clients.c:999
+#: src/dht/gnunet-service-dht_clients.c:620
+#: src/dht/gnunet-service-wdht_clients.c:1011
 msgid "# GET requests received from clients"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_clients.c:794
-#: src/dht/gnunet-service-wdht_clients.c:1213
-#: src/dht/gnunet-service-xdht_clients.c:1201
+#: src/dht/gnunet-service-dht_clients.c:847
+#: src/dht/gnunet-service-wdht_clients.c:1220
 msgid "# GET STOP requests received from clients"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_clients.c:1041
+#: src/dht/gnunet-service-dht_clients.c:1032
 #: src/dht/gnunet-service-wdht_clients.c:510
-#: src/dht/gnunet-service-xdht_clients.c:508
 msgid "# Key match, type mismatches in REPLY to CLIENT"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_clients.c:1054
+#: src/dht/gnunet-service-dht_clients.c:1047
 #: src/dht/gnunet-service-wdht_clients.c:524
-#: src/dht/gnunet-service-xdht_clients.c:522
 msgid "# Duplicate REPLIES to CLIENT request dropped"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_clients.c:1099
+#: src/dht/gnunet-service-dht_clients.c:1094
 #: src/dht/gnunet-service-wdht_clients.c:566
-#: src/dht/gnunet-service-xdht_clients.c:564
 #, c-format
 msgid "Unsupported block type (%u) in request!\n"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_clients.c:1122
+#: src/dht/gnunet-service-dht_clients.c:1101
 #: src/dht/gnunet-service-wdht_clients.c:589
-#: src/dht/gnunet-service-xdht_clients.c:587
 msgid "# RESULTS queued for clients"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_clients.c:1176
-#: src/dht/gnunet-service-dht_clients.c:1219
+#: src/dht/gnunet-service-dht_clients.c:1179
 #: src/dht/gnunet-service-wdht_clients.c:643
-#: src/dht/gnunet-service-wdht_clients.c:686
-#: src/dht/gnunet-service-xdht_clients.c:641
-#: src/dht/gnunet-service-xdht_clients.c:684
+#: src/dht/gnunet-service-wdht_clients.c:693
 msgid "# REPLIES ignored for CLIENTS (no match)"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_clients.c:1186
-#: src/dht/gnunet-service-wdht_clients.c:653
-#: src/dht/gnunet-service-xdht_clients.c:651
-msgid "Could not pass reply to client, message too big!\n"
-msgstr ""
-
-#: src/dht/gnunet-service-dht_datacache.c:68
+#: src/dht/gnunet-service-dht_datacache.c:72
 #, c-format
 msgid "%s request received, but have no datacache!\n"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_datacache.c:78
-#: src/dht/gnunet-service-wdht_datacache.c:107
-#: src/dht/gnunet-service-xdht_datacache.c:91
+#: src/dht/gnunet-service-dht_datacache.c:82
 msgid "# ITEMS stored in datacache"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_datacache.c:184
-#: src/dht/gnunet-service-wdht_datacache.c:216
-#: src/dht/gnunet-service-xdht_datacache.c:238
+#: src/dht/gnunet-service-dht_datacache.c:199
 msgid "# Good RESULTS found in datacache"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_datacache.c:201
-#: src/dht/gnunet-service-wdht_datacache.c:231
-#: src/dht/gnunet-service-xdht_datacache.c:267
+#: src/dht/gnunet-service-dht_datacache.c:211
 msgid "# Duplicate RESULTS found in datacache"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_datacache.c:207
-#: src/dht/gnunet-service-wdht_datacache.c:237
-#: src/dht/gnunet-service-xdht_datacache.c:273
+#: src/dht/gnunet-service-dht_datacache.c:217
 msgid "# Invalid RESULTS found in datacache"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_datacache.c:213
-#: src/dht/gnunet-service-wdht_datacache.c:243
-#: src/dht/gnunet-service-xdht_datacache.c:279
+#: src/dht/gnunet-service-dht_datacache.c:223
 msgid "# Irrelevant RESULTS found in datacache"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_datacache.c:225
-#: src/dht/gnunet-service-wdht_datacache.c:255
-#: src/dht/gnunet-service-xdht_datacache.c:291
+#: src/dht/gnunet-service-dht_datacache.c:235
 msgid "# Unsupported RESULTS found in datacache"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_datacache.c:229
-#: src/dht/gnunet-service-wdht_datacache.c:258
-#: src/dht/gnunet-service-xdht_datacache.c:294
+#: src/dht/gnunet-service-dht_datacache.c:239
 #, c-format
 msgid "Unsupported block type (%u) in local response!\n"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_datacache.c:262
-#: src/dht/gnunet-service-wdht_datacache.c:295
-#: src/dht/gnunet-service-xdht_datacache.c:334
+#: src/dht/gnunet-service-dht_datacache.c:276
 msgid "# GET requests given to datacache"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_hello.c:84
-#: src/dht/gnunet-service-xdht_hello.c:82
+#: src/dht/gnunet-service-dht_hello.c:84 src/dht/gnunet-service-xdht_hello.c:82
 msgid "# HELLOs obtained from peerinfo"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:735
+#: src/dht/gnunet-service-dht_neighbours.c:685
 msgid "# FIND PEER messages initiated"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:900
-#: src/dht/gnunet-service-xdht_neighbours.c:6062
-msgid "# Queued messages discarded (peer disconnected)"
-msgstr ""
-
-#: src/dht/gnunet-service-dht_neighbours.c:933
-#: src/dht/gnunet-service-xdht_neighbours.c:986
-msgid "# Messages dropped (CORE timeout)"
-msgstr ""
-
-#: src/dht/gnunet-service-dht_neighbours.c:963
-#: src/dht/gnunet-service-xdht_neighbours.c:1018
-msgid "# Bytes transmitted to other peers"
-msgstr ""
-
-#: src/dht/gnunet-service-dht_neighbours.c:1009
-msgid "# Bytes of bandwidth requested from core"
-msgstr ""
-
-#: src/dht/gnunet-service-dht_neighbours.c:1043
+#: src/dht/gnunet-service-dht_neighbours.c:851
 msgid "# requests TTL-dropped"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1248
-#: src/dht/gnunet-service-dht_neighbours.c:1285
+#: src/dht/gnunet-service-dht_neighbours.c:1054
+#: src/dht/gnunet-service-dht_neighbours.c:1091
 msgid "# Peers excluded from routing due to Bloomfilter"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1263
-#: src/dht/gnunet-service-dht_neighbours.c:1300
+#: src/dht/gnunet-service-dht_neighbours.c:1071
+#: src/dht/gnunet-service-dht_neighbours.c:1107
 msgid "# Peer selection failed"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1447
+#: src/dht/gnunet-service-dht_neighbours.c:1255
 msgid "# PUT requests routed"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1476
+#: src/dht/gnunet-service-dht_neighbours.c:1288
 msgid "# PUT messages queued for transmission"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1486
-#: src/dht/gnunet-service-dht_neighbours.c:1610
-#: src/dht/gnunet-service-dht_neighbours.c:1717
-#: src/dht/gnunet-service-xdht_neighbours.c:1128
-#: src/dht/gnunet-service-xdht_neighbours.c:1197
-#: src/dht/gnunet-service-xdht_neighbours.c:1247
-#: src/dht/gnunet-service-xdht_neighbours.c:1311
-#: src/dht/gnunet-service-xdht_neighbours.c:1378
-#: src/dht/gnunet-service-xdht_neighbours.c:1440
-#: src/dht/gnunet-service-xdht_neighbours.c:1502
-#: src/dht/gnunet-service-xdht_neighbours.c:1564
-#: src/dht/gnunet-service-xdht_neighbours.c:1624
+#: src/dht/gnunet-service-dht_neighbours.c:1299
+#: src/dht/gnunet-service-dht_neighbours.c:1427
+#: src/dht/gnunet-service-dht_neighbours.c:1532
+#: 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:1572
+#: src/dht/gnunet-service-dht_neighbours.c:1383
 msgid "# GET requests routed"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1599
+#: src/dht/gnunet-service-dht_neighbours.c:1415
 msgid "# GET messages queued for transmission"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1724
+#: src/dht/gnunet-service-dht_neighbours.c:1547
 msgid "# RESULT messages queued for transmission"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1811
+#: src/dht/gnunet-service-dht_neighbours.c:1646
 msgid "# P2P PUT requests received"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1814
+#: src/dht/gnunet-service-dht_neighbours.c:1650
 msgid "# P2P PUT bytes received"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1986
+#: src/dht/gnunet-service-dht_neighbours.c:1854
 msgid "# FIND PEER requests ignored due to Bloomfilter"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1994
+#: src/dht/gnunet-service-dht_neighbours.c:1862
 msgid "# FIND PEER requests ignored due to lack of HELLO"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:2089
+#: src/dht/gnunet-service-dht_neighbours.c:2018
 msgid "# P2P GET requests received"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:2092
+#: src/dht/gnunet-service-dht_neighbours.c:2022
 msgid "# P2P GET bytes received"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:2157
+#: src/dht/gnunet-service-dht_neighbours.c:2097
 msgid "# P2P FIND PEER requests processed"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:2171
+#: src/dht/gnunet-service-dht_neighbours.c:2120
 msgid "# P2P GET requests ONLY routed"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:2257
+#: src/dht/gnunet-service-dht_neighbours.c:2222
 msgid "# P2P RESULTS received"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:2260
+#: src/dht/gnunet-service-dht_neighbours.c:2226
 msgid "# P2P RESULT bytes received"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_nse.c:59 src/dht/gnunet-service-wdht_nse.c:59
-#: src/dht/gnunet-service-xdht_nse.c:59
+#: src/dht/gnunet-service-dht_nse.c:59
 msgid "# Network size estimates received"
 msgstr ""
 
@@ -2255,23 +2127,23 @@
 msgid "# Unsupported REPLIES matched against routing table"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_routing.c:324
+#: src/dht/gnunet-service-dht_routing.c:327
 msgid "# Entries removed from routing table"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_routing.c:406
+#: src/dht/gnunet-service-dht_routing.c:409
 msgid "# Entries added to routing table"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_routing.c:424
+#: src/dht/gnunet-service-dht_routing.c:427
 msgid "# DHT requests combined"
 msgstr ""
 
-#: src/dht/gnunet-service-wdht_datacache.c:82
-msgid "PUT request received, but have no datacache!\n"
+#: src/dht/gnunet-service-wdht_clients.c:653
+msgid "Could not pass reply to client, message too big!\n"
 msgstr ""
 
-#: src/dht/gnunet-service-xdht_neighbours.c:1831
+#: src/dht/gnunet-service-xdht_neighbours.c:1572
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -2280,7 +2152,7 @@
 "\n"
 "SUPU %s, %s, %d,my_identity = %s"
 
-#: src/dht/gnunet-service-xdht_neighbours.c:1836
+#: src/dht/gnunet-service-xdht_neighbours.c:1577
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -2289,7 +2161,7 @@
 "\n"
 "SUPU %s, %s, %d"
 
-#: src/dht/gnunet-service-xdht_neighbours.c:1856
+#: src/dht/gnunet-service-xdht_neighbours.c:1597
 #, c-format
 msgid ""
 "\n"
@@ -2296,7 +2168,7 @@
 "SUPU************  FRIEND_PEERMAP of %s"
 msgstr ""
 
-#: src/dht/gnunet-service-xdht_neighbours.c:1866
+#: src/dht/gnunet-service-xdht_neighbours.c:1607
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -2305,7 +2177,7 @@
 "\n"
 "SUPU %s, %s, %d,my_identity = %s"
 
-#: src/dht/gnunet-service-xdht_neighbours.c:1887
+#: src/dht/gnunet-service-xdht_neighbours.c:1628
 #, c-format
 msgid ""
 "\n"
@@ -2312,7 +2184,7 @@
 "SUPU************  FINGER_TABLE of %s"
 msgstr ""
 
-#: src/dht/gnunet-service-xdht_neighbours.c:1896
+#: src/dht/gnunet-service-xdht_neighbours.c:1637
 #, c-format
 msgid ""
 "\n"
@@ -2319,7 +2191,7 @@
 "SUPU %s, %s, %d, finger_table[%d] = %s, trails_count = %d"
 msgstr ""
 
-#: src/dht/gnunet-service-xdht_neighbours.c:1903
+#: src/dht/gnunet-service-xdht_neighbours.c:1644
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -2328,7 +2200,7 @@
 "\n"
 "SUPU %s, %s, %d,my_identity = %s"
 
-#: src/dht/gnunet-service-xdht_neighbours.c:1909
+#: src/dht/gnunet-service-xdht_neighbours.c:1650
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -2337,26 +2209,26 @@
 "\n"
 "SUPU %s, %s, %d,my_identity = %s"
 
-#: src/dht/gnunet-service-xdht_neighbours.c:3557
+#: src/dht/gnunet-service-xdht_neighbours.c:3366
 msgid "# FINGERS_COUNT"
 msgstr ""
 
-#: src/dht/gnunet-service-xdht_neighbours.c:3698
-#: src/dht/gnunet-service-xdht_neighbours.c:3936
-#: src/dht/gnunet-service-xdht_neighbours.c:4088
-#: src/dht/gnunet-service-xdht_neighbours.c:4240
-#: src/dht/gnunet-service-xdht_neighbours.c:4421
-#: src/dht/gnunet-service-xdht_neighbours.c:4934
-#: src/dht/gnunet-service-xdht_neighbours.c:5325
-#: src/dht/gnunet-service-xdht_neighbours.c:5420
-#: src/dht/gnunet-service-xdht_neighbours.c:5510
-#: src/dht/gnunet-service-xdht_neighbours.c:5614
-#: src/dht/gnunet-service-xdht_neighbours.c:5758
-#: src/dht/gnunet-service-xdht_neighbours.c:5849
+#: 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:256
+#: src/dht/gnunet-service-xdht_routing.c:261
 #, c-format
 msgid ""
 "\n"
@@ -2363,7 +2235,7 @@
 "SUPU ***PRINTING ROUTING TABLE ***** of =%s"
 msgstr ""
 
-#: src/dht/gnunet-service-xdht_routing.c:264
+#: src/dht/gnunet-service-xdht_routing.c:269
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -2372,7 +2244,7 @@
 "\n"
 "SUPU %s, %s, %d,my_identity = %s"
 
-#: src/dht/gnunet-service-xdht_routing.c:267
+#: src/dht/gnunet-service-xdht_routing.c:272
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -2381,7 +2253,7 @@
 "\n"
 "SUPU %s, %s, %d,my_identity = %s"
 
-#: src/dht/gnunet-service-xdht_routing.c:270
+#: src/dht/gnunet-service-xdht_routing.c:275
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -2414,27 +2286,27 @@
 msgid "Failed to convert UTF-8 name `%s' to DNS IDNA format: %s\n"
 msgstr ""
 
-#: src/dns/dnsstub.c:175
+#: src/dns/dnsstub.c:176
 #, c-format
 msgid "Could not bind to any port: %s\n"
 msgstr ""
 
-#: src/dns/dnsstub.c:293 src/dns/dnsstub.c:381
+#: src/dns/dnsstub.c:294 src/dns/dnsstub.c:382
 #, c-format
 msgid "Failed to send DNS request to %s\n"
 msgstr ""
 
-#: src/dns/dnsstub.c:297
+#: src/dns/dnsstub.c:298
 #, c-format
 msgid "Sent DNS request to %s\n"
 msgstr ""
 
-#: src/dns/dnsstub.c:366
+#: src/dns/dnsstub.c:367
 #, c-format
 msgid "Configured DNS exit `%s' is not working / valid.\n"
 msgstr ""
 
-#: src/dns/dnsstub.c:438
+#: src/dns/dnsstub.c:437
 #, c-format
 msgid "Received DNS response that is too small (%u bytes)"
 msgstr ""
@@ -2463,48 +2335,52 @@
 msgid "Change DNS replies to point elsewhere."
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:457
+#: src/dns/gnunet-service-dns.c:462
 msgid "# DNS requests answered via TUN interface"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:604
+#: src/dns/gnunet-service-dns.c:608
 msgid "# DNS exit failed (failed to open socket)"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:715
+#: src/dns/gnunet-service-dns.c:738
 msgid "# External DNS response discarded (no matching request)"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:793
+#: src/dns/gnunet-service-dns.c:813
 msgid "# Client response discarded (no matching request)"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:908
+#: src/dns/gnunet-service-dns.c:929
 msgid "Received malformed IPv4-UDP packet on TUN interface.\n"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:924
+#: src/dns/gnunet-service-dns.c:945
 msgid "Received malformed IPv6-UDP packet on TUN interface.\n"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:933
+#: src/dns/gnunet-service-dns.c:954
 #, c-format
 msgid "Got non-IP packet with %u bytes and protocol %u from TUN\n"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:943
+#: src/dns/gnunet-service-dns.c:964
+msgid "DNS interceptor got non-DNS packet (dropped)\n"
+msgstr ""
+
+#: src/dns/gnunet-service-dns.c:966
 msgid "# Non-DNS UDP packet received via TUN interface"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:1010
+#: src/dns/gnunet-service-dns.c:1033
 msgid "# DNS requests received via TUN interface"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:1062 src/exit/gnunet-daemon-exit.c:3607
+#: src/dns/gnunet-service-dns.c:1078 src/exit/gnunet-daemon-exit.c:3643
 msgid "need a valid IPv4 or IPv6 address\n"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:1080
+#: src/dns/gnunet-service-dns.c:1091
 #, c-format
 msgid "`%s' must be installed SUID, will not run DNS interceptor\n"
 msgstr ""
@@ -2517,212 +2393,198 @@
 msgid "Print information about DV state"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:807
+#: src/exit/gnunet-daemon-exit.c:805 src/exit/gnunet-daemon-exit.c:3109
+msgid "# Inbound CADET channels created"
+msgstr ""
+
+#: src/exit/gnunet-daemon-exit.c:861
 #, c-format
 msgid "Got duplicate service records for `%s:%u'\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:858
+#: src/exit/gnunet-daemon-exit.c:914
 msgid "# Bytes transmitted via cadet channels"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:975 src/exit/gnunet-daemon-exit.c:2408
-#: src/exit/gnunet-daemon-exit.c:2666 src/vpn/gnunet-service-vpn.c:1446
-#: src/vpn/gnunet-service-vpn.c:1837 src/vpn/gnunet-service-vpn.c:2000
+#: src/exit/gnunet-daemon-exit.c:1033 src/exit/gnunet-daemon-exit.c:2493
+#: src/exit/gnunet-daemon-exit.c:2746 src/vpn/gnunet-service-vpn.c:1455
+#: src/vpn/gnunet-service-vpn.c:1846 src/vpn/gnunet-service-vpn.c:2009
 msgid "# ICMPv4 packets dropped (type not allowed)"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:1012 src/exit/gnunet-daemon-exit.c:2467
-#: src/exit/gnunet-daemon-exit.c:2725 src/vpn/gnunet-service-vpn.c:1502
-#: src/vpn/gnunet-service-vpn.c:1896 src/vpn/gnunet-service-vpn.c:2033
+#: src/exit/gnunet-daemon-exit.c:1070 src/exit/gnunet-daemon-exit.c:2552
+#: src/exit/gnunet-daemon-exit.c:2805 src/vpn/gnunet-service-vpn.c:1511
+#: src/vpn/gnunet-service-vpn.c:1905 src/vpn/gnunet-service-vpn.c:2042
 msgid "# ICMPv6 packets dropped (type not allowed)"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:1052
+#: src/exit/gnunet-daemon-exit.c:1118
 msgid "# ICMP packets dropped (not allowed)"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:1059
+#: src/exit/gnunet-daemon-exit.c:1126
 msgid "ICMP Packet dropped, have no matching connection information\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:1135
+#: src/exit/gnunet-daemon-exit.c:1203
 msgid "UDP Packet dropped, have no matching connection information\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:1209
+#: src/exit/gnunet-daemon-exit.c:1278
 msgid "TCP Packet dropped, have no matching connection information\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:1262
+#: src/exit/gnunet-daemon-exit.c:1331
 msgid "# Packets received from TUN"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:1276
+#: src/exit/gnunet-daemon-exit.c:1345
 msgid "# Bytes received from TUN"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:1302
+#: src/exit/gnunet-daemon-exit.c:1371
 msgid "IPv4 packet options received.  Ignored.\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:1329
+#: src/exit/gnunet-daemon-exit.c:1398
 #, c-format
 msgid "IPv4 packet with unsupported next header %u received.  Ignored.\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:1375
+#: src/exit/gnunet-daemon-exit.c:1444
 #, c-format
 msgid "IPv6 packet with unsupported next header %d received.  Ignored.\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:1383
+#: src/exit/gnunet-daemon-exit.c:1452
 #, c-format
 msgid "Packet from unknown protocol %u received.  Ignored.\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:1765
+#: src/exit/gnunet-daemon-exit.c:1853
 msgid "# TCP packets sent via TUN"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:1878
+#: src/exit/gnunet-daemon-exit.c:1977
 msgid "# TCP service creation requests received via cadet"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:1881 src/exit/gnunet-daemon-exit.c:1975
-#: src/exit/gnunet-daemon-exit.c:2082 src/exit/gnunet-daemon-exit.c:2332
-#: src/exit/gnunet-daemon-exit.c:2582 src/exit/gnunet-daemon-exit.c:2872
-#: src/exit/gnunet-daemon-exit.c:2980
+#: src/exit/gnunet-daemon-exit.c:1981 src/exit/gnunet-daemon-exit.c:2060
+#: src/exit/gnunet-daemon-exit.c:2167 src/exit/gnunet-daemon-exit.c:2417
+#: src/exit/gnunet-daemon-exit.c:2667 src/exit/gnunet-daemon-exit.c:2954
+#: src/exit/gnunet-daemon-exit.c:3057
 msgid "# Bytes received from CADET"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:1915 src/exit/gnunet-daemon-exit.c:3004
-#, c-format
-msgid "No service %s found for %s on port %d!\n"
-msgstr ""
-
-#: src/exit/gnunet-daemon-exit.c:1920
-msgid "# TCP requests dropped (no such service)"
-msgstr ""
-
-#: src/exit/gnunet-daemon-exit.c:1978
+#: src/exit/gnunet-daemon-exit.c:2063
 msgid "# TCP IP-exit creation requests received via cadet"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:2085
+#: src/exit/gnunet-daemon-exit.c:2170
 msgid "# TCP data requests received via cadet"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:2099
+#: src/exit/gnunet-daemon-exit.c:2184
 msgid "# TCP DATA requests dropped (no session)"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:2161
+#: src/exit/gnunet-daemon-exit.c:2246
 msgid "# ICMP packets sent via TUN"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:2335
+#: src/exit/gnunet-daemon-exit.c:2420
 msgid "# ICMP IP-exit requests received via cadet"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:2585
+#: src/exit/gnunet-daemon-exit.c:2670
 msgid "# ICMP service requests received via cadet"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:2651 src/vpn/gnunet-service-vpn.c:1436
-#: src/vpn/gnunet-service-vpn.c:1994
+#: src/exit/gnunet-daemon-exit.c:2731 src/vpn/gnunet-service-vpn.c:1445
+#: src/vpn/gnunet-service-vpn.c:2003
 msgid "# ICMPv4 packets dropped (impossible PT to v6)"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:2710 src/vpn/gnunet-service-vpn.c:1472
-#: src/vpn/gnunet-service-vpn.c:1484 src/vpn/gnunet-service-vpn.c:1884
+#: src/exit/gnunet-daemon-exit.c:2790 src/vpn/gnunet-service-vpn.c:1481
+#: src/vpn/gnunet-service-vpn.c:1493 src/vpn/gnunet-service-vpn.c:1893
 msgid "# ICMPv6 packets dropped (impossible PT to v4)"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:2761
+#: src/exit/gnunet-daemon-exit.c:2841
 msgid "# UDP packets sent via TUN"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:2875
+#: src/exit/gnunet-daemon-exit.c:2957
 msgid "# UDP IP-exit requests received via cadet"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:2983
+#: src/exit/gnunet-daemon-exit.c:3060
 msgid "# UDP service requests received via cadet"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3009
-msgid "# UDP requests dropped (no such service)"
-msgstr ""
-
-#: src/exit/gnunet-daemon-exit.c:3047
-msgid "# Inbound CADET channels created"
-msgstr ""
-
-#: src/exit/gnunet-daemon-exit.c:3268 src/exit/gnunet-daemon-exit.c:3278
+#: src/exit/gnunet-daemon-exit.c:3327 src/exit/gnunet-daemon-exit.c:3337
 #, c-format
 msgid "Option `%s' for domain `%s' is not formatted correctly!\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3292 src/exit/gnunet-daemon-exit.c:3300
+#: src/exit/gnunet-daemon-exit.c:3351 src/exit/gnunet-daemon-exit.c:3359
 #, c-format
 msgid "`%s' is not a valid port number (for domain `%s')!"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3333
+#: src/exit/gnunet-daemon-exit.c:3400
 #, c-format
 msgid "No addresses found for hostname `%s' of service `%s'!\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3347 src/exit/gnunet-daemon-exit.c:3359
+#: src/exit/gnunet-daemon-exit.c:3414 src/exit/gnunet-daemon-exit.c:3427
 #, c-format
 msgid "Service `%s' configured for IPv4, but IPv4 is disabled!\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3370
+#: src/exit/gnunet-daemon-exit.c:3439
 #, c-format
 msgid "No IP addresses found for hostname `%s' of service `%s'!\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3548
-#, c-format
-msgid "`%s' must be installed SUID, EXIT will not work\n"
-msgstr ""
-
-#: src/exit/gnunet-daemon-exit.c:3563
+#: src/exit/gnunet-daemon-exit.c:3584
 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:3571
+#: src/exit/gnunet-daemon-exit.c:3592
 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:3578
+#: src/exit/gnunet-daemon-exit.c:3599
 msgid ""
 "Cannot enable IPv4 exit but disable IPv4 on TUN interface, will use "
 "ENABLE_IPv4=YES\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3584
+#: src/exit/gnunet-daemon-exit.c:3605
 msgid ""
 "Cannot enable IPv6 exit but disable IPv6 on TUN interface, will use "
 "ENABLE_IPv6=YES\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3590 src/exit/gnunet-daemon-exit.c:3754
-#: src/pt/gnunet-daemon-pt.c:1243
+#: src/exit/gnunet-daemon-exit.c:3765
+msgid "Must be a number"
+msgstr "Doit être un nombre"
+
+#: src/exit/gnunet-daemon-exit.c:3872
+#, c-format
+msgid "`%s' must be installed SUID, EXIT will not work\n"
+msgstr ""
+
+#: src/exit/gnunet-daemon-exit.c:3884 src/pt/gnunet-daemon-pt.c:1279
 msgid "No useful service enabled.  Exiting.\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3701
-msgid "Must be a number"
-msgstr "Doit être un nombre"
-
-#: src/exit/gnunet-daemon-exit.c:3852
+#: src/exit/gnunet-daemon-exit.c:4029
 msgid "Daemon to run to provide an IP exit node for the VPN"
 msgstr ""
 
@@ -2775,71 +2637,71 @@
 msgid "# fragmentation transmissions completed"
 msgstr ""
 
-#: src/fs/fs_api.c:493
+#: src/fs/fs_api.c:499
 #, c-format
 msgid "Could not open file `%s': %s"
 msgstr ""
 
-#: src/fs/fs_api.c:504
+#: src/fs/fs_api.c:510
 #, c-format
 msgid "Could not read file `%s': %s"
 msgstr ""
 
-#: src/fs/fs_api.c:512
+#: src/fs/fs_api.c:518
 #, c-format
 msgid "Short read reading from file `%s'!"
 msgstr ""
 
-#: src/fs/fs_api.c:1120
+#: src/fs/fs_api.c:1126
 #, c-format
 msgid "Failed to resume publishing information `%s': %s\n"
 msgstr ""
 
-#: src/fs/fs_api.c:1640
+#: src/fs/fs_api.c:1646
 #, c-format
 msgid "Failure while resuming publishing operation `%s': %s\n"
 msgstr ""
 
-#: src/fs/fs_api.c:1654
+#: src/fs/fs_api.c:1660
 #, c-format
 msgid "Failed to resume publishing operation `%s': %s\n"
 msgstr ""
 
-#: src/fs/fs_api.c:2312
+#: src/fs/fs_api.c:2318
 #, c-format
 msgid "Failure while resuming unindexing operation `%s': %s\n"
 msgstr ""
 
-#: src/fs/fs_api.c:2322
+#: src/fs/fs_api.c:2328
 #, c-format
 msgid "Failed to resume unindexing operation `%s': %s\n"
 msgstr ""
 
-#: src/fs/fs_api.c:2450 src/fs/fs_api.c:2698
+#: src/fs/fs_api.c:2456 src/fs/fs_api.c:2703
 #, c-format
 msgid "Failed to resume sub-download `%s': %s\n"
 msgstr ""
 
-#: src/fs/fs_api.c:2468
+#: src/fs/fs_api.c:2474
 #, c-format
 msgid "Failed to resume sub-search `%s': %s\n"
 msgstr ""
 
-#: src/fs/fs_api.c:2483 src/fs/fs_api.c:2502 src/fs/fs_api.c:2994
+#: src/fs/fs_api.c:2489 src/fs/fs_api.c:2508 src/fs/fs_api.c:3006
 #, c-format
 msgid "Failure while resuming search operation `%s': %s\n"
 msgstr ""
 
-#: src/fs/fs_api.c:2688
+#: src/fs/fs_api.c:2693
 #, c-format
 msgid "Failed to resume sub-download `%s': could not open file `%s'\n"
 msgstr ""
 
-#: src/fs/fs_api.c:2937
+#: src/fs/fs_api.c:2949
 msgid "Could not resume running search, will resume as paused search\n"
 msgstr ""
 
-#: src/fs/fs_api.c:3032
+#: src/fs/fs_api.c:3044
 #, c-format
 msgid "Failure while resuming download operation `%s': %s\n"
 msgstr ""
@@ -2848,27 +2710,27 @@
 msgid "MAGIC mismatch.  This is not a GNUnet directory.\n"
 msgstr ""
 
-#: src/fs/fs_download.c:322
+#: src/fs/fs_download.c:308
 msgid ""
 "Recursive downloads of directories larger than 4 GB are not supported on 32-"
 "bit systems\n"
 msgstr ""
 
-#: src/fs/fs_download.c:342
+#: src/fs/fs_download.c:328
 msgid "Directory too large for system address space\n"
 msgstr ""
 
-#: src/fs/fs_download.c:523 src/fs/fs_download.c:535
+#: src/fs/fs_download.c:509 src/fs/fs_download.c:521
 #, c-format
 msgid "Failed to open file `%s' for writing"
 msgstr ""
 
-#: src/fs/fs_download.c:905
+#: src/fs/fs_download.c:926
 #, c-format
 msgid "Failed to create directory for recursive download of `%s'\n"
 msgstr ""
 
-#: src/fs/fs_download.c:987
+#: src/fs/fs_download.c:1011
 #, c-format
 msgid ""
 "Internal error or bogus download URI (expected %u bytes at depth %u and "
@@ -2875,30 +2737,30 @@
 "offset %llu/%llu, got %u bytes)"
 msgstr ""
 
-#: src/fs/fs_download.c:1013
+#: src/fs/fs_download.c:1039
 msgid "internal error decrypting content"
 msgstr ""
 
-#: src/fs/fs_download.c:1036
+#: src/fs/fs_download.c:1063
 #, c-format
 msgid "Download failed: could not open file `%s': %s"
 msgstr ""
 
-#: src/fs/fs_download.c:1046
+#: src/fs/fs_download.c:1075
 #, c-format
 msgid "Failed to seek to offset %llu in file `%s': %s"
 msgstr ""
 
-#: src/fs/fs_download.c:1055
+#: src/fs/fs_download.c:1084
 #, c-format
 msgid "Failed to write block of %u bytes at offset %llu in file `%s': %s"
 msgstr ""
 
-#: src/fs/fs_download.c:1153
+#: src/fs/fs_download.c:1184
 msgid "internal error decoding tree"
 msgstr ""
 
-#: src/fs/fs_download.c:1939
+#: src/fs/fs_download.c:1838
 msgid "Invalid URI"
 msgstr "URI invalide"
 
@@ -2909,18 +2771,13 @@
 "`unknown' instead.\n"
 msgstr ""
 
-#: src/fs/fs_list_indexed.c:90
-#, c-format
-msgid "Failed to receive response for `%s' request from `%s' service.\n"
-msgstr ""
+#: src/fs/fs_list_indexed.c:152
+#, fuzzy, c-format
+msgid "Failed to receive response from `%s' service.\n"
+msgstr "Dernier message reçu de %s\n"
 
-#: src/fs/fs_list_indexed.c:113
+#: src/fs/fs_list_indexed.c:196
 #, c-format
-msgid "Failed to receive valid response for `%s' request from `%s' service.\n"
-msgstr ""
-
-#: src/fs/fs_list_indexed.c:151
-#, c-format
 msgid "Failed to not connect to `%s' service.\n"
 msgstr ""
 
@@ -2948,66 +2805,62 @@
 msgid "Failed to connect to datastore."
 msgstr ""
 
-#: src/fs/fs_publish.c:127 src/fs/fs_publish.c:439
+#: src/fs/fs_publish.c:127 src/fs/fs_publish.c:438
 #, c-format
 msgid "Publishing failed: %s"
 msgstr ""
 
-#: src/fs/fs_publish.c:706 src/fs/fs_publish.c:723 src/fs/fs_publish.c:762
-#: src/fs/fs_publish.c:783 src/fs/fs_publish.c:807 src/fs/fs_publish.c:1055
+#: src/fs/fs_publish.c:724 src/fs/fs_publish.c:778 src/fs/fs_publish.c:823
+#: src/fs/fs_publish.c:844 src/fs/fs_publish.c:874 src/fs/fs_publish.c:1140
 #, c-format
 msgid "Can not index file `%s': %s.  Will try to insert instead.\n"
 msgstr ""
 
-#: src/fs/fs_publish.c:708
-msgid "timeout on index-start request to `fs' service"
+#: src/fs/fs_publish.c:780
+msgid "error on index-start request to `fs' service"
 msgstr ""
 
-#: src/fs/fs_publish.c:720
-msgid "unknown error"
-msgstr "erreur unconnue."
-
-#: src/fs/fs_publish.c:764
+#: src/fs/fs_publish.c:825
 msgid "failed to compute hash"
 msgstr ""
 
-#: src/fs/fs_publish.c:784
+#: src/fs/fs_publish.c:845
 msgid "filename too long"
 msgstr ""
 
-#: src/fs/fs_publish.c:809
+#: src/fs/fs_publish.c:876
 msgid "could not connect to `fs' service"
 msgstr ""
 
-#: src/fs/fs_publish.c:832
+#: src/fs/fs_publish.c:902
 #, c-format
 msgid "Failed to get file identifiers for `%s'\n"
 msgstr ""
 
-#: src/fs/fs_publish.c:896 src/fs/fs_publish.c:937
+#: src/fs/fs_publish.c:991 src/fs/fs_publish.c:1027
 msgid "Can not create LOC URI. Will continue with CHK instead.\n"
 msgstr ""
 
-#: src/fs/fs_publish.c:1009
+#: src/fs/fs_publish.c:1094
 #, c-format
 msgid "Recursive upload failed at `%s': %s"
 msgstr ""
 
-#: src/fs/fs_publish.c:1017
+#: src/fs/fs_publish.c:1102
 #, c-format
 msgid "Recursive upload failed: %s"
 msgstr ""
 
-#: src/fs/fs_publish.c:1057
+#: src/fs/fs_publish.c:1142
 msgid "needs to be an actual file"
 msgstr ""
 
-#: src/fs/fs_publish.c:1296
+#: src/fs/fs_publish.c:1381
 #, fuzzy, c-format
 msgid "Datastore failure: %s"
 msgstr "pa_stream_new() échoué : %s\n"
 
-#: src/fs/fs_publish.c:1387
+#: src/fs/fs_publish.c:1472
 #, c-format
 msgid "Reserving space for %u entries and %llu bytes for publication\n"
 msgstr ""
@@ -3020,12 +2873,12 @@
 msgid "Internal error."
 msgstr "Erreur interne."
 
-#: src/fs/fs_search.c:806 src/fs/fs_search.c:876
+#: src/fs/fs_search.c:809 src/fs/fs_search.c:879
 #, c-format
 msgid "Failed to parse URI `%s': %s\n"
 msgstr ""
 
-#: src/fs/fs_search.c:935
+#: src/fs/fs_search.c:966
 #, c-format
 msgid "Got result with unknown block type `%d', ignoring"
 msgstr ""
@@ -3038,45 +2891,37 @@
 msgid "Failed to read file"
 msgstr ""
 
-#: src/fs/fs_unindex.c:245
-msgid "Unexpected time for a response from `fs' service."
+#: src/fs/fs_unindex.c:275
+msgid "Error communicating with `fs' service."
 msgstr ""
 
-#: src/fs/fs_unindex.c:253
-msgid "Timeout waiting for `fs' service."
-msgstr ""
-
-#: src/fs/fs_unindex.c:261
-msgid "Invalid response from `fs' service."
-msgstr ""
-
-#: src/fs/fs_unindex.c:304
+#: src/fs/fs_unindex.c:328
 msgid "Failed to connect to FS service for unindexing."
 msgstr ""
 
-#: src/fs/fs_unindex.c:360 src/fs/fs_unindex.c:372
+#: src/fs/fs_unindex.c:378 src/fs/fs_unindex.c:390
 msgid "Failed to get KSKs from directory scan."
 msgstr ""
 
-#: src/fs/fs_unindex.c:368
+#: src/fs/fs_unindex.c:386
 #, c-format
 msgid "Internal error scanning `%s'.\n"
 msgstr ""
 
-#: src/fs/fs_unindex.c:427
+#: src/fs/fs_unindex.c:445
 #, c-format
 msgid "Failed to remove UBlock: %s\n"
 msgstr ""
 
-#: src/fs/fs_unindex.c:590 src/fs/fs_unindex.c:654
+#: src/fs/fs_unindex.c:606 src/fs/fs_unindex.c:669
 msgid "Failed to connect to `datastore' service."
 msgstr ""
 
-#: src/fs/fs_unindex.c:667
+#: src/fs/fs_unindex.c:682
 msgid "Failed to open file for unindexing."
 msgstr ""
 
-#: src/fs/fs_unindex.c:706
+#: src/fs/fs_unindex.c:721
 msgid "Failed to compute hash of file."
 msgstr ""
 
@@ -3290,7 +3135,7 @@
 msgstr ""
 
 #: src/fs/gnunet-download.c:208 src/fs/gnunet-publish.c:295
-#: src/fs/gnunet-search.c:208 src/fs/gnunet-unindex.c:107
+#: src/fs/gnunet-search.c:212 src/fs/gnunet-unindex.c:107
 #, c-format
 msgid "Unexpected status: %d\n"
 msgstr ""
@@ -3313,12 +3158,12 @@
 msgstr ""
 
 #: src/fs/gnunet-download.c:267 src/fs/gnunet-publish.c:870
-#: src/fs/gnunet-search.c:266 src/fs/gnunet-unindex.c:139
+#: src/fs/gnunet-search.c:270 src/fs/gnunet-unindex.c:139
 #, c-format
 msgid "Could not initialize `%s' subsystem.\n"
 msgstr ""
 
-#: src/fs/gnunet-download.c:304 src/fs/gnunet-search.c:306
+#: src/fs/gnunet-download.c:304 src/fs/gnunet-search.c:310
 msgid "set the desired LEVEL of receiver-anonymity"
 msgstr ""
 
@@ -3326,7 +3171,7 @@
 msgid "delete incomplete downloads (when aborted with CTRL-C)"
 msgstr ""
 
-#: src/fs/gnunet-download.c:310 src/fs/gnunet-search.c:309
+#: src/fs/gnunet-download.c:310 src/fs/gnunet-search.c:313
 msgid "only search the local peer (no P2P network search)"
 msgstr ""
 
@@ -3500,7 +3345,7 @@
 msgstr ""
 
 #: src/fs/gnunet-publish.c:849 src/fs/gnunet-publish.c:857
-#: src/transport/gnunet-transport.c:1811 src/transport/gnunet-transport.c:1835
+#: src/transport/gnunet-transport.c:1577 src/transport/gnunet-transport.c:1602
 #, c-format
 msgid "Option `%s' makes no sense without option `%s'.\n"
 msgstr ""
@@ -3558,64 +3403,84 @@
 msgid "Publish a file or directory on GNUnet"
 msgstr ""
 
-#: src/fs/gnunet-search.c:123
+#: src/fs/gnunet-search.c:127
 #, c-format
 msgid "Failed to write directory with search results to `%s'\n"
 msgstr ""
 
-#: src/fs/gnunet-search.c:200
+#: src/fs/gnunet-search.c:204
 #, c-format
 msgid "Error searching: %s.\n"
 msgstr ""
 
-#: src/fs/gnunet-search.c:256
+#: src/fs/gnunet-search.c:260
 msgid "Could not create keyword URI from arguments.\n"
 msgstr ""
 
-#: src/fs/gnunet-search.c:280
+#: src/fs/gnunet-search.c:284
 msgid "Could not start searching.\n"
 msgstr ""
 
-#: src/fs/gnunet-search.c:312
+#: src/fs/gnunet-search.c:316
 msgid "write search results to file starting with PREFIX"
 msgstr ""
 
-#: src/fs/gnunet-search.c:315
+#: src/fs/gnunet-search.c:319
 msgid "automatically terminate search after DELAY"
 msgstr ""
 
-#: src/fs/gnunet-search.c:322
+#: src/fs/gnunet-search.c:326
 msgid "automatically terminate search after VALUE results are found"
 msgstr ""
 
-#: src/fs/gnunet-search.c:333
+#: src/fs/gnunet-search.c:337
 msgid "Search GNUnet for files that were published on GNUnet"
 msgstr ""
 
-#: src/fs/gnunet-service-fs.c:273
+#: src/fs/gnunet-service-fs.c:378 src/fs/gnunet-service-fs.c:883
+msgid "# client searches active"
+msgstr ""
+
+#: src/fs/gnunet-service-fs.c:437
+msgid "# replies received for local clients"
+msgstr ""
+
+#: src/fs/gnunet-service-fs.c:606
 msgid "# running average P2P latency (ms)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs.c:331 src/fs/gnunet-service-fs.c:603
+#: src/fs/gnunet-service-fs.c:658 src/fs/gnunet-service-fs_cp.c:564
 msgid "# Loopback routes suppressed"
 msgstr ""
 
-#: src/fs/gnunet-service-fs.c:730
+#: src/fs/gnunet-service-fs.c:837
+msgid "# client searches received"
+msgstr ""
+
+#: src/fs/gnunet-service-fs.c:876
+msgid "# client searches updated (merged content seen list)"
+msgstr ""
+
+#: src/fs/gnunet-service-fs.c:1047
+#, c-format
+msgid "Hash mismatch trying to index file `%s' which does not have hash `%s'\n"
+msgstr ""
+
+#: src/fs/gnunet-service-fs.c:1288
 msgid "FS service is lacking HOSTKEY configuration setting.  Exiting.\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs.c:756 src/hostlist/gnunet-daemon-hostlist.c:308
-#: src/topology/gnunet-daemon-topology.c:1245
-#: src/topology/gnunet-daemon-topology.c:1253
+#: src/fs/gnunet-service-fs.c:1313 src/hostlist/gnunet-daemon-hostlist.c:355
+#: src/topology/gnunet-daemon-topology.c:1203
 #, c-format
 msgid "Failed to connect to `%s' service.\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cadet_client.c:490
+#: src/fs/gnunet-service-fs_cadet_client.c:494
 msgid "# replies received via cadet"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cadet_client.c:504
+#: src/fs/gnunet-service-fs_cadet_client.c:508
 msgid "# replies received via cadet dropped"
 msgstr ""
 
@@ -3623,201 +3488,164 @@
 msgid "# Blocks transferred via cadet"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cadet_server.c:359
+#: src/fs/gnunet-service-fs_cadet_server.c:360
 msgid "# queries received via CADET not answered"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cadet_server.c:439
+#: src/fs/gnunet-service-fs_cadet_server.c:440
 msgid "# queries received via cadet"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cadet_server.c:483
+#: src/fs/gnunet-service-fs_cadet_server.c:484
 msgid "# cadet client connections rejected"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cadet_server.c:489
-#: src/fs/gnunet-service-fs_cadet_server.c:529
+#: src/fs/gnunet-service-fs_cadet_server.c:490
+#: src/fs/gnunet-service-fs_cadet_server.c:530
 #, fuzzy
 msgid "# cadet connections active"
 msgstr "# Session TCP active"
 
-#: src/fs/gnunet-service-fs_cp.c:743
+#: src/fs/gnunet-service-fs_cp.c:686
 msgid "# migration stop messages received"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:747
+#: src/fs/gnunet-service-fs_cp.c:690
 #, c-format
 msgid "Migration of content to peer `%s' blocked for %s\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:785
-msgid "# replies transmitted to other peers"
-msgstr ""
-
-#: src/fs/gnunet-service-fs_cp.c:793
-msgid "# replies dropped"
-msgstr ""
-
-#: src/fs/gnunet-service-fs_cp.c:820 src/fs/gnunet-service-fs_cp.c:1472
+#: src/fs/gnunet-service-fs_cp.c:723 src/fs/gnunet-service-fs_cp.c:1343
 msgid "# P2P searches active"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:918
+#: src/fs/gnunet-service-fs_cp.c:818
 msgid "# artificial delays introduced (ms)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:974
+#: src/fs/gnunet-service-fs_cp.c:875
 msgid "# replies dropped due to type mismatch"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:982
+#: src/fs/gnunet-service-fs_cp.c:883
 msgid "# replies received for other peers"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:996
+#: src/fs/gnunet-service-fs_cp.c:897
 msgid "# replies dropped due to insufficient cover traffic"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1044
+#: src/fs/gnunet-service-fs_cp.c:944
 msgid "# P2P searches destroyed due to ultimate reply"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1115
+#: src/fs/gnunet-service-fs_cp.c:1015
 msgid "# requests done for free (low load)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1140
+#: src/fs/gnunet-service-fs_cp.c:1040
 msgid "# request dropped, priority insufficient"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1150
+#: src/fs/gnunet-service-fs_cp.c:1050
 msgid "# requests done for a price (normal load)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1248
+#: src/fs/gnunet-service-fs_cp.c:1148
 msgid "# requests dropped due to higher-TTL request"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1302
+#: src/fs/gnunet-service-fs_cp.c:1205
 msgid "# GET requests received (from other peers)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1337
-msgid "# requests dropped due to initiator not being connected"
-msgstr ""
-
-#: src/fs/gnunet-service-fs_cp.c:1358
+#: src/fs/gnunet-service-fs_cp.c:1228
 msgid "# requests dropped due to missing reverse route"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1369
+#: src/fs/gnunet-service-fs_cp.c:1239
 msgid "# requests dropped due to full reply queue"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1424
+#: src/fs/gnunet-service-fs_cp.c:1295
 msgid "# requests dropped due TTL underflow"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1468
+#: src/fs/gnunet-service-fs_cp.c:1339
 msgid "# P2P query messages received and processed"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1913
+#: src/fs/gnunet-service-fs_cp.c:1706
 msgid "# migration stop messages sent"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_indexing.c:130
-#: src/fs/gnunet-service-fs_indexing.c:181
+#: src/fs/gnunet-service-fs_indexing.c:134
+#: src/fs/gnunet-service-fs_indexing.c:195
 #, c-format
 msgid "Could not open `%s'.\n"
 msgstr "Impossible d’ouvrir « %s ».\n"
 
-#: src/fs/gnunet-service-fs_indexing.c:142
+#: src/fs/gnunet-service-fs_indexing.c:151
 #, c-format
 msgid "Error writing `%s'.\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_indexing.c:237
+#: src/fs/gnunet-service-fs_indexing.c:253
 #, c-format
-msgid ""
-"Index request received for file `%s' is already indexed as `%s'.  Permitting "
-"anyway.\n"
-msgstr ""
-
-#: src/fs/gnunet-service-fs_indexing.c:275
-#, c-format
-msgid "Hash mismatch trying to index file `%s' which has hash `%s'\n"
-msgstr ""
-
-#: src/fs/gnunet-service-fs_indexing.c:477
-#, c-format
 msgid "Failed to delete bogus block: %s\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_indexing.c:542
+#: src/fs/gnunet-service-fs_indexing.c:329
 msgid "# index blocks removed: original file inaccessible"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_indexing.c:557
+#: src/fs/gnunet-service-fs_indexing.c:355
 #, c-format
 msgid "Could not access indexed file `%s' (%s) at offset %llu: %s\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_indexing.c:559
+#: src/fs/gnunet-service-fs_indexing.c:359
 msgid "not indexed"
 msgstr "non indexé"
 
-#: src/fs/gnunet-service-fs_indexing.c:574
+#: src/fs/gnunet-service-fs_indexing.c:392
 #, c-format
 msgid "Indexed file `%s' changed at offset %llu\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_lc.c:202 src/fs/gnunet-service-fs_lc.c:378
-msgid "# client searches active"
+#: src/fs/gnunet-service-fs_indexing.c:515
+#, c-format
+msgid ""
+"Index request received for file `%s' is already indexed as `%s'.  Permitting "
+"anyway.\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_lc.c:261
-msgid "# replies received for local clients"
+#: src/fs/gnunet-service-fs_pe.c:265
+msgid "# average retransmission delay (ms)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_lc.c:332
-msgid "# client searches received"
+#: src/fs/gnunet-service-fs_pe.c:427
+msgid "# delay heap timeout (ms)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_lc.c:372
-msgid "# client searches updated (merged content seen list)"
+#: src/fs/gnunet-service-fs_pe.c:438
+msgid "# query plans executed"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pe.c:273
-msgid "# average retransmission delay (ms)"
-msgstr ""
-
-#: src/fs/gnunet-service-fs_pe.c:412
-msgid "# transmission failed (core has no bandwidth)"
-msgstr ""
-
-#: src/fs/gnunet-service-fs_pe.c:447
+#: src/fs/gnunet-service-fs_pe.c:466
 msgid "# query messages sent to other peers"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pe.c:501
-msgid "# delay heap timeout (ms)"
-msgstr ""
-
-#: src/fs/gnunet-service-fs_pe.c:511
-msgid "# query plans executed"
-msgstr ""
-
-#: src/fs/gnunet-service-fs_pe.c:593
+#: src/fs/gnunet-service-fs_pe.c:536
 msgid "# requests merged"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pe.c:603
+#: src/fs/gnunet-service-fs_pe.c:546
 msgid "# requests refreshed"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pe.c:661 src/fs/gnunet-service-fs_pe.c:769
-#: src/fs/gnunet-service-fs_pe.c:848
+#: src/fs/gnunet-service-fs_pe.c:606 src/fs/gnunet-service-fs_pe.c:709
+#: src/fs/gnunet-service-fs_pe.c:788
 msgid "# query plan entries"
 msgstr ""
 
@@ -3825,107 +3653,107 @@
 msgid "# Pending requests created"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:411 src/fs/gnunet-service-fs_pr.c:671
+#: src/fs/gnunet-service-fs_pr.c:411 src/fs/gnunet-service-fs_pr.c:661
 msgid "# Pending requests active"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:852
+#: src/fs/gnunet-service-fs_pr.c:842
 msgid "# replies received and matched"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:889
+#: src/fs/gnunet-service-fs_pr.c:879
 msgid "# duplicate replies discarded (bloomfilter)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:898
+#: src/fs/gnunet-service-fs_pr.c:888
 msgid "# irrelevant replies discarded"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:913
+#: src/fs/gnunet-service-fs_pr.c:903
 #, c-format
 msgid "Unsupported block type %u\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:930
+#: src/fs/gnunet-service-fs_pr.c:920
 msgid "# results found locally"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1060
+#: src/fs/gnunet-service-fs_pr.c:1050
 msgid "# Datastore `PUT' failures"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1088
+#: src/fs/gnunet-service-fs_pr.c:1078
 msgid "# storage requests dropped due to high load"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1126
+#: src/fs/gnunet-service-fs_pr.c:1116
 msgid "# Replies received from DHT"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1258
+#: src/fs/gnunet-service-fs_pr.c:1247
 msgid "# Replies received from CADET"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1310
+#: src/fs/gnunet-service-fs_pr.c:1299
 #, c-format
 msgid "Datastore lookup already took %s!\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1331
+#: src/fs/gnunet-service-fs_pr.c:1320
 #, c-format
 msgid "On-demand lookup already took %s!\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1383
+#: src/fs/gnunet-service-fs_pr.c:1372
 msgid "# Datastore lookups concluded (no results)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1398
+#: src/fs/gnunet-service-fs_pr.c:1387
 msgid "# Datastore lookups concluded (seen all)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1407
+#: src/fs/gnunet-service-fs_pr.c:1396
 msgid "# Datastore lookups aborted (more than MAX_RESULTS)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1422
+#: src/fs/gnunet-service-fs_pr.c:1411
 msgid "# requested DBLOCK or IBLOCK not found"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1436
+#: src/fs/gnunet-service-fs_pr.c:1425
 msgid "# on-demand blocks matched requests"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1449
+#: src/fs/gnunet-service-fs_pr.c:1438
 msgid "# on-demand lookups performed successfully"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1454
+#: src/fs/gnunet-service-fs_pr.c:1443
 msgid "# on-demand lookups failed"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1481 src/fs/gnunet-service-fs_pr.c:1521
-#: src/fs/gnunet-service-fs_pr.c:1690
+#: src/fs/gnunet-service-fs_pr.c:1469 src/fs/gnunet-service-fs_pr.c:1508
+#: src/fs/gnunet-service-fs_pr.c:1675
 msgid "# Datastore lookups concluded (error queueing)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1540
+#: src/fs/gnunet-service-fs_pr.c:1527
 msgid "# Datastore lookups concluded (found last result)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1552
+#: src/fs/gnunet-service-fs_pr.c:1539
 msgid "# Datastore lookups concluded (load too high)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1666
+#: src/fs/gnunet-service-fs_pr.c:1652
 msgid "# Datastore lookups initiated"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1755
+#: src/fs/gnunet-service-fs_pr.c:1732
 msgid "# GAP PUT messages received"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_push.c:678
+#: src/fs/gnunet-service-fs_push.c:642
 msgid "time required, content pushing disabled"
 msgstr ""
 
@@ -3956,10 +3784,6 @@
 msgid "Unindex a file that was previously indexed with gnunet-publish."
 msgstr ""
 
-#: src/gns/gns_api.c:393
-msgid "Failed to deserialize lookup reply from GNS service!\n"
-msgstr ""
-
 #: src/gns/gnunet-bcd.c:127
 #, c-format
 msgid "Refusing `%s' request to HTTP server\n"
@@ -4043,22 +3867,22 @@
 msgid "GNUnet DNS-to-GNS proxy (a DNS server)"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:236 src/gns/plugin_rest_gns.c:347
+#: src/gns/gnunet-gns.c:269 src/gns/plugin_rest_gns.c:347
 #, c-format
 msgid "Invalid typename specified, assuming `ANY'\n"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:254
+#: src/gns/gnunet-gns.c:295
 #, c-format
 msgid "Please specify name to lookup!\n"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:335
+#: src/gns/gnunet-gns.c:376
 #, c-format
 msgid "Ego for `%s' not found, cannot perform lookup.\n"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:374 src/gns/gnunet-gns-helper-service-w32.c:796
+#: src/gns/gnunet-gns.c:415 src/gns/gnunet-gns-helper-service-w32.c:796
 #: src/gns/plugin_rest_gns.c:472
 #, c-format
 msgid ""
@@ -4066,44 +3890,61 @@
 "gns-import.sh?\n"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:415 src/gns/gnunet-gns-helper-service-w32.c:826
+#: src/gns/gnunet-gns.c:456 src/gns/gnunet-gns-helper-service-w32.c:826
 #, c-format
 msgid "Failed to connect to GNS\n"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:429
+#: src/gns/gnunet-gns.c:470 src/gns/gnunet-gns.c:500
 #, 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:479
+#: src/gns/gnunet-gns.c:548
 msgid "Lookup a record for the given name"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:482
+#: src/gns/gnunet-gns.c:551
 msgid "Specify the type of the record to lookup"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:485
+#: src/gns/gnunet-gns.c:554
 msgid "Specify timeout for the lookup"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:488
+#: src/gns/gnunet-gns.c:557
 msgid "No unneeded output"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:491
+#: src/gns/gnunet-gns.c:560
 msgid "Specify the public key of the zone to lookup the record in"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:494
+#: src/gns/gnunet-gns.c:563
 msgid "Specify the name of the ego of the zone to lookup the record in"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:508
+#: src/gns/gnunet-gns.c:566
+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
+msgid "Transmission to client failed!\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 ""
@@ -4122,14 +3963,14 @@
 msgstr ""
 
 #: src/gns/gnunet-gns-proxy.c:109
-#: src/hostlist/gnunet-daemon-hostlist_client.c:529
-#: src/hostlist/gnunet-daemon-hostlist_client.c:747
-#: src/hostlist/gnunet-daemon-hostlist_client.c:753
-#: src/hostlist/gnunet-daemon-hostlist_client.c:805
-#: src/hostlist/gnunet-daemon-hostlist_client.c:814
-#: src/hostlist/gnunet-daemon-hostlist_client.c:925
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1020
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1025
+#: src/hostlist/gnunet-daemon-hostlist_client.c:569
+#: src/hostlist/gnunet-daemon-hostlist_client.c:787
+#: src/hostlist/gnunet-daemon-hostlist_client.c:793
+#: src/hostlist/gnunet-daemon-hostlist_client.c:845
+#: src/hostlist/gnunet-daemon-hostlist_client.c:854
+#: src/hostlist/gnunet-daemon-hostlist_client.c:965
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1060
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1065
 #: src/transport/plugin_transport_http_client.c:598
 #: src/transport/plugin_transport_http_client.c:616
 #, c-format
@@ -4136,124 +3977,125 @@
 msgid "%s failed at %s:%d: `%s'\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:846
+#: src/gns/gnunet-gns-proxy.c:887
 #, c-format
 msgid "Unsupported CURL SSL backend %d\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:869
+#: src/gns/gnunet-gns-proxy.c:910
 #, c-format
 msgid "Failed to fetch CN from cert: %s\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:892
+#: src/gns/gnunet-gns-proxy.c:933
 #, c-format
 msgid "Failed to initialize DANE: %s\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:905
+#: src/gns/gnunet-gns-proxy.c:946
 #, c-format
 msgid "Failed to parse DANE record: %s\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:920
+#: src/gns/gnunet-gns-proxy.c:961
 #, c-format
 msgid "Failed to verify TLS connection using DANE: %s\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:930
+#: src/gns/gnunet-gns-proxy.c:971
 #, c-format
 msgid "Failed DANE verification failed with GnuTLS verify status code: %u\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:954
+#: src/gns/gnunet-gns-proxy.c:995
 #, c-format
 msgid "SSL certificate subject name (%s) does not match `%s'\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:1099
+#: src/gns/gnunet-gns-proxy.c:1104
 #, c-format
 msgid "Cookie domain `%s' supplied by server is invalid\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:1631
+#: src/gns/gnunet-gns-proxy.c:1708
 #, c-format
 msgid "Unsupported HTTP method `%s'\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:1997
+#: src/gns/gnunet-gns-proxy.c:2167
 #, c-format
 msgid "Unable to import private key from file `%s'\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:2027
+#: src/gns/gnunet-gns-proxy.c:2197
 #, c-format
 msgid "Unable to import certificate %s\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:2199
+#: src/gns/gnunet-gns-proxy.c:2370
 #, c-format
 msgid "Failed to start HTTPS server for `%s'\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:2218 src/rest/gnunet-rest-server.c:529
+#: src/gns/gnunet-gns-proxy.c:2389 src/rest/gnunet-rest-server.c:533
 msgid "Failed to pass client to MHD\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:2538
+#: src/gns/gnunet-gns-proxy.c:2709
 #, c-format
 msgid "Unsupported socks version %d\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:2567
+#: src/gns/gnunet-gns-proxy.c:2738
 #, c-format
 msgid "Unsupported socks command %d\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:2585 src/gns/gnunet-gns-proxy.c:2614
+#: src/gns/gnunet-gns-proxy.c:2756 src/gns/gnunet-gns-proxy.c:2785
 msgid "SSL connection to plain IPv4 address requested\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:2665
+#: src/gns/gnunet-gns-proxy.c:2836
 #, c-format
 msgid "Unsupported socks address type %d\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:2999
+#: src/gns/gnunet-gns-proxy.c:3171
 msgid "No ego configured for `shorten-zone`\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:3039 src/gns/gnunet-service-gns.c:887
+#: src/gns/gnunet-gns-proxy.c:3211 src/gns/gnunet-service-gns.c:1093
+#: src/gns/gnunet-service-gns.c:1149
 #, c-format
 msgid "No ego configured for `%s`\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:3101
+#: src/gns/gnunet-gns-proxy.c:3273
 #, c-format
 msgid "Failed to load SSL/TLS key and certificate from `%s'\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:3141
+#: src/gns/gnunet-gns-proxy.c:3313
 msgid "listen on specified port (default: 7777)"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:3144
+#: src/gns/gnunet-gns-proxy.c:3316
 msgid "pem file to use as CA"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:3163
+#: src/gns/gnunet-gns-proxy.c:3335
 msgid "GNUnet GNS proxy"
 msgstr ""
 
-#: src/gns/gnunet-service-gns.c:928
+#: src/gns/gnunet-service-gns.c:1187
 msgid "Failed to connect to the namestore!\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns.c:936
+#: src/gns/gnunet-service-gns.c:1195
 msgid "Failed to connect to the namecache!\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns.c:969
+#: src/gns/gnunet-service-gns.c:1228
 msgid "Could not connect to DHT!\n"
 msgstr ""
 
@@ -4261,7 +4103,7 @@
 msgid "Error converting GNS response to DNS response!\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns_interceptor.c:369
+#: src/gns/gnunet-service-gns_interceptor.c:371
 msgid "Failed to connect to the DNS service!\n"
 msgstr ""
 
@@ -4284,55 +4126,60 @@
 msgid "Skipping record of unsupported type %d\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns_resolver.c:1353
+#: src/gns/gnunet-service-gns_resolver.c:1354
 #, c-format
 msgid "GNS lookup resulted in DNS name that is too long (`%s')\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns_resolver.c:1888
+#: src/gns/gnunet-service-gns_resolver.c:1889
 msgid "GNS lookup recursion failed (no delegation record found)\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns_resolver.c:1912
+#: src/gns/gnunet-service-gns_resolver.c:1913
 #, c-format
 msgid "Failed to cache GNS resolution: %s\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns_resolver.c:2194
+#: src/gns/gnunet-service-gns_resolver.c:2195
 #, c-format
 msgid "Zone %s was revoked, resolution fails\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns_resolver.c:2341
+#: src/gns/gnunet-service-gns_resolver.c:2342
 #, c-format
 msgid "Hostname `%s' is not well-formed, resolution fails\n"
 msgstr ""
 
-#: src/gns/plugin_gnsrecord_gns.c:172
+#: src/gns/plugin_gnsrecord_gns.c:203
 #, c-format
 msgid "Unable to parse PKEY record `%s'\n"
 msgstr ""
 
-#: src/gns/plugin_gnsrecord_gns.c:201
+#: src/gns/plugin_gnsrecord_gns.c:232
 #, c-format
 msgid "Unable to parse GNS2DNS record `%s'\n"
 msgstr ""
 
-#: src/gns/plugin_gnsrecord_gns.c:222
+#: src/gns/plugin_gnsrecord_gns.c:253
 #, c-format
 msgid "Failed to serialize GNS2DNS record with value `%s'\n"
 msgstr ""
 
-#: src/gns/plugin_gnsrecord_gns.c:245
+#: src/gns/plugin_gnsrecord_gns.c:276
 #, c-format
 msgid "Unable to parse VPN record string `%s'\n"
 msgstr ""
 
-#: src/gns/plugin_gnsrecord_gns.c:280
+#: src/gns/plugin_gnsrecord_gns.c:311
 #, c-format
 msgid "Unable to parse BOX record string `%s'\n"
 msgstr ""
 
+#: src/gns/plugin_gnsrecord_gns.c:359
+#, c-format
+msgid "Unable to parse REVERSE record string `%s'\n"
+msgstr ""
+
 #: src/gns/plugin_rest_gns.c:435
 msgid "Ego for not found, cannot perform lookup.\n"
 msgstr ""
@@ -4356,53 +4203,53 @@
 msgid "Failed to serialize CNAME record with value `%s'\n"
 msgstr ""
 
-#: src/gnsrecord/plugin_gnsrecord_dns.c:486
+#: src/gnsrecord/plugin_gnsrecord_dns.c:487
 #, c-format
 msgid "Failed to serialize CERT record with %u bytes\n"
 msgstr ""
 
-#: src/gnsrecord/plugin_gnsrecord_dns.c:522
+#: src/gnsrecord/plugin_gnsrecord_dns.c:523
 #, c-format
 msgid "Unable to parse SOA record `%s'\n"
 msgstr ""
 
-#: src/gnsrecord/plugin_gnsrecord_dns.c:541
+#: src/gnsrecord/plugin_gnsrecord_dns.c:542
 #, c-format
 msgid "Failed to serialize SOA record with mname `%s' and rname `%s'\n"
 msgstr ""
 
-#: src/gnsrecord/plugin_gnsrecord_dns.c:564
+#: src/gnsrecord/plugin_gnsrecord_dns.c:565
 #, c-format
 msgid "Failed to serialize PTR record with value `%s'\n"
 msgstr ""
 
-#: src/gnsrecord/plugin_gnsrecord_dns.c:587
+#: src/gnsrecord/plugin_gnsrecord_dns.c:588
 #, c-format
 msgid "Unable to parse MX record `%s'\n"
 msgstr ""
 
-#: src/gnsrecord/plugin_gnsrecord_dns.c:602
+#: src/gnsrecord/plugin_gnsrecord_dns.c:603
 #, c-format
 msgid "Failed to serialize MX record with hostname `%s'\n"
 msgstr ""
 
-#: src/gnsrecord/plugin_gnsrecord_dns.c:629
+#: src/gnsrecord/plugin_gnsrecord_dns.c:630
 #, c-format
 msgid "Unable to parse SRV record `%s'\n"
 msgstr ""
 
-#: src/gnsrecord/plugin_gnsrecord_dns.c:645
+#: src/gnsrecord/plugin_gnsrecord_dns.c:646
 #, c-format
 msgid "Failed to serialize SRV record with target `%s'\n"
 msgstr ""
 
-#: src/gnsrecord/plugin_gnsrecord_dns.c:662
+#: src/gnsrecord/plugin_gnsrecord_dns.c:663
 #, c-format
 msgid "Unable to parse IPv6 address `%s'\n"
 msgstr ""
 
-#: src/gnsrecord/plugin_gnsrecord_dns.c:686
-#: src/gnsrecord/plugin_gnsrecord_dns.c:702
+#: src/gnsrecord/plugin_gnsrecord_dns.c:687
+#: src/gnsrecord/plugin_gnsrecord_dns.c:703
 #, c-format
 msgid "Unable to parse TLSA record string `%s'\n"
 msgstr ""
@@ -4446,95 +4293,95 @@
 msgid "Modified %u addresses, wrote %u bytes\n"
 msgstr ""
 
-#: src/hello/hello.c:1139
+#: src/hello/hello.c:1103
 msgid "Failed to parse HELLO message: missing expiration time\n"
 msgstr ""
 
-#: src/hello/hello.c:1148
+#: src/hello/hello.c:1112
 msgid "Failed to parse HELLO message: invalid expiration time\n"
 msgstr ""
 
-#: src/hello/hello.c:1158
+#: src/hello/hello.c:1122
 msgid "Failed to parse HELLO message: malformed\n"
 msgstr ""
 
-#: src/hello/hello.c:1169
+#: src/hello/hello.c:1133
 msgid "Failed to parse HELLO message: missing transport plugin\n"
 msgstr ""
 
-#: src/hello/hello.c:1187
+#: src/hello/hello.c:1151
 #, fuzzy, c-format
 msgid "Plugin `%s' not found, skipping address\n"
 msgstr "Extension « %s » introuvable\n"
 
-#: src/hello/hello.c:1195
+#: src/hello/hello.c:1159
 #, c-format
 msgid "Plugin `%s' does not support URIs yet\n"
 msgstr ""
 
-#: src/hello/hello.c:1210
+#: src/hello/hello.c:1174
 #, c-format
 msgid "Failed to parse `%s' as an address for plugin `%s'\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist.c:272
+#: src/hostlist/gnunet-daemon-hostlist.c:316
 msgid ""
 "None of the functions for the hostlist daemon were enabled.  I have no "
 "reason to run!\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist.c:328
+#: src/hostlist/gnunet-daemon-hostlist.c:375
 msgid "advertise our hostlist to other peers"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist.c:333
+#: src/hostlist/gnunet-daemon-hostlist.c:380
 msgid ""
 "bootstrap using hostlists (it is highly recommended that you always use this "
 "option)"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist.c:336
+#: src/hostlist/gnunet-daemon-hostlist.c:383
 msgid "enable learning about hostlist servers from other peers"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist.c:340
+#: src/hostlist/gnunet-daemon-hostlist.c:387
 msgid "provide a hostlist server"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist.c:356
+#: src/hostlist/gnunet-daemon-hostlist.c:403
 msgid "GNUnet hostlist server and client"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:348
+#: src/hostlist/gnunet-daemon-hostlist_client.c:371
 msgid "# bytes downloaded from hostlist servers"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:369
-#: src/hostlist/gnunet-daemon-hostlist_client.c:399
+#: src/hostlist/gnunet-daemon-hostlist_client.c:392
+#: src/hostlist/gnunet-daemon-hostlist_client.c:437
 msgid "# invalid HELLOs downloaded from hostlist servers"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:372
-#: src/hostlist/gnunet-daemon-hostlist_client.c:402
+#: src/hostlist/gnunet-daemon-hostlist_client.c:395
+#: src/hostlist/gnunet-daemon-hostlist_client.c:440
 #, c-format
 msgid "Invalid `%s' message received from hostlist at `%s'\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:390
+#: src/hostlist/gnunet-daemon-hostlist_client.c:413
 msgid "# valid HELLOs downloaded from hostlist servers"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:655
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1386
+#: src/hostlist/gnunet-daemon-hostlist_client.c:695
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1441
 msgid "# advertised hostlist URIs"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:685
+#: src/hostlist/gnunet-daemon-hostlist_client.c:725
 #, c-format
 msgid "# advertised URI `%s' downloaded"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:728
+#: src/hostlist/gnunet-daemon-hostlist_client.c:768
 #, c-format
 msgid ""
 "Advertised hostlist with URI `%s' could not be downloaded. Advertised URI "
@@ -4541,226 +4388,221 @@
 "gets dismissed.\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:856
+#: src/hostlist/gnunet-daemon-hostlist_client.c:896
 #, c-format
 msgid "Timeout trying to download hostlist from `%s'\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:870
+#: src/hostlist/gnunet-daemon-hostlist_client.c:910
 #, c-format
 msgid "Download limit of %u bytes exceeded, stopping download\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:890
+#: src/hostlist/gnunet-daemon-hostlist_client.c:930
 #, c-format
 msgid "Download of hostlist from `%s' failed: `%s'\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:896
+#: src/hostlist/gnunet-daemon-hostlist_client.c:936
 #, c-format
 msgid "Download of hostlist `%s' completed.\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:904
+#: src/hostlist/gnunet-daemon-hostlist_client.c:944
 #, c-format
 msgid "Adding successfully tested hostlist `%s' datastore.\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:957
+#: src/hostlist/gnunet-daemon-hostlist_client.c:997
 #, c-format
 msgid "Bootstrapping using hostlist at `%s'.\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:965
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1005
 msgid "# hostlist downloads initiated"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1092
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1639
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1132
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1698
 msgid "# milliseconds between hostlist downloads"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1101
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1141
 #, c-format
 msgid "Have %u/%u connections.  Will consider downloading hostlist in %s\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1156
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1172
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1200
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1221
 msgid "# active connections"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1332
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1387
 #, c-format
 msgid "Loading saved hostlist entries from file `%s' \n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1337
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1392
 #, c-format
 msgid "Hostlist file `%s' does not exist\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1346
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1401
 #, c-format
 msgid "Could not open file `%s' for reading to load hostlists: %s\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1380
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1435
 #, c-format
 msgid "%u hostlist URIs loaded from file\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1383
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1438
 msgid "# hostlist URIs read from file"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1429
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1484
 #, c-format
 msgid "Could not open file `%s' for writing to save hostlists: %s\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1436
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1491
 #, c-format
 msgid "Writing %u hostlist URIs to `%s'\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1460
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1477
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1515
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1532
 #, c-format
 msgid "Error writing hostlist URIs to file `%s'\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1472
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1527
 msgid "# hostlist URIs written to file"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1572
-#: src/transport/plugin_transport_http_client.c:2273
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1628
+#: src/transport/plugin_transport_http_client.c:2277
 #, c-format
 msgid "Invalid proxy type: `%s', disabling proxy! Check configuration!\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1601
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1657
 msgid "Learning is enabled on this peer\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1614
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1671
 msgid "Learning is not enabled on this peer\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1625
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1684
 #, c-format
 msgid ""
 "Since learning is not enabled on this peer, hostlist file `%s' was removed\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:182
+#: src/hostlist/gnunet-daemon-hostlist_server.c:176
 msgid "bytes in hostlist"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:207
+#: src/hostlist/gnunet-daemon-hostlist_server.c:201
 msgid "expired addresses encountered"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:243
-#: src/hostlist/gnunet-daemon-hostlist_server.c:590
-#: src/peerinfo-tool/gnunet-peerinfo.c:389
-#: src/peerinfo-tool/gnunet-peerinfo.c:538
-#: src/topology/gnunet-daemon-topology.c:866
+#: src/hostlist/gnunet-daemon-hostlist_server.c:237
+#: src/hostlist/gnunet-daemon-hostlist_server.c:531
+#: src/peerinfo-tool/gnunet-peerinfo.c:385
+#: src/peerinfo-tool/gnunet-peerinfo.c:534
+#: src/topology/gnunet-daemon-topology.c:857
 #, c-format
 msgid "Error in communication with PEERINFO service: %s\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:267
+#: src/hostlist/gnunet-daemon-hostlist_server.c:261
 msgid "HELLOs without addresses encountered (ignored)"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:284
+#: src/hostlist/gnunet-daemon-hostlist_server.c:278
 msgid "bytes not included in hostlist (size limit)"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:388
+#: src/hostlist/gnunet-daemon-hostlist_server.c:382
 #, c-format
 msgid "Refusing `%s' request to hostlist server\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:391
+#: src/hostlist/gnunet-daemon-hostlist_server.c:385
 msgid "hostlist requests refused (not HTTP GET)"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:403
+#: src/hostlist/gnunet-daemon-hostlist_server.c:397
 #, c-format
 msgid "Refusing `%s' request with %llu bytes of upload data\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:407
+#: src/hostlist/gnunet-daemon-hostlist_server.c:401
 msgid "hostlist requests refused (upload data)"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:414
+#: src/hostlist/gnunet-daemon-hostlist_server.c:408
 msgid "Could not handle hostlist request since I do not have a response yet\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:417
+#: src/hostlist/gnunet-daemon-hostlist_server.c:411
 msgid "hostlist requests refused (not ready)"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:422
+#: src/hostlist/gnunet-daemon-hostlist_server.c:416
 msgid "Received request for our hostlist\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:424
+#: src/hostlist/gnunet-daemon-hostlist_server.c:418
 msgid "hostlist requests processed"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:485
+#: src/hostlist/gnunet-daemon-hostlist_server.c:466
 msgid "# hostlist advertisements send"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:535
-msgid "Advertisement message could not be queued by core\n"
-msgstr ""
-
-#: src/hostlist/gnunet-daemon-hostlist_server.c:743
-#: src/peerinfo-tool/gnunet-peerinfo.c:741
-#: src/transport/gnunet-service-transport.c:856
+#: src/hostlist/gnunet-daemon-hostlist_server.c:679
+#: src/transport/gnunet-service-transport.c:2802
 msgid "Could not access PEERINFO service.  Exiting.\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:755
+#: src/hostlist/gnunet-daemon-hostlist_server.c:691
 #, c-format
 msgid "Invalid port number %llu.  Exiting.\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:767
+#: src/hostlist/gnunet-daemon-hostlist_server.c:703
 #, c-format
 msgid "Hostlist service starts on %s:%llu\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:782
+#: src/hostlist/gnunet-daemon-hostlist_server.c:718
 #, c-format
 msgid "Address to obtain hostlist: `%s'\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:795
+#: src/hostlist/gnunet-daemon-hostlist_server.c:731
 msgid "BINDTOIP does not a valid IPv4 address! Ignoring BINDTOIPV4.\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:808
+#: src/hostlist/gnunet-daemon-hostlist_server.c:748
 msgid "BINDTOIP does not a valid IPv4 address! Ignoring BINDTOIPV6.\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:829
+#: src/hostlist/gnunet-daemon-hostlist_server.c:769
 #, c-format
 msgid "`%s' is not a valid IPv4 address! Ignoring BINDTOIPV4.\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:849
+#: src/hostlist/gnunet-daemon-hostlist_server.c:789
 #, c-format
 msgid "`%s' is not a valid IPv6 address! Ignoring BINDTOIPV6.\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:889
+#: src/hostlist/gnunet-daemon-hostlist_server.c:829
 #, c-format
 msgid "Could not start hostlist HTTP server on port %u\n"
 msgstr ""
@@ -4805,75 +4647,93 @@
 msgid "Maintain egos"
 msgstr ""
 
-#: src/identity/gnunet-service-identity.c:337
+#: src/identity/gnunet-service-identity.c:390
 msgid "no default known"
 msgstr ""
 
-#: src/identity/gnunet-service-identity.c:361
+#: src/identity/gnunet-service-identity.c:412
 msgid "default configured, but ego unknown (internal error)"
 msgstr ""
 
-#: src/identity/gnunet-service-identity.c:438
-#: src/identity/gnunet-service-identity.c:669
-#: src/identity/gnunet-service-identity.c:777
+#: src/identity/gnunet-service-identity.c:501
+#: src/identity/gnunet-service-identity.c:773
+#: src/identity/gnunet-service-identity.c:895
 #, c-format
 msgid "Failed to write subsystem default identifier map to `%s'.\n"
 msgstr ""
 
-#: src/identity/gnunet-service-identity.c:445
+#: src/identity/gnunet-service-identity.c:508
 msgid "Unknown ego specified for service (internal error)"
 msgstr ""
 
-#: src/identity/gnunet-service-identity.c:515
+#: src/identity/gnunet-service-identity.c:601
 msgid "identifier already in use for another ego"
 msgstr ""
 
-#: src/identity/gnunet-service-identity.c:646
+#: src/identity/gnunet-service-identity.c:750
 msgid "target name already exists"
 msgstr ""
 
-#: src/identity/gnunet-service-identity.c:685
-#: src/identity/gnunet-service-identity.c:794
+#: src/identity/gnunet-service-identity.c:789
+#: src/identity/gnunet-service-identity.c:912
 msgid "no matching ego found"
 msgstr ""
 
-#: src/identity/gnunet-service-identity.c:828
+#: src/identity/gnunet-service-identity.c:946
 #, c-format
 msgid "Failed to parse ego information in `%s'\n"
 msgstr ""
 
-#: src/identity/gnunet-service-identity.c:901
+#: src/identity/gnunet-service-identity.c:1004
 #, c-format
 msgid "Failed to parse subsystem identity configuration file `%s'\n"
 msgstr ""
 
-#: src/identity/gnunet-service-identity.c:913
+#: src/identity/gnunet-service-identity.c:1014
 #, c-format
 msgid "Failed to create directory `%s' for storing egos\n"
 msgstr ""
 
-#: src/identity/plugin_rest_identity.c:938
+#: src/identity/plugin_rest_identity.c:967
 msgid "Identity REST API initialized\n"
 msgstr ""
 
-#: src/identity-provider/gnunet-identity-token.c:101
+#: src/identity-provider/gnunet-identity-token.c:66
+msgid "Option `-t' is required\n"
+msgstr ""
+
+#: src/identity-provider/gnunet-identity-token.c:77
+#, c-format
+msgid "Token `%s' is malformed\n"
+msgstr ""
+
+#: src/identity-provider/gnunet-identity-token.c:163
 msgid "GNUid token"
 msgstr ""
 
-#: src/identity-provider/gnunet-identity-token.c:104
+#: src/identity-provider/gnunet-identity-token.c:166
 msgid "Print token contents"
 msgstr ""
 
-#: src/identity-provider/plugin_rest_identity_provider.c:1126
+#: src/identity-provider/plugin_rest_identity_provider.c:1163
 msgid "Identity Token REST API initialized\n"
 msgstr ""
 
-#: src/mysql/mysql.c:174
+#: src/multicast/gnunet-multicast.c:48 src/multicast/gnunet-multicast.c:72
+msgid "This command doesn't do anything yet."
+msgstr ""
+
+#: src/my/my.c:198 src/my/my.c:217
 #, c-format
+msgid "%s failed at %s:%d with error: %s\n"
+msgstr ""
+
+#: src/mysql/mysql.c:180
+#, c-format
 msgid "Trying to use file `%s' for MySQL configuration.\n"
 msgstr ""
 
-#: src/mysql/mysql.c:181
+#: src/mysql/mysql.c:187
 #, c-format
 msgid "Could not access file `%s': %s\n"
 msgstr ""
@@ -4883,7 +4743,7 @@
 msgid "No records found for `%s'"
 msgstr ""
 
-#: src/namecache/gnunet-namecache.c:122 src/namestore/gnunet-namestore.c:395
+#: src/namecache/gnunet-namecache.c:122 src/namestore/gnunet-namestore.c:415
 #, c-format
 msgid "\tCorrupt or unsupported record of type %u\n"
 msgstr ""
@@ -4903,7 +4763,7 @@
 msgid "You must specify a name\n"
 msgstr ""
 
-#: src/namecache/gnunet-namecache.c:230 src/namestore/gnunet-namestore.c:1081
+#: src/namecache/gnunet-namecache.c:230 src/namestore/gnunet-namestore.c:1153
 msgid "name of the record to add/delete/display"
 msgstr ""
 
@@ -4911,18 +4771,24 @@
 msgid "spezifies the public key of the zone to look in"
 msgstr ""
 
-#: src/namecache/gnunet-namecache.c:244 src/namestore/gnunet-namestore.c:1113
+#: src/namecache/gnunet-namecache.c:244 src/namestore/gnunet-namestore.c:1189
 msgid "GNUnet zone manipulation tool"
 msgstr ""
 
-#: src/namecache/namecache_api.c:276
+#: src/namecache/namecache_api.c:296
 msgid "Namecache failed to cache block"
 msgstr ""
 
+#: src/namecache/namecache_api.c:383
+msgid "Error communicating with namecache service"
+msgstr ""
+
 #: src/namecache/plugin_namecache_flat.c:119
-#: src/namecache/plugin_namecache_flat.c:244
+#: src/namecache/plugin_namecache_flat.c:253
 #: src/namestore/plugin_namestore_flat.c:179
-#: src/namestore/plugin_namestore_flat.c:351
+#: src/namestore/plugin_namestore_flat.c:375
+#: src/peerstore/plugin_peerstore_flat.c:379
+#: src/peerstore/plugin_peerstore_flat.c:527
 #, c-format
 msgid "Unable to initialize file: %s.\n"
 msgstr ""
@@ -4929,17 +4795,19 @@
 
 #: src/namecache/plugin_namecache_flat.c:130
 #: src/namestore/plugin_namestore_flat.c:190
+#: src/peerstore/plugin_peerstore_flat.c:394
 #, c-format
 msgid "Unable to get filesize: %s.\n"
 msgstr ""
 
-#: src/namecache/plugin_namecache_flat.c:145
-#: src/namestore/plugin_namestore_flat.c:202
+#: src/namecache/plugin_namecache_flat.c:149
+#: src/namestore/plugin_namestore_flat.c:203
+#: src/peerstore/plugin_peerstore_flat.c:406
 #, fuzzy, c-format
 msgid "Unable to read file: %s.\n"
 msgstr "Résolution de « %s » échouée\n"
 
-#: src/namecache/plugin_namecache_flat.c:399
+#: src/namecache/plugin_namecache_flat.c:408
 msgid "flat plugin running\n"
 msgstr ""
 
@@ -4954,257 +4822,242 @@
 msgstr ""
 
 #: src/namestore/gnunet-namestore.c:330
-#: src/namestore/plugin_rest_namestore.c:547
+#: src/namestore/plugin_rest_namestore.c:562
 #, c-format
 msgid "Deleting record failed, record does not exist%s%s\n"
 msgstr ""
 
 #: src/namestore/gnunet-namestore.c:337
-#: src/namestore/plugin_rest_namestore.c:556
+#: src/namestore/plugin_rest_namestore.c:571
 #, c-format
 msgid "Deleting record failed%s%s\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:475 src/namestore/gnunet-namestore.c:483
-#: src/namestore/gnunet-namestore.c:491
+#: src/namestore/gnunet-namestore.c:519 src/namestore/gnunet-namestore.c:527
+#: src/namestore/gnunet-namestore.c:535
 #, c-format
 msgid "A %s record exists already under `%s', no other records can be added.\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:505 src/namestore/gnunet-namestore.c:517
-#: src/namestore/gnunet-namestore.c:529
+#: src/namestore/gnunet-namestore.c:549 src/namestore/gnunet-namestore.c:561
+#: src/namestore/gnunet-namestore.c:573
 #, c-format
 msgid "Records already exist under `%s', cannot add `%s' record.\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:626
-#: src/namestore/plugin_rest_namestore.c:580
+#: src/namestore/gnunet-namestore.c:698
+#: src/namestore/plugin_rest_namestore.c:597
 #, c-format
 msgid "There are no records under label `%s' that could be deleted.\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:665
+#: src/namestore/gnunet-namestore.c:739
 #, c-format
 msgid ""
 "There are no records under label `%s' that match the request for deletion.\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:698
-#: src/namestore/plugin_rest_namestore.c:954
-#: src/transport/gnunet-transport.c:1769
-#: src/transport/gnunet-transport-profiler.c:497
+#: src/namestore/gnunet-namestore.c:776
+#: src/namestore/plugin_rest_namestore.c:1003
 #, c-format
-msgid "Service `%s' is not running\n"
+msgid "Ego `%s' not known to identity service\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:706
+#: src/namestore/gnunet-namestore.c:791
 #, c-format
 msgid "No options given\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:717
-#: src/namestore/gnunet-namestore-fcfsd.c:978
-#: src/namestore/plugin_rest_namestore.c:963
+#: src/namestore/gnunet-namestore.c:802
+#: src/namestore/gnunet-namestore-fcfsd.c:1034
+#: src/namestore/plugin_rest_namestore.c:1016
 msgid "Failed to connect to namestore\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:725 src/namestore/gnunet-namestore.c:734
-#: src/namestore/gnunet-namestore.c:751 src/namestore/gnunet-namestore.c:773
-#: src/namestore/gnunet-namestore.c:813
+#: src/namestore/gnunet-namestore.c:810 src/namestore/gnunet-namestore.c:819
+#: src/namestore/gnunet-namestore.c:838 src/namestore/gnunet-namestore.c:861
+#: src/namestore/gnunet-namestore.c:915
 #, c-format
 msgid "Missing option `%s' for operation `%s'\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:726 src/namestore/gnunet-namestore.c:735
-#: src/namestore/gnunet-namestore.c:752 src/namestore/gnunet-namestore.c:774
+#: src/namestore/gnunet-namestore.c:811 src/namestore/gnunet-namestore.c:820
+#: src/namestore/gnunet-namestore.c:839 src/namestore/gnunet-namestore.c:863
 msgid "add"
 msgstr "ajouter"
 
-#: src/namestore/gnunet-namestore.c:743
-#: src/namestore/plugin_rest_namestore.c:650
+#: src/namestore/gnunet-namestore.c:829
+#: src/namestore/plugin_rest_namestore.c:671
 #, c-format
 msgid "Unsupported type `%s'\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:763
-#: src/namestore/plugin_rest_namestore.c:668
-#: src/namestore/plugin_rest_namestore.c:708
+#: src/namestore/gnunet-namestore.c:851
+#: src/namestore/plugin_rest_namestore.c:689
+#: src/namestore/plugin_rest_namestore.c:729
 #, c-format
 msgid "Value `%s' invalid for record type `%s'\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:799
+#: src/namestore/gnunet-namestore.c:896
 #, c-format
 msgid "Invalid time format `%s'\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:814
+#: src/namestore/gnunet-namestore.c:916
 msgid "del"
 msgstr "supprimer"
 
-#: src/namestore/gnunet-namestore.c:842
+#: src/namestore/gnunet-namestore.c:950
 #, c-format
 msgid "Invalid public key for reverse lookup `%s'\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:866
-#: src/peerinfo-tool/gnunet-peerinfo.c:819
+#: src/namestore/gnunet-namestore.c:979 src/peerinfo-tool/gnunet-peerinfo.c:775
 #, c-format
 msgid "Invalid URI `%s'\n"
 msgstr "URI invalide « %s »\n"
 
-#: src/namestore/gnunet-namestore.c:901
+#: src/namestore/gnunet-namestore.c:1014
 #, c-format
 msgid "Invalid nick `%s'\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:941
-#: src/namestore/plugin_rest_namestore.c:999
+#: src/namestore/gnunet-namestore.c:1051
+#: src/namestore/plugin_rest_namestore.c:1046
 #, c-format
-msgid "Ego `%s' not known to identity service\n"
-msgstr ""
-
-#: src/namestore/gnunet-namestore.c:968
-#: src/namestore/plugin_rest_namestore.c:1026
-#, c-format
 msgid "No default ego configured in identity service\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1004
-#: src/namestore/plugin_rest_namestore.c:1066
+#: src/namestore/gnunet-namestore.c:1108
+#: src/namestore/plugin_rest_namestore.c:1142
 #, c-format
-msgid "Identity service is not running\n"
-msgstr ""
-
-#: src/namestore/gnunet-namestore.c:1015
-#: src/namestore/plugin_rest_namestore.c:1107
-#, c-format
 msgid "Cannot connect to identity service\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1063
+#: src/namestore/gnunet-namestore.c:1135
 msgid "add record"
 msgstr "ajouter un enregistrement"
 
-#: src/namestore/gnunet-namestore.c:1066
+#: src/namestore/gnunet-namestore.c:1138
 msgid "delete record"
 msgstr "suprimer un enregistrement"
 
-#: src/namestore/gnunet-namestore.c:1069
+#: src/namestore/gnunet-namestore.c:1141
 msgid "display records"
 msgstr "afficher les enregistrements"
 
-#: src/namestore/gnunet-namestore.c:1072
+#: src/namestore/gnunet-namestore.c:1144
 msgid ""
 "expiration time for record to use (for adding only), \"never\" is possible"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1075
+#: src/namestore/gnunet-namestore.c:1147
 msgid "set the desired nick name for the zone"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1078
+#: src/namestore/gnunet-namestore.c:1150
 msgid "monitor changes in the namestore"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1084
+#: src/namestore/gnunet-namestore.c:1156
 msgid "determine our name for the given PKEY"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1087
+#: src/namestore/gnunet-namestore.c:1159
 msgid "type of the record to add/delete/display"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1090
+#: src/namestore/gnunet-namestore.c:1162
 msgid "URI to import into our zone"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1093
+#: src/namestore/gnunet-namestore.c:1165
 msgid "value of the record to add/delete"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1096
+#: src/namestore/gnunet-namestore.c:1168
 msgid "create or list public record"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1099
+#: src/namestore/gnunet-namestore.c:1171
 msgid ""
 "create shadow record (only valid if all other records of the same type have "
 "expired"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1102
+#: src/namestore/gnunet-namestore.c:1174
 msgid "name of the ego controlling the zone"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:476
+#: src/namestore/gnunet-namestore-fcfsd.c:508
 #, c-format
 msgid "Unsupported form value `%s'\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:503
+#: src/namestore/gnunet-namestore-fcfsd.c:535
 #, c-format
 msgid "Failed to create record for domain `%s': %s\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:537
+#: src/namestore/gnunet-namestore-fcfsd.c:555
+msgid "Error when mapping zone to name\n"
+msgstr ""
+
+#: src/namestore/gnunet-namestore-fcfsd.c:585
 #, c-format
 msgid "Found existing name `%s' for the given key\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:546
-msgid "Error when mapping zone to name\n"
-msgstr ""
-
-#: src/namestore/gnunet-namestore-fcfsd.c:608
+#: src/namestore/gnunet-namestore-fcfsd.c:662
 #, c-format
 msgid "Found %u existing records for domain `%s'\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:664
+#: src/namestore/gnunet-namestore-fcfsd.c:718
 #, c-format
 msgid "Failed to create page for `%s'\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:680
+#: src/namestore/gnunet-namestore-fcfsd.c:734
 #, c-format
 msgid "Failed to setup post processor for `%s'\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:716
+#: src/namestore/gnunet-namestore-fcfsd.c:770
 msgid "Domain name must not contain `.'\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:724
+#: src/namestore/gnunet-namestore-fcfsd.c:778
 msgid "Domain name must not contain `+'\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:918
+#: src/namestore/gnunet-namestore-fcfsd.c:974
 msgid "No ego configured for `fcfsd` subsystem\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:944
+#: src/namestore/gnunet-namestore-fcfsd.c:1000
 msgid "Failed to start HTTP server\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:986
+#: src/namestore/gnunet-namestore-fcfsd.c:1042
 msgid "Failed to connect to identity\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:1018
+#: src/namestore/gnunet-namestore-fcfsd.c:1074
 msgid "GNU Name System First Come First Serve name registration service"
 msgstr ""
 
-#: src/namestore/gnunet-service-namestore.c:655
+#: src/namestore/gnunet-service-namestore.c:612
 #, c-format
 msgid "Failed to replicate block in namecache: %s\n"
 msgstr ""
 
-#: src/namestore/namestore_api.c:275
+#: src/namestore/namestore_api.c:379
 msgid "Namestore failed to store record\n"
 msgstr ""
 
-#: src/namestore/plugin_namestore_flat.c:632
+#: src/namestore/plugin_namestore_flat.c:656
 msgid "flat file database running\n"
 msgstr ""
 
@@ -5216,66 +5069,66 @@
 msgid "GNUnet NAT traversal autoconfigure daemon"
 msgstr ""
 
-#: src/nat/gnunet-nat-server.c:279
+#: src/nat/gnunet-nat-server.c:321
 #, c-format
 msgid "Please pass valid port number as the first argument! (got `%s')\n"
 msgstr ""
 
-#: src/nat/gnunet-nat-server.c:321
+#: src/nat/gnunet-nat-server.c:363
 msgid "GNUnet NAT traversal test helper daemon"
 msgstr ""
 
-#: src/nat/nat_auto.c:388
+#: src/nat/nat_auto.c:385
 msgid "NAT traversal with ICMP Server succeeded.\n"
 msgstr ""
 
-#: src/nat/nat_auto.c:389
+#: src/nat/nat_auto.c:386
 msgid "NAT traversal with ICMP Server failed.\n"
 msgstr ""
 
-#: src/nat/nat_auto.c:408
+#: src/nat/nat_auto.c:405
 msgid "Testing connection reversal with ICMP server.\n"
 msgstr ""
 
-#: src/nat/nat_auto.c:440
+#: src/nat/nat_auto.c:437
 #, c-format
 msgid "Detected external IP `%s'\n"
 msgstr ""
 
-#: src/nat/nat_auto.c:574
+#: src/nat/nat_auto.c:572
 msgid "This system has a global IPv6 address, setting IPv6 to supported.\n"
 msgstr ""
 
-#: src/nat/nat_auto.c:592
+#: src/nat/nat_auto.c:590
 #, c-format
 msgid "Detected internal network address `%s'.\n"
 msgstr ""
 
-#: src/nat/nat_auto.c:662 src/nat/nat_test.c:360
+#: src/nat/nat_auto.c:681 src/nat/nat_test.c:403
 msgid "Failed to connect to `gnunet-nat-server'\n"
 msgstr ""
 
-#: src/nat/nat_auto.c:709
+#: src/nat/nat_auto.c:724
 msgid "upnpc found, enabling its use\n"
 msgstr ""
 
-#: src/nat/nat_auto.c:710
+#: src/nat/nat_auto.c:725
 msgid "upnpc not found\n"
 msgstr "upnpc introuvable\n"
 
-#: src/nat/nat_auto.c:742
+#: src/nat/nat_auto.c:762
 msgid "test_icmp_server not possible, as we have no public IPv4 address\n"
 msgstr ""
 
-#: src/nat/nat_auto.c:750 src/nat/nat_auto.c:796
+#: src/nat/nat_auto.c:774 src/nat/nat_auto.c:834
 msgid "test_icmp_server not possible, as we are not behind NAT\n"
 msgstr ""
 
-#: src/nat/nat_auto.c:758 src/nat/nat_auto.c:805
+#: src/nat/nat_auto.c:786 src/nat/nat_auto.c:846
 msgid "No working gnunet-helper-nat-server found\n"
 msgstr ""
 
-#: src/nat/nat_auto.c:788
+#: src/nat/nat_auto.c:823
 msgid "test_icmp_client not possible, as we have no internal IPv4 address\n"
 msgstr ""
 
@@ -5289,26 +5142,26 @@
 msgid "Failed to start %s\n"
 msgstr "Échec du démarrage de %s\n"
 
-#: src/nat/nat.c:1321
+#: src/nat/nat.c:1327
 msgid "Error while running upnp client:\n"
 msgstr ""
 
-#: src/nat/nat.c:1396
+#: src/nat/nat.c:1402
 #, c-format
 msgid "Failed to run upnp client for port %u\n"
 msgstr ""
 
-#: src/nat/nat.c:1540
+#: src/nat/nat.c:1546
 msgid "malformed"
 msgstr "malformé"
 
-#: src/nat/nat.c:1594
+#: src/nat/nat.c:1600
 msgid ""
 "UPnP enabled in configuration, but UPnP client `upnpc` command not found, "
 "disabling UPnP \n"
 msgstr ""
 
-#: src/nat/nat.c:1723 src/nat/nat.c:1736
+#: src/nat/nat.c:1726 src/nat/nat.c:1739
 #, c-format
 msgid ""
 "Configuration requires `%s', but binary is not installed properly (SUID bit "
@@ -5315,88 +5168,88 @@
 "not set).  Option disabled.\n"
 msgstr ""
 
-#: src/nat/nat.c:1891
+#: src/nat/nat.c:1903
 msgid "Internal IP address not known, cannot use ICMP NAT traversal method\n"
 msgstr ""
 
-#: src/nat/nat.c:1907
+#: src/nat/nat.c:1919
 #, c-format
 msgid "Running gnunet-helper-nat-client %s %s %u\n"
 msgstr ""
 
-#: src/nat/nat.c:1998
+#: src/nat/nat.c:2010
 msgid "Operation Successful"
 msgstr ""
 
-#: src/nat/nat.c:2000
+#: src/nat/nat.c:2012
 msgid "Internal Failure (IPC, ...)"
 msgstr ""
 
-#: src/nat/nat.c:2002
+#: src/nat/nat.c:2014
 msgid "Failure in network subsystem, check permissions."
 msgstr ""
 
-#: src/nat/nat.c:2004
+#: src/nat/nat.c:2016
 msgid "Encountered timeout while performing operation"
 msgstr ""
 
-#: src/nat/nat.c:2006
+#: src/nat/nat.c:2018
 msgid "detected that we are offline"
 msgstr ""
 
-#: src/nat/nat.c:2008
+#: src/nat/nat.c:2020
 msgid "`upnpc` command not found"
 msgstr ""
 
-#: src/nat/nat.c:2010
+#: src/nat/nat.c:2022
 msgid "Failed to run `upnpc` command"
 msgstr ""
 
-#: src/nat/nat.c:2012
+#: src/nat/nat.c:2024
 msgid "`upnpc' command took too long, process killed"
 msgstr ""
 
-#: src/nat/nat.c:2014
+#: src/nat/nat.c:2026
 msgid "`upnpc' command failed to establish port mapping"
 msgstr ""
 
-#: src/nat/nat.c:2016
+#: src/nat/nat.c:2028
 msgid "`external-ip' command not found"
 msgstr ""
 
-#: src/nat/nat.c:2018
+#: src/nat/nat.c:2030
 msgid "Failed to run `external-ip` command"
 msgstr ""
 
-#: src/nat/nat.c:2020
+#: src/nat/nat.c:2032
 msgid "`external-ip' command output invalid"
 msgstr ""
 
-#: src/nat/nat.c:2022
+#: src/nat/nat.c:2034
 msgid "no valid address was returned by `external-ip'"
 msgstr ""
 
-#: src/nat/nat.c:2024
+#: src/nat/nat.c:2036
 msgid "Could not determine interface with internal/local network address"
 msgstr ""
 
-#: src/nat/nat.c:2026
+#: src/nat/nat.c:2038
 msgid "No functioning gnunet-helper-nat-server installation found"
 msgstr ""
 
-#: src/nat/nat.c:2028
+#: src/nat/nat.c:2040
 msgid "NAT test could not be initialized"
 msgstr ""
 
-#: src/nat/nat.c:2030
+#: src/nat/nat.c:2042
 msgid "NAT test timeout reached"
 msgstr ""
 
-#: src/nat/nat.c:2032
+#: src/nat/nat.c:2044
 msgid "could not register NAT"
 msgstr ""
 
-#: src/nat/nat.c:2034
+#: src/nat/nat.c:2046
 msgid "No working gnunet-helper-nat-client installation found"
 msgstr ""
 
@@ -5408,24 +5261,16 @@
 msgid "`upnpc' command not found\n"
 msgstr ""
 
-#: src/nat/nat_test.c:460
+#: src/nat/nat_test.c:518
 #, c-format
 msgid "Failed to create listen socket bound to `%s' for NAT test: %s\n"
 msgstr ""
 
-#: src/nat/nat_test.c:497
+#: src/nat/nat_test.c:568
 msgid "NAT test failed to start NAT library\n"
 msgstr ""
 
-#: src/nse/gnunet-nse.c:116
-msgid "NSE service is not running\n"
-msgstr ""
-
-#: src/nse/gnunet-nse.c:121
-msgid "Error while checking if NSE service is running or not\n"
-msgstr ""
-
-#: src/nse/gnunet-nse.c:167
+#: src/nse/gnunet-nse.c:122
 msgid "Show network size estimates from NSE service."
 msgstr ""
 
@@ -5453,171 +5298,133 @@
 msgid "Measure quality and performance of the NSE service."
 msgstr ""
 
-#: src/nse/gnunet-service-nse.c:1535
-#: src/revocation/gnunet-service-revocation.c:844 src/util/gnunet-scrypt.c:276
+#: src/nse/gnunet-service-nse.c:1536
+#: src/revocation/gnunet-service-revocation.c:832 src/util/gnunet-scrypt.c:276
 msgid "Value is too large.\n"
 msgstr ""
 
-#: src/peerinfo/gnunet-service-peerinfo.c:225
+#: src/peerinfo/gnunet-service-peerinfo.c:178
 #, c-format
 msgid "Removing expired address of transport `%s'\n"
 msgstr ""
 
-#: src/peerinfo/gnunet-service-peerinfo.c:362
+#: src/peerinfo/gnunet-service-peerinfo.c:310
 #, c-format
 msgid "Failed to parse HELLO in file `%s': %s\n"
 msgstr ""
 
-#: src/peerinfo/gnunet-service-peerinfo.c:382
-#: src/peerinfo/gnunet-service-peerinfo.c:411
+#: src/peerinfo/gnunet-service-peerinfo.c:331
+#: src/peerinfo/gnunet-service-peerinfo.c:362
 #, c-format
 msgid "Failed to parse HELLO in file `%s'\n"
 msgstr ""
 
-#: src/peerinfo/gnunet-service-peerinfo.c:491
+#: src/peerinfo/gnunet-service-peerinfo.c:446
 msgid "# peers known"
 msgstr ""
 
-#: src/peerinfo/gnunet-service-peerinfo.c:529
+#: src/peerinfo/gnunet-service-peerinfo.c:489
 #, c-format
 msgid ""
 "File `%s' in directory `%s' does not match naming convention. Removed.\n"
 msgstr ""
 
-#: src/peerinfo/gnunet-service-peerinfo.c:683
+#: src/peerinfo/gnunet-service-peerinfo.c:655
 #, c-format
 msgid "Scanning directory `%s'\n"
 msgstr ""
 
-#: src/peerinfo/gnunet-service-peerinfo.c:689
+#: src/peerinfo/gnunet-service-peerinfo.c:663
 #, c-format
 msgid "Still no peers found in `%s'!\n"
 msgstr ""
 
-#: src/peerinfo/gnunet-service-peerinfo.c:1061
+#: src/peerinfo/gnunet-service-peerinfo.c:1076
 #, c-format
 msgid "Cleaning up directory `%s'\n"
 msgstr ""
 
-#: src/peerinfo/gnunet-service-peerinfo.c:1391
+#: src/peerinfo/gnunet-service-peerinfo.c:1405
 #, c-format
 msgid "Importing HELLOs from `%s'\n"
 msgstr ""
 
-#: src/peerinfo/gnunet-service-peerinfo.c:1404
+#: src/peerinfo/gnunet-service-peerinfo.c:1418
 msgid "Skipping import of included HELLOs\n"
 msgstr ""
 
-#: src/peerinfo/peerinfo_api.c:237
-msgid "aborted due to explicit disconnect request"
-msgstr ""
-
-#: src/peerinfo/peerinfo_api.c:361
-msgid "failed to transmit request (service down?)"
-msgstr ""
-
-#: src/peerinfo/peerinfo_api.c:516
+#: src/peerinfo/peerinfo_api.c:220
 msgid "Failed to receive response from `PEERINFO' service."
 msgstr ""
 
-#: src/peerinfo/peerinfo_api.c:560 src/peerinfo/peerinfo_api.c:583
-#: src/peerinfo/peerinfo_api.c:600 src/peerinfo/peerinfo_api.c:613
-#: src/peerinfo/peerinfo_api.c:628
-msgid "Received invalid message from `PEERINFO' service."
-msgstr ""
-
-#: src/peerinfo/peerinfo_api.c:715
-msgid "Timeout transmitting iteration request to `PEERINFO' service."
-msgstr ""
-
-#: src/peerinfo/peerinfo_api_notify.c:268
+#: src/peerinfo-tool/gnunet-peerinfo.c:239
 #, c-format
-msgid "Could not connect to `%s' service.\n"
-msgstr ""
-
-#: src/peerinfo-tool/gnunet-peerinfo.c:243
-#, c-format
 msgid "%sPeer `%s'\n"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:250
+#: src/peerinfo-tool/gnunet-peerinfo.c:246
 #, c-format
 msgid "\tExpires: %s \t %s\n"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:303
+#: src/peerinfo-tool/gnunet-peerinfo.c:299
 #, c-format
 msgid "Failure: Cannot convert address to string for peer `%s'\n"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:470
+#: src/peerinfo-tool/gnunet-peerinfo.c:466
 #, c-format
 msgid "Failure: Received invalid %s\n"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:484
+#: src/peerinfo-tool/gnunet-peerinfo.c:480
 #, c-format
 msgid "Failed to write HELLO with %u bytes to file `%s'\n"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:503
+#: src/peerinfo-tool/gnunet-peerinfo.c:499
 #, c-format
 msgid "Wrote %s HELLO containing %u addresses with %u bytes to file `%s'\n"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:573
+#: src/peerinfo-tool/gnunet-peerinfo.c:799
 #, c-format
-msgid "Failure adding HELLO: %s\n"
-msgstr ""
-
-#: src/peerinfo-tool/gnunet-peerinfo.c:700
-#, c-format
-msgid "Failed to get my own HELLO from this peer!\n"
-msgstr ""
-
-#: src/peerinfo-tool/gnunet-peerinfo.c:732
-#, c-format
-msgid "Service `%s' is not running, please start GNUnet\n"
-msgstr ""
-
-#: src/peerinfo-tool/gnunet-peerinfo.c:843
-#, c-format
 msgid "I am peer `%s'.\n"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:884
+#: src/peerinfo-tool/gnunet-peerinfo.c:842
 msgid "don't resolve host names"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:887
+#: src/peerinfo-tool/gnunet-peerinfo.c:845
 msgid "output only the identity strings"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:890
+#: src/peerinfo-tool/gnunet-peerinfo.c:848
 msgid "include friend-only information"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:893
+#: src/peerinfo-tool/gnunet-peerinfo.c:851
 msgid "output our own identity only"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:896
+#: src/peerinfo-tool/gnunet-peerinfo.c:854
 msgid "list all known peers"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:899
+#: src/peerinfo-tool/gnunet-peerinfo.c:857
 msgid "dump hello to file"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:902
+#: src/peerinfo-tool/gnunet-peerinfo.c:860
 msgid "also output HELLO uri(s)"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:905
+#: src/peerinfo-tool/gnunet-peerinfo.c:863
 msgid "add given HELLO uri to the database"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:919
+#: src/peerinfo-tool/gnunet-peerinfo.c:880
 msgid "Print information about peers."
 msgstr ""
 
@@ -5643,62 +5450,29 @@
 msgid "peerstore"
 msgstr ""
 
-#: src/peerstore/gnunet-service-peerstore.c:395
-msgid "Malformed iterate request.\n"
-msgstr ""
-
-#: src/peerstore/gnunet-service-peerstore.c:402
-msgid "Sub system not supplied in client iterate request.\n"
-msgstr ""
-
-#: src/peerstore/gnunet-service-peerstore.c:462
-msgid "Malformed store request from client\n"
-msgstr ""
-
-#: src/peerstore/gnunet-service-peerstore.c:470
-msgid "Full key not supplied in client store request\n"
-msgstr ""
-
-#: src/peerstore/gnunet-service-peerstore.c:489
-msgid "Failed to store requested value, database error."
-msgstr ""
-
-#: src/peerstore/gnunet-service-peerstore.c:568
-msgid "No database backend configured\n"
-msgstr ""
-
-#: src/peerstore/gnunet-service-peerstore.c:579
+#: src/peerstore/gnunet-service-peerstore.c:588
 #, fuzzy, c-format
 msgid "Could not load database backend `%s'\n"
 msgstr "Impossible d’ouvrir « %s ».\n"
 
-#: src/peerstore/peerstore_api.c:329
+#: src/peerstore/peerstore_api.c:296
 #, c-format
 msgid "Received an error notification from MQ of type: %d\n"
 msgstr ""
 
-#: src/peerstore/peerstore_api.c:376
+#: src/peerstore/peerstore_api.c:344
 msgid "timeout"
 msgstr ""
 
-#: src/peerstore/peerstore_api.c:679
+#: src/peerstore/peerstore_api.c:560 src/peerstore/peerstore_api.c:609
 msgid "Unexpected iteration response, this should not happen.\n"
 msgstr ""
 
-#: src/peerstore/peerstore_api.c:690
-msgid "Error communicating with `PEERSTORE' service."
-msgstr ""
-
-#: src/peerstore/peerstore_api.c:709
+#: src/peerstore/peerstore_api.c:623
 msgid "Received a malformed response from service."
 msgstr ""
 
-#: src/peerstore/peerstore_api.c:821
-msgid ""
-"Problem receiving a watch response, no way to determine which request.\n"
-msgstr ""
-
-#: src/peerstore/peerstore_api.c:833
+#: src/peerstore/peerstore_api.c:768
 msgid "Received a watch result for a non existing watch.\n"
 msgstr ""
 
@@ -5711,6 +5485,7 @@
 msgstr ""
 
 #: src/peerstore/plugin_peerstore_sqlite.c:422
+#: src/psycstore/plugin_psycstore_mysql.c:250
 #: src/psycstore/plugin_psycstore_sqlite.c:259
 #, c-format
 msgid ""
@@ -5723,85 +5498,101 @@
 msgid "Unable to create indices: %s.\n"
 msgstr ""
 
-#: src/postgres/postgres.c:63
+#: src/postgres/postgres.c:67
 #, c-format
-msgid "`%s:%s' failed at %s:%d with error: %s"
+msgid "`%s:%s' failed at %s:%d with error: %s\n"
 msgstr ""
 
-#: src/postgres/postgres.c:166
-#, c-format
-msgid "Unable to initialize Postgres: %s"
-msgstr ""
+#: src/postgres/postgres.c:195
+#, fuzzy, c-format
+msgid "Unable to initialize Postgres: %s\n"
+msgstr "Résolution de « %s » échouée\n"
 
-#: src/psycstore/gnunet-service-psycstore.c:260
+#: src/psycstore/gnunet-service-psycstore.c:249
 msgid "Failed to store membership information!\n"
 msgstr ""
 
-#: src/psycstore/gnunet-service-psycstore.c:284
+#: src/psycstore/gnunet-service-psycstore.c:271
 msgid "Failed to test membership!\n"
 msgstr ""
 
-#: src/psycstore/gnunet-service-psycstore.c:306
-msgid "Failed to store fragment!\n"
-msgstr ""
+#: src/psycstore/gnunet-service-psycstore.c:300
+#, fuzzy
+msgid "Dropping invalid fragment\n"
+msgstr "Argument invalide « %s »\n"
 
-#: src/psycstore/gnunet-service-psycstore.c:364
+#: src/psycstore/gnunet-service-psycstore.c:311
+#, fuzzy
+msgid "Failed to store fragment\n"
+msgstr "Échec du démarrage de %s\n"
+
+#: src/psycstore/gnunet-service-psycstore.c:368
 msgid "Failed to get fragment!\n"
 msgstr ""
 
-#: src/psycstore/gnunet-service-psycstore.c:423
+#: src/psycstore/gnunet-service-psycstore.c:434
 msgid "Failed to get message!\n"
 msgstr ""
 
-#: src/psycstore/gnunet-service-psycstore.c:454
+#: src/psycstore/gnunet-service-psycstore.c:464
 msgid "Failed to get message fragment!\n"
 msgstr ""
 
-#: src/psycstore/gnunet-service-psycstore.c:482
+#: src/psycstore/gnunet-service-psycstore.c:494
 msgid "Failed to get master counters!\n"
 msgstr ""
 
-#: src/psycstore/gnunet-service-psycstore.c:665
+#: src/psycstore/gnunet-service-psycstore.c:675
 #, fuzzy, c-format
 msgid "Failed to begin modifying state: %d\n"
 msgstr "Échec du démarrage de %s\n"
 
-#: src/psycstore/gnunet-service-psycstore.c:675
+#: src/psycstore/gnunet-service-psycstore.c:685
 #, fuzzy, c-format
 msgid "Failed to modify state: %d\n"
 msgstr "Échec du démarrage de %s\n"
 
-#: src/psycstore/gnunet-service-psycstore.c:683
+#: src/psycstore/gnunet-service-psycstore.c:693
 msgid "Failed to end modifying state!\n"
 msgstr ""
 
-#: src/psycstore/gnunet-service-psycstore.c:714
+#: src/psycstore/gnunet-service-psycstore.c:730
 msgid "Tried to set invalid state variable name!\n"
 msgstr ""
 
-#: src/psycstore/gnunet-service-psycstore.c:728
+#: src/psycstore/gnunet-service-psycstore.c:744
 msgid "Failed to begin synchronizing state!\n"
 msgstr ""
 
-#: src/psycstore/gnunet-service-psycstore.c:745
+#: src/psycstore/gnunet-service-psycstore.c:761
 msgid "Failed to end synchronizing state!\n"
 msgstr ""
 
-#: src/psycstore/gnunet-service-psycstore.c:765
-#: src/psycstore/gnunet-service-psycstore.c:784
+#: src/psycstore/gnunet-service-psycstore.c:779
+#: src/psycstore/gnunet-service-psycstore.c:795
 msgid "Failed to reset state!\n"
 msgstr ""
 
-#: src/psycstore/gnunet-service-psycstore.c:807
-#: src/psycstore/gnunet-service-psycstore.c:858
+#: src/psycstore/gnunet-service-psycstore.c:824
+#: src/psycstore/gnunet-service-psycstore.c:881
 msgid "Tried to get invalid state variable name!\n"
 msgstr ""
 
-#: src/psycstore/gnunet-service-psycstore.c:834
-#: src/psycstore/gnunet-service-psycstore.c:873
+#: src/psycstore/gnunet-service-psycstore.c:851
+#: src/psycstore/gnunet-service-psycstore.c:896
 msgid "Failed to get state variable!\n"
 msgstr ""
 
+#: src/psycstore/plugin_psycstore_mysql.c:281
+#, fuzzy
+msgid "Unable to initialize Mysql.\n"
+msgstr "Résolution de « %s » échouée\n"
+
+#: src/psycstore/plugin_psycstore_mysql.c:291
+#, fuzzy, c-format
+msgid "Failed to run SQL statement `%s'\n"
+msgstr "Échec du démarrage de %s\n"
+
 #: src/psycstore/plugin_psycstore_sqlite.c:61
 #, c-format
 msgid "`%s' failed at %s:%d with error: %s (%d)\n"
@@ -5811,58 +5602,58 @@
 msgid "SQLite database running\n"
 msgstr ""
 
-#: src/pt/gnunet-daemon-pt.c:482
+#: src/pt/gnunet-daemon-pt.c:493
 msgid "Failed to pack DNS request.  Dropping.\n"
 msgstr ""
 
-#: src/pt/gnunet-daemon-pt.c:488
+#: src/pt/gnunet-daemon-pt.c:499
 msgid "# DNS requests mapped to VPN"
 msgstr ""
 
-#: src/pt/gnunet-daemon-pt.c:541
+#: src/pt/gnunet-daemon-pt.c:553
 msgid "# DNS records modified"
 msgstr ""
 
-#: src/pt/gnunet-daemon-pt.c:717
+#: src/pt/gnunet-daemon-pt.c:737
 msgid "# DNS replies intercepted"
 msgstr ""
 
-#: src/pt/gnunet-daemon-pt.c:723
+#: src/pt/gnunet-daemon-pt.c:744
 msgid "Failed to parse DNS request.  Dropping.\n"
 msgstr ""
 
-#: src/pt/gnunet-daemon-pt.c:824
+#: src/pt/gnunet-daemon-pt.c:851
 msgid "# DNS requests dropped (timeout)"
 msgstr ""
 
-#: src/pt/gnunet-daemon-pt.c:881
+#: src/pt/gnunet-daemon-pt.c:909
 msgid "# DNS requests intercepted"
 msgstr ""
 
-#: src/pt/gnunet-daemon-pt.c:886
+#: src/pt/gnunet-daemon-pt.c:914
 msgid "# DNS requests dropped (DNS cadet channel down)"
 msgstr ""
 
-#: src/pt/gnunet-daemon-pt.c:894
+#: src/pt/gnunet-daemon-pt.c:922
 msgid "# DNS requests dropped (malformed)"
 msgstr ""
 
-#: src/pt/gnunet-daemon-pt.c:967
+#: src/pt/gnunet-daemon-pt.c:995
 msgid "# DNS replies received"
 msgstr ""
 
-#: src/pt/gnunet-daemon-pt.c:983
+#: src/pt/gnunet-daemon-pt.c:1011
 msgid "# DNS replies dropped (too late?)"
 msgstr ""
 
-#: src/pt/gnunet-daemon-pt.c:1257 src/pt/gnunet-daemon-pt.c:1266
-#: src/pt/gnunet-daemon-pt.c:1286 src/pt/gnunet-daemon-pt.c:1297
-#: src/pt/gnunet-daemon-pt.c:1306
+#: src/pt/gnunet-daemon-pt.c:1294 src/pt/gnunet-daemon-pt.c:1303
+#: src/pt/gnunet-daemon-pt.c:1324 src/pt/gnunet-daemon-pt.c:1336
+#: src/pt/gnunet-daemon-pt.c:1345
 #, c-format
 msgid "Failed to connect to %s service.  Exiting.\n"
 msgstr ""
 
-#: src/pt/gnunet-daemon-pt.c:1343
+#: src/pt/gnunet-daemon-pt.c:1390
 msgid "Daemon to run to perform IP protocol translation to GNUnet"
 msgstr ""
 
@@ -5875,81 +5666,86 @@
 msgid "Daemon to announce regular expressions for the peer using cadet."
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1301
+#: src/regex/gnunet-regex-profiler.c:1314
 msgid "No configuration file given. Exiting\n"
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1342
-#: src/regex/gnunet-regex-simulation-profiler.c:638
+#: src/regex/gnunet-regex-profiler.c:1355
+#: src/regex/gnunet-regex-simulation-profiler.c:630
 #, c-format
 msgid "No policy directory specified on command line. Exiting.\n"
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1348
-#: src/regex/gnunet-regex-simulation-profiler.c:646
+#: src/regex/gnunet-regex-profiler.c:1361
+#: src/regex/gnunet-regex-simulation-profiler.c:638
 #, c-format
 msgid "Specified policies directory does not exist. Exiting.\n"
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1355
+#: src/regex/gnunet-regex-profiler.c:1368
 #, c-format
 msgid "No files found in `%s'\n"
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1364
+#: src/regex/gnunet-regex-profiler.c:1377
 msgid "No search strings file given. Exiting.\n"
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1384
+#: src/regex/gnunet-regex-profiler.c:1397
 msgid "Error loading search strings. Exiting.\n"
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1469
+#: src/regex/gnunet-regex-profiler.c:1482
 msgid "name of the file for writing statistics"
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1472
+#: src/regex/gnunet-regex-profiler.c:1485
 msgid "wait TIMEOUT before ending the experiment"
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1475
+#: src/regex/gnunet-regex-profiler.c:1488
 msgid "directory with policy files"
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1478
+#: src/regex/gnunet-regex-profiler.c:1491
 msgid "name of file with input strings"
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1481
+#: src/regex/gnunet-regex-profiler.c:1494
 msgid "name of file with hosts' names"
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1493
+#: src/regex/gnunet-regex-profiler.c:1506
 msgid "Profiler for regex"
 msgstr ""
 
-#: src/regex/gnunet-regex-simulation-profiler.c:704
+#: src/regex/gnunet-regex-simulation-profiler.c:696
 msgid "name of the table to write DFAs"
 msgstr ""
 
-#: src/regex/gnunet-regex-simulation-profiler.c:707
+#: src/regex/gnunet-regex-simulation-profiler.c:699
 msgid "maximum path compression length"
 msgstr ""
 
-#: src/regex/gnunet-regex-simulation-profiler.c:720
+#: src/regex/gnunet-regex-simulation-profiler.c:712
 msgid "Profiler for regex library"
 msgstr ""
 
-#: src/regex/regex_api.c:131
+#: src/regex/regex_api_announce.c:152
 #, c-format
 msgid "Regex `%s' is too long!\n"
 msgstr ""
 
-#: src/rest/gnunet-rest-server.c:784
+#: src/regex/regex_api_search.c:212
+#, c-format
+msgid "Search string `%s' is too long!\n"
+msgstr ""
+
+#: src/rest/gnunet-rest-server.c:788
 msgid "listen on specified port (default: 7776)"
 msgstr ""
 
-#: src/rest/gnunet-rest-server.c:801
+#: src/rest/gnunet-rest-server.c:805
 msgid "GNUnet REST server"
 msgstr ""
 
@@ -5989,97 +5785,97 @@
 msgid "Internal error, key revocation might have failed\n"
 msgstr ""
 
-#: src/revocation/gnunet-revocation.c:320
+#: src/revocation/gnunet-revocation.c:323
 #, c-format
 msgid "Revocation certificate for `%s' stored in `%s'\n"
 msgstr ""
 
-#: src/revocation/gnunet-revocation.c:350
+#: src/revocation/gnunet-revocation.c:352
 #, c-format
 msgid "Ego `%s' not found.\n"
 msgstr ""
 
-#: src/revocation/gnunet-revocation.c:371
+#: src/revocation/gnunet-revocation.c:373
 #, c-format
 msgid "Error: revocation certificate in `%s' is not for `%s'\n"
 msgstr ""
 
-#: src/revocation/gnunet-revocation.c:391
+#: src/revocation/gnunet-revocation.c:393
 msgid "Revocation certificate ready\n"
 msgstr ""
 
-#: src/revocation/gnunet-revocation.c:401
+#: src/revocation/gnunet-revocation.c:403
 msgid "Revocation certificate not ready, calculating proof of work\n"
 msgstr ""
 
-#: src/revocation/gnunet-revocation.c:435
+#: src/revocation/gnunet-revocation.c:437 src/social/gnunet-social.c:1159
 #, c-format
 msgid "Public key `%s' malformed\n"
 msgstr ""
 
-#: src/revocation/gnunet-revocation.c:448
+#: src/revocation/gnunet-revocation.c:450
 msgid ""
 "Testing and revoking at the same time is not allowed, only executing test.\n"
 msgstr ""
 
-#: src/revocation/gnunet-revocation.c:468
+#: src/revocation/gnunet-revocation.c:470
 msgid "No filename to store revocation certificate given.\n"
 msgstr ""
 
-#: src/revocation/gnunet-revocation.c:489
+#: src/revocation/gnunet-revocation.c:491
 #, c-format
 msgid "Failed to read revocation certificate from `%s'\n"
 msgstr ""
 
-#: src/revocation/gnunet-revocation.c:514
+#: src/revocation/gnunet-revocation.c:516
 msgid "No action specified. Nothing to do.\n"
 msgstr ""
 
-#: src/revocation/gnunet-revocation.c:530
+#: src/revocation/gnunet-revocation.c:532
 msgid "use NAME for the name of the revocation file"
 msgstr ""
 
-#: src/revocation/gnunet-revocation.c:533
+#: src/revocation/gnunet-revocation.c:535
 msgid ""
 "revoke the private key associated for the the private key associated with "
 "the ego NAME "
 msgstr ""
 
-#: src/revocation/gnunet-revocation.c:536
+#: src/revocation/gnunet-revocation.c:538
 msgid "actually perform revocation, otherwise we just do the precomputation"
 msgstr ""
 
-#: src/revocation/gnunet-revocation.c:539
+#: src/revocation/gnunet-revocation.c:541
 msgid "test if the public key KEY has been revoked"
 msgstr ""
 
-#: src/revocation/gnunet-service-revocation.c:481
+#: src/revocation/gnunet-service-revocation.c:456
 msgid "# unsupported revocations received via set union"
 msgstr ""
 
-#: src/revocation/gnunet-service-revocation.c:490
+#: src/revocation/gnunet-service-revocation.c:464
 msgid "# revocation messages received via set union"
 msgstr ""
 
-#: src/revocation/gnunet-service-revocation.c:495
+#: src/revocation/gnunet-service-revocation.c:469
 #, c-format
 msgid "Error computing revocation set union with %s\n"
 msgstr ""
 
-#: src/revocation/gnunet-service-revocation.c:499
+#: src/revocation/gnunet-service-revocation.c:473
 msgid "# revocation set unions failed"
 msgstr ""
 
-#: src/revocation/gnunet-service-revocation.c:508
+#: src/revocation/gnunet-service-revocation.c:482
 msgid "# revocation set unions completed"
 msgstr ""
 
-#: src/revocation/gnunet-service-revocation.c:545
-#: src/revocation/gnunet-service-revocation.c:776
+#: src/revocation/gnunet-service-revocation.c:519
+#: src/revocation/gnunet-service-revocation.c:765
 msgid "SET service crashed, terminating revocation service\n"
 msgstr ""
 
-#: src/revocation/gnunet-service-revocation.c:868
+#: src/revocation/gnunet-service-revocation.c:856
 msgid "Could not open revocation database file!"
 msgstr ""
 
@@ -6140,14 +5936,14 @@
 msgid "Calculate the Vectorproduct with a GNUnet peer."
 msgstr ""
 
-#: src/scalarproduct/gnunet-service-scalarproduct_alice.c:1417
-#: src/scalarproduct/gnunet-service-scalarproduct_bob.c:1546
-#: src/scalarproduct/gnunet-service-scalarproduct-ecc_alice.c:1192
-#: src/scalarproduct/gnunet-service-scalarproduct-ecc_bob.c:1249
+#: src/scalarproduct/gnunet-service-scalarproduct_alice.c:1415
+#: src/scalarproduct/gnunet-service-scalarproduct_bob.c:1553
+#: src/scalarproduct/gnunet-service-scalarproduct-ecc_alice.c:1191
+#: src/scalarproduct/gnunet-service-scalarproduct-ecc_bob.c:1259
 msgid "Connect to CADET failed\n"
 msgstr ""
 
-#: src/scalarproduct/scalarproduct_api.c:296
+#: src/scalarproduct/scalarproduct_api.c:185
 msgid "Keys given to SCALARPRODUCT not unique!\n"
 msgstr ""
 
@@ -6167,7 +5963,7 @@
 msgid "also profile decryption"
 msgstr ""
 
-#: src/set/gnunet-service-set.c:2008
+#: src/set/gnunet-service-set.c:1991
 msgid "Could not connect to cadet service\n"
 msgstr ""
 
@@ -6191,232 +5987,221 @@
 msgid "ibf size"
 msgstr "taille ibz"
 
-#: src/set/gnunet-set-profiler.c:386
+#: src/set/gnunet-set-profiler.c:387
 msgid "operation to execute"
 msgstr ""
 
-#: src/social/gnunet-social.c:1138
+#: src/social/gnunet-social.c:1146
 msgid "--place missing or invalid.\n"
 msgstr ""
 
-#: src/social/gnunet-social.c:1180
+#: src/social/gnunet-social.c:1195
 msgid "assign --name in state to --data"
 msgstr ""
 
-#: src/social/gnunet-social.c:1184
+#: src/social/gnunet-social.c:1199
 msgid "say good-bye and leave somebody else's place"
 msgstr ""
 
-#: src/social/gnunet-social.c:1188
+#: src/social/gnunet-social.c:1203
 msgid "create a place"
 msgstr ""
 
-#: src/social/gnunet-social.c:1192
+#: src/social/gnunet-social.c:1207
 msgid "destroy a place we were hosting"
 msgstr ""
 
-#: src/social/gnunet-social.c:1196
+#: src/social/gnunet-social.c:1211
 msgid "enter somebody else's place"
 msgstr ""
 
-#: src/social/gnunet-social.c:1200
+#: src/social/gnunet-social.c:1215
 msgid "find state matching name prefix"
 msgstr ""
 
-#: src/social/gnunet-social.c:1204
+#: src/social/gnunet-social.c:1219
 msgid "replay history of messages up to the given --limit"
 msgstr ""
 
-#: src/social/gnunet-social.c:1208
+#: src/social/gnunet-social.c:1223
 msgid "reconnect to a previously created place"
 msgstr ""
 
-#: src/social/gnunet-social.c:1212
+#: src/social/gnunet-social.c:1227
 msgid "publish something to a place we are hosting"
 msgstr ""
 
-#: src/social/gnunet-social.c:1216
+#: src/social/gnunet-social.c:1231
 msgid "reconnect to a previously entered place"
 msgstr ""
 
-#: src/social/gnunet-social.c:1220
+#: src/social/gnunet-social.c:1235
 msgid "search for state matching exact name"
 msgstr ""
 
-#: src/social/gnunet-social.c:1224
+#: src/social/gnunet-social.c:1239
 msgid "submit something to somebody's place"
 msgstr ""
 
-#: src/social/gnunet-social.c:1228
+#: src/social/gnunet-social.c:1243
 msgid "list of egos and subscribed places"
 msgstr ""
 
-#: src/social/gnunet-social.c:1232
+#: src/social/gnunet-social.c:1247
 msgid "extract and replay history between message IDs --start and --until"
 msgstr ""
 
-#: src/social/gnunet-social.c:1239
+#: src/social/gnunet-social.c:1254
 msgid "application ID to use when connecting"
 msgstr ""
 
-#: src/social/gnunet-social.c:1243
+#: src/social/gnunet-social.c:1258
 msgid "message body or state value"
 msgstr ""
 
-#: src/social/gnunet-social.c:1247
+#: src/social/gnunet-social.c:1262
 msgid "name or public key of ego"
 msgstr ""
 
-#: src/social/gnunet-social.c:1251
+#: src/social/gnunet-social.c:1266
 msgid "wait for incoming messages"
 msgstr ""
 
-#: src/social/gnunet-social.c:1255
+#: src/social/gnunet-social.c:1270
 msgid "GNS name"
 msgstr ""
 
-#: src/social/gnunet-social.c:1259
+#: src/social/gnunet-social.c:1274
 msgid "peer ID for --guest-enter"
 msgstr ""
 
-#: src/social/gnunet-social.c:1263
+#: src/social/gnunet-social.c:1278
 msgid "name (key) to query from state"
 msgstr ""
 
-#: src/social/gnunet-social.c:1267
+#: src/social/gnunet-social.c:1282
 msgid "method name"
 msgstr ""
 
-#: src/social/gnunet-social.c:1271
+#: src/social/gnunet-social.c:1286
 #, fuzzy
 msgid "number of messages to replay from history"
 msgstr "nombre de valeurs"
 
-#: src/social/gnunet-social.c:1275
+#: src/social/gnunet-social.c:1290
 msgid "key address of place"
 msgstr ""
 
-#: src/social/gnunet-social.c:1279
+#: src/social/gnunet-social.c:1294
 msgid "start message ID for history replay"
 msgstr ""
 
-#: src/social/gnunet-social.c:1283
+#: src/social/gnunet-social.c:1298
 msgid "respond to entry requests by admitting all guests"
 msgstr ""
 
-#: src/social/gnunet-social.c:1287
+#: src/social/gnunet-social.c:1302
 msgid "end message ID for history replay"
 msgstr ""
 
-#: src/social/gnunet-social.c:1291
+#: src/social/gnunet-social.c:1306
 msgid "respond to entry requests by refusing all guests"
 msgstr ""
 
-#: src/social/gnunet-social.c:1301
+#: src/social/gnunet-social.c:1316
 msgid ""
 "gnunet-social - Interact with the social service: enter/leave, send/receive "
 "messages, access history and state.\n"
 msgstr ""
 
-#: src/statistics/gnunet-service-statistics.c:323
+#: src/statistics/gnunet-service-statistics.c:338
 #, c-format
-msgid "Loading %llu bytes of statistics from `%s'\n"
+msgid "Wrote %llu bytes of statistics to `%s'\n"
 msgstr ""
 
-#: src/statistics/gnunet-service-statistics.c:434
+#: src/statistics/gnunet-service-statistics.c:1083
 #, c-format
-msgid "Wrote %llu bytes of statistics to `%s'\n"
+msgid "Loading %llu bytes of statistics from `%s'\n"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:145
+#: src/statistics/gnunet-statistics.c:158
 msgid "Failed to obtain statistics.\n"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:148
+#: src/statistics/gnunet-statistics.c:161
 #, c-format
 msgid "Failed to obtain statistics from host `%s:%llu'\n"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:194
+#: src/statistics/gnunet-statistics.c:219
 msgid "Missing argument: subsystem \n"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:200
+#: src/statistics/gnunet-statistics.c:227
 msgid "Missing argument: name\n"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:232
+#: src/statistics/gnunet-statistics.c:270
 #, c-format
 msgid "No subsystem or name given\n"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:241
+#: src/statistics/gnunet-statistics.c:285
 #, c-format
 msgid "Failed to initialize watch routine\n"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:266
+#: src/statistics/gnunet-statistics.c:321
 #, c-format
-msgid "Trying to connect to remote host, but service `%s' is not running\n"
-msgstr ""
+msgid "Invalid argument `%s'\n"
+msgstr "Argument invalide « %s »\n"
 
-#: src/statistics/gnunet-statistics.c:279
+#: src/statistics/gnunet-statistics.c:339
 #, c-format
 msgid "A port is required to connect to host `%s'\n"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:287
+#: src/statistics/gnunet-statistics.c:347
 #, c-format
 msgid "A port has to be between 1 and 65535 to connect to host `%s'\n"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:320
-#, c-format
-msgid "Invalid argument `%s'\n"
-msgstr "Argument invalide « %s »\n"
-
-#: src/statistics/gnunet-statistics.c:346
+#: src/statistics/gnunet-statistics.c:383
 msgid "limit output to statistics for the given NAME"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:349
+#: src/statistics/gnunet-statistics.c:386
 msgid "make the value being set persistent"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:352
+#: src/statistics/gnunet-statistics.c:389
 msgid "limit output to the given SUBSYSTEM"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:355
+#: src/statistics/gnunet-statistics.c:392
 msgid "just print the statistics value"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:358
+#: src/statistics/gnunet-statistics.c:395
 msgid "watch value continuously"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:361
+#: src/statistics/gnunet-statistics.c:398
 msgid "connect to remote host"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:364
+#: src/statistics/gnunet-statistics.c:401
 msgid "port for remote host"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:376
+#: src/statistics/gnunet-statistics.c:417
 msgid "Print statistics about GNUnet operations."
 msgstr ""
 
-#: src/statistics/statistics_api.c:515
+#: src/statistics/statistics_api.c:753
 msgid "Could not save some persistent statistics\n"
 msgstr ""
 
-#: src/statistics/statistics_api.c:1082
-msgid ""
-"Failed to receive acknowledgement from statistics service, some statistics "
-"might have been lost!\n"
-msgstr ""
-
 #: src/testbed/generate-underlay-topology.c:225
 msgid "Need at least 2 arguments\n"
 msgstr ""
@@ -6459,12 +6244,12 @@
 msgid "Invalid argument `%s'; expecting unsigned int\n"
 msgstr ""
 
-#: src/testbed/generate-underlay-topology.c:338
+#: src/testbed/generate-underlay-topology.c:339
 #: src/testbed/gnunet-testbed-profiler.c:281
 msgid "create COUNT number of peers"
 msgstr ""
 
-#: src/testbed/generate-underlay-topology.c:347
+#: src/testbed/generate-underlay-topology.c:348
 msgid ""
 "Generates SQLite3 database representing a given underlay topology.\n"
 "Usage: gnunet-underlay-topology [OPTIONS] db-filename TOPO [TOPOOPTS]\n"
@@ -6492,19 +6277,19 @@
 msgid "Daemon to log latency values of connections to neighbours"
 msgstr ""
 
-#: src/testbed/gnunet-daemon-testbed-blacklist.c:248
+#: src/testbed/gnunet-daemon-testbed-blacklist.c:247
 msgid ""
 "Daemon to restrict incoming transport layer connections during testbed "
 "deployments"
 msgstr ""
 
-#: src/testbed/gnunet-daemon-testbed-underlay.c:230 src/testing/list-keys.c:50
-#: src/testing/testing.c:293 src/util/gnunet-ecc.c:298
+#: src/testbed/gnunet-daemon-testbed-underlay.c:231 src/testing/list-keys.c:50
+#: src/testing/testing.c:288 src/util/gnunet-ecc.c:298
 #, c-format
 msgid "Incorrect hostkey file format: %s\n"
 msgstr ""
 
-#: src/testbed/gnunet-daemon-testbed-underlay.c:468
+#: src/testbed/gnunet-daemon-testbed-underlay.c:469
 msgid "Daemon to restrict underlay network in testbed deployments"
 msgstr ""
 
@@ -6514,15 +6299,11 @@
 "Cannot open %s for writing load statistics.  Not logging load statistics\n"
 msgstr ""
 
-#: src/testbed/gnunet-service-testbed_peers.c:1015
+#: src/testbed/gnunet-service-testbed_peers.c:1141
 msgid "Misconfiguration (can't connect to the ARM service)"
 msgstr ""
 
-#: src/testbed/gnunet-service-testbed_peers.c:1021
-msgid "Request doesn't fit into a message"
-msgstr ""
-
-#: src/testbed/gnunet-service-testbed_peers.c:1059
+#: src/testbed/gnunet-service-testbed_peers.c:1183
 #, c-format
 msgid "%s service can't be started because ARM is shutting down"
 msgstr ""
@@ -6547,31 +6328,31 @@
 "signal is received"
 msgstr ""
 
-#: src/testbed/testbed_api_hosts.c:415
+#: src/testbed/testbed_api.c:410
 #, c-format
+msgid "Adding host %u failed with error: %s\n"
+msgstr ""
+
+#: src/testbed/testbed_api_hosts.c:413
+#, c-format
 msgid "Hosts file %s not found\n"
 msgstr ""
 
-#: src/testbed/testbed_api_hosts.c:423
+#: src/testbed/testbed_api_hosts.c:421
 #, c-format
 msgid "Hosts file %s has no data\n"
 msgstr ""
 
-#: src/testbed/testbed_api_hosts.c:430
+#: src/testbed/testbed_api_hosts.c:428
 #, c-format
 msgid "Hosts file %s cannot be read\n"
 msgstr ""
 
-#: src/testbed/testbed_api_hosts.c:570
+#: src/testbed/testbed_api_hosts.c:569
 #, c-format
 msgid "The function %s is only available when compiled with (--with-ll)\n"
 msgstr ""
 
-#: src/testbed/testbed_api_hosts.c:1590
-#, c-format
-msgid "Adding host %u failed with error: %s\n"
-msgstr ""
-
 #: src/testbed/testbed_api_testbed.c:818
 msgid "Linking controllers failed. Exiting"
 msgstr ""
@@ -6628,44 +6409,44 @@
 "free topology cannot be more than %u.  Given `%s = %llu'"
 msgstr ""
 
-#: src/testbed/testbed_api_topology.c:966
+#: src/testbed/testbed_api_topology.c:1028
 #, c-format
 msgid "Topology file %s not found\n"
 msgstr ""
 
-#: src/testbed/testbed_api_topology.c:974
+#: src/testbed/testbed_api_topology.c:1036
 #, c-format
 msgid "Topology file %s has no data\n"
 msgstr ""
 
-#: src/testbed/testbed_api_topology.c:982
+#: src/testbed/testbed_api_topology.c:1044
 #, c-format
 msgid "Topology file %s cannot be read\n"
 msgstr ""
 
-#: src/testbed/testbed_api_topology.c:1004
+#: src/testbed/testbed_api_topology.c:1066
 #, c-format
 msgid "Failed to read peer index from toology file: %s"
 msgstr ""
 
-#: src/testbed/testbed_api_topology.c:1013
-#: src/testbed/testbed_api_topology.c:1037
+#: src/testbed/testbed_api_topology.c:1075
+#: src/testbed/testbed_api_topology.c:1099
 #, c-format
 msgid "Value in given topology file: %s out of range\n"
 msgstr ""
 
-#: src/testbed/testbed_api_topology.c:1019
-#: src/testbed/testbed_api_topology.c:1043
+#: src/testbed/testbed_api_topology.c:1081
+#: src/testbed/testbed_api_topology.c:1105
 #, c-format
 msgid "Failed to read peer index from topology file: %s"
 msgstr ""
 
-#: src/testbed/testbed_api_topology.c:1025
-#: src/testbed/testbed_api_topology.c:1049
+#: src/testbed/testbed_api_topology.c:1087
+#: src/testbed/testbed_api_topology.c:1111
 msgid "Topology file needs more peers than given ones\n"
 msgstr ""
 
-#: src/testbed/testbed_api_topology.c:1083
+#: src/testbed/testbed_api_topology.c:1145
 #, c-format
 msgid "Ignoring to connect peer %u to peer %u\n"
 msgstr ""
@@ -6706,25 +6487,25 @@
 msgid "Command line tool to access the testing library"
 msgstr ""
 
-#: src/testing/list-keys.c:90
+#: src/testing/list-keys.c:91
 msgid "list COUNT number of keys"
 msgstr ""
 
-#: src/testing/list-keys.c:93
+#: src/testing/list-keys.c:94
 msgid "skip COUNT number of keys in the beginning"
 msgstr ""
 
-#: src/testing/testing.c:277
+#: src/testing/testing.c:272
 #, c-format
 msgid "Hostkeys file not found: %s\n"
 msgstr ""
 
-#: src/testing/testing.c:720
+#: src/testing/testing.c:715
 #, c-format
 msgid "Key number %u does not exist\n"
 msgstr ""
 
-#: src/testing/testing.c:1163
+#: src/testing/testing.c:1158
 #, c-format
 msgid ""
 "You attempted to create a testbed with more than %u hosts.  Please "
@@ -6731,40 +6512,40 @@
 "precompute more hostkeys first.\n"
 msgstr ""
 
-#: src/testing/testing.c:1172
+#: src/testing/testing.c:1167
 #, c-format
 msgid "Failed to initialize hostkey for peer %u\n"
 msgstr ""
 
-#: src/testing/testing.c:1182
+#: src/testing/testing.c:1177
 msgid "PRIVATE_KEY option in PEER section missing in configuration\n"
 msgstr ""
 
-#: src/testing/testing.c:1195
+#: src/testing/testing.c:1190
 msgid "Failed to create configuration for peer (not enough free ports?)\n"
 msgstr ""
 
-#: src/testing/testing.c:1209
+#: src/testing/testing.c:1204
 #, c-format
 msgid "Cannot open hostkey file `%s': %s\n"
 msgstr ""
 
-#: src/testing/testing.c:1221
+#: src/testing/testing.c:1216
 #, c-format
 msgid "Failed to write hostkey file for peer %u: %s\n"
 msgstr ""
 
-#: src/testing/testing.c:1246
+#: src/testing/testing.c:1241
 #, c-format
 msgid "Failed to write configuration file `%s' for peer %u: %s\n"
 msgstr ""
 
-#: src/testing/testing.c:1348
+#: src/testing/testing.c:1343
 #, c-format
 msgid "Failed to start `%s': %s\n"
 msgstr ""
 
-#: src/testing/testing.c:1710
+#: src/testing/testing.c:1644
 #, c-format
 msgid "Failed to load configuration from %s\n"
 msgstr ""
@@ -6779,62 +6560,62 @@
 msgid "Directory for file `%s' does not seem to be writable.\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:230
+#: src/topology/gnunet-daemon-topology.c:225
 msgid "# peers blacklisted"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:349
+#: src/topology/gnunet-daemon-topology.c:339
 msgid "# connect requests issued to ATS"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:634
-#: src/topology/gnunet-daemon-topology.c:730
+#: src/topology/gnunet-daemon-topology.c:533
+msgid "# HELLO messages gossipped"
+msgstr ""
+
+#: src/topology/gnunet-daemon-topology.c:635
+#: src/topology/gnunet-daemon-topology.c:721
 msgid "# friends connected"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:927
+#: src/topology/gnunet-daemon-topology.c:918
 msgid "Failed to connect to core service, can not manage topology!\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:960
+#: src/topology/gnunet-daemon-topology.c:951
 #, c-format
 msgid "Found myself `%s' in friend list (useless, ignored)\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:967
+#: src/topology/gnunet-daemon-topology.c:958
 #, c-format
 msgid "Found friend `%s' in configuration\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:989
+#: src/topology/gnunet-daemon-topology.c:980
 msgid "Encountered errors parsing friends list!\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:992
+#: src/topology/gnunet-daemon-topology.c:983
 msgid "# friends in configuration"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:999
+#: src/topology/gnunet-daemon-topology.c:990
 msgid ""
 "Fewer friends specified than required by minimum friend count. Will only "
 "connect to friends.\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:1005
+#: src/topology/gnunet-daemon-topology.c:996
 msgid ""
 "More friendly connections required than target total number of connections.\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:1039
+#: src/topology/gnunet-daemon-topology.c:1059
 #: src/transport/plugin_transport_wlan.c:1491
 msgid "# HELLO messages received"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:1112
-msgid "# HELLO messages gossipped"
-msgstr ""
-
-#: src/topology/gnunet-daemon-topology.c:1283
+#: src/topology/gnunet-daemon-topology.c:1233
 msgid "GNUnet topology control"
 msgstr ""
 
@@ -6842,48 +6623,48 @@
 msgid "# Addresses given to ATS"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_blacklist.c:284
-#, c-format
-msgid "Adding blacklisting entry for peer `%s'\n"
+#: src/transport/gnunet-service-transport.c:448
+msgid "# messages dropped due to slow client"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_blacklist.c:293
-#, c-format
-msgid "Adding blacklisting entry for peer `%s':`%s'\n"
+#: src/transport/gnunet-service-transport.c:809
+msgid "# bytes payload dropped (other peer was not connected)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_blacklist.c:500
-#: src/transport/gnunet-service-transport_blacklist.c:851
-msgid "# disconnects due to blacklist"
+#: src/transport/gnunet-service-transport.c:1539
+msgid "# bytes payload discarded due to not connected peer"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_blacklist.c:855
-#, c-format
-msgid "Disallowing connection to peer `%s' on transport %s\n"
+#: src/transport/gnunet-service-transport.c:1698
+msgid "# bytes total received"
 msgstr ""
 
-#: src/transport/gnunet-service-transport.c:231
-msgid "# bytes payload discarded due to not connected peer"
+#: src/transport/gnunet-service-transport.c:1795
+msgid "# bytes payload received"
 msgstr ""
 
-#: src/transport/gnunet-service-transport.c:383
-msgid "# bytes total received"
+#: src/transport/gnunet-service-transport.c:2112
+#: src/transport/gnunet-service-transport.c:2584
+msgid "# disconnects due to blacklist"
 msgstr ""
 
-#: src/transport/gnunet-service-transport.c:478
-msgid "# bytes payload received"
+#: src/transport/gnunet-service-transport.c:2588
+#, c-format
+msgid "Disallowing connection to peer `%s' on transport %s\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport.c:823
-msgid "Transport service is lacking key configuration settings. Exiting.\n"
+#: src/transport/gnunet-service-transport.c:2696
+#, c-format
+msgid "Adding blacklisting entry for peer `%s'\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_clients.c:523
-msgid "# messages dropped due to slow client"
+#: src/transport/gnunet-service-transport.c:2705
+#, c-format
+msgid "Adding blacklisting entry for peer `%s':`%s'\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_clients.c:845
-msgid "# bytes payload dropped (other peer was not connected)"
+#: src/transport/gnunet-service-transport.c:2770
+msgid "Transport service is lacking key configuration settings. Exiting.\n"
 msgstr ""
 
 #: src/transport/gnunet-service-transport_hello.c:195
@@ -6890,191 +6671,191 @@
 msgid "# refreshed my HELLO"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:805
+#: src/transport/gnunet-service-transport_neighbours.c:804
 #, fuzzy
 msgid "# session creation failed"
 msgstr "# Session TCP active"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1048
+#: src/transport/gnunet-service-transport_neighbours.c:1047
 msgid "# DISCONNECT messages sent"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1168
+#: src/transport/gnunet-service-transport_neighbours.c:1167
 msgid "# disconnects due to quota of 0"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1311
-#: src/transport/gnunet-service-transport_neighbours.c:1764
+#: src/transport/gnunet-service-transport_neighbours.c:1310
+#: src/transport/gnunet-service-transport_neighbours.c:1763
 msgid "# bytes in message queue for other peers"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1316
+#: src/transport/gnunet-service-transport_neighbours.c:1315
 msgid "# messages transmitted to other peers"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1322
+#: src/transport/gnunet-service-transport_neighbours.c:1321
 msgid "# transmission failures for messages to other peers"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1382
+#: src/transport/gnunet-service-transport_neighbours.c:1381
 msgid "# messages timed out while in transport queue"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1458
+#: src/transport/gnunet-service-transport_neighbours.c:1457
 msgid "# KEEPALIVES sent"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1494
+#: src/transport/gnunet-service-transport_neighbours.c:1493
 msgid "# KEEPALIVE messages discarded (peer unknown)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1502
+#: src/transport/gnunet-service-transport_neighbours.c:1501
 msgid "# KEEPALIVE messages discarded (no session)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1512
+#: src/transport/gnunet-service-transport_neighbours.c:1511
 msgid "# KEEPALIVES received in good order"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1557
+#: src/transport/gnunet-service-transport_neighbours.c:1556
 msgid "# KEEPALIVE_RESPONSEs discarded (not connected)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1566
+#: src/transport/gnunet-service-transport_neighbours.c:1565
 msgid "# KEEPALIVE_RESPONSEs discarded (not expected)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1574
+#: src/transport/gnunet-service-transport_neighbours.c:1573
 msgid "# KEEPALIVE_RESPONSEs discarded (address changed)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1583
+#: src/transport/gnunet-service-transport_neighbours.c:1582
 msgid "# KEEPALIVE_RESPONSEs discarded (no nonce)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1588
+#: src/transport/gnunet-service-transport_neighbours.c:1587
 msgid "# KEEPALIVE_RESPONSEs discarded (bad nonce)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1594
+#: src/transport/gnunet-service-transport_neighbours.c:1593
 msgid "# KEEPALIVE_RESPONSEs received (OK)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1661
+#: src/transport/gnunet-service-transport_neighbours.c:1660
 msgid "# messages discarded due to lack of neighbour record"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1695
+#: src/transport/gnunet-service-transport_neighbours.c:1694
 msgid "# bandwidth quota violations by other peers"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1710
+#: src/transport/gnunet-service-transport_neighbours.c:1709
 msgid "# ms throttling suggested"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1830
+#: src/transport/gnunet-service-transport_neighbours.c:1829
 #, 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:1850
+#: src/transport/gnunet-service-transport_neighbours.c:1849
 msgid "# Failed attempts to switch addresses (failed to send SYN CONT)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1889
+#: src/transport/gnunet-service-transport_neighbours.c:1888
 msgid "# SYN messages sent"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1906
+#: src/transport/gnunet-service-transport_neighbours.c:1905
 #, fuzzy, c-format
 msgid "Failed to transmit SYN message to %s\n"
 msgstr "Échec du démarrage de %s\n"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1936
+#: src/transport/gnunet-service-transport_neighbours.c:1935
 msgid "# Failed attempts to switch addresses (failed to send SYN)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:2001
+#: src/transport/gnunet-service-transport_neighbours.c:2000
 #, c-format
 msgid "Failed to send SYN_ACK message to peer `%s' using address `%s'\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:2055
+#: src/transport/gnunet-service-transport_neighbours.c:2054
 msgid "# SYN_ACK messages sent"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:2072
+#: src/transport/gnunet-service-transport_neighbours.c:2071
 #, fuzzy, c-format
 msgid "Failed to transmit SYN_ACK message to %s\n"
 msgstr "Échec du démarrage de %s\n"
 
-#: src/transport/gnunet-service-transport_neighbours.c:2228
+#: src/transport/gnunet-service-transport_neighbours.c:2227
 msgid "# SYN messages received"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:2233
+#: src/transport/gnunet-service-transport_neighbours.c:2232
 #, c-format
 msgid "SYN request from peer `%s' ignored due impending shutdown\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:2599
+#: src/transport/gnunet-service-transport_neighbours.c:2598
 msgid "# Attempts to switch addresses"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3081
+#: src/transport/gnunet-service-transport_neighbours.c:3080
 msgid "# SYN_ACK messages received"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3089
+#: src/transport/gnunet-service-transport_neighbours.c:3088
 msgid "# unexpected SYN_ACK messages (no peer)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3107
-#: src/transport/gnunet-service-transport_neighbours.c:3131
+#: src/transport/gnunet-service-transport_neighbours.c:3106
+#: src/transport/gnunet-service-transport_neighbours.c:3130
 msgid "# unexpected SYN_ACK messages (not ready)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3143
+#: src/transport/gnunet-service-transport_neighbours.c:3142
 msgid "# unexpected SYN_ACK messages (waiting on ATS)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3168
+#: src/transport/gnunet-service-transport_neighbours.c:3167
 msgid "# Successful attempts to switch addresses"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3181
+#: src/transport/gnunet-service-transport_neighbours.c:3180
 msgid "# unexpected SYN_ACK messages (disconnecting)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3353
+#: src/transport/gnunet-service-transport_neighbours.c:3352
 msgid "# ACK messages received"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3389
+#: src/transport/gnunet-service-transport_neighbours.c:3388
 msgid "# unexpected ACK messages"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3477
+#: src/transport/gnunet-service-transport_neighbours.c:3476
 msgid "# quota messages ignored (malformed)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3484
+#: src/transport/gnunet-service-transport_neighbours.c:3483
 msgid "# QUOTA messages received"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3524
+#: src/transport/gnunet-service-transport_neighbours.c:3523
 msgid "# disconnect messages ignored (malformed)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3531
+#: src/transport/gnunet-service-transport_neighbours.c:3530
 msgid "# DISCONNECT messages received"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3542
+#: src/transport/gnunet-service-transport_neighbours.c:3541
 msgid "# disconnect messages ignored (timestamp)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3676
+#: src/transport/gnunet-service-transport_neighbours.c:3675
 msgid "# disconnected from peer upon explicit request"
 msgstr ""
 
@@ -7102,60 +6883,60 @@
 msgid "Did not load plugin `%s' due to missing functions\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:343
+#: src/transport/gnunet-service-transport_validation.c:388
 msgid "# Addresses in validation map"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:452
-#: src/transport/gnunet-service-transport_validation.c:638
-#: src/transport/gnunet-service-transport_validation.c:949
-#: src/transport/gnunet-service-transport_validation.c:1551
+#: src/transport/gnunet-service-transport_validation.c:491
+#: src/transport/gnunet-service-transport_validation.c:677
+#: src/transport/gnunet-service-transport_validation.c:988
+#: src/transport/gnunet-service-transport_validation.c:1590
 msgid "# validations running"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:493
+#: src/transport/gnunet-service-transport_validation.c:532
 msgid "# address records discarded (timeout)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:541
+#: src/transport/gnunet-service-transport_validation.c:580
 msgid "# address records discarded (blacklist)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:629
+#: src/transport/gnunet-service-transport_validation.c:668
 msgid "# PINGs for address validation sent"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:709
+#: src/transport/gnunet-service-transport_validation.c:748
 msgid "# validations delayed by global throttle"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:746
+#: src/transport/gnunet-service-transport_validation.c:785
 msgid "# address revalidations started"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1075
+#: src/transport/gnunet-service-transport_validation.c:1114
 msgid "# PING message for different peer received"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1126
+#: src/transport/gnunet-service-transport_validation.c:1165
 #, c-format
 msgid "Plugin `%s' not available, cannot confirm having this address\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1139
+#: src/transport/gnunet-service-transport_validation.c:1178
 msgid "# failed address checks during validation"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1142
+#: src/transport/gnunet-service-transport_validation.c:1181
 #, c-format
 msgid "Address `%s' is not one of my addresses, not confirming PING\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1150
+#: src/transport/gnunet-service-transport_validation.c:1189
 msgid "# successful address checks during validation"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1163
+#: src/transport/gnunet-service-transport_validation.c:1202
 #, c-format
 msgid ""
 "Not confirming PING from peer `%s' with address `%s' since I cannot confirm "
@@ -7162,119 +6943,100 @@
 "having this address.\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1218
+#: src/transport/gnunet-service-transport_validation.c:1257
 #, c-format
 msgid "Failed to create PONG signature for peer `%s'\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1269
+#: src/transport/gnunet-service-transport_validation.c:1308
 msgid "# PONGs unicast via reliable transport"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1278
+#: src/transport/gnunet-service-transport_validation.c:1317
 msgid "# PONGs multicast to all available addresses"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1441
+#: src/transport/gnunet-service-transport_validation.c:1480
 msgid "# PONGs dropped, no matching pending validation"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1459
+#: src/transport/gnunet-service-transport_validation.c:1498
 msgid "# PONGs dropped, signature expired"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1514
+#: src/transport/gnunet-service-transport_validation.c:1553
 msgid "# validations succeeded"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:558
+#: src/transport/gnunet-transport.c:518
 #, c-format
 msgid "Transmitted %llu bytes/s (%llu bytes in %s)\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:567
-#: src/transport/gnunet-transport-profiler.c:277
+#: src/transport/gnunet-transport.c:528
 #, c-format
 msgid "Received %llu bytes/s (%llu bytes in %s)\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:608
+#: src/transport/gnunet-transport.c:572
 #, c-format
 msgid "Failed to connect to `%s'\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:621
+#: src/transport/gnunet-transport.c:585
 #, c-format
 msgid "Failed to resolve address for peer `%s'\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:633
+#: src/transport/gnunet-transport.c:597
 msgid "Failed to list connections, timeout occured\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:658 src/transport/gnunet-transport.c:683
+#: src/transport/gnunet-transport.c:622 src/transport/gnunet-transport.c:647
 #, c-format
 msgid "Configuration for plugin `%s' did not work!\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:663
+#: src/transport/gnunet-transport.c:627
 #, c-format
 msgid "Configuration for plugin `%s' did work!\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:668
+#: src/transport/gnunet-transport.c:632
 #, c-format
 msgid "Internal NAT error while running test for plugin `%s'\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:673
+#: src/transport/gnunet-transport.c:637
 #, fuzzy, c-format
 msgid "Failed to start NAT test for plugin `%s'\n"
 msgstr "Résolution de « %s » échouée\n"
 
-#: src/transport/gnunet-transport.c:678
+#: src/transport/gnunet-transport.c:642
 #, c-format
 msgid "Timeout while waiting for result of NAT test for plugin `%s'\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:803
-#, c-format
-msgid ""
-"Peer `%s' %s %s\n"
-"\t%s%s\n"
-"\t%s%s\n"
-"\t%s%s\n"
-msgstr ""
-
-#: src/transport/gnunet-transport.c:838
-#, c-format
-msgid "Peer `%s' %s `%s' \n"
-msgstr ""
-
-#: src/transport/gnunet-transport.c:927 src/transport/gnunet-transport.c:1673
-msgid "Monitor disconnected from transport service. Reconnecting.\n"
-msgstr ""
-
-#: src/transport/gnunet-transport.c:982
+#: src/transport/gnunet-transport.c:735
 msgid "No transport plugins configured, peer will never communicate\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:996
+#: src/transport/gnunet-transport.c:749
 #, c-format
 msgid "No port configured for plugin `%s', cannot test it\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1021
+#: src/transport/gnunet-transport.c:774
 #, fuzzy
 msgid "Failed to start resolver!\n"
 msgstr "Échec du démarrage de %s\n"
 
-#: src/transport/gnunet-transport.c:1067
+#: src/transport/gnunet-transport.c:810
 #, c-format
-msgid "Transmitting %u bytes to %s\n"
+msgid "Transmitting %u bytes\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1096
+#: src/transport/gnunet-transport.c:844
 #, c-format
 msgid ""
 "Successfully connected to `%s', starting to send benchmark data in %u Kb "
@@ -7281,42 +7043,44 @@
 "blocks\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1133
-#: src/transport/gnunet-transport-profiler.c:432
+#: src/transport/gnunet-transport.c:875
 #, c-format
 msgid "Disconnected from peer `%s' while benchmarking\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1158 src/transport/gnunet-transport.c:1184
+#: src/transport/gnunet-transport.c:899 src/transport/gnunet-transport.c:928
 #, c-format
 msgid "%24s: %-17s %4s   (%u connections in total)\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1160
+#: src/transport/gnunet-transport.c:901
 msgid "Connected to"
 msgstr "Connecté à"
 
-#: src/transport/gnunet-transport.c:1186
+#: src/transport/gnunet-transport.c:930
 msgid "Disconnected from"
 msgstr "Déconnecté de"
 
-#: src/transport/gnunet-transport.c:1210
-#: src/transport/gnunet-transport-profiler.c:457
-#, c-format
-msgid "Received %u bytes from %s\n"
-msgstr ""
+#: src/transport/gnunet-transport.c:965
+#, fuzzy, c-format
+msgid "Received %u bytes\n"
+msgstr "%s message(s) reçu(s)\n"
 
-#: src/transport/gnunet-transport.c:1250
+#: src/transport/gnunet-transport.c:1002
 #, c-format
 msgid "Peer `%s': %s %s in state `%s' until %s\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1262
+#: src/transport/gnunet-transport.c:1014
 #, c-format
 msgid "Peer `%s': %s %s\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1792
+#: src/transport/gnunet-transport.c:1426
+msgid "Monitor disconnected from transport service. Reconnecting.\n"
+msgstr ""
+
+#: src/transport/gnunet-transport.c:1548
 #, c-format
 msgid ""
 "Multiple operations given. Please choose only one operation: %s, %s, %s, %s, "
@@ -7323,208 +7087,133 @@
 "%s, %s %s\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1800
+#: src/transport/gnunet-transport.c:1561
 #, c-format
 msgid ""
 "No operation given. Please choose one operation: %s, %s, %s, %s, %s, %s, %s\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1823
+#: src/transport/gnunet-transport.c:1589
 msgid "Failed to connect to transport service for disconnection\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1829
+#: src/transport/gnunet-transport.c:1595
 msgid "Blacklisting request in place, stop with CTRL-C\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1848 src/transport/gnunet-transport.c:1867
-#: src/transport/gnunet-transport.c:1925
-#: src/transport/gnunet-transport-profiler.c:553
+#: src/transport/gnunet-transport.c:1618 src/transport/gnunet-transport.c:1648
+#: src/transport/gnunet-transport.c:1701
 msgid "Failed to connect to transport service\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1872
+#: src/transport/gnunet-transport.c:1655
 msgid "Starting to receive benchmark data\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1972
+#: src/transport/gnunet-transport.c:1725
 msgid "print information for all peers (instead of only connected peers)"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1975
+#: src/transport/gnunet-transport.c:1728
 msgid "measure how fast we are receiving data from all peers (until CTRL-C)"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1978
+#: src/transport/gnunet-transport.c:1731
 msgid "disconnect from a peer"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1981
-msgid "print information for all pending validations "
-msgstr ""
-
-#: src/transport/gnunet-transport.c:1984
-msgid "print information for all pending validations continuously"
-msgstr ""
-
-#: src/transport/gnunet-transport.c:1987
+#: src/transport/gnunet-transport.c:1734
 msgid "provide information about all current connections (once)"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1993
+#: src/transport/gnunet-transport.c:1740
 msgid ""
 "provide information about all connects and disconnect events (continuously)"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1996
+#: src/transport/gnunet-transport.c:1743
 msgid "do not resolve hostnames"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1999
-#: src/transport/gnunet-transport-profiler.c:618
+#: src/transport/gnunet-transport.c:1746
+#: src/transport/gnunet-transport-profiler.c:631
 msgid "peer identity"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:2002
+#: src/transport/gnunet-transport.c:1749
 msgid "monitor plugin sessions"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:2005
+#: src/transport/gnunet-transport.c:1752
 msgid "send data for benchmarking to the other peer (until CTRL-C)"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:2008
+#: src/transport/gnunet-transport.c:1755
 msgid "test transport configuration (involves external server)"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:2019
-#: src/transport/gnunet-transport-profiler.c:629
+#: src/transport/gnunet-transport.c:1766
+#: src/transport/gnunet-transport-profiler.c:642
 msgid "Direct access to transport service."
 msgstr ""
 
-#: src/transport/gnunet-transport-profiler.c:221
+#: src/transport/gnunet-transport-profiler.c:219
 #, c-format
 msgid "%llu B in %llu ms == %.2f KB/s!\n"
 msgstr ""
 
-#: src/transport/gnunet-transport-profiler.c:257
-#, c-format
-msgid "%u;%u;%llu;%llu;%.2f;%.2f"
-msgstr ""
-
-#: src/transport/gnunet-transport-profiler.c:266
-#, c-format
-msgid ";%llu;%.2f"
-msgstr ""
-
-#: src/transport/gnunet-transport-profiler.c:283
-msgid "\n"
-msgstr ""
-
-#: src/transport/gnunet-transport-profiler.c:336
-msgid "."
-msgstr ""
-
-#: src/transport/gnunet-transport-profiler.c:356
-#, c-format
-msgid ""
-"\n"
-"Starting benchmark to `%s', starting to send %u messages in %u byte blocks\n"
-msgstr ""
-
-#: src/transport/gnunet-transport-profiler.c:404
-#, c-format
-msgid "Connected to different peer `%s'\n"
-msgstr ""
-
-#: src/transport/gnunet-transport-profiler.c:411
-#, c-format
-msgid "Successfully connected to `%s'\n"
-msgstr ""
-
-#: src/transport/gnunet-transport-profiler.c:473
-#, c-format
-msgid "Denying connection to `%s'\n"
-msgstr ""
-
-#: src/transport/gnunet-transport-profiler.c:503
-msgid "Message size too big!\n"
-msgstr ""
-
-#: src/transport/gnunet-transport-profiler.c:509
-msgid "No peer identity given\n"
-msgstr ""
-
-#: src/transport/gnunet-transport-profiler.c:524
-#, c-format
-msgid "Trying to send %u messages with size %u to peer `%s'\n"
-msgstr ""
-
-#: src/transport/gnunet-transport-profiler.c:530
-#, fuzzy, c-format
-msgid "Trying to receive messages from peer `%s'\n"
-msgstr "Dernier message reçu de %s\n"
-
-#: src/transport/gnunet-transport-profiler.c:535
-msgid "No operation given\n"
-msgstr ""
-
-#: src/transport/gnunet-transport-profiler.c:542
-msgid "Failed to connect to ATS service\n"
-msgstr ""
-
-#: src/transport/gnunet-transport-profiler.c:603
+#: src/transport/gnunet-transport-profiler.c:616
 msgid "send data to peer"
 msgstr ""
 
-#: src/transport/gnunet-transport-profiler.c:606
+#: src/transport/gnunet-transport-profiler.c:619
 msgid "receive data from peer"
 msgstr ""
 
-#: src/transport/gnunet-transport-profiler.c:609
+#: src/transport/gnunet-transport-profiler.c:622
 msgid "iterations"
 msgstr ""
 
-#: src/transport/gnunet-transport-profiler.c:612
+#: src/transport/gnunet-transport-profiler.c:625
 #, fuzzy
 msgid "number of messages to send"
 msgstr "nombre de valeurs"
 
-#: src/transport/gnunet-transport-profiler.c:615
+#: src/transport/gnunet-transport-profiler.c:628
 msgid "message size to use"
 msgstr ""
 
-#: src/transport/plugin_transport_http_client.c:1473
-#: src/transport/plugin_transport_http_server.c:2237
-#: src/transport/plugin_transport_http_server.c:3427
-#: src/transport/plugin_transport_tcp.c:2985
-#: src/transport/plugin_transport_tcp.c:2992
+#: src/transport/plugin_transport_http_client.c:1477
+#: src/transport/plugin_transport_http_server.c:2248
+#: src/transport/plugin_transport_http_server.c:3457
+#: src/transport/plugin_transport_tcp.c:3365
+#: src/transport/plugin_transport_tcp.c:3372
 msgid "TCP_STEALTH not supported on this platform.\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_client.c:2114
+#: src/transport/plugin_transport_http_client.c:2118
 #, c-format
 msgid "Could not initialize curl multi handle, failed to start %s plugin!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_client.c:2163
-#: src/transport/plugin_transport_http_server.c:3142
+#: src/transport/plugin_transport_http_client.c:2167
+#: src/transport/plugin_transport_http_server.c:3172
 #, c-format
 msgid "Shutting down plugin `%s'\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_client.c:2180
-#: src/transport/plugin_transport_http_server.c:3212
+#: src/transport/plugin_transport_http_client.c:2184
+#: src/transport/plugin_transport_http_server.c:3242
 #, c-format
 msgid "Shutdown for plugin `%s' complete\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_client.c:2214
+#: src/transport/plugin_transport_http_client.c:2218
 #, c-format
 msgid "Maximum number of requests is %u\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:1721
+#: src/transport/plugin_transport_http_server.c:1729
 #, c-format
 msgid ""
 "Access from connection %p (%u of %u) for `%s' `%s' url `%s' with upload data "
@@ -7531,115 +7220,95 @@
 "size %u\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:1955
+#: src/transport/plugin_transport_http_server.c:1966
 #, c-format
 msgid "Accepting connection (%u of %u) from `%s'\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:1963
+#: src/transport/plugin_transport_http_server.c:1974
 #, c-format
 msgid ""
 "Server reached maximum number connections (%u), rejecting new connection\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:2113
+#: src/transport/plugin_transport_http_server.c:2124
 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:2136
+#: src/transport/plugin_transport_http_server.c:2147
 #, c-format
 msgid "No usable TLS certificate found and creating one at `%s/%s' failed!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:2263
+#: src/transport/plugin_transport_http_server.c:2274
 msgid "Could not load or create server certificate! Loading plugin failed!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:2572
+#: src/transport/plugin_transport_http_server.c:2583
 msgid "Require valid port number for service in configuration!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:2606 src/util/service.c:704
+#: src/transport/plugin_transport_http_server.c:2748
 #, c-format
-msgid "Failed to resolve `%s': %s\n"
-msgstr "Résolution de « %s » échouée : %s\n"
-
-#: src/transport/plugin_transport_http_server.c:2624 src/util/service.c:723
-#, c-format
-msgid "Failed to find %saddress for `%s'.\n"
-msgstr ""
-
-#: src/transport/plugin_transport_http_server.c:2737
-#, c-format
 msgid "Found %u addresses to report to NAT service\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:2815
+#: src/transport/plugin_transport_http_server.c:2832
 #: src/transport/plugin_transport_udp.c:3600
 msgid "Disabling IPv6 since it is not supported on this system!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:2918
+#: src/transport/plugin_transport_http_server.c:2938
 #, c-format
 msgid "IPv4 support is %s\n"
 msgstr "Prise en charge d’IPv4 %s\n"
 
-#: src/transport/plugin_transport_http_server.c:2933
+#: src/transport/plugin_transport_http_server.c:2953
 #, c-format
 msgid "IPv6 support is %s\n"
 msgstr "Prise en charge d’IPv6 %s\n"
 
-#: src/transport/plugin_transport_http_server.c:2939
+#: src/transport/plugin_transport_http_server.c:2959
 msgid "Neither IPv4 nor IPv6 are enabled! Fix in configuration\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:2950
+#: src/transport/plugin_transport_http_server.c:2970
 msgid "Port is required! Fix in configuration\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:2956
+#: src/transport/plugin_transport_http_server.c:2976
 #, c-format
 msgid "Using port %u\n"
 msgstr "Utilisation du port %u\n"
 
-#: src/transport/plugin_transport_http_server.c:2970
+#: src/transport/plugin_transport_http_server.c:2995
 #, c-format
 msgid "Specific IPv4 address `%s' in configuration file is invalid!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:2980
+#: src/transport/plugin_transport_http_server.c:3030
 #, c-format
-msgid "Binding to IPv4 address %s\n"
-msgstr ""
-
-#: src/transport/plugin_transport_http_server.c:3002
-#, c-format
 msgid "Specific IPv6 address `%s' in configuration file is invalid!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:3012
+#: src/transport/plugin_transport_http_server.c:3105
 #, c-format
-msgid "Binding to IPv6 address %s\n"
-msgstr ""
-
-#: src/transport/plugin_transport_http_server.c:3075
-#, c-format
 msgid "Using external hostname `%s'\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:3096
+#: src/transport/plugin_transport_http_server.c:3126
 #, c-format
 msgid "Notifying transport only about hostname `%s'\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:3113
+#: src/transport/plugin_transport_http_server.c:3143
 #, c-format
 msgid "Maximum number of connections is %u\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:3439
+#: src/transport/plugin_transport_http_server.c:3469
 msgid "Unable to compile URL regex\n"
 msgstr ""
 
@@ -7685,102 +7354,96 @@
 msgid "# bytes dropped by SMTP (outgoing)"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:672
-#: src/transport/plugin_transport_tcp.c:1983
+#: src/transport/plugin_transport_tcp.c:1051
+#: src/transport/plugin_transport_tcp.c:2362
 #, c-format
 msgid "Unexpected address length: %u bytes\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:855
-#: src/transport/plugin_transport_tcp.c:1079
-#: src/transport/plugin_transport_tcp.c:2253
-#: src/transport/plugin_transport_tcp.c:3106
+#: src/transport/plugin_transport_tcp.c:1234
+#: src/transport/plugin_transport_tcp.c:1458
+#: src/transport/plugin_transport_tcp.c:2633
+#: src/transport/plugin_transport_tcp.c:3490
 msgid "# TCP sessions active"
 msgstr "# Session TCP active"
 
-#: src/transport/plugin_transport_tcp.c:897
-#: src/transport/plugin_transport_tcp.c:1061
-#: src/transport/plugin_transport_tcp.c:1185
-#: src/transport/plugin_transport_tcp.c:1258
-#: src/transport/plugin_transport_tcp.c:1358
-#: src/transport/plugin_transport_tcp.c:1383
+#: src/transport/plugin_transport_tcp.c:1276
+#: src/transport/plugin_transport_tcp.c:1440
+#: src/transport/plugin_transport_tcp.c:1564
+#: src/transport/plugin_transport_tcp.c:1637
+#: src/transport/plugin_transport_tcp.c:1737
+#: src/transport/plugin_transport_tcp.c:1762
 msgid "# bytes currently in TCP buffers"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:900
+#: src/transport/plugin_transport_tcp.c:1279
 msgid "# bytes discarded by TCP (disconnect)"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:1188
+#: src/transport/plugin_transport_tcp.c:1567
 msgid "# bytes discarded by TCP (timeout)"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:1262
+#: src/transport/plugin_transport_tcp.c:1641
 msgid "# bytes transmitted via TCP"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:1653
+#: src/transport/plugin_transport_tcp.c:2032
 msgid "# requests to create session with invalid address"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:1821
+#: src/transport/plugin_transport_tcp.c:2200
 msgid "# transport-service disconnect requests for TCP"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2312
+#: src/transport/plugin_transport_tcp.c:2692
 msgid "# TCP WELCOME messages received"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2503
+#: src/transport/plugin_transport_tcp.c:2883
 msgid "# bytes received via TCP"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2554
-#: src/transport/plugin_transport_tcp.c:2612
+#: src/transport/plugin_transport_tcp.c:2934
+#: src/transport/plugin_transport_tcp.c:2992
 #, fuzzy
 msgid "# TCP server connections active"
 msgstr "# Session TCP active"
 
-#: src/transport/plugin_transport_tcp.c:2558
+#: src/transport/plugin_transport_tcp.c:2938
 msgid "# TCP server connect events"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2564
+#: src/transport/plugin_transport_tcp.c:2944
 msgid "TCP connection limit reached, suspending server\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2566
+#: src/transport/plugin_transport_tcp.c:2946
 msgid "# TCP service suspended"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2606
+#: src/transport/plugin_transport_tcp.c:2986
 msgid "# TCP service resumed"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2616
+#: src/transport/plugin_transport_tcp.c:2996
 msgid "# network-level TCP disconnect events"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2919 src/util/service.c:584
-#: src/util/service.c:590
-#, c-format
-msgid "Require valid port number for service `%s' in configuration!\n"
-msgstr ""
-
-#: src/transport/plugin_transport_tcp.c:2935
+#: src/transport/plugin_transport_tcp.c:3315
 msgid "Failed to start service.\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:3094
+#: src/transport/plugin_transport_tcp.c:3478
 #, c-format
 msgid "TCP transport listening on port %llu\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:3098
+#: src/transport/plugin_transport_tcp.c:3482
 msgid "TCP transport not listening on any port (client only)\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:3102
+#: src/transport/plugin_transport_tcp.c:3486
 #, c-format
 msgid "TCP transport advertises itself as being on port %llu\n"
 msgstr ""
@@ -7883,7 +7546,7 @@
 
 #: src/transport/plugin_transport_wlan.c:1167
 #: src/transport/plugin_transport_wlan.c:1258
-#: src/transport/plugin_transport_wlan.c:2279
+#: src/transport/plugin_transport_wlan.c:2280
 msgid "# MAC endpoints allocated"
 msgstr ""
 
@@ -7907,145 +7570,118 @@
 msgid "# DATA messages processed"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:2254
+#: src/transport/plugin_transport_wlan.c:2255
 #, c-format
 msgid "Helper binary `%s' not SUID, cannot run WLAN transport\n"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:2276
+#: src/transport/plugin_transport_wlan.c:2277
 #, fuzzy
 msgid "# sessions allocated"
 msgstr "# Session TCP active"
 
-#: src/transport/transport_api.c:816
-#, c-format
-msgid "Received unexpected message of type %u in %s:%u\n"
-msgstr ""
-
-#: src/transport/transport-testing.c:676
-msgid "Failed to initialize testing library!\n"
-msgstr ""
-
 #: src/tun/regex.c:134
 #, c-format
 msgid "Bad mask: %d\n"
 msgstr "Masque érroné : %d\n"
 
-#: src/util/bio.c:170 src/util/bio.c:178
+#: src/util/bio.c:177 src/util/bio.c:185
 #, c-format
 msgid "Error reading `%s': %s"
 msgstr "Erreur de lecture : « %s » : %s"
 
-#: src/util/bio.c:180
+#: src/util/bio.c:187
 msgid "End of file"
 msgstr "Fin de fichier"
 
-#: src/util/bio.c:237
+#: src/util/bio.c:244
 #, c-format
 msgid "Error reading length of string `%s'"
 msgstr ""
 
-#: src/util/bio.c:247
+#: src/util/bio.c:254
 #, c-format
 msgid "String `%s' longer than allowed (%u > %u)"
 msgstr ""
 
-#: src/util/bio.c:293
+#: src/util/bio.c:300
 #, c-format
 msgid "Serialized metadata `%s' larger than allowed (%u>%u)"
 msgstr ""
 
-#: src/util/bio.c:307
+#: src/util/bio.c:314
 #, c-format
 msgid "Metadata `%s' failed to deserialize"
 msgstr ""
 
-#: src/util/client.c:264 src/util/client.c:892 src/util/service.c:621
+#: src/util/client_new.c:863
 #, c-format
-msgid "UNIXPATH `%s' too long, maximum length is %llu\n"
-msgstr ""
-
-#: src/util/client.c:268 src/util/client.c:897 src/util/service.c:625
-#, c-format
-msgid "Using `%s' instead\n"
-msgstr ""
-
-#: src/util/client.c:367
-#, c-format
-msgid ""
-"Could not determine valid hostname and port for service `%s' from "
-"configuration.\n"
-msgstr ""
-
-#: src/util/client.c:375
-#, c-format
 msgid "Need a non-empty hostname for service `%s'.\n"
 msgstr ""
 
-#: src/util/client.c:1042
-#, c-format
-msgid "Could not connect to service `%s', configuration broken.\n"
-msgstr ""
-
-#: src/util/client.c:1054
-#, c-format
-msgid "Failure to transmit request to service `%s'\n"
-msgstr ""
-
-#: src/util/common_logging.c:255 src/util/common_logging.c:1062
+#: src/util/common_logging.c:256 src/util/common_logging.c:1129
 msgid "DEBUG"
 msgstr "DEBUG"
 
-#: src/util/common_logging.c:257 src/util/common_logging.c:1060
+#: src/util/common_logging.c:258 src/util/common_logging.c:1127
 msgid "INFO"
 msgstr "INFO"
 
-#: src/util/common_logging.c:259 src/util/common_logging.c:1058
+#: src/util/common_logging.c:260 src/util/common_logging.c:1125
+msgid "MESSAGE"
+msgstr ""
+
+#: src/util/common_logging.c:262 src/util/common_logging.c:1123
 msgid "WARNING"
 msgstr "AVERTISSEMENT"
 
-#: src/util/common_logging.c:261 src/util/common_logging.c:1056
+#: src/util/common_logging.c:264 src/util/common_logging.c:1121
 msgid "ERROR"
 msgstr "ERREUR"
 
-#: src/util/common_logging.c:263 src/util/common_logging.c:1064
+#: src/util/common_logging.c:266 src/util/common_logging.c:1131
 msgid "NONE"
 msgstr "AUCUN"
 
-#: src/util/common_logging.c:840
+#: src/util/common_logging.c:879
 #, c-format
 msgid "Message `%.*s' repeated %u times in the last %s\n"
 msgstr ""
 
-#: src/util/common_logging.c:1065
+#: src/util/common_logging.c:1132
 msgid "INVALID"
 msgstr "INVALIDE"
 
-#: src/util/common_logging.c:1181
+#: src/util/common_logging.c:1248
 msgid "unknown address"
 msgstr "adresse inconnue"
 
-#: src/util/common_logging.c:1223
+#: src/util/common_logging.c:1290
 msgid "invalid address"
 msgstr "adresse invalide"
 
-#: src/util/common_logging.c:1241
+#: src/util/common_logging.c:1308
 #, c-format
 msgid "Configuration fails to specify option `%s' in section `%s'!\n"
 msgstr ""
 
-#: src/util/common_logging.c:1262
+#: src/util/common_logging.c:1329
 #, c-format
 msgid ""
 "Configuration specifies invalid value for option `%s' in section `%s': %s\n"
 msgstr ""
 
-#: src/util/configuration.c:291
+#: src/util/configuration.c:286
 #, c-format
 msgid "Syntax error while deserializing in line %u\n"
 msgstr ""
 
-#: src/util/configuration.c:1028
+#: src/util/configuration.c:344
+#, fuzzy, c-format
+msgid "Error while reading file `%s'\n"
+msgstr "Erreur de lecture : « %s » : %s"
+
+#: src/util/configuration.c:1017
 #, c-format
 msgid ""
 "Configuration value '%s' for '%s' in section '%s' is not in set of legal "
@@ -8052,17 +7688,17 @@
 "choices\n"
 msgstr ""
 
-#: src/util/configuration.c:1147
+#: src/util/configuration.c:1136
 #, c-format
 msgid "Recursive expansion suspected, aborting $-expansion for term `%s'\n"
 msgstr ""
 
-#: src/util/configuration.c:1179
+#: src/util/configuration.c:1169
 #, c-format
 msgid "Missing closing `%s' in option `%s'\n"
 msgstr ""
 
-#: src/util/configuration.c:1253
+#: src/util/configuration.c:1237
 #, c-format
 msgid ""
 "Failed to expand `%s' in `%s' as it is neither found in [PATHS] nor defined "
@@ -8139,17 +7775,22 @@
 msgid "libgcrypt has not the expected version (version %s is required).\n"
 msgstr ""
 
-#: src/util/crypto_rsa.c:1146
+#: src/util/crypto_rsa.c:835
 #, c-format
+msgid "RSA signing failed at %s:%d: %s\n"
+msgstr ""
+
+#: src/util/crypto_rsa.c:1166
+#, c-format
 msgid "RSA signature verification failed at %s:%d: %s\n"
 msgstr ""
 
-#: src/util/disk.c:1227
+#: src/util/disk.c:1245
 #, c-format
 msgid "Expected `%s' to be a directory!\n"
 msgstr ""
 
-#: src/util/disk.c:1450 src/util/service.c:1322
+#: src/util/disk.c:1486 src/util/service.c:1322 src/util/service_new.c:1371
 #, c-format
 msgid "Cannot obtain information about user `%s': %s\n"
 msgstr ""
@@ -8392,13 +8033,13 @@
 msgid "Manipulate GNUnet proof of work files"
 msgstr ""
 
-#: src/util/gnunet-service-resolver.c:327
+#: src/util/gnunet-service-resolver.c:371
 #, c-format
 msgid "Could not resolve `%s' (%s): %s\n"
 msgstr ""
 
-#: src/util/gnunet-service-resolver.c:401
-#: src/util/gnunet-service-resolver.c:442
+#: src/util/gnunet-service-resolver.c:460
+#: src/util/gnunet-service-resolver.c:512
 #, c-format
 msgid "Could not find IP of host `%s': %s\n"
 msgstr ""
@@ -8447,7 +8088,7 @@
 msgid "Unable to shorten unix path `%s' while keeping name unique\n"
 msgstr ""
 
-#: src/util/network.c:1731 src/util/network.c:1907
+#: src/util/network.c:1737 src/util/network.c:1913
 #, c-format
 msgid ""
 "Fatal internal logic error, process hangs in `%s' (abort with CTRL-C)!\n"
@@ -8494,17 +8135,17 @@
 msgid "Could not determine plugin installation path.\n"
 msgstr ""
 
-#: src/util/program.c:244 src/util/service.c:1456
+#: src/util/program.c:244 src/util/service.c:1456 src/util/service_new.c:1801
 #, c-format
 msgid "Malformed configuration file `%s', exit ...\n"
 msgstr ""
 
-#: src/util/program.c:256 src/util/service.c:1471
+#: src/util/program.c:256 src/util/service.c:1471 src/util/service_new.c:1818
 #, c-format
 msgid "Could not access configuration file `%s'\n"
 msgstr ""
 
-#: src/util/program.c:261 src/util/service.c:1466
+#: src/util/program.c:261 src/util/service.c:1466 src/util/service_new.c:1812
 msgid "Malformed configuration, exit ...\n"
 msgstr ""
 
@@ -8521,37 +8162,37 @@
 "resolution will be unavailable.\n"
 msgstr ""
 
-#: src/util/resolver_api.c:357
+#: src/util/resolver_api.c:815
 #, c-format
-msgid "Timeout trying to resolve IP address `%s'.\n"
+msgid "Timeout trying to resolve hostname `%s'.\n"
 msgstr ""
 
-#: src/util/resolver_api.c:364
+#: src/util/resolver_api.c:827
 #, c-format
-msgid "Timeout trying to resolve hostname `%s'.\n"
+msgid "Timeout trying to resolve IP address `%s'.\n"
 msgstr ""
 
-#: src/util/resolver_api.c:950
+#: src/util/resolver_api.c:1004
 msgid "Resolver not configured correctly.\n"
 msgstr ""
 
-#: src/util/resolver_api.c:1026 src/util/resolver_api.c:1047
-#: src/util/resolver_api.c:1061
+#: src/util/resolver_api.c:1086 src/util/resolver_api.c:1107
+#: src/util/resolver_api.c:1121
 #, fuzzy, c-format
 msgid "Could not resolve our FQDN: %s\n"
 msgstr "Résolution de « %s » échouée : %s\n"
 
-#: src/util/server.c:478
+#: src/util/server.c:478 src/util/service_new.c:1103
 #, c-format
 msgid "`%s' failed for port %d (%s).\n"
 msgstr ""
 
-#: src/util/server.c:488
+#: src/util/server.c:488 src/util/service_new.c:1113
 #, c-format
 msgid "`%s' failed for port %d (%s): address already in use\n"
 msgstr ""
 
-#: src/util/server.c:494
+#: src/util/server.c:494 src/util/service_new.c:1119
 #, c-format
 msgid "`%s' failed for `%s': address already in use\n"
 msgstr ""
@@ -8563,7 +8204,7 @@
 "`GNUNET_SERVER_receive_done' after %s\n"
 msgstr ""
 
-#: src/util/service.c:347
+#: src/util/service.c:347 src/util/service_new.c:2335
 #, c-format
 msgid "Unknown address family %d\n"
 msgstr ""
@@ -8573,44 +8214,26 @@
 msgid "Access from `%s' denied to service `%s'\n"
 msgstr ""
 
-#: src/util/service.c:410
+#: src/util/service.c:410 src/util/service_new.c:431
 #, c-format
 msgid "Could not parse IPv4 network specification `%s' for `%s:%s'\n"
 msgstr ""
 
-#: src/util/service.c:448
+#: src/util/service.c:448 src/util/service_new.c:474
 #, c-format
 msgid "Could not parse IPv6 network specification `%s' for `%s:%s'\n"
 msgstr ""
 
-#: src/util/service.c:565
-#, c-format
-msgid ""
-"Disabling IPv6 support for service `%s', failed to create IPv6 socket: %s\n"
-msgstr ""
-
-#: src/util/service.c:656
-#, c-format
-msgid ""
-"Disabling UNIX domain socket support for service `%s', failed to create UNIX "
-"domain socket: %s\n"
-msgstr ""
-
-#: src/util/service.c:673
-#, c-format
-msgid "Have neither PORT nor UNIXPATH for service `%s', but one is required\n"
-msgstr ""
-
-#: src/util/service.c:912
+#: src/util/service.c:912 src/util/service_new.c:1034
 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.c:961 src/util/service.c:979 src/util/service_new.c:1186
 #, c-format
 msgid "Specified value for `%s' of service `%s' is invalid\n"
 msgstr ""
 
-#: src/util/service.c:1004
+#: src/util/service.c:1004 src/util/service_new.c:1218
 #, c-format
 msgid "Could not access pre-bound socket %u, will try to bind myself\n"
 msgstr ""
@@ -8625,31 +8248,43 @@
 msgid "Service `%s' runs at %s\n"
 msgstr ""
 
-#: src/util/service.c:1260
+#: src/util/service.c:1260 src/util/service_new.c:1493
 msgid "Service process failed to initialize\n"
 msgstr ""
 
-#: src/util/service.c:1264
+#: src/util/service.c:1264 src/util/service_new.c:1497
 msgid "Service process could not initialize server function\n"
 msgstr ""
 
-#: src/util/service.c:1268
+#: src/util/service.c:1268 src/util/service_new.c:1501
 msgid "Service process failed to report status\n"
 msgstr ""
 
-#: src/util/service.c:1323
+#: src/util/service.c:1323 src/util/service_new.c:1373
 msgid "No such user"
 msgstr "Aucun utilisateur trouvé"
 
-#: src/util/service.c:1336
+#: src/util/service.c:1336 src/util/service_new.c:1392
 #, c-format
 msgid "Cannot change user/group to `%s': %s\n"
 msgstr ""
 
-#: src/util/service.c:1406
+#: src/util/service.c:1406 src/util/service_new.c:1729
 msgid "do daemonize (detach from terminal)"
 msgstr ""
 
+#: src/util/service_new.c:1298
+msgid ""
+"Could not bind to any of the ports I was supposed to, refusing to run!\n"
+msgstr ""
+
+#: src/util/service_new.c:2085
+#, c-format
+msgid ""
+"Processing code for message of type %u did not call "
+"`GNUNET_SERVICE_client_continue' after %s\n"
+msgstr ""
+
 #: src/util/signal.c:89
 #, c-format
 msgid "signal (%d, %p) returned %d.\n"
@@ -8669,221 +8304,216 @@
 msgid "b"
 msgstr "o"
 
-#: src/util/strings.c:437
+#: src/util/strings.c:441
 #, c-format
 msgid "Character sets requested were `%s'->`%s'\n"
 msgstr ""
 
-#: src/util/strings.c:565
+#: src/util/strings.c:568
 msgid "Failed to expand `$HOME': environment variable `HOME' not set"
 msgstr ""
 
-#: src/util/strings.c:662
+#: src/util/strings.c:672
 msgid "µs"
 msgstr "µs"
 
-#: src/util/strings.c:666
+#: src/util/strings.c:676
 msgid "forever"
 msgstr "perpetuel"
 
-#: src/util/strings.c:668
+#: src/util/strings.c:678
 msgid "0 ms"
 msgstr "0 ms"
 
-#: src/util/strings.c:674
+#: src/util/strings.c:684
 msgid "ms"
 msgstr "ms"
 
-#: src/util/strings.c:680
+#: src/util/strings.c:690
 msgid "s"
 msgstr "s"
 
-#: src/util/strings.c:686
+#: src/util/strings.c:696
 msgid "m"
 msgstr "m"
 
-#: src/util/strings.c:692
+#: src/util/strings.c:702
 msgid "h"
 msgstr "h"
 
-#: src/util/strings.c:699
+#: src/util/strings.c:709
 msgid "day"
 msgstr "jour"
 
-#: src/util/strings.c:701
+#: src/util/strings.c:711
 msgid "days"
 msgstr "jours"
 
-#: src/util/strings.c:730
+#: src/util/strings.c:740
 msgid "end of time"
 msgstr "fin du temps"
 
-#: src/util/strings.c:1229
+#: src/util/strings.c:1239
 msgid "IPv6 address did not start with `['\n"
 msgstr ""
 
-#: src/util/strings.c:1237
+#: src/util/strings.c:1247
 msgid "IPv6 address did contain ':' to separate port number\n"
 msgstr ""
 
-#: src/util/strings.c:1243
+#: src/util/strings.c:1253
 msgid "IPv6 address did contain ']' before ':' to separate port number\n"
 msgstr ""
 
-#: src/util/strings.c:1250
+#: src/util/strings.c:1260
 msgid "IPv6 address did contain a valid port number after the last ':'\n"
 msgstr ""
 
-#: src/util/strings.c:1259
+#: src/util/strings.c:1269
 #, c-format
 msgid "Invalid IPv6 address `%s': %s\n"
 msgstr ""
 
-#: src/util/strings.c:1465 src/util/strings.c:1481
+#: src/util/strings.c:1475 src/util/strings.c:1491
 msgid "Port not in range\n"
 msgstr ""
 
-#: src/util/strings.c:1490
+#: src/util/strings.c:1500
 #, c-format
 msgid "Malformed port policy `%s'\n"
 msgstr ""
 
-#: src/util/strings.c:1573 src/util/strings.c:1604 src/util/strings.c:1652
-#: src/util/strings.c:1673
+#: src/util/strings.c:1583 src/util/strings.c:1614 src/util/strings.c:1662
+#: src/util/strings.c:1683
 #, c-format
 msgid "Invalid format for IP: `%s'\n"
 msgstr ""
 
-#: src/util/strings.c:1630
+#: src/util/strings.c:1640
 #, c-format
 msgid "Invalid network notation ('/%d' is not legal in IPv4 CIDR)."
 msgstr ""
 
-#: src/util/strings.c:1682
+#: src/util/strings.c:1692
 #, c-format
 msgid "Invalid format: `%s'\n"
 msgstr "fornat invalide : « %s »\n"
 
-#: src/util/strings.c:1734
+#: src/util/strings.c:1744
 #, c-format
 msgid "Invalid network notation (does not end with ';': `%s')\n"
 msgstr ""
 
-#: src/util/strings.c:1784
+#: src/util/strings.c:1794
 #, c-format
 msgid "Wrong format `%s' for netmask\n"
 msgstr ""
 
-#: src/util/strings.c:1815
+#: src/util/strings.c:1825
 #, c-format
 msgid "Wrong format `%s' for network\n"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:556 src/vpn/gnunet-service-vpn.c:1113
+#: src/vpn/gnunet-service-vpn.c:550 src/vpn/gnunet-service-vpn.c:1125
 msgid "# Active channels"
 msgstr "# Canaux actifs"
 
-#: src/vpn/gnunet-service-vpn.c:632
+#: src/vpn/gnunet-service-vpn.c:629
 msgid "# Bytes given to cadet for transmission"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:670
+#: src/vpn/gnunet-service-vpn.c:667
 msgid "# Bytes dropped in cadet queue (overflow)"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:781
+#: src/vpn/gnunet-service-vpn.c:783
 msgid "# Cadet channels created"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:809
-#, fuzzy
-msgid "Failed to setup cadet channel!\n"
-msgstr "Échec du démarrage de %s\n"
-
-#: src/vpn/gnunet-service-vpn.c:1008
+#: src/vpn/gnunet-service-vpn.c:1005
 #, c-format
 msgid "Protocol %u not supported, dropping\n"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:1133
+#: src/vpn/gnunet-service-vpn.c:1145
 msgid "# Packets dropped (channel not yet online)"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:1344
+#: src/vpn/gnunet-service-vpn.c:1353
 msgid "# ICMPv4 packets dropped (not allowed)"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:1365
+#: src/vpn/gnunet-service-vpn.c:1374
 msgid "# ICMPv6 packets dropped (not allowed)"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:1571
+#: src/vpn/gnunet-service-vpn.c:1580
 msgid "# Packets received from TUN interface"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:1604 src/vpn/gnunet-service-vpn.c:1640
+#: src/vpn/gnunet-service-vpn.c:1613 src/vpn/gnunet-service-vpn.c:1649
 #, c-format
 msgid "Packet received for unmapped destination `%s' (dropping it)\n"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:1650
+#: src/vpn/gnunet-service-vpn.c:1659
 msgid "Received IPv4 packet with options (dropping it)\n"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:1664
+#: src/vpn/gnunet-service-vpn.c:1673
 #, c-format
 msgid "Received packet of unknown protocol %d from TUN (dropping it)\n"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:1746
+#: src/vpn/gnunet-service-vpn.c:1755
 msgid "# ICMP packets received from cadet"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:2086
+#: src/vpn/gnunet-service-vpn.c:2095
 msgid "# UDP packets received from cadet"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:2242
+#: src/vpn/gnunet-service-vpn.c:2251
 msgid "# TCP packets received from cadet"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:2394
+#: src/vpn/gnunet-service-vpn.c:2403
 msgid "Failed to find unallocated IPv4 address in VPN's range\n"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:2449
+#: src/vpn/gnunet-service-vpn.c:2458
 msgid "Failed to find unallocated IPv6 address in VPN's range\n"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:2491 src/vpn/gnunet-service-vpn.c:2702
+#: src/vpn/gnunet-service-vpn.c:2500 src/vpn/gnunet-service-vpn.c:2722
 msgid "# Active destinations"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:2753
+#: src/vpn/gnunet-service-vpn.c:2771
 msgid "Failed to allocate IP address for new destination\n"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:3017
+#: src/vpn/gnunet-service-vpn.c:3063
 msgid "Must specify valid IPv6 address"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:3041
+#: src/vpn/gnunet-service-vpn.c:3087
 msgid "Must specify valid IPv6 mask"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:3049
+#: src/vpn/gnunet-service-vpn.c:3095
 msgid "IPv6 support disabled as this system does not support IPv6\n"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:3062
+#: src/vpn/gnunet-service-vpn.c:3108
 msgid "Must specify valid IPv4 address"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:3075
+#: src/vpn/gnunet-service-vpn.c:3121
 msgid "Must specify valid IPv4 mask"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:3085
+#: src/vpn/gnunet-service-vpn.c:3131
 msgid "IPv4 support disabled as this system does not support IPv4\n"
 msgstr ""
 
@@ -8952,21 +8582,32 @@
 msgid "Setup tunnels via VPN."
 msgstr "Configurer des tunnels via VPN."
 
-#: src/include/gnunet_common.h:641 src/include/gnunet_common.h:648
-#: src/include/gnunet_common.h:656
+#: src/include/gnunet_common.h:645 src/include/gnunet_common.h:652
+#: src/include/gnunet_common.h:660
 #, c-format
 msgid "Assertion failed at %s:%d.\n"
 msgstr ""
 
-#: src/include/gnunet_common.h:668
+#: src/include/gnunet_common.h:672
 #, c-format
 msgid "External protocol violation detected at %s:%d.\n"
 msgstr ""
 
-#: src/include/gnunet_common.h:695 src/include/gnunet_common.h:704
+#: src/include/gnunet_common.h:699 src/include/gnunet_common.h:708
 #, c-format
 msgid "`%s' failed on file `%s' at %s:%d with error: %s\n"
 msgstr ""
 
-#~ msgid "Received %s message\n"
-#~ msgstr "%s message(s) reçu(s)\n"
+#~ msgid "Benchmarking done\n"
+#~ msgstr "Benchmark terminé\n"
+
+#, fuzzy
+#~ msgid "number too large"
+#~ msgstr "nombre de valeurs"
+
+#~ msgid "unknown error"
+#~ msgstr "erreur unconnue."
+
+#, fuzzy
+#~ msgid "Failed to setup cadet channel!\n"
+#~ msgstr "Échec du démarrage de %s\n"

Modified: gnunet/po/sv.po
===================================================================
--- gnunet/po/sv.po     2016-10-26 04:21:00 UTC (rev 38215)
+++ gnunet/po/sv.po     2016-10-26 14:25:30 UTC (rev 38216)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: GNUnet 0.7.0b\n"
 "Report-Msgid-Bugs-To: address@hidden"
-"POT-Creation-Date: 2016-05-19 13:54+0200\n"
+"POT-Creation-Date: 2016-10-26 09:18-0500\n"
 "PO-Revision-Date: 2006-01-21 17:16+0100\n"
 "Last-Translator: Daniel Nylander <address@hidden>\n"
 "Language-Team: Swedish <address@hidden>\n"
@@ -16,318 +16,353 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: src/arm/arm_api.c:338
-msgid "Client was disconnected from arm service, trying to reconnect.\n"
-msgstr ""
-
-#: src/arm/arm_monitor_api.c:324
-msgid ""
-"Monitoring client was disconnected from arm service, trying to reconnect.\n"
-msgstr ""
-
-#: src/arm/gnunet-arm.c:169
+#: src/arm/gnunet-arm.c:152
 #, fuzzy, c-format
 msgid "Failed to remove configuration file %s\n"
 msgstr "Kunde inte spara konfigurationsfil \"%s\":"
 
-#: src/arm/gnunet-arm.c:175
+#: src/arm/gnunet-arm.c:158
 #, fuzzy, c-format
 msgid "Failed to remove servicehome directory %s\n"
 msgstr "Filformatsfel (inte en GNUnet-katalog?)\n"
 
-#: src/arm/gnunet-arm.c:225 src/testbed/gnunet-service-testbed_peers.c:1013
+#: src/arm/gnunet-arm.c:213 src/testbed/gnunet-service-testbed_peers.c:1139
 msgid "Message was sent successfully"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:227
+#: src/arm/gnunet-arm.c:215
 #, fuzzy
 msgid "Misconfiguration (can not connect to the ARM service)"
 msgstr "Misslyckades att ansluta till gnunetd.\n"
 
-#: src/arm/gnunet-arm.c:229 src/testbed/gnunet-service-testbed_peers.c:1017
+#: src/arm/gnunet-arm.c:217 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:231 src/testbed/gnunet-service-testbed_peers.c:1019
+#: src/arm/gnunet-arm.c:219 src/testbed/gnunet-service-testbed_peers.c:1145
 msgid "ARM API is busy"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:233
-msgid "Request does not fit into a message"
-msgstr ""
-
-#: src/arm/gnunet-arm.c:235 src/testbed/gnunet-service-testbed_peers.c:1023
+#: src/arm/gnunet-arm.c:221 src/testbed/gnunet-service-testbed_peers.c:1147
 #, fuzzy
 msgid "Request timed out"
 msgstr "# sessionsnycklar accepterade"
 
-#: src/arm/gnunet-arm.c:237 src/testbed/gnunet-service-testbed_peers.c:1025
+#: src/arm/gnunet-arm.c:223 src/testbed/gnunet-service-testbed_peers.c:1149
 #, fuzzy
 msgid "Unknown request status"
 msgstr "Okänd operation \"%s\"\n"
 
-#: src/arm/gnunet-arm.c:253 src/testbed/gnunet-service-testbed_peers.c:1041
+#: src/arm/gnunet-arm.c:239 src/testbed/gnunet-service-testbed_peers.c:1165
 #, fuzzy, c-format
 msgid "%s is stopped"
 msgstr "# byte krypterade"
 
-#: src/arm/gnunet-arm.c:255 src/testbed/gnunet-service-testbed_peers.c:1043
+#: src/arm/gnunet-arm.c:241 src/testbed/gnunet-service-testbed_peers.c:1167
 #, fuzzy, c-format
 msgid "%s is starting"
 msgstr "\"%s\" startar\n"
 
-#: src/arm/gnunet-arm.c:257 src/testbed/gnunet-service-testbed_peers.c:1045
+#: src/arm/gnunet-arm.c:243 src/testbed/gnunet-service-testbed_peers.c:1169
 #, c-format
 msgid "%s is stopping"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:259 src/testbed/gnunet-service-testbed_peers.c:1047
+#: src/arm/gnunet-arm.c:245 src/testbed/gnunet-service-testbed_peers.c:1171
 #, fuzzy, c-format
 msgid "%s is starting already"
 msgstr "\"%s\" startar\n"
 
-#: src/arm/gnunet-arm.c:261 src/testbed/gnunet-service-testbed_peers.c:1049
+#: src/arm/gnunet-arm.c:247 src/testbed/gnunet-service-testbed_peers.c:1173
 #, c-format
 msgid "%s is stopping already"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:263 src/testbed/gnunet-service-testbed_peers.c:1051
+#: src/arm/gnunet-arm.c:249 src/testbed/gnunet-service-testbed_peers.c:1175
 #, c-format
 msgid "%s is started already"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:265 src/testbed/gnunet-service-testbed_peers.c:1053
+#: src/arm/gnunet-arm.c:251 src/testbed/gnunet-service-testbed_peers.c:1177
 #, c-format
 msgid "%s is stopped already"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:267 src/testbed/gnunet-service-testbed_peers.c:1055
+#: src/arm/gnunet-arm.c:253 src/testbed/gnunet-service-testbed_peers.c:1179
 #, fuzzy, c-format
 msgid "%s service is not known to ARM"
 msgstr "\"%s\" är inte en fil.\n"
 
-#: src/arm/gnunet-arm.c:269 src/testbed/gnunet-service-testbed_peers.c:1057
+#: src/arm/gnunet-arm.c:255 src/testbed/gnunet-service-testbed_peers.c:1181
 #, fuzzy, c-format
 msgid "%s service failed to start"
 msgstr "Misslyckades att starta samling.\n"
 
-#: src/arm/gnunet-arm.c:271
+#: src/arm/gnunet-arm.c:257
 #, c-format
 msgid "%s service cannot be started because ARM is shutting down"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:273 src/testbed/gnunet-service-testbed_peers.c:1061
+#: src/arm/gnunet-arm.c:259 src/testbed/gnunet-service-testbed_peers.c:1185
 #, c-format
 msgid "%.s Unknown result code."
 msgstr ""
 
-#: src/arm/gnunet-arm.c:305
+#: src/arm/gnunet-arm.c:291
 msgid "Fatal error initializing ARM API.\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:335 src/arm/gnunet-arm.c:344
+#: src/arm/gnunet-arm.c:320 src/arm/gnunet-arm.c:329
 #, fuzzy, c-format
 msgid "Failed to start the ARM service: %s\n"
 msgstr "Misslyckades att starta samling.\n"
 
-#: src/arm/gnunet-arm.c:380
+#: src/arm/gnunet-arm.c:364
 #, 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:391
+#: src/arm/gnunet-arm.c:375
 #, 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:434
+#: src/arm/gnunet-arm.c:417
 #, 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:444
+#: src/arm/gnunet-arm.c:428
 #, fuzzy, c-format
 msgid "Failed to start the `%s' service: %s\n"
 msgstr "Misslyckades att starta samling.\n"
 
-#: src/arm/gnunet-arm.c:482
+#: src/arm/gnunet-arm.c:467
 #, 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:493
+#: src/arm/gnunet-arm.c:478
 #, fuzzy, c-format
 msgid "Failed to kill the `%s' service: %s\n"
 msgstr "Fel vid %s:%d.\n"
 
-#: src/arm/gnunet-arm.c:533
+#: src/arm/gnunet-arm.c:519
 #, fuzzy, c-format
 msgid "Failed to request a list of services: %s\n"
 msgstr "Misslyckades att starta samling.\n"
 
-#: src/arm/gnunet-arm.c:542
+#: src/arm/gnunet-arm.c:528
 #, fuzzy
 msgid "Error communicating with ARM. ARM not running?\n"
 msgstr "Skriv ut information om GNUnets motparter."
 
-#: src/arm/gnunet-arm.c:547
+#: src/arm/gnunet-arm.c:534
 #, fuzzy
 msgid "Running services:\n"
 msgstr "Startade samling \"%s\".\n"
 
-#: src/arm/gnunet-arm.c:633
+#: src/arm/gnunet-arm.c:622
 #, c-format
 msgid "Now only monitoring, press CTRL-C to stop.\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:665
+#: src/arm/gnunet-arm.c:654
 #, c-format
 msgid "Stopped %s.\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:668
+#: src/arm/gnunet-arm.c:657
 #, fuzzy, c-format
 msgid "Starting %s...\n"
 msgstr "Startade samling \"%s\".\n"
 
-#: src/arm/gnunet-arm.c:671
+#: src/arm/gnunet-arm.c:660
 #, c-format
 msgid "Stopping %s...\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:682
+#: src/arm/gnunet-arm.c:674
 #, fuzzy, c-format
 msgid "Unknown status %u for service %s.\n"
 msgstr "Okänd operation \"%s\"\n"
 
-#: src/arm/gnunet-arm.c:745
+#: src/arm/gnunet-arm.c:756
 msgid "stop all GNUnet services"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:747
+#: src/arm/gnunet-arm.c:758
 msgid "start a particular service"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:749
+#: src/arm/gnunet-arm.c:760
 msgid "stop a particular service"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:751
+#: src/arm/gnunet-arm.c:762
 msgid "start all GNUnet default services"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:754
+#: src/arm/gnunet-arm.c:765
 msgid "stop and start all GNUnet default services"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:757
+#: src/arm/gnunet-arm.c:768
 msgid "delete config file and directory on exit"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:760
+#: src/arm/gnunet-arm.c:771
 msgid "monitor ARM activities"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:762
+#: src/arm/gnunet-arm.c:773
 msgid "don't print status messages"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:765
+#: src/arm/gnunet-arm.c:776
 msgid "exit with error status if operation does not finish after DELAY"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:767
+#: src/arm/gnunet-arm.c:778
 #, fuzzy
 msgid "list currently running services"
 msgstr "Startade samling \"%s\".\n"
 
-#: src/arm/gnunet-arm.c:769
+#: src/arm/gnunet-arm.c:780
 msgid "don't let gnunet-service-arm inherit standard output"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:771
+#: src/arm/gnunet-arm.c:782
 msgid "don't let gnunet-service-arm inherit standard error"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:782
+#: src/arm/gnunet-arm.c:794
 msgid "Control services and the Automated Restart Manager (ARM)"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:279
-#, fuzzy
-msgid "Could not send status result to client\n"
-msgstr "Kunde inte skicka begäran till gnunetd.\n"
+#: src/arm/gnunet-service-arm.c:374 src/transport/plugin_transport_tcp.c:633
+#: src/util/service.c:565 src/util/service_new.c:604
+#, c-format
+msgid ""
+"Disabling IPv6 support for service `%s', failed to create IPv6 socket: %s\n"
+msgstr ""
 
-#: src/arm/gnunet-service-arm.c:315
-#, fuzzy
-msgid "Could not send list result to client\n"
-msgstr "Kunde inte skicka begäran till gnunetd.\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:658
+#: src/transport/plugin_transport_tcp.c:3299 src/util/service.c:584
+#: src/util/service.c:590 src/util/service_new.c:629 src/util/service_new.c:635
+#, c-format
+msgid "Require valid port number for service `%s' in configuration!\n"
+msgstr ""
 
-#: src/arm/gnunet-service-arm.c:555
+#: src/arm/gnunet-service-arm.c:430 src/transport/plugin_transport_tcp.c:689
+#: src/util/client_new.c:464 src/util/service.c:621 src/util/service_new.c:674
+#, 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/util/client_new.c:469 src/util/service.c:625 src/util/service_new.c:679
 #, 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/util/service.c:656 src/util/service_new.c:715
+#, 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/util/service.c:673 src/util/service_new.c:733
+#, 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:2617
+#: src/transport/plugin_transport_tcp.c:772 src/util/service.c:704
+#: src/util/service_new.c:774
+#, 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:2635
+#: src/transport/plugin_transport_tcp.c:791 src/util/service.c:723
+#: src/util/service_new.c:794
+#, 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
+#, fuzzy, c-format
 msgid "Failed to start service `%s'\n"
 msgstr "Misslyckades att starta samling.\n"
 
-#: src/arm/gnunet-service-arm.c:566
+#: src/arm/gnunet-service-arm.c:943
 #, fuzzy, c-format
 msgid "Starting service `%s'\n"
 msgstr "Startade samling \"%s\".\n"
 
-#: src/arm/gnunet-service-arm.c:663
+#: src/arm/gnunet-service-arm.c:1055
 #, 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:687
+#: src/arm/gnunet-service-arm.c:1090
 #, c-format
 msgid "Unable to bind listening socket for service `%s' to address `%s': %s\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:723
+#: src/arm/gnunet-service-arm.c:1133
 #, c-format
 msgid "ARM now monitors connections to service `%s' at `%s'\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:863
+#: src/arm/gnunet-service-arm.c:1309
 #, fuzzy, c-format
 msgid "Preparing to stop `%s'\n"
 msgstr "Startade samling \"%s\".\n"
 
-#: src/arm/gnunet-service-arm.c:1145
+#: src/arm/gnunet-service-arm.c:1611
 #, fuzzy, c-format
 msgid "Restarting service `%s'.\n"
 msgstr "Startade samling \"%s\".\n"
 
-#: src/arm/gnunet-service-arm.c:1299
+#: src/arm/gnunet-service-arm.c:1771
 msgid "exit"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:1304
+#: src/arm/gnunet-service-arm.c:1776
 msgid "signal"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:1309
+#: src/arm/gnunet-service-arm.c:1781
 #, fuzzy
 msgid "unknown"
 msgstr "Okänt fel"
 
-#: src/arm/gnunet-service-arm.c:1315
+#: src/arm/gnunet-service-arm.c:1787
 #, fuzzy, c-format
 msgid "Service `%s' took %s to terminate\n"
 msgstr "Tjänst borttagen.\n"
 
-#: src/arm/gnunet-service-arm.c:1342
+#: src/arm/gnunet-service-arm.c:1813
 #, c-format
 msgid "Service `%s' terminated normally, will restart at any time\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:1358
+#: src/arm/gnunet-service-arm.c:1829
 #, c-format
 msgid "Service `%s' terminated with status %s/%d, will restart in %s\n"
 msgstr ""
 
-#: src/arm/mockup-service.c:41
+#: src/arm/mockup-service.c:42
 msgid "Initiating shutdown as requested by client.\n"
 msgstr ""
 
@@ -352,14 +387,12 @@
 "%llu\n"
 msgstr ""
 
-#: src/ats/gnunet-ats-solver-eval.c:3293
-#: src/ats-tests/gnunet-solver-eval.c:921
+#: src/ats/gnunet-ats-solver-eval.c:3293 src/ats-tests/gnunet-solver-eval.c:935
 msgid "solver to use"
 msgstr ""
 
-#: src/ats/gnunet-ats-solver-eval.c:3296
-#: src/ats-tests/gnunet-solver-eval.c:924
-#: src/ats-tests/gnunet-solver-eval.c:927
+#: 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 ""
 
@@ -464,54 +497,26 @@
 msgid "Invalid %s configuration %f\n"
 msgstr "Kunde inte spara konfigurationsfil \"%s\":"
 
-#: src/ats-tests/ats-testing.c:72
-msgid "Benchmarking done\n"
-msgstr ""
-
-#: src/ats-tests/ats-testing.c:105
-#, fuzzy, c-format
-msgid "Failed to connect peer 0 and %u\n"
-msgstr "Misslyckades att ansluta till gnunetd.\n"
-
-#: src/ats-tests/ats-testing.c:413
+#: src/ats-tests/ats-testing.c:441
 #, c-format
 msgid "Connected master [%u] with slave [%u]\n"
 msgstr ""
 
-#: src/ats-tests/ats-testing.c:419
+#: src/ats-tests/ats-testing.c:448
 #, fuzzy, c-format
 msgid "Failed to connect master peer [%u] with slave [%u]\n"
 msgstr "Misslyckades att ansluta till gnunetd.\n"
 
-#: src/ats-tests/ats-testing.c:450
-msgid "Connecting peers on CORE level\n"
-msgstr ""
-
-#: src/ats-tests/ats-testing.c:461
-#, c-format
-msgid "Connecting master [%u] with slave [%u]\n"
-msgstr ""
-
-#: src/ats-tests/ats-testing.c:470
-#, fuzzy, c-format
-msgid "Could not connect master [%u] and slave [%u]\n"
-msgstr "Kunde inte ansluta till gnunetd.\n"
-
-#: src/ats-tests/ats-testing.c:490 src/ats-tests/ats-testing.c:634
-#, fuzzy
-msgid "Initialization failed, shutdown\n"
-msgstr "Initiering av insticksmekanism misslyckades: %s!\n"
-
-#: src/ats-tests/ats-testing-log.c:836
+#: src/ats-tests/ats-testing-log.c:837
 msgid "Stop logging\n"
 msgstr ""
 
-#: src/ats-tests/ats-testing-log.c:887
+#: src/ats-tests/ats-testing-log.c:892
 #, fuzzy, c-format
 msgid "Start logging `%s'\n"
 msgstr "Startade samling \"%s\".\n"
 
-#: src/ats-tests/gnunet-ats-sim.c:86
+#: src/ats-tests/gnunet-ats-sim.c:88
 #, c-format
 msgid ""
 "Master [%u]: sent: %u KiB in %u sec. = %u KiB/s, received: %u KiB in %u sec. "
@@ -554,8 +559,7 @@
 msgstr ""
 
 #: src/ats-tool/gnunet-ats.c:748 src/ats-tool/gnunet-ats.c:761
-#: src/transport/gnunet-transport.c:1780
-#: src/transport/gnunet-transport-profiler.c:516
+#: src/transport/gnunet-transport.c:1536
 #, fuzzy, c-format
 msgid "Failed to parse peer identity `%s'\n"
 msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
@@ -641,113 +645,108 @@
 msgid "Print information about ATS state"
 msgstr "Skriv ut information om GNUnets motparter."
 
-#: src/cadet/gnunet-cadet.c:476
+#: src/cadet/gnunet-cadet.c:511
 #, fuzzy, c-format
 msgid "Invalid target `%s'\n"
 msgstr "Ogiltigt argument: \"%s\"\n"
 
-#: src/cadet/gnunet-cadet.c:751
+#: src/cadet/gnunet-cadet.c:787
 #, fuzzy, c-format
 msgid "Invalid peer ID `%s'\n"
 msgstr "Ogiltiga argument: "
 
-#: src/cadet/gnunet-cadet.c:789
+#: src/cadet/gnunet-cadet.c:825
 #, fuzzy, c-format
 msgid "Invalid tunnel owner `%s'\n"
 msgstr "Ogiltigt format för IP: \"%s\"\n"
 
-#: src/cadet/gnunet-cadet.c:857
+#: src/cadet/gnunet-cadet.c:892
 msgid "You must NOT give a TARGET when using 'request all' options\n"
 msgstr ""
 
-#: src/cadet/gnunet-cadet.c:952
+#: src/cadet/gnunet-cadet.c:982
 #, fuzzy
 msgid "provide information about a particular connection"
 msgstr "Skriv ut information om GNUnets motparter."
 
-#: src/cadet/gnunet-cadet.c:955
+#: src/cadet/gnunet-cadet.c:985
 msgid "activate echo mode"
 msgstr ""
 
-#: src/cadet/gnunet-cadet.c:958
+#: src/cadet/gnunet-cadet.c:988
 msgid "dump debug information to STDERR"
 msgstr ""
 
-#: src/cadet/gnunet-cadet.c:964
-msgid "port to listen to (default; 0)"
+#: src/cadet/gnunet-cadet.c:994
+msgid "port to listen to"
 msgstr ""
 
-#: src/cadet/gnunet-cadet.c:967
+#: src/cadet/gnunet-cadet.c:997
 #, fuzzy
 msgid "provide information about a patricular peer"
 msgstr "Skriv ut information om GNUnets motparter."
 
-#: src/cadet/gnunet-cadet.c:970
+#: src/cadet/gnunet-cadet.c:1000
 #, fuzzy
 msgid "provide information about all peers"
 msgstr "Skriv ut information om GNUnets motparter."
 
-#: src/cadet/gnunet-cadet.c:973
+#: src/cadet/gnunet-cadet.c:1003
 #, fuzzy
 msgid "provide information about a particular tunnel"
 msgstr "Skriv ut information om GNUnets motparter."
 
-#: src/cadet/gnunet-cadet.c:976
+#: src/cadet/gnunet-cadet.c:1006
 #, fuzzy
 msgid "provide information about all tunnels"
 msgstr "Skriv ut information om GNUnets motparter."
 
-#: src/cadet/gnunet-service-cadet_peer.c:562
+#: src/cadet/gnunet-service-cadet_peer.c:707
 msgid "Wrong CORE service\n"
 msgstr ""
 
-#: src/consensus/gnunet-consensus-profiler.c:496
+#: 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:499
+#: src/consensus/gnunet-consensus-profiler.c:502
 msgid ""
 "how many peers (random selection without replacement) receive one value?"
 msgstr ""
 
-#: src/consensus/gnunet-consensus-profiler.c:502
-#: src/set/gnunet-set-profiler.c:377 src/set/gnunet-set-profiler.c:380
-#: src/set/gnunet-set-profiler.c:383
+#: src/consensus/gnunet-consensus-profiler.c:505
+#: src/set/gnunet-set-profiler.c:378 src/set/gnunet-set-profiler.c:381
+#: src/set/gnunet-set-profiler.c:384
 #, fuzzy
 msgid "number of values"
 msgstr "antal iterationer"
 
-#: src/consensus/gnunet-consensus-profiler.c:505
+#: src/consensus/gnunet-consensus-profiler.c:508
 #, fuzzy
 msgid "consensus timeout"
 msgstr "# sessionsnycklar accepterade"
 
-#: src/consensus/gnunet-consensus-profiler.c:508
+#: src/consensus/gnunet-consensus-profiler.c:511
 msgid "delay until consensus starts"
 msgstr ""
 
-#: src/consensus/gnunet-consensus-profiler.c:511
-#: src/set/gnunet-set-profiler.c:389
+#: src/consensus/gnunet-consensus-profiler.c:514
+#: src/set/gnunet-set-profiler.c:390
 msgid "write statistics to file"
 msgstr ""
 
-#: src/consensus/gnunet-consensus-profiler.c:514
+#: src/consensus/gnunet-consensus-profiler.c:517
 #: src/secretsharing/gnunet-secretsharing-profiler.c:622
 msgid "be more verbose (print received values)"
 msgstr ""
 
-#: src/conversation/conversation_api.c:493
-#: src/conversation/conversation_api_call.c:475
+#: src/conversation/conversation_api.c:513
+#: src/conversation/conversation_api_call.c:490
 msgid "Connection to conversation service lost, trying to reconnect\n"
 msgstr ""
 
-#: src/conversation/conversation_api.c:617
-#, fuzzy
-msgid "number too large"
-msgstr "antal iterationer"
-
 #: src/conversation/gnunet-conversation.c:269
 #, c-format
 msgid "Incoming call from `%s'. Please /accept %u or /cancel %u the call.\n"
@@ -773,236 +772,235 @@
 msgid "Ego `%s' no longer available, phone is now down.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:366
+#: src/conversation/gnunet-conversation.c:367
 #, fuzzy
 msgid "Failed to setup phone (internal error)\n"
 msgstr "Kunde inte skapa värdnyckel!\n"
 
-#: src/conversation/gnunet-conversation.c:378
+#: src/conversation/gnunet-conversation.c:379
 #, c-format
-msgid ""
-"Phone active on line %u.  Type `/help' for a list of available commands\n"
+msgid "Phone active at `%s'.  Type `/help' for a list of available commands\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:400
+#: src/conversation/gnunet-conversation.c:401
 #, c-format
 msgid "Resolved address of `%s'. Now ringing other party.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:407
+#: src/conversation/gnunet-conversation.c:408
 #, fuzzy, c-format
 msgid "Connection established to `%s'\n"
 msgstr "Misslyckades att leverera \"%s\" meddelande.\n"
 
-#: src/conversation/gnunet-conversation.c:414
+#: src/conversation/gnunet-conversation.c:415
 #, fuzzy, c-format
 msgid "Failed to resolve `%s'\n"
 msgstr "Misslyckades att leverera \"%s\" meddelande.\n"
 
-#: src/conversation/gnunet-conversation.c:422
+#: src/conversation/gnunet-conversation.c:423
 #, c-format
 msgid "Call to `%s' terminated\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:431
+#: src/conversation/gnunet-conversation.c:432
 #, c-format
 msgid "Connection to `%s' suspended (by other user)\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:437
+#: src/conversation/gnunet-conversation.c:438
 #, c-format
 msgid "Connection to `%s' resumed (by other user)\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:442
+#: src/conversation/gnunet-conversation.c:443
 msgid "Error with the call, restarting it\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:511
+#: src/conversation/gnunet-conversation.c:512
 #, fuzzy, c-format
 msgid "Unknown command `%s'\n"
 msgstr "Okänd operation \"%s\"\n"
 
-#: src/conversation/gnunet-conversation.c:527
-#: src/conversation/gnunet-conversation.c:541
+#: src/conversation/gnunet-conversation.c:528
+#: src/conversation/gnunet-conversation.c:542
 #, c-format
 msgid "Ego `%s' not available\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:534
-#: src/conversation/gnunet-conversation.c:591
+#: src/conversation/gnunet-conversation.c:535
+#: src/conversation/gnunet-conversation.c:592
 msgid "You are calling someone else already, hang up first!\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:549
-#: src/conversation/gnunet-conversation.c:604
+#: src/conversation/gnunet-conversation.c:550
+#: src/conversation/gnunet-conversation.c:605
 #, c-format
 msgid "You are answering call from `%s', hang up or suspend that call first!\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:559
+#: src/conversation/gnunet-conversation.c:560
 msgid "Call recipient missing.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:615
+#: src/conversation/gnunet-conversation.c:616
 msgid "There is no incoming call to accept here!\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:632
+#: src/conversation/gnunet-conversation.c:633
 #, c-format
 msgid "There is no incoming call `%s' to accept right now!\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:662
+#: src/conversation/gnunet-conversation.c:663
 msgid "We currently do not have an address.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:685
+#: src/conversation/gnunet-conversation.c:686
 #, c-format
 msgid "We are currently trying to locate the private key for the ego `%s'.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:690
+#: src/conversation/gnunet-conversation.c:691
 #, c-format
-msgid "We are listening for incoming calls for ego `%s' on line %u.\n"
+msgid "We are listening for incoming calls for ego `%s' on line `%s'.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:696
-#: src/conversation/gnunet-conversation.c:720
+#: src/conversation/gnunet-conversation.c:697
+#: src/conversation/gnunet-conversation.c:721
 #, c-format
 msgid "You are having a conversation with `%s'.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:701
+#: src/conversation/gnunet-conversation.c:702
 msgid ""
 "We had an internal error setting up our phone line. You can still make "
 "calls.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:710
+#: src/conversation/gnunet-conversation.c:711
 #, c-format
 msgid "We are trying to find the network address to call `%s'.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:715
+#: src/conversation/gnunet-conversation.c:716
 #, c-format
 msgid "We are calling `%s', his phone should be ringing.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:734
+#: src/conversation/gnunet-conversation.c:735
 msgid "Calls waiting:\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:740
+#: src/conversation/gnunet-conversation.c:741
 #, fuzzy, c-format
 msgid "#%u: `%s'\n"
 msgstr "Jag är ändpunkt \"%s\".\n"
 
-#: src/conversation/gnunet-conversation.c:768
-#: src/conversation/gnunet-conversation.c:783
+#: src/conversation/gnunet-conversation.c:769
+#: src/conversation/gnunet-conversation.c:784
 msgid "There is no call that could be suspended right now.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:816
-#: src/conversation/gnunet-conversation.c:832
+#: src/conversation/gnunet-conversation.c:817
+#: src/conversation/gnunet-conversation.c:833
 msgid "There is no call that could be resumed right now.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:839
+#: src/conversation/gnunet-conversation.c:840
 #, c-format
 msgid "Already talking with `%s', cannot resume a call right now.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:848
+#: src/conversation/gnunet-conversation.c:849
 msgid "There is no incoming call to resume here!\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:865
+#: src/conversation/gnunet-conversation.c:866
 #, c-format
 msgid "There is no incoming call `%s' to resume right now!\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:900
+#: src/conversation/gnunet-conversation.c:901
 msgid "There is no call that could be cancelled right now.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:908
+#: src/conversation/gnunet-conversation.c:909
 msgid "There is no incoming call to refuse here!\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:925
+#: src/conversation/gnunet-conversation.c:926
 #, c-format
 msgid "There is no incoming call `%s' to refuse right now!\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:951
+#: src/conversation/gnunet-conversation.c:952
 msgid "Use `/address' to find out which address this phone should have in GNS"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:953
+#: src/conversation/gnunet-conversation.c:954
 msgid "Use `/call USER.gnu' to call USER"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:955
+#: src/conversation/gnunet-conversation.c:956
 msgid "Use `/accept #NUM' to accept incoming call #NUM"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:957
+#: src/conversation/gnunet-conversation.c:958
 msgid "Use `/suspend' to suspend the active call"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:959
+#: src/conversation/gnunet-conversation.c:960
 msgid ""
 "Use `/resume [#NUM]' to resume a call, #NUM is needed to resume incoming "
 "calls, no argument is needed to resume the current outgoing call."
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:961
+#: src/conversation/gnunet-conversation.c:962
 msgid "Use `/cancel' to reject or terminate a call"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:963
+#: src/conversation/gnunet-conversation.c:964
 msgid "Use `/status' to print status information"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:965
+#: src/conversation/gnunet-conversation.c:966
 #, fuzzy
 msgid "Use `/quit' to terminate gnunet-conversation"
 msgstr "tillåter klienter att fastställa gnunetds konfiguration"
 
-#: src/conversation/gnunet-conversation.c:967
+#: src/conversation/gnunet-conversation.c:968
 msgid "Use `/help command' to get help for a specific command"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:1171
+#: src/conversation/gnunet-conversation.c:1172
 #, fuzzy, c-format
 msgid "Name of our ego changed to `%s'\n"
 msgstr "Kunde inte skapa namnrymd \"%s\" (existerar?).\n"
 
-#: src/conversation/gnunet-conversation.c:1184
+#: src/conversation/gnunet-conversation.c:1185
 #, fuzzy, c-format
 msgid "Our ego `%s' was deleted!\n"
 msgstr "Pseudonym \"%s\" togs bort.\n"
 
-#: src/conversation/gnunet-conversation.c:1219
+#: src/conversation/gnunet-conversation.c:1220
 #, fuzzy
 msgid "You must specify the NAME of an ego to use\n"
 msgstr "Du måste ange en lista av filer att lägga in.\n"
 
-#: src/conversation/gnunet-conversation.c:1243
+#: src/conversation/gnunet-conversation.c:1244
 #, fuzzy
 msgid "Failed to start gnunet-helper-w32-console\n"
 msgstr "Misslyckades att starta samling.\n"
 
-#: src/conversation/gnunet-conversation.c:1269
+#: src/conversation/gnunet-conversation.c:1270
 msgid "sets the NAME of the ego to use for the phone (and name resolution)"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:1272
+#: src/conversation/gnunet-conversation.c:1273
 msgid "sets the LINE to use for the phone"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:1298
+#: src/conversation/gnunet-conversation.c:1299
 msgid "Enables having a conversation with other GNUnet users."
 msgstr ""
 
@@ -1029,8 +1027,7 @@
 msgstr ""
 
 #: src/conversation/gnunet-conversation-test.c:243
-#: src/multicast/gnunet-multicast.c:70 src/revocation/gnunet-revocation.c:548
-#: src/template/gnunet-template.c:70
+#: src/revocation/gnunet-revocation.c:550 src/template/gnunet-template.c:76
 #, fuzzy
 msgid "help text"
 msgstr "hjälptext för -t"
@@ -1168,27 +1165,18 @@
 msgid "Failed to allocate %u bytes for second packet\n"
 msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 
-#: src/conversation/gnunet-service-conversation.c:855
-msgid "Cadet audio channel not ready; audio data dropped\n"
-msgstr ""
-
-#: src/conversation/gnunet-service-conversation.c:946
-#, c-format
-msgid ""
-"No available phone for incoming call on line %u, sending HANG_UP signal\n"
-msgstr ""
-
-#: src/conversation/gnunet-service-conversation.c:1360
-#, fuzzy, c-format
-msgid "Received incoming Cadet channel on port %u\n"
-msgstr "\"%s\" ansluten till \"%s\".\n"
-
 #: src/conversation/microphone.c:121
 #, fuzzy
 msgid "Could not start record audio helper\n"
 msgstr "Kunde inte komma åt namnrymdsinformation.\n"
 
-#: src/conversation/plugin_gnsrecord_conversation.c:116
+#: src/conversation/plugin_gnsrecord_conversation.c:71
+#, c-format
+msgid "PHONE version %u not supported\n"
+msgstr ""
+
+#: src/conversation/plugin_gnsrecord_conversation.c:133
+#: src/conversation/plugin_gnsrecord_conversation.c:147
 #, fuzzy, c-format
 msgid "Unable to parse PHONE record `%s'\n"
 msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
@@ -1198,10 +1186,6 @@
 msgid "Could not start playback audio helper.\n"
 msgstr "Kunde inte slå upp \"%s\": %s\n"
 
-#: src/core/core_api.c:725
-msgid "Client was disconnected from core service, trying to reconnect.\n"
-msgstr ""
-
 #: src/core/gnunet-core.c:90
 #, fuzzy
 msgid "fresh connection"
@@ -1244,7 +1228,7 @@
 msgid "%24s: %-30s %4s (timeout in %6s)\n"
 msgstr ""
 
-#: src/core/gnunet-core.c:144 src/peerinfo-tool/gnunet-peerinfo.c:790
+#: src/core/gnunet-core.c:144 src/peerinfo-tool/gnunet-peerinfo.c:728
 #, fuzzy, c-format
 msgid "Invalid command line argument `%s'\n"
 msgstr "Ogiltiga kommandoradsargument:\n"
@@ -1254,7 +1238,7 @@
 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:1990
+#: src/core/gnunet-core.c:176 src/transport/gnunet-transport.c:1737
 #, fuzzy
 msgid "provide information about all current connections (continuously)"
 msgstr "Skriv ut information om GNUnets motparter."
@@ -1264,61 +1248,65 @@
 msgid "Print information about connected peers."
 msgstr "Skriv ut information om GNUnets motparter."
 
-#: src/core/gnunet-service-core.c:104
-#, fuzzy
-msgid "Core service is lacking HOSTKEY configuration setting.  Exiting.\n"
-msgstr "GNUnet-konfiguration"
-
-#: src/core/gnunet-service-core.c:127
-#, c-format
-msgid "Core service of `%4s' ready.\n"
+#: src/core/gnunet-service-core.c:339
+msgid "# send requests dropped (disconnected)"
 msgstr ""
 
-#: src/core/gnunet-service-core_clients.c:380
-msgid "# send requests dropped (disconnected)"
+#: src/core/gnunet-service-core.c:363
+msgid "# dequeuing CAR (duplicate request)"
 msgstr ""
 
-#: src/core/gnunet-service-core_clients.c:498
+#: src/core/gnunet-service-core.c:432
+#, fuzzy, c-format
+msgid "# bytes of messages of type %u received"
+msgstr "# krypterade PONG-meddelanden mottagna"
+
+#: src/core/gnunet-service-core.c:530
 #, fuzzy
 msgid "# messages discarded (session disconnected)"
 msgstr "Nätverksannonsering avstängd i konfigurationen!\n"
 
-#: src/core/gnunet-service-core_clients.c:561
+#: src/core/gnunet-service-core.c:928
+#, fuzzy
+msgid "Core service is lacking HOSTKEY configuration setting.  Exiting.\n"
+msgstr "GNUnet-konfiguration"
+
+#: src/core/gnunet-service-core.c:949
 #, fuzzy, c-format
-msgid "# bytes of messages of type %u received"
-msgstr "# krypterade PONG-meddelanden mottagna"
+msgid "Core service of `%s' ready.\n"
+msgstr "\"%s\" är inte en fil.\n"
 
-#: src/core/gnunet-service-core_kx.c:571
+#: src/core/gnunet-service-core_kx.c:566
 msgid "# bytes encrypted"
 msgstr "# byte krypterade"
 
-#: src/core/gnunet-service-core_kx.c:630
+#: src/core/gnunet-service-core_kx.c:626
 msgid "# bytes decrypted"
 msgstr "# byte dekrypterade"
 
-#: src/core/gnunet-service-core_kx.c:719
+#: src/core/gnunet-service-core_kx.c:726
 msgid "# key exchanges initiated"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:766
+#: src/core/gnunet-service-core_kx.c:786
 msgid "# key exchanges stopped"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:796
+#: src/core/gnunet-service-core_kx.c:819
 #, fuzzy
 msgid "# PING messages transmitted"
 msgstr "# PING-meddelanden skapade"
 
-#: src/core/gnunet-service-core_kx.c:871
+#: src/core/gnunet-service-core_kx.c:886
 msgid "# old ephemeral keys ignored"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:878
+#: src/core/gnunet-service-core_kx.c:893
 #, fuzzy
 msgid "# ephemeral keys received"
 msgstr "# krypterade PONG-meddelanden mottagna"
 
-#: src/core/gnunet-service-core_kx.c:917
+#: src/core/gnunet-service-core_kx.c:932
 #, c-format
 msgid ""
 "Ephemeral key message from peer `%s' rejected as its validity range does not "
@@ -1325,157 +1313,138 @@
 "match our system time (%llu not in [%llu,%llu]).\n"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:928
+#: src/core/gnunet-service-core_kx.c:943
 #, fuzzy
 msgid "# EPHEMERAL_KEY messages received"
 msgstr "# PING-meddelanden skapade"
 
-#: src/core/gnunet-service-core_kx.c:1030
-#: src/transport/gnunet-service-transport_validation.c:1080
+#: src/core/gnunet-service-core_kx.c:1039
+#: src/transport/gnunet-service-transport_validation.c:1119
 #, fuzzy
 msgid "# PING messages received"
 msgstr "# PING-meddelanden skapade"
 
-#: src/core/gnunet-service-core_kx.c:1039
+#: src/core/gnunet-service-core_kx.c:1048
 #, fuzzy
 msgid "# PING messages dropped (out of order)"
 msgstr "Nätverksannonsering avstängd i konfigurationen!\n"
 
-#: src/core/gnunet-service-core_kx.c:1092
+#: src/core/gnunet-service-core_kx.c:1106
 #, fuzzy
 msgid "# PONG messages created"
 msgstr "# PING-meddelanden skapade"
 
-#: src/core/gnunet-service-core_kx.c:1119
+#: src/core/gnunet-service-core_kx.c:1132
 #, fuzzy
 msgid "# sessions terminated by timeout"
 msgstr "# byte kastade via TCP (utgående)"
 
-#: src/core/gnunet-service-core_kx.c:1132
+#: src/core/gnunet-service-core_kx.c:1145
 #, fuzzy
 msgid "# keepalive messages sent"
 msgstr "# PING-meddelanden i klartext skickade"
 
-#: src/core/gnunet-service-core_kx.c:1203
-#: src/transport/gnunet-service-transport_validation.c:1403
+#: src/core/gnunet-service-core_kx.c:1209
+#: 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:1210
+#: src/core/gnunet-service-core_kx.c:1216
 #, fuzzy
 msgid "# PONG messages dropped (connection down)"
 msgstr "# krypterade PONG-meddelanden mottagna"
 
-#: src/core/gnunet-service-core_kx.c:1215
+#: src/core/gnunet-service-core_kx.c:1221
 #, fuzzy
 msgid "# PONG messages dropped (out of order)"
 msgstr "Nätverksannonsering avstängd i konfigurationen!\n"
 
-#: src/core/gnunet-service-core_kx.c:1251
+#: src/core/gnunet-service-core_kx.c:1256
 #, fuzzy
 msgid "# PONG messages decrypted"
 msgstr "# PING-meddelanden skapade"
 
-#: src/core/gnunet-service-core_kx.c:1289
+#: src/core/gnunet-service-core_kx.c:1294
 #, fuzzy
 msgid "# session keys confirmed via PONG"
 msgstr "# sessionnycklar vägrade"
 
-#: src/core/gnunet-service-core_kx.c:1300
+#: src/core/gnunet-service-core_kx.c:1305
 #, fuzzy
 msgid "# timeouts prevented via PONG"
 msgstr "# byte mottogs via TCP"
 
-#: src/core/gnunet-service-core_kx.c:1307
+#: src/core/gnunet-service-core_kx.c:1312
 #, fuzzy
 msgid "# rekey operations confirmed via PONG"
 msgstr "# sessionnycklar vägrade"
 
-#: src/core/gnunet-service-core_kx.c:1463
+#: src/core/gnunet-service-core_kx.c:1485
 #, fuzzy
 msgid "# DATA message dropped (out of order)"
 msgstr "# byte kastade via UDP (utgående)"
 
-#: src/core/gnunet-service-core_kx.c:1471
+#: src/core/gnunet-service-core_kx.c:1493
 #, 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:1474
+#: src/core/gnunet-service-core_kx.c:1496
 #, fuzzy
 msgid "# sessions terminated by key expiration"
 msgstr "# byte kastade via TCP (utgående)"
 
-#: src/core/gnunet-service-core_kx.c:1532
-#: src/core/gnunet-service-core_kx.c:1558
+#: src/core/gnunet-service-core_kx.c:1554
+#: src/core/gnunet-service-core_kx.c:1580
 #, fuzzy
 msgid "# bytes dropped (duplicates)"
 msgstr "# byte kastade via UDP (utgående)"
 
-#: src/core/gnunet-service-core_kx.c:1545
+#: src/core/gnunet-service-core_kx.c:1567
 #, fuzzy
 msgid "# bytes dropped (out of sequence)"
 msgstr "# byte kastade via UDP (utgående)"
 
-#: src/core/gnunet-service-core_kx.c:1587
+#: src/core/gnunet-service-core_kx.c:1609
 #, fuzzy
 msgid "# bytes dropped (ancient message)"
 msgstr "# byte kastade via UDP (utgående)"
 
-#: src/core/gnunet-service-core_kx.c:1595
+#: src/core/gnunet-service-core_kx.c:1617
 #, fuzzy
 msgid "# bytes of payload decrypted"
 msgstr "# byte dekrypterade"
 
-#: src/core/gnunet-service-core_kx.c:1629
+#: src/core/gnunet-service-core_kx.c:1674
 #, fuzzy
 msgid "# PAYLOAD dropped (out of order)"
 msgstr "# byte kastade via UDP (utgående)"
 
-#: src/core/gnunet-service-core_neighbours.c:183
+#: src/core/gnunet-service-core_sessions.c:256
+#: src/core/gnunet-service-core_sessions.c:341
+#: src/dht/gnunet-service-dht_neighbours.c:741
+#: src/dht/gnunet-service-dht_neighbours.c:803
+#: 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
+#: src/transport/gnunet-service-transport_neighbours.c:719
+#: src/transport/gnunet-service-transport_neighbours.c:727
 #, fuzzy
-msgid "# sessions terminated by transport disconnect"
-msgstr "Nätverksannonsering avstängd i konfigurationen!\n"
-
-#: src/core/gnunet-service-core_neighbours.c:199
-#: src/core/gnunet-service-core_neighbours.c:387
-msgid "# neighbour entries allocated"
-msgstr ""
-
-#: src/core/gnunet-service-core_neighbours.c:291
-msgid "# encrypted bytes given to transport"
-msgstr ""
-
-#: src/core/gnunet-service-core_neighbours.c:486
-#, c-format
-msgid "Unsupported message of type %u (%u bytes) received from peer `%s'\n"
-msgstr ""
-
-#: src/core/gnunet-service-core_sessions.c:253
-#: src/core/gnunet-service-core_sessions.c:337
-#: src/dht/gnunet-service-dht_neighbours.c:789
-#: src/dht/gnunet-service-dht_neighbours.c:863
-#: src/fs/gnunet-service-fs_cp.c:662 src/fs/gnunet-service-fs_cp.c:1715
-#: src/topology/gnunet-daemon-topology.c:611
-#: src/topology/gnunet-daemon-topology.c:723
-#: src/transport/gnunet-service-transport_neighbours.c:720
-#: src/transport/gnunet-service-transport_neighbours.c:728
-#, fuzzy
 msgid "# peers connected"
 msgstr "# av anslutna parter"
 
-#: src/core/gnunet-service-core_sessions.c:284
+#: src/core/gnunet-service-core_sessions.c:287
 msgid "# type map refreshes sent"
 msgstr ""
 
-#: src/core/gnunet-service-core_sessions.c:403
+#: src/core/gnunet-service-core_sessions.c:407
 #, fuzzy
 msgid "# outdated typemap confirmations received"
 msgstr "Kunde inte spara konfiguration!"
 
-#: src/core/gnunet-service-core_sessions.c:414
+#: src/core/gnunet-service-core_sessions.c:418
 #, fuzzy
 msgid "# valid typemap confirmations received"
 msgstr "Kunde inte spara konfiguration!"
@@ -1491,7 +1460,7 @@
 msgstr ""
 
 #: src/datacache/datacache.c:119 src/datacache/datacache.c:294
-#: src/datastore/gnunet-service-datastore.c:865
+#: src/datastore/gnunet-service-datastore.c:770
 #, fuzzy
 msgid "# bytes stored"
 msgstr "# byte krypterade"
@@ -1530,29 +1499,28 @@
 msgid "# proximity search requests received"
 msgstr "# klartext PONG-meddelanden mottagna"
 
-#: src/datacache/plugin_datacache_heap.c:466
+#: src/datacache/plugin_datacache_heap.c:467
 msgid "Heap datacache running\n"
 msgstr ""
 
 #: src/datacache/plugin_datacache_sqlite.c:77
 #: src/datacache/plugin_datacache_sqlite.c:86
-#: src/datastore/plugin_datastore_mysql.c:818
-#: src/datastore/plugin_datastore_mysql.c:834
+#: src/datastore/plugin_datastore_mysql.c:1027
 #: src/datastore/plugin_datastore_sqlite.c:57
-#: src/datastore/plugin_datastore_sqlite.c:65 src/my/my.c:74 src/my/my.c:84
-#: src/mysql/mysql.c:41 src/mysql/mysql.c:48 src/mysql/mysql.c:522
-#: src/mysql/mysql.c:531 src/mysql/mysql.c:591 src/mysql/mysql.c:607
+#: src/datastore/plugin_datastore_sqlite.c:65 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/namestore/plugin_namestore_postgres.c:53
 #: src/namestore/plugin_namestore_sqlite.c:52
 #: src/peerstore/plugin_peerstore_sqlite.c:50
+#: src/psycstore/plugin_psycstore_mysql.c:62
 #: src/testbed/generate-underlay-topology.c:47
 #: src/testbed/gnunet-daemon-latency-logger.c:52
-#: src/testbed/gnunet-daemon-testbed-underlay.c:55
+#: src/testbed/gnunet-daemon-testbed-underlay.c:56
 #: src/testbed/testbed_api_hosts.c:69 src/util/crypto_ecc.c:52
 #: src/util/crypto_ecc_setup.c:41 src/util/crypto_mpi.c:39
-#: src/include/gnunet_common.h:677 src/include/gnunet_common.h:686
+#: src/include/gnunet_common.h:681 src/include/gnunet_common.h:690
 #: src/scalarproduct/scalarproduct.h:35
 #, c-format
 msgid "`%s' failed at %s:%d with error: %s\n"
@@ -1561,100 +1529,73 @@
 #: src/datacache/plugin_datacache_sqlite.c:749
 #: src/datastore/plugin_datastore_sqlite.c:409
 #: src/namecache/plugin_namecache_sqlite.c:292
-#: src/namestore/plugin_namestore_sqlite.c:324
+#: src/namestore/plugin_namestore_sqlite.c:343
 msgid "Tried to close sqlite without finalizing all prepared statements.\n"
 msgstr ""
 
-#: src/datastore/datastore_api.c:308
+#: src/datastore/datastore_api.c:309
 #, fuzzy
-msgid "Failed to transmit request to drop database.\n"
-msgstr "Misslyckades att skicka HTTP-begäran till värd \"%s\": %s\n"
+msgid "DATASTORE disconnected"
+msgstr "\"%s\" ansluten till \"%s\".\n"
 
-#: src/datastore/datastore_api.c:392
-msgid "# queue entry timeouts"
-msgstr ""
+#: src/datastore/datastore_api.c:425
+#, fuzzy
+msgid "Disconnected from DATASTORE"
+msgstr "\"%s\" ansluten till \"%s\".\n"
 
-#: src/datastore/datastore_api.c:447
+#: src/datastore/datastore_api.c:513
 msgid "# queue overflows"
 msgstr ""
 
-#: src/datastore/datastore_api.c:475
+#: src/datastore/datastore_api.c:543
 #, fuzzy
 msgid "# queue entries created"
 msgstr "# PING-meddelanden skapade"
 
-#: src/datastore/datastore_api.c:495
-msgid "# Requests dropped from datastore queue"
-msgstr ""
-
-#: src/datastore/datastore_api.c:536
+#: src/datastore/datastore_api.c:680
 #, fuzzy
-msgid "# datastore connections (re)created"
-msgstr "Nätverksanslutning"
+msgid "# status messages received"
+msgstr "# krypterade PONG-meddelanden mottagna"
 
-#: src/datastore/datastore_api.c:624
+#: src/datastore/datastore_api.c:754
 #, fuzzy
-msgid "# transmission request failures"
-msgstr "# klartext PONG-meddelanden mottagna"
+msgid "# Results received"
+msgstr "# byte mottogs via TCP"
 
-#: src/datastore/datastore_api.c:648
+#: src/datastore/datastore_api.c:879
 #, fuzzy
-msgid "# bytes sent to datastore"
-msgstr "# byte krypterade"
+msgid "# datastore connections (re)created"
+msgstr "Nätverksanslutning"
 
-#: src/datastore/datastore_api.c:790
-#, fuzzy
-msgid "Failed to receive status response from database."
-msgstr "Misslyckades att ta emot svar till \"%s\" meddelande från gnunetd\n"
-
-#: src/datastore/datastore_api.c:804
-msgid "Error reading response from datastore service"
-msgstr ""
-
-#: src/datastore/datastore_api.c:816 src/datastore/datastore_api.c:822
-#, fuzzy
-msgid "Invalid error message received from datastore service"
-msgstr "Ogiltigt meddelande mottogs den %s:%d."
-
-#: src/datastore/datastore_api.c:826
-#, fuzzy
-msgid "# status messages received"
-msgstr "# krypterade PONG-meddelanden mottagna"
-
-#: src/datastore/datastore_api.c:905
+#: src/datastore/datastore_api.c:995
 msgid "# PUT requests executed"
 msgstr ""
 
-#: src/datastore/datastore_api.c:971
+#: src/datastore/datastore_api.c:1056
 msgid "# RESERVE requests executed"
 msgstr ""
 
-#: src/datastore/datastore_api.c:1032
+#: src/datastore/datastore_api.c:1121
 msgid "# RELEASE RESERVE requests executed"
 msgstr ""
 
-#: src/datastore/datastore_api.c:1092
+#: src/datastore/datastore_api.c:1187
 msgid "# UPDATE requests executed"
 msgstr ""
 
-#: src/datastore/datastore_api.c:1156
+#: src/datastore/datastore_api.c:1271
 msgid "# REMOVE requests executed"
 msgstr ""
 
-#: src/datastore/datastore_api.c:1260
-#, fuzzy
-msgid "# Results received"
-msgstr "# byte mottogs via TCP"
-
-#: src/datastore/datastore_api.c:1327
+#: src/datastore/datastore_api.c:1331
 msgid "# GET REPLICATION requests executed"
 msgstr ""
 
-#: src/datastore/datastore_api.c:1390
+#: src/datastore/datastore_api.c:1397
 msgid "# GET ZERO ANONYMITY requests executed"
 msgstr ""
 
-#: src/datastore/datastore_api.c:1459
+#: src/datastore/datastore_api.c:1477
 msgid "# GET requests executed"
 msgstr ""
 
@@ -1679,37 +1620,27 @@
 msgid "Manipulate GNUnet datastore"
 msgstr "skriv ut ett värde från konfigurationsfilen till standard ut"
 
-#: src/datastore/gnunet-service-datastore.c:370
+#: src/datastore/gnunet-service-datastore.c:336
 #, fuzzy
 msgid "# bytes expired"
 msgstr "# byte mottogs via TCP"
 
-#: src/datastore/gnunet-service-datastore.c:446
+#: src/datastore/gnunet-service-datastore.c:416
 msgid "# bytes purged (low-priority)"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:504
-#: src/gns/gnunet-gns-helper-service-w32.c:221
-msgid "Transmission to client failed!\n"
-msgstr ""
-
-#: src/datastore/gnunet-service-datastore.c:535
-#: src/gns/gnunet-gns-helper-service-w32.c:260
-msgid "Shutdown in progress, aborting transmission.\n"
-msgstr ""
-
-#: src/datastore/gnunet-service-datastore.c:651
+#: src/datastore/gnunet-service-datastore.c:557
 msgid "# results found"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:696
+#: src/datastore/gnunet-service-datastore.c:598
 #, c-format
 msgid ""
-"Insufficient space (%llu bytes are available) to satisfy `%s' request for "
+"Insufficient space (%llu bytes are available) to satisfy RESERVE request for "
 "%llu bytes\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:707
+#: src/datastore/gnunet-service-datastore.c:609
 #, c-format
 msgid ""
 "The requested amount (%llu bytes) is larger than the cache size (%llu "
@@ -1716,133 +1647,132 @@
 "bytes)\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:711
+#: src/datastore/gnunet-service-datastore.c:615
 msgid ""
 "Insufficient space to satisfy request and requested amount is larger than "
 "cache size"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:717
+#: src/datastore/gnunet-service-datastore.c:622
 msgid "Insufficient space to satisfy request"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:723
-#: src/datastore/gnunet-service-datastore.c:778
-#: src/datastore/gnunet-service-datastore.c:1039
-#: src/datastore/gnunet-service-datastore.c:1673
+#: src/datastore/gnunet-service-datastore.c:629
+#: src/datastore/gnunet-service-datastore.c:684
+#: src/datastore/gnunet-service-datastore.c:969
+#: src/datastore/gnunet-service-datastore.c:1668
 msgid "# reserved"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:792
+#: src/datastore/gnunet-service-datastore.c:702
 msgid "Could not find matching reservation"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:879
+#: src/datastore/gnunet-service-datastore.c:787
 #, c-format
 msgid "Need %llu bytes more space (%llu allowed, using %llu)\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1094
+#: src/datastore/gnunet-service-datastore.c:1017
 #, fuzzy
 msgid "# GET requests received"
 msgstr "# byte mottogs via TCP"
 
-#: src/datastore/gnunet-service-datastore.c:1107
+#: src/datastore/gnunet-service-datastore.c:1048
+#, fuzzy
+msgid "# GET KEY requests received"
+msgstr "# byte mottogs via TCP"
+
+#: src/datastore/gnunet-service-datastore.c:1061
 msgid "# requests filtered by bloomfilter"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1155
+#: src/datastore/gnunet-service-datastore.c:1115
 #, fuzzy
 msgid "# UPDATE requests received"
 msgstr "# byte mottogs via TCP"
 
-#: src/datastore/gnunet-service-datastore.c:1187
+#: src/datastore/gnunet-service-datastore.c:1146
 msgid "# GET REPLICATION requests received"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1223
+#: src/datastore/gnunet-service-datastore.c:1179
 msgid "# GET ZERO ANONYMITY requests received"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1269
+#: src/datastore/gnunet-service-datastore.c:1226
 #, fuzzy
 msgid "Content not found"
 msgstr "Kommando \"%s\" hittades inte!\n"
 
-#: src/datastore/gnunet-service-datastore.c:1279
+#: src/datastore/gnunet-service-datastore.c:1235
 msgid "# bytes removed (explicit request)"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1311
+#: src/datastore/gnunet-service-datastore.c:1282
 #, fuzzy
 msgid "# REMOVE requests received"
 msgstr "# byte mottogs via TCP"
 
-#: src/datastore/gnunet-service-datastore.c:1364
+#: src/datastore/gnunet-service-datastore.c:1336
 #, c-format
 msgid ""
 "Datastore payload must have been inaccurate (%lld < %lld). Recomputing it.\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1369
+#: src/datastore/gnunet-service-datastore.c:1342
+#: src/datastore/gnunet-service-datastore.c:1517
 #, c-format
 msgid "New payload: %lld\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1423
+#: src/datastore/gnunet-service-datastore.c:1396
 #, c-format
 msgid "Loading `%s' datastore plugin\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1434
+#: src/datastore/gnunet-service-datastore.c:1408
 #, 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:1503
-#: src/datastore/gnunet-service-datastore.c:1566
+#: src/datastore/gnunet-service-datastore.c:1468
 msgid "Bloomfilter construction complete.\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1553
+#: src/datastore/gnunet-service-datastore.c:1524
 msgid "Rebuilding bloomfilter.  Please be patient.\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1563
+#: src/datastore/gnunet-service-datastore.c:1535
 msgid "Plugin does not support get_keys function. Please fix!\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1704
-#: src/datastore/gnunet-service-datastore.c:1716
+#: src/datastore/gnunet-service-datastore.c:1705
 #, fuzzy, c-format
-msgid "No `%s' specified for `%s' in configuration!\n"
-msgstr "Inga applikationer definierade i konfiguration!\n"
-
-#: src/datastore/gnunet-service-datastore.c:1710
-#, fuzzy, c-format
 msgid "# bytes used in file-sharing datastore `%s'"
 msgstr "# byte krypterade"
 
-#: src/datastore/gnunet-service-datastore.c:1722
+#: src/datastore/gnunet-service-datastore.c:1721
 msgid "# quota"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1724
+#: src/datastore/gnunet-service-datastore.c:1726
 msgid "# cache size"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1739
+#: src/datastore/gnunet-service-datastore.c:1742
 #, c-format
 msgid "Could not use specified filename `%s' for bloomfilter.\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1757
-#: src/datastore/gnunet-service-datastore.c:1773
+#: src/datastore/gnunet-service-datastore.c:1760
+#: src/datastore/gnunet-service-datastore.c:1776
 #, fuzzy, c-format
 msgid "Failed to remove bogus bloomfilter file `%s'\n"
 msgstr "Kunde inte spara konfigurationsfil \"%s\":"
 
-#: src/datastore/gnunet-service-datastore.c:1803
+#: src/datastore/gnunet-service-datastore.c:1808
 #, fuzzy
 msgid "Failed to initialize bloomfilter.\n"
 msgstr "Misslyckades att initiera tjänsten \"%s\".\n"
@@ -1851,27 +1781,23 @@
 msgid "Heap database running\n"
 msgstr ""
 
-#: src/datastore/plugin_datastore_mysql.c:309
+#: src/datastore/plugin_datastore_mysql.c:347
 #: src/datastore/plugin_datastore_sqlite.c:507
 #, fuzzy
 msgid "Data too large"
 msgstr "antal iterationer"
 
-#: src/datastore/plugin_datastore_mysql.c:328
+#: src/datastore/plugin_datastore_mysql.c:363
 msgid "MySQL statement run failure"
 msgstr ""
 
-#: src/datastore/plugin_datastore_mysql.c:793
+#: src/datastore/plugin_datastore_mysql.c:983
 #, fuzzy, c-format
-msgid "Failed to prepare statement `%s'\n"
-msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
-
-#: src/datastore/plugin_datastore_mysql.c:802
-#, 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:1036
+#: src/datastore/plugin_datastore_mysql.c:1257
+#: src/psycstore/plugin_psycstore_mysql.c:1936
 msgid "Mysql database running\n"
 msgstr ""
 
@@ -1887,6 +1813,7 @@
 #: src/datastore/plugin_datastore_postgres.c:1012
 #: 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 ""
 
@@ -1893,7 +1820,7 @@
 #: src/datastore/plugin_datastore_sqlite.c:65
 #: src/testbed/generate-underlay-topology.c:50
 #: src/testbed/gnunet-daemon-latency-logger.c:55
-#: src/testbed/gnunet-daemon-testbed-underlay.c:58
+#: src/testbed/gnunet-daemon-testbed-underlay.c:59
 #, fuzzy, c-format
 msgid "`%s' failed at %s:%u with error: %s"
 msgstr "\"%s\" misslyckades vid %s:%d med fel: %s\n"
@@ -1900,7 +1827,7 @@
 
 #: src/datastore/plugin_datastore_sqlite.c:263
 #: src/namecache/plugin_namecache_sqlite.c:193
-#: src/namestore/plugin_namestore_sqlite.c:204
+#: src/namestore/plugin_namestore_sqlite.c:213
 #: src/peerstore/plugin_peerstore_sqlite.c:479
 #: src/psycstore/plugin_psycstore_sqlite.c:325
 #, fuzzy, c-format
@@ -1924,7 +1851,7 @@
 
 #: src/datastore/plugin_datastore_sqlite.c:1245
 #: src/namecache/plugin_namecache_sqlite.c:580
-#: src/namestore/plugin_namestore_sqlite.c:716
+#: src/namestore/plugin_namestore_sqlite.c:766
 msgid "Sqlite database running\n"
 msgstr ""
 
@@ -1932,11 +1859,6 @@
 msgid "Template database running\n"
 msgstr ""
 
-#: src/dht/dht_api.c:403
-#, fuzzy
-msgid "Failed to connect to the DHT service!\n"
-msgstr "Misslyckades att ansluta till gnunetd.\n"
-
 #: src/dht/gnunet-dht-get.c:155
 #, c-format
 msgid ""
@@ -1958,7 +1880,7 @@
 msgstr ""
 
 #: src/dht/gnunet-dht-get.c:212 src/dht/gnunet-dht-monitor.c:289
-#: src/dht/gnunet-dht-put.c:202
+#: src/dht/gnunet-dht-put.c:198
 msgid "the query key"
 msgstr ""
 
@@ -1970,18 +1892,18 @@
 msgid "the type of data to look for"
 msgstr ""
 
-#: src/dht/gnunet-dht-get.c:221 src/dht/gnunet-dht-put.c:214
+#: src/dht/gnunet-dht-get.c:221
 msgid "how long to execute this query before giving up?"
 msgstr ""
 
-#: src/dht/gnunet-dht-get.c:224 src/dht/gnunet-dht-put.c:205
+#: src/dht/gnunet-dht-get.c:224 src/dht/gnunet-dht-put.c:201
 msgid "use DHT's demultiplex everywhere option"
 msgstr ""
 
 #: src/dht/gnunet-dht-get.c:227 src/dht/gnunet-dht-monitor.c:298
-#: src/dht/gnunet-dht-put.c:217 src/fs/gnunet-auto-share.c:780
+#: src/dht/gnunet-dht-put.c:210 src/fs/gnunet-auto-share.c:780
 #: src/fs/gnunet-download.c:327 src/fs/gnunet-publish.c:951
-#: src/fs/gnunet-search.c:318 src/fs/gnunet-unindex.c:167
+#: src/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 ""
@@ -1998,370 +1920,306 @@
 msgid "Prints all packets that go through the DHT."
 msgstr ""
 
-#: src/dht/gnunet_dht_profiler.c:1392
-#: src/testbed/gnunet-testbed-profiler.c:255
+#: src/dht/gnunet_dht_profiler.c:1161 src/testbed/gnunet-testbed-profiler.c:255
 #, fuzzy, c-format
 msgid "Exiting as the number of peers is %u\n"
 msgstr "Maximalt antal chattklienter uppnått.\n"
 
-#: src/dht/gnunet_dht_profiler.c:1417
+#: src/dht/gnunet_dht_profiler.c:1186
 #, fuzzy
 msgid "number of peers to start"
 msgstr "antal iterationer"
 
-#: src/dht/gnunet_dht_profiler.c:1420
+#: src/dht/gnunet_dht_profiler.c:1189
 msgid ""
 "maximum number of times we try to search for successor circle formation (0 "
 "for R5N)"
 msgstr ""
 
-#: src/dht/gnunet_dht_profiler.c:1423 src/nse/gnunet-nse-profiler.c:846
+#: src/dht/gnunet_dht_profiler.c:1192 src/nse/gnunet-nse-profiler.c:846
 #: src/testbed/gnunet-testbed-profiler.c:294
 msgid "name of the file with the login information for the testbed"
 msgstr ""
 
-#: src/dht/gnunet_dht_profiler.c:1426
+#: src/dht/gnunet_dht_profiler.c:1195
 msgid "delay between rounds for collecting statistics (default: 30 sec)"
 msgstr ""
 
-#: src/dht/gnunet_dht_profiler.c:1429
+#: src/dht/gnunet_dht_profiler.c:1198
 msgid "delay to start doing PUTs (default: 1 sec)"
 msgstr ""
 
-#: src/dht/gnunet_dht_profiler.c:1432
+#: src/dht/gnunet_dht_profiler.c:1201
 msgid "delay to start doing GETs (default: 5 min)"
 msgstr ""
 
-#: src/dht/gnunet_dht_profiler.c:1435
+#: src/dht/gnunet_dht_profiler.c:1204
 msgid "replication degree for DHT PUTs"
 msgstr ""
 
-#: src/dht/gnunet_dht_profiler.c:1438
+#: src/dht/gnunet_dht_profiler.c:1207
 msgid "timeout for DHT PUT and GET requests (default: 1 min)"
 msgstr ""
 
-#: src/dht/gnunet_dht_profiler.c:1456
+#: src/dht/gnunet_dht_profiler.c:1225
 #, fuzzy
 msgid "Measure quality and performance of the DHT service."
 msgstr "Kan inte tillgå tjänsten"
 
-#: src/dht/gnunet-dht-put.c:120
+#: src/dht/gnunet-dht-put.c:115
 #, fuzzy
 msgid "PUT request sent with key"
 msgstr "# byte mottogs via TCP"
 
-#: src/dht/gnunet-dht-put.c:123
+#: src/dht/gnunet-dht-put.c:118
 msgid "Timeout sending PUT request!\n"
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:126
+#: src/dht/gnunet-dht-put.c:121
 #, fuzzy
 msgid "PUT request not confirmed!\n"
 msgstr "# byte mottogs via TCP"
 
-#: src/dht/gnunet-dht-put.c:157
+#: src/dht/gnunet-dht-put.c:151
 msgid "Must provide KEY and DATA for DHT put!\n"
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:164
+#: src/dht/gnunet-dht-put.c:158
 #, fuzzy, c-format
 msgid "Could not connect to %s service!\n"
 msgstr "Kunde inte ansluta till gnunetd.\n"
 
-#: src/dht/gnunet-dht-put.c:180
+#: src/dht/gnunet-dht-put.c:172
 #, c-format
 msgid "Issuing put request for `%s' with data `%s'!\n"
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:196
+#: src/dht/gnunet-dht-put.c:192
 msgid "the data to insert under the key"
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:199
+#: src/dht/gnunet-dht-put.c:195
 msgid "how long to store this entry in the dht (in seconds)"
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:208
+#: src/dht/gnunet-dht-put.c:204
 msgid "how many replicas to create"
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:211
+#: src/dht/gnunet-dht-put.c:207
 msgid "the type to insert data as"
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:240
+#: src/dht/gnunet-dht-put.c:232
 msgid "Issue a PUT request to the GNUnet DHT insert DATA under KEY."
 msgstr ""
 
-#: src/dht/gnunet-service-dht.c:171
+#: src/dht/gnunet-service-dht_clients.c:370
+#: src/dht/gnunet-service-wdht_clients.c:864
 #, fuzzy
-msgid "Failed to connect to transport service!\n"
-msgstr "Misslyckades att ansluta till gnunetd.\n"
-
-#: src/dht/gnunet-service-dht_clients.c:417
-#: src/dht/gnunet-service-wdht_clients.c:857
-#: src/dht/gnunet-service-xdht_clients.c:854
-#, fuzzy
 msgid "# GET requests from clients injected"
 msgstr "# byte mottogs via TCP"
 
-#: src/dht/gnunet-service-dht_clients.c:509
-#: src/dht/gnunet-service-wdht_clients.c:938
-#: src/dht/gnunet-service-xdht_clients.c:934
+#: src/dht/gnunet-service-dht_clients.c:481
+#: 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:593
-#: src/dht/gnunet-service-wdht_clients.c:1004
-#: src/dht/gnunet-service-xdht_clients.c:999
+#: src/dht/gnunet-service-dht_clients.c:620
+#: 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:794
-#: src/dht/gnunet-service-wdht_clients.c:1213
-#: src/dht/gnunet-service-xdht_clients.c:1201
+#: src/dht/gnunet-service-dht_clients.c:847
+#: 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:1041
+#: src/dht/gnunet-service-dht_clients.c:1032
 #: src/dht/gnunet-service-wdht_clients.c:510
-#: src/dht/gnunet-service-xdht_clients.c:508
 msgid "# Key match, type mismatches in REPLY to CLIENT"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_clients.c:1054
+#: src/dht/gnunet-service-dht_clients.c:1047
 #: src/dht/gnunet-service-wdht_clients.c:524
-#: src/dht/gnunet-service-xdht_clients.c:522
 msgid "# Duplicate REPLIES to CLIENT request dropped"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_clients.c:1099
+#: src/dht/gnunet-service-dht_clients.c:1094
 #: src/dht/gnunet-service-wdht_clients.c:566
-#: src/dht/gnunet-service-xdht_clients.c:564
 #, c-format
 msgid "Unsupported block type (%u) in request!\n"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_clients.c:1122
+#: src/dht/gnunet-service-dht_clients.c:1101
 #: src/dht/gnunet-service-wdht_clients.c:589
-#: src/dht/gnunet-service-xdht_clients.c:587
 #, fuzzy
 msgid "# RESULTS queued for clients"
 msgstr "Meddelande mottaget från klient är ogiltig.\n"
 
-#: src/dht/gnunet-service-dht_clients.c:1176
-#: src/dht/gnunet-service-dht_clients.c:1219
+#: src/dht/gnunet-service-dht_clients.c:1179
 #: src/dht/gnunet-service-wdht_clients.c:643
-#: src/dht/gnunet-service-wdht_clients.c:686
-#: src/dht/gnunet-service-xdht_clients.c:641
-#: src/dht/gnunet-service-xdht_clients.c:684
+#: src/dht/gnunet-service-wdht_clients.c:693
 msgid "# REPLIES ignored for CLIENTS (no match)"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_clients.c:1186
-#: src/dht/gnunet-service-wdht_clients.c:653
-#: src/dht/gnunet-service-xdht_clients.c:651
-#, fuzzy
-msgid "Could not pass reply to client, message too big!\n"
-msgstr "Kunde inte skicka meddelande till gnunetd\n"
-
-#: src/dht/gnunet-service-dht_datacache.c:68
+#: src/dht/gnunet-service-dht_datacache.c:72
 #, fuzzy, c-format
 msgid "%s request received, but have no datacache!\n"
 msgstr "# byte mottagna av typen %d"
 
-#: src/dht/gnunet-service-dht_datacache.c:78
-#: src/dht/gnunet-service-wdht_datacache.c:107
-#: src/dht/gnunet-service-xdht_datacache.c:91
+#: src/dht/gnunet-service-dht_datacache.c:82
 msgid "# ITEMS stored in datacache"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_datacache.c:184
-#: src/dht/gnunet-service-wdht_datacache.c:216
-#: src/dht/gnunet-service-xdht_datacache.c:238
+#: src/dht/gnunet-service-dht_datacache.c:199
 msgid "# Good RESULTS found in datacache"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_datacache.c:201
-#: src/dht/gnunet-service-wdht_datacache.c:231
-#: src/dht/gnunet-service-xdht_datacache.c:267
+#: src/dht/gnunet-service-dht_datacache.c:211
 msgid "# Duplicate RESULTS found in datacache"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_datacache.c:207
-#: src/dht/gnunet-service-wdht_datacache.c:237
-#: src/dht/gnunet-service-xdht_datacache.c:273
+#: src/dht/gnunet-service-dht_datacache.c:217
 msgid "# Invalid RESULTS found in datacache"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_datacache.c:213
-#: src/dht/gnunet-service-wdht_datacache.c:243
-#: src/dht/gnunet-service-xdht_datacache.c:279
+#: src/dht/gnunet-service-dht_datacache.c:223
 msgid "# Irrelevant RESULTS found in datacache"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_datacache.c:225
-#: src/dht/gnunet-service-wdht_datacache.c:255
-#: src/dht/gnunet-service-xdht_datacache.c:291
+#: src/dht/gnunet-service-dht_datacache.c:235
 msgid "# Unsupported RESULTS found in datacache"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_datacache.c:229
-#: src/dht/gnunet-service-wdht_datacache.c:258
-#: src/dht/gnunet-service-xdht_datacache.c:294
+#: src/dht/gnunet-service-dht_datacache.c:239
 #, c-format
 msgid "Unsupported block type (%u) in local response!\n"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_datacache.c:262
-#: src/dht/gnunet-service-wdht_datacache.c:295
-#: src/dht/gnunet-service-xdht_datacache.c:334
+#: src/dht/gnunet-service-dht_datacache.c:276
 #, fuzzy
 msgid "# GET requests given to datacache"
 msgstr "# byte mottogs via TCP"
 
-#: src/dht/gnunet-service-dht_hello.c:84
-#: src/dht/gnunet-service-xdht_hello.c:82
+#: src/dht/gnunet-service-dht_hello.c:84 src/dht/gnunet-service-xdht_hello.c:82
 #, fuzzy
 msgid "# HELLOs obtained from peerinfo"
 msgstr "Meddelande mottaget från klient är ogiltig.\n"
 
-#: src/dht/gnunet-service-dht_neighbours.c:735
+#: src/dht/gnunet-service-dht_neighbours.c:685
 #, fuzzy
 msgid "# FIND PEER messages initiated"
 msgstr "# PING-meddelanden skapade"
 
-#: src/dht/gnunet-service-dht_neighbours.c:900
-#: src/dht/gnunet-service-xdht_neighbours.c:6062
+#: src/dht/gnunet-service-dht_neighbours.c:851
 #, fuzzy
-msgid "# Queued messages discarded (peer disconnected)"
-msgstr "Nätverksannonsering avstängd i konfigurationen!\n"
-
-#: src/dht/gnunet-service-dht_neighbours.c:933
-#: src/dht/gnunet-service-xdht_neighbours.c:986
-#, fuzzy
-msgid "# Messages dropped (CORE timeout)"
-msgstr "Nätverksannonsering avstängd i konfigurationen!\n"
-
-#: src/dht/gnunet-service-dht_neighbours.c:963
-#: src/dht/gnunet-service-xdht_neighbours.c:1018
-#, fuzzy
-msgid "# Bytes transmitted to other peers"
-msgstr "# byte skickade av typen %d"
-
-#: src/dht/gnunet-service-dht_neighbours.c:1009
-msgid "# Bytes of bandwidth requested from core"
-msgstr ""
-
-#: src/dht/gnunet-service-dht_neighbours.c:1043
-#, fuzzy
 msgid "# requests TTL-dropped"
 msgstr "# byte mottogs via TCP"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1248
-#: src/dht/gnunet-service-dht_neighbours.c:1285
+#: src/dht/gnunet-service-dht_neighbours.c:1054
+#: src/dht/gnunet-service-dht_neighbours.c:1091
 msgid "# Peers excluded from routing due to Bloomfilter"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1263
-#: src/dht/gnunet-service-dht_neighbours.c:1300
+#: src/dht/gnunet-service-dht_neighbours.c:1071
+#: src/dht/gnunet-service-dht_neighbours.c:1107
 msgid "# Peer selection failed"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1447
+#: src/dht/gnunet-service-dht_neighbours.c:1255
 #, fuzzy
 msgid "# PUT requests routed"
 msgstr "# byte mottogs via TCP"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1476
+#: src/dht/gnunet-service-dht_neighbours.c:1288
 #, fuzzy
 msgid "# PUT messages queued for transmission"
 msgstr "# PING-meddelanden skapade"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1486
-#: src/dht/gnunet-service-dht_neighbours.c:1610
-#: src/dht/gnunet-service-dht_neighbours.c:1717
-#: src/dht/gnunet-service-xdht_neighbours.c:1128
-#: src/dht/gnunet-service-xdht_neighbours.c:1197
-#: src/dht/gnunet-service-xdht_neighbours.c:1247
-#: src/dht/gnunet-service-xdht_neighbours.c:1311
-#: src/dht/gnunet-service-xdht_neighbours.c:1378
-#: src/dht/gnunet-service-xdht_neighbours.c:1440
-#: src/dht/gnunet-service-xdht_neighbours.c:1502
-#: src/dht/gnunet-service-xdht_neighbours.c:1564
-#: src/dht/gnunet-service-xdht_neighbours.c:1624
+#: src/dht/gnunet-service-dht_neighbours.c:1299
+#: src/dht/gnunet-service-dht_neighbours.c:1427
+#: src/dht/gnunet-service-dht_neighbours.c:1532
+#: 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:1572
+#: src/dht/gnunet-service-dht_neighbours.c:1383
 #, fuzzy
 msgid "# GET requests routed"
 msgstr "# byte mottogs via TCP"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1599
+#: src/dht/gnunet-service-dht_neighbours.c:1415
 #, fuzzy
 msgid "# GET messages queued for transmission"
 msgstr "# PING-meddelanden skapade"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1724
+#: src/dht/gnunet-service-dht_neighbours.c:1547
 #, fuzzy
 msgid "# RESULT messages queued for transmission"
 msgstr "# PING-meddelanden skapade"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1811
+#: src/dht/gnunet-service-dht_neighbours.c:1646
 #, fuzzy
 msgid "# P2P PUT requests received"
 msgstr "# byte mottogs via TCP"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1814
+#: src/dht/gnunet-service-dht_neighbours.c:1650
 #, fuzzy
 msgid "# P2P PUT bytes received"
 msgstr "# byte mottogs via TCP"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1986
+#: src/dht/gnunet-service-dht_neighbours.c:1854
 msgid "# FIND PEER requests ignored due to Bloomfilter"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1994
+#: src/dht/gnunet-service-dht_neighbours.c:1862
 msgid "# FIND PEER requests ignored due to lack of HELLO"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:2089
+#: src/dht/gnunet-service-dht_neighbours.c:2018
 #, fuzzy
 msgid "# P2P GET requests received"
 msgstr "# byte mottogs via TCP"
 
-#: src/dht/gnunet-service-dht_neighbours.c:2092
+#: src/dht/gnunet-service-dht_neighbours.c:2022
 #, fuzzy
 msgid "# P2P GET bytes received"
 msgstr "# byte mottogs via TCP"
 
-#: src/dht/gnunet-service-dht_neighbours.c:2157
+#: src/dht/gnunet-service-dht_neighbours.c:2097
 #, fuzzy
 msgid "# P2P FIND PEER requests processed"
 msgstr "# byte mottogs via TCP"
 
-#: src/dht/gnunet-service-dht_neighbours.c:2171
+#: src/dht/gnunet-service-dht_neighbours.c:2120
 #, fuzzy
 msgid "# P2P GET requests ONLY routed"
 msgstr "# byte mottogs via TCP"
 
-#: src/dht/gnunet-service-dht_neighbours.c:2257
+#: src/dht/gnunet-service-dht_neighbours.c:2222
 #, fuzzy
 msgid "# P2P RESULTS received"
 msgstr "# krypterade PONG-meddelanden mottagna"
 
-#: src/dht/gnunet-service-dht_neighbours.c:2260
+#: src/dht/gnunet-service-dht_neighbours.c:2226
 #, fuzzy
 msgid "# P2P RESULT bytes received"
 msgstr "# krypterade PONG-meddelanden mottagna"
 
-#: src/dht/gnunet-service-dht_nse.c:59 src/dht/gnunet-service-wdht_nse.c:59
-#: src/dht/gnunet-service-xdht_nse.c:59
+#: src/dht/gnunet-service-dht_nse.c:59
 #, fuzzy
 msgid "# Network size estimates received"
 msgstr "# byte mottogs via TCP"
@@ -2386,25 +2244,25 @@
 msgid "# Unsupported REPLIES matched against routing table"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_routing.c:324
+#: src/dht/gnunet-service-dht_routing.c:327
 msgid "# Entries removed from routing table"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_routing.c:406
+#: src/dht/gnunet-service-dht_routing.c:409
 msgid "# Entries added to routing table"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_routing.c:424
+#: src/dht/gnunet-service-dht_routing.c:427
 #, fuzzy
 msgid "# DHT requests combined"
 msgstr "# byte mottogs via TCP"
 
-#: src/dht/gnunet-service-wdht_datacache.c:82
+#: src/dht/gnunet-service-wdht_clients.c:653
 #, fuzzy
-msgid "PUT request received, but have no datacache!\n"
-msgstr "# byte mottagna av typen %d"
+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:1831
+#: src/dht/gnunet-service-xdht_neighbours.c:1572
 #, c-format
 msgid ""
 "\n"
@@ -2411,7 +2269,7 @@
 "SUPU %s, %s, %d,trail_length = %d"
 msgstr ""
 
-#: src/dht/gnunet-service-xdht_neighbours.c:1836
+#: src/dht/gnunet-service-xdht_neighbours.c:1577
 #, c-format
 msgid ""
 "\n"
@@ -2418,7 +2276,7 @@
 "SUPU %s, %s, %d,trail[%d]=%s"
 msgstr ""
 
-#: src/dht/gnunet-service-xdht_neighbours.c:1856
+#: src/dht/gnunet-service-xdht_neighbours.c:1597
 #, c-format
 msgid ""
 "\n"
@@ -2425,7 +2283,7 @@
 "SUPU************  FRIEND_PEERMAP of %s"
 msgstr ""
 
-#: src/dht/gnunet-service-xdht_neighbours.c:1866
+#: src/dht/gnunet-service-xdht_neighbours.c:1607
 #, c-format
 msgid ""
 "\n"
@@ -2432,7 +2290,7 @@
 "SUPU %s, %s, %d, friend = %s, friend->trails_count = %d"
 msgstr ""
 
-#: src/dht/gnunet-service-xdht_neighbours.c:1887
+#: src/dht/gnunet-service-xdht_neighbours.c:1628
 #, c-format
 msgid ""
 "\n"
@@ -2439,7 +2297,7 @@
 "SUPU************  FINGER_TABLE of %s"
 msgstr ""
 
-#: src/dht/gnunet-service-xdht_neighbours.c:1896
+#: src/dht/gnunet-service-xdht_neighbours.c:1637
 #, c-format
 msgid ""
 "\n"
@@ -2446,7 +2304,7 @@
 "SUPU %s, %s, %d, finger_table[%d] = %s, trails_count = %d"
 msgstr ""
 
-#: src/dht/gnunet-service-xdht_neighbours.c:1903
+#: src/dht/gnunet-service-xdht_neighbours.c:1644
 #, c-format
 msgid ""
 "\n"
@@ -2453,7 +2311,7 @@
 "SUPU %s, %s, %d, trail_id[%d]=%s"
 msgstr ""
 
-#: src/dht/gnunet-service-xdht_neighbours.c:1909
+#: src/dht/gnunet-service-xdht_neighbours.c:1650
 #, c-format
 msgid ""
 "\n"
@@ -2460,27 +2318,27 @@
 "SUPU %s, %s, %d,trail[%d] = %s "
 msgstr ""
 
-#: src/dht/gnunet-service-xdht_neighbours.c:3557
+#: src/dht/gnunet-service-xdht_neighbours.c:3366
 msgid "# FINGERS_COUNT"
 msgstr ""
 
-#: src/dht/gnunet-service-xdht_neighbours.c:3698
-#: src/dht/gnunet-service-xdht_neighbours.c:3936
-#: src/dht/gnunet-service-xdht_neighbours.c:4088
-#: src/dht/gnunet-service-xdht_neighbours.c:4240
-#: src/dht/gnunet-service-xdht_neighbours.c:4421
-#: src/dht/gnunet-service-xdht_neighbours.c:4934
-#: src/dht/gnunet-service-xdht_neighbours.c:5325
-#: src/dht/gnunet-service-xdht_neighbours.c:5420
-#: src/dht/gnunet-service-xdht_neighbours.c:5510
-#: src/dht/gnunet-service-xdht_neighbours.c:5614
-#: src/dht/gnunet-service-xdht_neighbours.c:5758
-#: src/dht/gnunet-service-xdht_neighbours.c:5849
+#: 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:256
+#: src/dht/gnunet-service-xdht_routing.c:261
 #, c-format
 msgid ""
 "\n"
@@ -2487,7 +2345,7 @@
 "SUPU ***PRINTING ROUTING TABLE ***** of =%s"
 msgstr ""
 
-#: src/dht/gnunet-service-xdht_routing.c:264
+#: src/dht/gnunet-service-xdht_routing.c:269
 #, c-format
 msgid ""
 "\n"
@@ -2494,7 +2352,7 @@
 "SUPU %s, %s, %d, trail->trail_id = %s"
 msgstr ""
 
-#: src/dht/gnunet-service-xdht_routing.c:267
+#: src/dht/gnunet-service-xdht_routing.c:272
 #, c-format
 msgid ""
 "\n"
@@ -2501,7 +2359,7 @@
 "SUPU %s, %s, %d, trail->next_hop = %s"
 msgstr ""
 
-#: src/dht/gnunet-service-xdht_routing.c:270
+#: src/dht/gnunet-service-xdht_routing.c:275
 #, c-format
 msgid ""
 "\n"
@@ -2532,27 +2390,27 @@
 msgid "Failed to convert UTF-8 name `%s' to DNS IDNA format: %s\n"
 msgstr "Misslyckades att leverera \"%s\" meddelande.\n"
 
-#: src/dns/dnsstub.c:175
+#: src/dns/dnsstub.c:176
 #, fuzzy, c-format
 msgid "Could not bind to any port: %s\n"
 msgstr "Kunde inte köra \"%s\": %s\n"
 
-#: src/dns/dnsstub.c:293 src/dns/dnsstub.c:381
+#: src/dns/dnsstub.c:294 src/dns/dnsstub.c:382
 #, fuzzy, c-format
 msgid "Failed to send DNS request to %s\n"
 msgstr "Misslyckades att skicka HTTP-begäran till värd \"%s\": %s\n"
 
-#: src/dns/dnsstub.c:297
+#: src/dns/dnsstub.c:298
 #, fuzzy, c-format
 msgid "Sent DNS request to %s\n"
 msgstr "Misslyckades att skicka HTTP-begäran till värd \"%s\": %s\n"
 
-#: src/dns/dnsstub.c:366
+#: src/dns/dnsstub.c:367
 #, c-format
 msgid "Configured DNS exit `%s' is not working / valid.\n"
 msgstr ""
 
-#: src/dns/dnsstub.c:438
+#: src/dns/dnsstub.c:437
 #, c-format
 msgid "Received DNS response that is too small (%u bytes)"
 msgstr ""
@@ -2581,50 +2439,54 @@
 msgid "Change DNS replies to point elsewhere."
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:457
+#: src/dns/gnunet-service-dns.c:462
 msgid "# DNS requests answered via TUN interface"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:604
+#: src/dns/gnunet-service-dns.c:608
 msgid "# DNS exit failed (failed to open socket)"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:715
+#: src/dns/gnunet-service-dns.c:738
 msgid "# External DNS response discarded (no matching request)"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:793
+#: src/dns/gnunet-service-dns.c:813
 msgid "# Client response discarded (no matching request)"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:908
+#: src/dns/gnunet-service-dns.c:929
 msgid "Received malformed IPv4-UDP packet on TUN interface.\n"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:924
+#: src/dns/gnunet-service-dns.c:945
 msgid "Received malformed IPv6-UDP packet on TUN interface.\n"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:933
+#: src/dns/gnunet-service-dns.c:954
 #, c-format
 msgid "Got non-IP packet with %u bytes and protocol %u from TUN\n"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:943
+#: src/dns/gnunet-service-dns.c:964
+msgid "DNS interceptor got non-DNS packet (dropped)\n"
+msgstr ""
+
+#: src/dns/gnunet-service-dns.c:966
 msgid "# Non-DNS UDP packet received via TUN interface"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:1010
+#: src/dns/gnunet-service-dns.c:1033
 #, fuzzy
 msgid "# DNS requests received via TUN interface"
 msgstr "Meddelande mottaget från klient är ogiltig.\n"
 
-#: src/dns/gnunet-service-dns.c:1062 src/exit/gnunet-daemon-exit.c:3607
+#: src/dns/gnunet-service-dns.c:1078 src/exit/gnunet-daemon-exit.c:3643
 #, fuzzy
 msgid "need a valid IPv4 or IPv6 address\n"
 msgstr "Ogiltigt svar på \"%s\".\n"
 
-#: src/dns/gnunet-service-dns.c:1080
+#: src/dns/gnunet-service-dns.c:1091
 #, c-format
 msgid "`%s' must be installed SUID, will not run DNS interceptor\n"
 msgstr ""
@@ -2638,230 +2500,214 @@
 msgid "Print information about DV state"
 msgstr "Skriv ut information om GNUnets motparter."
 
-#: src/exit/gnunet-daemon-exit.c:807
+#: src/exit/gnunet-daemon-exit.c:805 src/exit/gnunet-daemon-exit.c:3109
+#, fuzzy
+msgid "# Inbound CADET channels created"
+msgstr "# PING-meddelanden skapade"
+
+#: src/exit/gnunet-daemon-exit.c:861
 #, c-format
 msgid "Got duplicate service records for `%s:%u'\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:858
+#: src/exit/gnunet-daemon-exit.c:914
 #, fuzzy
 msgid "# Bytes transmitted via cadet channels"
 msgstr "# byte skickade av typen %d"
 
-#: src/exit/gnunet-daemon-exit.c:975 src/exit/gnunet-daemon-exit.c:2408
-#: src/exit/gnunet-daemon-exit.c:2666 src/vpn/gnunet-service-vpn.c:1446
-#: src/vpn/gnunet-service-vpn.c:1837 src/vpn/gnunet-service-vpn.c:2000
+#: src/exit/gnunet-daemon-exit.c:1033 src/exit/gnunet-daemon-exit.c:2493
+#: src/exit/gnunet-daemon-exit.c:2746 src/vpn/gnunet-service-vpn.c:1455
+#: src/vpn/gnunet-service-vpn.c:1846 src/vpn/gnunet-service-vpn.c:2009
 msgid "# ICMPv4 packets dropped (type not allowed)"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:1012 src/exit/gnunet-daemon-exit.c:2467
-#: src/exit/gnunet-daemon-exit.c:2725 src/vpn/gnunet-service-vpn.c:1502
-#: src/vpn/gnunet-service-vpn.c:1896 src/vpn/gnunet-service-vpn.c:2033
+#: src/exit/gnunet-daemon-exit.c:1070 src/exit/gnunet-daemon-exit.c:2552
+#: src/exit/gnunet-daemon-exit.c:2805 src/vpn/gnunet-service-vpn.c:1511
+#: src/vpn/gnunet-service-vpn.c:1905 src/vpn/gnunet-service-vpn.c:2042
 msgid "# ICMPv6 packets dropped (type not allowed)"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:1052
+#: src/exit/gnunet-daemon-exit.c:1118
 msgid "# ICMP packets dropped (not allowed)"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:1059
+#: src/exit/gnunet-daemon-exit.c:1126
 msgid "ICMP Packet dropped, have no matching connection information\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:1135
+#: src/exit/gnunet-daemon-exit.c:1203
 msgid "UDP Packet dropped, have no matching connection information\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:1209
+#: src/exit/gnunet-daemon-exit.c:1278
 msgid "TCP Packet dropped, have no matching connection information\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:1262
+#: src/exit/gnunet-daemon-exit.c:1331
 #, fuzzy
 msgid "# Packets received from TUN"
 msgstr "# byte mottagna via HTTP"
 
-#: src/exit/gnunet-daemon-exit.c:1276
+#: src/exit/gnunet-daemon-exit.c:1345
 #, fuzzy
 msgid "# Bytes received from TUN"
 msgstr "# byte mottagna via HTTP"
 
-#: src/exit/gnunet-daemon-exit.c:1302
+#: src/exit/gnunet-daemon-exit.c:1371
 msgid "IPv4 packet options received.  Ignored.\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:1329
+#: src/exit/gnunet-daemon-exit.c:1398
 #, c-format
 msgid "IPv4 packet with unsupported next header %u received.  Ignored.\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:1375
+#: src/exit/gnunet-daemon-exit.c:1444
 #, c-format
 msgid "IPv6 packet with unsupported next header %d received.  Ignored.\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:1383
+#: src/exit/gnunet-daemon-exit.c:1452
 #, c-format
 msgid "Packet from unknown protocol %u received.  Ignored.\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:1765
+#: src/exit/gnunet-daemon-exit.c:1853
 #, fuzzy
 msgid "# TCP packets sent via TUN"
 msgstr "# byte skickade via UDP"
 
-#: src/exit/gnunet-daemon-exit.c:1878
+#: src/exit/gnunet-daemon-exit.c:1977
 #, fuzzy
 msgid "# TCP service creation requests received via cadet"
 msgstr "# byte mottogs via TCP"
 
-#: src/exit/gnunet-daemon-exit.c:1881 src/exit/gnunet-daemon-exit.c:1975
-#: src/exit/gnunet-daemon-exit.c:2082 src/exit/gnunet-daemon-exit.c:2332
-#: src/exit/gnunet-daemon-exit.c:2582 src/exit/gnunet-daemon-exit.c:2872
-#: src/exit/gnunet-daemon-exit.c:2980
+#: src/exit/gnunet-daemon-exit.c:1981 src/exit/gnunet-daemon-exit.c:2060
+#: src/exit/gnunet-daemon-exit.c:2167 src/exit/gnunet-daemon-exit.c:2417
+#: src/exit/gnunet-daemon-exit.c:2667 src/exit/gnunet-daemon-exit.c:2954
+#: src/exit/gnunet-daemon-exit.c:3057
 #, fuzzy
 msgid "# Bytes received from CADET"
 msgstr "# byte mottagna via HTTP"
 
-#: src/exit/gnunet-daemon-exit.c:1915 src/exit/gnunet-daemon-exit.c:3004
-#, c-format
-msgid "No service %s found for %s on port %d!\n"
-msgstr ""
-
-#: src/exit/gnunet-daemon-exit.c:1920
+#: src/exit/gnunet-daemon-exit.c:2063
 #, fuzzy
-msgid "# TCP requests dropped (no such service)"
-msgstr "# byte mottogs via TCP"
-
-#: src/exit/gnunet-daemon-exit.c:1978
-#, fuzzy
 msgid "# TCP IP-exit creation requests received via cadet"
 msgstr "# byte mottogs via TCP"
 
-#: src/exit/gnunet-daemon-exit.c:2085
+#: src/exit/gnunet-daemon-exit.c:2170
 #, fuzzy
 msgid "# TCP data requests received via cadet"
 msgstr "# byte mottogs via TCP"
 
-#: src/exit/gnunet-daemon-exit.c:2099
+#: src/exit/gnunet-daemon-exit.c:2184
 #, fuzzy
 msgid "# TCP DATA requests dropped (no session)"
 msgstr "# byte mottogs via TCP"
 
-#: src/exit/gnunet-daemon-exit.c:2161
+#: src/exit/gnunet-daemon-exit.c:2246
 #, fuzzy
 msgid "# ICMP packets sent via TUN"
 msgstr "# byte skickade via UDP"
 
-#: src/exit/gnunet-daemon-exit.c:2335
+#: src/exit/gnunet-daemon-exit.c:2420
 #, fuzzy
 msgid "# ICMP IP-exit requests received via cadet"
 msgstr "# byte mottogs via TCP"
 
-#: src/exit/gnunet-daemon-exit.c:2585
+#: src/exit/gnunet-daemon-exit.c:2670
 #, fuzzy
 msgid "# ICMP service requests received via cadet"
 msgstr "Meddelande mottaget från klient är ogiltig.\n"
 
-#: src/exit/gnunet-daemon-exit.c:2651 src/vpn/gnunet-service-vpn.c:1436
-#: src/vpn/gnunet-service-vpn.c:1994
+#: src/exit/gnunet-daemon-exit.c:2731 src/vpn/gnunet-service-vpn.c:1445
+#: src/vpn/gnunet-service-vpn.c:2003
 msgid "# ICMPv4 packets dropped (impossible PT to v6)"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:2710 src/vpn/gnunet-service-vpn.c:1472
-#: src/vpn/gnunet-service-vpn.c:1484 src/vpn/gnunet-service-vpn.c:1884
+#: src/exit/gnunet-daemon-exit.c:2790 src/vpn/gnunet-service-vpn.c:1481
+#: src/vpn/gnunet-service-vpn.c:1493 src/vpn/gnunet-service-vpn.c:1893
 msgid "# ICMPv6 packets dropped (impossible PT to v4)"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:2761
+#: src/exit/gnunet-daemon-exit.c:2841
 #, fuzzy
 msgid "# UDP packets sent via TUN"
 msgstr "# byte skickade via UDP"
 
-#: src/exit/gnunet-daemon-exit.c:2875
+#: src/exit/gnunet-daemon-exit.c:2957
 #, fuzzy
 msgid "# UDP IP-exit requests received via cadet"
 msgstr "# byte mottogs via TCP"
 
-#: src/exit/gnunet-daemon-exit.c:2983
+#: src/exit/gnunet-daemon-exit.c:3060
 #, fuzzy
 msgid "# UDP service requests received via cadet"
 msgstr "# byte mottogs via TCP"
 
-#: src/exit/gnunet-daemon-exit.c:3009
-#, fuzzy
-msgid "# UDP requests dropped (no such service)"
-msgstr "# byte mottogs via TCP"
-
-#: src/exit/gnunet-daemon-exit.c:3047
-#, fuzzy
-msgid "# Inbound CADET channels created"
-msgstr "# PING-meddelanden skapade"
-
-#: src/exit/gnunet-daemon-exit.c:3268 src/exit/gnunet-daemon-exit.c:3278
+#: src/exit/gnunet-daemon-exit.c:3327 src/exit/gnunet-daemon-exit.c:3337
 #, 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:3292 src/exit/gnunet-daemon-exit.c:3300
+#: src/exit/gnunet-daemon-exit.c:3351 src/exit/gnunet-daemon-exit.c:3359
 #, c-format
 msgid "`%s' is not a valid port number (for domain `%s')!"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3333
+#: src/exit/gnunet-daemon-exit.c:3400
 #, c-format
 msgid "No addresses found for hostname `%s' of service `%s'!\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3347 src/exit/gnunet-daemon-exit.c:3359
+#: src/exit/gnunet-daemon-exit.c:3414 src/exit/gnunet-daemon-exit.c:3427
 #, c-format
 msgid "Service `%s' configured for IPv4, but IPv4 is disabled!\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3370
+#: src/exit/gnunet-daemon-exit.c:3439
 #, c-format
 msgid "No IP addresses found for hostname `%s' of service `%s'!\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3548
-#, c-format
-msgid "`%s' must be installed SUID, EXIT will not work\n"
-msgstr ""
-
-#: src/exit/gnunet-daemon-exit.c:3563
+#: src/exit/gnunet-daemon-exit.c:3584
 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:3571
+#: src/exit/gnunet-daemon-exit.c:3592
 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:3578
+#: src/exit/gnunet-daemon-exit.c:3599
 msgid ""
 "Cannot enable IPv4 exit but disable IPv4 on TUN interface, will use "
 "ENABLE_IPv4=YES\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3584
+#: src/exit/gnunet-daemon-exit.c:3605
 msgid ""
 "Cannot enable IPv6 exit but disable IPv6 on TUN interface, will use "
 "ENABLE_IPv6=YES\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3590 src/exit/gnunet-daemon-exit.c:3754
-#: src/pt/gnunet-daemon-pt.c:1243
-msgid "No useful service enabled.  Exiting.\n"
+#: src/exit/gnunet-daemon-exit.c:3765
+msgid "Must be a number"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3701
-msgid "Must be a number"
+#: src/exit/gnunet-daemon-exit.c:3872
+#, c-format
+msgid "`%s' must be installed SUID, EXIT will not work\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3852
+#: src/exit/gnunet-daemon-exit.c:3884 src/pt/gnunet-daemon-pt.c:1279
+msgid "No useful service enabled.  Exiting.\n"
+msgstr ""
+
+#: src/exit/gnunet-daemon-exit.c:4029
 msgid "Daemon to run to provide an IP exit node for the VPN"
 msgstr ""
 
@@ -2920,71 +2766,71 @@
 msgid "# fragmentation transmissions completed"
 msgstr "# klartext PONG-meddelanden mottagna"
 
-#: src/fs/fs_api.c:493
+#: src/fs/fs_api.c:499
 #, fuzzy, c-format
 msgid "Could not open file `%s': %s"
 msgstr "Kunde inte slå upp \"%s\": %s\n"
 
-#: src/fs/fs_api.c:504
+#: src/fs/fs_api.c:510
 #, fuzzy, c-format
 msgid "Could not read file `%s': %s"
 msgstr "Kunde inte slå upp \"%s\": %s\n"
 
-#: src/fs/fs_api.c:512
+#: src/fs/fs_api.c:518
 #, c-format
 msgid "Short read reading from file `%s'!"
 msgstr ""
 
-#: src/fs/fs_api.c:1120
+#: src/fs/fs_api.c:1126
 #, fuzzy, c-format
 msgid "Failed to resume publishing information `%s': %s\n"
 msgstr "Misslyckades att leverera \"%s\" meddelande.\n"
 
-#: src/fs/fs_api.c:1640
+#: src/fs/fs_api.c:1646
 #, c-format
 msgid "Failure while resuming publishing operation `%s': %s\n"
 msgstr ""
 
-#: src/fs/fs_api.c:1654
+#: src/fs/fs_api.c:1660
 #, fuzzy, c-format
 msgid "Failed to resume publishing operation `%s': %s\n"
 msgstr "Misslyckades att leverera \"%s\" meddelande.\n"
 
-#: src/fs/fs_api.c:2312
+#: src/fs/fs_api.c:2318
 #, c-format
 msgid "Failure while resuming unindexing operation `%s': %s\n"
 msgstr ""
 
-#: src/fs/fs_api.c:2322
+#: src/fs/fs_api.c:2328
 #, fuzzy, c-format
 msgid "Failed to resume unindexing operation `%s': %s\n"
 msgstr "Misslyckades att leverera \"%s\" meddelande.\n"
 
-#: src/fs/fs_api.c:2450 src/fs/fs_api.c:2698
+#: src/fs/fs_api.c:2456 src/fs/fs_api.c:2703
 #, fuzzy, c-format
 msgid "Failed to resume sub-download `%s': %s\n"
 msgstr "Misslyckades att leverera \"%s\" meddelande.\n"
 
-#: src/fs/fs_api.c:2468
+#: src/fs/fs_api.c:2474
 #, fuzzy, c-format
 msgid "Failed to resume sub-search `%s': %s\n"
 msgstr "Misslyckades att leverera \"%s\" meddelande.\n"
 
-#: src/fs/fs_api.c:2483 src/fs/fs_api.c:2502 src/fs/fs_api.c:2994
+#: src/fs/fs_api.c:2489 src/fs/fs_api.c:2508 src/fs/fs_api.c:3006
 #, c-format
 msgid "Failure while resuming search operation `%s': %s\n"
 msgstr ""
 
-#: src/fs/fs_api.c:2688
+#: src/fs/fs_api.c:2693
 #, c-format
 msgid "Failed to resume sub-download `%s': could not open file `%s'\n"
 msgstr ""
 
-#: src/fs/fs_api.c:2937
+#: src/fs/fs_api.c:2949
 msgid "Could not resume running search, will resume as paused search\n"
 msgstr ""
 
-#: src/fs/fs_api.c:3032
+#: src/fs/fs_api.c:3044
 #, c-format
 msgid "Failure while resuming download operation `%s': %s\n"
 msgstr ""
@@ -2994,27 +2840,27 @@
 msgid "MAGIC mismatch.  This is not a GNUnet directory.\n"
 msgstr "Filformatsfel (inte en GNUnet-katalog?)\n"
 
-#: src/fs/fs_download.c:322
+#: src/fs/fs_download.c:308
 msgid ""
 "Recursive downloads of directories larger than 4 GB are not supported on 32-"
 "bit systems\n"
 msgstr ""
 
-#: src/fs/fs_download.c:342
+#: src/fs/fs_download.c:328
 msgid "Directory too large for system address space\n"
 msgstr ""
 
-#: src/fs/fs_download.c:523 src/fs/fs_download.c:535
+#: src/fs/fs_download.c:509 src/fs/fs_download.c:521
 #, fuzzy, c-format
 msgid "Failed to open file `%s' for writing"
 msgstr "Misslyckades att leverera \"%s\" meddelande.\n"
 
-#: src/fs/fs_download.c:905
+#: src/fs/fs_download.c:926
 #, 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:987
+#: src/fs/fs_download.c:1011
 #, c-format
 msgid ""
 "Internal error or bogus download URI (expected %u bytes at depth %u and "
@@ -3021,31 +2867,31 @@
 "offset %llu/%llu, got %u bytes)"
 msgstr ""
 
-#: src/fs/fs_download.c:1013
+#: src/fs/fs_download.c:1039
 msgid "internal error decrypting content"
 msgstr ""
 
-#: src/fs/fs_download.c:1036
+#: src/fs/fs_download.c:1063
 #, 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:1046
+#: src/fs/fs_download.c:1075
 #, 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:1055
+#: src/fs/fs_download.c:1084
 #, 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:1153
+#: src/fs/fs_download.c:1184
 #, fuzzy
 msgid "internal error decoding tree"
 msgstr "=\tFel vid läsning av katalog.\n"
 
-#: src/fs/fs_download.c:1939
+#: src/fs/fs_download.c:1838
 #, fuzzy
 msgid "Invalid URI"
 msgstr "Ogiltiga argument: "
@@ -3057,18 +2903,13 @@
 "`unknown' instead.\n"
 msgstr ""
 
-#: src/fs/fs_list_indexed.c:90
+#: src/fs/fs_list_indexed.c:152
 #, fuzzy, c-format
-msgid "Failed to receive response for `%s' request from `%s' service.\n"
+msgid "Failed to receive response from `%s' service.\n"
 msgstr "Misslyckades att ta emot svar till \"%s\" meddelande från gnunetd\n"
 
-#: src/fs/fs_list_indexed.c:113
+#: src/fs/fs_list_indexed.c:196
 #, fuzzy, c-format
-msgid "Failed to receive valid response for `%s' request from `%s' service.\n"
-msgstr "Misslyckades att ta emot svar till \"%s\" meddelande från gnunetd\n"
-
-#: src/fs/fs_list_indexed.c:151
-#, fuzzy, c-format
 msgid "Failed to not connect to `%s' service.\n"
 msgstr "Misslyckades att initiera tjänsten \"%s\".\n"
 
@@ -3097,7 +2938,7 @@
 msgid "Failed to connect to datastore."
 msgstr "Misslyckades att ansluta till gnunetd.\n"
 
-#: src/fs/fs_publish.c:127 src/fs/fs_publish.c:439
+#: src/fs/fs_publish.c:127 src/fs/fs_publish.c:438
 #, fuzzy, c-format
 msgid "Publishing failed: %s"
 msgstr ""
@@ -3104,49 +2945,45 @@
 "\n"
 "Fel vid uppladdning av fil: %s\n"
 
-#: src/fs/fs_publish.c:706 src/fs/fs_publish.c:723 src/fs/fs_publish.c:762
-#: src/fs/fs_publish.c:783 src/fs/fs_publish.c:807 src/fs/fs_publish.c:1055
+#: src/fs/fs_publish.c:724 src/fs/fs_publish.c:778 src/fs/fs_publish.c:823
+#: src/fs/fs_publish.c:844 src/fs/fs_publish.c:874 src/fs/fs_publish.c:1140
 #, fuzzy, c-format
 msgid "Can not index file `%s': %s.  Will try to insert instead.\n"
 msgstr "Indexering av fil \"%s\" misslyckades. Försöker att infoga fil...\n"
 
-#: src/fs/fs_publish.c:708
-msgid "timeout on index-start request to `fs' service"
-msgstr ""
-
-#: src/fs/fs_publish.c:720
+#: src/fs/fs_publish.c:780
 #, fuzzy
-msgid "unknown error"
-msgstr "Okänt fel"
+msgid "error on index-start request to `fs' service"
+msgstr "Misslyckades att ansluta till gnunetd.\n"
 
-#: src/fs/fs_publish.c:764
+#: src/fs/fs_publish.c:825
 msgid "failed to compute hash"
 msgstr ""
 
-#: src/fs/fs_publish.c:784
+#: src/fs/fs_publish.c:845
 msgid "filename too long"
 msgstr ""
 
-#: src/fs/fs_publish.c:809
+#: src/fs/fs_publish.c:876
 #, fuzzy
 msgid "could not connect to `fs' service"
 msgstr "Kunde inte ansluta till gnunetd.\n"
 
-#: src/fs/fs_publish.c:832
+#: src/fs/fs_publish.c:902
 #, fuzzy, c-format
 msgid "Failed to get file identifiers for `%s'\n"
 msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 
-#: src/fs/fs_publish.c:896 src/fs/fs_publish.c:937
+#: src/fs/fs_publish.c:991 src/fs/fs_publish.c:1027
 msgid "Can not create LOC URI. Will continue with CHK instead.\n"
 msgstr ""
 
-#: src/fs/fs_publish.c:1009
+#: src/fs/fs_publish.c:1094
 #, fuzzy, c-format
 msgid "Recursive upload failed at `%s': %s"
 msgstr "\"%s\" misslyckades vid %s:%d med fel: \"%s\".\n"
 
-#: src/fs/fs_publish.c:1017
+#: src/fs/fs_publish.c:1102
 #, fuzzy, c-format
 msgid "Recursive upload failed: %s"
 msgstr ""
@@ -3153,16 +2990,16 @@
 "\n"
 "Fel vid uppladdning av fil: %s\n"
 
-#: src/fs/fs_publish.c:1057
+#: src/fs/fs_publish.c:1142
 msgid "needs to be an actual file"
 msgstr ""
 
-#: src/fs/fs_publish.c:1296
+#: src/fs/fs_publish.c:1381
 #, fuzzy, c-format
 msgid "Datastore failure: %s"
 msgstr " Anslutning misslyckades (fel?)\n"
 
-#: src/fs/fs_publish.c:1387
+#: src/fs/fs_publish.c:1472
 #, c-format
 msgid "Reserving space for %u entries and %llu bytes for publication\n"
 msgstr ""
@@ -3177,12 +3014,12 @@
 msgid "Internal error."
 msgstr "Okänt fel.\n"
 
-#: src/fs/fs_search.c:806 src/fs/fs_search.c:876
+#: src/fs/fs_search.c:809 src/fs/fs_search.c:879
 #, fuzzy, c-format
 msgid "Failed to parse URI `%s': %s\n"
 msgstr "Fil \"%s\" har URI: %s\n"
 
-#: src/fs/fs_search.c:935
+#: src/fs/fs_search.c:966
 #, c-format
 msgid "Got result with unknown block type `%d', ignoring"
 msgstr ""
@@ -3196,50 +3033,42 @@
 msgid "Failed to read file"
 msgstr "Misslyckades att leverera \"%s\" meddelande.\n"
 
-#: src/fs/fs_unindex.c:245
-msgid "Unexpected time for a response from `fs' service."
-msgstr ""
-
-#: src/fs/fs_unindex.c:253
-msgid "Timeout waiting for `fs' service."
-msgstr ""
-
-#: src/fs/fs_unindex.c:261
+#: src/fs/fs_unindex.c:275
 #, fuzzy
-msgid "Invalid response from `fs' service."
-msgstr "Ogiltigt svar till \"%s\" från \"%s\"\n"
+msgid "Error communicating with `fs' service."
+msgstr "Skriv ut information om GNUnets motparter."
 
-#: src/fs/fs_unindex.c:304
+#: src/fs/fs_unindex.c:328
 #, fuzzy
 msgid "Failed to connect to FS service for unindexing."
 msgstr "Misslyckades att ansluta till gnunetd.\n"
 
-#: src/fs/fs_unindex.c:360 src/fs/fs_unindex.c:372
+#: src/fs/fs_unindex.c:378 src/fs/fs_unindex.c:390
 #, fuzzy
 msgid "Failed to get KSKs from directory scan."
 msgstr "Filformatsfel (inte en GNUnet-katalog?)\n"
 
-#: src/fs/fs_unindex.c:368
+#: src/fs/fs_unindex.c:386
 #, fuzzy, c-format
 msgid "Internal error scanning `%s'.\n"
 msgstr "=\tFel vid läsning av katalog.\n"
 
-#: src/fs/fs_unindex.c:427
+#: src/fs/fs_unindex.c:445
 #, fuzzy, c-format
 msgid "Failed to remove UBlock: %s\n"
 msgstr "Misslyckades att leverera \"%s\" meddelande.\n"
 
-#: src/fs/fs_unindex.c:590 src/fs/fs_unindex.c:654
+#: src/fs/fs_unindex.c:606 src/fs/fs_unindex.c:669
 #, fuzzy
 msgid "Failed to connect to `datastore' service."
 msgstr "Misslyckades att initiera tjänsten \"%s\".\n"
 
-#: src/fs/fs_unindex.c:667
+#: src/fs/fs_unindex.c:682
 #, fuzzy
 msgid "Failed to open file for unindexing."
 msgstr "Misslyckades att ansluta till gnunetd.\n"
 
-#: src/fs/fs_unindex.c:706
+#: src/fs/fs_unindex.c:721
 #, fuzzy
 msgid "Failed to compute hash of file."
 msgstr "Misslyckades att ansluta till gnunetd.\n"
@@ -3462,7 +3291,7 @@
 msgstr "Uppladdning vägrades!"
 
 #: src/fs/gnunet-download.c:208 src/fs/gnunet-publish.c:295
-#: src/fs/gnunet-search.c:208 src/fs/gnunet-unindex.c:107
+#: src/fs/gnunet-search.c:212 src/fs/gnunet-unindex.c:107
 #, c-format
 msgid "Unexpected status: %d\n"
 msgstr ""
@@ -3486,12 +3315,12 @@
 msgstr ""
 
 #: src/fs/gnunet-download.c:267 src/fs/gnunet-publish.c:870
-#: src/fs/gnunet-search.c:266 src/fs/gnunet-unindex.c:139
+#: src/fs/gnunet-search.c:270 src/fs/gnunet-unindex.c:139
 #, fuzzy, c-format
 msgid "Could not initialize `%s' subsystem.\n"
 msgstr "Misslyckades att initiera tjänsten \"%s\".\n"
 
-#: src/fs/gnunet-download.c:304 src/fs/gnunet-search.c:306
+#: src/fs/gnunet-download.c:304 src/fs/gnunet-search.c:310
 msgid "set the desired LEVEL of receiver-anonymity"
 msgstr ""
 
@@ -3499,7 +3328,7 @@
 msgid "delete incomplete downloads (when aborted with CTRL-C)"
 msgstr ""
 
-#: src/fs/gnunet-download.c:310 src/fs/gnunet-search.c:309
+#: src/fs/gnunet-download.c:310 src/fs/gnunet-search.c:313
 msgid "only search the local peer (no P2P network search)"
 msgstr ""
 
@@ -3681,7 +3510,7 @@
 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:1811 src/transport/gnunet-transport.c:1835
+#: src/transport/gnunet-transport.c:1577 src/transport/gnunet-transport.c:1602
 #, c-format
 msgid "Option `%s' makes no sense without option `%s'.\n"
 msgstr ""
@@ -3739,68 +3568,91 @@
 msgid "Publish a file or directory on GNUnet"
 msgstr ""
 
-#: src/fs/gnunet-search.c:123
+#: src/fs/gnunet-search.c:127
 #, c-format
 msgid "Failed to write directory with search results to `%s'\n"
 msgstr ""
 
-#: src/fs/gnunet-search.c:200
+#: src/fs/gnunet-search.c:204
 #, fuzzy, c-format
 msgid "Error searching: %s.\n"
 msgstr "Fel vid lämning av DHT.\n"
 
-#: src/fs/gnunet-search.c:256
+#: src/fs/gnunet-search.c:260
 #, fuzzy
 msgid "Could not create keyword URI from arguments.\n"
 msgstr "Kunde inte skapa namnrymd \"%s\" (existerar?).\n"
 
-#: src/fs/gnunet-search.c:280
+#: src/fs/gnunet-search.c:284
 #, fuzzy
 msgid "Could not start searching.\n"
 msgstr "Kunde inte skapa namnrymd \"%s\" (existerar?).\n"
 
-#: src/fs/gnunet-search.c:312
+#: src/fs/gnunet-search.c:316
 msgid "write search results to file starting with PREFIX"
 msgstr ""
 
-#: src/fs/gnunet-search.c:315
+#: src/fs/gnunet-search.c:319
 msgid "automatically terminate search after DELAY"
 msgstr ""
 
-#: src/fs/gnunet-search.c:322
+#: src/fs/gnunet-search.c:326
 msgid "automatically terminate search after VALUE results are found"
 msgstr ""
 
-#: src/fs/gnunet-search.c:333
+#: src/fs/gnunet-search.c:337
 msgid "Search GNUnet for files that were published on GNUnet"
 msgstr ""
 
-#: src/fs/gnunet-service-fs.c:273
+#: src/fs/gnunet-service-fs.c:378 src/fs/gnunet-service-fs.c:883
+#, fuzzy
+msgid "# client searches active"
+msgstr "# klartext PONG-meddelanden mottagna"
+
+#: src/fs/gnunet-service-fs.c:437
+#, fuzzy
+msgid "# replies received for local clients"
+msgstr "Meddelande mottaget från klient är ogiltig.\n"
+
+#: src/fs/gnunet-service-fs.c:606
 msgid "# running average P2P latency (ms)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs.c:331 src/fs/gnunet-service-fs.c:603
+#: src/fs/gnunet-service-fs.c:658 src/fs/gnunet-service-fs_cp.c:564
 msgid "# Loopback routes suppressed"
 msgstr ""
 
-#: src/fs/gnunet-service-fs.c:730
+#: src/fs/gnunet-service-fs.c:837
 #, fuzzy
+msgid "# client searches received"
+msgstr "# klartext PONG-meddelanden mottagna"
+
+#: src/fs/gnunet-service-fs.c:876
+msgid "# client searches updated (merged content seen list)"
+msgstr ""
+
+#: src/fs/gnunet-service-fs.c:1047
+#, c-format
+msgid "Hash mismatch trying to index file `%s' which does not have hash `%s'\n"
+msgstr ""
+
+#: src/fs/gnunet-service-fs.c:1288
+#, fuzzy
 msgid "FS service is lacking HOSTKEY configuration setting.  Exiting.\n"
 msgstr "GNUnet-konfiguration"
 
-#: src/fs/gnunet-service-fs.c:756 src/hostlist/gnunet-daemon-hostlist.c:308
-#: src/topology/gnunet-daemon-topology.c:1245
-#: src/topology/gnunet-daemon-topology.c:1253
+#: src/fs/gnunet-service-fs.c:1313 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"
 msgstr "Misslyckades att initiera tjänsten \"%s\".\n"
 
-#: src/fs/gnunet-service-fs_cadet_client.c:490
+#: src/fs/gnunet-service-fs_cadet_client.c:494
 #, fuzzy
 msgid "# replies received via cadet"
 msgstr "# byte mottagna av typen %d"
 
-#: src/fs/gnunet-service-fs_cadet_client.c:504
+#: src/fs/gnunet-service-fs_cadet_client.c:508
 #, fuzzy
 msgid "# replies received via cadet dropped"
 msgstr "# byte mottagna av typen %d"
@@ -3810,219 +3662,177 @@
 msgid "# Blocks transferred via cadet"
 msgstr "# byte skickade av typen %d"
 
-#: src/fs/gnunet-service-fs_cadet_server.c:359
+#: src/fs/gnunet-service-fs_cadet_server.c:360
 #, fuzzy
 msgid "# queries received via CADET not answered"
 msgstr "# byte mottogs via TCP"
 
-#: src/fs/gnunet-service-fs_cadet_server.c:439
+#: src/fs/gnunet-service-fs_cadet_server.c:440
 #, fuzzy
 msgid "# queries received via cadet"
 msgstr "# byte mottogs via TCP"
 
-#: src/fs/gnunet-service-fs_cadet_server.c:483
+#: src/fs/gnunet-service-fs_cadet_server.c:484
 #, fuzzy
 msgid "# cadet client connections rejected"
 msgstr "Nätverksanslutning"
 
-#: src/fs/gnunet-service-fs_cadet_server.c:489
-#: src/fs/gnunet-service-fs_cadet_server.c:529
+#: src/fs/gnunet-service-fs_cadet_server.c:490
+#: src/fs/gnunet-service-fs_cadet_server.c:530
 #, fuzzy
 msgid "# cadet connections active"
 msgstr "Nätverksanslutning"
 
-#: src/fs/gnunet-service-fs_cp.c:743
+#: src/fs/gnunet-service-fs_cp.c:686
 #, fuzzy
 msgid "# migration stop messages received"
 msgstr "# krypterade PONG-meddelanden mottagna"
 
-#: src/fs/gnunet-service-fs_cp.c:747
+#: src/fs/gnunet-service-fs_cp.c:690
 #, c-format
 msgid "Migration of content to peer `%s' blocked for %s\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:785
-#, fuzzy
-msgid "# replies transmitted to other peers"
-msgstr "# byte skickade av typen %d"
-
-#: src/fs/gnunet-service-fs_cp.c:793
-msgid "# replies dropped"
-msgstr ""
-
-#: src/fs/gnunet-service-fs_cp.c:820 src/fs/gnunet-service-fs_cp.c:1472
+#: src/fs/gnunet-service-fs_cp.c:723 src/fs/gnunet-service-fs_cp.c:1343
 msgid "# P2P searches active"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:918
+#: src/fs/gnunet-service-fs_cp.c:818
 msgid "# artificial delays introduced (ms)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:974
+#: src/fs/gnunet-service-fs_cp.c:875
 #, fuzzy
 msgid "# replies dropped due to type mismatch"
 msgstr "# byte mottagna av typen %d"
 
-#: src/fs/gnunet-service-fs_cp.c:982
+#: src/fs/gnunet-service-fs_cp.c:883
 #, fuzzy
 msgid "# replies received for other peers"
 msgstr "# byte mottagna av typen %d"
 
-#: src/fs/gnunet-service-fs_cp.c:996
+#: src/fs/gnunet-service-fs_cp.c:897
 msgid "# replies dropped due to insufficient cover traffic"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1044
+#: src/fs/gnunet-service-fs_cp.c:944
 msgid "# P2P searches destroyed due to ultimate reply"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1115
+#: src/fs/gnunet-service-fs_cp.c:1015
 msgid "# requests done for free (low load)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1140
+#: src/fs/gnunet-service-fs_cp.c:1040
 msgid "# request dropped, priority insufficient"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1150
+#: src/fs/gnunet-service-fs_cp.c:1050
 msgid "# requests done for a price (normal load)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1248
+#: src/fs/gnunet-service-fs_cp.c:1148
 msgid "# requests dropped due to higher-TTL request"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1302
+#: src/fs/gnunet-service-fs_cp.c:1205
 msgid "# GET requests received (from other peers)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1337
-msgid "# requests dropped due to initiator not being connected"
-msgstr ""
-
-#: src/fs/gnunet-service-fs_cp.c:1358
+#: src/fs/gnunet-service-fs_cp.c:1228
 msgid "# requests dropped due to missing reverse route"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1369
+#: src/fs/gnunet-service-fs_cp.c:1239
 #, fuzzy
 msgid "# requests dropped due to full reply queue"
 msgstr "Nätverksannonsering avstängd i konfigurationen!\n"
 
-#: src/fs/gnunet-service-fs_cp.c:1424
+#: src/fs/gnunet-service-fs_cp.c:1295
 msgid "# requests dropped due TTL underflow"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1468
+#: src/fs/gnunet-service-fs_cp.c:1339
 #, fuzzy
 msgid "# P2P query messages received and processed"
 msgstr "# krypterade PONG-meddelanden mottagna"
 
-#: src/fs/gnunet-service-fs_cp.c:1913
+#: src/fs/gnunet-service-fs_cp.c:1706
 #, fuzzy
 msgid "# migration stop messages sent"
 msgstr "# krypterade PONG-meddelanden mottagna"
 
-#: src/fs/gnunet-service-fs_indexing.c:130
-#: src/fs/gnunet-service-fs_indexing.c:181
+#: src/fs/gnunet-service-fs_indexing.c:134
+#: src/fs/gnunet-service-fs_indexing.c:195
 #, fuzzy, c-format
 msgid "Could not open `%s'.\n"
 msgstr "Kunde inte slå upp \"%s\": %s\n"
 
-#: src/fs/gnunet-service-fs_indexing.c:142
+#: src/fs/gnunet-service-fs_indexing.c:151
 #, fuzzy, c-format
 msgid "Error writing `%s'.\n"
 msgstr "Fel vid skapandet av användare"
 
-#: src/fs/gnunet-service-fs_indexing.c:237
-#, c-format
-msgid ""
-"Index request received for file `%s' is already indexed as `%s'.  Permitting "
-"anyway.\n"
-msgstr ""
-
-#: src/fs/gnunet-service-fs_indexing.c:275
-#, c-format
-msgid "Hash mismatch trying to index file `%s' which has hash `%s'\n"
-msgstr ""
-
-#: src/fs/gnunet-service-fs_indexing.c:477
+#: src/fs/gnunet-service-fs_indexing.c:253
 #, fuzzy, c-format
 msgid "Failed to delete bogus block: %s\n"
 msgstr "Misslyckades att leverera \"%s\" meddelande.\n"
 
-#: src/fs/gnunet-service-fs_indexing.c:542
+#: src/fs/gnunet-service-fs_indexing.c:329
 msgid "# index blocks removed: original file inaccessible"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_indexing.c:557
+#: src/fs/gnunet-service-fs_indexing.c:355
 #, 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:559
+#: src/fs/gnunet-service-fs_indexing.c:359
 #, fuzzy
 msgid "not indexed"
 msgstr "Avindexering misslyckades."
 
-#: src/fs/gnunet-service-fs_indexing.c:574
+#: src/fs/gnunet-service-fs_indexing.c:392
 #, 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_lc.c:202 src/fs/gnunet-service-fs_lc.c:378
-#, fuzzy
-msgid "# client searches active"
-msgstr "# klartext PONG-meddelanden mottagna"
-
-#: src/fs/gnunet-service-fs_lc.c:261
-#, fuzzy
-msgid "# replies received for local clients"
-msgstr "Meddelande mottaget från klient är ogiltig.\n"
-
-#: src/fs/gnunet-service-fs_lc.c:332
-#, fuzzy
-msgid "# client searches received"
-msgstr "# klartext PONG-meddelanden mottagna"
-
-#: src/fs/gnunet-service-fs_lc.c:372
-msgid "# client searches updated (merged content seen list)"
+#: src/fs/gnunet-service-fs_indexing.c:515
+#, c-format
+msgid ""
+"Index request received for file `%s' is already indexed as `%s'.  Permitting "
+"anyway.\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pe.c:273
+#: src/fs/gnunet-service-fs_pe.c:265
 msgid "# average retransmission delay (ms)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pe.c:412
-#, fuzzy
-msgid "# transmission failed (core has no bandwidth)"
-msgstr "Ingen transport av typ %d är känd.\n"
-
-#: src/fs/gnunet-service-fs_pe.c:447
-#, fuzzy
-msgid "# query messages sent to other peers"
-msgstr "# byte skickade av typen %d"
-
-#: src/fs/gnunet-service-fs_pe.c:501
+#: src/fs/gnunet-service-fs_pe.c:427
 msgid "# delay heap timeout (ms)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pe.c:511
+#: src/fs/gnunet-service-fs_pe.c:438
 msgid "# query plans executed"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pe.c:593
+#: src/fs/gnunet-service-fs_pe.c:466
 #, fuzzy
+msgid "# query messages sent to other peers"
+msgstr "# byte skickade av typen %d"
+
+#: src/fs/gnunet-service-fs_pe.c:536
+#, fuzzy
 msgid "# requests merged"
 msgstr "# byte mottogs via TCP"
 
-#: src/fs/gnunet-service-fs_pe.c:603
+#: src/fs/gnunet-service-fs_pe.c:546
 #, fuzzy
 msgid "# requests refreshed"
 msgstr "# byte mottogs via TCP"
 
-#: src/fs/gnunet-service-fs_pe.c:661 src/fs/gnunet-service-fs_pe.c:769
-#: src/fs/gnunet-service-fs_pe.c:848
+#: src/fs/gnunet-service-fs_pe.c:606 src/fs/gnunet-service-fs_pe.c:709
+#: src/fs/gnunet-service-fs_pe.c:788
 msgid "# query plan entries"
 msgstr ""
 
@@ -4031,112 +3841,112 @@
 msgid "# Pending requests created"
 msgstr "# byte mottogs via TCP"
 
-#: src/fs/gnunet-service-fs_pr.c:411 src/fs/gnunet-service-fs_pr.c:671
+#: src/fs/gnunet-service-fs_pr.c:411 src/fs/gnunet-service-fs_pr.c:661
 msgid "# Pending requests active"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:852
+#: src/fs/gnunet-service-fs_pr.c:842
 #, fuzzy
 msgid "# replies received and matched"
 msgstr "# byte mottagna av typen %d"
 
-#: src/fs/gnunet-service-fs_pr.c:889
+#: src/fs/gnunet-service-fs_pr.c:879
 msgid "# duplicate replies discarded (bloomfilter)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:898
+#: src/fs/gnunet-service-fs_pr.c:888
 msgid "# irrelevant replies discarded"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:913
+#: src/fs/gnunet-service-fs_pr.c:903
 #, c-format
 msgid "Unsupported block type %u\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:930
+#: src/fs/gnunet-service-fs_pr.c:920
 msgid "# results found locally"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1060
+#: src/fs/gnunet-service-fs_pr.c:1050
 msgid "# Datastore `PUT' failures"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1088
+#: src/fs/gnunet-service-fs_pr.c:1078
 #, fuzzy
 msgid "# storage requests dropped due to high load"
 msgstr "Nätverksannonsering avstängd i konfigurationen!\n"
 
-#: src/fs/gnunet-service-fs_pr.c:1126
+#: src/fs/gnunet-service-fs_pr.c:1116
 #, fuzzy
 msgid "# Replies received from DHT"
 msgstr "# byte mottagna via HTTP"
 
-#: src/fs/gnunet-service-fs_pr.c:1258
+#: src/fs/gnunet-service-fs_pr.c:1247
 #, fuzzy
 msgid "# Replies received from CADET"
 msgstr "# byte mottagna via HTTP"
 
-#: src/fs/gnunet-service-fs_pr.c:1310
+#: src/fs/gnunet-service-fs_pr.c:1299
 #, c-format
 msgid "Datastore lookup already took %s!\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1331
+#: src/fs/gnunet-service-fs_pr.c:1320
 #, c-format
 msgid "On-demand lookup already took %s!\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1383
+#: src/fs/gnunet-service-fs_pr.c:1372
 msgid "# Datastore lookups concluded (no results)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1398
+#: src/fs/gnunet-service-fs_pr.c:1387
 msgid "# Datastore lookups concluded (seen all)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1407
+#: src/fs/gnunet-service-fs_pr.c:1396
 msgid "# Datastore lookups aborted (more than MAX_RESULTS)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1422
+#: src/fs/gnunet-service-fs_pr.c:1411
 msgid "# requested DBLOCK or IBLOCK not found"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1436
+#: src/fs/gnunet-service-fs_pr.c:1425
 msgid "# on-demand blocks matched requests"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1449
+#: src/fs/gnunet-service-fs_pr.c:1438
 msgid "# on-demand lookups performed successfully"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1454
+#: src/fs/gnunet-service-fs_pr.c:1443
 msgid "# on-demand lookups failed"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1481 src/fs/gnunet-service-fs_pr.c:1521
-#: src/fs/gnunet-service-fs_pr.c:1690
+#: src/fs/gnunet-service-fs_pr.c:1469 src/fs/gnunet-service-fs_pr.c:1508
+#: src/fs/gnunet-service-fs_pr.c:1675
 msgid "# Datastore lookups concluded (error queueing)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1540
+#: src/fs/gnunet-service-fs_pr.c:1527
 msgid "# Datastore lookups concluded (found last result)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1552
+#: src/fs/gnunet-service-fs_pr.c:1539
 msgid "# Datastore lookups concluded (load too high)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1666
+#: src/fs/gnunet-service-fs_pr.c:1652
 msgid "# Datastore lookups initiated"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1755
+#: src/fs/gnunet-service-fs_pr.c:1732
 #, fuzzy
 msgid "# GAP PUT messages received"
 msgstr "# krypterade PONG-meddelanden mottagna"
 
-#: src/fs/gnunet-service-fs_push.c:678
+#: src/fs/gnunet-service-fs_push.c:642
 msgid "time required, content pushing disabled"
 msgstr ""
 
@@ -4171,11 +3981,6 @@
 msgid "Unindex a file that was previously indexed with gnunet-publish."
 msgstr ""
 
-#: src/gns/gns_api.c:393
-#, fuzzy
-msgid "Failed to deserialize lookup reply from GNS service!\n"
-msgstr "Misslyckades att ta emot svar till \"%s\" meddelande från gnunetd\n"
-
 #: src/gns/gnunet-bcd.c:127
 #, c-format
 msgid "Refusing `%s' request to HTTP server\n"
@@ -4262,22 +4067,22 @@
 msgid "GNUnet DNS-to-GNS proxy (a DNS server)"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:236 src/gns/plugin_rest_gns.c:347
+#: src/gns/gnunet-gns.c:269 src/gns/plugin_rest_gns.c:347
 #, c-format
 msgid "Invalid typename specified, assuming `ANY'\n"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:254
+#: src/gns/gnunet-gns.c:295
 #, c-format
 msgid "Please specify name to lookup!\n"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:335
+#: src/gns/gnunet-gns.c:376
 #, c-format
 msgid "Ego for `%s' not found, cannot perform lookup.\n"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:374 src/gns/gnunet-gns-helper-service-w32.c:796
+#: src/gns/gnunet-gns.c:415 src/gns/gnunet-gns-helper-service-w32.c:796
 #: src/gns/plugin_rest_gns.c:472
 #, c-format
 msgid ""
@@ -4285,49 +4090,67 @@
 "gns-import.sh?\n"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:415 src/gns/gnunet-gns-helper-service-w32.c:826
+#: src/gns/gnunet-gns.c:456 src/gns/gnunet-gns-helper-service-w32.c:826
 #, fuzzy, c-format
 msgid "Failed to connect to GNS\n"
 msgstr "Misslyckades att ansluta till gnunetd.\n"
 
-#: src/gns/gnunet-gns.c:429
+#: src/gns/gnunet-gns.c:470 src/gns/gnunet-gns.c:500
 #, 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:479
+#: src/gns/gnunet-gns.c:548
 msgid "Lookup a record for the given name"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:482
+#: src/gns/gnunet-gns.c:551
 #, fuzzy
 msgid "Specify the type of the record to lookup"
 msgstr "ange prioritet för innehållet"
 
-#: src/gns/gnunet-gns.c:485
+#: src/gns/gnunet-gns.c:554
 #, fuzzy
 msgid "Specify timeout for the lookup"
 msgstr "ange prioritet för innehållet"
 
-#: src/gns/gnunet-gns.c:488
+#: src/gns/gnunet-gns.c:557
 msgid "No unneeded output"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:491
+#: src/gns/gnunet-gns.c:560
 #, 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:494
+#: src/gns/gnunet-gns.c:563
 #, 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:508
+#: src/gns/gnunet-gns.c:566
 #, 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
+msgid "Transmission to client failed!\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 ""
@@ -4346,14 +4169,14 @@
 msgstr ""
 
 #: src/gns/gnunet-gns-proxy.c:109
-#: src/hostlist/gnunet-daemon-hostlist_client.c:529
-#: src/hostlist/gnunet-daemon-hostlist_client.c:747
-#: src/hostlist/gnunet-daemon-hostlist_client.c:753
-#: src/hostlist/gnunet-daemon-hostlist_client.c:805
-#: src/hostlist/gnunet-daemon-hostlist_client.c:814
-#: src/hostlist/gnunet-daemon-hostlist_client.c:925
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1020
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1025
+#: src/hostlist/gnunet-daemon-hostlist_client.c:569
+#: src/hostlist/gnunet-daemon-hostlist_client.c:787
+#: src/hostlist/gnunet-daemon-hostlist_client.c:793
+#: src/hostlist/gnunet-daemon-hostlist_client.c:845
+#: src/hostlist/gnunet-daemon-hostlist_client.c:854
+#: src/hostlist/gnunet-daemon-hostlist_client.c:965
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1060
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1065
 #: src/transport/plugin_transport_http_client.c:598
 #: src/transport/plugin_transport_http_client.c:616
 #, fuzzy, c-format
@@ -4360,127 +4183,128 @@
 msgid "%s failed at %s:%d: `%s'\n"
 msgstr "\"%s\" misslyckades vid %s:%d med fel: \"%s\".\n"
 
-#: src/gns/gnunet-gns-proxy.c:846
+#: src/gns/gnunet-gns-proxy.c:887
 #, fuzzy, c-format
 msgid "Unsupported CURL SSL backend %d\n"
 msgstr "Kommando \"%s\" stöds ej.  Avbryter.\n"
 
-#: src/gns/gnunet-gns-proxy.c:869
+#: src/gns/gnunet-gns-proxy.c:910
 #, 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:892
+#: src/gns/gnunet-gns-proxy.c:933
 #, fuzzy, c-format
 msgid "Failed to initialize DANE: %s\n"
 msgstr "Kunde inte initiera SQLite.\n"
 
-#: src/gns/gnunet-gns-proxy.c:905
+#: src/gns/gnunet-gns-proxy.c:946
 #, 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:920
+#: src/gns/gnunet-gns-proxy.c:961
 #, 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:930
+#: src/gns/gnunet-gns-proxy.c:971
 #, c-format
 msgid "Failed DANE verification failed with GnuTLS verify status code: %u\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:954
+#: src/gns/gnunet-gns-proxy.c:995
 #, c-format
 msgid "SSL certificate subject name (%s) does not match `%s'\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:1099
+#: src/gns/gnunet-gns-proxy.c:1104
 #, c-format
 msgid "Cookie domain `%s' supplied by server is invalid\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:1631
+#: src/gns/gnunet-gns-proxy.c:1708
 #, fuzzy, c-format
 msgid "Unsupported HTTP method `%s'\n"
 msgstr "Kommando \"%s\" stöds ej.  Avbryter.\n"
 
-#: src/gns/gnunet-gns-proxy.c:1997
+#: src/gns/gnunet-gns-proxy.c:2167
 #, 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:2027
+#: src/gns/gnunet-gns-proxy.c:2197
 #, fuzzy, c-format
 msgid "Unable to import certificate %s\n"
 msgstr "Kunde inte spara konfigurationsfil \"%s\":"
 
-#: src/gns/gnunet-gns-proxy.c:2199
+#: src/gns/gnunet-gns-proxy.c:2370
 #, fuzzy, c-format
 msgid "Failed to start HTTPS server for `%s'\n"
 msgstr "Misslyckades att starta samling.\n"
 
-#: src/gns/gnunet-gns-proxy.c:2218 src/rest/gnunet-rest-server.c:529
+#: src/gns/gnunet-gns-proxy.c:2389 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:2538
+#: src/gns/gnunet-gns-proxy.c:2709
 #, fuzzy, c-format
 msgid "Unsupported socks version %d\n"
 msgstr "Kommando \"%s\" stöds ej.  Avbryter.\n"
 
-#: src/gns/gnunet-gns-proxy.c:2567
+#: src/gns/gnunet-gns-proxy.c:2738
 #, fuzzy, c-format
 msgid "Unsupported socks command %d\n"
 msgstr "Kommando \"%s\" stöds ej.  Avbryter.\n"
 
-#: src/gns/gnunet-gns-proxy.c:2585 src/gns/gnunet-gns-proxy.c:2614
+#: src/gns/gnunet-gns-proxy.c:2756 src/gns/gnunet-gns-proxy.c:2785
 msgid "SSL connection to plain IPv4 address requested\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:2665
+#: src/gns/gnunet-gns-proxy.c:2836
 #, fuzzy, c-format
 msgid "Unsupported socks address type %d\n"
 msgstr "Kommando \"%s\" stöds ej.  Avbryter.\n"
 
-#: src/gns/gnunet-gns-proxy.c:2999
+#: src/gns/gnunet-gns-proxy.c:3171
 msgid "No ego configured for `shorten-zone`\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:3039 src/gns/gnunet-service-gns.c:887
+#: src/gns/gnunet-gns-proxy.c:3211 src/gns/gnunet-service-gns.c:1093
+#: src/gns/gnunet-service-gns.c:1149
 #, c-format
 msgid "No ego configured for `%s`\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:3101
+#: src/gns/gnunet-gns-proxy.c:3273
 #, 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:3141
+#: src/gns/gnunet-gns-proxy.c:3313
 msgid "listen on specified port (default: 7777)"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:3144
+#: src/gns/gnunet-gns-proxy.c:3316
 msgid "pem file to use as CA"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:3163
+#: src/gns/gnunet-gns-proxy.c:3335
 msgid "GNUnet GNS proxy"
 msgstr ""
 
-#: src/gns/gnunet-service-gns.c:928
+#: src/gns/gnunet-service-gns.c:1187
 #, fuzzy
 msgid "Failed to connect to the namestore!\n"
 msgstr "Misslyckades att ansluta till gnunetd.\n"
 
-#: src/gns/gnunet-service-gns.c:936
+#: src/gns/gnunet-service-gns.c:1195
 #, fuzzy
 msgid "Failed to connect to the namecache!\n"
 msgstr "Misslyckades att ansluta till gnunetd.\n"
 
-#: src/gns/gnunet-service-gns.c:969
+#: src/gns/gnunet-service-gns.c:1228
 #, fuzzy
 msgid "Could not connect to DHT!\n"
 msgstr "Kunde inte ansluta till gnunetd.\n"
@@ -4489,7 +4313,7 @@
 msgid "Error converting GNS response to DNS response!\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns_interceptor.c:369
+#: src/gns/gnunet-service-gns_interceptor.c:371
 #, fuzzy
 msgid "Failed to connect to the DNS service!\n"
 msgstr "Misslyckades att ansluta till gnunetd.\n"
@@ -4514,55 +4338,60 @@
 msgid "Skipping record of unsupported type %d\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns_resolver.c:1353
+#: src/gns/gnunet-service-gns_resolver.c:1354
 #, c-format
 msgid "GNS lookup resulted in DNS name that is too long (`%s')\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns_resolver.c:1888
+#: src/gns/gnunet-service-gns_resolver.c:1889
 msgid "GNS lookup recursion failed (no delegation record found)\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns_resolver.c:1912
+#: src/gns/gnunet-service-gns_resolver.c:1913
 #, 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:2194
+#: src/gns/gnunet-service-gns_resolver.c:2195
 #, c-format
 msgid "Zone %s was revoked, resolution fails\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns_resolver.c:2341
+#: src/gns/gnunet-service-gns_resolver.c:2342
 #, c-format
 msgid "Hostname `%s' is not well-formed, resolution fails\n"
 msgstr ""
 
-#: src/gns/plugin_gnsrecord_gns.c:172
+#: src/gns/plugin_gnsrecord_gns.c:203
 #, fuzzy, c-format
 msgid "Unable to parse PKEY record `%s'\n"
 msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 
-#: src/gns/plugin_gnsrecord_gns.c:201
+#: src/gns/plugin_gnsrecord_gns.c:232
 #, fuzzy, c-format
 msgid "Unable to parse GNS2DNS record `%s'\n"
 msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 
-#: src/gns/plugin_gnsrecord_gns.c:222
+#: src/gns/plugin_gnsrecord_gns.c:253
 #, fuzzy, c-format
 msgid "Failed to serialize GNS2DNS record with value `%s'\n"
 msgstr "Kunde inte tolka konfigurationsfil \"%s\".\n"
 
-#: src/gns/plugin_gnsrecord_gns.c:245
+#: src/gns/plugin_gnsrecord_gns.c:276
 #, fuzzy, c-format
 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:280
+#: src/gns/plugin_gnsrecord_gns.c:311
 #, 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
+#, 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
 msgid "Ego for not found, cannot perform lookup.\n"
 msgstr ""
@@ -4587,53 +4416,53 @@
 msgid "Failed to serialize CNAME record with value `%s'\n"
 msgstr "Kunde inte tolka konfigurationsfil \"%s\".\n"
 
-#: src/gnsrecord/plugin_gnsrecord_dns.c:486
+#: src/gnsrecord/plugin_gnsrecord_dns.c:487
 #, fuzzy, c-format
 msgid "Failed to serialize CERT record with %u bytes\n"
 msgstr "Kunde inte tolka konfigurationsfil \"%s\".\n"
 
-#: src/gnsrecord/plugin_gnsrecord_dns.c:522
+#: src/gnsrecord/plugin_gnsrecord_dns.c:523
 #, fuzzy, c-format
 msgid "Unable to parse SOA record `%s'\n"
 msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 
-#: src/gnsrecord/plugin_gnsrecord_dns.c:541
+#: src/gnsrecord/plugin_gnsrecord_dns.c:542
 #, fuzzy, c-format
 msgid "Failed to serialize SOA record with mname `%s' and rname `%s'\n"
 msgstr "Kunde inte tolka konfigurationsfil \"%s\".\n"
 
-#: src/gnsrecord/plugin_gnsrecord_dns.c:564
+#: src/gnsrecord/plugin_gnsrecord_dns.c:565
 #, fuzzy, c-format
 msgid "Failed to serialize PTR record with value `%s'\n"
 msgstr "Kunde inte tolka konfigurationsfil \"%s\".\n"
 
-#: src/gnsrecord/plugin_gnsrecord_dns.c:587
+#: src/gnsrecord/plugin_gnsrecord_dns.c:588
 #, fuzzy, c-format
 msgid "Unable to parse MX record `%s'\n"
 msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 
-#: src/gnsrecord/plugin_gnsrecord_dns.c:602
+#: src/gnsrecord/plugin_gnsrecord_dns.c:603
 #, fuzzy, c-format
 msgid "Failed to serialize MX record with hostname `%s'\n"
 msgstr "Kunde inte tolka konfigurationsfil \"%s\".\n"
 
-#: src/gnsrecord/plugin_gnsrecord_dns.c:629
+#: src/gnsrecord/plugin_gnsrecord_dns.c:630
 #, fuzzy, c-format
 msgid "Unable to parse SRV record `%s'\n"
 msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 
-#: src/gnsrecord/plugin_gnsrecord_dns.c:645
+#: src/gnsrecord/plugin_gnsrecord_dns.c:646
 #, fuzzy, c-format
 msgid "Failed to serialize SRV record with target `%s'\n"
 msgstr "Kunde inte tolka konfigurationsfil \"%s\".\n"
 
-#: src/gnsrecord/plugin_gnsrecord_dns.c:662
+#: src/gnsrecord/plugin_gnsrecord_dns.c:663
 #, fuzzy, c-format
 msgid "Unable to parse IPv6 address `%s'\n"
 msgstr "Ogiltigt svar på \"%s\".\n"
 
-#: src/gnsrecord/plugin_gnsrecord_dns.c:686
-#: src/gnsrecord/plugin_gnsrecord_dns.c:702
+#: src/gnsrecord/plugin_gnsrecord_dns.c:687
+#: src/gnsrecord/plugin_gnsrecord_dns.c:703
 #, fuzzy, c-format
 msgid "Unable to parse TLSA record string `%s'\n"
 msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
@@ -4677,99 +4506,99 @@
 msgid "Modified %u addresses, wrote %u bytes\n"
 msgstr ""
 
-#: src/hello/hello.c:1139
+#: src/hello/hello.c:1103
 #, fuzzy
 msgid "Failed to parse HELLO message: missing expiration time\n"
 msgstr "Kunde inte spara konfiguration!"
 
-#: src/hello/hello.c:1148
+#: src/hello/hello.c:1112
 #, fuzzy
 msgid "Failed to parse HELLO message: invalid expiration time\n"
 msgstr "Kunde inte spara konfiguration!"
 
-#: src/hello/hello.c:1158
+#: src/hello/hello.c:1122
 #, fuzzy
 msgid "Failed to parse HELLO message: malformed\n"
 msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 
-#: src/hello/hello.c:1169
+#: src/hello/hello.c:1133
 #, fuzzy
 msgid "Failed to parse HELLO message: missing transport plugin\n"
 msgstr "Kunde inte slå upp \"%s\": %s\n"
 
-#: src/hello/hello.c:1187
+#: src/hello/hello.c:1151
 #, c-format
 msgid "Plugin `%s' not found, skipping address\n"
 msgstr ""
 
-#: src/hello/hello.c:1195
+#: src/hello/hello.c:1159
 #, c-format
 msgid "Plugin `%s' does not support URIs yet\n"
 msgstr ""
 
-#: src/hello/hello.c:1210
+#: src/hello/hello.c:1174
 #, fuzzy, c-format
 msgid "Failed to parse `%s' as an address for plugin `%s'\n"
 msgstr "Misslyckades att binda till UDP-port %d.\n"
 
-#: src/hostlist/gnunet-daemon-hostlist.c:272
+#: src/hostlist/gnunet-daemon-hostlist.c:316
 msgid ""
 "None of the functions for the hostlist daemon were enabled.  I have no "
 "reason to run!\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist.c:328
+#: src/hostlist/gnunet-daemon-hostlist.c:375
 msgid "advertise our hostlist to other peers"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist.c:333
+#: src/hostlist/gnunet-daemon-hostlist.c:380
 msgid ""
 "bootstrap using hostlists (it is highly recommended that you always use this "
 "option)"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist.c:336
+#: src/hostlist/gnunet-daemon-hostlist.c:383
 msgid "enable learning about hostlist servers from other peers"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist.c:340
+#: src/hostlist/gnunet-daemon-hostlist.c:387
 msgid "provide a hostlist server"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist.c:356
+#: src/hostlist/gnunet-daemon-hostlist.c:403
 msgid "GNUnet hostlist server and client"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:348
+#: src/hostlist/gnunet-daemon-hostlist_client.c:371
 msgid "# bytes downloaded from hostlist servers"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:369
-#: src/hostlist/gnunet-daemon-hostlist_client.c:399
+#: src/hostlist/gnunet-daemon-hostlist_client.c:392
+#: src/hostlist/gnunet-daemon-hostlist_client.c:437
 msgid "# invalid HELLOs downloaded from hostlist servers"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:372
-#: src/hostlist/gnunet-daemon-hostlist_client.c:402
+#: src/hostlist/gnunet-daemon-hostlist_client.c:395
+#: src/hostlist/gnunet-daemon-hostlist_client.c:440
 #, fuzzy, c-format
 msgid "Invalid `%s' message received from hostlist at `%s'\n"
 msgstr "Ogiltigt meddelande mottogs den %s:%d."
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:390
+#: src/hostlist/gnunet-daemon-hostlist_client.c:413
 msgid "# valid HELLOs downloaded from hostlist servers"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:655
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1386
+#: src/hostlist/gnunet-daemon-hostlist_client.c:695
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1441
 msgid "# advertised hostlist URIs"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:685
+#: src/hostlist/gnunet-daemon-hostlist_client.c:725
 #, c-format
 msgid "# advertised URI `%s' downloaded"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:728
+#: src/hostlist/gnunet-daemon-hostlist_client.c:768
 #, c-format
 msgid ""
 "Advertised hostlist with URI `%s' could not be downloaded. Advertised URI "
@@ -4776,233 +4605,228 @@
 "gets dismissed.\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:856
+#: src/hostlist/gnunet-daemon-hostlist_client.c:896
 #, fuzzy, c-format
 msgid "Timeout trying to download hostlist from `%s'\n"
 msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:870
+#: src/hostlist/gnunet-daemon-hostlist_client.c:910
 #, c-format
 msgid "Download limit of %u bytes exceeded, stopping download\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:890
+#: src/hostlist/gnunet-daemon-hostlist_client.c:930
 #, fuzzy, c-format
 msgid "Download of hostlist from `%s' failed: `%s'\n"
 msgstr ""
 "Uppladdning av \"%s\" klar, aktuell genomsnittshastighet är %8.3f kbps.\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:896
+#: src/hostlist/gnunet-daemon-hostlist_client.c:936
 #, fuzzy, c-format
 msgid "Download of hostlist `%s' completed.\n"
 msgstr ""
 "Uppladdning av \"%s\" klar, aktuell genomsnittshastighet är %8.3f kbps.\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:904
+#: src/hostlist/gnunet-daemon-hostlist_client.c:944
 #, c-format
 msgid "Adding successfully tested hostlist `%s' datastore.\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:957
+#: src/hostlist/gnunet-daemon-hostlist_client.c:997
 #, c-format
 msgid "Bootstrapping using hostlist at `%s'.\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:965
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1005
 msgid "# hostlist downloads initiated"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1092
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1639
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1132
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1698
 msgid "# milliseconds between hostlist downloads"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1101
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1141
 #, c-format
 msgid "Have %u/%u connections.  Will consider downloading hostlist in %s\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1156
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1172
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1200
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1221
 #, fuzzy
 msgid "# active connections"
 msgstr "Nätverksanslutning"
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1332
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1387
 #, fuzzy, c-format
 msgid "Loading saved hostlist entries from file `%s' \n"
 msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1337
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1392
 #, fuzzy, c-format
 msgid "Hostlist file `%s' does not exist\n"
 msgstr "antal meddelanden att använda per iteration"
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1346
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1401
 #, fuzzy, c-format
 msgid "Could not open file `%s' for reading to load hostlists: %s\n"
 msgstr "Kunde inte slå upp \"%s\": %s\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1380
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1435
 #, c-format
 msgid "%u hostlist URIs loaded from file\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1383
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1438
 msgid "# hostlist URIs read from file"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1429
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1484
 #, fuzzy, c-format
 msgid "Could not open file `%s' for writing to save hostlists: %s\n"
 msgstr "Kunde inte slå upp \"%s\": %s\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1436
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1491
 #, fuzzy, c-format
 msgid "Writing %u hostlist URIs to `%s'\n"
 msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1460
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1477
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1515
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1532
 #, c-format
 msgid "Error writing hostlist URIs to file `%s'\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1472
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1527
 msgid "# hostlist URIs written to file"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1572
-#: src/transport/plugin_transport_http_client.c:2273
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1628
+#: src/transport/plugin_transport_http_client.c:2277
 #, c-format
 msgid "Invalid proxy type: `%s', disabling proxy! Check configuration!\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1601
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1657
 msgid "Learning is enabled on this peer\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1614
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1671
 msgid "Learning is not enabled on this peer\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1625
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1684
 #, c-format
 msgid ""
 "Since learning is not enabled on this peer, hostlist file `%s' was removed\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:182
+#: src/hostlist/gnunet-daemon-hostlist_server.c:176
 #, fuzzy
 msgid "bytes in hostlist"
 msgstr "# byte krypterade"
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:207
+#: src/hostlist/gnunet-daemon-hostlist_server.c:201
 msgid "expired addresses encountered"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:243
-#: src/hostlist/gnunet-daemon-hostlist_server.c:590
-#: src/peerinfo-tool/gnunet-peerinfo.c:389
-#: src/peerinfo-tool/gnunet-peerinfo.c:538
-#: src/topology/gnunet-daemon-topology.c:866
+#: src/hostlist/gnunet-daemon-hostlist_server.c:237
+#: src/hostlist/gnunet-daemon-hostlist_server.c:531
+#: src/peerinfo-tool/gnunet-peerinfo.c:385
+#: src/peerinfo-tool/gnunet-peerinfo.c:534
+#: src/topology/gnunet-daemon-topology.c:857
 #, fuzzy, c-format
 msgid "Error in communication with PEERINFO service: %s\n"
 msgstr "Skriv ut information om GNUnets motparter."
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:267
+#: src/hostlist/gnunet-daemon-hostlist_server.c:261
 msgid "HELLOs without addresses encountered (ignored)"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:284
+#: src/hostlist/gnunet-daemon-hostlist_server.c:278
 msgid "bytes not included in hostlist (size limit)"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:388
+#: src/hostlist/gnunet-daemon-hostlist_server.c:382
 #, c-format
 msgid "Refusing `%s' request to hostlist server\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:391
+#: src/hostlist/gnunet-daemon-hostlist_server.c:385
 msgid "hostlist requests refused (not HTTP GET)"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:403
+#: src/hostlist/gnunet-daemon-hostlist_server.c:397
 #, c-format
 msgid "Refusing `%s' request with %llu bytes of upload data\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:407
+#: src/hostlist/gnunet-daemon-hostlist_server.c:401
 msgid "hostlist requests refused (upload data)"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:414
+#: src/hostlist/gnunet-daemon-hostlist_server.c:408
 msgid "Could not handle hostlist request since I do not have a response yet\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:417
+#: src/hostlist/gnunet-daemon-hostlist_server.c:411
 msgid "hostlist requests refused (not ready)"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:422
+#: src/hostlist/gnunet-daemon-hostlist_server.c:416
 msgid "Received request for our hostlist\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:424
+#: src/hostlist/gnunet-daemon-hostlist_server.c:418
 msgid "hostlist requests processed"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:485
+#: src/hostlist/gnunet-daemon-hostlist_server.c:466
 msgid "# hostlist advertisements send"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:535
-msgid "Advertisement message could not be queued by core\n"
-msgstr ""
-
-#: src/hostlist/gnunet-daemon-hostlist_server.c:743
-#: src/peerinfo-tool/gnunet-peerinfo.c:741
-#: src/transport/gnunet-service-transport.c:856
+#: src/hostlist/gnunet-daemon-hostlist_server.c:679
+#: src/transport/gnunet-service-transport.c:2802
 #, fuzzy
 msgid "Could not access PEERINFO service.  Exiting.\n"
 msgstr "Kunde inte komma åt namnrymdsinformation.\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:755
+#: src/hostlist/gnunet-daemon-hostlist_server.c:691
 #, fuzzy, c-format
 msgid "Invalid port number %llu.  Exiting.\n"
 msgstr "Ogiltiga argument. Avslutar.\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:767
+#: src/hostlist/gnunet-daemon-hostlist_server.c:703
 #, c-format
 msgid "Hostlist service starts on %s:%llu\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:782
+#: src/hostlist/gnunet-daemon-hostlist_server.c:718
 #, fuzzy, c-format
 msgid "Address to obtain hostlist: `%s'\n"
 msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:795
+#: src/hostlist/gnunet-daemon-hostlist_server.c:731
 #, fuzzy
 msgid "BINDTOIP does not a valid IPv4 address! Ignoring BINDTOIPV4.\n"
 msgstr "\"%s\" är inte tillgänglig."
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:808
+#: src/hostlist/gnunet-daemon-hostlist_server.c:748
 #, fuzzy
 msgid "BINDTOIP does not a valid IPv4 address! Ignoring BINDTOIPV6.\n"
 msgstr "\"%s\" är inte tillgänglig."
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:829
+#: src/hostlist/gnunet-daemon-hostlist_server.c:769
 #, fuzzy, c-format
 msgid "`%s' is not a valid IPv4 address! Ignoring BINDTOIPV4.\n"
 msgstr "\"%s\" är inte tillgänglig."
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:849
+#: src/hostlist/gnunet-daemon-hostlist_server.c:789
 #, fuzzy, c-format
 msgid "`%s' is not a valid IPv6 address! Ignoring BINDTOIPV6.\n"
 msgstr "\"%s\" är inte tillgänglig."
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:889
+#: src/hostlist/gnunet-daemon-hostlist_server.c:829
 #, c-format
 msgid "Could not start hostlist HTTP server on port %u\n"
 msgstr ""
@@ -5047,77 +4871,96 @@
 msgid "Maintain egos"
 msgstr ""
 
-#: src/identity/gnunet-service-identity.c:337
+#: src/identity/gnunet-service-identity.c:390
 msgid "no default known"
 msgstr ""
 
-#: src/identity/gnunet-service-identity.c:361
+#: src/identity/gnunet-service-identity.c:412
 msgid "default configured, but ego unknown (internal error)"
 msgstr ""
 
-#: src/identity/gnunet-service-identity.c:438
-#: src/identity/gnunet-service-identity.c:669
-#: src/identity/gnunet-service-identity.c:777
+#: src/identity/gnunet-service-identity.c:501
+#: src/identity/gnunet-service-identity.c:773
+#: src/identity/gnunet-service-identity.c:895
 #, fuzzy, c-format
 msgid "Failed to write subsystem default identifier map to `%s'.\n"
 msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 
-#: src/identity/gnunet-service-identity.c:445
+#: src/identity/gnunet-service-identity.c:508
 msgid "Unknown ego specified for service (internal error)"
 msgstr ""
 
-#: src/identity/gnunet-service-identity.c:515
+#: src/identity/gnunet-service-identity.c:601
 msgid "identifier already in use for another ego"
 msgstr ""
 
-#: src/identity/gnunet-service-identity.c:646
+#: src/identity/gnunet-service-identity.c:750
 msgid "target name already exists"
 msgstr ""
 
-#: src/identity/gnunet-service-identity.c:685
-#: src/identity/gnunet-service-identity.c:794
+#: src/identity/gnunet-service-identity.c:789
+#: src/identity/gnunet-service-identity.c:912
 msgid "no matching ego found"
 msgstr ""
 
-#: src/identity/gnunet-service-identity.c:828
+#: src/identity/gnunet-service-identity.c:946
 #, fuzzy, c-format
 msgid "Failed to parse ego information in `%s'\n"
 msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 
-#: src/identity/gnunet-service-identity.c:901
+#: src/identity/gnunet-service-identity.c:1004
 #, fuzzy, c-format
 msgid "Failed to parse subsystem identity configuration file `%s'\n"
 msgstr "Kunde inte spara konfigurationsfil \"%s\":"
 
-#: src/identity/gnunet-service-identity.c:913
+#: src/identity/gnunet-service-identity.c:1014
 #, fuzzy, c-format
 msgid "Failed to create directory `%s' for storing egos\n"
 msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 
-#: src/identity/plugin_rest_identity.c:938
+#: src/identity/plugin_rest_identity.c:967
 #, fuzzy
 msgid "Identity REST API initialized\n"
 msgstr " Anslutning misslyckades\n"
 
-#: src/identity-provider/gnunet-identity-token.c:101
+#: src/identity-provider/gnunet-identity-token.c:66
+#, fuzzy
+msgid "Option `-t' is required\n"
+msgstr "%s: flagga \"%s\" är tvetydig\n"
+
+#: src/identity-provider/gnunet-identity-token.c:77
+#, fuzzy, c-format
+msgid "Token `%s' is malformed\n"
+msgstr "Ogiltigt argument: \"%s\"\n"
+
+#: src/identity-provider/gnunet-identity-token.c:163
 msgid "GNUid token"
 msgstr ""
 
-#: src/identity-provider/gnunet-identity-token.c:104
+#: src/identity-provider/gnunet-identity-token.c:166
 msgid "Print token contents"
 msgstr ""
 
-#: src/identity-provider/plugin_rest_identity_provider.c:1126
+#: src/identity-provider/plugin_rest_identity_provider.c:1163
 #, fuzzy
 msgid "Identity Token REST API initialized\n"
 msgstr " Anslutning misslyckades\n"
 
-#: src/mysql/mysql.c:174
+#: src/multicast/gnunet-multicast.c:48 src/multicast/gnunet-multicast.c:72
+msgid "This command doesn't do anything yet."
+msgstr ""
+
+#: src/my/my.c:198 src/my/my.c:217
+#, fuzzy, c-format
+msgid "%s failed at %s:%d with error: %s\n"
+msgstr "\"%s\" misslyckades vid %s:%d med fel: %s\n"
+
+#: src/mysql/mysql.c:180
 #, c-format
 msgid "Trying to use file `%s' for MySQL configuration.\n"
 msgstr "Försöker använda fil \"%s\" för MySQL-konfiguration.\n"
 
-#: src/mysql/mysql.c:181
+#: src/mysql/mysql.c:187
 #, fuzzy, c-format
 msgid "Could not access file `%s': %s\n"
 msgstr "Kunde inte köra \"%s\": %s\n"
@@ -5127,7 +4970,7 @@
 msgid "No records found for `%s'"
 msgstr "%d filer hittades i katalog.\n"
 
-#: src/namecache/gnunet-namecache.c:122 src/namestore/gnunet-namestore.c:395
+#: src/namecache/gnunet-namecache.c:122 src/namestore/gnunet-namestore.c:415
 #, c-format
 msgid "\tCorrupt or unsupported record of type %u\n"
 msgstr ""
@@ -5147,7 +4990,7 @@
 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:1081
+#: src/namecache/gnunet-namecache.c:230 src/namestore/gnunet-namestore.c:1153
 msgid "name of the record to add/delete/display"
 msgstr ""
 
@@ -5156,19 +4999,26 @@
 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:1113
+#: src/namecache/gnunet-namecache.c:244 src/namestore/gnunet-namestore.c:1189
 #, fuzzy
 msgid "GNUnet zone manipulation tool"
 msgstr "GNUnet-konfiguration"
 
-#: src/namecache/namecache_api.c:276
+#: src/namecache/namecache_api.c:296
 msgid "Namecache failed to cache block"
 msgstr ""
 
+#: src/namecache/namecache_api.c:383
+#, fuzzy
+msgid "Error communicating with namecache service"
+msgstr "Skriv ut information om GNUnets motparter."
+
 #: src/namecache/plugin_namecache_flat.c:119
-#: src/namecache/plugin_namecache_flat.c:244
+#: src/namecache/plugin_namecache_flat.c:253
 #: src/namestore/plugin_namestore_flat.c:179
-#: src/namestore/plugin_namestore_flat.c:351
+#: src/namestore/plugin_namestore_flat.c:375
+#: src/peerstore/plugin_peerstore_flat.c:379
+#: src/peerstore/plugin_peerstore_flat.c:527
 #, fuzzy, c-format
 msgid "Unable to initialize file: %s.\n"
 msgstr "Kunde inte initiera SQLite.\n"
@@ -5175,17 +5025,19 @@
 
 #: src/namecache/plugin_namecache_flat.c:130
 #: src/namestore/plugin_namestore_flat.c:190
+#: src/peerstore/plugin_peerstore_flat.c:394
 #, fuzzy, c-format
 msgid "Unable to get filesize: %s.\n"
 msgstr "Kunde inte skapa namnrymd \"%s\" (existerar?).\n"
 
-#: src/namecache/plugin_namecache_flat.c:145
-#: src/namestore/plugin_namestore_flat.c:202
+#: src/namecache/plugin_namecache_flat.c:149
+#: src/namestore/plugin_namestore_flat.c:203
+#: src/peerstore/plugin_peerstore_flat.c:406
 #, fuzzy, c-format
 msgid "Unable to read file: %s.\n"
 msgstr "Kunde inte skapa namnrymd \"%s\" (existerar?).\n"
 
-#: src/namecache/plugin_namecache_flat.c:399
+#: src/namecache/plugin_namecache_flat.c:408
 msgid "flat plugin running\n"
 msgstr ""
 
@@ -5203,7 +5055,7 @@
 "Fel vid uppladdning av fil: %s\n"
 
 #: src/namestore/gnunet-namestore.c:330
-#: src/namestore/plugin_rest_namestore.c:547
+#: src/namestore/plugin_rest_namestore.c:562
 #, fuzzy, c-format
 msgid "Deleting record failed, record does not exist%s%s\n"
 msgstr ""
@@ -5211,7 +5063,7 @@
 "Fel vid uppladdning av fil: %s\n"
 
 #: src/namestore/gnunet-namestore.c:337
-#: src/namestore/plugin_rest_namestore.c:556
+#: src/namestore/plugin_rest_namestore.c:571
 #, fuzzy, c-format
 msgid "Deleting record failed%s%s\n"
 msgstr ""
@@ -5218,253 +5070,238 @@
 "\n"
 "Fel vid uppladdning av fil: %s\n"
 
-#: src/namestore/gnunet-namestore.c:475 src/namestore/gnunet-namestore.c:483
-#: src/namestore/gnunet-namestore.c:491
+#: src/namestore/gnunet-namestore.c:519 src/namestore/gnunet-namestore.c:527
+#: src/namestore/gnunet-namestore.c:535
 #, c-format
 msgid "A %s record exists already under `%s', no other records can be added.\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:505 src/namestore/gnunet-namestore.c:517
-#: src/namestore/gnunet-namestore.c:529
+#: src/namestore/gnunet-namestore.c:549 src/namestore/gnunet-namestore.c:561
+#: src/namestore/gnunet-namestore.c:573
 #, c-format
 msgid "Records already exist under `%s', cannot add `%s' record.\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:626
-#: src/namestore/plugin_rest_namestore.c:580
+#: src/namestore/gnunet-namestore.c:698
+#: src/namestore/plugin_rest_namestore.c:597
 #, c-format
 msgid "There are no records under label `%s' that could be deleted.\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:665
+#: src/namestore/gnunet-namestore.c:739
 #, c-format
 msgid ""
 "There are no records under label `%s' that match the request for deletion.\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:698
-#: src/namestore/plugin_rest_namestore.c:954
-#: src/transport/gnunet-transport.c:1769
-#: src/transport/gnunet-transport-profiler.c:497
+#: src/namestore/gnunet-namestore.c:776
+#: src/namestore/plugin_rest_namestore.c:1003
 #, fuzzy, c-format
-msgid "Service `%s' is not running\n"
-msgstr "\"%s\" är inte en fil.\n"
+msgid "Ego `%s' not known to identity service\n"
+msgstr "\"%s\": okänd tjänst: %s\n"
 
-#: src/namestore/gnunet-namestore.c:706
+#: src/namestore/gnunet-namestore.c:791
 #, c-format
 msgid "No options given\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:717
-#: src/namestore/gnunet-namestore-fcfsd.c:978
-#: src/namestore/plugin_rest_namestore.c:963
+#: src/namestore/gnunet-namestore.c:802
+#: src/namestore/gnunet-namestore-fcfsd.c:1034
+#: src/namestore/plugin_rest_namestore.c:1016
 #, fuzzy
 msgid "Failed to connect to namestore\n"
 msgstr "Misslyckades att ansluta till gnunetd.\n"
 
-#: src/namestore/gnunet-namestore.c:725 src/namestore/gnunet-namestore.c:734
-#: src/namestore/gnunet-namestore.c:751 src/namestore/gnunet-namestore.c:773
-#: src/namestore/gnunet-namestore.c:813
+#: src/namestore/gnunet-namestore.c:810 src/namestore/gnunet-namestore.c:819
+#: src/namestore/gnunet-namestore.c:838 src/namestore/gnunet-namestore.c:861
+#: src/namestore/gnunet-namestore.c:915
 #, fuzzy, c-format
 msgid "Missing option `%s' for operation `%s'\n"
 msgstr "Konfigurationsfil \"%s\" skapad.\n"
 
-#: src/namestore/gnunet-namestore.c:726 src/namestore/gnunet-namestore.c:735
-#: src/namestore/gnunet-namestore.c:752 src/namestore/gnunet-namestore.c:774
+#: src/namestore/gnunet-namestore.c:811 src/namestore/gnunet-namestore.c:820
+#: src/namestore/gnunet-namestore.c:839 src/namestore/gnunet-namestore.c:863
 msgid "add"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:743
-#: src/namestore/plugin_rest_namestore.c:650
+#: src/namestore/gnunet-namestore.c:829
+#: src/namestore/plugin_rest_namestore.c:671
 #, fuzzy, c-format
 msgid "Unsupported type `%s'\n"
 msgstr "Kommando \"%s\" stöds ej.  Avbryter.\n"
 
-#: src/namestore/gnunet-namestore.c:763
-#: src/namestore/plugin_rest_namestore.c:668
-#: src/namestore/plugin_rest_namestore.c:708
+#: src/namestore/gnunet-namestore.c:851
+#: src/namestore/plugin_rest_namestore.c:689
+#: src/namestore/plugin_rest_namestore.c:729
 #, fuzzy, c-format
 msgid "Value `%s' invalid for record type `%s'\n"
 msgstr "%s: symbolvärde \"%s\" ogiltigt för %s\n"
 
-#: src/namestore/gnunet-namestore.c:799
+#: src/namestore/gnunet-namestore.c:896
 #, fuzzy, c-format
 msgid "Invalid time format `%s'\n"
 msgstr "Ogiltigt format för IP: \"%s\"\n"
 
-#: src/namestore/gnunet-namestore.c:814
+#: src/namestore/gnunet-namestore.c:916
 msgid "del"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:842
+#: src/namestore/gnunet-namestore.c:950
 #, fuzzy, c-format
 msgid "Invalid public key for reverse lookup `%s'\n"
 msgstr "Ogiltigt argument: \"%s\"\n"
 
-#: src/namestore/gnunet-namestore.c:866
-#: src/peerinfo-tool/gnunet-peerinfo.c:819
+#: src/namestore/gnunet-namestore.c:979 src/peerinfo-tool/gnunet-peerinfo.c:775
 #, fuzzy, c-format
 msgid "Invalid URI `%s'\n"
 msgstr "Ogiltiga argument: "
 
-#: src/namestore/gnunet-namestore.c:901
+#: src/namestore/gnunet-namestore.c:1014
 #, fuzzy, c-format
 msgid "Invalid nick `%s'\n"
 msgstr "Ogiltiga argument: "
 
-#: src/namestore/gnunet-namestore.c:941
-#: src/namestore/plugin_rest_namestore.c:999
+#: src/namestore/gnunet-namestore.c:1051
+#: src/namestore/plugin_rest_namestore.c:1046
 #, fuzzy, c-format
-msgid "Ego `%s' not known to identity service\n"
-msgstr "\"%s\": okänd tjänst: %s\n"
-
-#: src/namestore/gnunet-namestore.c:968
-#: src/namestore/plugin_rest_namestore.c:1026
-#, fuzzy, c-format
 msgid "No default ego configured in identity service\n"
 msgstr "\"%s\": okänd tjänst: %s\n"
 
-#: src/namestore/gnunet-namestore.c:1004
-#: src/namestore/plugin_rest_namestore.c:1066
+#: src/namestore/gnunet-namestore.c:1108
+#: src/namestore/plugin_rest_namestore.c:1142
 #, fuzzy, c-format
-msgid "Identity service is not running\n"
-msgstr "\"%s\" är inte en fil.\n"
-
-#: src/namestore/gnunet-namestore.c:1015
-#: src/namestore/plugin_rest_namestore.c:1107
-#, fuzzy, c-format
 msgid "Cannot connect to identity service\n"
 msgstr "Kunde inte ansluta till gnunetd.\n"
 
-#: src/namestore/gnunet-namestore.c:1063
+#: src/namestore/gnunet-namestore.c:1135
 msgid "add record"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1066
+#: src/namestore/gnunet-namestore.c:1138
 msgid "delete record"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1069
+#: src/namestore/gnunet-namestore.c:1141
 msgid "display records"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1072
+#: src/namestore/gnunet-namestore.c:1144
 msgid ""
 "expiration time for record to use (for adding only), \"never\" is possible"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1075
+#: src/namestore/gnunet-namestore.c:1147
 #, fuzzy
 msgid "set the desired nick name for the zone"
 msgstr "Skriv ut information om GNUnets motparter."
 
-#: src/namestore/gnunet-namestore.c:1078
+#: src/namestore/gnunet-namestore.c:1150
 #, fuzzy
 msgid "monitor changes in the namestore"
 msgstr "Misslyckades att ansluta till gnunetd.\n"
 
-#: src/namestore/gnunet-namestore.c:1084
+#: src/namestore/gnunet-namestore.c:1156
 #, fuzzy
 msgid "determine our name for the given PKEY"
 msgstr "Skriv ut information om GNUnets motparter."
 
-#: src/namestore/gnunet-namestore.c:1087
+#: src/namestore/gnunet-namestore.c:1159
 msgid "type of the record to add/delete/display"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1090
+#: src/namestore/gnunet-namestore.c:1162
 msgid "URI to import into our zone"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1093
+#: src/namestore/gnunet-namestore.c:1165
 msgid "value of the record to add/delete"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1096
+#: src/namestore/gnunet-namestore.c:1168
 msgid "create or list public record"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1099
+#: src/namestore/gnunet-namestore.c:1171
 msgid ""
 "create shadow record (only valid if all other records of the same type have "
 "expired"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1102
+#: src/namestore/gnunet-namestore.c:1174
 #, fuzzy
 msgid "name of the ego controlling the zone"
 msgstr "Visa värde av alternativet"
 
-#: src/namestore/gnunet-namestore-fcfsd.c:476
+#: src/namestore/gnunet-namestore-fcfsd.c:508
 #, fuzzy, c-format
 msgid "Unsupported form value `%s'\n"
 msgstr "Kommando \"%s\" stöds ej.  Avbryter.\n"
 
-#: src/namestore/gnunet-namestore-fcfsd.c:503
+#: src/namestore/gnunet-namestore-fcfsd.c:535
 #, fuzzy, c-format
 msgid "Failed to create record for domain `%s': %s\n"
 msgstr "Kunde inte tolka konfigurationsfil \"%s\".\n"
 
-#: src/namestore/gnunet-namestore-fcfsd.c:537
+#: src/namestore/gnunet-namestore-fcfsd.c:555
+msgid "Error when mapping zone to name\n"
+msgstr ""
+
+#: src/namestore/gnunet-namestore-fcfsd.c:585
 #, c-format
 msgid "Found existing name `%s' for the given key\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:546
-msgid "Error when mapping zone to name\n"
-msgstr ""
-
-#: src/namestore/gnunet-namestore-fcfsd.c:608
+#: src/namestore/gnunet-namestore-fcfsd.c:662
 #, c-format
 msgid "Found %u existing records for domain `%s'\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:664
+#: src/namestore/gnunet-namestore-fcfsd.c:718
 #, fuzzy, c-format
 msgid "Failed to create page for `%s'\n"
 msgstr "Kunde inte skapa namnrymd \"%s\" (existerar?).\n"
 
-#: src/namestore/gnunet-namestore-fcfsd.c:680
+#: src/namestore/gnunet-namestore-fcfsd.c:734
 #, fuzzy, c-format
 msgid "Failed to setup post processor for `%s'\n"
 msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 
-#: src/namestore/gnunet-namestore-fcfsd.c:716
+#: src/namestore/gnunet-namestore-fcfsd.c:770
 msgid "Domain name must not contain `.'\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:724
+#: src/namestore/gnunet-namestore-fcfsd.c:778
 msgid "Domain name must not contain `+'\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:918
+#: src/namestore/gnunet-namestore-fcfsd.c:974
 msgid "No ego configured for `fcfsd` subsystem\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:944
+#: src/namestore/gnunet-namestore-fcfsd.c:1000
 #, fuzzy
 msgid "Failed to start HTTP server\n"
 msgstr "Misslyckades att starta samling.\n"
 
-#: src/namestore/gnunet-namestore-fcfsd.c:986
+#: src/namestore/gnunet-namestore-fcfsd.c:1042
 #, fuzzy
 msgid "Failed to connect to identity\n"
 msgstr "Misslyckades att ansluta till gnunetd.\n"
 
-#: src/namestore/gnunet-namestore-fcfsd.c:1018
+#: src/namestore/gnunet-namestore-fcfsd.c:1074
 msgid "GNU Name System First Come First Serve name registration service"
 msgstr ""
 
-#: src/namestore/gnunet-service-namestore.c:655
+#: src/namestore/gnunet-service-namestore.c:612
 #, fuzzy, c-format
 msgid "Failed to replicate block in namecache: %s\n"
 msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 
-#: src/namestore/namestore_api.c:275
+#: src/namestore/namestore_api.c:379
 msgid "Namestore failed to store record\n"
 msgstr ""
 
-#: src/namestore/plugin_namestore_flat.c:632
+#: src/namestore/plugin_namestore_flat.c:656
 msgid "flat file database running\n"
 msgstr ""
 
@@ -5477,69 +5314,69 @@
 msgid "GNUnet NAT traversal autoconfigure daemon"
 msgstr ""
 
-#: src/nat/gnunet-nat-server.c:279
+#: src/nat/gnunet-nat-server.c:321
 #, c-format
 msgid "Please pass valid port number as the first argument! (got `%s')\n"
 msgstr ""
 
-#: src/nat/gnunet-nat-server.c:321
+#: src/nat/gnunet-nat-server.c:363
 msgid "GNUnet NAT traversal test helper daemon"
 msgstr ""
 
-#: src/nat/nat_auto.c:388
+#: src/nat/nat_auto.c:385
 msgid "NAT traversal with ICMP Server succeeded.\n"
 msgstr ""
 
-#: src/nat/nat_auto.c:389
+#: src/nat/nat_auto.c:386
 msgid "NAT traversal with ICMP Server failed.\n"
 msgstr ""
 
-#: src/nat/nat_auto.c:408
+#: src/nat/nat_auto.c:405
 #, fuzzy
 msgid "Testing connection reversal with ICMP server.\n"
 msgstr "Skriv ut information om GNUnets motparter."
 
-#: src/nat/nat_auto.c:440
+#: src/nat/nat_auto.c:437
 #, fuzzy, c-format
 msgid "Detected external IP `%s'\n"
 msgstr "Mottog ogiltig RPC \"%s\".\n"
 
-#: src/nat/nat_auto.c:574
+#: src/nat/nat_auto.c:572
 msgid "This system has a global IPv6 address, setting IPv6 to supported.\n"
 msgstr ""
 
-#: src/nat/nat_auto.c:592
+#: src/nat/nat_auto.c:590
 #, c-format
 msgid "Detected internal network address `%s'.\n"
 msgstr ""
 
-#: src/nat/nat_auto.c:662 src/nat/nat_test.c:360
+#: src/nat/nat_auto.c:681 src/nat/nat_test.c:403
 #, fuzzy
 msgid "Failed to connect to `gnunet-nat-server'\n"
 msgstr "Misslyckades att ansluta till gnunetd.\n"
 
-#: src/nat/nat_auto.c:709
+#: src/nat/nat_auto.c:724
 msgid "upnpc found, enabling its use\n"
 msgstr ""
 
-#: src/nat/nat_auto.c:710
+#: src/nat/nat_auto.c:725
 #, fuzzy
 msgid "upnpc not found\n"
 msgstr "Kommando \"%s\" hittades inte!\n"
 
-#: src/nat/nat_auto.c:742
+#: src/nat/nat_auto.c:762
 msgid "test_icmp_server not possible, as we have no public IPv4 address\n"
 msgstr ""
 
-#: src/nat/nat_auto.c:750 src/nat/nat_auto.c:796
+#: src/nat/nat_auto.c:774 src/nat/nat_auto.c:834
 msgid "test_icmp_server not possible, as we are not behind NAT\n"
 msgstr ""
 
-#: src/nat/nat_auto.c:758 src/nat/nat_auto.c:805
+#: src/nat/nat_auto.c:786 src/nat/nat_auto.c:846
 msgid "No working gnunet-helper-nat-server found\n"
 msgstr ""
 
-#: src/nat/nat_auto.c:788
+#: src/nat/nat_auto.c:823
 msgid "test_icmp_client not possible, as we have no internal IPv4 address\n"
 msgstr ""
 
@@ -5553,26 +5390,26 @@
 msgid "Failed to start %s\n"
 msgstr "Misslyckades att starta samling.\n"
 
-#: src/nat/nat.c:1321
+#: src/nat/nat.c:1327
 msgid "Error while running upnp client:\n"
 msgstr ""
 
-#: src/nat/nat.c:1396
+#: src/nat/nat.c:1402
 #, fuzzy, c-format
 msgid "Failed to run upnp client for port %u\n"
 msgstr "Misslyckades att initiera tjänsten \"%s\".\n"
 
-#: src/nat/nat.c:1540
+#: src/nat/nat.c:1546
 msgid "malformed"
 msgstr ""
 
-#: src/nat/nat.c:1594
+#: src/nat/nat.c:1600
 msgid ""
 "UPnP enabled in configuration, but UPnP client `upnpc` command not found, "
 "disabling UPnP \n"
 msgstr ""
 
-#: src/nat/nat.c:1723 src/nat/nat.c:1736
+#: src/nat/nat.c:1726 src/nat/nat.c:1739
 #, c-format
 msgid ""
 "Configuration requires `%s', but binary is not installed properly (SUID bit "
@@ -5579,94 +5416,94 @@
 "not set).  Option disabled.\n"
 msgstr ""
 
-#: src/nat/nat.c:1891
+#: src/nat/nat.c:1903
 msgid "Internal IP address not known, cannot use ICMP NAT traversal method\n"
 msgstr ""
 
-#: src/nat/nat.c:1907
+#: src/nat/nat.c:1919
 #, c-format
 msgid "Running gnunet-helper-nat-client %s %s %u\n"
 msgstr ""
 
-#: src/nat/nat.c:1998
+#: src/nat/nat.c:2010
 msgid "Operation Successful"
 msgstr ""
 
-#: src/nat/nat.c:2000
+#: src/nat/nat.c:2012
 msgid "Internal Failure (IPC, ...)"
 msgstr ""
 
-#: src/nat/nat.c:2002
+#: src/nat/nat.c:2014
 msgid "Failure in network subsystem, check permissions."
 msgstr ""
 
-#: src/nat/nat.c:2004
+#: src/nat/nat.c:2016
 msgid "Encountered timeout while performing operation"
 msgstr ""
 
-#: src/nat/nat.c:2006
+#: src/nat/nat.c:2018
 msgid "detected that we are offline"
 msgstr ""
 
-#: src/nat/nat.c:2008
+#: src/nat/nat.c:2020
 #, fuzzy
 msgid "`upnpc` command not found"
 msgstr "Kommando \"%s\" hittades inte!\n"
 
-#: src/nat/nat.c:2010
+#: src/nat/nat.c:2022
 #, fuzzy
 msgid "Failed to run `upnpc` command"
 msgstr "Misslyckades att starta samling.\n"
 
-#: src/nat/nat.c:2012
+#: src/nat/nat.c:2024
 #, fuzzy
 msgid "`upnpc' command took too long, process killed"
 msgstr "Kommando \"%s\" hittades inte!\n"
 
-#: src/nat/nat.c:2014
+#: src/nat/nat.c:2026
 msgid "`upnpc' command failed to establish port mapping"
 msgstr ""
 
-#: src/nat/nat.c:2016
+#: src/nat/nat.c:2028
 #, fuzzy
 msgid "`external-ip' command not found"
 msgstr "Kommando \"%s\" hittades inte!\n"
 
-#: src/nat/nat.c:2018
+#: src/nat/nat.c:2030
 #, fuzzy
 msgid "Failed to run `external-ip` command"
 msgstr "Misslyckades att starta samling.\n"
 
-#: src/nat/nat.c:2020
+#: src/nat/nat.c:2032
 msgid "`external-ip' command output invalid"
 msgstr ""
 
-#: src/nat/nat.c:2022
+#: src/nat/nat.c:2034
 msgid "no valid address was returned by `external-ip'"
 msgstr ""
 
-#: src/nat/nat.c:2024
+#: src/nat/nat.c:2036
 #, fuzzy
 msgid "Could not determine interface with internal/local network address"
 msgstr "Kunde inte fastställa min publika IPv6-adress.\n"
 
-#: src/nat/nat.c:2026
+#: src/nat/nat.c:2038
 msgid "No functioning gnunet-helper-nat-server installation found"
 msgstr ""
 
-#: src/nat/nat.c:2028
+#: src/nat/nat.c:2040
 msgid "NAT test could not be initialized"
 msgstr ""
 
-#: src/nat/nat.c:2030
+#: src/nat/nat.c:2042
 msgid "NAT test timeout reached"
 msgstr ""
 
-#: src/nat/nat.c:2032
+#: src/nat/nat.c:2044
 msgid "could not register NAT"
 msgstr ""
 
-#: src/nat/nat.c:2034
+#: src/nat/nat.c:2046
 msgid "No working gnunet-helper-nat-client installation found"
 msgstr ""
 
@@ -5678,27 +5515,18 @@
 msgid "`upnpc' command not found\n"
 msgstr ""
 
-#: src/nat/nat_test.c:460
+#: src/nat/nat_test.c:518
 #, c-format
 msgid "Failed to create listen socket bound to `%s' for NAT test: %s\n"
 msgstr ""
 
-#: src/nat/nat_test.c:497
+#: src/nat/nat_test.c:568
 #, fuzzy
 msgid "NAT test failed to start NAT library\n"
 msgstr "Misslyckades att starta samling.\n"
 
-#: src/nse/gnunet-nse.c:116
+#: src/nse/gnunet-nse.c:122
 #, fuzzy
-msgid "NSE service is not running\n"
-msgstr "\"%s\" är inte en fil.\n"
-
-#: src/nse/gnunet-nse.c:121
-msgid "Error while checking if NSE service is running or not\n"
-msgstr ""
-
-#: src/nse/gnunet-nse.c:167
-#, fuzzy
 msgid "Show network size estimates from NSE service."
 msgstr "# byte mottogs via TCP"
 
@@ -5728,175 +5556,134 @@
 msgid "Measure quality and performance of the NSE service."
 msgstr "Kan inte tillgå tjänsten"
 
-#: src/nse/gnunet-service-nse.c:1535
-#: src/revocation/gnunet-service-revocation.c:844 src/util/gnunet-scrypt.c:276
+#: src/nse/gnunet-service-nse.c:1536
+#: src/revocation/gnunet-service-revocation.c:832 src/util/gnunet-scrypt.c:276
 msgid "Value is too large.\n"
 msgstr ""
 
-#: src/peerinfo/gnunet-service-peerinfo.c:225
+#: src/peerinfo/gnunet-service-peerinfo.c:178
 #, fuzzy, c-format
 msgid "Removing expired address of transport `%s'\n"
 msgstr "Tillgängliga transport(er): %s\n"
 
-#: src/peerinfo/gnunet-service-peerinfo.c:362
+#: src/peerinfo/gnunet-service-peerinfo.c:310
 #, fuzzy, c-format
 msgid "Failed to parse HELLO in file `%s': %s\n"
 msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 
-#: src/peerinfo/gnunet-service-peerinfo.c:382
-#: src/peerinfo/gnunet-service-peerinfo.c:411
+#: src/peerinfo/gnunet-service-peerinfo.c:331
+#: src/peerinfo/gnunet-service-peerinfo.c:362
 #, fuzzy, c-format
 msgid "Failed to parse HELLO in file `%s'\n"
 msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 
-#: src/peerinfo/gnunet-service-peerinfo.c:491
+#: src/peerinfo/gnunet-service-peerinfo.c:446
 msgid "# peers known"
 msgstr ""
 
-#: src/peerinfo/gnunet-service-peerinfo.c:529
+#: src/peerinfo/gnunet-service-peerinfo.c:489
 #, c-format
 msgid ""
 "File `%s' in directory `%s' does not match naming convention. Removed.\n"
 msgstr ""
 
-#: src/peerinfo/gnunet-service-peerinfo.c:683
+#: src/peerinfo/gnunet-service-peerinfo.c:655
 #, fuzzy, c-format
 msgid "Scanning directory `%s'\n"
 msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 
-#: src/peerinfo/gnunet-service-peerinfo.c:689
+#: src/peerinfo/gnunet-service-peerinfo.c:663
 #, c-format
 msgid "Still no peers found in `%s'!\n"
 msgstr ""
 
-#: src/peerinfo/gnunet-service-peerinfo.c:1061
+#: src/peerinfo/gnunet-service-peerinfo.c:1076
 #, fuzzy, c-format
 msgid "Cleaning up directory `%s'\n"
 msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 
-#: src/peerinfo/gnunet-service-peerinfo.c:1391
+#: src/peerinfo/gnunet-service-peerinfo.c:1405
 #, c-format
 msgid "Importing HELLOs from `%s'\n"
 msgstr ""
 
-#: src/peerinfo/gnunet-service-peerinfo.c:1404
+#: src/peerinfo/gnunet-service-peerinfo.c:1418
 msgid "Skipping import of included HELLOs\n"
 msgstr ""
 
-#: src/peerinfo/peerinfo_api.c:237
-msgid "aborted due to explicit disconnect request"
-msgstr ""
-
-#: src/peerinfo/peerinfo_api.c:361
+#: src/peerinfo/peerinfo_api.c:220
 #, fuzzy
-msgid "failed to transmit request (service down?)"
-msgstr "Misslyckades att skicka HTTP-begäran till värd \"%s\": %s\n"
-
-#: src/peerinfo/peerinfo_api.c:516
-#, fuzzy
 msgid "Failed to receive response from `PEERINFO' service."
 msgstr "Misslyckades att ta emot svar till \"%s\" meddelande från gnunetd\n"
 
-#: src/peerinfo/peerinfo_api.c:560 src/peerinfo/peerinfo_api.c:583
-#: src/peerinfo/peerinfo_api.c:600 src/peerinfo/peerinfo_api.c:613
-#: src/peerinfo/peerinfo_api.c:628
-#, fuzzy
-msgid "Received invalid message from `PEERINFO' service."
-msgstr "mottog ogiltigt \"%s\" meddelande: %s.\n"
-
-#: src/peerinfo/peerinfo_api.c:715
-#, fuzzy
-msgid "Timeout transmitting iteration request to `PEERINFO' service."
-msgstr "Misslyckades att initiera tjänsten \"%s\".\n"
-
-#: src/peerinfo/peerinfo_api_notify.c:268
+#: src/peerinfo-tool/gnunet-peerinfo.c:239
 #, fuzzy, c-format
-msgid "Could not connect to `%s' service.\n"
-msgstr "Kunde inte ansluta till gnunetd.\n"
-
-#: src/peerinfo-tool/gnunet-peerinfo.c:243
-#, fuzzy, c-format
 msgid "%sPeer `%s'\n"
 msgstr "Jag är ändpunkt \"%s\".\n"
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:250
+#: src/peerinfo-tool/gnunet-peerinfo.c:246
 #, c-format
 msgid "\tExpires: %s \t %s\n"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:303
+#: src/peerinfo-tool/gnunet-peerinfo.c:299
 #, fuzzy, c-format
 msgid "Failure: Cannot convert address to string for peer `%s'\n"
 msgstr "Misslyckades att binda till UDP-port %d.\n"
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:470
+#: src/peerinfo-tool/gnunet-peerinfo.c:466
 #, c-format
 msgid "Failure: Received invalid %s\n"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:484
+#: src/peerinfo-tool/gnunet-peerinfo.c:480
 #, fuzzy, c-format
 msgid "Failed to write HELLO with %u bytes to file `%s'\n"
 msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:503
+#: src/peerinfo-tool/gnunet-peerinfo.c:499
 #, c-format
 msgid "Wrote %s HELLO containing %u addresses with %u bytes to file `%s'\n"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:573
+#: src/peerinfo-tool/gnunet-peerinfo.c:799
 #, c-format
-msgid "Failure adding HELLO: %s\n"
-msgstr ""
-
-#: src/peerinfo-tool/gnunet-peerinfo.c:700
-#, fuzzy, c-format
-msgid "Failed to get my own HELLO from this peer!\n"
-msgstr "Kunde inte skapa värdnyckel!\n"
-
-#: src/peerinfo-tool/gnunet-peerinfo.c:732
-#, fuzzy, c-format
-msgid "Service `%s' is not running, please start GNUnet\n"
-msgstr "\"%s\" är inte en fil.\n"
-
-#: src/peerinfo-tool/gnunet-peerinfo.c:843
-#, c-format
 msgid "I am peer `%s'.\n"
 msgstr "Jag är ändpunkt \"%s\".\n"
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:884
+#: src/peerinfo-tool/gnunet-peerinfo.c:842
 msgid "don't resolve host names"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:887
+#: src/peerinfo-tool/gnunet-peerinfo.c:845
 msgid "output only the identity strings"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:890
+#: src/peerinfo-tool/gnunet-peerinfo.c:848
 msgid "include friend-only information"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:893
+#: src/peerinfo-tool/gnunet-peerinfo.c:851
 msgid "output our own identity only"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:896
+#: src/peerinfo-tool/gnunet-peerinfo.c:854
 msgid "list all known peers"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:899
+#: src/peerinfo-tool/gnunet-peerinfo.c:857
 msgid "dump hello to file"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:902
+#: src/peerinfo-tool/gnunet-peerinfo.c:860
 msgid "also output HELLO uri(s)"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:905
+#: src/peerinfo-tool/gnunet-peerinfo.c:863
 msgid "add given HELLO uri to the database"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:919
+#: src/peerinfo-tool/gnunet-peerinfo.c:880
 #, fuzzy
 msgid "Print information about peers."
 msgstr "Skriv ut information om GNUnets motparter."
@@ -5923,68 +5710,31 @@
 msgid "peerstore"
 msgstr ""
 
-#: src/peerstore/gnunet-service-peerstore.c:395
-#, fuzzy
-msgid "Malformed iterate request.\n"
-msgstr "Kunde inte spara konfigurationsfil \"%s\":"
-
-#: src/peerstore/gnunet-service-peerstore.c:402
-msgid "Sub system not supplied in client iterate request.\n"
-msgstr ""
-
-#: src/peerstore/gnunet-service-peerstore.c:462
-#, fuzzy
-msgid "Malformed store request from client\n"
-msgstr "Mottog ogiltig \"%s\" begäran (storlek %d)\n"
-
-#: src/peerstore/gnunet-service-peerstore.c:470
-msgid "Full key not supplied in client store request\n"
-msgstr ""
-
-#: src/peerstore/gnunet-service-peerstore.c:489
-#, fuzzy
-msgid "Failed to store requested value, database error."
-msgstr "Misslyckades att skicka HTTP-begäran till värd \"%s\": %s\n"
-
-#: src/peerstore/gnunet-service-peerstore.c:568
-msgid "No database backend configured\n"
-msgstr ""
-
-#: src/peerstore/gnunet-service-peerstore.c:579
+#: src/peerstore/gnunet-service-peerstore.c:588
 #, 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:329
+#: src/peerstore/peerstore_api.c:296
 #, c-format
 msgid "Received an error notification from MQ of type: %d\n"
 msgstr ""
 
-#: src/peerstore/peerstore_api.c:376
+#: src/peerstore/peerstore_api.c:344
 msgid "timeout"
 msgstr ""
 
-#: src/peerstore/peerstore_api.c:679
+#: src/peerstore/peerstore_api.c:560 src/peerstore/peerstore_api.c:609
 #, 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:690
+#: src/peerstore/peerstore_api.c:623
 #, fuzzy
-msgid "Error communicating with `PEERSTORE' service."
-msgstr "Skriv ut information om GNUnets motparter."
-
-#: src/peerstore/peerstore_api.c:709
-#, fuzzy
 msgid "Received a malformed response from service."
 msgstr "Mottog ogiltig \"%s\" begäran (storlek %d)\n"
 
-#: src/peerstore/peerstore_api.c:821
-msgid ""
-"Problem receiving a watch response, no way to determine which request.\n"
-msgstr ""
-
-#: src/peerstore/peerstore_api.c:833
+#: src/peerstore/peerstore_api.c:768
 msgid "Received a watch result for a non existing watch.\n"
 msgstr ""
 
@@ -5997,6 +5747,7 @@
 msgstr "Fel vid skapandet av användare"
 
 #: src/peerstore/plugin_peerstore_sqlite.c:422
+#: src/psycstore/plugin_psycstore_mysql.c:250
 #: src/psycstore/plugin_psycstore_sqlite.c:259
 #, fuzzy, c-format
 msgid ""
@@ -6009,97 +5760,112 @@
 msgid "Unable to create indices: %s.\n"
 msgstr "Kunde inte skapa namnrymd \"%s\" (existerar?).\n"
 
-#: src/postgres/postgres.c:63
+#: src/postgres/postgres.c:67
 #, fuzzy, c-format
-msgid "`%s:%s' failed at %s:%d with error: %s"
+msgid "`%s:%s' failed at %s:%d with error: %s\n"
 msgstr "\"%s\" misslyckades vid %s:%d med fel: %s\n"
 
-#: src/postgres/postgres.c:166
+#: src/postgres/postgres.c:195
 #, fuzzy, c-format
-msgid "Unable to initialize Postgres: %s"
+msgid "Unable to initialize Postgres: %s\n"
 msgstr "Kunde inte initiera SQLite.\n"
 
-#: src/psycstore/gnunet-service-psycstore.c:260
+#: src/psycstore/gnunet-service-psycstore.c:249
 #, fuzzy
 msgid "Failed to store membership information!\n"
 msgstr "Misslyckades att leverera \"%s\" meddelande.\n"
 
-#: src/psycstore/gnunet-service-psycstore.c:284
+#: src/psycstore/gnunet-service-psycstore.c:271
 #, fuzzy
 msgid "Failed to test membership!\n"
 msgstr "Kunde inte skapa värdnyckel!\n"
 
-#: src/psycstore/gnunet-service-psycstore.c:306
+#: src/psycstore/gnunet-service-psycstore.c:300
 #, fuzzy
-msgid "Failed to store fragment!\n"
+msgid "Dropping invalid fragment\n"
+msgstr "Ogiltigt argument: \"%s\"\n"
+
+#: src/psycstore/gnunet-service-psycstore.c:311
+#, fuzzy
+msgid "Failed to store fragment\n"
 msgstr "Misslyckades att starta samling.\n"
 
-#: src/psycstore/gnunet-service-psycstore.c:364
+#: src/psycstore/gnunet-service-psycstore.c:368
 #, fuzzy
 msgid "Failed to get fragment!\n"
 msgstr "Kunde inte skapa värdnyckel!\n"
 
-#: src/psycstore/gnunet-service-psycstore.c:423
+#: src/psycstore/gnunet-service-psycstore.c:434
 #, fuzzy
 msgid "Failed to get message!\n"
 msgstr "Kunde inte skapa värdnyckel!\n"
 
-#: src/psycstore/gnunet-service-psycstore.c:454
+#: src/psycstore/gnunet-service-psycstore.c:464
 #, fuzzy
 msgid "Failed to get message fragment!\n"
 msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 
-#: src/psycstore/gnunet-service-psycstore.c:482
+#: src/psycstore/gnunet-service-psycstore.c:494
 #, fuzzy
 msgid "Failed to get master counters!\n"
 msgstr "Kunde inte skapa värdnyckel!\n"
 
-#: src/psycstore/gnunet-service-psycstore.c:665
+#: src/psycstore/gnunet-service-psycstore.c:675
 #, fuzzy, c-format
 msgid "Failed to begin modifying state: %d\n"
 msgstr "Misslyckades att starta samling.\n"
 
-#: src/psycstore/gnunet-service-psycstore.c:675
+#: src/psycstore/gnunet-service-psycstore.c:685
 #, fuzzy, c-format
 msgid "Failed to modify state: %d\n"
 msgstr "Misslyckades att starta samling.\n"
 
-#: src/psycstore/gnunet-service-psycstore.c:683
+#: src/psycstore/gnunet-service-psycstore.c:693
 #, fuzzy
 msgid "Failed to end modifying state!\n"
 msgstr "Misslyckades att starta samling.\n"
 
-#: src/psycstore/gnunet-service-psycstore.c:714
+#: src/psycstore/gnunet-service-psycstore.c:730
 msgid "Tried to set invalid state variable name!\n"
 msgstr ""
 
-#: src/psycstore/gnunet-service-psycstore.c:728
+#: src/psycstore/gnunet-service-psycstore.c:744
 #, fuzzy
 msgid "Failed to begin synchronizing state!\n"
 msgstr "Kunde inte skapa värdnyckel!\n"
 
-#: src/psycstore/gnunet-service-psycstore.c:745
+#: src/psycstore/gnunet-service-psycstore.c:761
 #, fuzzy
 msgid "Failed to end synchronizing state!\n"
 msgstr "Kunde inte skapa värdnyckel!\n"
 
-#: src/psycstore/gnunet-service-psycstore.c:765
-#: src/psycstore/gnunet-service-psycstore.c:784
+#: src/psycstore/gnunet-service-psycstore.c:779
+#: src/psycstore/gnunet-service-psycstore.c:795
 #, fuzzy
 msgid "Failed to reset state!\n"
 msgstr "Kunde inte skapa värdnyckel!\n"
 
-#: src/psycstore/gnunet-service-psycstore.c:807
-#: src/psycstore/gnunet-service-psycstore.c:858
+#: src/psycstore/gnunet-service-psycstore.c:824
+#: src/psycstore/gnunet-service-psycstore.c:881
 msgid "Tried to get invalid state variable name!\n"
 msgstr ""
 
-#: src/psycstore/gnunet-service-psycstore.c:834
-#: src/psycstore/gnunet-service-psycstore.c:873
+#: src/psycstore/gnunet-service-psycstore.c:851
+#: src/psycstore/gnunet-service-psycstore.c:896
 #, fuzzy
 msgid "Failed to get state variable!\n"
 msgstr "Kunde inte skapa värdnyckel!\n"
 
+#: src/psycstore/plugin_psycstore_mysql.c:281
+#, fuzzy
+msgid "Unable to initialize Mysql.\n"
+msgstr "Kunde inte initiera SQLite.\n"
+
+#: src/psycstore/plugin_psycstore_mysql.c:291
+#, fuzzy, c-format
+msgid "Failed to run SQL statement `%s'\n"
+msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
+
 #: src/psycstore/plugin_psycstore_sqlite.c:61
 #, fuzzy, c-format
 msgid "`%s' failed at %s:%d with error: %s (%d)\n"
@@ -6109,67 +5875,67 @@
 msgid "SQLite database running\n"
 msgstr ""
 
-#: src/pt/gnunet-daemon-pt.c:482
+#: src/pt/gnunet-daemon-pt.c:493
 #, 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:488
+#: src/pt/gnunet-daemon-pt.c:499
 #, fuzzy
 msgid "# DNS requests mapped to VPN"
 msgstr "# byte mottogs via TCP"
 
-#: src/pt/gnunet-daemon-pt.c:541
+#: src/pt/gnunet-daemon-pt.c:553
 msgid "# DNS records modified"
 msgstr ""
 
-#: src/pt/gnunet-daemon-pt.c:717
+#: src/pt/gnunet-daemon-pt.c:737
 msgid "# DNS replies intercepted"
 msgstr ""
 
-#: src/pt/gnunet-daemon-pt.c:723
+#: src/pt/gnunet-daemon-pt.c:744
 #, 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:824
+#: src/pt/gnunet-daemon-pt.c:851
 #, fuzzy
 msgid "# DNS requests dropped (timeout)"
 msgstr "Nätverksannonsering avstängd i konfigurationen!\n"
 
-#: src/pt/gnunet-daemon-pt.c:881
+#: src/pt/gnunet-daemon-pt.c:909
 #, fuzzy
 msgid "# DNS requests intercepted"
 msgstr "# byte mottogs via TCP"
 
-#: src/pt/gnunet-daemon-pt.c:886
+#: src/pt/gnunet-daemon-pt.c:914
 #, fuzzy
 msgid "# DNS requests dropped (DNS cadet channel down)"
 msgstr "# byte mottogs via TCP"
 
-#: src/pt/gnunet-daemon-pt.c:894
+#: src/pt/gnunet-daemon-pt.c:922
 #, fuzzy
 msgid "# DNS requests dropped (malformed)"
 msgstr "# byte mottogs via TCP"
 
-#: src/pt/gnunet-daemon-pt.c:967
+#: src/pt/gnunet-daemon-pt.c:995
 #, fuzzy
 msgid "# DNS replies received"
 msgstr "# byte mottogs via TCP"
 
-#: src/pt/gnunet-daemon-pt.c:983
+#: src/pt/gnunet-daemon-pt.c:1011
 #, fuzzy
 msgid "# DNS replies dropped (too late?)"
 msgstr "# byte mottagna av typen %d"
 
-#: src/pt/gnunet-daemon-pt.c:1257 src/pt/gnunet-daemon-pt.c:1266
-#: src/pt/gnunet-daemon-pt.c:1286 src/pt/gnunet-daemon-pt.c:1297
-#: src/pt/gnunet-daemon-pt.c:1306
+#: src/pt/gnunet-daemon-pt.c:1294 src/pt/gnunet-daemon-pt.c:1303
+#: src/pt/gnunet-daemon-pt.c:1324 src/pt/gnunet-daemon-pt.c:1336
+#: src/pt/gnunet-daemon-pt.c:1345
 #, 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:1343
+#: src/pt/gnunet-daemon-pt.c:1390
 msgid "Daemon to run to perform IP protocol translation to GNUnet"
 msgstr ""
 
@@ -6182,87 +5948,92 @@
 msgid "Daemon to announce regular expressions for the peer using cadet."
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1301
+#: src/regex/gnunet-regex-profiler.c:1314
 #, fuzzy
 msgid "No configuration file given. Exiting\n"
 msgstr "använd konfigurationsfil FILNAMN"
 
-#: src/regex/gnunet-regex-profiler.c:1342
-#: src/regex/gnunet-regex-simulation-profiler.c:638
+#: src/regex/gnunet-regex-profiler.c:1355
+#: src/regex/gnunet-regex-simulation-profiler.c:630
 #, c-format
 msgid "No policy directory specified on command line. Exiting.\n"
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1348
-#: src/regex/gnunet-regex-simulation-profiler.c:646
+#: src/regex/gnunet-regex-profiler.c:1361
+#: src/regex/gnunet-regex-simulation-profiler.c:638
 #, c-format
 msgid "Specified policies directory does not exist. Exiting.\n"
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1355
+#: src/regex/gnunet-regex-profiler.c:1368
 #, fuzzy, c-format
 msgid "No files found in `%s'\n"
 msgstr "%d filer hittades i katalog.\n"
 
-#: src/regex/gnunet-regex-profiler.c:1364
+#: src/regex/gnunet-regex-profiler.c:1377
 msgid "No search strings file given. Exiting.\n"
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1384
+#: src/regex/gnunet-regex-profiler.c:1397
 #, fuzzy
 msgid "Error loading search strings. Exiting.\n"
 msgstr "Fel vid lämning av DHT.\n"
 
-#: src/regex/gnunet-regex-profiler.c:1469
+#: src/regex/gnunet-regex-profiler.c:1482
 #, fuzzy
 msgid "name of the file for writing statistics"
 msgstr "Visa värde av alternativet"
 
-#: src/regex/gnunet-regex-profiler.c:1472
+#: src/regex/gnunet-regex-profiler.c:1485
 msgid "wait TIMEOUT before ending the experiment"
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1475
+#: src/regex/gnunet-regex-profiler.c:1488
 msgid "directory with policy files"
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1478
+#: src/regex/gnunet-regex-profiler.c:1491
 #, fuzzy
 msgid "name of file with input strings"
 msgstr "Visa värde av alternativet"
 
-#: src/regex/gnunet-regex-profiler.c:1481
+#: src/regex/gnunet-regex-profiler.c:1494
 #, fuzzy
 msgid "name of file with hosts' names"
 msgstr "Visa värde av alternativet"
 
-#: src/regex/gnunet-regex-profiler.c:1493
+#: src/regex/gnunet-regex-profiler.c:1506
 msgid "Profiler for regex"
 msgstr ""
 
-#: src/regex/gnunet-regex-simulation-profiler.c:704
+#: src/regex/gnunet-regex-simulation-profiler.c:696
 #, fuzzy
 msgid "name of the table to write DFAs"
 msgstr "Visa värde av alternativet"
 
-#: src/regex/gnunet-regex-simulation-profiler.c:707
+#: src/regex/gnunet-regex-simulation-profiler.c:699
 msgid "maximum path compression length"
 msgstr ""
 
-#: src/regex/gnunet-regex-simulation-profiler.c:720
+#: src/regex/gnunet-regex-simulation-profiler.c:712
 msgid "Profiler for regex library"
 msgstr ""
 
-#: src/regex/regex_api.c:131
+#: src/regex/regex_api_announce.c:152
 #, fuzzy, c-format
 msgid "Regex `%s' is too long!\n"
 msgstr "\"%s\" är inte en fil.\n"
 
-#: src/rest/gnunet-rest-server.c:784
+#: src/regex/regex_api_search.c:212
+#, fuzzy, c-format
+msgid "Search string `%s' is too long!\n"
+msgstr "\"%s\" är inte en fil.\n"
+
+#: src/rest/gnunet-rest-server.c:788
 msgid "listen on specified port (default: 7776)"
 msgstr ""
 
-#: src/rest/gnunet-rest-server.c:801
+#: src/rest/gnunet-rest-server.c:805
 #, fuzzy
 msgid "GNUnet REST server"
 msgstr "Spåra GNUnets nätverkstopologi."
@@ -6305,103 +6076,103 @@
 msgid "Internal error, key revocation might have failed\n"
 msgstr ""
 
-#: src/revocation/gnunet-revocation.c:320
+#: src/revocation/gnunet-revocation.c:323
 #, c-format
 msgid "Revocation certificate for `%s' stored in `%s'\n"
 msgstr ""
 
-#: src/revocation/gnunet-revocation.c:350
+#: src/revocation/gnunet-revocation.c:352
 #, fuzzy, c-format
 msgid "Ego `%s' not found.\n"
 msgstr "\"%s\" misslyckades: tabell hittades inte!\n"
 
-#: src/revocation/gnunet-revocation.c:371
+#: src/revocation/gnunet-revocation.c:373
 #, c-format
 msgid "Error: revocation certificate in `%s' is not for `%s'\n"
 msgstr ""
 
-#: src/revocation/gnunet-revocation.c:391
+#: src/revocation/gnunet-revocation.c:393
 msgid "Revocation certificate ready\n"
 msgstr ""
 
-#: src/revocation/gnunet-revocation.c:401
+#: src/revocation/gnunet-revocation.c:403
 msgid "Revocation certificate not ready, calculating proof of work\n"
 msgstr ""
 
-#: src/revocation/gnunet-revocation.c:435
+#: src/revocation/gnunet-revocation.c:437 src/social/gnunet-social.c:1159
 #, fuzzy, c-format
 msgid "Public key `%s' malformed\n"
 msgstr "Ogiltigt argument: \"%s\"\n"
 
-#: src/revocation/gnunet-revocation.c:448
+#: src/revocation/gnunet-revocation.c:450
 msgid ""
 "Testing and revoking at the same time is not allowed, only executing test.\n"
 msgstr ""
 
-#: src/revocation/gnunet-revocation.c:468
+#: src/revocation/gnunet-revocation.c:470
 #, fuzzy
 msgid "No filename to store revocation certificate given.\n"
 msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 
-#: src/revocation/gnunet-revocation.c:489
+#: src/revocation/gnunet-revocation.c:491
 #, fuzzy, c-format
 msgid "Failed to read revocation certificate from `%s'\n"
 msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 
-#: src/revocation/gnunet-revocation.c:514
+#: src/revocation/gnunet-revocation.c:516
 #, fuzzy
 msgid "No action specified. Nothing to do.\n"
 msgstr "Inget tabellnamn angivet, använder \"%s\".\n"
 
-#: src/revocation/gnunet-revocation.c:530
+#: src/revocation/gnunet-revocation.c:532
 msgid "use NAME for the name of the revocation file"
 msgstr ""
 
-#: src/revocation/gnunet-revocation.c:533
+#: src/revocation/gnunet-revocation.c:535
 msgid ""
 "revoke the private key associated for the the private key associated with "
 "the ego NAME "
 msgstr ""
 
-#: src/revocation/gnunet-revocation.c:536
+#: src/revocation/gnunet-revocation.c:538
 msgid "actually perform revocation, otherwise we just do the precomputation"
 msgstr ""
 
-#: src/revocation/gnunet-revocation.c:539
+#: src/revocation/gnunet-revocation.c:541
 msgid "test if the public key KEY has been revoked"
 msgstr ""
 
-#: src/revocation/gnunet-service-revocation.c:481
+#: src/revocation/gnunet-service-revocation.c:456
 #, fuzzy
 msgid "# unsupported revocations received via set union"
 msgstr "# byte mottogs via TCP"
 
-#: src/revocation/gnunet-service-revocation.c:490
+#: src/revocation/gnunet-service-revocation.c:464
 #, fuzzy
 msgid "# revocation messages received via set union"
 msgstr "# krypterade PONG-meddelanden mottagna"
 
-#: src/revocation/gnunet-service-revocation.c:495
+#: src/revocation/gnunet-service-revocation.c:469
 #, c-format
 msgid "Error computing revocation set union with %s\n"
 msgstr ""
 
-#: src/revocation/gnunet-service-revocation.c:499
+#: src/revocation/gnunet-service-revocation.c:473
 #, fuzzy
 msgid "# revocation set unions failed"
 msgstr "# sessionsnycklar accepterade"
 
-#: src/revocation/gnunet-service-revocation.c:508
+#: src/revocation/gnunet-service-revocation.c:482
 #, fuzzy
 msgid "# revocation set unions completed"
 msgstr "# klartext PONG-meddelanden mottagna"
 
-#: src/revocation/gnunet-service-revocation.c:545
-#: src/revocation/gnunet-service-revocation.c:776
+#: src/revocation/gnunet-service-revocation.c:519
+#: src/revocation/gnunet-service-revocation.c:765
 msgid "SET service crashed, terminating revocation service\n"
 msgstr ""
 
-#: src/revocation/gnunet-service-revocation.c:868
+#: src/revocation/gnunet-service-revocation.c:856
 #, fuzzy
 msgid "Could not open revocation database file!"
 msgstr "Kunde inte ansluta till gnunetd.\n"
@@ -6464,15 +6235,15 @@
 msgid "Calculate the Vectorproduct with a GNUnet peer."
 msgstr ""
 
-#: src/scalarproduct/gnunet-service-scalarproduct_alice.c:1417
-#: src/scalarproduct/gnunet-service-scalarproduct_bob.c:1546
-#: src/scalarproduct/gnunet-service-scalarproduct-ecc_alice.c:1192
-#: src/scalarproduct/gnunet-service-scalarproduct-ecc_bob.c:1249
+#: src/scalarproduct/gnunet-service-scalarproduct_alice.c:1415
+#: src/scalarproduct/gnunet-service-scalarproduct_bob.c:1553
+#: src/scalarproduct/gnunet-service-scalarproduct-ecc_alice.c:1191
+#: src/scalarproduct/gnunet-service-scalarproduct-ecc_bob.c:1259
 #, fuzzy
 msgid "Connect to CADET failed\n"
 msgstr " Anslutning misslyckades (fel?)\n"
 
-#: src/scalarproduct/scalarproduct_api.c:296
+#: src/scalarproduct/scalarproduct_api.c:185
 msgid "Keys given to SCALARPRODUCT not unique!\n"
 msgstr ""
 
@@ -6492,7 +6263,7 @@
 msgid "also profile decryption"
 msgstr ""
 
-#: src/set/gnunet-service-set.c:2008
+#: src/set/gnunet-service-set.c:1991
 #, fuzzy
 msgid "Could not connect to cadet service\n"
 msgstr "Kunde inte ansluta till gnunetd.\n"
@@ -6519,239 +6290,228 @@
 msgid "ibf size"
 msgstr ""
 
-#: src/set/gnunet-set-profiler.c:386
+#: src/set/gnunet-set-profiler.c:387
 msgid "operation to execute"
 msgstr ""
 
-#: src/social/gnunet-social.c:1138
+#: src/social/gnunet-social.c:1146
 #, fuzzy
 msgid "--place missing or invalid.\n"
 msgstr "Ogiltigt argument: \"%s\"\n"
 
-#: src/social/gnunet-social.c:1180
+#: src/social/gnunet-social.c:1195
 msgid "assign --name in state to --data"
 msgstr ""
 
-#: src/social/gnunet-social.c:1184
+#: src/social/gnunet-social.c:1199
 msgid "say good-bye and leave somebody else's place"
 msgstr ""
 
-#: src/social/gnunet-social.c:1188
+#: src/social/gnunet-social.c:1203
 msgid "create a place"
 msgstr ""
 
-#: src/social/gnunet-social.c:1192
+#: src/social/gnunet-social.c:1207
 msgid "destroy a place we were hosting"
 msgstr ""
 
-#: src/social/gnunet-social.c:1196
+#: src/social/gnunet-social.c:1211
 msgid "enter somebody else's place"
 msgstr ""
 
-#: src/social/gnunet-social.c:1200
+#: src/social/gnunet-social.c:1215
 msgid "find state matching name prefix"
 msgstr ""
 
-#: src/social/gnunet-social.c:1204
+#: src/social/gnunet-social.c:1219
 msgid "replay history of messages up to the given --limit"
 msgstr ""
 
-#: src/social/gnunet-social.c:1208
+#: src/social/gnunet-social.c:1223
 msgid "reconnect to a previously created place"
 msgstr ""
 
-#: src/social/gnunet-social.c:1212
+#: src/social/gnunet-social.c:1227
 msgid "publish something to a place we are hosting"
 msgstr ""
 
-#: src/social/gnunet-social.c:1216
+#: src/social/gnunet-social.c:1231
 msgid "reconnect to a previously entered place"
 msgstr ""
 
-#: src/social/gnunet-social.c:1220
+#: src/social/gnunet-social.c:1235
 msgid "search for state matching exact name"
 msgstr ""
 
-#: src/social/gnunet-social.c:1224
+#: src/social/gnunet-social.c:1239
 msgid "submit something to somebody's place"
 msgstr ""
 
-#: src/social/gnunet-social.c:1228
+#: src/social/gnunet-social.c:1243
 msgid "list of egos and subscribed places"
 msgstr ""
 
-#: src/social/gnunet-social.c:1232
+#: src/social/gnunet-social.c:1247
 msgid "extract and replay history between message IDs --start and --until"
 msgstr ""
 
-#: src/social/gnunet-social.c:1239
+#: src/social/gnunet-social.c:1254
 msgid "application ID to use when connecting"
 msgstr ""
 
-#: src/social/gnunet-social.c:1243
+#: src/social/gnunet-social.c:1258
 msgid "message body or state value"
 msgstr ""
 
-#: src/social/gnunet-social.c:1247
+#: src/social/gnunet-social.c:1262
 #, fuzzy
 msgid "name or public key of ego"
 msgstr "Ogiltigt argument: \"%s\"\n"
 
-#: src/social/gnunet-social.c:1251
+#: src/social/gnunet-social.c:1266
 #, fuzzy
 msgid "wait for incoming messages"
 msgstr "Misslyckades att leverera \"%s\" meddelande.\n"
 
-#: src/social/gnunet-social.c:1255
+#: src/social/gnunet-social.c:1270
 #, fuzzy
 msgid "GNS name"
 msgstr "Visa _namn"
 
-#: src/social/gnunet-social.c:1259
+#: src/social/gnunet-social.c:1274
 msgid "peer ID for --guest-enter"
 msgstr ""
 
-#: src/social/gnunet-social.c:1263
+#: src/social/gnunet-social.c:1278
 msgid "name (key) to query from state"
 msgstr ""
 
-#: src/social/gnunet-social.c:1267
+#: src/social/gnunet-social.c:1282
 #, fuzzy
 msgid "method name"
 msgstr "Visa _namn"
 
-#: src/social/gnunet-social.c:1271
+#: src/social/gnunet-social.c:1286
 #, fuzzy
 msgid "number of messages to replay from history"
 msgstr "antal meddelanden att använda per iteration"
 
-#: src/social/gnunet-social.c:1275
+#: src/social/gnunet-social.c:1290
 msgid "key address of place"
 msgstr ""
 
-#: src/social/gnunet-social.c:1279
+#: src/social/gnunet-social.c:1294
 msgid "start message ID for history replay"
 msgstr ""
 
-#: src/social/gnunet-social.c:1283
+#: src/social/gnunet-social.c:1298
 msgid "respond to entry requests by admitting all guests"
 msgstr ""
 
-#: src/social/gnunet-social.c:1287
+#: src/social/gnunet-social.c:1302
 msgid "end message ID for history replay"
 msgstr ""
 
-#: src/social/gnunet-social.c:1291
+#: src/social/gnunet-social.c:1306
 msgid "respond to entry requests by refusing all guests"
 msgstr ""
 
-#: src/social/gnunet-social.c:1301
+#: src/social/gnunet-social.c:1316
 msgid ""
 "gnunet-social - Interact with the social service: enter/leave, send/receive "
 "messages, access history and state.\n"
 msgstr ""
 
-#: src/statistics/gnunet-service-statistics.c:323
+#: src/statistics/gnunet-service-statistics.c:338
 #, fuzzy, c-format
-msgid "Loading %llu bytes of statistics from `%s'\n"
+msgid "Wrote %llu bytes of statistics to `%s'\n"
 msgstr "Ladda ner filer från GNUnet."
 
-#: src/statistics/gnunet-service-statistics.c:434
+#: src/statistics/gnunet-service-statistics.c:1083
 #, fuzzy, c-format
-msgid "Wrote %llu bytes of statistics to `%s'\n"
+msgid "Loading %llu bytes of statistics from `%s'\n"
 msgstr "Ladda ner filer från GNUnet."
 
-#: src/statistics/gnunet-statistics.c:145
+#: src/statistics/gnunet-statistics.c:158
 #, fuzzy
 msgid "Failed to obtain statistics.\n"
 msgstr "Misslyckades att binda till UDP-port %d.\n"
 
-#: src/statistics/gnunet-statistics.c:148
+#: src/statistics/gnunet-statistics.c:161
 #, fuzzy, c-format
 msgid "Failed to obtain statistics from host `%s:%llu'\n"
 msgstr "Misslyckades att binda till UDP-port %d.\n"
 
-#: src/statistics/gnunet-statistics.c:194
+#: src/statistics/gnunet-statistics.c:219
 msgid "Missing argument: subsystem \n"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:200
+#: src/statistics/gnunet-statistics.c:227
 msgid "Missing argument: name\n"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:232
+#: src/statistics/gnunet-statistics.c:270
 #, c-format
 msgid "No subsystem or name given\n"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:241
+#: src/statistics/gnunet-statistics.c:285
 #, fuzzy, c-format
 msgid "Failed to initialize watch routine\n"
 msgstr "Misslyckades att initiera tjänsten \"%s\".\n"
 
-#: src/statistics/gnunet-statistics.c:266
+#: src/statistics/gnunet-statistics.c:321
 #, fuzzy, c-format
-msgid "Trying to connect to remote host, but service `%s' is not running\n"
-msgstr "Kunde inte ansluta till gnunetd.\n"
+msgid "Invalid argument `%s'\n"
+msgstr "Ogiltigt argument: \"%s\"\n"
 
-#: src/statistics/gnunet-statistics.c:279
+#: src/statistics/gnunet-statistics.c:339
 #, fuzzy, c-format
 msgid "A port is required to connect to host `%s'\n"
 msgstr "Kan inte ansluta till %u.%u.%u.%u:%u: %s\n"
 
-#: src/statistics/gnunet-statistics.c:287
+#: src/statistics/gnunet-statistics.c:347
 #, c-format
 msgid "A port has to be between 1 and 65535 to connect to host `%s'\n"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:320
-#, fuzzy, c-format
-msgid "Invalid argument `%s'\n"
-msgstr "Ogiltigt argument: \"%s\"\n"
-
-#: src/statistics/gnunet-statistics.c:346
+#: src/statistics/gnunet-statistics.c:383
 msgid "limit output to statistics for the given NAME"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:349
+#: src/statistics/gnunet-statistics.c:386
 msgid "make the value being set persistent"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:352
+#: src/statistics/gnunet-statistics.c:389
 msgid "limit output to the given SUBSYSTEM"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:355
+#: src/statistics/gnunet-statistics.c:392
 msgid "just print the statistics value"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:358
+#: src/statistics/gnunet-statistics.c:395
 msgid "watch value continuously"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:361
+#: src/statistics/gnunet-statistics.c:398
 msgid "connect to remote host"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:364
+#: src/statistics/gnunet-statistics.c:401
 msgid "port for remote host"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:376
+#: src/statistics/gnunet-statistics.c:417
 msgid "Print statistics about GNUnet operations."
 msgstr "Skriv ut statistik om GNUnet-operationer."
 
-#: src/statistics/statistics_api.c:515
+#: src/statistics/statistics_api.c:753
 #, fuzzy
 msgid "Could not save some persistent statistics\n"
 msgstr "Kunde inte skapa värdnyckel!\n"
 
-#: src/statistics/statistics_api.c:1082
-msgid ""
-"Failed to receive acknowledgement from statistics service, some statistics "
-"might have been lost!\n"
-msgstr ""
-
 #: src/testbed/generate-underlay-topology.c:225
 #, fuzzy
 msgid "Need at least 2 arguments\n"
@@ -6795,12 +6555,12 @@
 msgid "Invalid argument `%s'; expecting unsigned int\n"
 msgstr "Ogiltigt argument: \"%s\"\n"
 
-#: src/testbed/generate-underlay-topology.c:338
+#: src/testbed/generate-underlay-topology.c:339
 #: src/testbed/gnunet-testbed-profiler.c:281
 msgid "create COUNT number of peers"
 msgstr ""
 
-#: src/testbed/generate-underlay-topology.c:347
+#: src/testbed/generate-underlay-topology.c:348
 msgid ""
 "Generates SQLite3 database representing a given underlay topology.\n"
 "Usage: gnunet-underlay-topology [OPTIONS] db-filename TOPO [TOPOOPTS]\n"
@@ -6828,19 +6588,19 @@
 msgid "Daemon to log latency values of connections to neighbours"
 msgstr ""
 
-#: src/testbed/gnunet-daemon-testbed-blacklist.c:248
+#: src/testbed/gnunet-daemon-testbed-blacklist.c:247
 msgid ""
 "Daemon to restrict incoming transport layer connections during testbed "
 "deployments"
 msgstr ""
 
-#: src/testbed/gnunet-daemon-testbed-underlay.c:230 src/testing/list-keys.c:50
-#: src/testing/testing.c:293 src/util/gnunet-ecc.c:298
+#: src/testbed/gnunet-daemon-testbed-underlay.c:231 src/testing/list-keys.c:50
+#: src/testing/testing.c:288 src/util/gnunet-ecc.c:298
 #, c-format
 msgid "Incorrect hostkey file format: %s\n"
 msgstr ""
 
-#: src/testbed/gnunet-daemon-testbed-underlay.c:468
+#: src/testbed/gnunet-daemon-testbed-underlay.c:469
 msgid "Daemon to restrict underlay network in testbed deployments"
 msgstr ""
 
@@ -6850,16 +6610,12 @@
 "Cannot open %s for writing load statistics.  Not logging load statistics\n"
 msgstr ""
 
-#: src/testbed/gnunet-service-testbed_peers.c:1015
+#: src/testbed/gnunet-service-testbed_peers.c:1141
 #, fuzzy
 msgid "Misconfiguration (can't connect to the ARM service)"
 msgstr "Misslyckades att ansluta till gnunetd.\n"
 
-#: src/testbed/gnunet-service-testbed_peers.c:1021
-msgid "Request doesn't fit into a message"
-msgstr ""
-
-#: src/testbed/gnunet-service-testbed_peers.c:1059
+#: src/testbed/gnunet-service-testbed_peers.c:1183
 #, c-format
 msgid "%s service can't be started because ARM is shutting down"
 msgstr ""
@@ -6885,31 +6641,31 @@
 "signal is received"
 msgstr ""
 
-#: src/testbed/testbed_api_hosts.c:415
+#: src/testbed/testbed_api.c:410
 #, fuzzy, c-format
+msgid "Adding host %u failed with error: %s\n"
+msgstr "\"%s\" misslyckades vid %s:%d med fel: %s\n"
+
+#: src/testbed/testbed_api_hosts.c:413
+#, fuzzy, c-format
 msgid "Hosts file %s not found\n"
 msgstr "\"%s\" misslyckades: tabell hittades inte!\n"
 
-#: src/testbed/testbed_api_hosts.c:423
+#: src/testbed/testbed_api_hosts.c:421
 #, c-format
 msgid "Hosts file %s has no data\n"
 msgstr ""
 
-#: src/testbed/testbed_api_hosts.c:430
+#: src/testbed/testbed_api_hosts.c:428
 #, c-format
 msgid "Hosts file %s cannot be read\n"
 msgstr ""
 
-#: src/testbed/testbed_api_hosts.c:570
+#: src/testbed/testbed_api_hosts.c:569
 #, c-format
 msgid "The function %s is only available when compiled with (--with-ll)\n"
 msgstr ""
 
-#: src/testbed/testbed_api_hosts.c:1590
-#, fuzzy, c-format
-msgid "Adding host %u failed with error: %s\n"
-msgstr "\"%s\" misslyckades vid %s:%d med fel: %s\n"
-
 #: src/testbed/testbed_api_testbed.c:818
 msgid "Linking controllers failed. Exiting"
 msgstr ""
@@ -6966,44 +6722,44 @@
 "free topology cannot be more than %u.  Given `%s = %llu'"
 msgstr ""
 
-#: src/testbed/testbed_api_topology.c:966
+#: src/testbed/testbed_api_topology.c:1028
 #, fuzzy, c-format
 msgid "Topology file %s not found\n"
 msgstr "\"%s\" misslyckades: tabell hittades inte!\n"
 
-#: src/testbed/testbed_api_topology.c:974
+#: src/testbed/testbed_api_topology.c:1036
 #, c-format
 msgid "Topology file %s has no data\n"
 msgstr ""
 
-#: src/testbed/testbed_api_topology.c:982
+#: src/testbed/testbed_api_topology.c:1044
 #, c-format
 msgid "Topology file %s cannot be read\n"
 msgstr ""
 
-#: src/testbed/testbed_api_topology.c:1004
+#: src/testbed/testbed_api_topology.c:1066
 #, fuzzy, c-format
 msgid "Failed to read peer index from toology file: %s"
 msgstr "Kunde inte tolka konfigurationsfil \"%s\".\n"
 
-#: src/testbed/testbed_api_topology.c:1013
-#: src/testbed/testbed_api_topology.c:1037
+#: src/testbed/testbed_api_topology.c:1075
+#: src/testbed/testbed_api_topology.c:1099
 #, c-format
 msgid "Value in given topology file: %s out of range\n"
 msgstr ""
 
-#: src/testbed/testbed_api_topology.c:1019
-#: src/testbed/testbed_api_topology.c:1043
+#: src/testbed/testbed_api_topology.c:1081
+#: src/testbed/testbed_api_topology.c:1105
 #, fuzzy, c-format
 msgid "Failed to read peer index from topology file: %s"
 msgstr "Kunde inte tolka konfigurationsfil \"%s\".\n"
 
-#: src/testbed/testbed_api_topology.c:1025
-#: src/testbed/testbed_api_topology.c:1049
+#: src/testbed/testbed_api_topology.c:1087
+#: src/testbed/testbed_api_topology.c:1111
 msgid "Topology file needs more peers than given ones\n"
 msgstr ""
 
-#: src/testbed/testbed_api_topology.c:1083
+#: src/testbed/testbed_api_topology.c:1145
 #, fuzzy, c-format
 msgid "Ignoring to connect peer %u to peer %u\n"
 msgstr "Kan inte ansluta till %u.%u.%u.%u:%u: %s\n"
@@ -7047,25 +6803,25 @@
 msgid "Command line tool to access the testing library"
 msgstr ""
 
-#: src/testing/list-keys.c:90
+#: src/testing/list-keys.c:91
 msgid "list COUNT number of keys"
 msgstr ""
 
-#: src/testing/list-keys.c:93
+#: src/testing/list-keys.c:94
 msgid "skip COUNT number of keys in the beginning"
 msgstr ""
 
-#: src/testing/testing.c:277
+#: src/testing/testing.c:272
 #, c-format
 msgid "Hostkeys file not found: %s\n"
 msgstr ""
 
-#: src/testing/testing.c:720
+#: src/testing/testing.c:715
 #, fuzzy, c-format
 msgid "Key number %u does not exist\n"
 msgstr "antal meddelanden att använda per iteration"
 
-#: src/testing/testing.c:1163
+#: src/testing/testing.c:1158
 #, c-format
 msgid ""
 "You attempted to create a testbed with more than %u hosts.  Please "
@@ -7072,42 +6828,42 @@
 "precompute more hostkeys first.\n"
 msgstr ""
 
-#: src/testing/testing.c:1172
+#: src/testing/testing.c:1167
 #, fuzzy, c-format
 msgid "Failed to initialize hostkey for peer %u\n"
 msgstr "Misslyckades att initiera tjänsten \"%s\".\n"
 
-#: src/testing/testing.c:1182
+#: src/testing/testing.c:1177
 #, fuzzy
 msgid "PRIVATE_KEY option in PEER section missing in configuration\n"
 msgstr "Inga applikationer definierade i konfiguration!\n"
 
-#: src/testing/testing.c:1195
+#: src/testing/testing.c:1190
 #, fuzzy
 msgid "Failed to create configuration for peer (not enough free ports?)\n"
 msgstr "Kunde inte komma åt namnrymdsinformation.\n"
 
-#: src/testing/testing.c:1209
+#: src/testing/testing.c:1204
 #, fuzzy, c-format
 msgid "Cannot open hostkey file `%s': %s\n"
 msgstr "Kunde inte skapa värdnyckel!\n"
 
-#: src/testing/testing.c:1221
+#: src/testing/testing.c:1216
 #, fuzzy, c-format
 msgid "Failed to write hostkey file for peer %u: %s\n"
 msgstr "Kunde inte skapa användarkonto:"
 
-#: src/testing/testing.c:1246
+#: src/testing/testing.c:1241
 #, 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:1348
+#: src/testing/testing.c:1343
 #, fuzzy, c-format
 msgid "Failed to start `%s': %s\n"
 msgstr "Fel vid %s:%d.\n"
 
-#: src/testing/testing.c:1710
+#: src/testing/testing.c:1644
 #, fuzzy, c-format
 msgid "Failed to load configuration from %s\n"
 msgstr "Kunde inte spara konfigurationsfil \"%s\":"
@@ -7122,66 +6878,66 @@
 msgid "Directory for file `%s' does not seem to be writable.\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:230
+#: src/topology/gnunet-daemon-topology.c:225
 msgid "# peers blacklisted"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:349
+#: src/topology/gnunet-daemon-topology.c:339
 #, fuzzy
 msgid "# connect requests issued to ATS"
 msgstr "# byte mottogs via TCP"
 
-#: src/topology/gnunet-daemon-topology.c:634
-#: src/topology/gnunet-daemon-topology.c:730
+#: src/topology/gnunet-daemon-topology.c:533
+msgid "# HELLO messages gossipped"
+msgstr ""
+
+#: src/topology/gnunet-daemon-topology.c:635
+#: src/topology/gnunet-daemon-topology.c:721
 #, fuzzy
 msgid "# friends connected"
 msgstr "# av anslutna parter"
 
-#: src/topology/gnunet-daemon-topology.c:927
+#: src/topology/gnunet-daemon-topology.c:918
 msgid "Failed to connect to core service, can not manage topology!\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:960
+#: src/topology/gnunet-daemon-topology.c:951
 #, c-format
 msgid "Found myself `%s' in friend list (useless, ignored)\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:967
+#: src/topology/gnunet-daemon-topology.c:958
 #, fuzzy, c-format
 msgid "Found friend `%s' in configuration\n"
 msgstr " gconfig\tGTK-konfiguration\n"
 
-#: src/topology/gnunet-daemon-topology.c:989
+#: src/topology/gnunet-daemon-topology.c:980
 msgid "Encountered errors parsing friends list!\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:992
+#: src/topology/gnunet-daemon-topology.c:983
 #, fuzzy
 msgid "# friends in configuration"
 msgstr " gconfig\tGTK-konfiguration\n"
 
-#: src/topology/gnunet-daemon-topology.c:999
+#: src/topology/gnunet-daemon-topology.c:990
 msgid ""
 "Fewer friends specified than required by minimum friend count. Will only "
 "connect to friends.\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:1005
+#: src/topology/gnunet-daemon-topology.c:996
 msgid ""
 "More friendly connections required than target total number of connections.\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:1039
+#: src/topology/gnunet-daemon-topology.c:1059
 #: src/transport/plugin_transport_wlan.c:1491
 #, fuzzy
 msgid "# HELLO messages received"
 msgstr "# krypterade PONG-meddelanden mottagna"
 
-#: src/topology/gnunet-daemon-topology.c:1112
-msgid "# HELLO messages gossipped"
-msgstr ""
-
-#: src/topology/gnunet-daemon-topology.c:1283
+#: src/topology/gnunet-daemon-topology.c:1233
 msgid "GNUnet topology control"
 msgstr ""
 
@@ -7189,270 +6945,270 @@
 msgid "# Addresses given to ATS"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_blacklist.c:284
-#, fuzzy, c-format
-msgid "Adding blacklisting entry for peer `%s'\n"
-msgstr "Motpart \"%s\" med pålitlighet %8u och adress \"%s\"\n"
-
-#: src/transport/gnunet-service-transport_blacklist.c:293
-#, c-format
-msgid "Adding blacklisting entry for peer `%s':`%s'\n"
+#: src/transport/gnunet-service-transport.c:448
+msgid "# messages dropped due to slow client"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_blacklist.c:500
-#: src/transport/gnunet-service-transport_blacklist.c:851
-msgid "# disconnects due to blacklist"
+#: src/transport/gnunet-service-transport.c:809
+msgid "# bytes payload dropped (other peer was not connected)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_blacklist.c:855
-#, fuzzy, c-format
-msgid "Disallowing connection to peer `%s' on transport %s\n"
-msgstr "Kunde inte slå upp \"%s\": %s\n"
-
-#: src/transport/gnunet-service-transport.c:231
+#: src/transport/gnunet-service-transport.c:1539
 #, fuzzy
 msgid "# bytes payload discarded due to not connected peer"
 msgstr "Nätverksannonsering avstängd i konfigurationen!\n"
 
-#: src/transport/gnunet-service-transport.c:383
+#: src/transport/gnunet-service-transport.c:1698
 #, fuzzy
 msgid "# bytes total received"
 msgstr "# byte krypterade"
 
-#: src/transport/gnunet-service-transport.c:478
+#: src/transport/gnunet-service-transport.c:1795
 #, fuzzy
 msgid "# bytes payload received"
 msgstr "# byte dekrypterade"
 
-#: src/transport/gnunet-service-transport.c:823
+#: src/transport/gnunet-service-transport.c:2112
+#: src/transport/gnunet-service-transport.c:2584
+msgid "# disconnects due to blacklist"
+msgstr ""
+
+#: src/transport/gnunet-service-transport.c:2588
+#, fuzzy, c-format
+msgid "Disallowing connection to peer `%s' on transport %s\n"
+msgstr "Kunde inte slå upp \"%s\": %s\n"
+
+#: src/transport/gnunet-service-transport.c:2696
+#, fuzzy, c-format
+msgid "Adding blacklisting entry for peer `%s'\n"
+msgstr "Motpart \"%s\" med pålitlighet %8u och adress \"%s\"\n"
+
+#: src/transport/gnunet-service-transport.c:2705
+#, c-format
+msgid "Adding blacklisting entry for peer `%s':`%s'\n"
+msgstr ""
+
+#: src/transport/gnunet-service-transport.c:2770
 #, fuzzy
 msgid "Transport service is lacking key configuration settings. Exiting.\n"
 msgstr "GNUnet-konfiguration"
 
-#: src/transport/gnunet-service-transport_clients.c:523
-msgid "# messages dropped due to slow client"
-msgstr ""
-
-#: src/transport/gnunet-service-transport_clients.c:845
-msgid "# bytes payload dropped (other peer was not connected)"
-msgstr ""
-
 #: src/transport/gnunet-service-transport_hello.c:195
 msgid "# refreshed my HELLO"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:805
+#: src/transport/gnunet-service-transport_neighbours.c:804
 #, fuzzy
 msgid "# session creation failed"
 msgstr "# sessionsnycklar accepterade"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1048
+#: src/transport/gnunet-service-transport_neighbours.c:1047
 #, fuzzy
 msgid "# DISCONNECT messages sent"
 msgstr "# krypterade PONG-meddelanden mottagna"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1168
+#: src/transport/gnunet-service-transport_neighbours.c:1167
 msgid "# disconnects due to quota of 0"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1311
-#: src/transport/gnunet-service-transport_neighbours.c:1764
+#: src/transport/gnunet-service-transport_neighbours.c:1310
+#: src/transport/gnunet-service-transport_neighbours.c:1763
 msgid "# bytes in message queue for other peers"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1316
+#: src/transport/gnunet-service-transport_neighbours.c:1315
 #, fuzzy
 msgid "# messages transmitted to other peers"
 msgstr "# byte skickade av typen %d"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1322
+#: src/transport/gnunet-service-transport_neighbours.c:1321
 #, fuzzy
 msgid "# transmission failures for messages to other peers"
 msgstr "# byte skickade av typen %d"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1382
+#: src/transport/gnunet-service-transport_neighbours.c:1381
 msgid "# messages timed out while in transport queue"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1458
+#: src/transport/gnunet-service-transport_neighbours.c:1457
 msgid "# KEEPALIVES sent"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1494
+#: src/transport/gnunet-service-transport_neighbours.c:1493
 #, fuzzy
 msgid "# KEEPALIVE messages discarded (peer unknown)"
 msgstr "Nätverksannonsering avstängd i konfigurationen!\n"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1502
+#: src/transport/gnunet-service-transport_neighbours.c:1501
 #, fuzzy
 msgid "# KEEPALIVE messages discarded (no session)"
 msgstr "Nätverksannonsering avstängd i konfigurationen!\n"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1512
+#: src/transport/gnunet-service-transport_neighbours.c:1511
 msgid "# KEEPALIVES received in good order"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1557
+#: src/transport/gnunet-service-transport_neighbours.c:1556
 #, fuzzy
 msgid "# KEEPALIVE_RESPONSEs discarded (not connected)"
 msgstr "Nätverksannonsering avstängd i konfigurationen!\n"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1566
+#: src/transport/gnunet-service-transport_neighbours.c:1565
 #, fuzzy
 msgid "# KEEPALIVE_RESPONSEs discarded (not expected)"
 msgstr "Nätverksannonsering avstängd i konfigurationen!\n"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1574
+#: src/transport/gnunet-service-transport_neighbours.c:1573
 #, fuzzy
 msgid "# KEEPALIVE_RESPONSEs discarded (address changed)"
 msgstr "Nätverksannonsering avstängd i konfigurationen!\n"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1583
+#: src/transport/gnunet-service-transport_neighbours.c:1582
 #, fuzzy
 msgid "# KEEPALIVE_RESPONSEs discarded (no nonce)"
 msgstr "Nätverksannonsering avstängd i konfigurationen!\n"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1588
+#: src/transport/gnunet-service-transport_neighbours.c:1587
 #, fuzzy
 msgid "# KEEPALIVE_RESPONSEs discarded (bad nonce)"
 msgstr "Nätverksannonsering avstängd i konfigurationen!\n"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1594
+#: src/transport/gnunet-service-transport_neighbours.c:1593
 #, fuzzy
 msgid "# KEEPALIVE_RESPONSEs received (OK)"
 msgstr "Nätverksannonsering avstängd i konfigurationen!\n"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1661
+#: src/transport/gnunet-service-transport_neighbours.c:1660
 #, 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:1695
+#: src/transport/gnunet-service-transport_neighbours.c:1694
 msgid "# bandwidth quota violations by other peers"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1710
+#: src/transport/gnunet-service-transport_neighbours.c:1709
 msgid "# ms throttling suggested"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1830
+#: src/transport/gnunet-service-transport_neighbours.c:1829
 #, 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:1850
+#: src/transport/gnunet-service-transport_neighbours.c:1849
 #, 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:1889
+#: src/transport/gnunet-service-transport_neighbours.c:1888
 #, fuzzy
 msgid "# SYN messages sent"
 msgstr "# krypterade PONG-meddelanden mottagna"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1906
+#: src/transport/gnunet-service-transport_neighbours.c:1905
 #, 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:1936
+#: src/transport/gnunet-service-transport_neighbours.c:1935
 #, 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:2001
+#: src/transport/gnunet-service-transport_neighbours.c:2000
 #, 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:2055
+#: src/transport/gnunet-service-transport_neighbours.c:2054
 #, fuzzy
 msgid "# SYN_ACK messages sent"
 msgstr "# krypterade PONG-meddelanden mottagna"
 
-#: src/transport/gnunet-service-transport_neighbours.c:2072
+#: src/transport/gnunet-service-transport_neighbours.c:2071
 #, 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:2228
+#: src/transport/gnunet-service-transport_neighbours.c:2227
 #, fuzzy
 msgid "# SYN messages received"
 msgstr "# PING-meddelanden skapade"
 
-#: src/transport/gnunet-service-transport_neighbours.c:2233
+#: src/transport/gnunet-service-transport_neighbours.c:2232
 #, c-format
 msgid "SYN request from peer `%s' ignored due impending shutdown\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:2599
+#: src/transport/gnunet-service-transport_neighbours.c:2598
 msgid "# Attempts to switch addresses"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3081
+#: src/transport/gnunet-service-transport_neighbours.c:3080
 #, fuzzy
 msgid "# SYN_ACK messages received"
 msgstr "# krypterade PONG-meddelanden mottagna"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3089
+#: src/transport/gnunet-service-transport_neighbours.c:3088
 #, fuzzy
 msgid "# unexpected SYN_ACK messages (no peer)"
 msgstr "skicka ANTAL meddelanden"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3107
-#: src/transport/gnunet-service-transport_neighbours.c:3131
+#: src/transport/gnunet-service-transport_neighbours.c:3106
+#: src/transport/gnunet-service-transport_neighbours.c:3130
 #, fuzzy
 msgid "# unexpected SYN_ACK messages (not ready)"
 msgstr "skicka ANTAL meddelanden"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3143
+#: src/transport/gnunet-service-transport_neighbours.c:3142
 #, fuzzy
 msgid "# unexpected SYN_ACK messages (waiting on ATS)"
 msgstr "skicka ANTAL meddelanden"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3168
+#: src/transport/gnunet-service-transport_neighbours.c:3167
 msgid "# Successful attempts to switch addresses"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3181
+#: src/transport/gnunet-service-transport_neighbours.c:3180
 #, fuzzy
 msgid "# unexpected SYN_ACK messages (disconnecting)"
 msgstr "skicka ANTAL meddelanden"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3353
+#: src/transport/gnunet-service-transport_neighbours.c:3352
 #, fuzzy
 msgid "# ACK messages received"
 msgstr "# krypterade PONG-meddelanden mottagna"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3389
+#: src/transport/gnunet-service-transport_neighbours.c:3388
 #, fuzzy
 msgid "# unexpected ACK messages"
 msgstr "# krypterade PONG-meddelanden skickade"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3477
+#: src/transport/gnunet-service-transport_neighbours.c:3476
 #, fuzzy
 msgid "# quota messages ignored (malformed)"
 msgstr "# byte mottogs via TCP"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3484
+#: src/transport/gnunet-service-transport_neighbours.c:3483
 #, fuzzy
 msgid "# QUOTA messages received"
 msgstr "# krypterade PONG-meddelanden mottagna"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3524
+#: src/transport/gnunet-service-transport_neighbours.c:3523
 msgid "# disconnect messages ignored (malformed)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3531
+#: src/transport/gnunet-service-transport_neighbours.c:3530
 #, fuzzy
 msgid "# DISCONNECT messages received"
 msgstr "# krypterade PONG-meddelanden mottagna"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3542
+#: src/transport/gnunet-service-transport_neighbours.c:3541
 msgid "# disconnect messages ignored (timestamp)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3676
+#: src/transport/gnunet-service-transport_neighbours.c:3675
 #, fuzzy
 msgid "# disconnected from peer upon explicit request"
 msgstr "# av anslutna parter"
@@ -7481,62 +7237,62 @@
 msgid "Did not load plugin `%s' due to missing functions\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:343
+#: src/transport/gnunet-service-transport_validation.c:388
 msgid "# Addresses in validation map"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:452
-#: src/transport/gnunet-service-transport_validation.c:638
-#: src/transport/gnunet-service-transport_validation.c:949
-#: src/transport/gnunet-service-transport_validation.c:1551
+#: src/transport/gnunet-service-transport_validation.c:491
+#: src/transport/gnunet-service-transport_validation.c:677
+#: src/transport/gnunet-service-transport_validation.c:988
+#: src/transport/gnunet-service-transport_validation.c:1590
 msgid "# validations running"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:493
+#: src/transport/gnunet-service-transport_validation.c:532
 #, fuzzy
 msgid "# address records discarded (timeout)"
 msgstr "# byte kastade via TCP (utgående)"
 
-#: src/transport/gnunet-service-transport_validation.c:541
+#: src/transport/gnunet-service-transport_validation.c:580
 msgid "# address records discarded (blacklist)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:629
+#: src/transport/gnunet-service-transport_validation.c:668
 msgid "# PINGs for address validation sent"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:709
+#: src/transport/gnunet-service-transport_validation.c:748
 msgid "# validations delayed by global throttle"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:746
+#: src/transport/gnunet-service-transport_validation.c:785
 msgid "# address revalidations started"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1075
+#: src/transport/gnunet-service-transport_validation.c:1114
 #, fuzzy
 msgid "# PING message for different peer received"
 msgstr "# PING-meddelanden skapade"
 
-#: src/transport/gnunet-service-transport_validation.c:1126
+#: src/transport/gnunet-service-transport_validation.c:1165
 #, c-format
 msgid "Plugin `%s' not available, cannot confirm having this address\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1139
+#: src/transport/gnunet-service-transport_validation.c:1178
 msgid "# failed address checks during validation"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1142
+#: src/transport/gnunet-service-transport_validation.c:1181
 #, c-format
 msgid "Address `%s' is not one of my addresses, not confirming PING\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1150
+#: src/transport/gnunet-service-transport_validation.c:1189
 msgid "# successful address checks during validation"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1163
+#: src/transport/gnunet-service-transport_validation.c:1202
 #, c-format
 msgid ""
 "Not confirming PING from peer `%s' with address `%s' since I cannot confirm "
@@ -7543,121 +7299,101 @@
 "having this address.\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1218
+#: src/transport/gnunet-service-transport_validation.c:1257
 #, fuzzy, c-format
 msgid "Failed to create PONG signature for peer `%s'\n"
 msgstr "Kunde inte skapa namnrymd \"%s\" (existerar?).\n"
 
-#: src/transport/gnunet-service-transport_validation.c:1269
+#: src/transport/gnunet-service-transport_validation.c:1308
 msgid "# PONGs unicast via reliable transport"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1278
+#: src/transport/gnunet-service-transport_validation.c:1317
 msgid "# PONGs multicast to all available addresses"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1441
+#: src/transport/gnunet-service-transport_validation.c:1480
 msgid "# PONGs dropped, no matching pending validation"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1459
+#: src/transport/gnunet-service-transport_validation.c:1498
 msgid "# PONGs dropped, signature expired"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1514
+#: src/transport/gnunet-service-transport_validation.c:1553
 msgid "# validations succeeded"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:558
+#: src/transport/gnunet-transport.c:518
 #, 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:567
-#: src/transport/gnunet-transport-profiler.c:277
+#: src/transport/gnunet-transport.c:528
 #, c-format
 msgid "Received %llu bytes/s (%llu bytes in %s)\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:608
+#: src/transport/gnunet-transport.c:572
 #, fuzzy, c-format
 msgid "Failed to connect to `%s'\n"
 msgstr "Misslyckades att ansluta till gnunetd.\n"
 
-#: src/transport/gnunet-transport.c:621
+#: src/transport/gnunet-transport.c:585
 #, 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:633
+#: src/transport/gnunet-transport.c:597
 #, fuzzy
 msgid "Failed to list connections, timeout occured\n"
 msgstr "Misslyckades att ansluta till gnunetd.\n"
 
-#: src/transport/gnunet-transport.c:658 src/transport/gnunet-transport.c:683
+#: src/transport/gnunet-transport.c:622 src/transport/gnunet-transport.c:647
 #, fuzzy, c-format
 msgid "Configuration for plugin `%s' did not work!\n"
 msgstr "Konfigurationsfil \"%s\" skapad.\n"
 
-#: src/transport/gnunet-transport.c:663
+#: src/transport/gnunet-transport.c:627
 #, fuzzy, c-format
 msgid "Configuration for plugin `%s' did work!\n"
 msgstr "Konfigurationsfil \"%s\" skapad.\n"
 
-#: src/transport/gnunet-transport.c:668
+#: src/transport/gnunet-transport.c:632
 #, fuzzy, c-format
 msgid "Internal NAT error while running test for plugin `%s'\n"
 msgstr "=\tFel vid läsning av katalog.\n"
 
-#: src/transport/gnunet-transport.c:673
+#: src/transport/gnunet-transport.c:637
 #, fuzzy, c-format
 msgid "Failed to start NAT test for plugin `%s'\n"
 msgstr "Misslyckades att starta samling.\n"
 
-#: src/transport/gnunet-transport.c:678
+#: src/transport/gnunet-transport.c:642
 #, c-format
 msgid "Timeout while waiting for result of NAT test for plugin `%s'\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:803
-#, fuzzy, c-format
-msgid ""
-"Peer `%s' %s %s\n"
-"\t%s%s\n"
-"\t%s%s\n"
-"\t%s%s\n"
-msgstr "Jag är ändpunkt \"%s\".\n"
-
-#: src/transport/gnunet-transport.c:838
-#, fuzzy, c-format
-msgid "Peer `%s' %s `%s' \n"
-msgstr "Jag är ändpunkt \"%s\".\n"
-
-#: src/transport/gnunet-transport.c:927 src/transport/gnunet-transport.c:1673
-#, fuzzy
-msgid "Monitor disconnected from transport service. Reconnecting.\n"
-msgstr "Misslyckades att ansluta till gnunetd.\n"
-
-#: src/transport/gnunet-transport.c:982
+#: src/transport/gnunet-transport.c:735
 msgid "No transport plugins configured, peer will never communicate\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:996
+#: src/transport/gnunet-transport.c:749
 #, c-format
 msgid "No port configured for plugin `%s', cannot test it\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1021
+#: src/transport/gnunet-transport.c:774
 #, fuzzy
 msgid "Failed to start resolver!\n"
 msgstr "Misslyckades att starta samling.\n"
 
-#: src/transport/gnunet-transport.c:1067
+#: src/transport/gnunet-transport.c:810
 #, fuzzy, c-format
-msgid "Transmitting %u bytes to %s\n"
+msgid "Transmitting %u bytes\n"
 msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 
-#: src/transport/gnunet-transport.c:1096
+#: src/transport/gnunet-transport.c:844
 #, c-format
 msgid ""
 "Successfully connected to `%s', starting to send benchmark data in %u Kb "
@@ -7664,44 +7400,47 @@
 "blocks\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1133
-#: src/transport/gnunet-transport-profiler.c:432
+#: src/transport/gnunet-transport.c:875
 #, fuzzy, c-format
 msgid "Disconnected from peer `%s' while benchmarking\n"
 msgstr "\"%s\" ansluten till \"%s\".\n"
 
-#: src/transport/gnunet-transport.c:1158 src/transport/gnunet-transport.c:1184
+#: src/transport/gnunet-transport.c:899 src/transport/gnunet-transport.c:928
 #, c-format
 msgid "%24s: %-17s %4s   (%u connections in total)\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1160
+#: src/transport/gnunet-transport.c:901
 #, fuzzy
 msgid "Connected to"
 msgstr "\"%s\" ansluten till \"%s\".\n"
 
-#: src/transport/gnunet-transport.c:1186
+#: src/transport/gnunet-transport.c:930
 #, fuzzy
 msgid "Disconnected from"
 msgstr "\"%s\" ansluten till \"%s\".\n"
 
-#: src/transport/gnunet-transport.c:1210
-#: src/transport/gnunet-transport-profiler.c:457
-#, c-format
-msgid "Received %u bytes from %s\n"
-msgstr ""
+#: src/transport/gnunet-transport.c:965
+#, fuzzy, c-format
+msgid "Received %u bytes\n"
+msgstr "mottog ogiltigt \"%s\" meddelande\n"
 
-#: src/transport/gnunet-transport.c:1250
+#: src/transport/gnunet-transport.c:1002
 #, c-format
 msgid "Peer `%s': %s %s in state `%s' until %s\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1262
+#: src/transport/gnunet-transport.c:1014
 #, fuzzy, c-format
 msgid "Peer `%s': %s %s\n"
 msgstr "Jag är ändpunkt \"%s\".\n"
 
-#: src/transport/gnunet-transport.c:1792
+#: src/transport/gnunet-transport.c:1426
+#, fuzzy
+msgid "Monitor disconnected from transport service. Reconnecting.\n"
+msgstr "Misslyckades att ansluta till gnunetd.\n"
+
+#: src/transport/gnunet-transport.c:1548
 #, c-format
 msgid ""
 "Multiple operations given. Please choose only one operation: %s, %s, %s, %s, "
@@ -7708,226 +7447,145 @@
 "%s, %s %s\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1800
+#: src/transport/gnunet-transport.c:1561
 #, c-format
 msgid ""
 "No operation given. Please choose one operation: %s, %s, %s, %s, %s, %s, %s\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1823
+#: src/transport/gnunet-transport.c:1589
 #, fuzzy
 msgid "Failed to connect to transport service for disconnection\n"
 msgstr "Misslyckades att ansluta till gnunetd.\n"
 
-#: src/transport/gnunet-transport.c:1829
+#: src/transport/gnunet-transport.c:1595
 msgid "Blacklisting request in place, stop with CTRL-C\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1848 src/transport/gnunet-transport.c:1867
-#: src/transport/gnunet-transport.c:1925
-#: src/transport/gnunet-transport-profiler.c:553
+#: src/transport/gnunet-transport.c:1618 src/transport/gnunet-transport.c:1648
+#: src/transport/gnunet-transport.c:1701
 #, fuzzy
 msgid "Failed to connect to transport service\n"
 msgstr "Misslyckades att ansluta till gnunetd.\n"
 
-#: src/transport/gnunet-transport.c:1872
+#: src/transport/gnunet-transport.c:1655
 msgid "Starting to receive benchmark data\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1972
+#: src/transport/gnunet-transport.c:1725
 #, fuzzy
 msgid "print information for all peers (instead of only connected peers)"
 msgstr "Skriv ut information om GNUnets motparter."
 
-#: src/transport/gnunet-transport.c:1975
+#: src/transport/gnunet-transport.c:1728
 msgid "measure how fast we are receiving data from all peers (until CTRL-C)"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1978
+#: src/transport/gnunet-transport.c:1731
 #, fuzzy
 msgid "disconnect from a peer"
 msgstr "Misslyckades att ansluta till gnunetd.\n"
 
-#: src/transport/gnunet-transport.c:1981
+#: src/transport/gnunet-transport.c:1734
 #, fuzzy
-msgid "print information for all pending validations "
-msgstr "Skriv ut information om GNUnets motparter."
-
-#: src/transport/gnunet-transport.c:1984
-#, fuzzy
-msgid "print information for all pending validations continuously"
-msgstr "Skriv ut information om GNUnets motparter."
-
-#: src/transport/gnunet-transport.c:1987
-#, fuzzy
 msgid "provide information about all current connections (once)"
 msgstr "Skriv ut information om GNUnets motparter."
 
-#: src/transport/gnunet-transport.c:1993
+#: src/transport/gnunet-transport.c:1740
 #, fuzzy
 msgid ""
 "provide information about all connects and disconnect events (continuously)"
 msgstr "Skriv ut information om GNUnets motparter."
 
-#: src/transport/gnunet-transport.c:1996
+#: src/transport/gnunet-transport.c:1743
 #, fuzzy
 msgid "do not resolve hostnames"
 msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 
-#: src/transport/gnunet-transport.c:1999
-#: src/transport/gnunet-transport-profiler.c:618
+#: src/transport/gnunet-transport.c:1746
+#: src/transport/gnunet-transport-profiler.c:631
 msgid "peer identity"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:2002
+#: src/transport/gnunet-transport.c:1749
 msgid "monitor plugin sessions"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:2005
+#: src/transport/gnunet-transport.c:1752
 msgid "send data for benchmarking to the other peer (until CTRL-C)"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:2008
+#: src/transport/gnunet-transport.c:1755
 msgid "test transport configuration (involves external server)"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:2019
-#: src/transport/gnunet-transport-profiler.c:629
+#: src/transport/gnunet-transport.c:1766
+#: src/transport/gnunet-transport-profiler.c:642
 #, fuzzy
 msgid "Direct access to transport service."
 msgstr "Misslyckades att ansluta till gnunetd.\n"
 
-#: src/transport/gnunet-transport-profiler.c:221
+#: src/transport/gnunet-transport-profiler.c:219
 #, c-format
 msgid "%llu B in %llu ms == %.2f KB/s!\n"
 msgstr ""
 
-#: src/transport/gnunet-transport-profiler.c:257
-#, c-format
-msgid "%u;%u;%llu;%llu;%.2f;%.2f"
-msgstr ""
-
-#: src/transport/gnunet-transport-profiler.c:266
-#, c-format
-msgid ";%llu;%.2f"
-msgstr ""
-
-#: src/transport/gnunet-transport-profiler.c:283
-msgid "\n"
-msgstr ""
-
-#: src/transport/gnunet-transport-profiler.c:336
-msgid "."
-msgstr ""
-
-#: src/transport/gnunet-transport-profiler.c:356
-#, c-format
-msgid ""
-"\n"
-"Starting benchmark to `%s', starting to send %u messages in %u byte blocks\n"
-msgstr ""
-
-#: src/transport/gnunet-transport-profiler.c:404
-#, fuzzy, c-format
-msgid "Connected to different peer `%s'\n"
-msgstr "\"%s\" ansluten till \"%s\".\n"
-
-#: src/transport/gnunet-transport-profiler.c:411
-#, fuzzy, c-format
-msgid "Successfully connected to `%s'\n"
-msgstr "Åtkomst nekad för \"%s\" vid %s:%d.\n"
-
-#: src/transport/gnunet-transport-profiler.c:473
-#, fuzzy, c-format
-msgid "Denying connection to `%s'\n"
-msgstr "Kan inte ansluta till %u.%u.%u.%u:%u: %s\n"
-
-#: src/transport/gnunet-transport-profiler.c:503
-#, fuzzy
-msgid "Message size too big!\n"
-msgstr "meddelandestorlek"
-
-#: src/transport/gnunet-transport-profiler.c:509
-#, fuzzy
-msgid "No peer identity given\n"
-msgstr "Skriv ut information om GNUnets motparter."
-
-#: src/transport/gnunet-transport-profiler.c:524
-#, c-format
-msgid "Trying to send %u messages with size %u to peer `%s'\n"
-msgstr ""
-
-#: src/transport/gnunet-transport-profiler.c:530
-#, fuzzy, c-format
-msgid "Trying to receive messages from peer `%s'\n"
-msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
-
-#: src/transport/gnunet-transport-profiler.c:535
-#, fuzzy
-msgid "No operation given\n"
-msgstr "Skriv ut information om GNUnets motparter."
-
-#: src/transport/gnunet-transport-profiler.c:542
-#, fuzzy
-msgid "Failed to connect to ATS service\n"
-msgstr "Misslyckades att ansluta till gnunetd.\n"
-
-#: src/transport/gnunet-transport-profiler.c:603
+#: src/transport/gnunet-transport-profiler.c:616
 msgid "send data to peer"
 msgstr ""
 
-#: src/transport/gnunet-transport-profiler.c:606
+#: src/transport/gnunet-transport-profiler.c:619
 #, fuzzy
 msgid "receive data from peer"
 msgstr "# byte mottagna av typen %d"
 
-#: src/transport/gnunet-transport-profiler.c:609
+#: src/transport/gnunet-transport-profiler.c:622
 #, fuzzy
 msgid "iterations"
 msgstr "Visa alla alternativ"
 
-#: src/transport/gnunet-transport-profiler.c:612
+#: src/transport/gnunet-transport-profiler.c:625
 #, fuzzy
 msgid "number of messages to send"
 msgstr "antal meddelanden att använda per iteration"
 
-#: src/transport/gnunet-transport-profiler.c:615
+#: src/transport/gnunet-transport-profiler.c:628
 #, fuzzy
 msgid "message size to use"
 msgstr "meddelandestorlek"
 
-#: src/transport/plugin_transport_http_client.c:1473
-#: src/transport/plugin_transport_http_server.c:2237
-#: src/transport/plugin_transport_http_server.c:3427
-#: src/transport/plugin_transport_tcp.c:2985
-#: src/transport/plugin_transport_tcp.c:2992
+#: src/transport/plugin_transport_http_client.c:1477
+#: src/transport/plugin_transport_http_server.c:2248
+#: src/transport/plugin_transport_http_server.c:3457
+#: src/transport/plugin_transport_tcp.c:3365
+#: src/transport/plugin_transport_tcp.c:3372
 msgid "TCP_STEALTH not supported on this platform.\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_client.c:2114
+#: src/transport/plugin_transport_http_client.c:2118
 #, c-format
 msgid "Could not initialize curl multi handle, failed to start %s plugin!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_client.c:2163
-#: src/transport/plugin_transport_http_server.c:3142
+#: src/transport/plugin_transport_http_client.c:2167
+#: src/transport/plugin_transport_http_server.c:3172
 #, fuzzy, c-format
 msgid "Shutting down plugin `%s'\n"
 msgstr "Testar transport(er) %s\n"
 
-#: src/transport/plugin_transport_http_client.c:2180
-#: src/transport/plugin_transport_http_server.c:3212
+#: src/transport/plugin_transport_http_client.c:2184
+#: src/transport/plugin_transport_http_server.c:3242
 #, 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:2214
+#: src/transport/plugin_transport_http_client.c:2218
 #, 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:1721
+#: src/transport/plugin_transport_http_server.c:1729
 #, c-format
 msgid ""
 "Access from connection %p (%u of %u) for `%s' `%s' url `%s' with upload data "
@@ -7934,82 +7592,72 @@
 "size %u\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:1955
+#: src/transport/plugin_transport_http_server.c:1966
 #, c-format
 msgid "Accepting connection (%u of %u) from `%s'\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:1963
+#: src/transport/plugin_transport_http_server.c:1974
 #, c-format
 msgid ""
 "Server reached maximum number connections (%u), rejecting new connection\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:2113
+#: src/transport/plugin_transport_http_server.c:2124
 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:2136
+#: src/transport/plugin_transport_http_server.c:2147
 #, c-format
 msgid "No usable TLS certificate found and creating one at `%s/%s' failed!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:2263
+#: src/transport/plugin_transport_http_server.c:2274
 msgid "Could not load or create server certificate! Loading plugin failed!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:2572
+#: src/transport/plugin_transport_http_server.c:2583
 #, 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:2606 src/util/service.c:704
-#, fuzzy, c-format
-msgid "Failed to resolve `%s': %s\n"
-msgstr "Misslyckades att leverera \"%s\" meddelande.\n"
-
-#: src/transport/plugin_transport_http_server.c:2624 src/util/service.c:723
-#, fuzzy, c-format
-msgid "Failed to find %saddress for `%s'.\n"
-msgstr "Misslyckades att binda till UDP-port %d.\n"
-
-#: src/transport/plugin_transport_http_server.c:2737
+#: src/transport/plugin_transport_http_server.c:2748
 #, c-format
 msgid "Found %u addresses to report to NAT service\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:2815
+#: src/transport/plugin_transport_http_server.c:2832
 #: src/transport/plugin_transport_udp.c:3600
 msgid "Disabling IPv6 since it is not supported on this system!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:2918
+#: src/transport/plugin_transport_http_server.c:2938
 #, c-format
 msgid "IPv4 support is %s\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:2933
+#: src/transport/plugin_transport_http_server.c:2953
 #, c-format
 msgid "IPv6 support is %s\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:2939
+#: src/transport/plugin_transport_http_server.c:2959
 msgid "Neither IPv4 nor IPv6 are enabled! Fix in configuration\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:2950
+#: src/transport/plugin_transport_http_server.c:2970
 #, fuzzy
 msgid "Port is required! Fix in configuration\n"
 msgstr " gconfig\tGTK-konfiguration\n"
 
-#: src/transport/plugin_transport_http_server.c:2956
+#: src/transport/plugin_transport_http_server.c:2976
 #, fuzzy, c-format
 msgid "Using port %u\n"
 msgstr "Testar transport(er) %s\n"
 
-#: src/transport/plugin_transport_http_server.c:2970
+#: src/transport/plugin_transport_http_server.c:2995
 #, fuzzy, c-format
 msgid "Specific IPv4 address `%s' in configuration file is invalid!\n"
 msgstr ""
@@ -8016,39 +7664,29 @@
 "Du måste ange ett positivt nummer för \"%s\" i konfigurationen i sektion \"%s"
 "\".\n"
 
-#: src/transport/plugin_transport_http_server.c:2980
+#: src/transport/plugin_transport_http_server.c:3030
 #, fuzzy, c-format
-msgid "Binding to IPv4 address %s\n"
-msgstr "Ogiltigt svar på \"%s\".\n"
-
-#: src/transport/plugin_transport_http_server.c:3002
-#, 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:3012
+#: src/transport/plugin_transport_http_server.c:3105
 #, fuzzy, c-format
-msgid "Binding to IPv6 address %s\n"
-msgstr "Ogiltigt svar på \"%s\".\n"
-
-#: src/transport/plugin_transport_http_server.c:3075
-#, fuzzy, c-format
 msgid "Using external hostname `%s'\n"
 msgstr "Startade samling \"%s\".\n"
 
-#: src/transport/plugin_transport_http_server.c:3096
+#: src/transport/plugin_transport_http_server.c:3126
 #, 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:3113
+#: src/transport/plugin_transport_http_server.c:3143
 #, 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:3439
+#: src/transport/plugin_transport_http_server.c:3469
 #, fuzzy
 msgid "Unable to compile URL regex\n"
 msgstr "Kunde inte initiera SQLite.\n"
@@ -8101,110 +7739,104 @@
 msgid "# bytes dropped by SMTP (outgoing)"
 msgstr "# byte kastade via TCP (utgående)"
 
-#: src/transport/plugin_transport_tcp.c:672
-#: src/transport/plugin_transport_tcp.c:1983
+#: src/transport/plugin_transport_tcp.c:1051
+#: src/transport/plugin_transport_tcp.c:2362
 #, c-format
 msgid "Unexpected address length: %u bytes\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:855
-#: src/transport/plugin_transport_tcp.c:1079
-#: src/transport/plugin_transport_tcp.c:2253
-#: src/transport/plugin_transport_tcp.c:3106
+#: src/transport/plugin_transport_tcp.c:1234
+#: src/transport/plugin_transport_tcp.c:1458
+#: src/transport/plugin_transport_tcp.c:2633
+#: src/transport/plugin_transport_tcp.c:3490
 #, fuzzy
 msgid "# TCP sessions active"
 msgstr "# sessionsnycklar accepterade"
 
-#: src/transport/plugin_transport_tcp.c:897
-#: src/transport/plugin_transport_tcp.c:1061
-#: src/transport/plugin_transport_tcp.c:1185
-#: src/transport/plugin_transport_tcp.c:1258
-#: src/transport/plugin_transport_tcp.c:1358
-#: src/transport/plugin_transport_tcp.c:1383
+#: src/transport/plugin_transport_tcp.c:1276
+#: src/transport/plugin_transport_tcp.c:1440
+#: src/transport/plugin_transport_tcp.c:1564
+#: src/transport/plugin_transport_tcp.c:1637
+#: src/transport/plugin_transport_tcp.c:1737
+#: src/transport/plugin_transport_tcp.c:1762
 #, fuzzy
 msgid "# bytes currently in TCP buffers"
 msgstr "# byte skickades via TCP"
 
-#: src/transport/plugin_transport_tcp.c:900
+#: src/transport/plugin_transport_tcp.c:1279
 #, fuzzy
 msgid "# bytes discarded by TCP (disconnect)"
 msgstr "# byte kastade via TCP (utgående)"
 
-#: src/transport/plugin_transport_tcp.c:1188
+#: src/transport/plugin_transport_tcp.c:1567
 #, fuzzy
 msgid "# bytes discarded by TCP (timeout)"
 msgstr "# byte kastade via TCP (utgående)"
 
-#: src/transport/plugin_transport_tcp.c:1262
+#: src/transport/plugin_transport_tcp.c:1641
 #, fuzzy
 msgid "# bytes transmitted via TCP"
 msgstr "# byte skickade av typen %d"
 
-#: src/transport/plugin_transport_tcp.c:1653
+#: src/transport/plugin_transport_tcp.c:2032
 msgid "# requests to create session with invalid address"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:1821
+#: src/transport/plugin_transport_tcp.c:2200
 msgid "# transport-service disconnect requests for TCP"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2312
+#: src/transport/plugin_transport_tcp.c:2692
 #, fuzzy
 msgid "# TCP WELCOME messages received"
 msgstr "# krypterade PONG-meddelanden mottagna"
 
-#: src/transport/plugin_transport_tcp.c:2503
+#: src/transport/plugin_transport_tcp.c:2883
 msgid "# bytes received via TCP"
 msgstr "# byte mottogs via TCP"
 
-#: src/transport/plugin_transport_tcp.c:2554
-#: src/transport/plugin_transport_tcp.c:2612
+#: src/transport/plugin_transport_tcp.c:2934
+#: src/transport/plugin_transport_tcp.c:2992
 #, fuzzy
 msgid "# TCP server connections active"
 msgstr "Nätverksanslutning"
 
-#: src/transport/plugin_transport_tcp.c:2558
+#: src/transport/plugin_transport_tcp.c:2938
 #, fuzzy
 msgid "# TCP server connect events"
 msgstr "# av anslutna parter"
 
-#: src/transport/plugin_transport_tcp.c:2564
+#: src/transport/plugin_transport_tcp.c:2944
 msgid "TCP connection limit reached, suspending server\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2566
+#: src/transport/plugin_transport_tcp.c:2946
 msgid "# TCP service suspended"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2606
+#: src/transport/plugin_transport_tcp.c:2986
 msgid "# TCP service resumed"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2616
+#: src/transport/plugin_transport_tcp.c:2996
 msgid "# network-level TCP disconnect events"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2919 src/util/service.c:584
-#: src/util/service.c:590
-#, c-format
-msgid "Require valid port number for service `%s' in configuration!\n"
-msgstr ""
-
-#: src/transport/plugin_transport_tcp.c:2935
+#: src/transport/plugin_transport_tcp.c:3315
 #, fuzzy
 msgid "Failed to start service.\n"
 msgstr "Misslyckades att starta samling.\n"
 
-#: src/transport/plugin_transport_tcp.c:3094
+#: src/transport/plugin_transport_tcp.c:3478
 #, c-format
 msgid "TCP transport listening on port %llu\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:3098
+#: src/transport/plugin_transport_tcp.c:3482
 msgid "TCP transport not listening on any port (client only)\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:3102
+#: src/transport/plugin_transport_tcp.c:3486
 #, c-format
 msgid "TCP transport advertises itself as being on port %llu\n"
 msgstr ""
@@ -8314,7 +7946,7 @@
 
 #: src/transport/plugin_transport_wlan.c:1167
 #: src/transport/plugin_transport_wlan.c:1258
-#: src/transport/plugin_transport_wlan.c:2279
+#: src/transport/plugin_transport_wlan.c:2280
 #, fuzzy
 msgid "# MAC endpoints allocated"
 msgstr "# byte mottogs via TCP"
@@ -8344,147 +7976,119 @@
 msgid "# DATA messages processed"
 msgstr "# krypterade PONG-meddelanden mottagna"
 
-#: src/transport/plugin_transport_wlan.c:2254
+#: src/transport/plugin_transport_wlan.c:2255
 #, c-format
 msgid "Helper binary `%s' not SUID, cannot run WLAN transport\n"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:2276
+#: src/transport/plugin_transport_wlan.c:2277
 #, fuzzy
 msgid "# sessions allocated"
 msgstr "# sessionsnycklar accepterade"
 
-#: src/transport/transport_api.c:816
-#, fuzzy, c-format
-msgid "Received unexpected message of type %u in %s:%u\n"
-msgstr "Mottog skadat meddelande från motpart \"%s\"i %s:%d.\n"
-
-#: src/transport/transport-testing.c:676
-#, fuzzy
-msgid "Failed to initialize testing library!\n"
-msgstr "Misslyckades att initiera tjänsten \"%s\".\n"
-
 #: src/tun/regex.c:134
 #, c-format
 msgid "Bad mask: %d\n"
 msgstr ""
 
-#: src/util/bio.c:170 src/util/bio.c:178
+#: src/util/bio.c:177 src/util/bio.c:185
 #, fuzzy, c-format
 msgid "Error reading `%s': %s"
 msgstr "Fel vid skapandet av användare"
 
-#: src/util/bio.c:180
+#: src/util/bio.c:187
 #, fuzzy
 msgid "End of file"
 msgstr "Läs in en konfigurationsfil"
 
-#: src/util/bio.c:237
+#: src/util/bio.c:244
 #, c-format
 msgid "Error reading length of string `%s'"
 msgstr ""
 
-#: src/util/bio.c:247
+#: src/util/bio.c:254
 #, c-format
 msgid "String `%s' longer than allowed (%u > %u)"
 msgstr ""
 
-#: src/util/bio.c:293
+#: src/util/bio.c:300
 #, c-format
 msgid "Serialized metadata `%s' larger than allowed (%u>%u)"
 msgstr ""
 
-#: src/util/bio.c:307
+#: src/util/bio.c:314
 #, c-format
 msgid "Metadata `%s' failed to deserialize"
 msgstr ""
 
-#: src/util/client.c:264 src/util/client.c:892 src/util/service.c:621
+#: src/util/client_new.c:863
 #, c-format
-msgid "UNIXPATH `%s' too long, maximum length is %llu\n"
-msgstr ""
-
-#: src/util/client.c:268 src/util/client.c:897 src/util/service.c:625
-#, fuzzy, c-format
-msgid "Using `%s' instead\n"
-msgstr "%s: flagga \"%s\" är tvetydig\n"
-
-#: src/util/client.c:367
-#, c-format
-msgid ""
-"Could not determine valid hostname and port for service `%s' from "
-"configuration.\n"
-msgstr ""
-
-#: src/util/client.c:375
-#, c-format
 msgid "Need a non-empty hostname for service `%s'.\n"
 msgstr ""
 
-#: src/util/client.c:1042
-#, fuzzy, c-format
-msgid "Could not connect to service `%s', configuration broken.\n"
-msgstr "Kunde inte ansluta till gnunetd.\n"
-
-#: src/util/client.c:1054
-#, fuzzy, c-format
-msgid "Failure to transmit request to service `%s'\n"
-msgstr "Misslyckades att skicka HTTP-begäran till värd \"%s\": %s\n"
-
-#: src/util/common_logging.c:255 src/util/common_logging.c:1062
+#: src/util/common_logging.c:256 src/util/common_logging.c:1129
 msgid "DEBUG"
 msgstr "FELSÖKNING"
 
-#: src/util/common_logging.c:257 src/util/common_logging.c:1060
+#: src/util/common_logging.c:258 src/util/common_logging.c:1127
 msgid "INFO"
 msgstr "INFO"
 
-#: src/util/common_logging.c:259 src/util/common_logging.c:1058
+#: src/util/common_logging.c:260 src/util/common_logging.c:1125
+msgid "MESSAGE"
+msgstr "MEDDELANDE"
+
+#: src/util/common_logging.c:262 src/util/common_logging.c:1123
 msgid "WARNING"
 msgstr "VARNING"
 
-#: src/util/common_logging.c:261 src/util/common_logging.c:1056
+#: src/util/common_logging.c:264 src/util/common_logging.c:1121
 msgid "ERROR"
 msgstr "FEL"
 
-#: src/util/common_logging.c:263 src/util/common_logging.c:1064
+#: src/util/common_logging.c:266 src/util/common_logging.c:1131
 msgid "NONE"
 msgstr ""
 
-#: src/util/common_logging.c:840
+#: src/util/common_logging.c:879
 #, c-format
 msgid "Message `%.*s' repeated %u times in the last %s\n"
 msgstr ""
 
-#: src/util/common_logging.c:1065
+#: src/util/common_logging.c:1132
 msgid "INVALID"
 msgstr ""
 
-#: src/util/common_logging.c:1181
+#: src/util/common_logging.c:1248
 msgid "unknown address"
 msgstr ""
 
-#: src/util/common_logging.c:1223
+#: src/util/common_logging.c:1290
 msgid "invalid address"
 msgstr ""
 
-#: src/util/common_logging.c:1241
+#: src/util/common_logging.c:1308
 #, fuzzy, c-format
 msgid "Configuration fails to specify option `%s' in section `%s'!\n"
 msgstr "Konfigurationsfil \"%s\" skapad.\n"
 
-#: src/util/common_logging.c:1262
+#: src/util/common_logging.c:1329
 #, fuzzy, c-format
 msgid ""
 "Configuration specifies invalid value for option `%s' in section `%s': %s\n"
 msgstr "Konfigurationsfil \"%s\" hittades inte.  Kör \"gnunet-setup -d\"!\n"
 
-#: src/util/configuration.c:291
+#: src/util/configuration.c:286
 #, fuzzy, c-format
 msgid "Syntax error while deserializing in line %u\n"
 msgstr "Syntaxfel i konfigurationsfil \"%s\" på rad %d.\n"
 
-#: src/util/configuration.c:1028
+#: src/util/configuration.c:344
+#, fuzzy, c-format
+msgid "Error while reading file `%s'\n"
+msgstr "Fel vid nedladdning: %s\n"
+
+#: src/util/configuration.c:1017
 #, c-format
 msgid ""
 "Configuration value '%s' for '%s' in section '%s' is not in set of legal "
@@ -8491,17 +8095,17 @@
 "choices\n"
 msgstr ""
 
-#: src/util/configuration.c:1147
+#: src/util/configuration.c:1136
 #, c-format
 msgid "Recursive expansion suspected, aborting $-expansion for term `%s'\n"
 msgstr ""
 
-#: src/util/configuration.c:1179
+#: src/util/configuration.c:1169
 #, fuzzy, c-format
 msgid "Missing closing `%s' in option `%s'\n"
 msgstr "Konfigurationsfil \"%s\" skapad.\n"
 
-#: src/util/configuration.c:1253
+#: src/util/configuration.c:1237
 #, c-format
 msgid ""
 "Failed to expand `%s' in `%s' as it is neither found in [PATHS] nor defined "
@@ -8580,17 +8184,22 @@
 msgid "libgcrypt has not the expected version (version %s is required).\n"
 msgstr "libgcrypt har inte den förväntande versionen (version %s krävs).\n"
 
-#: src/util/crypto_rsa.c:1146
+#: src/util/crypto_rsa.c:835
 #, fuzzy, c-format
+msgid "RSA signing failed at %s:%d: %s\n"
+msgstr "\"%s\" misslyckades vid %s:%d med fel: \"%s\".\n"
+
+#: src/util/crypto_rsa.c:1166
+#, fuzzy, c-format
 msgid "RSA signature verification failed at %s:%d: %s\n"
 msgstr "\"%s\" misslyckades vid %s:%d med fel: \"%s\".\n"
 
-#: src/util/disk.c:1227
+#: src/util/disk.c:1245
 #, 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:1450 src/util/service.c:1322
+#: src/util/disk.c:1486 src/util/service.c:1322 src/util/service_new.c:1371
 #, fuzzy, c-format
 msgid "Cannot obtain information about user `%s': %s\n"
 msgstr "Kan inte öppna konfigurationsfil \"%s\".\n"
@@ -8838,13 +8447,13 @@
 msgid "Manipulate GNUnet proof of work files"
 msgstr "skriv ut ett värde från konfigurationsfilen till standard ut"
 
-#: src/util/gnunet-service-resolver.c:327
+#: src/util/gnunet-service-resolver.c:371
 #, fuzzy, c-format
 msgid "Could not resolve `%s' (%s): %s\n"
 msgstr "Kunde inte slå upp \"%s\": %s\n"
 
-#: src/util/gnunet-service-resolver.c:401
-#: src/util/gnunet-service-resolver.c:442
+#: src/util/gnunet-service-resolver.c:460
+#: src/util/gnunet-service-resolver.c:512
 #, c-format
 msgid "Could not find IP of host `%s': %s\n"
 msgstr ""
@@ -8893,7 +8502,7 @@
 msgid "Unable to shorten unix path `%s' while keeping name unique\n"
 msgstr ""
 
-#: src/util/network.c:1731 src/util/network.c:1907
+#: src/util/network.c:1737 src/util/network.c:1913
 #, c-format
 msgid ""
 "Fatal internal logic error, process hangs in `%s' (abort with CTRL-C)!\n"
@@ -8942,17 +8551,17 @@
 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/program.c:244 src/util/service.c:1456 src/util/service_new.c:1801
 #, 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/program.c:256 src/util/service.c:1471 src/util/service_new.c:1818
 #, 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/program.c:261 src/util/service.c:1466 src/util/service_new.c:1812
 #, fuzzy
 msgid "Malformed configuration, exit ...\n"
 msgstr "Kunde inte spara konfigurationsfil \"%s\":"
@@ -8972,38 +8581,38 @@
 "Du måste ange ett positivt nummer för \"%s\" i konfigurationen i sektion \"%s"
 "\".\n"
 
-#: src/util/resolver_api.c:357
+#: src/util/resolver_api.c:815
+#, fuzzy, c-format
+msgid "Timeout trying to resolve hostname `%s'.\n"
+msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
+
+#: src/util/resolver_api.c:827
 #, c-format
 msgid "Timeout trying to resolve IP address `%s'.\n"
 msgstr ""
 
-#: src/util/resolver_api.c:364
-#, fuzzy, c-format
-msgid "Timeout trying to resolve hostname `%s'.\n"
-msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
-
-#: src/util/resolver_api.c:950
+#: src/util/resolver_api.c:1004
 msgid "Resolver not configured correctly.\n"
 msgstr ""
 
-#: src/util/resolver_api.c:1026 src/util/resolver_api.c:1047
-#: src/util/resolver_api.c:1061
+#: src/util/resolver_api.c:1086 src/util/resolver_api.c:1107
+#: src/util/resolver_api.c:1121
 #, fuzzy, c-format
 msgid "Could not resolve our FQDN: %s\n"
 msgstr "Kunde inte slå upp \"%s\": %s\n"
 
 # drive = hard drive ?
-#: src/util/server.c:478
+#: src/util/server.c:478 src/util/service_new.c:1103
 #, 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/server.c:488 src/util/service_new.c:1113
 #, 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/server.c:494 src/util/service_new.c:1119
 #, 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"
@@ -9015,7 +8624,7 @@
 "`GNUNET_SERVER_receive_done' after %s\n"
 msgstr ""
 
-#: src/util/service.c:347
+#: src/util/service.c:347 src/util/service_new.c:2335
 #, fuzzy, c-format
 msgid "Unknown address family %d\n"
 msgstr "Okänd operation \"%s\"\n"
@@ -9025,44 +8634,26 @@
 msgid "Access from `%s' denied to service `%s'\n"
 msgstr ""
 
-#: src/util/service.c:410
+#: src/util/service.c:410 src/util/service_new.c:431
 #, c-format
 msgid "Could not parse IPv4 network specification `%s' for `%s:%s'\n"
 msgstr ""
 
-#: src/util/service.c:448
+#: src/util/service.c:448 src/util/service_new.c:474
 #, c-format
 msgid "Could not parse IPv6 network specification `%s' for `%s:%s'\n"
 msgstr ""
 
-#: src/util/service.c:565
-#, c-format
-msgid ""
-"Disabling IPv6 support for service `%s', failed to create IPv6 socket: %s\n"
-msgstr ""
-
-#: src/util/service.c:656
-#, c-format
-msgid ""
-"Disabling UNIX domain socket support for service `%s', failed to create UNIX "
-"domain socket: %s\n"
-msgstr ""
-
-#: src/util/service.c:673
-#, c-format
-msgid "Have neither PORT nor UNIXPATH for service `%s', but one is required\n"
-msgstr ""
-
-#: src/util/service.c:912
+#: src/util/service.c:912 src/util/service_new.c:1034
 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.c:961 src/util/service.c:979 src/util/service_new.c:1186
 #, c-format
 msgid "Specified value for `%s' of service `%s' is invalid\n"
 msgstr ""
 
-#: src/util/service.c:1004
+#: src/util/service.c:1004 src/util/service_new.c:1218
 #, c-format
 msgid "Could not access pre-bound socket %u, will try to bind myself\n"
 msgstr ""
@@ -9077,31 +8668,43 @@
 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.c:1260 src/util/service_new.c:1493
 msgid "Service process failed to initialize\n"
 msgstr ""
 
-#: src/util/service.c:1264
+#: src/util/service.c:1264 src/util/service_new.c:1497
 msgid "Service process could not initialize server function\n"
 msgstr ""
 
-#: src/util/service.c:1268
+#: src/util/service.c:1268 src/util/service_new.c:1501
 msgid "Service process failed to report status\n"
 msgstr ""
 
-#: src/util/service.c:1323
+#: src/util/service.c:1323 src/util/service_new.c:1373
 msgid "No such user"
 msgstr ""
 
-#: src/util/service.c:1336
+#: src/util/service.c:1336 src/util/service_new.c:1392
 #, 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.c:1406 src/util/service_new.c:1729
 msgid "do daemonize (detach from terminal)"
 msgstr ""
 
+#: src/util/service_new.c:1298
+msgid ""
+"Could not bind to any of the ports I was supposed to, refusing to run!\n"
+msgstr ""
+
+#: src/util/service_new.c:2085
+#, c-format
+msgid ""
+"Processing code for message of type %u did not call "
+"`GNUNET_SERVICE_client_continue' after %s\n"
+msgstr ""
+
 #: src/util/signal.c:89
 #, fuzzy, c-format
 msgid "signal (%d, %p) returned %d.\n"
@@ -9121,235 +8724,230 @@
 msgid "b"
 msgstr "b"
 
-#: src/util/strings.c:437
+#: src/util/strings.c:441
 #, c-format
 msgid "Character sets requested were `%s'->`%s'\n"
 msgstr ""
 
-#: src/util/strings.c:565
+#: src/util/strings.c:568
 msgid "Failed to expand `$HOME': environment variable `HOME' not set"
 msgstr ""
 
-#: src/util/strings.c:662
+#: src/util/strings.c:672
 msgid "µs"
 msgstr ""
 
-#: src/util/strings.c:666
+#: src/util/strings.c:676
 msgid "forever"
 msgstr ""
 
-#: src/util/strings.c:668
+#: src/util/strings.c:678
 msgid "0 ms"
 msgstr ""
 
-#: src/util/strings.c:674
+#: src/util/strings.c:684
 msgid "ms"
 msgstr "ms"
 
-#: src/util/strings.c:680
+#: src/util/strings.c:690
 msgid "s"
 msgstr "s"
 
-#: src/util/strings.c:686
+#: src/util/strings.c:696
 msgid "m"
 msgstr "m"
 
-#: src/util/strings.c:692
+#: src/util/strings.c:702
 msgid "h"
 msgstr "h"
 
-#: src/util/strings.c:699
+#: src/util/strings.c:709
 #, fuzzy
 msgid "day"
 msgstr " dagar"
 
-#: src/util/strings.c:701
+#: src/util/strings.c:711
 #, fuzzy
 msgid "days"
 msgstr " dagar"
 
-#: src/util/strings.c:730
+#: src/util/strings.c:740
 msgid "end of time"
 msgstr ""
 
-#: src/util/strings.c:1229
+#: src/util/strings.c:1239
 msgid "IPv6 address did not start with `['\n"
 msgstr ""
 
-#: src/util/strings.c:1237
+#: src/util/strings.c:1247
 msgid "IPv6 address did contain ':' to separate port number\n"
 msgstr ""
 
-#: src/util/strings.c:1243
+#: src/util/strings.c:1253
 msgid "IPv6 address did contain ']' before ':' to separate port number\n"
 msgstr ""
 
-#: src/util/strings.c:1250
+#: src/util/strings.c:1260
 msgid "IPv6 address did contain a valid port number after the last ':'\n"
 msgstr ""
 
-#: src/util/strings.c:1259
+#: src/util/strings.c:1269
 #, fuzzy, c-format
 msgid "Invalid IPv6 address `%s': %s\n"
 msgstr "Ogiltigt svar på \"%s\".\n"
 
-#: src/util/strings.c:1465 src/util/strings.c:1481
+#: src/util/strings.c:1475 src/util/strings.c:1491
 msgid "Port not in range\n"
 msgstr ""
 
-#: src/util/strings.c:1490
+#: src/util/strings.c:1500
 #, fuzzy, c-format
 msgid "Malformed port policy `%s'\n"
 msgstr "Misslyckades att starta samling.\n"
 
-#: src/util/strings.c:1573 src/util/strings.c:1604 src/util/strings.c:1652
-#: src/util/strings.c:1673
+#: src/util/strings.c:1583 src/util/strings.c:1614 src/util/strings.c:1662
+#: src/util/strings.c:1683
 #, c-format
 msgid "Invalid format for IP: `%s'\n"
 msgstr "Ogiltigt format för IP: \"%s\"\n"
 
-#: src/util/strings.c:1630
+#: src/util/strings.c:1640
 #, 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:1682
+#: src/util/strings.c:1692
 #, fuzzy, c-format
 msgid "Invalid format: `%s'\n"
 msgstr "Ogiltigt format för IP: \"%s\"\n"
 
-#: src/util/strings.c:1734
+#: src/util/strings.c:1744
 #, 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:1784
+#: src/util/strings.c:1794
 #, fuzzy, c-format
 msgid "Wrong format `%s' for netmask\n"
 msgstr "Fel format \"%s\" för nätmask: %s\n"
 
-#: src/util/strings.c:1815
+#: src/util/strings.c:1825
 #, 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:556 src/vpn/gnunet-service-vpn.c:1113
+#: src/vpn/gnunet-service-vpn.c:550 src/vpn/gnunet-service-vpn.c:1125
 #, fuzzy
 msgid "# Active channels"
 msgstr "Nätverksanslutning"
 
-#: src/vpn/gnunet-service-vpn.c:632
+#: src/vpn/gnunet-service-vpn.c:629
 #, fuzzy
 msgid "# Bytes given to cadet for transmission"
 msgstr "# PING-meddelanden skapade"
 
-#: src/vpn/gnunet-service-vpn.c:670
+#: src/vpn/gnunet-service-vpn.c:667
 #, fuzzy
 msgid "# Bytes dropped in cadet queue (overflow)"
 msgstr "# byte kastade via UDP (utgående)"
 
-#: src/vpn/gnunet-service-vpn.c:781
+#: src/vpn/gnunet-service-vpn.c:783
 #, fuzzy
 msgid "# Cadet channels created"
 msgstr "# PING-meddelanden skapade"
 
-#: src/vpn/gnunet-service-vpn.c:809
-#, fuzzy
-msgid "Failed to setup cadet channel!\n"
-msgstr "Kunde inte skapa värdnyckel!\n"
-
-#: src/vpn/gnunet-service-vpn.c:1008
+#: src/vpn/gnunet-service-vpn.c:1005
 #, c-format
 msgid "Protocol %u not supported, dropping\n"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:1133
+#: src/vpn/gnunet-service-vpn.c:1145
 #, fuzzy
 msgid "# Packets dropped (channel not yet online)"
 msgstr "# byte kastade via UDP (utgående)"
 
-#: src/vpn/gnunet-service-vpn.c:1344
+#: src/vpn/gnunet-service-vpn.c:1353
 msgid "# ICMPv4 packets dropped (not allowed)"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:1365
+#: src/vpn/gnunet-service-vpn.c:1374
 msgid "# ICMPv6 packets dropped (not allowed)"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:1571
+#: src/vpn/gnunet-service-vpn.c:1580
 #, fuzzy
 msgid "# Packets received from TUN interface"
 msgstr "Meddelande mottaget från klient är ogiltig.\n"
 
-#: src/vpn/gnunet-service-vpn.c:1604 src/vpn/gnunet-service-vpn.c:1640
+#: src/vpn/gnunet-service-vpn.c:1613 src/vpn/gnunet-service-vpn.c:1649
 #, c-format
 msgid "Packet received for unmapped destination `%s' (dropping it)\n"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:1650
+#: src/vpn/gnunet-service-vpn.c:1659
 msgid "Received IPv4 packet with options (dropping it)\n"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:1664
+#: src/vpn/gnunet-service-vpn.c:1673
 #, c-format
 msgid "Received packet of unknown protocol %d from TUN (dropping it)\n"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:1746
+#: src/vpn/gnunet-service-vpn.c:1755
 #, fuzzy
 msgid "# ICMP packets received from cadet"
 msgstr "Meddelande mottaget från klient är ogiltig.\n"
 
-#: src/vpn/gnunet-service-vpn.c:2086
+#: src/vpn/gnunet-service-vpn.c:2095
 #, fuzzy
 msgid "# UDP packets received from cadet"
 msgstr "Meddelande mottaget från klient är ogiltig.\n"
 
-#: src/vpn/gnunet-service-vpn.c:2242
+#: src/vpn/gnunet-service-vpn.c:2251
 #, fuzzy
 msgid "# TCP packets received from cadet"
 msgstr "Meddelande mottaget från klient är ogiltig.\n"
 
-#: src/vpn/gnunet-service-vpn.c:2394
+#: src/vpn/gnunet-service-vpn.c:2403
 msgid "Failed to find unallocated IPv4 address in VPN's range\n"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:2449
+#: src/vpn/gnunet-service-vpn.c:2458
 msgid "Failed to find unallocated IPv6 address in VPN's range\n"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:2491 src/vpn/gnunet-service-vpn.c:2702
+#: src/vpn/gnunet-service-vpn.c:2500 src/vpn/gnunet-service-vpn.c:2722
 #, fuzzy
 msgid "# Active destinations"
 msgstr "Nätverksanslutning"
 
-#: src/vpn/gnunet-service-vpn.c:2753
+#: src/vpn/gnunet-service-vpn.c:2771
 msgid "Failed to allocate IP address for new destination\n"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:3017
+#: src/vpn/gnunet-service-vpn.c:3063
 #, fuzzy
 msgid "Must specify valid IPv6 address"
 msgstr "\"%s\" är inte tillgänglig."
 
-#: src/vpn/gnunet-service-vpn.c:3041
+#: src/vpn/gnunet-service-vpn.c:3087
 msgid "Must specify valid IPv6 mask"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:3049
+#: src/vpn/gnunet-service-vpn.c:3095
 msgid "IPv6 support disabled as this system does not support IPv6\n"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:3062
+#: src/vpn/gnunet-service-vpn.c:3108
 #, fuzzy
 msgid "Must specify valid IPv4 address"
 msgstr "\"%s\" är inte tillgänglig."
 
-#: src/vpn/gnunet-service-vpn.c:3075
+#: src/vpn/gnunet-service-vpn.c:3121
 msgid "Must specify valid IPv4 mask"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:3085
+#: src/vpn/gnunet-service-vpn.c:3131
 msgid "IPv4 support disabled as this system does not support IPv4\n"
 msgstr ""
 
@@ -9421,23 +9019,272 @@
 msgid "Setup tunnels via VPN."
 msgstr ""
 
-#: src/include/gnunet_common.h:641 src/include/gnunet_common.h:648
-#: src/include/gnunet_common.h:656
+#: src/include/gnunet_common.h:645 src/include/gnunet_common.h:652
+#: src/include/gnunet_common.h:660
 #, fuzzy, c-format
 msgid "Assertion failed at %s:%d.\n"
 msgstr "\"%s\" misslyckades vid %s:%d med fel: \"%s\".\n"
 
-#: src/include/gnunet_common.h:668
+#: src/include/gnunet_common.h:672
 #, c-format
 msgid "External protocol violation detected at %s:%d.\n"
 msgstr ""
 
-#: src/include/gnunet_common.h:695 src/include/gnunet_common.h:704
+#: src/include/gnunet_common.h:699 src/include/gnunet_common.h:708
 #, c-format
 msgid "`%s' failed on file `%s' at %s:%d with error: %s\n"
 msgstr "\"%s\" misslyckades för fil \"%s\" vid %s:%d med fel: %s\n"
 
 #, fuzzy
+#~ msgid "Could not send status result to client\n"
+#~ msgstr "Kunde inte skicka begäran till gnunetd.\n"
+
+#, fuzzy
+#~ msgid "Could not send list result to client\n"
+#~ msgstr "Kunde inte skicka begäran till gnunetd.\n"
+
+#, fuzzy
+#~ msgid "Failed to connect peer 0 and %u\n"
+#~ msgstr "Misslyckades att ansluta till gnunetd.\n"
+
+#, fuzzy
+#~ msgid "Could not connect master [%u] and slave [%u]\n"
+#~ msgstr "Kunde inte ansluta till gnunetd.\n"
+
+#, fuzzy
+#~ msgid "Initialization failed, shutdown\n"
+#~ msgstr "Initiering av insticksmekanism misslyckades: %s!\n"
+
+#, fuzzy
+#~ msgid "number too large"
+#~ msgstr "antal iterationer"
+
+#, fuzzy
+#~ msgid "Received incoming Cadet channel on port %u\n"
+#~ msgstr "\"%s\" ansluten till \"%s\".\n"
+
+#, fuzzy
+#~ msgid "# sessions terminated by transport disconnect"
+#~ msgstr "Nätverksannonsering avstängd i konfigurationen!\n"
+
+#, fuzzy
+#~ msgid "Failed to transmit request to drop database.\n"
+#~ msgstr "Misslyckades att skicka HTTP-begäran till värd \"%s\": %s\n"
+
+#, fuzzy
+#~ msgid "# transmission request failures"
+#~ msgstr "# klartext PONG-meddelanden mottagna"
+
+#, fuzzy
+#~ msgid "# bytes sent to datastore"
+#~ msgstr "# byte krypterade"
+
+#, fuzzy
+#~ msgid "Failed to receive status response from database."
+#~ msgstr "Misslyckades att ta emot svar till \"%s\" meddelande från gnunetd\n"
+
+#, fuzzy
+#~ msgid "Invalid error message received from datastore service"
+#~ msgstr "Ogiltigt meddelande mottogs den %s:%d."
+
+#, fuzzy
+#~ msgid "No `%s' specified for `%s' in configuration!\n"
+#~ msgstr "Inga applikationer definierade i konfiguration!\n"
+
+#, fuzzy
+#~ msgid "Failed to connect to the DHT service!\n"
+#~ msgstr "Misslyckades att ansluta till gnunetd.\n"
+
+#, fuzzy
+#~ msgid "Failed to connect to transport service!\n"
+#~ msgstr "Misslyckades att ansluta till gnunetd.\n"
+
+#, fuzzy
+#~ msgid "# Queued messages discarded (peer disconnected)"
+#~ msgstr "Nätverksannonsering avstängd i konfigurationen!\n"
+
+#, fuzzy
+#~ msgid "# Messages dropped (CORE timeout)"
+#~ msgstr "Nätverksannonsering avstängd i konfigurationen!\n"
+
+#, fuzzy
+#~ msgid "# Bytes transmitted to other peers"
+#~ msgstr "# byte skickade av typen %d"
+
+#, fuzzy
+#~ msgid "PUT request received, but have no datacache!\n"
+#~ msgstr "# byte mottagna av typen %d"
+
+#, fuzzy
+#~ msgid "# TCP requests dropped (no such service)"
+#~ msgstr "# byte mottogs via TCP"
+
+#, fuzzy
+#~ msgid "# UDP requests dropped (no such service)"
+#~ msgstr "# byte mottogs via TCP"
+
+#, fuzzy
+#~ msgid "Failed to receive response for `%s' request from `%s' service.\n"
+#~ msgstr "Misslyckades att ta emot svar till \"%s\" meddelande från gnunetd\n"
+
+#, fuzzy
+#~ msgid ""
+#~ "Failed to receive valid response for `%s' request from `%s' service.\n"
+#~ msgstr "Misslyckades att ta emot svar till \"%s\" meddelande från gnunetd\n"
+
+#, fuzzy
+#~ msgid "unknown error"
+#~ msgstr "Okänt fel"
+
+#, fuzzy
+#~ msgid "Invalid response from `fs' service."
+#~ msgstr "Ogiltigt svar till \"%s\" från \"%s\"\n"
+
+#, fuzzy
+#~ msgid "# replies transmitted to other peers"
+#~ msgstr "# byte skickade av typen %d"
+
+#, fuzzy
+#~ msgid "# transmission failed (core has no bandwidth)"
+#~ msgstr "Ingen transport av typ %d är känd.\n"
+
+#, fuzzy
+#~ msgid "Failed to deserialize lookup reply from GNS service!\n"
+#~ msgstr "Misslyckades att ta emot svar till \"%s\" meddelande från gnunetd\n"
+
+#, fuzzy
+#~ msgid "Service `%s' is not running\n"
+#~ msgstr "\"%s\" är inte en fil.\n"
+
+#, fuzzy
+#~ msgid "Identity service is not running\n"
+#~ msgstr "\"%s\" är inte en fil.\n"
+
+#, fuzzy
+#~ msgid "NSE service is not running\n"
+#~ msgstr "\"%s\" är inte en fil.\n"
+
+#, fuzzy
+#~ msgid "failed to transmit request (service down?)"
+#~ msgstr "Misslyckades att skicka HTTP-begäran till värd \"%s\": %s\n"
+
+#, fuzzy
+#~ msgid "Received invalid message from `PEERINFO' service."
+#~ msgstr "mottog ogiltigt \"%s\" meddelande: %s.\n"
+
+#, fuzzy
+#~ msgid "Timeout transmitting iteration request to `PEERINFO' service."
+#~ msgstr "Misslyckades att initiera tjänsten \"%s\".\n"
+
+#, fuzzy
+#~ msgid "Could not connect to `%s' service.\n"
+#~ msgstr "Kunde inte ansluta till gnunetd.\n"
+
+#, fuzzy
+#~ msgid "Failed to get my own HELLO from this peer!\n"
+#~ msgstr "Kunde inte skapa värdnyckel!\n"
+
+#, fuzzy
+#~ msgid "Service `%s' is not running, please start GNUnet\n"
+#~ msgstr "\"%s\" är inte en fil.\n"
+
+#, fuzzy
+#~ msgid "Malformed iterate request.\n"
+#~ msgstr "Kunde inte spara konfigurationsfil \"%s\":"
+
+#, fuzzy
+#~ msgid "Malformed store request from client\n"
+#~ msgstr "Mottog ogiltig \"%s\" begäran (storlek %d)\n"
+
+#, fuzzy
+#~ msgid "Failed to store requested value, database error."
+#~ msgstr "Misslyckades att skicka HTTP-begäran till värd \"%s\": %s\n"
+
+#, fuzzy
+#~ msgid "Trying to connect to remote host, but service `%s' is not running\n"
+#~ msgstr "Kunde inte ansluta till gnunetd.\n"
+
+#, fuzzy
+#~ msgid ""
+#~ "Peer `%s' %s %s\n"
+#~ "\t%s%s\n"
+#~ "\t%s%s\n"
+#~ "\t%s%s\n"
+#~ msgstr "Jag är ändpunkt \"%s\".\n"
+
+#, fuzzy
+#~ msgid "Peer `%s' %s `%s' \n"
+#~ msgstr "Jag är ändpunkt \"%s\".\n"
+
+#, fuzzy
+#~ msgid "print information for all pending validations "
+#~ msgstr "Skriv ut information om GNUnets motparter."
+
+#, fuzzy
+#~ msgid "print information for all pending validations continuously"
+#~ msgstr "Skriv ut information om GNUnets motparter."
+
+#, fuzzy
+#~ msgid "Connected to different peer `%s'\n"
+#~ msgstr "\"%s\" ansluten till \"%s\".\n"
+
+#, fuzzy
+#~ msgid "Successfully connected to `%s'\n"
+#~ msgstr "Åtkomst nekad för \"%s\" vid %s:%d.\n"
+
+#, fuzzy
+#~ msgid "Denying connection to `%s'\n"
+#~ msgstr "Kan inte ansluta till %u.%u.%u.%u:%u: %s\n"
+
+#, fuzzy
+#~ msgid "Message size too big!\n"
+#~ msgstr "meddelandestorlek"
+
+#, fuzzy
+#~ msgid "No peer identity given\n"
+#~ msgstr "Skriv ut information om GNUnets motparter."
+
+#, fuzzy
+#~ msgid "Trying to receive messages from peer `%s'\n"
+#~ msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
+
+#, fuzzy
+#~ msgid "No operation given\n"
+#~ msgstr "Skriv ut information om GNUnets motparter."
+
+#, fuzzy
+#~ msgid "Failed to connect to ATS service\n"
+#~ msgstr "Misslyckades att ansluta till gnunetd.\n"
+
+#, fuzzy
+#~ msgid "Binding to IPv4 address %s\n"
+#~ msgstr "Ogiltigt svar på \"%s\".\n"
+
+#, fuzzy
+#~ msgid "Binding to IPv6 address %s\n"
+#~ msgstr "Ogiltigt svar på \"%s\".\n"
+
+#, fuzzy
+#~ msgid "Received unexpected message of type %u in %s:%u\n"
+#~ msgstr "Mottog skadat meddelande från motpart \"%s\"i %s:%d.\n"
+
+#, fuzzy
+#~ msgid "Failed to initialize testing library!\n"
+#~ msgstr "Misslyckades att initiera tjänsten \"%s\".\n"
+
+#, fuzzy
+#~ msgid "Could not connect to service `%s', configuration broken.\n"
+#~ msgstr "Kunde inte ansluta till gnunetd.\n"
+
+#, fuzzy
+#~ msgid "Failure to transmit request to service `%s'\n"
+#~ msgstr "Misslyckades att skicka HTTP-begäran till värd \"%s\": %s\n"
+
+#, fuzzy
+#~ msgid "Failed to setup cadet channel!\n"
+#~ msgstr "Kunde inte skapa värdnyckel!\n"
+
+#, fuzzy
 #~ msgid "Configuration option \"regex_prefix\" missing. Exiting\n"
 #~ msgstr "Konfigurationsfil \"%s\" skapad.\n"
 
@@ -9590,10 +9437,6 @@
 #~ msgstr "Misslyckades att ansluta till gnunetd.\n"
 
 #, fuzzy
-#~ msgid "Failed to send request to transport service\n"
-#~ msgstr "Misslyckades att ansluta till gnunetd.\n"
-
-#, fuzzy
 #~ msgid "Retrying to connect to `%s'\n"
 #~ msgstr "Kan inte ansluta till %u.%u.%u.%u:%u: %s\n"
 
@@ -9693,10 +9536,6 @@
 #~ msgstr "Startade samling \"%s\".\n"
 
 #, fuzzy
-#~ msgid "Received %s message\n"
-#~ msgstr "mottog ogiltigt \"%s\" meddelande\n"
-
-#, fuzzy
 #~ msgid "Received last message for %s \n"
 #~ msgstr "Mottog ogiltigt \"%s\" meddelande från \"%s\".\n"
 
@@ -9793,10 +9632,6 @@
 #~ msgstr "Ladda ner filer från GNUnet."
 
 #, fuzzy
-#~ msgid "Failed to receive response from `SENSOR' service."
-#~ msgstr "Misslyckades att ta emot svar till \"%s\" meddelande från gnunetd\n"
-
-#, fuzzy
 #~ msgid "Received invalid message from `SENSOR' service."
 #~ msgstr "mottog ogiltigt \"%s\" meddelande: %s.\n"
 
@@ -9998,10 +9833,6 @@
 #~ msgstr "använd konfigurationsfil FILNAMN"
 
 #, fuzzy
-#~ msgid "Error while decoding key %u\n"
-#~ msgstr "Fel vid nedladdning: %s\n"
-
-#, fuzzy
 #~ msgid "Could not read friends list `%s'\n"
 #~ msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 
@@ -10166,10 +9997,6 @@
 #~ msgstr "\"%s\" misslyckades för enhet %s: %u\n"
 
 #, fuzzy
-#~ msgid "Service `%s' was already running.\n"
-#~ msgstr "\"%s\" är inte en fil.\n"
-
-#, fuzzy
 #~ msgid "Service `%s' has been started.\n"
 #~ msgstr "Tjänst borttagen.\n"
 
@@ -11806,9 +11633,6 @@
 #~ msgid "FAILURE"
 #~ msgstr "MISSLYCKANDE"
 
-#~ msgid "MESSAGE"
-#~ msgstr "MEDDELANDE"
-
 #~ msgid "CRON"
 #~ msgstr "CRON"
 

Modified: gnunet/po/vi.po
===================================================================
--- gnunet/po/vi.po     2016-10-26 04:21:00 UTC (rev 38215)
+++ gnunet/po/vi.po     2016-10-26 14:25:30 UTC (rev 38216)
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: gnunet 0.8.0a\n"
 "Report-Msgid-Bugs-To: address@hidden"
-"POT-Creation-Date: 2016-05-19 13:54+0200\n"
+"POT-Creation-Date: 2016-10-26 09:18-0500\n"
 "PO-Revision-Date: 2008-09-10 22:05+0930\n"
 "Last-Translator: Clytie Siddall <address@hidden>\n"
 "Language-Team: Vietnamese <address@hidden>\n"
@@ -19,320 +19,356 @@
 "Plural-Forms: nplurals=1; plural=0;\n"
 "X-Generator: LocFactoryEditor 1.7b3\n"
 
-#: src/arm/arm_api.c:338
-msgid "Client was disconnected from arm service, trying to reconnect.\n"
-msgstr ""
-
-#: src/arm/arm_monitor_api.c:324
-msgid ""
-"Monitoring client was disconnected from arm service, trying to reconnect.\n"
-msgstr ""
-
-#: src/arm/gnunet-arm.c:169
+#: src/arm/gnunet-arm.c:152
 #, fuzzy, c-format
 msgid "Failed to remove configuration file %s\n"
 msgstr "Không thể lưu tập tin cấu hình « %s »:"
 
-#: src/arm/gnunet-arm.c:175
+#: src/arm/gnunet-arm.c:158
 #, fuzzy, c-format
 msgid "Failed to remove servicehome directory %s\n"
 msgstr "Lỗi truy cập đến thư mục nhà GNUnet « %s »\n"
 
-#: src/arm/gnunet-arm.c:225 src/testbed/gnunet-service-testbed_peers.c:1013
+#: src/arm/gnunet-arm.c:213 src/testbed/gnunet-service-testbed_peers.c:1139
 msgid "Message was sent successfully"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:227
+#: src/arm/gnunet-arm.c:215
 #, 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:229 src/testbed/gnunet-service-testbed_peers.c:1017
+#: src/arm/gnunet-arm.c:217 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:231 src/testbed/gnunet-service-testbed_peers.c:1019
+#: src/arm/gnunet-arm.c:219 src/testbed/gnunet-service-testbed_peers.c:1145
 msgid "ARM API is busy"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:233
-msgid "Request does not fit into a message"
-msgstr ""
-
-#: src/arm/gnunet-arm.c:235 src/testbed/gnunet-service-testbed_peers.c:1023
+#: src/arm/gnunet-arm.c:221 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:237 src/testbed/gnunet-service-testbed_peers.c:1025
+#: src/arm/gnunet-arm.c:223 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:253 src/testbed/gnunet-service-testbed_peers.c:1041
+#: src/arm/gnunet-arm.c:239 src/testbed/gnunet-service-testbed_peers.c:1165
 #, fuzzy, c-format
 msgid "%s is stopped"
 msgstr "# các byte trong kho dữ liệu"
 
-#: src/arm/gnunet-arm.c:255 src/testbed/gnunet-service-testbed_peers.c:1043
+#: src/arm/gnunet-arm.c:241 src/testbed/gnunet-service-testbed_peers.c:1167
 #, c-format
 msgid "%s is starting"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:257 src/testbed/gnunet-service-testbed_peers.c:1045
+#: src/arm/gnunet-arm.c:243 src/testbed/gnunet-service-testbed_peers.c:1169
 #, c-format
 msgid "%s is stopping"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:259 src/testbed/gnunet-service-testbed_peers.c:1047
+#: src/arm/gnunet-arm.c:245 src/testbed/gnunet-service-testbed_peers.c:1171
 #, fuzzy, c-format
 msgid "%s is starting already"
 msgstr "« %s » đang đăng ký trình điều khiển %d\n"
 
-#: src/arm/gnunet-arm.c:261 src/testbed/gnunet-service-testbed_peers.c:1049
+#: src/arm/gnunet-arm.c:247 src/testbed/gnunet-service-testbed_peers.c:1173
 #, c-format
 msgid "%s is stopping already"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:263 src/testbed/gnunet-service-testbed_peers.c:1051
+#: src/arm/gnunet-arm.c:249 src/testbed/gnunet-service-testbed_peers.c:1175
 #, c-format
 msgid "%s is started already"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:265 src/testbed/gnunet-service-testbed_peers.c:1053
+#: src/arm/gnunet-arm.c:251 src/testbed/gnunet-service-testbed_peers.c:1177
 #, c-format
 msgid "%s is stopped already"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:267 src/testbed/gnunet-service-testbed_peers.c:1055
+#: src/arm/gnunet-arm.c:253 src/testbed/gnunet-service-testbed_peers.c:1179
 #, fuzzy, c-format
 msgid "%s service is not known to ARM"
 msgstr "Không gian tên « %s » có đánh giá %d.\n"
 
-#: src/arm/gnunet-arm.c:269 src/testbed/gnunet-service-testbed_peers.c:1057
+#: src/arm/gnunet-arm.c:255 src/testbed/gnunet-service-testbed_peers.c:1181
 #, fuzzy, c-format
 msgid "%s service failed to start"
 msgstr "Lỗi bắt đầu thu thập.\n"
 
-#: src/arm/gnunet-arm.c:271
+#: src/arm/gnunet-arm.c:257
 #, fuzzy, c-format
 msgid "%s service cannot be started because ARM is shutting down"
 msgstr "« %s » đang tắt.\n"
 
-#: src/arm/gnunet-arm.c:273 src/testbed/gnunet-service-testbed_peers.c:1061
+#: src/arm/gnunet-arm.c:259 src/testbed/gnunet-service-testbed_peers.c:1185
 #, c-format
 msgid "%.s Unknown result code."
 msgstr ""
 
-#: src/arm/gnunet-arm.c:305
+#: src/arm/gnunet-arm.c:291
 msgid "Fatal error initializing ARM API.\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:335 src/arm/gnunet-arm.c:344
+#: src/arm/gnunet-arm.c:320 src/arm/gnunet-arm.c:329
 #, 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:380
+#: src/arm/gnunet-arm.c:364
 #, 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:391
+#: src/arm/gnunet-arm.c:375
 #, 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:434
+#: src/arm/gnunet-arm.c:417
 #, 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:444
+#: src/arm/gnunet-arm.c:428
 #, 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:482
+#: src/arm/gnunet-arm.c:467
 #, 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:493
+#: src/arm/gnunet-arm.c:478
 #, 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:533
+#: src/arm/gnunet-arm.c:519
 #, 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:542
+#: src/arm/gnunet-arm.c:528
 #, 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:547
+#: src/arm/gnunet-arm.c:534
 #, fuzzy
 msgid "Running services:\n"
 msgstr "Đang nạp và khởi động dùng « %s ».\n"
 
-#: src/arm/gnunet-arm.c:633
+#: src/arm/gnunet-arm.c:622
 #, c-format
 msgid "Now only monitoring, press CTRL-C to stop.\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:665
+#: src/arm/gnunet-arm.c:654
 #, c-format
 msgid "Stopped %s.\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:668
+#: src/arm/gnunet-arm.c:657
 #, fuzzy, c-format
 msgid "Starting %s...\n"
 msgstr "Đang bắt đầu tài về « %s »\n"
 
-#: src/arm/gnunet-arm.c:671
+#: src/arm/gnunet-arm.c:660
 #, c-format
 msgid "Stopping %s...\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:682
+#: src/arm/gnunet-arm.c:674
 #, 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:745
+#: src/arm/gnunet-arm.c:756
 #, fuzzy
 msgid "stop all GNUnet services"
 msgstr "hủy cài đặt dịch vụ GNUnet"
 
-#: src/arm/gnunet-arm.c:747
+#: src/arm/gnunet-arm.c:758
 msgid "start a particular service"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:749
+#: src/arm/gnunet-arm.c:760
 msgid "stop a particular service"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:751
+#: src/arm/gnunet-arm.c:762
 #, fuzzy
 msgid "start all GNUnet default services"
 msgstr "hủy cài đặt dịch vụ GNUnet"
 
-#: src/arm/gnunet-arm.c:754
+#: src/arm/gnunet-arm.c:765
 #, fuzzy
 msgid "stop and start all GNUnet default services"
 msgstr "hủy cài đặt dịch vụ GNUnet"
 
-#: src/arm/gnunet-arm.c:757
+#: src/arm/gnunet-arm.c:768
 msgid "delete config file and directory on exit"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:760
+#: src/arm/gnunet-arm.c:771
 msgid "monitor ARM activities"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:762
+#: src/arm/gnunet-arm.c:773
 msgid "don't print status messages"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:765
+#: src/arm/gnunet-arm.c:776
 msgid "exit with error status if operation does not finish after DELAY"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:767
+#: src/arm/gnunet-arm.c:778
 #, fuzzy
 msgid "list currently running services"
 msgstr "Đang nạp và khởi động dùng « %s ».\n"
 
-#: src/arm/gnunet-arm.c:769
+#: src/arm/gnunet-arm.c:780
 msgid "don't let gnunet-service-arm inherit standard output"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:771
+#: src/arm/gnunet-arm.c:782
 msgid "don't let gnunet-service-arm inherit standard error"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:782
+#: src/arm/gnunet-arm.c:794
 msgid "Control services and the Automated Restart Manager (ARM)"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:279
-msgid "Could not send status result to client\n"
+#: src/arm/gnunet-service-arm.c:374 src/transport/plugin_transport_tcp.c:633
+#: src/util/service.c:565 src/util/service_new.c:604
+#, c-format
+msgid ""
+"Disabling IPv6 support for service `%s', failed to create IPv6 socket: %s\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:315
-#, fuzzy
-msgid "Could not send list result to client\n"
-msgstr "Không thể đọc danh sách bạn bè « %s »\n"
+#: src/arm/gnunet-service-arm.c:393 src/arm/gnunet-service-arm.c:399
+#: src/transport/plugin_transport_tcp.c:652
+#: src/transport/plugin_transport_tcp.c:658
+#: src/transport/plugin_transport_tcp.c:3299 src/util/service.c:584
+#: src/util/service.c:590 src/util/service_new.c:629 src/util/service_new.c:635
+#, c-format
+msgid "Require valid port number for service `%s' in configuration!\n"
+msgstr ""
 
-#: src/arm/gnunet-service-arm.c:555
+#: src/arm/gnunet-service-arm.c:430 src/transport/plugin_transport_tcp.c:689
+#: src/util/client_new.c:464 src/util/service.c:621 src/util/service_new.c:674
+#, 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/util/client_new.c:469 src/util/service.c:625 src/util/service_new.c:679
 #, 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/util/service.c:656 src/util/service_new.c:715
+#, 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/util/service.c:673 src/util/service_new.c:733
+#, 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:2617
+#: src/transport/plugin_transport_tcp.c:772 src/util/service.c:704
+#: src/util/service_new.c:774
+#, 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:2635
+#: src/transport/plugin_transport_tcp.c:791 src/util/service.c:723
+#: src/util/service_new.c:794
+#, 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
+#, 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:566
+#: src/arm/gnunet-service-arm.c:943
 #, fuzzy, c-format
 msgid "Starting service `%s'\n"
 msgstr "Đang bắt đầu tài về « %s »\n"
 
-#: src/arm/gnunet-service-arm.c:663
+#: src/arm/gnunet-service-arm.c:1055
 #, 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:687
+#: src/arm/gnunet-service-arm.c:1090
 #, c-format
 msgid "Unable to bind listening socket for service `%s' to address `%s': %s\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:723
+#: src/arm/gnunet-service-arm.c:1133
 #, c-format
 msgid "ARM now monitors connections to service `%s' at `%s'\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:863
+#: src/arm/gnunet-service-arm.c:1309
 #, 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:1145
+#: src/arm/gnunet-service-arm.c:1611
 #, 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:1299
+#: src/arm/gnunet-service-arm.c:1771
 msgid "exit"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:1304
+#: src/arm/gnunet-service-arm.c:1776
 msgid "signal"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:1309
+#: src/arm/gnunet-service-arm.c:1781
 #, fuzzy
 msgid "unknown"
 msgstr "Lỗi không rõ"
 
-#: src/arm/gnunet-service-arm.c:1315
+#: src/arm/gnunet-service-arm.c:1787
 #, fuzzy, c-format
 msgid "Service `%s' took %s to terminate\n"
 msgstr "Dịch vụ đã bị xoá.\n"
 
-#: src/arm/gnunet-service-arm.c:1342
+#: src/arm/gnunet-service-arm.c:1813
 #, c-format
 msgid "Service `%s' terminated normally, will restart at any time\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:1358
+#: src/arm/gnunet-service-arm.c:1829
 #, c-format
 msgid "Service `%s' terminated with status %s/%d, will restart in %s\n"
 msgstr ""
 
-#: src/arm/mockup-service.c:41
+#: src/arm/mockup-service.c:42
 msgid "Initiating shutdown as requested by client.\n"
 msgstr ""
 
@@ -357,14 +393,12 @@
 "%llu\n"
 msgstr ""
 
-#: src/ats/gnunet-ats-solver-eval.c:3293
-#: src/ats-tests/gnunet-solver-eval.c:921
+#: src/ats/gnunet-ats-solver-eval.c:3293 src/ats-tests/gnunet-solver-eval.c:935
 msgid "solver to use"
 msgstr ""
 
-#: src/ats/gnunet-ats-solver-eval.c:3296
-#: src/ats-tests/gnunet-solver-eval.c:924
-#: src/ats-tests/gnunet-solver-eval.c:927
+#: 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 ""
 
@@ -469,55 +503,27 @@
 msgid "Invalid %s configuration %f\n"
 msgstr "Không thể lưu tập tin cấu hình « %s »:"
 
-#: src/ats-tests/ats-testing.c:72
-msgid "Benchmarking done\n"
-msgstr ""
-
-#: src/ats-tests/ats-testing.c:105
-#, fuzzy, c-format
-msgid "Failed to connect peer 0 and %u\n"
-msgstr "Lỗi kết nối đến gnunetd.\n"
-
-#: src/ats-tests/ats-testing.c:413
+#: src/ats-tests/ats-testing.c:441
 #, c-format
 msgid "Connected master [%u] with slave [%u]\n"
 msgstr ""
 
-#: src/ats-tests/ats-testing.c:419
+#: src/ats-tests/ats-testing.c:448
 #, fuzzy, c-format
 msgid "Failed to connect master peer [%u] with slave [%u]\n"
 msgstr "Lỗi kết nối đến gnunetd.\n"
 
-#: src/ats-tests/ats-testing.c:450
-msgid "Connecting peers on CORE level\n"
-msgstr ""
-
-#: src/ats-tests/ats-testing.c:461
-#, c-format
-msgid "Connecting master [%u] with slave [%u]\n"
-msgstr ""
-
-#: src/ats-tests/ats-testing.c:470
-#, fuzzy, c-format
-msgid "Could not connect master [%u] and slave [%u]\n"
-msgstr "Không thể kết nối tới %s:%u: %s\n"
-
-#: src/ats-tests/ats-testing.c:490 src/ats-tests/ats-testing.c:634
+#: src/ats-tests/ats-testing-log.c:837
 #, fuzzy
-msgid "Initialization failed, shutdown\n"
-msgstr "Lỗi sơ khởi cơ chế phần bổ sung: %s\n"
-
-#: src/ats-tests/ats-testing-log.c:836
-#, fuzzy
 msgid "Stop logging\n"
 msgstr "Theo dõi"
 
-#: src/ats-tests/ats-testing-log.c:887
+#: src/ats-tests/ats-testing-log.c:892
 #, fuzzy, c-format
 msgid "Start logging `%s'\n"
 msgstr "Đang bắt đầu tài về « %s »\n"
 
-#: src/ats-tests/gnunet-ats-sim.c:86
+#: src/ats-tests/gnunet-ats-sim.c:88
 #, c-format
 msgid ""
 "Master [%u]: sent: %u KiB in %u sec. = %u KiB/s, received: %u KiB in %u sec. "
@@ -560,8 +566,7 @@
 msgstr ""
 
 #: src/ats-tool/gnunet-ats.c:748 src/ats-tool/gnunet-ats.c:761
-#: src/transport/gnunet-transport.c:1780
-#: src/transport/gnunet-transport-profiler.c:516
+#: src/transport/gnunet-transport.c:1536
 #, fuzzy, c-format
 msgid "Failed to parse peer identity `%s'\n"
 msgstr "Lỗi đọc danh sách bạn bè từ « %s »\n"
@@ -648,113 +653,108 @@
 msgid "Print information about ATS state"
 msgstr "In ra thông tin về các đồng đẳng GNUnet."
 
-#: src/cadet/gnunet-cadet.c:476
+#: src/cadet/gnunet-cadet.c:511
 #, fuzzy, c-format
 msgid "Invalid target `%s'\n"
 msgstr "Đối số không hợp lệ cho « %s ».\n"
 
-#: src/cadet/gnunet-cadet.c:751
+#: src/cadet/gnunet-cadet.c:787
 #, 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:789
+#: src/cadet/gnunet-cadet.c:825
 #, fuzzy, c-format
 msgid "Invalid tunnel owner `%s'\n"
 msgstr "Địa chỉ IP định dạng sai: %s\n"
 
-#: src/cadet/gnunet-cadet.c:857
+#: src/cadet/gnunet-cadet.c:892
 msgid "You must NOT give a TARGET when using 'request all' options\n"
 msgstr ""
 
-#: src/cadet/gnunet-cadet.c:952
+#: src/cadet/gnunet-cadet.c:982
 #, fuzzy
 msgid "provide information about a particular connection"
 msgstr "In ra thông tin về các đồng đẳng GNUnet."
 
-#: src/cadet/gnunet-cadet.c:955
+#: src/cadet/gnunet-cadet.c:985
 msgid "activate echo mode"
 msgstr ""
 
-#: src/cadet/gnunet-cadet.c:958
+#: src/cadet/gnunet-cadet.c:988
 msgid "dump debug information to STDERR"
 msgstr ""
 
-#: src/cadet/gnunet-cadet.c:964
-msgid "port to listen to (default; 0)"
+#: src/cadet/gnunet-cadet.c:994
+msgid "port to listen to"
 msgstr ""
 
-#: src/cadet/gnunet-cadet.c:967
+#: src/cadet/gnunet-cadet.c:997
 #, fuzzy
 msgid "provide information about a patricular peer"
 msgstr "In ra thông tin về các đồng đẳng GNUnet."
 
-#: src/cadet/gnunet-cadet.c:970
+#: src/cadet/gnunet-cadet.c:1000
 #, fuzzy
 msgid "provide information about all peers"
 msgstr "In ra thông tin về các đồng đẳng GNUnet."
 
-#: src/cadet/gnunet-cadet.c:973
+#: src/cadet/gnunet-cadet.c:1003
 #, fuzzy
 msgid "provide information about a particular tunnel"
 msgstr "In ra thông tin về các đồng đẳng GNUnet."
 
-#: src/cadet/gnunet-cadet.c:976
+#: src/cadet/gnunet-cadet.c:1006
 #, fuzzy
 msgid "provide information about all tunnels"
 msgstr "In ra thông tin về các đồng đẳng GNUnet."
 
-#: src/cadet/gnunet-service-cadet_peer.c:562
+#: src/cadet/gnunet-service-cadet_peer.c:707
 msgid "Wrong CORE service\n"
 msgstr ""
 
-#: src/consensus/gnunet-consensus-profiler.c:496
+#: 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:499
+#: src/consensus/gnunet-consensus-profiler.c:502
 msgid ""
 "how many peers (random selection without replacement) receive one value?"
 msgstr ""
 
-#: src/consensus/gnunet-consensus-profiler.c:502
-#: src/set/gnunet-set-profiler.c:377 src/set/gnunet-set-profiler.c:380
-#: src/set/gnunet-set-profiler.c:383
+#: src/consensus/gnunet-consensus-profiler.c:505
+#: src/set/gnunet-set-profiler.c:378 src/set/gnunet-set-profiler.c:381
+#: src/set/gnunet-set-profiler.c:384
 #, fuzzy
 msgid "number of values"
 msgstr "số lần lặp lại"
 
-#: src/consensus/gnunet-consensus-profiler.c:505
+#: src/consensus/gnunet-consensus-profiler.c:508
 #, fuzzy
 msgid "consensus timeout"
 msgstr "# các khoá phiên chạy được chấp nhận"
 
-#: src/consensus/gnunet-consensus-profiler.c:508
+#: src/consensus/gnunet-consensus-profiler.c:511
 msgid "delay until consensus starts"
 msgstr ""
 
-#: src/consensus/gnunet-consensus-profiler.c:511
-#: src/set/gnunet-set-profiler.c:389
+#: src/consensus/gnunet-consensus-profiler.c:514
+#: src/set/gnunet-set-profiler.c:390
 msgid "write statistics to file"
 msgstr ""
 
-#: src/consensus/gnunet-consensus-profiler.c:514
+#: src/consensus/gnunet-consensus-profiler.c:517
 #: src/secretsharing/gnunet-secretsharing-profiler.c:622
 msgid "be more verbose (print received values)"
 msgstr ""
 
-#: src/conversation/conversation_api.c:493
-#: src/conversation/conversation_api_call.c:475
+#: src/conversation/conversation_api.c:513
+#: src/conversation/conversation_api_call.c:490
 msgid "Connection to conversation service lost, trying to reconnect\n"
 msgstr ""
 
-#: src/conversation/conversation_api.c:617
-#, fuzzy
-msgid "number too large"
-msgstr "số lần lặp lại"
-
 #: src/conversation/gnunet-conversation.c:269
 #, c-format
 msgid "Incoming call from `%s'. Please /accept %u or /cancel %u the call.\n"
@@ -780,236 +780,235 @@
 msgid "Ego `%s' no longer available, phone is now down.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:366
+#: src/conversation/gnunet-conversation.c:367
 #, fuzzy
 msgid "Failed to setup phone (internal error)\n"
 msgstr "Lỗi lấy thông kê về truyền tải.\n"
 
-#: src/conversation/gnunet-conversation.c:378
+#: src/conversation/gnunet-conversation.c:379
 #, c-format
-msgid ""
-"Phone active on line %u.  Type `/help' for a list of available commands\n"
+msgid "Phone active at `%s'.  Type `/help' for a list of available commands\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:400
+#: src/conversation/gnunet-conversation.c:401
 #, c-format
 msgid "Resolved address of `%s'. Now ringing other party.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:407
+#: src/conversation/gnunet-conversation.c:408
 #, fuzzy, c-format
 msgid "Connection established to `%s'\n"
 msgstr "%s bị lỗi tại %s:%d: « %s »\n"
 
-#: src/conversation/gnunet-conversation.c:414
+#: src/conversation/gnunet-conversation.c:415
 #, fuzzy, c-format
 msgid "Failed to resolve `%s'\n"
 msgstr "Lỗi mở tập tin ghi sự kiện « %s »: %s\n"
 
-#: src/conversation/gnunet-conversation.c:422
+#: src/conversation/gnunet-conversation.c:423
 #, c-format
 msgid "Call to `%s' terminated\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:431
+#: src/conversation/gnunet-conversation.c:432
 #, c-format
 msgid "Connection to `%s' suspended (by other user)\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:437
+#: src/conversation/gnunet-conversation.c:438
 #, c-format
 msgid "Connection to `%s' resumed (by other user)\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:442
+#: src/conversation/gnunet-conversation.c:443
 msgid "Error with the call, restarting it\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:511
+#: src/conversation/gnunet-conversation.c:512
 #, fuzzy, c-format
 msgid "Unknown command `%s'\n"
 msgstr "Không rõ câu lệnh « %s ».\n"
 
-#: src/conversation/gnunet-conversation.c:527
-#: src/conversation/gnunet-conversation.c:541
+#: src/conversation/gnunet-conversation.c:528
+#: src/conversation/gnunet-conversation.c:542
 #, c-format
 msgid "Ego `%s' not available\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:534
-#: src/conversation/gnunet-conversation.c:591
+#: src/conversation/gnunet-conversation.c:535
+#: src/conversation/gnunet-conversation.c:592
 msgid "You are calling someone else already, hang up first!\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:549
-#: src/conversation/gnunet-conversation.c:604
+#: src/conversation/gnunet-conversation.c:550
+#: src/conversation/gnunet-conversation.c:605
 #, c-format
 msgid "You are answering call from `%s', hang up or suspend that call first!\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:559
+#: src/conversation/gnunet-conversation.c:560
 msgid "Call recipient missing.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:615
+#: src/conversation/gnunet-conversation.c:616
 msgid "There is no incoming call to accept here!\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:632
+#: src/conversation/gnunet-conversation.c:633
 #, c-format
 msgid "There is no incoming call `%s' to accept right now!\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:662
+#: src/conversation/gnunet-conversation.c:663
 msgid "We currently do not have an address.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:685
+#: src/conversation/gnunet-conversation.c:686
 #, c-format
 msgid "We are currently trying to locate the private key for the ego `%s'.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:690
+#: src/conversation/gnunet-conversation.c:691
 #, c-format
-msgid "We are listening for incoming calls for ego `%s' on line %u.\n"
+msgid "We are listening for incoming calls for ego `%s' on line `%s'.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:696
-#: src/conversation/gnunet-conversation.c:720
+#: src/conversation/gnunet-conversation.c:697
+#: src/conversation/gnunet-conversation.c:721
 #, c-format
 msgid "You are having a conversation with `%s'.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:701
+#: src/conversation/gnunet-conversation.c:702
 msgid ""
 "We had an internal error setting up our phone line. You can still make "
 "calls.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:710
+#: src/conversation/gnunet-conversation.c:711
 #, fuzzy, c-format
 msgid "We are trying to find the network address to call `%s'.\n"
 msgstr "GNUnet bây giờ sử dụng địa chỉ IP %s.\n"
 
-#: src/conversation/gnunet-conversation.c:715
+#: src/conversation/gnunet-conversation.c:716
 #, c-format
 msgid "We are calling `%s', his phone should be ringing.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:734
+#: src/conversation/gnunet-conversation.c:735
 msgid "Calls waiting:\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:740
+#: src/conversation/gnunet-conversation.c:741
 #, fuzzy, c-format
 msgid "#%u: `%s'\n"
 msgstr "Tôi là đồng đẳng « %s ».\n"
 
-#: src/conversation/gnunet-conversation.c:768
-#: src/conversation/gnunet-conversation.c:783
+#: src/conversation/gnunet-conversation.c:769
+#: src/conversation/gnunet-conversation.c:784
 msgid "There is no call that could be suspended right now.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:816
-#: src/conversation/gnunet-conversation.c:832
+#: src/conversation/gnunet-conversation.c:817
+#: src/conversation/gnunet-conversation.c:833
 msgid "There is no call that could be resumed right now.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:839
+#: src/conversation/gnunet-conversation.c:840
 #, c-format
 msgid "Already talking with `%s', cannot resume a call right now.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:848
+#: src/conversation/gnunet-conversation.c:849
 msgid "There is no incoming call to resume here!\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:865
+#: src/conversation/gnunet-conversation.c:866
 #, c-format
 msgid "There is no incoming call `%s' to resume right now!\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:900
+#: src/conversation/gnunet-conversation.c:901
 msgid "There is no call that could be cancelled right now.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:908
+#: src/conversation/gnunet-conversation.c:909
 msgid "There is no incoming call to refuse here!\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:925
+#: src/conversation/gnunet-conversation.c:926
 #, c-format
 msgid "There is no incoming call `%s' to refuse right now!\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:951
+#: src/conversation/gnunet-conversation.c:952
 msgid "Use `/address' to find out which address this phone should have in GNS"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:953
+#: src/conversation/gnunet-conversation.c:954
 msgid "Use `/call USER.gnu' to call USER"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:955
+#: src/conversation/gnunet-conversation.c:956
 msgid "Use `/accept #NUM' to accept incoming call #NUM"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:957
+#: src/conversation/gnunet-conversation.c:958
 msgid "Use `/suspend' to suspend the active call"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:959
+#: src/conversation/gnunet-conversation.c:960
 msgid ""
 "Use `/resume [#NUM]' to resume a call, #NUM is needed to resume incoming "
 "calls, no argument is needed to resume the current outgoing call."
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:961
+#: src/conversation/gnunet-conversation.c:962
 msgid "Use `/cancel' to reject or terminate a call"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:963
+#: src/conversation/gnunet-conversation.c:964
 msgid "Use `/status' to print status information"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:965
+#: src/conversation/gnunet-conversation.c:966
 #, fuzzy
 msgid "Use `/quit' to terminate gnunet-conversation"
 msgstr "Gõ chuỗi « /quit » để thoát khỏi trình gnunet-chat"
 
-#: src/conversation/gnunet-conversation.c:967
+#: src/conversation/gnunet-conversation.c:968
 msgid "Use `/help command' to get help for a specific command"
 msgstr "Gõ chuỗi « /help LỆNH » để xem trợ giúp về lệnh đó"
 
-#: src/conversation/gnunet-conversation.c:1171
+#: src/conversation/gnunet-conversation.c:1172
 #, fuzzy, c-format
 msgid "Name of our ego changed to `%s'\n"
 msgstr "Không thể tạo miền tên.\n"
 
-#: src/conversation/gnunet-conversation.c:1184
+#: src/conversation/gnunet-conversation.c:1185
 #, fuzzy, c-format
 msgid "Our ego `%s' was deleted!\n"
 msgstr "Biệt hiệu « %s » bị xoá.\n"
 
-#: src/conversation/gnunet-conversation.c:1219
+#: src/conversation/gnunet-conversation.c:1220
 #, fuzzy
 msgid "You must specify the NAME of an ego to use\n"
 msgstr "Phải ghi rõ chỉ một tên tập tin để chèn.\n"
 
-#: src/conversation/gnunet-conversation.c:1243
+#: src/conversation/gnunet-conversation.c:1244
 #, fuzzy
 msgid "Failed to start gnunet-helper-w32-console\n"
 msgstr "Lỗi bắt đầu thu thập.\n"
 
-#: src/conversation/gnunet-conversation.c:1269
+#: src/conversation/gnunet-conversation.c:1270
 msgid "sets the NAME of the ego to use for the phone (and name resolution)"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:1272
+#: src/conversation/gnunet-conversation.c:1273
 msgid "sets the LINE to use for the phone"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:1298
+#: src/conversation/gnunet-conversation.c:1299
 msgid "Enables having a conversation with other GNUnet users."
 msgstr ""
 
@@ -1036,8 +1035,7 @@
 msgstr ""
 
 #: src/conversation/gnunet-conversation-test.c:243
-#: src/multicast/gnunet-multicast.c:70 src/revocation/gnunet-revocation.c:548
-#: src/template/gnunet-template.c:70
+#: src/revocation/gnunet-revocation.c:550 src/template/gnunet-template.c:76
 msgid "help text"
 msgstr ""
 
@@ -1172,27 +1170,18 @@
 msgid "Failed to allocate %u bytes for second packet\n"
 msgstr "Lỗi tạo thư mục tạm thời."
 
-#: src/conversation/gnunet-service-conversation.c:855
-msgid "Cadet audio channel not ready; audio data dropped\n"
-msgstr ""
-
-#: src/conversation/gnunet-service-conversation.c:946
-#, c-format
-msgid ""
-"No available phone for incoming call on line %u, sending HANG_UP signal\n"
-msgstr ""
-
-#: src/conversation/gnunet-service-conversation.c:1360
-#, fuzzy, c-format
-msgid "Received incoming Cadet channel on port %u\n"
-msgstr "« %.*s » được kết nối tới « %.*s ».\n"
-
 #: src/conversation/microphone.c:121
 #, 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"
 
-#: src/conversation/plugin_gnsrecord_conversation.c:116
+#: src/conversation/plugin_gnsrecord_conversation.c:71
+#, c-format
+msgid "PHONE version %u not supported\n"
+msgstr ""
+
+#: src/conversation/plugin_gnsrecord_conversation.c:133
+#: src/conversation/plugin_gnsrecord_conversation.c:147
 #, fuzzy, c-format
 msgid "Unable to parse PHONE record `%s'\n"
 msgstr "Lỗi đọc danh sách bạn bè từ « %s »\n"
@@ -1202,10 +1191,6 @@
 msgid "Could not start playback audio helper.\n"
 msgstr "Không thể nạp phần bổ sung truyền tải « %s »\n"
 
-#: src/core/core_api.c:725
-msgid "Client was disconnected from core service, trying to reconnect.\n"
-msgstr ""
-
 #: src/core/gnunet-core.c:90
 #, fuzzy
 msgid "fresh connection"
@@ -1248,7 +1233,7 @@
 msgid "%24s: %-30s %4s (timeout in %6s)\n"
 msgstr ""
 
-#: src/core/gnunet-core.c:144 src/peerinfo-tool/gnunet-peerinfo.c:790
+#: src/core/gnunet-core.c:144 src/peerinfo-tool/gnunet-peerinfo.c:728
 #, fuzzy, c-format
 msgid "Invalid command line argument `%s'\n"
 msgstr "Đối số không hợp lệ cho « %s ».\n"
@@ -1258,7 +1243,7 @@
 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:1990
+#: src/core/gnunet-core.c:176 src/transport/gnunet-transport.c:1737
 #, fuzzy
 msgid "provide information about all current connections (continuously)"
 msgstr "In ra thông tin về các đồng đẳng GNUnet."
@@ -1268,62 +1253,66 @@
 msgid "Print information about connected peers."
 msgstr "In ra thông tin về các đồng đẳng GNUnet."
 
-#: src/core/gnunet-service-core.c:104
+#: src/core/gnunet-service-core.c:339
 #, fuzzy
-msgid "Core service is lacking HOSTKEY configuration setting.  Exiting.\n"
-msgstr "Lưu cấu hình ngay bây giờ không?"
+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:127
-#, c-format
-msgid "Core service of `%4s' ready.\n"
+#: src/core/gnunet-service-core.c:363
+msgid "# dequeuing CAR (duplicate request)"
 msgstr ""
 
-#: src/core/gnunet-service-core_clients.c:380
-#, 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:432
+#, 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_clients.c:498
+#: src/core/gnunet-service-core.c:530
 #, fuzzy
 msgid "# messages discarded (session disconnected)"
 msgstr "# các thông báo được chắp liền"
 
-#: src/core/gnunet-service-core_clients.c:561
+#: src/core/gnunet-service-core.c:928
+#, 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:949
 #, fuzzy, c-format
-msgid "# bytes of messages of type %u received"
-msgstr "# các byte nhiễu được nhận"
+msgid "Core service of `%s' ready.\n"
+msgstr "Không gian tên « %s » có đánh giá %d.\n"
 
-#: src/core/gnunet-service-core_kx.c:571
+#: src/core/gnunet-service-core_kx.c:566
 msgid "# bytes encrypted"
 msgstr "# các byte đã mã hoá"
 
-#: src/core/gnunet-service-core_kx.c:630
+#: src/core/gnunet-service-core_kx.c:626
 msgid "# bytes decrypted"
 msgstr "# các byte đã giải mã"
 
-#: src/core/gnunet-service-core_kx.c:719
+#: src/core/gnunet-service-core_kx.c:726
 msgid "# key exchanges initiated"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:766
+#: src/core/gnunet-service-core_kx.c:786
 msgid "# key exchanges stopped"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:796
+#: src/core/gnunet-service-core_kx.c:819
 #, fuzzy
 msgid "# PING messages transmitted"
 msgstr "# các thông báo PING được tạo"
 
-#: src/core/gnunet-service-core_kx.c:871
+#: src/core/gnunet-service-core_kx.c:886
 msgid "# old ephemeral keys ignored"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:878
+#: src/core/gnunet-service-core_kx.c:893
 #, 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:917
+#: src/core/gnunet-service-core_kx.c:932
 #, c-format
 msgid ""
 "Ephemeral key message from peer `%s' rejected as its validity range does not "
@@ -1330,158 +1319,139 @@
 "match our system time (%llu not in [%llu,%llu]).\n"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:928
+#: src/core/gnunet-service-core_kx.c:943
 #, 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:1030
-#: src/transport/gnunet-service-transport_validation.c:1080
+#: src/core/gnunet-service-core_kx.c:1039
+#: 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:1039
+#: src/core/gnunet-service-core_kx.c:1048
 #, 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:1092
+#: src/core/gnunet-service-core_kx.c:1106
 #, fuzzy
 msgid "# PONG messages created"
 msgstr "# các thông báo PING được tạo"
 
-#: src/core/gnunet-service-core_kx.c:1119
+#: src/core/gnunet-service-core_kx.c:1132
 #, 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:1132
+#: src/core/gnunet-service-core_kx.c:1145
 #, 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:1203
-#: src/transport/gnunet-service-transport_validation.c:1403
+#: src/core/gnunet-service-core_kx.c:1209
+#: 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:1210
+#: src/core/gnunet-service-core_kx.c:1216
 #, 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:1215
+#: src/core/gnunet-service-core_kx.c:1221
 #, 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:1251
+#: src/core/gnunet-service-core_kx.c:1256
 #, fuzzy
 msgid "# PONG messages decrypted"
 msgstr "# các thông báo PING được tạo"
 
-#: src/core/gnunet-service-core_kx.c:1289
+#: src/core/gnunet-service-core_kx.c:1294
 #, 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:1300
+#: src/core/gnunet-service-core_kx.c:1305
 #, fuzzy
 msgid "# timeouts prevented via PONG"
 msgstr "# các byte đã nhận qua TCP"
 
-#: src/core/gnunet-service-core_kx.c:1307
+#: src/core/gnunet-service-core_kx.c:1312
 #, 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:1463
+#: src/core/gnunet-service-core_kx.c:1485
 #, 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:1471
+#: src/core/gnunet-service-core_kx.c:1493
 #, 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:1474
+#: src/core/gnunet-service-core_kx.c:1496
 #, 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:1532
-#: src/core/gnunet-service-core_kx.c:1558
+#: src/core/gnunet-service-core_kx.c:1554
+#: src/core/gnunet-service-core_kx.c:1580
 #, fuzzy
 msgid "# bytes dropped (duplicates)"
 msgstr "# các byte loại bỏ bởi UDP (đi ra)"
 
-#: src/core/gnunet-service-core_kx.c:1545
+#: src/core/gnunet-service-core_kx.c:1567
 #, 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:1587
+#: src/core/gnunet-service-core_kx.c:1609
 #, 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:1595
+#: src/core/gnunet-service-core_kx.c:1617
 #, fuzzy
 msgid "# bytes of payload decrypted"
 msgstr "# các byte đã giải mã"
 
-#: src/core/gnunet-service-core_kx.c:1629
+#: src/core/gnunet-service-core_kx.c:1674
 #, fuzzy
 msgid "# PAYLOAD dropped (out of order)"
 msgstr "# các byte loại bỏ bởi UDP (đi ra)"
 
-#: src/core/gnunet-service-core_neighbours.c:183
+#: src/core/gnunet-service-core_sessions.c:256
+#: src/core/gnunet-service-core_sessions.c:341
+#: src/dht/gnunet-service-dht_neighbours.c:741
+#: src/dht/gnunet-service-dht_neighbours.c:803
+#: 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
+#: src/transport/gnunet-service-transport_neighbours.c:719
+#: src/transport/gnunet-service-transport_neighbours.c:727
 #, fuzzy
-msgid "# sessions terminated by transport disconnect"
-msgstr "# Các quảng cáo đồng đẳng bị hủy do trọng tải"
-
-#: src/core/gnunet-service-core_neighbours.c:199
-#: src/core/gnunet-service-core_neighbours.c:387
-msgid "# neighbour entries allocated"
-msgstr ""
-
-#: src/core/gnunet-service-core_neighbours.c:291
-msgid "# encrypted bytes given to transport"
-msgstr ""
-
-#: src/core/gnunet-service-core_neighbours.c:486
-#, c-format
-msgid "Unsupported message of type %u (%u bytes) received from peer `%s'\n"
-msgstr ""
-
-#: src/core/gnunet-service-core_sessions.c:253
-#: src/core/gnunet-service-core_sessions.c:337
-#: src/dht/gnunet-service-dht_neighbours.c:789
-#: src/dht/gnunet-service-dht_neighbours.c:863
-#: src/fs/gnunet-service-fs_cp.c:662 src/fs/gnunet-service-fs_cp.c:1715
-#: src/topology/gnunet-daemon-topology.c:611
-#: src/topology/gnunet-daemon-topology.c:723
-#: src/transport/gnunet-service-transport_neighbours.c:720
-#: src/transport/gnunet-service-transport_neighbours.c:728
-#, fuzzy
 msgid "# peers connected"
 msgstr "# của các đồng đẳng đã kết nối"
 
-#: src/core/gnunet-service-core_sessions.c:284
+#: src/core/gnunet-service-core_sessions.c:287
 #, fuzzy
 msgid "# type map refreshes sent"
 msgstr "# tổng số yêu cầu lỗ hổng được gửi"
 
-#: src/core/gnunet-service-core_sessions.c:403
+#: src/core/gnunet-service-core_sessions.c:407
 #, fuzzy
 msgid "# outdated typemap confirmations received"
 msgstr "Lỗi lưu cấu hình."
 
-#: src/core/gnunet-service-core_sessions.c:414
+#: src/core/gnunet-service-core_sessions.c:418
 #, fuzzy
 msgid "# valid typemap confirmations received"
 msgstr "Lỗi lưu cấu hình."
@@ -1497,7 +1467,7 @@
 msgstr ""
 
 #: src/datacache/datacache.c:119 src/datacache/datacache.c:294
-#: src/datastore/gnunet-service-datastore.c:865
+#: src/datastore/gnunet-service-datastore.c:770
 #, fuzzy
 msgid "# bytes stored"
 msgstr "# các byte trong kho dữ liệu"
@@ -1536,7 +1506,7 @@
 msgid "# proximity search requests received"
 msgstr "# các yêu cầu khách lỗ hổng được nhận"
 
-#: src/datacache/plugin_datacache_heap.c:466
+#: src/datacache/plugin_datacache_heap.c:467
 #, fuzzy
 msgid "Heap datacache running\n"
 msgstr "kho dữ liệu sqlite"
@@ -1543,23 +1513,22 @@
 
 #: src/datacache/plugin_datacache_sqlite.c:77
 #: src/datacache/plugin_datacache_sqlite.c:86
-#: src/datastore/plugin_datastore_mysql.c:818
-#: src/datastore/plugin_datastore_mysql.c:834
+#: src/datastore/plugin_datastore_mysql.c:1027
 #: src/datastore/plugin_datastore_sqlite.c:57
-#: src/datastore/plugin_datastore_sqlite.c:65 src/my/my.c:74 src/my/my.c:84
-#: src/mysql/mysql.c:41 src/mysql/mysql.c:48 src/mysql/mysql.c:522
-#: src/mysql/mysql.c:531 src/mysql/mysql.c:591 src/mysql/mysql.c:607
+#: src/datastore/plugin_datastore_sqlite.c:65 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/namestore/plugin_namestore_postgres.c:53
 #: src/namestore/plugin_namestore_sqlite.c:52
 #: src/peerstore/plugin_peerstore_sqlite.c:50
+#: src/psycstore/plugin_psycstore_mysql.c:62
 #: src/testbed/generate-underlay-topology.c:47
 #: src/testbed/gnunet-daemon-latency-logger.c:52
-#: src/testbed/gnunet-daemon-testbed-underlay.c:55
+#: src/testbed/gnunet-daemon-testbed-underlay.c:56
 #: src/testbed/testbed_api_hosts.c:69 src/util/crypto_ecc.c:52
 #: src/util/crypto_ecc_setup.c:41 src/util/crypto_mpi.c:39
-#: src/include/gnunet_common.h:677 src/include/gnunet_common.h:686
+#: src/include/gnunet_common.h:681 src/include/gnunet_common.h:690
 #: src/scalarproduct/scalarproduct.h:35
 #, c-format
 msgid "`%s' failed at %s:%d with error: %s\n"
@@ -1568,106 +1537,77 @@
 #: src/datacache/plugin_datacache_sqlite.c:749
 #: src/datastore/plugin_datastore_sqlite.c:409
 #: src/namecache/plugin_namecache_sqlite.c:292
-#: src/namestore/plugin_namestore_sqlite.c:324
+#: src/namestore/plugin_namestore_sqlite.c:343
 msgid "Tried to close sqlite without finalizing all prepared statements.\n"
 msgstr ""
 
-#: src/datastore/datastore_api.c:308
-msgid "Failed to transmit request to drop database.\n"
-msgstr ""
+#: src/datastore/datastore_api.c:309
+#, fuzzy
+msgid "DATASTORE disconnected"
+msgstr "« %.*s » được kết nối tới « %.*s ».\n"
 
-#: src/datastore/datastore_api.c:392
-msgid "# queue entry timeouts"
-msgstr ""
+#: src/datastore/datastore_api.c:425
+#, fuzzy
+msgid "Disconnected from DATASTORE"
+msgstr "« %.*s » được kết nối tới « %.*s ».\n"
 
-#: src/datastore/datastore_api.c:447
+#: src/datastore/datastore_api.c:513
 msgid "# queue overflows"
 msgstr ""
 
-#: src/datastore/datastore_api.c:475
+#: src/datastore/datastore_api.c:543
 #, fuzzy
 msgid "# queue entries created"
 msgstr "# các truy vấn lỗ hổng được định tuyến"
 
-#: src/datastore/datastore_api.c:495
+#: src/datastore/datastore_api.c:680
 #, fuzzy
-msgid "# Requests dropped from datastore queue"
-msgstr "# các yêu cầu lỗ hổng bị bỏ do trọng tải"
+msgid "# status messages received"
+msgstr "# các thông báo phát hiện dht được nhận"
 
-#: src/datastore/datastore_api.c:536
+#: src/datastore/datastore_api.c:754
 #, fuzzy
+msgid "# Results received"
+msgstr "# các kết quả dht được nhận"
+
+#: src/datastore/datastore_api.c:879
+#, fuzzy
 msgid "# datastore connections (re)created"
 msgstr "# các kết nối dht"
 
-#: src/datastore/datastore_api.c:624
+#: src/datastore/datastore_api.c:995
 #, fuzzy
-msgid "# transmission request failures"
-msgstr "# các sự truyền PONG bị lỗi"
-
-#: src/datastore/datastore_api.c:648
-#, fuzzy
-msgid "# bytes sent to datastore"
-msgstr "# các byte trong kho dữ liệu"
-
-#: src/datastore/datastore_api.c:790
-#, fuzzy
-msgid "Failed to receive status response from database."
-msgstr ""
-"\n"
-"Không nhận được đáp ứng từ gnunetd.\n"
-
-#: src/datastore/datastore_api.c:804
-msgid "Error reading response from datastore service"
-msgstr ""
-
-#: src/datastore/datastore_api.c:816 src/datastore/datastore_api.c:822
-#, fuzzy
-msgid "Invalid error message received from datastore service"
-msgstr "Nhận được thông báo « %s » sai từ đồng đẳng « %s ».\n"
-
-#: src/datastore/datastore_api.c:826
-#, 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:905
-#, fuzzy
 msgid "# PUT requests executed"
 msgstr "# các yêu cầu dht được định tuyến"
 
-#: src/datastore/datastore_api.c:971
+#: src/datastore/datastore_api.c:1056
 #, fuzzy
 msgid "# RESERVE requests executed"
 msgstr "# các yêu cầu dht được định tuyến"
 
-#: src/datastore/datastore_api.c:1032
+#: src/datastore/datastore_api.c:1121
 msgid "# RELEASE RESERVE requests executed"
 msgstr ""
 
-#: src/datastore/datastore_api.c:1092
+#: src/datastore/datastore_api.c:1187
 #, fuzzy
 msgid "# UPDATE requests executed"
 msgstr "# các yêu cầu dht được định tuyến"
 
-#: src/datastore/datastore_api.c:1156
+#: src/datastore/datastore_api.c:1271
 #, fuzzy
 msgid "# REMOVE requests executed"
 msgstr "# các yêu cầu dht được định tuyến"
 
-#: src/datastore/datastore_api.c:1260
-#, fuzzy
-msgid "# Results received"
-msgstr "# các kết quả dht được nhận"
-
-#: src/datastore/datastore_api.c:1327
+#: src/datastore/datastore_api.c:1331
 msgid "# GET REPLICATION requests executed"
 msgstr ""
 
-#: src/datastore/datastore_api.c:1390
+#: src/datastore/datastore_api.c:1397
 msgid "# GET ZERO ANONYMITY requests executed"
 msgstr ""
 
-#: src/datastore/datastore_api.c:1459
+#: src/datastore/datastore_api.c:1477
 #, fuzzy
 msgid "# GET requests executed"
 msgstr "# các yêu cầu dht được định tuyến"
@@ -1693,37 +1633,27 @@
 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:370
+#: src/datastore/gnunet-service-datastore.c:336
 #, fuzzy
 msgid "# bytes expired"
 msgstr "# các byte được nhận"
 
-#: src/datastore/gnunet-service-datastore.c:446
+#: src/datastore/gnunet-service-datastore.c:416
 msgid "# bytes purged (low-priority)"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:504
-#: src/gns/gnunet-gns-helper-service-w32.c:221
-msgid "Transmission to client failed!\n"
-msgstr ""
-
-#: src/datastore/gnunet-service-datastore.c:535
-#: src/gns/gnunet-gns-helper-service-w32.c:260
-msgid "Shutdown in progress, aborting transmission.\n"
-msgstr ""
-
-#: src/datastore/gnunet-service-datastore.c:651
+#: src/datastore/gnunet-service-datastore.c:557
 msgid "# results found"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:696
+#: src/datastore/gnunet-service-datastore.c:598
 #, c-format
 msgid ""
-"Insufficient space (%llu bytes are available) to satisfy `%s' request for "
+"Insufficient space (%llu bytes are available) to satisfy RESERVE request for "
 "%llu bytes\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:707
+#: src/datastore/gnunet-service-datastore.c:609
 #, c-format
 msgid ""
 "The requested amount (%llu bytes) is larger than the cache size (%llu "
@@ -1730,135 +1660,134 @@
 "bytes)\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:711
+#: src/datastore/gnunet-service-datastore.c:615
 msgid ""
 "Insufficient space to satisfy request and requested amount is larger than "
 "cache size"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:717
+#: src/datastore/gnunet-service-datastore.c:622
 msgid "Insufficient space to satisfy request"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:723
-#: src/datastore/gnunet-service-datastore.c:778
-#: src/datastore/gnunet-service-datastore.c:1039
-#: src/datastore/gnunet-service-datastore.c:1673
+#: src/datastore/gnunet-service-datastore.c:629
+#: src/datastore/gnunet-service-datastore.c:684
+#: src/datastore/gnunet-service-datastore.c:969
+#: src/datastore/gnunet-service-datastore.c:1668
 msgid "# reserved"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:792
+#: src/datastore/gnunet-service-datastore.c:702
 msgid "Could not find matching reservation"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:879
+#: src/datastore/gnunet-service-datastore.c:787
 #, c-format
 msgid "Need %llu bytes more space (%llu allowed, using %llu)\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1094
+#: src/datastore/gnunet-service-datastore.c:1017
 #, 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:1107
+#: src/datastore/gnunet-service-datastore.c:1048
 #, 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
+#, 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:1155
+#: src/datastore/gnunet-service-datastore.c:1115
 #, fuzzy
 msgid "# UPDATE requests received"
 msgstr "# các yêu cầu get (lấy) dht được nhận"
 
-#: src/datastore/gnunet-service-datastore.c:1187
+#: src/datastore/gnunet-service-datastore.c:1146
 #, 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:1223
+#: src/datastore/gnunet-service-datastore.c:1179
 #, 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:1269
+#: src/datastore/gnunet-service-datastore.c:1226
 msgid "Content not found"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1279
+#: src/datastore/gnunet-service-datastore.c:1235
 msgid "# bytes removed (explicit request)"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1311
+#: src/datastore/gnunet-service-datastore.c:1282
 #, 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:1364
+#: src/datastore/gnunet-service-datastore.c:1336
 #, c-format
 msgid ""
 "Datastore payload must have been inaccurate (%lld < %lld). Recomputing it.\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1369
+#: src/datastore/gnunet-service-datastore.c:1342
+#: src/datastore/gnunet-service-datastore.c:1517
 #, c-format
 msgid "New payload: %lld\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1423
+#: src/datastore/gnunet-service-datastore.c:1396
 #, c-format
 msgid "Loading `%s' datastore plugin\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1434
+#: src/datastore/gnunet-service-datastore.c:1408
 #, 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:1503
-#: src/datastore/gnunet-service-datastore.c:1566
+#: src/datastore/gnunet-service-datastore.c:1468
 msgid "Bloomfilter construction complete.\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1553
+#: src/datastore/gnunet-service-datastore.c:1524
 msgid "Rebuilding bloomfilter.  Please be patient.\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1563
+#: src/datastore/gnunet-service-datastore.c:1535
 msgid "Plugin does not support get_keys function. Please fix!\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1704
-#: src/datastore/gnunet-service-datastore.c:1716
-#, c-format
-msgid "No `%s' specified for `%s' in configuration!\n"
-msgstr ""
-
-#: src/datastore/gnunet-service-datastore.c:1710
+#: src/datastore/gnunet-service-datastore.c:1705
 #, 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:1722
+#: src/datastore/gnunet-service-datastore.c:1721
 msgid "# quota"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1724
+#: src/datastore/gnunet-service-datastore.c:1726
 msgid "# cache size"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1739
+#: src/datastore/gnunet-service-datastore.c:1742
 #, c-format
 msgid "Could not use specified filename `%s' for bloomfilter.\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1757
-#: src/datastore/gnunet-service-datastore.c:1773
+#: src/datastore/gnunet-service-datastore.c:1760
+#: src/datastore/gnunet-service-datastore.c:1776
 #, 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:1803
+#: src/datastore/gnunet-service-datastore.c:1808
 #, fuzzy
 msgid "Failed to initialize bloomfilter.\n"
 msgstr "Lỗi sơ khởi dịch vụ « %s ».\n"
@@ -1868,27 +1797,23 @@
 msgid "Heap database running\n"
 msgstr "kho dữ liệu sqlite"
 
-#: src/datastore/plugin_datastore_mysql.c:309
+#: src/datastore/plugin_datastore_mysql.c:347
 #: src/datastore/plugin_datastore_sqlite.c:507
 #, fuzzy
 msgid "Data too large"
 msgstr "số lần lặp lại"
 
-#: src/datastore/plugin_datastore_mysql.c:328
+#: src/datastore/plugin_datastore_mysql.c:363
 msgid "MySQL statement run failure"
 msgstr ""
 
-#: src/datastore/plugin_datastore_mysql.c:793
+#: src/datastore/plugin_datastore_mysql.c:983
 #, fuzzy, c-format
-msgid "Failed to prepare statement `%s'\n"
-msgstr "Lỗi đọc danh sách bạn bè từ « %s »\n"
-
-#: src/datastore/plugin_datastore_mysql.c:802
-#, 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:1036
+#: src/datastore/plugin_datastore_mysql.c:1257
+#: src/psycstore/plugin_psycstore_mysql.c:1936
 msgid "Mysql database running\n"
 msgstr ""
 
@@ -1906,6 +1831,7 @@
 #: src/datastore/plugin_datastore_postgres.c:1012
 #: 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 ""
 
@@ -1912,7 +1838,7 @@
 #: src/datastore/plugin_datastore_sqlite.c:65
 #: src/testbed/generate-underlay-topology.c:50
 #: src/testbed/gnunet-daemon-latency-logger.c:55
-#: src/testbed/gnunet-daemon-testbed-underlay.c:58
+#: src/testbed/gnunet-daemon-testbed-underlay.c:59
 #, fuzzy, c-format
 msgid "`%s' failed at %s:%u with error: %s"
 msgstr "« %s » bị lỗi tại %s:%d với lỗi: %s"
@@ -1919,7 +1845,7 @@
 
 #: src/datastore/plugin_datastore_sqlite.c:263
 #: src/namecache/plugin_namecache_sqlite.c:193
-#: src/namestore/plugin_namestore_sqlite.c:204
+#: src/namestore/plugin_namestore_sqlite.c:213
 #: src/peerstore/plugin_peerstore_sqlite.c:479
 #: src/psycstore/plugin_psycstore_sqlite.c:325
 #, c-format
@@ -1944,7 +1870,7 @@
 
 #: src/datastore/plugin_datastore_sqlite.c:1245
 #: src/namecache/plugin_namecache_sqlite.c:580
-#: src/namestore/plugin_namestore_sqlite.c:716
+#: src/namestore/plugin_namestore_sqlite.c:766
 #, fuzzy
 msgid "Sqlite database running\n"
 msgstr "kho dữ liệu sqlite"
@@ -1953,11 +1879,6 @@
 msgid "Template database running\n"
 msgstr ""
 
-#: src/dht/dht_api.c:403
-#, fuzzy
-msgid "Failed to connect to the DHT service!\n"
-msgstr "Lỗi kết nối đến gnunetd.\n"
-
 #: src/dht/gnunet-dht-get.c:155
 #, c-format
 msgid ""
@@ -1979,7 +1900,7 @@
 msgstr ""
 
 #: src/dht/gnunet-dht-get.c:212 src/dht/gnunet-dht-monitor.c:289
-#: src/dht/gnunet-dht-put.c:202
+#: src/dht/gnunet-dht-put.c:198
 msgid "the query key"
 msgstr ""
 
@@ -1991,18 +1912,18 @@
 msgid "the type of data to look for"
 msgstr ""
 
-#: src/dht/gnunet-dht-get.c:221 src/dht/gnunet-dht-put.c:214
+#: src/dht/gnunet-dht-get.c:221
 msgid "how long to execute this query before giving up?"
 msgstr ""
 
-#: src/dht/gnunet-dht-get.c:224 src/dht/gnunet-dht-put.c:205
+#: src/dht/gnunet-dht-get.c:224 src/dht/gnunet-dht-put.c:201
 msgid "use DHT's demultiplex everywhere option"
 msgstr ""
 
 #: src/dht/gnunet-dht-get.c:227 src/dht/gnunet-dht-monitor.c:298
-#: src/dht/gnunet-dht-put.c:217 src/fs/gnunet-auto-share.c:780
+#: src/dht/gnunet-dht-put.c:210 src/fs/gnunet-auto-share.c:780
 #: src/fs/gnunet-download.c:327 src/fs/gnunet-publish.c:951
-#: src/fs/gnunet-search.c:318 src/fs/gnunet-unindex.c:167
+#: src/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 ""
@@ -2019,371 +1940,307 @@
 msgid "Prints all packets that go through the DHT."
 msgstr ""
 
-#: src/dht/gnunet_dht_profiler.c:1392
-#: src/testbed/gnunet-testbed-profiler.c:255
+#: src/dht/gnunet_dht_profiler.c:1161 src/testbed/gnunet-testbed-profiler.c:255
 #, fuzzy, c-format
 msgid "Exiting as the number of peers is %u\n"
 msgstr "tăng sổ tối đa các kết nối TCP/IP"
 
-#: src/dht/gnunet_dht_profiler.c:1417
+#: src/dht/gnunet_dht_profiler.c:1186
 #, fuzzy
 msgid "number of peers to start"
 msgstr "số lần lặp lại"
 
-#: src/dht/gnunet_dht_profiler.c:1420
+#: src/dht/gnunet_dht_profiler.c:1189
 msgid ""
 "maximum number of times we try to search for successor circle formation (0 "
 "for R5N)"
 msgstr ""
 
-#: src/dht/gnunet_dht_profiler.c:1423 src/nse/gnunet-nse-profiler.c:846
+#: src/dht/gnunet_dht_profiler.c:1192 src/nse/gnunet-nse-profiler.c:846
 #: src/testbed/gnunet-testbed-profiler.c:294
 msgid "name of the file with the login information for the testbed"
 msgstr ""
 
-#: src/dht/gnunet_dht_profiler.c:1426
+#: src/dht/gnunet_dht_profiler.c:1195
 msgid "delay between rounds for collecting statistics (default: 30 sec)"
 msgstr ""
 
-#: src/dht/gnunet_dht_profiler.c:1429
+#: src/dht/gnunet_dht_profiler.c:1198
 msgid "delay to start doing PUTs (default: 1 sec)"
 msgstr ""
 
-#: src/dht/gnunet_dht_profiler.c:1432
+#: src/dht/gnunet_dht_profiler.c:1201
 msgid "delay to start doing GETs (default: 5 min)"
 msgstr ""
 
-#: src/dht/gnunet_dht_profiler.c:1435
+#: src/dht/gnunet_dht_profiler.c:1204
 msgid "replication degree for DHT PUTs"
 msgstr ""
 
-#: src/dht/gnunet_dht_profiler.c:1438
+#: src/dht/gnunet_dht_profiler.c:1207
 msgid "timeout for DHT PUT and GET requests (default: 1 min)"
 msgstr ""
 
-#: src/dht/gnunet_dht_profiler.c:1456
+#: src/dht/gnunet_dht_profiler.c:1225
 #, fuzzy
 msgid "Measure quality and performance of the DHT service."
 msgstr "Không thể truy cập đến dịch vụ"
 
-#: src/dht/gnunet-dht-put.c:120
+#: src/dht/gnunet-dht-put.c:115
 #, fuzzy
 msgid "PUT request sent with key"
 msgstr "# độ tin cậy được tiêu phí"
 
-#: src/dht/gnunet-dht-put.c:123
+#: src/dht/gnunet-dht-put.c:118
 msgid "Timeout sending PUT request!\n"
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:126
+#: src/dht/gnunet-dht-put.c:121
 #, fuzzy
 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:151
 msgid "Must provide KEY and DATA for DHT put!\n"
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:164
+#: src/dht/gnunet-dht-put.c:158
 #, 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:180
+#: src/dht/gnunet-dht-put.c:172
 #, c-format
 msgid "Issuing put request for `%s' with data `%s'!\n"
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:196
+#: src/dht/gnunet-dht-put.c:192
 msgid "the data to insert under the key"
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:199
+#: src/dht/gnunet-dht-put.c:195
 msgid "how long to store this entry in the dht (in seconds)"
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:208
+#: src/dht/gnunet-dht-put.c:204
 msgid "how many replicas to create"
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:211
+#: src/dht/gnunet-dht-put.c:207
 msgid "the type to insert data as"
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:240
+#: src/dht/gnunet-dht-put.c:232
 msgid "Issue a PUT request to the GNUnet DHT insert DATA under KEY."
 msgstr ""
 
-#: src/dht/gnunet-service-dht.c:171
+#: src/dht/gnunet-service-dht_clients.c:370
+#: src/dht/gnunet-service-wdht_clients.c:864
 #, fuzzy
-msgid "Failed to connect to transport service!\n"
-msgstr "Lỗi kết nối đến gnunetd.\n"
-
-#: src/dht/gnunet-service-dht_clients.c:417
-#: src/dht/gnunet-service-wdht_clients.c:857
-#: src/dht/gnunet-service-xdht_clients.c:854
-#, fuzzy
 msgid "# GET requests from clients injected"
 msgstr "# các yêu cầu get (lấy) dht được nhận"
 
-#: src/dht/gnunet-service-dht_clients.c:509
-#: src/dht/gnunet-service-wdht_clients.c:938
-#: src/dht/gnunet-service-xdht_clients.c:934
+#: src/dht/gnunet-service-dht_clients.c:481
+#: 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:593
-#: src/dht/gnunet-service-wdht_clients.c:1004
-#: src/dht/gnunet-service-xdht_clients.c:999
+#: src/dht/gnunet-service-dht_clients.c:620
+#: 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:794
-#: src/dht/gnunet-service-wdht_clients.c:1213
-#: src/dht/gnunet-service-xdht_clients.c:1201
+#: src/dht/gnunet-service-dht_clients.c:847
+#: 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:1041
+#: src/dht/gnunet-service-dht_clients.c:1032
 #: src/dht/gnunet-service-wdht_clients.c:510
-#: src/dht/gnunet-service-xdht_clients.c:508
 msgid "# Key match, type mismatches in REPLY to CLIENT"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_clients.c:1054
+#: src/dht/gnunet-service-dht_clients.c:1047
 #: src/dht/gnunet-service-wdht_clients.c:524
-#: src/dht/gnunet-service-xdht_clients.c:522
 msgid "# Duplicate REPLIES to CLIENT request dropped"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_clients.c:1099
+#: src/dht/gnunet-service-dht_clients.c:1094
 #: src/dht/gnunet-service-wdht_clients.c:566
-#: src/dht/gnunet-service-xdht_clients.c:564
 #, c-format
 msgid "Unsupported block type (%u) in request!\n"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_clients.c:1122
+#: src/dht/gnunet-service-dht_clients.c:1101
 #: src/dht/gnunet-service-wdht_clients.c:589
-#: src/dht/gnunet-service-xdht_clients.c:587
 msgid "# RESULTS queued for clients"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_clients.c:1176
-#: src/dht/gnunet-service-dht_clients.c:1219
+#: src/dht/gnunet-service-dht_clients.c:1179
 #: src/dht/gnunet-service-wdht_clients.c:643
-#: src/dht/gnunet-service-wdht_clients.c:686
-#: src/dht/gnunet-service-xdht_clients.c:641
-#: src/dht/gnunet-service-xdht_clients.c:684
+#: src/dht/gnunet-service-wdht_clients.c:693
 msgid "# REPLIES ignored for CLIENTS (no match)"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_clients.c:1186
-#: src/dht/gnunet-service-wdht_clients.c:653
-#: src/dht/gnunet-service-xdht_clients.c:651
-msgid "Could not pass reply to client, message too big!\n"
-msgstr ""
-
-#: src/dht/gnunet-service-dht_datacache.c:68
+#: src/dht/gnunet-service-dht_datacache.c:72
 #, fuzzy, c-format
 msgid "%s request received, but have no datacache!\n"
 msgstr "# các byte kiểu %d được nhận"
 
-#: src/dht/gnunet-service-dht_datacache.c:78
-#: src/dht/gnunet-service-wdht_datacache.c:107
-#: src/dht/gnunet-service-xdht_datacache.c:91
+#: src/dht/gnunet-service-dht_datacache.c:82
 msgid "# ITEMS stored in datacache"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_datacache.c:184
-#: src/dht/gnunet-service-wdht_datacache.c:216
-#: src/dht/gnunet-service-xdht_datacache.c:238
+#: src/dht/gnunet-service-dht_datacache.c:199
 msgid "# Good RESULTS found in datacache"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_datacache.c:201
-#: src/dht/gnunet-service-wdht_datacache.c:231
-#: src/dht/gnunet-service-xdht_datacache.c:267
+#: src/dht/gnunet-service-dht_datacache.c:211
 msgid "# Duplicate RESULTS found in datacache"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_datacache.c:207
-#: src/dht/gnunet-service-wdht_datacache.c:237
-#: src/dht/gnunet-service-xdht_datacache.c:273
+#: src/dht/gnunet-service-dht_datacache.c:217
 msgid "# Invalid RESULTS found in datacache"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_datacache.c:213
-#: src/dht/gnunet-service-wdht_datacache.c:243
-#: src/dht/gnunet-service-xdht_datacache.c:279
+#: src/dht/gnunet-service-dht_datacache.c:223
 msgid "# Irrelevant RESULTS found in datacache"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_datacache.c:225
-#: src/dht/gnunet-service-wdht_datacache.c:255
-#: src/dht/gnunet-service-xdht_datacache.c:291
+#: src/dht/gnunet-service-dht_datacache.c:235
 msgid "# Unsupported RESULTS found in datacache"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_datacache.c:229
-#: src/dht/gnunet-service-wdht_datacache.c:258
-#: src/dht/gnunet-service-xdht_datacache.c:294
+#: src/dht/gnunet-service-dht_datacache.c:239
 #, c-format
 msgid "Unsupported block type (%u) in local response!\n"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_datacache.c:262
-#: src/dht/gnunet-service-wdht_datacache.c:295
-#: src/dht/gnunet-service-xdht_datacache.c:334
+#: src/dht/gnunet-service-dht_datacache.c:276
 #, fuzzy
 msgid "# GET requests given to datacache"
 msgstr "# các yêu cầu get (lấy) dht được nhận"
 
-#: src/dht/gnunet-service-dht_hello.c:84
-#: src/dht/gnunet-service-xdht_hello.c:82
+#: src/dht/gnunet-service-dht_hello.c:84 src/dht/gnunet-service-xdht_hello.c:82
 #, fuzzy
 msgid "# HELLOs obtained from peerinfo"
 msgstr "Nhận được thông báo « %s » sai từ đồng đẳng « %s ».\n"
 
-#: src/dht/gnunet-service-dht_neighbours.c:735
+#: src/dht/gnunet-service-dht_neighbours.c:685
 #, fuzzy
 msgid "# FIND PEER messages initiated"
 msgstr "# các thông báo PING được tạo"
 
-#: src/dht/gnunet-service-dht_neighbours.c:900
-#: src/dht/gnunet-service-xdht_neighbours.c:6062
+#: src/dht/gnunet-service-dht_neighbours.c:851
 #, fuzzy
-msgid "# Queued messages discarded (peer disconnected)"
-msgstr "# các thông báo được chắp liền"
-
-#: src/dht/gnunet-service-dht_neighbours.c:933
-#: src/dht/gnunet-service-xdht_neighbours.c:986
-#, fuzzy
-msgid "# Messages dropped (CORE timeout)"
-msgstr "# các yêu cầu lỗ hổng bị bỏ do trọng tải"
-
-#: src/dht/gnunet-service-dht_neighbours.c:963
-#: src/dht/gnunet-service-xdht_neighbours.c:1018
-#, fuzzy
-msgid "# Bytes transmitted to other peers"
-msgstr "# các byte kiểu %d được gửi "
-
-#: src/dht/gnunet-service-dht_neighbours.c:1009
-#, fuzzy
-msgid "# Bytes of bandwidth requested from core"
-msgstr "# các yêu cầu máy/trình khách lỗ hổng được phun vào"
-
-#: src/dht/gnunet-service-dht_neighbours.c:1043
-#, fuzzy
 msgid "# requests TTL-dropped"
 msgstr "# các yêu cầu get (lấy) dht được nhận"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1248
-#: src/dht/gnunet-service-dht_neighbours.c:1285
+#: src/dht/gnunet-service-dht_neighbours.c:1054
+#: src/dht/gnunet-service-dht_neighbours.c:1091
 msgid "# Peers excluded from routing due to Bloomfilter"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1263
-#: src/dht/gnunet-service-dht_neighbours.c:1300
+#: src/dht/gnunet-service-dht_neighbours.c:1071
+#: src/dht/gnunet-service-dht_neighbours.c:1107
 #, 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:1447
+#: src/dht/gnunet-service-dht_neighbours.c:1255
 #, fuzzy
 msgid "# PUT requests routed"
 msgstr "# các yêu cầu dht được định tuyến"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1476
+#: src/dht/gnunet-service-dht_neighbours.c:1288
 #, 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:1486
-#: src/dht/gnunet-service-dht_neighbours.c:1610
-#: src/dht/gnunet-service-dht_neighbours.c:1717
-#: src/dht/gnunet-service-xdht_neighbours.c:1128
-#: src/dht/gnunet-service-xdht_neighbours.c:1197
-#: src/dht/gnunet-service-xdht_neighbours.c:1247
-#: src/dht/gnunet-service-xdht_neighbours.c:1311
-#: src/dht/gnunet-service-xdht_neighbours.c:1378
-#: src/dht/gnunet-service-xdht_neighbours.c:1440
-#: src/dht/gnunet-service-xdht_neighbours.c:1502
-#: src/dht/gnunet-service-xdht_neighbours.c:1564
-#: src/dht/gnunet-service-xdht_neighbours.c:1624
+#: src/dht/gnunet-service-dht_neighbours.c:1299
+#: src/dht/gnunet-service-dht_neighbours.c:1427
+#: src/dht/gnunet-service-dht_neighbours.c:1532
+#: 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:1572
+#: src/dht/gnunet-service-dht_neighbours.c:1383
 #, fuzzy
 msgid "# GET requests routed"
 msgstr "# các yêu cầu dht được định tuyến"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1599
+#: src/dht/gnunet-service-dht_neighbours.c:1415
 #, 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:1724
+#: src/dht/gnunet-service-dht_neighbours.c:1547
 #, 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:1811
+#: src/dht/gnunet-service-dht_neighbours.c:1646
 #, 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:1814
+#: src/dht/gnunet-service-dht_neighbours.c:1650
 #, 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:1986
+#: src/dht/gnunet-service-dht_neighbours.c:1854
 #, 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:1994
+#: src/dht/gnunet-service-dht_neighbours.c:1862
 msgid "# FIND PEER requests ignored due to lack of HELLO"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:2089
+#: src/dht/gnunet-service-dht_neighbours.c:2018
 #, 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:2092
+#: src/dht/gnunet-service-dht_neighbours.c:2022
 #, 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:2157
+#: src/dht/gnunet-service-dht_neighbours.c:2097
 #, 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:2171
+#: src/dht/gnunet-service-dht_neighbours.c:2120
 #, 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:2257
+#: src/dht/gnunet-service-dht_neighbours.c:2222
 #, fuzzy
 msgid "# P2P RESULTS received"
 msgstr "# Tín hiệu HTTP PUT được nhận"
 
-#: src/dht/gnunet-service-dht_neighbours.c:2260
+#: src/dht/gnunet-service-dht_neighbours.c:2226
 #, fuzzy
 msgid "# P2P RESULT bytes received"
 msgstr "# Tín hiệu HTTP PUT được nhận"
 
-#: src/dht/gnunet-service-dht_nse.c:59 src/dht/gnunet-service-wdht_nse.c:59
-#: src/dht/gnunet-service-xdht_nse.c:59
+#: src/dht/gnunet-service-dht_nse.c:59
 #, fuzzy
 msgid "# Network size estimates received"
 msgstr "# các yêu cầu get (lấy) dht được nhận"
@@ -2408,25 +2265,24 @@
 msgid "# Unsupported REPLIES matched against routing table"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_routing.c:324
+#: src/dht/gnunet-service-dht_routing.c:327
 msgid "# Entries removed from routing table"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_routing.c:406
+#: src/dht/gnunet-service-dht_routing.c:409
 msgid "# Entries added to routing table"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_routing.c:424
+#: src/dht/gnunet-service-dht_routing.c:427
 #, fuzzy
 msgid "# DHT requests combined"
 msgstr "# các yêu cầu get (lấy) dht được nhận"
 
-#: src/dht/gnunet-service-wdht_datacache.c:82
-#, fuzzy
-msgid "PUT request received, but have no datacache!\n"
-msgstr "# các byte kiểu %d được nhận"
+#: src/dht/gnunet-service-wdht_clients.c:653
+msgid "Could not pass reply to client, message too big!\n"
+msgstr ""
 
-#: src/dht/gnunet-service-xdht_neighbours.c:1831
+#: src/dht/gnunet-service-xdht_neighbours.c:1572
 #, c-format
 msgid ""
 "\n"
@@ -2433,7 +2289,7 @@
 "SUPU %s, %s, %d,trail_length = %d"
 msgstr ""
 
-#: src/dht/gnunet-service-xdht_neighbours.c:1836
+#: src/dht/gnunet-service-xdht_neighbours.c:1577
 #, c-format
 msgid ""
 "\n"
@@ -2440,7 +2296,7 @@
 "SUPU %s, %s, %d,trail[%d]=%s"
 msgstr ""
 
-#: src/dht/gnunet-service-xdht_neighbours.c:1856
+#: src/dht/gnunet-service-xdht_neighbours.c:1597
 #, c-format
 msgid ""
 "\n"
@@ -2447,7 +2303,7 @@
 "SUPU************  FRIEND_PEERMAP of %s"
 msgstr ""
 
-#: src/dht/gnunet-service-xdht_neighbours.c:1866
+#: src/dht/gnunet-service-xdht_neighbours.c:1607
 #, c-format
 msgid ""
 "\n"
@@ -2454,7 +2310,7 @@
 "SUPU %s, %s, %d, friend = %s, friend->trails_count = %d"
 msgstr ""
 
-#: src/dht/gnunet-service-xdht_neighbours.c:1887
+#: src/dht/gnunet-service-xdht_neighbours.c:1628
 #, c-format
 msgid ""
 "\n"
@@ -2461,7 +2317,7 @@
 "SUPU************  FINGER_TABLE of %s"
 msgstr ""
 
-#: src/dht/gnunet-service-xdht_neighbours.c:1896
+#: src/dht/gnunet-service-xdht_neighbours.c:1637
 #, c-format
 msgid ""
 "\n"
@@ -2468,7 +2324,7 @@
 "SUPU %s, %s, %d, finger_table[%d] = %s, trails_count = %d"
 msgstr ""
 
-#: src/dht/gnunet-service-xdht_neighbours.c:1903
+#: src/dht/gnunet-service-xdht_neighbours.c:1644
 #, c-format
 msgid ""
 "\n"
@@ -2475,7 +2331,7 @@
 "SUPU %s, %s, %d, trail_id[%d]=%s"
 msgstr ""
 
-#: src/dht/gnunet-service-xdht_neighbours.c:1909
+#: src/dht/gnunet-service-xdht_neighbours.c:1650
 #, c-format
 msgid ""
 "\n"
@@ -2482,27 +2338,27 @@
 "SUPU %s, %s, %d,trail[%d] = %s "
 msgstr ""
 
-#: src/dht/gnunet-service-xdht_neighbours.c:3557
+#: src/dht/gnunet-service-xdht_neighbours.c:3366
 msgid "# FINGERS_COUNT"
 msgstr ""
 
-#: src/dht/gnunet-service-xdht_neighbours.c:3698
-#: src/dht/gnunet-service-xdht_neighbours.c:3936
-#: src/dht/gnunet-service-xdht_neighbours.c:4088
-#: src/dht/gnunet-service-xdht_neighbours.c:4240
-#: src/dht/gnunet-service-xdht_neighbours.c:4421
-#: src/dht/gnunet-service-xdht_neighbours.c:4934
-#: src/dht/gnunet-service-xdht_neighbours.c:5325
-#: src/dht/gnunet-service-xdht_neighbours.c:5420
-#: src/dht/gnunet-service-xdht_neighbours.c:5510
-#: src/dht/gnunet-service-xdht_neighbours.c:5614
-#: src/dht/gnunet-service-xdht_neighbours.c:5758
-#: src/dht/gnunet-service-xdht_neighbours.c:5849
+#: 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:256
+#: src/dht/gnunet-service-xdht_routing.c:261
 #, c-format
 msgid ""
 "\n"
@@ -2509,7 +2365,7 @@
 "SUPU ***PRINTING ROUTING TABLE ***** of =%s"
 msgstr ""
 
-#: src/dht/gnunet-service-xdht_routing.c:264
+#: src/dht/gnunet-service-xdht_routing.c:269
 #, c-format
 msgid ""
 "\n"
@@ -2516,7 +2372,7 @@
 "SUPU %s, %s, %d, trail->trail_id = %s"
 msgstr ""
 
-#: src/dht/gnunet-service-xdht_routing.c:267
+#: src/dht/gnunet-service-xdht_routing.c:272
 #, c-format
 msgid ""
 "\n"
@@ -2523,7 +2379,7 @@
 "SUPU %s, %s, %d, trail->next_hop = %s"
 msgstr ""
 
-#: src/dht/gnunet-service-xdht_routing.c:270
+#: src/dht/gnunet-service-xdht_routing.c:275
 #, c-format
 msgid ""
 "\n"
@@ -2554,27 +2410,27 @@
 msgid "Failed to convert UTF-8 name `%s' to DNS IDNA format: %s\n"
 msgstr "Lỗi mở tập tin ghi sự kiện « %s »: %s\n"
 
-#: src/dns/dnsstub.c:175
+#: src/dns/dnsstub.c:176
 #, fuzzy, c-format
 msgid "Could not bind to any port: %s\n"
 msgstr "Không tìm thấy địa chỉ IP của máy « %s »: %s\n"
 
-#: src/dns/dnsstub.c:293 src/dns/dnsstub.c:381
+#: src/dns/dnsstub.c:294 src/dns/dnsstub.c:382
 #, fuzzy, c-format
 msgid "Failed to send DNS request to %s\n"
 msgstr "Lỗi mở tập tin ghi sự kiện « %s »: %s\n"
 
-#: src/dns/dnsstub.c:297
+#: src/dns/dnsstub.c:298
 #, fuzzy, c-format
 msgid "Sent DNS request to %s\n"
 msgstr "Lỗi mở tập tin ghi sự kiện « %s »: %s\n"
 
-#: src/dns/dnsstub.c:366
+#: src/dns/dnsstub.c:367
 #, c-format
 msgid "Configured DNS exit `%s' is not working / valid.\n"
 msgstr ""
 
-#: src/dns/dnsstub.c:438
+#: src/dns/dnsstub.c:437
 #, c-format
 msgid "Received DNS response that is too small (%u bytes)"
 msgstr ""
@@ -2603,50 +2459,54 @@
 msgid "Change DNS replies to point elsewhere."
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:457
+#: src/dns/gnunet-service-dns.c:462
 msgid "# DNS requests answered via TUN interface"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:604
+#: src/dns/gnunet-service-dns.c:608
 msgid "# DNS exit failed (failed to open socket)"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:715
+#: src/dns/gnunet-service-dns.c:738
 msgid "# External DNS response discarded (no matching request)"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:793
+#: src/dns/gnunet-service-dns.c:813
 msgid "# Client response discarded (no matching request)"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:908
+#: src/dns/gnunet-service-dns.c:929
 msgid "Received malformed IPv4-UDP packet on TUN interface.\n"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:924
+#: src/dns/gnunet-service-dns.c:945
 msgid "Received malformed IPv6-UDP packet on TUN interface.\n"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:933
+#: src/dns/gnunet-service-dns.c:954
 #, c-format
 msgid "Got non-IP packet with %u bytes and protocol %u from TUN\n"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:943
+#: src/dns/gnunet-service-dns.c:964
+msgid "DNS interceptor got non-DNS packet (dropped)\n"
+msgstr ""
+
+#: src/dns/gnunet-service-dns.c:966
 msgid "# Non-DNS UDP packet received via TUN interface"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:1010
+#: src/dns/gnunet-service-dns.c:1033
 #, 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:1062 src/exit/gnunet-daemon-exit.c:3607
+#: src/dns/gnunet-service-dns.c:1078 src/exit/gnunet-daemon-exit.c:3643
 #, 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:1080
+#: src/dns/gnunet-service-dns.c:1091
 #, c-format
 msgid "`%s' must be installed SUID, will not run DNS interceptor\n"
 msgstr ""
@@ -2660,230 +2520,214 @@
 msgid "Print information about DV state"
 msgstr "In ra thông tin về các đồng đẳng GNUnet."
 
-#: src/exit/gnunet-daemon-exit.c:807
+#: src/exit/gnunet-daemon-exit.c:805 src/exit/gnunet-daemon-exit.c:3109
+#, fuzzy
+msgid "# Inbound CADET channels created"
+msgstr "# các truy vấn lỗ hổng được định tuyến"
+
+#: src/exit/gnunet-daemon-exit.c:861
 #, c-format
 msgid "Got duplicate service records for `%s:%u'\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:858
+#: src/exit/gnunet-daemon-exit.c:914
 #, fuzzy
 msgid "# Bytes transmitted via cadet channels"
 msgstr "# các byte được gửi"
 
-#: src/exit/gnunet-daemon-exit.c:975 src/exit/gnunet-daemon-exit.c:2408
-#: src/exit/gnunet-daemon-exit.c:2666 src/vpn/gnunet-service-vpn.c:1446
-#: src/vpn/gnunet-service-vpn.c:1837 src/vpn/gnunet-service-vpn.c:2000
+#: src/exit/gnunet-daemon-exit.c:1033 src/exit/gnunet-daemon-exit.c:2493
+#: src/exit/gnunet-daemon-exit.c:2746 src/vpn/gnunet-service-vpn.c:1455
+#: src/vpn/gnunet-service-vpn.c:1846 src/vpn/gnunet-service-vpn.c:2009
 msgid "# ICMPv4 packets dropped (type not allowed)"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:1012 src/exit/gnunet-daemon-exit.c:2467
-#: src/exit/gnunet-daemon-exit.c:2725 src/vpn/gnunet-service-vpn.c:1502
-#: src/vpn/gnunet-service-vpn.c:1896 src/vpn/gnunet-service-vpn.c:2033
+#: src/exit/gnunet-daemon-exit.c:1070 src/exit/gnunet-daemon-exit.c:2552
+#: src/exit/gnunet-daemon-exit.c:2805 src/vpn/gnunet-service-vpn.c:1511
+#: src/vpn/gnunet-service-vpn.c:1905 src/vpn/gnunet-service-vpn.c:2042
 msgid "# ICMPv6 packets dropped (type not allowed)"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:1052
+#: src/exit/gnunet-daemon-exit.c:1118
 msgid "# ICMP packets dropped (not allowed)"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:1059
+#: src/exit/gnunet-daemon-exit.c:1126
 msgid "ICMP Packet dropped, have no matching connection information\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:1135
+#: src/exit/gnunet-daemon-exit.c:1203
 msgid "UDP Packet dropped, have no matching connection information\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:1209
+#: src/exit/gnunet-daemon-exit.c:1278
 msgid "TCP Packet dropped, have no matching connection information\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:1262
+#: src/exit/gnunet-daemon-exit.c:1331
 #, fuzzy
 msgid "# Packets received from TUN"
 msgstr "# các byte đã nhận qua HTTP"
 
-#: src/exit/gnunet-daemon-exit.c:1276
+#: src/exit/gnunet-daemon-exit.c:1345
 #, fuzzy
 msgid "# Bytes received from TUN"
 msgstr "# các byte đã nhận qua HTTP"
 
-#: src/exit/gnunet-daemon-exit.c:1302
+#: src/exit/gnunet-daemon-exit.c:1371
 msgid "IPv4 packet options received.  Ignored.\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:1329
+#: src/exit/gnunet-daemon-exit.c:1398
 #, c-format
 msgid "IPv4 packet with unsupported next header %u received.  Ignored.\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:1375
+#: src/exit/gnunet-daemon-exit.c:1444
 #, c-format
 msgid "IPv6 packet with unsupported next header %d received.  Ignored.\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:1383
+#: src/exit/gnunet-daemon-exit.c:1452
 #, c-format
 msgid "Packet from unknown protocol %u received.  Ignored.\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:1765
+#: src/exit/gnunet-daemon-exit.c:1853
 #, fuzzy
 msgid "# TCP packets sent via TUN"
 msgstr "# các byte đã gửi qua UDP"
 
-#: src/exit/gnunet-daemon-exit.c:1878
+#: src/exit/gnunet-daemon-exit.c:1977
 #, 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:1881 src/exit/gnunet-daemon-exit.c:1975
-#: src/exit/gnunet-daemon-exit.c:2082 src/exit/gnunet-daemon-exit.c:2332
-#: src/exit/gnunet-daemon-exit.c:2582 src/exit/gnunet-daemon-exit.c:2872
-#: src/exit/gnunet-daemon-exit.c:2980
+#: src/exit/gnunet-daemon-exit.c:1981 src/exit/gnunet-daemon-exit.c:2060
+#: src/exit/gnunet-daemon-exit.c:2167 src/exit/gnunet-daemon-exit.c:2417
+#: src/exit/gnunet-daemon-exit.c:2667 src/exit/gnunet-daemon-exit.c:2954
+#: src/exit/gnunet-daemon-exit.c:3057
 #, fuzzy
 msgid "# Bytes received from CADET"
 msgstr "# các byte đã nhận qua HTTP"
 
-#: src/exit/gnunet-daemon-exit.c:1915 src/exit/gnunet-daemon-exit.c:3004
-#, c-format
-msgid "No service %s found for %s on port %d!\n"
-msgstr ""
-
-#: src/exit/gnunet-daemon-exit.c:1920
+#: src/exit/gnunet-daemon-exit.c:2063
 #, fuzzy
-msgid "# TCP requests dropped (no such service)"
-msgstr "# các yêu cầu lỗ hổng bị bỏ do trọng tải"
-
-#: src/exit/gnunet-daemon-exit.c:1978
-#, 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:2085
+#: src/exit/gnunet-daemon-exit.c:2170
 #, 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:2099
+#: src/exit/gnunet-daemon-exit.c:2184
 #, 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:2161
+#: src/exit/gnunet-daemon-exit.c:2246
 #, fuzzy
 msgid "# ICMP packets sent via TUN"
 msgstr "# các byte đã gửi qua UDP"
 
-#: src/exit/gnunet-daemon-exit.c:2335
+#: src/exit/gnunet-daemon-exit.c:2420
 #, 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:2585
+#: src/exit/gnunet-daemon-exit.c:2670
 #, 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:2651 src/vpn/gnunet-service-vpn.c:1436
-#: src/vpn/gnunet-service-vpn.c:1994
+#: src/exit/gnunet-daemon-exit.c:2731 src/vpn/gnunet-service-vpn.c:1445
+#: src/vpn/gnunet-service-vpn.c:2003
 msgid "# ICMPv4 packets dropped (impossible PT to v6)"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:2710 src/vpn/gnunet-service-vpn.c:1472
-#: src/vpn/gnunet-service-vpn.c:1484 src/vpn/gnunet-service-vpn.c:1884
+#: src/exit/gnunet-daemon-exit.c:2790 src/vpn/gnunet-service-vpn.c:1481
+#: src/vpn/gnunet-service-vpn.c:1493 src/vpn/gnunet-service-vpn.c:1893
 msgid "# ICMPv6 packets dropped (impossible PT to v4)"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:2761
+#: src/exit/gnunet-daemon-exit.c:2841
 #, fuzzy
 msgid "# UDP packets sent via TUN"
 msgstr "# các byte đã gửi qua UDP"
 
-#: src/exit/gnunet-daemon-exit.c:2875
+#: src/exit/gnunet-daemon-exit.c:2957
 #, fuzzy
 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:2983
+#: src/exit/gnunet-daemon-exit.c:3060
 #, fuzzy
 msgid "# UDP service requests received via cadet"
 msgstr "# các yêu cầu get (lấy) dht được nhận"
 
-#: src/exit/gnunet-daemon-exit.c:3009
-#, fuzzy
-msgid "# UDP requests dropped (no such service)"
-msgstr "# các yêu cầu lỗ hổng bị bỏ do trọng tải"
-
-#: src/exit/gnunet-daemon-exit.c:3047
-#, fuzzy
-msgid "# Inbound CADET channels created"
-msgstr "# các truy vấn lỗ hổng được định tuyến"
-
-#: src/exit/gnunet-daemon-exit.c:3268 src/exit/gnunet-daemon-exit.c:3278
+#: src/exit/gnunet-daemon-exit.c:3327 src/exit/gnunet-daemon-exit.c:3337
 #, 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:3292 src/exit/gnunet-daemon-exit.c:3300
+#: src/exit/gnunet-daemon-exit.c:3351 src/exit/gnunet-daemon-exit.c:3359
 #, c-format
 msgid "`%s' is not a valid port number (for domain `%s')!"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3333
+#: src/exit/gnunet-daemon-exit.c:3400
 #, c-format
 msgid "No addresses found for hostname `%s' of service `%s'!\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3347 src/exit/gnunet-daemon-exit.c:3359
+#: src/exit/gnunet-daemon-exit.c:3414 src/exit/gnunet-daemon-exit.c:3427
 #, c-format
 msgid "Service `%s' configured for IPv4, but IPv4 is disabled!\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3370
+#: src/exit/gnunet-daemon-exit.c:3439
 #, c-format
 msgid "No IP addresses found for hostname `%s' of service `%s'!\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3548
-#, c-format
-msgid "`%s' must be installed SUID, EXIT will not work\n"
-msgstr ""
-
-#: src/exit/gnunet-daemon-exit.c:3563
+#: src/exit/gnunet-daemon-exit.c:3584
 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:3571
+#: src/exit/gnunet-daemon-exit.c:3592
 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:3578
+#: src/exit/gnunet-daemon-exit.c:3599
 msgid ""
 "Cannot enable IPv4 exit but disable IPv4 on TUN interface, will use "
 "ENABLE_IPv4=YES\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3584
+#: src/exit/gnunet-daemon-exit.c:3605
 msgid ""
 "Cannot enable IPv6 exit but disable IPv6 on TUN interface, will use "
 "ENABLE_IPv6=YES\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3590 src/exit/gnunet-daemon-exit.c:3754
-#: src/pt/gnunet-daemon-pt.c:1243
-msgid "No useful service enabled.  Exiting.\n"
+#: src/exit/gnunet-daemon-exit.c:3765
+msgid "Must be a number"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3701
-msgid "Must be a number"
+#: src/exit/gnunet-daemon-exit.c:3872
+#, c-format
+msgid "`%s' must be installed SUID, EXIT will not work\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3852
+#: src/exit/gnunet-daemon-exit.c:3884 src/pt/gnunet-daemon-pt.c:1279
+msgid "No useful service enabled.  Exiting.\n"
+msgstr ""
+
+#: src/exit/gnunet-daemon-exit.c:4029
 msgid "Daemon to run to provide an IP exit node for the VPN"
 msgstr ""
 
@@ -2943,71 +2787,71 @@
 msgid "# fragmentation transmissions completed"
 msgstr "# các sự truyền PONG bị lỗi"
 
-#: src/fs/fs_api.c:493
+#: src/fs/fs_api.c:499
 #, fuzzy, c-format
 msgid "Could not open file `%s': %s"
 msgstr "Lỗi mở tập tin theo dõi « %s »: %s\n"
 
-#: src/fs/fs_api.c:504
+#: src/fs/fs_api.c:510
 #, fuzzy, c-format
 msgid "Could not read file `%s': %s"
 msgstr "Lỗi mở tập tin theo dõi « %s »: %s\n"
 
-#: src/fs/fs_api.c:512
+#: src/fs/fs_api.c:518
 #, c-format
 msgid "Short read reading from file `%s'!"
 msgstr ""
 
-#: src/fs/fs_api.c:1120
+#: src/fs/fs_api.c:1126
 #, fuzzy, c-format
 msgid "Failed to resume publishing information `%s': %s\n"
 msgstr "Lỗi mở tập tin ghi sự kiện « %s »: %s\n"
 
-#: src/fs/fs_api.c:1640
+#: src/fs/fs_api.c:1646
 #, c-format
 msgid "Failure while resuming publishing operation `%s': %s\n"
 msgstr ""
 
-#: src/fs/fs_api.c:1654
+#: src/fs/fs_api.c:1660
 #, fuzzy, c-format
 msgid "Failed to resume publishing operation `%s': %s\n"
 msgstr "Lỗi mở tập tin ghi sự kiện « %s »: %s\n"
 
-#: src/fs/fs_api.c:2312
+#: src/fs/fs_api.c:2318
 #, c-format
 msgid "Failure while resuming unindexing operation `%s': %s\n"
 msgstr ""
 
-#: src/fs/fs_api.c:2322
+#: src/fs/fs_api.c:2328
 #, fuzzy, c-format
 msgid "Failed to resume unindexing operation `%s': %s\n"
 msgstr "Lỗi mở tập tin ghi sự kiện « %s »: %s\n"
 
-#: src/fs/fs_api.c:2450 src/fs/fs_api.c:2698
+#: src/fs/fs_api.c:2456 src/fs/fs_api.c:2703
 #, fuzzy, c-format
 msgid "Failed to resume sub-download `%s': %s\n"
 msgstr "Lỗi mở tập tin ghi sự kiện « %s »: %s\n"
 
-#: src/fs/fs_api.c:2468
+#: src/fs/fs_api.c:2474
 #, fuzzy, c-format
 msgid "Failed to resume sub-search `%s': %s\n"
 msgstr "Lỗi mở tập tin ghi sự kiện « %s »: %s\n"
 
-#: src/fs/fs_api.c:2483 src/fs/fs_api.c:2502 src/fs/fs_api.c:2994
+#: src/fs/fs_api.c:2489 src/fs/fs_api.c:2508 src/fs/fs_api.c:3006
 #, c-format
 msgid "Failure while resuming search operation `%s': %s\n"
 msgstr ""
 
-#: src/fs/fs_api.c:2688
+#: src/fs/fs_api.c:2693
 #, c-format
 msgid "Failed to resume sub-download `%s': could not open file `%s'\n"
 msgstr ""
 
-#: src/fs/fs_api.c:2937
+#: src/fs/fs_api.c:2949
 msgid "Could not resume running search, will resume as paused search\n"
 msgstr ""
 
-#: src/fs/fs_api.c:3032
+#: src/fs/fs_api.c:3044
 #, c-format
 msgid "Failure while resuming download operation `%s': %s\n"
 msgstr ""
@@ -3017,27 +2861,27 @@
 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:322
+#: src/fs/fs_download.c:308
 msgid ""
 "Recursive downloads of directories larger than 4 GB are not supported on 32-"
 "bit systems\n"
 msgstr ""
 
-#: src/fs/fs_download.c:342
+#: src/fs/fs_download.c:328
 msgid "Directory too large for system address space\n"
 msgstr ""
 
-#: src/fs/fs_download.c:523 src/fs/fs_download.c:535
+#: src/fs/fs_download.c:509 src/fs/fs_download.c:521
 #, 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:905
+#: src/fs/fs_download.c:926
 #, 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:987
+#: src/fs/fs_download.c:1011
 #, c-format
 msgid ""
 "Internal error or bogus download URI (expected %u bytes at depth %u and "
@@ -3044,31 +2888,31 @@
 "offset %llu/%llu, got %u bytes)"
 msgstr ""
 
-#: src/fs/fs_download.c:1013
+#: src/fs/fs_download.c:1039
 msgid "internal error decrypting content"
 msgstr ""
 
-#: src/fs/fs_download.c:1036
+#: src/fs/fs_download.c:1063
 #, 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:1046
+#: src/fs/fs_download.c:1075
 #, 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:1055
+#: src/fs/fs_download.c:1084
 #, 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:1153
+#: src/fs/fs_download.c:1184
 #, fuzzy
 msgid "internal error decoding tree"
 msgstr "=\tLỗi đọc thư mục.\n"
 
-#: src/fs/fs_download.c:1939
+#: src/fs/fs_download.c:1838
 #, fuzzy
 msgid "Invalid URI"
 msgstr "Dữ liệu nhập không hợp lệ.\n"
@@ -3082,18 +2926,15 @@
 "Không rõ kiểu siêu dữ liệu trong tùy chọn siêu dữ liệu « %s ». Đang ùng kiểu "
 "siêu dữ liệu « không rõ » (unknown) để thay thế.\n"
 
-#: src/fs/fs_list_indexed.c:90
+#: src/fs/fs_list_indexed.c:152
 #, fuzzy, c-format
-msgid "Failed to receive response for `%s' request from `%s' service.\n"
-msgstr "Lỗi đọc danh sách bạn bè từ « %s »\n"
+msgid "Failed to receive response from `%s' service.\n"
+msgstr ""
+"\n"
+"Không nhận được đáp ứng từ gnunetd.\n"
 
-#: src/fs/fs_list_indexed.c:113
+#: src/fs/fs_list_indexed.c:196
 #, fuzzy, c-format
-msgid "Failed to receive valid response for `%s' request from `%s' service.\n"
-msgstr "Lỗi đọc danh sách bạn bè từ « %s »\n"
-
-#: src/fs/fs_list_indexed.c:151
-#, fuzzy, c-format
 msgid "Failed to not connect to `%s' service.\n"
 msgstr "Lỗi sơ khởi dịch vụ « %s ».\n"
 
@@ -3122,68 +2963,64 @@
 msgid "Failed to connect to datastore."
 msgstr "Không kết nối được đến trình nền gnunetd."
 
-#: src/fs/fs_publish.c:127 src/fs/fs_publish.c:439
+#: src/fs/fs_publish.c:127 src/fs/fs_publish.c:438
 #, fuzzy, c-format
 msgid "Publishing failed: %s"
 msgstr "Gặp lỗi khi tải lên tập tin: %s\n"
 
-#: src/fs/fs_publish.c:706 src/fs/fs_publish.c:723 src/fs/fs_publish.c:762
-#: src/fs/fs_publish.c:783 src/fs/fs_publish.c:807 src/fs/fs_publish.c:1055
+#: src/fs/fs_publish.c:724 src/fs/fs_publish.c:778 src/fs/fs_publish.c:823
+#: src/fs/fs_publish.c:844 src/fs/fs_publish.c:874 src/fs/fs_publish.c:1140
 #, fuzzy, c-format
 msgid "Can not index file `%s': %s.  Will try to insert instead.\n"
 msgstr "Lỗi đánh chỉ mục tập tin « %s ». Đề nghị: thử chèn tập tin.\n"
 
-#: src/fs/fs_publish.c:708
-msgid "timeout on index-start request to `fs' service"
-msgstr ""
-
-#: src/fs/fs_publish.c:720
+#: src/fs/fs_publish.c:780
 #, fuzzy
-msgid "unknown error"
-msgstr "Lỗi không rõ"
+msgid "error on index-start request to `fs' service"
+msgstr "Lỗi kết nối đến gnunetd.\n"
 
-#: src/fs/fs_publish.c:764
+#: src/fs/fs_publish.c:825
 msgid "failed to compute hash"
 msgstr ""
 
-#: src/fs/fs_publish.c:784
+#: src/fs/fs_publish.c:845
 #, fuzzy
 msgid "filename too long"
 msgstr "tên tập tin"
 
-#: src/fs/fs_publish.c:809
+#: src/fs/fs_publish.c:876
 msgid "could not connect to `fs' service"
 msgstr ""
 
-#: src/fs/fs_publish.c:832
+#: src/fs/fs_publish.c:902
 #, fuzzy, c-format
 msgid "Failed to get file identifiers for `%s'\n"
 msgstr "Lỗi đọc danh sách bạn bè từ « %s »\n"
 
-#: src/fs/fs_publish.c:896 src/fs/fs_publish.c:937
+#: src/fs/fs_publish.c:991 src/fs/fs_publish.c:1027
 msgid "Can not create LOC URI. Will continue with CHK instead.\n"
 msgstr ""
 
-#: src/fs/fs_publish.c:1009
+#: src/fs/fs_publish.c:1094
 #, fuzzy, c-format
 msgid "Recursive upload failed at `%s': %s"
 msgstr "%s bị lỗi tại %s:%d: « %s »\n"
 
-#: src/fs/fs_publish.c:1017
+#: src/fs/fs_publish.c:1102
 #, fuzzy, c-format
 msgid "Recursive upload failed: %s"
 msgstr "Gặp lỗi khi tải lên tập tin: %s\n"
 
-#: src/fs/fs_publish.c:1057
+#: src/fs/fs_publish.c:1142
 msgid "needs to be an actual file"
 msgstr ""
 
-#: src/fs/fs_publish.c:1296
+#: src/fs/fs_publish.c:1381
 #, fuzzy, c-format
 msgid "Datastore failure: %s"
 msgstr "Kho dữ liệu đầy.\n"
 
-#: src/fs/fs_publish.c:1387
+#: src/fs/fs_publish.c:1472
 #, c-format
 msgid "Reserving space for %u entries and %llu bytes for publication\n"
 msgstr ""
@@ -3198,12 +3035,12 @@
 msgid "Internal error."
 msgstr "Lỗi VR."
 
-#: src/fs/fs_search.c:806 src/fs/fs_search.c:876
+#: src/fs/fs_search.c:809 src/fs/fs_search.c:879
 #, fuzzy, c-format
 msgid "Failed to parse URI `%s': %s\n"
 msgstr "Tập tin « %s » có URI: %s\n"
 
-#: src/fs/fs_search.c:935
+#: src/fs/fs_search.c:966
 #, c-format
 msgid "Got result with unknown block type `%d', ignoring"
 msgstr ""
@@ -3217,50 +3054,42 @@
 msgid "Failed to read file"
 msgstr "Lỗi gửi tin nhẳn.\n"
 
-#: src/fs/fs_unindex.c:245
-msgid "Unexpected time for a response from `fs' service."
-msgstr ""
-
-#: src/fs/fs_unindex.c:253
-msgid "Timeout waiting for `fs' service."
-msgstr ""
-
-#: src/fs/fs_unindex.c:261
+#: src/fs/fs_unindex.c:275
 #, fuzzy
-msgid "Invalid response from `fs' service."
-msgstr "Đối số không hợp lệ cho « %s ».\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:304
+#: src/fs/fs_unindex.c:328
 #, 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:360 src/fs/fs_unindex.c:372
+#: src/fs/fs_unindex.c:378 src/fs/fs_unindex.c:390
 #, 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:368
+#: src/fs/fs_unindex.c:386
 #, fuzzy, c-format
 msgid "Internal error scanning `%s'.\n"
 msgstr "=\tLỗi đọc thư mục.\n"
 
-#: src/fs/fs_unindex.c:427
+#: src/fs/fs_unindex.c:445
 #, 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:590 src/fs/fs_unindex.c:654
+#: src/fs/fs_unindex.c:606 src/fs/fs_unindex.c:669
 #, fuzzy
 msgid "Failed to connect to `datastore' service."
 msgstr "Lỗi sơ khởi dịch vụ « %s ».\n"
 
-#: src/fs/fs_unindex.c:667
+#: src/fs/fs_unindex.c:682
 #, 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:706
+#: src/fs/fs_unindex.c:721
 #, fuzzy
 msgid "Failed to compute hash of file."
 msgstr "Không kết nối được đến trình nền gnunetd."
@@ -3479,7 +3308,7 @@
 msgstr "Tiến trình tải lên « %s » đã tiếp tục lại.\n"
 
 #: src/fs/gnunet-download.c:208 src/fs/gnunet-publish.c:295
-#: src/fs/gnunet-search.c:208 src/fs/gnunet-unindex.c:107
+#: src/fs/gnunet-search.c:212 src/fs/gnunet-unindex.c:107
 #, fuzzy, c-format
 msgid "Unexpected status: %d\n"
 msgstr "Gặp sự kiện bất thường: %d\n"
@@ -3503,12 +3332,12 @@
 msgstr ""
 
 #: src/fs/gnunet-download.c:267 src/fs/gnunet-publish.c:870
-#: src/fs/gnunet-search.c:266 src/fs/gnunet-unindex.c:139
+#: src/fs/gnunet-search.c:270 src/fs/gnunet-unindex.c:139
 #, fuzzy, c-format
 msgid "Could not initialize `%s' subsystem.\n"
 msgstr "Lỗi sơ khởi dịch vụ « %s ».\n"
 
-#: src/fs/gnunet-download.c:304 src/fs/gnunet-search.c:306
+#: src/fs/gnunet-download.c:304 src/fs/gnunet-search.c:310
 #, 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"
@@ -3517,7 +3346,7 @@
 msgid "delete incomplete downloads (when aborted with CTRL-C)"
 msgstr "xoá việc tải về không hoàn thành (khi hủy bở dùng CTRL-C)"
 
-#: src/fs/gnunet-download.c:310 src/fs/gnunet-search.c:309
+#: src/fs/gnunet-download.c:310 src/fs/gnunet-search.c:313
 msgid "only search the local peer (no P2P network search)"
 msgstr ""
 
@@ -3700,7 +3529,7 @@
 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:1811 src/transport/gnunet-transport.c:1835
+#: src/transport/gnunet-transport.c:1577 src/transport/gnunet-transport.c:1602
 #, 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"
@@ -3772,70 +3601,93 @@
 msgid "Publish a file or directory on GNUnet"
 msgstr ""
 
-#: src/fs/gnunet-search.c:123
+#: src/fs/gnunet-search.c:127
 #, c-format
 msgid "Failed to write directory with search results to `%s'\n"
 msgstr ""
 
-#: src/fs/gnunet-search.c:200
+#: src/fs/gnunet-search.c:204
 #, fuzzy, c-format
 msgid "Error searching: %s.\n"
 msgstr "Gặp lỗi khi tải xuống: %s\n"
 
-#: src/fs/gnunet-search.c:256
+#: src/fs/gnunet-search.c:260
 #, fuzzy
 msgid "Could not create keyword URI from arguments.\n"
 msgstr "Không thể tạo miền tên.\n"
 
-#: src/fs/gnunet-search.c:280
+#: src/fs/gnunet-search.c:284
 #, fuzzy
 msgid "Could not start searching.\n"
 msgstr "Không thể tạo miền tên.\n"
 
-#: src/fs/gnunet-search.c:312
+#: src/fs/gnunet-search.c:316
 msgid "write search results to file starting with PREFIX"
 msgstr ""
 
-#: src/fs/gnunet-search.c:315
+#: src/fs/gnunet-search.c:319
 msgid "automatically terminate search after DELAY"
 msgstr ""
 
-#: src/fs/gnunet-search.c:322
+#: src/fs/gnunet-search.c:326
 msgid "automatically terminate search after VALUE results are found"
 msgstr ""
 
-#: src/fs/gnunet-search.c:333
+#: src/fs/gnunet-search.c:337
 #, 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:273
+#: src/fs/gnunet-service-fs.c:378 src/fs/gnunet-service-fs.c:883
+#, 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
+#, 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
 msgid "# running average P2P latency (ms)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs.c:331 src/fs/gnunet-service-fs.c:603
+#: src/fs/gnunet-service-fs.c:658 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:730
+#: src/fs/gnunet-service-fs.c:837
 #, 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
+msgid "# client searches updated (merged content seen list)"
+msgstr ""
+
+#: src/fs/gnunet-service-fs.c:1047
+#, c-format
+msgid "Hash mismatch trying to index file `%s' which does not have hash `%s'\n"
+msgstr ""
+
+#: src/fs/gnunet-service-fs.c:1288
+#, 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:756 src/hostlist/gnunet-daemon-hostlist.c:308
-#: src/topology/gnunet-daemon-topology.c:1245
-#: src/topology/gnunet-daemon-topology.c:1253
+#: src/fs/gnunet-service-fs.c:1313 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"
 msgstr "Lỗi sơ khởi dịch vụ « %s ».\n"
 
-#: src/fs/gnunet-service-fs_cadet_client.c:490
+#: src/fs/gnunet-service-fs_cadet_client.c:494
 #, fuzzy
 msgid "# replies received via cadet"
 msgstr "# các byte kiểu %d được nhận"
 
-#: src/fs/gnunet-service-fs_cadet_client.c:504
+#: src/fs/gnunet-service-fs_cadet_client.c:508
 #, fuzzy
 msgid "# replies received via cadet dropped"
 msgstr "# các byte kiểu %d được nhận"
@@ -3845,227 +3697,183 @@
 msgid "# Blocks transferred via cadet"
 msgstr "# các byte được gửi"
 
-#: src/fs/gnunet-service-fs_cadet_server.c:359
+#: src/fs/gnunet-service-fs_cadet_server.c:360
 #, fuzzy
 msgid "# queries received via CADET not answered"
 msgstr "# các byte đã nhận qua TCP"
 
-#: src/fs/gnunet-service-fs_cadet_server.c:439
+#: src/fs/gnunet-service-fs_cadet_server.c:440
 #, fuzzy
 msgid "# queries received via cadet"
 msgstr "# các byte đã nhận qua TCP"
 
-#: src/fs/gnunet-service-fs_cadet_server.c:483
+#: src/fs/gnunet-service-fs_cadet_server.c:484
 #, fuzzy
 msgid "# cadet client connections rejected"
 msgstr "# các kết nối dht"
 
-#: src/fs/gnunet-service-fs_cadet_server.c:489
-#: src/fs/gnunet-service-fs_cadet_server.c:529
+#: src/fs/gnunet-service-fs_cadet_server.c:490
+#: src/fs/gnunet-service-fs_cadet_server.c:530
 #, fuzzy
 msgid "# cadet connections active"
 msgstr "# các kết nối dht"
 
-#: src/fs/gnunet-service-fs_cp.c:743
+#: src/fs/gnunet-service-fs_cp.c:686
 #, fuzzy
 msgid "# migration stop messages received"
 msgstr "# các thông báo phát hiện dht được nhận"
 
-#: src/fs/gnunet-service-fs_cp.c:747
+#: src/fs/gnunet-service-fs_cp.c:690
 #, c-format
 msgid "Migration of content to peer `%s' blocked for %s\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:785
-#, fuzzy
-msgid "# replies transmitted to other peers"
-msgstr "# các byte kiểu %d được gửi "
-
-#: src/fs/gnunet-service-fs_cp.c:793
-#, fuzzy
-msgid "# replies dropped"
-msgstr "# các đáp ứng dht được định tuyến"
-
-#: src/fs/gnunet-service-fs_cp.c:820 src/fs/gnunet-service-fs_cp.c:1472
+#: src/fs/gnunet-service-fs_cp.c:723 src/fs/gnunet-service-fs_cp.c:1343
 msgid "# P2P searches active"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:918
+#: src/fs/gnunet-service-fs_cp.c:818
 msgid "# artificial delays introduced (ms)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:974
+#: src/fs/gnunet-service-fs_cp.c:875
 #, fuzzy
 msgid "# replies dropped due to type mismatch"
 msgstr "# các yêu cầu lỗ hổng bị bỏ do trọng tải"
 
-#: src/fs/gnunet-service-fs_cp.c:982
+#: src/fs/gnunet-service-fs_cp.c:883
 #, fuzzy
 msgid "# replies received for other peers"
 msgstr "# các byte kiểu %d được nhận"
 
-#: src/fs/gnunet-service-fs_cp.c:996
+#: src/fs/gnunet-service-fs_cp.c:897
 msgid "# replies dropped due to insufficient cover traffic"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1044
+#: src/fs/gnunet-service-fs_cp.c:944
 msgid "# P2P searches destroyed due to ultimate reply"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1115
+#: src/fs/gnunet-service-fs_cp.c:1015
 #, fuzzy
 msgid "# requests done for free (low load)"
 msgstr "# các yêu cầu lỗ hổng bị bỏ do trọng tải"
 
-#: src/fs/gnunet-service-fs_cp.c:1140
+#: src/fs/gnunet-service-fs_cp.c:1040
 msgid "# request dropped, priority insufficient"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1150
+#: src/fs/gnunet-service-fs_cp.c:1050
 #, fuzzy
 msgid "# requests done for a price (normal load)"
 msgstr "# các yêu cầu lỗ hổng bị bỏ do trọng tải"
 
-#: src/fs/gnunet-service-fs_cp.c:1248
+#: src/fs/gnunet-service-fs_cp.c:1148
 #, fuzzy
 msgid "# requests dropped due to higher-TTL request"
 msgstr "# các yêu cầu lỗ hổng bị bỏ do trọng tải"
 
-#: src/fs/gnunet-service-fs_cp.c:1302
+#: src/fs/gnunet-service-fs_cp.c:1205
 msgid "# GET requests received (from other peers)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1337
+#: src/fs/gnunet-service-fs_cp.c:1228
 #, fuzzy
-msgid "# requests dropped due to initiator not being connected"
-msgstr "# các yêu cầu lỗ hổng bị bỏ do trọng tải"
-
-#: src/fs/gnunet-service-fs_cp.c:1358
-#, fuzzy
 msgid "# requests dropped due to missing reverse route"
 msgstr "# các yêu cầu lỗ hổng bị bỏ do trọng tải"
 
-#: src/fs/gnunet-service-fs_cp.c:1369
+#: src/fs/gnunet-service-fs_cp.c:1239
 #, fuzzy
 msgid "# requests dropped due to full reply queue"
 msgstr "# các yêu cầu lỗ hổng bị bỏ do trọng tải"
 
-#: src/fs/gnunet-service-fs_cp.c:1424
+#: src/fs/gnunet-service-fs_cp.c:1295
 #, fuzzy
 msgid "# requests dropped due TTL underflow"
 msgstr "# các yêu cầu lỗ hổng bị bỏ do trọng tải"
 
-#: src/fs/gnunet-service-fs_cp.c:1468
+#: src/fs/gnunet-service-fs_cp.c:1339
 #, fuzzy
 msgid "# P2P query messages received and processed"
 msgstr "# các thông báo phát hiện dht được nhận"
 
-#: src/fs/gnunet-service-fs_cp.c:1913
+#: src/fs/gnunet-service-fs_cp.c:1706
 #, fuzzy
 msgid "# migration stop messages sent"
 msgstr "# các thông báo phát hiện dht được nhận"
 
-#: src/fs/gnunet-service-fs_indexing.c:130
-#: src/fs/gnunet-service-fs_indexing.c:181
+#: src/fs/gnunet-service-fs_indexing.c:134
+#: src/fs/gnunet-service-fs_indexing.c:195
 #, fuzzy, c-format
 msgid "Could not open `%s'.\n"
 msgstr "Lỗi mở tập tin theo dõi « %s »: %s\n"
 
-#: src/fs/gnunet-service-fs_indexing.c:142
+#: src/fs/gnunet-service-fs_indexing.c:151
 #, fuzzy, c-format
 msgid "Error writing `%s'.\n"
 msgstr "Gặp lỗi khi tạo người dùng"
 
-#: src/fs/gnunet-service-fs_indexing.c:237
-#, c-format
-msgid ""
-"Index request received for file `%s' is already indexed as `%s'.  Permitting "
-"anyway.\n"
-msgstr ""
-
-#: src/fs/gnunet-service-fs_indexing.c:275
-#, c-format
-msgid "Hash mismatch trying to index file `%s' which has hash `%s'\n"
-msgstr ""
-
-#: src/fs/gnunet-service-fs_indexing.c:477
+#: src/fs/gnunet-service-fs_indexing.c:253
 #, fuzzy, c-format
 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:542
+#: src/fs/gnunet-service-fs_indexing.c:329
 msgid "# index blocks removed: original file inaccessible"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_indexing.c:557
+#: src/fs/gnunet-service-fs_indexing.c:355
 #, 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:559
+#: src/fs/gnunet-service-fs_indexing.c:359
 msgid "not indexed"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_indexing.c:574
+#: src/fs/gnunet-service-fs_indexing.c:392
 #, 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_lc.c:202 src/fs/gnunet-service-fs_lc.c:378
-#, 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_lc.c:261
-#, 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_lc.c:332
-#, 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_lc.c:372
-msgid "# client searches updated (merged content seen list)"
+#: src/fs/gnunet-service-fs_indexing.c:515
+#, c-format
+msgid ""
+"Index request received for file `%s' is already indexed as `%s'.  Permitting "
+"anyway.\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pe.c:273
+#: src/fs/gnunet-service-fs_pe.c:265
 #, fuzzy
 msgid "# average retransmission delay (ms)"
 msgstr "# thời gian trung bình còn kết nối (theo miligiây)"
 
-#: src/fs/gnunet-service-fs_pe.c:412
-#, fuzzy
-msgid "# transmission failed (core has no bandwidth)"
-msgstr "Lỗi thử gửi, kiểu truyền tải %d không được hỗ trợ\n"
-
-#: src/fs/gnunet-service-fs_pe.c:447
-#, fuzzy
-msgid "# query messages sent to other peers"
-msgstr "# các byte thông báo gửi đi bị loại bỏ"
-
-#: src/fs/gnunet-service-fs_pe.c:501
+#: src/fs/gnunet-service-fs_pe.c:427
 msgid "# delay heap timeout (ms)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pe.c:511
+#: src/fs/gnunet-service-fs_pe.c:438
 #, fuzzy
 msgid "# query plans executed"
 msgstr "# các yêu cầu dht được định tuyến"
 
-#: src/fs/gnunet-service-fs_pe.c:593
+#: src/fs/gnunet-service-fs_pe.c:466
 #, fuzzy
+msgid "# query messages sent to other peers"
+msgstr "# các byte thông báo gửi đi bị loại bỏ"
+
+#: src/fs/gnunet-service-fs_pe.c:536
+#, fuzzy
 msgid "# requests merged"
 msgstr "# các yêu cầu get (lấy) dht được nhận"
 
-#: src/fs/gnunet-service-fs_pe.c:603
+#: src/fs/gnunet-service-fs_pe.c:546
 #, fuzzy
 msgid "# requests refreshed"
 msgstr "# các yêu cầu get (lấy) dht được nhận"
 
-#: src/fs/gnunet-service-fs_pe.c:661 src/fs/gnunet-service-fs_pe.c:769
-#: src/fs/gnunet-service-fs_pe.c:848
+#: src/fs/gnunet-service-fs_pe.c:606 src/fs/gnunet-service-fs_pe.c:709
+#: src/fs/gnunet-service-fs_pe.c:788
 msgid "# query plan entries"
 msgstr ""
 
@@ -4074,114 +3882,114 @@
 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:411 src/fs/gnunet-service-fs_pr.c:671
+#: src/fs/gnunet-service-fs_pr.c:411 src/fs/gnunet-service-fs_pr.c:661
 #, 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:852
+#: src/fs/gnunet-service-fs_pr.c:842
 #, fuzzy
 msgid "# replies received and matched"
 msgstr "# các byte kiểu %d được nhận"
 
-#: src/fs/gnunet-service-fs_pr.c:889
+#: src/fs/gnunet-service-fs_pr.c:879
 msgid "# duplicate replies discarded (bloomfilter)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:898
+#: src/fs/gnunet-service-fs_pr.c:888
 msgid "# irrelevant replies discarded"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:913
+#: src/fs/gnunet-service-fs_pr.c:903
 #, c-format
 msgid "Unsupported block type %u\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:930
+#: src/fs/gnunet-service-fs_pr.c:920
 #, 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:1060
+#: src/fs/gnunet-service-fs_pr.c:1050
 msgid "# Datastore `PUT' failures"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1088
+#: src/fs/gnunet-service-fs_pr.c:1078
 #, 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:1126
+#: src/fs/gnunet-service-fs_pr.c:1116
 #, fuzzy
 msgid "# Replies received from DHT"
 msgstr "# các byte đã nhận qua HTTP"
 
-#: src/fs/gnunet-service-fs_pr.c:1258
+#: src/fs/gnunet-service-fs_pr.c:1247
 #, fuzzy
 msgid "# Replies received from CADET"
 msgstr "# các byte đã nhận qua HTTP"
 
-#: src/fs/gnunet-service-fs_pr.c:1310
+#: src/fs/gnunet-service-fs_pr.c:1299
 #, c-format
 msgid "Datastore lookup already took %s!\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1331
+#: src/fs/gnunet-service-fs_pr.c:1320
 #, c-format
 msgid "On-demand lookup already took %s!\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1383
+#: src/fs/gnunet-service-fs_pr.c:1372
 msgid "# Datastore lookups concluded (no results)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1398
+#: src/fs/gnunet-service-fs_pr.c:1387
 msgid "# Datastore lookups concluded (seen all)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1407
+#: src/fs/gnunet-service-fs_pr.c:1396
 msgid "# Datastore lookups aborted (more than MAX_RESULTS)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1422
+#: src/fs/gnunet-service-fs_pr.c:1411
 msgid "# requested DBLOCK or IBLOCK not found"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1436
+#: src/fs/gnunet-service-fs_pr.c:1425
 msgid "# on-demand blocks matched requests"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1449
+#: src/fs/gnunet-service-fs_pr.c:1438
 msgid "# on-demand lookups performed successfully"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1454
+#: src/fs/gnunet-service-fs_pr.c:1443
 msgid "# on-demand lookups failed"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1481 src/fs/gnunet-service-fs_pr.c:1521
-#: src/fs/gnunet-service-fs_pr.c:1690
+#: src/fs/gnunet-service-fs_pr.c:1469 src/fs/gnunet-service-fs_pr.c:1508
+#: src/fs/gnunet-service-fs_pr.c:1675
 msgid "# Datastore lookups concluded (error queueing)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1540
+#: src/fs/gnunet-service-fs_pr.c:1527
 msgid "# Datastore lookups concluded (found last result)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1552
+#: src/fs/gnunet-service-fs_pr.c:1539
 msgid "# Datastore lookups concluded (load too high)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1666
+#: src/fs/gnunet-service-fs_pr.c:1652
 msgid "# Datastore lookups initiated"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1755
+#: src/fs/gnunet-service-fs_pr.c:1732
 #, 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:678
+#: src/fs/gnunet-service-fs_push.c:642
 msgid "time required, content pushing disabled"
 msgstr ""
 
@@ -4216,13 +4024,6 @@
 msgid "Unindex a file that was previously indexed with gnunet-publish."
 msgstr ""
 
-#: src/gns/gns_api.c:393
-#, fuzzy
-msgid "Failed to deserialize lookup reply from GNS service!\n"
-msgstr ""
-"\n"
-"Không nhận được đáp ứng từ gnunetd.\n"
-
 #: src/gns/gnunet-bcd.c:127
 #, fuzzy, c-format
 msgid "Refusing `%s' request to HTTP server\n"
@@ -4309,22 +4110,22 @@
 msgid "GNUnet DNS-to-GNS proxy (a DNS server)"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:236 src/gns/plugin_rest_gns.c:347
+#: src/gns/gnunet-gns.c:269 src/gns/plugin_rest_gns.c:347
 #, c-format
 msgid "Invalid typename specified, assuming `ANY'\n"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:254
+#: src/gns/gnunet-gns.c:295
 #, c-format
 msgid "Please specify name to lookup!\n"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:335
+#: src/gns/gnunet-gns.c:376
 #, c-format
 msgid "Ego for `%s' not found, cannot perform lookup.\n"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:374 src/gns/gnunet-gns-helper-service-w32.c:796
+#: src/gns/gnunet-gns.c:415 src/gns/gnunet-gns-helper-service-w32.c:796
 #: src/gns/plugin_rest_gns.c:472
 #, c-format
 msgid ""
@@ -4332,49 +4133,67 @@
 "gns-import.sh?\n"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:415 src/gns/gnunet-gns-helper-service-w32.c:826
+#: src/gns/gnunet-gns.c:456 src/gns/gnunet-gns-helper-service-w32.c:826
 #, fuzzy, c-format
 msgid "Failed to connect to GNS\n"
 msgstr "Lỗi kết nối đến gnunetd.\n"
 
-#: src/gns/gnunet-gns.c:429
+#: src/gns/gnunet-gns.c:470 src/gns/gnunet-gns.c:500
 #, 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:479
+#: src/gns/gnunet-gns.c:548
 msgid "Lookup a record for the given name"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:482
+#: src/gns/gnunet-gns.c:551
 #, 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:485
+#: src/gns/gnunet-gns.c:554
 #, 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:488
+#: src/gns/gnunet-gns.c:557
 msgid "No unneeded output"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:491
+#: src/gns/gnunet-gns.c:560
 #, 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:494
+#: src/gns/gnunet-gns.c:563
 #, 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:508
+#: src/gns/gnunet-gns.c:566
 #, 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
+msgid "Transmission to client failed!\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 ""
@@ -4393,14 +4212,14 @@
 msgstr ""
 
 #: src/gns/gnunet-gns-proxy.c:109
-#: src/hostlist/gnunet-daemon-hostlist_client.c:529
-#: src/hostlist/gnunet-daemon-hostlist_client.c:747
-#: src/hostlist/gnunet-daemon-hostlist_client.c:753
-#: src/hostlist/gnunet-daemon-hostlist_client.c:805
-#: src/hostlist/gnunet-daemon-hostlist_client.c:814
-#: src/hostlist/gnunet-daemon-hostlist_client.c:925
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1020
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1025
+#: src/hostlist/gnunet-daemon-hostlist_client.c:569
+#: src/hostlist/gnunet-daemon-hostlist_client.c:787
+#: src/hostlist/gnunet-daemon-hostlist_client.c:793
+#: src/hostlist/gnunet-daemon-hostlist_client.c:845
+#: src/hostlist/gnunet-daemon-hostlist_client.c:854
+#: src/hostlist/gnunet-daemon-hostlist_client.c:965
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1060
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1065
 #: src/transport/plugin_transport_http_client.c:598
 #: src/transport/plugin_transport_http_client.c:616
 #, c-format
@@ -4407,127 +4226,128 @@
 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:846
+#: src/gns/gnunet-gns-proxy.c:887
 #, 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:869
+#: src/gns/gnunet-gns-proxy.c:910
 #, 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:892
+#: src/gns/gnunet-gns-proxy.c:933
 #, 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:905
+#: src/gns/gnunet-gns-proxy.c:946
 #, 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:920
+#: src/gns/gnunet-gns-proxy.c:961
 #, 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:930
+#: src/gns/gnunet-gns-proxy.c:971
 #, c-format
 msgid "Failed DANE verification failed with GnuTLS verify status code: %u\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:954
+#: src/gns/gnunet-gns-proxy.c:995
 #, c-format
 msgid "SSL certificate subject name (%s) does not match `%s'\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:1099
+#: src/gns/gnunet-gns-proxy.c:1104
 #, c-format
 msgid "Cookie domain `%s' supplied by server is invalid\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:1631
+#: src/gns/gnunet-gns-proxy.c:1708
 #, 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:1997
+#: src/gns/gnunet-gns-proxy.c:2167
 #, 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:2027
+#: src/gns/gnunet-gns-proxy.c:2197
 #, 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:2199
+#: src/gns/gnunet-gns-proxy.c:2370
 #, 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:2218 src/rest/gnunet-rest-server.c:529
+#: src/gns/gnunet-gns-proxy.c:2389 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:2538
+#: src/gns/gnunet-gns-proxy.c:2709
 #, 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:2567
+#: src/gns/gnunet-gns-proxy.c:2738
 #, 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:2585 src/gns/gnunet-gns-proxy.c:2614
+#: src/gns/gnunet-gns-proxy.c:2756 src/gns/gnunet-gns-proxy.c:2785
 msgid "SSL connection to plain IPv4 address requested\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:2665
+#: src/gns/gnunet-gns-proxy.c:2836
 #, 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:2999
+#: src/gns/gnunet-gns-proxy.c:3171
 msgid "No ego configured for `shorten-zone`\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:3039 src/gns/gnunet-service-gns.c:887
+#: src/gns/gnunet-gns-proxy.c:3211 src/gns/gnunet-service-gns.c:1093
+#: src/gns/gnunet-service-gns.c:1149
 #, c-format
 msgid "No ego configured for `%s`\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:3101
+#: src/gns/gnunet-gns-proxy.c:3273
 #, 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:3141
+#: src/gns/gnunet-gns-proxy.c:3313
 msgid "listen on specified port (default: 7777)"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:3144
+#: src/gns/gnunet-gns-proxy.c:3316
 msgid "pem file to use as CA"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:3163
+#: src/gns/gnunet-gns-proxy.c:3335
 msgid "GNUnet GNS proxy"
 msgstr ""
 
-#: src/gns/gnunet-service-gns.c:928
+#: src/gns/gnunet-service-gns.c:1187
 #, 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:936
+#: src/gns/gnunet-service-gns.c:1195
 #, 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:969
+#: src/gns/gnunet-service-gns.c:1228
 #, fuzzy
 msgid "Could not connect to DHT!\n"
 msgstr "Không thể kết nối tới %s:%u: %s\n"
@@ -4537,7 +4357,7 @@
 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:369
+#: src/gns/gnunet-service-gns_interceptor.c:371
 #, fuzzy
 msgid "Failed to connect to the DNS service!\n"
 msgstr "Lỗi kết nối đến gnunetd.\n"
@@ -4562,55 +4382,60 @@
 msgid "Skipping record of unsupported type %d\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns_resolver.c:1353
+#: src/gns/gnunet-service-gns_resolver.c:1354
 #, c-format
 msgid "GNS lookup resulted in DNS name that is too long (`%s')\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns_resolver.c:1888
+#: src/gns/gnunet-service-gns_resolver.c:1889
 msgid "GNS lookup recursion failed (no delegation record found)\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns_resolver.c:1912
+#: src/gns/gnunet-service-gns_resolver.c:1913
 #, 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:2194
+#: src/gns/gnunet-service-gns_resolver.c:2195
 #, c-format
 msgid "Zone %s was revoked, resolution fails\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns_resolver.c:2341
+#: src/gns/gnunet-service-gns_resolver.c:2342
 #, c-format
 msgid "Hostname `%s' is not well-formed, resolution fails\n"
 msgstr ""
 
-#: src/gns/plugin_gnsrecord_gns.c:172
+#: src/gns/plugin_gnsrecord_gns.c:203
 #, fuzzy, c-format
 msgid "Unable to parse PKEY record `%s'\n"
 msgstr "Lỗi đọc danh sách bạn bè từ « %s »\n"
 
-#: src/gns/plugin_gnsrecord_gns.c:201
+#: src/gns/plugin_gnsrecord_gns.c:232
 #, fuzzy, c-format
 msgid "Unable to parse GNS2DNS record `%s'\n"
 msgstr "Lỗi đọc danh sách bạn bè từ « %s »\n"
 
-#: src/gns/plugin_gnsrecord_gns.c:222
+#: src/gns/plugin_gnsrecord_gns.c:253
 #, fuzzy, c-format
 msgid "Failed to serialize GNS2DNS record with value `%s'\n"
 msgstr "Không thể truy cập đến tập tin gnunet-directory « %s »\n"
 
-#: src/gns/plugin_gnsrecord_gns.c:245
+#: src/gns/plugin_gnsrecord_gns.c:276
 #, fuzzy, c-format
 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:280
+#: src/gns/plugin_gnsrecord_gns.c:311
 #, 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
+#, 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
 msgid "Ego for not found, cannot perform lookup.\n"
 msgstr ""
@@ -4635,53 +4460,53 @@
 msgid "Failed to serialize CNAME record with value `%s'\n"
 msgstr "Không thể truy cập đến tập tin gnunet-directory « %s »\n"
 
-#: src/gnsrecord/plugin_gnsrecord_dns.c:486
+#: src/gnsrecord/plugin_gnsrecord_dns.c:487
 #, fuzzy, c-format
 msgid "Failed to serialize CERT record with %u bytes\n"
 msgstr "Không thể truy cập đến tập tin gnunet-directory « %s »\n"
 
-#: src/gnsrecord/plugin_gnsrecord_dns.c:522
+#: src/gnsrecord/plugin_gnsrecord_dns.c:523
 #, fuzzy, c-format
 msgid "Unable to parse SOA record `%s'\n"
 msgstr "Lỗi đọc danh sách bạn bè từ « %s »\n"
 
-#: src/gnsrecord/plugin_gnsrecord_dns.c:541
+#: src/gnsrecord/plugin_gnsrecord_dns.c:542
 #, fuzzy, c-format
 msgid "Failed to serialize SOA record with mname `%s' and rname `%s'\n"
 msgstr "Không thể truy cập đến tập tin gnunet-directory « %s »\n"
 
-#: src/gnsrecord/plugin_gnsrecord_dns.c:564
+#: src/gnsrecord/plugin_gnsrecord_dns.c:565
 #, fuzzy, c-format
 msgid "Failed to serialize PTR record with value `%s'\n"
 msgstr "Không thể truy cập đến tập tin gnunet-directory « %s »\n"
 
-#: src/gnsrecord/plugin_gnsrecord_dns.c:587
+#: src/gnsrecord/plugin_gnsrecord_dns.c:588
 #, fuzzy, c-format
 msgid "Unable to parse MX record `%s'\n"
 msgstr "Lỗi đọc danh sách bạn bè từ « %s »\n"
 
-#: src/gnsrecord/plugin_gnsrecord_dns.c:602
+#: src/gnsrecord/plugin_gnsrecord_dns.c:603
 #, fuzzy, c-format
 msgid "Failed to serialize MX record with hostname `%s'\n"
 msgstr "Không thể truy cập đến tập tin gnunet-directory « %s »\n"
 
-#: src/gnsrecord/plugin_gnsrecord_dns.c:629
+#: src/gnsrecord/plugin_gnsrecord_dns.c:630
 #, fuzzy, c-format
 msgid "Unable to parse SRV record `%s'\n"
 msgstr "Lỗi đọc danh sách bạn bè từ « %s »\n"
 
-#: src/gnsrecord/plugin_gnsrecord_dns.c:645
+#: src/gnsrecord/plugin_gnsrecord_dns.c:646
 #, fuzzy, c-format
 msgid "Failed to serialize SRV record with target `%s'\n"
 msgstr "Không thể truy cập đến tập tin gnunet-directory « %s »\n"
 
-#: src/gnsrecord/plugin_gnsrecord_dns.c:662
+#: src/gnsrecord/plugin_gnsrecord_dns.c:663
 #, fuzzy, c-format
 msgid "Unable to parse IPv6 address `%s'\n"
 msgstr "Mức ưu tiên tiến trình không hợp lê « %s ».\n"
 
-#: src/gnsrecord/plugin_gnsrecord_dns.c:686
-#: src/gnsrecord/plugin_gnsrecord_dns.c:702
+#: src/gnsrecord/plugin_gnsrecord_dns.c:687
+#: src/gnsrecord/plugin_gnsrecord_dns.c:703
 #, fuzzy, c-format
 msgid "Unable to parse TLSA record string `%s'\n"
 msgstr "Lỗi đọc danh sách bạn bè từ « %s »\n"
@@ -4725,105 +4550,105 @@
 msgid "Modified %u addresses, wrote %u bytes\n"
 msgstr ""
 
-#: src/hello/hello.c:1139
+#: src/hello/hello.c:1103
 #, fuzzy
 msgid "Failed to parse HELLO message: missing expiration time\n"
 msgstr "Lỗi lưu cấu hình."
 
-#: src/hello/hello.c:1148
+#: src/hello/hello.c:1112
 #, fuzzy
 msgid "Failed to parse HELLO message: invalid expiration time\n"
 msgstr "Lỗi lưu cấu hình."
 
-#: src/hello/hello.c:1158
+#: src/hello/hello.c:1122
 #, fuzzy
 msgid "Failed to parse HELLO message: malformed\n"
 msgstr "Lỗi đọc danh sách bạn bè từ « %s »\n"
 
-#: src/hello/hello.c:1169
+#: src/hello/hello.c:1133
 #, fuzzy
 msgid "Failed to parse HELLO message: missing transport plugin\n"
 msgstr "Không thể nạp phần bổ sung truyền tải « %s »\n"
 
-#: src/hello/hello.c:1187
+#: src/hello/hello.c:1151
 #, c-format
 msgid "Plugin `%s' not found, skipping address\n"
 msgstr ""
 
-#: src/hello/hello.c:1195
+#: src/hello/hello.c:1159
 #, c-format
 msgid "Plugin `%s' does not support URIs yet\n"
 msgstr ""
 
-#: src/hello/hello.c:1210
+#: src/hello/hello.c:1174
 #, fuzzy, c-format
 msgid "Failed to parse `%s' as an address for plugin `%s'\n"
 msgstr "Lỗi đóng kết đến cổng %s %d.\n"
 
-#: src/hostlist/gnunet-daemon-hostlist.c:272
+#: src/hostlist/gnunet-daemon-hostlist.c:316
 msgid ""
 "None of the functions for the hostlist daemon were enabled.  I have no "
 "reason to run!\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist.c:328
+#: src/hostlist/gnunet-daemon-hostlist.c:375
 #, 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:333
+#: src/hostlist/gnunet-daemon-hostlist.c:380
 msgid ""
 "bootstrap using hostlists (it is highly recommended that you always use this "
 "option)"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist.c:336
+#: src/hostlist/gnunet-daemon-hostlist.c:383
 #, 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:340
+#: src/hostlist/gnunet-daemon-hostlist.c:387
 #, 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:356
+#: src/hostlist/gnunet-daemon-hostlist.c:403
 msgid "GNUnet hostlist server and client"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:348
+#: src/hostlist/gnunet-daemon-hostlist_client.c:371
 #, fuzzy
 msgid "# bytes downloaded from hostlist servers"
 msgstr "trình phục vụ danh sách máy HTTP hợp nhất"
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:369
-#: src/hostlist/gnunet-daemon-hostlist_client.c:399
+#: src/hostlist/gnunet-daemon-hostlist_client.c:392
+#: src/hostlist/gnunet-daemon-hostlist_client.c:437
 #, fuzzy
 msgid "# invalid HELLOs downloaded from hostlist servers"
 msgstr "# các HELLO tải xuống qua HTTP"
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:372
-#: src/hostlist/gnunet-daemon-hostlist_client.c:402
+#: src/hostlist/gnunet-daemon-hostlist_client.c:395
+#: src/hostlist/gnunet-daemon-hostlist_client.c:440
 #, fuzzy, c-format
 msgid "Invalid `%s' message received from hostlist at `%s'\n"
 msgstr "Nhận được thông báo « %s » sai từ đồng đẳng « %s ».\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:390
+#: src/hostlist/gnunet-daemon-hostlist_client.c:413
 #, fuzzy
 msgid "# valid HELLOs downloaded from hostlist servers"
 msgstr "# các HELLO tải xuống qua HTTP"
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:655
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1386
+#: src/hostlist/gnunet-daemon-hostlist_client.c:695
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1441
 msgid "# advertised hostlist URIs"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:685
+#: src/hostlist/gnunet-daemon-hostlist_client.c:725
 #, c-format
 msgid "# advertised URI `%s' downloaded"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:728
+#: src/hostlist/gnunet-daemon-hostlist_client.c:768
 #, c-format
 msgid ""
 "Advertised hostlist with URI `%s' could not be downloaded. Advertised URI "
@@ -4830,239 +4655,234 @@
 "gets dismissed.\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:856
+#: src/hostlist/gnunet-daemon-hostlist_client.c:896
 #, fuzzy, c-format
 msgid "Timeout trying to download hostlist from `%s'\n"
 msgstr "Đang thử tải danh sách các máy xuống « %s »\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:870
+#: src/hostlist/gnunet-daemon-hostlist_client.c:910
 #, c-format
 msgid "Download limit of %u bytes exceeded, stopping download\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:890
+#: src/hostlist/gnunet-daemon-hostlist_client.c:930
 #, fuzzy, c-format
 msgid "Download of hostlist from `%s' failed: `%s'\n"
 msgstr "Tải lên « %s » hoàn thành, địa chỉ URI là « %s ».\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:896
+#: src/hostlist/gnunet-daemon-hostlist_client.c:936
 #, fuzzy, c-format
 msgid "Download of hostlist `%s' completed.\n"
 msgstr "Tải lên « %s » hoàn thành, địa chỉ URI là « %s ».\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:904
+#: src/hostlist/gnunet-daemon-hostlist_client.c:944
 #, c-format
 msgid "Adding successfully tested hostlist `%s' datastore.\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:957
+#: src/hostlist/gnunet-daemon-hostlist_client.c:997
 #, fuzzy, c-format
 msgid "Bootstrapping using hostlist at `%s'.\n"
 msgstr "Đang nạp và khởi động dùng « %s ».\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:965
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1005
 msgid "# hostlist downloads initiated"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1092
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1639
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1132
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1698
 msgid "# milliseconds between hostlist downloads"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1101
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1141
 #, c-format
 msgid "Have %u/%u connections.  Will consider downloading hostlist in %s\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1156
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1172
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1200
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1221
 #, fuzzy
 msgid "# active connections"
 msgstr "# các kết nối dht"
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1332
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1387
 #, fuzzy, c-format
 msgid "Loading saved hostlist entries from file `%s' \n"
 msgstr "Đang thử tải danh sách các máy xuống « %s »\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1337
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1392
 #, fuzzy, c-format
 msgid "Hostlist file `%s' does not exist\n"
 msgstr "Khoá phiên chạy từ đồng đẳng « %s » không thể được thẩm tra.\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1346
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1401
 #, fuzzy, c-format
 msgid "Could not open file `%s' for reading to load hostlists: %s\n"
 msgstr "Lỗi mở tập tin theo dõi « %s »: %s\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1380
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1435
 #, c-format
 msgid "%u hostlist URIs loaded from file\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1383
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1438
 #, fuzzy
 msgid "# hostlist URIs read from file"
 msgstr "# các byte danh sách máy được trả về"
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1429
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1484
 #, fuzzy, c-format
 msgid "Could not open file `%s' for writing to save hostlists: %s\n"
 msgstr "Lỗi mở tập tin theo dõi « %s »: %s\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1436
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1491
 #, fuzzy, c-format
 msgid "Writing %u hostlist URIs to `%s'\n"
 msgstr "Đang thử tải danh sách các máy xuống « %s »\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1460
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1477
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1515
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1532
 #, c-format
 msgid "Error writing hostlist URIs to file `%s'\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1472
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1527
 #, fuzzy
 msgid "# hostlist URIs written to file"
 msgstr "# các byte danh sách máy được trả về"
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1572
-#: src/transport/plugin_transport_http_client.c:2273
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1628
+#: src/transport/plugin_transport_http_client.c:2277
 #, c-format
 msgid "Invalid proxy type: `%s', disabling proxy! Check configuration!\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1601
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1657
 msgid "Learning is enabled on this peer\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1614
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1671
 msgid "Learning is not enabled on this peer\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1625
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1684
 #, c-format
 msgid ""
 "Since learning is not enabled on this peer, hostlist file `%s' was removed\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:182
+#: src/hostlist/gnunet-daemon-hostlist_server.c:176
 #, fuzzy
 msgid "bytes in hostlist"
 msgstr "# các byte trong kho dữ liệu"
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:207
+#: src/hostlist/gnunet-daemon-hostlist_server.c:201
 msgid "expired addresses encountered"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:243
-#: src/hostlist/gnunet-daemon-hostlist_server.c:590
-#: src/peerinfo-tool/gnunet-peerinfo.c:389
-#: src/peerinfo-tool/gnunet-peerinfo.c:538
-#: src/topology/gnunet-daemon-topology.c:866
+#: src/hostlist/gnunet-daemon-hostlist_server.c:237
+#: src/hostlist/gnunet-daemon-hostlist_server.c:531
+#: src/peerinfo-tool/gnunet-peerinfo.c:385
+#: src/peerinfo-tool/gnunet-peerinfo.c:534
+#: src/topology/gnunet-daemon-topology.c:857
 #, fuzzy, c-format
 msgid "Error in communication with PEERINFO service: %s\n"
 msgstr "Cổng để liên lạc với giao diện người dùng GNUnet"
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:267
+#: src/hostlist/gnunet-daemon-hostlist_server.c:261
 msgid "HELLOs without addresses encountered (ignored)"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:284
+#: src/hostlist/gnunet-daemon-hostlist_server.c:278
 msgid "bytes not included in hostlist (size limit)"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:388
+#: src/hostlist/gnunet-daemon-hostlist_server.c:382
 #, fuzzy, c-format
 msgid "Refusing `%s' request to hostlist server\n"
 msgstr "trình phục vụ danh sách máy HTTP hợp nhất"
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:391
+#: src/hostlist/gnunet-daemon-hostlist_server.c:385
 #, fuzzy
 msgid "hostlist requests refused (not HTTP GET)"
 msgstr "# các yêu cầu danh sách máy được nhận"
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:403
+#: src/hostlist/gnunet-daemon-hostlist_server.c:397
 #, c-format
 msgid "Refusing `%s' request with %llu bytes of upload data\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:407
+#: src/hostlist/gnunet-daemon-hostlist_server.c:401
 #, fuzzy
 msgid "hostlist requests refused (upload data)"
 msgstr "# các yêu cầu danh sách máy được nhận"
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:414
+#: src/hostlist/gnunet-daemon-hostlist_server.c:408
 msgid "Could not handle hostlist request since I do not have a response yet\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:417
+#: src/hostlist/gnunet-daemon-hostlist_server.c:411
 #, fuzzy
 msgid "hostlist requests refused (not ready)"
 msgstr "# các yêu cầu danh sách máy được nhận"
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:422
+#: src/hostlist/gnunet-daemon-hostlist_server.c:416
 #, fuzzy
 msgid "Received request for our hostlist\n"
 msgstr "Nhận yêu cầu định tuyến\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:424
+#: src/hostlist/gnunet-daemon-hostlist_server.c:418
 #, fuzzy
 msgid "hostlist requests processed"
 msgstr "# các yêu cầu danh sách máy được nhận"
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:485
+#: src/hostlist/gnunet-daemon-hostlist_server.c:466
 #, fuzzy
 msgid "# hostlist advertisements send"
 msgstr "# Các quảng cáo ngoại được chuyển tiếp"
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:535
-msgid "Advertisement message could not be queued by core\n"
-msgstr ""
-
-#: src/hostlist/gnunet-daemon-hostlist_server.c:743
-#: src/peerinfo-tool/gnunet-peerinfo.c:741
-#: src/transport/gnunet-service-transport.c:856
+#: src/hostlist/gnunet-daemon-hostlist_server.c:679
+#: src/transport/gnunet-service-transport.c:2802
 #, fuzzy
 msgid "Could not access PEERINFO service.  Exiting.\n"
 msgstr "Không thể truy cập đến thông tin về không gian tên.\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:755
+#: src/hostlist/gnunet-daemon-hostlist_server.c:691
 #, c-format
 msgid "Invalid port number %llu.  Exiting.\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:767
+#: src/hostlist/gnunet-daemon-hostlist_server.c:703
 #, c-format
 msgid "Hostlist service starts on %s:%llu\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:782
+#: src/hostlist/gnunet-daemon-hostlist_server.c:718
 #, fuzzy, c-format
 msgid "Address to obtain hostlist: `%s'\n"
 msgstr "Đang thử tải danh sách các máy xuống « %s »\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:795
+#: src/hostlist/gnunet-daemon-hostlist_server.c:731
 #, fuzzy
 msgid "BINDTOIP does not a valid IPv4 address! Ignoring BINDTOIPV4.\n"
 msgstr "« %s » không sẵn sàng.\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:808
+#: src/hostlist/gnunet-daemon-hostlist_server.c:748
 #, fuzzy
 msgid "BINDTOIP does not a valid IPv4 address! Ignoring BINDTOIPV6.\n"
 msgstr "« %s » không sẵn sàng.\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:829
+#: src/hostlist/gnunet-daemon-hostlist_server.c:769
 #, fuzzy, c-format
 msgid "`%s' is not a valid IPv4 address! Ignoring BINDTOIPV4.\n"
 msgstr "« %s » không sẵn sàng.\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:849
+#: src/hostlist/gnunet-daemon-hostlist_server.c:789
 #, fuzzy, c-format
 msgid "`%s' is not a valid IPv6 address! Ignoring BINDTOIPV6.\n"
 msgstr "« %s » không sẵn sàng.\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:889
+#: src/hostlist/gnunet-daemon-hostlist_server.c:829
 #, fuzzy, c-format
 msgid "Could not start hostlist HTTP server on port %u\n"
 msgstr "Cổng cho trình phục vụ HTTP danh sách máy chủ thống nhất"
@@ -5107,77 +4927,96 @@
 msgid "Maintain egos"
 msgstr ""
 
-#: src/identity/gnunet-service-identity.c:337
+#: src/identity/gnunet-service-identity.c:390
 msgid "no default known"
 msgstr ""
 
-#: src/identity/gnunet-service-identity.c:361
+#: src/identity/gnunet-service-identity.c:412
 msgid "default configured, but ego unknown (internal error)"
 msgstr ""
 
-#: src/identity/gnunet-service-identity.c:438
-#: src/identity/gnunet-service-identity.c:669
-#: src/identity/gnunet-service-identity.c:777
+#: src/identity/gnunet-service-identity.c:501
+#: src/identity/gnunet-service-identity.c:773
+#: src/identity/gnunet-service-identity.c:895
 #, fuzzy, c-format
 msgid "Failed to write subsystem default identifier map to `%s'.\n"
 msgstr "Lỗi đọc danh sách bạn bè từ « %s »\n"
 
-#: src/identity/gnunet-service-identity.c:445
+#: src/identity/gnunet-service-identity.c:508
 msgid "Unknown ego specified for service (internal error)"
 msgstr ""
 
-#: src/identity/gnunet-service-identity.c:515
+#: src/identity/gnunet-service-identity.c:601
 msgid "identifier already in use for another ego"
 msgstr ""
 
-#: src/identity/gnunet-service-identity.c:646
+#: src/identity/gnunet-service-identity.c:750
 msgid "target name already exists"
 msgstr ""
 
-#: src/identity/gnunet-service-identity.c:685
-#: src/identity/gnunet-service-identity.c:794
+#: src/identity/gnunet-service-identity.c:789
+#: src/identity/gnunet-service-identity.c:912
 msgid "no matching ego found"
 msgstr ""
 
-#: src/identity/gnunet-service-identity.c:828
+#: src/identity/gnunet-service-identity.c:946
 #, fuzzy, c-format
 msgid "Failed to parse ego information in `%s'\n"
 msgstr "Lỗi đọc danh sách bạn bè từ « %s »\n"
 
-#: src/identity/gnunet-service-identity.c:901
+#: src/identity/gnunet-service-identity.c:1004
 #, fuzzy, c-format
 msgid "Failed to parse subsystem identity configuration file `%s'\n"
 msgstr "Không thể lưu tập tin cấu hình « %s »:"
 
-#: src/identity/gnunet-service-identity.c:913
+#: src/identity/gnunet-service-identity.c:1014
 #, fuzzy, c-format
 msgid "Failed to create directory `%s' for storing egos\n"
 msgstr "Lỗi đọc danh sách bạn bè từ « %s »\n"
 
-#: src/identity/plugin_rest_identity.c:938
+#: src/identity/plugin_rest_identity.c:967
 #, fuzzy
 msgid "Identity REST API initialized\n"
 msgstr "Lỗi sơ khởi lõi.\n"
 
-#: src/identity-provider/gnunet-identity-token.c:101
+#: src/identity-provider/gnunet-identity-token.c:66
+#, fuzzy
+msgid "Option `-t' is required\n"
+msgstr "Bị từ chối đặt tùy chọn « %s » trong phần « %s » thành « %s ».\n"
+
+#: src/identity-provider/gnunet-identity-token.c:77
+#, fuzzy, c-format
+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
 msgid "GNUid token"
 msgstr ""
 
-#: src/identity-provider/gnunet-identity-token.c:104
+#: src/identity-provider/gnunet-identity-token.c:166
 msgid "Print token contents"
 msgstr ""
 
-#: src/identity-provider/plugin_rest_identity_provider.c:1126
+#: src/identity-provider/plugin_rest_identity_provider.c:1163
 #, fuzzy
 msgid "Identity Token REST API initialized\n"
 msgstr "Lỗi sơ khởi lõi.\n"
 
-#: src/mysql/mysql.c:174
+#: src/multicast/gnunet-multicast.c:48 src/multicast/gnunet-multicast.c:72
+msgid "This command doesn't do anything yet."
+msgstr ""
+
+#: src/my/my.c:198 src/my/my.c:217
+#, fuzzy, c-format
+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/mysql/mysql.c:180
 #, c-format
 msgid "Trying to use file `%s' for MySQL configuration.\n"
 msgstr "Đang thử dùng tập tin « %s » cho cấu hình MySQL.\n"
 
-#: src/mysql/mysql.c:181
+#: src/mysql/mysql.c:187
 #, fuzzy, c-format
 msgid "Could not access file `%s': %s\n"
 msgstr "Không thể truy cập đến « %s »: %s\n"
@@ -5187,7 +5026,7 @@
 msgid "No records found for `%s'"
 msgstr "Vẫn còn không tìm thấy đồng đẳng trong « %s ».\n"
 
-#: src/namecache/gnunet-namecache.c:122 src/namestore/gnunet-namestore.c:395
+#: src/namecache/gnunet-namecache.c:122 src/namestore/gnunet-namestore.c:415
 #, c-format
 msgid "\tCorrupt or unsupported record of type %u\n"
 msgstr ""
@@ -5207,7 +5046,7 @@
 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:1081
+#: src/namecache/gnunet-namecache.c:230 src/namestore/gnunet-namestore.c:1153
 msgid "name of the record to add/delete/display"
 msgstr ""
 
@@ -5216,19 +5055,26 @@
 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:1113
+#: src/namecache/gnunet-namecache.c:244 src/namestore/gnunet-namestore.c:1189
 #, fuzzy
 msgid "GNUnet zone manipulation tool"
 msgstr "Cấu hình GNUnet"
 
-#: src/namecache/namecache_api.c:276
+#: src/namecache/namecache_api.c:296
 msgid "Namecache failed to cache block"
 msgstr ""
 
+#: src/namecache/namecache_api.c:383
+#, fuzzy
+msgid "Error communicating with namecache service"
+msgstr "Cổng để liên lạc với giao diện người dùng GNUnet"
+
 #: src/namecache/plugin_namecache_flat.c:119
-#: src/namecache/plugin_namecache_flat.c:244
+#: src/namecache/plugin_namecache_flat.c:253
 #: src/namestore/plugin_namestore_flat.c:179
-#: src/namestore/plugin_namestore_flat.c:351
+#: src/namestore/plugin_namestore_flat.c:375
+#: src/peerstore/plugin_peerstore_flat.c:379
+#: src/peerstore/plugin_peerstore_flat.c:527
 #, fuzzy, c-format
 msgid "Unable to initialize file: %s.\n"
 msgstr "Không thể sơ khởi SQLite: %s.\n"
@@ -5235,17 +5081,19 @@
 
 #: src/namecache/plugin_namecache_flat.c:130
 #: src/namestore/plugin_namestore_flat.c:190
+#: src/peerstore/plugin_peerstore_flat.c:394
 #, fuzzy, c-format
 msgid "Unable to get filesize: %s.\n"
 msgstr "Không thể tạo miền tên.\n"
 
-#: src/namecache/plugin_namecache_flat.c:145
-#: src/namestore/plugin_namestore_flat.c:202
+#: src/namecache/plugin_namecache_flat.c:149
+#: src/namestore/plugin_namestore_flat.c:203
+#: src/peerstore/plugin_peerstore_flat.c:406
 #, fuzzy, c-format
 msgid "Unable to read file: %s.\n"
 msgstr "Không thể tạo miền tên.\n"
 
-#: src/namecache/plugin_namecache_flat.c:399
+#: src/namecache/plugin_namecache_flat.c:408
 #, fuzzy
 msgid "flat plugin running\n"
 msgstr "kho dữ liệu sqlite"
@@ -5262,263 +5110,248 @@
 msgstr "Gặp lỗi khi tải lên tập tin: %s\n"
 
 #: src/namestore/gnunet-namestore.c:330
-#: src/namestore/plugin_rest_namestore.c:547
+#: src/namestore/plugin_rest_namestore.c:562
 #, fuzzy, c-format
 msgid "Deleting record failed, record does not exist%s%s\n"
 msgstr "Gặp lỗi khi tải lên tập tin: %s\n"
 
 #: src/namestore/gnunet-namestore.c:337
-#: src/namestore/plugin_rest_namestore.c:556
+#: src/namestore/plugin_rest_namestore.c:571
 #, fuzzy, c-format
 msgid "Deleting record failed%s%s\n"
 msgstr "Gặp lỗi khi tải lên tập tin: %s\n"
 
-#: src/namestore/gnunet-namestore.c:475 src/namestore/gnunet-namestore.c:483
-#: src/namestore/gnunet-namestore.c:491
+#: src/namestore/gnunet-namestore.c:519 src/namestore/gnunet-namestore.c:527
+#: src/namestore/gnunet-namestore.c:535
 #, c-format
 msgid "A %s record exists already under `%s', no other records can be added.\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:505 src/namestore/gnunet-namestore.c:517
-#: src/namestore/gnunet-namestore.c:529
+#: src/namestore/gnunet-namestore.c:549 src/namestore/gnunet-namestore.c:561
+#: src/namestore/gnunet-namestore.c:573
 #, c-format
 msgid "Records already exist under `%s', cannot add `%s' record.\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:626
-#: src/namestore/plugin_rest_namestore.c:580
+#: src/namestore/gnunet-namestore.c:698
+#: src/namestore/plugin_rest_namestore.c:597
 #, c-format
 msgid "There are no records under label `%s' that could be deleted.\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:665
+#: src/namestore/gnunet-namestore.c:739
 #, c-format
 msgid ""
 "There are no records under label `%s' that match the request for deletion.\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:698
-#: src/namestore/plugin_rest_namestore.c:954
-#: src/transport/gnunet-transport.c:1769
-#: src/transport/gnunet-transport-profiler.c:497
-#, fuzzy, c-format
-msgid "Service `%s' is not running\n"
-msgstr "« %s » không phải là một tập tin.\n"
+#: src/namestore/gnunet-namestore.c:776
+#: src/namestore/plugin_rest_namestore.c:1003
+#, c-format
+msgid "Ego `%s' not known to identity service\n"
+msgstr ""
 
-#: src/namestore/gnunet-namestore.c:706
+#: src/namestore/gnunet-namestore.c:791
 #, fuzzy, c-format
 msgid "No options given\n"
 msgstr "chưa đưa ra tên"
 
-#: src/namestore/gnunet-namestore.c:717
-#: src/namestore/gnunet-namestore-fcfsd.c:978
-#: src/namestore/plugin_rest_namestore.c:963
+#: src/namestore/gnunet-namestore.c:802
+#: src/namestore/gnunet-namestore-fcfsd.c:1034
+#: src/namestore/plugin_rest_namestore.c:1016
 #, fuzzy
 msgid "Failed to connect to namestore\n"
 msgstr "Không kết nối được đến trình nền gnunetd."
 
-#: src/namestore/gnunet-namestore.c:725 src/namestore/gnunet-namestore.c:734
-#: src/namestore/gnunet-namestore.c:751 src/namestore/gnunet-namestore.c:773
-#: src/namestore/gnunet-namestore.c:813
+#: src/namestore/gnunet-namestore.c:810 src/namestore/gnunet-namestore.c:819
+#: src/namestore/gnunet-namestore.c:838 src/namestore/gnunet-namestore.c:861
+#: src/namestore/gnunet-namestore.c:915
 #, fuzzy, c-format
 msgid "Missing option `%s' for operation `%s'\n"
 msgstr "Giá trị cấu hình « %s » cho « %s » trong phần « %s » nên là con số\n"
 
-#: src/namestore/gnunet-namestore.c:726 src/namestore/gnunet-namestore.c:735
-#: src/namestore/gnunet-namestore.c:752 src/namestore/gnunet-namestore.c:774
+#: src/namestore/gnunet-namestore.c:811 src/namestore/gnunet-namestore.c:820
+#: src/namestore/gnunet-namestore.c:839 src/namestore/gnunet-namestore.c:863
 msgid "add"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:743
-#: src/namestore/plugin_rest_namestore.c:650
+#: src/namestore/gnunet-namestore.c:829
+#: src/namestore/plugin_rest_namestore.c:671
 #, fuzzy, c-format
 msgid "Unsupported type `%s'\n"
 msgstr "Lệnh không được hỗ trợ « %s ». Đang hủy bỏ.\n"
 
-#: src/namestore/gnunet-namestore.c:763
-#: src/namestore/plugin_rest_namestore.c:668
-#: src/namestore/plugin_rest_namestore.c:708
+#: src/namestore/gnunet-namestore.c:851
+#: src/namestore/plugin_rest_namestore.c:689
+#: src/namestore/plugin_rest_namestore.c:729
 #, c-format
 msgid "Value `%s' invalid for record type `%s'\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:799
+#: src/namestore/gnunet-namestore.c:896
 #, fuzzy, c-format
 msgid "Invalid time format `%s'\n"
 msgstr "Địa chỉ IP định dạng sai: %s\n"
 
-#: src/namestore/gnunet-namestore.c:814
+#: src/namestore/gnunet-namestore.c:916
 msgid "del"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:842
+#: src/namestore/gnunet-namestore.c:950
 #, fuzzy, c-format
 msgid "Invalid public key for reverse lookup `%s'\n"
 msgstr "Đối số không hợp lệ cho « %s ».\n"
 
-#: src/namestore/gnunet-namestore.c:866
-#: src/peerinfo-tool/gnunet-peerinfo.c:819
+#: src/namestore/gnunet-namestore.c:979 src/peerinfo-tool/gnunet-peerinfo.c:775
 #, fuzzy, c-format
 msgid "Invalid URI `%s'\n"
 msgstr "Dữ liệu nhập không hợp lệ.\n"
 
-#: src/namestore/gnunet-namestore.c:901
+#: src/namestore/gnunet-namestore.c:1014
 #, fuzzy, c-format
 msgid "Invalid nick `%s'\n"
 msgstr "Dữ liệu nhập không hợp lệ.\n"
 
-#: src/namestore/gnunet-namestore.c:941
-#: src/namestore/plugin_rest_namestore.c:999
+#: src/namestore/gnunet-namestore.c:1051
+#: src/namestore/plugin_rest_namestore.c:1046
 #, c-format
-msgid "Ego `%s' not known to identity service\n"
-msgstr ""
-
-#: src/namestore/gnunet-namestore.c:968
-#: src/namestore/plugin_rest_namestore.c:1026
-#, c-format
 msgid "No default ego configured in identity service\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1004
-#: src/namestore/plugin_rest_namestore.c:1066
+#: src/namestore/gnunet-namestore.c:1108
+#: src/namestore/plugin_rest_namestore.c:1142
 #, fuzzy, c-format
-msgid "Identity service is not running\n"
-msgstr "« %s » không phải là một tập tin.\n"
-
-#: src/namestore/gnunet-namestore.c:1015
-#: src/namestore/plugin_rest_namestore.c:1107
-#, fuzzy, c-format
 msgid "Cannot connect to identity service\n"
 msgstr "Không thể kết nối tới %s:%u: %s\n"
 
-#: src/namestore/gnunet-namestore.c:1063
+#: src/namestore/gnunet-namestore.c:1135
 msgid "add record"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1066
+#: src/namestore/gnunet-namestore.c:1138
 msgid "delete record"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1069
+#: src/namestore/gnunet-namestore.c:1141
 msgid "display records"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1072
+#: src/namestore/gnunet-namestore.c:1144
 msgid ""
 "expiration time for record to use (for adding only), \"never\" is possible"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1075
+#: src/namestore/gnunet-namestore.c:1147
 #, 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:1078
+#: src/namestore/gnunet-namestore.c:1150
 #, 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:1084
+#: src/namestore/gnunet-namestore.c:1156
 #, 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:1087
+#: src/namestore/gnunet-namestore.c:1159
 msgid "type of the record to add/delete/display"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1090
+#: src/namestore/gnunet-namestore.c:1162
 msgid "URI to import into our zone"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1093
+#: src/namestore/gnunet-namestore.c:1165
 msgid "value of the record to add/delete"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1096
+#: src/namestore/gnunet-namestore.c:1168
 msgid "create or list public record"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1099
+#: src/namestore/gnunet-namestore.c:1171
 msgid ""
 "create shadow record (only valid if all other records of the same type have "
 "expired"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1102
+#: src/namestore/gnunet-namestore.c:1174
 msgid "name of the ego controlling the zone"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:476
+#: src/namestore/gnunet-namestore-fcfsd.c:508
 #, fuzzy, c-format
 msgid "Unsupported form value `%s'\n"
 msgstr "Lệnh không được hỗ trợ « %s ». Đang hủy bỏ.\n"
 
-#: src/namestore/gnunet-namestore-fcfsd.c:503
+#: src/namestore/gnunet-namestore-fcfsd.c:535
 #, fuzzy, c-format
 msgid "Failed to create record for domain `%s': %s\n"
 msgstr "Không thể truy cập đến tập tin gnunet-directory « %s »\n"
 
-#: src/namestore/gnunet-namestore-fcfsd.c:537
+#: src/namestore/gnunet-namestore-fcfsd.c:555
+msgid "Error when mapping zone to name\n"
+msgstr ""
+
+#: src/namestore/gnunet-namestore-fcfsd.c:585
 #, c-format
 msgid "Found existing name `%s' for the given key\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:546
-msgid "Error when mapping zone to name\n"
-msgstr ""
-
-#: src/namestore/gnunet-namestore-fcfsd.c:608
+#: src/namestore/gnunet-namestore-fcfsd.c:662
 #, c-format
 msgid "Found %u existing records for domain `%s'\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:664
+#: src/namestore/gnunet-namestore-fcfsd.c:718
 #, fuzzy, c-format
 msgid "Failed to create page for `%s'\n"
 msgstr "Không thể tạo miền tên.\n"
 
-#: src/namestore/gnunet-namestore-fcfsd.c:680
+#: src/namestore/gnunet-namestore-fcfsd.c:734
 #, fuzzy, c-format
 msgid "Failed to setup post processor for `%s'\n"
 msgstr "Lỗi cập nhật dữ liệu cho mô-đun « %s »\n"
 
-#: src/namestore/gnunet-namestore-fcfsd.c:716
+#: src/namestore/gnunet-namestore-fcfsd.c:770
 msgid "Domain name must not contain `.'\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:724
+#: src/namestore/gnunet-namestore-fcfsd.c:778
 msgid "Domain name must not contain `+'\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:918
+#: src/namestore/gnunet-namestore-fcfsd.c:974
 msgid "No ego configured for `fcfsd` subsystem\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:944
+#: src/namestore/gnunet-namestore-fcfsd.c:1000
 #, fuzzy
 msgid "Failed to start HTTP server\n"
 msgstr "Lỗi bắt đầu thu thập.\n"
 
-#: src/namestore/gnunet-namestore-fcfsd.c:986
+#: src/namestore/gnunet-namestore-fcfsd.c:1042
 #, fuzzy
 msgid "Failed to connect to identity\n"
 msgstr "Lỗi kết nối đến gnunetd.\n"
 
-#: src/namestore/gnunet-namestore-fcfsd.c:1018
+#: src/namestore/gnunet-namestore-fcfsd.c:1074
 msgid "GNU Name System First Come First Serve name registration service"
 msgstr ""
 
-#: src/namestore/gnunet-service-namestore.c:655
+#: src/namestore/gnunet-service-namestore.c:612
 #, fuzzy, c-format
 msgid "Failed to replicate block in namecache: %s\n"
 msgstr "Lỗi cập nhật dữ liệu cho mô-đun « %s »\n"
 
-#: src/namestore/namestore_api.c:275
+#: src/namestore/namestore_api.c:379
 msgid "Namestore failed to store record\n"
 msgstr ""
 
-#: src/namestore/plugin_namestore_flat.c:632
+#: src/namestore/plugin_namestore_flat.c:656
 #, fuzzy
 msgid "flat file database running\n"
 msgstr "kho dữ liệu sqlite"
@@ -5532,68 +5365,68 @@
 msgid "GNUnet NAT traversal autoconfigure daemon"
 msgstr ""
 
-#: src/nat/gnunet-nat-server.c:279
+#: src/nat/gnunet-nat-server.c:321
 #, c-format
 msgid "Please pass valid port number as the first argument! (got `%s')\n"
 msgstr ""
 
-#: src/nat/gnunet-nat-server.c:321
+#: src/nat/gnunet-nat-server.c:363
 msgid "GNUnet NAT traversal test helper daemon"
 msgstr ""
 
-#: src/nat/nat_auto.c:388
+#: src/nat/nat_auto.c:385
 msgid "NAT traversal with ICMP Server succeeded.\n"
 msgstr ""
 
-#: src/nat/nat_auto.c:389
+#: src/nat/nat_auto.c:386
 msgid "NAT traversal with ICMP Server failed.\n"
 msgstr ""
 
-#: src/nat/nat_auto.c:408
+#: src/nat/nat_auto.c:405
 #, fuzzy
 msgid "Testing connection reversal with ICMP server.\n"
 msgstr "Cổng để liên lạc với giao diện người dùng GNUnet"
 
-#: src/nat/nat_auto.c:440
+#: src/nat/nat_auto.c:437
 #, c-format
 msgid "Detected external IP `%s'\n"
 msgstr ""
 
-#: src/nat/nat_auto.c:574
+#: src/nat/nat_auto.c:572
 msgid "This system has a global IPv6 address, setting IPv6 to supported.\n"
 msgstr ""
 
-#: src/nat/nat_auto.c:592
+#: src/nat/nat_auto.c:590
 #, fuzzy, c-format
 msgid "Detected internal network address `%s'.\n"
 msgstr "GNUnet bây giờ sử dụng địa chỉ IP %s.\n"
 
-#: src/nat/nat_auto.c:662 src/nat/nat_test.c:360
+#: src/nat/nat_auto.c:681 src/nat/nat_test.c:403
 #, fuzzy
 msgid "Failed to connect to `gnunet-nat-server'\n"
 msgstr "Lỗi kết nối đến gnunetd.\n"
 
-#: src/nat/nat_auto.c:709
+#: src/nat/nat_auto.c:724
 msgid "upnpc found, enabling its use\n"
 msgstr ""
 
-#: src/nat/nat_auto.c:710
+#: src/nat/nat_auto.c:725
 msgid "upnpc not found\n"
 msgstr ""
 
-#: src/nat/nat_auto.c:742
+#: src/nat/nat_auto.c:762
 msgid "test_icmp_server not possible, as we have no public IPv4 address\n"
 msgstr ""
 
-#: src/nat/nat_auto.c:750 src/nat/nat_auto.c:796
+#: src/nat/nat_auto.c:774 src/nat/nat_auto.c:834
 msgid "test_icmp_server not possible, as we are not behind NAT\n"
 msgstr ""
 
-#: src/nat/nat_auto.c:758 src/nat/nat_auto.c:805
+#: src/nat/nat_auto.c:786 src/nat/nat_auto.c:846
 msgid "No working gnunet-helper-nat-server found\n"
 msgstr ""
 
-#: src/nat/nat_auto.c:788
+#: src/nat/nat_auto.c:823
 msgid "test_icmp_client not possible, as we have no internal IPv4 address\n"
 msgstr ""
 
@@ -5607,26 +5440,26 @@
 msgid "Failed to start %s\n"
 msgstr "Lỗi bắt đầu thu thập.\n"
 
-#: src/nat/nat.c:1321
+#: src/nat/nat.c:1327
 msgid "Error while running upnp client:\n"
 msgstr ""
 
-#: src/nat/nat.c:1396
+#: src/nat/nat.c:1402
 #, fuzzy, c-format
 msgid "Failed to run upnp client for port %u\n"
 msgstr "Lỗi sơ khởi dịch vụ « %s ».\n"
 
-#: src/nat/nat.c:1540
+#: src/nat/nat.c:1546
 msgid "malformed"
 msgstr ""
 
-#: src/nat/nat.c:1594
+#: src/nat/nat.c:1600
 msgid ""
 "UPnP enabled in configuration, but UPnP client `upnpc` command not found, "
 "disabling UPnP \n"
 msgstr ""
 
-#: src/nat/nat.c:1723 src/nat/nat.c:1736
+#: src/nat/nat.c:1726 src/nat/nat.c:1739
 #, c-format
 msgid ""
 "Configuration requires `%s', but binary is not installed properly (SUID bit "
@@ -5633,91 +5466,91 @@
 "not set).  Option disabled.\n"
 msgstr ""
 
-#: src/nat/nat.c:1891
+#: src/nat/nat.c:1903
 msgid "Internal IP address not known, cannot use ICMP NAT traversal method\n"
 msgstr ""
 
-#: src/nat/nat.c:1907
+#: src/nat/nat.c:1919
 #, c-format
 msgid "Running gnunet-helper-nat-client %s %s %u\n"
 msgstr ""
 
-#: src/nat/nat.c:1998
+#: src/nat/nat.c:2010
 msgid "Operation Successful"
 msgstr ""
 
-#: src/nat/nat.c:2000
+#: src/nat/nat.c:2012
 msgid "Internal Failure (IPC, ...)"
 msgstr ""
 
-#: src/nat/nat.c:2002
+#: src/nat/nat.c:2014
 msgid "Failure in network subsystem, check permissions."
 msgstr ""
 
-#: src/nat/nat.c:2004
+#: src/nat/nat.c:2016
 msgid "Encountered timeout while performing operation"
 msgstr ""
 
-#: src/nat/nat.c:2006
+#: src/nat/nat.c:2018
 msgid "detected that we are offline"
 msgstr ""
 
-#: src/nat/nat.c:2008
+#: src/nat/nat.c:2020
 msgid "`upnpc` command not found"
 msgstr ""
 
-#: src/nat/nat.c:2010
+#: src/nat/nat.c:2022
 #, fuzzy
 msgid "Failed to run `upnpc` command"
 msgstr "Lỗi bắt đầu thu thập.\n"
 
-#: src/nat/nat.c:2012
+#: src/nat/nat.c:2024
 msgid "`upnpc' command took too long, process killed"
 msgstr ""
 
-#: src/nat/nat.c:2014
+#: src/nat/nat.c:2026
 msgid "`upnpc' command failed to establish port mapping"
 msgstr ""
 
-#: src/nat/nat.c:2016
+#: src/nat/nat.c:2028
 msgid "`external-ip' command not found"
 msgstr ""
 
-#: src/nat/nat.c:2018
+#: src/nat/nat.c:2030
 #, fuzzy
 msgid "Failed to run `external-ip` command"
 msgstr "Lỗi bắt đầu thu thập.\n"
 
-#: src/nat/nat.c:2020
+#: src/nat/nat.c:2032
 msgid "`external-ip' command output invalid"
 msgstr ""
 
-#: src/nat/nat.c:2022
+#: src/nat/nat.c:2034
 msgid "no valid address was returned by `external-ip'"
 msgstr ""
 
-#: src/nat/nat.c:2024
+#: src/nat/nat.c:2036
 #, fuzzy
 msgid "Could not determine interface with internal/local network address"
 msgstr "Không thể truy cập đến thông tin về không gian tên.\n"
 
-#: src/nat/nat.c:2026
+#: src/nat/nat.c:2038
 msgid "No functioning gnunet-helper-nat-server installation found"
 msgstr ""
 
-#: src/nat/nat.c:2028
+#: src/nat/nat.c:2040
 msgid "NAT test could not be initialized"
 msgstr ""
 
-#: src/nat/nat.c:2030
+#: src/nat/nat.c:2042
 msgid "NAT test timeout reached"
 msgstr ""
 
-#: src/nat/nat.c:2032
+#: src/nat/nat.c:2044
 msgid "could not register NAT"
 msgstr ""
 
-#: src/nat/nat.c:2034
+#: src/nat/nat.c:2046
 msgid "No working gnunet-helper-nat-client installation found"
 msgstr ""
 
@@ -5729,27 +5562,18 @@
 msgid "`upnpc' command not found\n"
 msgstr ""
 
-#: src/nat/nat_test.c:460
+#: src/nat/nat_test.c:518
 #, c-format
 msgid "Failed to create listen socket bound to `%s' for NAT test: %s\n"
 msgstr ""
 
-#: src/nat/nat_test.c:497
+#: src/nat/nat_test.c:568
 #, fuzzy
 msgid "NAT test failed to start NAT library\n"
 msgstr "Lỗi bắt đầu thu thập.\n"
 
-#: src/nse/gnunet-nse.c:116
+#: src/nse/gnunet-nse.c:122
 #, fuzzy
-msgid "NSE service is not running\n"
-msgstr "« %s » không phải là một tập tin.\n"
-
-#: src/nse/gnunet-nse.c:121
-msgid "Error while checking if NSE service is running or not\n"
-msgstr ""
-
-#: src/nse/gnunet-nse.c:167
-#, fuzzy
 msgid "Show network size estimates from NSE service."
 msgstr "# các yêu cầu get (lấy) dht được nhận"
 
@@ -5779,33 +5603,33 @@
 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:1535
-#: src/revocation/gnunet-service-revocation.c:844 src/util/gnunet-scrypt.c:276
+#: src/nse/gnunet-service-nse.c:1536
+#: src/revocation/gnunet-service-revocation.c:832 src/util/gnunet-scrypt.c:276
 #, fuzzy
 msgid "Value is too large.\n"
 msgstr "Giá trị không nằm trong phạm vi được phép."
 
-#: src/peerinfo/gnunet-service-peerinfo.c:225
+#: src/peerinfo/gnunet-service-peerinfo.c:178
 #, fuzzy, c-format
 msgid "Removing expired address of transport `%s'\n"
 msgstr "Đã nạp truyền tải « %s »\n"
 
-#: src/peerinfo/gnunet-service-peerinfo.c:362
+#: src/peerinfo/gnunet-service-peerinfo.c:310
 #, fuzzy, c-format
 msgid "Failed to parse HELLO in file `%s': %s\n"
 msgstr "Lỗi đọc danh sách bạn bè từ « %s »\n"
 
-#: src/peerinfo/gnunet-service-peerinfo.c:382
-#: src/peerinfo/gnunet-service-peerinfo.c:411
+#: src/peerinfo/gnunet-service-peerinfo.c:331
+#: src/peerinfo/gnunet-service-peerinfo.c:362
 #, fuzzy, c-format
 msgid "Failed to parse HELLO in file `%s'\n"
 msgstr "Lỗi đọc danh sách bạn bè từ « %s »\n"
 
-#: src/peerinfo/gnunet-service-peerinfo.c:491
+#: src/peerinfo/gnunet-service-peerinfo.c:446
 msgid "# peers known"
 msgstr ""
 
-#: src/peerinfo/gnunet-service-peerinfo.c:529
+#: src/peerinfo/gnunet-service-peerinfo.c:489
 #, c-format
 msgid ""
 "File `%s' in directory `%s' does not match naming convention. Removed.\n"
@@ -5813,149 +5637,106 @@
 "Tập tin « %s » trong thư mục « %s » không tùy theo quy ước đặt tên. Bị gỡ "
 "bỏ.\n"
 
-#: src/peerinfo/gnunet-service-peerinfo.c:683
+#: src/peerinfo/gnunet-service-peerinfo.c:655
 #, fuzzy, c-format
 msgid "Scanning directory `%s'\n"
 msgstr "Lỗi đọc danh sách bạn bè từ « %s »\n"
 
-#: src/peerinfo/gnunet-service-peerinfo.c:689
+#: src/peerinfo/gnunet-service-peerinfo.c:663
 #, c-format
 msgid "Still no peers found in `%s'!\n"
 msgstr "Vẫn còn không tìm thấy đồng đẳng trong « %s ».\n"
 
-#: src/peerinfo/gnunet-service-peerinfo.c:1061
+#: src/peerinfo/gnunet-service-peerinfo.c:1076
 #, fuzzy, c-format
 msgid "Cleaning up directory `%s'\n"
 msgstr "Lỗi đọc danh sách bạn bè từ « %s »\n"
 
-#: src/peerinfo/gnunet-service-peerinfo.c:1391
+#: src/peerinfo/gnunet-service-peerinfo.c:1405
 #, c-format
 msgid "Importing HELLOs from `%s'\n"
 msgstr ""
 
-#: src/peerinfo/gnunet-service-peerinfo.c:1404
+#: src/peerinfo/gnunet-service-peerinfo.c:1418
 msgid "Skipping import of included HELLOs\n"
 msgstr ""
 
-#: src/peerinfo/peerinfo_api.c:237
-msgid "aborted due to explicit disconnect request"
-msgstr ""
-
-#: src/peerinfo/peerinfo_api.c:361
+#: src/peerinfo/peerinfo_api.c:220
 #, fuzzy
-msgid "failed to transmit request (service down?)"
-msgstr "Lỗi đọc danh sách bạn bè từ « %s »\n"
-
-#: src/peerinfo/peerinfo_api.c:516
-#, fuzzy
 msgid "Failed to receive response from `PEERINFO' service."
 msgstr ""
 "\n"
 "Không nhận được đáp ứng từ gnunetd.\n"
 
-#: src/peerinfo/peerinfo_api.c:560 src/peerinfo/peerinfo_api.c:583
-#: src/peerinfo/peerinfo_api.c:600 src/peerinfo/peerinfo_api.c:613
-#: src/peerinfo/peerinfo_api.c:628
-#, fuzzy
-msgid "Received invalid message from `PEERINFO' service."
-msgstr ""
-"\n"
-"Không nhận được đáp ứng từ gnunetd.\n"
-
-#: src/peerinfo/peerinfo_api.c:715
-#, fuzzy
-msgid "Timeout transmitting iteration request to `PEERINFO' service."
-msgstr "Lỗi sơ khởi dịch vụ « %s ».\n"
-
-#: src/peerinfo/peerinfo_api_notify.c:268
+#: src/peerinfo-tool/gnunet-peerinfo.c:239
 #, 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/peerinfo-tool/gnunet-peerinfo.c:243
-#, fuzzy, c-format
 msgid "%sPeer `%s'\n"
 msgstr "Tôi là đồng đẳng « %s ».\n"
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:250
+#: src/peerinfo-tool/gnunet-peerinfo.c:246
 #, c-format
 msgid "\tExpires: %s \t %s\n"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:303
+#: src/peerinfo-tool/gnunet-peerinfo.c:299
 #, fuzzy, c-format
 msgid "Failure: Cannot convert address to string for peer `%s'\n"
 msgstr "Lỗi đóng kết đến cổng %s %d.\n"
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:470
+#: src/peerinfo-tool/gnunet-peerinfo.c:466
 #, c-format
 msgid "Failure: Received invalid %s\n"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:484
+#: src/peerinfo-tool/gnunet-peerinfo.c:480
 #, fuzzy, c-format
 msgid "Failed to write HELLO with %u bytes to file `%s'\n"
 msgstr "Lỗi đọc danh sách bạn bè từ « %s »\n"
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:503
+#: src/peerinfo-tool/gnunet-peerinfo.c:499
 #, c-format
 msgid "Wrote %s HELLO containing %u addresses with %u bytes to file `%s'\n"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:573
+#: src/peerinfo-tool/gnunet-peerinfo.c:799
 #, c-format
-msgid "Failure adding HELLO: %s\n"
-msgstr ""
-
-#: src/peerinfo-tool/gnunet-peerinfo.c:700
-#, fuzzy, c-format
-msgid "Failed to get my own HELLO from this peer!\n"
-msgstr "Lỗi lấy thông kê về truyền tải.\n"
-
-#: src/peerinfo-tool/gnunet-peerinfo.c:732
-#, fuzzy, c-format
-msgid "Service `%s' is not running, please start GNUnet\n"
-msgstr "« %s » không phải là một tập tin.\n"
-
-#: src/peerinfo-tool/gnunet-peerinfo.c:843
-#, c-format
 msgid "I am peer `%s'.\n"
 msgstr "Tôi là đồng đẳng « %s ».\n"
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:884
+#: src/peerinfo-tool/gnunet-peerinfo.c:842
 msgid "don't resolve host names"
 msgstr "không quyết định các tên máy"
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:887
+#: src/peerinfo-tool/gnunet-peerinfo.c:845
 msgid "output only the identity strings"
 msgstr "chỉ xuất những chuỗi nhận diện"
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:890
+#: src/peerinfo-tool/gnunet-peerinfo.c:848
 msgid "include friend-only information"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:893
+#: src/peerinfo-tool/gnunet-peerinfo.c:851
 msgid "output our own identity only"
 msgstr "chỉ xuất nhận diện mình"
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:896
+#: src/peerinfo-tool/gnunet-peerinfo.c:854
 #, 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:899
+#: src/peerinfo-tool/gnunet-peerinfo.c:857
 msgid "dump hello to file"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:902
+#: src/peerinfo-tool/gnunet-peerinfo.c:860
 msgid "also output HELLO uri(s)"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:905
+#: src/peerinfo-tool/gnunet-peerinfo.c:863
 msgid "add given HELLO uri to the database"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:919
+#: src/peerinfo-tool/gnunet-peerinfo.c:880
 #, fuzzy
 msgid "Print information about peers."
 msgstr "In ra thông tin về các đồng đẳng GNUnet."
@@ -5982,70 +5763,31 @@
 msgid "peerstore"
 msgstr ""
 
-#: src/peerstore/gnunet-service-peerstore.c:395
-#, fuzzy
-msgid "Malformed iterate request.\n"
-msgstr "Không thể lưu tập tin cấu hình « %s »:"
-
-#: src/peerstore/gnunet-service-peerstore.c:402
-msgid "Sub system not supplied in client iterate request.\n"
-msgstr ""
-
-#: src/peerstore/gnunet-service-peerstore.c:462
-#, fuzzy
-msgid "Malformed store request from client\n"
-msgstr "Nhận yêu cầu định tuyến\n"
-
-#: src/peerstore/gnunet-service-peerstore.c:470
-msgid "Full key not supplied in client store request\n"
-msgstr ""
-
-#: src/peerstore/gnunet-service-peerstore.c:489
-#, fuzzy
-msgid "Failed to store requested value, database error."
-msgstr ""
-"\n"
-"Không nhận được đáp ứng từ gnunetd.\n"
-
-#: src/peerstore/gnunet-service-peerstore.c:568
-msgid "No database backend configured\n"
-msgstr ""
-
-#: src/peerstore/gnunet-service-peerstore.c:579
+#: src/peerstore/gnunet-service-peerstore.c:588
 #, 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:329
+#: src/peerstore/peerstore_api.c:296
 #, c-format
 msgid "Received an error notification from MQ of type: %d\n"
 msgstr ""
 
-#: src/peerstore/peerstore_api.c:376
+#: src/peerstore/peerstore_api.c:344
 msgid "timeout"
 msgstr ""
 
-#: src/peerstore/peerstore_api.c:679
+#: src/peerstore/peerstore_api.c:560 src/peerstore/peerstore_api.c:609
 #, 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:690
+#: src/peerstore/peerstore_api.c:623
 #, fuzzy
-msgid "Error communicating with `PEERSTORE' service."
-msgstr "Cổng để liên lạc với giao diện người dùng GNUnet"
-
-#: src/peerstore/peerstore_api.c:709
-#, fuzzy
 msgid "Received a malformed response from service."
 msgstr "Nhận yêu cầu định tuyến\n"
 
-#: src/peerstore/peerstore_api.c:821
-msgid ""
-"Problem receiving a watch response, no way to determine which request.\n"
-msgstr ""
-
-#: src/peerstore/peerstore_api.c:833
+#: src/peerstore/peerstore_api.c:768
 msgid "Received a watch result for a non existing watch.\n"
 msgstr ""
 
@@ -6058,6 +5800,7 @@
 msgstr "Gặp lỗi khi tạo người dùng"
 
 #: src/peerstore/plugin_peerstore_sqlite.c:422
+#: src/psycstore/plugin_psycstore_mysql.c:250
 #: src/psycstore/plugin_psycstore_sqlite.c:259
 #, fuzzy, c-format
 msgid ""
@@ -6070,97 +5813,112 @@
 msgid "Unable to create indices: %s.\n"
 msgstr "Không thể tạo miền tên.\n"
 
-#: src/postgres/postgres.c:63
+#: src/postgres/postgres.c:67
 #, fuzzy, c-format
-msgid "`%s:%s' failed at %s:%d with error: %s"
+msgid "`%s:%s' failed at %s:%d with error: %s\n"
 msgstr "« %s » bị lỗi tại %s:%d với lỗi: %s"
 
-#: src/postgres/postgres.c:166
+#: src/postgres/postgres.c:195
 #, fuzzy, c-format
-msgid "Unable to initialize Postgres: %s"
+msgid "Unable to initialize Postgres: %s\n"
 msgstr "Không thể sơ khởi SQLite: %s.\n"
 
-#: src/psycstore/gnunet-service-psycstore.c:260
+#: src/psycstore/gnunet-service-psycstore.c:249
 #, fuzzy
 msgid "Failed to store membership information!\n"
 msgstr "Lỗi mở tập tin ghi sự kiện « %s »: %s\n"
 
-#: src/psycstore/gnunet-service-psycstore.c:284
+#: src/psycstore/gnunet-service-psycstore.c:271
 #, fuzzy
 msgid "Failed to test membership!\n"
 msgstr "Lỗi lấy thông kê về truyền tải.\n"
 
-#: src/psycstore/gnunet-service-psycstore.c:306
+#: src/psycstore/gnunet-service-psycstore.c:300
 #, fuzzy
-msgid "Failed to store fragment!\n"
+msgid "Dropping invalid fragment\n"
+msgstr "Đối số không hợp lệ cho « %s ».\n"
+
+#: src/psycstore/gnunet-service-psycstore.c:311
+#, fuzzy
+msgid "Failed to store fragment\n"
 msgstr "Lỗi bắt đầu thu thập.\n"
 
-#: src/psycstore/gnunet-service-psycstore.c:364
+#: src/psycstore/gnunet-service-psycstore.c:368
 #, fuzzy
 msgid "Failed to get fragment!\n"
 msgstr "Lỗi lấy thông kê về truyền tải.\n"
 
-#: src/psycstore/gnunet-service-psycstore.c:423
+#: src/psycstore/gnunet-service-psycstore.c:434
 #, fuzzy
 msgid "Failed to get message!\n"
 msgstr "Lỗi lấy thông kê về truyền tải.\n"
 
-#: src/psycstore/gnunet-service-psycstore.c:454
+#: src/psycstore/gnunet-service-psycstore.c:464
 #, fuzzy
 msgid "Failed to get message fragment!\n"
 msgstr "Lỗi đọc danh sách bạn bè từ « %s »\n"
 
-#: src/psycstore/gnunet-service-psycstore.c:482
+#: src/psycstore/gnunet-service-psycstore.c:494
 #, fuzzy
 msgid "Failed to get master counters!\n"
 msgstr "Lỗi lấy thông kê về truyền tải.\n"
 
-#: src/psycstore/gnunet-service-psycstore.c:665
+#: src/psycstore/gnunet-service-psycstore.c:675
 #, fuzzy, c-format
 msgid "Failed to begin modifying state: %d\n"
 msgstr "Lỗi bắt đầu thu thập.\n"
 
-#: src/psycstore/gnunet-service-psycstore.c:675
+#: src/psycstore/gnunet-service-psycstore.c:685
 #, fuzzy, c-format
 msgid "Failed to modify state: %d\n"
 msgstr "Lỗi bắt đầu thu thập.\n"
 
-#: src/psycstore/gnunet-service-psycstore.c:683
+#: src/psycstore/gnunet-service-psycstore.c:693
 #, fuzzy
 msgid "Failed to end modifying state!\n"
 msgstr "Lỗi bắt đầu thu thập.\n"
 
-#: src/psycstore/gnunet-service-psycstore.c:714
+#: src/psycstore/gnunet-service-psycstore.c:730
 msgid "Tried to set invalid state variable name!\n"
 msgstr ""
 
-#: src/psycstore/gnunet-service-psycstore.c:728
+#: src/psycstore/gnunet-service-psycstore.c:744
 #, fuzzy
 msgid "Failed to begin synchronizing state!\n"
 msgstr "Lỗi lấy thông kê về truyền tải.\n"
 
-#: src/psycstore/gnunet-service-psycstore.c:745
+#: src/psycstore/gnunet-service-psycstore.c:761
 #, fuzzy
 msgid "Failed to end synchronizing state!\n"
 msgstr "Lỗi lấy thông kê về truyền tải.\n"
 
-#: src/psycstore/gnunet-service-psycstore.c:765
-#: src/psycstore/gnunet-service-psycstore.c:784
+#: src/psycstore/gnunet-service-psycstore.c:779
+#: src/psycstore/gnunet-service-psycstore.c:795
 #, fuzzy
 msgid "Failed to reset state!\n"
 msgstr "Lỗi lấy thông kê về truyền tải.\n"
 
-#: src/psycstore/gnunet-service-psycstore.c:807
-#: src/psycstore/gnunet-service-psycstore.c:858
+#: src/psycstore/gnunet-service-psycstore.c:824
+#: src/psycstore/gnunet-service-psycstore.c:881
 msgid "Tried to get invalid state variable name!\n"
 msgstr ""
 
-#: src/psycstore/gnunet-service-psycstore.c:834
-#: src/psycstore/gnunet-service-psycstore.c:873
+#: src/psycstore/gnunet-service-psycstore.c:851
+#: src/psycstore/gnunet-service-psycstore.c:896
 #, fuzzy
 msgid "Failed to get state variable!\n"
 msgstr "Lỗi lấy thông kê về truyền tải.\n"
 
+#: src/psycstore/plugin_psycstore_mysql.c:281
+#, fuzzy
+msgid "Unable to initialize Mysql.\n"
+msgstr "Không thể sơ khởi SQLite: %s.\n"
+
+#: src/psycstore/plugin_psycstore_mysql.c:291
+#, fuzzy, c-format
+msgid "Failed to run SQL statement `%s'\n"
+msgstr "Lỗi đọc danh sách bạn bè từ « %s »\n"
+
 #: src/psycstore/plugin_psycstore_sqlite.c:61
 #, fuzzy, c-format
 msgid "`%s' failed at %s:%d with error: %s (%d)\n"
@@ -6171,66 +5929,66 @@
 msgid "SQLite database running\n"
 msgstr "kho dữ liệu sqlite"
 
-#: src/pt/gnunet-daemon-pt.c:482
+#: src/pt/gnunet-daemon-pt.c:493
 msgid "Failed to pack DNS request.  Dropping.\n"
 msgstr ""
 
-#: src/pt/gnunet-daemon-pt.c:488
+#: src/pt/gnunet-daemon-pt.c:499
 #, 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:541
+#: src/pt/gnunet-daemon-pt.c:553
 msgid "# DNS records modified"
 msgstr ""
 
-#: src/pt/gnunet-daemon-pt.c:717
+#: src/pt/gnunet-daemon-pt.c:737
 #, fuzzy
 msgid "# DNS replies intercepted"
 msgstr "# các đáp ứng dht được định tuyến"
 
-#: src/pt/gnunet-daemon-pt.c:723
+#: src/pt/gnunet-daemon-pt.c:744
 msgid "Failed to parse DNS request.  Dropping.\n"
 msgstr ""
 
-#: src/pt/gnunet-daemon-pt.c:824
+#: src/pt/gnunet-daemon-pt.c:851
 #, 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:881
+#: src/pt/gnunet-daemon-pt.c:909
 #, 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:886
+#: src/pt/gnunet-daemon-pt.c:914
 #, 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:894
+#: src/pt/gnunet-daemon-pt.c:922
 #, 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:967
+#: src/pt/gnunet-daemon-pt.c:995
 #, 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:983
+#: src/pt/gnunet-daemon-pt.c:1011
 #, fuzzy
 msgid "# DNS replies dropped (too late?)"
 msgstr "# các đáp ứng dht được định tuyến"
 
-#: src/pt/gnunet-daemon-pt.c:1257 src/pt/gnunet-daemon-pt.c:1266
-#: src/pt/gnunet-daemon-pt.c:1286 src/pt/gnunet-daemon-pt.c:1297
-#: src/pt/gnunet-daemon-pt.c:1306
+#: src/pt/gnunet-daemon-pt.c:1294 src/pt/gnunet-daemon-pt.c:1303
+#: src/pt/gnunet-daemon-pt.c:1324 src/pt/gnunet-daemon-pt.c:1336
+#: src/pt/gnunet-daemon-pt.c:1345
 #, 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:1343
+#: src/pt/gnunet-daemon-pt.c:1390
 msgid "Daemon to run to perform IP protocol translation to GNUnet"
 msgstr ""
 
@@ -6243,86 +6001,91 @@
 msgid "Daemon to announce regular expressions for the peer using cadet."
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1301
+#: src/regex/gnunet-regex-profiler.c:1314
 #, fuzzy
 msgid "No configuration file given. Exiting\n"
 msgstr "dùng tập tin cấu hình TÊN_TẬP_TIN"
 
-#: src/regex/gnunet-regex-profiler.c:1342
-#: src/regex/gnunet-regex-simulation-profiler.c:638
+#: src/regex/gnunet-regex-profiler.c:1355
+#: src/regex/gnunet-regex-simulation-profiler.c:630
 #, c-format
 msgid "No policy directory specified on command line. Exiting.\n"
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1348
-#: src/regex/gnunet-regex-simulation-profiler.c:646
+#: src/regex/gnunet-regex-profiler.c:1361
+#: src/regex/gnunet-regex-simulation-profiler.c:638
 #, c-format
 msgid "Specified policies directory does not exist. Exiting.\n"
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1355
+#: src/regex/gnunet-regex-profiler.c:1368
 #, fuzzy, c-format
 msgid "No files found in `%s'\n"
 msgstr "Vẫn còn không tìm thấy đồng đẳng trong « %s ».\n"
 
-#: src/regex/gnunet-regex-profiler.c:1364
+#: src/regex/gnunet-regex-profiler.c:1377
 msgid "No search strings file given. Exiting.\n"
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1384
+#: src/regex/gnunet-regex-profiler.c:1397
 #, fuzzy
 msgid "Error loading search strings. Exiting.\n"
 msgstr "Gặp lỗi khi tải xuống: %s\n"
 
-#: src/regex/gnunet-regex-profiler.c:1469
+#: src/regex/gnunet-regex-profiler.c:1482
 #, 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:1472
+#: src/regex/gnunet-regex-profiler.c:1485
 msgid "wait TIMEOUT before ending the experiment"
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1475
+#: src/regex/gnunet-regex-profiler.c:1488
 msgid "directory with policy files"
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1478
+#: src/regex/gnunet-regex-profiler.c:1491
 #, 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:1481
+#: src/regex/gnunet-regex-profiler.c:1494
 #, 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:1493
+#: src/regex/gnunet-regex-profiler.c:1506
 msgid "Profiler for regex"
 msgstr ""
 
-#: src/regex/gnunet-regex-simulation-profiler.c:704
+#: src/regex/gnunet-regex-simulation-profiler.c:696
 msgid "name of the table to write DFAs"
 msgstr ""
 
-#: src/regex/gnunet-regex-simulation-profiler.c:707
+#: src/regex/gnunet-regex-simulation-profiler.c:699
 msgid "maximum path compression length"
 msgstr ""
 
-#: src/regex/gnunet-regex-simulation-profiler.c:720
+#: src/regex/gnunet-regex-simulation-profiler.c:712
 msgid "Profiler for regex library"
 msgstr ""
 
-#: src/regex/regex_api.c:131
+#: src/regex/regex_api_announce.c:152
 #, fuzzy, c-format
 msgid "Regex `%s' is too long!\n"
 msgstr "« %s » không phải là một tập tin.\n"
 
-#: src/rest/gnunet-rest-server.c:784
+#: src/regex/regex_api_search.c:212
+#, fuzzy, c-format
+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
 msgid "listen on specified port (default: 7776)"
 msgstr ""
 
-#: src/rest/gnunet-rest-server.c:801
+#: src/rest/gnunet-rest-server.c:805
 #, fuzzy
 msgid "GNUnet REST server"
 msgstr "Bản ghi lỗi GNUnet"
@@ -6365,103 +6128,103 @@
 msgid "Internal error, key revocation might have failed\n"
 msgstr ""
 
-#: src/revocation/gnunet-revocation.c:320
+#: src/revocation/gnunet-revocation.c:323
 #, c-format
 msgid "Revocation certificate for `%s' stored in `%s'\n"
 msgstr ""
 
-#: src/revocation/gnunet-revocation.c:350
+#: src/revocation/gnunet-revocation.c:352
 #, fuzzy, c-format
 msgid "Ego `%s' not found.\n"
 msgstr "Khoá phiên chạy từ đồng đẳng « %s » không thể được thẩm tra.\n"
 
-#: src/revocation/gnunet-revocation.c:371
+#: src/revocation/gnunet-revocation.c:373
 #, c-format
 msgid "Error: revocation certificate in `%s' is not for `%s'\n"
 msgstr ""
 
-#: src/revocation/gnunet-revocation.c:391
+#: src/revocation/gnunet-revocation.c:393
 msgid "Revocation certificate ready\n"
 msgstr ""
 
-#: src/revocation/gnunet-revocation.c:401
+#: src/revocation/gnunet-revocation.c:403
 msgid "Revocation certificate not ready, calculating proof of work\n"
 msgstr ""
 
-#: src/revocation/gnunet-revocation.c:435
+#: src/revocation/gnunet-revocation.c:437 src/social/gnunet-social.c:1159
 #, fuzzy, c-format
 msgid "Public key `%s' malformed\n"
 msgstr "Đối số không hợp lệ cho « %s ».\n"
 
-#: src/revocation/gnunet-revocation.c:448
+#: src/revocation/gnunet-revocation.c:450
 msgid ""
 "Testing and revoking at the same time is not allowed, only executing test.\n"
 msgstr ""
 
-#: src/revocation/gnunet-revocation.c:468
+#: src/revocation/gnunet-revocation.c:470
 #, fuzzy
 msgid "No filename to store revocation certificate given.\n"
 msgstr "Lỗi đọc danh sách bạn bè từ « %s »\n"
 
-#: src/revocation/gnunet-revocation.c:489
+#: src/revocation/gnunet-revocation.c:491
 #, fuzzy, c-format
 msgid "Failed to read revocation certificate from `%s'\n"
 msgstr "Lỗi đọc danh sách bạn bè từ « %s »\n"
 
-#: src/revocation/gnunet-revocation.c:514
+#: src/revocation/gnunet-revocation.c:516
 #, fuzzy
 msgid "No action specified. Nothing to do.\n"
 msgstr "Chưa xác định giao diện nên dùng mặc định.\n"
 
-#: src/revocation/gnunet-revocation.c:530
+#: src/revocation/gnunet-revocation.c:532
 msgid "use NAME for the name of the revocation file"
 msgstr ""
 
-#: src/revocation/gnunet-revocation.c:533
+#: src/revocation/gnunet-revocation.c:535
 msgid ""
 "revoke the private key associated for the the private key associated with "
 "the ego NAME "
 msgstr ""
 
-#: src/revocation/gnunet-revocation.c:536
+#: src/revocation/gnunet-revocation.c:538
 msgid "actually perform revocation, otherwise we just do the precomputation"
 msgstr ""
 
-#: src/revocation/gnunet-revocation.c:539
+#: src/revocation/gnunet-revocation.c:541
 msgid "test if the public key KEY has been revoked"
 msgstr ""
 
-#: src/revocation/gnunet-service-revocation.c:481
+#: src/revocation/gnunet-service-revocation.c:456
 #, 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:490
+#: src/revocation/gnunet-service-revocation.c:464
 #, 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:495
+#: src/revocation/gnunet-service-revocation.c:469
 #, c-format
 msgid "Error computing revocation set union with %s\n"
 msgstr ""
 
-#: src/revocation/gnunet-service-revocation.c:499
+#: src/revocation/gnunet-service-revocation.c:473
 #, 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:508
+#: src/revocation/gnunet-service-revocation.c:482
 #, fuzzy
 msgid "# revocation set unions completed"
 msgstr "# các sự truyền PONG bị lỗi"
 
-#: src/revocation/gnunet-service-revocation.c:545
-#: src/revocation/gnunet-service-revocation.c:776
+#: src/revocation/gnunet-service-revocation.c:519
+#: src/revocation/gnunet-service-revocation.c:765
 msgid "SET service crashed, terminating revocation service\n"
 msgstr ""
 
-#: src/revocation/gnunet-service-revocation.c:868
+#: src/revocation/gnunet-service-revocation.c:856
 #, fuzzy
 msgid "Could not open revocation database file!"
 msgstr "« %s »: Không thể kết nối.\n"
@@ -6524,15 +6287,15 @@
 msgid "Calculate the Vectorproduct with a GNUnet peer."
 msgstr ""
 
-#: src/scalarproduct/gnunet-service-scalarproduct_alice.c:1417
-#: src/scalarproduct/gnunet-service-scalarproduct_bob.c:1546
-#: src/scalarproduct/gnunet-service-scalarproduct-ecc_alice.c:1192
-#: src/scalarproduct/gnunet-service-scalarproduct-ecc_bob.c:1249
+#: src/scalarproduct/gnunet-service-scalarproduct_alice.c:1415
+#: src/scalarproduct/gnunet-service-scalarproduct_bob.c:1553
+#: src/scalarproduct/gnunet-service-scalarproduct-ecc_alice.c:1191
+#: src/scalarproduct/gnunet-service-scalarproduct-ecc_bob.c:1259
 #, fuzzy
 msgid "Connect to CADET failed\n"
 msgstr " Không kết nối được (lỗi ?)\n"
 
-#: src/scalarproduct/scalarproduct_api.c:296
+#: src/scalarproduct/scalarproduct_api.c:185
 msgid "Keys given to SCALARPRODUCT not unique!\n"
 msgstr ""
 
@@ -6552,7 +6315,7 @@
 msgid "also profile decryption"
 msgstr ""
 
-#: src/set/gnunet-service-set.c:2008
+#: src/set/gnunet-service-set.c:1991
 #, fuzzy
 msgid "Could not connect to cadet service\n"
 msgstr "Không thể kết nối tới %s:%u: %s\n"
@@ -6579,237 +6342,226 @@
 msgid "ibf size"
 msgstr ""
 
-#: src/set/gnunet-set-profiler.c:386
+#: src/set/gnunet-set-profiler.c:387
 msgid "operation to execute"
 msgstr ""
 
-#: src/social/gnunet-social.c:1138
+#: src/social/gnunet-social.c:1146
 #, fuzzy
 msgid "--place missing or invalid.\n"
 msgstr "Đối số không hợp lệ cho « %s ».\n"
 
-#: src/social/gnunet-social.c:1180
+#: src/social/gnunet-social.c:1195
 msgid "assign --name in state to --data"
 msgstr ""
 
-#: src/social/gnunet-social.c:1184
+#: src/social/gnunet-social.c:1199
 msgid "say good-bye and leave somebody else's place"
 msgstr ""
 
-#: src/social/gnunet-social.c:1188
+#: src/social/gnunet-social.c:1203
 msgid "create a place"
 msgstr ""
 
-#: src/social/gnunet-social.c:1192
+#: src/social/gnunet-social.c:1207
 msgid "destroy a place we were hosting"
 msgstr ""
 
-#: src/social/gnunet-social.c:1196
+#: src/social/gnunet-social.c:1211
 msgid "enter somebody else's place"
 msgstr ""
 
-#: src/social/gnunet-social.c:1200
+#: src/social/gnunet-social.c:1215
 msgid "find state matching name prefix"
 msgstr ""
 
-#: src/social/gnunet-social.c:1204
+#: src/social/gnunet-social.c:1219
 msgid "replay history of messages up to the given --limit"
 msgstr ""
 
-#: src/social/gnunet-social.c:1208
+#: src/social/gnunet-social.c:1223
 msgid "reconnect to a previously created place"
 msgstr ""
 
-#: src/social/gnunet-social.c:1212
+#: src/social/gnunet-social.c:1227
 msgid "publish something to a place we are hosting"
 msgstr ""
 
-#: src/social/gnunet-social.c:1216
+#: src/social/gnunet-social.c:1231
 msgid "reconnect to a previously entered place"
 msgstr ""
 
-#: src/social/gnunet-social.c:1220
+#: src/social/gnunet-social.c:1235
 msgid "search for state matching exact name"
 msgstr ""
 
-#: src/social/gnunet-social.c:1224
+#: src/social/gnunet-social.c:1239
 msgid "submit something to somebody's place"
 msgstr ""
 
-#: src/social/gnunet-social.c:1228
+#: src/social/gnunet-social.c:1243
 msgid "list of egos and subscribed places"
 msgstr ""
 
-#: src/social/gnunet-social.c:1232
+#: src/social/gnunet-social.c:1247
 msgid "extract and replay history between message IDs --start and --until"
 msgstr ""
 
-#: src/social/gnunet-social.c:1239
+#: src/social/gnunet-social.c:1254
 msgid "application ID to use when connecting"
 msgstr ""
 
-#: src/social/gnunet-social.c:1243
+#: src/social/gnunet-social.c:1258
 msgid "message body or state value"
 msgstr ""
 
-#: src/social/gnunet-social.c:1247
+#: src/social/gnunet-social.c:1262
 #, fuzzy
 msgid "name or public key of ego"
 msgstr "Đối số không hợp lệ cho « %s ».\n"
 
-#: src/social/gnunet-social.c:1251
+#: src/social/gnunet-social.c:1266
 #, fuzzy
 msgid "wait for incoming messages"
 msgstr "Lỗi gửi tin nhẳn.\n"
 
-#: src/social/gnunet-social.c:1255
+#: src/social/gnunet-social.c:1270
 msgid "GNS name"
 msgstr ""
 
-#: src/social/gnunet-social.c:1259
+#: src/social/gnunet-social.c:1274
 msgid "peer ID for --guest-enter"
 msgstr ""
 
-#: src/social/gnunet-social.c:1263
+#: src/social/gnunet-social.c:1278
 msgid "name (key) to query from state"
 msgstr ""
 
-#: src/social/gnunet-social.c:1267
+#: src/social/gnunet-social.c:1282
 msgid "method name"
 msgstr ""
 
-#: src/social/gnunet-social.c:1271
+#: src/social/gnunet-social.c:1286
 #, fuzzy
 msgid "number of messages to replay from history"
 msgstr "số tin nhắn cần dùng mỗi lần lặp"
 
-#: src/social/gnunet-social.c:1275
+#: src/social/gnunet-social.c:1290
 msgid "key address of place"
 msgstr ""
 
-#: src/social/gnunet-social.c:1279
+#: src/social/gnunet-social.c:1294
 msgid "start message ID for history replay"
 msgstr ""
 
-#: src/social/gnunet-social.c:1283
+#: src/social/gnunet-social.c:1298
 msgid "respond to entry requests by admitting all guests"
 msgstr ""
 
-#: src/social/gnunet-social.c:1287
+#: src/social/gnunet-social.c:1302
 msgid "end message ID for history replay"
 msgstr ""
 
-#: src/social/gnunet-social.c:1291
+#: src/social/gnunet-social.c:1306
 msgid "respond to entry requests by refusing all guests"
 msgstr ""
 
-#: src/social/gnunet-social.c:1301
+#: src/social/gnunet-social.c:1316
 msgid ""
 "gnunet-social - Interact with the social service: enter/leave, send/receive "
 "messages, access history and state.\n"
 msgstr ""
 
-#: src/statistics/gnunet-service-statistics.c:323
+#: src/statistics/gnunet-service-statistics.c:338
 #, fuzzy, c-format
-msgid "Loading %llu bytes of statistics from `%s'\n"
+msgid "Wrote %llu bytes of statistics to `%s'\n"
 msgstr "Đã tải %llu byte xuống « %s ».\n"
 
-#: src/statistics/gnunet-service-statistics.c:434
+#: src/statistics/gnunet-service-statistics.c:1083
 #, fuzzy, c-format
-msgid "Wrote %llu bytes of statistics to `%s'\n"
+msgid "Loading %llu bytes of statistics from `%s'\n"
 msgstr "Đã tải %llu byte xuống « %s ».\n"
 
-#: src/statistics/gnunet-statistics.c:145
+#: src/statistics/gnunet-statistics.c:158
 #, fuzzy
 msgid "Failed to obtain statistics.\n"
 msgstr "Lỗi lấy thông kê về truyền tải.\n"
 
-#: src/statistics/gnunet-statistics.c:148
+#: src/statistics/gnunet-statistics.c:161
 #, fuzzy, c-format
 msgid "Failed to obtain statistics from host `%s:%llu'\n"
 msgstr "Lỗi lấy thông kê về truyền tải.\n"
 
-#: src/statistics/gnunet-statistics.c:194
+#: src/statistics/gnunet-statistics.c:219
 msgid "Missing argument: subsystem \n"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:200
+#: src/statistics/gnunet-statistics.c:227
 msgid "Missing argument: name\n"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:232
+#: src/statistics/gnunet-statistics.c:270
 #, fuzzy, c-format
 msgid "No subsystem or name given\n"
 msgstr "chưa đưa ra tên"
 
-#: src/statistics/gnunet-statistics.c:241
+#: src/statistics/gnunet-statistics.c:285
 #, fuzzy, c-format
 msgid "Failed to initialize watch routine\n"
 msgstr "Lỗi sơ khởi dịch vụ « %s ».\n"
 
-#: src/statistics/gnunet-statistics.c:266
+#: src/statistics/gnunet-statistics.c:321
 #, fuzzy, c-format
-msgid "Trying to connect to remote host, but service `%s' is not running\n"
-msgstr "Lỗi sơ khởi dịch vụ « %s ».\n"
+msgid "Invalid argument `%s'\n"
+msgstr "Đối số không hợp lệ cho « %s ».\n"
 
-#: src/statistics/gnunet-statistics.c:279
+#: src/statistics/gnunet-statistics.c:339
 #, fuzzy, c-format
 msgid "A port is required to connect to host `%s'\n"
 msgstr "Không thể kết nối tới %s:%u: %s\n"
 
-#: src/statistics/gnunet-statistics.c:287
+#: src/statistics/gnunet-statistics.c:347
 #, c-format
 msgid "A port has to be between 1 and 65535 to connect to host `%s'\n"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:320
-#, fuzzy, c-format
-msgid "Invalid argument `%s'\n"
-msgstr "Đối số không hợp lệ cho « %s ».\n"
-
-#: src/statistics/gnunet-statistics.c:346
+#: src/statistics/gnunet-statistics.c:383
 msgid "limit output to statistics for the given NAME"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:349
+#: src/statistics/gnunet-statistics.c:386
 msgid "make the value being set persistent"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:352
+#: src/statistics/gnunet-statistics.c:389
 msgid "limit output to the given SUBSYSTEM"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:355
+#: src/statistics/gnunet-statistics.c:392
 msgid "just print the statistics value"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:358
+#: src/statistics/gnunet-statistics.c:395
 msgid "watch value continuously"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:361
+#: src/statistics/gnunet-statistics.c:398
 msgid "connect to remote host"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:364
+#: src/statistics/gnunet-statistics.c:401
 msgid "port for remote host"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:376
+#: src/statistics/gnunet-statistics.c:417
 msgid "Print statistics about GNUnet operations."
 msgstr "In ra thống kê về các thao tác GNUnet."
 
-#: src/statistics/statistics_api.c:515
+#: src/statistics/statistics_api.c:753
 #, fuzzy
 msgid "Could not save some persistent statistics\n"
 msgstr "Không thể tạo miền tên.\n"
 
-#: src/statistics/statistics_api.c:1082
-msgid ""
-"Failed to receive acknowledgement from statistics service, some statistics "
-"might have been lost!\n"
-msgstr ""
-
 #: src/testbed/generate-underlay-topology.c:225
 #, fuzzy
 msgid "Need at least 2 arguments\n"
@@ -6853,12 +6605,12 @@
 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:338
+#: src/testbed/generate-underlay-topology.c:339
 #: src/testbed/gnunet-testbed-profiler.c:281
 msgid "create COUNT number of peers"
 msgstr ""
 
-#: src/testbed/generate-underlay-topology.c:347
+#: src/testbed/generate-underlay-topology.c:348
 msgid ""
 "Generates SQLite3 database representing a given underlay topology.\n"
 "Usage: gnunet-underlay-topology [OPTIONS] db-filename TOPO [TOPOOPTS]\n"
@@ -6886,19 +6638,19 @@
 msgid "Daemon to log latency values of connections to neighbours"
 msgstr ""
 
-#: src/testbed/gnunet-daemon-testbed-blacklist.c:248
+#: src/testbed/gnunet-daemon-testbed-blacklist.c:247
 msgid ""
 "Daemon to restrict incoming transport layer connections during testbed "
 "deployments"
 msgstr ""
 
-#: src/testbed/gnunet-daemon-testbed-underlay.c:230 src/testing/list-keys.c:50
-#: src/testing/testing.c:293 src/util/gnunet-ecc.c:298
+#: src/testbed/gnunet-daemon-testbed-underlay.c:231 src/testing/list-keys.c:50
+#: src/testing/testing.c:288 src/util/gnunet-ecc.c:298
 #, c-format
 msgid "Incorrect hostkey file format: %s\n"
 msgstr ""
 
-#: src/testbed/gnunet-daemon-testbed-underlay.c:468
+#: src/testbed/gnunet-daemon-testbed-underlay.c:469
 msgid "Daemon to restrict underlay network in testbed deployments"
 msgstr ""
 
@@ -6908,16 +6660,12 @@
 "Cannot open %s for writing load statistics.  Not logging load statistics\n"
 msgstr ""
 
-#: src/testbed/gnunet-service-testbed_peers.c:1015
+#: src/testbed/gnunet-service-testbed_peers.c:1141
 #, fuzzy
 msgid "Misconfiguration (can't connect to the ARM service)"
 msgstr "Lỗi kết nối đến gnunetd.\n"
 
-#: src/testbed/gnunet-service-testbed_peers.c:1021
-msgid "Request doesn't fit into a message"
-msgstr ""
-
-#: src/testbed/gnunet-service-testbed_peers.c:1059
+#: src/testbed/gnunet-service-testbed_peers.c:1183
 #, fuzzy, c-format
 msgid "%s service can't be started because ARM is shutting down"
 msgstr "« %s » đang tắt.\n"
@@ -6943,31 +6691,31 @@
 "signal is received"
 msgstr ""
 
-#: src/testbed/testbed_api_hosts.c:415
+#: src/testbed/testbed_api.c:410
 #, fuzzy, c-format
+msgid "Adding host %u failed with error: %s\n"
+msgstr "« %s » thất bại với mã lỗi %d: %s\n"
+
+#: src/testbed/testbed_api_hosts.c:413
+#, fuzzy, c-format
 msgid "Hosts file %s not found\n"
 msgstr "Khoá phiên chạy từ đồng đẳng « %s » không thể được thẩm tra.\n"
 
-#: src/testbed/testbed_api_hosts.c:423
+#: src/testbed/testbed_api_hosts.c:421
 #, fuzzy, c-format
 msgid "Hosts file %s has no data\n"
 msgstr "Khoá phiên chạy từ đồng đẳng « %s » không thể được thẩm tra.\n"
 
-#: src/testbed/testbed_api_hosts.c:430
+#: src/testbed/testbed_api_hosts.c:428
 #, fuzzy, c-format
 msgid "Hosts file %s cannot be read\n"
 msgstr "Khoá phiên chạy từ đồng đẳng « %s » không thể được thẩm tra.\n"
 
-#: src/testbed/testbed_api_hosts.c:570
+#: src/testbed/testbed_api_hosts.c:569
 #, c-format
 msgid "The function %s is only available when compiled with (--with-ll)\n"
 msgstr ""
 
-#: src/testbed/testbed_api_hosts.c:1590
-#, fuzzy, c-format
-msgid "Adding host %u failed with error: %s\n"
-msgstr "« %s » thất bại với mã lỗi %d: %s\n"
-
 #: src/testbed/testbed_api_testbed.c:818
 msgid "Linking controllers failed. Exiting"
 msgstr ""
@@ -7024,44 +6772,44 @@
 "free topology cannot be more than %u.  Given `%s = %llu'"
 msgstr ""
 
-#: src/testbed/testbed_api_topology.c:966
+#: src/testbed/testbed_api_topology.c:1028
 #, fuzzy, c-format
 msgid "Topology file %s not found\n"
 msgstr "Khoá phiên chạy từ đồng đẳng « %s » không thể được thẩm tra.\n"
 
-#: src/testbed/testbed_api_topology.c:974
+#: src/testbed/testbed_api_topology.c:1036
 #, fuzzy, c-format
 msgid "Topology file %s has no data\n"
 msgstr "Khoá phiên chạy từ đồng đẳng « %s » không thể được thẩm tra.\n"
 
-#: src/testbed/testbed_api_topology.c:982
+#: src/testbed/testbed_api_topology.c:1044
 #, fuzzy, c-format
 msgid "Topology file %s cannot be read\n"
 msgstr "Khoá phiên chạy từ đồng đẳng « %s » không thể được thẩm tra.\n"
 
-#: src/testbed/testbed_api_topology.c:1004
+#: src/testbed/testbed_api_topology.c:1066
 #, fuzzy, c-format
 msgid "Failed to read peer index from toology file: %s"
 msgstr "Không thể truy cập đến tập tin gnunet-directory « %s »\n"
 
-#: src/testbed/testbed_api_topology.c:1013
-#: src/testbed/testbed_api_topology.c:1037
+#: src/testbed/testbed_api_topology.c:1075
+#: src/testbed/testbed_api_topology.c:1099
 #, c-format
 msgid "Value in given topology file: %s out of range\n"
 msgstr ""
 
-#: src/testbed/testbed_api_topology.c:1019
-#: src/testbed/testbed_api_topology.c:1043
+#: src/testbed/testbed_api_topology.c:1081
+#: src/testbed/testbed_api_topology.c:1105
 #, fuzzy, c-format
 msgid "Failed to read peer index from topology file: %s"
 msgstr "Không thể truy cập đến tập tin gnunet-directory « %s »\n"
 
-#: src/testbed/testbed_api_topology.c:1025
-#: src/testbed/testbed_api_topology.c:1049
+#: src/testbed/testbed_api_topology.c:1087
+#: src/testbed/testbed_api_topology.c:1111
 msgid "Topology file needs more peers than given ones\n"
 msgstr ""
 
-#: src/testbed/testbed_api_topology.c:1083
+#: src/testbed/testbed_api_topology.c:1145
 #, fuzzy, c-format
 msgid "Ignoring to connect peer %u to peer %u\n"
 msgstr "đang kết nối đồng đẳng %s:%d tới đồng đẳng %s:%d\n"
@@ -7105,25 +6853,25 @@
 msgid "Command line tool to access the testing library"
 msgstr ""
 
-#: src/testing/list-keys.c:90
+#: src/testing/list-keys.c:91
 msgid "list COUNT number of keys"
 msgstr ""
 
-#: src/testing/list-keys.c:93
+#: src/testing/list-keys.c:94
 msgid "skip COUNT number of keys in the beginning"
 msgstr ""
 
-#: src/testing/testing.c:277
+#: src/testing/testing.c:272
 #, c-format
 msgid "Hostkeys file not found: %s\n"
 msgstr ""
 
-#: src/testing/testing.c:720
+#: src/testing/testing.c:715
 #, fuzzy, c-format
 msgid "Key number %u does not exist\n"
 msgstr "đặt số trình nền cần khởi chạy"
 
-#: src/testing/testing.c:1163
+#: src/testing/testing.c:1158
 #, c-format
 msgid ""
 "You attempted to create a testbed with more than %u hosts.  Please "
@@ -7130,41 +6878,41 @@
 "precompute more hostkeys first.\n"
 msgstr ""
 
-#: src/testing/testing.c:1172
+#: src/testing/testing.c:1167
 #, 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:1182
+#: src/testing/testing.c:1177
 msgid "PRIVATE_KEY option in PEER section missing in configuration\n"
 msgstr ""
 
-#: src/testing/testing.c:1195
+#: src/testing/testing.c:1190
 #, 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:1209
+#: src/testing/testing.c:1204
 #, 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:1221
+#: src/testing/testing.c:1216
 #, 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:1246
+#: src/testing/testing.c:1241
 #, 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:1348
+#: src/testing/testing.c:1343
 #, fuzzy, c-format
 msgid "Failed to start `%s': %s\n"
 msgstr "Lỗi chạy %s: %s %d\n"
 
-#: src/testing/testing.c:1710
+#: src/testing/testing.c:1644
 #, 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 »:"
@@ -7180,31 +6928,36 @@
 msgid "Directory for file `%s' does not seem to be writable.\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:230
+#: src/topology/gnunet-daemon-topology.c:225
 msgid "# peers blacklisted"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:349
+#: src/topology/gnunet-daemon-topology.c:339
 #, fuzzy
 msgid "# connect requests issued to ATS"
 msgstr "# các yêu cầu máy/trình khách lỗ hổng được phun vào"
 
-#: src/topology/gnunet-daemon-topology.c:634
-#: src/topology/gnunet-daemon-topology.c:730
+#: src/topology/gnunet-daemon-topology.c:533
 #, fuzzy
+msgid "# HELLO messages gossipped"
+msgstr "# các thông báo gửi đi bị loại bỏ"
+
+#: src/topology/gnunet-daemon-topology.c:635
+#: src/topology/gnunet-daemon-topology.c:721
+#, fuzzy
 msgid "# friends connected"
 msgstr "# của các đồng đẳng đã kết nối"
 
-#: src/topology/gnunet-daemon-topology.c:927
+#: src/topology/gnunet-daemon-topology.c:918
 msgid "Failed to connect to core service, can not manage topology!\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:960
+#: src/topology/gnunet-daemon-topology.c:951
 #, c-format
 msgid "Found myself `%s' in friend list (useless, ignored)\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:967
+#: src/topology/gnunet-daemon-topology.c:958
 #, fuzzy, c-format
 msgid "Found friend `%s' in configuration\n"
 msgstr ""
@@ -7211,11 +6964,11 @@
 "\n"
 "Kết thúc cấu hình.\n"
 
-#: src/topology/gnunet-daemon-topology.c:989
+#: src/topology/gnunet-daemon-topology.c:980
 msgid "Encountered errors parsing friends list!\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:992
+#: src/topology/gnunet-daemon-topology.c:983
 #, fuzzy
 msgid "# friends in configuration"
 msgstr ""
@@ -7222,7 +6975,7 @@
 "\n"
 "Kết thúc cấu hình.\n"
 
-#: src/topology/gnunet-daemon-topology.c:999
+#: src/topology/gnunet-daemon-topology.c:990
 msgid ""
 "Fewer friends specified than required by minimum friend count. Will only "
 "connect to friends.\n"
@@ -7229,23 +6982,18 @@
 msgstr ""
 "Xác định quá ít bạn bè (dưới số tối thiểu). Sẽ chỉ kết nối tới bạn bè.\n"
 
-#: src/topology/gnunet-daemon-topology.c:1005
+#: src/topology/gnunet-daemon-topology.c:996
 msgid ""
 "More friendly connections required than target total number of connections.\n"
 msgstr "Cần thiết nhiều kết nối bạn bè hơn tổng số kết nối đích.\n"
 
-#: src/topology/gnunet-daemon-topology.c:1039
+#: src/topology/gnunet-daemon-topology.c:1059
 #: src/transport/plugin_transport_wlan.c:1491
 #, fuzzy
 msgid "# HELLO messages received"
 msgstr "# các thông báo PONG đã mật mã được nhận"
 
-#: src/topology/gnunet-daemon-topology.c:1112
-#, fuzzy
-msgid "# HELLO messages gossipped"
-msgstr "# các thông báo gửi đi bị loại bỏ"
-
-#: src/topology/gnunet-daemon-topology.c:1283
+#: src/topology/gnunet-daemon-topology.c:1233
 msgid "GNUnet topology control"
 msgstr ""
 
@@ -7253,273 +7001,273 @@
 msgid "# Addresses given to ATS"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_blacklist.c:284
-#, fuzzy, c-format
-msgid "Adding blacklisting entry for peer `%s'\n"
-msgstr "Không thể lấy địa chỉ của đồng đẳng « %s ».\n"
+#: src/transport/gnunet-service-transport.c:448
+#, fuzzy
+msgid "# messages dropped due to slow client"
+msgstr "# các yêu cầu lỗ hổng bị bỏ do trọng tải"
 
-#: src/transport/gnunet-service-transport_blacklist.c:293
-#, c-format
-msgid "Adding blacklisting entry for peer `%s':`%s'\n"
+#: src/transport/gnunet-service-transport.c:809
+msgid "# bytes payload dropped (other peer was not connected)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_blacklist.c:500
-#: src/transport/gnunet-service-transport_blacklist.c:851
-msgid "# disconnects due to blacklist"
-msgstr ""
-
-#: src/transport/gnunet-service-transport_blacklist.c:855
-#, fuzzy, c-format
-msgid "Disallowing connection to peer `%s' on transport %s\n"
-msgstr "Không thể nạp phần bổ sung truyền tải « %s »\n"
-
-#: src/transport/gnunet-service-transport.c:231
+#: src/transport/gnunet-service-transport.c:1539
 #, fuzzy
 msgid "# bytes payload discarded due to not connected peer"
 msgstr "# Các quảng cáo đồng đẳng bị hủy do trọng tải"
 
-#: src/transport/gnunet-service-transport.c:383
+#: src/transport/gnunet-service-transport.c:1698
 #, fuzzy
 msgid "# bytes total received"
 msgstr "# tổng số nội dung lỗ hổng được nhận"
 
-#: src/transport/gnunet-service-transport.c:478
+#: src/transport/gnunet-service-transport.c:1795
 #, fuzzy
 msgid "# bytes payload received"
 msgstr "# các byte đã giải mã"
 
-#: src/transport/gnunet-service-transport.c:823
+#: src/transport/gnunet-service-transport.c:2112
+#: src/transport/gnunet-service-transport.c:2584
+msgid "# disconnects due to blacklist"
+msgstr ""
+
+#: src/transport/gnunet-service-transport.c:2588
+#, fuzzy, c-format
+msgid "Disallowing connection to peer `%s' on transport %s\n"
+msgstr "Không thể nạp phần bổ sung truyền tải « %s »\n"
+
+#: src/transport/gnunet-service-transport.c:2696
+#, fuzzy, c-format
+msgid "Adding blacklisting entry for peer `%s'\n"
+msgstr "Không thể lấy địa chỉ của đồng đẳng « %s ».\n"
+
+#: src/transport/gnunet-service-transport.c:2705
+#, c-format
+msgid "Adding blacklisting entry for peer `%s':`%s'\n"
+msgstr ""
+
+#: src/transport/gnunet-service-transport.c:2770
 #, fuzzy
 msgid "Transport service is lacking key configuration settings. Exiting.\n"
 msgstr "Lưu cấu hình ngay bây giờ không?"
 
-#: src/transport/gnunet-service-transport_clients.c:523
-#, fuzzy
-msgid "# messages dropped due to slow client"
-msgstr "# các yêu cầu lỗ hổng bị bỏ do trọng tải"
-
-#: src/transport/gnunet-service-transport_clients.c:845
-msgid "# bytes payload dropped (other peer was not connected)"
-msgstr ""
-
 #: src/transport/gnunet-service-transport_hello.c:195
 msgid "# refreshed my HELLO"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:805
+#: src/transport/gnunet-service-transport_neighbours.c:804
 #, fuzzy
 msgid "# session creation failed"
 msgstr "# các khoá phiên chạy được chấp nhận"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1048
+#: src/transport/gnunet-service-transport_neighbours.c:1047
 #, fuzzy
 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:1168
+#: src/transport/gnunet-service-transport_neighbours.c:1167
 msgid "# disconnects due to quota of 0"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1311
-#: src/transport/gnunet-service-transport_neighbours.c:1764
+#: src/transport/gnunet-service-transport_neighbours.c:1310
+#: src/transport/gnunet-service-transport_neighbours.c:1763
 #, 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:1316
+#: src/transport/gnunet-service-transport_neighbours.c:1315
 #, fuzzy
 msgid "# messages transmitted to other peers"
 msgstr "# các byte kiểu %d được gửi "
 
-#: src/transport/gnunet-service-transport_neighbours.c:1322
+#: src/transport/gnunet-service-transport_neighbours.c:1321
 #, 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:1382
+#: src/transport/gnunet-service-transport_neighbours.c:1381
 msgid "# messages timed out while in transport queue"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1458
+#: src/transport/gnunet-service-transport_neighbours.c:1457
 msgid "# KEEPALIVES sent"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1494
+#: src/transport/gnunet-service-transport_neighbours.c:1493
 #, 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:1502
+#: src/transport/gnunet-service-transport_neighbours.c:1501
 #, 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:1512
+#: src/transport/gnunet-service-transport_neighbours.c:1511
 msgid "# KEEPALIVES received in good order"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1557
+#: src/transport/gnunet-service-transport_neighbours.c:1556
 #, 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:1566
+#: src/transport/gnunet-service-transport_neighbours.c:1565
 #, 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:1574
+#: src/transport/gnunet-service-transport_neighbours.c:1573
 #, 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:1583
+#: src/transport/gnunet-service-transport_neighbours.c:1582
 #, 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:1588
+#: src/transport/gnunet-service-transport_neighbours.c:1587
 #, 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:1594
+#: src/transport/gnunet-service-transport_neighbours.c:1593
 #, 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:1661
+#: src/transport/gnunet-service-transport_neighbours.c:1660
 #, 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:1695
+#: src/transport/gnunet-service-transport_neighbours.c:1694
 #, 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:1710
+#: src/transport/gnunet-service-transport_neighbours.c:1709
 msgid "# ms throttling suggested"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1830
+#: src/transport/gnunet-service-transport_neighbours.c:1829
 #, 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:1850
+#: src/transport/gnunet-service-transport_neighbours.c:1849
 #, 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:1889
+#: src/transport/gnunet-service-transport_neighbours.c:1888
 #, 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:1906
+#: src/transport/gnunet-service-transport_neighbours.c:1905
 #, 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:1936
+#: src/transport/gnunet-service-transport_neighbours.c:1935
 #, 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:2001
+#: src/transport/gnunet-service-transport_neighbours.c:2000
 #, 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:2055
+#: src/transport/gnunet-service-transport_neighbours.c:2054
 #, 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:2072
+#: src/transport/gnunet-service-transport_neighbours.c:2071
 #, 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:2228
+#: src/transport/gnunet-service-transport_neighbours.c:2227
 #, fuzzy
 msgid "# SYN messages received"
 msgstr "# các thông báo PING được tạo"
 
-#: src/transport/gnunet-service-transport_neighbours.c:2233
+#: src/transport/gnunet-service-transport_neighbours.c:2232
 #, c-format
 msgid "SYN request from peer `%s' ignored due impending shutdown\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:2599
+#: src/transport/gnunet-service-transport_neighbours.c:2598
 msgid "# Attempts to switch addresses"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3081
+#: src/transport/gnunet-service-transport_neighbours.c:3080
 #, 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:3089
+#: src/transport/gnunet-service-transport_neighbours.c:3088
 #, fuzzy
 msgid "# unexpected SYN_ACK messages (no peer)"
 msgstr "gửi ĐẾM thông báo"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3107
-#: src/transport/gnunet-service-transport_neighbours.c:3131
+#: src/transport/gnunet-service-transport_neighbours.c:3106
+#: src/transport/gnunet-service-transport_neighbours.c:3130
 #, fuzzy
 msgid "# unexpected SYN_ACK messages (not ready)"
 msgstr "gửi ĐẾM thông báo"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3143
+#: src/transport/gnunet-service-transport_neighbours.c:3142
 #, fuzzy
 msgid "# unexpected SYN_ACK messages (waiting on ATS)"
 msgstr "gửi ĐẾM thông báo"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3168
+#: src/transport/gnunet-service-transport_neighbours.c:3167
 msgid "# Successful attempts to switch addresses"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3181
+#: src/transport/gnunet-service-transport_neighbours.c:3180
 #, fuzzy
 msgid "# unexpected SYN_ACK messages (disconnecting)"
 msgstr "gửi ĐẾM thông báo"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3353
+#: src/transport/gnunet-service-transport_neighbours.c:3352
 #, 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:3389
+#: src/transport/gnunet-service-transport_neighbours.c:3388
 #, 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:3477
+#: src/transport/gnunet-service-transport_neighbours.c:3476
 #, 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:3484
+#: src/transport/gnunet-service-transport_neighbours.c:3483
 #, 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:3524
+#: src/transport/gnunet-service-transport_neighbours.c:3523
 msgid "# disconnect messages ignored (malformed)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3531
+#: src/transport/gnunet-service-transport_neighbours.c:3530
 #, 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:3542
+#: src/transport/gnunet-service-transport_neighbours.c:3541
 msgid "# disconnect messages ignored (timestamp)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3676
+#: src/transport/gnunet-service-transport_neighbours.c:3675
 #, 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"
@@ -7548,63 +7296,63 @@
 msgid "Did not load plugin `%s' due to missing functions\n"
 msgstr "Lỗi nạp phần bổ sung « %s » tại %s:%d. Đang hủy nạp phần bổ sung.\n"
 
-#: src/transport/gnunet-service-transport_validation.c:343
+#: src/transport/gnunet-service-transport_validation.c:388
 msgid "# Addresses in validation map"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:452
-#: src/transport/gnunet-service-transport_validation.c:638
-#: src/transport/gnunet-service-transport_validation.c:949
-#: src/transport/gnunet-service-transport_validation.c:1551
+#: src/transport/gnunet-service-transport_validation.c:491
+#: src/transport/gnunet-service-transport_validation.c:677
+#: src/transport/gnunet-service-transport_validation.c:988
+#: src/transport/gnunet-service-transport_validation.c:1590
 #, fuzzy
 msgid "# validations running"
 msgstr "kho dữ liệu sqlite"
 
-#: src/transport/gnunet-service-transport_validation.c:493
+#: src/transport/gnunet-service-transport_validation.c:532
 #, fuzzy
 msgid "# address records discarded (timeout)"
 msgstr "# các byte loại đi bởi TCP (đi ra)"
 
-#: src/transport/gnunet-service-transport_validation.c:541
+#: src/transport/gnunet-service-transport_validation.c:580
 msgid "# address records discarded (blacklist)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:629
+#: src/transport/gnunet-service-transport_validation.c:668
 msgid "# PINGs for address validation sent"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:709
+#: src/transport/gnunet-service-transport_validation.c:748
 msgid "# validations delayed by global throttle"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:746
+#: src/transport/gnunet-service-transport_validation.c:785
 msgid "# address revalidations started"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1075
+#: src/transport/gnunet-service-transport_validation.c:1114
 #, fuzzy
 msgid "# PING message for different peer received"
 msgstr "# các thông báo PING được tạo"
 
-#: src/transport/gnunet-service-transport_validation.c:1126
+#: src/transport/gnunet-service-transport_validation.c:1165
 #, c-format
 msgid "Plugin `%s' not available, cannot confirm having this address\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1139
+#: src/transport/gnunet-service-transport_validation.c:1178
 msgid "# failed address checks during validation"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1142
+#: src/transport/gnunet-service-transport_validation.c:1181
 #, c-format
 msgid "Address `%s' is not one of my addresses, not confirming PING\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1150
+#: src/transport/gnunet-service-transport_validation.c:1189
 msgid "# successful address checks during validation"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1163
+#: src/transport/gnunet-service-transport_validation.c:1202
 #, c-format
 msgid ""
 "Not confirming PING from peer `%s' with address `%s' since I cannot confirm "
@@ -7611,121 +7359,101 @@
 "having this address.\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1218
+#: src/transport/gnunet-service-transport_validation.c:1257
 #, fuzzy, c-format
 msgid "Failed to create PONG signature for peer `%s'\n"
 msgstr "Không thể tạo miền tên.\n"
 
-#: src/transport/gnunet-service-transport_validation.c:1269
+#: src/transport/gnunet-service-transport_validation.c:1308
 msgid "# PONGs unicast via reliable transport"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1278
+#: src/transport/gnunet-service-transport_validation.c:1317
 msgid "# PONGs multicast to all available addresses"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1441
+#: src/transport/gnunet-service-transport_validation.c:1480
 msgid "# PONGs dropped, no matching pending validation"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1459
+#: src/transport/gnunet-service-transport_validation.c:1498
 msgid "# PONGs dropped, signature expired"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1514
+#: src/transport/gnunet-service-transport_validation.c:1553
 msgid "# validations succeeded"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:558
+#: src/transport/gnunet-transport.c:518
 #, 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:567
-#: src/transport/gnunet-transport-profiler.c:277
+#: src/transport/gnunet-transport.c:528
 #, 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:608
+#: src/transport/gnunet-transport.c:572
 #, 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:621
+#: src/transport/gnunet-transport.c:585
 #, 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:633
+#: src/transport/gnunet-transport.c:597
 #, 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:658 src/transport/gnunet-transport.c:683
+#: src/transport/gnunet-transport.c:622 src/transport/gnunet-transport.c:647
 #, fuzzy, c-format
 msgid "Configuration for plugin `%s' did not work!\n"
 msgstr "Tập tin cấu hình « %s » đã được ghi.\n"
 
-#: src/transport/gnunet-transport.c:663
+#: src/transport/gnunet-transport.c:627
 #, fuzzy, c-format
 msgid "Configuration for plugin `%s' did work!\n"
 msgstr "Tập tin cấu hình « %s » đã được ghi.\n"
 
-#: src/transport/gnunet-transport.c:668
+#: src/transport/gnunet-transport.c:632
 #, fuzzy, c-format
 msgid "Internal NAT error while running test for plugin `%s'\n"
 msgstr "=\tLỗi đọc thư mục.\n"
 
-#: src/transport/gnunet-transport.c:673
+#: src/transport/gnunet-transport.c:637
 #, fuzzy, c-format
 msgid "Failed to start NAT test for plugin `%s'\n"
 msgstr "Lỗi bắt đầu thu thập.\n"
 
-#: src/transport/gnunet-transport.c:678
+#: src/transport/gnunet-transport.c:642
 #, c-format
 msgid "Timeout while waiting for result of NAT test for plugin `%s'\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:803
-#, fuzzy, c-format
-msgid ""
-"Peer `%s' %s %s\n"
-"\t%s%s\n"
-"\t%s%s\n"
-"\t%s%s\n"
-msgstr "Tôi là đồng đẳng « %s ».\n"
-
-#: src/transport/gnunet-transport.c:838
-#, fuzzy, c-format
-msgid "Peer `%s' %s `%s' \n"
-msgstr "Tôi là đồng đẳng « %s ».\n"
-
-#: src/transport/gnunet-transport.c:927 src/transport/gnunet-transport.c:1673
-#, fuzzy
-msgid "Monitor disconnected from transport service. Reconnecting.\n"
-msgstr "Lỗi kết nối đến gnunetd.\n"
-
-#: src/transport/gnunet-transport.c:982
+#: src/transport/gnunet-transport.c:735
 msgid "No transport plugins configured, peer will never communicate\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:996
+#: src/transport/gnunet-transport.c:749
 #, c-format
 msgid "No port configured for plugin `%s', cannot test it\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1021
+#: src/transport/gnunet-transport.c:774
 #, fuzzy
 msgid "Failed to start resolver!\n"
 msgstr "Lỗi bắt đầu thu thập.\n"
 
-#: src/transport/gnunet-transport.c:1067
+#: src/transport/gnunet-transport.c:810
 #, fuzzy, c-format
-msgid "Transmitting %u bytes to %s\n"
+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:1096
+#: src/transport/gnunet-transport.c:844
 #, c-format
 msgid ""
 "Successfully connected to `%s', starting to send benchmark data in %u Kb "
@@ -7732,44 +7460,47 @@
 "blocks\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1133
-#: src/transport/gnunet-transport-profiler.c:432
+#: src/transport/gnunet-transport.c:875
 #, 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:1158 src/transport/gnunet-transport.c:1184
+#: src/transport/gnunet-transport.c:899 src/transport/gnunet-transport.c:928
 #, c-format
 msgid "%24s: %-17s %4s   (%u connections in total)\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1160
+#: src/transport/gnunet-transport.c:901
 #, fuzzy
 msgid "Connected to"
 msgstr "« %s » được kết nối tới « %s ».\n"
 
-#: src/transport/gnunet-transport.c:1186
+#: src/transport/gnunet-transport.c:930
 #, fuzzy
 msgid "Disconnected from"
 msgstr "« %.*s » được kết nối tới « %.*s ».\n"
 
-#: src/transport/gnunet-transport.c:1210
-#: src/transport/gnunet-transport-profiler.c:457
+#: src/transport/gnunet-transport.c:965
 #, fuzzy, c-format
-msgid "Received %u bytes from %s\n"
+msgid "Received %u bytes\n"
 msgstr "Nhận yêu cầu định tuyến\n"
 
-#: src/transport/gnunet-transport.c:1250
+#: src/transport/gnunet-transport.c:1002
 #, c-format
 msgid "Peer `%s': %s %s in state `%s' until %s\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1262
+#: src/transport/gnunet-transport.c:1014
 #, fuzzy, c-format
 msgid "Peer `%s': %s %s\n"
 msgstr "Tôi là đồng đẳng « %s ».\n"
 
-#: src/transport/gnunet-transport.c:1792
+#: src/transport/gnunet-transport.c:1426
+#, fuzzy
+msgid "Monitor disconnected from transport service. Reconnecting.\n"
+msgstr "Lỗi kết nối đến gnunetd.\n"
+
+#: src/transport/gnunet-transport.c:1548
 #, c-format
 msgid ""
 "Multiple operations given. Please choose only one operation: %s, %s, %s, %s, "
@@ -7776,225 +7507,144 @@
 "%s, %s %s\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1800
+#: src/transport/gnunet-transport.c:1561
 #, c-format
 msgid ""
 "No operation given. Please choose one operation: %s, %s, %s, %s, %s, %s, %s\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1823
+#: src/transport/gnunet-transport.c:1589
 #, 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:1829
+#: src/transport/gnunet-transport.c:1595
 msgid "Blacklisting request in place, stop with CTRL-C\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1848 src/transport/gnunet-transport.c:1867
-#: src/transport/gnunet-transport.c:1925
-#: src/transport/gnunet-transport-profiler.c:553
+#: src/transport/gnunet-transport.c:1618 src/transport/gnunet-transport.c:1648
+#: src/transport/gnunet-transport.c:1701
 #, fuzzy
 msgid "Failed to connect to transport service\n"
 msgstr "Lỗi kết nối đến gnunetd.\n"
 
-#: src/transport/gnunet-transport.c:1872
+#: src/transport/gnunet-transport.c:1655
 msgid "Starting to receive benchmark data\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1972
+#: src/transport/gnunet-transport.c:1725
 #, 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:1975
+#: src/transport/gnunet-transport.c:1728
 msgid "measure how fast we are receiving data from all peers (until CTRL-C)"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1978
+#: src/transport/gnunet-transport.c:1731
 #, fuzzy
 msgid "disconnect from a peer"
 msgstr "Lỗi kết nối đến gnunetd.\n"
 
-#: src/transport/gnunet-transport.c:1981
+#: src/transport/gnunet-transport.c:1734
 #, fuzzy
-msgid "print information for all pending validations "
-msgstr "In ra thông tin về các đồng đẳng GNUnet."
-
-#: src/transport/gnunet-transport.c:1984
-#, fuzzy
-msgid "print information for all pending validations continuously"
-msgstr "In ra thông tin về các đồng đẳng GNUnet."
-
-#: src/transport/gnunet-transport.c:1987
-#, fuzzy
 msgid "provide information about all current connections (once)"
 msgstr "In ra thông tin về các đồng đẳng GNUnet."
 
-#: src/transport/gnunet-transport.c:1993
+#: src/transport/gnunet-transport.c:1740
 #, 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:1996
+#: src/transport/gnunet-transport.c:1743
 #, fuzzy
 msgid "do not resolve hostnames"
 msgstr "không quyết định các tên máy"
 
-#: src/transport/gnunet-transport.c:1999
-#: src/transport/gnunet-transport-profiler.c:618
+#: src/transport/gnunet-transport.c:1746
+#: src/transport/gnunet-transport-profiler.c:631
 msgid "peer identity"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:2002
+#: src/transport/gnunet-transport.c:1749
 msgid "monitor plugin sessions"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:2005
+#: src/transport/gnunet-transport.c:1752
 msgid "send data for benchmarking to the other peer (until CTRL-C)"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:2008
+#: src/transport/gnunet-transport.c:1755
 msgid "test transport configuration (involves external server)"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:2019
-#: src/transport/gnunet-transport-profiler.c:629
+#: src/transport/gnunet-transport.c:1766
+#: src/transport/gnunet-transport-profiler.c:642
 #, fuzzy
 msgid "Direct access to transport service."
 msgstr "Lỗi kết nối đến gnunetd.\n"
 
-#: src/transport/gnunet-transport-profiler.c:221
+#: src/transport/gnunet-transport-profiler.c:219
 #, c-format
 msgid "%llu B in %llu ms == %.2f KB/s!\n"
 msgstr ""
 
-#: src/transport/gnunet-transport-profiler.c:257
-#, c-format
-msgid "%u;%u;%llu;%llu;%.2f;%.2f"
-msgstr ""
-
-#: src/transport/gnunet-transport-profiler.c:266
-#, c-format
-msgid ";%llu;%.2f"
-msgstr ""
-
-#: src/transport/gnunet-transport-profiler.c:283
-msgid "\n"
-msgstr ""
-
-#: src/transport/gnunet-transport-profiler.c:336
-msgid "."
-msgstr ""
-
-#: src/transport/gnunet-transport-profiler.c:356
-#, c-format
-msgid ""
-"\n"
-"Starting benchmark to `%s', starting to send %u messages in %u byte blocks\n"
-msgstr ""
-
-#: src/transport/gnunet-transport-profiler.c:404
-#, fuzzy, c-format
-msgid "Connected to different peer `%s'\n"
-msgstr "« %s » được kết nối tới « %s ».\n"
-
-#: src/transport/gnunet-transport-profiler.c:411
-#, fuzzy, c-format
-msgid "Successfully connected to `%s'\n"
-msgstr "Không đủ quyền cho « %s ».\n"
-
-#: src/transport/gnunet-transport-profiler.c:473
-#, fuzzy, c-format
-msgid "Denying connection to `%s'\n"
-msgstr "Không thể kết nối tới %s:%u: %s\n"
-
-#: src/transport/gnunet-transport-profiler.c:503
-#, fuzzy
-msgid "Message size too big!\n"
-msgstr "kích cỡ tin nhắn"
-
-#: src/transport/gnunet-transport-profiler.c:509
-#, fuzzy
-msgid "No peer identity given\n"
-msgstr "chưa đưa ra tên"
-
-#: src/transport/gnunet-transport-profiler.c:524
-#, fuzzy, c-format
-msgid "Trying to send %u messages with size %u to peer `%s'\n"
-msgstr "Sử dụng %u thông báo với kích cỡ %u trong %u lần.\n"
-
-#: src/transport/gnunet-transport-profiler.c:530
-#, fuzzy, c-format
-msgid "Trying to receive messages from peer `%s'\n"
-msgstr "Lỗi đọc danh sách bạn bè từ « %s »\n"
-
-#: src/transport/gnunet-transport-profiler.c:535
-#, fuzzy
-msgid "No operation given\n"
-msgstr "chưa đưa ra tên"
-
-#: src/transport/gnunet-transport-profiler.c:542
-#, fuzzy
-msgid "Failed to connect to ATS service\n"
-msgstr "Lỗi kết nối đến gnunetd.\n"
-
-#: src/transport/gnunet-transport-profiler.c:603
+#: src/transport/gnunet-transport-profiler.c:616
 msgid "send data to peer"
 msgstr ""
 
-#: src/transport/gnunet-transport-profiler.c:606
+#: src/transport/gnunet-transport-profiler.c:619
 #, 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:609
+#: src/transport/gnunet-transport-profiler.c:622
 #, fuzzy
 msgid "iterations"
 msgstr "Tùy chọn chung"
 
-#: src/transport/gnunet-transport-profiler.c:612
+#: src/transport/gnunet-transport-profiler.c:625
 #, 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:615
+#: src/transport/gnunet-transport-profiler.c:628
 #, fuzzy
 msgid "message size to use"
 msgstr "kích cỡ tin nhắn"
 
-#: src/transport/plugin_transport_http_client.c:1473
-#: src/transport/plugin_transport_http_server.c:2237
-#: src/transport/plugin_transport_http_server.c:3427
-#: src/transport/plugin_transport_tcp.c:2985
-#: src/transport/plugin_transport_tcp.c:2992
+#: src/transport/plugin_transport_http_client.c:1477
+#: src/transport/plugin_transport_http_server.c:2248
+#: src/transport/plugin_transport_http_server.c:3457
+#: src/transport/plugin_transport_tcp.c:3365
+#: src/transport/plugin_transport_tcp.c:3372
 msgid "TCP_STEALTH not supported on this platform.\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_client.c:2114
+#: src/transport/plugin_transport_http_client.c:2118
 #, c-format
 msgid "Could not initialize curl multi handle, failed to start %s plugin!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_client.c:2163
-#: src/transport/plugin_transport_http_server.c:3142
+#: src/transport/plugin_transport_http_client.c:2167
+#: src/transport/plugin_transport_http_server.c:3172
 #, 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:2180
-#: src/transport/plugin_transport_http_server.c:3212
+#: src/transport/plugin_transport_http_client.c:2184
+#: src/transport/plugin_transport_http_server.c:3242
 #, 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:2214
+#: src/transport/plugin_transport_http_client.c:2218
 #, 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:1721
+#: src/transport/plugin_transport_http_server.c:1729
 #, c-format
 msgid ""
 "Access from connection %p (%u of %u) for `%s' `%s' url `%s' with upload data "
@@ -8001,72 +7651,62 @@
 "size %u\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:1955
+#: src/transport/plugin_transport_http_server.c:1966
 #, c-format
 msgid "Accepting connection (%u of %u) from `%s'\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:1963
+#: src/transport/plugin_transport_http_server.c:1974
 #, c-format
 msgid ""
 "Server reached maximum number connections (%u), rejecting new connection\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:2113
+#: src/transport/plugin_transport_http_server.c:2124
 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:2136
+#: src/transport/plugin_transport_http_server.c:2147
 #, c-format
 msgid "No usable TLS certificate found and creating one at `%s/%s' failed!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:2263
+#: src/transport/plugin_transport_http_server.c:2274
 msgid "Could not load or create server certificate! Loading plugin failed!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:2572
+#: src/transport/plugin_transport_http_server.c:2583
 #, 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:2606 src/util/service.c:704
-#, fuzzy, c-format
-msgid "Failed to resolve `%s': %s\n"
-msgstr "Lỗi mở tập tin ghi sự kiện « %s »: %s\n"
-
-#: src/transport/plugin_transport_http_server.c:2624 src/util/service.c:723
-#, fuzzy, c-format
-msgid "Failed to find %saddress for `%s'.\n"
-msgstr "Lỗi đóng kết đến cổng %s %d.\n"
-
-#: src/transport/plugin_transport_http_server.c:2737
+#: src/transport/plugin_transport_http_server.c:2748
 #, c-format
 msgid "Found %u addresses to report to NAT service\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:2815
+#: src/transport/plugin_transport_http_server.c:2832
 #: src/transport/plugin_transport_udp.c:3600
 msgid "Disabling IPv6 since it is not supported on this system!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:2918
+#: src/transport/plugin_transport_http_server.c:2938
 #, c-format
 msgid "IPv4 support is %s\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:2933
+#: src/transport/plugin_transport_http_server.c:2953
 #, c-format
 msgid "IPv6 support is %s\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:2939
+#: src/transport/plugin_transport_http_server.c:2959
 msgid "Neither IPv4 nor IPv6 are enabled! Fix in configuration\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:2950
+#: src/transport/plugin_transport_http_server.c:2970
 #, fuzzy
 msgid "Port is required! Fix in configuration\n"
 msgstr ""
@@ -8073,47 +7713,37 @@
 "\n"
 "Kết thúc cấu hình.\n"
 
-#: src/transport/plugin_transport_http_server.c:2956
+#: src/transport/plugin_transport_http_server.c:2976
 #, 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:2970
+#: src/transport/plugin_transport_http_server.c:2995
 #, 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:2980
+#: src/transport/plugin_transport_http_server.c:3030
 #, fuzzy, c-format
-msgid "Binding to IPv4 address %s\n"
-msgstr "Mức ưu tiên tiến trình không hợp lê « %s ».\n"
-
-#: src/transport/plugin_transport_http_server.c:3002
-#, fuzzy, c-format
 msgid "Specific IPv6 address `%s' in configuration file is invalid!\n"
 msgstr "Đang thử dùng tập tin « %s » cho cấu hình MySQL.\n"
 
-#: src/transport/plugin_transport_http_server.c:3012
+#: src/transport/plugin_transport_http_server.c:3105
 #, fuzzy, c-format
-msgid "Binding to IPv6 address %s\n"
-msgstr "Mức ưu tiên tiến trình không hợp lê « %s ».\n"
-
-#: src/transport/plugin_transport_http_server.c:3075
-#, fuzzy, c-format
 msgid "Using external hostname `%s'\n"
 msgstr "Đang bắt đầu tài về « %s »\n"
 
-#: src/transport/plugin_transport_http_server.c:3096
+#: src/transport/plugin_transport_http_server.c:3126
 #, 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:3113
+#: src/transport/plugin_transport_http_server.c:3143
 #, 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:3439
+#: src/transport/plugin_transport_http_server.c:3469
 #, fuzzy
 msgid "Unable to compile URL regex\n"
 msgstr "Không thể sơ khởi SQLite: %s.\n"
@@ -8160,110 +7790,104 @@
 msgid "# bytes dropped by SMTP (outgoing)"
 msgstr "# các byte loại đi bởi SMTP (đi ra)"
 
-#: src/transport/plugin_transport_tcp.c:672
-#: src/transport/plugin_transport_tcp.c:1983
+#: src/transport/plugin_transport_tcp.c:1051
+#: src/transport/plugin_transport_tcp.c:2362
 #, 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:855
-#: src/transport/plugin_transport_tcp.c:1079
-#: src/transport/plugin_transport_tcp.c:2253
-#: src/transport/plugin_transport_tcp.c:3106
+#: src/transport/plugin_transport_tcp.c:1234
+#: src/transport/plugin_transport_tcp.c:1458
+#: src/transport/plugin_transport_tcp.c:2633
+#: src/transport/plugin_transport_tcp.c:3490
 #, fuzzy
 msgid "# TCP sessions active"
 msgstr "# các khoá phiên chạy được chấp nhận"
 
-#: src/transport/plugin_transport_tcp.c:897
-#: src/transport/plugin_transport_tcp.c:1061
-#: src/transport/plugin_transport_tcp.c:1185
-#: src/transport/plugin_transport_tcp.c:1258
-#: src/transport/plugin_transport_tcp.c:1358
-#: src/transport/plugin_transport_tcp.c:1383
+#: src/transport/plugin_transport_tcp.c:1276
+#: src/transport/plugin_transport_tcp.c:1440
+#: src/transport/plugin_transport_tcp.c:1564
+#: src/transport/plugin_transport_tcp.c:1637
+#: src/transport/plugin_transport_tcp.c:1737
+#: src/transport/plugin_transport_tcp.c:1762
 #, fuzzy
 msgid "# bytes currently in TCP buffers"
 msgstr "# các byte đã gừi qua TCP"
 
-#: src/transport/plugin_transport_tcp.c:900
+#: src/transport/plugin_transport_tcp.c:1279
 #, 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:1188
+#: src/transport/plugin_transport_tcp.c:1567
 #, 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:1262
+#: src/transport/plugin_transport_tcp.c:1641
 #, fuzzy
 msgid "# bytes transmitted via TCP"
 msgstr "# các byte được gửi"
 
-#: src/transport/plugin_transport_tcp.c:1653
+#: src/transport/plugin_transport_tcp.c:2032
 msgid "# requests to create session with invalid address"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:1821
+#: src/transport/plugin_transport_tcp.c:2200
 msgid "# transport-service disconnect requests for TCP"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2312
+#: src/transport/plugin_transport_tcp.c:2692
 #, 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:2503
+#: src/transport/plugin_transport_tcp.c:2883
 msgid "# bytes received via TCP"
 msgstr "# các byte đã nhận qua TCP"
 
-#: src/transport/plugin_transport_tcp.c:2554
-#: src/transport/plugin_transport_tcp.c:2612
+#: src/transport/plugin_transport_tcp.c:2934
+#: src/transport/plugin_transport_tcp.c:2992
 #, fuzzy
 msgid "# TCP server connections active"
 msgstr "# các kết nối dht"
 
-#: src/transport/plugin_transport_tcp.c:2558
+#: src/transport/plugin_transport_tcp.c:2938
 #, fuzzy
 msgid "# TCP server connect events"
 msgstr "# của các đồng đẳng đã kết nối"
 
-#: src/transport/plugin_transport_tcp.c:2564
+#: src/transport/plugin_transport_tcp.c:2944
 msgid "TCP connection limit reached, suspending server\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2566
+#: src/transport/plugin_transport_tcp.c:2946
 msgid "# TCP service suspended"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2606
+#: src/transport/plugin_transport_tcp.c:2986
 msgid "# TCP service resumed"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2616
+#: src/transport/plugin_transport_tcp.c:2996
 msgid "# network-level TCP disconnect events"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2919 src/util/service.c:584
-#: src/util/service.c:590
-#, c-format
-msgid "Require valid port number for service `%s' in configuration!\n"
-msgstr ""
-
-#: src/transport/plugin_transport_tcp.c:2935
+#: src/transport/plugin_transport_tcp.c:3315
 #, fuzzy
 msgid "Failed to start service.\n"
 msgstr "Lỗi bắt đầu thu thập.\n"
 
-#: src/transport/plugin_transport_tcp.c:3094
+#: src/transport/plugin_transport_tcp.c:3478
 #, c-format
 msgid "TCP transport listening on port %llu\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:3098
+#: src/transport/plugin_transport_tcp.c:3482
 msgid "TCP transport not listening on any port (client only)\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:3102
+#: src/transport/plugin_transport_tcp.c:3486
 #, c-format
 msgid "TCP transport advertises itself as being on port %llu\n"
 msgstr ""
@@ -8373,7 +7997,7 @@
 
 #: src/transport/plugin_transport_wlan.c:1167
 #: src/transport/plugin_transport_wlan.c:1258
-#: src/transport/plugin_transport_wlan.c:2279
+#: src/transport/plugin_transport_wlan.c:2280
 #, fuzzy
 msgid "# MAC endpoints allocated"
 msgstr "# các yêu cầu get (lấy) dht được nhận"
@@ -8403,136 +8027,103 @@
 msgid "# DATA messages processed"
 msgstr "# các thông báo PONG đã mật mã được nhận"
 
-#: src/transport/plugin_transport_wlan.c:2254
+#: src/transport/plugin_transport_wlan.c:2255
 #, c-format
 msgid "Helper binary `%s' not SUID, cannot run WLAN transport\n"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:2276
+#: src/transport/plugin_transport_wlan.c:2277
 #, fuzzy
 msgid "# sessions allocated"
 msgstr "# các khoá phiên chạy được chấp nhận"
 
-#: src/transport/transport_api.c:816
-#, fuzzy, c-format
-msgid "Received unexpected message of type %u in %s:%u\n"
-msgstr "Nhận được thông báo bị hỏng từ đồng đẳng « %s » trong %s:%d.\n"
-
-#: src/transport/transport-testing.c:676
-#, fuzzy
-msgid "Failed to initialize testing library!\n"
-msgstr "Lỗi sơ khởi dịch vụ « %s ».\n"
-
 #: src/tun/regex.c:134
 #, c-format
 msgid "Bad mask: %d\n"
 msgstr ""
 
-#: src/util/bio.c:170 src/util/bio.c:178
+#: src/util/bio.c:177 src/util/bio.c:185
 #, fuzzy, c-format
 msgid "Error reading `%s': %s"
 msgstr "Gặp lỗi khi tạo người dùng"
 
-#: src/util/bio.c:180
+#: src/util/bio.c:187
 msgid "End of file"
 msgstr ""
 
-#: src/util/bio.c:237
+#: src/util/bio.c:244
 #, c-format
 msgid "Error reading length of string `%s'"
 msgstr ""
 
-#: src/util/bio.c:247
+#: src/util/bio.c:254
 #, c-format
 msgid "String `%s' longer than allowed (%u > %u)"
 msgstr ""
 
-#: src/util/bio.c:293
+#: src/util/bio.c:300
 #, c-format
 msgid "Serialized metadata `%s' larger than allowed (%u>%u)"
 msgstr ""
 
-#: src/util/bio.c:307
+#: src/util/bio.c:314
 #, c-format
 msgid "Metadata `%s' failed to deserialize"
 msgstr ""
 
-#: src/util/client.c:264 src/util/client.c:892 src/util/service.c:621
+#: src/util/client_new.c:863
 #, c-format
-msgid "UNIXPATH `%s' too long, maximum length is %llu\n"
-msgstr ""
-
-#: src/util/client.c:268 src/util/client.c:897 src/util/service.c:625
-#, fuzzy, c-format
-msgid "Using `%s' instead\n"
-msgstr "%s: tùy chọn « %s » là mơ hồ\n"
-
-#: src/util/client.c:367
-#, c-format
-msgid ""
-"Could not determine valid hostname and port for service `%s' from "
-"configuration.\n"
-msgstr ""
-
-#: src/util/client.c:375
-#, c-format
 msgid "Need a non-empty hostname for service `%s'.\n"
 msgstr ""
 
-#: src/util/client.c:1042
-#, fuzzy, c-format
-msgid "Could not connect to service `%s', configuration broken.\n"
-msgstr "Không thể kết nối tới %s:%u: %s\n"
-
-#: src/util/client.c:1054
-#, fuzzy, c-format
-msgid "Failure to transmit request to service `%s'\n"
-msgstr "Lỗi đọc danh sách bạn bè từ « %s »\n"
-
-#: src/util/common_logging.c:255 src/util/common_logging.c:1062
+#: src/util/common_logging.c:256 src/util/common_logging.c:1129
 msgid "DEBUG"
 msgstr "GỠ LỖI"
 
-#: src/util/common_logging.c:257 src/util/common_logging.c:1060
+#: src/util/common_logging.c:258 src/util/common_logging.c:1127
 msgid "INFO"
 msgstr "TIN"
 
-#: src/util/common_logging.c:259 src/util/common_logging.c:1058
+#: src/util/common_logging.c:260 src/util/common_logging.c:1125
+msgid "MESSAGE"
+msgstr ""
+
+#: src/util/common_logging.c:262 src/util/common_logging.c:1123
 msgid "WARNING"
 msgstr "CẢNH BÁO"
 
-#: src/util/common_logging.c:261 src/util/common_logging.c:1056
+#: src/util/common_logging.c:264 src/util/common_logging.c:1121
 msgid "ERROR"
 msgstr "LỖI"
 
-#: src/util/common_logging.c:263 src/util/common_logging.c:1064
+#: src/util/common_logging.c:266 src/util/common_logging.c:1131
 msgid "NONE"
 msgstr ""
 
-#: src/util/common_logging.c:840
+#: src/util/common_logging.c:879
 #, fuzzy, c-format
 msgid "Message `%.*s' repeated %u times in the last %s\n"
 msgstr "Thông điệp « %.*s » đã lặp lại %u lần trong %llu giây trước\n"
 
-#: src/util/common_logging.c:1065
+#: src/util/common_logging.c:1132
 msgid "INVALID"
 msgstr ""
 
-#: src/util/common_logging.c:1181
+#: src/util/common_logging.c:1248
 msgid "unknown address"
 msgstr ""
 
-#: src/util/common_logging.c:1223
+#: src/util/common_logging.c:1290
 msgid "invalid address"
 msgstr ""
 
-#: src/util/common_logging.c:1241
+#: src/util/common_logging.c:1308
 #, fuzzy, c-format
 msgid "Configuration fails to specify option `%s' in section `%s'!\n"
 msgstr ""
 "Cấu hình không thỏa mãn các ràng buộc của tập tin đặc tả cấu hình « %s ».\n"
 
-#: src/util/common_logging.c:1262
+#: src/util/common_logging.c:1329
 #, fuzzy, c-format
 msgid ""
 "Configuration specifies invalid value for option `%s' in section `%s': %s\n"
@@ -8539,12 +8130,17 @@
 msgstr ""
 "Cấu hình không thỏa mãn các ràng buộc của tập tin đặc tả cấu hình « %s ».\n"
 
-#: src/util/configuration.c:291
+#: src/util/configuration.c:286
 #, fuzzy, c-format
 msgid "Syntax error while deserializing in line %u\n"
 msgstr "Gặp lỗi cú pháp trong tập tin cấu hình « %s » tại dòng %d.\n"
 
-#: src/util/configuration.c:1028
+#: src/util/configuration.c:344
+#, fuzzy, c-format
+msgid "Error while reading file `%s'\n"
+msgstr "Gặp lỗi khi tải xuống: %s\n"
+
+#: src/util/configuration.c:1017
 #, c-format
 msgid ""
 "Configuration value '%s' for '%s' in section '%s' is not in set of legal "
@@ -8553,17 +8149,17 @@
 "Giá trị cấu hình « %s » cho « %s » trong phần « %s » không phải nằm trong "
 "tập hợp các sự chọn được phép\n"
 
-#: src/util/configuration.c:1147
+#: src/util/configuration.c:1136
 #, c-format
 msgid "Recursive expansion suspected, aborting $-expansion for term `%s'\n"
 msgstr ""
 
-#: src/util/configuration.c:1179
+#: src/util/configuration.c:1169
 #, fuzzy, c-format
 msgid "Missing closing `%s' in 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/configuration.c:1253
+#: src/util/configuration.c:1237
 #, c-format
 msgid ""
 "Failed to expand `%s' in `%s' as it is neither found in [PATHS] nor defined "
@@ -8642,17 +8238,22 @@
 msgid "libgcrypt has not the expected version (version %s is required).\n"
 msgstr "libgcrypt không có phiên bản mong đợi (yêu cầu phiên bản %s).\n"
 
-#: src/util/crypto_rsa.c:1146
+#: src/util/crypto_rsa.c:835
+#, fuzzy, c-format
+msgid "RSA signing failed at %s:%d: %s\n"
+msgstr "%s bị lỗi tại %s:%d: « %s »\n"
+
+#: src/util/crypto_rsa.c:1166
 #, c-format
 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:1227
+#: src/util/disk.c:1245
 #, 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:1450 src/util/service.c:1322
+#: src/util/disk.c:1486 src/util/service.c:1322 src/util/service_new.c:1371
 #, 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"
@@ -8900,13 +8501,13 @@
 msgid "Manipulate GNUnet proof of work files"
 msgstr "cập nhật một giá trị trong tập tin cấu hình"
 
-#: src/util/gnunet-service-resolver.c:327
+#: src/util/gnunet-service-resolver.c:371
 #, c-format
 msgid "Could not resolve `%s' (%s): %s\n"
 msgstr "Không thể giải quyết « %s » (%s): %s\n"
 
-#: src/util/gnunet-service-resolver.c:401
-#: src/util/gnunet-service-resolver.c:442
+#: src/util/gnunet-service-resolver.c:460
+#: src/util/gnunet-service-resolver.c:512
 #, c-format
 msgid "Could not find IP of host `%s': %s\n"
 msgstr "Không tìm thấy địa chỉ IP của máy « %s »: %s\n"
@@ -8955,7 +8556,7 @@
 msgid "Unable to shorten unix path `%s' while keeping name unique\n"
 msgstr ""
 
-#: src/util/network.c:1731 src/util/network.c:1907
+#: src/util/network.c:1737 src/util/network.c:1913
 #, c-format
 msgid ""
 "Fatal internal logic error, process hangs in `%s' (abort with CTRL-C)!\n"
@@ -9003,17 +8604,17 @@
 msgid "Could not determine plugin installation path.\n"
 msgstr "Không thể truy cập đến thông tin về không gian tên.\n"
 
-#: src/util/program.c:244 src/util/service.c:1456
+#: src/util/program.c:244 src/util/service.c:1456 src/util/service_new.c:1801
 #, 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/program.c:256 src/util/service.c:1471 src/util/service_new.c:1818
 #, 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/program.c:261 src/util/service.c:1466 src/util/service_new.c:1812
 #, fuzzy
 msgid "Malformed configuration, exit ...\n"
 msgstr "Không thể lưu tập tin cấu hình « %s »:"
@@ -9031,37 +8632,37 @@
 "resolution will be unavailable.\n"
 msgstr ""
 
-#: src/util/resolver_api.c:357
+#: src/util/resolver_api.c:815
 #, fuzzy, c-format
+msgid "Timeout trying to resolve hostname `%s'.\n"
+msgstr "không quyết định các tên máy"
+
+#: src/util/resolver_api.c:827
+#, fuzzy, c-format
 msgid "Timeout trying to resolve IP address `%s'.\n"
 msgstr "GNUnet bây giờ sử dụng địa chỉ IP %s.\n"
 
-#: src/util/resolver_api.c:364
-#, fuzzy, c-format
-msgid "Timeout trying to resolve hostname `%s'.\n"
-msgstr "không quyết định các tên máy"
-
-#: src/util/resolver_api.c:950
+#: src/util/resolver_api.c:1004
 msgid "Resolver not configured correctly.\n"
 msgstr ""
 
-#: src/util/resolver_api.c:1026 src/util/resolver_api.c:1047
-#: src/util/resolver_api.c:1061
+#: src/util/resolver_api.c:1086 src/util/resolver_api.c:1107
+#: src/util/resolver_api.c:1121
 #, fuzzy, c-format
 msgid "Could not resolve our FQDN: %s\n"
 msgstr "Không thể giải quyết « %s » (%s): %s\n"
 
-#: src/util/server.c:478
+#: src/util/server.c:478 src/util/service_new.c:1103
 #, 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/server.c:488 src/util/service_new.c:1113
 #, 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/server.c:494 src/util/service_new.c:1119
 #, 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"
@@ -9073,7 +8674,7 @@
 "`GNUNET_SERVER_receive_done' after %s\n"
 msgstr ""
 
-#: src/util/service.c:347
+#: src/util/service.c:347 src/util/service_new.c:2335
 #, fuzzy, c-format
 msgid "Unknown address family %d\n"
 msgstr "\tKhông rõ miền tên « %s »\n"
@@ -9083,44 +8684,26 @@
 msgid "Access from `%s' denied to service `%s'\n"
 msgstr ""
 
-#: src/util/service.c:410
+#: src/util/service.c:410 src/util/service_new.c:431
 #, c-format
 msgid "Could not parse IPv4 network specification `%s' for `%s:%s'\n"
 msgstr ""
 
-#: src/util/service.c:448
+#: src/util/service.c:448 src/util/service_new.c:474
 #, c-format
 msgid "Could not parse IPv6 network specification `%s' for `%s:%s'\n"
 msgstr ""
 
-#: src/util/service.c:565
-#, c-format
-msgid ""
-"Disabling IPv6 support for service `%s', failed to create IPv6 socket: %s\n"
-msgstr ""
-
-#: src/util/service.c:656
-#, c-format
-msgid ""
-"Disabling UNIX domain socket support for service `%s', failed to create UNIX "
-"domain socket: %s\n"
-msgstr ""
-
-#: src/util/service.c:673
-#, c-format
-msgid "Have neither PORT nor UNIXPATH for service `%s', but one is required\n"
-msgstr ""
-
-#: src/util/service.c:912
+#: src/util/service.c:912 src/util/service_new.c:1034
 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.c:961 src/util/service.c:979 src/util/service_new.c:1186
 #, c-format
 msgid "Specified value for `%s' of service `%s' is invalid\n"
 msgstr ""
 
-#: src/util/service.c:1004
+#: src/util/service.c:1004 src/util/service_new.c:1218
 #, c-format
 msgid "Could not access pre-bound socket %u, will try to bind myself\n"
 msgstr ""
@@ -9135,31 +8718,43 @@
 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.c:1260 src/util/service_new.c:1493
 msgid "Service process failed to initialize\n"
 msgstr ""
 
-#: src/util/service.c:1264
+#: src/util/service.c:1264 src/util/service_new.c:1497
 msgid "Service process could not initialize server function\n"
 msgstr ""
 
-#: src/util/service.c:1268
+#: src/util/service.c:1268 src/util/service_new.c:1501
 msgid "Service process failed to report status\n"
 msgstr ""
 
-#: src/util/service.c:1323
+#: src/util/service.c:1323 src/util/service_new.c:1373
 msgid "No such user"
 msgstr "Không có người dùng như vậy"
 
-#: src/util/service.c:1336
+#: src/util/service.c:1336 src/util/service_new.c:1392
 #, 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.c:1406 src/util/service_new.c:1729
 msgid "do daemonize (detach from terminal)"
 msgstr ""
 
+#: src/util/service_new.c:1298
+msgid ""
+"Could not bind to any of the ports I was supposed to, refusing to run!\n"
+msgstr ""
+
+#: src/util/service_new.c:2085
+#, c-format
+msgid ""
+"Processing code for message of type %u did not call "
+"`GNUNET_SERVICE_client_continue' after %s\n"
+msgstr ""
+
 #: src/util/signal.c:89
 #, c-format
 msgid "signal (%d, %p) returned %d.\n"
@@ -9179,236 +8774,231 @@
 msgid "b"
 msgstr "b"
 
-#: src/util/strings.c:437
+#: src/util/strings.c:441
 #, c-format
 msgid "Character sets requested were `%s'->`%s'\n"
 msgstr ""
 
-#: src/util/strings.c:565
+#: src/util/strings.c:568
 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:662
+#: src/util/strings.c:672
 msgid "µs"
 msgstr ""
 
-#: src/util/strings.c:666
+#: src/util/strings.c:676
 msgid "forever"
 msgstr ""
 
-#: src/util/strings.c:668
+#: src/util/strings.c:678
 msgid "0 ms"
 msgstr ""
 
-#: src/util/strings.c:674
+#: src/util/strings.c:684
 msgid "ms"
 msgstr "mg"
 
-#: src/util/strings.c:680
+#: src/util/strings.c:690
 msgid "s"
 msgstr "g"
 
-#: src/util/strings.c:686
+#: src/util/strings.c:696
 msgid "m"
 msgstr "p"
 
-#: src/util/strings.c:692
+#: src/util/strings.c:702
 msgid "h"
 msgstr "g"
 
-#: src/util/strings.c:699
+#: src/util/strings.c:709
 #, fuzzy
 msgid "day"
 msgstr " ngày"
 
-#: src/util/strings.c:701
+#: src/util/strings.c:711
 #, fuzzy
 msgid "days"
 msgstr " ngày"
 
-#: src/util/strings.c:730
+#: src/util/strings.c:740
 msgid "end of time"
 msgstr ""
 
-#: src/util/strings.c:1229
+#: src/util/strings.c:1239
 msgid "IPv6 address did not start with `['\n"
 msgstr ""
 
-#: src/util/strings.c:1237
+#: src/util/strings.c:1247
 msgid "IPv6 address did contain ':' to separate port number\n"
 msgstr ""
 
-#: src/util/strings.c:1243
+#: src/util/strings.c:1253
 msgid "IPv6 address did contain ']' before ':' to separate port number\n"
 msgstr ""
 
-#: src/util/strings.c:1250
+#: src/util/strings.c:1260
 msgid "IPv6 address did contain a valid port number after the last ':'\n"
 msgstr ""
 
-#: src/util/strings.c:1259
+#: src/util/strings.c:1269
 #, 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:1465 src/util/strings.c:1481
+#: src/util/strings.c:1475 src/util/strings.c:1491
 msgid "Port not in range\n"
 msgstr ""
 
-#: src/util/strings.c:1490
+#: src/util/strings.c:1500
 #, fuzzy, c-format
 msgid "Malformed port policy `%s'\n"
 msgstr "Lỗi bắt đầu thu thập.\n"
 
-#: src/util/strings.c:1573 src/util/strings.c:1604 src/util/strings.c:1652
-#: src/util/strings.c:1673
+#: src/util/strings.c:1583 src/util/strings.c:1614 src/util/strings.c:1662
+#: src/util/strings.c:1683
 #, c-format
 msgid "Invalid format for IP: `%s'\n"
 msgstr "Địa chỉ IP định dạng sai: %s\n"
 
-#: src/util/strings.c:1630
+#: src/util/strings.c:1640
 #, 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:1682
+#: src/util/strings.c:1692
 #, fuzzy, c-format
 msgid "Invalid format: `%s'\n"
 msgstr "Địa chỉ IP định dạng sai: %s\n"
 
-#: src/util/strings.c:1734
+#: src/util/strings.c:1744
 #, 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:1784
+#: src/util/strings.c:1794
 #, 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:1815
+#: src/util/strings.c:1825
 #, 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:556 src/vpn/gnunet-service-vpn.c:1113
+#: src/vpn/gnunet-service-vpn.c:550 src/vpn/gnunet-service-vpn.c:1125
 #, fuzzy
 msgid "# Active channels"
 msgstr "# các kết nối dht"
 
-#: src/vpn/gnunet-service-vpn.c:632
+#: src/vpn/gnunet-service-vpn.c:629
 #, fuzzy
 msgid "# Bytes given to cadet for transmission"
 msgstr "# các thông báo PING được tạo"
 
-#: src/vpn/gnunet-service-vpn.c:670
+#: src/vpn/gnunet-service-vpn.c:667
 #, fuzzy
 msgid "# Bytes dropped in cadet queue (overflow)"
 msgstr "# các byte loại bỏ bởi UDP (đi ra)"
 
-#: src/vpn/gnunet-service-vpn.c:781
+#: src/vpn/gnunet-service-vpn.c:783
 #, fuzzy
 msgid "# Cadet channels created"
 msgstr "# các truy vấn lỗ hổng được định tuyến"
 
-#: src/vpn/gnunet-service-vpn.c:809
-#, fuzzy
-msgid "Failed to setup cadet channel!\n"
-msgstr "Lỗi lấy thông kê về truyền tải.\n"
-
-#: src/vpn/gnunet-service-vpn.c:1008
+#: src/vpn/gnunet-service-vpn.c:1005
 #, c-format
 msgid "Protocol %u not supported, dropping\n"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:1133
+#: src/vpn/gnunet-service-vpn.c:1145
 #, 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:1344
+#: src/vpn/gnunet-service-vpn.c:1353
 msgid "# ICMPv4 packets dropped (not allowed)"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:1365
+#: src/vpn/gnunet-service-vpn.c:1374
 msgid "# ICMPv6 packets dropped (not allowed)"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:1571
+#: src/vpn/gnunet-service-vpn.c:1580
 #, 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:1604 src/vpn/gnunet-service-vpn.c:1640
+#: src/vpn/gnunet-service-vpn.c:1613 src/vpn/gnunet-service-vpn.c:1649
 #, c-format
 msgid "Packet received for unmapped destination `%s' (dropping it)\n"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:1650
+#: src/vpn/gnunet-service-vpn.c:1659
 msgid "Received IPv4 packet with options (dropping it)\n"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:1664
+#: src/vpn/gnunet-service-vpn.c:1673
 #, c-format
 msgid "Received packet of unknown protocol %d from TUN (dropping it)\n"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:1746
+#: src/vpn/gnunet-service-vpn.c:1755
 #, 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:2086
+#: src/vpn/gnunet-service-vpn.c:2095
 #, 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:2242
+#: src/vpn/gnunet-service-vpn.c:2251
 #, 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:2394
+#: src/vpn/gnunet-service-vpn.c:2403
 msgid "Failed to find unallocated IPv4 address in VPN's range\n"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:2449
+#: src/vpn/gnunet-service-vpn.c:2458
 msgid "Failed to find unallocated IPv6 address in VPN's range\n"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:2491 src/vpn/gnunet-service-vpn.c:2702
+#: src/vpn/gnunet-service-vpn.c:2500 src/vpn/gnunet-service-vpn.c:2722
 #, fuzzy
 msgid "# Active destinations"
 msgstr "# các kết nối dht"
 
-#: src/vpn/gnunet-service-vpn.c:2753
+#: src/vpn/gnunet-service-vpn.c:2771
 msgid "Failed to allocate IP address for new destination\n"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:3017
+#: src/vpn/gnunet-service-vpn.c:3063
 #, fuzzy
 msgid "Must specify valid IPv6 address"
 msgstr "« %s » không sẵn sàng.\n"
 
-#: src/vpn/gnunet-service-vpn.c:3041
+#: src/vpn/gnunet-service-vpn.c:3087
 msgid "Must specify valid IPv6 mask"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:3049
+#: src/vpn/gnunet-service-vpn.c:3095
 msgid "IPv6 support disabled as this system does not support IPv6\n"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:3062
+#: src/vpn/gnunet-service-vpn.c:3108
 #, fuzzy
 msgid "Must specify valid IPv4 address"
 msgstr "« %s » không sẵn sàng.\n"
 
-#: src/vpn/gnunet-service-vpn.c:3075
+#: src/vpn/gnunet-service-vpn.c:3121
 msgid "Must specify valid IPv4 mask"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:3085
+#: src/vpn/gnunet-service-vpn.c:3131
 msgid "IPv4 support disabled as this system does not support IPv4\n"
 msgstr ""
 
@@ -9480,23 +9070,288 @@
 msgid "Setup tunnels via VPN."
 msgstr ""
 
-#: src/include/gnunet_common.h:641 src/include/gnunet_common.h:648
-#: src/include/gnunet_common.h:656
+#: src/include/gnunet_common.h:645 src/include/gnunet_common.h:652
+#: src/include/gnunet_common.h:660
 #, fuzzy, c-format
 msgid "Assertion failed at %s:%d.\n"
 msgstr "Lỗi nội bộ : khẳng định không thành công tại %s:%d.\n"
 
-#: src/include/gnunet_common.h:668
+#: src/include/gnunet_common.h:672
 #, fuzzy, c-format
 msgid "External protocol violation detected at %s:%d.\n"
 msgstr "Lỗi nội bộ : khẳng định không thành công tại %s:%d.\n"
 
-#: src/include/gnunet_common.h:695 src/include/gnunet_common.h:704
+#: src/include/gnunet_common.h:699 src/include/gnunet_common.h:708
 #, c-format
 msgid "`%s' failed on file `%s' at %s:%d with error: %s\n"
 msgstr "« %s » thất bại ở tập tin « %s » tại %s:%d với lỗi: %s\n"
 
 #, fuzzy
+#~ msgid "Could not send list result to client\n"
+#~ msgstr "Không thể đọc danh sách bạn bè « %s »\n"
+
+#, fuzzy
+#~ msgid "Failed to connect peer 0 and %u\n"
+#~ msgstr "Lỗi kết nối đến gnunetd.\n"
+
+#, fuzzy
+#~ msgid "Could not connect master [%u] and slave [%u]\n"
+#~ msgstr "Không thể kết nối tới %s:%u: %s\n"
+
+#, fuzzy
+#~ msgid "Initialization failed, shutdown\n"
+#~ msgstr "Lỗi sơ khởi cơ chế phần bổ sung: %s\n"
+
+#, fuzzy
+#~ msgid "number too large"
+#~ msgstr "số lần lặp lại"
+
+#, fuzzy
+#~ msgid "Received incoming Cadet channel on port %u\n"
+#~ msgstr "« %.*s » được kết nối tới « %.*s ».\n"
+
+#, fuzzy
+#~ msgid "# sessions terminated by transport disconnect"
+#~ msgstr "# Các quảng cáo đồng đẳng bị hủy do trọng tải"
+
+#, fuzzy
+#~ msgid "# Requests dropped from datastore queue"
+#~ msgstr "# các yêu cầu lỗ hổng bị bỏ do trọng tải"
+
+#, fuzzy
+#~ msgid "# transmission request failures"
+#~ msgstr "# các sự truyền PONG bị lỗi"
+
+#, fuzzy
+#~ msgid "# bytes sent to datastore"
+#~ msgstr "# các byte trong kho dữ liệu"
+
+#, fuzzy
+#~ msgid "Failed to receive status response from database."
+#~ msgstr ""
+#~ "\n"
+#~ "Không nhận được đáp ứng từ gnunetd.\n"
+
+#, fuzzy
+#~ msgid "Invalid error message received from datastore service"
+#~ msgstr "Nhận được thông báo « %s » sai từ đồng đẳng « %s ».\n"
+
+#, fuzzy
+#~ msgid "Failed to connect to the DHT service!\n"
+#~ msgstr "Lỗi kết nối đến gnunetd.\n"
+
+#, fuzzy
+#~ msgid "Failed to connect to transport service!\n"
+#~ msgstr "Lỗi kết nối đến gnunetd.\n"
+
+#, fuzzy
+#~ msgid "# Queued messages discarded (peer disconnected)"
+#~ msgstr "# các thông báo được chắp liền"
+
+#, fuzzy
+#~ msgid "# Messages dropped (CORE timeout)"
+#~ msgstr "# các yêu cầu lỗ hổng bị bỏ do trọng tải"
+
+#, fuzzy
+#~ msgid "# Bytes transmitted to other peers"
+#~ msgstr "# các byte kiểu %d được gửi "
+
+#, fuzzy
+#~ msgid "# Bytes of bandwidth requested from core"
+#~ msgstr "# các yêu cầu máy/trình khách lỗ hổng được phun vào"
+
+#, fuzzy
+#~ msgid "PUT request received, but have no datacache!\n"
+#~ msgstr "# các byte kiểu %d được nhận"
+
+#, fuzzy
+#~ msgid "# TCP requests dropped (no such service)"
+#~ msgstr "# các yêu cầu lỗ hổng bị bỏ do trọng tải"
+
+#, fuzzy
+#~ msgid "# UDP requests dropped (no such service)"
+#~ msgstr "# các yêu cầu lỗ hổng bị bỏ do trọng tải"
+
+#, fuzzy
+#~ msgid "Failed to receive response for `%s' request from `%s' service.\n"
+#~ msgstr "Lỗi đọc danh sách bạn bè từ « %s »\n"
+
+#, fuzzy
+#~ msgid ""
+#~ "Failed to receive valid response for `%s' request from `%s' service.\n"
+#~ msgstr "Lỗi đọc danh sách bạn bè từ « %s »\n"
+
+#, fuzzy
+#~ msgid "unknown error"
+#~ msgstr "Lỗi không rõ"
+
+#, fuzzy
+#~ msgid "Invalid response from `fs' service."
+#~ msgstr "Đối số không hợp lệ cho « %s ».\n"
+
+#, fuzzy
+#~ msgid "# replies transmitted to other peers"
+#~ msgstr "# các byte kiểu %d được gửi "
+
+#, fuzzy
+#~ msgid "# replies dropped"
+#~ msgstr "# các đáp ứng dht được định tuyến"
+
+#, fuzzy
+#~ msgid "# requests dropped due to initiator not being connected"
+#~ msgstr "# các yêu cầu lỗ hổng bị bỏ do trọng tải"
+
+#, fuzzy
+#~ msgid "# transmission failed (core has no bandwidth)"
+#~ msgstr "Lỗi thử gửi, kiểu truyền tải %d không được hỗ trợ\n"
+
+#, fuzzy
+#~ msgid "Failed to deserialize lookup reply from GNS service!\n"
+#~ msgstr ""
+#~ "\n"
+#~ "Không nhận được đáp ứng từ gnunetd.\n"
+
+#, fuzzy
+#~ msgid "Service `%s' is not running\n"
+#~ msgstr "« %s » không phải là một tập tin.\n"
+
+#, fuzzy
+#~ msgid "Identity service is not running\n"
+#~ msgstr "« %s » không phải là một tập tin.\n"
+
+#, fuzzy
+#~ msgid "NSE service is not running\n"
+#~ msgstr "« %s » không phải là một tập tin.\n"
+
+#, fuzzy
+#~ msgid "failed to transmit request (service down?)"
+#~ msgstr "Lỗi đọc danh sách bạn bè từ « %s »\n"
+
+#, fuzzy
+#~ msgid "Received invalid message from `PEERINFO' service."
+#~ msgstr ""
+#~ "\n"
+#~ "Không nhận được đáp ứng từ gnunetd.\n"
+
+#, fuzzy
+#~ msgid "Timeout transmitting iteration request to `PEERINFO' service."
+#~ msgstr "Lỗi sơ khởi dịch vụ « %s ».\n"
+
+#, fuzzy
+#~ msgid "Could not connect to `%s' service.\n"
+#~ msgstr "Không thể kết nối tới %s:%u: %s\n"
+
+#, fuzzy
+#~ msgid "Failed to get my own HELLO from this peer!\n"
+#~ msgstr "Lỗi lấy thông kê về truyền tải.\n"
+
+#, fuzzy
+#~ msgid "Service `%s' is not running, please start GNUnet\n"
+#~ msgstr "« %s » không phải là một tập tin.\n"
+
+#, fuzzy
+#~ msgid "Malformed iterate request.\n"
+#~ msgstr "Không thể lưu tập tin cấu hình « %s »:"
+
+#, fuzzy
+#~ msgid "Malformed store request from client\n"
+#~ msgstr "Nhận yêu cầu định tuyến\n"
+
+#, fuzzy
+#~ msgid "Failed to store requested value, database error."
+#~ msgstr ""
+#~ "\n"
+#~ "Không nhận được đáp ứng từ gnunetd.\n"
+
+#, fuzzy
+#~ msgid "Trying to connect to remote host, but service `%s' is not running\n"
+#~ msgstr "Lỗi sơ khởi dịch vụ « %s ».\n"
+
+#, fuzzy
+#~ msgid ""
+#~ "Peer `%s' %s %s\n"
+#~ "\t%s%s\n"
+#~ "\t%s%s\n"
+#~ "\t%s%s\n"
+#~ msgstr "Tôi là đồng đẳng « %s ».\n"
+
+#, fuzzy
+#~ msgid "Peer `%s' %s `%s' \n"
+#~ msgstr "Tôi là đồng đẳng « %s ».\n"
+
+#, fuzzy
+#~ msgid "print information for all pending validations "
+#~ msgstr "In ra thông tin về các đồng đẳng GNUnet."
+
+#, fuzzy
+#~ msgid "print information for all pending validations continuously"
+#~ msgstr "In ra thông tin về các đồng đẳng GNUnet."
+
+#, fuzzy
+#~ msgid "Connected to different peer `%s'\n"
+#~ msgstr "« %s » được kết nối tới « %s ».\n"
+
+#, fuzzy
+#~ msgid "Successfully connected to `%s'\n"
+#~ msgstr "Không đủ quyền cho « %s ».\n"
+
+#, fuzzy
+#~ msgid "Denying connection to `%s'\n"
+#~ msgstr "Không thể kết nối tới %s:%u: %s\n"
+
+#, fuzzy
+#~ msgid "Message size too big!\n"
+#~ msgstr "kích cỡ tin nhắn"
+
+#, fuzzy
+#~ msgid "No peer identity given\n"
+#~ msgstr "chưa đưa ra tên"
+
+#, fuzzy
+#~ msgid "Trying to send %u messages with size %u to peer `%s'\n"
+#~ msgstr "Sử dụng %u thông báo với kích cỡ %u trong %u lần.\n"
+
+#, fuzzy
+#~ msgid "Trying to receive messages from peer `%s'\n"
+#~ msgstr "Lỗi đọc danh sách bạn bè từ « %s »\n"
+
+#, fuzzy
+#~ msgid "No operation given\n"
+#~ msgstr "chưa đưa ra tên"
+
+#, fuzzy
+#~ msgid "Failed to connect to ATS service\n"
+#~ msgstr "Lỗi kết nối đến gnunetd.\n"
+
+#, fuzzy
+#~ msgid "Binding to IPv4 address %s\n"
+#~ msgstr "Mức ưu tiên tiến trình không hợp lê « %s ».\n"
+
+#, fuzzy
+#~ msgid "Binding to IPv6 address %s\n"
+#~ msgstr "Mức ưu tiên tiến trình không hợp lê « %s ».\n"
+
+#, fuzzy
+#~ msgid "Received unexpected message of type %u in %s:%u\n"
+#~ msgstr "Nhận được thông báo bị hỏng từ đồng đẳng « %s » trong %s:%d.\n"
+
+#, fuzzy
+#~ msgid "Failed to initialize testing library!\n"
+#~ msgstr "Lỗi sơ khởi dịch vụ « %s ».\n"
+
+#, fuzzy
+#~ msgid "Could not connect to service `%s', configuration broken.\n"
+#~ msgstr "Không thể kết nối tới %s:%u: %s\n"
+
+#, fuzzy
+#~ msgid "Failure to transmit request to service `%s'\n"
+#~ msgstr "Lỗi đọc danh sách bạn bè từ « %s »\n"
+
+#, fuzzy
+#~ msgid "Failed to setup cadet channel!\n"
+#~ msgstr "Lỗi lấy thông kê về truyền tải.\n"
+
+#, fuzzy
 #~ msgid "Configuration option \"regex_prefix\" missing. Exiting\n"
 #~ msgstr ""
 #~ "Giá trị cấu hình « %s » cho « %s » trong phần « %s » nên là con số\n"
@@ -9656,10 +9511,6 @@
 #~ msgstr "Lỗi kết nối đến gnunetd.\n"
 
 #, fuzzy
-#~ msgid "Failed to send request to transport service\n"
-#~ msgstr "Lỗi kết nối đến gnunetd.\n"
-
-#, fuzzy
 #~ msgid "Retrying to connect to `%s'\n"
 #~ msgstr "Không thể kết nối tới %s:%u: %s\n"
 
@@ -9869,12 +9720,6 @@
 #~ msgstr "Đang tải %d tập tin xuống thư mục « %s ».\n"
 
 #, fuzzy
-#~ msgid "Failed to receive response from `SENSOR' service."
-#~ msgstr ""
-#~ "\n"
-#~ "Không nhận được đáp ứng từ gnunetd.\n"
-
-#, fuzzy
 #~ msgid "Received invalid message from `SENSOR' service."
 #~ msgstr ""
 #~ "\n"
@@ -10077,10 +9922,6 @@
 #~ msgid "Job command file not given. Exiting\n"
 #~ msgstr "dùng tập tin cấu hình TÊN_TẬP_TIN"
 
-#, fuzzy
-#~ msgid "Error while decoding key %u\n"
-#~ msgstr "Gặp lỗi khi tải xuống: %s\n"
-
 #~ msgid "Could not read friends list `%s'\n"
 #~ msgstr "Không thể đọc danh sách bạn bè « %s »\n"
 
@@ -10276,10 +10117,6 @@
 #~ msgstr "« %s » thất bại cho ổ đĩa « %s »: %u\n"
 
 #, fuzzy
-#~ msgid "Service `%s' was already running.\n"
-#~ msgstr "Không gian tên « %s » có đánh giá %d.\n"
-
-#, fuzzy
 #~ msgid "Service `%s' has been started.\n"
 #~ msgstr "Dịch vụ đã bị xoá.\n"
 

Modified: gnunet/po/zh_CN.po
===================================================================
--- gnunet/po/zh_CN.po  2016-10-26 04:21:00 UTC (rev 38215)
+++ gnunet/po/zh_CN.po  2016-10-26 14:25:30 UTC (rev 38216)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: gnunet-0.8.1\n"
 "Report-Msgid-Bugs-To: address@hidden"
-"POT-Creation-Date: 2016-05-19 13:54+0200\n"
+"POT-Creation-Date: 2016-10-26 09:18-0500\n"
 "PO-Revision-Date: 2011-07-09 12:12+0800\n"
 "Last-Translator: Wylmer Wang <address@hidden>\n"
 "Language-Team: Chinese (simplified) <address@hidden>\n"
@@ -16,316 +16,352 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: src/arm/arm_api.c:338
-msgid "Client was disconnected from arm service, trying to reconnect.\n"
-msgstr ""
-
-#: src/arm/arm_monitor_api.c:324
-msgid ""
-"Monitoring client was disconnected from arm service, trying to reconnect.\n"
-msgstr ""
-
-#: src/arm/gnunet-arm.c:169
+#: src/arm/gnunet-arm.c:152
 #, fuzzy, c-format
 msgid "Failed to remove configuration file %s\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/arm/gnunet-arm.c:175
+#: src/arm/gnunet-arm.c:158
 #, c-format
 msgid "Failed to remove servicehome directory %s\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:225 src/testbed/gnunet-service-testbed_peers.c:1013
+#: src/arm/gnunet-arm.c:213 src/testbed/gnunet-service-testbed_peers.c:1139
 msgid "Message was sent successfully"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:227
+#: src/arm/gnunet-arm.c:215
 #, fuzzy
 msgid "Misconfiguration (can not connect to the ARM service)"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/arm/gnunet-arm.c:229 src/testbed/gnunet-service-testbed_peers.c:1017
+#: src/arm/gnunet-arm.c:217 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:231 src/testbed/gnunet-service-testbed_peers.c:1019
+#: src/arm/gnunet-arm.c:219 src/testbed/gnunet-service-testbed_peers.c:1145
 msgid "ARM API is busy"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:233
-msgid "Request does not fit into a message"
-msgstr ""
-
-#: src/arm/gnunet-arm.c:235 src/testbed/gnunet-service-testbed_peers.c:1023
+#: src/arm/gnunet-arm.c:221 src/testbed/gnunet-service-testbed_peers.c:1147
 msgid "Request timed out"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:237 src/testbed/gnunet-service-testbed_peers.c:1025
+#: src/arm/gnunet-arm.c:223 src/testbed/gnunet-service-testbed_peers.c:1149
 #, fuzzy
 msgid "Unknown request status"
 msgstr "未知的用户“%s”\n"
 
-#: src/arm/gnunet-arm.c:253 src/testbed/gnunet-service-testbed_peers.c:1041
+#: src/arm/gnunet-arm.c:239 src/testbed/gnunet-service-testbed_peers.c:1165
 #, c-format
 msgid "%s is stopped"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:255 src/testbed/gnunet-service-testbed_peers.c:1043
+#: src/arm/gnunet-arm.c:241 src/testbed/gnunet-service-testbed_peers.c:1167
 #, c-format
 msgid "%s is starting"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:257 src/testbed/gnunet-service-testbed_peers.c:1045
+#: src/arm/gnunet-arm.c:243 src/testbed/gnunet-service-testbed_peers.c:1169
 #, c-format
 msgid "%s is stopping"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:259 src/testbed/gnunet-service-testbed_peers.c:1047
+#: src/arm/gnunet-arm.c:245 src/testbed/gnunet-service-testbed_peers.c:1171
 #, c-format
 msgid "%s is starting already"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:261 src/testbed/gnunet-service-testbed_peers.c:1049
+#: src/arm/gnunet-arm.c:247 src/testbed/gnunet-service-testbed_peers.c:1173
 #, c-format
 msgid "%s is stopping already"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:263 src/testbed/gnunet-service-testbed_peers.c:1051
+#: src/arm/gnunet-arm.c:249 src/testbed/gnunet-service-testbed_peers.c:1175
 #, c-format
 msgid "%s is started already"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:265 src/testbed/gnunet-service-testbed_peers.c:1053
+#: src/arm/gnunet-arm.c:251 src/testbed/gnunet-service-testbed_peers.c:1177
 #, c-format
 msgid "%s is stopped already"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:267 src/testbed/gnunet-service-testbed_peers.c:1055
+#: src/arm/gnunet-arm.c:253 src/testbed/gnunet-service-testbed_peers.c:1179
 #, fuzzy, c-format
 msgid "%s service is not known to ARM"
 msgstr "服务已删除。\n"
 
-#: src/arm/gnunet-arm.c:269 src/testbed/gnunet-service-testbed_peers.c:1057
+#: src/arm/gnunet-arm.c:255 src/testbed/gnunet-service-testbed_peers.c:1181
 #, fuzzy, c-format
 msgid "%s service failed to start"
 msgstr "运行 %s失败:%s %d\n"
 
-#: src/arm/gnunet-arm.c:271
+#: src/arm/gnunet-arm.c:257
 #, c-format
 msgid "%s service cannot be started because ARM is shutting down"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:273 src/testbed/gnunet-service-testbed_peers.c:1061
+#: src/arm/gnunet-arm.c:259 src/testbed/gnunet-service-testbed_peers.c:1185
 #, c-format
 msgid "%.s Unknown result code."
 msgstr ""
 
-#: src/arm/gnunet-arm.c:305
+#: src/arm/gnunet-arm.c:291
 msgid "Fatal error initializing ARM API.\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:335 src/arm/gnunet-arm.c:344
+#: src/arm/gnunet-arm.c:320 src/arm/gnunet-arm.c:329
 #, fuzzy, c-format
 msgid "Failed to start the ARM service: %s\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/arm/gnunet-arm.c:380
+#: src/arm/gnunet-arm.c:364
 #, fuzzy, c-format
 msgid "Failed to send a stop request to the ARM service: %s\n"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/arm/gnunet-arm.c:391
+#: src/arm/gnunet-arm.c:375
 #, fuzzy, c-format
 msgid "Failed to stop the ARM service: %s\n"
 msgstr "打开日志文件“%s”失败:%s\n"
 
-#: src/arm/gnunet-arm.c:434
+#: src/arm/gnunet-arm.c:417
 #, fuzzy, c-format
 msgid "Failed to send a request to start the `%s' service: %%s\n"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/arm/gnunet-arm.c:444
+#: src/arm/gnunet-arm.c:428
 #, fuzzy, c-format
 msgid "Failed to start the `%s' service: %s\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/arm/gnunet-arm.c:482
+#: src/arm/gnunet-arm.c:467
 #, fuzzy, c-format
 msgid "Failed to send a request to kill the `%s' service: %%s\n"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/arm/gnunet-arm.c:493
+#: src/arm/gnunet-arm.c:478
 #, fuzzy, c-format
 msgid "Failed to kill the `%s' service: %s\n"
 msgstr "运行 %s失败:%s %d\n"
 
-#: src/arm/gnunet-arm.c:533
+#: src/arm/gnunet-arm.c:519
 #, fuzzy, c-format
 msgid "Failed to request a list of services: %s\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/arm/gnunet-arm.c:542
+#: src/arm/gnunet-arm.c:528
 #, fuzzy
 msgid "Error communicating with ARM. ARM not running?\n"
 msgstr "连接 %s:%u 出错。守护程序在运行吗?\n"
 
-#: src/arm/gnunet-arm.c:547
+#: src/arm/gnunet-arm.c:534
 msgid "Running services:\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:633
+#: src/arm/gnunet-arm.c:622
 #, c-format
 msgid "Now only monitoring, press CTRL-C to stop.\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:665
+#: src/arm/gnunet-arm.c:654
 #, c-format
 msgid "Stopped %s.\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:668
+#: src/arm/gnunet-arm.c:657
 #, fuzzy, c-format
 msgid "Starting %s...\n"
 msgstr "未知的命令“%s”。\n"
 
-#: src/arm/gnunet-arm.c:671
+#: src/arm/gnunet-arm.c:660
 #, c-format
 msgid "Stopping %s...\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:682
+#: src/arm/gnunet-arm.c:674
 #, fuzzy, c-format
 msgid "Unknown status %u for service %s.\n"
 msgstr "未知的用户“%s”\n"
 
-#: src/arm/gnunet-arm.c:745
+#: src/arm/gnunet-arm.c:756
 #, fuzzy
 msgid "stop all GNUnet services"
 msgstr "卸载 GNUnet 服务"
 
-#: src/arm/gnunet-arm.c:747
+#: src/arm/gnunet-arm.c:758
 msgid "start a particular service"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:749
+#: src/arm/gnunet-arm.c:760
 msgid "stop a particular service"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:751
+#: src/arm/gnunet-arm.c:762
 #, fuzzy
 msgid "start all GNUnet default services"
 msgstr "卸载 GNUnet 服务"
 
-#: src/arm/gnunet-arm.c:754
+#: src/arm/gnunet-arm.c:765
 #, fuzzy
 msgid "stop and start all GNUnet default services"
 msgstr "卸载 GNUnet 服务"
 
-#: src/arm/gnunet-arm.c:757
+#: src/arm/gnunet-arm.c:768
 msgid "delete config file and directory on exit"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:760
+#: src/arm/gnunet-arm.c:771
 msgid "monitor ARM activities"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:762
+#: src/arm/gnunet-arm.c:773
 msgid "don't print status messages"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:765
+#: src/arm/gnunet-arm.c:776
 msgid "exit with error status if operation does not finish after DELAY"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:767
+#: src/arm/gnunet-arm.c:778
 msgid "list currently running services"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:769
+#: src/arm/gnunet-arm.c:780
 msgid "don't let gnunet-service-arm inherit standard output"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:771
+#: src/arm/gnunet-arm.c:782
 msgid "don't let gnunet-service-arm inherit standard error"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:782
+#: src/arm/gnunet-arm.c:794
 msgid "Control services and the Automated Restart Manager (ARM)"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:279
-msgid "Could not send status result to client\n"
+#: src/arm/gnunet-service-arm.c:374 src/transport/plugin_transport_tcp.c:633
+#: src/util/service.c:565 src/util/service_new.c:604
+#, c-format
+msgid ""
+"Disabling IPv6 support for service `%s', failed to create IPv6 socket: %s\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:315
-#, fuzzy
-msgid "Could not send list result to client\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:658
+#: src/transport/plugin_transport_tcp.c:3299 src/util/service.c:584
+#: src/util/service.c:590 src/util/service_new.c:629 src/util/service_new.c:635
+#, 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/util/client_new.c:464 src/util/service.c:621 src/util/service_new.c:674
+#, 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/util/client_new.c:469 src/util/service.c:625 src/util/service_new.c:679
+#, 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/util/service.c:656 src/util/service_new.c:715
+#, 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/util/service.c:673 src/util/service_new.c:733
+#, 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:2617
+#: src/transport/plugin_transport_tcp.c:772 src/util/service.c:704
+#: src/util/service_new.c:774
+#, 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:2635
+#: src/transport/plugin_transport_tcp.c:791 src/util/service.c:723
+#: src/util/service_new.c:794
+#, fuzzy, c-format
+msgid "Failed to find %saddress for `%s'.\n"
 msgstr "找不到接口“%s”的一个 IP 地址。\n"
 
-#: src/arm/gnunet-service-arm.c:555
+#: src/arm/gnunet-service-arm.c:932
 #, fuzzy, c-format
 msgid "Failed to start service `%s'\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/arm/gnunet-service-arm.c:566
+#: src/arm/gnunet-service-arm.c:943
 #, c-format
 msgid "Starting service `%s'\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:663
+#: src/arm/gnunet-service-arm.c:1055
 #, fuzzy, c-format
 msgid "Unable to create socket for service `%s': %s\n"
 msgstr "无法创建用户账户:"
 
-#: src/arm/gnunet-service-arm.c:687
+#: src/arm/gnunet-service-arm.c:1090
 #, c-format
 msgid "Unable to bind listening socket for service `%s' to address `%s': %s\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:723
+#: src/arm/gnunet-service-arm.c:1133
 #, c-format
 msgid "ARM now monitors connections to service `%s' at `%s'\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:863
+#: src/arm/gnunet-service-arm.c:1309
 #, c-format
 msgid "Preparing to stop `%s'\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:1145
+#: src/arm/gnunet-service-arm.c:1611
 #, c-format
 msgid "Restarting service `%s'.\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:1299
+#: src/arm/gnunet-service-arm.c:1771
 msgid "exit"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:1304
+#: src/arm/gnunet-service-arm.c:1776
 msgid "signal"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:1309
+#: src/arm/gnunet-service-arm.c:1781
 #, fuzzy
 msgid "unknown"
 msgstr "未知错误"
 
-#: src/arm/gnunet-service-arm.c:1315
+#: src/arm/gnunet-service-arm.c:1787
 #, fuzzy, c-format
 msgid "Service `%s' took %s to terminate\n"
 msgstr "服务已删除。\n"
 
-#: src/arm/gnunet-service-arm.c:1342
+#: src/arm/gnunet-service-arm.c:1813
 #, c-format
 msgid "Service `%s' terminated normally, will restart at any time\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:1358
+#: src/arm/gnunet-service-arm.c:1829
 #, c-format
 msgid "Service `%s' terminated with status %s/%d, will restart in %s\n"
 msgstr ""
 
-#: src/arm/mockup-service.c:41
+#: src/arm/mockup-service.c:42
 msgid "Initiating shutdown as requested by client.\n"
 msgstr ""
 
@@ -350,14 +386,12 @@
 "%llu\n"
 msgstr ""
 
-#: src/ats/gnunet-ats-solver-eval.c:3293
-#: src/ats-tests/gnunet-solver-eval.c:921
+#: src/ats/gnunet-ats-solver-eval.c:3293 src/ats-tests/gnunet-solver-eval.c:935
 msgid "solver to use"
 msgstr ""
 
-#: src/ats/gnunet-ats-solver-eval.c:3296
-#: src/ats-tests/gnunet-solver-eval.c:924
-#: src/ats-tests/gnunet-solver-eval.c:927
+#: 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 ""
 
@@ -462,54 +496,26 @@
 msgid "Invalid %s configuration %f\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/ats-tests/ats-testing.c:72
-msgid "Benchmarking done\n"
-msgstr ""
-
-#: src/ats-tests/ats-testing.c:105
-#, fuzzy, c-format
-msgid "Failed to connect peer 0 and %u\n"
-msgstr "初始化“%s”服务失败。\n"
-
-#: src/ats-tests/ats-testing.c:413
+#: src/ats-tests/ats-testing.c:441
 #, c-format
 msgid "Connected master [%u] with slave [%u]\n"
 msgstr ""
 
-#: src/ats-tests/ats-testing.c:419
+#: src/ats-tests/ats-testing.c:448
 #, fuzzy, c-format
 msgid "Failed to connect master peer [%u] with slave [%u]\n"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/ats-tests/ats-testing.c:450
-msgid "Connecting peers on CORE level\n"
-msgstr ""
-
-#: src/ats-tests/ats-testing.c:461
-#, c-format
-msgid "Connecting master [%u] with slave [%u]\n"
-msgstr ""
-
-#: src/ats-tests/ats-testing.c:470
-#, fuzzy, c-format
-msgid "Could not connect master [%u] and slave [%u]\n"
-msgstr "无法连接到 %s:%u:%s\n"
-
-#: src/ats-tests/ats-testing.c:490 src/ats-tests/ats-testing.c:634
-#, fuzzy
-msgid "Initialization failed, shutdown\n"
-msgstr "插件机构初始化失败:%s!\n"
-
-#: src/ats-tests/ats-testing-log.c:836
+#: src/ats-tests/ats-testing-log.c:837
 msgid "Stop logging\n"
 msgstr ""
 
-#: src/ats-tests/ats-testing-log.c:887
+#: src/ats-tests/ats-testing-log.c:892
 #, fuzzy, c-format
 msgid "Start logging `%s'\n"
 msgstr "未知的命令“%s”。\n"
 
-#: src/ats-tests/gnunet-ats-sim.c:86
+#: src/ats-tests/gnunet-ats-sim.c:88
 #, c-format
 msgid ""
 "Master [%u]: sent: %u KiB in %u sec. = %u KiB/s, received: %u KiB in %u sec. "
@@ -552,8 +558,7 @@
 msgstr ""
 
 #: src/ats-tool/gnunet-ats.c:748 src/ats-tool/gnunet-ats.c:761
-#: src/transport/gnunet-transport.c:1780
-#: src/transport/gnunet-transport-profiler.c:516
+#: src/transport/gnunet-transport.c:1536
 #, fuzzy, c-format
 msgid "Failed to parse peer identity `%s'\n"
 msgstr "解析配置文件“%s”失败\n"
@@ -639,112 +644,107 @@
 msgid "Print information about ATS state"
 msgstr "无法获取有关用户“%s”的信息:%s\n"
 
-#: src/cadet/gnunet-cadet.c:476
+#: src/cadet/gnunet-cadet.c:511
 #, fuzzy, c-format
 msgid "Invalid target `%s'\n"
 msgstr "“%s”的参数无效。\n"
 
-#: src/cadet/gnunet-cadet.c:751
+#: src/cadet/gnunet-cadet.c:787
 #, fuzzy, c-format
 msgid "Invalid peer ID `%s'\n"
 msgstr "无效条目。\n"
 
-#: src/cadet/gnunet-cadet.c:789
+#: src/cadet/gnunet-cadet.c:825
 #, fuzzy, c-format
 msgid "Invalid tunnel owner `%s'\n"
 msgstr "IP 格式无效:“%s”\n"
 
-#: src/cadet/gnunet-cadet.c:857
+#: src/cadet/gnunet-cadet.c:892
 msgid "You must NOT give a TARGET when using 'request all' options\n"
 msgstr ""
 
-#: src/cadet/gnunet-cadet.c:952
+#: src/cadet/gnunet-cadet.c:982
 #, fuzzy
 msgid "provide information about a particular connection"
 msgstr "无法获取有关用户“%s”的信息:%s\n"
 
-#: src/cadet/gnunet-cadet.c:955
+#: src/cadet/gnunet-cadet.c:985
 msgid "activate echo mode"
 msgstr ""
 
-#: src/cadet/gnunet-cadet.c:958
+#: src/cadet/gnunet-cadet.c:988
 msgid "dump debug information to STDERR"
 msgstr ""
 
-#: src/cadet/gnunet-cadet.c:964
-msgid "port to listen to (default; 0)"
+#: src/cadet/gnunet-cadet.c:994
+msgid "port to listen to"
 msgstr ""
 
-#: src/cadet/gnunet-cadet.c:967
+#: src/cadet/gnunet-cadet.c:997
 #, fuzzy
 msgid "provide information about a patricular peer"
 msgstr "无法获取有关用户“%s”的信息:%s\n"
 
-#: src/cadet/gnunet-cadet.c:970
+#: src/cadet/gnunet-cadet.c:1000
 #, fuzzy
 msgid "provide information about all peers"
 msgstr "无法获取有关用户“%s”的信息:%s\n"
 
-#: src/cadet/gnunet-cadet.c:973
+#: src/cadet/gnunet-cadet.c:1003
 #, fuzzy
 msgid "provide information about a particular tunnel"
 msgstr "无法获取有关用户“%s”的信息:%s\n"
 
-#: src/cadet/gnunet-cadet.c:976
+#: src/cadet/gnunet-cadet.c:1006
 #, fuzzy
 msgid "provide information about all tunnels"
 msgstr "无法获取有关用户“%s”的信息:%s\n"
 
-#: src/cadet/gnunet-service-cadet_peer.c:562
+#: src/cadet/gnunet-service-cadet_peer.c:707
 msgid "Wrong CORE service\n"
 msgstr ""
 
-#: src/consensus/gnunet-consensus-profiler.c:496
+#: 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:499
+#: src/consensus/gnunet-consensus-profiler.c:502
 msgid ""
 "how many peers (random selection without replacement) receive one value?"
 msgstr ""
 
-#: src/consensus/gnunet-consensus-profiler.c:502
-#: src/set/gnunet-set-profiler.c:377 src/set/gnunet-set-profiler.c:380
-#: src/set/gnunet-set-profiler.c:383
+#: src/consensus/gnunet-consensus-profiler.c:505
+#: src/set/gnunet-set-profiler.c:378 src/set/gnunet-set-profiler.c:381
+#: src/set/gnunet-set-profiler.c:384
 #, fuzzy
 msgid "number of values"
 msgstr "迭代次数"
 
-#: src/consensus/gnunet-consensus-profiler.c:505
+#: src/consensus/gnunet-consensus-profiler.c:508
 msgid "consensus timeout"
 msgstr ""
 
-#: src/consensus/gnunet-consensus-profiler.c:508
+#: src/consensus/gnunet-consensus-profiler.c:511
 msgid "delay until consensus starts"
 msgstr ""
 
-#: src/consensus/gnunet-consensus-profiler.c:511
-#: src/set/gnunet-set-profiler.c:389
+#: src/consensus/gnunet-consensus-profiler.c:514
+#: src/set/gnunet-set-profiler.c:390
 msgid "write statistics to file"
 msgstr ""
 
-#: src/consensus/gnunet-consensus-profiler.c:514
+#: src/consensus/gnunet-consensus-profiler.c:517
 #: src/secretsharing/gnunet-secretsharing-profiler.c:622
 msgid "be more verbose (print received values)"
 msgstr ""
 
-#: src/conversation/conversation_api.c:493
-#: src/conversation/conversation_api_call.c:475
+#: src/conversation/conversation_api.c:513
+#: src/conversation/conversation_api_call.c:490
 msgid "Connection to conversation service lost, trying to reconnect\n"
 msgstr ""
 
-#: src/conversation/conversation_api.c:617
-#, fuzzy
-msgid "number too large"
-msgstr "迭代次数"
-
 #: src/conversation/gnunet-conversation.c:269
 #, c-format
 msgid "Incoming call from `%s'. Please /accept %u or /cancel %u the call.\n"
@@ -770,235 +770,234 @@
 msgid "Ego `%s' no longer available, phone is now down.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:366
+#: src/conversation/gnunet-conversation.c:367
 #, fuzzy
 msgid "Failed to setup phone (internal error)\n"
 msgstr "发送消息失败。\n"
 
-#: src/conversation/gnunet-conversation.c:378
+#: src/conversation/gnunet-conversation.c:379
 #, c-format
-msgid ""
-"Phone active on line %u.  Type `/help' for a list of available commands\n"
+msgid "Phone active at `%s'.  Type `/help' for a list of available commands\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:400
+#: src/conversation/gnunet-conversation.c:401
 #, c-format
 msgid "Resolved address of `%s'. Now ringing other party.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:407
+#: src/conversation/gnunet-conversation.c:408
 #, fuzzy, c-format
 msgid "Connection established to `%s'\n"
 msgstr "找不到接口“%s”的一个 IP 地址。\n"
 
-#: src/conversation/gnunet-conversation.c:414
+#: src/conversation/gnunet-conversation.c:415
 #, fuzzy, c-format
 msgid "Failed to resolve `%s'\n"
 msgstr "打开日志文件“%s”失败:%s\n"
 
-#: src/conversation/gnunet-conversation.c:422
+#: src/conversation/gnunet-conversation.c:423
 #, c-format
 msgid "Call to `%s' terminated\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:431
+#: src/conversation/gnunet-conversation.c:432
 #, c-format
 msgid "Connection to `%s' suspended (by other user)\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:437
+#: src/conversation/gnunet-conversation.c:438
 #, c-format
 msgid "Connection to `%s' resumed (by other user)\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:442
+#: src/conversation/gnunet-conversation.c:443
 msgid "Error with the call, restarting it\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:511
+#: src/conversation/gnunet-conversation.c:512
 #, fuzzy, c-format
 msgid "Unknown command `%s'\n"
 msgstr "未知的命令“%s”。\n"
 
-#: src/conversation/gnunet-conversation.c:527
-#: src/conversation/gnunet-conversation.c:541
+#: src/conversation/gnunet-conversation.c:528
+#: src/conversation/gnunet-conversation.c:542
 #, c-format
 msgid "Ego `%s' not available\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:534
-#: src/conversation/gnunet-conversation.c:591
+#: src/conversation/gnunet-conversation.c:535
+#: src/conversation/gnunet-conversation.c:592
 msgid "You are calling someone else already, hang up first!\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:549
-#: src/conversation/gnunet-conversation.c:604
+#: src/conversation/gnunet-conversation.c:550
+#: src/conversation/gnunet-conversation.c:605
 #, c-format
 msgid "You are answering call from `%s', hang up or suspend that call first!\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:559
+#: src/conversation/gnunet-conversation.c:560
 msgid "Call recipient missing.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:615
+#: src/conversation/gnunet-conversation.c:616
 msgid "There is no incoming call to accept here!\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:632
+#: src/conversation/gnunet-conversation.c:633
 #, c-format
 msgid "There is no incoming call `%s' to accept right now!\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:662
+#: src/conversation/gnunet-conversation.c:663
 msgid "We currently do not have an address.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:685
+#: src/conversation/gnunet-conversation.c:686
 #, c-format
 msgid "We are currently trying to locate the private key for the ego `%s'.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:690
+#: src/conversation/gnunet-conversation.c:691
 #, c-format
-msgid "We are listening for incoming calls for ego `%s' on line %u.\n"
+msgid "We are listening for incoming calls for ego `%s' on line `%s'.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:696
-#: src/conversation/gnunet-conversation.c:720
+#: src/conversation/gnunet-conversation.c:697
+#: src/conversation/gnunet-conversation.c:721
 #, c-format
 msgid "You are having a conversation with `%s'.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:701
+#: src/conversation/gnunet-conversation.c:702
 msgid ""
 "We had an internal error setting up our phone line. You can still make "
 "calls.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:710
+#: src/conversation/gnunet-conversation.c:711
 #, fuzzy, c-format
 msgid "We are trying to find the network address to call `%s'.\n"
 msgstr "GNUnet 现在使用 IP 地址 %s。\n"
 
-#: src/conversation/gnunet-conversation.c:715
+#: src/conversation/gnunet-conversation.c:716
 #, c-format
 msgid "We are calling `%s', his phone should be ringing.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:734
+#: src/conversation/gnunet-conversation.c:735
 msgid "Calls waiting:\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:740
+#: src/conversation/gnunet-conversation.c:741
 #, fuzzy, c-format
 msgid "#%u: `%s'\n"
 msgstr "运行 %s失败:%s %d\n"
 
-#: src/conversation/gnunet-conversation.c:768
-#: src/conversation/gnunet-conversation.c:783
+#: src/conversation/gnunet-conversation.c:769
+#: src/conversation/gnunet-conversation.c:784
 msgid "There is no call that could be suspended right now.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:816
-#: src/conversation/gnunet-conversation.c:832
+#: src/conversation/gnunet-conversation.c:817
+#: src/conversation/gnunet-conversation.c:833
 msgid "There is no call that could be resumed right now.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:839
+#: src/conversation/gnunet-conversation.c:840
 #, c-format
 msgid "Already talking with `%s', cannot resume a call right now.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:848
+#: src/conversation/gnunet-conversation.c:849
 msgid "There is no incoming call to resume here!\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:865
+#: src/conversation/gnunet-conversation.c:866
 #, c-format
 msgid "There is no incoming call `%s' to resume right now!\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:900
+#: src/conversation/gnunet-conversation.c:901
 msgid "There is no call that could be cancelled right now.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:908
+#: src/conversation/gnunet-conversation.c:909
 msgid "There is no incoming call to refuse here!\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:925
+#: src/conversation/gnunet-conversation.c:926
 #, c-format
 msgid "There is no incoming call `%s' to refuse right now!\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:951
+#: src/conversation/gnunet-conversation.c:952
 msgid "Use `/address' to find out which address this phone should have in GNS"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:953
+#: src/conversation/gnunet-conversation.c:954
 msgid "Use `/call USER.gnu' to call USER"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:955
+#: src/conversation/gnunet-conversation.c:956
 msgid "Use `/accept #NUM' to accept incoming call #NUM"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:957
+#: src/conversation/gnunet-conversation.c:958
 msgid "Use `/suspend' to suspend the active call"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:959
+#: src/conversation/gnunet-conversation.c:960
 msgid ""
 "Use `/resume [#NUM]' to resume a call, #NUM is needed to resume incoming "
 "calls, no argument is needed to resume the current outgoing call."
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:961
+#: src/conversation/gnunet-conversation.c:962
 msgid "Use `/cancel' to reject or terminate a call"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:963
+#: src/conversation/gnunet-conversation.c:964
 msgid "Use `/status' to print status information"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:965
+#: src/conversation/gnunet-conversation.c:966
 msgid "Use `/quit' to terminate gnunet-conversation"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:967
+#: src/conversation/gnunet-conversation.c:968
 msgid "Use `/help command' to get help for a specific command"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:1171
+#: src/conversation/gnunet-conversation.c:1172
 #, fuzzy, c-format
 msgid "Name of our ego changed to `%s'\n"
 msgstr "发送消息失败。\n"
 
-#: src/conversation/gnunet-conversation.c:1184
+#: src/conversation/gnunet-conversation.c:1185
 #, c-format
 msgid "Our ego `%s' was deleted!\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:1219
+#: src/conversation/gnunet-conversation.c:1220
 #, fuzzy
 msgid "You must specify the NAME of an ego to use\n"
 msgstr "您必须指定一个昵称\n"
 
-#: src/conversation/gnunet-conversation.c:1243
+#: src/conversation/gnunet-conversation.c:1244
 #, fuzzy
 msgid "Failed to start gnunet-helper-w32-console\n"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/conversation/gnunet-conversation.c:1269
+#: src/conversation/gnunet-conversation.c:1270
 msgid "sets the NAME of the ego to use for the phone (and name resolution)"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:1272
+#: src/conversation/gnunet-conversation.c:1273
 msgid "sets the LINE to use for the phone"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:1298
+#: src/conversation/gnunet-conversation.c:1299
 msgid "Enables having a conversation with other GNUnet users."
 msgstr ""
 
@@ -1025,8 +1024,7 @@
 msgstr ""
 
 #: src/conversation/gnunet-conversation-test.c:243
-#: src/multicast/gnunet-multicast.c:70 src/revocation/gnunet-revocation.c:548
-#: src/template/gnunet-template.c:70
+#: src/revocation/gnunet-revocation.c:550 src/template/gnunet-template.c:76
 msgid "help text"
 msgstr ""
 
@@ -1157,27 +1155,18 @@
 msgid "Failed to allocate %u bytes for second packet\n"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/conversation/gnunet-service-conversation.c:855
-msgid "Cadet audio channel not ready; audio data dropped\n"
-msgstr ""
-
-#: src/conversation/gnunet-service-conversation.c:946
-#, c-format
-msgid ""
-"No available phone for incoming call on line %u, sending HANG_UP signal\n"
-msgstr ""
-
-#: src/conversation/gnunet-service-conversation.c:1360
-#, fuzzy, c-format
-msgid "Received incoming Cadet channel on port %u\n"
-msgstr "“%s”已连接到“%s”。\n"
-
 #: src/conversation/microphone.c:121
 #, fuzzy
 msgid "Could not start record audio helper\n"
 msgstr "找不到主机“%s”的 IP:%s\n"
 
-#: src/conversation/plugin_gnsrecord_conversation.c:116
+#: src/conversation/plugin_gnsrecord_conversation.c:71
+#, c-format
+msgid "PHONE version %u not supported\n"
+msgstr ""
+
+#: src/conversation/plugin_gnsrecord_conversation.c:133
+#: src/conversation/plugin_gnsrecord_conversation.c:147
 #, fuzzy, c-format
 msgid "Unable to parse PHONE record `%s'\n"
 msgstr "解析配置文件“%s”失败\n"
@@ -1186,10 +1175,6 @@
 msgid "Could not start playback audio helper.\n"
 msgstr ""
 
-#: src/core/core_api.c:725
-msgid "Client was disconnected from core service, trying to reconnect.\n"
-msgstr ""
-
 #: src/core/gnunet-core.c:90
 #, fuzzy
 msgid "fresh connection"
@@ -1233,7 +1218,7 @@
 msgid "%24s: %-30s %4s (timeout in %6s)\n"
 msgstr ""
 
-#: src/core/gnunet-core.c:144 src/peerinfo-tool/gnunet-peerinfo.c:790
+#: src/core/gnunet-core.c:144 src/peerinfo-tool/gnunet-peerinfo.c:728
 #, fuzzy, c-format
 msgid "Invalid command line argument `%s'\n"
 msgstr "“%s”的参数无效。\n"
@@ -1243,7 +1228,7 @@
 msgid "Failed to connect to CORE service!\n"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/core/gnunet-core.c:176 src/transport/gnunet-transport.c:1990
+#: src/core/gnunet-core.c:176 src/transport/gnunet-transport.c:1737
 msgid "provide information about all current connections (continuously)"
 msgstr ""
 
@@ -1251,59 +1236,63 @@
 msgid "Print information about connected peers."
 msgstr ""
 
-#: src/core/gnunet-service-core.c:104
-#, fuzzy
-msgid "Core service is lacking HOSTKEY configuration setting.  Exiting.\n"
-msgstr "立即保存配置?"
-
-#: src/core/gnunet-service-core.c:127
-#, c-format
-msgid "Core service of `%4s' ready.\n"
-msgstr ""
-
-#: src/core/gnunet-service-core_clients.c:380
+#: src/core/gnunet-service-core.c:339
 msgid "# send requests dropped (disconnected)"
 msgstr ""
 
-#: src/core/gnunet-service-core_clients.c:498
-msgid "# messages discarded (session disconnected)"
+#: src/core/gnunet-service-core.c:363
+msgid "# dequeuing CAR (duplicate request)"
 msgstr ""
 
-#: src/core/gnunet-service-core_clients.c:561
+#: src/core/gnunet-service-core.c:432
 #, c-format
 msgid "# bytes of messages of type %u received"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:571
+#: src/core/gnunet-service-core.c:530
+msgid "# messages discarded (session disconnected)"
+msgstr ""
+
+#: src/core/gnunet-service-core.c:928
+#, fuzzy
+msgid "Core service is lacking HOSTKEY configuration setting.  Exiting.\n"
+msgstr "立即保存配置?"
+
+#: src/core/gnunet-service-core.c:949
+#, fuzzy, c-format
+msgid "Core service of `%s' ready.\n"
+msgstr "服务已删除。\n"
+
+#: src/core/gnunet-service-core_kx.c:566
 msgid "# bytes encrypted"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:630
+#: src/core/gnunet-service-core_kx.c:626
 msgid "# bytes decrypted"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:719
+#: src/core/gnunet-service-core_kx.c:726
 msgid "# key exchanges initiated"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:766
+#: src/core/gnunet-service-core_kx.c:786
 msgid "# key exchanges stopped"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:796
+#: src/core/gnunet-service-core_kx.c:819
 #, fuzzy
 msgid "# PING messages transmitted"
 msgstr "消息尺寸"
 
-#: src/core/gnunet-service-core_kx.c:871
+#: src/core/gnunet-service-core_kx.c:886
 msgid "# old ephemeral keys ignored"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:878
+#: src/core/gnunet-service-core_kx.c:893
 msgid "# ephemeral keys received"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:917
+#: src/core/gnunet-service-core_kx.c:932
 #, c-format
 msgid ""
 "Ephemeral key message from peer `%s' rejected as its validity range does not "
@@ -1310,135 +1299,117 @@
 "match our system time (%llu not in [%llu,%llu]).\n"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:928
+#: src/core/gnunet-service-core_kx.c:943
 msgid "# EPHEMERAL_KEY messages received"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1030
-#: src/transport/gnunet-service-transport_validation.c:1080
+#: src/core/gnunet-service-core_kx.c:1039
+#: src/transport/gnunet-service-transport_validation.c:1119
 msgid "# PING messages received"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1039
+#: src/core/gnunet-service-core_kx.c:1048
 msgid "# PING messages dropped (out of order)"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1092
+#: src/core/gnunet-service-core_kx.c:1106
 msgid "# PONG messages created"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1119
+#: src/core/gnunet-service-core_kx.c:1132
 msgid "# sessions terminated by timeout"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1132
+#: src/core/gnunet-service-core_kx.c:1145
 msgid "# keepalive messages sent"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1203
-#: src/transport/gnunet-service-transport_validation.c:1403
+#: src/core/gnunet-service-core_kx.c:1209
+#: src/transport/gnunet-service-transport_validation.c:1442
 msgid "# PONG messages received"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1210
+#: src/core/gnunet-service-core_kx.c:1216
 msgid "# PONG messages dropped (connection down)"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1215
+#: src/core/gnunet-service-core_kx.c:1221
 msgid "# PONG messages dropped (out of order)"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1251
+#: src/core/gnunet-service-core_kx.c:1256
 msgid "# PONG messages decrypted"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1289
+#: src/core/gnunet-service-core_kx.c:1294
 msgid "# session keys confirmed via PONG"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1300
+#: src/core/gnunet-service-core_kx.c:1305
 msgid "# timeouts prevented via PONG"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1307
+#: src/core/gnunet-service-core_kx.c:1312
 msgid "# rekey operations confirmed via PONG"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1463
+#: src/core/gnunet-service-core_kx.c:1485
 msgid "# DATA message dropped (out of order)"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1471
+#: src/core/gnunet-service-core_kx.c:1493
 #, 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:1474
+#: src/core/gnunet-service-core_kx.c:1496
 msgid "# sessions terminated by key expiration"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1532
-#: src/core/gnunet-service-core_kx.c:1558
+#: src/core/gnunet-service-core_kx.c:1554
+#: src/core/gnunet-service-core_kx.c:1580
 msgid "# bytes dropped (duplicates)"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1545
+#: src/core/gnunet-service-core_kx.c:1567
 msgid "# bytes dropped (out of sequence)"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1587
+#: src/core/gnunet-service-core_kx.c:1609
 msgid "# bytes dropped (ancient message)"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1595
+#: src/core/gnunet-service-core_kx.c:1617
 msgid "# bytes of payload decrypted"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1629
+#: src/core/gnunet-service-core_kx.c:1674
 msgid "# PAYLOAD dropped (out of order)"
 msgstr ""
 
-#: src/core/gnunet-service-core_neighbours.c:183
-msgid "# sessions terminated by transport disconnect"
-msgstr ""
-
-#: src/core/gnunet-service-core_neighbours.c:199
-#: src/core/gnunet-service-core_neighbours.c:387
-msgid "# neighbour entries allocated"
-msgstr ""
-
-#: src/core/gnunet-service-core_neighbours.c:291
-msgid "# encrypted bytes given to transport"
-msgstr ""
-
-#: src/core/gnunet-service-core_neighbours.c:486
-#, c-format
-msgid "Unsupported message of type %u (%u bytes) received from peer `%s'\n"
-msgstr ""
-
-#: src/core/gnunet-service-core_sessions.c:253
-#: src/core/gnunet-service-core_sessions.c:337
-#: src/dht/gnunet-service-dht_neighbours.c:789
-#: src/dht/gnunet-service-dht_neighbours.c:863
-#: src/fs/gnunet-service-fs_cp.c:662 src/fs/gnunet-service-fs_cp.c:1715
-#: src/topology/gnunet-daemon-topology.c:611
-#: src/topology/gnunet-daemon-topology.c:723
-#: src/transport/gnunet-service-transport_neighbours.c:720
-#: src/transport/gnunet-service-transport_neighbours.c:728
+#: src/core/gnunet-service-core_sessions.c:256
+#: src/core/gnunet-service-core_sessions.c:341
+#: src/dht/gnunet-service-dht_neighbours.c:741
+#: src/dht/gnunet-service-dht_neighbours.c:803
+#: 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
+#: src/transport/gnunet-service-transport_neighbours.c:719
+#: src/transport/gnunet-service-transport_neighbours.c:727
 msgid "# peers connected"
 msgstr ""
 
-#: src/core/gnunet-service-core_sessions.c:284
+#: src/core/gnunet-service-core_sessions.c:287
 msgid "# type map refreshes sent"
 msgstr ""
 
-#: src/core/gnunet-service-core_sessions.c:403
+#: src/core/gnunet-service-core_sessions.c:407
 #, fuzzy
 msgid "# outdated typemap confirmations received"
 msgstr "保存配置失败。"
 
-#: src/core/gnunet-service-core_sessions.c:414
+#: src/core/gnunet-service-core_sessions.c:418
 #, fuzzy
 msgid "# valid typemap confirmations received"
 msgstr "保存配置失败。"
@@ -1453,7 +1424,7 @@
 msgstr ""
 
 #: src/datacache/datacache.c:119 src/datacache/datacache.c:294
-#: src/datastore/gnunet-service-datastore.c:865
+#: src/datastore/gnunet-service-datastore.c:770
 msgid "# bytes stored"
 msgstr ""
 
@@ -1487,7 +1458,7 @@
 msgid "# proximity search requests received"
 msgstr ""
 
-#: src/datacache/plugin_datacache_heap.c:466
+#: src/datacache/plugin_datacache_heap.c:467
 #, fuzzy
 msgid "Heap datacache running\n"
 msgstr "sqlite 数据仓库"
@@ -1494,23 +1465,22 @@
 
 #: src/datacache/plugin_datacache_sqlite.c:77
 #: src/datacache/plugin_datacache_sqlite.c:86
-#: src/datastore/plugin_datastore_mysql.c:818
-#: src/datastore/plugin_datastore_mysql.c:834
+#: src/datastore/plugin_datastore_mysql.c:1027
 #: src/datastore/plugin_datastore_sqlite.c:57
-#: src/datastore/plugin_datastore_sqlite.c:65 src/my/my.c:74 src/my/my.c:84
-#: src/mysql/mysql.c:41 src/mysql/mysql.c:48 src/mysql/mysql.c:522
-#: src/mysql/mysql.c:531 src/mysql/mysql.c:591 src/mysql/mysql.c:607
+#: src/datastore/plugin_datastore_sqlite.c:65 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/namestore/plugin_namestore_postgres.c:53
 #: src/namestore/plugin_namestore_sqlite.c:52
 #: src/peerstore/plugin_peerstore_sqlite.c:50
+#: src/psycstore/plugin_psycstore_mysql.c:62
 #: src/testbed/generate-underlay-topology.c:47
 #: src/testbed/gnunet-daemon-latency-logger.c:52
-#: src/testbed/gnunet-daemon-testbed-underlay.c:55
+#: src/testbed/gnunet-daemon-testbed-underlay.c:56
 #: src/testbed/testbed_api_hosts.c:69 src/util/crypto_ecc.c:52
 #: src/util/crypto_ecc_setup.c:41 src/util/crypto_mpi.c:39
-#: src/include/gnunet_common.h:677 src/include/gnunet_common.h:686
+#: src/include/gnunet_common.h:681 src/include/gnunet_common.h:690
 #: src/scalarproduct/scalarproduct.h:35
 #, fuzzy, c-format
 msgid "`%s' failed at %s:%d with error: %s\n"
@@ -1519,91 +1489,69 @@
 #: src/datacache/plugin_datacache_sqlite.c:749
 #: src/datastore/plugin_datastore_sqlite.c:409
 #: src/namecache/plugin_namecache_sqlite.c:292
-#: src/namestore/plugin_namestore_sqlite.c:324
+#: src/namestore/plugin_namestore_sqlite.c:343
 msgid "Tried to close sqlite without finalizing all prepared statements.\n"
 msgstr ""
 
-#: src/datastore/datastore_api.c:308
-msgid "Failed to transmit request to drop database.\n"
-msgstr ""
+#: src/datastore/datastore_api.c:309
+#, fuzzy
+msgid "DATASTORE disconnected"
+msgstr "“%s”已连接到“%s”。\n"
 
-#: src/datastore/datastore_api.c:392
-msgid "# queue entry timeouts"
-msgstr ""
+#: src/datastore/datastore_api.c:425
+#, fuzzy
+msgid "Disconnected from DATASTORE"
+msgstr "“%s”已连接到“%s”。\n"
 
-#: src/datastore/datastore_api.c:447
+#: src/datastore/datastore_api.c:513
 msgid "# queue overflows"
 msgstr ""
 
-#: src/datastore/datastore_api.c:475
+#: src/datastore/datastore_api.c:543
 msgid "# queue entries created"
 msgstr ""
 
-#: src/datastore/datastore_api.c:495
-msgid "# Requests dropped from datastore queue"
+#: src/datastore/datastore_api.c:680
+msgid "# status messages received"
 msgstr ""
 
-#: src/datastore/datastore_api.c:536
-msgid "# datastore connections (re)created"
+#: src/datastore/datastore_api.c:754
+msgid "# Results received"
 msgstr ""
 
-#: src/datastore/datastore_api.c:624
-msgid "# transmission request failures"
+#: src/datastore/datastore_api.c:879
+msgid "# datastore connections (re)created"
 msgstr ""
 
-#: src/datastore/datastore_api.c:648
-msgid "# bytes sent to datastore"
-msgstr ""
-
-#: src/datastore/datastore_api.c:790
-msgid "Failed to receive status response from database."
-msgstr ""
-
-#: src/datastore/datastore_api.c:804
-msgid "Error reading response from datastore service"
-msgstr ""
-
-#: src/datastore/datastore_api.c:816 src/datastore/datastore_api.c:822
-msgid "Invalid error message received from datastore service"
-msgstr ""
-
-#: src/datastore/datastore_api.c:826
-msgid "# status messages received"
-msgstr ""
-
-#: src/datastore/datastore_api.c:905
+#: src/datastore/datastore_api.c:995
 msgid "# PUT requests executed"
 msgstr ""
 
-#: src/datastore/datastore_api.c:971
+#: src/datastore/datastore_api.c:1056
 msgid "# RESERVE requests executed"
 msgstr ""
 
-#: src/datastore/datastore_api.c:1032
+#: src/datastore/datastore_api.c:1121
 msgid "# RELEASE RESERVE requests executed"
 msgstr ""
 
-#: src/datastore/datastore_api.c:1092
+#: src/datastore/datastore_api.c:1187
 msgid "# UPDATE requests executed"
 msgstr ""
 
-#: src/datastore/datastore_api.c:1156
+#: src/datastore/datastore_api.c:1271
 msgid "# REMOVE requests executed"
 msgstr ""
 
-#: src/datastore/datastore_api.c:1260
-msgid "# Results received"
-msgstr ""
-
-#: src/datastore/datastore_api.c:1327
+#: src/datastore/datastore_api.c:1331
 msgid "# GET REPLICATION requests executed"
 msgstr ""
 
-#: src/datastore/datastore_api.c:1390
+#: src/datastore/datastore_api.c:1397
 msgid "# GET ZERO ANONYMITY requests executed"
 msgstr ""
 
-#: src/datastore/datastore_api.c:1459
+#: src/datastore/datastore_api.c:1477
 msgid "# GET requests executed"
 msgstr ""
 
@@ -1628,36 +1576,26 @@
 msgid "Manipulate GNUnet datastore"
 msgstr "更改配置文件中的一个值"
 
-#: src/datastore/gnunet-service-datastore.c:370
+#: src/datastore/gnunet-service-datastore.c:336
 msgid "# bytes expired"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:446
+#: src/datastore/gnunet-service-datastore.c:416
 msgid "# bytes purged (low-priority)"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:504
-#: src/gns/gnunet-gns-helper-service-w32.c:221
-msgid "Transmission to client failed!\n"
-msgstr ""
-
-#: src/datastore/gnunet-service-datastore.c:535
-#: src/gns/gnunet-gns-helper-service-w32.c:260
-msgid "Shutdown in progress, aborting transmission.\n"
-msgstr ""
-
-#: src/datastore/gnunet-service-datastore.c:651
+#: src/datastore/gnunet-service-datastore.c:557
 msgid "# results found"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:696
+#: src/datastore/gnunet-service-datastore.c:598
 #, c-format
 msgid ""
-"Insufficient space (%llu bytes are available) to satisfy `%s' request for "
+"Insufficient space (%llu bytes are available) to satisfy RESERVE request for "
 "%llu bytes\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:707
+#: src/datastore/gnunet-service-datastore.c:609
 #, c-format
 msgid ""
 "The requested amount (%llu bytes) is larger than the cache size (%llu "
@@ -1664,129 +1602,127 @@
 "bytes)\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:711
+#: src/datastore/gnunet-service-datastore.c:615
 msgid ""
 "Insufficient space to satisfy request and requested amount is larger than "
 "cache size"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:717
+#: src/datastore/gnunet-service-datastore.c:622
 msgid "Insufficient space to satisfy request"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:723
-#: src/datastore/gnunet-service-datastore.c:778
-#: src/datastore/gnunet-service-datastore.c:1039
-#: src/datastore/gnunet-service-datastore.c:1673
+#: src/datastore/gnunet-service-datastore.c:629
+#: src/datastore/gnunet-service-datastore.c:684
+#: src/datastore/gnunet-service-datastore.c:969
+#: src/datastore/gnunet-service-datastore.c:1668
 msgid "# reserved"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:792
+#: src/datastore/gnunet-service-datastore.c:702
 msgid "Could not find matching reservation"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:879
+#: src/datastore/gnunet-service-datastore.c:787
 #, c-format
 msgid "Need %llu bytes more space (%llu allowed, using %llu)\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1094
+#: src/datastore/gnunet-service-datastore.c:1017
 msgid "# GET requests received"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1107
+#: src/datastore/gnunet-service-datastore.c:1048
+msgid "# GET KEY requests received"
+msgstr ""
+
+#: src/datastore/gnunet-service-datastore.c:1061
 msgid "# requests filtered by bloomfilter"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1155
+#: src/datastore/gnunet-service-datastore.c:1115
 msgid "# UPDATE requests received"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1187
+#: src/datastore/gnunet-service-datastore.c:1146
 msgid "# GET REPLICATION requests received"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1223
+#: src/datastore/gnunet-service-datastore.c:1179
 msgid "# GET ZERO ANONYMITY requests received"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1269
+#: src/datastore/gnunet-service-datastore.c:1226
 msgid "Content not found"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1279
+#: src/datastore/gnunet-service-datastore.c:1235
 msgid "# bytes removed (explicit request)"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1311
+#: src/datastore/gnunet-service-datastore.c:1282
 msgid "# REMOVE requests received"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1364
+#: src/datastore/gnunet-service-datastore.c:1336
 #, c-format
 msgid ""
 "Datastore payload must have been inaccurate (%lld < %lld). Recomputing it.\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1369
+#: src/datastore/gnunet-service-datastore.c:1342
+#: src/datastore/gnunet-service-datastore.c:1517
 #, c-format
 msgid "New payload: %lld\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1423
+#: src/datastore/gnunet-service-datastore.c:1396
 #, c-format
 msgid "Loading `%s' datastore plugin\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1434
+#: src/datastore/gnunet-service-datastore.c:1408
 #, fuzzy, c-format
 msgid "Failed to load datastore plugin for `%s'\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/datastore/gnunet-service-datastore.c:1503
-#: src/datastore/gnunet-service-datastore.c:1566
+#: src/datastore/gnunet-service-datastore.c:1468
 msgid "Bloomfilter construction complete.\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1553
+#: src/datastore/gnunet-service-datastore.c:1524
 msgid "Rebuilding bloomfilter.  Please be patient.\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1563
+#: src/datastore/gnunet-service-datastore.c:1535
 msgid "Plugin does not support get_keys function. Please fix!\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1704
-#: src/datastore/gnunet-service-datastore.c:1716
+#: src/datastore/gnunet-service-datastore.c:1705
 #, c-format
-msgid "No `%s' specified for `%s' in configuration!\n"
-msgstr ""
-
-#: src/datastore/gnunet-service-datastore.c:1710
-#, c-format
 msgid "# bytes used in file-sharing datastore `%s'"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1722
+#: src/datastore/gnunet-service-datastore.c:1721
 msgid "# quota"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1724
+#: src/datastore/gnunet-service-datastore.c:1726
 msgid "# cache size"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1739
+#: src/datastore/gnunet-service-datastore.c:1742
 #, c-format
 msgid "Could not use specified filename `%s' for bloomfilter.\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1757
-#: src/datastore/gnunet-service-datastore.c:1773
+#: src/datastore/gnunet-service-datastore.c:1760
+#: src/datastore/gnunet-service-datastore.c:1776
 #, fuzzy, c-format
 msgid "Failed to remove bogus bloomfilter file `%s'\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/datastore/gnunet-service-datastore.c:1803
+#: src/datastore/gnunet-service-datastore.c:1808
 #, fuzzy
 msgid "Failed to initialize bloomfilter.\n"
 msgstr "初始化“%s”服务失败。\n"
@@ -1796,27 +1732,23 @@
 msgid "Heap database running\n"
 msgstr "sqlite 数据仓库"
 
-#: src/datastore/plugin_datastore_mysql.c:309
+#: src/datastore/plugin_datastore_mysql.c:347
 #: src/datastore/plugin_datastore_sqlite.c:507
 #, fuzzy
 msgid "Data too large"
 msgstr "迭代次数"
 
-#: src/datastore/plugin_datastore_mysql.c:328
+#: src/datastore/plugin_datastore_mysql.c:363
 msgid "MySQL statement run failure"
 msgstr ""
 
-#: src/datastore/plugin_datastore_mysql.c:793
+#: src/datastore/plugin_datastore_mysql.c:983
 #, fuzzy, c-format
-msgid "Failed to prepare statement `%s'\n"
-msgstr "解析配置文件“%s”失败\n"
-
-#: src/datastore/plugin_datastore_mysql.c:802
-#, 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:1036
+#: src/datastore/plugin_datastore_mysql.c:1257
+#: src/psycstore/plugin_psycstore_mysql.c:1936
 msgid "Mysql database running\n"
 msgstr ""
 
@@ -1832,6 +1764,7 @@
 #: src/datastore/plugin_datastore_postgres.c:1012
 #: 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 ""
 
@@ -1838,7 +1771,7 @@
 #: src/datastore/plugin_datastore_sqlite.c:65
 #: src/testbed/generate-underlay-topology.c:50
 #: src/testbed/gnunet-daemon-latency-logger.c:55
-#: src/testbed/gnunet-daemon-testbed-underlay.c:58
+#: src/testbed/gnunet-daemon-testbed-underlay.c:59
 #, fuzzy, c-format
 msgid "`%s' failed at %s:%u with error: %s"
 msgstr "“%s”于 %s:%d 处失败,错误为:%s\n"
@@ -1845,7 +1778,7 @@
 
 #: src/datastore/plugin_datastore_sqlite.c:263
 #: src/namecache/plugin_namecache_sqlite.c:193
-#: src/namestore/plugin_namestore_sqlite.c:204
+#: src/namestore/plugin_namestore_sqlite.c:213
 #: src/peerstore/plugin_peerstore_sqlite.c:479
 #: src/psycstore/plugin_psycstore_sqlite.c:325
 #, c-format
@@ -1870,7 +1803,7 @@
 
 #: src/datastore/plugin_datastore_sqlite.c:1245
 #: src/namecache/plugin_namecache_sqlite.c:580
-#: src/namestore/plugin_namestore_sqlite.c:716
+#: src/namestore/plugin_namestore_sqlite.c:766
 #, fuzzy
 msgid "Sqlite database running\n"
 msgstr "sqlite 数据仓库"
@@ -1879,11 +1812,6 @@
 msgid "Template database running\n"
 msgstr ""
 
-#: src/dht/dht_api.c:403
-#, fuzzy
-msgid "Failed to connect to the DHT service!\n"
-msgstr "初始化“%s”服务失败。\n"
-
 #: src/dht/gnunet-dht-get.c:155
 #, c-format
 msgid ""
@@ -1905,7 +1833,7 @@
 msgstr ""
 
 #: src/dht/gnunet-dht-get.c:212 src/dht/gnunet-dht-monitor.c:289
-#: src/dht/gnunet-dht-put.c:202
+#: src/dht/gnunet-dht-put.c:198
 msgid "the query key"
 msgstr ""
 
@@ -1917,18 +1845,18 @@
 msgid "the type of data to look for"
 msgstr ""
 
-#: src/dht/gnunet-dht-get.c:221 src/dht/gnunet-dht-put.c:214
+#: src/dht/gnunet-dht-get.c:221
 msgid "how long to execute this query before giving up?"
 msgstr ""
 
-#: src/dht/gnunet-dht-get.c:224 src/dht/gnunet-dht-put.c:205
+#: src/dht/gnunet-dht-get.c:224 src/dht/gnunet-dht-put.c:201
 msgid "use DHT's demultiplex everywhere option"
 msgstr ""
 
 #: src/dht/gnunet-dht-get.c:227 src/dht/gnunet-dht-monitor.c:298
-#: src/dht/gnunet-dht-put.c:217 src/fs/gnunet-auto-share.c:780
+#: src/dht/gnunet-dht-put.c:210 src/fs/gnunet-auto-share.c:780
 #: src/fs/gnunet-download.c:327 src/fs/gnunet-publish.c:951
-#: src/fs/gnunet-search.c:318 src/fs/gnunet-unindex.c:167
+#: src/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 ""
@@ -1945,341 +1873,281 @@
 msgid "Prints all packets that go through the DHT."
 msgstr ""
 
-#: src/dht/gnunet_dht_profiler.c:1392
-#: src/testbed/gnunet-testbed-profiler.c:255
+#: src/dht/gnunet_dht_profiler.c:1161 src/testbed/gnunet-testbed-profiler.c:255
 #, fuzzy, c-format
 msgid "Exiting as the number of peers is %u\n"
 msgstr "增加 TCP/IP 的最大连接数"
 
-#: src/dht/gnunet_dht_profiler.c:1417
+#: src/dht/gnunet_dht_profiler.c:1186
 #, fuzzy
 msgid "number of peers to start"
 msgstr "迭代次数"
 
-#: src/dht/gnunet_dht_profiler.c:1420
+#: src/dht/gnunet_dht_profiler.c:1189
 msgid ""
 "maximum number of times we try to search for successor circle formation (0 "
 "for R5N)"
 msgstr ""
 
-#: src/dht/gnunet_dht_profiler.c:1423 src/nse/gnunet-nse-profiler.c:846
+#: src/dht/gnunet_dht_profiler.c:1192 src/nse/gnunet-nse-profiler.c:846
 #: src/testbed/gnunet-testbed-profiler.c:294
 msgid "name of the file with the login information for the testbed"
 msgstr ""
 
-#: src/dht/gnunet_dht_profiler.c:1426
+#: src/dht/gnunet_dht_profiler.c:1195
 msgid "delay between rounds for collecting statistics (default: 30 sec)"
 msgstr ""
 
-#: src/dht/gnunet_dht_profiler.c:1429
+#: src/dht/gnunet_dht_profiler.c:1198
 msgid "delay to start doing PUTs (default: 1 sec)"
 msgstr ""
 
-#: src/dht/gnunet_dht_profiler.c:1432
+#: src/dht/gnunet_dht_profiler.c:1201
 msgid "delay to start doing GETs (default: 5 min)"
 msgstr ""
 
-#: src/dht/gnunet_dht_profiler.c:1435
+#: src/dht/gnunet_dht_profiler.c:1204
 msgid "replication degree for DHT PUTs"
 msgstr ""
 
-#: src/dht/gnunet_dht_profiler.c:1438
+#: src/dht/gnunet_dht_profiler.c:1207
 msgid "timeout for DHT PUT and GET requests (default: 1 min)"
 msgstr ""
 
-#: src/dht/gnunet_dht_profiler.c:1456
+#: src/dht/gnunet_dht_profiler.c:1225
 #, fuzzy
 msgid "Measure quality and performance of the DHT service."
 msgstr "无法访问该服务"
 
-#: src/dht/gnunet-dht-put.c:120
+#: src/dht/gnunet-dht-put.c:115
 msgid "PUT request sent with key"
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:123
+#: src/dht/gnunet-dht-put.c:118
 msgid "Timeout sending PUT request!\n"
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:126
+#: src/dht/gnunet-dht-put.c:121
 msgid "PUT request not confirmed!\n"
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:157
+#: src/dht/gnunet-dht-put.c:151
 msgid "Must provide KEY and DATA for DHT put!\n"
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:164
+#: src/dht/gnunet-dht-put.c:158
 #, fuzzy, c-format
 msgid "Could not connect to %s service!\n"
 msgstr "无法连接到 %s:%u:%s\n"
 
-#: src/dht/gnunet-dht-put.c:180
+#: src/dht/gnunet-dht-put.c:172
 #, c-format
 msgid "Issuing put request for `%s' with data `%s'!\n"
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:196
+#: src/dht/gnunet-dht-put.c:192
 msgid "the data to insert under the key"
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:199
+#: src/dht/gnunet-dht-put.c:195
 msgid "how long to store this entry in the dht (in seconds)"
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:208
+#: src/dht/gnunet-dht-put.c:204
 msgid "how many replicas to create"
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:211
+#: src/dht/gnunet-dht-put.c:207
 msgid "the type to insert data as"
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:240
+#: src/dht/gnunet-dht-put.c:232
 msgid "Issue a PUT request to the GNUnet DHT insert DATA under KEY."
 msgstr ""
 
-#: src/dht/gnunet-service-dht.c:171
-#, fuzzy
-msgid "Failed to connect to transport service!\n"
-msgstr "初始化“%s”服务失败。\n"
-
-#: src/dht/gnunet-service-dht_clients.c:417
-#: src/dht/gnunet-service-wdht_clients.c:857
-#: src/dht/gnunet-service-xdht_clients.c:854
+#: src/dht/gnunet-service-dht_clients.c:370
+#: src/dht/gnunet-service-wdht_clients.c:864
 msgid "# GET requests from clients injected"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_clients.c:509
-#: src/dht/gnunet-service-wdht_clients.c:938
-#: src/dht/gnunet-service-xdht_clients.c:934
+#: src/dht/gnunet-service-dht_clients.c:481
+#: src/dht/gnunet-service-wdht_clients.c:945
 msgid "# PUT requests received from clients"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_clients.c:593
-#: src/dht/gnunet-service-wdht_clients.c:1004
-#: src/dht/gnunet-service-xdht_clients.c:999
+#: src/dht/gnunet-service-dht_clients.c:620
+#: src/dht/gnunet-service-wdht_clients.c:1011
 msgid "# GET requests received from clients"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_clients.c:794
-#: src/dht/gnunet-service-wdht_clients.c:1213
-#: src/dht/gnunet-service-xdht_clients.c:1201
+#: src/dht/gnunet-service-dht_clients.c:847
+#: src/dht/gnunet-service-wdht_clients.c:1220
 msgid "# GET STOP requests received from clients"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_clients.c:1041
+#: src/dht/gnunet-service-dht_clients.c:1032
 #: src/dht/gnunet-service-wdht_clients.c:510
-#: src/dht/gnunet-service-xdht_clients.c:508
 msgid "# Key match, type mismatches in REPLY to CLIENT"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_clients.c:1054
+#: src/dht/gnunet-service-dht_clients.c:1047
 #: src/dht/gnunet-service-wdht_clients.c:524
-#: src/dht/gnunet-service-xdht_clients.c:522
 msgid "# Duplicate REPLIES to CLIENT request dropped"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_clients.c:1099
+#: src/dht/gnunet-service-dht_clients.c:1094
 #: src/dht/gnunet-service-wdht_clients.c:566
-#: src/dht/gnunet-service-xdht_clients.c:564
 #, c-format
 msgid "Unsupported block type (%u) in request!\n"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_clients.c:1122
+#: src/dht/gnunet-service-dht_clients.c:1101
 #: src/dht/gnunet-service-wdht_clients.c:589
-#: src/dht/gnunet-service-xdht_clients.c:587
 msgid "# RESULTS queued for clients"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_clients.c:1176
-#: src/dht/gnunet-service-dht_clients.c:1219
+#: src/dht/gnunet-service-dht_clients.c:1179
 #: src/dht/gnunet-service-wdht_clients.c:643
-#: src/dht/gnunet-service-wdht_clients.c:686
-#: src/dht/gnunet-service-xdht_clients.c:641
-#: src/dht/gnunet-service-xdht_clients.c:684
+#: src/dht/gnunet-service-wdht_clients.c:693
 msgid "# REPLIES ignored for CLIENTS (no match)"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_clients.c:1186
-#: src/dht/gnunet-service-wdht_clients.c:653
-#: src/dht/gnunet-service-xdht_clients.c:651
-msgid "Could not pass reply to client, message too big!\n"
-msgstr ""
-
-#: src/dht/gnunet-service-dht_datacache.c:68
+#: src/dht/gnunet-service-dht_datacache.c:72
 #, c-format
 msgid "%s request received, but have no datacache!\n"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_datacache.c:78
-#: src/dht/gnunet-service-wdht_datacache.c:107
-#: src/dht/gnunet-service-xdht_datacache.c:91
+#: src/dht/gnunet-service-dht_datacache.c:82
 msgid "# ITEMS stored in datacache"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_datacache.c:184
-#: src/dht/gnunet-service-wdht_datacache.c:216
-#: src/dht/gnunet-service-xdht_datacache.c:238
+#: src/dht/gnunet-service-dht_datacache.c:199
 msgid "# Good RESULTS found in datacache"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_datacache.c:201
-#: src/dht/gnunet-service-wdht_datacache.c:231
-#: src/dht/gnunet-service-xdht_datacache.c:267
+#: src/dht/gnunet-service-dht_datacache.c:211
 msgid "# Duplicate RESULTS found in datacache"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_datacache.c:207
-#: src/dht/gnunet-service-wdht_datacache.c:237
-#: src/dht/gnunet-service-xdht_datacache.c:273
+#: src/dht/gnunet-service-dht_datacache.c:217
 msgid "# Invalid RESULTS found in datacache"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_datacache.c:213
-#: src/dht/gnunet-service-wdht_datacache.c:243
-#: src/dht/gnunet-service-xdht_datacache.c:279
+#: src/dht/gnunet-service-dht_datacache.c:223
 msgid "# Irrelevant RESULTS found in datacache"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_datacache.c:225
-#: src/dht/gnunet-service-wdht_datacache.c:255
-#: src/dht/gnunet-service-xdht_datacache.c:291
+#: src/dht/gnunet-service-dht_datacache.c:235
 msgid "# Unsupported RESULTS found in datacache"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_datacache.c:229
-#: src/dht/gnunet-service-wdht_datacache.c:258
-#: src/dht/gnunet-service-xdht_datacache.c:294
+#: src/dht/gnunet-service-dht_datacache.c:239
 #, c-format
 msgid "Unsupported block type (%u) in local response!\n"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_datacache.c:262
-#: src/dht/gnunet-service-wdht_datacache.c:295
-#: src/dht/gnunet-service-xdht_datacache.c:334
+#: src/dht/gnunet-service-dht_datacache.c:276
 msgid "# GET requests given to datacache"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_hello.c:84
-#: src/dht/gnunet-service-xdht_hello.c:82
+#: src/dht/gnunet-service-dht_hello.c:84 src/dht/gnunet-service-xdht_hello.c:82
 msgid "# HELLOs obtained from peerinfo"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:735
+#: src/dht/gnunet-service-dht_neighbours.c:685
 msgid "# FIND PEER messages initiated"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:900
-#: src/dht/gnunet-service-xdht_neighbours.c:6062
-msgid "# Queued messages discarded (peer disconnected)"
-msgstr ""
-
-#: src/dht/gnunet-service-dht_neighbours.c:933
-#: src/dht/gnunet-service-xdht_neighbours.c:986
-msgid "# Messages dropped (CORE timeout)"
-msgstr ""
-
-#: src/dht/gnunet-service-dht_neighbours.c:963
-#: src/dht/gnunet-service-xdht_neighbours.c:1018
-msgid "# Bytes transmitted to other peers"
-msgstr ""
-
-#: src/dht/gnunet-service-dht_neighbours.c:1009
-msgid "# Bytes of bandwidth requested from core"
-msgstr ""
-
-#: src/dht/gnunet-service-dht_neighbours.c:1043
+#: src/dht/gnunet-service-dht_neighbours.c:851
 msgid "# requests TTL-dropped"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1248
-#: src/dht/gnunet-service-dht_neighbours.c:1285
+#: src/dht/gnunet-service-dht_neighbours.c:1054
+#: src/dht/gnunet-service-dht_neighbours.c:1091
 msgid "# Peers excluded from routing due to Bloomfilter"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1263
-#: src/dht/gnunet-service-dht_neighbours.c:1300
+#: src/dht/gnunet-service-dht_neighbours.c:1071
+#: src/dht/gnunet-service-dht_neighbours.c:1107
 msgid "# Peer selection failed"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1447
+#: src/dht/gnunet-service-dht_neighbours.c:1255
 msgid "# PUT requests routed"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1476
+#: src/dht/gnunet-service-dht_neighbours.c:1288
 msgid "# PUT messages queued for transmission"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1486
-#: src/dht/gnunet-service-dht_neighbours.c:1610
-#: src/dht/gnunet-service-dht_neighbours.c:1717
-#: src/dht/gnunet-service-xdht_neighbours.c:1128
-#: src/dht/gnunet-service-xdht_neighbours.c:1197
-#: src/dht/gnunet-service-xdht_neighbours.c:1247
-#: src/dht/gnunet-service-xdht_neighbours.c:1311
-#: src/dht/gnunet-service-xdht_neighbours.c:1378
-#: src/dht/gnunet-service-xdht_neighbours.c:1440
-#: src/dht/gnunet-service-xdht_neighbours.c:1502
-#: src/dht/gnunet-service-xdht_neighbours.c:1564
-#: src/dht/gnunet-service-xdht_neighbours.c:1624
+#: src/dht/gnunet-service-dht_neighbours.c:1299
+#: src/dht/gnunet-service-dht_neighbours.c:1427
+#: src/dht/gnunet-service-dht_neighbours.c:1532
+#: 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:1572
+#: src/dht/gnunet-service-dht_neighbours.c:1383
 msgid "# GET requests routed"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1599
+#: src/dht/gnunet-service-dht_neighbours.c:1415
 msgid "# GET messages queued for transmission"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1724
+#: src/dht/gnunet-service-dht_neighbours.c:1547
 msgid "# RESULT messages queued for transmission"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1811
+#: src/dht/gnunet-service-dht_neighbours.c:1646
 msgid "# P2P PUT requests received"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1814
+#: src/dht/gnunet-service-dht_neighbours.c:1650
 msgid "# P2P PUT bytes received"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1986
+#: src/dht/gnunet-service-dht_neighbours.c:1854
 msgid "# FIND PEER requests ignored due to Bloomfilter"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1994
+#: src/dht/gnunet-service-dht_neighbours.c:1862
 msgid "# FIND PEER requests ignored due to lack of HELLO"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:2089
+#: src/dht/gnunet-service-dht_neighbours.c:2018
 msgid "# P2P GET requests received"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:2092
+#: src/dht/gnunet-service-dht_neighbours.c:2022
 msgid "# P2P GET bytes received"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:2157
+#: src/dht/gnunet-service-dht_neighbours.c:2097
 msgid "# P2P FIND PEER requests processed"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:2171
+#: src/dht/gnunet-service-dht_neighbours.c:2120
 msgid "# P2P GET requests ONLY routed"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:2257
+#: src/dht/gnunet-service-dht_neighbours.c:2222
 msgid "# P2P RESULTS received"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:2260
+#: src/dht/gnunet-service-dht_neighbours.c:2226
 msgid "# P2P RESULT bytes received"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_nse.c:59 src/dht/gnunet-service-wdht_nse.c:59
-#: src/dht/gnunet-service-xdht_nse.c:59
+#: src/dht/gnunet-service-dht_nse.c:59
 msgid "# Network size estimates received"
 msgstr ""
 
@@ -2303,23 +2171,23 @@
 msgid "# Unsupported REPLIES matched against routing table"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_routing.c:324
+#: src/dht/gnunet-service-dht_routing.c:327
 msgid "# Entries removed from routing table"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_routing.c:406
+#: src/dht/gnunet-service-dht_routing.c:409
 msgid "# Entries added to routing table"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_routing.c:424
+#: src/dht/gnunet-service-dht_routing.c:427
 msgid "# DHT requests combined"
 msgstr ""
 
-#: src/dht/gnunet-service-wdht_datacache.c:82
-msgid "PUT request received, but have no datacache!\n"
+#: src/dht/gnunet-service-wdht_clients.c:653
+msgid "Could not pass reply to client, message too big!\n"
 msgstr ""
 
-#: src/dht/gnunet-service-xdht_neighbours.c:1831
+#: src/dht/gnunet-service-xdht_neighbours.c:1572
 #, c-format
 msgid ""
 "\n"
@@ -2326,7 +2194,7 @@
 "SUPU %s, %s, %d,trail_length = %d"
 msgstr ""
 
-#: src/dht/gnunet-service-xdht_neighbours.c:1836
+#: src/dht/gnunet-service-xdht_neighbours.c:1577
 #, c-format
 msgid ""
 "\n"
@@ -2333,7 +2201,7 @@
 "SUPU %s, %s, %d,trail[%d]=%s"
 msgstr ""
 
-#: src/dht/gnunet-service-xdht_neighbours.c:1856
+#: src/dht/gnunet-service-xdht_neighbours.c:1597
 #, c-format
 msgid ""
 "\n"
@@ -2340,7 +2208,7 @@
 "SUPU************  FRIEND_PEERMAP of %s"
 msgstr ""
 
-#: src/dht/gnunet-service-xdht_neighbours.c:1866
+#: src/dht/gnunet-service-xdht_neighbours.c:1607
 #, c-format
 msgid ""
 "\n"
@@ -2347,7 +2215,7 @@
 "SUPU %s, %s, %d, friend = %s, friend->trails_count = %d"
 msgstr ""
 
-#: src/dht/gnunet-service-xdht_neighbours.c:1887
+#: src/dht/gnunet-service-xdht_neighbours.c:1628
 #, c-format
 msgid ""
 "\n"
@@ -2354,7 +2222,7 @@
 "SUPU************  FINGER_TABLE of %s"
 msgstr ""
 
-#: src/dht/gnunet-service-xdht_neighbours.c:1896
+#: src/dht/gnunet-service-xdht_neighbours.c:1637
 #, c-format
 msgid ""
 "\n"
@@ -2361,7 +2229,7 @@
 "SUPU %s, %s, %d, finger_table[%d] = %s, trails_count = %d"
 msgstr ""
 
-#: src/dht/gnunet-service-xdht_neighbours.c:1903
+#: src/dht/gnunet-service-xdht_neighbours.c:1644
 #, c-format
 msgid ""
 "\n"
@@ -2368,7 +2236,7 @@
 "SUPU %s, %s, %d, trail_id[%d]=%s"
 msgstr ""
 
-#: src/dht/gnunet-service-xdht_neighbours.c:1909
+#: src/dht/gnunet-service-xdht_neighbours.c:1650
 #, c-format
 msgid ""
 "\n"
@@ -2375,26 +2243,26 @@
 "SUPU %s, %s, %d,trail[%d] = %s "
 msgstr ""
 
-#: src/dht/gnunet-service-xdht_neighbours.c:3557
+#: src/dht/gnunet-service-xdht_neighbours.c:3366
 msgid "# FINGERS_COUNT"
 msgstr ""
 
-#: src/dht/gnunet-service-xdht_neighbours.c:3698
-#: src/dht/gnunet-service-xdht_neighbours.c:3936
-#: src/dht/gnunet-service-xdht_neighbours.c:4088
-#: src/dht/gnunet-service-xdht_neighbours.c:4240
-#: src/dht/gnunet-service-xdht_neighbours.c:4421
-#: src/dht/gnunet-service-xdht_neighbours.c:4934
-#: src/dht/gnunet-service-xdht_neighbours.c:5325
-#: src/dht/gnunet-service-xdht_neighbours.c:5420
-#: src/dht/gnunet-service-xdht_neighbours.c:5510
-#: src/dht/gnunet-service-xdht_neighbours.c:5614
-#: src/dht/gnunet-service-xdht_neighbours.c:5758
-#: src/dht/gnunet-service-xdht_neighbours.c:5849
+#: 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:256
+#: src/dht/gnunet-service-xdht_routing.c:261
 #, c-format
 msgid ""
 "\n"
@@ -2401,7 +2269,7 @@
 "SUPU ***PRINTING ROUTING TABLE ***** of =%s"
 msgstr ""
 
-#: src/dht/gnunet-service-xdht_routing.c:264
+#: src/dht/gnunet-service-xdht_routing.c:269
 #, c-format
 msgid ""
 "\n"
@@ -2408,7 +2276,7 @@
 "SUPU %s, %s, %d, trail->trail_id = %s"
 msgstr ""
 
-#: src/dht/gnunet-service-xdht_routing.c:267
+#: src/dht/gnunet-service-xdht_routing.c:272
 #, c-format
 msgid ""
 "\n"
@@ -2415,7 +2283,7 @@
 "SUPU %s, %s, %d, trail->next_hop = %s"
 msgstr ""
 
-#: src/dht/gnunet-service-xdht_routing.c:270
+#: src/dht/gnunet-service-xdht_routing.c:275
 #, c-format
 msgid ""
 "\n"
@@ -2446,27 +2314,27 @@
 msgid "Failed to convert UTF-8 name `%s' to DNS IDNA format: %s\n"
 msgstr "打开日志文件“%s”失败:%s\n"
 
-#: src/dns/dnsstub.c:175
+#: src/dns/dnsstub.c:176
 #, fuzzy, c-format
 msgid "Could not bind to any port: %s\n"
 msgstr "找不到主机“%s”的 IP:%s\n"
 
-#: src/dns/dnsstub.c:293 src/dns/dnsstub.c:381
+#: src/dns/dnsstub.c:294 src/dns/dnsstub.c:382
 #, fuzzy, c-format
 msgid "Failed to send DNS request to %s\n"
 msgstr "打开日志文件“%s”失败:%s\n"
 
-#: src/dns/dnsstub.c:297
+#: src/dns/dnsstub.c:298
 #, fuzzy, c-format
 msgid "Sent DNS request to %s\n"
 msgstr "打开日志文件“%s”失败:%s\n"
 
-#: src/dns/dnsstub.c:366
+#: src/dns/dnsstub.c:367
 #, c-format
 msgid "Configured DNS exit `%s' is not working / valid.\n"
 msgstr ""
 
-#: src/dns/dnsstub.c:438
+#: src/dns/dnsstub.c:437
 #, c-format
 msgid "Received DNS response that is too small (%u bytes)"
 msgstr ""
@@ -2495,49 +2363,53 @@
 msgid "Change DNS replies to point elsewhere."
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:457
+#: src/dns/gnunet-service-dns.c:462
 msgid "# DNS requests answered via TUN interface"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:604
+#: src/dns/gnunet-service-dns.c:608
 msgid "# DNS exit failed (failed to open socket)"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:715
+#: src/dns/gnunet-service-dns.c:738
 msgid "# External DNS response discarded (no matching request)"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:793
+#: src/dns/gnunet-service-dns.c:813
 msgid "# Client response discarded (no matching request)"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:908
+#: src/dns/gnunet-service-dns.c:929
 msgid "Received malformed IPv4-UDP packet on TUN interface.\n"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:924
+#: src/dns/gnunet-service-dns.c:945
 msgid "Received malformed IPv6-UDP packet on TUN interface.\n"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:933
+#: src/dns/gnunet-service-dns.c:954
 #, c-format
 msgid "Got non-IP packet with %u bytes and protocol %u from TUN\n"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:943
+#: src/dns/gnunet-service-dns.c:964
+msgid "DNS interceptor got non-DNS packet (dropped)\n"
+msgstr ""
+
+#: src/dns/gnunet-service-dns.c:966
 msgid "# Non-DNS UDP packet received via TUN interface"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:1010
+#: src/dns/gnunet-service-dns.c:1033
 msgid "# DNS requests received via TUN interface"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:1062 src/exit/gnunet-daemon-exit.c:3607
+#: src/dns/gnunet-service-dns.c:1078 src/exit/gnunet-daemon-exit.c:3643
 #, fuzzy
 msgid "need a valid IPv4 or IPv6 address\n"
 msgstr "无效的进程优先级“%s”\n"
 
-#: src/dns/gnunet-service-dns.c:1080
+#: src/dns/gnunet-service-dns.c:1091
 #, c-format
 msgid "`%s' must be installed SUID, will not run DNS interceptor\n"
 msgstr ""
@@ -2551,12 +2423,19 @@
 msgid "Print information about DV state"
 msgstr "无法获取有关用户“%s”的信息:%s\n"
 
-#: src/exit/gnunet-daemon-exit.c:807
+#: src/exit/gnunet-daemon-exit.c:805 src/exit/gnunet-daemon-exit.c:3109
+#, fuzzy
+msgid "# Inbound CADET channels created"
+msgstr ""
+"\n"
+"按任意键继续\n"
+
+#: src/exit/gnunet-daemon-exit.c:861
 #, c-format
 msgid "Got duplicate service records for `%s:%u'\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:858
+#: src/exit/gnunet-daemon-exit.c:914
 #, fuzzy
 msgid "# Bytes transmitted via cadet channels"
 msgstr ""
@@ -2563,206 +2442,185 @@
 "\n"
 "按任意键继续\n"
 
-#: src/exit/gnunet-daemon-exit.c:975 src/exit/gnunet-daemon-exit.c:2408
-#: src/exit/gnunet-daemon-exit.c:2666 src/vpn/gnunet-service-vpn.c:1446
-#: src/vpn/gnunet-service-vpn.c:1837 src/vpn/gnunet-service-vpn.c:2000
+#: src/exit/gnunet-daemon-exit.c:1033 src/exit/gnunet-daemon-exit.c:2493
+#: src/exit/gnunet-daemon-exit.c:2746 src/vpn/gnunet-service-vpn.c:1455
+#: src/vpn/gnunet-service-vpn.c:1846 src/vpn/gnunet-service-vpn.c:2009
 msgid "# ICMPv4 packets dropped (type not allowed)"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:1012 src/exit/gnunet-daemon-exit.c:2467
-#: src/exit/gnunet-daemon-exit.c:2725 src/vpn/gnunet-service-vpn.c:1502
-#: src/vpn/gnunet-service-vpn.c:1896 src/vpn/gnunet-service-vpn.c:2033
+#: src/exit/gnunet-daemon-exit.c:1070 src/exit/gnunet-daemon-exit.c:2552
+#: src/exit/gnunet-daemon-exit.c:2805 src/vpn/gnunet-service-vpn.c:1511
+#: src/vpn/gnunet-service-vpn.c:1905 src/vpn/gnunet-service-vpn.c:2042
 msgid "# ICMPv6 packets dropped (type not allowed)"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:1052
+#: src/exit/gnunet-daemon-exit.c:1118
 msgid "# ICMP packets dropped (not allowed)"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:1059
+#: src/exit/gnunet-daemon-exit.c:1126
 msgid "ICMP Packet dropped, have no matching connection information\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:1135
+#: src/exit/gnunet-daemon-exit.c:1203
 msgid "UDP Packet dropped, have no matching connection information\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:1209
+#: src/exit/gnunet-daemon-exit.c:1278
 msgid "TCP Packet dropped, have no matching connection information\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:1262
+#: src/exit/gnunet-daemon-exit.c:1331
 msgid "# Packets received from TUN"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:1276
+#: src/exit/gnunet-daemon-exit.c:1345
 msgid "# Bytes received from TUN"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:1302
+#: src/exit/gnunet-daemon-exit.c:1371
 msgid "IPv4 packet options received.  Ignored.\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:1329
+#: src/exit/gnunet-daemon-exit.c:1398
 #, c-format
 msgid "IPv4 packet with unsupported next header %u received.  Ignored.\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:1375
+#: src/exit/gnunet-daemon-exit.c:1444
 #, c-format
 msgid "IPv6 packet with unsupported next header %d received.  Ignored.\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:1383
+#: src/exit/gnunet-daemon-exit.c:1452
 #, c-format
 msgid "Packet from unknown protocol %u received.  Ignored.\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:1765
+#: src/exit/gnunet-daemon-exit.c:1853
 msgid "# TCP packets sent via TUN"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:1878
+#: src/exit/gnunet-daemon-exit.c:1977
 msgid "# TCP service creation requests received via cadet"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:1881 src/exit/gnunet-daemon-exit.c:1975
-#: src/exit/gnunet-daemon-exit.c:2082 src/exit/gnunet-daemon-exit.c:2332
-#: src/exit/gnunet-daemon-exit.c:2582 src/exit/gnunet-daemon-exit.c:2872
-#: src/exit/gnunet-daemon-exit.c:2980
+#: src/exit/gnunet-daemon-exit.c:1981 src/exit/gnunet-daemon-exit.c:2060
+#: src/exit/gnunet-daemon-exit.c:2167 src/exit/gnunet-daemon-exit.c:2417
+#: src/exit/gnunet-daemon-exit.c:2667 src/exit/gnunet-daemon-exit.c:2954
+#: src/exit/gnunet-daemon-exit.c:3057
 msgid "# Bytes received from CADET"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:1915 src/exit/gnunet-daemon-exit.c:3004
-#, c-format
-msgid "No service %s found for %s on port %d!\n"
-msgstr ""
-
-#: src/exit/gnunet-daemon-exit.c:1920
-msgid "# TCP requests dropped (no such service)"
-msgstr ""
-
-#: src/exit/gnunet-daemon-exit.c:1978
+#: src/exit/gnunet-daemon-exit.c:2063
 msgid "# TCP IP-exit creation requests received via cadet"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:2085
+#: src/exit/gnunet-daemon-exit.c:2170
 msgid "# TCP data requests received via cadet"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:2099
+#: src/exit/gnunet-daemon-exit.c:2184
 msgid "# TCP DATA requests dropped (no session)"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:2161
+#: src/exit/gnunet-daemon-exit.c:2246
 msgid "# ICMP packets sent via TUN"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:2335
+#: src/exit/gnunet-daemon-exit.c:2420
 msgid "# ICMP IP-exit requests received via cadet"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:2585
+#: src/exit/gnunet-daemon-exit.c:2670
 msgid "# ICMP service requests received via cadet"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:2651 src/vpn/gnunet-service-vpn.c:1436
-#: src/vpn/gnunet-service-vpn.c:1994
+#: src/exit/gnunet-daemon-exit.c:2731 src/vpn/gnunet-service-vpn.c:1445
+#: src/vpn/gnunet-service-vpn.c:2003
 msgid "# ICMPv4 packets dropped (impossible PT to v6)"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:2710 src/vpn/gnunet-service-vpn.c:1472
-#: src/vpn/gnunet-service-vpn.c:1484 src/vpn/gnunet-service-vpn.c:1884
+#: src/exit/gnunet-daemon-exit.c:2790 src/vpn/gnunet-service-vpn.c:1481
+#: src/vpn/gnunet-service-vpn.c:1493 src/vpn/gnunet-service-vpn.c:1893
 msgid "# ICMPv6 packets dropped (impossible PT to v4)"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:2761
+#: src/exit/gnunet-daemon-exit.c:2841
 msgid "# UDP packets sent via TUN"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:2875
+#: src/exit/gnunet-daemon-exit.c:2957
 msgid "# UDP IP-exit requests received via cadet"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:2983
+#: src/exit/gnunet-daemon-exit.c:3060
 msgid "# UDP service requests received via cadet"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3009
-msgid "# UDP requests dropped (no such service)"
-msgstr ""
-
-#: src/exit/gnunet-daemon-exit.c:3047
-#, fuzzy
-msgid "# Inbound CADET channels created"
-msgstr ""
-"\n"
-"按任意键继续\n"
-
-#: src/exit/gnunet-daemon-exit.c:3268 src/exit/gnunet-daemon-exit.c:3278
+#: src/exit/gnunet-daemon-exit.c:3327 src/exit/gnunet-daemon-exit.c:3337
 #, fuzzy, c-format
 msgid "Option `%s' for domain `%s' is not formatted correctly!\n"
 msgstr "%s:选项“%s”有歧义\n"
 
-#: src/exit/gnunet-daemon-exit.c:3292 src/exit/gnunet-daemon-exit.c:3300
+#: src/exit/gnunet-daemon-exit.c:3351 src/exit/gnunet-daemon-exit.c:3359
 #, c-format
 msgid "`%s' is not a valid port number (for domain `%s')!"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3333
+#: src/exit/gnunet-daemon-exit.c:3400
 #, c-format
 msgid "No addresses found for hostname `%s' of service `%s'!\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3347 src/exit/gnunet-daemon-exit.c:3359
+#: src/exit/gnunet-daemon-exit.c:3414 src/exit/gnunet-daemon-exit.c:3427
 #, c-format
 msgid "Service `%s' configured for IPv4, but IPv4 is disabled!\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3370
+#: src/exit/gnunet-daemon-exit.c:3439
 #, c-format
 msgid "No IP addresses found for hostname `%s' of service `%s'!\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3548
-#, c-format
-msgid "`%s' must be installed SUID, EXIT will not work\n"
-msgstr ""
-
-#: src/exit/gnunet-daemon-exit.c:3563
+#: src/exit/gnunet-daemon-exit.c:3584
 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:3571
+#: src/exit/gnunet-daemon-exit.c:3592
 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:3578
+#: src/exit/gnunet-daemon-exit.c:3599
 msgid ""
 "Cannot enable IPv4 exit but disable IPv4 on TUN interface, will use "
 "ENABLE_IPv4=YES\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3584
+#: src/exit/gnunet-daemon-exit.c:3605
 msgid ""
 "Cannot enable IPv6 exit but disable IPv6 on TUN interface, will use "
 "ENABLE_IPv6=YES\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3590 src/exit/gnunet-daemon-exit.c:3754
-#: src/pt/gnunet-daemon-pt.c:1243
-msgid "No useful service enabled.  Exiting.\n"
+#: src/exit/gnunet-daemon-exit.c:3765
+msgid "Must be a number"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3701
-msgid "Must be a number"
+#: src/exit/gnunet-daemon-exit.c:3872
+#, c-format
+msgid "`%s' must be installed SUID, EXIT will not work\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3852
+#: src/exit/gnunet-daemon-exit.c:3884 src/pt/gnunet-daemon-pt.c:1279
+msgid "No useful service enabled.  Exiting.\n"
+msgstr ""
+
+#: src/exit/gnunet-daemon-exit.c:4029
 msgid "Daemon to run to provide an IP exit node for the VPN"
 msgstr ""
 
@@ -2815,71 +2673,71 @@
 msgid "# fragmentation transmissions completed"
 msgstr ""
 
-#: src/fs/fs_api.c:493
+#: src/fs/fs_api.c:499
 #, fuzzy, c-format
 msgid "Could not open file `%s': %s"
 msgstr "打开日志文件“%s”失败:%s\n"
 
-#: src/fs/fs_api.c:504
+#: src/fs/fs_api.c:510
 #, fuzzy, c-format
 msgid "Could not read file `%s': %s"
 msgstr "无法解析“%s”(%s):%s\n"
 
-#: src/fs/fs_api.c:512
+#: src/fs/fs_api.c:518
 #, c-format
 msgid "Short read reading from file `%s'!"
 msgstr ""
 
-#: src/fs/fs_api.c:1120
+#: src/fs/fs_api.c:1126
 #, fuzzy, c-format
 msgid "Failed to resume publishing information `%s': %s\n"
 msgstr "打开日志文件“%s”失败:%s\n"
 
-#: src/fs/fs_api.c:1640
+#: src/fs/fs_api.c:1646
 #, c-format
 msgid "Failure while resuming publishing operation `%s': %s\n"
 msgstr ""
 
-#: src/fs/fs_api.c:1654
+#: src/fs/fs_api.c:1660
 #, fuzzy, c-format
 msgid "Failed to resume publishing operation `%s': %s\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/fs/fs_api.c:2312
+#: src/fs/fs_api.c:2318
 #, c-format
 msgid "Failure while resuming unindexing operation `%s': %s\n"
 msgstr ""
 
-#: src/fs/fs_api.c:2322
+#: src/fs/fs_api.c:2328
 #, fuzzy, c-format
 msgid "Failed to resume unindexing operation `%s': %s\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/fs/fs_api.c:2450 src/fs/fs_api.c:2698
+#: src/fs/fs_api.c:2456 src/fs/fs_api.c:2703
 #, fuzzy, c-format
 msgid "Failed to resume sub-download `%s': %s\n"
 msgstr "打开日志文件“%s”失败:%s\n"
 
-#: src/fs/fs_api.c:2468
+#: src/fs/fs_api.c:2474
 #, fuzzy, c-format
 msgid "Failed to resume sub-search `%s': %s\n"
 msgstr "打开日志文件“%s”失败:%s\n"
 
-#: src/fs/fs_api.c:2483 src/fs/fs_api.c:2502 src/fs/fs_api.c:2994
+#: src/fs/fs_api.c:2489 src/fs/fs_api.c:2508 src/fs/fs_api.c:3006
 #, c-format
 msgid "Failure while resuming search operation `%s': %s\n"
 msgstr ""
 
-#: src/fs/fs_api.c:2688
+#: src/fs/fs_api.c:2693
 #, fuzzy, c-format
 msgid "Failed to resume sub-download `%s': could not open file `%s'\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/fs/fs_api.c:2937
+#: src/fs/fs_api.c:2949
 msgid "Could not resume running search, will resume as paused search\n"
 msgstr ""
 
-#: src/fs/fs_api.c:3032
+#: src/fs/fs_api.c:3044
 #, c-format
 msgid "Failure while resuming download operation `%s': %s\n"
 msgstr ""
@@ -2888,27 +2746,27 @@
 msgid "MAGIC mismatch.  This is not a GNUnet directory.\n"
 msgstr ""
 
-#: src/fs/fs_download.c:322
+#: src/fs/fs_download.c:308
 msgid ""
 "Recursive downloads of directories larger than 4 GB are not supported on 32-"
 "bit systems\n"
 msgstr ""
 
-#: src/fs/fs_download.c:342
+#: src/fs/fs_download.c:328
 msgid "Directory too large for system address space\n"
 msgstr ""
 
-#: src/fs/fs_download.c:523 src/fs/fs_download.c:535
+#: src/fs/fs_download.c:509 src/fs/fs_download.c:521
 #, fuzzy, c-format
 msgid "Failed to open file `%s' for writing"
 msgstr "打开日志文件“%s”失败:%s\n"
 
-#: src/fs/fs_download.c:905
+#: src/fs/fs_download.c:926
 #, c-format
 msgid "Failed to create directory for recursive download of `%s'\n"
 msgstr ""
 
-#: src/fs/fs_download.c:987
+#: src/fs/fs_download.c:1011
 #, c-format
 msgid ""
 "Internal error or bogus download URI (expected %u bytes at depth %u and "
@@ -2915,31 +2773,31 @@
 "offset %llu/%llu, got %u bytes)"
 msgstr ""
 
-#: src/fs/fs_download.c:1013
+#: src/fs/fs_download.c:1039
 msgid "internal error decrypting content"
 msgstr ""
 
-#: src/fs/fs_download.c:1036
+#: src/fs/fs_download.c:1063
 #, fuzzy, c-format
 msgid "Download failed: could not open file `%s': %s"
 msgstr "打开日志文件“%s”失败:%s\n"
 
-#: src/fs/fs_download.c:1046
+#: src/fs/fs_download.c:1075
 #, fuzzy, c-format
 msgid "Failed to seek to offset %llu in file `%s': %s"
 msgstr "打开日志文件“%s”失败:%s\n"
 
-#: src/fs/fs_download.c:1055
+#: src/fs/fs_download.c:1084
 #, 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:1153
+#: src/fs/fs_download.c:1184
 #, fuzzy
 msgid "internal error decoding tree"
 msgstr "未知错误。\n"
 
-#: src/fs/fs_download.c:1939
+#: src/fs/fs_download.c:1838
 #, fuzzy
 msgid "Invalid URI"
 msgstr "无效条目。\n"
@@ -2951,17 +2809,12 @@
 "`unknown' instead.\n"
 msgstr ""
 
-#: src/fs/fs_list_indexed.c:90
-#, c-format
-msgid "Failed to receive response for `%s' request from `%s' service.\n"
-msgstr ""
+#: src/fs/fs_list_indexed.c:152
+#, fuzzy, c-format
+msgid "Failed to receive response from `%s' service.\n"
+msgstr "“%s”的参数无效。\n"
 
-#: src/fs/fs_list_indexed.c:113
-#, c-format
-msgid "Failed to receive valid response for `%s' request from `%s' service.\n"
-msgstr ""
-
-#: src/fs/fs_list_indexed.c:151
+#: src/fs/fs_list_indexed.c:196
 #, fuzzy, c-format
 msgid "Failed to not connect to `%s' service.\n"
 msgstr "初始化“%s”服务失败。\n"
@@ -2990,67 +2843,63 @@
 msgid "Failed to connect to datastore."
 msgstr ""
 
-#: src/fs/fs_publish.c:127 src/fs/fs_publish.c:439
+#: src/fs/fs_publish.c:127 src/fs/fs_publish.c:438
 #, c-format
 msgid "Publishing failed: %s"
 msgstr ""
 
-#: src/fs/fs_publish.c:706 src/fs/fs_publish.c:723 src/fs/fs_publish.c:762
-#: src/fs/fs_publish.c:783 src/fs/fs_publish.c:807 src/fs/fs_publish.c:1055
+#: src/fs/fs_publish.c:724 src/fs/fs_publish.c:778 src/fs/fs_publish.c:823
+#: src/fs/fs_publish.c:844 src/fs/fs_publish.c:874 src/fs/fs_publish.c:1140
 #, c-format
 msgid "Can not index file `%s': %s.  Will try to insert instead.\n"
 msgstr ""
 
-#: src/fs/fs_publish.c:708
-msgid "timeout on index-start request to `fs' service"
-msgstr ""
-
-#: src/fs/fs_publish.c:720
+#: src/fs/fs_publish.c:780
 #, fuzzy
-msgid "unknown error"
-msgstr "未知错误"
+msgid "error on index-start request to `fs' service"
+msgstr "初始化“%s”服务失败。\n"
 
-#: src/fs/fs_publish.c:764
+#: src/fs/fs_publish.c:825
 msgid "failed to compute hash"
 msgstr ""
 
-#: src/fs/fs_publish.c:784
+#: src/fs/fs_publish.c:845
 msgid "filename too long"
 msgstr ""
 
-#: src/fs/fs_publish.c:809
+#: src/fs/fs_publish.c:876
 msgid "could not connect to `fs' service"
 msgstr ""
 
-#: src/fs/fs_publish.c:832
+#: src/fs/fs_publish.c:902
 #, fuzzy, c-format
 msgid "Failed to get file identifiers for `%s'\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/fs/fs_publish.c:896 src/fs/fs_publish.c:937
+#: src/fs/fs_publish.c:991 src/fs/fs_publish.c:1027
 msgid "Can not create LOC URI. Will continue with CHK instead.\n"
 msgstr ""
 
-#: src/fs/fs_publish.c:1009
+#: src/fs/fs_publish.c:1094
 #, c-format
 msgid "Recursive upload failed at `%s': %s"
 msgstr ""
 
-#: src/fs/fs_publish.c:1017
+#: src/fs/fs_publish.c:1102
 #, c-format
 msgid "Recursive upload failed: %s"
 msgstr ""
 
-#: src/fs/fs_publish.c:1057
+#: src/fs/fs_publish.c:1142
 msgid "needs to be an actual file"
 msgstr ""
 
-#: src/fs/fs_publish.c:1296
+#: src/fs/fs_publish.c:1381
 #, fuzzy, c-format
 msgid "Datastore failure: %s"
 msgstr "“%s”已连接到“%s”。\n"
 
-#: src/fs/fs_publish.c:1387
+#: src/fs/fs_publish.c:1472
 #, c-format
 msgid "Reserving space for %u entries and %llu bytes for publication\n"
 msgstr ""
@@ -3064,12 +2913,12 @@
 msgid "Internal error."
 msgstr "未知错误。\n"
 
-#: src/fs/fs_search.c:806 src/fs/fs_search.c:876
+#: src/fs/fs_search.c:809 src/fs/fs_search.c:879
 #, fuzzy, c-format
 msgid "Failed to parse URI `%s': %s\n"
 msgstr "运行 %s失败:%s %d\n"
 
-#: src/fs/fs_search.c:935
+#: src/fs/fs_search.c:966
 #, c-format
 msgid "Got result with unknown block type `%d', ignoring"
 msgstr ""
@@ -3083,49 +2932,41 @@
 msgid "Failed to read file"
 msgstr "发送消息失败。\n"
 
-#: src/fs/fs_unindex.c:245
-msgid "Unexpected time for a response from `fs' service."
-msgstr ""
-
-#: src/fs/fs_unindex.c:253
-msgid "Timeout waiting for `fs' service."
-msgstr ""
-
-#: src/fs/fs_unindex.c:261
+#: src/fs/fs_unindex.c:275
 #, fuzzy
-msgid "Invalid response from `fs' service."
-msgstr "“%s”的参数无效。\n"
+msgid "Error communicating with `fs' service."
+msgstr "连接 %s:%u 出错。守护程序在运行吗?\n"
 
-#: src/fs/fs_unindex.c:304
+#: src/fs/fs_unindex.c:328
 msgid "Failed to connect to FS service for unindexing."
 msgstr ""
 
-#: src/fs/fs_unindex.c:360 src/fs/fs_unindex.c:372
+#: src/fs/fs_unindex.c:378 src/fs/fs_unindex.c:390
 #, fuzzy
 msgid "Failed to get KSKs from directory scan."
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/fs/fs_unindex.c:368
+#: src/fs/fs_unindex.c:386
 #, fuzzy, c-format
 msgid "Internal error scanning `%s'.\n"
 msgstr "未知错误。\n"
 
-#: src/fs/fs_unindex.c:427
+#: src/fs/fs_unindex.c:445
 #, fuzzy, c-format
 msgid "Failed to remove UBlock: %s\n"
 msgstr "打开日志文件“%s”失败:%s\n"
 
-#: src/fs/fs_unindex.c:590 src/fs/fs_unindex.c:654
+#: src/fs/fs_unindex.c:606 src/fs/fs_unindex.c:669
 #, fuzzy
 msgid "Failed to connect to `datastore' service."
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/fs/fs_unindex.c:667
+#: src/fs/fs_unindex.c:682
 #, fuzzy
 msgid "Failed to open file for unindexing."
 msgstr "打开日志文件“%s”失败:%s\n"
 
-#: src/fs/fs_unindex.c:706
+#: src/fs/fs_unindex.c:721
 msgid "Failed to compute hash of file."
 msgstr ""
 
@@ -3342,7 +3183,7 @@
 msgstr ""
 
 #: src/fs/gnunet-download.c:208 src/fs/gnunet-publish.c:295
-#: src/fs/gnunet-search.c:208 src/fs/gnunet-unindex.c:107
+#: src/fs/gnunet-search.c:212 src/fs/gnunet-unindex.c:107
 #, c-format
 msgid "Unexpected status: %d\n"
 msgstr ""
@@ -3366,12 +3207,12 @@
 msgstr ""
 
 #: src/fs/gnunet-download.c:267 src/fs/gnunet-publish.c:870
-#: src/fs/gnunet-search.c:266 src/fs/gnunet-unindex.c:139
+#: src/fs/gnunet-search.c:270 src/fs/gnunet-unindex.c:139
 #, fuzzy, c-format
 msgid "Could not initialize `%s' subsystem.\n"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/fs/gnunet-download.c:304 src/fs/gnunet-search.c:306
+#: src/fs/gnunet-download.c:304 src/fs/gnunet-search.c:310
 msgid "set the desired LEVEL of receiver-anonymity"
 msgstr ""
 
@@ -3379,7 +3220,7 @@
 msgid "delete incomplete downloads (when aborted with CTRL-C)"
 msgstr ""
 
-#: src/fs/gnunet-download.c:310 src/fs/gnunet-search.c:309
+#: src/fs/gnunet-download.c:310 src/fs/gnunet-search.c:313
 msgid "only search the local peer (no P2P network search)"
 msgstr ""
 
@@ -3555,7 +3396,7 @@
 msgstr ""
 
 #: src/fs/gnunet-publish.c:849 src/fs/gnunet-publish.c:857
-#: src/transport/gnunet-transport.c:1811 src/transport/gnunet-transport.c:1835
+#: src/transport/gnunet-transport.c:1577 src/transport/gnunet-transport.c:1602
 #, c-format
 msgid "Option `%s' makes no sense without option `%s'.\n"
 msgstr ""
@@ -3613,65 +3454,85 @@
 msgid "Publish a file or directory on GNUnet"
 msgstr ""
 
-#: src/fs/gnunet-search.c:123
+#: src/fs/gnunet-search.c:127
 #, c-format
 msgid "Failed to write directory with search results to `%s'\n"
 msgstr ""
 
-#: src/fs/gnunet-search.c:200
+#: src/fs/gnunet-search.c:204
 #, fuzzy, c-format
 msgid "Error searching: %s.\n"
 msgstr "创建用户出错"
 
-#: src/fs/gnunet-search.c:256
+#: src/fs/gnunet-search.c:260
 msgid "Could not create keyword URI from arguments.\n"
 msgstr ""
 
-#: src/fs/gnunet-search.c:280
+#: src/fs/gnunet-search.c:284
 msgid "Could not start searching.\n"
 msgstr ""
 
-#: src/fs/gnunet-search.c:312
+#: src/fs/gnunet-search.c:316
 msgid "write search results to file starting with PREFIX"
 msgstr ""
 
-#: src/fs/gnunet-search.c:315
+#: src/fs/gnunet-search.c:319
 msgid "automatically terminate search after DELAY"
 msgstr ""
 
-#: src/fs/gnunet-search.c:322
+#: src/fs/gnunet-search.c:326
 msgid "automatically terminate search after VALUE results are found"
 msgstr ""
 
-#: src/fs/gnunet-search.c:333
+#: src/fs/gnunet-search.c:337
 msgid "Search GNUnet for files that were published on GNUnet"
 msgstr ""
 
-#: src/fs/gnunet-service-fs.c:273
+#: src/fs/gnunet-service-fs.c:378 src/fs/gnunet-service-fs.c:883
+msgid "# client searches active"
+msgstr ""
+
+#: src/fs/gnunet-service-fs.c:437
+msgid "# replies received for local clients"
+msgstr ""
+
+#: src/fs/gnunet-service-fs.c:606
 msgid "# running average P2P latency (ms)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs.c:331 src/fs/gnunet-service-fs.c:603
+#: src/fs/gnunet-service-fs.c:658 src/fs/gnunet-service-fs_cp.c:564
 msgid "# Loopback routes suppressed"
 msgstr ""
 
-#: src/fs/gnunet-service-fs.c:730
+#: src/fs/gnunet-service-fs.c:837
+msgid "# client searches received"
+msgstr ""
+
+#: src/fs/gnunet-service-fs.c:876
+msgid "# client searches updated (merged content seen list)"
+msgstr ""
+
+#: src/fs/gnunet-service-fs.c:1047
+#, c-format
+msgid "Hash mismatch trying to index file `%s' which does not have hash `%s'\n"
+msgstr ""
+
+#: src/fs/gnunet-service-fs.c:1288
 #, fuzzy
 msgid "FS service is lacking HOSTKEY configuration setting.  Exiting.\n"
 msgstr "立即保存配置?"
 
-#: src/fs/gnunet-service-fs.c:756 src/hostlist/gnunet-daemon-hostlist.c:308
-#: src/topology/gnunet-daemon-topology.c:1245
-#: src/topology/gnunet-daemon-topology.c:1253
+#: src/fs/gnunet-service-fs.c:1313 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"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/fs/gnunet-service-fs_cadet_client.c:490
+#: src/fs/gnunet-service-fs_cadet_client.c:494
 msgid "# replies received via cadet"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cadet_client.c:504
+#: src/fs/gnunet-service-fs_cadet_client.c:508
 msgid "# replies received via cadet dropped"
 msgstr ""
 
@@ -3679,15 +3540,15 @@
 msgid "# Blocks transferred via cadet"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cadet_server.c:359
+#: src/fs/gnunet-service-fs_cadet_server.c:360
 msgid "# queries received via CADET not answered"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cadet_server.c:439
+#: src/fs/gnunet-service-fs_cadet_server.c:440
 msgid "# queries received via cadet"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cadet_server.c:483
+#: src/fs/gnunet-service-fs_cadet_server.c:484
 #, fuzzy
 msgid "# cadet client connections rejected"
 msgstr ""
@@ -3694,8 +3555,8 @@
 "\n"
 "按任意键继续\n"
 
-#: src/fs/gnunet-service-fs_cadet_server.c:489
-#: src/fs/gnunet-service-fs_cadet_server.c:529
+#: src/fs/gnunet-service-fs_cadet_server.c:490
+#: src/fs/gnunet-service-fs_cadet_server.c:530
 #, fuzzy
 msgid "# cadet connections active"
 msgstr ""
@@ -3702,183 +3563,146 @@
 "\n"
 "按任意键继续\n"
 
-#: src/fs/gnunet-service-fs_cp.c:743
+#: src/fs/gnunet-service-fs_cp.c:686
 msgid "# migration stop messages received"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:747
+#: src/fs/gnunet-service-fs_cp.c:690
 #, c-format
 msgid "Migration of content to peer `%s' blocked for %s\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:785
-msgid "# replies transmitted to other peers"
-msgstr ""
-
-#: src/fs/gnunet-service-fs_cp.c:793
-msgid "# replies dropped"
-msgstr ""
-
-#: src/fs/gnunet-service-fs_cp.c:820 src/fs/gnunet-service-fs_cp.c:1472
+#: src/fs/gnunet-service-fs_cp.c:723 src/fs/gnunet-service-fs_cp.c:1343
 msgid "# P2P searches active"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:918
+#: src/fs/gnunet-service-fs_cp.c:818
 msgid "# artificial delays introduced (ms)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:974
+#: src/fs/gnunet-service-fs_cp.c:875
 msgid "# replies dropped due to type mismatch"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:982
+#: src/fs/gnunet-service-fs_cp.c:883
 msgid "# replies received for other peers"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:996
+#: src/fs/gnunet-service-fs_cp.c:897
 msgid "# replies dropped due to insufficient cover traffic"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1044
+#: src/fs/gnunet-service-fs_cp.c:944
 msgid "# P2P searches destroyed due to ultimate reply"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1115
+#: src/fs/gnunet-service-fs_cp.c:1015
 msgid "# requests done for free (low load)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1140
+#: src/fs/gnunet-service-fs_cp.c:1040
 msgid "# request dropped, priority insufficient"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1150
+#: src/fs/gnunet-service-fs_cp.c:1050
 msgid "# requests done for a price (normal load)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1248
+#: src/fs/gnunet-service-fs_cp.c:1148
 msgid "# requests dropped due to higher-TTL request"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1302
+#: src/fs/gnunet-service-fs_cp.c:1205
 msgid "# GET requests received (from other peers)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1337
-msgid "# requests dropped due to initiator not being connected"
-msgstr ""
-
-#: src/fs/gnunet-service-fs_cp.c:1358
+#: src/fs/gnunet-service-fs_cp.c:1228
 msgid "# requests dropped due to missing reverse route"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1369
+#: src/fs/gnunet-service-fs_cp.c:1239
 msgid "# requests dropped due to full reply queue"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1424
+#: src/fs/gnunet-service-fs_cp.c:1295
 msgid "# requests dropped due TTL underflow"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1468
+#: src/fs/gnunet-service-fs_cp.c:1339
 msgid "# P2P query messages received and processed"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1913
+#: src/fs/gnunet-service-fs_cp.c:1706
 msgid "# migration stop messages sent"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_indexing.c:130
-#: src/fs/gnunet-service-fs_indexing.c:181
+#: src/fs/gnunet-service-fs_indexing.c:134
+#: src/fs/gnunet-service-fs_indexing.c:195
 #, fuzzy, c-format
 msgid "Could not open `%s'.\n"
 msgstr "无法解析“%s”(%s):%s\n"
 
-#: src/fs/gnunet-service-fs_indexing.c:142
+#: src/fs/gnunet-service-fs_indexing.c:151
 #, fuzzy, c-format
 msgid "Error writing `%s'.\n"
 msgstr "创建用户出错"
 
-#: src/fs/gnunet-service-fs_indexing.c:237
-#, c-format
-msgid ""
-"Index request received for file `%s' is already indexed as `%s'.  Permitting "
-"anyway.\n"
-msgstr ""
-
-#: src/fs/gnunet-service-fs_indexing.c:275
-#, c-format
-msgid "Hash mismatch trying to index file `%s' which has hash `%s'\n"
-msgstr ""
-
-#: src/fs/gnunet-service-fs_indexing.c:477
+#: src/fs/gnunet-service-fs_indexing.c:253
 #, fuzzy, c-format
 msgid "Failed to delete bogus block: %s\n"
 msgstr "打开日志文件“%s”失败:%s\n"
 
-#: src/fs/gnunet-service-fs_indexing.c:542
+#: src/fs/gnunet-service-fs_indexing.c:329
 msgid "# index blocks removed: original file inaccessible"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_indexing.c:557
+#: src/fs/gnunet-service-fs_indexing.c:355
 #, 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:559
+#: src/fs/gnunet-service-fs_indexing.c:359
 msgid "not indexed"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_indexing.c:574
+#: src/fs/gnunet-service-fs_indexing.c:392
 #, c-format
 msgid "Indexed file `%s' changed at offset %llu\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_lc.c:202 src/fs/gnunet-service-fs_lc.c:378
-msgid "# client searches active"
+#: src/fs/gnunet-service-fs_indexing.c:515
+#, c-format
+msgid ""
+"Index request received for file `%s' is already indexed as `%s'.  Permitting "
+"anyway.\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_lc.c:261
-msgid "# replies received for local clients"
+#: src/fs/gnunet-service-fs_pe.c:265
+msgid "# average retransmission delay (ms)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_lc.c:332
-msgid "# client searches received"
+#: src/fs/gnunet-service-fs_pe.c:427
+msgid "# delay heap timeout (ms)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_lc.c:372
-msgid "# client searches updated (merged content seen list)"
+#: src/fs/gnunet-service-fs_pe.c:438
+msgid "# query plans executed"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pe.c:273
-msgid "# average retransmission delay (ms)"
-msgstr ""
-
-#: src/fs/gnunet-service-fs_pe.c:412
-msgid "# transmission failed (core has no bandwidth)"
-msgstr ""
-
-#: src/fs/gnunet-service-fs_pe.c:447
+#: src/fs/gnunet-service-fs_pe.c:466
 msgid "# query messages sent to other peers"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pe.c:501
-msgid "# delay heap timeout (ms)"
-msgstr ""
-
-#: src/fs/gnunet-service-fs_pe.c:511
-msgid "# query plans executed"
-msgstr ""
-
-#: src/fs/gnunet-service-fs_pe.c:593
+#: src/fs/gnunet-service-fs_pe.c:536
 msgid "# requests merged"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pe.c:603
+#: src/fs/gnunet-service-fs_pe.c:546
 msgid "# requests refreshed"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pe.c:661 src/fs/gnunet-service-fs_pe.c:769
-#: src/fs/gnunet-service-fs_pe.c:848
+#: src/fs/gnunet-service-fs_pe.c:606 src/fs/gnunet-service-fs_pe.c:709
+#: src/fs/gnunet-service-fs_pe.c:788
 msgid "# query plan entries"
 msgstr ""
 
@@ -3886,107 +3710,107 @@
 msgid "# Pending requests created"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:411 src/fs/gnunet-service-fs_pr.c:671
+#: src/fs/gnunet-service-fs_pr.c:411 src/fs/gnunet-service-fs_pr.c:661
 msgid "# Pending requests active"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:852
+#: src/fs/gnunet-service-fs_pr.c:842
 msgid "# replies received and matched"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:889
+#: src/fs/gnunet-service-fs_pr.c:879
 msgid "# duplicate replies discarded (bloomfilter)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:898
+#: src/fs/gnunet-service-fs_pr.c:888
 msgid "# irrelevant replies discarded"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:913
+#: src/fs/gnunet-service-fs_pr.c:903
 #, c-format
 msgid "Unsupported block type %u\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:930
+#: src/fs/gnunet-service-fs_pr.c:920
 msgid "# results found locally"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1060
+#: src/fs/gnunet-service-fs_pr.c:1050
 msgid "# Datastore `PUT' failures"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1088
+#: src/fs/gnunet-service-fs_pr.c:1078
 msgid "# storage requests dropped due to high load"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1126
+#: src/fs/gnunet-service-fs_pr.c:1116
 msgid "# Replies received from DHT"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1258
+#: src/fs/gnunet-service-fs_pr.c:1247
 msgid "# Replies received from CADET"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1310
+#: src/fs/gnunet-service-fs_pr.c:1299
 #, c-format
 msgid "Datastore lookup already took %s!\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1331
+#: src/fs/gnunet-service-fs_pr.c:1320
 #, c-format
 msgid "On-demand lookup already took %s!\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1383
+#: src/fs/gnunet-service-fs_pr.c:1372
 msgid "# Datastore lookups concluded (no results)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1398
+#: src/fs/gnunet-service-fs_pr.c:1387
 msgid "# Datastore lookups concluded (seen all)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1407
+#: src/fs/gnunet-service-fs_pr.c:1396
 msgid "# Datastore lookups aborted (more than MAX_RESULTS)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1422
+#: src/fs/gnunet-service-fs_pr.c:1411
 msgid "# requested DBLOCK or IBLOCK not found"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1436
+#: src/fs/gnunet-service-fs_pr.c:1425
 msgid "# on-demand blocks matched requests"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1449
+#: src/fs/gnunet-service-fs_pr.c:1438
 msgid "# on-demand lookups performed successfully"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1454
+#: src/fs/gnunet-service-fs_pr.c:1443
 msgid "# on-demand lookups failed"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1481 src/fs/gnunet-service-fs_pr.c:1521
-#: src/fs/gnunet-service-fs_pr.c:1690
+#: src/fs/gnunet-service-fs_pr.c:1469 src/fs/gnunet-service-fs_pr.c:1508
+#: src/fs/gnunet-service-fs_pr.c:1675
 msgid "# Datastore lookups concluded (error queueing)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1540
+#: src/fs/gnunet-service-fs_pr.c:1527
 msgid "# Datastore lookups concluded (found last result)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1552
+#: src/fs/gnunet-service-fs_pr.c:1539
 msgid "# Datastore lookups concluded (load too high)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1666
+#: src/fs/gnunet-service-fs_pr.c:1652
 msgid "# Datastore lookups initiated"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1755
+#: src/fs/gnunet-service-fs_pr.c:1732
 msgid "# GAP PUT messages received"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_push.c:678
+#: src/fs/gnunet-service-fs_push.c:642
 msgid "time required, content pushing disabled"
 msgstr ""
 
@@ -4017,11 +3841,6 @@
 msgid "Unindex a file that was previously indexed with gnunet-publish."
 msgstr ""
 
-#: src/gns/gns_api.c:393
-#, fuzzy
-msgid "Failed to deserialize lookup reply from GNS service!\n"
-msgstr "初始化“%s”服务失败。\n"
-
 #: src/gns/gnunet-bcd.c:127
 #, c-format
 msgid "Refusing `%s' request to HTTP server\n"
@@ -4106,22 +3925,22 @@
 msgid "GNUnet DNS-to-GNS proxy (a DNS server)"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:236 src/gns/plugin_rest_gns.c:347
+#: src/gns/gnunet-gns.c:269 src/gns/plugin_rest_gns.c:347
 #, c-format
 msgid "Invalid typename specified, assuming `ANY'\n"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:254
+#: src/gns/gnunet-gns.c:295
 #, c-format
 msgid "Please specify name to lookup!\n"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:335
+#: src/gns/gnunet-gns.c:376
 #, c-format
 msgid "Ego for `%s' not found, cannot perform lookup.\n"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:374 src/gns/gnunet-gns-helper-service-w32.c:796
+#: src/gns/gnunet-gns.c:415 src/gns/gnunet-gns-helper-service-w32.c:796
 #: src/gns/plugin_rest_gns.c:472
 #, c-format
 msgid ""
@@ -4129,45 +3948,62 @@
 "gns-import.sh?\n"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:415 src/gns/gnunet-gns-helper-service-w32.c:826
+#: src/gns/gnunet-gns.c:456 src/gns/gnunet-gns-helper-service-w32.c:826
 #, fuzzy, c-format
 msgid "Failed to connect to GNS\n"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/gns/gnunet-gns.c:429
+#: src/gns/gnunet-gns.c:470 src/gns/gnunet-gns.c:500
 #, 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:479
+#: src/gns/gnunet-gns.c:548
 msgid "Lookup a record for the given name"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:482
+#: src/gns/gnunet-gns.c:551
 msgid "Specify the type of the record to lookup"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:485
+#: src/gns/gnunet-gns.c:554
 msgid "Specify timeout for the lookup"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:488
+#: src/gns/gnunet-gns.c:557
 msgid "No unneeded output"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:491
+#: src/gns/gnunet-gns.c:560
 msgid "Specify the public key of the zone to lookup the record in"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:494
+#: src/gns/gnunet-gns.c:563
 msgid "Specify the name of the ego of the zone to lookup the record in"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:508
+#: src/gns/gnunet-gns.c:566
+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
+msgid "Transmission to client failed!\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 ""
@@ -4186,14 +4022,14 @@
 msgstr ""
 
 #: src/gns/gnunet-gns-proxy.c:109
-#: src/hostlist/gnunet-daemon-hostlist_client.c:529
-#: src/hostlist/gnunet-daemon-hostlist_client.c:747
-#: src/hostlist/gnunet-daemon-hostlist_client.c:753
-#: src/hostlist/gnunet-daemon-hostlist_client.c:805
-#: src/hostlist/gnunet-daemon-hostlist_client.c:814
-#: src/hostlist/gnunet-daemon-hostlist_client.c:925
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1020
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1025
+#: src/hostlist/gnunet-daemon-hostlist_client.c:569
+#: src/hostlist/gnunet-daemon-hostlist_client.c:787
+#: src/hostlist/gnunet-daemon-hostlist_client.c:793
+#: src/hostlist/gnunet-daemon-hostlist_client.c:845
+#: src/hostlist/gnunet-daemon-hostlist_client.c:854
+#: src/hostlist/gnunet-daemon-hostlist_client.c:965
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1060
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1065
 #: src/transport/plugin_transport_http_client.c:598
 #: src/transport/plugin_transport_http_client.c:616
 #, c-format
@@ -4200,127 +4036,128 @@
 msgid "%s failed at %s:%d: `%s'\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:846
+#: src/gns/gnunet-gns-proxy.c:887
 #, fuzzy, c-format
 msgid "Unsupported CURL SSL backend %d\n"
 msgstr "未知的命令“%s”。\n"
 
-#: src/gns/gnunet-gns-proxy.c:869
+#: src/gns/gnunet-gns-proxy.c:910
 #, fuzzy, c-format
 msgid "Failed to fetch CN from cert: %s\n"
 msgstr "打开日志文件“%s”失败:%s\n"
 
-#: src/gns/gnunet-gns-proxy.c:892
+#: src/gns/gnunet-gns-proxy.c:933
 #, fuzzy, c-format
 msgid "Failed to initialize DANE: %s\n"
 msgstr "无法初始化 SQLite:%s。\n"
 
-#: src/gns/gnunet-gns-proxy.c:905
+#: src/gns/gnunet-gns-proxy.c:946
 #, fuzzy, c-format
 msgid "Failed to parse DANE record: %s\n"
 msgstr "打开日志文件“%s”失败:%s\n"
 
-#: src/gns/gnunet-gns-proxy.c:920
+#: src/gns/gnunet-gns-proxy.c:961
 #, fuzzy, c-format
 msgid "Failed to verify TLS connection using DANE: %s\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/gns/gnunet-gns-proxy.c:930
+#: src/gns/gnunet-gns-proxy.c:971
 #, c-format
 msgid "Failed DANE verification failed with GnuTLS verify status code: %u\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:954
+#: src/gns/gnunet-gns-proxy.c:995
 #, c-format
 msgid "SSL certificate subject name (%s) does not match `%s'\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:1099
+#: src/gns/gnunet-gns-proxy.c:1104
 #, c-format
 msgid "Cookie domain `%s' supplied by server is invalid\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:1631
+#: src/gns/gnunet-gns-proxy.c:1708
 #, fuzzy, c-format
 msgid "Unsupported HTTP method `%s'\n"
 msgstr "未知的命令“%s”。\n"
 
-#: src/gns/gnunet-gns-proxy.c:1997
+#: src/gns/gnunet-gns-proxy.c:2167
 #, fuzzy, c-format
 msgid "Unable to import private key from file `%s'\n"
 msgstr "无法创建用户账户:"
 
-#: src/gns/gnunet-gns-proxy.c:2027
+#: src/gns/gnunet-gns-proxy.c:2197
 #, fuzzy, c-format
 msgid "Unable to import certificate %s\n"
 msgstr "无法保存配置文件“%s”:"
 
-#: src/gns/gnunet-gns-proxy.c:2199
+#: src/gns/gnunet-gns-proxy.c:2370
 #, fuzzy, c-format
 msgid "Failed to start HTTPS server for `%s'\n"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/gns/gnunet-gns-proxy.c:2218 src/rest/gnunet-rest-server.c:529
+#: src/gns/gnunet-gns-proxy.c:2389 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:2538
+#: src/gns/gnunet-gns-proxy.c:2709
 #, fuzzy, c-format
 msgid "Unsupported socks version %d\n"
 msgstr "未知的命令“%s”。\n"
 
-#: src/gns/gnunet-gns-proxy.c:2567
+#: src/gns/gnunet-gns-proxy.c:2738
 #, fuzzy, c-format
 msgid "Unsupported socks command %d\n"
 msgstr "未知的命令“%s”。\n"
 
-#: src/gns/gnunet-gns-proxy.c:2585 src/gns/gnunet-gns-proxy.c:2614
+#: src/gns/gnunet-gns-proxy.c:2756 src/gns/gnunet-gns-proxy.c:2785
 msgid "SSL connection to plain IPv4 address requested\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:2665
+#: src/gns/gnunet-gns-proxy.c:2836
 #, fuzzy, c-format
 msgid "Unsupported socks address type %d\n"
 msgstr "未知的命令“%s”。\n"
 
-#: src/gns/gnunet-gns-proxy.c:2999
+#: src/gns/gnunet-gns-proxy.c:3171
 msgid "No ego configured for `shorten-zone`\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:3039 src/gns/gnunet-service-gns.c:887
+#: src/gns/gnunet-gns-proxy.c:3211 src/gns/gnunet-service-gns.c:1093
+#: src/gns/gnunet-service-gns.c:1149
 #, c-format
 msgid "No ego configured for `%s`\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:3101
+#: src/gns/gnunet-gns-proxy.c:3273
 #, fuzzy, c-format
 msgid "Failed to load SSL/TLS key and certificate from `%s'\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/gns/gnunet-gns-proxy.c:3141
+#: src/gns/gnunet-gns-proxy.c:3313
 msgid "listen on specified port (default: 7777)"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:3144
+#: src/gns/gnunet-gns-proxy.c:3316
 msgid "pem file to use as CA"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:3163
+#: src/gns/gnunet-gns-proxy.c:3335
 msgid "GNUnet GNS proxy"
 msgstr ""
 
-#: src/gns/gnunet-service-gns.c:928
+#: src/gns/gnunet-service-gns.c:1187
 #, fuzzy
 msgid "Failed to connect to the namestore!\n"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/gns/gnunet-service-gns.c:936
+#: src/gns/gnunet-service-gns.c:1195
 #, fuzzy
 msgid "Failed to connect to the namecache!\n"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/gns/gnunet-service-gns.c:969
+#: src/gns/gnunet-service-gns.c:1228
 #, fuzzy
 msgid "Could not connect to DHT!\n"
 msgstr "无法连接到 %s:%u:%s\n"
@@ -4329,7 +4166,7 @@
 msgid "Error converting GNS response to DNS response!\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns_interceptor.c:369
+#: src/gns/gnunet-service-gns_interceptor.c:371
 #, fuzzy
 msgid "Failed to connect to the DNS service!\n"
 msgstr "初始化“%s”服务失败。\n"
@@ -4354,55 +4191,60 @@
 msgid "Skipping record of unsupported type %d\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns_resolver.c:1353
+#: src/gns/gnunet-service-gns_resolver.c:1354
 #, c-format
 msgid "GNS lookup resulted in DNS name that is too long (`%s')\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns_resolver.c:1888
+#: src/gns/gnunet-service-gns_resolver.c:1889
 msgid "GNS lookup recursion failed (no delegation record found)\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns_resolver.c:1912
+#: src/gns/gnunet-service-gns_resolver.c:1913
 #, fuzzy, c-format
 msgid "Failed to cache GNS resolution: %s\n"
 msgstr "打开日志文件“%s”失败:%s\n"
 
-#: src/gns/gnunet-service-gns_resolver.c:2194
+#: src/gns/gnunet-service-gns_resolver.c:2195
 #, c-format
 msgid "Zone %s was revoked, resolution fails\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns_resolver.c:2341
+#: src/gns/gnunet-service-gns_resolver.c:2342
 #, c-format
 msgid "Hostname `%s' is not well-formed, resolution fails\n"
 msgstr ""
 
-#: src/gns/plugin_gnsrecord_gns.c:172
+#: src/gns/plugin_gnsrecord_gns.c:203
 #, fuzzy, c-format
 msgid "Unable to parse PKEY record `%s'\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/gns/plugin_gnsrecord_gns.c:201
+#: src/gns/plugin_gnsrecord_gns.c:232
 #, fuzzy, c-format
 msgid "Unable to parse GNS2DNS record `%s'\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/gns/plugin_gnsrecord_gns.c:222
+#: src/gns/plugin_gnsrecord_gns.c:253
 #, fuzzy, c-format
 msgid "Failed to serialize GNS2DNS record with value `%s'\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/gns/plugin_gnsrecord_gns.c:245
+#: src/gns/plugin_gnsrecord_gns.c:276
 #, fuzzy, c-format
 msgid "Unable to parse VPN record string `%s'\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/gns/plugin_gnsrecord_gns.c:280
+#: src/gns/plugin_gnsrecord_gns.c:311
 #, fuzzy, c-format
 msgid "Unable to parse BOX record string `%s'\n"
 msgstr "解析配置文件“%s”失败\n"
 
+#: src/gns/plugin_gnsrecord_gns.c:359
+#, fuzzy, c-format
+msgid "Unable to parse REVERSE record string `%s'\n"
+msgstr "解析配置文件“%s”失败\n"
+
 #: src/gns/plugin_rest_gns.c:435
 msgid "Ego for not found, cannot perform lookup.\n"
 msgstr ""
@@ -4426,53 +4268,53 @@
 msgid "Failed to serialize CNAME record with value `%s'\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/gnsrecord/plugin_gnsrecord_dns.c:486
+#: src/gnsrecord/plugin_gnsrecord_dns.c:487
 #, fuzzy, c-format
 msgid "Failed to serialize CERT record with %u bytes\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/gnsrecord/plugin_gnsrecord_dns.c:522
+#: src/gnsrecord/plugin_gnsrecord_dns.c:523
 #, fuzzy, c-format
 msgid "Unable to parse SOA record `%s'\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/gnsrecord/plugin_gnsrecord_dns.c:541
+#: src/gnsrecord/plugin_gnsrecord_dns.c:542
 #, fuzzy, c-format
 msgid "Failed to serialize SOA record with mname `%s' and rname `%s'\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/gnsrecord/plugin_gnsrecord_dns.c:564
+#: src/gnsrecord/plugin_gnsrecord_dns.c:565
 #, fuzzy, c-format
 msgid "Failed to serialize PTR record with value `%s'\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/gnsrecord/plugin_gnsrecord_dns.c:587
+#: src/gnsrecord/plugin_gnsrecord_dns.c:588
 #, fuzzy, c-format
 msgid "Unable to parse MX record `%s'\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/gnsrecord/plugin_gnsrecord_dns.c:602
+#: src/gnsrecord/plugin_gnsrecord_dns.c:603
 #, fuzzy, c-format
 msgid "Failed to serialize MX record with hostname `%s'\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/gnsrecord/plugin_gnsrecord_dns.c:629
+#: src/gnsrecord/plugin_gnsrecord_dns.c:630
 #, fuzzy, c-format
 msgid "Unable to parse SRV record `%s'\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/gnsrecord/plugin_gnsrecord_dns.c:645
+#: src/gnsrecord/plugin_gnsrecord_dns.c:646
 #, fuzzy, c-format
 msgid "Failed to serialize SRV record with target `%s'\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/gnsrecord/plugin_gnsrecord_dns.c:662
+#: src/gnsrecord/plugin_gnsrecord_dns.c:663
 #, fuzzy, c-format
 msgid "Unable to parse IPv6 address `%s'\n"
 msgstr "无效的进程优先级“%s”\n"
 
-#: src/gnsrecord/plugin_gnsrecord_dns.c:686
-#: src/gnsrecord/plugin_gnsrecord_dns.c:702
+#: src/gnsrecord/plugin_gnsrecord_dns.c:687
+#: src/gnsrecord/plugin_gnsrecord_dns.c:703
 #, fuzzy, c-format
 msgid "Unable to parse TLSA record string `%s'\n"
 msgstr "解析配置文件“%s”失败\n"
@@ -4516,98 +4358,98 @@
 msgid "Modified %u addresses, wrote %u bytes\n"
 msgstr ""
 
-#: src/hello/hello.c:1139
+#: src/hello/hello.c:1103
 #, fuzzy
 msgid "Failed to parse HELLO message: missing expiration time\n"
 msgstr "保存配置失败。"
 
-#: src/hello/hello.c:1148
+#: src/hello/hello.c:1112
 #, fuzzy
 msgid "Failed to parse HELLO message: invalid expiration time\n"
 msgstr "保存配置失败。"
 
-#: src/hello/hello.c:1158
+#: src/hello/hello.c:1122
 #, fuzzy
 msgid "Failed to parse HELLO message: malformed\n"
 msgstr "打开日志文件“%s”失败:%s\n"
 
-#: src/hello/hello.c:1169
+#: src/hello/hello.c:1133
 msgid "Failed to parse HELLO message: missing transport plugin\n"
 msgstr ""
 
-#: src/hello/hello.c:1187
+#: src/hello/hello.c:1151
 #, c-format
 msgid "Plugin `%s' not found, skipping address\n"
 msgstr ""
 
-#: src/hello/hello.c:1195
+#: src/hello/hello.c:1159
 #, c-format
 msgid "Plugin `%s' does not support URIs yet\n"
 msgstr ""
 
-#: src/hello/hello.c:1210
+#: src/hello/hello.c:1174
 #, fuzzy, c-format
 msgid "Failed to parse `%s' as an address for plugin `%s'\n"
 msgstr "找不到接口“%s”的一个 IP 地址。\n"
 
-#: src/hostlist/gnunet-daemon-hostlist.c:272
+#: src/hostlist/gnunet-daemon-hostlist.c:316
 msgid ""
 "None of the functions for the hostlist daemon were enabled.  I have no "
 "reason to run!\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist.c:328
+#: src/hostlist/gnunet-daemon-hostlist.c:375
 msgid "advertise our hostlist to other peers"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist.c:333
+#: src/hostlist/gnunet-daemon-hostlist.c:380
 msgid ""
 "bootstrap using hostlists (it is highly recommended that you always use this "
 "option)"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist.c:336
+#: src/hostlist/gnunet-daemon-hostlist.c:383
 msgid "enable learning about hostlist servers from other peers"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist.c:340
+#: src/hostlist/gnunet-daemon-hostlist.c:387
 msgid "provide a hostlist server"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist.c:356
+#: src/hostlist/gnunet-daemon-hostlist.c:403
 msgid "GNUnet hostlist server and client"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:348
+#: src/hostlist/gnunet-daemon-hostlist_client.c:371
 msgid "# bytes downloaded from hostlist servers"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:369
-#: src/hostlist/gnunet-daemon-hostlist_client.c:399
+#: src/hostlist/gnunet-daemon-hostlist_client.c:392
+#: src/hostlist/gnunet-daemon-hostlist_client.c:437
 msgid "# invalid HELLOs downloaded from hostlist servers"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:372
-#: src/hostlist/gnunet-daemon-hostlist_client.c:402
+#: src/hostlist/gnunet-daemon-hostlist_client.c:395
+#: src/hostlist/gnunet-daemon-hostlist_client.c:440
 #, c-format
 msgid "Invalid `%s' message received from hostlist at `%s'\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:390
+#: src/hostlist/gnunet-daemon-hostlist_client.c:413
 msgid "# valid HELLOs downloaded from hostlist servers"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:655
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1386
+#: src/hostlist/gnunet-daemon-hostlist_client.c:695
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1441
 msgid "# advertised hostlist URIs"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:685
+#: src/hostlist/gnunet-daemon-hostlist_client.c:725
 #, c-format
 msgid "# advertised URI `%s' downloaded"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:728
+#: src/hostlist/gnunet-daemon-hostlist_client.c:768
 #, c-format
 msgid ""
 "Advertised hostlist with URI `%s' could not be downloaded. Advertised URI "
@@ -4614,228 +4456,223 @@
 "gets dismissed.\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:856
+#: src/hostlist/gnunet-daemon-hostlist_client.c:896
 #, c-format
 msgid "Timeout trying to download hostlist from `%s'\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:870
+#: src/hostlist/gnunet-daemon-hostlist_client.c:910
 #, c-format
 msgid "Download limit of %u bytes exceeded, stopping download\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:890
+#: src/hostlist/gnunet-daemon-hostlist_client.c:930
 #, fuzzy, c-format
 msgid "Download of hostlist from `%s' failed: `%s'\n"
 msgstr "打开日志文件“%s”失败:%s\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:896
+#: src/hostlist/gnunet-daemon-hostlist_client.c:936
 #, c-format
 msgid "Download of hostlist `%s' completed.\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:904
+#: src/hostlist/gnunet-daemon-hostlist_client.c:944
 #, c-format
 msgid "Adding successfully tested hostlist `%s' datastore.\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:957
+#: src/hostlist/gnunet-daemon-hostlist_client.c:997
 #, c-format
 msgid "Bootstrapping using hostlist at `%s'.\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:965
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1005
 msgid "# hostlist downloads initiated"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1092
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1639
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1132
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1698
 msgid "# milliseconds between hostlist downloads"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1101
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1141
 #, c-format
 msgid "Have %u/%u connections.  Will consider downloading hostlist in %s\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1156
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1172
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1200
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1221
 msgid "# active connections"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1332
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1387
 #, c-format
 msgid "Loading saved hostlist entries from file `%s' \n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1337
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1392
 #, c-format
 msgid "Hostlist file `%s' does not exist\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1346
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1401
 #, fuzzy, c-format
 msgid "Could not open file `%s' for reading to load hostlists: %s\n"
 msgstr "无法解析“%s”来确定已方的 IP 地址:%s\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1380
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1435
 #, c-format
 msgid "%u hostlist URIs loaded from file\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1383
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1438
 msgid "# hostlist URIs read from file"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1429
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1484
 #, fuzzy, c-format
 msgid "Could not open file `%s' for writing to save hostlists: %s\n"
 msgstr "无法解析“%s”来确定已方的 IP 地址:%s\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1436
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1491
 #, c-format
 msgid "Writing %u hostlist URIs to `%s'\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1460
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1477
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1515
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1532
 #, c-format
 msgid "Error writing hostlist URIs to file `%s'\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1472
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1527
 msgid "# hostlist URIs written to file"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1572
-#: src/transport/plugin_transport_http_client.c:2273
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1628
+#: src/transport/plugin_transport_http_client.c:2277
 #, c-format
 msgid "Invalid proxy type: `%s', disabling proxy! Check configuration!\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1601
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1657
 msgid "Learning is enabled on this peer\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1614
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1671
 msgid "Learning is not enabled on this peer\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1625
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1684
 #, c-format
 msgid ""
 "Since learning is not enabled on this peer, hostlist file `%s' was removed\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:182
+#: src/hostlist/gnunet-daemon-hostlist_server.c:176
 msgid "bytes in hostlist"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:207
+#: src/hostlist/gnunet-daemon-hostlist_server.c:201
 msgid "expired addresses encountered"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:243
-#: src/hostlist/gnunet-daemon-hostlist_server.c:590
-#: src/peerinfo-tool/gnunet-peerinfo.c:389
-#: src/peerinfo-tool/gnunet-peerinfo.c:538
-#: src/topology/gnunet-daemon-topology.c:866
+#: src/hostlist/gnunet-daemon-hostlist_server.c:237
+#: src/hostlist/gnunet-daemon-hostlist_server.c:531
+#: src/peerinfo-tool/gnunet-peerinfo.c:385
+#: src/peerinfo-tool/gnunet-peerinfo.c:534
+#: src/topology/gnunet-daemon-topology.c:857
 #, c-format
 msgid "Error in communication with PEERINFO service: %s\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:267
+#: src/hostlist/gnunet-daemon-hostlist_server.c:261
 msgid "HELLOs without addresses encountered (ignored)"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:284
+#: src/hostlist/gnunet-daemon-hostlist_server.c:278
 msgid "bytes not included in hostlist (size limit)"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:388
+#: src/hostlist/gnunet-daemon-hostlist_server.c:382
 #, c-format
 msgid "Refusing `%s' request to hostlist server\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:391
+#: src/hostlist/gnunet-daemon-hostlist_server.c:385
 msgid "hostlist requests refused (not HTTP GET)"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:403
+#: src/hostlist/gnunet-daemon-hostlist_server.c:397
 #, c-format
 msgid "Refusing `%s' request with %llu bytes of upload data\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:407
+#: src/hostlist/gnunet-daemon-hostlist_server.c:401
 msgid "hostlist requests refused (upload data)"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:414
+#: src/hostlist/gnunet-daemon-hostlist_server.c:408
 msgid "Could not handle hostlist request since I do not have a response yet\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:417
+#: src/hostlist/gnunet-daemon-hostlist_server.c:411
 msgid "hostlist requests refused (not ready)"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:422
+#: src/hostlist/gnunet-daemon-hostlist_server.c:416
 msgid "Received request for our hostlist\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:424
+#: src/hostlist/gnunet-daemon-hostlist_server.c:418
 msgid "hostlist requests processed"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:485
+#: src/hostlist/gnunet-daemon-hostlist_server.c:466
 msgid "# hostlist advertisements send"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:535
-msgid "Advertisement message could not be queued by core\n"
-msgstr ""
-
-#: src/hostlist/gnunet-daemon-hostlist_server.c:743
-#: src/peerinfo-tool/gnunet-peerinfo.c:741
-#: src/transport/gnunet-service-transport.c:856
+#: src/hostlist/gnunet-daemon-hostlist_server.c:679
+#: src/transport/gnunet-service-transport.c:2802
 msgid "Could not access PEERINFO service.  Exiting.\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:755
+#: src/hostlist/gnunet-daemon-hostlist_server.c:691
 #, c-format
 msgid "Invalid port number %llu.  Exiting.\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:767
+#: src/hostlist/gnunet-daemon-hostlist_server.c:703
 #, c-format
 msgid "Hostlist service starts on %s:%llu\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:782
+#: src/hostlist/gnunet-daemon-hostlist_server.c:718
 #, c-format
 msgid "Address to obtain hostlist: `%s'\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:795
+#: src/hostlist/gnunet-daemon-hostlist_server.c:731
 #, fuzzy
 msgid "BINDTOIP does not a valid IPv4 address! Ignoring BINDTOIPV4.\n"
 msgstr "“%s”不可用。\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:808
+#: src/hostlist/gnunet-daemon-hostlist_server.c:748
 #, fuzzy
 msgid "BINDTOIP does not a valid IPv4 address! Ignoring BINDTOIPV6.\n"
 msgstr "“%s”不可用。\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:829
+#: src/hostlist/gnunet-daemon-hostlist_server.c:769
 #, fuzzy, c-format
 msgid "`%s' is not a valid IPv4 address! Ignoring BINDTOIPV4.\n"
 msgstr "“%s”不可用。\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:849
+#: src/hostlist/gnunet-daemon-hostlist_server.c:789
 #, fuzzy, c-format
 msgid "`%s' is not a valid IPv6 address! Ignoring BINDTOIPV6.\n"
 msgstr "“%s”不可用。\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:889
+#: src/hostlist/gnunet-daemon-hostlist_server.c:829
 #, c-format
 msgid "Could not start hostlist HTTP server on port %u\n"
 msgstr ""
@@ -4880,75 +4717,94 @@
 msgid "Maintain egos"
 msgstr ""
 
-#: src/identity/gnunet-service-identity.c:337
+#: src/identity/gnunet-service-identity.c:390
 msgid "no default known"
 msgstr ""
 
-#: src/identity/gnunet-service-identity.c:361
+#: src/identity/gnunet-service-identity.c:412
 msgid "default configured, but ego unknown (internal error)"
 msgstr ""
 
-#: src/identity/gnunet-service-identity.c:438
-#: src/identity/gnunet-service-identity.c:669
-#: src/identity/gnunet-service-identity.c:777
+#: src/identity/gnunet-service-identity.c:501
+#: src/identity/gnunet-service-identity.c:773
+#: src/identity/gnunet-service-identity.c:895
 #, fuzzy, c-format
 msgid "Failed to write subsystem default identifier map to `%s'.\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/identity/gnunet-service-identity.c:445
+#: src/identity/gnunet-service-identity.c:508
 msgid "Unknown ego specified for service (internal error)"
 msgstr ""
 
-#: src/identity/gnunet-service-identity.c:515
+#: src/identity/gnunet-service-identity.c:601
 msgid "identifier already in use for another ego"
 msgstr ""
 
-#: src/identity/gnunet-service-identity.c:646
+#: src/identity/gnunet-service-identity.c:750
 msgid "target name already exists"
 msgstr ""
 
-#: src/identity/gnunet-service-identity.c:685
-#: src/identity/gnunet-service-identity.c:794
+#: src/identity/gnunet-service-identity.c:789
+#: src/identity/gnunet-service-identity.c:912
 msgid "no matching ego found"
 msgstr ""
 
-#: src/identity/gnunet-service-identity.c:828
+#: src/identity/gnunet-service-identity.c:946
 #, fuzzy, c-format
 msgid "Failed to parse ego information in `%s'\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/identity/gnunet-service-identity.c:901
+#: src/identity/gnunet-service-identity.c:1004
 #, fuzzy, c-format
 msgid "Failed to parse subsystem identity configuration file `%s'\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/identity/gnunet-service-identity.c:913
+#: src/identity/gnunet-service-identity.c:1014
 #, fuzzy, c-format
 msgid "Failed to create directory `%s' for storing egos\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/identity/plugin_rest_identity.c:938
+#: src/identity/plugin_rest_identity.c:967
 msgid "Identity REST API initialized\n"
 msgstr ""
 
-#: src/identity-provider/gnunet-identity-token.c:101
+#: src/identity-provider/gnunet-identity-token.c:66
+#, fuzzy
+msgid "Option `-t' is required\n"
+msgstr "%s:选项“%s”有歧义\n"
+
+#: src/identity-provider/gnunet-identity-token.c:77
+#, fuzzy, c-format
+msgid "Token `%s' is malformed\n"
+msgstr "“%s”的参数无效。\n"
+
+#: src/identity-provider/gnunet-identity-token.c:163
 msgid "GNUid token"
 msgstr ""
 
-#: src/identity-provider/gnunet-identity-token.c:104
+#: src/identity-provider/gnunet-identity-token.c:166
 msgid "Print token contents"
 msgstr ""
 
-#: src/identity-provider/plugin_rest_identity_provider.c:1126
+#: src/identity-provider/plugin_rest_identity_provider.c:1163
 msgid "Identity Token REST API initialized\n"
 msgstr ""
 
-#: src/mysql/mysql.c:174
+#: src/multicast/gnunet-multicast.c:48 src/multicast/gnunet-multicast.c:72
+msgid "This command doesn't do anything yet."
+msgstr ""
+
+#: src/my/my.c:198 src/my/my.c:217
+#, fuzzy, c-format
+msgid "%s failed at %s:%d with error: %s\n"
+msgstr "“%s”于 %s:%d 处失败,错误为:%s\n"
+
+#: src/mysql/mysql.c:180
 #, c-format
 msgid "Trying to use file `%s' for MySQL configuration.\n"
 msgstr ""
 
-#: src/mysql/mysql.c:181
+#: src/mysql/mysql.c:187
 #, fuzzy, c-format
 msgid "Could not access file `%s': %s\n"
 msgstr "无法解析“%s”(%s):%s\n"
@@ -4958,7 +4814,7 @@
 msgid "No records found for `%s'"
 msgstr "运行 %s失败:%s %d\n"
 
-#: src/namecache/gnunet-namecache.c:122 src/namestore/gnunet-namestore.c:395
+#: src/namecache/gnunet-namecache.c:122 src/namestore/gnunet-namestore.c:415
 #, c-format
 msgid "\tCorrupt or unsupported record of type %u\n"
 msgstr ""
@@ -4978,7 +4834,7 @@
 msgid "You must specify a name\n"
 msgstr "您必须指定一个接收方!\n"
 
-#: src/namecache/gnunet-namecache.c:230 src/namestore/gnunet-namestore.c:1081
+#: src/namecache/gnunet-namecache.c:230 src/namestore/gnunet-namestore.c:1153
 msgid "name of the record to add/delete/display"
 msgstr ""
 
@@ -4986,19 +4842,26 @@
 msgid "spezifies the public key of the zone to look in"
 msgstr ""
 
-#: src/namecache/gnunet-namecache.c:244 src/namestore/gnunet-namestore.c:1113
+#: src/namecache/gnunet-namecache.c:244 src/namestore/gnunet-namestore.c:1189
 #, fuzzy
 msgid "GNUnet zone manipulation tool"
 msgstr "GNUnet 配置"
 
-#: src/namecache/namecache_api.c:276
+#: src/namecache/namecache_api.c:296
 msgid "Namecache failed to cache block"
 msgstr ""
 
+#: src/namecache/namecache_api.c:383
+#, fuzzy
+msgid "Error communicating with namecache service"
+msgstr "连接 %s:%u 出错。守护程序在运行吗?\n"
+
 #: src/namecache/plugin_namecache_flat.c:119
-#: src/namecache/plugin_namecache_flat.c:244
+#: src/namecache/plugin_namecache_flat.c:253
 #: src/namestore/plugin_namestore_flat.c:179
-#: src/namestore/plugin_namestore_flat.c:351
+#: src/namestore/plugin_namestore_flat.c:375
+#: src/peerstore/plugin_peerstore_flat.c:379
+#: src/peerstore/plugin_peerstore_flat.c:527
 #, fuzzy, c-format
 msgid "Unable to initialize file: %s.\n"
 msgstr "无法初始化 SQLite:%s。\n"
@@ -5005,17 +4868,19 @@
 
 #: src/namecache/plugin_namecache_flat.c:130
 #: src/namestore/plugin_namestore_flat.c:190
+#: src/peerstore/plugin_peerstore_flat.c:394
 #, fuzzy, c-format
 msgid "Unable to get filesize: %s.\n"
 msgstr "发送消息失败。\n"
 
-#: src/namecache/plugin_namecache_flat.c:145
-#: src/namestore/plugin_namestore_flat.c:202
+#: src/namecache/plugin_namecache_flat.c:149
+#: src/namestore/plugin_namestore_flat.c:203
+#: src/peerstore/plugin_peerstore_flat.c:406
 #, fuzzy, c-format
 msgid "Unable to read file: %s.\n"
 msgstr "发送消息失败。\n"
 
-#: src/namecache/plugin_namecache_flat.c:399
+#: src/namecache/plugin_namecache_flat.c:408
 #, fuzzy
 msgid "flat plugin running\n"
 msgstr "sqlite 数据仓库"
@@ -5032,263 +4897,248 @@
 msgstr ""
 
 #: src/namestore/gnunet-namestore.c:330
-#: src/namestore/plugin_rest_namestore.c:547
+#: src/namestore/plugin_rest_namestore.c:562
 #, c-format
 msgid "Deleting record failed, record does not exist%s%s\n"
 msgstr ""
 
 #: src/namestore/gnunet-namestore.c:337
-#: src/namestore/plugin_rest_namestore.c:556
+#: src/namestore/plugin_rest_namestore.c:571
 #, c-format
 msgid "Deleting record failed%s%s\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:475 src/namestore/gnunet-namestore.c:483
-#: src/namestore/gnunet-namestore.c:491
+#: src/namestore/gnunet-namestore.c:519 src/namestore/gnunet-namestore.c:527
+#: src/namestore/gnunet-namestore.c:535
 #, c-format
 msgid "A %s record exists already under `%s', no other records can be added.\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:505 src/namestore/gnunet-namestore.c:517
-#: src/namestore/gnunet-namestore.c:529
+#: src/namestore/gnunet-namestore.c:549 src/namestore/gnunet-namestore.c:561
+#: src/namestore/gnunet-namestore.c:573
 #, c-format
 msgid "Records already exist under `%s', cannot add `%s' record.\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:626
-#: src/namestore/plugin_rest_namestore.c:580
+#: src/namestore/gnunet-namestore.c:698
+#: src/namestore/plugin_rest_namestore.c:597
 #, c-format
 msgid "There are no records under label `%s' that could be deleted.\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:665
+#: src/namestore/gnunet-namestore.c:739
 #, c-format
 msgid ""
 "There are no records under label `%s' that match the request for deletion.\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:698
-#: src/namestore/plugin_rest_namestore.c:954
-#: src/transport/gnunet-transport.c:1769
-#: src/transport/gnunet-transport-profiler.c:497
-#, fuzzy, c-format
-msgid "Service `%s' is not running\n"
-msgstr "服务已删除。\n"
+#: src/namestore/gnunet-namestore.c:776
+#: src/namestore/plugin_rest_namestore.c:1003
+#, c-format
+msgid "Ego `%s' not known to identity service\n"
+msgstr ""
 
-#: src/namestore/gnunet-namestore.c:706
+#: src/namestore/gnunet-namestore.c:791
 #, c-format
 msgid "No options given\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:717
-#: src/namestore/gnunet-namestore-fcfsd.c:978
-#: src/namestore/plugin_rest_namestore.c:963
+#: src/namestore/gnunet-namestore.c:802
+#: src/namestore/gnunet-namestore-fcfsd.c:1034
+#: src/namestore/plugin_rest_namestore.c:1016
 #, fuzzy
 msgid "Failed to connect to namestore\n"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/namestore/gnunet-namestore.c:725 src/namestore/gnunet-namestore.c:734
-#: src/namestore/gnunet-namestore.c:751 src/namestore/gnunet-namestore.c:773
-#: src/namestore/gnunet-namestore.c:813
+#: src/namestore/gnunet-namestore.c:810 src/namestore/gnunet-namestore.c:819
+#: src/namestore/gnunet-namestore.c:838 src/namestore/gnunet-namestore.c:861
+#: src/namestore/gnunet-namestore.c:915
 #, fuzzy, c-format
 msgid "Missing option `%s' for operation `%s'\n"
 msgstr "配置文件“%s”已写入。\n"
 
-#: src/namestore/gnunet-namestore.c:726 src/namestore/gnunet-namestore.c:735
-#: src/namestore/gnunet-namestore.c:752 src/namestore/gnunet-namestore.c:774
+#: src/namestore/gnunet-namestore.c:811 src/namestore/gnunet-namestore.c:820
+#: src/namestore/gnunet-namestore.c:839 src/namestore/gnunet-namestore.c:863
 msgid "add"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:743
-#: src/namestore/plugin_rest_namestore.c:650
+#: src/namestore/gnunet-namestore.c:829
+#: src/namestore/plugin_rest_namestore.c:671
 #, fuzzy, c-format
 msgid "Unsupported type `%s'\n"
 msgstr "未知的命令“%s”。\n"
 
-#: src/namestore/gnunet-namestore.c:763
-#: src/namestore/plugin_rest_namestore.c:668
-#: src/namestore/plugin_rest_namestore.c:708
+#: src/namestore/gnunet-namestore.c:851
+#: src/namestore/plugin_rest_namestore.c:689
+#: src/namestore/plugin_rest_namestore.c:729
 #, c-format
 msgid "Value `%s' invalid for record type `%s'\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:799
+#: src/namestore/gnunet-namestore.c:896
 #, fuzzy, c-format
 msgid "Invalid time format `%s'\n"
 msgstr "IP 格式无效:“%s”\n"
 
-#: src/namestore/gnunet-namestore.c:814
+#: src/namestore/gnunet-namestore.c:916
 msgid "del"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:842
+#: src/namestore/gnunet-namestore.c:950
 #, fuzzy, c-format
 msgid "Invalid public key for reverse lookup `%s'\n"
 msgstr "“%s”的参数无效。\n"
 
-#: src/namestore/gnunet-namestore.c:866
-#: src/peerinfo-tool/gnunet-peerinfo.c:819
+#: src/namestore/gnunet-namestore.c:979 src/peerinfo-tool/gnunet-peerinfo.c:775
 #, fuzzy, c-format
 msgid "Invalid URI `%s'\n"
 msgstr "无效条目。\n"
 
-#: src/namestore/gnunet-namestore.c:901
+#: src/namestore/gnunet-namestore.c:1014
 #, fuzzy, c-format
 msgid "Invalid nick `%s'\n"
 msgstr "无效条目。\n"
 
-#: src/namestore/gnunet-namestore.c:941
-#: src/namestore/plugin_rest_namestore.c:999
+#: src/namestore/gnunet-namestore.c:1051
+#: src/namestore/plugin_rest_namestore.c:1046
 #, c-format
-msgid "Ego `%s' not known to identity service\n"
-msgstr ""
-
-#: src/namestore/gnunet-namestore.c:968
-#: src/namestore/plugin_rest_namestore.c:1026
-#, c-format
 msgid "No default ego configured in identity service\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1004
-#: src/namestore/plugin_rest_namestore.c:1066
+#: src/namestore/gnunet-namestore.c:1108
+#: src/namestore/plugin_rest_namestore.c:1142
 #, fuzzy, c-format
-msgid "Identity service is not running\n"
-msgstr "服务已删除。\n"
-
-#: src/namestore/gnunet-namestore.c:1015
-#: src/namestore/plugin_rest_namestore.c:1107
-#, fuzzy, c-format
 msgid "Cannot connect to identity service\n"
 msgstr "无法连接到 %s:%u:%s\n"
 
-#: src/namestore/gnunet-namestore.c:1063
+#: src/namestore/gnunet-namestore.c:1135
 msgid "add record"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1066
+#: src/namestore/gnunet-namestore.c:1138
 msgid "delete record"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1069
+#: src/namestore/gnunet-namestore.c:1141
 msgid "display records"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1072
+#: src/namestore/gnunet-namestore.c:1144
 msgid ""
 "expiration time for record to use (for adding only), \"never\" is possible"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1075
+#: src/namestore/gnunet-namestore.c:1147
 #, fuzzy
 msgid "set the desired nick name for the zone"
 msgstr "无法获取有关用户“%s”的信息:%s\n"
 
-#: src/namestore/gnunet-namestore.c:1078
+#: src/namestore/gnunet-namestore.c:1150
 #, fuzzy
 msgid "monitor changes in the namestore"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/namestore/gnunet-namestore.c:1084
+#: src/namestore/gnunet-namestore.c:1156
 #, fuzzy
 msgid "determine our name for the given PKEY"
 msgstr "无法获取有关用户“%s”的信息:%s\n"
 
-#: src/namestore/gnunet-namestore.c:1087
+#: src/namestore/gnunet-namestore.c:1159
 msgid "type of the record to add/delete/display"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1090
+#: src/namestore/gnunet-namestore.c:1162
 msgid "URI to import into our zone"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1093
+#: src/namestore/gnunet-namestore.c:1165
 msgid "value of the record to add/delete"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1096
+#: src/namestore/gnunet-namestore.c:1168
 msgid "create or list public record"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1099
+#: src/namestore/gnunet-namestore.c:1171
 msgid ""
 "create shadow record (only valid if all other records of the same type have "
 "expired"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1102
+#: src/namestore/gnunet-namestore.c:1174
 msgid "name of the ego controlling the zone"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:476
+#: src/namestore/gnunet-namestore-fcfsd.c:508
 #, fuzzy, c-format
 msgid "Unsupported form value `%s'\n"
 msgstr "未知的命令“%s”。\n"
 
-#: src/namestore/gnunet-namestore-fcfsd.c:503
+#: src/namestore/gnunet-namestore-fcfsd.c:535
 #, fuzzy, c-format
 msgid "Failed to create record for domain `%s': %s\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/namestore/gnunet-namestore-fcfsd.c:537
+#: src/namestore/gnunet-namestore-fcfsd.c:555
+msgid "Error when mapping zone to name\n"
+msgstr ""
+
+#: src/namestore/gnunet-namestore-fcfsd.c:585
 #, c-format
 msgid "Found existing name `%s' for the given key\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:546
-msgid "Error when mapping zone to name\n"
-msgstr ""
-
-#: src/namestore/gnunet-namestore-fcfsd.c:608
+#: src/namestore/gnunet-namestore-fcfsd.c:662
 #, c-format
 msgid "Found %u existing records for domain `%s'\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:664
+#: src/namestore/gnunet-namestore-fcfsd.c:718
 #, fuzzy, c-format
 msgid "Failed to create page for `%s'\n"
 msgstr "发送消息失败。\n"
 
-#: src/namestore/gnunet-namestore-fcfsd.c:680
+#: src/namestore/gnunet-namestore-fcfsd.c:734
 #, fuzzy, c-format
 msgid "Failed to setup post processor for `%s'\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/namestore/gnunet-namestore-fcfsd.c:716
+#: src/namestore/gnunet-namestore-fcfsd.c:770
 msgid "Domain name must not contain `.'\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:724
+#: src/namestore/gnunet-namestore-fcfsd.c:778
 msgid "Domain name must not contain `+'\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:918
+#: src/namestore/gnunet-namestore-fcfsd.c:974
 msgid "No ego configured for `fcfsd` subsystem\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:944
+#: src/namestore/gnunet-namestore-fcfsd.c:1000
 #, fuzzy
 msgid "Failed to start HTTP server\n"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/namestore/gnunet-namestore-fcfsd.c:986
+#: src/namestore/gnunet-namestore-fcfsd.c:1042
 #, fuzzy
 msgid "Failed to connect to identity\n"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/namestore/gnunet-namestore-fcfsd.c:1018
+#: src/namestore/gnunet-namestore-fcfsd.c:1074
 msgid "GNU Name System First Come First Serve name registration service"
 msgstr ""
 
-#: src/namestore/gnunet-service-namestore.c:655
+#: src/namestore/gnunet-service-namestore.c:612
 #, fuzzy, c-format
 msgid "Failed to replicate block in namecache: %s\n"
 msgstr "发送消息失败。\n"
 
-#: src/namestore/namestore_api.c:275
+#: src/namestore/namestore_api.c:379
 msgid "Namestore failed to store record\n"
 msgstr ""
 
-#: src/namestore/plugin_namestore_flat.c:632
+#: src/namestore/plugin_namestore_flat.c:656
 #, fuzzy
 msgid "flat file database running\n"
 msgstr "sqlite 数据仓库"
@@ -5301,66 +5151,66 @@
 msgid "GNUnet NAT traversal autoconfigure daemon"
 msgstr ""
 
-#: src/nat/gnunet-nat-server.c:279
+#: src/nat/gnunet-nat-server.c:321
 #, c-format
 msgid "Please pass valid port number as the first argument! (got `%s')\n"
 msgstr ""
 
-#: src/nat/gnunet-nat-server.c:321
+#: src/nat/gnunet-nat-server.c:363
 msgid "GNUnet NAT traversal test helper daemon"
 msgstr ""
 
-#: src/nat/nat_auto.c:388
+#: src/nat/nat_auto.c:385
 msgid "NAT traversal with ICMP Server succeeded.\n"
 msgstr ""
 
-#: src/nat/nat_auto.c:389
+#: src/nat/nat_auto.c:386
 msgid "NAT traversal with ICMP Server failed.\n"
 msgstr ""
 
-#: src/nat/nat_auto.c:408
+#: src/nat/nat_auto.c:405
 msgid "Testing connection reversal with ICMP server.\n"
 msgstr ""
 
-#: src/nat/nat_auto.c:440
+#: src/nat/nat_auto.c:437
 #, c-format
 msgid "Detected external IP `%s'\n"
 msgstr ""
 
-#: src/nat/nat_auto.c:574
+#: src/nat/nat_auto.c:572
 msgid "This system has a global IPv6 address, setting IPv6 to supported.\n"
 msgstr ""
 
-#: src/nat/nat_auto.c:592
+#: src/nat/nat_auto.c:590
 #, fuzzy, c-format
 msgid "Detected internal network address `%s'.\n"
 msgstr "GNUnet 现在使用 IP 地址 %s。\n"
 
-#: src/nat/nat_auto.c:662 src/nat/nat_test.c:360
+#: src/nat/nat_auto.c:681 src/nat/nat_test.c:403
 msgid "Failed to connect to `gnunet-nat-server'\n"
 msgstr ""
 
-#: src/nat/nat_auto.c:709
+#: src/nat/nat_auto.c:724
 msgid "upnpc found, enabling its use\n"
 msgstr ""
 
-#: src/nat/nat_auto.c:710
+#: src/nat/nat_auto.c:725
 msgid "upnpc not found\n"
 msgstr ""
 
-#: src/nat/nat_auto.c:742
+#: src/nat/nat_auto.c:762
 msgid "test_icmp_server not possible, as we have no public IPv4 address\n"
 msgstr ""
 
-#: src/nat/nat_auto.c:750 src/nat/nat_auto.c:796
+#: src/nat/nat_auto.c:774 src/nat/nat_auto.c:834
 msgid "test_icmp_server not possible, as we are not behind NAT\n"
 msgstr ""
 
-#: src/nat/nat_auto.c:758 src/nat/nat_auto.c:805
+#: src/nat/nat_auto.c:786 src/nat/nat_auto.c:846
 msgid "No working gnunet-helper-nat-server found\n"
 msgstr ""
 
-#: src/nat/nat_auto.c:788
+#: src/nat/nat_auto.c:823
 msgid "test_icmp_client not possible, as we have no internal IPv4 address\n"
 msgstr ""
 
@@ -5374,26 +5224,26 @@
 msgid "Failed to start %s\n"
 msgstr "运行 %s失败:%s %d\n"
 
-#: src/nat/nat.c:1321
+#: src/nat/nat.c:1327
 msgid "Error while running upnp client:\n"
 msgstr ""
 
-#: src/nat/nat.c:1396
+#: src/nat/nat.c:1402
 #, fuzzy, c-format
 msgid "Failed to run upnp client for port %u\n"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/nat/nat.c:1540
+#: src/nat/nat.c:1546
 msgid "malformed"
 msgstr ""
 
-#: src/nat/nat.c:1594
+#: src/nat/nat.c:1600
 msgid ""
 "UPnP enabled in configuration, but UPnP client `upnpc` command not found, "
 "disabling UPnP \n"
 msgstr ""
 
-#: src/nat/nat.c:1723 src/nat/nat.c:1736
+#: src/nat/nat.c:1726 src/nat/nat.c:1739
 #, c-format
 msgid ""
 "Configuration requires `%s', but binary is not installed properly (SUID bit "
@@ -5400,91 +5250,91 @@
 "not set).  Option disabled.\n"
 msgstr ""
 
-#: src/nat/nat.c:1891
+#: src/nat/nat.c:1903
 msgid "Internal IP address not known, cannot use ICMP NAT traversal method\n"
 msgstr ""
 
-#: src/nat/nat.c:1907
+#: src/nat/nat.c:1919
 #, c-format
 msgid "Running gnunet-helper-nat-client %s %s %u\n"
 msgstr ""
 
-#: src/nat/nat.c:1998
+#: src/nat/nat.c:2010
 msgid "Operation Successful"
 msgstr ""
 
-#: src/nat/nat.c:2000
+#: src/nat/nat.c:2012
 msgid "Internal Failure (IPC, ...)"
 msgstr ""
 
-#: src/nat/nat.c:2002
+#: src/nat/nat.c:2014
 msgid "Failure in network subsystem, check permissions."
 msgstr ""
 
-#: src/nat/nat.c:2004
+#: src/nat/nat.c:2016
 msgid "Encountered timeout while performing operation"
 msgstr ""
 
-#: src/nat/nat.c:2006
+#: src/nat/nat.c:2018
 msgid "detected that we are offline"
 msgstr ""
 
-#: src/nat/nat.c:2008
+#: src/nat/nat.c:2020
 msgid "`upnpc` command not found"
 msgstr ""
 
-#: src/nat/nat.c:2010
+#: src/nat/nat.c:2022
 #, fuzzy
 msgid "Failed to run `upnpc` command"
 msgstr "运行 %s失败:%s %d\n"
 
-#: src/nat/nat.c:2012
+#: src/nat/nat.c:2024
 msgid "`upnpc' command took too long, process killed"
 msgstr ""
 
-#: src/nat/nat.c:2014
+#: src/nat/nat.c:2026
 msgid "`upnpc' command failed to establish port mapping"
 msgstr ""
 
-#: src/nat/nat.c:2016
+#: src/nat/nat.c:2028
 msgid "`external-ip' command not found"
 msgstr ""
 
-#: src/nat/nat.c:2018
+#: src/nat/nat.c:2030
 #, fuzzy
 msgid "Failed to run `external-ip` command"
 msgstr "运行 %s失败:%s %d\n"
 
-#: src/nat/nat.c:2020
+#: src/nat/nat.c:2032
 msgid "`external-ip' command output invalid"
 msgstr ""
 
-#: src/nat/nat.c:2022
+#: src/nat/nat.c:2034
 msgid "no valid address was returned by `external-ip'"
 msgstr ""
 
-#: src/nat/nat.c:2024
+#: src/nat/nat.c:2036
 #, fuzzy
 msgid "Could not determine interface with internal/local network address"
 msgstr "无法确定用户界面定义文件。"
 
-#: src/nat/nat.c:2026
+#: src/nat/nat.c:2038
 msgid "No functioning gnunet-helper-nat-server installation found"
 msgstr ""
 
-#: src/nat/nat.c:2028
+#: src/nat/nat.c:2040
 msgid "NAT test could not be initialized"
 msgstr ""
 
-#: src/nat/nat.c:2030
+#: src/nat/nat.c:2042
 msgid "NAT test timeout reached"
 msgstr ""
 
-#: src/nat/nat.c:2032
+#: src/nat/nat.c:2044
 msgid "could not register NAT"
 msgstr ""
 
-#: src/nat/nat.c:2034
+#: src/nat/nat.c:2046
 msgid "No working gnunet-helper-nat-client installation found"
 msgstr ""
 
@@ -5496,26 +5346,17 @@
 msgid "`upnpc' command not found\n"
 msgstr ""
 
-#: src/nat/nat_test.c:460
+#: src/nat/nat_test.c:518
 #, c-format
 msgid "Failed to create listen socket bound to `%s' for NAT test: %s\n"
 msgstr ""
 
-#: src/nat/nat_test.c:497
+#: src/nat/nat_test.c:568
 #, fuzzy
 msgid "NAT test failed to start NAT library\n"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/nse/gnunet-nse.c:116
-#, fuzzy
-msgid "NSE service is not running\n"
-msgstr "服务已删除。\n"
-
-#: src/nse/gnunet-nse.c:121
-msgid "Error while checking if NSE service is running or not\n"
-msgstr ""
-
-#: src/nse/gnunet-nse.c:167
+#: src/nse/gnunet-nse.c:122
 msgid "Show network size estimates from NSE service."
 msgstr ""
 
@@ -5544,176 +5385,135 @@
 msgid "Measure quality and performance of the NSE service."
 msgstr "无法访问该服务"
 
-#: src/nse/gnunet-service-nse.c:1535
-#: src/revocation/gnunet-service-revocation.c:844 src/util/gnunet-scrypt.c:276
+#: src/nse/gnunet-service-nse.c:1536
+#: src/revocation/gnunet-service-revocation.c:832 src/util/gnunet-scrypt.c:276
 #, fuzzy
 msgid "Value is too large.\n"
 msgstr "值不在合法范围内。"
 
-#: src/peerinfo/gnunet-service-peerinfo.c:225
+#: src/peerinfo/gnunet-service-peerinfo.c:178
 #, c-format
 msgid "Removing expired address of transport `%s'\n"
 msgstr ""
 
-#: src/peerinfo/gnunet-service-peerinfo.c:362
+#: src/peerinfo/gnunet-service-peerinfo.c:310
 #, fuzzy, c-format
 msgid "Failed to parse HELLO in file `%s': %s\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/peerinfo/gnunet-service-peerinfo.c:382
-#: src/peerinfo/gnunet-service-peerinfo.c:411
+#: src/peerinfo/gnunet-service-peerinfo.c:331
+#: src/peerinfo/gnunet-service-peerinfo.c:362
 #, fuzzy, c-format
 msgid "Failed to parse HELLO in file `%s'\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/peerinfo/gnunet-service-peerinfo.c:491
+#: src/peerinfo/gnunet-service-peerinfo.c:446
 msgid "# peers known"
 msgstr ""
 
-#: src/peerinfo/gnunet-service-peerinfo.c:529
+#: src/peerinfo/gnunet-service-peerinfo.c:489
 #, c-format
 msgid ""
 "File `%s' in directory `%s' does not match naming convention. Removed.\n"
 msgstr ""
 
-#: src/peerinfo/gnunet-service-peerinfo.c:683
+#: src/peerinfo/gnunet-service-peerinfo.c:655
 #, fuzzy, c-format
 msgid "Scanning directory `%s'\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/peerinfo/gnunet-service-peerinfo.c:689
+#: src/peerinfo/gnunet-service-peerinfo.c:663
 #, c-format
 msgid "Still no peers found in `%s'!\n"
 msgstr ""
 
-#: src/peerinfo/gnunet-service-peerinfo.c:1061
+#: src/peerinfo/gnunet-service-peerinfo.c:1076
 #, fuzzy, c-format
 msgid "Cleaning up directory `%s'\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/peerinfo/gnunet-service-peerinfo.c:1391
+#: src/peerinfo/gnunet-service-peerinfo.c:1405
 #, c-format
 msgid "Importing HELLOs from `%s'\n"
 msgstr ""
 
-#: src/peerinfo/gnunet-service-peerinfo.c:1404
+#: src/peerinfo/gnunet-service-peerinfo.c:1418
 msgid "Skipping import of included HELLOs\n"
 msgstr ""
 
-#: src/peerinfo/peerinfo_api.c:237
-msgid "aborted due to explicit disconnect request"
-msgstr ""
-
-#: src/peerinfo/peerinfo_api.c:361
-#, fuzzy
-msgid "failed to transmit request (service down?)"
-msgstr "初始化“%s”服务失败。\n"
-
-#: src/peerinfo/peerinfo_api.c:516
+#: src/peerinfo/peerinfo_api.c:220
 msgid "Failed to receive response from `PEERINFO' service."
 msgstr ""
 
-#: src/peerinfo/peerinfo_api.c:560 src/peerinfo/peerinfo_api.c:583
-#: src/peerinfo/peerinfo_api.c:600 src/peerinfo/peerinfo_api.c:613
-#: src/peerinfo/peerinfo_api.c:628
-#, fuzzy
-msgid "Received invalid message from `PEERINFO' service."
-msgstr "“%s”的参数无效。\n"
-
-#: src/peerinfo/peerinfo_api.c:715
-#, fuzzy
-msgid "Timeout transmitting iteration request to `PEERINFO' service."
-msgstr "初始化“%s”服务失败。\n"
-
-#: src/peerinfo/peerinfo_api_notify.c:268
+#: src/peerinfo-tool/gnunet-peerinfo.c:239
 #, fuzzy, c-format
-msgid "Could not connect to `%s' service.\n"
-msgstr "无法连接到 %s:%u:%s\n"
-
-#: src/peerinfo-tool/gnunet-peerinfo.c:243
-#, fuzzy, c-format
 msgid "%sPeer `%s'\n"
 msgstr "运行 %s失败:%s %d\n"
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:250
+#: src/peerinfo-tool/gnunet-peerinfo.c:246
 #, c-format
 msgid "\tExpires: %s \t %s\n"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:303
+#: src/peerinfo-tool/gnunet-peerinfo.c:299
 #, fuzzy, c-format
 msgid "Failure: Cannot convert address to string for peer `%s'\n"
 msgstr "找不到接口“%s”的一个 IP 地址。\n"
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:470
+#: src/peerinfo-tool/gnunet-peerinfo.c:466
 #, c-format
 msgid "Failure: Received invalid %s\n"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:484
+#: src/peerinfo-tool/gnunet-peerinfo.c:480
 #, fuzzy, c-format
 msgid "Failed to write HELLO with %u bytes to file `%s'\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:503
+#: src/peerinfo-tool/gnunet-peerinfo.c:499
 #, c-format
 msgid "Wrote %s HELLO containing %u addresses with %u bytes to file `%s'\n"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:573
+#: src/peerinfo-tool/gnunet-peerinfo.c:799
 #, c-format
-msgid "Failure adding HELLO: %s\n"
-msgstr ""
-
-#: src/peerinfo-tool/gnunet-peerinfo.c:700
-#, fuzzy, c-format
-msgid "Failed to get my own HELLO from this peer!\n"
-msgstr "发送消息失败。\n"
-
-#: src/peerinfo-tool/gnunet-peerinfo.c:732
-#, fuzzy, c-format
-msgid "Service `%s' is not running, please start GNUnet\n"
-msgstr "服务已删除。\n"
-
-#: src/peerinfo-tool/gnunet-peerinfo.c:843
-#, c-format
 msgid "I am peer `%s'.\n"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:884
+#: src/peerinfo-tool/gnunet-peerinfo.c:842
 msgid "don't resolve host names"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:887
+#: src/peerinfo-tool/gnunet-peerinfo.c:845
 msgid "output only the identity strings"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:890
+#: src/peerinfo-tool/gnunet-peerinfo.c:848
 msgid "include friend-only information"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:893
+#: src/peerinfo-tool/gnunet-peerinfo.c:851
 msgid "output our own identity only"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:896
+#: src/peerinfo-tool/gnunet-peerinfo.c:854
 #, fuzzy
 msgid "list all known peers"
 msgstr "列出所有网络适配器"
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:899
+#: src/peerinfo-tool/gnunet-peerinfo.c:857
 msgid "dump hello to file"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:902
+#: src/peerinfo-tool/gnunet-peerinfo.c:860
 msgid "also output HELLO uri(s)"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:905
+#: src/peerinfo-tool/gnunet-peerinfo.c:863
 msgid "add given HELLO uri to the database"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:919
+#: src/peerinfo-tool/gnunet-peerinfo.c:880
 #, fuzzy
 msgid "Print information about peers."
 msgstr "无法获取有关用户“%s”的信息:%s\n"
@@ -5740,68 +5540,31 @@
 msgid "peerstore"
 msgstr ""
 
-#: src/peerstore/gnunet-service-peerstore.c:395
-#, fuzzy
-msgid "Malformed iterate request.\n"
-msgstr "解析配置文件“%s”失败\n"
-
-#: src/peerstore/gnunet-service-peerstore.c:402
-msgid "Sub system not supplied in client iterate request.\n"
-msgstr ""
-
-#: src/peerstore/gnunet-service-peerstore.c:462
-#, fuzzy
-msgid "Malformed store request from client\n"
-msgstr "找不到接口“%s”的一个 IP 地址。\n"
-
-#: src/peerstore/gnunet-service-peerstore.c:470
-msgid "Full key not supplied in client store request\n"
-msgstr ""
-
-#: src/peerstore/gnunet-service-peerstore.c:489
-#, fuzzy
-msgid "Failed to store requested value, database error."
-msgstr "发送消息失败。\n"
-
-#: src/peerstore/gnunet-service-peerstore.c:568
-msgid "No database backend configured\n"
-msgstr ""
-
-#: src/peerstore/gnunet-service-peerstore.c:579
+#: src/peerstore/gnunet-service-peerstore.c:588
 #, fuzzy, c-format
 msgid "Could not load database backend `%s'\n"
 msgstr "无法解析“%s”(%s):%s\n"
 
-#: src/peerstore/peerstore_api.c:329
+#: src/peerstore/peerstore_api.c:296
 #, c-format
 msgid "Received an error notification from MQ of type: %d\n"
 msgstr ""
 
-#: src/peerstore/peerstore_api.c:376
+#: src/peerstore/peerstore_api.c:344
 msgid "timeout"
 msgstr ""
 
-#: src/peerstore/peerstore_api.c:679
+#: src/peerstore/peerstore_api.c:560 src/peerstore/peerstore_api.c:609
 #, fuzzy
 msgid "Unexpected iteration response, this should not happen.\n"
 msgstr "输出格式未知,不应出现这种情况。\n"
 
-#: src/peerstore/peerstore_api.c:690
+#: src/peerstore/peerstore_api.c:623
 #, fuzzy
-msgid "Error communicating with `PEERSTORE' service."
-msgstr "连接 %s:%u 出错。守护程序在运行吗?\n"
-
-#: src/peerstore/peerstore_api.c:709
-#, fuzzy
 msgid "Received a malformed response from service."
 msgstr "“%s”的参数无效。\n"
 
-#: src/peerstore/peerstore_api.c:821
-msgid ""
-"Problem receiving a watch response, no way to determine which request.\n"
-msgstr ""
-
-#: src/peerstore/peerstore_api.c:833
+#: src/peerstore/peerstore_api.c:768
 msgid "Received a watch result for a non existing watch.\n"
 msgstr ""
 
@@ -5814,6 +5577,7 @@
 msgstr "创建用户出错"
 
 #: src/peerstore/plugin_peerstore_sqlite.c:422
+#: src/psycstore/plugin_psycstore_mysql.c:250
 #: src/psycstore/plugin_psycstore_sqlite.c:259
 #, fuzzy, c-format
 msgid ""
@@ -5826,97 +5590,112 @@
 msgid "Unable to create indices: %s.\n"
 msgstr "发送消息失败。\n"
 
-#: src/postgres/postgres.c:63
+#: src/postgres/postgres.c:67
 #, fuzzy, c-format
-msgid "`%s:%s' failed at %s:%d with error: %s"
+msgid "`%s:%s' failed at %s:%d with error: %s\n"
 msgstr "“%s”于 %s:%d 处失败,错误为:%s\n"
 
-#: src/postgres/postgres.c:166
+#: src/postgres/postgres.c:195
 #, fuzzy, c-format
-msgid "Unable to initialize Postgres: %s"
+msgid "Unable to initialize Postgres: %s\n"
 msgstr "无法初始化 SQLite:%s。\n"
 
-#: src/psycstore/gnunet-service-psycstore.c:260
+#: src/psycstore/gnunet-service-psycstore.c:249
 #, fuzzy
 msgid "Failed to store membership information!\n"
 msgstr "打开日志文件“%s”失败:%s\n"
 
-#: src/psycstore/gnunet-service-psycstore.c:284
+#: src/psycstore/gnunet-service-psycstore.c:271
 #, fuzzy
 msgid "Failed to test membership!\n"
 msgstr "发送消息失败。\n"
 
-#: src/psycstore/gnunet-service-psycstore.c:306
+#: src/psycstore/gnunet-service-psycstore.c:300
 #, fuzzy
-msgid "Failed to store fragment!\n"
+msgid "Dropping invalid fragment\n"
+msgstr "“%s”的参数无效。\n"
+
+#: src/psycstore/gnunet-service-psycstore.c:311
+#, fuzzy
+msgid "Failed to store fragment\n"
 msgstr "运行 %s失败:%s %d\n"
 
-#: src/psycstore/gnunet-service-psycstore.c:364
+#: src/psycstore/gnunet-service-psycstore.c:368
 #, fuzzy
 msgid "Failed to get fragment!\n"
 msgstr "发送消息失败。\n"
 
-#: src/psycstore/gnunet-service-psycstore.c:423
+#: src/psycstore/gnunet-service-psycstore.c:434
 #, fuzzy
 msgid "Failed to get message!\n"
 msgstr "发送消息失败。\n"
 
-#: src/psycstore/gnunet-service-psycstore.c:454
+#: src/psycstore/gnunet-service-psycstore.c:464
 #, fuzzy
 msgid "Failed to get message fragment!\n"
 msgstr "打开日志文件“%s”失败:%s\n"
 
-#: src/psycstore/gnunet-service-psycstore.c:482
+#: src/psycstore/gnunet-service-psycstore.c:494
 #, fuzzy
 msgid "Failed to get master counters!\n"
 msgstr "发送消息失败。\n"
 
-#: src/psycstore/gnunet-service-psycstore.c:665
+#: src/psycstore/gnunet-service-psycstore.c:675
 #, fuzzy, c-format
 msgid "Failed to begin modifying state: %d\n"
 msgstr "运行 %s失败:%s %d\n"
 
-#: src/psycstore/gnunet-service-psycstore.c:675
+#: src/psycstore/gnunet-service-psycstore.c:685
 #, fuzzy, c-format
 msgid "Failed to modify state: %d\n"
 msgstr "运行 %s失败:%s %d\n"
 
-#: src/psycstore/gnunet-service-psycstore.c:683
+#: src/psycstore/gnunet-service-psycstore.c:693
 #, fuzzy
 msgid "Failed to end modifying state!\n"
 msgstr "运行 %s失败:%s %d\n"
 
-#: src/psycstore/gnunet-service-psycstore.c:714
+#: src/psycstore/gnunet-service-psycstore.c:730
 msgid "Tried to set invalid state variable name!\n"
 msgstr ""
 
-#: src/psycstore/gnunet-service-psycstore.c:728
+#: src/psycstore/gnunet-service-psycstore.c:744
 #, fuzzy
 msgid "Failed to begin synchronizing state!\n"
 msgstr "发送消息失败。\n"
 
-#: src/psycstore/gnunet-service-psycstore.c:745
+#: src/psycstore/gnunet-service-psycstore.c:761
 #, fuzzy
 msgid "Failed to end synchronizing state!\n"
 msgstr "发送消息失败。\n"
 
-#: src/psycstore/gnunet-service-psycstore.c:765
-#: src/psycstore/gnunet-service-psycstore.c:784
+#: src/psycstore/gnunet-service-psycstore.c:779
+#: src/psycstore/gnunet-service-psycstore.c:795
 #, fuzzy
 msgid "Failed to reset state!\n"
 msgstr "发送消息失败。\n"
 
-#: src/psycstore/gnunet-service-psycstore.c:807
-#: src/psycstore/gnunet-service-psycstore.c:858
+#: src/psycstore/gnunet-service-psycstore.c:824
+#: src/psycstore/gnunet-service-psycstore.c:881
 msgid "Tried to get invalid state variable name!\n"
 msgstr ""
 
-#: src/psycstore/gnunet-service-psycstore.c:834
-#: src/psycstore/gnunet-service-psycstore.c:873
+#: src/psycstore/gnunet-service-psycstore.c:851
+#: src/psycstore/gnunet-service-psycstore.c:896
 #, fuzzy
 msgid "Failed to get state variable!\n"
 msgstr "发送消息失败。\n"
 
+#: src/psycstore/plugin_psycstore_mysql.c:281
+#, fuzzy
+msgid "Unable to initialize Mysql.\n"
+msgstr "无法初始化 SQLite:%s。\n"
+
+#: src/psycstore/plugin_psycstore_mysql.c:291
+#, fuzzy, c-format
+msgid "Failed to run SQL statement `%s'\n"
+msgstr "解析配置文件“%s”失败\n"
+
 #: src/psycstore/plugin_psycstore_sqlite.c:61
 #, fuzzy, c-format
 msgid "`%s' failed at %s:%d with error: %s (%d)\n"
@@ -5927,58 +5706,58 @@
 msgid "SQLite database running\n"
 msgstr "sqlite 数据仓库"
 
-#: src/pt/gnunet-daemon-pt.c:482
+#: src/pt/gnunet-daemon-pt.c:493
 msgid "Failed to pack DNS request.  Dropping.\n"
 msgstr ""
 
-#: src/pt/gnunet-daemon-pt.c:488
+#: src/pt/gnunet-daemon-pt.c:499
 msgid "# DNS requests mapped to VPN"
 msgstr ""
 
-#: src/pt/gnunet-daemon-pt.c:541
+#: src/pt/gnunet-daemon-pt.c:553
 msgid "# DNS records modified"
 msgstr ""
 
-#: src/pt/gnunet-daemon-pt.c:717
+#: src/pt/gnunet-daemon-pt.c:737
 msgid "# DNS replies intercepted"
 msgstr ""
 
-#: src/pt/gnunet-daemon-pt.c:723
+#: src/pt/gnunet-daemon-pt.c:744
 msgid "Failed to parse DNS request.  Dropping.\n"
 msgstr ""
 
-#: src/pt/gnunet-daemon-pt.c:824
+#: src/pt/gnunet-daemon-pt.c:851
 msgid "# DNS requests dropped (timeout)"
 msgstr ""
 
-#: src/pt/gnunet-daemon-pt.c:881
+#: src/pt/gnunet-daemon-pt.c:909
 msgid "# DNS requests intercepted"
 msgstr ""
 
-#: src/pt/gnunet-daemon-pt.c:886
+#: src/pt/gnunet-daemon-pt.c:914
 msgid "# DNS requests dropped (DNS cadet channel down)"
 msgstr ""
 
-#: src/pt/gnunet-daemon-pt.c:894
+#: src/pt/gnunet-daemon-pt.c:922
 msgid "# DNS requests dropped (malformed)"
 msgstr ""
 
-#: src/pt/gnunet-daemon-pt.c:967
+#: src/pt/gnunet-daemon-pt.c:995
 msgid "# DNS replies received"
 msgstr ""
 
-#: src/pt/gnunet-daemon-pt.c:983
+#: src/pt/gnunet-daemon-pt.c:1011
 msgid "# DNS replies dropped (too late?)"
 msgstr ""
 
-#: src/pt/gnunet-daemon-pt.c:1257 src/pt/gnunet-daemon-pt.c:1266
-#: src/pt/gnunet-daemon-pt.c:1286 src/pt/gnunet-daemon-pt.c:1297
-#: src/pt/gnunet-daemon-pt.c:1306
+#: src/pt/gnunet-daemon-pt.c:1294 src/pt/gnunet-daemon-pt.c:1303
+#: src/pt/gnunet-daemon-pt.c:1324 src/pt/gnunet-daemon-pt.c:1336
+#: src/pt/gnunet-daemon-pt.c:1345
 #, fuzzy, c-format
 msgid "Failed to connect to %s service.  Exiting.\n"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/pt/gnunet-daemon-pt.c:1343
+#: src/pt/gnunet-daemon-pt.c:1390
 msgid "Daemon to run to perform IP protocol translation to GNUnet"
 msgstr ""
 
@@ -5991,85 +5770,90 @@
 msgid "Daemon to announce regular expressions for the peer using cadet."
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1301
+#: src/regex/gnunet-regex-profiler.c:1314
 msgid "No configuration file given. Exiting\n"
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1342
-#: src/regex/gnunet-regex-simulation-profiler.c:638
+#: src/regex/gnunet-regex-profiler.c:1355
+#: src/regex/gnunet-regex-simulation-profiler.c:630
 #, c-format
 msgid "No policy directory specified on command line. Exiting.\n"
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1348
-#: src/regex/gnunet-regex-simulation-profiler.c:646
+#: src/regex/gnunet-regex-profiler.c:1361
+#: src/regex/gnunet-regex-simulation-profiler.c:638
 #, c-format
 msgid "Specified policies directory does not exist. Exiting.\n"
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1355
+#: src/regex/gnunet-regex-profiler.c:1368
 #, fuzzy, c-format
 msgid "No files found in `%s'\n"
 msgstr "运行 %s失败:%s %d\n"
 
-#: src/regex/gnunet-regex-profiler.c:1364
+#: src/regex/gnunet-regex-profiler.c:1377
 msgid "No search strings file given. Exiting.\n"
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1384
+#: src/regex/gnunet-regex-profiler.c:1397
 #, fuzzy
 msgid "Error loading search strings. Exiting.\n"
 msgstr "创建用户出错"
 
-#: src/regex/gnunet-regex-profiler.c:1469
+#: src/regex/gnunet-regex-profiler.c:1482
 #, fuzzy
 msgid "name of the file for writing statistics"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/regex/gnunet-regex-profiler.c:1472
+#: src/regex/gnunet-regex-profiler.c:1485
 msgid "wait TIMEOUT before ending the experiment"
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1475
+#: src/regex/gnunet-regex-profiler.c:1488
 msgid "directory with policy files"
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1478
+#: src/regex/gnunet-regex-profiler.c:1491
 #, fuzzy
 msgid "name of file with input strings"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/regex/gnunet-regex-profiler.c:1481
+#: src/regex/gnunet-regex-profiler.c:1494
 #, fuzzy
 msgid "name of file with hosts' names"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/regex/gnunet-regex-profiler.c:1493
+#: src/regex/gnunet-regex-profiler.c:1506
 msgid "Profiler for regex"
 msgstr ""
 
-#: src/regex/gnunet-regex-simulation-profiler.c:704
+#: src/regex/gnunet-regex-simulation-profiler.c:696
 msgid "name of the table to write DFAs"
 msgstr ""
 
-#: src/regex/gnunet-regex-simulation-profiler.c:707
+#: src/regex/gnunet-regex-simulation-profiler.c:699
 msgid "maximum path compression length"
 msgstr ""
 
-#: src/regex/gnunet-regex-simulation-profiler.c:720
+#: src/regex/gnunet-regex-simulation-profiler.c:712
 msgid "Profiler for regex library"
 msgstr ""
 
-#: src/regex/regex_api.c:131
+#: src/regex/regex_api_announce.c:152
 #, fuzzy, c-format
 msgid "Regex `%s' is too long!\n"
 msgstr "服务已删除。\n"
 
-#: src/rest/gnunet-rest-server.c:784
+#: src/regex/regex_api_search.c:212
+#, fuzzy, c-format
+msgid "Search string `%s' is too long!\n"
+msgstr "服务已删除。\n"
+
+#: src/rest/gnunet-rest-server.c:788
 msgid "listen on specified port (default: 7776)"
 msgstr ""
 
-#: src/rest/gnunet-rest-server.c:801
+#: src/rest/gnunet-rest-server.c:805
 #, fuzzy
 msgid "GNUnet REST server"
 msgstr "GNUnet 错误日志"
@@ -6111,86 +5895,86 @@
 msgid "Internal error, key revocation might have failed\n"
 msgstr ""
 
-#: src/revocation/gnunet-revocation.c:320
+#: src/revocation/gnunet-revocation.c:323
 #, c-format
 msgid "Revocation certificate for `%s' stored in `%s'\n"
 msgstr ""
 
-#: src/revocation/gnunet-revocation.c:350
+#: src/revocation/gnunet-revocation.c:352
 #, c-format
 msgid "Ego `%s' not found.\n"
 msgstr ""
 
-#: src/revocation/gnunet-revocation.c:371
+#: src/revocation/gnunet-revocation.c:373
 #, c-format
 msgid "Error: revocation certificate in `%s' is not for `%s'\n"
 msgstr ""
 
-#: src/revocation/gnunet-revocation.c:391
+#: src/revocation/gnunet-revocation.c:393
 msgid "Revocation certificate ready\n"
 msgstr ""
 
-#: src/revocation/gnunet-revocation.c:401
+#: src/revocation/gnunet-revocation.c:403
 msgid "Revocation certificate not ready, calculating proof of work\n"
 msgstr ""
 
-#: src/revocation/gnunet-revocation.c:435
+#: src/revocation/gnunet-revocation.c:437 src/social/gnunet-social.c:1159
 #, fuzzy, c-format
 msgid "Public key `%s' malformed\n"
 msgstr "“%s”的参数无效。\n"
 
-#: src/revocation/gnunet-revocation.c:448
+#: src/revocation/gnunet-revocation.c:450
 msgid ""
 "Testing and revoking at the same time is not allowed, only executing test.\n"
 msgstr ""
 
-#: src/revocation/gnunet-revocation.c:468
+#: src/revocation/gnunet-revocation.c:470
 #, fuzzy
 msgid "No filename to store revocation certificate given.\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/revocation/gnunet-revocation.c:489
+#: src/revocation/gnunet-revocation.c:491
 #, fuzzy, c-format
 msgid "Failed to read revocation certificate from `%s'\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/revocation/gnunet-revocation.c:514
+#: src/revocation/gnunet-revocation.c:516
 #, fuzzy
 msgid "No action specified. Nothing to do.\n"
 msgstr "没有指定接口,将使用默认。\n"
 
-#: src/revocation/gnunet-revocation.c:530
+#: src/revocation/gnunet-revocation.c:532
 msgid "use NAME for the name of the revocation file"
 msgstr ""
 
-#: src/revocation/gnunet-revocation.c:533
+#: src/revocation/gnunet-revocation.c:535
 msgid ""
 "revoke the private key associated for the the private key associated with "
 "the ego NAME "
 msgstr ""
 
-#: src/revocation/gnunet-revocation.c:536
+#: src/revocation/gnunet-revocation.c:538
 msgid "actually perform revocation, otherwise we just do the precomputation"
 msgstr ""
 
-#: src/revocation/gnunet-revocation.c:539
+#: src/revocation/gnunet-revocation.c:541
 msgid "test if the public key KEY has been revoked"
 msgstr ""
 
-#: src/revocation/gnunet-service-revocation.c:481
+#: src/revocation/gnunet-service-revocation.c:456
 msgid "# unsupported revocations received via set union"
 msgstr ""
 
-#: src/revocation/gnunet-service-revocation.c:490
+#: src/revocation/gnunet-service-revocation.c:464
 msgid "# revocation messages received via set union"
 msgstr ""
 
-#: src/revocation/gnunet-service-revocation.c:495
+#: src/revocation/gnunet-service-revocation.c:469
 #, c-format
 msgid "Error computing revocation set union with %s\n"
 msgstr ""
 
-#: src/revocation/gnunet-service-revocation.c:499
+#: src/revocation/gnunet-service-revocation.c:473
 #, fuzzy
 msgid "# revocation set unions failed"
 msgstr ""
@@ -6197,16 +5981,16 @@
 "\n"
 "按任意键继续\n"
 
-#: src/revocation/gnunet-service-revocation.c:508
+#: src/revocation/gnunet-service-revocation.c:482
 msgid "# revocation set unions completed"
 msgstr ""
 
-#: src/revocation/gnunet-service-revocation.c:545
-#: src/revocation/gnunet-service-revocation.c:776
+#: src/revocation/gnunet-service-revocation.c:519
+#: src/revocation/gnunet-service-revocation.c:765
 msgid "SET service crashed, terminating revocation service\n"
 msgstr ""
 
-#: src/revocation/gnunet-service-revocation.c:868
+#: src/revocation/gnunet-service-revocation.c:856
 #, fuzzy
 msgid "Could not open revocation database file!"
 msgstr "无法连接到 %s:%u:%s\n"
@@ -6269,15 +6053,15 @@
 msgid "Calculate the Vectorproduct with a GNUnet peer."
 msgstr ""
 
-#: src/scalarproduct/gnunet-service-scalarproduct_alice.c:1417
-#: src/scalarproduct/gnunet-service-scalarproduct_bob.c:1546
-#: src/scalarproduct/gnunet-service-scalarproduct-ecc_alice.c:1192
-#: src/scalarproduct/gnunet-service-scalarproduct-ecc_bob.c:1249
+#: src/scalarproduct/gnunet-service-scalarproduct_alice.c:1415
+#: src/scalarproduct/gnunet-service-scalarproduct_bob.c:1553
+#: src/scalarproduct/gnunet-service-scalarproduct-ecc_alice.c:1191
+#: src/scalarproduct/gnunet-service-scalarproduct-ecc_bob.c:1259
 #, fuzzy
 msgid "Connect to CADET failed\n"
 msgstr "“%s”已连接到“%s”。\n"
 
-#: src/scalarproduct/scalarproduct_api.c:296
+#: src/scalarproduct/scalarproduct_api.c:185
 msgid "Keys given to SCALARPRODUCT not unique!\n"
 msgstr ""
 
@@ -6297,7 +6081,7 @@
 msgid "also profile decryption"
 msgstr ""
 
-#: src/set/gnunet-service-set.c:2008
+#: src/set/gnunet-service-set.c:1991
 #, fuzzy
 msgid "Could not connect to cadet service\n"
 msgstr "无法连接到 %s:%u:%s\n"
@@ -6324,237 +6108,226 @@
 msgid "ibf size"
 msgstr ""
 
-#: src/set/gnunet-set-profiler.c:386
+#: src/set/gnunet-set-profiler.c:387
 msgid "operation to execute"
 msgstr ""
 
-#: src/social/gnunet-social.c:1138
+#: src/social/gnunet-social.c:1146
 #, fuzzy
 msgid "--place missing or invalid.\n"
 msgstr "“%s”的参数无效。\n"
 
-#: src/social/gnunet-social.c:1180
+#: src/social/gnunet-social.c:1195
 msgid "assign --name in state to --data"
 msgstr ""
 
-#: src/social/gnunet-social.c:1184
+#: src/social/gnunet-social.c:1199
 msgid "say good-bye and leave somebody else's place"
 msgstr ""
 
-#: src/social/gnunet-social.c:1188
+#: src/social/gnunet-social.c:1203
 msgid "create a place"
 msgstr ""
 
-#: src/social/gnunet-social.c:1192
+#: src/social/gnunet-social.c:1207
 msgid "destroy a place we were hosting"
 msgstr ""
 
-#: src/social/gnunet-social.c:1196
+#: src/social/gnunet-social.c:1211
 msgid "enter somebody else's place"
 msgstr ""
 
-#: src/social/gnunet-social.c:1200
+#: src/social/gnunet-social.c:1215
 msgid "find state matching name prefix"
 msgstr ""
 
-#: src/social/gnunet-social.c:1204
+#: src/social/gnunet-social.c:1219
 msgid "replay history of messages up to the given --limit"
 msgstr ""
 
-#: src/social/gnunet-social.c:1208
+#: src/social/gnunet-social.c:1223
 msgid "reconnect to a previously created place"
 msgstr ""
 
-#: src/social/gnunet-social.c:1212
+#: src/social/gnunet-social.c:1227
 msgid "publish something to a place we are hosting"
 msgstr ""
 
-#: src/social/gnunet-social.c:1216
+#: src/social/gnunet-social.c:1231
 msgid "reconnect to a previously entered place"
 msgstr ""
 
-#: src/social/gnunet-social.c:1220
+#: src/social/gnunet-social.c:1235
 msgid "search for state matching exact name"
 msgstr ""
 
-#: src/social/gnunet-social.c:1224
+#: src/social/gnunet-social.c:1239
 msgid "submit something to somebody's place"
 msgstr ""
 
-#: src/social/gnunet-social.c:1228
+#: src/social/gnunet-social.c:1243
 msgid "list of egos and subscribed places"
 msgstr ""
 
-#: src/social/gnunet-social.c:1232
+#: src/social/gnunet-social.c:1247
 msgid "extract and replay history between message IDs --start and --until"
 msgstr ""
 
-#: src/social/gnunet-social.c:1239
+#: src/social/gnunet-social.c:1254
 msgid "application ID to use when connecting"
 msgstr ""
 
-#: src/social/gnunet-social.c:1243
+#: src/social/gnunet-social.c:1258
 msgid "message body or state value"
 msgstr ""
 
-#: src/social/gnunet-social.c:1247
+#: src/social/gnunet-social.c:1262
 #, fuzzy
 msgid "name or public key of ego"
 msgstr "“%s”的参数无效。\n"
 
-#: src/social/gnunet-social.c:1251
+#: src/social/gnunet-social.c:1266
 #, fuzzy
 msgid "wait for incoming messages"
 msgstr "发送消息失败。\n"
 
-#: src/social/gnunet-social.c:1255
+#: src/social/gnunet-social.c:1270
 msgid "GNS name"
 msgstr ""
 
-#: src/social/gnunet-social.c:1259
+#: src/social/gnunet-social.c:1274
 msgid "peer ID for --guest-enter"
 msgstr ""
 
-#: src/social/gnunet-social.c:1263
+#: src/social/gnunet-social.c:1278
 msgid "name (key) to query from state"
 msgstr ""
 
-#: src/social/gnunet-social.c:1267
+#: src/social/gnunet-social.c:1282
 msgid "method name"
 msgstr ""
 
-#: src/social/gnunet-social.c:1271
+#: src/social/gnunet-social.c:1286
 #, fuzzy
 msgid "number of messages to replay from history"
 msgstr "每次迭代所使用的消息数量"
 
-#: src/social/gnunet-social.c:1275
+#: src/social/gnunet-social.c:1290
 msgid "key address of place"
 msgstr ""
 
-#: src/social/gnunet-social.c:1279
+#: src/social/gnunet-social.c:1294
 msgid "start message ID for history replay"
 msgstr ""
 
-#: src/social/gnunet-social.c:1283
+#: src/social/gnunet-social.c:1298
 msgid "respond to entry requests by admitting all guests"
 msgstr ""
 
-#: src/social/gnunet-social.c:1287
+#: src/social/gnunet-social.c:1302
 msgid "end message ID for history replay"
 msgstr ""
 
-#: src/social/gnunet-social.c:1291
+#: src/social/gnunet-social.c:1306
 msgid "respond to entry requests by refusing all guests"
 msgstr ""
 
-#: src/social/gnunet-social.c:1301
+#: src/social/gnunet-social.c:1316
 msgid ""
 "gnunet-social - Interact with the social service: enter/leave, send/receive "
 "messages, access history and state.\n"
 msgstr ""
 
-#: src/statistics/gnunet-service-statistics.c:323
+#: src/statistics/gnunet-service-statistics.c:338
 #, c-format
-msgid "Loading %llu bytes of statistics from `%s'\n"
+msgid "Wrote %llu bytes of statistics to `%s'\n"
 msgstr ""
 
-#: src/statistics/gnunet-service-statistics.c:434
+#: src/statistics/gnunet-service-statistics.c:1083
 #, c-format
-msgid "Wrote %llu bytes of statistics to `%s'\n"
+msgid "Loading %llu bytes of statistics from `%s'\n"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:145
+#: src/statistics/gnunet-statistics.c:158
 #, fuzzy
 msgid "Failed to obtain statistics.\n"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/statistics/gnunet-statistics.c:148
+#: src/statistics/gnunet-statistics.c:161
 #, fuzzy, c-format
 msgid "Failed to obtain statistics from host `%s:%llu'\n"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/statistics/gnunet-statistics.c:194
+#: src/statistics/gnunet-statistics.c:219
 msgid "Missing argument: subsystem \n"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:200
+#: src/statistics/gnunet-statistics.c:227
 msgid "Missing argument: name\n"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:232
+#: src/statistics/gnunet-statistics.c:270
 #, c-format
 msgid "No subsystem or name given\n"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:241
+#: src/statistics/gnunet-statistics.c:285
 #, fuzzy, c-format
 msgid "Failed to initialize watch routine\n"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/statistics/gnunet-statistics.c:266
+#: src/statistics/gnunet-statistics.c:321
 #, fuzzy, c-format
-msgid "Trying to connect to remote host, but service `%s' is not running\n"
-msgstr "初始化“%s”服务失败。\n"
+msgid "Invalid argument `%s'\n"
+msgstr "“%s”的参数无效。\n"
 
-#: src/statistics/gnunet-statistics.c:279
+#: src/statistics/gnunet-statistics.c:339
 #, fuzzy, c-format
 msgid "A port is required to connect to host `%s'\n"
 msgstr "无法连接到 %s:%u:%s\n"
 
-#: src/statistics/gnunet-statistics.c:287
+#: src/statistics/gnunet-statistics.c:347
 #, c-format
 msgid "A port has to be between 1 and 65535 to connect to host `%s'\n"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:320
-#, fuzzy, c-format
-msgid "Invalid argument `%s'\n"
-msgstr "“%s”的参数无效。\n"
-
-#: src/statistics/gnunet-statistics.c:346
+#: src/statistics/gnunet-statistics.c:383
 msgid "limit output to statistics for the given NAME"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:349
+#: src/statistics/gnunet-statistics.c:386
 msgid "make the value being set persistent"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:352
+#: src/statistics/gnunet-statistics.c:389
 msgid "limit output to the given SUBSYSTEM"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:355
+#: src/statistics/gnunet-statistics.c:392
 msgid "just print the statistics value"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:358
+#: src/statistics/gnunet-statistics.c:395
 msgid "watch value continuously"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:361
+#: src/statistics/gnunet-statistics.c:398
 msgid "connect to remote host"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:364
+#: src/statistics/gnunet-statistics.c:401
 msgid "port for remote host"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:376
+#: src/statistics/gnunet-statistics.c:417
 msgid "Print statistics about GNUnet operations."
 msgstr ""
 
-#: src/statistics/statistics_api.c:515
+#: src/statistics/statistics_api.c:753
 #, fuzzy
 msgid "Could not save some persistent statistics\n"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/statistics/statistics_api.c:1082
-msgid ""
-"Failed to receive acknowledgement from statistics service, some statistics "
-"might have been lost!\n"
-msgstr ""
-
 #: src/testbed/generate-underlay-topology.c:225
 #, fuzzy
 msgid "Need at least 2 arguments\n"
@@ -6598,12 +6371,12 @@
 msgid "Invalid argument `%s'; expecting unsigned int\n"
 msgstr "“%s”的参数无效。\n"
 
-#: src/testbed/generate-underlay-topology.c:338
+#: src/testbed/generate-underlay-topology.c:339
 #: src/testbed/gnunet-testbed-profiler.c:281
 msgid "create COUNT number of peers"
 msgstr ""
 
-#: src/testbed/generate-underlay-topology.c:347
+#: src/testbed/generate-underlay-topology.c:348
 msgid ""
 "Generates SQLite3 database representing a given underlay topology.\n"
 "Usage: gnunet-underlay-topology [OPTIONS] db-filename TOPO [TOPOOPTS]\n"
@@ -6631,19 +6404,19 @@
 msgid "Daemon to log latency values of connections to neighbours"
 msgstr ""
 
-#: src/testbed/gnunet-daemon-testbed-blacklist.c:248
+#: src/testbed/gnunet-daemon-testbed-blacklist.c:247
 msgid ""
 "Daemon to restrict incoming transport layer connections during testbed "
 "deployments"
 msgstr ""
 
-#: src/testbed/gnunet-daemon-testbed-underlay.c:230 src/testing/list-keys.c:50
-#: src/testing/testing.c:293 src/util/gnunet-ecc.c:298
+#: src/testbed/gnunet-daemon-testbed-underlay.c:231 src/testing/list-keys.c:50
+#: src/testing/testing.c:288 src/util/gnunet-ecc.c:298
 #, c-format
 msgid "Incorrect hostkey file format: %s\n"
 msgstr ""
 
-#: src/testbed/gnunet-daemon-testbed-underlay.c:468
+#: src/testbed/gnunet-daemon-testbed-underlay.c:469
 msgid "Daemon to restrict underlay network in testbed deployments"
 msgstr ""
 
@@ -6653,16 +6426,12 @@
 "Cannot open %s for writing load statistics.  Not logging load statistics\n"
 msgstr ""
 
-#: src/testbed/gnunet-service-testbed_peers.c:1015
+#: src/testbed/gnunet-service-testbed_peers.c:1141
 #, fuzzy
 msgid "Misconfiguration (can't connect to the ARM service)"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/testbed/gnunet-service-testbed_peers.c:1021
-msgid "Request doesn't fit into a message"
-msgstr ""
-
-#: src/testbed/gnunet-service-testbed_peers.c:1059
+#: src/testbed/gnunet-service-testbed_peers.c:1183
 #, c-format
 msgid "%s service can't be started because ARM is shutting down"
 msgstr ""
@@ -6687,31 +6456,31 @@
 "signal is received"
 msgstr ""
 
-#: src/testbed/testbed_api_hosts.c:415
+#: src/testbed/testbed_api.c:410
+#, fuzzy, c-format
+msgid "Adding host %u failed with error: %s\n"
+msgstr "“%s”以错误码 %d 失败:%s\n"
+
+#: src/testbed/testbed_api_hosts.c:413
 #, c-format
 msgid "Hosts file %s not found\n"
 msgstr ""
 
-#: src/testbed/testbed_api_hosts.c:423
+#: src/testbed/testbed_api_hosts.c:421
 #, c-format
 msgid "Hosts file %s has no data\n"
 msgstr ""
 
-#: src/testbed/testbed_api_hosts.c:430
+#: src/testbed/testbed_api_hosts.c:428
 #, c-format
 msgid "Hosts file %s cannot be read\n"
 msgstr ""
 
-#: src/testbed/testbed_api_hosts.c:570
+#: src/testbed/testbed_api_hosts.c:569
 #, c-format
 msgid "The function %s is only available when compiled with (--with-ll)\n"
 msgstr ""
 
-#: src/testbed/testbed_api_hosts.c:1590
-#, fuzzy, c-format
-msgid "Adding host %u failed with error: %s\n"
-msgstr "“%s”以错误码 %d 失败:%s\n"
-
 #: src/testbed/testbed_api_testbed.c:818
 msgid "Linking controllers failed. Exiting"
 msgstr ""
@@ -6768,44 +6537,44 @@
 "free topology cannot be more than %u.  Given `%s = %llu'"
 msgstr ""
 
-#: src/testbed/testbed_api_topology.c:966
+#: src/testbed/testbed_api_topology.c:1028
 #, c-format
 msgid "Topology file %s not found\n"
 msgstr ""
 
-#: src/testbed/testbed_api_topology.c:974
+#: src/testbed/testbed_api_topology.c:1036
 #, c-format
 msgid "Topology file %s has no data\n"
 msgstr ""
 
-#: src/testbed/testbed_api_topology.c:982
+#: src/testbed/testbed_api_topology.c:1044
 #, c-format
 msgid "Topology file %s cannot be read\n"
 msgstr ""
 
-#: src/testbed/testbed_api_topology.c:1004
+#: src/testbed/testbed_api_topology.c:1066
 #, fuzzy, c-format
 msgid "Failed to read peer index from toology file: %s"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/testbed/testbed_api_topology.c:1013
-#: src/testbed/testbed_api_topology.c:1037
+#: src/testbed/testbed_api_topology.c:1075
+#: src/testbed/testbed_api_topology.c:1099
 #, c-format
 msgid "Value in given topology file: %s out of range\n"
 msgstr ""
 
-#: src/testbed/testbed_api_topology.c:1019
-#: src/testbed/testbed_api_topology.c:1043
+#: src/testbed/testbed_api_topology.c:1081
+#: src/testbed/testbed_api_topology.c:1105
 #, fuzzy, c-format
 msgid "Failed to read peer index from topology file: %s"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/testbed/testbed_api_topology.c:1025
-#: src/testbed/testbed_api_topology.c:1049
+#: src/testbed/testbed_api_topology.c:1087
+#: src/testbed/testbed_api_topology.c:1111
 msgid "Topology file needs more peers than given ones\n"
 msgstr ""
 
-#: src/testbed/testbed_api_topology.c:1083
+#: src/testbed/testbed_api_topology.c:1145
 #, fuzzy, c-format
 msgid "Ignoring to connect peer %u to peer %u\n"
 msgstr "无法连接到 %s:%u:%s\n"
@@ -6849,25 +6618,25 @@
 msgid "Command line tool to access the testing library"
 msgstr ""
 
-#: src/testing/list-keys.c:90
+#: src/testing/list-keys.c:91
 msgid "list COUNT number of keys"
 msgstr ""
 
-#: src/testing/list-keys.c:93
+#: src/testing/list-keys.c:94
 msgid "skip COUNT number of keys in the beginning"
 msgstr ""
 
-#: src/testing/testing.c:277
+#: src/testing/testing.c:272
 #, c-format
 msgid "Hostkeys file not found: %s\n"
 msgstr ""
 
-#: src/testing/testing.c:720
+#: src/testing/testing.c:715
 #, c-format
 msgid "Key number %u does not exist\n"
 msgstr ""
 
-#: src/testing/testing.c:1163
+#: src/testing/testing.c:1158
 #, c-format
 msgid ""
 "You attempted to create a testbed with more than %u hosts.  Please "
@@ -6874,41 +6643,41 @@
 "precompute more hostkeys first.\n"
 msgstr ""
 
-#: src/testing/testing.c:1172
+#: src/testing/testing.c:1167
 #, fuzzy, c-format
 msgid "Failed to initialize hostkey for peer %u\n"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/testing/testing.c:1182
+#: src/testing/testing.c:1177
 msgid "PRIVATE_KEY option in PEER section missing in configuration\n"
 msgstr ""
 
-#: src/testing/testing.c:1195
+#: src/testing/testing.c:1190
 #, fuzzy
 msgid "Failed to create configuration for peer (not enough free ports?)\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/testing/testing.c:1209
+#: src/testing/testing.c:1204
 #, fuzzy, c-format
 msgid "Cannot open hostkey file `%s': %s\n"
 msgstr "找不到接口“%s”的一个 IP 地址。\n"
 
-#: src/testing/testing.c:1221
+#: src/testing/testing.c:1216
 #, fuzzy, c-format
 msgid "Failed to write hostkey file for peer %u: %s\n"
 msgstr "发送消息失败。\n"
 
-#: src/testing/testing.c:1246
+#: src/testing/testing.c:1241
 #, fuzzy, c-format
 msgid "Failed to write configuration file `%s' for peer %u: %s\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/testing/testing.c:1348
+#: src/testing/testing.c:1343
 #, fuzzy, c-format
 msgid "Failed to start `%s': %s\n"
 msgstr "运行 %s失败:%s %d\n"
 
-#: src/testing/testing.c:1710
+#: src/testing/testing.c:1644
 #, fuzzy, c-format
 msgid "Failed to load configuration from %s\n"
 msgstr "解析配置文件“%s”失败\n"
@@ -6923,29 +6692,33 @@
 msgid "Directory for file `%s' does not seem to be writable.\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:230
+#: src/topology/gnunet-daemon-topology.c:225
 msgid "# peers blacklisted"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:349
+#: src/topology/gnunet-daemon-topology.c:339
 msgid "# connect requests issued to ATS"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:634
-#: src/topology/gnunet-daemon-topology.c:730
+#: src/topology/gnunet-daemon-topology.c:533
+msgid "# HELLO messages gossipped"
+msgstr ""
+
+#: src/topology/gnunet-daemon-topology.c:635
+#: src/topology/gnunet-daemon-topology.c:721
 msgid "# friends connected"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:927
+#: src/topology/gnunet-daemon-topology.c:918
 msgid "Failed to connect to core service, can not manage topology!\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:960
+#: src/topology/gnunet-daemon-topology.c:951
 #, c-format
 msgid "Found myself `%s' in friend list (useless, ignored)\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:967
+#: src/topology/gnunet-daemon-topology.c:958
 #, fuzzy, c-format
 msgid "Found friend `%s' in configuration\n"
 msgstr ""
@@ -6952,11 +6725,11 @@
 "\n"
 "结束配置。\n"
 
-#: src/topology/gnunet-daemon-topology.c:989
+#: src/topology/gnunet-daemon-topology.c:980
 msgid "Encountered errors parsing friends list!\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:992
+#: src/topology/gnunet-daemon-topology.c:983
 #, fuzzy
 msgid "# friends in configuration"
 msgstr ""
@@ -6963,27 +6736,23 @@
 "\n"
 "结束配置。\n"
 
-#: src/topology/gnunet-daemon-topology.c:999
+#: src/topology/gnunet-daemon-topology.c:990
 msgid ""
 "Fewer friends specified than required by minimum friend count. Will only "
 "connect to friends.\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:1005
+#: src/topology/gnunet-daemon-topology.c:996
 msgid ""
 "More friendly connections required than target total number of connections.\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:1039
+#: src/topology/gnunet-daemon-topology.c:1059
 #: src/transport/plugin_transport_wlan.c:1491
 msgid "# HELLO messages received"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:1112
-msgid "# HELLO messages gossipped"
-msgstr ""
-
-#: src/topology/gnunet-daemon-topology.c:1283
+#: src/topology/gnunet-daemon-topology.c:1233
 msgid "GNUnet topology control"
 msgstr ""
 
@@ -6991,242 +6760,242 @@
 msgid "# Addresses given to ATS"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_blacklist.c:284
-#, fuzzy, c-format
-msgid "Adding blacklisting entry for peer `%s'\n"
-msgstr "卸载 GNUnet 服务"
+#: src/transport/gnunet-service-transport.c:448
+msgid "# messages dropped due to slow client"
+msgstr ""
 
-#: src/transport/gnunet-service-transport_blacklist.c:293
-#, c-format
-msgid "Adding blacklisting entry for peer `%s':`%s'\n"
+#: src/transport/gnunet-service-transport.c:809
+msgid "# bytes payload dropped (other peer was not connected)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_blacklist.c:500
-#: src/transport/gnunet-service-transport_blacklist.c:851
+#: src/transport/gnunet-service-transport.c:1539
+msgid "# bytes payload discarded due to not connected peer"
+msgstr ""
+
+#: src/transport/gnunet-service-transport.c:1698
+msgid "# bytes total received"
+msgstr ""
+
+#: src/transport/gnunet-service-transport.c:1795
+msgid "# bytes payload received"
+msgstr ""
+
+#: src/transport/gnunet-service-transport.c:2112
+#: src/transport/gnunet-service-transport.c:2584
 msgid "# disconnects due to blacklist"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_blacklist.c:855
+#: src/transport/gnunet-service-transport.c:2588
 #, fuzzy, c-format
 msgid "Disallowing connection to peer `%s' on transport %s\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/transport/gnunet-service-transport.c:231
-msgid "# bytes payload discarded due to not connected peer"
-msgstr ""
+#: src/transport/gnunet-service-transport.c:2696
+#, fuzzy, c-format
+msgid "Adding blacklisting entry for peer `%s'\n"
+msgstr "卸载 GNUnet 服务"
 
-#: src/transport/gnunet-service-transport.c:383
-msgid "# bytes total received"
+#: src/transport/gnunet-service-transport.c:2705
+#, c-format
+msgid "Adding blacklisting entry for peer `%s':`%s'\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport.c:478
-msgid "# bytes payload received"
-msgstr ""
-
-#: src/transport/gnunet-service-transport.c:823
+#: src/transport/gnunet-service-transport.c:2770
 #, fuzzy
 msgid "Transport service is lacking key configuration settings. Exiting.\n"
 msgstr "立即保存配置?"
 
-#: src/transport/gnunet-service-transport_clients.c:523
-msgid "# messages dropped due to slow client"
-msgstr ""
-
-#: src/transport/gnunet-service-transport_clients.c:845
-msgid "# bytes payload dropped (other peer was not connected)"
-msgstr ""
-
 #: src/transport/gnunet-service-transport_hello.c:195
 msgid "# refreshed my HELLO"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:805
+#: src/transport/gnunet-service-transport_neighbours.c:804
 msgid "# session creation failed"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1048
+#: src/transport/gnunet-service-transport_neighbours.c:1047
 msgid "# DISCONNECT messages sent"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1168
+#: src/transport/gnunet-service-transport_neighbours.c:1167
 msgid "# disconnects due to quota of 0"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1311
-#: src/transport/gnunet-service-transport_neighbours.c:1764
+#: src/transport/gnunet-service-transport_neighbours.c:1310
+#: src/transport/gnunet-service-transport_neighbours.c:1763
 msgid "# bytes in message queue for other peers"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1316
+#: src/transport/gnunet-service-transport_neighbours.c:1315
 msgid "# messages transmitted to other peers"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1322
+#: src/transport/gnunet-service-transport_neighbours.c:1321
 msgid "# transmission failures for messages to other peers"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1382
+#: src/transport/gnunet-service-transport_neighbours.c:1381
 msgid "# messages timed out while in transport queue"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1458
+#: src/transport/gnunet-service-transport_neighbours.c:1457
 msgid "# KEEPALIVES sent"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1494
+#: src/transport/gnunet-service-transport_neighbours.c:1493
 msgid "# KEEPALIVE messages discarded (peer unknown)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1502
+#: src/transport/gnunet-service-transport_neighbours.c:1501
 msgid "# KEEPALIVE messages discarded (no session)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1512
+#: src/transport/gnunet-service-transport_neighbours.c:1511
 msgid "# KEEPALIVES received in good order"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1557
+#: src/transport/gnunet-service-transport_neighbours.c:1556
 msgid "# KEEPALIVE_RESPONSEs discarded (not connected)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1566
+#: src/transport/gnunet-service-transport_neighbours.c:1565
 msgid "# KEEPALIVE_RESPONSEs discarded (not expected)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1574
+#: src/transport/gnunet-service-transport_neighbours.c:1573
 msgid "# KEEPALIVE_RESPONSEs discarded (address changed)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1583
+#: src/transport/gnunet-service-transport_neighbours.c:1582
 msgid "# KEEPALIVE_RESPONSEs discarded (no nonce)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1588
+#: src/transport/gnunet-service-transport_neighbours.c:1587
 msgid "# KEEPALIVE_RESPONSEs discarded (bad nonce)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1594
+#: src/transport/gnunet-service-transport_neighbours.c:1593
 msgid "# KEEPALIVE_RESPONSEs received (OK)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1661
+#: src/transport/gnunet-service-transport_neighbours.c:1660
 msgid "# messages discarded due to lack of neighbour record"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1695
+#: src/transport/gnunet-service-transport_neighbours.c:1694
 msgid "# bandwidth quota violations by other peers"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1710
+#: src/transport/gnunet-service-transport_neighbours.c:1709
 msgid "# ms throttling suggested"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1830
+#: src/transport/gnunet-service-transport_neighbours.c:1829
 #, fuzzy, c-format
 msgid "Failed to send SYN message to peer `%s'\n"
 msgstr "打开日志文件“%s”失败:%s\n"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1850
+#: src/transport/gnunet-service-transport_neighbours.c:1849
 #, fuzzy
 msgid "# Failed attempts to switch addresses (failed to send SYN CONT)"
 msgstr "打开日志文件“%s”失败:%s\n"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1889
+#: src/transport/gnunet-service-transport_neighbours.c:1888
 #, fuzzy
 msgid "# SYN messages sent"
 msgstr "消息尺寸"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1906
+#: src/transport/gnunet-service-transport_neighbours.c:1905
 #, fuzzy, c-format
 msgid "Failed to transmit SYN message to %s\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1936
+#: src/transport/gnunet-service-transport_neighbours.c:1935
 #, fuzzy
 msgid "# Failed attempts to switch addresses (failed to send SYN)"
 msgstr "打开日志文件“%s”失败:%s\n"
 
-#: src/transport/gnunet-service-transport_neighbours.c:2001
+#: src/transport/gnunet-service-transport_neighbours.c:2000
 #, 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:2055
+#: src/transport/gnunet-service-transport_neighbours.c:2054
 msgid "# SYN_ACK messages sent"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:2072
+#: src/transport/gnunet-service-transport_neighbours.c:2071
 #, fuzzy, c-format
 msgid "Failed to transmit SYN_ACK message to %s\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/transport/gnunet-service-transport_neighbours.c:2228
+#: src/transport/gnunet-service-transport_neighbours.c:2227
 msgid "# SYN messages received"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:2233
+#: src/transport/gnunet-service-transport_neighbours.c:2232
 #, c-format
 msgid "SYN request from peer `%s' ignored due impending shutdown\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:2599
+#: src/transport/gnunet-service-transport_neighbours.c:2598
 msgid "# Attempts to switch addresses"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3081
+#: src/transport/gnunet-service-transport_neighbours.c:3080
 msgid "# SYN_ACK messages received"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3089
+#: src/transport/gnunet-service-transport_neighbours.c:3088
 msgid "# unexpected SYN_ACK messages (no peer)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3107
-#: src/transport/gnunet-service-transport_neighbours.c:3131
+#: src/transport/gnunet-service-transport_neighbours.c:3106
+#: src/transport/gnunet-service-transport_neighbours.c:3130
 msgid "# unexpected SYN_ACK messages (not ready)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3143
+#: src/transport/gnunet-service-transport_neighbours.c:3142
 msgid "# unexpected SYN_ACK messages (waiting on ATS)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3168
+#: src/transport/gnunet-service-transport_neighbours.c:3167
 msgid "# Successful attempts to switch addresses"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3181
+#: src/transport/gnunet-service-transport_neighbours.c:3180
 msgid "# unexpected SYN_ACK messages (disconnecting)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3353
+#: src/transport/gnunet-service-transport_neighbours.c:3352
 msgid "# ACK messages received"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3389
+#: src/transport/gnunet-service-transport_neighbours.c:3388
 msgid "# unexpected ACK messages"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3477
+#: src/transport/gnunet-service-transport_neighbours.c:3476
 msgid "# quota messages ignored (malformed)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3484
+#: src/transport/gnunet-service-transport_neighbours.c:3483
 msgid "# QUOTA messages received"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3524
+#: src/transport/gnunet-service-transport_neighbours.c:3523
 msgid "# disconnect messages ignored (malformed)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3531
+#: src/transport/gnunet-service-transport_neighbours.c:3530
 msgid "# DISCONNECT messages received"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3542
+#: src/transport/gnunet-service-transport_neighbours.c:3541
 msgid "# disconnect messages ignored (timestamp)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3676
+#: src/transport/gnunet-service-transport_neighbours.c:3675
 msgid "# disconnected from peer upon explicit request"
 msgstr ""
 
@@ -7254,61 +7023,61 @@
 msgid "Did not load plugin `%s' due to missing functions\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:343
+#: src/transport/gnunet-service-transport_validation.c:388
 msgid "# Addresses in validation map"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:452
-#: src/transport/gnunet-service-transport_validation.c:638
-#: src/transport/gnunet-service-transport_validation.c:949
-#: src/transport/gnunet-service-transport_validation.c:1551
+#: src/transport/gnunet-service-transport_validation.c:491
+#: src/transport/gnunet-service-transport_validation.c:677
+#: src/transport/gnunet-service-transport_validation.c:988
+#: src/transport/gnunet-service-transport_validation.c:1590
 #, fuzzy
 msgid "# validations running"
 msgstr "sqlite 数据仓库"
 
-#: src/transport/gnunet-service-transport_validation.c:493
+#: src/transport/gnunet-service-transport_validation.c:532
 msgid "# address records discarded (timeout)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:541
+#: src/transport/gnunet-service-transport_validation.c:580
 msgid "# address records discarded (blacklist)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:629
+#: src/transport/gnunet-service-transport_validation.c:668
 msgid "# PINGs for address validation sent"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:709
+#: src/transport/gnunet-service-transport_validation.c:748
 msgid "# validations delayed by global throttle"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:746
+#: src/transport/gnunet-service-transport_validation.c:785
 msgid "# address revalidations started"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1075
+#: src/transport/gnunet-service-transport_validation.c:1114
 msgid "# PING message for different peer received"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1126
+#: src/transport/gnunet-service-transport_validation.c:1165
 #, c-format
 msgid "Plugin `%s' not available, cannot confirm having this address\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1139
+#: src/transport/gnunet-service-transport_validation.c:1178
 msgid "# failed address checks during validation"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1142
+#: src/transport/gnunet-service-transport_validation.c:1181
 #, c-format
 msgid "Address `%s' is not one of my addresses, not confirming PING\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1150
+#: src/transport/gnunet-service-transport_validation.c:1189
 msgid "# successful address checks during validation"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1163
+#: src/transport/gnunet-service-transport_validation.c:1202
 #, c-format
 msgid ""
 "Not confirming PING from peer `%s' with address `%s' since I cannot confirm "
@@ -7315,121 +7084,101 @@
 "having this address.\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1218
+#: src/transport/gnunet-service-transport_validation.c:1257
 #, fuzzy, c-format
 msgid "Failed to create PONG signature for peer `%s'\n"
 msgstr "发送消息失败。\n"
 
-#: src/transport/gnunet-service-transport_validation.c:1269
+#: src/transport/gnunet-service-transport_validation.c:1308
 msgid "# PONGs unicast via reliable transport"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1278
+#: src/transport/gnunet-service-transport_validation.c:1317
 msgid "# PONGs multicast to all available addresses"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1441
+#: src/transport/gnunet-service-transport_validation.c:1480
 msgid "# PONGs dropped, no matching pending validation"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1459
+#: src/transport/gnunet-service-transport_validation.c:1498
 msgid "# PONGs dropped, signature expired"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1514
+#: src/transport/gnunet-service-transport_validation.c:1553
 msgid "# validations succeeded"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:558
+#: src/transport/gnunet-transport.c:518
 #, c-format
 msgid "Transmitted %llu bytes/s (%llu bytes in %s)\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:567
-#: src/transport/gnunet-transport-profiler.c:277
+#: src/transport/gnunet-transport.c:528
 #, c-format
 msgid "Received %llu bytes/s (%llu bytes in %s)\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:608
+#: src/transport/gnunet-transport.c:572
 #, fuzzy, c-format
 msgid "Failed to connect to `%s'\n"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/transport/gnunet-transport.c:621
+#: src/transport/gnunet-transport.c:585
 #, fuzzy, c-format
 msgid "Failed to resolve address for peer `%s'\n"
 msgstr "找不到接口“%s”的一个 IP 地址。\n"
 
-#: src/transport/gnunet-transport.c:633
+#: src/transport/gnunet-transport.c:597
 #, fuzzy
 msgid "Failed to list connections, timeout occured\n"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/transport/gnunet-transport.c:658 src/transport/gnunet-transport.c:683
+#: src/transport/gnunet-transport.c:622 src/transport/gnunet-transport.c:647
 #, fuzzy, c-format
 msgid "Configuration for plugin `%s' did not work!\n"
 msgstr "配置文件“%s”已写入。\n"
 
-#: src/transport/gnunet-transport.c:663
+#: src/transport/gnunet-transport.c:627
 #, fuzzy, c-format
 msgid "Configuration for plugin `%s' did work!\n"
 msgstr "配置文件“%s”已写入。\n"
 
-#: src/transport/gnunet-transport.c:668
+#: src/transport/gnunet-transport.c:632
 #, fuzzy, c-format
 msgid "Internal NAT error while running test for plugin `%s'\n"
 msgstr "未知错误。\n"
 
-#: src/transport/gnunet-transport.c:673
+#: src/transport/gnunet-transport.c:637
 #, fuzzy, c-format
 msgid "Failed to start NAT test for plugin `%s'\n"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/transport/gnunet-transport.c:678
+#: src/transport/gnunet-transport.c:642
 #, c-format
 msgid "Timeout while waiting for result of NAT test for plugin `%s'\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:803
-#, fuzzy, c-format
-msgid ""
-"Peer `%s' %s %s\n"
-"\t%s%s\n"
-"\t%s%s\n"
-"\t%s%s\n"
-msgstr "运行 %s失败:%s %d\n"
-
-#: src/transport/gnunet-transport.c:838
-#, fuzzy, c-format
-msgid "Peer `%s' %s `%s' \n"
-msgstr "运行 %s失败:%s %d\n"
-
-#: src/transport/gnunet-transport.c:927 src/transport/gnunet-transport.c:1673
-#, fuzzy
-msgid "Monitor disconnected from transport service. Reconnecting.\n"
-msgstr "初始化“%s”服务失败。\n"
-
-#: src/transport/gnunet-transport.c:982
+#: src/transport/gnunet-transport.c:735
 msgid "No transport plugins configured, peer will never communicate\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:996
+#: src/transport/gnunet-transport.c:749
 #, c-format
 msgid "No port configured for plugin `%s', cannot test it\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1021
+#: src/transport/gnunet-transport.c:774
 #, fuzzy
 msgid "Failed to start resolver!\n"
 msgstr "运行 %s失败:%s %d\n"
 
-#: src/transport/gnunet-transport.c:1067
+#: src/transport/gnunet-transport.c:810
 #, c-format
-msgid "Transmitting %u bytes to %s\n"
+msgid "Transmitting %u bytes\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1096
+#: src/transport/gnunet-transport.c:844
 #, c-format
 msgid ""
 "Successfully connected to `%s', starting to send benchmark data in %u Kb "
@@ -7436,44 +7185,47 @@
 "blocks\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1133
-#: src/transport/gnunet-transport-profiler.c:432
+#: src/transport/gnunet-transport.c:875
 #, fuzzy, c-format
 msgid "Disconnected from peer `%s' while benchmarking\n"
 msgstr "“%s”已连接到“%s”。\n"
 
-#: src/transport/gnunet-transport.c:1158 src/transport/gnunet-transport.c:1184
+#: src/transport/gnunet-transport.c:899 src/transport/gnunet-transport.c:928
 #, c-format
 msgid "%24s: %-17s %4s   (%u connections in total)\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1160
+#: src/transport/gnunet-transport.c:901
 #, fuzzy
 msgid "Connected to"
 msgstr "“%s”已连接到“%s”。\n"
 
-#: src/transport/gnunet-transport.c:1186
+#: src/transport/gnunet-transport.c:930
 #, fuzzy
 msgid "Disconnected from"
 msgstr "“%s”已连接到“%s”。\n"
 
-#: src/transport/gnunet-transport.c:1210
-#: src/transport/gnunet-transport-profiler.c:457
+#: src/transport/gnunet-transport.c:965
 #, c-format
-msgid "Received %u bytes from %s\n"
+msgid "Received %u bytes\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1250
+#: src/transport/gnunet-transport.c:1002
 #, c-format
 msgid "Peer `%s': %s %s in state `%s' until %s\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1262
+#: src/transport/gnunet-transport.c:1014
 #, fuzzy, c-format
 msgid "Peer `%s': %s %s\n"
 msgstr "运行 %s失败:%s %d\n"
 
-#: src/transport/gnunet-transport.c:1792
+#: src/transport/gnunet-transport.c:1426
+#, fuzzy
+msgid "Monitor disconnected from transport service. Reconnecting.\n"
+msgstr "初始化“%s”服务失败。\n"
+
+#: src/transport/gnunet-transport.c:1548
 #, c-format
 msgid ""
 "Multiple operations given. Please choose only one operation: %s, %s, %s, %s, "
@@ -7480,220 +7232,139 @@
 "%s, %s %s\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1800
+#: src/transport/gnunet-transport.c:1561
 #, c-format
 msgid ""
 "No operation given. Please choose one operation: %s, %s, %s, %s, %s, %s, %s\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1823
+#: src/transport/gnunet-transport.c:1589
 #, fuzzy
 msgid "Failed to connect to transport service for disconnection\n"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/transport/gnunet-transport.c:1829
+#: src/transport/gnunet-transport.c:1595
 msgid "Blacklisting request in place, stop with CTRL-C\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1848 src/transport/gnunet-transport.c:1867
-#: src/transport/gnunet-transport.c:1925
-#: src/transport/gnunet-transport-profiler.c:553
+#: src/transport/gnunet-transport.c:1618 src/transport/gnunet-transport.c:1648
+#: src/transport/gnunet-transport.c:1701
 #, fuzzy
 msgid "Failed to connect to transport service\n"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/transport/gnunet-transport.c:1872
+#: src/transport/gnunet-transport.c:1655
 msgid "Starting to receive benchmark data\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1972
+#: src/transport/gnunet-transport.c:1725
 #, fuzzy
 msgid "print information for all peers (instead of only connected peers)"
 msgstr "无法获取有关用户“%s”的信息:%s\n"
 
-#: src/transport/gnunet-transport.c:1975
+#: src/transport/gnunet-transport.c:1728
 msgid "measure how fast we are receiving data from all peers (until CTRL-C)"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1978
+#: src/transport/gnunet-transport.c:1731
 #, fuzzy
 msgid "disconnect from a peer"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/transport/gnunet-transport.c:1981
-#, fuzzy
-msgid "print information for all pending validations "
-msgstr "无法获取有关用户“%s”的信息:%s\n"
-
-#: src/transport/gnunet-transport.c:1984
-#, fuzzy
-msgid "print information for all pending validations continuously"
-msgstr "无法获取有关用户“%s”的信息:%s\n"
-
-#: src/transport/gnunet-transport.c:1987
+#: src/transport/gnunet-transport.c:1734
 msgid "provide information about all current connections (once)"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1993
+#: src/transport/gnunet-transport.c:1740
 msgid ""
 "provide information about all connects and disconnect events (continuously)"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1996
+#: src/transport/gnunet-transport.c:1743
 msgid "do not resolve hostnames"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1999
-#: src/transport/gnunet-transport-profiler.c:618
+#: src/transport/gnunet-transport.c:1746
+#: src/transport/gnunet-transport-profiler.c:631
 msgid "peer identity"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:2002
+#: src/transport/gnunet-transport.c:1749
 msgid "monitor plugin sessions"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:2005
+#: src/transport/gnunet-transport.c:1752
 msgid "send data for benchmarking to the other peer (until CTRL-C)"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:2008
+#: src/transport/gnunet-transport.c:1755
 msgid "test transport configuration (involves external server)"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:2019
-#: src/transport/gnunet-transport-profiler.c:629
+#: src/transport/gnunet-transport.c:1766
+#: src/transport/gnunet-transport-profiler.c:642
 #, fuzzy
 msgid "Direct access to transport service."
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/transport/gnunet-transport-profiler.c:221
+#: src/transport/gnunet-transport-profiler.c:219
 #, c-format
 msgid "%llu B in %llu ms == %.2f KB/s!\n"
 msgstr ""
 
-#: src/transport/gnunet-transport-profiler.c:257
-#, c-format
-msgid "%u;%u;%llu;%llu;%.2f;%.2f"
-msgstr ""
-
-#: src/transport/gnunet-transport-profiler.c:266
-#, c-format
-msgid ";%llu;%.2f"
-msgstr ""
-
-#: src/transport/gnunet-transport-profiler.c:283
-msgid "\n"
-msgstr ""
-
-#: src/transport/gnunet-transport-profiler.c:336
-msgid "."
-msgstr ""
-
-#: src/transport/gnunet-transport-profiler.c:356
-#, c-format
-msgid ""
-"\n"
-"Starting benchmark to `%s', starting to send %u messages in %u byte blocks\n"
-msgstr ""
-
-#: src/transport/gnunet-transport-profiler.c:404
-#, fuzzy, c-format
-msgid "Connected to different peer `%s'\n"
-msgstr "“%s”已连接到“%s”。\n"
-
-#: src/transport/gnunet-transport-profiler.c:411
-#, fuzzy, c-format
-msgid "Successfully connected to `%s'\n"
-msgstr "“%s”已连接到“%s”。\n"
-
-#: src/transport/gnunet-transport-profiler.c:473
-#, fuzzy, c-format
-msgid "Denying connection to `%s'\n"
-msgstr "无法连接到 %s:%u:%s\n"
-
-#: src/transport/gnunet-transport-profiler.c:503
-#, fuzzy
-msgid "Message size too big!\n"
-msgstr "消息尺寸"
-
-#: src/transport/gnunet-transport-profiler.c:509
-#, fuzzy
-msgid "No peer identity given\n"
-msgstr "无法获取有关用户“%s”的信息:%s\n"
-
-#: src/transport/gnunet-transport-profiler.c:524
-#, c-format
-msgid "Trying to send %u messages with size %u to peer `%s'\n"
-msgstr ""
-
-#: src/transport/gnunet-transport-profiler.c:530
-#, fuzzy, c-format
-msgid "Trying to receive messages from peer `%s'\n"
-msgstr "打开日志文件“%s”失败:%s\n"
-
-#: src/transport/gnunet-transport-profiler.c:535
-#, fuzzy
-msgid "No operation given\n"
-msgstr "无法获取有关用户“%s”的信息:%s\n"
-
-#: src/transport/gnunet-transport-profiler.c:542
-#, fuzzy
-msgid "Failed to connect to ATS service\n"
-msgstr "初始化“%s”服务失败。\n"
-
-#: src/transport/gnunet-transport-profiler.c:603
+#: src/transport/gnunet-transport-profiler.c:616
 msgid "send data to peer"
 msgstr ""
 
-#: src/transport/gnunet-transport-profiler.c:606
+#: src/transport/gnunet-transport-profiler.c:619
 msgid "receive data from peer"
 msgstr ""
 
-#: src/transport/gnunet-transport-profiler.c:609
+#: src/transport/gnunet-transport-profiler.c:622
 msgid "iterations"
 msgstr ""
 
-#: src/transport/gnunet-transport-profiler.c:612
+#: src/transport/gnunet-transport-profiler.c:625
 #, fuzzy
 msgid "number of messages to send"
 msgstr "每次迭代所使用的消息数量"
 
-#: src/transport/gnunet-transport-profiler.c:615
+#: src/transport/gnunet-transport-profiler.c:628
 #, fuzzy
 msgid "message size to use"
 msgstr "消息尺寸"
 
-#: src/transport/plugin_transport_http_client.c:1473
-#: src/transport/plugin_transport_http_server.c:2237
-#: src/transport/plugin_transport_http_server.c:3427
-#: src/transport/plugin_transport_tcp.c:2985
-#: src/transport/plugin_transport_tcp.c:2992
+#: src/transport/plugin_transport_http_client.c:1477
+#: src/transport/plugin_transport_http_server.c:2248
+#: src/transport/plugin_transport_http_server.c:3457
+#: src/transport/plugin_transport_tcp.c:3365
+#: src/transport/plugin_transport_tcp.c:3372
 msgid "TCP_STEALTH not supported on this platform.\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_client.c:2114
+#: src/transport/plugin_transport_http_client.c:2118
 #, c-format
 msgid "Could not initialize curl multi handle, failed to start %s plugin!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_client.c:2163
-#: src/transport/plugin_transport_http_server.c:3142
+#: src/transport/plugin_transport_http_client.c:2167
+#: src/transport/plugin_transport_http_server.c:3172
 #, fuzzy, c-format
 msgid "Shutting down plugin `%s'\n"
 msgstr "未知的命令“%s”。\n"
 
-#: src/transport/plugin_transport_http_client.c:2180
-#: src/transport/plugin_transport_http_server.c:3212
+#: src/transport/plugin_transport_http_client.c:2184
+#: src/transport/plugin_transport_http_server.c:3242
 #, c-format
 msgid "Shutdown for plugin `%s' complete\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_client.c:2214
+#: src/transport/plugin_transport_http_client.c:2218
 #, fuzzy, c-format
 msgid "Maximum number of requests is %u\n"
 msgstr "增加 TCP/IP 的最大连接数"
 
-#: src/transport/plugin_transport_http_server.c:1721
+#: src/transport/plugin_transport_http_server.c:1729
 #, c-format
 msgid ""
 "Access from connection %p (%u of %u) for `%s' `%s' url `%s' with upload data "
@@ -7700,72 +7371,62 @@
 "size %u\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:1955
+#: src/transport/plugin_transport_http_server.c:1966
 #, c-format
 msgid "Accepting connection (%u of %u) from `%s'\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:1963
+#: src/transport/plugin_transport_http_server.c:1974
 #, c-format
 msgid ""
 "Server reached maximum number connections (%u), rejecting new connection\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:2113
+#: src/transport/plugin_transport_http_server.c:2124
 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:2136
+#: src/transport/plugin_transport_http_server.c:2147
 #, c-format
 msgid "No usable TLS certificate found and creating one at `%s/%s' failed!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:2263
+#: src/transport/plugin_transport_http_server.c:2274
 msgid "Could not load or create server certificate! Loading plugin failed!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:2572
+#: src/transport/plugin_transport_http_server.c:2583
 #, fuzzy
 msgid "Require valid port number for service in configuration!\n"
 msgstr "保存配置失败。"
 
-#: src/transport/plugin_transport_http_server.c:2606 src/util/service.c:704
-#, fuzzy, c-format
-msgid "Failed to resolve `%s': %s\n"
-msgstr "打开日志文件“%s”失败:%s\n"
-
-#: src/transport/plugin_transport_http_server.c:2624 src/util/service.c:723
-#, fuzzy, c-format
-msgid "Failed to find %saddress for `%s'.\n"
-msgstr "找不到接口“%s”的一个 IP 地址。\n"
-
-#: src/transport/plugin_transport_http_server.c:2737
+#: src/transport/plugin_transport_http_server.c:2748
 #, c-format
 msgid "Found %u addresses to report to NAT service\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:2815
+#: src/transport/plugin_transport_http_server.c:2832
 #: src/transport/plugin_transport_udp.c:3600
 msgid "Disabling IPv6 since it is not supported on this system!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:2918
+#: src/transport/plugin_transport_http_server.c:2938
 #, c-format
 msgid "IPv4 support is %s\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:2933
+#: src/transport/plugin_transport_http_server.c:2953
 #, c-format
 msgid "IPv6 support is %s\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:2939
+#: src/transport/plugin_transport_http_server.c:2959
 msgid "Neither IPv4 nor IPv6 are enabled! Fix in configuration\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:2950
+#: src/transport/plugin_transport_http_server.c:2970
 #, fuzzy
 msgid "Port is required! Fix in configuration\n"
 msgstr ""
@@ -7772,47 +7433,37 @@
 "\n"
 "结束配置。\n"
 
-#: src/transport/plugin_transport_http_server.c:2956
+#: src/transport/plugin_transport_http_server.c:2976
 #, c-format
 msgid "Using port %u\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:2970
+#: src/transport/plugin_transport_http_server.c:2995
 #, c-format
 msgid "Specific IPv4 address `%s' in configuration file is invalid!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:2980
-#, fuzzy, c-format
-msgid "Binding to IPv4 address %s\n"
-msgstr "无效的进程优先级“%s”\n"
-
-#: src/transport/plugin_transport_http_server.c:3002
+#: src/transport/plugin_transport_http_server.c:3030
 #, c-format
 msgid "Specific IPv6 address `%s' in configuration file is invalid!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:3012
+#: src/transport/plugin_transport_http_server.c:3105
 #, fuzzy, c-format
-msgid "Binding to IPv6 address %s\n"
-msgstr "无效的进程优先级“%s”\n"
-
-#: src/transport/plugin_transport_http_server.c:3075
-#, fuzzy, c-format
 msgid "Using external hostname `%s'\n"
 msgstr "卸载 GNUnet 服务"
 
-#: src/transport/plugin_transport_http_server.c:3096
+#: src/transport/plugin_transport_http_server.c:3126
 #, c-format
 msgid "Notifying transport only about hostname `%s'\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:3113
+#: src/transport/plugin_transport_http_server.c:3143
 #, fuzzy, c-format
 msgid "Maximum number of connections is %u\n"
 msgstr "增加 TCP/IP 的最大连接数"
 
-#: src/transport/plugin_transport_http_server.c:3439
+#: src/transport/plugin_transport_http_server.c:3469
 #, fuzzy
 msgid "Unable to compile URL regex\n"
 msgstr "无法初始化 SQLite:%s。\n"
@@ -7859,58 +7510,58 @@
 msgid "# bytes dropped by SMTP (outgoing)"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:672
-#: src/transport/plugin_transport_tcp.c:1983
+#: src/transport/plugin_transport_tcp.c:1051
+#: src/transport/plugin_transport_tcp.c:2362
 #, c-format
 msgid "Unexpected address length: %u bytes\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:855
-#: src/transport/plugin_transport_tcp.c:1079
-#: src/transport/plugin_transport_tcp.c:2253
-#: src/transport/plugin_transport_tcp.c:3106
+#: src/transport/plugin_transport_tcp.c:1234
+#: src/transport/plugin_transport_tcp.c:1458
+#: src/transport/plugin_transport_tcp.c:2633
+#: src/transport/plugin_transport_tcp.c:3490
 msgid "# TCP sessions active"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:897
-#: src/transport/plugin_transport_tcp.c:1061
-#: src/transport/plugin_transport_tcp.c:1185
-#: src/transport/plugin_transport_tcp.c:1258
-#: src/transport/plugin_transport_tcp.c:1358
-#: src/transport/plugin_transport_tcp.c:1383
+#: src/transport/plugin_transport_tcp.c:1276
+#: src/transport/plugin_transport_tcp.c:1440
+#: src/transport/plugin_transport_tcp.c:1564
+#: src/transport/plugin_transport_tcp.c:1637
+#: src/transport/plugin_transport_tcp.c:1737
+#: src/transport/plugin_transport_tcp.c:1762
 msgid "# bytes currently in TCP buffers"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:900
+#: src/transport/plugin_transport_tcp.c:1279
 msgid "# bytes discarded by TCP (disconnect)"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:1188
+#: src/transport/plugin_transport_tcp.c:1567
 msgid "# bytes discarded by TCP (timeout)"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:1262
+#: src/transport/plugin_transport_tcp.c:1641
 msgid "# bytes transmitted via TCP"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:1653
+#: src/transport/plugin_transport_tcp.c:2032
 msgid "# requests to create session with invalid address"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:1821
+#: src/transport/plugin_transport_tcp.c:2200
 msgid "# transport-service disconnect requests for TCP"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2312
+#: src/transport/plugin_transport_tcp.c:2692
 msgid "# TCP WELCOME messages received"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2503
+#: src/transport/plugin_transport_tcp.c:2883
 msgid "# bytes received via TCP"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2554
-#: src/transport/plugin_transport_tcp.c:2612
+#: src/transport/plugin_transport_tcp.c:2934
+#: src/transport/plugin_transport_tcp.c:2992
 #, fuzzy
 msgid "# TCP server connections active"
 msgstr ""
@@ -7917,7 +7568,7 @@
 "\n"
 "按任意键继续\n"
 
-#: src/transport/plugin_transport_tcp.c:2558
+#: src/transport/plugin_transport_tcp.c:2938
 #, fuzzy
 msgid "# TCP server connect events"
 msgstr ""
@@ -7924,43 +7575,37 @@
 "\n"
 "按任意键继续\n"
 
-#: src/transport/plugin_transport_tcp.c:2564
+#: src/transport/plugin_transport_tcp.c:2944
 msgid "TCP connection limit reached, suspending server\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2566
+#: src/transport/plugin_transport_tcp.c:2946
 msgid "# TCP service suspended"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2606
+#: src/transport/plugin_transport_tcp.c:2986
 msgid "# TCP service resumed"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2616
+#: src/transport/plugin_transport_tcp.c:2996
 msgid "# network-level TCP disconnect events"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2919 src/util/service.c:584
-#: src/util/service.c:590
-#, c-format
-msgid "Require valid port number for service `%s' in configuration!\n"
-msgstr ""
-
-#: src/transport/plugin_transport_tcp.c:2935
+#: src/transport/plugin_transport_tcp.c:3315
 #, fuzzy
 msgid "Failed to start service.\n"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/transport/plugin_transport_tcp.c:3094
+#: src/transport/plugin_transport_tcp.c:3478
 #, c-format
 msgid "TCP transport listening on port %llu\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:3098
+#: src/transport/plugin_transport_tcp.c:3482
 msgid "TCP transport not listening on any port (client only)\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:3102
+#: src/transport/plugin_transport_tcp.c:3486
 #, c-format
 msgid "TCP transport advertises itself as being on port %llu\n"
 msgstr ""
@@ -8066,7 +7711,7 @@
 
 #: src/transport/plugin_transport_wlan.c:1167
 #: src/transport/plugin_transport_wlan.c:1258
-#: src/transport/plugin_transport_wlan.c:2279
+#: src/transport/plugin_transport_wlan.c:2280
 msgid "# MAC endpoints allocated"
 msgstr ""
 
@@ -8090,145 +7735,117 @@
 msgid "# DATA messages processed"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:2254
+#: src/transport/plugin_transport_wlan.c:2255
 #, c-format
 msgid "Helper binary `%s' not SUID, cannot run WLAN transport\n"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:2276
+#: src/transport/plugin_transport_wlan.c:2277
 msgid "# sessions allocated"
 msgstr ""
 
-#: src/transport/transport_api.c:816
-#, c-format
-msgid "Received unexpected message of type %u in %s:%u\n"
-msgstr ""
-
-#: src/transport/transport-testing.c:676
-#, fuzzy
-msgid "Failed to initialize testing library!\n"
-msgstr "初始化“%s”服务失败。\n"
-
 #: src/tun/regex.c:134
 #, c-format
 msgid "Bad mask: %d\n"
 msgstr ""
 
-#: src/util/bio.c:170 src/util/bio.c:178
+#: src/util/bio.c:177 src/util/bio.c:185
 #, fuzzy, c-format
 msgid "Error reading `%s': %s"
 msgstr "创建用户出错"
 
-#: src/util/bio.c:180
+#: src/util/bio.c:187
 msgid "End of file"
 msgstr ""
 
-#: src/util/bio.c:237
+#: src/util/bio.c:244
 #, c-format
 msgid "Error reading length of string `%s'"
 msgstr ""
 
-#: src/util/bio.c:247
+#: src/util/bio.c:254
 #, c-format
 msgid "String `%s' longer than allowed (%u > %u)"
 msgstr ""
 
-#: src/util/bio.c:293
+#: src/util/bio.c:300
 #, c-format
 msgid "Serialized metadata `%s' larger than allowed (%u>%u)"
 msgstr ""
 
-#: src/util/bio.c:307
+#: src/util/bio.c:314
 #, c-format
 msgid "Metadata `%s' failed to deserialize"
 msgstr ""
 
-#: src/util/client.c:264 src/util/client.c:892 src/util/service.c:621
+#: src/util/client_new.c:863
 #, c-format
-msgid "UNIXPATH `%s' too long, maximum length is %llu\n"
-msgstr ""
-
-#: src/util/client.c:268 src/util/client.c:897 src/util/service.c:625
-#, fuzzy, c-format
-msgid "Using `%s' instead\n"
-msgstr "%s:选项“%s”有歧义\n"
-
-#: src/util/client.c:367
-#, c-format
-msgid ""
-"Could not determine valid hostname and port for service `%s' from "
-"configuration.\n"
-msgstr ""
-
-#: src/util/client.c:375
-#, c-format
 msgid "Need a non-empty hostname for service `%s'.\n"
 msgstr ""
 
-#: src/util/client.c:1042
-#, fuzzy, c-format
-msgid "Could not connect to service `%s', configuration broken.\n"
-msgstr "无法连接到 %s:%u:%s\n"
-
-#: src/util/client.c:1054
-#, c-format
-msgid "Failure to transmit request to service `%s'\n"
-msgstr ""
-
-#: src/util/common_logging.c:255 src/util/common_logging.c:1062
+#: src/util/common_logging.c:256 src/util/common_logging.c:1129
 msgid "DEBUG"
 msgstr "调试"
 
-#: src/util/common_logging.c:257 src/util/common_logging.c:1060
+#: src/util/common_logging.c:258 src/util/common_logging.c:1127
 msgid "INFO"
 msgstr "信息"
 
-#: src/util/common_logging.c:259 src/util/common_logging.c:1058
+#: src/util/common_logging.c:260 src/util/common_logging.c:1125
+msgid "MESSAGE"
+msgstr ""
+
+#: src/util/common_logging.c:262 src/util/common_logging.c:1123
 msgid "WARNING"
 msgstr "警告"
 
-#: src/util/common_logging.c:261 src/util/common_logging.c:1056
+#: src/util/common_logging.c:264 src/util/common_logging.c:1121
 msgid "ERROR"
 msgstr "错误"
 
-#: src/util/common_logging.c:263 src/util/common_logging.c:1064
+#: src/util/common_logging.c:266 src/util/common_logging.c:1131
 msgid "NONE"
 msgstr ""
 
-#: src/util/common_logging.c:840
+#: src/util/common_logging.c:879
 #, fuzzy, c-format
 msgid "Message `%.*s' repeated %u times in the last %s\n"
 msgstr "消息“%.*s”重复了 %u 次,在最近 %llu 秒内\n"
 
-#: src/util/common_logging.c:1065
+#: src/util/common_logging.c:1132
 msgid "INVALID"
 msgstr ""
 
-#: src/util/common_logging.c:1181
+#: src/util/common_logging.c:1248
 msgid "unknown address"
 msgstr ""
 
-#: src/util/common_logging.c:1223
+#: src/util/common_logging.c:1290
 msgid "invalid address"
 msgstr ""
 
-#: src/util/common_logging.c:1241
+#: src/util/common_logging.c:1308
 #, fuzzy, c-format
 msgid "Configuration fails to specify option `%s' in section `%s'!\n"
 msgstr "配置不满足配置规范文件“%s”的约束!\n"
 
-#: src/util/common_logging.c:1262
+#: src/util/common_logging.c:1329
 #, fuzzy, c-format
 msgid ""
 "Configuration specifies invalid value for option `%s' in section `%s': %s\n"
 msgstr "配置不满足配置规范文件“%s”的约束!\n"
 
-#: src/util/configuration.c:291
+#: src/util/configuration.c:286
 #, fuzzy, c-format
 msgid "Syntax error while deserializing in line %u\n"
 msgstr "配置文件“%s”第 %d 行有语法错误。\n"
 
-#: src/util/configuration.c:1028
+#: src/util/configuration.c:344
+#, fuzzy, c-format
+msgid "Error while reading file `%s'\n"
+msgstr "解析 dscl 输出时出错。\n"
+
+#: src/util/configuration.c:1017
 #, c-format
 msgid ""
 "Configuration value '%s' for '%s' in section '%s' is not in set of legal "
@@ -8235,17 +7852,17 @@
 "choices\n"
 msgstr ""
 
-#: src/util/configuration.c:1147
+#: src/util/configuration.c:1136
 #, c-format
 msgid "Recursive expansion suspected, aborting $-expansion for term `%s'\n"
 msgstr ""
 
-#: src/util/configuration.c:1179
+#: src/util/configuration.c:1169
 #, fuzzy, c-format
 msgid "Missing closing `%s' in option `%s'\n"
 msgstr "配置文件“%s”已写入。\n"
 
-#: src/util/configuration.c:1253
+#: src/util/configuration.c:1237
 #, c-format
 msgid ""
 "Failed to expand `%s' in `%s' as it is neither found in [PATHS] nor defined "
@@ -8324,17 +7941,22 @@
 msgid "libgcrypt has not the expected version (version %s is required).\n"
 msgstr "libgcrypt 的版本不符合预期(要求版本 %s)。\n"
 
-#: src/util/crypto_rsa.c:1146
+#: src/util/crypto_rsa.c:835
 #, fuzzy, c-format
+msgid "RSA signing failed at %s:%d: %s\n"
+msgstr "对驱动器“%2$s”的“%1$s”操作失败:%3$u\n"
+
+#: src/util/crypto_rsa.c:1166
+#, fuzzy, c-format
 msgid "RSA signature verification failed at %s:%d: %s\n"
 msgstr "对驱动器“%2$s”的“%1$s”操作失败:%3$u\n"
 
-#: src/util/disk.c:1227
+#: src/util/disk.c:1245
 #, c-format
 msgid "Expected `%s' to be a directory!\n"
 msgstr "“%s”应为目录!\n"
 
-#: src/util/disk.c:1450 src/util/service.c:1322
+#: src/util/disk.c:1486 src/util/service.c:1322 src/util/service_new.c:1371
 #, c-format
 msgid "Cannot obtain information about user `%s': %s\n"
 msgstr "无法获取有关用户“%s”的信息:%s\n"
@@ -8579,13 +8201,13 @@
 msgid "Manipulate GNUnet proof of work files"
 msgstr "更改配置文件中的一个值"
 
-#: src/util/gnunet-service-resolver.c:327
+#: src/util/gnunet-service-resolver.c:371
 #, c-format
 msgid "Could not resolve `%s' (%s): %s\n"
 msgstr "无法解析“%s”(%s):%s\n"
 
-#: src/util/gnunet-service-resolver.c:401
-#: src/util/gnunet-service-resolver.c:442
+#: src/util/gnunet-service-resolver.c:460
+#: src/util/gnunet-service-resolver.c:512
 #, c-format
 msgid "Could not find IP of host `%s': %s\n"
 msgstr "找不到主机“%s”的 IP:%s\n"
@@ -8634,7 +8256,7 @@
 msgid "Unable to shorten unix path `%s' while keeping name unique\n"
 msgstr ""
 
-#: src/util/network.c:1731 src/util/network.c:1907
+#: src/util/network.c:1737 src/util/network.c:1913
 #, c-format
 msgid ""
 "Fatal internal logic error, process hangs in `%s' (abort with CTRL-C)!\n"
@@ -8682,17 +8304,17 @@
 msgid "Could not determine plugin installation path.\n"
 msgstr "无法确定用户界面定义文件。"
 
-#: src/util/program.c:244 src/util/service.c:1456
+#: src/util/program.c:244 src/util/service.c:1456 src/util/service_new.c:1801
 #, 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/program.c:256 src/util/service.c:1471 src/util/service_new.c:1818
 #, 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/program.c:261 src/util/service.c:1466 src/util/service_new.c:1812
 #, fuzzy
 msgid "Malformed configuration, exit ...\n"
 msgstr "解析配置文件“%s”失败\n"
@@ -8710,37 +8332,37 @@
 "resolution will be unavailable.\n"
 msgstr ""
 
-#: src/util/resolver_api.c:357
+#: src/util/resolver_api.c:815
+#, c-format
+msgid "Timeout trying to resolve hostname `%s'.\n"
+msgstr ""
+
+#: src/util/resolver_api.c:827
 #, fuzzy, c-format
 msgid "Timeout trying to resolve IP address `%s'.\n"
 msgstr "GNUnet 现在使用 IP 地址 %s。\n"
 
-#: src/util/resolver_api.c:364
-#, c-format
-msgid "Timeout trying to resolve hostname `%s'.\n"
-msgstr ""
-
-#: src/util/resolver_api.c:950
+#: src/util/resolver_api.c:1004
 msgid "Resolver not configured correctly.\n"
 msgstr ""
 
-#: src/util/resolver_api.c:1026 src/util/resolver_api.c:1047
-#: src/util/resolver_api.c:1061
+#: src/util/resolver_api.c:1086 src/util/resolver_api.c:1107
+#: src/util/resolver_api.c:1121
 #, fuzzy, c-format
 msgid "Could not resolve our FQDN: %s\n"
 msgstr "无法解析“%s”(%s):%s\n"
 
-#: src/util/server.c:478
+#: src/util/server.c:478 src/util/service_new.c:1103
 #, 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/server.c:488 src/util/service_new.c:1113
 #, c-format
 msgid "`%s' failed for port %d (%s): address already in use\n"
 msgstr ""
 
-#: src/util/server.c:494
+#: src/util/server.c:494 src/util/service_new.c:1119
 #, fuzzy, c-format
 msgid "`%s' failed for `%s': address already in use\n"
 msgstr "对驱动器“%2$s”的“%1$s”操作失败:%3$u\n"
@@ -8752,7 +8374,7 @@
 "`GNUNET_SERVER_receive_done' after %s\n"
 msgstr ""
 
-#: src/util/service.c:347
+#: src/util/service.c:347 src/util/service_new.c:2335
 #, c-format
 msgid "Unknown address family %d\n"
 msgstr ""
@@ -8762,44 +8384,26 @@
 msgid "Access from `%s' denied to service `%s'\n"
 msgstr ""
 
-#: src/util/service.c:410
+#: src/util/service.c:410 src/util/service_new.c:431
 #, c-format
 msgid "Could not parse IPv4 network specification `%s' for `%s:%s'\n"
 msgstr ""
 
-#: src/util/service.c:448
+#: src/util/service.c:448 src/util/service_new.c:474
 #, c-format
 msgid "Could not parse IPv6 network specification `%s' for `%s:%s'\n"
 msgstr ""
 
-#: src/util/service.c:565
-#, c-format
-msgid ""
-"Disabling IPv6 support for service `%s', failed to create IPv6 socket: %s\n"
-msgstr ""
-
-#: src/util/service.c:656
-#, c-format
-msgid ""
-"Disabling UNIX domain socket support for service `%s', failed to create UNIX "
-"domain socket: %s\n"
-msgstr ""
-
-#: src/util/service.c:673
-#, c-format
-msgid "Have neither PORT nor UNIXPATH for service `%s', but one is required\n"
-msgstr ""
-
-#: src/util/service.c:912
+#: src/util/service.c:912 src/util/service_new.c:1034
 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.c:961 src/util/service.c:979 src/util/service_new.c:1186
 #, c-format
 msgid "Specified value for `%s' of service `%s' is invalid\n"
 msgstr ""
 
-#: src/util/service.c:1004
+#: src/util/service.c:1004 src/util/service_new.c:1218
 #, c-format
 msgid "Could not access pre-bound socket %u, will try to bind myself\n"
 msgstr ""
@@ -8814,31 +8418,43 @@
 msgid "Service `%s' runs at %s\n"
 msgstr ""
 
-#: src/util/service.c:1260
+#: src/util/service.c:1260 src/util/service_new.c:1493
 msgid "Service process failed to initialize\n"
 msgstr ""
 
-#: src/util/service.c:1264
+#: src/util/service.c:1264 src/util/service_new.c:1497
 msgid "Service process could not initialize server function\n"
 msgstr ""
 
-#: src/util/service.c:1268
+#: src/util/service.c:1268 src/util/service_new.c:1501
 msgid "Service process failed to report status\n"
 msgstr ""
 
-#: src/util/service.c:1323
+#: src/util/service.c:1323 src/util/service_new.c:1373
 msgid "No such user"
 msgstr "无此用户"
 
-#: src/util/service.c:1336
+#: src/util/service.c:1336 src/util/service_new.c:1392
 #, c-format
 msgid "Cannot change user/group to `%s': %s\n"
 msgstr "无法更改用户/组为“%s”:%s\n"
 
-#: src/util/service.c:1406
+#: src/util/service.c:1406 src/util/service_new.c:1729
 msgid "do daemonize (detach from terminal)"
 msgstr ""
 
+#: src/util/service_new.c:1298
+msgid ""
+"Could not bind to any of the ports I was supposed to, refusing to run!\n"
+msgstr ""
+
+#: src/util/service_new.c:2085
+#, c-format
+msgid ""
+"Processing code for message of type %u did not call "
+"`GNUNET_SERVICE_client_continue' after %s\n"
+msgstr ""
+
 #: src/util/signal.c:89
 #, c-format
 msgid "signal (%d, %p) returned %d.\n"
@@ -8858,131 +8474,131 @@
 msgid "b"
 msgstr "b"
 
-#: src/util/strings.c:437
+#: src/util/strings.c:441
 #, c-format
 msgid "Character sets requested were `%s'->`%s'\n"
 msgstr ""
 
-#: src/util/strings.c:565
+#: src/util/strings.c:568
 msgid "Failed to expand `$HOME': environment variable `HOME' not set"
 msgstr "扩展“$HOME”失败:没有设置环境变量“HOME”"
 
-#: src/util/strings.c:662
+#: src/util/strings.c:672
 msgid "µs"
 msgstr ""
 
-#: src/util/strings.c:666
+#: src/util/strings.c:676
 msgid "forever"
 msgstr ""
 
-#: src/util/strings.c:668
+#: src/util/strings.c:678
 msgid "0 ms"
 msgstr ""
 
-#: src/util/strings.c:674
+#: src/util/strings.c:684
 msgid "ms"
 msgstr "毫秒"
 
-#: src/util/strings.c:680
+#: src/util/strings.c:690
 msgid "s"
 msgstr "秒"
 
-#: src/util/strings.c:686
+#: src/util/strings.c:696
 msgid "m"
 msgstr "分"
 
-#: src/util/strings.c:692
+#: src/util/strings.c:702
 msgid "h"
 msgstr "时"
 
-#: src/util/strings.c:699
+#: src/util/strings.c:709
 #, fuzzy
 msgid "day"
 msgstr " 天"
 
-#: src/util/strings.c:701
+#: src/util/strings.c:711
 #, fuzzy
 msgid "days"
 msgstr " 天"
 
-#: src/util/strings.c:730
+#: src/util/strings.c:740
 msgid "end of time"
 msgstr ""
 
-#: src/util/strings.c:1229
+#: src/util/strings.c:1239
 msgid "IPv6 address did not start with `['\n"
 msgstr ""
 
-#: src/util/strings.c:1237
+#: src/util/strings.c:1247
 msgid "IPv6 address did contain ':' to separate port number\n"
 msgstr ""
 
-#: src/util/strings.c:1243
+#: src/util/strings.c:1253
 msgid "IPv6 address did contain ']' before ':' to separate port number\n"
 msgstr ""
 
-#: src/util/strings.c:1250
+#: src/util/strings.c:1260
 msgid "IPv6 address did contain a valid port number after the last ':'\n"
 msgstr ""
 
-#: src/util/strings.c:1259
+#: src/util/strings.c:1269
 #, fuzzy, c-format
 msgid "Invalid IPv6 address `%s': %s\n"
 msgstr "无效的进程优先级“%s”\n"
 
-#: src/util/strings.c:1465 src/util/strings.c:1481
+#: src/util/strings.c:1475 src/util/strings.c:1491
 msgid "Port not in range\n"
 msgstr ""
 
-#: src/util/strings.c:1490
+#: src/util/strings.c:1500
 #, fuzzy, c-format
 msgid "Malformed port policy `%s'\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/util/strings.c:1573 src/util/strings.c:1604 src/util/strings.c:1652
-#: src/util/strings.c:1673
+#: src/util/strings.c:1583 src/util/strings.c:1614 src/util/strings.c:1662
+#: src/util/strings.c:1683
 #, c-format
 msgid "Invalid format for IP: `%s'\n"
 msgstr "IP 格式无效:“%s”\n"
 
-#: src/util/strings.c:1630
+#: src/util/strings.c:1640
 #, c-format
 msgid "Invalid network notation ('/%d' is not legal in IPv4 CIDR)."
 msgstr "网络表示法无效(“/%d” 在 IPv4 CIDR 中是非法的)。"
 
-#: src/util/strings.c:1682
+#: src/util/strings.c:1692
 #, fuzzy, c-format
 msgid "Invalid format: `%s'\n"
 msgstr "IP 格式无效:“%s”\n"
 
-#: src/util/strings.c:1734
+#: src/util/strings.c:1744
 #, c-format
 msgid "Invalid network notation (does not end with ';': `%s')\n"
 msgstr "无效的网络表示法(没有以“;”结尾:“%s”)\n"
 
-#: src/util/strings.c:1784
+#: src/util/strings.c:1794
 #, c-format
 msgid "Wrong format `%s' for netmask\n"
 msgstr "网络掩码的格式“%s”错误\n"
 
-#: src/util/strings.c:1815
+#: src/util/strings.c:1825
 #, c-format
 msgid "Wrong format `%s' for network\n"
 msgstr "网络的格式“%s”错误\n"
 
-#: src/vpn/gnunet-service-vpn.c:556 src/vpn/gnunet-service-vpn.c:1113
+#: src/vpn/gnunet-service-vpn.c:550 src/vpn/gnunet-service-vpn.c:1125
 msgid "# Active channels"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:632
+#: src/vpn/gnunet-service-vpn.c:629
 msgid "# Bytes given to cadet for transmission"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:670
+#: src/vpn/gnunet-service-vpn.c:667
 msgid "# Bytes dropped in cadet queue (overflow)"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:781
+#: src/vpn/gnunet-service-vpn.c:783
 #, fuzzy
 msgid "# Cadet channels created"
 msgstr ""
@@ -8989,97 +8605,92 @@
 "\n"
 "按任意键继续\n"
 
-#: src/vpn/gnunet-service-vpn.c:809
-#, fuzzy
-msgid "Failed to setup cadet channel!\n"
-msgstr "发送消息失败。\n"
-
-#: src/vpn/gnunet-service-vpn.c:1008
+#: src/vpn/gnunet-service-vpn.c:1005
 #, c-format
 msgid "Protocol %u not supported, dropping\n"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:1133
+#: src/vpn/gnunet-service-vpn.c:1145
 msgid "# Packets dropped (channel not yet online)"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:1344
+#: src/vpn/gnunet-service-vpn.c:1353
 msgid "# ICMPv4 packets dropped (not allowed)"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:1365
+#: src/vpn/gnunet-service-vpn.c:1374
 msgid "# ICMPv6 packets dropped (not allowed)"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:1571
+#: src/vpn/gnunet-service-vpn.c:1580
 msgid "# Packets received from TUN interface"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:1604 src/vpn/gnunet-service-vpn.c:1640
+#: src/vpn/gnunet-service-vpn.c:1613 src/vpn/gnunet-service-vpn.c:1649
 #, c-format
 msgid "Packet received for unmapped destination `%s' (dropping it)\n"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:1650
+#: src/vpn/gnunet-service-vpn.c:1659
 msgid "Received IPv4 packet with options (dropping it)\n"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:1664
+#: src/vpn/gnunet-service-vpn.c:1673
 #, c-format
 msgid "Received packet of unknown protocol %d from TUN (dropping it)\n"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:1746
+#: src/vpn/gnunet-service-vpn.c:1755
 msgid "# ICMP packets received from cadet"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:2086
+#: src/vpn/gnunet-service-vpn.c:2095
 msgid "# UDP packets received from cadet"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:2242
+#: src/vpn/gnunet-service-vpn.c:2251
 msgid "# TCP packets received from cadet"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:2394
+#: src/vpn/gnunet-service-vpn.c:2403
 msgid "Failed to find unallocated IPv4 address in VPN's range\n"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:2449
+#: src/vpn/gnunet-service-vpn.c:2458
 msgid "Failed to find unallocated IPv6 address in VPN's range\n"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:2491 src/vpn/gnunet-service-vpn.c:2702
+#: src/vpn/gnunet-service-vpn.c:2500 src/vpn/gnunet-service-vpn.c:2722
 msgid "# Active destinations"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:2753
+#: src/vpn/gnunet-service-vpn.c:2771
 msgid "Failed to allocate IP address for new destination\n"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:3017
+#: src/vpn/gnunet-service-vpn.c:3063
 #, fuzzy
 msgid "Must specify valid IPv6 address"
 msgstr "“%s”不可用。\n"
 
-#: src/vpn/gnunet-service-vpn.c:3041
+#: src/vpn/gnunet-service-vpn.c:3087
 msgid "Must specify valid IPv6 mask"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:3049
+#: src/vpn/gnunet-service-vpn.c:3095
 msgid "IPv6 support disabled as this system does not support IPv6\n"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:3062
+#: src/vpn/gnunet-service-vpn.c:3108
 #, fuzzy
 msgid "Must specify valid IPv4 address"
 msgstr "“%s”不可用。\n"
 
-#: src/vpn/gnunet-service-vpn.c:3075
+#: src/vpn/gnunet-service-vpn.c:3121
 msgid "Must specify valid IPv4 mask"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:3085
+#: src/vpn/gnunet-service-vpn.c:3131
 msgid "IPv4 support disabled as this system does not support IPv4\n"
 msgstr ""
 
@@ -9149,23 +8760,191 @@
 msgid "Setup tunnels via VPN."
 msgstr ""
 
-#: src/include/gnunet_common.h:641 src/include/gnunet_common.h:648
-#: src/include/gnunet_common.h:656
+#: src/include/gnunet_common.h:645 src/include/gnunet_common.h:652
+#: src/include/gnunet_common.h:660
 #, c-format
 msgid "Assertion failed at %s:%d.\n"
 msgstr ""
 
-#: src/include/gnunet_common.h:668
+#: src/include/gnunet_common.h:672
 #, c-format
 msgid "External protocol violation detected at %s:%d.\n"
 msgstr ""
 
-#: src/include/gnunet_common.h:695 src/include/gnunet_common.h:704
+#: src/include/gnunet_common.h:699 src/include/gnunet_common.h:708
 #, c-format
 msgid "`%s' failed on file `%s' at %s:%d with error: %s\n"
 msgstr ""
 
 #, fuzzy
+#~ msgid "Could not send list result to client\n"
+#~ msgstr "找不到接口“%s”的一个 IP 地址。\n"
+
+#, fuzzy
+#~ msgid "Failed to connect peer 0 and %u\n"
+#~ msgstr "初始化“%s”服务失败。\n"
+
+#, fuzzy
+#~ msgid "Could not connect master [%u] and slave [%u]\n"
+#~ msgstr "无法连接到 %s:%u:%s\n"
+
+#, fuzzy
+#~ msgid "Initialization failed, shutdown\n"
+#~ msgstr "插件机构初始化失败:%s!\n"
+
+#, fuzzy
+#~ msgid "number too large"
+#~ msgstr "迭代次数"
+
+#, fuzzy
+#~ msgid "Received incoming Cadet channel on port %u\n"
+#~ msgstr "“%s”已连接到“%s”。\n"
+
+#, fuzzy
+#~ msgid "Failed to connect to the DHT service!\n"
+#~ msgstr "初始化“%s”服务失败。\n"
+
+#, fuzzy
+#~ msgid "Failed to connect to transport service!\n"
+#~ msgstr "初始化“%s”服务失败。\n"
+
+#, fuzzy
+#~ msgid "unknown error"
+#~ msgstr "未知错误"
+
+#, fuzzy
+#~ msgid "Invalid response from `fs' service."
+#~ msgstr "“%s”的参数无效。\n"
+
+#, fuzzy
+#~ msgid "Failed to deserialize lookup reply from GNS service!\n"
+#~ msgstr "初始化“%s”服务失败。\n"
+
+#, fuzzy
+#~ msgid "Service `%s' is not running\n"
+#~ msgstr "服务已删除。\n"
+
+#, fuzzy
+#~ msgid "Identity service is not running\n"
+#~ msgstr "服务已删除。\n"
+
+#, fuzzy
+#~ msgid "NSE service is not running\n"
+#~ msgstr "服务已删除。\n"
+
+#, fuzzy
+#~ msgid "failed to transmit request (service down?)"
+#~ msgstr "初始化“%s”服务失败。\n"
+
+#, fuzzy
+#~ msgid "Received invalid message from `PEERINFO' service."
+#~ msgstr "“%s”的参数无效。\n"
+
+#, fuzzy
+#~ msgid "Timeout transmitting iteration request to `PEERINFO' service."
+#~ msgstr "初始化“%s”服务失败。\n"
+
+#, fuzzy
+#~ msgid "Could not connect to `%s' service.\n"
+#~ msgstr "无法连接到 %s:%u:%s\n"
+
+#, fuzzy
+#~ msgid "Failed to get my own HELLO from this peer!\n"
+#~ msgstr "发送消息失败。\n"
+
+#, fuzzy
+#~ msgid "Service `%s' is not running, please start GNUnet\n"
+#~ msgstr "服务已删除。\n"
+
+#, fuzzy
+#~ msgid "Malformed iterate request.\n"
+#~ msgstr "解析配置文件“%s”失败\n"
+
+#, fuzzy
+#~ msgid "Malformed store request from client\n"
+#~ msgstr "找不到接口“%s”的一个 IP 地址。\n"
+
+#, fuzzy
+#~ msgid "Failed to store requested value, database error."
+#~ msgstr "发送消息失败。\n"
+
+#, fuzzy
+#~ msgid "Trying to connect to remote host, but service `%s' is not running\n"
+#~ msgstr "初始化“%s”服务失败。\n"
+
+#, fuzzy
+#~ msgid ""
+#~ "Peer `%s' %s %s\n"
+#~ "\t%s%s\n"
+#~ "\t%s%s\n"
+#~ "\t%s%s\n"
+#~ msgstr "运行 %s失败:%s %d\n"
+
+#, fuzzy
+#~ msgid "Peer `%s' %s `%s' \n"
+#~ msgstr "运行 %s失败:%s %d\n"
+
+#, fuzzy
+#~ msgid "print information for all pending validations "
+#~ msgstr "无法获取有关用户“%s”的信息:%s\n"
+
+#, fuzzy
+#~ msgid "print information for all pending validations continuously"
+#~ msgstr "无法获取有关用户“%s”的信息:%s\n"
+
+#, fuzzy
+#~ msgid "Connected to different peer `%s'\n"
+#~ msgstr "“%s”已连接到“%s”。\n"
+
+#, fuzzy
+#~ msgid "Successfully connected to `%s'\n"
+#~ msgstr "“%s”已连接到“%s”。\n"
+
+#, fuzzy
+#~ msgid "Denying connection to `%s'\n"
+#~ msgstr "无法连接到 %s:%u:%s\n"
+
+#, fuzzy
+#~ msgid "Message size too big!\n"
+#~ msgstr "消息尺寸"
+
+#, fuzzy
+#~ msgid "No peer identity given\n"
+#~ msgstr "无法获取有关用户“%s”的信息:%s\n"
+
+#, fuzzy
+#~ msgid "Trying to receive messages from peer `%s'\n"
+#~ msgstr "打开日志文件“%s”失败:%s\n"
+
+#, fuzzy
+#~ msgid "No operation given\n"
+#~ msgstr "无法获取有关用户“%s”的信息:%s\n"
+
+#, fuzzy
+#~ msgid "Failed to connect to ATS service\n"
+#~ msgstr "初始化“%s”服务失败。\n"
+
+#, fuzzy
+#~ msgid "Binding to IPv4 address %s\n"
+#~ msgstr "无效的进程优先级“%s”\n"
+
+#, fuzzy
+#~ msgid "Binding to IPv6 address %s\n"
+#~ msgstr "无效的进程优先级“%s”\n"
+
+#, fuzzy
+#~ msgid "Failed to initialize testing library!\n"
+#~ msgstr "初始化“%s”服务失败。\n"
+
+#, fuzzy
+#~ msgid "Could not connect to service `%s', configuration broken.\n"
+#~ msgstr "无法连接到 %s:%u:%s\n"
+
+#, fuzzy
+#~ msgid "Failed to setup cadet channel!\n"
+#~ msgstr "发送消息失败。\n"
+
+#, fuzzy
 #~ msgid "Configuration option \"regex_prefix\" missing. Exiting\n"
 #~ msgstr "配置文件“%s”已写入。\n"
 
@@ -9302,10 +9081,6 @@
 #~ msgstr "初始化“%s”服务失败。\n"
 
 #, fuzzy
-#~ msgid "Failed to send request to transport service\n"
-#~ msgstr "初始化“%s”服务失败。\n"
-
-#, fuzzy
 #~ msgid "Retrying to connect to `%s'\n"
 #~ msgstr "无法连接到 %s:%u:%s\n"
 
@@ -9443,10 +9218,6 @@
 #~ msgstr "解析配置文件“%s”失败\n"
 
 #, fuzzy
-#~ msgid "Failed to receive response from `SENSOR' service."
-#~ msgstr "“%s”的参数无效。\n"
-
-#, fuzzy
 #~ msgid "Received invalid message from `SENSOR' service."
 #~ msgstr "“%s”的参数无效。\n"
 
@@ -9533,10 +9304,6 @@
 #~ msgstr "无法利用“%2$s”获取接口“%1$s”的 IP。\n"
 
 #, fuzzy
-#~ msgid "Error while decoding key %u\n"
-#~ msgstr "解析 dscl 输出时出错。\n"
-
-#, fuzzy
 #~ msgid "Failed to parse metadata about pseudonym from file `%s': %s\n"
 #~ msgstr "打开日志文件“%s”失败:%s\n"
 
@@ -9626,10 +9393,6 @@
 #~ msgstr "对驱动器“%2$s”的“%1$s”操作失败:%3$u\n"
 
 #, fuzzy
-#~ msgid "Service `%s' was already running.\n"
-#~ msgstr "服务已删除。\n"
-
-#, fuzzy
 #~ msgid "Service `%s' has been started.\n"
 #~ msgstr "服务已删除。\n"
 




reply via email to

[Prev in Thread] Current Thread [Next in Thread]