gnunet-svn
[Top][All Lists]
Advanced

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

[GNUnet-SVN] [gnunet] branch master updated (f6f7fbbe9 -> 6b6a96686)


From: gnunet
Subject: [GNUnet-SVN] [gnunet] branch master updated (f6f7fbbe9 -> 6b6a96686)
Date: Mon, 20 Feb 2017 18:22:17 +0100

This is an automated email from the git hooks/post-receive script.

david-barksdale pushed a change to branch master
in repository gnunet.

    from f6f7fbbe9 completed big block refactoring in preparation for SET-BLOCK 
integration
     new 4e9670453 Remove unused GNUNET_DATASTORE_update() API call
     new 6b6a96686 Update po files

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 po/POTFILES.in                           |   1 +
 po/de.po                                 | 947 ++++++++++++++++---------------
 po/es.po                                 | 946 +++++++++++++++---------------
 po/fr.po                                 | 935 +++++++++++++++---------------
 po/sv.po                                 | 942 +++++++++++++++---------------
 po/vi.po                                 | 947 ++++++++++++++++---------------
 po/zh_CN.po                              | 932 +++++++++++++++---------------
 src/datastore/datastore.h                |  29 -
 src/datastore/datastore_api.c            |  66 ---
 src/datastore/gnunet-service-datastore.c |  53 --
 src/datastore/test_datastore_api.c       |  48 +-
 src/include/gnunet_protocols.h           |   5 -
 12 files changed, 2911 insertions(+), 2940 deletions(-)

diff --git a/po/POTFILES.in b/po/POTFILES.in
index 21d00efbd..a1fd41d82 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -32,6 +32,7 @@ src/auction/gnunet-auction-create.c
 src/auction/gnunet-auction-info.c
 src/auction/gnunet-auction-join.c
 src/auction/gnunet-service-auction.c
+src/block/bg_bf.c
 src/block/block.c
 src/block/plugin_block_template.c
 src/block/plugin_block_test.c
diff --git a/po/de.po b/po/de.po
index 037a90288..7dd4e34fd 100644
--- a/po/de.po
+++ b/po/de.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnunet 0.10.1\n"
 "Report-Msgid-Bugs-To: address@hidden"
-"POT-Creation-Date: 2017-01-12 17:19+0100\n"
+"POT-Creation-Date: 2017-02-20 11:12-0600\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,224 +21,224 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: Poedit 1.7.4\n"
 
-#: src/arm/gnunet-arm.c:152
+#: src/arm/gnunet-arm.c:156
 #, fuzzy, c-format
 msgid "Failed to remove configuration file %s\n"
 msgstr "Fehler beim Speichern der Konfigurationsdatei `%s':"
 
-#: src/arm/gnunet-arm.c:158
+#: src/arm/gnunet-arm.c:162
 #, fuzzy, c-format
 msgid "Failed to remove servicehome directory %s\n"
 msgstr "Dateiformat fehlerhaft (kein GNUnet Verzeichnis?)\n"
 
-#: src/arm/gnunet-arm.c:213 src/testbed/gnunet-service-testbed_peers.c:1139
+#: src/arm/gnunet-arm.c:222 src/testbed/gnunet-service-testbed_peers.c:1139
 msgid "Message was sent successfully"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:215
+#: src/arm/gnunet-arm.c:224
 #, fuzzy
 msgid "Misconfiguration (can not connect to the ARM service)"
 msgstr ""
 "Konfiguration oder die GNUnet Version hat sich geändert. Sie müssen `%s' "
 "ausführen!\n"
 
-#: src/arm/gnunet-arm.c:217 src/testbed/gnunet-service-testbed_peers.c:1143
+#: src/arm/gnunet-arm.c:226 src/testbed/gnunet-service-testbed_peers.c:1143
 msgid "We disconnected from ARM before we could send a request"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:219 src/testbed/gnunet-service-testbed_peers.c:1145
+#: src/arm/gnunet-arm.c:228 src/testbed/gnunet-service-testbed_peers.c:1145
 msgid "ARM API is busy"
 msgstr "ARM-API ist belegt"
 
-#: src/arm/gnunet-arm.c:221 src/testbed/gnunet-service-testbed_peers.c:1147
+#: src/arm/gnunet-arm.c:230 src/testbed/gnunet-service-testbed_peers.c:1147
 msgid "Request timed out"
 msgstr "Zeitüberschreitung der Anfrage"
 
-#: src/arm/gnunet-arm.c:223 src/testbed/gnunet-service-testbed_peers.c:1149
+#: src/arm/gnunet-arm.c:232 src/testbed/gnunet-service-testbed_peers.c:1149
 msgid "Unknown request status"
 msgstr "Unbekannter Anfragestatus"
 
-#: src/arm/gnunet-arm.c:239 src/testbed/gnunet-service-testbed_peers.c:1165
+#: src/arm/gnunet-arm.c:248 src/testbed/gnunet-service-testbed_peers.c:1165
 #, c-format
 msgid "%s is stopped"
 msgstr "%s wurde gestoppt"
 
-#: src/arm/gnunet-arm.c:241 src/testbed/gnunet-service-testbed_peers.c:1167
+#: src/arm/gnunet-arm.c:250 src/testbed/gnunet-service-testbed_peers.c:1167
 #, c-format
 msgid "%s is starting"
 msgstr "%s startet"
 
-#: src/arm/gnunet-arm.c:243 src/testbed/gnunet-service-testbed_peers.c:1169
+#: src/arm/gnunet-arm.c:252 src/testbed/gnunet-service-testbed_peers.c:1169
 #, c-format
 msgid "%s is stopping"
 msgstr "%s wird gestoppt"
 
-#: src/arm/gnunet-arm.c:245 src/testbed/gnunet-service-testbed_peers.c:1171
+#: src/arm/gnunet-arm.c:254 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:247 src/testbed/gnunet-service-testbed_peers.c:1173
+#: src/arm/gnunet-arm.c:256 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:249 src/testbed/gnunet-service-testbed_peers.c:1175
+#: src/arm/gnunet-arm.c:258 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:251 src/testbed/gnunet-service-testbed_peers.c:1177
+#: src/arm/gnunet-arm.c:260 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:253 src/testbed/gnunet-service-testbed_peers.c:1179
+#: src/arm/gnunet-arm.c:262 src/testbed/gnunet-service-testbed_peers.c:1179
 #, c-format
 msgid "%s service is not known to ARM"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:255 src/testbed/gnunet-service-testbed_peers.c:1181
+#: src/arm/gnunet-arm.c:264 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:257
+#: src/arm/gnunet-arm.c:266
 #, c-format
 msgid "%s service cannot be started because ARM is shutting down"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:259 src/testbed/gnunet-service-testbed_peers.c:1185
+#: src/arm/gnunet-arm.c:268 src/testbed/gnunet-service-testbed_peers.c:1185
 #, c-format
 msgid "%.s Unknown result code."
 msgstr ""
 
-#: src/arm/gnunet-arm.c:291
+#: src/arm/gnunet-arm.c:300
 msgid "Fatal error initializing ARM API.\n"
 msgstr "Schwerwiegender Fehler bei der Initialisierung der ARM-API.\n"
 
-#: src/arm/gnunet-arm.c:320 src/arm/gnunet-arm.c:329
+#: src/arm/gnunet-arm.c:328 src/arm/gnunet-arm.c:337
 #, 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:364
+#: src/arm/gnunet-arm.c:371
 #, 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:375
+#: src/arm/gnunet-arm.c:382
 #, 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:417
+#: src/arm/gnunet-arm.c:422
 #, fuzzy, c-format
-msgid "Failed to send a request to start the `%s' service: %%s\n"
+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:428
+#: src/arm/gnunet-arm.c:432
 #, 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:467
+#: src/arm/gnunet-arm.c:469
 #, 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:478
+#: src/arm/gnunet-arm.c:480
 #, 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:519
+#: src/arm/gnunet-arm.c:521
 #, 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:528
+#: src/arm/gnunet-arm.c:530
 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:534
+#: src/arm/gnunet-arm.c:536
 msgid "Running services:\n"
 msgstr "Laufende Dienste:\n"
 
-#: src/arm/gnunet-arm.c:622
+#: src/arm/gnunet-arm.c:624
 #, c-format
 msgid "Now only monitoring, press CTRL-C to stop.\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:654
+#: src/arm/gnunet-arm.c:656
 #, c-format
 msgid "Stopped %s.\n"
 msgstr "%s wurde gestoppt.\n"
 
-#: src/arm/gnunet-arm.c:657
+#: src/arm/gnunet-arm.c:659
 #, c-format
 msgid "Starting %s...\n"
 msgstr "%s wird gestartet …\n"
 
-#: src/arm/gnunet-arm.c:660
+#: src/arm/gnunet-arm.c:662
 #, c-format
 msgid "Stopping %s...\n"
 msgstr "%s wird gestoppt …\n"
 
-#: src/arm/gnunet-arm.c:674
+#: src/arm/gnunet-arm.c:676
 #, fuzzy, c-format
 msgid "Unknown status %u for service %s.\n"
 msgstr "`%s': unbekannter Dienst: %s\n"
 
-#: src/arm/gnunet-arm.c:756
+#: src/arm/gnunet-arm.c:774
 msgid "stop all GNUnet services"
 msgstr "Alle GNUnet-Dienste stoppen"
 
-#: src/arm/gnunet-arm.c:758
+#: src/arm/gnunet-arm.c:776
 msgid "start a particular service"
 msgstr "Einen bestimmten Dienst starten"
 
-#: src/arm/gnunet-arm.c:760
+#: src/arm/gnunet-arm.c:778
 msgid "stop a particular service"
 msgstr "Einen bestimmten Dienst stoppen"
 
-#: src/arm/gnunet-arm.c:762
+#: src/arm/gnunet-arm.c:780
 msgid "start all GNUnet default services"
 msgstr "Alle Standard-GNUnet-Dienste starten"
 
-#: src/arm/gnunet-arm.c:765
+#: src/arm/gnunet-arm.c:783
 msgid "stop and start all GNUnet default services"
 msgstr "Alle Standard-GNUnet-Dienste stoppen und starten"
 
-#: src/arm/gnunet-arm.c:768
+#: src/arm/gnunet-arm.c:786
 msgid "delete config file and directory on exit"
 msgstr "Konfigurationsdatei und Verzeichnis beim Beenden löschen"
 
-#: src/arm/gnunet-arm.c:771
+#: src/arm/gnunet-arm.c:789
 msgid "monitor ARM activities"
 msgstr "ARM-Aktivitäten überwachen"
 
-#: src/arm/gnunet-arm.c:773
+#: src/arm/gnunet-arm.c:791
 msgid "don't print status messages"
 msgstr "Keine Statusmeldungen ausgeben"
 
-#: src/arm/gnunet-arm.c:776
+#: src/arm/gnunet-arm.c:794
 msgid "exit with error status if operation does not finish after DELAY"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:778
+#: src/arm/gnunet-arm.c:796
 msgid "list currently running services"
 msgstr "Alle derzeit laufenden Dienste auflisten"
 
-#: src/arm/gnunet-arm.c:780
+#: src/arm/gnunet-arm.c:798
 msgid "don't let gnunet-service-arm inherit standard output"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:782
+#: src/arm/gnunet-arm.c:800
 msgid "don't let gnunet-service-arm inherit standard error"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:794
+#: src/arm/gnunet-arm.c:812
 msgid "Control services and the Automated Restart Manager (ARM)"
 msgstr ""
 
@@ -252,20 +252,21 @@ msgstr ""
 #: src/arm/gnunet-service-arm.c:393 src/arm/gnunet-service-arm.c:399
 #: src/transport/plugin_transport_tcp.c:652
 #: src/transport/plugin_transport_tcp.c:658
-#: src/transport/plugin_transport_tcp.c:3309 src/util/service.c:584
-#: src/util/service.c:590 src/util/service_new.c:637 src/util/service_new.c:643
+#: src/transport/plugin_transport_tcp.c:3337 src/util/service.c:584
+#: src/util/service.c:590 src/util/service_new.c:637
+#: src/util/service_new.c:643
 #, c-format
 msgid "Require valid port number for service `%s' in configuration!\n"
 msgstr ""
 
 #: src/arm/gnunet-service-arm.c:430 src/transport/plugin_transport_tcp.c:689
-#: src/util/client.c:464 src/util/service.c:621 src/util/service_new.c:682
+#: src/util/client.c:466 src/util/service.c:621 src/util/service_new.c:682
 #, c-format
 msgid "UNIXPATH `%s' too long, maximum length is %llu\n"
 msgstr ""
 
 #: src/arm/gnunet-service-arm.c:434 src/transport/plugin_transport_tcp.c:693
-#: src/util/client.c:469 src/util/service.c:625 src/util/service_new.c:687
+#: src/util/client.c:471 src/util/service.c:625 src/util/service_new.c:687
 #, c-format
 msgid "Using `%s' instead\n"
 msgstr ""
@@ -387,11 +388,13 @@ msgid ""
 "%llu\n"
 msgstr ""
 
-#: src/ats/gnunet-ats-solver-eval.c:3293 src/ats-tests/gnunet-solver-eval.c:935
+#: 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:938
+#: 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 ""
@@ -640,92 +643,107 @@ msgstr ""
 msgid "Print information about ATS state"
 msgstr "Informationen über andere GNUnet Knoten ausgeben."
 
-#: src/auction/gnunet-auction-create.c:69
+#: src/auction/gnunet-auction-create.c:160
 msgid "description of the item to be sold"
 msgstr ""
 
-#: src/auction/gnunet-auction-create.c:72
+#: src/auction/gnunet-auction-create.c:163
 msgid "mapping of possible prices"
 msgstr ""
 
-#: src/auction/gnunet-auction-create.c:75
+#: src/auction/gnunet-auction-create.c:166
 msgid "max duration per round"
 msgstr ""
 
-#: src/auction/gnunet-auction-create.c:78
+#: src/auction/gnunet-auction-create.c:169
 msgid "duration until auction starts"
 msgstr ""
 
-#: src/auction/gnunet-auction-create.c:81
-msgid "number of items to sell, 0 for first price auction"
+#: src/auction/gnunet-auction-create.c:172
+msgid ""
+"number of items to sell\n"
+"0 for first price auction\n"
+">0 for vickrey/M+1st price auction"
 msgstr ""
 
-#: src/auction/gnunet-auction-create.c:84
+#: src/auction/gnunet-auction-create.c:177
 msgid "public auction outcome"
 msgstr ""
 
-#: src/auction/gnunet-auction-create.c:94 src/auction/gnunet-auction-info.c:76
-#: src/auction/gnunet-auction-join.c:76
+#: src/auction/gnunet-auction-create.c:180
+msgid "keep running in foreground until auction completes"
+msgstr ""
+
+#: src/auction/gnunet-auction-create.c:190
+msgid "create a new auction and start listening for bidders"
+msgstr ""
+
+#: src/auction/gnunet-auction-info.c:76 src/auction/gnunet-auction-join.c:76
 #: src/conversation/gnunet-conversation-test.c:243
 #: src/revocation/gnunet-revocation.c:550 src/template/gnunet-template.c:76
 msgid "help text"
 msgstr "Hilfetext"
 
-#: 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:787
+#: src/cadet/gnunet-cadet.c:668
 #, fuzzy, c-format
 msgid "Invalid peer ID `%s'\n"
 msgstr "Ungültige Antwort auf `%s'.\n"
 
-#: src/cadet/gnunet-cadet.c:825
+#: src/cadet/gnunet-cadet.c:706
 #, fuzzy, c-format
 msgid "Invalid tunnel owner `%s'\n"
 msgstr "Ungültiger Parameter: `%s'\n"
 
-#: src/cadet/gnunet-cadet.c:892
+#: src/cadet/gnunet-cadet.c:779
 msgid "You must NOT give a TARGET when using 'request all' options\n"
 msgstr ""
 
-#: src/cadet/gnunet-cadet.c:982
+#: src/cadet/gnunet-cadet.c:870
+#, fuzzy, c-format
+msgid "Invalid target `%s'\n"
+msgstr "Ungültiger Parameter: `%s'\n"
+
+#: src/cadet/gnunet-cadet.c:907
+#, fuzzy
+msgid "No action requested\n"
+msgstr " Verbindung fehlgeschlagen\n"
+
+#: src/cadet/gnunet-cadet.c:929
 msgid "provide information about a particular connection"
 msgstr ""
 
-#: src/cadet/gnunet-cadet.c:985
+#: src/cadet/gnunet-cadet.c:932
 msgid "activate echo mode"
 msgstr ""
 
-#: src/cadet/gnunet-cadet.c:988
+#: src/cadet/gnunet-cadet.c:935
 msgid "dump debug information to STDERR"
 msgstr ""
 
-#: src/cadet/gnunet-cadet.c:994
+#: src/cadet/gnunet-cadet.c:938
 msgid "port to listen to"
 msgstr ""
 
-#: src/cadet/gnunet-cadet.c:997
+#: src/cadet/gnunet-cadet.c:941
 #, fuzzy
 msgid "provide information about a patricular peer"
 msgstr "Informationen über andere GNUnet Knoten ausgeben."
 
-#: src/cadet/gnunet-cadet.c:1000
+#: src/cadet/gnunet-cadet.c:944
 #, fuzzy
 msgid "provide information about all peers"
 msgstr "Informationen über andere GNUnet Knoten ausgeben."
 
-#: src/cadet/gnunet-cadet.c:1003
+#: src/cadet/gnunet-cadet.c:947
 msgid "provide information about a particular tunnel"
 msgstr ""
 
-#: src/cadet/gnunet-cadet.c:1006
+#: src/cadet/gnunet-cadet.c:950
 #, fuzzy
 msgid "provide information about all tunnels"
 msgstr "Informationen über andere GNUnet Knoten ausgeben."
 
-#: src/cadet/gnunet-service-cadet_peer.c:686
+#: src/cadet/gnunet-service-cadet_peer.c:687
 msgid "Wrong CORE service\n"
 msgstr ""
 
@@ -1271,11 +1289,11 @@ msgstr "# Bytes Rauschen empfangen"
 msgid "# messages discarded (session disconnected)"
 msgstr ""
 
-#: src/core/gnunet-service-core.c:928
+#: src/core/gnunet-service-core.c:937
 msgid "Core service is lacking HOSTKEY configuration setting.  Exiting.\n"
 msgstr ""
 
-#: src/core/gnunet-service-core.c:949
+#: src/core/gnunet-service-core.c:958
 #, fuzzy, c-format
 msgid "Core service of `%s' ready.\n"
 msgstr "Dienst »%s« wird neu gestartet.\n"
@@ -1396,35 +1414,35 @@ msgstr ""
 msgid "# sessions terminated by key expiration"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1554
-#: src/core/gnunet-service-core_kx.c:1580
+#: src/core/gnunet-service-core_kx.c:1557
+#: src/core/gnunet-service-core_kx.c:1583
 #, fuzzy
 msgid "# bytes dropped (duplicates)"
 msgstr "# Bytes verworfen von TCP (ausgehend)"
 
-#: src/core/gnunet-service-core_kx.c:1567
+#: src/core/gnunet-service-core_kx.c:1570
 #, fuzzy
 msgid "# bytes dropped (out of sequence)"
 msgstr "# Bytes verworfen von TCP (ausgehend)"
 
-#: src/core/gnunet-service-core_kx.c:1609
+#: src/core/gnunet-service-core_kx.c:1612
 #, fuzzy
 msgid "# bytes dropped (ancient message)"
 msgstr "# Bytes verworfen von TCP (ausgehend)"
 
-#: src/core/gnunet-service-core_kx.c:1617
+#: src/core/gnunet-service-core_kx.c:1620
 #, fuzzy
 msgid "# bytes of payload decrypted"
 msgstr "# Bytes entschlüsselt"
 
-#: src/core/gnunet-service-core_kx.c:1674
+#: src/core/gnunet-service-core_kx.c:1681
 msgid "# PAYLOAD dropped (out of order)"
 msgstr ""
 
-#: 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/core/gnunet-service-core_sessions.c:266
+#: src/core/gnunet-service-core_sessions.c:356
+#: src/dht/gnunet-service-dht_neighbours.c:732
+#: src/dht/gnunet-service-dht_neighbours.c:794
 #: 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
@@ -1433,28 +1451,28 @@ msgstr ""
 msgid "# peers connected"
 msgstr "# verbundener Knoten"
 
-#: src/core/gnunet-service-core_sessions.c:287
+#: src/core/gnunet-service-core_sessions.c:302
 #, fuzzy
 msgid "# type map refreshes sent"
 msgstr "# p2p Trace-Antworten gesendet"
 
-#: src/core/gnunet-service-core_sessions.c:407
+#: src/core/gnunet-service-core_sessions.c:422
 #, fuzzy
 msgid "# outdated typemap confirmations received"
 msgstr "# Bytes empfangen über TCP"
 
-#: src/core/gnunet-service-core_sessions.c:418
+#: src/core/gnunet-service-core_sessions.c:439
 #, fuzzy
 msgid "# valid typemap confirmations received"
 msgstr "# Bytes empfangen über TCP"
 
 #: src/core/gnunet-service-core_typemap.c:169
-#: src/core/gnunet-service-core_typemap.c:180
+#: src/core/gnunet-service-core_typemap.c:181
 #, fuzzy
 msgid "# type maps received"
 msgstr "# Bytes empfangen über TCP"
 
-#: src/core/gnunet-service-core_typemap.c:210
+#: src/core/gnunet-service-core_typemap.c:212
 msgid "# updates to my type map"
 msgstr ""
 
@@ -1495,7 +1513,7 @@ msgstr "# Anfragen empfangen"
 msgid "# proximity search requests received"
 msgstr "# Klartext PONG Nachrichten empfangen"
 
-#: src/datacache/plugin_datacache_heap.c:467
+#: src/datacache/plugin_datacache_heap.c:466
 msgid "Heap datacache running\n"
 msgstr ""
 
@@ -1516,7 +1534,7 @@ msgstr ""
 #: 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:691 src/include/gnunet_common.h:700
+#: src/include/gnunet_common.h:720 src/include/gnunet_common.h:729
 #: src/scalarproduct/scalarproduct.h:35
 #, c-format
 msgid "`%s' failed at %s:%d with error: %s\n"
@@ -1574,25 +1592,20 @@ msgstr "# dht Anfragen weitergeleitet"
 msgid "# RELEASE RESERVE requests executed"
 msgstr ""
 
-#: src/datastore/datastore_api.c:1187
-#, fuzzy
-msgid "# UPDATE requests executed"
-msgstr "# dht Anfragen weitergeleitet"
-
-#: src/datastore/datastore_api.c:1271
+#: src/datastore/datastore_api.c:1205
 #, fuzzy
 msgid "# REMOVE requests executed"
 msgstr "# dht Anfragen weitergeleitet"
 
-#: src/datastore/datastore_api.c:1331
+#: src/datastore/datastore_api.c:1265
 msgid "# GET REPLICATION requests executed"
 msgstr ""
 
-#: src/datastore/datastore_api.c:1397
+#: src/datastore/datastore_api.c:1331
 msgid "# GET ZERO ANONYMITY requests executed"
 msgstr ""
 
-#: src/datastore/datastore_api.c:1477
+#: src/datastore/datastore_api.c:1411
 msgid "# GET requests executed"
 msgstr "# ausgeführte GET-Anfragen"
 
@@ -1656,7 +1669,7 @@ msgstr ""
 #: 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
+#: src/datastore/gnunet-service-datastore.c:1619
 msgid "# reserved"
 msgstr ""
 
@@ -1683,97 +1696,92 @@ msgstr "# Client Trace-Anfragen empfangen"
 msgid "# requests filtered by bloomfilter"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1115
-#, fuzzy
-msgid "# UPDATE requests received"
-msgstr "# Client Trace-Anfragen empfangen"
-
-#: src/datastore/gnunet-service-datastore.c:1146
+#: src/datastore/gnunet-service-datastore.c:1097
 #, fuzzy
 msgid "# GET REPLICATION requests received"
 msgstr "# Client Trace-Anfragen empfangen"
 
-#: src/datastore/gnunet-service-datastore.c:1179
+#: src/datastore/gnunet-service-datastore.c:1130
 #, fuzzy
 msgid "# GET ZERO ANONYMITY requests received"
 msgstr "# Client Trace-Anfragen empfangen"
 
-#: src/datastore/gnunet-service-datastore.c:1226
+#: src/datastore/gnunet-service-datastore.c:1177
 msgid "Content not found"
 msgstr "Kein Inhalt gefunden"
 
-#: src/datastore/gnunet-service-datastore.c:1235
+#: src/datastore/gnunet-service-datastore.c:1186
 msgid "# bytes removed (explicit request)"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1282
+#: src/datastore/gnunet-service-datastore.c:1233
 #, fuzzy
 msgid "# REMOVE requests received"
 msgstr "# Client Trace-Anfragen empfangen"
 
-#: src/datastore/gnunet-service-datastore.c:1336
+#: src/datastore/gnunet-service-datastore.c:1287
 #, c-format
 msgid ""
 "Datastore payload must have been inaccurate (%lld < %lld). Recomputing it.\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1342
-#: src/datastore/gnunet-service-datastore.c:1517
+#: src/datastore/gnunet-service-datastore.c:1293
+#: src/datastore/gnunet-service-datastore.c:1468
 #, c-format
 msgid "New payload: %lld\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1396
+#: src/datastore/gnunet-service-datastore.c:1347
 #, c-format
 msgid "Loading `%s' datastore plugin\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1408
+#: src/datastore/gnunet-service-datastore.c:1359
 #, 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:1468
+#: src/datastore/gnunet-service-datastore.c:1419
 msgid "Bloomfilter construction complete.\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1524
+#: src/datastore/gnunet-service-datastore.c:1475
 msgid "Rebuilding bloomfilter.  Please be patient.\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1535
+#: src/datastore/gnunet-service-datastore.c:1486
 msgid "Plugin does not support get_keys function. Please fix!\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1705
+#: src/datastore/gnunet-service-datastore.c:1656
 #, fuzzy, c-format
 msgid "# bytes used in file-sharing datastore `%s'"
 msgstr "# bytes erlaubt in der Datenbank"
 
-#: src/datastore/gnunet-service-datastore.c:1721
+#: src/datastore/gnunet-service-datastore.c:1672
 msgid "# quota"
 msgstr "# Kontingent"
 
-#: src/datastore/gnunet-service-datastore.c:1726
+#: src/datastore/gnunet-service-datastore.c:1677
 msgid "# cache size"
 msgstr "# Zwischenspeichergröße"
 
-#: src/datastore/gnunet-service-datastore.c:1742
+#: src/datastore/gnunet-service-datastore.c:1693
 #, c-format
 msgid "Could not use specified filename `%s' for bloomfilter.\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1760
-#: src/datastore/gnunet-service-datastore.c:1776
+#: src/datastore/gnunet-service-datastore.c:1711
+#: src/datastore/gnunet-service-datastore.c:1727
 #, 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:1808
+#: src/datastore/gnunet-service-datastore.c:1759
 msgid "Failed to initialize bloomfilter.\n"
 msgstr "Bloomfilter konnte nicht initialisiert werden.\n"
 
-#: src/datastore/plugin_datastore_heap.c:826
+#: src/datastore/plugin_datastore_heap.c:824
 msgid "Heap database running\n"
 msgstr "Heap-Datenbank läuft\n"
 
@@ -1856,55 +1864,55 @@ msgstr "Sqlite-Datenbank läuft\n"
 msgid "Template database running\n"
 msgstr ""
 
-#: src/dht/gnunet-dht-get.c:155
+#: src/dht/gnunet-dht-get.c:157
 #, c-format
 msgid ""
 "Result %d, type %d:\n"
 "%.*s\n"
 msgstr ""
 
-#: src/dht/gnunet-dht-get.c:181
+#: src/dht/gnunet-dht-get.c:204
 msgid "Must provide key for DHT GET!\n"
 msgstr ""
 
-#: src/dht/gnunet-dht-get.c:187 src/dht/gnunet-dht-monitor.c:248
+#: src/dht/gnunet-dht-get.c:210 src/dht/gnunet-dht-monitor.c:248
 msgid "Failed to connect to DHT service!\n"
 msgstr "Verbindung zum DHT-Dienst ist fehlgeschlagen!\n"
 
-#: src/dht/gnunet-dht-get.c:195
+#: src/dht/gnunet-dht-get.c:218
 msgid "Issueing DHT GET with key"
 msgstr ""
 
-#: src/dht/gnunet-dht-get.c:212 src/dht/gnunet-dht-monitor.c:289
-#: src/dht/gnunet-dht-put.c:198
+#: src/dht/gnunet-dht-get.c:235 src/dht/gnunet-dht-monitor.c:289
+#: src/dht/gnunet-dht-put.c:207
 msgid "the query key"
 msgstr ""
 
-#: src/dht/gnunet-dht-get.c:215
+#: src/dht/gnunet-dht-get.c:238
 msgid "how many parallel requests (replicas) to create"
 msgstr ""
 
-#: src/dht/gnunet-dht-get.c:218 src/dht/gnunet-dht-monitor.c:292
+#: src/dht/gnunet-dht-get.c:241 src/dht/gnunet-dht-monitor.c:292
 msgid "the type of data to look for"
 msgstr ""
 
-#: src/dht/gnunet-dht-get.c:221
+#: src/dht/gnunet-dht-get.c:244
 msgid "how long to execute this query before giving up?"
 msgstr ""
 
-#: src/dht/gnunet-dht-get.c:224 src/dht/gnunet-dht-put.c:201
+#: src/dht/gnunet-dht-get.c:247 src/dht/gnunet-dht-put.c:210
 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:210 src/fs/gnunet-auto-share.c:780
+#: src/dht/gnunet-dht-get.c:250 src/dht/gnunet-dht-monitor.c:298
+#: src/dht/gnunet-dht-put.c:222 src/fs/gnunet-auto-share.c:780
 #: src/fs/gnunet-download.c:327 src/fs/gnunet-publish.c:951
 #: src/fs/gnunet-search.c:322 src/fs/gnunet-unindex.c:167
 #: src/nse/gnunet-nse-profiler.c:855
 msgid "be verbose (print progress information)"
 msgstr ""
 
-#: src/dht/gnunet-dht-get.c:248
+#: src/dht/gnunet-dht-get.c:271
 msgid "Issue a GET request to the GNUnet DHT, prints results."
 msgstr ""
 
@@ -1916,7 +1924,8 @@ msgstr ""
 msgid "Prints all packets that go through the DHT."
 msgstr ""
 
-#: src/dht/gnunet_dht_profiler.c:1161 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 ""
@@ -1961,65 +1970,69 @@ msgstr ""
 msgid "Measure quality and performance of the DHT service."
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:115
+#: src/dht/gnunet-dht-put.c:120
 msgid "PUT request sent with key"
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:118
+#: src/dht/gnunet-dht-put.c:123
 msgid "Timeout sending PUT request!\n"
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:121
+#: src/dht/gnunet-dht-put.c:126
 msgid "PUT request not confirmed!\n"
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:151
+#: src/dht/gnunet-dht-put.c:157
 msgid "Must provide KEY and DATA for DHT put!\n"
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:158
+#: src/dht/gnunet-dht-put.c:164
 #, c-format
 msgid "Could not connect to %s service!\n"
 msgstr "Verbindung zum %s-Dienst ist fehlgeschlagen!\n"
 
-#: src/dht/gnunet-dht-put.c:172
+#: src/dht/gnunet-dht-put.c:175
 #, c-format
 msgid "Issuing put request for `%s' with data `%s'!\n"
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:192
+#: src/dht/gnunet-dht-put.c:201
 msgid "the data to insert under the key"
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:195
+#: src/dht/gnunet-dht-put.c:204
 msgid "how long to store this entry in the dht (in seconds)"
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:204
+#: src/dht/gnunet-dht-put.c:213
 msgid "how many replicas to create"
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:207
+#: src/dht/gnunet-dht-put.c:216
+msgid "use DHT's record route option"
+msgstr ""
+
+#: src/dht/gnunet-dht-put.c:219
 msgid "the type to insert data as"
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:232
+#: src/dht/gnunet-dht-put.c:247
 msgid "Issue a PUT request to the GNUnet DHT insert DATA under KEY."
 msgstr ""
 
-#: src/dht/gnunet-service-dht_clients.c:370
+#: src/dht/gnunet-service-dht_clients.c:369
 #: src/dht/gnunet-service-wdht_clients.c:864
 #, fuzzy
 msgid "# GET requests from clients injected"
 msgstr "# gap Anfragen mit taktischer Entscheidung: nicht Antworten"
 
-#: src/dht/gnunet-service-dht_clients.c:481
+#: src/dht/gnunet-service-dht_clients.c:482
 #: 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:620
+#: src/dht/gnunet-service-dht_clients.c:621
 #: src/dht/gnunet-service-wdht_clients.c:1011
 #, fuzzy
 msgid "# GET requests received from clients"
@@ -2041,18 +2054,18 @@ msgstr ""
 msgid "# Duplicate REPLIES to CLIENT request dropped"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_clients.c:1094
+#: src/dht/gnunet-service-dht_clients.c:1093
 #: src/dht/gnunet-service-wdht_clients.c:566
 #, c-format
 msgid "Unsupported block type (%u) in request!\n"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_clients.c:1101
+#: src/dht/gnunet-service-dht_clients.c:1100
 #: src/dht/gnunet-service-wdht_clients.c:589
 msgid "# RESULTS queued for clients"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_clients.c:1179
+#: src/dht/gnunet-service-dht_clients.c:1178
 #: src/dht/gnunet-service-wdht_clients.c:643
 #: src/dht/gnunet-service-wdht_clients.c:693
 msgid "# REPLIES ignored for CLIENTS (no match)"
@@ -2067,72 +2080,73 @@ msgstr ""
 msgid "# ITEMS stored in datacache"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_datacache.c:199
+#: src/dht/gnunet-service-dht_datacache.c:198
 msgid "# Good RESULTS found in datacache"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_datacache.c:211
+#: src/dht/gnunet-service-dht_datacache.c:210
 msgid "# Duplicate RESULTS found in datacache"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_datacache.c:217
+#: src/dht/gnunet-service-dht_datacache.c:216
 msgid "# Invalid RESULTS found in datacache"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_datacache.c:223
+#: src/dht/gnunet-service-dht_datacache.c:222
 msgid "# Irrelevant RESULTS found in datacache"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_datacache.c:235
+#: src/dht/gnunet-service-dht_datacache.c:234
 msgid "# Unsupported RESULTS found in datacache"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_datacache.c:239
+#: src/dht/gnunet-service-dht_datacache.c:238
 #, c-format
 msgid "Unsupported block type (%u) in local response!\n"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_datacache.c:276
+#: src/dht/gnunet-service-dht_datacache.c:273
 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:86
+#: src/dht/gnunet-service-xdht_hello.c:82
 msgid "# HELLOs obtained from peerinfo"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:685
+#: src/dht/gnunet-service-dht_neighbours.c:671
 #, fuzzy
 msgid "# FIND PEER messages initiated"
 msgstr "# PING Nachrichten erstellt"
 
-#: src/dht/gnunet-service-dht_neighbours.c:851
+#: src/dht/gnunet-service-dht_neighbours.c:842
 #, fuzzy
 msgid "# requests TTL-dropped"
 msgstr "# dht Anfragen weitergeleitet"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1054
-#: src/dht/gnunet-service-dht_neighbours.c:1091
+#: src/dht/gnunet-service-dht_neighbours.c:1045
+#: src/dht/gnunet-service-dht_neighbours.c:1082
 msgid "# Peers excluded from routing due to Bloomfilter"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1071
-#: src/dht/gnunet-service-dht_neighbours.c:1107
+#: src/dht/gnunet-service-dht_neighbours.c:1062
+#: src/dht/gnunet-service-dht_neighbours.c:1098
 #, fuzzy
 msgid "# Peer selection failed"
 msgstr " Verbindung fehlgeschlagen\n"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1255
+#: src/dht/gnunet-service-dht_neighbours.c:1246
 #, fuzzy
 msgid "# PUT requests routed"
 msgstr "# dht Anfragen weitergeleitet"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1288
+#: src/dht/gnunet-service-dht_neighbours.c:1279
 msgid "# PUT messages queued for transmission"
 msgstr ""
 
-#: 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-dht_neighbours.c:1290
+#: src/dht/gnunet-service-dht_neighbours.c:1430
+#: src/dht/gnunet-service-dht_neighbours.c:1533
 #: src/dht/gnunet-service-xdht_neighbours.c:946
 #: src/dht/gnunet-service-xdht_neighbours.c:1007
 #: src/dht/gnunet-service-xdht_neighbours.c:1047
@@ -2145,61 +2159,61 @@ msgstr ""
 msgid "# P2P messages dropped due to full queue"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1383
+#: src/dht/gnunet-service-dht_neighbours.c:1375
 #, fuzzy
 msgid "# GET requests routed"
 msgstr "# dht Anfragen weitergeleitet"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1415
+#: src/dht/gnunet-service-dht_neighbours.c:1418
 msgid "# GET messages queued for transmission"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1547
+#: src/dht/gnunet-service-dht_neighbours.c:1548
 msgid "# RESULT messages queued for transmission"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1646
+#: src/dht/gnunet-service-dht_neighbours.c:1647
 #, fuzzy
 msgid "# P2P PUT requests received"
 msgstr "# Client Trace-Anfragen empfangen"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1650
+#: src/dht/gnunet-service-dht_neighbours.c:1651
 #, fuzzy
 msgid "# P2P PUT bytes received"
 msgstr "# Bytes empfangen über TCP"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1858
+#: src/dht/gnunet-service-dht_neighbours.c:1869
 msgid "# FIND PEER requests ignored due to Bloomfilter"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1866
+#: src/dht/gnunet-service-dht_neighbours.c:1877
 msgid "# FIND PEER requests ignored due to lack of HELLO"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:2022
+#: src/dht/gnunet-service-dht_neighbours.c:2029
 #, fuzzy
 msgid "# P2P GET requests received"
 msgstr "# Client Trace-Anfragen empfangen"
 
-#: src/dht/gnunet-service-dht_neighbours.c:2026
+#: src/dht/gnunet-service-dht_neighbours.c:2033
 #, fuzzy
 msgid "# P2P GET bytes received"
 msgstr "# Bytes empfangen über TCP"
 
-#: src/dht/gnunet-service-dht_neighbours.c:2101
+#: src/dht/gnunet-service-dht_neighbours.c:2104
 msgid "# P2P FIND PEER requests processed"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:2124
+#: src/dht/gnunet-service-dht_neighbours.c:2125
 #, fuzzy
 msgid "# P2P GET requests ONLY routed"
 msgstr "# dht Anfragen weitergeleitet"
 
-#: src/dht/gnunet-service-dht_neighbours.c:2226
+#: src/dht/gnunet-service-dht_neighbours.c:2223
 msgid "# P2P RESULTS received"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:2230
+#: src/dht/gnunet-service-dht_neighbours.c:2227
 #, fuzzy
 msgid "# P2P RESULT bytes received"
 msgstr "# Bytes empfangen über TCP"
@@ -2209,27 +2223,27 @@ msgstr "# Bytes empfangen über TCP"
 msgid "# Network size estimates received"
 msgstr "# verschlüsselter PING Nachrichten empfangen"
 
-#: src/dht/gnunet-service-dht_routing.c:220
+#: src/dht/gnunet-service-dht_routing.c:218
 msgid "# Good REPLIES matched against routing table"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_routing.c:229
+#: src/dht/gnunet-service-dht_routing.c:232
 msgid "# Duplicate REPLIES matched against routing table"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_routing.c:235
+#: src/dht/gnunet-service-dht_routing.c:238
 msgid "# Invalid REPLIES matched against routing table"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_routing.c:241
+#: src/dht/gnunet-service-dht_routing.c:244
 msgid "# Irrelevant REPLIES matched against routing table"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_routing.c:253
+#: src/dht/gnunet-service-dht_routing.c:256
 msgid "# Unsupported REPLIES matched against routing table"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_routing.c:329
+#: src/dht/gnunet-service-dht_routing.c:335
 msgid "# Entries removed from routing table"
 msgstr ""
 
@@ -2237,7 +2251,7 @@ msgstr ""
 msgid "# Entries added to routing table"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_routing.c:429
+#: src/dht/gnunet-service-dht_routing.c:433
 #, fuzzy
 msgid "# DHT requests combined"
 msgstr "# dht Anfragen weitergeleitet"
@@ -2351,16 +2365,16 @@ msgid ""
 "SUPU %s, %s, %d, trail->prev_hop = %s"
 msgstr ""
 
-#: src/dht/plugin_block_dht.c:144
+#: src/dht/plugin_block_dht.c:167
 #, fuzzy, c-format
 msgid "Block not of type %u\n"
 msgstr "Kein Transport des Typs %d bekannt.\n"
 
-#: src/dht/plugin_block_dht.c:151
+#: src/dht/plugin_block_dht.c:174
 msgid "Size mismatch for block\n"
 msgstr ""
 
-#: src/dht/plugin_block_dht.c:161
+#: src/dht/plugin_block_dht.c:184
 #, c-format
 msgid "Block of type %u is malformed\n"
 msgstr ""
@@ -2465,7 +2479,7 @@ msgstr ""
 msgid "# DNS requests received via TUN interface"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:1078 src/exit/gnunet-daemon-exit.c:3643
+#: src/dns/gnunet-service-dns.c:1078 src/exit/gnunet-daemon-exit.c:3642
 msgid "need a valid IPv4 or IPv6 address\n"
 msgstr ""
 
@@ -2483,214 +2497,214 @@ msgstr "Ausführliche Ausgabe"
 msgid "Print information about DV state"
 msgstr "Informationen über andere GNUnet Knoten ausgeben."
 
-#: src/exit/gnunet-daemon-exit.c:805 src/exit/gnunet-daemon-exit.c:3109
+#: src/exit/gnunet-daemon-exit.c:804 src/exit/gnunet-daemon-exit.c:3108
 #, fuzzy
 msgid "# Inbound CADET channels created"
 msgstr "# PING Nachrichten erstellt"
 
-#: src/exit/gnunet-daemon-exit.c:861
+#: src/exit/gnunet-daemon-exit.c:860
 #, c-format
 msgid "Got duplicate service records for `%s:%u'\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:914
+#: src/exit/gnunet-daemon-exit.c:913
 #, fuzzy
 msgid "# Bytes transmitted via cadet channels"
 msgstr "# Bytes des Typs %d übertragen"
 
-#: 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
+#: src/exit/gnunet-daemon-exit.c:1032 src/exit/gnunet-daemon-exit.c:2492
+#: src/exit/gnunet-daemon-exit.c:2745 src/vpn/gnunet-service-vpn.c:1454
+#: src/vpn/gnunet-service-vpn.c:1845 src/vpn/gnunet-service-vpn.c:2008
 msgid "# ICMPv4 packets dropped (type not allowed)"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c: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
+#: src/exit/gnunet-daemon-exit.c:1069 src/exit/gnunet-daemon-exit.c:2551
+#: src/exit/gnunet-daemon-exit.c:2804 src/vpn/gnunet-service-vpn.c:1510
+#: src/vpn/gnunet-service-vpn.c:1904 src/vpn/gnunet-service-vpn.c:2041
 msgid "# ICMPv6 packets dropped (type not allowed)"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:1118
+#: src/exit/gnunet-daemon-exit.c:1117
 msgid "# ICMP packets dropped (not allowed)"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:1126
+#: src/exit/gnunet-daemon-exit.c:1125
 msgid "ICMP Packet dropped, have no matching connection information\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:1203
+#: src/exit/gnunet-daemon-exit.c:1202
 msgid "UDP Packet dropped, have no matching connection information\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:1278
+#: src/exit/gnunet-daemon-exit.c:1277
 msgid "TCP Packet dropped, have no matching connection information\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:1331
+#: src/exit/gnunet-daemon-exit.c:1330
 #, fuzzy
 msgid "# Packets received from TUN"
 msgstr "# Bytes empfangen über TCP"
 
-#: src/exit/gnunet-daemon-exit.c:1345
+#: src/exit/gnunet-daemon-exit.c:1344
 #, fuzzy
 msgid "# Bytes received from TUN"
 msgstr "# Bytes empfangen über TCP"
 
-#: src/exit/gnunet-daemon-exit.c:1371
+#: src/exit/gnunet-daemon-exit.c:1370
 msgid "IPv4 packet options received.  Ignored.\n"
 msgstr "IPv4-Paketoptionen empfangen, werden ignoriert.\n"
 
-#: src/exit/gnunet-daemon-exit.c:1398
+#: src/exit/gnunet-daemon-exit.c:1397
 #, c-format
 msgid "IPv4 packet with unsupported next header %u received.  Ignored.\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:1444
+#: src/exit/gnunet-daemon-exit.c:1443
 #, c-format
 msgid "IPv6 packet with unsupported next header %d received.  Ignored.\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:1452
+#: src/exit/gnunet-daemon-exit.c:1451
 #, c-format
 msgid "Packet from unknown protocol %u received.  Ignored.\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:1853
+#: src/exit/gnunet-daemon-exit.c:1852
 #, fuzzy
 msgid "# TCP packets sent via TUN"
 msgstr "# Bytes gesendet über TCP"
 
-#: src/exit/gnunet-daemon-exit.c:1977
+#: src/exit/gnunet-daemon-exit.c:1976
 #, fuzzy
 msgid "# TCP service creation requests received via cadet"
 msgstr "# Client Trace-Anfragen empfangen"
 
-#: 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
+#: src/exit/gnunet-daemon-exit.c:1980 src/exit/gnunet-daemon-exit.c:2059
+#: src/exit/gnunet-daemon-exit.c:2166 src/exit/gnunet-daemon-exit.c:2416
+#: src/exit/gnunet-daemon-exit.c:2666 src/exit/gnunet-daemon-exit.c:2953
+#: src/exit/gnunet-daemon-exit.c:3056
 #, fuzzy
 msgid "# Bytes received from CADET"
 msgstr "# Bytes empfangen über TCP"
 
-#: src/exit/gnunet-daemon-exit.c:2063
+#: src/exit/gnunet-daemon-exit.c:2062
 #, fuzzy
 msgid "# TCP IP-exit creation requests received via cadet"
 msgstr "# Client Trace-Anfragen empfangen"
 
-#: src/exit/gnunet-daemon-exit.c:2170
+#: src/exit/gnunet-daemon-exit.c:2169
 #, fuzzy
 msgid "# TCP data requests received via cadet"
 msgstr "# Client Trace-Anfragen empfangen"
 
-#: src/exit/gnunet-daemon-exit.c:2184
+#: src/exit/gnunet-daemon-exit.c:2183
 #, fuzzy
 msgid "# TCP DATA requests dropped (no session)"
 msgstr "# gap Anfragen verworfen: Kollision in RT"
 
-#: src/exit/gnunet-daemon-exit.c:2246
+#: src/exit/gnunet-daemon-exit.c:2245
 #, fuzzy
 msgid "# ICMP packets sent via TUN"
 msgstr "# Bytes gesendet über TCP"
 
-#: src/exit/gnunet-daemon-exit.c:2420
+#: src/exit/gnunet-daemon-exit.c:2419
 #, fuzzy
 msgid "# ICMP IP-exit requests received via cadet"
 msgstr "# Client Trace-Anfragen empfangen"
 
-#: src/exit/gnunet-daemon-exit.c:2670
+#: src/exit/gnunet-daemon-exit.c:2669
 #, fuzzy
 msgid "# ICMP service requests received via cadet"
 msgstr "# Client Trace-Anfragen empfangen"
 
-#: src/exit/gnunet-daemon-exit.c:2731 src/vpn/gnunet-service-vpn.c:1445
-#: src/vpn/gnunet-service-vpn.c:2003
+#: src/exit/gnunet-daemon-exit.c:2730 src/vpn/gnunet-service-vpn.c:1444
+#: src/vpn/gnunet-service-vpn.c:2002
 msgid "# ICMPv4 packets dropped (impossible PT to v6)"
 msgstr ""
 
-#: 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
+#: src/exit/gnunet-daemon-exit.c:2789 src/vpn/gnunet-service-vpn.c:1480
+#: src/vpn/gnunet-service-vpn.c:1492 src/vpn/gnunet-service-vpn.c:1892
 msgid "# ICMPv6 packets dropped (impossible PT to v4)"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:2841
+#: src/exit/gnunet-daemon-exit.c:2840
 #, fuzzy
 msgid "# UDP packets sent via TUN"
 msgstr "# Bytes gesendet über TCP"
 
-#: src/exit/gnunet-daemon-exit.c:2957
+#: src/exit/gnunet-daemon-exit.c:2956
 #, fuzzy
 msgid "# UDP IP-exit requests received via cadet"
 msgstr "# Client Trace-Anfragen empfangen"
 
-#: src/exit/gnunet-daemon-exit.c:3060
+#: src/exit/gnunet-daemon-exit.c:3059
 #, fuzzy
 msgid "# UDP service requests received via cadet"
 msgstr "# Client Trace-Anfragen empfangen"
 
-#: src/exit/gnunet-daemon-exit.c:3327 src/exit/gnunet-daemon-exit.c:3337
+#: src/exit/gnunet-daemon-exit.c:3326 src/exit/gnunet-daemon-exit.c:3336
 #, 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:3351 src/exit/gnunet-daemon-exit.c:3359
+#: src/exit/gnunet-daemon-exit.c:3350 src/exit/gnunet-daemon-exit.c:3358
 #, c-format
 msgid "`%s' is not a valid port number (for domain `%s')!"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3400
+#: src/exit/gnunet-daemon-exit.c:3399
 #, c-format
 msgid "No addresses found for hostname `%s' of service `%s'!\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3414 src/exit/gnunet-daemon-exit.c:3427
+#: src/exit/gnunet-daemon-exit.c:3413 src/exit/gnunet-daemon-exit.c:3426
 #, c-format
 msgid "Service `%s' configured for IPv4, but IPv4 is disabled!\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3439
+#: src/exit/gnunet-daemon-exit.c:3438
 #, c-format
 msgid "No IP addresses found for hostname `%s' of service `%s'!\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3584
+#: src/exit/gnunet-daemon-exit.c:3583
 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:3592
+#: src/exit/gnunet-daemon-exit.c:3591
 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:3599
+#: src/exit/gnunet-daemon-exit.c:3598
 msgid ""
 "Cannot enable IPv4 exit but disable IPv4 on TUN interface, will use "
 "ENABLE_IPv4=YES\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3605
+#: src/exit/gnunet-daemon-exit.c:3604
 msgid ""
 "Cannot enable IPv6 exit but disable IPv6 on TUN interface, will use "
 "ENABLE_IPv6=YES\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3765
+#: src/exit/gnunet-daemon-exit.c:3764
 msgid "Must be a number"
 msgstr "Muss eine Zahl sein"
 
-#: src/exit/gnunet-daemon-exit.c:3872
+#: src/exit/gnunet-daemon-exit.c:3871
 #, 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
+#: src/exit/gnunet-daemon-exit.c:3883 src/pt/gnunet-daemon-pt.c:1279
 msgid "No useful service enabled.  Exiting.\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:4029
+#: src/exit/gnunet-daemon-exit.c:4028
 msgid "Daemon to run to provide an IP exit node for the VPN"
 msgstr ""
 
@@ -2736,16 +2750,16 @@ msgstr "# fragmentierter Nachrichten"
 msgid "# total size of fragmented messages"
 msgstr ""
 
-#: src/fragmentation/fragmentation.c:455
+#: src/fragmentation/fragmentation.c:456
 #, fuzzy
 msgid "# fragment acknowledgements received"
 msgstr "# Knotenankündigungen empfangen"
 
-#: src/fragmentation/fragmentation.c:462
+#: src/fragmentation/fragmentation.c:463
 msgid "# bits removed from fragmentation ACKs"
 msgstr ""
 
-#: src/fragmentation/fragmentation.c:486
+#: src/fragmentation/fragmentation.c:487
 #, fuzzy
 msgid "# fragmentation transmissions completed"
 msgstr "# Klartext PONG Nachrichten empfangen"
@@ -2775,46 +2789,46 @@ msgstr "Datei wurde als `%s' gespeichert.\n"
 msgid "Failure while resuming publishing operation `%s': %s\n"
 msgstr ""
 
-#: src/fs/fs_api.c:1660
+#: src/fs/fs_api.c:1662
 #, fuzzy, c-format
 msgid "Failed to resume publishing operation `%s': %s\n"
 msgstr "Datei wurde als `%s' gespeichert.\n"
 
-#: src/fs/fs_api.c:2318
+#: src/fs/fs_api.c:2322
 #, c-format
 msgid "Failure while resuming unindexing operation `%s': %s\n"
 msgstr ""
 
-#: src/fs/fs_api.c:2328
+#: src/fs/fs_api.c:2332
 #, fuzzy, c-format
 msgid "Failed to resume unindexing operation `%s': %s\n"
 msgstr "Datei wurde als `%s' gespeichert.\n"
 
-#: src/fs/fs_api.c:2456 src/fs/fs_api.c:2703
+#: src/fs/fs_api.c:2460 src/fs/fs_api.c:2706
 #, fuzzy, c-format
 msgid "Failed to resume sub-download `%s': %s\n"
 msgstr "Datei wurde als `%s' gespeichert.\n"
 
-#: src/fs/fs_api.c:2474
+#: src/fs/fs_api.c:2478
 #, fuzzy, c-format
 msgid "Failed to resume sub-search `%s': %s\n"
 msgstr "Datei wurde als `%s' gespeichert.\n"
 
-#: src/fs/fs_api.c:2489 src/fs/fs_api.c:2508 src/fs/fs_api.c:3006
+#: src/fs/fs_api.c:2493 src/fs/fs_api.c:2512 src/fs/fs_api.c:3016
 #, c-format
 msgid "Failure while resuming search operation `%s': %s\n"
 msgstr ""
 
-#: src/fs/fs_api.c:2693
+#: src/fs/fs_api.c:2696
 #, c-format
 msgid "Failed to resume sub-download `%s': could not open file `%s'\n"
 msgstr ""
 
-#: src/fs/fs_api.c:2949
+#: src/fs/fs_api.c:2959
 msgid "Could not resume running search, will resume as paused search\n"
 msgstr ""
 
-#: src/fs/fs_api.c:3044
+#: src/fs/fs_api.c:3054
 #, c-format
 msgid "Failure while resuming download operation `%s': %s\n"
 msgstr ""
@@ -2875,7 +2889,7 @@ msgstr ""
 msgid "internal error decoding tree"
 msgstr ""
 
-#: src/fs/fs_download.c:1838
+#: src/fs/fs_download.c:1845
 #, fuzzy
 msgid "Invalid URI"
 msgstr "Ungültiger Parameter: `%s'\n"
@@ -3631,48 +3645,48 @@ msgstr ""
 msgid "Hash mismatch trying to index file `%s' which does not have hash `%s'\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs.c:1288
+#: src/fs/gnunet-service-fs.c:1287
 #, fuzzy
 msgid "FS service is lacking HOSTKEY configuration setting.  Exiting.\n"
 msgstr "GNUnet Konfiguration"
 
-#: src/fs/gnunet-service-fs.c:1313 src/hostlist/gnunet-daemon-hostlist.c:355
+#: src/fs/gnunet-service-fs.c:1312 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:494
+#: src/fs/gnunet-service-fs_cadet_client.c:370
 #, fuzzy
 msgid "# replies received via cadet"
 msgstr "# Bytes empfangen über TCP"
 
-#: src/fs/gnunet-service-fs_cadet_client.c:508
+#: src/fs/gnunet-service-fs_cadet_client.c:384
 #, fuzzy
 msgid "# replies received via cadet dropped"
 msgstr "# Bytes empfangen über TCP"
 
-#: src/fs/gnunet-service-fs_cadet_server.c:258
-msgid "# Blocks transferred via cadet"
-msgstr ""
-
-#: src/fs/gnunet-service-fs_cadet_server.c:360
+#: src/fs/gnunet-service-fs_cadet_server.c:263
 #, fuzzy
 msgid "# queries received via CADET not answered"
 msgstr "# Bytes empfangen über TCP"
 
-#: src/fs/gnunet-service-fs_cadet_server.c:440
+#: src/fs/gnunet-service-fs_cadet_server.c:317
+msgid "# Blocks transferred via cadet"
+msgstr ""
+
+#: src/fs/gnunet-service-fs_cadet_server.c:343
 #, fuzzy
 msgid "# queries received via cadet"
 msgstr "# Bytes empfangen über TCP"
 
-#: src/fs/gnunet-service-fs_cadet_server.c:484
+#: src/fs/gnunet-service-fs_cadet_server.c:384
 #, fuzzy
 msgid "# cadet client connections rejected"
 msgstr "# Sitzungsschlüssel abgelehnt"
 
-#: src/fs/gnunet-service-fs_cadet_server.c:490
-#: src/fs/gnunet-service-fs_cadet_server.c:530
+#: src/fs/gnunet-service-fs_cadet_server.c:391
+#: src/fs/gnunet-service-fs_cadet_server.c:431
 #, fuzzy
 msgid "# cadet connections active"
 msgstr " Verbindung fehlgeschlagen\n"
@@ -3830,114 +3844,114 @@ msgstr "# dht Anfragen weitergeleitet"
 msgid "# query plan entries"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:315
+#: src/fs/gnunet-service-fs_pr.c:327
 #, fuzzy
 msgid "# Pending requests created"
 msgstr "# dht Anfragen weitergeleitet"
 
-#: src/fs/gnunet-service-fs_pr.c:411 src/fs/gnunet-service-fs_pr.c:661
+#: src/fs/gnunet-service-fs_pr.c:428 src/fs/gnunet-service-fs_pr.c:675
 #, fuzzy
 msgid "# Pending requests active"
 msgstr "# Client Trace-Anfragen empfangen"
 
-#: src/fs/gnunet-service-fs_pr.c:842
+#: src/fs/gnunet-service-fs_pr.c:856
 #, fuzzy
 msgid "# replies received and matched"
 msgstr "# Bytes empfangen über TCP"
 
-#: src/fs/gnunet-service-fs_pr.c:879
+#: src/fs/gnunet-service-fs_pr.c:892
 msgid "# duplicate replies discarded (bloomfilter)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:888
+#: src/fs/gnunet-service-fs_pr.c:901
 #, fuzzy
 msgid "# irrelevant replies discarded"
 msgstr "# verworfener Nachrichten"
 
-#: src/fs/gnunet-service-fs_pr.c:903
+#: src/fs/gnunet-service-fs_pr.c:916
 #, c-format
 msgid "Unsupported block type %u\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:920
+#: src/fs/gnunet-service-fs_pr.c:933
 msgid "# results found locally"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1050
+#: src/fs/gnunet-service-fs_pr.c:1063
 msgid "# Datastore `PUT' failures"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1078
+#: src/fs/gnunet-service-fs_pr.c:1091
 #, fuzzy
 msgid "# storage requests dropped due to high load"
 msgstr "# Knotenankündigungen empfangen"
 
-#: src/fs/gnunet-service-fs_pr.c:1116
+#: src/fs/gnunet-service-fs_pr.c:1129
 #, fuzzy
 msgid "# Replies received from DHT"
 msgstr "# Bytes empfangen über HTTP"
 
-#: src/fs/gnunet-service-fs_pr.c:1247
+#: src/fs/gnunet-service-fs_pr.c:1260
 #, fuzzy
 msgid "# Replies received from CADET"
 msgstr "# Bytes empfangen über HTTP"
 
-#: src/fs/gnunet-service-fs_pr.c:1299
+#: src/fs/gnunet-service-fs_pr.c:1312
 #, c-format
 msgid "Datastore lookup already took %s!\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1320
+#: src/fs/gnunet-service-fs_pr.c:1333
 #, c-format
 msgid "On-demand lookup already took %s!\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1372
+#: src/fs/gnunet-service-fs_pr.c:1385
 msgid "# Datastore lookups concluded (no results)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1387
+#: src/fs/gnunet-service-fs_pr.c:1400
 msgid "# Datastore lookups concluded (seen all)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1396
+#: src/fs/gnunet-service-fs_pr.c:1409
 msgid "# Datastore lookups aborted (more than MAX_RESULTS)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1411
+#: src/fs/gnunet-service-fs_pr.c:1424
 msgid "# requested DBLOCK or IBLOCK not found"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1425
+#: src/fs/gnunet-service-fs_pr.c:1438
 msgid "# on-demand blocks matched requests"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1438
+#: src/fs/gnunet-service-fs_pr.c:1451
 msgid "# on-demand lookups performed successfully"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1443
+#: src/fs/gnunet-service-fs_pr.c:1456
 msgid "# on-demand lookups failed"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1469 src/fs/gnunet-service-fs_pr.c:1508
-#: src/fs/gnunet-service-fs_pr.c:1675
+#: src/fs/gnunet-service-fs_pr.c:1482 src/fs/gnunet-service-fs_pr.c:1521
+#: src/fs/gnunet-service-fs_pr.c:1688
 msgid "# Datastore lookups concluded (error queueing)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1527
+#: src/fs/gnunet-service-fs_pr.c:1540
 msgid "# Datastore lookups concluded (found last result)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1539
+#: src/fs/gnunet-service-fs_pr.c:1552
 msgid "# Datastore lookups concluded (load too high)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1652
+#: src/fs/gnunet-service-fs_pr.c:1665
 msgid "# Datastore lookups initiated"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1732
+#: src/fs/gnunet-service-fs_pr.c:1745
 #, fuzzy
 msgid "# GAP PUT messages received"
 msgstr "# verschlüsselter PONG Nachrichten empfangen"
@@ -4298,7 +4312,7 @@ msgid "Failed to connect to the namecache!\n"
 msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
 
 #: src/gns/gnunet-service-gns.c:612
-#: src/zonemaster/gnunet-service-zonemaster.c:740
+#: src/zonemaster/gnunet-service-zonemaster.c:741
 #, fuzzy
 msgid "Could not connect to DHT!\n"
 msgstr "Verbindung zu gnunetd konnte nicht hergestellt werden.\n"
@@ -4784,7 +4798,7 @@ msgid "# hostlist advertisements send"
 msgstr "# Bekanntmachungen von anderen übertragen"
 
 #: src/hostlist/gnunet-daemon-hostlist_server.c:679
-#: src/transport/gnunet-service-transport.c:2802
+#: src/transport/gnunet-service-transport.c:2803
 #, fuzzy
 msgid "Could not access PEERINFO service.  Exiting.\n"
 msgstr "Auf die Namespace Informationen konnte nicht zugegriffen werden.\n"
@@ -5141,7 +5155,8 @@ msgstr ""
 msgid "Invalid public key for reverse lookup `%s'\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:979 src/peerinfo-tool/gnunet-peerinfo.c:775
+#: 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"
@@ -5346,23 +5361,22 @@ msgid "Failed to connect to `gnunet-nat-server'\n"
 msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
 
 #: src/nat-auto/gnunet-nat-auto_legacy.c:518
-#: src/nat-auto/nat_auto_api_test.c:520
 #, c-format
 msgid "Failed to create listen socket bound to `%s' for NAT test: %s\n"
 msgstr ""
 
 #: src/nat-auto/gnunet-nat-auto_legacy.c:568
-#: src/nat-auto/nat_auto_api_test.c:569
+#: src/nat-auto/nat_auto_api_test.c:571
 #, fuzzy
 msgid "NAT test failed to start NAT library\n"
 msgstr "Fehler beim Senden einer `%s' Anfrage an den SMTP Server.\n"
 
-#: src/nat-auto/gnunet-nat-server.c:336
+#: src/nat-auto/gnunet-nat-server.c:338
 #, c-format
 msgid "Please pass valid port number as the first argument! (got `%s')\n"
 msgstr ""
 
-#: src/nat-auto/gnunet-nat-server.c:386
+#: src/nat-auto/gnunet-nat-server.c:388
 msgid "GNUnet NAT traversal test helper daemon"
 msgstr ""
 
@@ -5510,6 +5524,11 @@ msgstr ""
 msgid "Failed to find valid PORT in section `%s'\n"
 msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
 
+#: src/nat-auto/nat_auto_api_test.c:522
+#, fuzzy, c-format
+msgid "Failed to create socket bound to `%s' for NAT test: %s\n"
+msgstr "Dateiformat fehlerhaft (kein GNUnet Verzeichnis?)\n"
+
 #: src/nat/gnunet-nat.c:424
 msgid "which IP and port are we locally using to bind/listen to"
 msgstr ""
@@ -5536,32 +5555,32 @@ msgstr ""
 msgid "GNUnet NAT traversal autoconfigure daemon"
 msgstr ""
 
-#: src/nat/gnunet-service-nat.c:1313
+#: src/nat/gnunet-service-nat.c:1317
 #, c-format
 msgid "Malformed punched hole specification `%s' (lacks port)\n"
 msgstr ""
 
-#: src/nat/gnunet-service-nat.c:1323
+#: src/nat/gnunet-service-nat.c:1327
 #, c-format
 msgid "Invalid port number in punched hole specification `%s' (lacks port)\n"
 msgstr ""
 
-#: src/nat/gnunet-service-nat.c:1339
+#: src/nat/gnunet-service-nat.c:1343
 #, c-format
 msgid "Malformed punched hole specification `%s' (lacks `]')\n"
 msgstr ""
 
-#: src/nat/gnunet-service-nat.c:1350
+#: src/nat/gnunet-service-nat.c:1354
 #, c-format
 msgid "Malformed punched hole specification `%s' (IPv6 address invalid)"
 msgstr ""
 
-#: src/nat/gnunet-service-nat.c:1803
+#: src/nat/gnunet-service-nat.c:1813
 #, fuzzy
 msgid "Connection reversal request failed\n"
 msgstr " Verbindung fehlgeschlagen\n"
 
-#: src/nat/gnunet-service-nat.c:1876
+#: src/nat/gnunet-service-nat.c:1886
 msgid ""
 "UPnP enabled in configuration, but UPnP client `upnpc` command not found, "
 "disabling UPnP\n"
@@ -5582,7 +5601,7 @@ msgstr "Fehler beim Starten der Collection.\n"
 msgid "`external-ip' command not found\n"
 msgstr "Kommando `%s' wurde nicht gefunden!\n"
 
-#: src/nat/gnunet-service-nat_mini.c:654
+#: src/nat/gnunet-service-nat_mini.c:656
 #, fuzzy
 msgid "`upnpc' command not found\n"
 msgstr "Kommando `%s' wurde nicht gefunden!\n"
@@ -5615,7 +5634,7 @@ msgstr ""
 msgid "Measure quality and performance of the NSE service."
 msgstr ""
 
-#: src/nse/gnunet-service-nse.c:1536
+#: src/nse/gnunet-service-nse.c:1534
 #: src/revocation/gnunet-service-revocation.c:832 src/util/gnunet-scrypt.c:276
 msgid "Value is too large.\n"
 msgstr ""
@@ -5825,7 +5844,7 @@ msgstr "Zustellung der Nachricht `%s' fehlgeschlagen.\n"
 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:195
+#: src/postgres/postgres.c:192
 #, fuzzy, c-format
 msgid "Unable to connect to Postgres database '%s': %s\n"
 msgstr "Fehler beim Anlegen des Benutzerkontos:"
@@ -6151,7 +6170,7 @@ msgstr ""
 msgid "Revocation certificate not ready, calculating proof of work\n"
 msgstr ""
 
-#: src/revocation/gnunet-revocation.c:437 src/social/gnunet-social.c:1159
+#: src/revocation/gnunet-revocation.c:437 src/social/gnunet-social.c:1176
 #, c-format
 msgid "Public key `%s' malformed\n"
 msgstr ""
@@ -6285,10 +6304,10 @@ msgstr ""
 msgid "Calculate the Vectorproduct with a GNUnet peer."
 msgstr ""
 
-#: 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
+#: src/scalarproduct/gnunet-service-scalarproduct_alice.c:1404
+#: src/scalarproduct/gnunet-service-scalarproduct_bob.c:1342
+#: src/scalarproduct/gnunet-service-scalarproduct-ecc_alice.c:1177
+#: src/scalarproduct/gnunet-service-scalarproduct-ecc_bob.c:1060
 #, fuzzy
 msgid "Connect to CADET failed\n"
 msgstr " Verbindung fehlgeschlagen\n"
@@ -6313,10 +6332,10 @@ msgstr ""
 msgid "also profile decryption"
 msgstr ""
 
-#: src/set/gnunet-service-set.c:1991
+#: src/set/gnunet-service-set.c:2068
 #, fuzzy
-msgid "Could not connect to cadet service\n"
-msgstr "Verbindung zu gnunetd konnte nicht hergestellt werden.\n"
+msgid "Could not connect to CADET service\n"
+msgstr "Verbindung zum %s-Dienst ist fehlgeschlagen!\n"
 
 #: src/set/gnunet-set-ibf-profiler.c:249
 #, fuzzy
@@ -6344,126 +6363,126 @@ msgstr ""
 msgid "operation to execute"
 msgstr ""
 
-#: src/social/gnunet-social.c:1146
+#: src/social/gnunet-social.c:1163
 #, fuzzy
 msgid "--place missing or invalid.\n"
 msgstr "Ungültige Antwort auf `%s'.\n"
 
-#: src/social/gnunet-social.c:1195
+#: src/social/gnunet-social.c:1212
 msgid "assign --name in state to --data"
 msgstr ""
 
-#: src/social/gnunet-social.c:1199
+#: src/social/gnunet-social.c:1216
 msgid "say good-bye and leave somebody else's place"
 msgstr ""
 
-#: src/social/gnunet-social.c:1203
+#: src/social/gnunet-social.c:1220
 msgid "create a place"
 msgstr ""
 
-#: src/social/gnunet-social.c:1207
+#: src/social/gnunet-social.c:1224
 msgid "destroy a place we were hosting"
 msgstr ""
 
-#: src/social/gnunet-social.c:1211
+#: src/social/gnunet-social.c:1228
 msgid "enter somebody else's place"
 msgstr ""
 
-#: src/social/gnunet-social.c:1215
+#: src/social/gnunet-social.c:1232
 msgid "find state matching name prefix"
 msgstr ""
 
-#: src/social/gnunet-social.c:1219
+#: src/social/gnunet-social.c:1236
 msgid "replay history of messages up to the given --limit"
 msgstr ""
 
-#: src/social/gnunet-social.c:1223
+#: src/social/gnunet-social.c:1240
 msgid "reconnect to a previously created place"
 msgstr ""
 
-#: src/social/gnunet-social.c:1227
+#: src/social/gnunet-social.c:1244
 msgid "publish something to a place we are hosting"
 msgstr ""
 
-#: src/social/gnunet-social.c:1231
+#: src/social/gnunet-social.c:1248
 msgid "reconnect to a previously entered place"
 msgstr ""
 
-#: src/social/gnunet-social.c:1235
+#: src/social/gnunet-social.c:1252
 msgid "search for state matching exact name"
 msgstr ""
 
-#: src/social/gnunet-social.c:1239
+#: src/social/gnunet-social.c:1256
 msgid "submit something to somebody's place"
 msgstr ""
 
-#: src/social/gnunet-social.c:1243
+#: src/social/gnunet-social.c:1260
 msgid "list of egos and subscribed places"
 msgstr ""
 
-#: src/social/gnunet-social.c:1247
+#: src/social/gnunet-social.c:1264
 msgid "extract and replay history between message IDs --start and --until"
 msgstr ""
 
-#: src/social/gnunet-social.c:1254
+#: src/social/gnunet-social.c:1271
 msgid "application ID to use when connecting"
 msgstr ""
 
-#: src/social/gnunet-social.c:1258
+#: src/social/gnunet-social.c:1275
 msgid "message body or state value"
 msgstr ""
 
-#: src/social/gnunet-social.c:1262
+#: src/social/gnunet-social.c:1279
 #, fuzzy
 msgid "name or public key of ego"
 msgstr "Ungültiger Parameter: `%s'\n"
 
-#: src/social/gnunet-social.c:1266
+#: src/social/gnunet-social.c:1283
 msgid "wait for incoming messages"
 msgstr ""
 
-#: src/social/gnunet-social.c:1270
+#: src/social/gnunet-social.c:1287
 msgid "GNS name"
 msgstr ""
 
-#: src/social/gnunet-social.c:1274
+#: src/social/gnunet-social.c:1291
 msgid "peer ID for --guest-enter"
 msgstr ""
 
-#: src/social/gnunet-social.c:1278
+#: src/social/gnunet-social.c:1295
 msgid "name (key) to query from state"
 msgstr ""
 
-#: src/social/gnunet-social.c:1282
+#: src/social/gnunet-social.c:1299
 msgid "method name"
 msgstr ""
 
-#: src/social/gnunet-social.c:1286
+#: src/social/gnunet-social.c:1303
 #, fuzzy
 msgid "number of messages to replay from history"
 msgstr "Anzahl an Durchläufen"
 
-#: src/social/gnunet-social.c:1290
+#: src/social/gnunet-social.c:1307
 msgid "key address of place"
 msgstr ""
 
-#: src/social/gnunet-social.c:1294
+#: src/social/gnunet-social.c:1311
 msgid "start message ID for history replay"
 msgstr ""
 
-#: src/social/gnunet-social.c:1298
+#: src/social/gnunet-social.c:1315
 msgid "respond to entry requests by admitting all guests"
 msgstr ""
 
-#: src/social/gnunet-social.c:1302
+#: src/social/gnunet-social.c:1319
 msgid "end message ID for history replay"
 msgstr ""
 
-#: src/social/gnunet-social.c:1306
+#: src/social/gnunet-social.c:1323
 msgid "respond to entry requests by refusing all guests"
 msgstr ""
 
-#: src/social/gnunet-social.c:1316
+#: src/social/gnunet-social.c:1333
 msgid ""
 "gnunet-social - Interact with the social service: enter/leave, send/receive "
 "messages, access history and state.\n"
@@ -7000,35 +7019,35 @@ msgstr ""
 msgid "# bytes payload discarded due to not connected peer"
 msgstr ""
 
-#: src/transport/gnunet-service-transport.c:1698
+#: src/transport/gnunet-service-transport.c:1699
 msgid "# bytes total received"
 msgstr "# Bytes insgesamt empfangen"
 
-#: src/transport/gnunet-service-transport.c:1795
+#: src/transport/gnunet-service-transport.c:1796
 msgid "# bytes payload received"
 msgstr "# Bytes Nutzdaten empfangen"
 
-#: src/transport/gnunet-service-transport.c:2112
-#: src/transport/gnunet-service-transport.c:2584
+#: src/transport/gnunet-service-transport.c:2113
+#: src/transport/gnunet-service-transport.c:2585
 msgid "# disconnects due to blacklist"
 msgstr ""
 
-#: src/transport/gnunet-service-transport.c:2588
+#: src/transport/gnunet-service-transport.c:2589
 #, 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
+#: src/transport/gnunet-service-transport.c:2697
 #, c-format
 msgid "Adding blacklisting entry for peer `%s'\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport.c:2705
+#: src/transport/gnunet-service-transport.c:2706
 #, c-format
 msgid "Adding blacklisting entry for peer `%s':`%s'\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport.c:2770
+#: src/transport/gnunet-service-transport.c:2771
 msgid "Transport service is lacking key configuration settings. Exiting.\n"
 msgstr ""
 
@@ -7169,74 +7188,74 @@ msgstr "# PING Nachrichten erstellt"
 msgid "SYN request from peer `%s' ignored due impending shutdown\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:2598
+#: src/transport/gnunet-service-transport_neighbours.c:2606
 msgid "# Attempts to switch addresses"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3080
+#: src/transport/gnunet-service-transport_neighbours.c:3088
 #, fuzzy
 msgid "# SYN_ACK messages received"
 msgstr "# SESSION_ACK-Meldungen empfangen"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3088
+#: src/transport/gnunet-service-transport_neighbours.c:3096
 #, fuzzy
 msgid "# unexpected SYN_ACK messages (no peer)"
 msgstr "# verschlüsselter PONG Nachrichten gesendet"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3106
-#: src/transport/gnunet-service-transport_neighbours.c:3130
+#: src/transport/gnunet-service-transport_neighbours.c:3114
+#: src/transport/gnunet-service-transport_neighbours.c:3138
 #, fuzzy
 msgid "# unexpected SYN_ACK messages (not ready)"
 msgstr "# verschlüsselter PONG Nachrichten gesendet"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3142
+#: src/transport/gnunet-service-transport_neighbours.c:3150
 #, fuzzy
 msgid "# unexpected SYN_ACK messages (waiting on ATS)"
 msgstr "# verschlüsselter PONG Nachrichten gesendet"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3167
+#: src/transport/gnunet-service-transport_neighbours.c:3175
 msgid "# Successful attempts to switch addresses"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3180
+#: src/transport/gnunet-service-transport_neighbours.c:3188
 #, fuzzy
 msgid "# unexpected SYN_ACK messages (disconnecting)"
 msgstr "# verschlüsselter PONG Nachrichten gesendet"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3352
+#: src/transport/gnunet-service-transport_neighbours.c:3360
 #, fuzzy
 msgid "# ACK messages received"
 msgstr "# CONNECT_ACK-Meldungen empfangen"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3388
+#: src/transport/gnunet-service-transport_neighbours.c:3396
 #, fuzzy
 msgid "# unexpected ACK messages"
 msgstr "# verschlüsselter PONG Nachrichten gesendet"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3476
+#: src/transport/gnunet-service-transport_neighbours.c:3484
 #, fuzzy
 msgid "# quota messages ignored (malformed)"
 msgstr "# gap Anfragen verworfen: Kollision in RT"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3483
+#: src/transport/gnunet-service-transport_neighbours.c:3491
 #, fuzzy
 msgid "# QUOTA messages received"
 msgstr "# verschlüsselter PONG Nachrichten empfangen"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3523
+#: src/transport/gnunet-service-transport_neighbours.c:3531
 msgid "# disconnect messages ignored (malformed)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3530
+#: src/transport/gnunet-service-transport_neighbours.c:3538
 #, fuzzy
 msgid "# DISCONNECT messages received"
 msgstr "# verschlüsselter PONG Nachrichten empfangen"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3541
+#: src/transport/gnunet-service-transport_neighbours.c:3549
 msgid "# disconnect messages ignored (timestamp)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3675
+#: src/transport/gnunet-service-transport_neighbours.c:3683
 msgid "# disconnected from peer upon explicit request"
 msgstr ""
 
@@ -7533,8 +7552,8 @@ msgstr ""
 #: src/transport/plugin_transport_http_client.c:1477
 #: src/transport/plugin_transport_http_server.c:2248
 #: src/transport/plugin_transport_http_server.c:3462
-#: src/transport/plugin_transport_tcp.c:3375
-#: src/transport/plugin_transport_tcp.c:3382
+#: src/transport/plugin_transport_tcp.c:3403
+#: src/transport/plugin_transport_tcp.c:3410
 msgid "TCP_STEALTH not supported on this platform.\n"
 msgstr ""
 
@@ -7603,7 +7622,7 @@ msgid "Found %u addresses to report to NAT service\n"
 msgstr ""
 
 #: src/transport/plugin_transport_http_server.c:2837
-#: src/transport/plugin_transport_udp.c:3623
+#: src/transport/plugin_transport_udp.c:3613
 msgid "Disabling IPv6 since it is not supported on this system!\n"
 msgstr ""
 
@@ -7707,15 +7726,15 @@ msgid "# bytes dropped by SMTP (outgoing)"
 msgstr "# Bytes verworfen von SMTP (ausgehend)"
 
 #: src/transport/plugin_transport_tcp.c:1060
-#: src/transport/plugin_transport_tcp.c:2379
+#: src/transport/plugin_transport_tcp.c:2386
 #, c-format
 msgid "Unexpected address length: %u bytes\n"
 msgstr ""
 
 #: src/transport/plugin_transport_tcp.c:1243
 #: src/transport/plugin_transport_tcp.c:1467
-#: src/transport/plugin_transport_tcp.c:2643
-#: src/transport/plugin_transport_tcp.c:3498
+#: src/transport/plugin_transport_tcp.c:2650
+#: src/transport/plugin_transport_tcp.c:3526
 msgid "# TCP sessions active"
 msgstr "# aktive TCP-Sitzungen"
 
@@ -7740,64 +7759,64 @@ msgstr "# Bytes verworfen von TCP (Zeitüberschreitung)"
 msgid "# bytes transmitted via TCP"
 msgstr "# Bytes über TCP übertragen"
 
-#: src/transport/plugin_transport_tcp.c:2041
+#: src/transport/plugin_transport_tcp.c:2048
 msgid "# requests to create session with invalid address"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2217
+#: src/transport/plugin_transport_tcp.c:2224
 msgid "# transport-service disconnect requests for TCP"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2702
+#: src/transport/plugin_transport_tcp.c:2716
 #, fuzzy
 msgid "# TCP WELCOME messages received"
 msgstr "# verschlüsselter PONG Nachrichten empfangen"
 
-#: src/transport/plugin_transport_tcp.c:2893
+#: src/transport/plugin_transport_tcp.c:2921
 msgid "# bytes received via TCP"
 msgstr "# Bytes empfangen über TCP"
 
-#: src/transport/plugin_transport_tcp.c:2944
-#: src/transport/plugin_transport_tcp.c:3002
+#: src/transport/plugin_transport_tcp.c:2972
+#: src/transport/plugin_transport_tcp.c:3030
 #, fuzzy
 msgid "# TCP server connections active"
 msgstr " Verbindung fehlgeschlagen\n"
 
-#: src/transport/plugin_transport_tcp.c:2948
+#: src/transport/plugin_transport_tcp.c:2976
 #, fuzzy
 msgid "# TCP server connect events"
 msgstr "# verbundener Knoten"
 
-#: src/transport/plugin_transport_tcp.c:2954
+#: src/transport/plugin_transport_tcp.c:2982
 msgid "TCP connection limit reached, suspending server\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2956
+#: src/transport/plugin_transport_tcp.c:2984
 msgid "# TCP service suspended"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2996
+#: src/transport/plugin_transport_tcp.c:3024
 msgid "# TCP service resumed"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:3006
+#: src/transport/plugin_transport_tcp.c:3034
 msgid "# network-level TCP disconnect events"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:3325
+#: src/transport/plugin_transport_tcp.c:3353
 msgid "Failed to start service.\n"
 msgstr "Fehler beim Starten des Dienstes.\n"
 
-#: src/transport/plugin_transport_tcp.c:3486
+#: src/transport/plugin_transport_tcp.c:3514
 #, c-format
 msgid "TCP transport listening on port %llu\n"
 msgstr "TCP-Transportdienst wartet auf Port %llu\n"
 
-#: src/transport/plugin_transport_tcp.c:3490
+#: src/transport/plugin_transport_tcp.c:3518
 msgid "TCP transport not listening on any port (client only)\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:3494
+#: src/transport/plugin_transport_tcp.c:3522
 #, c-format
 msgid "TCP transport advertises itself as being on port %llu\n"
 msgstr ""
@@ -7817,49 +7836,49 @@ msgstr ""
 msgid "Failed to set IPv4 broadcast option for broadcast socket on port %d\n"
 msgstr "Der Transportdienst auf Port %d konnte nicht gestartet werden.\n"
 
-#: src/transport/plugin_transport_udp.c:3367
+#: src/transport/plugin_transport_udp.c:3357
 #, c-format
 msgid ""
 "UDP could not transmit message to `%s': Network seems down, please check "
 "your network configuration\n"
 msgstr ""
 
-#: src/transport/plugin_transport_udp.c:3381
+#: src/transport/plugin_transport_udp.c:3371
 msgid ""
 "UDP could not transmit IPv6 message! Please check your network configuration "
 "and disable IPv6 if your connection does not have a global IPv6 address\n"
 msgstr ""
 
-#: src/transport/plugin_transport_udp.c:3699
-#: src/transport/plugin_transport_udp.c:3798
+#: src/transport/plugin_transport_udp.c:3689
+#: src/transport/plugin_transport_udp.c:3788
 #, fuzzy, c-format
 msgid "Failed to bind UDP socket to %s: %s\n"
 msgstr "UDP-Sockets können nicht geöffnet werden\n"
 
-#: src/transport/plugin_transport_udp.c:3717
+#: src/transport/plugin_transport_udp.c:3707
 msgid "Disabling IPv4 since it is not supported on this system!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_udp.c:3808
+#: src/transport/plugin_transport_udp.c:3798
 msgid "Failed to open UDP sockets\n"
 msgstr "UDP-Sockets können nicht geöffnet werden\n"
 
-#: src/transport/plugin_transport_udp.c:3879
-#: src/transport/plugin_transport_udp.c:3893
+#: src/transport/plugin_transport_udp.c:3869
+#: src/transport/plugin_transport_udp.c:3883
 msgid "must be in [0,65535]"
 msgstr ""
 
-#: src/transport/plugin_transport_udp.c:3925
+#: src/transport/plugin_transport_udp.c:3915
 #, fuzzy
 msgid "must be valid IPv4 address"
 msgstr "»%s« ist keine gültige IP-Adresse.\n"
 
-#: src/transport/plugin_transport_udp.c:3952
+#: src/transport/plugin_transport_udp.c:3942
 #, fuzzy
 msgid "must be valid IPv6 address"
 msgstr "»%s« ist keine gültige IP-Adresse.\n"
 
-#: src/transport/plugin_transport_udp.c:4018
+#: src/transport/plugin_transport_udp.c:4008
 #, fuzzy
 msgid "Failed to create UDP network sockets\n"
 msgstr "UDP-Sockets können nicht geöffnet werden\n"
@@ -7979,7 +7998,7 @@ msgstr ""
 msgid "Metadata `%s' failed to deserialize"
 msgstr ""
 
-#: src/util/client.c:864
+#: src/util/client.c:868
 #, c-format
 msgid "Need a non-empty hostname for service `%s'.\n"
 msgstr ""
@@ -8017,22 +8036,22 @@ msgstr ""
 msgid "INVALID"
 msgstr ""
 
-#: src/util/common_logging.c:1248
+#: src/util/common_logging.c:1302
 msgid "unknown address"
 msgstr "Unbekannte Adresse"
 
-#: src/util/common_logging.c:1290
+#: src/util/common_logging.c:1344
 msgid "invalid address"
 msgstr "Ungültige Adresse"
 
-#: src/util/common_logging.c:1308
+#: src/util/common_logging.c:1362
 #, fuzzy, c-format
 msgid "Configuration fails to specify option `%s' in section `%s'!\n"
 msgstr ""
 "Die Konfigurationsdatei muss in der Sektion `%s' unter `%s' ein Verzeichnis "
 "angeben, in dem FS Daten gespeichert werden.\n"
 
-#: src/util/common_logging.c:1329
+#: src/util/common_logging.c:1383
 #, fuzzy, c-format
 msgid ""
 "Configuration specifies invalid value for option `%s' in section `%s': %s\n"
@@ -8091,22 +8110,22 @@ msgid ""
 "%llu)\n"
 msgstr ""
 
-#: src/util/crypto_ecc.c:756
+#: src/util/crypto_ecc.c:777
 #, fuzzy, c-format
 msgid "ECC signing failed at %s:%d: %s\n"
 msgstr "`%s' schlug fehl bei %s:%d mit dem Fehler: `%s'.\n"
 
-#: src/util/crypto_ecc.c:806
+#: src/util/crypto_ecc.c:827
 #, fuzzy, c-format
 msgid "EdDSA signing failed at %s:%d: %s\n"
 msgstr "`%s' schlug fehl bei %s:%d mit dem Fehler: `%s'.\n"
 
-#: src/util/crypto_ecc.c:880
+#: src/util/crypto_ecc.c:901
 #, fuzzy, c-format
 msgid "ECDSA signature verification failed at %s:%d: %s\n"
 msgstr "RSA Signaturüberprüfung fehlgeschlagen bei %s:%d: %s\n"
 
-#: src/util/crypto_ecc.c:937
+#: src/util/crypto_ecc.c:958
 #, fuzzy, c-format
 msgid "EdDSA signature verification failed at %s:%d: %s\n"
 msgstr "RSA Signaturüberprüfung fehlgeschlagen bei %s:%d: %s\n"
@@ -8587,7 +8606,7 @@ msgid ""
 "`GNUNET_SERVER_receive_done' after %s\n"
 msgstr ""
 
-#: src/util/service.c:347 src/util/service_new.c:2343
+#: src/util/service.c:347 src/util/service_new.c:2344
 #, c-format
 msgid "Unknown address family %d\n"
 msgstr ""
@@ -8820,93 +8839,93 @@ msgstr "# PING Nachrichten erstellt"
 msgid "Protocol %u not supported, dropping\n"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:1145
+#: src/vpn/gnunet-service-vpn.c:1144
 #, fuzzy
 msgid "# Packets dropped (channel not yet online)"
 msgstr "# Bytes verworfen von TCP (ausgehend)"
 
-#: src/vpn/gnunet-service-vpn.c:1353
+#: src/vpn/gnunet-service-vpn.c:1352
 msgid "# ICMPv4 packets dropped (not allowed)"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:1374
+#: src/vpn/gnunet-service-vpn.c:1373
 msgid "# ICMPv6 packets dropped (not allowed)"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:1580
+#: src/vpn/gnunet-service-vpn.c:1579
 #, fuzzy
 msgid "# Packets received from TUN interface"
 msgstr ""
 "Die Formatüberprüfung des Pakets, das von %s:%d (UDP6) empfangen wurde, "
 "schlug fehl."
 
-#: src/vpn/gnunet-service-vpn.c:1613 src/vpn/gnunet-service-vpn.c:1649
+#: src/vpn/gnunet-service-vpn.c:1612 src/vpn/gnunet-service-vpn.c:1648
 #, c-format
 msgid "Packet received for unmapped destination `%s' (dropping it)\n"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:1659
+#: src/vpn/gnunet-service-vpn.c:1658
 msgid "Received IPv4 packet with options (dropping it)\n"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:1673
+#: src/vpn/gnunet-service-vpn.c:1672
 #, c-format
 msgid "Received packet of unknown protocol %d from TUN (dropping it)\n"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:1755
+#: src/vpn/gnunet-service-vpn.c:1754
 #, fuzzy
 msgid "# ICMP packets received from cadet"
 msgstr "# Bytes empfangen über TCP"
 
-#: src/vpn/gnunet-service-vpn.c:2095
+#: src/vpn/gnunet-service-vpn.c:2093
 #, fuzzy
 msgid "# UDP packets received from cadet"
 msgstr "# Bytes empfangen über TCP"
 
-#: src/vpn/gnunet-service-vpn.c:2251
+#: src/vpn/gnunet-service-vpn.c:2248
 #, fuzzy
 msgid "# TCP packets received from cadet"
 msgstr "# Bytes empfangen über TCP"
 
-#: src/vpn/gnunet-service-vpn.c:2403
+#: src/vpn/gnunet-service-vpn.c:2399
 msgid "Failed to find unallocated IPv4 address in VPN's range\n"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:2458
+#: src/vpn/gnunet-service-vpn.c:2454
 #, 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:2500 src/vpn/gnunet-service-vpn.c:2722
+#: src/vpn/gnunet-service-vpn.c:2496 src/vpn/gnunet-service-vpn.c:2718
 msgid "# Active destinations"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:2771
+#: src/vpn/gnunet-service-vpn.c:2767
 msgid "Failed to allocate IP address for new destination\n"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:3063
+#: src/vpn/gnunet-service-vpn.c:3059
 msgid "Must specify valid IPv6 address"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:3087
+#: src/vpn/gnunet-service-vpn.c:3083
 msgid "Must specify valid IPv6 mask"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:3095
+#: src/vpn/gnunet-service-vpn.c:3091
 msgid "IPv6 support disabled as this system does not support IPv6\n"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:3108
+#: src/vpn/gnunet-service-vpn.c:3104
 msgid "Must specify valid IPv4 address"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:3121
+#: src/vpn/gnunet-service-vpn.c:3117
 msgid "Must specify valid IPv4 mask"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:3131
+#: src/vpn/gnunet-service-vpn.c:3127
 msgid "IPv4 support disabled as this system does not support IPv4\n"
 msgstr ""
 
@@ -8975,23 +8994,35 @@ msgstr "Dienst wird über UDP angeboten"
 msgid "Setup tunnels via VPN."
 msgstr "Tunnel über VPN einrichten."
 
-#: src/include/gnunet_common.h:645 src/include/gnunet_common.h:652
-#: src/include/gnunet_common.h:662 src/include/gnunet_common.h:670
+#: src/include/gnunet_common.h:674 src/include/gnunet_common.h:681
+#: src/include/gnunet_common.h:691 src/include/gnunet_common.h:699
 #, fuzzy, c-format
 msgid "Assertion failed at %s:%d.\n"
 msgstr "`%s' schlug fehl bei %s:%d mit dem Fehler: `%s'.\n"
 
-#: src/include/gnunet_common.h:682
+#: src/include/gnunet_common.h:711
 #, fuzzy, c-format
 msgid "External protocol violation detected at %s:%d.\n"
 msgstr "Protokollverletzung auf Socket. Kommando erwartet.\n"
 
-#: src/include/gnunet_common.h:709 src/include/gnunet_common.h:718
+#: src/include/gnunet_common.h:738 src/include/gnunet_common.h:747
 #, fuzzy, c-format
 msgid "`%s' failed on file `%s' at %s:%d with error: %s\n"
 msgstr "`%s' schlug bei Datei `%s' fehl. Ort: %s:%d. Fehler: %s\n"
 
 #, fuzzy
+#~ msgid "# UPDATE requests executed"
+#~ msgstr "# dht Anfragen weitergeleitet"
+
+#, fuzzy
+#~ msgid "# UPDATE requests received"
+#~ msgstr "# Client Trace-Anfragen empfangen"
+
+#, fuzzy
+#~ msgid "Could not connect to cadet service\n"
+#~ msgstr "Verbindung zu gnunetd konnte nicht hergestellt werden.\n"
+
+#, fuzzy
 #~ msgid "Failed to run upnp client for port %u\n"
 #~ msgstr "SQLite Datenbank konnte nicht initialisiert werden.\n"
 
diff --git a/po/es.po b/po/es.po
index 89ed32c0e..3394e89ad 100644
--- a/po/es.po
+++ b/po/es.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnunet 0.9.5a\n"
 "Report-Msgid-Bugs-To: address@hidden"
-"POT-Creation-Date: 2017-01-12 17:19+0100\n"
+"POT-Creation-Date: 2017-02-20 11:12-0600\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,78 +17,78 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: src/arm/gnunet-arm.c:152
+#: src/arm/gnunet-arm.c:156
 #, 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:158
+#: src/arm/gnunet-arm.c:162
 #, 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:213 src/testbed/gnunet-service-testbed_peers.c:1139
+#: src/arm/gnunet-arm.c:222 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:215
+#: src/arm/gnunet-arm.c:224
 #, 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:217 src/testbed/gnunet-service-testbed_peers.c:1143
+#: src/arm/gnunet-arm.c:226 src/testbed/gnunet-service-testbed_peers.c:1143
 #, fuzzy
 msgid "We disconnected from ARM before we could send a request"
 msgstr "# desconexiones del par debido a una petición explícita"
 
-#: src/arm/gnunet-arm.c:219 src/testbed/gnunet-service-testbed_peers.c:1145
+#: src/arm/gnunet-arm.c:228 src/testbed/gnunet-service-testbed_peers.c:1145
 msgid "ARM API is busy"
 msgstr ""
 
 # Miguel: "timeout" lo he traducido como plazo, pero no se
 # si hay alguna palabra que lo describa mejor.
-#: src/arm/gnunet-arm.c:221 src/testbed/gnunet-service-testbed_peers.c:1147
+#: src/arm/gnunet-arm.c:230 src/testbed/gnunet-service-testbed_peers.c:1147
 #, fuzzy
 msgid "Request timed out"
 msgstr "plazo de consenso"
 
-#: src/arm/gnunet-arm.c:223 src/testbed/gnunet-service-testbed_peers.c:1149
+#: src/arm/gnunet-arm.c:232 src/testbed/gnunet-service-testbed_peers.c:1149
 #, fuzzy
 msgid "Unknown request status"
 msgstr "Usuario desconocido «%s»\n"
 
-#: src/arm/gnunet-arm.c:239 src/testbed/gnunet-service-testbed_peers.c:1165
+#: src/arm/gnunet-arm.c:248 src/testbed/gnunet-service-testbed_peers.c:1165
 #, fuzzy, c-format
 msgid "%s is stopped"
 msgstr "# elementos almacenados"
 
-#: src/arm/gnunet-arm.c:241 src/testbed/gnunet-service-testbed_peers.c:1167
+#: src/arm/gnunet-arm.c:250 src/testbed/gnunet-service-testbed_peers.c:1167
 #, fuzzy, c-format
 msgid "%s is starting"
 msgstr "'%s' comenzando\n"
 
-#: src/arm/gnunet-arm.c:243 src/testbed/gnunet-service-testbed_peers.c:1169
+#: src/arm/gnunet-arm.c:252 src/testbed/gnunet-service-testbed_peers.c:1169
 #, c-format
 msgid "%s is stopping"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:245 src/testbed/gnunet-service-testbed_peers.c:1171
+#: src/arm/gnunet-arm.c:254 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:247 src/testbed/gnunet-service-testbed_peers.c:1173
+#: src/arm/gnunet-arm.c:256 src/testbed/gnunet-service-testbed_peers.c:1173
 #, c-format
 msgid "%s is stopping already"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:249 src/testbed/gnunet-service-testbed_peers.c:1175
+#: src/arm/gnunet-arm.c:258 src/testbed/gnunet-service-testbed_peers.c:1175
 #, c-format
 msgid "%s is started already"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:251 src/testbed/gnunet-service-testbed_peers.c:1177
+#: src/arm/gnunet-arm.c:260 src/testbed/gnunet-service-testbed_peers.c:1177
 #, c-format
 msgid "%s is stopped already"
 msgstr ""
@@ -96,154 +96,154 @@ msgstr ""
 # 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:253 src/testbed/gnunet-service-testbed_peers.c:1179
+#: src/arm/gnunet-arm.c:262 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:255 src/testbed/gnunet-service-testbed_peers.c:1181
+#: src/arm/gnunet-arm.c:264 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:257
+#: src/arm/gnunet-arm.c:266
 #, 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:259 src/testbed/gnunet-service-testbed_peers.c:1185
+#: src/arm/gnunet-arm.c:268 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:291
+#: src/arm/gnunet-arm.c:300
 msgid "Fatal error initializing ARM API.\n"
 msgstr "Error fatal al inicializar la API del ARM.\n"
 
-#: src/arm/gnunet-arm.c:320 src/arm/gnunet-arm.c:329
+#: src/arm/gnunet-arm.c:328 src/arm/gnunet-arm.c:337
 #, 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:364
+#: src/arm/gnunet-arm.c:371
 #, 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:375
+#: src/arm/gnunet-arm.c:382
 #, fuzzy, c-format
 msgid "Failed to stop the ARM service: %s\n"
 msgstr "Fichero almacenado en '%s'.\n"
 
-#: src/arm/gnunet-arm.c:417
+#: src/arm/gnunet-arm.c:422
 #, fuzzy, c-format
-msgid "Failed to send a request to start the `%s' service: %%s\n"
+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:428
+#: src/arm/gnunet-arm.c:432
 #, 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:467
+#: src/arm/gnunet-arm.c:469
 #, 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:478
+#: src/arm/gnunet-arm.c:480
 #, 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:519
+#: src/arm/gnunet-arm.c:521
 #, 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:528
+#: src/arm/gnunet-arm.c:530
 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:534
+#: src/arm/gnunet-arm.c:536
 msgid "Running services:\n"
 msgstr "Servicios en ejecución:\n"
 
-#: src/arm/gnunet-arm.c:622
+#: src/arm/gnunet-arm.c:624
 #, c-format
 msgid "Now only monitoring, press CTRL-C to stop.\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:654
+#: src/arm/gnunet-arm.c:656
 #, c-format
 msgid "Stopped %s.\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:657
+#: src/arm/gnunet-arm.c:659
 #, fuzzy, c-format
 msgid "Starting %s...\n"
 msgstr "Iniciando descarga «%s».\n"
 
-#: src/arm/gnunet-arm.c:660
+#: src/arm/gnunet-arm.c:662
 #, c-format
 msgid "Stopping %s...\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:674
+#: src/arm/gnunet-arm.c:676
 #, fuzzy, c-format
 msgid "Unknown status %u for service %s.\n"
 msgstr "Solicitando incio del servicio «%s».\n"
 
-#: src/arm/gnunet-arm.c:756
+#: src/arm/gnunet-arm.c:774
 msgid "stop all GNUnet services"
 msgstr "detiene todos los servicios de GNUnet"
 
-#: src/arm/gnunet-arm.c:758
+#: src/arm/gnunet-arm.c:776
 msgid "start a particular service"
 msgstr "inicia un servicio particular"
 
-#: src/arm/gnunet-arm.c:760
+#: src/arm/gnunet-arm.c:778
 msgid "stop a particular service"
 msgstr "detiene un servicio particular"
 
-#: src/arm/gnunet-arm.c:762
+#: src/arm/gnunet-arm.c:780
 msgid "start all GNUnet default services"
 msgstr "inicia todos los servicios predeterminados de GNUnet"
 
-#: src/arm/gnunet-arm.c:765
+#: src/arm/gnunet-arm.c:783
 msgid "stop and start all GNUnet default services"
 msgstr "detiene e inicia todos los servicios predeterminados de GNUnet"
 
-#: src/arm/gnunet-arm.c:768
+#: src/arm/gnunet-arm.c:786
 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:771
+#: src/arm/gnunet-arm.c:789
 msgid "monitor ARM activities"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:773
+#: src/arm/gnunet-arm.c:791
 msgid "don't print status messages"
 msgstr "no imprime mensajes de estado"
 
-#: src/arm/gnunet-arm.c:776
+#: src/arm/gnunet-arm.c:794
 msgid "exit with error status if operation does not finish after DELAY"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:778
+#: src/arm/gnunet-arm.c:796
 msgid "list currently running services"
 msgstr "lista de servicios actualmente en ejecución"
 
-#: src/arm/gnunet-arm.c:780
+#: src/arm/gnunet-arm.c:798
 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:782
+#: src/arm/gnunet-arm.c:800
 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:794
+#: src/arm/gnunet-arm.c:812
 msgid "Control services and the Automated Restart Manager (ARM)"
 msgstr ""
 "Servicios de control y el Gestor de Reinicio Automático (ARM en inglés)"
@@ -260,8 +260,9 @@ msgstr ""
 #: src/arm/gnunet-service-arm.c:393 src/arm/gnunet-service-arm.c:399
 #: src/transport/plugin_transport_tcp.c:652
 #: src/transport/plugin_transport_tcp.c:658
-#: src/transport/plugin_transport_tcp.c:3309 src/util/service.c:584
-#: src/util/service.c:590 src/util/service_new.c:637 src/util/service_new.c:643
+#: src/transport/plugin_transport_tcp.c:3337 src/util/service.c:584
+#: src/util/service.c:590 src/util/service_new.c:637
+#: src/util/service_new.c:643
 #, c-format
 msgid "Require valid port number for service `%s' in configuration!\n"
 msgstr ""
@@ -269,14 +270,14 @@ msgstr ""
 "configuración!\n"
 
 #: src/arm/gnunet-service-arm.c:430 src/transport/plugin_transport_tcp.c:689
-#: src/util/client.c:464 src/util/service.c:621 src/util/service_new.c:682
+#: src/util/client.c:466 src/util/service.c:621 src/util/service_new.c:682
 #, c-format
 msgid "UNIXPATH `%s' too long, maximum length is %llu\n"
 msgstr ""
 "La ruta tipo UNIX «%s» es demasiado larga, la longitud máxima es %llu\n"
 
 #: src/arm/gnunet-service-arm.c:434 src/transport/plugin_transport_tcp.c:693
-#: src/util/client.c:469 src/util/service.c:625 src/util/service_new.c:687
+#: src/util/client.c:471 src/util/service.c:625 src/util/service_new.c:687
 #, c-format
 msgid "Using `%s' instead\n"
 msgstr "Usando «%s» en su defecto\n"
@@ -415,12 +416,14 @@ msgstr ""
 "No hay configurada una cuota de salida para la red «%s», asignando el ancho "
 "de banda predeterminado %llu\n"
 
-#: src/ats/gnunet-ats-solver-eval.c:3293 src/ats-tests/gnunet-solver-eval.c:935
+#: 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:938
+#: 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 ""
@@ -698,94 +701,109 @@ msgstr "salida prolija (incluye las propiedades de 
direcciones del ATS)"
 msgid "Print information about ATS state"
 msgstr "Imprime información acerca del estado del ATS"
 
-#: src/auction/gnunet-auction-create.c:69
+#: src/auction/gnunet-auction-create.c:160
 msgid "description of the item to be sold"
 msgstr ""
 
-#: src/auction/gnunet-auction-create.c:72
+#: src/auction/gnunet-auction-create.c:163
 msgid "mapping of possible prices"
 msgstr ""
 
-#: src/auction/gnunet-auction-create.c:75
+#: src/auction/gnunet-auction-create.c:166
 msgid "max duration per round"
 msgstr ""
 
-#: src/auction/gnunet-auction-create.c:78
+#: src/auction/gnunet-auction-create.c:169
 msgid "duration until auction starts"
 msgstr ""
 
-#: src/auction/gnunet-auction-create.c:81
-msgid "number of items to sell, 0 for first price auction"
+#: src/auction/gnunet-auction-create.c:172
+msgid ""
+"number of items to sell\n"
+"0 for first price auction\n"
+">0 for vickrey/M+1st price auction"
 msgstr ""
 
-#: src/auction/gnunet-auction-create.c:84
+#: src/auction/gnunet-auction-create.c:177
 #, fuzzy
 msgid "public auction outcome"
 msgstr "_Opciones"
 
-#: src/auction/gnunet-auction-create.c:94 src/auction/gnunet-auction-info.c:76
-#: src/auction/gnunet-auction-join.c:76
+#: src/auction/gnunet-auction-create.c:180
+msgid "keep running in foreground until auction completes"
+msgstr ""
+
+#: src/auction/gnunet-auction-create.c:190
+msgid "create a new auction and start listening for bidders"
+msgstr ""
+
+#: src/auction/gnunet-auction-info.c:76 src/auction/gnunet-auction-join.c:76
 #: src/conversation/gnunet-conversation-test.c:243
 #: src/revocation/gnunet-revocation.c:550 src/template/gnunet-template.c:76
 msgid "help text"
 msgstr "texto de ayuda"
 
-#: 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:787
+#: src/cadet/gnunet-cadet.c:668
 #, fuzzy, c-format
 msgid "Invalid peer ID `%s'\n"
 msgstr "URI no válida: «%s»\n"
 
-#: src/cadet/gnunet-cadet.c:825
+#: src/cadet/gnunet-cadet.c:706
 #, fuzzy, c-format
 msgid "Invalid tunnel owner `%s'\n"
 msgstr "Formato de tiempo no válido «%s»\n"
 
-#: src/cadet/gnunet-cadet.c:892
+#: src/cadet/gnunet-cadet.c:779
 msgid "You must NOT give a TARGET when using 'request all' options\n"
 msgstr ""
 
-#: src/cadet/gnunet-cadet.c:982
+#: src/cadet/gnunet-cadet.c:870
+#, fuzzy, c-format
+msgid "Invalid target `%s'\n"
+msgstr "Parámetro no válido «%s»\n"
+
+#: src/cadet/gnunet-cadet.c:907
+#, fuzzy
+msgid "No action requested\n"
+msgstr "Colección detenida.\n"
+
+#: src/cadet/gnunet-cadet.c:929
 #, fuzzy
 msgid "provide information about a particular connection"
 msgstr "proveer información acerca de un túnel en particular"
 
-#: src/cadet/gnunet-cadet.c:985
+#: src/cadet/gnunet-cadet.c:932
 msgid "activate echo mode"
 msgstr ""
 
-#: src/cadet/gnunet-cadet.c:988
+#: src/cadet/gnunet-cadet.c:935
 msgid "dump debug information to STDERR"
 msgstr ""
 
-#: src/cadet/gnunet-cadet.c:994
+#: src/cadet/gnunet-cadet.c:938
 msgid "port to listen to"
 msgstr ""
 
-#: src/cadet/gnunet-cadet.c:997
+#: src/cadet/gnunet-cadet.c:941
 #, fuzzy
 msgid "provide information about a patricular peer"
 msgstr "proveer información acerca de un túnel en particular"
 
-#: src/cadet/gnunet-cadet.c:1000
+#: src/cadet/gnunet-cadet.c:944
 #, fuzzy
 msgid "provide information about all peers"
 msgstr "proveer información acerca de un túnel en particular"
 
-#: src/cadet/gnunet-cadet.c:1003
+#: src/cadet/gnunet-cadet.c:947
 msgid "provide information about a particular tunnel"
 msgstr "proveer información acerca de un túnel en particular"
 
-#: src/cadet/gnunet-cadet.c:1006
+#: src/cadet/gnunet-cadet.c:950
 #, 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:686
+#: src/cadet/gnunet-service-cadet_peer.c:687
 msgid "Wrong CORE service\n"
 msgstr "Servicio principal (CORE) erróneo\n"
 
@@ -1349,13 +1367,13 @@ msgstr "# bytes de mensajes del tipo %u recibidos"
 msgid "# messages discarded (session disconnected)"
 msgstr "# mensajes descartados (sesión desconectada)"
 
-#: src/core/gnunet-service-core.c:928
+#: src/core/gnunet-service-core.c:937
 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
+#: src/core/gnunet-service-core.c:958
 #, fuzzy, c-format
 msgid "Core service of `%s' ready.\n"
 msgstr "El servicio principal de «%4s» está listo.\n"
@@ -1472,32 +1490,32 @@ msgstr ""
 msgid "# sessions terminated by key expiration"
 msgstr "# sesiones terminadas por plazo de expiración"
 
-#: src/core/gnunet-service-core_kx.c:1554
-#: src/core/gnunet-service-core_kx.c:1580
+#: src/core/gnunet-service-core_kx.c:1557
+#: src/core/gnunet-service-core_kx.c:1583
 msgid "# bytes dropped (duplicates)"
 msgstr "# bytes omitidos (duplicados)"
 
-#: src/core/gnunet-service-core_kx.c:1567
+#: src/core/gnunet-service-core_kx.c:1570
 msgid "# bytes dropped (out of sequence)"
 msgstr "# bytes omitidos (fuera de secuencia)"
 
-#: src/core/gnunet-service-core_kx.c:1609
+#: src/core/gnunet-service-core_kx.c:1612
 msgid "# bytes dropped (ancient message)"
 msgstr "# bytes omitidos (mensaje antiguo)"
 
-#: src/core/gnunet-service-core_kx.c:1617
+#: src/core/gnunet-service-core_kx.c:1620
 msgid "# bytes of payload decrypted"
 msgstr "# bytes de «payload» descifrados"
 
-#: src/core/gnunet-service-core_kx.c:1674
+#: src/core/gnunet-service-core_kx.c:1681
 #, fuzzy
 msgid "# PAYLOAD dropped (out of order)"
 msgstr "# bytes omitidos (fuera de secuencia)"
 
-#: src/core/gnunet-service-core_sessions.c: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/core/gnunet-service-core_sessions.c:266
+#: src/core/gnunet-service-core_sessions.c:356
+#: src/dht/gnunet-service-dht_neighbours.c:732
+#: src/dht/gnunet-service-dht_neighbours.c:794
 #: 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
@@ -1506,26 +1524,26 @@ msgstr "# bytes omitidos (fuera de secuencia)"
 msgid "# peers connected"
 msgstr "# pares conectados"
 
-#: src/core/gnunet-service-core_sessions.c:287
+#: src/core/gnunet-service-core_sessions.c:302
 msgid "# type map refreshes sent"
 msgstr "# envíos de refrescos del mapa de tipos"
 
-#: src/core/gnunet-service-core_sessions.c:407
+#: src/core/gnunet-service-core_sessions.c:422
 #, 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:418
+#: src/core/gnunet-service-core_sessions.c:439
 #, fuzzy
 msgid "# valid typemap confirmations received"
 msgstr "Se produjo un fallo al encolar una confirmación de recepción\n"
 
 #: src/core/gnunet-service-core_typemap.c:169
-#: src/core/gnunet-service-core_typemap.c:180
+#: src/core/gnunet-service-core_typemap.c:181
 msgid "# type maps received"
 msgstr "# mapas de tipos recibidos"
 
-#: src/core/gnunet-service-core_typemap.c:210
+#: src/core/gnunet-service-core_typemap.c:212
 msgid "# updates to my type map"
 msgstr "# actualizaciones de mi mapa de tipos"
 
@@ -1567,7 +1585,7 @@ msgstr "# peticiones recibidas"
 msgid "# proximity search requests received"
 msgstr "# búsquedas de clientes recibidas"
 
-#: src/datacache/plugin_datacache_heap.c:467
+#: src/datacache/plugin_datacache_heap.c:466
 msgid "Heap datacache running\n"
 msgstr "Caché de datos de montículo (heap) ejecutándose\n"
 
@@ -1588,7 +1606,7 @@ msgstr "Caché de datos de montículo (heap) ejecutándose\n"
 #: 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:691 src/include/gnunet_common.h:700
+#: src/include/gnunet_common.h:720 src/include/gnunet_common.h:729
 #: src/scalarproduct/scalarproduct.h:35
 #, c-format
 msgid "`%s' failed at %s:%d with error: %s\n"
@@ -1644,23 +1662,19 @@ msgstr "# peticiones «RESERVE» ejecutadas"
 msgid "# RELEASE RESERVE requests executed"
 msgstr "# Peticiones «RELEASE RESERVE» ejecutadas"
 
-#: src/datastore/datastore_api.c:1187
-msgid "# UPDATE requests executed"
-msgstr "# peticiones «UPDATE» ejecutadas"
-
-#: src/datastore/datastore_api.c:1271
+#: src/datastore/datastore_api.c:1205
 msgid "# REMOVE requests executed"
 msgstr "# peticiones «REMOVE» ejecutadas"
 
-#: src/datastore/datastore_api.c:1331
+#: src/datastore/datastore_api.c:1265
 msgid "# GET REPLICATION requests executed"
 msgstr "# peticiones «GET REPLICATION» ejecutadas"
 
-#: src/datastore/datastore_api.c:1397
+#: src/datastore/datastore_api.c:1331
 msgid "# GET ZERO ANONYMITY requests executed"
 msgstr "# peticiones «GET ZERO ANONYMITY» ejecutadas"
 
-#: src/datastore/datastore_api.c:1477
+#: src/datastore/datastore_api.c:1411
 msgid "# GET requests executed"
 msgstr "# peticiones «GET» ejecutadas"
 
@@ -1730,7 +1744,7 @@ msgstr "Espacio insuficiente para satisfacer la petición"
 #: 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
+#: src/datastore/gnunet-service-datastore.c:1619
 msgid "# reserved"
 msgstr "# reservado"
 
@@ -1757,32 +1771,28 @@ msgstr "# peticiones «GET» recibidas"
 msgid "# requests filtered by bloomfilter"
 msgstr "# peticiones filtradas por el «bloomfilter»"
 
-#: src/datastore/gnunet-service-datastore.c:1115
-msgid "# UPDATE requests received"
-msgstr "# peticiones «UPDATE» recibidas"
-
-#: src/datastore/gnunet-service-datastore.c:1146
+#: src/datastore/gnunet-service-datastore.c:1097
 msgid "# GET REPLICATION requests received"
 msgstr "# peticiones «GET REPLICATION» recibidas"
 
-#: src/datastore/gnunet-service-datastore.c:1179
+#: src/datastore/gnunet-service-datastore.c:1130
 msgid "# GET ZERO ANONYMITY requests received"
 msgstr "# peticiones «GET ZERO ANONYMITY» recibidas"
 
-#: src/datastore/gnunet-service-datastore.c:1226
+#: src/datastore/gnunet-service-datastore.c:1177
 msgid "Content not found"
 msgstr "Contenido no encontrado"
 
-#: src/datastore/gnunet-service-datastore.c:1235
+#: src/datastore/gnunet-service-datastore.c:1186
 msgid "# bytes removed (explicit request)"
 msgstr "# bytes eliminados (petición explícita)"
 
-#: src/datastore/gnunet-service-datastore.c:1282
+#: src/datastore/gnunet-service-datastore.c:1233
 msgid "# REMOVE requests received"
 msgstr "# peticiones «REMOVE» recibidas"
 
 # Miguel: ¿Cómo traducir «payload»? ¿Código cargado?
-#: src/datastore/gnunet-service-datastore.c:1336
+#: src/datastore/gnunet-service-datastore.c:1287
 #, fuzzy, c-format
 msgid ""
 "Datastore payload must have been inaccurate (%lld < %lld). Recomputing it.\n"
@@ -1790,67 +1800,67 @@ msgstr ""
 "El «payload» del almacén de datos es impreciso (%lld < %lld).  Intentando "
 "repararlo.\n"
 
-#: src/datastore/gnunet-service-datastore.c:1342
-#: src/datastore/gnunet-service-datastore.c:1517
+#: src/datastore/gnunet-service-datastore.c:1293
+#: src/datastore/gnunet-service-datastore.c:1468
 #, c-format
 msgid "New payload: %lld\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1396
+#: src/datastore/gnunet-service-datastore.c:1347
 #, 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:1408
+#: src/datastore/gnunet-service-datastore.c:1359
 #, 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:1468
+#: src/datastore/gnunet-service-datastore.c:1419
 msgid "Bloomfilter construction complete.\n"
 msgstr "Construcción de «bloomfilter» completa.\n"
 
-#: src/datastore/gnunet-service-datastore.c:1524
+#: src/datastore/gnunet-service-datastore.c:1475
 msgid "Rebuilding bloomfilter.  Please be patient.\n"
 msgstr "Reconstruyendo «bloomfilter».  Por favor, tenga paciencia.\n"
 
-#: src/datastore/gnunet-service-datastore.c:1535
+#: src/datastore/gnunet-service-datastore.c:1486
 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:1705
+#: src/datastore/gnunet-service-datastore.c:1656
 #, 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:1721
+#: src/datastore/gnunet-service-datastore.c:1672
 msgid "# quota"
 msgstr "# cuota"
 
-#: src/datastore/gnunet-service-datastore.c:1726
+#: src/datastore/gnunet-service-datastore.c:1677
 msgid "# cache size"
 msgstr "# tamaño de la caché"
 
-#: src/datastore/gnunet-service-datastore.c:1742
+#: src/datastore/gnunet-service-datastore.c:1693
 #, 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:1760
-#: src/datastore/gnunet-service-datastore.c:1776
+#: src/datastore/gnunet-service-datastore.c:1711
+#: src/datastore/gnunet-service-datastore.c:1727
 #, c-format
 msgid "Failed to remove bogus bloomfilter file `%s'\n"
 msgstr ""
 "Se produjo un fallo al borrar el fichero de configuración defectuoso de "
 "«bloomfilter» «%s»:\n"
 
-#: src/datastore/gnunet-service-datastore.c:1808
+#: src/datastore/gnunet-service-datastore.c:1759
 msgid "Failed to initialize bloomfilter.\n"
 msgstr "Se produjo un fallo al inicializar «bloomfilter».\n"
 
-#: src/datastore/plugin_datastore_heap.c:826
+#: src/datastore/plugin_datastore_heap.c:824
 msgid "Heap database running\n"
 msgstr "Base de datos de montículo ejecutándose\n"
 
@@ -1937,7 +1947,7 @@ msgstr "Base de datos sqlite ejecutándose\n"
 msgid "Template database running\n"
 msgstr "Base de datos de plantilla ejecutándose\n"
 
-#: src/dht/gnunet-dht-get.c:155
+#: src/dht/gnunet-dht-get.c:157
 #, c-format
 msgid ""
 "Result %d, type %d:\n"
@@ -1946,48 +1956,48 @@ msgstr ""
 "Resultado %d, tipo %d:\n"
 "%.*s\n"
 
-#: src/dht/gnunet-dht-get.c:181
+#: src/dht/gnunet-dht-get.c:204
 msgid "Must provide key for DHT GET!\n"
 msgstr "¡Se debe proveer una clave para el «GET» DHT!\n"
 
-#: src/dht/gnunet-dht-get.c:187 src/dht/gnunet-dht-monitor.c:248
+#: src/dht/gnunet-dht-get.c:210 src/dht/gnunet-dht-monitor.c:248
 msgid "Failed to connect to DHT service!\n"
 msgstr "¡Se produjo un fallo al conectar con el servicio DHT!\n"
 
-#: src/dht/gnunet-dht-get.c:195
+#: src/dht/gnunet-dht-get.c:218
 msgid "Issueing DHT GET with key"
 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:198
+#: src/dht/gnunet-dht-get.c:235 src/dht/gnunet-dht-monitor.c:289
+#: src/dht/gnunet-dht-put.c:207
 msgid "the query key"
 msgstr "la clave de búsqueda"
 
-#: src/dht/gnunet-dht-get.c:215
+#: src/dht/gnunet-dht-get.c:238
 msgid "how many parallel requests (replicas) to create"
 msgstr "cuantas peticiones paralelas (réplicas) crear"
 
-#: src/dht/gnunet-dht-get.c:218 src/dht/gnunet-dht-monitor.c:292
+#: src/dht/gnunet-dht-get.c:241 src/dht/gnunet-dht-monitor.c:292
 msgid "the type of data to look for"
 msgstr "el tipo de datos a buscar"
 
-#: src/dht/gnunet-dht-get.c:221
+#: src/dht/gnunet-dht-get.c:244
 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:201
+#: src/dht/gnunet-dht-get.c:247 src/dht/gnunet-dht-put.c:210
 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:210 src/fs/gnunet-auto-share.c:780
+#: src/dht/gnunet-dht-get.c:250 src/dht/gnunet-dht-monitor.c:298
+#: src/dht/gnunet-dht-put.c:222 src/fs/gnunet-auto-share.c:780
 #: src/fs/gnunet-download.c:327 src/fs/gnunet-publish.c:951
 #: src/fs/gnunet-search.c:322 src/fs/gnunet-unindex.c:167
 #: src/nse/gnunet-nse-profiler.c:855
 msgid "be verbose (print progress information)"
 msgstr "ser prolijo (imprime información de progreso)"
 
-#: src/dht/gnunet-dht-get.c:248
+#: src/dht/gnunet-dht-get.c:271
 msgid "Issue a GET request to the GNUnet DHT, prints results."
 msgstr ""
 "Iniciando una peticion «GET» a la DHT de GNUnet, imprimiendo resultados."
@@ -2000,7 +2010,8 @@ msgstr "cuanto tiempo debe ejecutarse el comando de 
monitorización"
 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:1161 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"
@@ -2047,65 +2058,70 @@ msgstr ""
 msgid "Measure quality and performance of the DHT service."
 msgstr "Medir la calidad y rendimiento del servicio NSE."
 
-#: src/dht/gnunet-dht-put.c:115
+#: src/dht/gnunet-dht-put.c:120
 msgid "PUT request sent with key"
 msgstr "Petición «PUT» enviada con clave"
 
-#: src/dht/gnunet-dht-put.c:118
+#: src/dht/gnunet-dht-put.c:123
 msgid "Timeout sending PUT request!\n"
 msgstr "¡Expiró el plazo enviando una petición «PUT»!\n"
 
-#: src/dht/gnunet-dht-put.c:121
+#: src/dht/gnunet-dht-put.c:126
 msgid "PUT request not confirmed!\n"
 msgstr "¡Petición «PUT» no confirmada!\n"
 
-#: src/dht/gnunet-dht-put.c:151
+#: src/dht/gnunet-dht-put.c:157
 msgid "Must provide KEY and DATA for DHT put!\n"
 msgstr "¡Se deben proveer «KEY» y «DATA» para una subida a la DHT!\n"
 
-#: src/dht/gnunet-dht-put.c:158
+#: src/dht/gnunet-dht-put.c:164
 #, c-format
 msgid "Could not connect to %s service!\n"
 msgstr "¡No se pudo conectar al servicio %s!\n"
 
-#: src/dht/gnunet-dht-put.c:172
+#: src/dht/gnunet-dht-put.c:175
 #, c-format
 msgid "Issuing put request for `%s' with data `%s'!\n"
 msgstr "¡Iniciando petición de subida para «%s» con datos «%s»!\n"
 
-#: src/dht/gnunet-dht-put.c:192
+#: src/dht/gnunet-dht-put.c:201
 msgid "the data to insert under the key"
 msgstr "los datos a insertar bajo la clave"
 
-#: src/dht/gnunet-dht-put.c:195
+#: src/dht/gnunet-dht-put.c:204
 msgid "how long to store this entry in the dht (in seconds)"
 msgstr "cuanto tiempo almacenar esta entrada en la DHT (en segundos)"
 
-#: src/dht/gnunet-dht-put.c:204
+#: src/dht/gnunet-dht-put.c:213
 msgid "how many replicas to create"
 msgstr "cuantas réplicas crear"
 
-#: src/dht/gnunet-dht-put.c:207
+#: src/dht/gnunet-dht-put.c:216
+#, fuzzy
+msgid "use DHT's record route option"
+msgstr "opción para usar el demultiplexado de la DHT siempre"
+
+#: src/dht/gnunet-dht-put.c:219
 msgid "the type to insert data as"
 msgstr "el tipo de datos a insertar"
 
-#: src/dht/gnunet-dht-put.c:232
+#: src/dht/gnunet-dht-put.c:247
 msgid "Issue a PUT request to the GNUnet DHT insert DATA under KEY."
 msgstr ""
 "Inicianco una petición «PUT» a la DHT de GNUnet para insertar «DATA» bajo "
 "«KEY»."
 
-#: src/dht/gnunet-service-dht_clients.c:370
+#: src/dht/gnunet-service-dht_clients.c:369
 #: src/dht/gnunet-service-wdht_clients.c:864
 msgid "# GET requests from clients injected"
 msgstr "# peticiones «GET» inyectadas de clientes"
 
-#: src/dht/gnunet-service-dht_clients.c:481
+#: src/dht/gnunet-service-dht_clients.c:482
 #: 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:620
+#: src/dht/gnunet-service-dht_clients.c:621
 #: src/dht/gnunet-service-wdht_clients.c:1011
 msgid "# GET requests received from clients"
 msgstr "# peticiones «GET» recibidas de clientes"
@@ -2128,18 +2144,18 @@ msgid "# Duplicate REPLIES to CLIENT request dropped"
 msgstr ""
 "# Peticiones duplicadas de respuestas (REPLIES) a clientes (CLIENT) omitidas"
 
-#: src/dht/gnunet-service-dht_clients.c:1094
+#: src/dht/gnunet-service-dht_clients.c:1093
 #: src/dht/gnunet-service-wdht_clients.c:566
 #, c-format
 msgid "Unsupported block type (%u) in request!\n"
 msgstr "¡Tipo de bloque no soportado (%u) en la petición!\n"
 
-#: src/dht/gnunet-service-dht_clients.c:1101
+#: src/dht/gnunet-service-dht_clients.c:1100
 #: src/dht/gnunet-service-wdht_clients.c:589
 msgid "# RESULTS queued for clients"
 msgstr "# Resultados (RESULTS) encolados para clientes"
 
-#: src/dht/gnunet-service-dht_clients.c:1179
+#: src/dht/gnunet-service-dht_clients.c:1178
 #: src/dht/gnunet-service-wdht_clients.c:643
 #: src/dht/gnunet-service-wdht_clients.c:693
 msgid "# REPLIES ignored for CLIENTS (no match)"
@@ -2155,69 +2171,70 @@ msgstr "¡Petición %s recibida, pero no tiene caché de 
datos!\n"
 msgid "# ITEMS stored in datacache"
 msgstr "# Elementos (ITEMS) almacenados en la caché de datos"
 
-#: src/dht/gnunet-service-dht_datacache.c:199
+#: src/dht/gnunet-service-dht_datacache.c:198
 msgid "# Good RESULTS found in datacache"
 msgstr "# Buenos resultados (RESULTS) encontrados en la caché de datos"
 
-#: src/dht/gnunet-service-dht_datacache.c:211
+#: src/dht/gnunet-service-dht_datacache.c:210
 msgid "# Duplicate RESULTS found in datacache"
 msgstr "# Resultados (RESULTS) duplicados encontrados en la caché de datos"
 
-#: src/dht/gnunet-service-dht_datacache.c:217
+#: src/dht/gnunet-service-dht_datacache.c:216
 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:223
+#: src/dht/gnunet-service-dht_datacache.c:222
 msgid "# Irrelevant RESULTS found in datacache"
 msgstr "# Resultados (RESULTS) irrelevantes encontrados en la caché de datos"
 
-#: src/dht/gnunet-service-dht_datacache.c:235
+#: src/dht/gnunet-service-dht_datacache.c:234
 msgid "# Unsupported RESULTS found in datacache"
 msgstr "# Resultados (RESULTS) no soportados encontrados en la caché de datos"
 
-#: src/dht/gnunet-service-dht_datacache.c:239
+#: src/dht/gnunet-service-dht_datacache.c:238
 #, 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:276
+#: src/dht/gnunet-service-dht_datacache.c:273
 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:86
+#: src/dht/gnunet-service-xdht_hello.c:82
 msgid "# HELLOs obtained from peerinfo"
 msgstr "# «HELLO» obtenidos de «peerinfo»"
 
-#: src/dht/gnunet-service-dht_neighbours.c:685
+#: src/dht/gnunet-service-dht_neighbours.c:671
 msgid "# FIND PEER messages initiated"
 msgstr "# mensajes «FIND PEER» iniciados"
 
-#: src/dht/gnunet-service-dht_neighbours.c:851
+#: src/dht/gnunet-service-dht_neighbours.c:842
 #, fuzzy
 msgid "# requests TTL-dropped"
 msgstr "# peticiones unidas"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1054
-#: src/dht/gnunet-service-dht_neighbours.c:1091
+#: src/dht/gnunet-service-dht_neighbours.c:1045
+#: src/dht/gnunet-service-dht_neighbours.c:1082
 msgid "# Peers excluded from routing due to Bloomfilter"
 msgstr "# Pares excluidos del encaminado debido a «Bloomfilter»"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1071
-#: src/dht/gnunet-service-dht_neighbours.c:1107
+#: src/dht/gnunet-service-dht_neighbours.c:1062
+#: src/dht/gnunet-service-dht_neighbours.c:1098
 msgid "# Peer selection failed"
 msgstr "# Selecciones de pares fallidas"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1255
+#: src/dht/gnunet-service-dht_neighbours.c:1246
 msgid "# PUT requests routed"
 msgstr "# Peticiones «PUT» encaminadas"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1288
+#: src/dht/gnunet-service-dht_neighbours.c:1279
 msgid "# PUT messages queued for transmission"
 msgstr "# mensajes «PUT» encolados para transmisión"
 
-#: 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-dht_neighbours.c:1290
+#: src/dht/gnunet-service-dht_neighbours.c:1430
+#: src/dht/gnunet-service-dht_neighbours.c:1533
 #: src/dht/gnunet-service-xdht_neighbours.c:946
 #: src/dht/gnunet-service-xdht_neighbours.c:1007
 #: src/dht/gnunet-service-xdht_neighbours.c:1047
@@ -2230,57 +2247,57 @@ msgstr "# mensajes «PUT» encolados para transmisión"
 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:1383
+#: src/dht/gnunet-service-dht_neighbours.c:1375
 msgid "# GET requests routed"
 msgstr "# Peticiones «GET» encaminadas"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1415
+#: src/dht/gnunet-service-dht_neighbours.c:1418
 msgid "# GET messages queued for transmission"
 msgstr "# Mensajes «GET» encolados para transmisión"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1547
+#: src/dht/gnunet-service-dht_neighbours.c:1548
 msgid "# RESULT messages queued for transmission"
 msgstr "# Mensajes «RESULT» encolados para transmisión"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1646
+#: src/dht/gnunet-service-dht_neighbours.c:1647
 msgid "# P2P PUT requests received"
 msgstr "# Peticiones «PUT» P2P recibidas"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1650
+#: src/dht/gnunet-service-dht_neighbours.c:1651
 #, fuzzy
 msgid "# P2P PUT bytes received"
 msgstr "# Peticiones «PUT» P2P recibidas"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1858
+#: src/dht/gnunet-service-dht_neighbours.c:1869
 msgid "# FIND PEER requests ignored due to Bloomfilter"
 msgstr "# Peticiones «FIND PEER» ignoradas debido a «Bloomfilter»"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1866
+#: src/dht/gnunet-service-dht_neighbours.c:1877
 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:2022
+#: src/dht/gnunet-service-dht_neighbours.c:2029
 msgid "# P2P GET requests received"
 msgstr "# Peticiones «GET» P2P recibidas"
 
-#: src/dht/gnunet-service-dht_neighbours.c:2026
+#: src/dht/gnunet-service-dht_neighbours.c:2033
 #, fuzzy
 msgid "# P2P GET bytes received"
 msgstr "# Peticiones «GET» P2P recibidas"
 
-#: src/dht/gnunet-service-dht_neighbours.c:2101
+#: src/dht/gnunet-service-dht_neighbours.c:2104
 msgid "# P2P FIND PEER requests processed"
 msgstr "# Peticiones «FIND PEER» P2P procesadas"
 
-#: src/dht/gnunet-service-dht_neighbours.c:2124
+#: src/dht/gnunet-service-dht_neighbours.c:2125
 msgid "# P2P GET requests ONLY routed"
 msgstr "# Peticiones «GET» P2P SOLAMENTE encaminadas"
 
-#: src/dht/gnunet-service-dht_neighbours.c:2226
+#: src/dht/gnunet-service-dht_neighbours.c:2223
 msgid "# P2P RESULTS received"
 msgstr "# Resultados (RESULTS) P2P recibidos"
 
-#: src/dht/gnunet-service-dht_neighbours.c:2230
+#: src/dht/gnunet-service-dht_neighbours.c:2227
 #, fuzzy
 msgid "# P2P RESULT bytes received"
 msgstr "# Resultados (RESULTS) P2P recibidos"
@@ -2289,33 +2306,33 @@ msgstr "# Resultados (RESULTS) P2P recibidos"
 msgid "# Network size estimates received"
 msgstr "# Estimaciones del tamaño de red recibidas"
 
-#: src/dht/gnunet-service-dht_routing.c:220
+#: src/dht/gnunet-service-dht_routing.c:218
 msgid "# Good REPLIES matched against routing table"
 msgstr ""
 "# Buenas respuestas (REPLIES) encontradas en la tabla de encaminamiento"
 
-#: src/dht/gnunet-service-dht_routing.c:229
+#: src/dht/gnunet-service-dht_routing.c:232
 msgid "# Duplicate REPLIES matched against routing table"
 msgstr ""
 "# Respuestas (REPLIES) duplicadas encontradas en la tabla de encaminamiento"
 
-#: src/dht/gnunet-service-dht_routing.c:235
+#: src/dht/gnunet-service-dht_routing.c:238
 msgid "# Invalid REPLIES matched against routing table"
 msgstr ""
 "# Respuestas (REPLIES) no válidas encontradas en la tabla de encaminamiento"
 
-#: src/dht/gnunet-service-dht_routing.c:241
+#: src/dht/gnunet-service-dht_routing.c:244
 msgid "# Irrelevant REPLIES matched against routing table"
 msgstr ""
 "# Respuestas (REPLIES) irrelevantes encontradas en la tabla de encaminamiento"
 
-#: src/dht/gnunet-service-dht_routing.c:253
+#: src/dht/gnunet-service-dht_routing.c:256
 msgid "# Unsupported REPLIES matched against routing table"
 msgstr ""
 "# Respuestas (REPLIES) no soportadas encontradas en la tabla de "
 "encaminamiento"
 
-#: src/dht/gnunet-service-dht_routing.c:329
+#: src/dht/gnunet-service-dht_routing.c:335
 msgid "# Entries removed from routing table"
 msgstr "# Entradas eliminadas de la tabla de encaminamiento"
 
@@ -2323,7 +2340,7 @@ msgstr "# Entradas eliminadas de la tabla de 
encaminamiento"
 msgid "# Entries added to routing table"
 msgstr "# Entradas añadidas a la tabla de encaminamiento"
 
-#: src/dht/gnunet-service-dht_routing.c:429
+#: src/dht/gnunet-service-dht_routing.c:433
 msgid "# DHT requests combined"
 msgstr "# Peticiones a la DHT combinadas"
 
@@ -2436,16 +2453,16 @@ msgid ""
 "SUPU %s, %s, %d, trail->prev_hop = %s"
 msgstr ""
 
-#: src/dht/plugin_block_dht.c:144
+#: src/dht/plugin_block_dht.c:167
 #, c-format
 msgid "Block not of type %u\n"
 msgstr "El bloque no es del tipo %u\n"
 
-#: src/dht/plugin_block_dht.c:151
+#: src/dht/plugin_block_dht.c:174
 msgid "Size mismatch for block\n"
 msgstr "Discrepancias de tamaños para el bloque\n"
 
-#: src/dht/plugin_block_dht.c:161
+#: src/dht/plugin_block_dht.c:184
 #, c-format
 msgid "Block of type %u is malformed\n"
 msgstr "El bloque del tipo %u está mal formado\n"
@@ -2554,7 +2571,7 @@ msgstr "# Paquetes UDP no-DNS recibidos vía interfaz TUN"
 msgid "# DNS requests received via TUN interface"
 msgstr "# Peticiones DNS recibidas vía interfaz TUN"
 
-#: src/dns/gnunet-service-dns.c:1078 src/exit/gnunet-daemon-exit.c:3643
+#: src/dns/gnunet-service-dns.c:1078 src/exit/gnunet-daemon-exit.c:3642
 msgid "need a valid IPv4 or IPv6 address\n"
 msgstr "se necesita una dirección IPv4 o IPv6 válida\n"
 
@@ -2572,177 +2589,177 @@ msgstr ""
 msgid "Print information about DV state"
 msgstr "Imprime información acerca del estado del ATS"
 
-#: src/exit/gnunet-daemon-exit.c:805 src/exit/gnunet-daemon-exit.c:3109
+#: src/exit/gnunet-daemon-exit.c:804 src/exit/gnunet-daemon-exit.c:3108
 #, fuzzy
 msgid "# Inbound CADET channels created"
 msgstr "# Túneles interiores MESH creados"
 
-#: src/exit/gnunet-daemon-exit.c:861
+#: src/exit/gnunet-daemon-exit.c:860
 #, 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:914
+#: src/exit/gnunet-daemon-exit.c:913
 #, fuzzy
 msgid "# Bytes transmitted via cadet channels"
 msgstr "# Bytes transmitidos vía túneles MESH"
 
-#: 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
+#: src/exit/gnunet-daemon-exit.c:1032 src/exit/gnunet-daemon-exit.c:2492
+#: src/exit/gnunet-daemon-exit.c:2745 src/vpn/gnunet-service-vpn.c:1454
+#: src/vpn/gnunet-service-vpn.c:1845 src/vpn/gnunet-service-vpn.c:2008
 msgid "# ICMPv4 packets dropped (type not allowed)"
 msgstr "# Paquetes ICMPv4 omitidos (tipo no permitido)"
 
-#: 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
+#: src/exit/gnunet-daemon-exit.c:1069 src/exit/gnunet-daemon-exit.c:2551
+#: src/exit/gnunet-daemon-exit.c:2804 src/vpn/gnunet-service-vpn.c:1510
+#: src/vpn/gnunet-service-vpn.c:1904 src/vpn/gnunet-service-vpn.c:2041
 msgid "# ICMPv6 packets dropped (type not allowed)"
 msgstr "# Paquetes ICMPv6 omitidos (tipo no permitido)"
 
-#: src/exit/gnunet-daemon-exit.c:1118
+#: src/exit/gnunet-daemon-exit.c:1117
 msgid "# ICMP packets dropped (not allowed)"
 msgstr "# Paquetes ICMP omitidos (tipo no permitido)"
 
-#: src/exit/gnunet-daemon-exit.c:1126
+#: src/exit/gnunet-daemon-exit.c:1125
 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:1203
+#: src/exit/gnunet-daemon-exit.c:1202
 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:1278
+#: src/exit/gnunet-daemon-exit.c:1277
 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:1331
+#: src/exit/gnunet-daemon-exit.c:1330
 msgid "# Packets received from TUN"
 msgstr "# Paquetes recibidos de TUN"
 
-#: src/exit/gnunet-daemon-exit.c:1345
+#: src/exit/gnunet-daemon-exit.c:1344
 msgid "# Bytes received from TUN"
 msgstr "# Bytes recibidos de TUN"
 
-#: src/exit/gnunet-daemon-exit.c:1371
+#: src/exit/gnunet-daemon-exit.c:1370
 msgid "IPv4 packet options received.  Ignored.\n"
 msgstr "Opciones de paquete IPv4 recibidas.  Ignoradas.\n"
 
-#: src/exit/gnunet-daemon-exit.c:1398
+#: src/exit/gnunet-daemon-exit.c:1397
 #, 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:1444
+#: src/exit/gnunet-daemon-exit.c:1443
 #, 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:1452
+#: src/exit/gnunet-daemon-exit.c:1451
 #, 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:1853
+#: src/exit/gnunet-daemon-exit.c:1852
 msgid "# TCP packets sent via TUN"
 msgstr "# Paquetes TCP enviados vía TUN"
 
-#: src/exit/gnunet-daemon-exit.c:1977
+#: src/exit/gnunet-daemon-exit.c:1976
 #, fuzzy
 msgid "# TCP service creation requests received via cadet"
 msgstr "# Peticiones de creaciones de servicio TCP recibidas vía mesh"
 
-#: src/exit/gnunet-daemon-exit.c: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
+#: src/exit/gnunet-daemon-exit.c:1980 src/exit/gnunet-daemon-exit.c:2059
+#: src/exit/gnunet-daemon-exit.c:2166 src/exit/gnunet-daemon-exit.c:2416
+#: src/exit/gnunet-daemon-exit.c:2666 src/exit/gnunet-daemon-exit.c:2953
+#: src/exit/gnunet-daemon-exit.c:3056
 #, fuzzy
 msgid "# Bytes received from CADET"
 msgstr "# Bytes recibidos de TUN"
 
-#: src/exit/gnunet-daemon-exit.c:2063
+#: src/exit/gnunet-daemon-exit.c:2062
 #, fuzzy
 msgid "# TCP IP-exit creation requests received via cadet"
 msgstr "# Peticiones de creación de salida IP por TCP recibidas vía mesh"
 
-#: src/exit/gnunet-daemon-exit.c:2170
+#: src/exit/gnunet-daemon-exit.c:2169
 #, fuzzy
 msgid "# TCP data requests received via cadet"
 msgstr "# Peticiones de datos TCP recibidas vía mesh"
 
-#: src/exit/gnunet-daemon-exit.c:2184
+#: src/exit/gnunet-daemon-exit.c:2183
 msgid "# TCP DATA requests dropped (no session)"
 msgstr "# Peticiones de datos (DATA) TCP omitidas (no hay sesión)"
 
-#: src/exit/gnunet-daemon-exit.c:2246
+#: src/exit/gnunet-daemon-exit.c:2245
 msgid "# ICMP packets sent via TUN"
 msgstr "# Paquetes ICMP enviados vía TUN"
 
-#: src/exit/gnunet-daemon-exit.c:2420
+#: src/exit/gnunet-daemon-exit.c:2419
 #, fuzzy
 msgid "# ICMP IP-exit requests received via cadet"
 msgstr "# Peticiones de salida IP por ICMP recibidas vía mesh"
 
-#: src/exit/gnunet-daemon-exit.c:2670
+#: src/exit/gnunet-daemon-exit.c:2669
 #, fuzzy
 msgid "# ICMP service requests received via cadet"
 msgstr "# Peticiones de servicio ICMP recibidas vía mesh"
 
-#: src/exit/gnunet-daemon-exit.c:2731 src/vpn/gnunet-service-vpn.c:1445
-#: src/vpn/gnunet-service-vpn.c:2003
+#: src/exit/gnunet-daemon-exit.c:2730 src/vpn/gnunet-service-vpn.c:1444
+#: src/vpn/gnunet-service-vpn.c:2002
 msgid "# ICMPv4 packets dropped (impossible PT to v6)"
 msgstr "# Paquetes ICMPv4 omitidos (imposible atravesar v6)"
 
-#: src/exit/gnunet-daemon-exit.c:2790 src/vpn/gnunet-service-vpn.c:1481
-#: src/vpn/gnunet-service-vpn.c:1493 src/vpn/gnunet-service-vpn.c:1893
+#: src/exit/gnunet-daemon-exit.c:2789 src/vpn/gnunet-service-vpn.c:1480
+#: src/vpn/gnunet-service-vpn.c:1492 src/vpn/gnunet-service-vpn.c:1892
 msgid "# ICMPv6 packets dropped (impossible PT to v4)"
 msgstr "# Paquetes ICMPv6 omitidos (imposible atravesar v4)"
 
-#: src/exit/gnunet-daemon-exit.c:2841
+#: src/exit/gnunet-daemon-exit.c:2840
 msgid "# UDP packets sent via TUN"
 msgstr "# Paquetes UDP enviados vía TUN"
 
-#: src/exit/gnunet-daemon-exit.c:2957
+#: src/exit/gnunet-daemon-exit.c:2956
 #, fuzzy
 msgid "# UDP IP-exit requests received via cadet"
 msgstr "# Peticiones de salida IP por UDP recibidas vía mesh"
 
-#: src/exit/gnunet-daemon-exit.c:3060
+#: src/exit/gnunet-daemon-exit.c:3059
 #, fuzzy
 msgid "# UDP service requests received via cadet"
 msgstr "# Peticiones de servicio UDP recibidas vía mesh"
 
-#: src/exit/gnunet-daemon-exit.c:3327 src/exit/gnunet-daemon-exit.c:3337
+#: src/exit/gnunet-daemon-exit.c:3326 src/exit/gnunet-daemon-exit.c:3336
 #, fuzzy, c-format
 msgid "Option `%s' for domain `%s' is not formatted correctly!\n"
 msgstr "Las opción «%s» o «%s» es necesaria.\n"
 
-#: src/exit/gnunet-daemon-exit.c:3351 src/exit/gnunet-daemon-exit.c:3359
+#: src/exit/gnunet-daemon-exit.c:3350 src/exit/gnunet-daemon-exit.c:3358
 #, c-format
 msgid "`%s' is not a valid port number (for domain `%s')!"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3400
+#: src/exit/gnunet-daemon-exit.c:3399
 #, c-format
 msgid "No addresses found for hostname `%s' of service `%s'!\n"
 msgstr ""
 "¡No se encontraron direcciones para el nombre de máquina «%s» del servicio "
 "«%s»!\n"
 
-#: src/exit/gnunet-daemon-exit.c:3414 src/exit/gnunet-daemon-exit.c:3427
+#: src/exit/gnunet-daemon-exit.c:3413 src/exit/gnunet-daemon-exit.c:3426
 #, 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:3439
+#: src/exit/gnunet-daemon-exit.c:3438
 #, c-format
 msgid "No IP addresses found for hostname `%s' of service `%s'!\n"
 msgstr ""
 "¡No se encontraron direcciones IP para el nombre de máquina «%s» del "
 "servicio «%s»!\n"
 
-#: src/exit/gnunet-daemon-exit.c:3584
+#: src/exit/gnunet-daemon-exit.c:3583
 msgid ""
 "This system does not support IPv4, will disable IPv4 functions despite them "
 "being enabled in the configuration\n"
@@ -2750,7 +2767,7 @@ msgstr ""
 "Este sistema no soporta IPv4, se deshabilitarán las funciones IPv4 aunque "
 "estén habilitadas en la configuración\n"
 
-#: src/exit/gnunet-daemon-exit.c:3592
+#: src/exit/gnunet-daemon-exit.c:3591
 msgid ""
 "This system does not support IPv6, will disable IPv6 functions despite them "
 "being enabled in the configuration\n"
@@ -2758,7 +2775,7 @@ msgstr ""
 "Este sistema no soporta IPv6, se deshabilitarán las funciones IPv6 aunque "
 "estén habilitadas en la configuración\n"
 
-#: src/exit/gnunet-daemon-exit.c:3599
+#: src/exit/gnunet-daemon-exit.c:3598
 msgid ""
 "Cannot enable IPv4 exit but disable IPv4 on TUN interface, will use "
 "ENABLE_IPv4=YES\n"
@@ -2766,7 +2783,7 @@ msgstr ""
 "No se puede habilitar salida IPv4 pero se deshabilita IPv4 sobre interfaz "
 "TUN, se usará ENABLE_IPv4=YES\n"
 
-#: src/exit/gnunet-daemon-exit.c:3605
+#: src/exit/gnunet-daemon-exit.c:3604
 msgid ""
 "Cannot enable IPv6 exit but disable IPv6 on TUN interface, will use "
 "ENABLE_IPv6=YES\n"
@@ -2774,20 +2791,20 @@ msgstr ""
 "No se pudo habilitar la salida IPv6 pero se deshabilita IPv6 sobre interfaz "
 "TUN, se usará ENABLE_IPv6=YES\n"
 
-#: src/exit/gnunet-daemon-exit.c:3765
+#: src/exit/gnunet-daemon-exit.c:3764
 msgid "Must be a number"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3872
+#: src/exit/gnunet-daemon-exit.c:3871
 #, 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
+#: src/exit/gnunet-daemon-exit.c:3883 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:4029
+#: src/exit/gnunet-daemon-exit.c:4028
 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"
 
@@ -2828,15 +2845,15 @@ msgstr "# mensajes fragmentados"
 msgid "# total size of fragmented messages"
 msgstr "# tamaño total de los mensajes fragmentados"
 
-#: src/fragmentation/fragmentation.c:455
+#: src/fragmentation/fragmentation.c:456
 msgid "# fragment acknowledgements received"
 msgstr "# reconocimientos de fragmentos recibidos"
 
-#: src/fragmentation/fragmentation.c:462
+#: src/fragmentation/fragmentation.c:463
 msgid "# bits removed from fragmentation ACKs"
 msgstr "# bits eliminados de reconocimientos de fragmentos"
 
-#: src/fragmentation/fragmentation.c:486
+#: src/fragmentation/fragmentation.c:487
 msgid "# fragmentation transmissions completed"
 msgstr "# transmisiones de fragmentos completadas"
 
@@ -2866,53 +2883,53 @@ msgstr "Se produjo un fallo al retomar la operación de 
publicación «%s»: %s\
 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:1660
+#: src/fs/fs_api.c:1662
 #, 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:2318
+#: src/fs/fs_api.c:2322
 #, c-format
 msgid "Failure while resuming unindexing operation `%s': %s\n"
 msgstr ""
 "Se produjo un fallo mientras se retomaba la operación de publicación «%s»: "
 "%s\n"
 
-#: src/fs/fs_api.c:2328
+#: src/fs/fs_api.c:2332
 #, 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:2456 src/fs/fs_api.c:2703
+#: src/fs/fs_api.c:2460 src/fs/fs_api.c:2706
 #, 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:2474
+#: src/fs/fs_api.c:2478
 #, 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:2489 src/fs/fs_api.c:2508 src/fs/fs_api.c:3006
+#: src/fs/fs_api.c:2493 src/fs/fs_api.c:2512 src/fs/fs_api.c:3016
 #, 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:2693
+#: src/fs/fs_api.c:2696
 #, c-format
 msgid "Failed to resume sub-download `%s': could not open file `%s'\n"
 msgstr ""
 "Se produjo un fallo al retomar la sub-descarga «%s»: no se pudo abrir el "
 "fichero «%s»\n"
 
-#: src/fs/fs_api.c:2949
+#: src/fs/fs_api.c:2959
 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:3044
+#: src/fs/fs_api.c:3054
 #, c-format
 msgid "Failure while resuming download operation `%s': %s\n"
 msgstr ""
@@ -2983,7 +3000,7 @@ msgstr ""
 msgid "internal error decoding tree"
 msgstr "error interno decodificando árbol"
 
-#: src/fs/fs_download.c:1838
+#: src/fs/fs_download.c:1845
 msgid "Invalid URI"
 msgstr "URI no válida"
 
@@ -3756,51 +3773,51 @@ 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
+#: src/fs/gnunet-service-fs.c:1287
 #, fuzzy
 msgid "FS service is lacking HOSTKEY configuration setting.  Exiting.\n"
 msgstr ""
 "Al servicio principal le falta la configuración de la clave de máquina "
 "(HOSTKEY).  Saliendo.\n"
 
-#: src/fs/gnunet-service-fs.c:1313 src/hostlist/gnunet-daemon-hostlist.c:355
+#: src/fs/gnunet-service-fs.c:1312 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:494
+#: src/fs/gnunet-service-fs_cadet_client.c:370
 #, fuzzy
 msgid "# replies received via cadet"
 msgstr "# respuestas recibidas vía «stream»"
 
-#: src/fs/gnunet-service-fs_cadet_client.c:508
+#: src/fs/gnunet-service-fs_cadet_client.c:384
 #, fuzzy
 msgid "# replies received via cadet dropped"
 msgstr "# respuestas recibidas omitidas vía «stream»"
 
-#: src/fs/gnunet-service-fs_cadet_server.c:258
-#, fuzzy
-msgid "# Blocks transferred via cadet"
-msgstr "# Bloques transferidos vía «stream»"
-
-#: src/fs/gnunet-service-fs_cadet_server.c:360
+#: src/fs/gnunet-service-fs_cadet_server.c:263
 #, fuzzy
 msgid "# queries received via CADET not answered"
 msgstr "# consultas recibidas vía «stream»"
 
-#: src/fs/gnunet-service-fs_cadet_server.c:440
+#: src/fs/gnunet-service-fs_cadet_server.c:317
+#, fuzzy
+msgid "# Blocks transferred via cadet"
+msgstr "# Bloques transferidos vía «stream»"
+
+#: src/fs/gnunet-service-fs_cadet_server.c:343
 #, fuzzy
 msgid "# queries received via cadet"
 msgstr "# consultas recibidas vía «stream»"
 
-#: src/fs/gnunet-service-fs_cadet_server.c:484
+#: src/fs/gnunet-service-fs_cadet_server.c:384
 #, fuzzy
 msgid "# cadet client connections rejected"
 msgstr "# conexiones de clientes «stream» rechazadas"
 
-#: src/fs/gnunet-service-fs_cadet_server.c:490
-#: src/fs/gnunet-service-fs_cadet_server.c:530
+#: src/fs/gnunet-service-fs_cadet_server.c:391
+#: src/fs/gnunet-service-fs_cadet_server.c:431
 #, fuzzy
 msgid "# cadet connections active"
 msgstr "# conexiones «stream» activas"
@@ -3955,109 +3972,109 @@ msgstr "# peticiones refrescadas"
 msgid "# query plan entries"
 msgstr "# entradas de planes de búsqueda"
 
-#: src/fs/gnunet-service-fs_pr.c:315
+#: src/fs/gnunet-service-fs_pr.c:327
 msgid "# Pending requests created"
 msgstr "# Peticiones pendientes creadas"
 
-#: src/fs/gnunet-service-fs_pr.c:411 src/fs/gnunet-service-fs_pr.c:661
+#: src/fs/gnunet-service-fs_pr.c:428 src/fs/gnunet-service-fs_pr.c:675
 msgid "# Pending requests active"
 msgstr "# Peticiones pendientes activas"
 
-#: src/fs/gnunet-service-fs_pr.c:842
+#: src/fs/gnunet-service-fs_pr.c:856
 msgid "# replies received and matched"
 msgstr "# respuestas recibidas y asociadas"
 
-#: src/fs/gnunet-service-fs_pr.c:879
+#: src/fs/gnunet-service-fs_pr.c:892
 msgid "# duplicate replies discarded (bloomfilter)"
 msgstr "# respuestas duplicadas descartadas (bloomfilter)"
 
-#: src/fs/gnunet-service-fs_pr.c:888
+#: src/fs/gnunet-service-fs_pr.c:901
 msgid "# irrelevant replies discarded"
 msgstr "# respuestas irrelevantes descartadas"
 
-#: src/fs/gnunet-service-fs_pr.c:903
+#: src/fs/gnunet-service-fs_pr.c:916
 #, c-format
 msgid "Unsupported block type %u\n"
 msgstr "Tipo de bloque %u no soportado\n"
 
-#: src/fs/gnunet-service-fs_pr.c:920
+#: src/fs/gnunet-service-fs_pr.c:933
 msgid "# results found locally"
 msgstr "# resultados hallados localmente"
 
-#: src/fs/gnunet-service-fs_pr.c:1050
+#: src/fs/gnunet-service-fs_pr.c:1063
 msgid "# Datastore `PUT' failures"
 msgstr "# «PUT» en el almacén de datos fallidos"
 
-#: src/fs/gnunet-service-fs_pr.c:1078
+#: src/fs/gnunet-service-fs_pr.c:1091
 msgid "# storage requests dropped due to high load"
 msgstr "# peticiones de almacenamiento omitidas debido a alta carga"
 
-#: src/fs/gnunet-service-fs_pr.c:1116
+#: src/fs/gnunet-service-fs_pr.c:1129
 msgid "# Replies received from DHT"
 msgstr "# Respuestas recibidas de la DHT"
 
-#: src/fs/gnunet-service-fs_pr.c:1247
+#: src/fs/gnunet-service-fs_pr.c:1260
 #, fuzzy
 msgid "# Replies received from CADET"
 msgstr "# Respuestas recibidas de la DHT"
 
-#: src/fs/gnunet-service-fs_pr.c:1299
+#: src/fs/gnunet-service-fs_pr.c:1312
 #, 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:1320
+#: src/fs/gnunet-service-fs_pr.c:1333
 #, 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:1372
+#: src/fs/gnunet-service-fs_pr.c:1385
 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:1387
+#: src/fs/gnunet-service-fs_pr.c:1400
 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:1396
+#: src/fs/gnunet-service-fs_pr.c:1409
 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:1411
+#: src/fs/gnunet-service-fs_pr.c:1424
 msgid "# requested DBLOCK or IBLOCK not found"
 msgstr "# «DBLOCK» o «IBLOCK» pedido no encontrado"
 
-#: src/fs/gnunet-service-fs_pr.c:1425
+#: src/fs/gnunet-service-fs_pr.c:1438
 msgid "# on-demand blocks matched requests"
 msgstr "# peticiones asociadas de bloques bajo demanda"
 
-#: src/fs/gnunet-service-fs_pr.c:1438
+#: src/fs/gnunet-service-fs_pr.c:1451
 msgid "# on-demand lookups performed successfully"
 msgstr "# búsquedas satisfactorias de bloques bajo demanda"
 
-#: src/fs/gnunet-service-fs_pr.c:1443
+#: src/fs/gnunet-service-fs_pr.c:1456
 msgid "# on-demand lookups failed"
 msgstr "# búsquedas fallidas de bloques bajo demanda"
 
-#: src/fs/gnunet-service-fs_pr.c:1469 src/fs/gnunet-service-fs_pr.c:1508
-#: src/fs/gnunet-service-fs_pr.c:1675
+#: src/fs/gnunet-service-fs_pr.c:1482 src/fs/gnunet-service-fs_pr.c:1521
+#: src/fs/gnunet-service-fs_pr.c:1688
 msgid "# Datastore lookups concluded (error queueing)"
 msgstr "# Búsquedas en el almacén de datos finalizadas (error encolando)"
 
-#: src/fs/gnunet-service-fs_pr.c:1527
+#: src/fs/gnunet-service-fs_pr.c:1540
 msgid "# Datastore lookups concluded (found last result)"
 msgstr ""
 "# Búsquedas en el almacén de datos finalizadas (encontrado último resultado)"
 
-#: src/fs/gnunet-service-fs_pr.c:1539
+#: src/fs/gnunet-service-fs_pr.c:1552
 msgid "# Datastore lookups concluded (load too high)"
 msgstr "# Búsquedas en el almacén de datos finalizadas (carga demasiado alta)"
 
-#: src/fs/gnunet-service-fs_pr.c:1652
+#: src/fs/gnunet-service-fs_pr.c:1665
 msgid "# Datastore lookups initiated"
 msgstr "# Búsquedas en el almacén de datos iniciadas"
 
-#: src/fs/gnunet-service-fs_pr.c:1732
+#: src/fs/gnunet-service-fs_pr.c:1745
 msgid "# GAP PUT messages received"
 msgstr "# Mensajes «GAP PUT» recibidos"
 
@@ -4421,7 +4438,7 @@ msgid "Failed to connect to the namecache!\n"
 msgstr "¡Se produjo un fallo al conectar con el almacén de nombres!\n"
 
 #: src/gns/gnunet-service-gns.c:612
-#: src/zonemaster/gnunet-service-zonemaster.c:740
+#: src/zonemaster/gnunet-service-zonemaster.c:741
 msgid "Could not connect to DHT!\n"
 msgstr "¡No se pudo conectar a la DHT!\n"
 
@@ -4935,7 +4952,7 @@ msgid "# hostlist advertisements send"
 msgstr "# anuncios de listas de máquinas enviados"
 
 #: src/hostlist/gnunet-daemon-hostlist_server.c:679
-#: src/transport/gnunet-service-transport.c:2802
+#: src/transport/gnunet-service-transport.c:2803
 msgid "Could not access PEERINFO service.  Exiting.\n"
 msgstr ""
 "No se pudo acceder al servicio de información de pares (PEERINFO).  "
@@ -5303,7 +5320,8 @@ msgstr "borrar"
 msgid "Invalid public key for reverse lookup `%s'\n"
 msgstr "Parámetro no válido «%s»\n"
 
-#: src/namestore/gnunet-namestore.c:979 src/peerinfo-tool/gnunet-peerinfo.c:775
+#: 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"
@@ -5516,7 +5534,6 @@ msgid "Failed to connect to `gnunet-nat-server'\n"
 msgstr "Se produjo un fallo al conectar con «gnunet-nat-server»\n"
 
 #: src/nat-auto/gnunet-nat-auto_legacy.c:518
-#: src/nat-auto/nat_auto_api_test.c:520
 #, c-format
 msgid "Failed to create listen socket bound to `%s' for NAT test: %s\n"
 msgstr ""
@@ -5524,19 +5541,19 @@ msgstr ""
 "pruebas NAT: %s\n"
 
 #: src/nat-auto/gnunet-nat-auto_legacy.c:568
-#: src/nat-auto/nat_auto_api_test.c:569
+#: src/nat-auto/nat_auto_api_test.c:571
 #, fuzzy
 msgid "NAT test failed to start NAT library\n"
 msgstr "El almacén de nombres no pudo añadir el registro\n"
 
-#: src/nat-auto/gnunet-nat-server.c:336
+#: src/nat-auto/gnunet-nat-server.c:338
 #, c-format
 msgid "Please pass valid port number as the first argument! (got `%s')\n"
 msgstr ""
 "¡Por favor, pase un número de puerto válido como primer parámetro! (se "
 "obtuvo «%s»)\n"
 
-#: src/nat-auto/gnunet-nat-server.c:386
+#: src/nat-auto/gnunet-nat-server.c:388
 msgid "GNUnet NAT traversal test helper daemon"
 msgstr "Demonio de ayuda en las pruebas de recorrido NAT de GNUnet"
 
@@ -5688,6 +5705,13 @@ msgstr "No se ha encontrado un 
«gnunet-helper-nat-server» funcional\n"
 msgid "Failed to find valid PORT in section `%s'\n"
 msgstr "¡Se produjo un fallo al buscar la opción %s en la sección %s!\n"
 
+#: src/nat-auto/nat_auto_api_test.c:522
+#, fuzzy, c-format
+msgid "Failed to create socket bound to `%s' for NAT test: %s\n"
+msgstr ""
+"Se produjo un fallo al crear el «socket» de escucha asociado a «%s» para "
+"pruebas NAT: %s\n"
+
 #: src/nat/gnunet-nat.c:424
 msgid "which IP and port are we locally using to bind/listen to"
 msgstr ""
@@ -5716,34 +5740,34 @@ msgstr "# pares desconectados debido a petición externa"
 msgid "GNUnet NAT traversal autoconfigure daemon"
 msgstr "Demonio de ayuda en las pruebas de recorrido NAT de GNUnet"
 
-#: src/nat/gnunet-service-nat.c:1313
+#: src/nat/gnunet-service-nat.c:1317
 #, c-format
 msgid "Malformed punched hole specification `%s' (lacks port)\n"
 msgstr ""
 
-#: src/nat/gnunet-service-nat.c:1323
+#: src/nat/gnunet-service-nat.c:1327
 #, fuzzy, c-format
 msgid "Invalid port number in punched hole specification `%s' (lacks port)\n"
 msgstr ""
 "Puerto inválido \"%s\" en la especificación de la lista local, probando el "
 "puerto %d.\n"
 
-#: src/nat/gnunet-service-nat.c:1339
+#: src/nat/gnunet-service-nat.c:1343
 #, c-format
 msgid "Malformed punched hole specification `%s' (lacks `]')\n"
 msgstr ""
 
-#: src/nat/gnunet-service-nat.c:1350
+#: src/nat/gnunet-service-nat.c:1354
 #, c-format
 msgid "Malformed punched hole specification `%s' (IPv6 address invalid)"
 msgstr ""
 
-#: src/nat/gnunet-service-nat.c:1803
+#: src/nat/gnunet-service-nat.c:1813
 #, fuzzy
 msgid "Connection reversal request failed\n"
 msgstr "Colección detenida.\n"
 
-#: src/nat/gnunet-service-nat.c:1876
+#: src/nat/gnunet-service-nat.c:1886
 msgid ""
 "UPnP enabled in configuration, but UPnP client `upnpc` command not found, "
 "disabling UPnP\n"
@@ -5763,7 +5787,7 @@ msgstr "Se produjo un fallo al arrancar %s\n"
 msgid "`external-ip' command not found\n"
 msgstr "comando «external-ip» no encontrado\n"
 
-#: src/nat/gnunet-service-nat_mini.c:654
+#: src/nat/gnunet-service-nat_mini.c:656
 msgid "`upnpc' command not found\n"
 msgstr "comando «upnpc» no encontrado\n"
 
@@ -5797,7 +5821,7 @@ msgstr "retraso entre rondas"
 msgid "Measure quality and performance of the NSE service."
 msgstr "Medir la calidad y rendimiento del servicio NSE."
 
-#: src/nse/gnunet-service-nse.c:1536
+#: src/nse/gnunet-service-nse.c:1534
 #: src/revocation/gnunet-service-revocation.c:832 src/util/gnunet-scrypt.c:276
 msgid "Value is too large.\n"
 msgstr ""
@@ -6009,7 +6033,7 @@ msgstr "Se produjo un fallo al crear los índices\n"
 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:195
+#: src/postgres/postgres.c:192
 #, fuzzy, c-format
 msgid "Unable to connect to Postgres database '%s': %s\n"
 msgstr "Imposible guardar el fichero de configuración '%s':"
@@ -6345,7 +6369,7 @@ msgstr ""
 msgid "Revocation certificate not ready, calculating proof of work\n"
 msgstr ""
 
-#: src/revocation/gnunet-revocation.c:437 src/social/gnunet-social.c:1159
+#: src/revocation/gnunet-revocation.c:437 src/social/gnunet-social.c:1176
 #, fuzzy, c-format
 msgid "Public key `%s' malformed\n"
 msgstr "El bloque del tipo %u está mal formado\n"
@@ -6481,10 +6505,10 @@ msgstr ""
 msgid "Calculate the Vectorproduct with a GNUnet peer."
 msgstr ""
 
-#: 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
+#: src/scalarproduct/gnunet-service-scalarproduct_alice.c:1404
+#: src/scalarproduct/gnunet-service-scalarproduct_bob.c:1342
+#: src/scalarproduct/gnunet-service-scalarproduct-ecc_alice.c:1177
+#: src/scalarproduct/gnunet-service-scalarproduct-ecc_bob.c:1060
 #, fuzzy
 msgid "Connect to CADET failed\n"
 msgstr "Conexión fallida (¿bug?)\n"
@@ -6509,9 +6533,9 @@ msgstr ""
 msgid "also profile decryption"
 msgstr ""
 
-#: src/set/gnunet-service-set.c:1991
+#: src/set/gnunet-service-set.c:2068
 #, fuzzy
-msgid "Could not connect to cadet service\n"
+msgid "Could not connect to CADET service\n"
 msgstr "¡No se pudo conectar al servicio %s!\n"
 
 # Miguel: Conjunto resta.
@@ -6541,129 +6565,129 @@ msgstr "tamaño ibf"
 msgid "operation to execute"
 msgstr ""
 
-#: src/social/gnunet-social.c:1146
+#: src/social/gnunet-social.c:1163
 #, fuzzy
 msgid "--place missing or invalid.\n"
 msgstr "Parámetro no válido «%s»\n"
 
-#: src/social/gnunet-social.c:1195
+#: src/social/gnunet-social.c:1212
 msgid "assign --name in state to --data"
 msgstr ""
 
-#: src/social/gnunet-social.c:1199
+#: src/social/gnunet-social.c:1216
 msgid "say good-bye and leave somebody else's place"
 msgstr ""
 
-#: src/social/gnunet-social.c:1203
+#: src/social/gnunet-social.c:1220
 msgid "create a place"
 msgstr ""
 
-#: src/social/gnunet-social.c:1207
+#: src/social/gnunet-social.c:1224
 msgid "destroy a place we were hosting"
 msgstr ""
 
-#: src/social/gnunet-social.c:1211
+#: src/social/gnunet-social.c:1228
 msgid "enter somebody else's place"
 msgstr ""
 
-#: src/social/gnunet-social.c:1215
+#: src/social/gnunet-social.c:1232
 msgid "find state matching name prefix"
 msgstr ""
 
-#: src/social/gnunet-social.c:1219
+#: src/social/gnunet-social.c:1236
 msgid "replay history of messages up to the given --limit"
 msgstr ""
 
-#: src/social/gnunet-social.c:1223
+#: src/social/gnunet-social.c:1240
 msgid "reconnect to a previously created place"
 msgstr ""
 
-#: src/social/gnunet-social.c:1227
+#: src/social/gnunet-social.c:1244
 msgid "publish something to a place we are hosting"
 msgstr ""
 
-#: src/social/gnunet-social.c:1231
+#: src/social/gnunet-social.c:1248
 msgid "reconnect to a previously entered place"
 msgstr ""
 
-#: src/social/gnunet-social.c:1235
+#: src/social/gnunet-social.c:1252
 msgid "search for state matching exact name"
 msgstr ""
 
-#: src/social/gnunet-social.c:1239
+#: src/social/gnunet-social.c:1256
 msgid "submit something to somebody's place"
 msgstr ""
 
-#: src/social/gnunet-social.c:1243
+#: src/social/gnunet-social.c:1260
 msgid "list of egos and subscribed places"
 msgstr ""
 
-#: src/social/gnunet-social.c:1247
+#: src/social/gnunet-social.c:1264
 msgid "extract and replay history between message IDs --start and --until"
 msgstr ""
 
-#: src/social/gnunet-social.c:1254
+#: src/social/gnunet-social.c:1271
 msgid "application ID to use when connecting"
 msgstr ""
 
-#: src/social/gnunet-social.c:1258
+#: src/social/gnunet-social.c:1275
 msgid "message body or state value"
 msgstr ""
 
-#: src/social/gnunet-social.c:1262
+#: src/social/gnunet-social.c:1279
 #, fuzzy
 msgid "name or public key of ego"
 msgstr "Parámetro no válido «%s»\n"
 
-#: src/social/gnunet-social.c:1266
+#: src/social/gnunet-social.c:1283
 #, fuzzy
 msgid "wait for incoming messages"
 msgstr "Falló al entregar el mensaje '%s'.\n"
 
-#: src/social/gnunet-social.c:1270
+#: src/social/gnunet-social.c:1287
 #, fuzzy
 msgid "GNS name"
 msgstr "Mostrar el _nombre"
 
-#: src/social/gnunet-social.c:1274
+#: src/social/gnunet-social.c:1291
 msgid "peer ID for --guest-enter"
 msgstr ""
 
-#: src/social/gnunet-social.c:1278
+#: src/social/gnunet-social.c:1295
 msgid "name (key) to query from state"
 msgstr ""
 
-#: src/social/gnunet-social.c:1282
+#: src/social/gnunet-social.c:1299
 #, fuzzy
 msgid "method name"
 msgstr "Mostrar el _nombre"
 
-#: src/social/gnunet-social.c:1286
+#: src/social/gnunet-social.c:1303
 #, fuzzy
 msgid "number of messages to replay from history"
 msgstr "número de mensajes a usar por iteración"
 
-#: src/social/gnunet-social.c:1290
+#: src/social/gnunet-social.c:1307
 msgid "key address of place"
 msgstr ""
 
-#: src/social/gnunet-social.c:1294
+#: src/social/gnunet-social.c:1311
 msgid "start message ID for history replay"
 msgstr ""
 
-#: src/social/gnunet-social.c:1298
+#: src/social/gnunet-social.c:1315
 msgid "respond to entry requests by admitting all guests"
 msgstr ""
 
-#: src/social/gnunet-social.c:1302
+#: src/social/gnunet-social.c:1319
 msgid "end message ID for history replay"
 msgstr ""
 
-#: src/social/gnunet-social.c:1306
+#: src/social/gnunet-social.c:1323
 msgid "respond to entry requests by refusing all guests"
 msgstr ""
 
-#: src/social/gnunet-social.c:1316
+#: src/social/gnunet-social.c:1333
 msgid ""
 "gnunet-social - Interact with the social service: enter/leave, send/receive "
 "messages, access history and state.\n"
@@ -7230,35 +7254,35 @@ msgstr "# bytes de «payload» omitidos (el otro par no 
estaba conectado)"
 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:1698
+#: src/transport/gnunet-service-transport.c:1699
 msgid "# bytes total received"
 msgstr "# total de bytes recibidos"
 
-#: src/transport/gnunet-service-transport.c:1795
+#: src/transport/gnunet-service-transport.c:1796
 msgid "# bytes payload received"
 msgstr "# bytes de «payload» recibidos"
 
-#: src/transport/gnunet-service-transport.c:2112
-#: src/transport/gnunet-service-transport.c:2584
+#: src/transport/gnunet-service-transport.c:2113
+#: src/transport/gnunet-service-transport.c:2585
 msgid "# disconnects due to blacklist"
 msgstr "# desconexiones debido a la lista negra"
 
-#: src/transport/gnunet-service-transport.c:2588
+#: src/transport/gnunet-service-transport.c:2589
 #, 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
+#: src/transport/gnunet-service-transport.c:2697
 #, 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
+#: src/transport/gnunet-service-transport.c:2706
 #, c-format
 msgid "Adding blacklisting entry for peer `%s':`%s'\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport.c:2770
+#: src/transport/gnunet-service-transport.c:2771
 #, fuzzy
 msgid "Transport service is lacking key configuration settings. Exiting.\n"
 msgstr ""
@@ -7410,75 +7434,75 @@ msgstr "# mensajes PING recibidos"
 msgid "SYN request from peer `%s' ignored due impending shutdown\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:2598
+#: src/transport/gnunet-service-transport_neighbours.c:2606
 msgid "# Attempts to switch addresses"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3080
+#: src/transport/gnunet-service-transport_neighbours.c:3088
 #, fuzzy
 msgid "# SYN_ACK messages received"
 msgstr "# mensajes SET QUOTA recibidos"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3088
+#: src/transport/gnunet-service-transport_neighbours.c:3096
 #, fuzzy
 msgid "# unexpected SYN_ACK messages (no peer)"
 msgstr "# Mensajes «CONNECT_ACK» inesperados (sin par)"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3106
-#: src/transport/gnunet-service-transport_neighbours.c:3130
+#: src/transport/gnunet-service-transport_neighbours.c:3114
+#: src/transport/gnunet-service-transport_neighbours.c:3138
 #, fuzzy
 msgid "# unexpected SYN_ACK messages (not ready)"
 msgstr "# Mensajes «CONNECT_ACK» inesperados (no estaba preparado)"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3142
+#: src/transport/gnunet-service-transport_neighbours.c:3150
 #, 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:3167
+#: src/transport/gnunet-service-transport_neighbours.c:3175
 msgid "# Successful attempts to switch addresses"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3180
+#: src/transport/gnunet-service-transport_neighbours.c:3188
 #, fuzzy
 msgid "# unexpected SYN_ACK messages (disconnecting)"
 msgstr "# Mensajes «CONNECT_ACK» inesperados (desconectando)"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3352
+#: src/transport/gnunet-service-transport_neighbours.c:3360
 #, fuzzy
 msgid "# ACK messages received"
 msgstr "# mensajes «REQUEST CONNECT» recibidos"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3388
+#: src/transport/gnunet-service-transport_neighbours.c:3396
 #, fuzzy
 msgid "# unexpected ACK messages"
 msgstr "# Mensajes «SESSION ACK» inesperados"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3476
+#: src/transport/gnunet-service-transport_neighbours.c:3484
 #, fuzzy
 msgid "# quota messages ignored (malformed)"
 msgstr "# mensajes de desconexión ignorados (formato antiguo)"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3483
+#: src/transport/gnunet-service-transport_neighbours.c:3491
 #, fuzzy
 msgid "# QUOTA messages received"
 msgstr "# Mensajes «GAP PUT» recibidos"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3523
+#: src/transport/gnunet-service-transport_neighbours.c:3531
 #, fuzzy
 msgid "# disconnect messages ignored (malformed)"
 msgstr "# mensajes de desconexión ignorados (formato antiguo)"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3530
+#: src/transport/gnunet-service-transport_neighbours.c:3538
 #, fuzzy
 msgid "# DISCONNECT messages received"
 msgstr "# mensajes «REQUEST CONNECT» recibidos"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3541
+#: src/transport/gnunet-service-transport_neighbours.c:3549
 msgid "# disconnect messages ignored (timestamp)"
 msgstr "# mensajes de desconexión ignorados (marca temporal)"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3675
+#: src/transport/gnunet-service-transport_neighbours.c:3683
 msgid "# disconnected from peer upon explicit request"
 msgstr "# desconexiones del par debido a una petición explícita"
 
@@ -7795,8 +7819,8 @@ msgstr "tamaño del mensaje"
 #: src/transport/plugin_transport_http_client.c:1477
 #: src/transport/plugin_transport_http_server.c:2248
 #: src/transport/plugin_transport_http_server.c:3462
-#: src/transport/plugin_transport_tcp.c:3375
-#: src/transport/plugin_transport_tcp.c:3382
+#: src/transport/plugin_transport_tcp.c:3403
+#: src/transport/plugin_transport_tcp.c:3410
 msgid "TCP_STEALTH not supported on this platform.\n"
 msgstr ""
 
@@ -7875,7 +7899,7 @@ msgid "Found %u addresses to report to NAT service\n"
 msgstr "Encontradas %u direcciones para comunicar al servicio NAT\n"
 
 #: src/transport/plugin_transport_http_server.c:2837
-#: src/transport/plugin_transport_udp.c:3623
+#: src/transport/plugin_transport_udp.c:3613
 msgid "Disabling IPv6 since it is not supported on this system!\n"
 msgstr "¡Deshabilitando IPv6 ya que no está soportado en este sistema!\n"
 
@@ -7982,15 +8006,15 @@ msgid "# bytes dropped by SMTP (outgoing)"
 msgstr "# bytes omitidos por SMTP (salientes)"
 
 #: src/transport/plugin_transport_tcp.c:1060
-#: src/transport/plugin_transport_tcp.c:2379
+#: src/transport/plugin_transport_tcp.c:2386
 #, c-format
 msgid "Unexpected address length: %u bytes\n"
 msgstr "Longitud de dirección inesperada: %u bytes\n"
 
 #: src/transport/plugin_transport_tcp.c:1243
 #: src/transport/plugin_transport_tcp.c:1467
-#: src/transport/plugin_transport_tcp.c:2643
-#: src/transport/plugin_transport_tcp.c:3498
+#: src/transport/plugin_transport_tcp.c:2650
+#: src/transport/plugin_transport_tcp.c:3526
 msgid "# TCP sessions active"
 msgstr "# Sesiones TCP activas"
 
@@ -8015,63 +8039,63 @@ msgstr "# bytes omitidos por TCP (expirados)"
 msgid "# bytes transmitted via TCP"
 msgstr "# bytes recibidos vía TCP"
 
-#: src/transport/plugin_transport_tcp.c:2041
+#: src/transport/plugin_transport_tcp.c:2048
 msgid "# requests to create session with invalid address"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2217
+#: src/transport/plugin_transport_tcp.c:2224
 msgid "# transport-service disconnect requests for TCP"
 msgstr "# peticiones de desconexión del servicio de transporte por TCP"
 
-#: src/transport/plugin_transport_tcp.c:2702
+#: src/transport/plugin_transport_tcp.c:2716
 msgid "# TCP WELCOME messages received"
 msgstr "# Mensajes «WELCOME» TCP recibidos"
 
-#: src/transport/plugin_transport_tcp.c:2893
+#: src/transport/plugin_transport_tcp.c:2921
 msgid "# bytes received via TCP"
 msgstr "# bytes recibidos vía TCP"
 
-#: src/transport/plugin_transport_tcp.c:2944
-#: src/transport/plugin_transport_tcp.c:3002
+#: src/transport/plugin_transport_tcp.c:2972
+#: src/transport/plugin_transport_tcp.c:3030
 #, fuzzy
 msgid "# TCP server connections active"
 msgstr "# conexiones «stream» activas"
 
-#: src/transport/plugin_transport_tcp.c:2948
+#: src/transport/plugin_transport_tcp.c:2976
 #, fuzzy
 msgid "# TCP server connect events"
 msgstr "# Pares conectados"
 
-#: src/transport/plugin_transport_tcp.c:2954
+#: src/transport/plugin_transport_tcp.c:2982
 msgid "TCP connection limit reached, suspending server\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2956
+#: src/transport/plugin_transport_tcp.c:2984
 msgid "# TCP service suspended"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2996
+#: src/transport/plugin_transport_tcp.c:3024
 msgid "# TCP service resumed"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:3006
+#: src/transport/plugin_transport_tcp.c:3034
 msgid "# network-level TCP disconnect events"
 msgstr "# eventos de desconexión TCP a nivel de red"
 
-#: src/transport/plugin_transport_tcp.c:3325
+#: src/transport/plugin_transport_tcp.c:3353
 msgid "Failed to start service.\n"
 msgstr "Se produjo un fallo al iniciar el servicio.\n"
 
-#: src/transport/plugin_transport_tcp.c:3486
+#: src/transport/plugin_transport_tcp.c:3514
 #, 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:3490
+#: src/transport/plugin_transport_tcp.c:3518
 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:3494
+#: src/transport/plugin_transport_tcp.c:3522
 #, 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"
@@ -8093,7 +8117,7 @@ msgstr ""
 "Se produjo un fallo al establecer la opción de «broadcast» IPv4 para el "
 "«socket» en el puerto %d\n"
 
-#: src/transport/plugin_transport_udp.c:3367
+#: src/transport/plugin_transport_udp.c:3357
 #, c-format
 msgid ""
 "UDP could not transmit message to `%s': Network seems down, please check "
@@ -8102,7 +8126,7 @@ msgstr ""
 "UDP no pudo transmitir el mensaje a «%s»: La red parece caída, por favor, "
 "compruebe su configuración de red\n"
 
-#: src/transport/plugin_transport_udp.c:3381
+#: src/transport/plugin_transport_udp.c:3371
 #, fuzzy
 msgid ""
 "UDP could not transmit IPv6 message! Please check your network configuration "
@@ -8112,37 +8136,37 @@ msgstr ""
 "configuración de red y deshabilite IPv6 si su conexión carece de una "
 "dirección IPv6 global\n"
 
-#: src/transport/plugin_transport_udp.c:3699
-#: src/transport/plugin_transport_udp.c:3798
+#: src/transport/plugin_transport_udp.c:3689
+#: src/transport/plugin_transport_udp.c:3788
 #, fuzzy, c-format
 msgid "Failed to bind UDP socket to %s: %s\n"
 msgstr "Se produjo un fallo al abrir los «sockets» UDP\n"
 
-#: src/transport/plugin_transport_udp.c:3717
+#: src/transport/plugin_transport_udp.c:3707
 #, fuzzy
 msgid "Disabling IPv4 since it is not supported on this system!\n"
 msgstr "¡Deshabilitando IPv6 ya que no está soportado en este sistema!\n"
 
-#: src/transport/plugin_transport_udp.c:3808
+#: src/transport/plugin_transport_udp.c:3798
 msgid "Failed to open UDP sockets\n"
 msgstr "Se produjo un fallo al abrir los «sockets» UDP\n"
 
-#: src/transport/plugin_transport_udp.c:3879
-#: src/transport/plugin_transport_udp.c:3893
+#: src/transport/plugin_transport_udp.c:3869
+#: src/transport/plugin_transport_udp.c:3883
 msgid "must be in [0,65535]"
 msgstr ""
 
-#: src/transport/plugin_transport_udp.c:3925
+#: src/transport/plugin_transport_udp.c:3915
 #, fuzzy
 msgid "must be valid IPv4 address"
 msgstr "«%s» no es una dirección IP válida.\n"
 
-#: src/transport/plugin_transport_udp.c:3952
+#: src/transport/plugin_transport_udp.c:3942
 #, fuzzy
 msgid "must be valid IPv6 address"
 msgstr "«%s» no es una dirección IP válida.\n"
 
-#: src/transport/plugin_transport_udp.c:4018
+#: src/transport/plugin_transport_udp.c:4008
 #, fuzzy
 msgid "Failed to create UDP network sockets\n"
 msgstr "Se produjo un fallo al crear una nueva firma"
@@ -8266,7 +8290,7 @@ msgstr "Los metadatos serializados «%s» son mayores de lo 
permitido (%u>%u)"
 msgid "Metadata `%s' failed to deserialize"
 msgstr "Se produjo un fallo al deserializar los metadatos «%s»"
 
-#: src/util/client.c:864
+#: src/util/client.c:868
 #, 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"
@@ -8304,20 +8328,20 @@ msgstr "Mensaje `%.*s» repetido %u veces en el último 
%s\n"
 msgid "INVALID"
 msgstr "NO VÁLIDO"
 
-#: src/util/common_logging.c:1248
+#: src/util/common_logging.c:1302
 msgid "unknown address"
 msgstr "dirección desconocida"
 
-#: src/util/common_logging.c:1290
+#: src/util/common_logging.c:1344
 msgid "invalid address"
 msgstr "dirección no válida"
 
-#: src/util/common_logging.c:1308
+#: src/util/common_logging.c:1362
 #, 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:1329
+#: src/util/common_logging.c:1383
 #, c-format
 msgid ""
 "Configuration specifies invalid value for option `%s' in section `%s': %s\n"
@@ -8380,22 +8404,22 @@ msgstr ""
 "El tamaño del fichero en disco es incorrecto para este «Bloom "
 "filter» (esperado %llu, tiene %llu)\n"
 
-#: src/util/crypto_ecc.c:756
+#: src/util/crypto_ecc.c:777
 #, c-format
 msgid "ECC signing failed at %s:%d: %s\n"
 msgstr "El firmado ECC falló en %s:%d: %s\n"
 
-#: src/util/crypto_ecc.c:806
+#: src/util/crypto_ecc.c:827
 #, fuzzy, c-format
 msgid "EdDSA signing failed at %s:%d: %s\n"
 msgstr "El firmado ECC falló en %s:%d: %s\n"
 
-#: src/util/crypto_ecc.c:880
+#: src/util/crypto_ecc.c:901
 #, fuzzy, c-format
 msgid "ECDSA signature verification failed at %s:%d: %s\n"
 msgstr "La verificación de la firma RSA fallo en %s:%d: %s\n"
 
-#: src/util/crypto_ecc.c:937
+#: src/util/crypto_ecc.c:958
 #, fuzzy, c-format
 msgid "EdDSA signature verification failed at %s:%d: %s\n"
 msgstr "La verificación de la firma RSA fallo en %s:%d: %s\n"
@@ -8890,7 +8914,7 @@ msgstr ""
 "El código de procesado para el mensaje del tipo %u no llamó a "
 "«GNUNET_SERVER_receive_done» después de %s\n"
 
-#: src/util/service.c:347 src/util/service_new.c:2343
+#: src/util/service.c:347 src/util/service_new.c:2344
 #, c-format
 msgid "Unknown address family %d\n"
 msgstr "Familia de direcciones %d desconocida\n"
@@ -9138,93 +9162,93 @@ msgstr "# Túneles mesh creados"
 msgid "Protocol %u not supported, dropping\n"
 msgstr "Protocolo %u no soportado, omitiendo\n"
 
-#: src/vpn/gnunet-service-vpn.c:1145
+#: src/vpn/gnunet-service-vpn.c:1144
 #, fuzzy
 msgid "# Packets dropped (channel not yet online)"
 msgstr "# Paquetes ICMP omitidos (tipo no permitido)"
 
-#: src/vpn/gnunet-service-vpn.c:1353
+#: src/vpn/gnunet-service-vpn.c:1352
 msgid "# ICMPv4 packets dropped (not allowed)"
 msgstr "# Paquetes ICMPv4 omitidos (no permitido)"
 
-#: src/vpn/gnunet-service-vpn.c:1374
+#: src/vpn/gnunet-service-vpn.c:1373
 msgid "# ICMPv6 packets dropped (not allowed)"
 msgstr "# Paquetes ICMPv6 omitidos (no permitido)"
 
-#: src/vpn/gnunet-service-vpn.c:1580
+#: src/vpn/gnunet-service-vpn.c:1579
 msgid "# Packets received from TUN interface"
 msgstr "# Paquetes recibidos de la interfaz TUN"
 
-#: src/vpn/gnunet-service-vpn.c:1613 src/vpn/gnunet-service-vpn.c:1649
+#: src/vpn/gnunet-service-vpn.c:1612 src/vpn/gnunet-service-vpn.c:1648
 #, 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:1659
+#: src/vpn/gnunet-service-vpn.c:1658
 msgid "Received IPv4 packet with options (dropping it)\n"
 msgstr "Recibido paquete IPv4 con opciones (omitiéndolo)\n"
 
-#: src/vpn/gnunet-service-vpn.c:1673
+#: src/vpn/gnunet-service-vpn.c:1672
 #, 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:1755
+#: src/vpn/gnunet-service-vpn.c:1754
 #, fuzzy
 msgid "# ICMP packets received from cadet"
 msgstr "# Paquetes ICMP recibidos de mesh"
 
-#: src/vpn/gnunet-service-vpn.c:2095
+#: src/vpn/gnunet-service-vpn.c:2093
 #, fuzzy
 msgid "# UDP packets received from cadet"
 msgstr "# Paquetes UDP recibidos de mesh"
 
-#: src/vpn/gnunet-service-vpn.c:2251
+#: src/vpn/gnunet-service-vpn.c:2248
 #, fuzzy
 msgid "# TCP packets received from cadet"
 msgstr "# Paquetes TCP recibidos de mesh"
 
-#: src/vpn/gnunet-service-vpn.c:2403
+#: src/vpn/gnunet-service-vpn.c:2399
 msgid "Failed to find unallocated IPv4 address in VPN's range\n"
 msgstr "No se encontraron direcciones IPv4 libres en el rango de la VPN\n"
 
-#: src/vpn/gnunet-service-vpn.c:2458
+#: src/vpn/gnunet-service-vpn.c:2454
 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:2500 src/vpn/gnunet-service-vpn.c:2722
+#: src/vpn/gnunet-service-vpn.c:2496 src/vpn/gnunet-service-vpn.c:2718
 msgid "# Active destinations"
 msgstr "# Destinos activos"
 
-#: src/vpn/gnunet-service-vpn.c:2771
+#: src/vpn/gnunet-service-vpn.c:2767
 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:3063
+#: src/vpn/gnunet-service-vpn.c:3059
 #, fuzzy
 msgid "Must specify valid IPv6 address"
 msgstr "«%s» no es una dirección IP válida.\n"
 
-#: src/vpn/gnunet-service-vpn.c:3087
+#: src/vpn/gnunet-service-vpn.c:3083
 msgid "Must specify valid IPv6 mask"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:3095
+#: src/vpn/gnunet-service-vpn.c:3091
 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:3108
+#: src/vpn/gnunet-service-vpn.c:3104
 #, fuzzy
 msgid "Must specify valid IPv4 address"
 msgstr "«%s» no es una dirección IP válida.\n"
 
-#: src/vpn/gnunet-service-vpn.c:3121
+#: src/vpn/gnunet-service-vpn.c:3117
 msgid "Must specify valid IPv4 mask"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:3131
+#: src/vpn/gnunet-service-vpn.c:3127
 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"
@@ -9294,22 +9318,32 @@ msgstr "el servicio es ofrecido vía UDP"
 msgid "Setup tunnels via VPN."
 msgstr "Configurar túneles vía VPN."
 
-#: src/include/gnunet_common.h:645 src/include/gnunet_common.h:652
-#: src/include/gnunet_common.h:662 src/include/gnunet_common.h:670
+#: src/include/gnunet_common.h:674 src/include/gnunet_common.h:681
+#: src/include/gnunet_common.h:691 src/include/gnunet_common.h:699
 #, c-format
 msgid "Assertion failed at %s:%d.\n"
 msgstr "Aserción fallida en %s:%d.\n"
 
-#: src/include/gnunet_common.h:682
+#: src/include/gnunet_common.h:711
 #, 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:709 src/include/gnunet_common.h:718
+#: src/include/gnunet_common.h:738 src/include/gnunet_common.h:747
 #, c-format
 msgid "`%s' failed on file `%s' at %s:%d with error: %s\n"
 msgstr "«%s» falló en el fichero «%s» en %s:%d con el error: %s\n"
 
+#~ msgid "# UPDATE requests executed"
+#~ msgstr "# peticiones «UPDATE» ejecutadas"
+
+#~ msgid "# UPDATE requests received"
+#~ msgstr "# peticiones «UPDATE» recibidas"
+
+#, fuzzy
+#~ msgid "Could not connect to cadet service\n"
+#~ msgstr "¡No se pudo conectar al servicio %s!\n"
+
 #, fuzzy
 #~ msgid "Failed to run upnp client for port %u\n"
 #~ msgstr ""
diff --git a/po/fr.po b/po/fr.po
index e287041e9..4804c8898 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnunet 0.10.1\n"
 "Report-Msgid-Bugs-To: address@hidden"
-"POT-Creation-Date: 2017-01-12 17:19+0100\n"
+"POT-Creation-Date: 2017-02-20 11:12-0600\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,221 +16,221 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: src/arm/gnunet-arm.c:152
+#: src/arm/gnunet-arm.c:156
 #, c-format
 msgid "Failed to remove configuration file %s\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:158
+#: src/arm/gnunet-arm.c:162
 #, c-format
 msgid "Failed to remove servicehome directory %s\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:213 src/testbed/gnunet-service-testbed_peers.c:1139
+#: src/arm/gnunet-arm.c:222 src/testbed/gnunet-service-testbed_peers.c:1139
 msgid "Message was sent successfully"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:215
+#: src/arm/gnunet-arm.c:224
 msgid "Misconfiguration (can not connect to the ARM service)"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:217 src/testbed/gnunet-service-testbed_peers.c:1143
+#: src/arm/gnunet-arm.c:226 src/testbed/gnunet-service-testbed_peers.c:1143
 msgid "We disconnected from ARM before we could send a request"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:219 src/testbed/gnunet-service-testbed_peers.c:1145
+#: src/arm/gnunet-arm.c:228 src/testbed/gnunet-service-testbed_peers.c:1145
 msgid "ARM API is busy"
 msgstr "API ARM occupé"
 
-#: src/arm/gnunet-arm.c:221 src/testbed/gnunet-service-testbed_peers.c:1147
+#: src/arm/gnunet-arm.c:230 src/testbed/gnunet-service-testbed_peers.c:1147
 msgid "Request timed out"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:223 src/testbed/gnunet-service-testbed_peers.c:1149
+#: src/arm/gnunet-arm.c:232 src/testbed/gnunet-service-testbed_peers.c:1149
 msgid "Unknown request status"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:239 src/testbed/gnunet-service-testbed_peers.c:1165
+#: src/arm/gnunet-arm.c:248 src/testbed/gnunet-service-testbed_peers.c:1165
 #, c-format
 msgid "%s is stopped"
 msgstr "%s est arrêté"
 
-#: src/arm/gnunet-arm.c:241 src/testbed/gnunet-service-testbed_peers.c:1167
+#: src/arm/gnunet-arm.c:250 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:243 src/testbed/gnunet-service-testbed_peers.c:1169
+#: src/arm/gnunet-arm.c:252 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:245 src/testbed/gnunet-service-testbed_peers.c:1171
+#: src/arm/gnunet-arm.c:254 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:247 src/testbed/gnunet-service-testbed_peers.c:1173
+#: src/arm/gnunet-arm.c:256 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:249 src/testbed/gnunet-service-testbed_peers.c:1175
+#: src/arm/gnunet-arm.c:258 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:251 src/testbed/gnunet-service-testbed_peers.c:1177
+#: src/arm/gnunet-arm.c:260 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:253 src/testbed/gnunet-service-testbed_peers.c:1179
+#: src/arm/gnunet-arm.c:262 src/testbed/gnunet-service-testbed_peers.c:1179
 #, c-format
 msgid "%s service is not known to ARM"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:255 src/testbed/gnunet-service-testbed_peers.c:1181
+#: src/arm/gnunet-arm.c:264 src/testbed/gnunet-service-testbed_peers.c:1181
 #, c-format
 msgid "%s service failed to start"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:257
+#: src/arm/gnunet-arm.c:266
 #, c-format
 msgid "%s service cannot be started because ARM is shutting down"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:259 src/testbed/gnunet-service-testbed_peers.c:1185
+#: src/arm/gnunet-arm.c:268 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:291
+#: src/arm/gnunet-arm.c:300
 msgid "Fatal error initializing ARM API.\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:320 src/arm/gnunet-arm.c:329
+#: src/arm/gnunet-arm.c:328 src/arm/gnunet-arm.c:337
 #, c-format
 msgid "Failed to start the ARM service: %s\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:364
+#: src/arm/gnunet-arm.c:371
 #, c-format
 msgid "Failed to send a stop request to the ARM service: %s\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:375
+#: src/arm/gnunet-arm.c:382
 #, c-format
 msgid "Failed to stop the ARM service: %s\n"
 msgstr ""
 
-#: 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:422
+#, fuzzy, c-format
+msgid "Failed to send a request to start the `%s' service: %s\n"
+msgstr "Dernier message reçu de %s\n"
 
-#: src/arm/gnunet-arm.c:428
+#: src/arm/gnunet-arm.c:432
 #, c-format
 msgid "Failed to start the `%s' service: %s\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:467
+#: src/arm/gnunet-arm.c:469
 #, c-format
 msgid "Failed to send a request to kill the `%s' service: %%s\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:478
+#: src/arm/gnunet-arm.c:480
 #, c-format
 msgid "Failed to kill the `%s' service: %s\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:519
+#: src/arm/gnunet-arm.c:521
 #, c-format
 msgid "Failed to request a list of services: %s\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:528
+#: src/arm/gnunet-arm.c:530
 msgid "Error communicating with ARM. ARM not running?\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:534
+#: src/arm/gnunet-arm.c:536
 msgid "Running services:\n"
 msgstr "Services en exécution :\n"
 
-#: src/arm/gnunet-arm.c:622
+#: src/arm/gnunet-arm.c:624
 #, c-format
 msgid "Now only monitoring, press CTRL-C to stop.\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:654
+#: src/arm/gnunet-arm.c:656
 #, c-format
 msgid "Stopped %s.\n"
 msgstr "Arrêté %s.\n"
 
-#: src/arm/gnunet-arm.c:657
+#: src/arm/gnunet-arm.c:659
 #, c-format
 msgid "Starting %s...\n"
 msgstr "En cous de démarrage %s…\n"
 
-#: src/arm/gnunet-arm.c:660
+#: src/arm/gnunet-arm.c:662
 #, c-format
 msgid "Stopping %s...\n"
 msgstr "En cour d'arrêt %s…\n"
 
-#: src/arm/gnunet-arm.c:674
+#: src/arm/gnunet-arm.c:676
 #, c-format
 msgid "Unknown status %u for service %s.\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:756
+#: src/arm/gnunet-arm.c:774
 msgid "stop all GNUnet services"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:758
+#: src/arm/gnunet-arm.c:776
 msgid "start a particular service"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:760
+#: src/arm/gnunet-arm.c:778
 msgid "stop a particular service"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:762
+#: src/arm/gnunet-arm.c:780
 msgid "start all GNUnet default services"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:765
+#: src/arm/gnunet-arm.c:783
 msgid "stop and start all GNUnet default services"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:768
+#: src/arm/gnunet-arm.c:786
 msgid "delete config file and directory on exit"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:771
+#: src/arm/gnunet-arm.c:789
 msgid "monitor ARM activities"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:773
+#: src/arm/gnunet-arm.c:791
 msgid "don't print status messages"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:776
+#: src/arm/gnunet-arm.c:794
 msgid "exit with error status if operation does not finish after DELAY"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:778
+#: src/arm/gnunet-arm.c:796
 msgid "list currently running services"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:780
+#: src/arm/gnunet-arm.c:798
 msgid "don't let gnunet-service-arm inherit standard output"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:782
+#: src/arm/gnunet-arm.c:800
 msgid "don't let gnunet-service-arm inherit standard error"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:794
+#: src/arm/gnunet-arm.c:812
 msgid "Control services and the Automated Restart Manager (ARM)"
 msgstr ""
 
@@ -244,20 +244,21 @@ msgstr ""
 #: src/arm/gnunet-service-arm.c:393 src/arm/gnunet-service-arm.c:399
 #: src/transport/plugin_transport_tcp.c:652
 #: src/transport/plugin_transport_tcp.c:658
-#: src/transport/plugin_transport_tcp.c:3309 src/util/service.c:584
-#: src/util/service.c:590 src/util/service_new.c:637 src/util/service_new.c:643
+#: src/transport/plugin_transport_tcp.c:3337 src/util/service.c:584
+#: src/util/service.c:590 src/util/service_new.c:637
+#: src/util/service_new.c:643
 #, c-format
 msgid "Require valid port number for service `%s' in configuration!\n"
 msgstr ""
 
 #: src/arm/gnunet-service-arm.c:430 src/transport/plugin_transport_tcp.c:689
-#: src/util/client.c:464 src/util/service.c:621 src/util/service_new.c:682
+#: src/util/client.c:466 src/util/service.c:621 src/util/service_new.c:682
 #, c-format
 msgid "UNIXPATH `%s' too long, maximum length is %llu\n"
 msgstr ""
 
 #: src/arm/gnunet-service-arm.c:434 src/transport/plugin_transport_tcp.c:693
-#: src/util/client.c:469 src/util/service.c:625 src/util/service_new.c:687
+#: src/util/client.c:471 src/util/service.c:625 src/util/service_new.c:687
 #, c-format
 msgid "Using `%s' instead\n"
 msgstr ""
@@ -379,11 +380,13 @@ msgid ""
 "%llu\n"
 msgstr ""
 
-#: src/ats/gnunet-ats-solver-eval.c:3293 src/ats-tests/gnunet-solver-eval.c:935
+#: 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:938
+#: 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 ""
@@ -630,89 +633,103 @@ msgstr ""
 msgid "Print information about ATS state"
 msgstr ""
 
-#: src/auction/gnunet-auction-create.c:69
+#: src/auction/gnunet-auction-create.c:160
 msgid "description of the item to be sold"
 msgstr ""
 
-#: src/auction/gnunet-auction-create.c:72
+#: src/auction/gnunet-auction-create.c:163
 msgid "mapping of possible prices"
 msgstr ""
 
-#: src/auction/gnunet-auction-create.c:75
+#: src/auction/gnunet-auction-create.c:166
 msgid "max duration per round"
 msgstr ""
 
-#: src/auction/gnunet-auction-create.c:78
+#: src/auction/gnunet-auction-create.c:169
 msgid "duration until auction starts"
 msgstr ""
 
-#: src/auction/gnunet-auction-create.c:81
-msgid "number of items to sell, 0 for first price auction"
+#: src/auction/gnunet-auction-create.c:172
+msgid ""
+"number of items to sell\n"
+"0 for first price auction\n"
+">0 for vickrey/M+1st price auction"
 msgstr ""
 
-#: src/auction/gnunet-auction-create.c:84
+#: src/auction/gnunet-auction-create.c:177
 msgid "public auction outcome"
 msgstr ""
 
-#: src/auction/gnunet-auction-create.c:94 src/auction/gnunet-auction-info.c:76
-#: src/auction/gnunet-auction-join.c:76
+#: src/auction/gnunet-auction-create.c:180
+msgid "keep running in foreground until auction completes"
+msgstr ""
+
+#: src/auction/gnunet-auction-create.c:190
+msgid "create a new auction and start listening for bidders"
+msgstr ""
+
+#: src/auction/gnunet-auction-info.c:76 src/auction/gnunet-auction-join.c:76
 #: src/conversation/gnunet-conversation-test.c:243
 #: src/revocation/gnunet-revocation.c:550 src/template/gnunet-template.c:76
 msgid "help text"
 msgstr ""
 
-#: src/cadet/gnunet-cadet.c:511
-#, c-format
-msgid "Invalid target `%s'\n"
-msgstr ""
-
-#: src/cadet/gnunet-cadet.c:787
+#: src/cadet/gnunet-cadet.c:668
 #, c-format
 msgid "Invalid peer ID `%s'\n"
 msgstr ""
 
-#: src/cadet/gnunet-cadet.c:825
+#: src/cadet/gnunet-cadet.c:706
 #, c-format
 msgid "Invalid tunnel owner `%s'\n"
 msgstr ""
 
-#: src/cadet/gnunet-cadet.c:892
+#: src/cadet/gnunet-cadet.c:779
 msgid "You must NOT give a TARGET when using 'request all' options\n"
 msgstr ""
 
-#: src/cadet/gnunet-cadet.c:982
+#: src/cadet/gnunet-cadet.c:870
+#, c-format
+msgid "Invalid target `%s'\n"
+msgstr ""
+
+#: src/cadet/gnunet-cadet.c:907
+msgid "No action requested\n"
+msgstr ""
+
+#: src/cadet/gnunet-cadet.c:929
 msgid "provide information about a particular connection"
 msgstr ""
 
-#: src/cadet/gnunet-cadet.c:985
+#: src/cadet/gnunet-cadet.c:932
 msgid "activate echo mode"
 msgstr ""
 
-#: src/cadet/gnunet-cadet.c:988
+#: src/cadet/gnunet-cadet.c:935
 msgid "dump debug information to STDERR"
 msgstr ""
 
-#: src/cadet/gnunet-cadet.c:994
+#: src/cadet/gnunet-cadet.c:938
 msgid "port to listen to"
 msgstr ""
 
-#: src/cadet/gnunet-cadet.c:997
+#: src/cadet/gnunet-cadet.c:941
 msgid "provide information about a patricular peer"
 msgstr ""
 
-#: src/cadet/gnunet-cadet.c:1000
+#: src/cadet/gnunet-cadet.c:944
 msgid "provide information about all peers"
 msgstr ""
 
-#: src/cadet/gnunet-cadet.c:1003
+#: src/cadet/gnunet-cadet.c:947
 msgid "provide information about a particular tunnel"
 msgstr ""
 
-#: src/cadet/gnunet-cadet.c:1006
+#: src/cadet/gnunet-cadet.c:950
 msgid "provide information about all tunnels"
 msgstr ""
 
-#: src/cadet/gnunet-service-cadet_peer.c:686
+#: src/cadet/gnunet-service-cadet_peer.c:687
 msgid "Wrong CORE service\n"
 msgstr ""
 
@@ -1247,11 +1264,11 @@ msgstr ""
 msgid "# messages discarded (session disconnected)"
 msgstr ""
 
-#: src/core/gnunet-service-core.c:928
+#: src/core/gnunet-service-core.c:937
 msgid "Core service is lacking HOSTKEY configuration setting.  Exiting.\n"
 msgstr ""
 
-#: src/core/gnunet-service-core.c:949
+#: src/core/gnunet-service-core.c:958
 #, c-format
 msgid "Core service of `%s' ready.\n"
 msgstr ""
@@ -1359,31 +1376,31 @@ msgstr ""
 msgid "# sessions terminated by key expiration"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1554
-#: src/core/gnunet-service-core_kx.c:1580
+#: src/core/gnunet-service-core_kx.c:1557
+#: src/core/gnunet-service-core_kx.c:1583
 msgid "# bytes dropped (duplicates)"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1567
+#: src/core/gnunet-service-core_kx.c:1570
 msgid "# bytes dropped (out of sequence)"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1609
+#: src/core/gnunet-service-core_kx.c:1612
 msgid "# bytes dropped (ancient message)"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1617
+#: src/core/gnunet-service-core_kx.c:1620
 msgid "# bytes of payload decrypted"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1674
+#: src/core/gnunet-service-core_kx.c:1681
 msgid "# PAYLOAD dropped (out of order)"
 msgstr ""
 
-#: 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/core/gnunet-service-core_sessions.c:266
+#: src/core/gnunet-service-core_sessions.c:356
+#: src/dht/gnunet-service-dht_neighbours.c:732
+#: src/dht/gnunet-service-dht_neighbours.c:794
 #: 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
@@ -1392,24 +1409,24 @@ msgstr ""
 msgid "# peers connected"
 msgstr ""
 
-#: src/core/gnunet-service-core_sessions.c:287
+#: src/core/gnunet-service-core_sessions.c:302
 msgid "# type map refreshes sent"
 msgstr ""
 
-#: src/core/gnunet-service-core_sessions.c:407
+#: src/core/gnunet-service-core_sessions.c:422
 msgid "# outdated typemap confirmations received"
 msgstr ""
 
-#: src/core/gnunet-service-core_sessions.c:418
+#: src/core/gnunet-service-core_sessions.c:439
 msgid "# valid typemap confirmations received"
 msgstr ""
 
 #: src/core/gnunet-service-core_typemap.c:169
-#: src/core/gnunet-service-core_typemap.c:180
+#: src/core/gnunet-service-core_typemap.c:181
 msgid "# type maps received"
 msgstr ""
 
-#: src/core/gnunet-service-core_typemap.c:210
+#: src/core/gnunet-service-core_typemap.c:212
 msgid "# updates to my type map"
 msgstr ""
 
@@ -1448,7 +1465,7 @@ msgstr ""
 msgid "# proximity search requests received"
 msgstr ""
 
-#: src/datacache/plugin_datacache_heap.c:467
+#: src/datacache/plugin_datacache_heap.c:466
 msgid "Heap datacache running\n"
 msgstr ""
 
@@ -1469,7 +1486,7 @@ msgstr ""
 #: 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:691 src/include/gnunet_common.h:700
+#: src/include/gnunet_common.h:720 src/include/gnunet_common.h:729
 #: src/scalarproduct/scalarproduct.h:35
 #, c-format
 msgid "`%s' failed at %s:%d with error: %s\n"
@@ -1524,23 +1541,19 @@ msgstr ""
 msgid "# RELEASE RESERVE requests executed"
 msgstr ""
 
-#: src/datastore/datastore_api.c:1187
-msgid "# UPDATE requests executed"
-msgstr ""
-
-#: src/datastore/datastore_api.c:1271
+#: src/datastore/datastore_api.c:1205
 msgid "# REMOVE requests executed"
 msgstr ""
 
-#: src/datastore/datastore_api.c:1331
+#: src/datastore/datastore_api.c:1265
 msgid "# GET REPLICATION requests executed"
 msgstr ""
 
-#: src/datastore/datastore_api.c:1397
+#: src/datastore/datastore_api.c:1331
 msgid "# GET ZERO ANONYMITY requests executed"
 msgstr ""
 
-#: src/datastore/datastore_api.c:1477
+#: src/datastore/datastore_api.c:1411
 msgid "# GET requests executed"
 msgstr ""
 
@@ -1603,7 +1616,7 @@ msgstr ""
 #: 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
+#: src/datastore/gnunet-service-datastore.c:1619
 msgid "# reserved"
 msgstr "# réservé"
 
@@ -1628,93 +1641,89 @@ msgstr ""
 msgid "# requests filtered by bloomfilter"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1115
-msgid "# UPDATE requests received"
-msgstr ""
-
-#: src/datastore/gnunet-service-datastore.c:1146
+#: src/datastore/gnunet-service-datastore.c:1097
 msgid "# GET REPLICATION requests received"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1179
+#: src/datastore/gnunet-service-datastore.c:1130
 msgid "# GET ZERO ANONYMITY requests received"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1226
+#: src/datastore/gnunet-service-datastore.c:1177
 msgid "Content not found"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1235
+#: src/datastore/gnunet-service-datastore.c:1186
 msgid "# bytes removed (explicit request)"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1282
+#: src/datastore/gnunet-service-datastore.c:1233
 msgid "# REMOVE requests received"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1336
+#: src/datastore/gnunet-service-datastore.c:1287
 #, c-format
 msgid ""
 "Datastore payload must have been inaccurate (%lld < %lld). Recomputing it.\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1342
-#: src/datastore/gnunet-service-datastore.c:1517
+#: src/datastore/gnunet-service-datastore.c:1293
+#: src/datastore/gnunet-service-datastore.c:1468
 #, c-format
 msgid "New payload: %lld\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1396
+#: src/datastore/gnunet-service-datastore.c:1347
 #, c-format
 msgid "Loading `%s' datastore plugin\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1408
+#: src/datastore/gnunet-service-datastore.c:1359
 #, c-format
 msgid "Failed to load datastore plugin for `%s'\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1468
+#: src/datastore/gnunet-service-datastore.c:1419
 msgid "Bloomfilter construction complete.\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1524
+#: src/datastore/gnunet-service-datastore.c:1475
 msgid "Rebuilding bloomfilter.  Please be patient.\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1535
+#: src/datastore/gnunet-service-datastore.c:1486
 msgid "Plugin does not support get_keys function. Please fix!\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1705
+#: src/datastore/gnunet-service-datastore.c:1656
 #, c-format
 msgid "# bytes used in file-sharing datastore `%s'"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1721
+#: src/datastore/gnunet-service-datastore.c:1672
 msgid "# quota"
 msgstr "# quota"
 
-#: src/datastore/gnunet-service-datastore.c:1726
+#: src/datastore/gnunet-service-datastore.c:1677
 msgid "# cache size"
 msgstr "# taille du cache"
 
-#: src/datastore/gnunet-service-datastore.c:1742
+#: src/datastore/gnunet-service-datastore.c:1693
 #, c-format
 msgid "Could not use specified filename `%s' for bloomfilter.\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1760
-#: src/datastore/gnunet-service-datastore.c:1776
+#: src/datastore/gnunet-service-datastore.c:1711
+#: src/datastore/gnunet-service-datastore.c:1727
 #, c-format
 msgid "Failed to remove bogus bloomfilter file `%s'\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1808
+#: src/datastore/gnunet-service-datastore.c:1759
 msgid "Failed to initialize bloomfilter.\n"
 msgstr ""
 
-#: src/datastore/plugin_datastore_heap.c:826
+#: src/datastore/plugin_datastore_heap.c:824
 msgid "Heap database running\n"
 msgstr ""
 
@@ -1794,7 +1803,7 @@ msgstr ""
 msgid "Template database running\n"
 msgstr ""
 
-#: src/dht/gnunet-dht-get.c:155
+#: src/dht/gnunet-dht-get.c:157
 #, c-format
 msgid ""
 "Result %d, type %d:\n"
@@ -1803,48 +1812,48 @@ msgstr ""
 "Resultat %d, type %d :\n"
 "%.*s\n"
 
-#: src/dht/gnunet-dht-get.c:181
+#: src/dht/gnunet-dht-get.c:204
 msgid "Must provide key for DHT GET!\n"
 msgstr ""
 
-#: src/dht/gnunet-dht-get.c:187 src/dht/gnunet-dht-monitor.c:248
+#: src/dht/gnunet-dht-get.c:210 src/dht/gnunet-dht-monitor.c:248
 msgid "Failed to connect to DHT service!\n"
 msgstr ""
 
-#: src/dht/gnunet-dht-get.c:195
+#: src/dht/gnunet-dht-get.c:218
 msgid "Issueing DHT GET with key"
 msgstr ""
 
-#: src/dht/gnunet-dht-get.c:212 src/dht/gnunet-dht-monitor.c:289
-#: src/dht/gnunet-dht-put.c:198
+#: src/dht/gnunet-dht-get.c:235 src/dht/gnunet-dht-monitor.c:289
+#: src/dht/gnunet-dht-put.c:207
 msgid "the query key"
 msgstr ""
 
-#: src/dht/gnunet-dht-get.c:215
+#: src/dht/gnunet-dht-get.c:238
 msgid "how many parallel requests (replicas) to create"
 msgstr ""
 
-#: src/dht/gnunet-dht-get.c:218 src/dht/gnunet-dht-monitor.c:292
+#: src/dht/gnunet-dht-get.c:241 src/dht/gnunet-dht-monitor.c:292
 msgid "the type of data to look for"
 msgstr ""
 
-#: src/dht/gnunet-dht-get.c:221
+#: src/dht/gnunet-dht-get.c:244
 msgid "how long to execute this query before giving up?"
 msgstr ""
 
-#: src/dht/gnunet-dht-get.c:224 src/dht/gnunet-dht-put.c:201
+#: src/dht/gnunet-dht-get.c:247 src/dht/gnunet-dht-put.c:210
 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:210 src/fs/gnunet-auto-share.c:780
+#: src/dht/gnunet-dht-get.c:250 src/dht/gnunet-dht-monitor.c:298
+#: src/dht/gnunet-dht-put.c:222 src/fs/gnunet-auto-share.c:780
 #: src/fs/gnunet-download.c:327 src/fs/gnunet-publish.c:951
 #: src/fs/gnunet-search.c:322 src/fs/gnunet-unindex.c:167
 #: src/nse/gnunet-nse-profiler.c:855
 msgid "be verbose (print progress information)"
 msgstr ""
 
-#: src/dht/gnunet-dht-get.c:248
+#: src/dht/gnunet-dht-get.c:271
 msgid "Issue a GET request to the GNUnet DHT, prints results."
 msgstr ""
 
@@ -1856,7 +1865,8 @@ msgstr ""
 msgid "Prints all packets that go through the DHT."
 msgstr ""
 
-#: src/dht/gnunet_dht_profiler.c:1161 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 ""
@@ -1901,63 +1911,67 @@ msgstr ""
 msgid "Measure quality and performance of the DHT service."
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:115
+#: src/dht/gnunet-dht-put.c:120
 msgid "PUT request sent with key"
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:118
+#: src/dht/gnunet-dht-put.c:123
 msgid "Timeout sending PUT request!\n"
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:121
+#: src/dht/gnunet-dht-put.c:126
 msgid "PUT request not confirmed!\n"
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:151
+#: src/dht/gnunet-dht-put.c:157
 msgid "Must provide KEY and DATA for DHT put!\n"
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:158
+#: src/dht/gnunet-dht-put.c:164
 #, c-format
 msgid "Could not connect to %s service!\n"
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:172
+#: src/dht/gnunet-dht-put.c:175
 #, c-format
 msgid "Issuing put request for `%s' with data `%s'!\n"
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:192
+#: src/dht/gnunet-dht-put.c:201
 msgid "the data to insert under the key"
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:195
+#: src/dht/gnunet-dht-put.c:204
 msgid "how long to store this entry in the dht (in seconds)"
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:204
+#: src/dht/gnunet-dht-put.c:213
 msgid "how many replicas to create"
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:207
+#: src/dht/gnunet-dht-put.c:216
+msgid "use DHT's record route option"
+msgstr ""
+
+#: src/dht/gnunet-dht-put.c:219
 msgid "the type to insert data as"
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:232
+#: src/dht/gnunet-dht-put.c:247
 msgid "Issue a PUT request to the GNUnet DHT insert DATA under KEY."
 msgstr ""
 
-#: src/dht/gnunet-service-dht_clients.c:370
+#: src/dht/gnunet-service-dht_clients.c:369
 #: src/dht/gnunet-service-wdht_clients.c:864
 msgid "# GET requests from clients injected"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_clients.c:481
+#: src/dht/gnunet-service-dht_clients.c:482
 #: src/dht/gnunet-service-wdht_clients.c:945
 msgid "# PUT requests received from clients"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_clients.c:620
+#: src/dht/gnunet-service-dht_clients.c:621
 #: src/dht/gnunet-service-wdht_clients.c:1011
 msgid "# GET requests received from clients"
 msgstr ""
@@ -1977,18 +1991,18 @@ msgstr ""
 msgid "# Duplicate REPLIES to CLIENT request dropped"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_clients.c:1094
+#: src/dht/gnunet-service-dht_clients.c:1093
 #: src/dht/gnunet-service-wdht_clients.c:566
 #, c-format
 msgid "Unsupported block type (%u) in request!\n"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_clients.c:1101
+#: src/dht/gnunet-service-dht_clients.c:1100
 #: src/dht/gnunet-service-wdht_clients.c:589
 msgid "# RESULTS queued for clients"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_clients.c:1179
+#: src/dht/gnunet-service-dht_clients.c:1178
 #: src/dht/gnunet-service-wdht_clients.c:643
 #: src/dht/gnunet-service-wdht_clients.c:693
 msgid "# REPLIES ignored for CLIENTS (no match)"
@@ -2003,68 +2017,69 @@ msgstr ""
 msgid "# ITEMS stored in datacache"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_datacache.c:199
+#: src/dht/gnunet-service-dht_datacache.c:198
 msgid "# Good RESULTS found in datacache"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_datacache.c:211
+#: src/dht/gnunet-service-dht_datacache.c:210
 msgid "# Duplicate RESULTS found in datacache"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_datacache.c:217
+#: src/dht/gnunet-service-dht_datacache.c:216
 msgid "# Invalid RESULTS found in datacache"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_datacache.c:223
+#: src/dht/gnunet-service-dht_datacache.c:222
 msgid "# Irrelevant RESULTS found in datacache"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_datacache.c:235
+#: src/dht/gnunet-service-dht_datacache.c:234
 msgid "# Unsupported RESULTS found in datacache"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_datacache.c:239
+#: src/dht/gnunet-service-dht_datacache.c:238
 #, c-format
 msgid "Unsupported block type (%u) in local response!\n"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_datacache.c:276
+#: src/dht/gnunet-service-dht_datacache.c:273
 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:86
+#: src/dht/gnunet-service-xdht_hello.c:82
 msgid "# HELLOs obtained from peerinfo"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:685
+#: src/dht/gnunet-service-dht_neighbours.c:671
 msgid "# FIND PEER messages initiated"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:851
+#: src/dht/gnunet-service-dht_neighbours.c:842
 msgid "# requests TTL-dropped"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1054
-#: src/dht/gnunet-service-dht_neighbours.c:1091
+#: src/dht/gnunet-service-dht_neighbours.c:1045
+#: src/dht/gnunet-service-dht_neighbours.c:1082
 msgid "# Peers excluded from routing due to Bloomfilter"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1071
-#: src/dht/gnunet-service-dht_neighbours.c:1107
+#: src/dht/gnunet-service-dht_neighbours.c:1062
+#: src/dht/gnunet-service-dht_neighbours.c:1098
 msgid "# Peer selection failed"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1255
+#: src/dht/gnunet-service-dht_neighbours.c:1246
 msgid "# PUT requests routed"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1288
+#: src/dht/gnunet-service-dht_neighbours.c:1279
 msgid "# PUT messages queued for transmission"
 msgstr ""
 
-#: 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-dht_neighbours.c:1290
+#: src/dht/gnunet-service-dht_neighbours.c:1430
+#: src/dht/gnunet-service-dht_neighbours.c:1533
 #: src/dht/gnunet-service-xdht_neighbours.c:946
 #: src/dht/gnunet-service-xdht_neighbours.c:1007
 #: src/dht/gnunet-service-xdht_neighbours.c:1047
@@ -2077,55 +2092,55 @@ msgstr ""
 msgid "# P2P messages dropped due to full queue"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1383
+#: src/dht/gnunet-service-dht_neighbours.c:1375
 msgid "# GET requests routed"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1415
+#: src/dht/gnunet-service-dht_neighbours.c:1418
 msgid "# GET messages queued for transmission"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1547
+#: src/dht/gnunet-service-dht_neighbours.c:1548
 msgid "# RESULT messages queued for transmission"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1646
+#: src/dht/gnunet-service-dht_neighbours.c:1647
 msgid "# P2P PUT requests received"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1650
+#: src/dht/gnunet-service-dht_neighbours.c:1651
 msgid "# P2P PUT bytes received"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1858
+#: src/dht/gnunet-service-dht_neighbours.c:1869
 msgid "# FIND PEER requests ignored due to Bloomfilter"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1866
+#: src/dht/gnunet-service-dht_neighbours.c:1877
 msgid "# FIND PEER requests ignored due to lack of HELLO"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:2022
+#: src/dht/gnunet-service-dht_neighbours.c:2029
 msgid "# P2P GET requests received"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:2026
+#: src/dht/gnunet-service-dht_neighbours.c:2033
 msgid "# P2P GET bytes received"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:2101
+#: src/dht/gnunet-service-dht_neighbours.c:2104
 msgid "# P2P FIND PEER requests processed"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:2124
+#: src/dht/gnunet-service-dht_neighbours.c:2125
 msgid "# P2P GET requests ONLY routed"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:2226
+#: src/dht/gnunet-service-dht_neighbours.c:2223
 msgid "# P2P RESULTS received"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:2230
+#: src/dht/gnunet-service-dht_neighbours.c:2227
 msgid "# P2P RESULT bytes received"
 msgstr ""
 
@@ -2133,27 +2148,27 @@ msgstr ""
 msgid "# Network size estimates received"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_routing.c:220
+#: src/dht/gnunet-service-dht_routing.c:218
 msgid "# Good REPLIES matched against routing table"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_routing.c:229
+#: src/dht/gnunet-service-dht_routing.c:232
 msgid "# Duplicate REPLIES matched against routing table"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_routing.c:235
+#: src/dht/gnunet-service-dht_routing.c:238
 msgid "# Invalid REPLIES matched against routing table"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_routing.c:241
+#: src/dht/gnunet-service-dht_routing.c:244
 msgid "# Irrelevant REPLIES matched against routing table"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_routing.c:253
+#: src/dht/gnunet-service-dht_routing.c:256
 msgid "# Unsupported REPLIES matched against routing table"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_routing.c:329
+#: src/dht/gnunet-service-dht_routing.c:335
 msgid "# Entries removed from routing table"
 msgstr ""
 
@@ -2161,7 +2176,7 @@ msgstr ""
 msgid "# Entries added to routing table"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_routing.c:429
+#: src/dht/gnunet-service-dht_routing.c:433
 msgid "# DHT requests combined"
 msgstr ""
 
@@ -2288,16 +2303,16 @@ msgstr ""
 "\n"
 "SUPU %s, %s, %d,my_identity = %s"
 
-#: src/dht/plugin_block_dht.c:144
+#: src/dht/plugin_block_dht.c:167
 #, c-format
 msgid "Block not of type %u\n"
 msgstr ""
 
-#: src/dht/plugin_block_dht.c:151
+#: src/dht/plugin_block_dht.c:174
 msgid "Size mismatch for block\n"
 msgstr ""
 
-#: src/dht/plugin_block_dht.c:161
+#: src/dht/plugin_block_dht.c:184
 #, c-format
 msgid "Block of type %u is malformed\n"
 msgstr ""
@@ -2402,7 +2417,7 @@ msgstr ""
 msgid "# DNS requests received via TUN interface"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:1078 src/exit/gnunet-daemon-exit.c:3643
+#: src/dns/gnunet-service-dns.c:1078 src/exit/gnunet-daemon-exit.c:3642
 msgid "need a valid IPv4 or IPv6 address\n"
 msgstr ""
 
@@ -2419,198 +2434,198 @@ msgstr "sortie verbeuse"
 msgid "Print information about DV state"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:805 src/exit/gnunet-daemon-exit.c:3109
+#: src/exit/gnunet-daemon-exit.c:804 src/exit/gnunet-daemon-exit.c:3108
 msgid "# Inbound CADET channels created"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:861
+#: src/exit/gnunet-daemon-exit.c:860
 #, c-format
 msgid "Got duplicate service records for `%s:%u'\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:914
+#: src/exit/gnunet-daemon-exit.c:913
 msgid "# Bytes transmitted via cadet channels"
 msgstr ""
 
-#: 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
+#: src/exit/gnunet-daemon-exit.c:1032 src/exit/gnunet-daemon-exit.c:2492
+#: src/exit/gnunet-daemon-exit.c:2745 src/vpn/gnunet-service-vpn.c:1454
+#: src/vpn/gnunet-service-vpn.c:1845 src/vpn/gnunet-service-vpn.c:2008
 msgid "# ICMPv4 packets dropped (type not allowed)"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c: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
+#: src/exit/gnunet-daemon-exit.c:1069 src/exit/gnunet-daemon-exit.c:2551
+#: src/exit/gnunet-daemon-exit.c:2804 src/vpn/gnunet-service-vpn.c:1510
+#: src/vpn/gnunet-service-vpn.c:1904 src/vpn/gnunet-service-vpn.c:2041
 msgid "# ICMPv6 packets dropped (type not allowed)"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:1118
+#: src/exit/gnunet-daemon-exit.c:1117
 msgid "# ICMP packets dropped (not allowed)"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:1126
+#: src/exit/gnunet-daemon-exit.c:1125
 msgid "ICMP Packet dropped, have no matching connection information\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:1203
+#: src/exit/gnunet-daemon-exit.c:1202
 msgid "UDP Packet dropped, have no matching connection information\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:1278
+#: src/exit/gnunet-daemon-exit.c:1277
 msgid "TCP Packet dropped, have no matching connection information\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:1331
+#: src/exit/gnunet-daemon-exit.c:1330
 msgid "# Packets received from TUN"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:1345
+#: src/exit/gnunet-daemon-exit.c:1344
 msgid "# Bytes received from TUN"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:1371
+#: src/exit/gnunet-daemon-exit.c:1370
 msgid "IPv4 packet options received.  Ignored.\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:1398
+#: src/exit/gnunet-daemon-exit.c:1397
 #, c-format
 msgid "IPv4 packet with unsupported next header %u received.  Ignored.\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:1444
+#: src/exit/gnunet-daemon-exit.c:1443
 #, c-format
 msgid "IPv6 packet with unsupported next header %d received.  Ignored.\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:1452
+#: src/exit/gnunet-daemon-exit.c:1451
 #, c-format
 msgid "Packet from unknown protocol %u received.  Ignored.\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:1853
+#: src/exit/gnunet-daemon-exit.c:1852
 msgid "# TCP packets sent via TUN"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:1977
+#: src/exit/gnunet-daemon-exit.c:1976
 msgid "# TCP service creation requests received via cadet"
 msgstr ""
 
-#: 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
+#: src/exit/gnunet-daemon-exit.c:1980 src/exit/gnunet-daemon-exit.c:2059
+#: src/exit/gnunet-daemon-exit.c:2166 src/exit/gnunet-daemon-exit.c:2416
+#: src/exit/gnunet-daemon-exit.c:2666 src/exit/gnunet-daemon-exit.c:2953
+#: src/exit/gnunet-daemon-exit.c:3056
 msgid "# Bytes received from CADET"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:2063
+#: src/exit/gnunet-daemon-exit.c:2062
 msgid "# TCP IP-exit creation requests received via cadet"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:2170
+#: src/exit/gnunet-daemon-exit.c:2169
 msgid "# TCP data requests received via cadet"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:2184
+#: src/exit/gnunet-daemon-exit.c:2183
 msgid "# TCP DATA requests dropped (no session)"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:2246
+#: src/exit/gnunet-daemon-exit.c:2245
 msgid "# ICMP packets sent via TUN"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:2420
+#: src/exit/gnunet-daemon-exit.c:2419
 msgid "# ICMP IP-exit requests received via cadet"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:2670
+#: src/exit/gnunet-daemon-exit.c:2669
 msgid "# ICMP service requests received via cadet"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:2731 src/vpn/gnunet-service-vpn.c:1445
-#: src/vpn/gnunet-service-vpn.c:2003
+#: src/exit/gnunet-daemon-exit.c:2730 src/vpn/gnunet-service-vpn.c:1444
+#: src/vpn/gnunet-service-vpn.c:2002
 msgid "# ICMPv4 packets dropped (impossible PT to v6)"
 msgstr ""
 
-#: 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
+#: src/exit/gnunet-daemon-exit.c:2789 src/vpn/gnunet-service-vpn.c:1480
+#: src/vpn/gnunet-service-vpn.c:1492 src/vpn/gnunet-service-vpn.c:1892
 msgid "# ICMPv6 packets dropped (impossible PT to v4)"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:2841
+#: src/exit/gnunet-daemon-exit.c:2840
 msgid "# UDP packets sent via TUN"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:2957
+#: src/exit/gnunet-daemon-exit.c:2956
 msgid "# UDP IP-exit requests received via cadet"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3060
+#: src/exit/gnunet-daemon-exit.c:3059
 msgid "# UDP service requests received via cadet"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3327 src/exit/gnunet-daemon-exit.c:3337
+#: src/exit/gnunet-daemon-exit.c:3326 src/exit/gnunet-daemon-exit.c:3336
 #, c-format
 msgid "Option `%s' for domain `%s' is not formatted correctly!\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3351 src/exit/gnunet-daemon-exit.c:3359
+#: src/exit/gnunet-daemon-exit.c:3350 src/exit/gnunet-daemon-exit.c:3358
 #, c-format
 msgid "`%s' is not a valid port number (for domain `%s')!"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3400
+#: src/exit/gnunet-daemon-exit.c:3399
 #, c-format
 msgid "No addresses found for hostname `%s' of service `%s'!\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3414 src/exit/gnunet-daemon-exit.c:3427
+#: src/exit/gnunet-daemon-exit.c:3413 src/exit/gnunet-daemon-exit.c:3426
 #, c-format
 msgid "Service `%s' configured for IPv4, but IPv4 is disabled!\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3439
+#: src/exit/gnunet-daemon-exit.c:3438
 #, c-format
 msgid "No IP addresses found for hostname `%s' of service `%s'!\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3584
+#: src/exit/gnunet-daemon-exit.c:3583
 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:3592
+#: src/exit/gnunet-daemon-exit.c:3591
 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:3599
+#: src/exit/gnunet-daemon-exit.c:3598
 msgid ""
 "Cannot enable IPv4 exit but disable IPv4 on TUN interface, will use "
 "ENABLE_IPv4=YES\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3605
+#: src/exit/gnunet-daemon-exit.c:3604
 msgid ""
 "Cannot enable IPv6 exit but disable IPv6 on TUN interface, will use "
 "ENABLE_IPv6=YES\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3765
+#: src/exit/gnunet-daemon-exit.c:3764
 msgid "Must be a number"
 msgstr "Doit être un nombre"
 
-#: src/exit/gnunet-daemon-exit.c:3872
+#: src/exit/gnunet-daemon-exit.c:3871
 #, 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
+#: src/exit/gnunet-daemon-exit.c:3883 src/pt/gnunet-daemon-pt.c:1279
 msgid "No useful service enabled.  Exiting.\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:4029
+#: src/exit/gnunet-daemon-exit.c:4028
 msgid "Daemon to run to provide an IP exit node for the VPN"
 msgstr ""
 
@@ -2651,15 +2666,15 @@ msgstr ""
 msgid "# total size of fragmented messages"
 msgstr ""
 
-#: src/fragmentation/fragmentation.c:455
+#: src/fragmentation/fragmentation.c:456
 msgid "# fragment acknowledgements received"
 msgstr ""
 
-#: src/fragmentation/fragmentation.c:462
+#: src/fragmentation/fragmentation.c:463
 msgid "# bits removed from fragmentation ACKs"
 msgstr ""
 
-#: src/fragmentation/fragmentation.c:486
+#: src/fragmentation/fragmentation.c:487
 msgid "# fragmentation transmissions completed"
 msgstr ""
 
@@ -2688,46 +2703,46 @@ msgstr ""
 msgid "Failure while resuming publishing operation `%s': %s\n"
 msgstr ""
 
-#: src/fs/fs_api.c:1660
+#: src/fs/fs_api.c:1662
 #, c-format
 msgid "Failed to resume publishing operation `%s': %s\n"
 msgstr ""
 
-#: src/fs/fs_api.c:2318
+#: src/fs/fs_api.c:2322
 #, c-format
 msgid "Failure while resuming unindexing operation `%s': %s\n"
 msgstr ""
 
-#: src/fs/fs_api.c:2328
+#: src/fs/fs_api.c:2332
 #, c-format
 msgid "Failed to resume unindexing operation `%s': %s\n"
 msgstr ""
 
-#: src/fs/fs_api.c:2456 src/fs/fs_api.c:2703
+#: src/fs/fs_api.c:2460 src/fs/fs_api.c:2706
 #, c-format
 msgid "Failed to resume sub-download `%s': %s\n"
 msgstr ""
 
-#: src/fs/fs_api.c:2474
+#: src/fs/fs_api.c:2478
 #, c-format
 msgid "Failed to resume sub-search `%s': %s\n"
 msgstr ""
 
-#: src/fs/fs_api.c:2489 src/fs/fs_api.c:2508 src/fs/fs_api.c:3006
+#: src/fs/fs_api.c:2493 src/fs/fs_api.c:2512 src/fs/fs_api.c:3016
 #, c-format
 msgid "Failure while resuming search operation `%s': %s\n"
 msgstr ""
 
-#: src/fs/fs_api.c:2693
+#: src/fs/fs_api.c:2696
 #, c-format
 msgid "Failed to resume sub-download `%s': could not open file `%s'\n"
 msgstr ""
 
-#: src/fs/fs_api.c:2949
+#: src/fs/fs_api.c:2959
 msgid "Could not resume running search, will resume as paused search\n"
 msgstr ""
 
-#: src/fs/fs_api.c:3044
+#: src/fs/fs_api.c:3054
 #, c-format
 msgid "Failure while resuming download operation `%s': %s\n"
 msgstr ""
@@ -2786,7 +2801,7 @@ msgstr ""
 msgid "internal error decoding tree"
 msgstr ""
 
-#: src/fs/fs_download.c:1838
+#: src/fs/fs_download.c:1845
 msgid "Invalid URI"
 msgstr "URI invalide"
 
@@ -3492,42 +3507,42 @@ msgstr ""
 msgid "Hash mismatch trying to index file `%s' which does not have hash `%s'\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs.c:1288
+#: src/fs/gnunet-service-fs.c:1287
 msgid "FS service is lacking HOSTKEY configuration setting.  Exiting.\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs.c:1313 src/hostlist/gnunet-daemon-hostlist.c:355
+#: src/fs/gnunet-service-fs.c:1312 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:494
+#: src/fs/gnunet-service-fs_cadet_client.c:370
 msgid "# replies received via cadet"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cadet_client.c:508
+#: src/fs/gnunet-service-fs_cadet_client.c:384
 msgid "# replies received via cadet dropped"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cadet_server.c:258
-msgid "# Blocks transferred via cadet"
+#: src/fs/gnunet-service-fs_cadet_server.c:263
+msgid "# queries received via CADET not answered"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cadet_server.c:360
-msgid "# queries received via CADET not answered"
+#: src/fs/gnunet-service-fs_cadet_server.c:317
+msgid "# Blocks transferred via cadet"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cadet_server.c:440
+#: src/fs/gnunet-service-fs_cadet_server.c:343
 msgid "# queries received via cadet"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cadet_server.c:484
+#: src/fs/gnunet-service-fs_cadet_server.c:384
 msgid "# cadet client connections rejected"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cadet_server.c:490
-#: src/fs/gnunet-service-fs_cadet_server.c:530
+#: src/fs/gnunet-service-fs_cadet_server.c:391
+#: src/fs/gnunet-service-fs_cadet_server.c:431
 #, fuzzy
 msgid "# cadet connections active"
 msgstr "# Session TCP active"
@@ -3675,107 +3690,107 @@ msgstr ""
 msgid "# query plan entries"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:315
+#: src/fs/gnunet-service-fs_pr.c:327
 msgid "# Pending requests created"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:411 src/fs/gnunet-service-fs_pr.c:661
+#: src/fs/gnunet-service-fs_pr.c:428 src/fs/gnunet-service-fs_pr.c:675
 msgid "# Pending requests active"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:842
+#: src/fs/gnunet-service-fs_pr.c:856
 msgid "# replies received and matched"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:879
+#: src/fs/gnunet-service-fs_pr.c:892
 msgid "# duplicate replies discarded (bloomfilter)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:888
+#: src/fs/gnunet-service-fs_pr.c:901
 msgid "# irrelevant replies discarded"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:903
+#: src/fs/gnunet-service-fs_pr.c:916
 #, c-format
 msgid "Unsupported block type %u\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:920
+#: src/fs/gnunet-service-fs_pr.c:933
 msgid "# results found locally"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1050
+#: src/fs/gnunet-service-fs_pr.c:1063
 msgid "# Datastore `PUT' failures"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1078
+#: src/fs/gnunet-service-fs_pr.c:1091
 msgid "# storage requests dropped due to high load"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1116
+#: src/fs/gnunet-service-fs_pr.c:1129
 msgid "# Replies received from DHT"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1247
+#: src/fs/gnunet-service-fs_pr.c:1260
 msgid "# Replies received from CADET"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1299
+#: src/fs/gnunet-service-fs_pr.c:1312
 #, c-format
 msgid "Datastore lookup already took %s!\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1320
+#: src/fs/gnunet-service-fs_pr.c:1333
 #, c-format
 msgid "On-demand lookup already took %s!\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1372
+#: src/fs/gnunet-service-fs_pr.c:1385
 msgid "# Datastore lookups concluded (no results)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1387
+#: src/fs/gnunet-service-fs_pr.c:1400
 msgid "# Datastore lookups concluded (seen all)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1396
+#: src/fs/gnunet-service-fs_pr.c:1409
 msgid "# Datastore lookups aborted (more than MAX_RESULTS)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1411
+#: src/fs/gnunet-service-fs_pr.c:1424
 msgid "# requested DBLOCK or IBLOCK not found"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1425
+#: src/fs/gnunet-service-fs_pr.c:1438
 msgid "# on-demand blocks matched requests"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1438
+#: src/fs/gnunet-service-fs_pr.c:1451
 msgid "# on-demand lookups performed successfully"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1443
+#: src/fs/gnunet-service-fs_pr.c:1456
 msgid "# on-demand lookups failed"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1469 src/fs/gnunet-service-fs_pr.c:1508
-#: src/fs/gnunet-service-fs_pr.c:1675
+#: src/fs/gnunet-service-fs_pr.c:1482 src/fs/gnunet-service-fs_pr.c:1521
+#: src/fs/gnunet-service-fs_pr.c:1688
 msgid "# Datastore lookups concluded (error queueing)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1527
+#: src/fs/gnunet-service-fs_pr.c:1540
 msgid "# Datastore lookups concluded (found last result)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1539
+#: src/fs/gnunet-service-fs_pr.c:1552
 msgid "# Datastore lookups concluded (load too high)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1652
+#: src/fs/gnunet-service-fs_pr.c:1665
 msgid "# Datastore lookups initiated"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1732
+#: src/fs/gnunet-service-fs_pr.c:1745
 msgid "# GAP PUT messages received"
 msgstr ""
 
@@ -4123,7 +4138,7 @@ msgid "Failed to connect to the namecache!\n"
 msgstr ""
 
 #: src/gns/gnunet-service-gns.c:612
-#: src/zonemaster/gnunet-service-zonemaster.c:740
+#: src/zonemaster/gnunet-service-zonemaster.c:741
 msgid "Could not connect to DHT!\n"
 msgstr ""
 
@@ -4593,7 +4608,7 @@ msgid "# hostlist advertisements send"
 msgstr ""
 
 #: src/hostlist/gnunet-daemon-hostlist_server.c:679
-#: src/transport/gnunet-service-transport.c:2802
+#: src/transport/gnunet-service-transport.c:2803
 msgid "Could not access PEERINFO service.  Exiting.\n"
 msgstr ""
 
@@ -4941,7 +4956,8 @@ msgstr "supprimer"
 msgid "Invalid public key for reverse lookup `%s'\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:979 src/peerinfo-tool/gnunet-peerinfo.c:775
+#: 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"
@@ -5139,22 +5155,21 @@ msgid "Failed to connect to `gnunet-nat-server'\n"
 msgstr ""
 
 #: src/nat-auto/gnunet-nat-auto_legacy.c:518
-#: src/nat-auto/nat_auto_api_test.c:520
 #, c-format
 msgid "Failed to create listen socket bound to `%s' for NAT test: %s\n"
 msgstr ""
 
 #: src/nat-auto/gnunet-nat-auto_legacy.c:568
-#: src/nat-auto/nat_auto_api_test.c:569
+#: src/nat-auto/nat_auto_api_test.c:571
 msgid "NAT test failed to start NAT library\n"
 msgstr ""
 
-#: src/nat-auto/gnunet-nat-server.c:336
+#: src/nat-auto/gnunet-nat-server.c:338
 #, c-format
 msgid "Please pass valid port number as the first argument! (got `%s')\n"
 msgstr ""
 
-#: src/nat-auto/gnunet-nat-server.c:386
+#: src/nat-auto/gnunet-nat-server.c:388
 msgid "GNUnet NAT traversal test helper daemon"
 msgstr ""
 
@@ -5295,6 +5310,11 @@ msgstr ""
 msgid "Failed to find valid PORT in section `%s'\n"
 msgstr "Résolution de « %s » échouée : %s\n"
 
+#: src/nat-auto/nat_auto_api_test.c:522
+#, fuzzy, c-format
+msgid "Failed to create socket bound to `%s' for NAT test: %s\n"
+msgstr "Résolution de « %s » échouée : %s\n"
+
 #: src/nat/gnunet-nat.c:424
 msgid "which IP and port are we locally using to bind/listen to"
 msgstr ""
@@ -5321,31 +5341,31 @@ msgstr ""
 msgid "GNUnet NAT traversal autoconfigure daemon"
 msgstr ""
 
-#: src/nat/gnunet-service-nat.c:1313
+#: src/nat/gnunet-service-nat.c:1317
 #, c-format
 msgid "Malformed punched hole specification `%s' (lacks port)\n"
 msgstr ""
 
-#: src/nat/gnunet-service-nat.c:1323
+#: src/nat/gnunet-service-nat.c:1327
 #, c-format
 msgid "Invalid port number in punched hole specification `%s' (lacks port)\n"
 msgstr ""
 
-#: src/nat/gnunet-service-nat.c:1339
+#: src/nat/gnunet-service-nat.c:1343
 #, c-format
 msgid "Malformed punched hole specification `%s' (lacks `]')\n"
 msgstr ""
 
-#: src/nat/gnunet-service-nat.c:1350
+#: src/nat/gnunet-service-nat.c:1354
 #, c-format
 msgid "Malformed punched hole specification `%s' (IPv6 address invalid)"
 msgstr ""
 
-#: src/nat/gnunet-service-nat.c:1803
+#: src/nat/gnunet-service-nat.c:1813
 msgid "Connection reversal request failed\n"
 msgstr ""
 
-#: src/nat/gnunet-service-nat.c:1876
+#: src/nat/gnunet-service-nat.c:1886
 msgid ""
 "UPnP enabled in configuration, but UPnP client `upnpc` command not found, "
 "disabling UPnP\n"
@@ -5365,7 +5385,7 @@ msgstr "Échec du démarrage de %s\n"
 msgid "`external-ip' command not found\n"
 msgstr ""
 
-#: src/nat/gnunet-service-nat_mini.c:654
+#: src/nat/gnunet-service-nat_mini.c:656
 msgid "`upnpc' command not found\n"
 msgstr ""
 
@@ -5397,7 +5417,7 @@ msgstr ""
 msgid "Measure quality and performance of the NSE service."
 msgstr ""
 
-#: src/nse/gnunet-service-nse.c:1536
+#: src/nse/gnunet-service-nse.c:1534
 #: src/revocation/gnunet-service-revocation.c:832 src/util/gnunet-scrypt.c:276
 msgid "Value is too large.\n"
 msgstr ""
@@ -5602,7 +5622,7 @@ msgstr ""
 msgid "`%s:%s' failed at %s:%d with error: %s\n"
 msgstr ""
 
-#: src/postgres/postgres.c:195
+#: src/postgres/postgres.c:192
 #, fuzzy, c-format
 msgid "Unable to connect to Postgres database '%s': %s\n"
 msgstr "Résolution de « %s » échouée\n"
@@ -5907,7 +5927,7 @@ msgstr ""
 msgid "Revocation certificate not ready, calculating proof of work\n"
 msgstr ""
 
-#: src/revocation/gnunet-revocation.c:437 src/social/gnunet-social.c:1159
+#: src/revocation/gnunet-revocation.c:437 src/social/gnunet-social.c:1176
 #, c-format
 msgid "Public key `%s' malformed\n"
 msgstr ""
@@ -6035,10 +6055,10 @@ msgstr ""
 msgid "Calculate the Vectorproduct with a GNUnet peer."
 msgstr ""
 
-#: 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
+#: src/scalarproduct/gnunet-service-scalarproduct_alice.c:1404
+#: src/scalarproduct/gnunet-service-scalarproduct_bob.c:1342
+#: src/scalarproduct/gnunet-service-scalarproduct-ecc_alice.c:1177
+#: src/scalarproduct/gnunet-service-scalarproduct-ecc_bob.c:1060
 msgid "Connect to CADET failed\n"
 msgstr ""
 
@@ -6062,9 +6082,10 @@ msgstr "threshold"
 msgid "also profile decryption"
 msgstr ""
 
-#: src/set/gnunet-service-set.c:1991
-msgid "Could not connect to cadet service\n"
-msgstr ""
+#: src/set/gnunet-service-set.c:2068
+#, fuzzy
+msgid "Could not connect to CADET service\n"
+msgstr "Impossible d’ouvrir « %s ».\n"
 
 #: src/set/gnunet-set-ibf-profiler.c:249
 msgid "number of element in set A-B"
@@ -6090,124 +6111,124 @@ msgstr "taille ibz"
 msgid "operation to execute"
 msgstr ""
 
-#: src/social/gnunet-social.c:1146
+#: src/social/gnunet-social.c:1163
 msgid "--place missing or invalid.\n"
 msgstr ""
 
-#: src/social/gnunet-social.c:1195
+#: src/social/gnunet-social.c:1212
 msgid "assign --name in state to --data"
 msgstr ""
 
-#: src/social/gnunet-social.c:1199
+#: src/social/gnunet-social.c:1216
 msgid "say good-bye and leave somebody else's place"
 msgstr ""
 
-#: src/social/gnunet-social.c:1203
+#: src/social/gnunet-social.c:1220
 msgid "create a place"
 msgstr ""
 
-#: src/social/gnunet-social.c:1207
+#: src/social/gnunet-social.c:1224
 msgid "destroy a place we were hosting"
 msgstr ""
 
-#: src/social/gnunet-social.c:1211
+#: src/social/gnunet-social.c:1228
 msgid "enter somebody else's place"
 msgstr ""
 
-#: src/social/gnunet-social.c:1215
+#: src/social/gnunet-social.c:1232
 msgid "find state matching name prefix"
 msgstr ""
 
-#: src/social/gnunet-social.c:1219
+#: src/social/gnunet-social.c:1236
 msgid "replay history of messages up to the given --limit"
 msgstr ""
 
-#: src/social/gnunet-social.c:1223
+#: src/social/gnunet-social.c:1240
 msgid "reconnect to a previously created place"
 msgstr ""
 
-#: src/social/gnunet-social.c:1227
+#: src/social/gnunet-social.c:1244
 msgid "publish something to a place we are hosting"
 msgstr ""
 
-#: src/social/gnunet-social.c:1231
+#: src/social/gnunet-social.c:1248
 msgid "reconnect to a previously entered place"
 msgstr ""
 
-#: src/social/gnunet-social.c:1235
+#: src/social/gnunet-social.c:1252
 msgid "search for state matching exact name"
 msgstr ""
 
-#: src/social/gnunet-social.c:1239
+#: src/social/gnunet-social.c:1256
 msgid "submit something to somebody's place"
 msgstr ""
 
-#: src/social/gnunet-social.c:1243
+#: src/social/gnunet-social.c:1260
 msgid "list of egos and subscribed places"
 msgstr ""
 
-#: src/social/gnunet-social.c:1247
+#: src/social/gnunet-social.c:1264
 msgid "extract and replay history between message IDs --start and --until"
 msgstr ""
 
-#: src/social/gnunet-social.c:1254
+#: src/social/gnunet-social.c:1271
 msgid "application ID to use when connecting"
 msgstr ""
 
-#: src/social/gnunet-social.c:1258
+#: src/social/gnunet-social.c:1275
 msgid "message body or state value"
 msgstr ""
 
-#: src/social/gnunet-social.c:1262
+#: src/social/gnunet-social.c:1279
 msgid "name or public key of ego"
 msgstr ""
 
-#: src/social/gnunet-social.c:1266
+#: src/social/gnunet-social.c:1283
 msgid "wait for incoming messages"
 msgstr ""
 
-#: src/social/gnunet-social.c:1270
+#: src/social/gnunet-social.c:1287
 msgid "GNS name"
 msgstr ""
 
-#: src/social/gnunet-social.c:1274
+#: src/social/gnunet-social.c:1291
 msgid "peer ID for --guest-enter"
 msgstr ""
 
-#: src/social/gnunet-social.c:1278
+#: src/social/gnunet-social.c:1295
 msgid "name (key) to query from state"
 msgstr ""
 
-#: src/social/gnunet-social.c:1282
+#: src/social/gnunet-social.c:1299
 msgid "method name"
 msgstr ""
 
-#: src/social/gnunet-social.c:1286
+#: src/social/gnunet-social.c:1303
 #, fuzzy
 msgid "number of messages to replay from history"
 msgstr "nombre de valeurs"
 
-#: src/social/gnunet-social.c:1290
+#: src/social/gnunet-social.c:1307
 msgid "key address of place"
 msgstr ""
 
-#: src/social/gnunet-social.c:1294
+#: src/social/gnunet-social.c:1311
 msgid "start message ID for history replay"
 msgstr ""
 
-#: src/social/gnunet-social.c:1298
+#: src/social/gnunet-social.c:1315
 msgid "respond to entry requests by admitting all guests"
 msgstr ""
 
-#: src/social/gnunet-social.c:1302
+#: src/social/gnunet-social.c:1319
 msgid "end message ID for history replay"
 msgstr ""
 
-#: src/social/gnunet-social.c:1306
+#: src/social/gnunet-social.c:1323
 msgid "respond to entry requests by refusing all guests"
 msgstr ""
 
-#: src/social/gnunet-social.c:1316
+#: src/social/gnunet-social.c:1333
 msgid ""
 "gnunet-social - Interact with the social service: enter/leave, send/receive "
 "messages, access history and state.\n"
@@ -6734,35 +6755,35 @@ msgstr ""
 msgid "# bytes payload discarded due to not connected peer"
 msgstr ""
 
-#: src/transport/gnunet-service-transport.c:1698
+#: src/transport/gnunet-service-transport.c:1699
 msgid "# bytes total received"
 msgstr ""
 
-#: src/transport/gnunet-service-transport.c:1795
+#: src/transport/gnunet-service-transport.c:1796
 msgid "# bytes payload received"
 msgstr ""
 
-#: src/transport/gnunet-service-transport.c:2112
-#: src/transport/gnunet-service-transport.c:2584
+#: src/transport/gnunet-service-transport.c:2113
+#: src/transport/gnunet-service-transport.c:2585
 msgid "# disconnects due to blacklist"
 msgstr ""
 
-#: src/transport/gnunet-service-transport.c:2588
+#: src/transport/gnunet-service-transport.c:2589
 #, c-format
 msgid "Disallowing connection to peer `%s' on transport %s\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport.c:2696
+#: src/transport/gnunet-service-transport.c:2697
 #, c-format
 msgid "Adding blacklisting entry for peer `%s'\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport.c:2705
+#: src/transport/gnunet-service-transport.c:2706
 #, c-format
 msgid "Adding blacklisting entry for peer `%s':`%s'\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport.c:2770
+#: src/transport/gnunet-service-transport.c:2771
 msgid "Transport service is lacking key configuration settings. Exiting.\n"
 msgstr ""
 
@@ -6897,64 +6918,64 @@ msgstr ""
 msgid "SYN request from peer `%s' ignored due impending shutdown\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:2598
+#: src/transport/gnunet-service-transport_neighbours.c:2606
 msgid "# Attempts to switch addresses"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3080
+#: src/transport/gnunet-service-transport_neighbours.c:3088
 msgid "# SYN_ACK messages received"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3088
+#: src/transport/gnunet-service-transport_neighbours.c:3096
 msgid "# unexpected SYN_ACK messages (no peer)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3106
-#: src/transport/gnunet-service-transport_neighbours.c:3130
+#: src/transport/gnunet-service-transport_neighbours.c:3114
+#: src/transport/gnunet-service-transport_neighbours.c:3138
 msgid "# unexpected SYN_ACK messages (not ready)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3142
+#: src/transport/gnunet-service-transport_neighbours.c:3150
 msgid "# unexpected SYN_ACK messages (waiting on ATS)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3167
+#: src/transport/gnunet-service-transport_neighbours.c:3175
 msgid "# Successful attempts to switch addresses"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3180
+#: src/transport/gnunet-service-transport_neighbours.c:3188
 msgid "# unexpected SYN_ACK messages (disconnecting)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3352
+#: src/transport/gnunet-service-transport_neighbours.c:3360
 msgid "# ACK messages received"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3388
+#: src/transport/gnunet-service-transport_neighbours.c:3396
 msgid "# unexpected ACK messages"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3476
+#: src/transport/gnunet-service-transport_neighbours.c:3484
 msgid "# quota messages ignored (malformed)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3483
+#: src/transport/gnunet-service-transport_neighbours.c:3491
 msgid "# QUOTA messages received"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3523
+#: src/transport/gnunet-service-transport_neighbours.c:3531
 msgid "# disconnect messages ignored (malformed)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3530
+#: src/transport/gnunet-service-transport_neighbours.c:3538
 msgid "# DISCONNECT messages received"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3541
+#: src/transport/gnunet-service-transport_neighbours.c:3549
 msgid "# disconnect messages ignored (timestamp)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3675
+#: src/transport/gnunet-service-transport_neighbours.c:3683
 msgid "# disconnected from peer upon explicit request"
 msgstr ""
 
@@ -7242,8 +7263,8 @@ msgstr ""
 #: src/transport/plugin_transport_http_client.c:1477
 #: src/transport/plugin_transport_http_server.c:2248
 #: src/transport/plugin_transport_http_server.c:3462
-#: src/transport/plugin_transport_tcp.c:3375
-#: src/transport/plugin_transport_tcp.c:3382
+#: src/transport/plugin_transport_tcp.c:3403
+#: src/transport/plugin_transport_tcp.c:3410
 msgid "TCP_STEALTH not supported on this platform.\n"
 msgstr ""
 
@@ -7312,7 +7333,7 @@ msgid "Found %u addresses to report to NAT service\n"
 msgstr ""
 
 #: src/transport/plugin_transport_http_server.c:2837
-#: src/transport/plugin_transport_udp.c:3623
+#: src/transport/plugin_transport_udp.c:3613
 msgid "Disabling IPv6 since it is not supported on this system!\n"
 msgstr ""
 
@@ -7411,15 +7432,15 @@ msgid "# bytes dropped by SMTP (outgoing)"
 msgstr ""
 
 #: src/transport/plugin_transport_tcp.c:1060
-#: src/transport/plugin_transport_tcp.c:2379
+#: src/transport/plugin_transport_tcp.c:2386
 #, c-format
 msgid "Unexpected address length: %u bytes\n"
 msgstr ""
 
 #: src/transport/plugin_transport_tcp.c:1243
 #: src/transport/plugin_transport_tcp.c:1467
-#: src/transport/plugin_transport_tcp.c:2643
-#: src/transport/plugin_transport_tcp.c:3498
+#: src/transport/plugin_transport_tcp.c:2650
+#: src/transport/plugin_transport_tcp.c:3526
 msgid "# TCP sessions active"
 msgstr "# Session TCP active"
 
@@ -7444,62 +7465,62 @@ msgstr ""
 msgid "# bytes transmitted via TCP"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2041
+#: src/transport/plugin_transport_tcp.c:2048
 msgid "# requests to create session with invalid address"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2217
+#: src/transport/plugin_transport_tcp.c:2224
 msgid "# transport-service disconnect requests for TCP"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2702
+#: src/transport/plugin_transport_tcp.c:2716
 msgid "# TCP WELCOME messages received"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2893
+#: src/transport/plugin_transport_tcp.c:2921
 msgid "# bytes received via TCP"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2944
-#: src/transport/plugin_transport_tcp.c:3002
+#: src/transport/plugin_transport_tcp.c:2972
+#: src/transport/plugin_transport_tcp.c:3030
 #, fuzzy
 msgid "# TCP server connections active"
 msgstr "# Session TCP active"
 
-#: src/transport/plugin_transport_tcp.c:2948
+#: src/transport/plugin_transport_tcp.c:2976
 msgid "# TCP server connect events"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2954
+#: src/transport/plugin_transport_tcp.c:2982
 msgid "TCP connection limit reached, suspending server\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2956
+#: src/transport/plugin_transport_tcp.c:2984
 msgid "# TCP service suspended"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2996
+#: src/transport/plugin_transport_tcp.c:3024
 msgid "# TCP service resumed"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:3006
+#: src/transport/plugin_transport_tcp.c:3034
 msgid "# network-level TCP disconnect events"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:3325
+#: src/transport/plugin_transport_tcp.c:3353
 msgid "Failed to start service.\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:3486
+#: src/transport/plugin_transport_tcp.c:3514
 #, c-format
 msgid "TCP transport listening on port %llu\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:3490
+#: src/transport/plugin_transport_tcp.c:3518
 msgid "TCP transport not listening on any port (client only)\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:3494
+#: src/transport/plugin_transport_tcp.c:3522
 #, c-format
 msgid "TCP transport advertises itself as being on port %llu\n"
 msgstr ""
@@ -7518,49 +7539,49 @@ msgstr ""
 msgid "Failed to set IPv4 broadcast option for broadcast socket on port %d\n"
 msgstr ""
 
-#: src/transport/plugin_transport_udp.c:3367
+#: src/transport/plugin_transport_udp.c:3357
 #, c-format
 msgid ""
 "UDP could not transmit message to `%s': Network seems down, please check "
 "your network configuration\n"
 msgstr ""
 
-#: src/transport/plugin_transport_udp.c:3381
+#: src/transport/plugin_transport_udp.c:3371
 msgid ""
 "UDP could not transmit IPv6 message! Please check your network configuration "
 "and disable IPv6 if your connection does not have a global IPv6 address\n"
 msgstr ""
 
-#: src/transport/plugin_transport_udp.c:3699
-#: src/transport/plugin_transport_udp.c:3798
+#: src/transport/plugin_transport_udp.c:3689
+#: src/transport/plugin_transport_udp.c:3788
 #, fuzzy, c-format
 msgid "Failed to bind UDP socket to %s: %s\n"
 msgstr "Résolution de « %s » échouée : %s\n"
 
-#: src/transport/plugin_transport_udp.c:3717
+#: src/transport/plugin_transport_udp.c:3707
 msgid "Disabling IPv4 since it is not supported on this system!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_udp.c:3808
+#: src/transport/plugin_transport_udp.c:3798
 msgid "Failed to open UDP sockets\n"
 msgstr ""
 
-#: src/transport/plugin_transport_udp.c:3879
-#: src/transport/plugin_transport_udp.c:3893
+#: src/transport/plugin_transport_udp.c:3869
+#: src/transport/plugin_transport_udp.c:3883
 msgid "must be in [0,65535]"
 msgstr ""
 
-#: src/transport/plugin_transport_udp.c:3925
+#: src/transport/plugin_transport_udp.c:3915
 #, fuzzy
 msgid "must be valid IPv4 address"
 msgstr "adresse invalide"
 
-#: src/transport/plugin_transport_udp.c:3952
+#: src/transport/plugin_transport_udp.c:3942
 #, fuzzy
 msgid "must be valid IPv6 address"
 msgstr "adresse invalide"
 
-#: src/transport/plugin_transport_udp.c:4018
+#: src/transport/plugin_transport_udp.c:4008
 msgid "Failed to create UDP network sockets\n"
 msgstr ""
 
@@ -7670,7 +7691,7 @@ msgstr ""
 msgid "Metadata `%s' failed to deserialize"
 msgstr ""
 
-#: src/util/client.c:864
+#: src/util/client.c:868
 #, c-format
 msgid "Need a non-empty hostname for service `%s'.\n"
 msgstr ""
@@ -7708,20 +7729,20 @@ msgstr ""
 msgid "INVALID"
 msgstr "INVALIDE"
 
-#: src/util/common_logging.c:1248
+#: src/util/common_logging.c:1302
 msgid "unknown address"
 msgstr "adresse inconnue"
 
-#: src/util/common_logging.c:1290
+#: src/util/common_logging.c:1344
 msgid "invalid address"
 msgstr "adresse invalide"
 
-#: src/util/common_logging.c:1308
+#: src/util/common_logging.c:1362
 #, c-format
 msgid "Configuration fails to specify option `%s' in section `%s'!\n"
 msgstr ""
 
-#: src/util/common_logging.c:1329
+#: src/util/common_logging.c:1383
 #, c-format
 msgid ""
 "Configuration specifies invalid value for option `%s' in section `%s': %s\n"
@@ -7778,22 +7799,22 @@ msgid ""
 "%llu)\n"
 msgstr ""
 
-#: src/util/crypto_ecc.c:756
+#: src/util/crypto_ecc.c:777
 #, c-format
 msgid "ECC signing failed at %s:%d: %s\n"
 msgstr ""
 
-#: src/util/crypto_ecc.c:806
+#: src/util/crypto_ecc.c:827
 #, c-format
 msgid "EdDSA signing failed at %s:%d: %s\n"
 msgstr ""
 
-#: src/util/crypto_ecc.c:880
+#: src/util/crypto_ecc.c:901
 #, c-format
 msgid "ECDSA signature verification failed at %s:%d: %s\n"
 msgstr ""
 
-#: src/util/crypto_ecc.c:937
+#: src/util/crypto_ecc.c:958
 #, c-format
 msgid "EdDSA signature verification failed at %s:%d: %s\n"
 msgstr ""
@@ -8260,7 +8281,7 @@ msgid ""
 "`GNUNET_SERVER_receive_done' after %s\n"
 msgstr ""
 
-#: src/util/service.c:347 src/util/service_new.c:2343
+#: src/util/service.c:347 src/util/service_new.c:2344
 #, c-format
 msgid "Unknown address family %d\n"
 msgstr ""
@@ -8491,85 +8512,85 @@ msgstr ""
 msgid "Protocol %u not supported, dropping\n"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:1145
+#: src/vpn/gnunet-service-vpn.c:1144
 msgid "# Packets dropped (channel not yet online)"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:1353
+#: src/vpn/gnunet-service-vpn.c:1352
 msgid "# ICMPv4 packets dropped (not allowed)"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:1374
+#: src/vpn/gnunet-service-vpn.c:1373
 msgid "# ICMPv6 packets dropped (not allowed)"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:1580
+#: src/vpn/gnunet-service-vpn.c:1579
 msgid "# Packets received from TUN interface"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:1613 src/vpn/gnunet-service-vpn.c:1649
+#: src/vpn/gnunet-service-vpn.c:1612 src/vpn/gnunet-service-vpn.c:1648
 #, c-format
 msgid "Packet received for unmapped destination `%s' (dropping it)\n"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:1659
+#: src/vpn/gnunet-service-vpn.c:1658
 msgid "Received IPv4 packet with options (dropping it)\n"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:1673
+#: src/vpn/gnunet-service-vpn.c:1672
 #, c-format
 msgid "Received packet of unknown protocol %d from TUN (dropping it)\n"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:1755
+#: src/vpn/gnunet-service-vpn.c:1754
 msgid "# ICMP packets received from cadet"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:2095
+#: src/vpn/gnunet-service-vpn.c:2093
 msgid "# UDP packets received from cadet"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:2251
+#: src/vpn/gnunet-service-vpn.c:2248
 msgid "# TCP packets received from cadet"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:2403
+#: src/vpn/gnunet-service-vpn.c:2399
 msgid "Failed to find unallocated IPv4 address in VPN's range\n"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:2458
+#: src/vpn/gnunet-service-vpn.c:2454
 msgid "Failed to find unallocated IPv6 address in VPN's range\n"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:2500 src/vpn/gnunet-service-vpn.c:2722
+#: src/vpn/gnunet-service-vpn.c:2496 src/vpn/gnunet-service-vpn.c:2718
 msgid "# Active destinations"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:2771
+#: src/vpn/gnunet-service-vpn.c:2767
 msgid "Failed to allocate IP address for new destination\n"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:3063
+#: src/vpn/gnunet-service-vpn.c:3059
 msgid "Must specify valid IPv6 address"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:3087
+#: src/vpn/gnunet-service-vpn.c:3083
 msgid "Must specify valid IPv6 mask"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:3095
+#: src/vpn/gnunet-service-vpn.c:3091
 msgid "IPv6 support disabled as this system does not support IPv6\n"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:3108
+#: src/vpn/gnunet-service-vpn.c:3104
 msgid "Must specify valid IPv4 address"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:3121
+#: src/vpn/gnunet-service-vpn.c:3117
 msgid "Must specify valid IPv4 mask"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:3131
+#: src/vpn/gnunet-service-vpn.c:3127
 msgid "IPv4 support disabled as this system does not support IPv4\n"
 msgstr ""
 
@@ -8638,18 +8659,18 @@ msgstr ""
 msgid "Setup tunnels via VPN."
 msgstr "Configurer des tunnels via VPN."
 
-#: src/include/gnunet_common.h:645 src/include/gnunet_common.h:652
-#: src/include/gnunet_common.h:662 src/include/gnunet_common.h:670
+#: src/include/gnunet_common.h:674 src/include/gnunet_common.h:681
+#: src/include/gnunet_common.h:691 src/include/gnunet_common.h:699
 #, c-format
 msgid "Assertion failed at %s:%d.\n"
 msgstr ""
 
-#: src/include/gnunet_common.h:682
+#: src/include/gnunet_common.h:711
 #, c-format
 msgid "External protocol violation detected at %s:%d.\n"
 msgstr ""
 
-#: src/include/gnunet_common.h:709 src/include/gnunet_common.h:718
+#: src/include/gnunet_common.h:738 src/include/gnunet_common.h:747
 #, c-format
 msgid "`%s' failed on file `%s' at %s:%d with error: %s\n"
 msgstr ""
diff --git a/po/sv.po b/po/sv.po
index 6cf121b0e..3045bac2f 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: GNUnet 0.7.0b\n"
 "Report-Msgid-Bugs-To: address@hidden"
-"POT-Creation-Date: 2017-01-12 17:19+0100\n"
+"POT-Creation-Date: 2017-02-20 11:12-0600\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,228 +16,228 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: src/arm/gnunet-arm.c:152
+#: src/arm/gnunet-arm.c:156
 #, fuzzy, c-format
 msgid "Failed to remove configuration file %s\n"
 msgstr "Kunde inte spara konfigurationsfil \"%s\":"
 
-#: src/arm/gnunet-arm.c:158
+#: src/arm/gnunet-arm.c:162
 #, fuzzy, c-format
 msgid "Failed to remove servicehome directory %s\n"
 msgstr "Filformatsfel (inte en GNUnet-katalog?)\n"
 
-#: src/arm/gnunet-arm.c:213 src/testbed/gnunet-service-testbed_peers.c:1139
+#: src/arm/gnunet-arm.c:222 src/testbed/gnunet-service-testbed_peers.c:1139
 msgid "Message was sent successfully"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:215
+#: src/arm/gnunet-arm.c:224
 #, fuzzy
 msgid "Misconfiguration (can not connect to the ARM service)"
 msgstr "Misslyckades att ansluta till gnunetd.\n"
 
-#: src/arm/gnunet-arm.c:217 src/testbed/gnunet-service-testbed_peers.c:1143
+#: src/arm/gnunet-arm.c:226 src/testbed/gnunet-service-testbed_peers.c:1143
 #, fuzzy
 msgid "We disconnected from ARM before we could send a request"
 msgstr "# av anslutna parter"
 
-#: src/arm/gnunet-arm.c:219 src/testbed/gnunet-service-testbed_peers.c:1145
+#: src/arm/gnunet-arm.c:228 src/testbed/gnunet-service-testbed_peers.c:1145
 msgid "ARM API is busy"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:221 src/testbed/gnunet-service-testbed_peers.c:1147
+#: src/arm/gnunet-arm.c:230 src/testbed/gnunet-service-testbed_peers.c:1147
 #, fuzzy
 msgid "Request timed out"
 msgstr "# sessionsnycklar accepterade"
 
-#: src/arm/gnunet-arm.c:223 src/testbed/gnunet-service-testbed_peers.c:1149
+#: src/arm/gnunet-arm.c:232 src/testbed/gnunet-service-testbed_peers.c:1149
 #, fuzzy
 msgid "Unknown request status"
 msgstr "Okänd operation \"%s\"\n"
 
-#: src/arm/gnunet-arm.c:239 src/testbed/gnunet-service-testbed_peers.c:1165
+#: src/arm/gnunet-arm.c:248 src/testbed/gnunet-service-testbed_peers.c:1165
 #, fuzzy, c-format
 msgid "%s is stopped"
 msgstr "# byte krypterade"
 
-#: src/arm/gnunet-arm.c:241 src/testbed/gnunet-service-testbed_peers.c:1167
+#: src/arm/gnunet-arm.c:250 src/testbed/gnunet-service-testbed_peers.c:1167
 #, fuzzy, c-format
 msgid "%s is starting"
 msgstr "\"%s\" startar\n"
 
-#: src/arm/gnunet-arm.c:243 src/testbed/gnunet-service-testbed_peers.c:1169
+#: src/arm/gnunet-arm.c:252 src/testbed/gnunet-service-testbed_peers.c:1169
 #, c-format
 msgid "%s is stopping"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:245 src/testbed/gnunet-service-testbed_peers.c:1171
+#: src/arm/gnunet-arm.c:254 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:247 src/testbed/gnunet-service-testbed_peers.c:1173
+#: src/arm/gnunet-arm.c:256 src/testbed/gnunet-service-testbed_peers.c:1173
 #, c-format
 msgid "%s is stopping already"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:249 src/testbed/gnunet-service-testbed_peers.c:1175
+#: src/arm/gnunet-arm.c:258 src/testbed/gnunet-service-testbed_peers.c:1175
 #, c-format
 msgid "%s is started already"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:251 src/testbed/gnunet-service-testbed_peers.c:1177
+#: src/arm/gnunet-arm.c:260 src/testbed/gnunet-service-testbed_peers.c:1177
 #, c-format
 msgid "%s is stopped already"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:253 src/testbed/gnunet-service-testbed_peers.c:1179
+#: src/arm/gnunet-arm.c:262 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:255 src/testbed/gnunet-service-testbed_peers.c:1181
+#: src/arm/gnunet-arm.c:264 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:257
+#: src/arm/gnunet-arm.c:266
 #, c-format
 msgid "%s service cannot be started because ARM is shutting down"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:259 src/testbed/gnunet-service-testbed_peers.c:1185
+#: src/arm/gnunet-arm.c:268 src/testbed/gnunet-service-testbed_peers.c:1185
 #, c-format
 msgid "%.s Unknown result code."
 msgstr ""
 
-#: src/arm/gnunet-arm.c:291
+#: src/arm/gnunet-arm.c:300
 msgid "Fatal error initializing ARM API.\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:320 src/arm/gnunet-arm.c:329
+#: src/arm/gnunet-arm.c:328 src/arm/gnunet-arm.c:337
 #, fuzzy, c-format
 msgid "Failed to start the ARM service: %s\n"
 msgstr "Misslyckades att starta samling.\n"
 
-#: src/arm/gnunet-arm.c:364
+#: src/arm/gnunet-arm.c:371
 #, 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:375
+#: src/arm/gnunet-arm.c:382
 #, 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:417
+#: src/arm/gnunet-arm.c:422
 #, fuzzy, c-format
-msgid "Failed to send a request to start the `%s' service: %%s\n"
+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:428
+#: src/arm/gnunet-arm.c:432
 #, fuzzy, c-format
 msgid "Failed to start the `%s' service: %s\n"
 msgstr "Misslyckades att starta samling.\n"
 
-#: src/arm/gnunet-arm.c:467
+#: src/arm/gnunet-arm.c:469
 #, 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:478
+#: src/arm/gnunet-arm.c:480
 #, fuzzy, c-format
 msgid "Failed to kill the `%s' service: %s\n"
 msgstr "Fel vid %s:%d.\n"
 
-#: src/arm/gnunet-arm.c:519
+#: src/arm/gnunet-arm.c:521
 #, fuzzy, c-format
 msgid "Failed to request a list of services: %s\n"
 msgstr "Misslyckades att starta samling.\n"
 
-#: src/arm/gnunet-arm.c:528
+#: src/arm/gnunet-arm.c:530
 #, fuzzy
 msgid "Error communicating with ARM. ARM not running?\n"
 msgstr "Skriv ut information om GNUnets motparter."
 
-#: src/arm/gnunet-arm.c:534
+#: src/arm/gnunet-arm.c:536
 #, fuzzy
 msgid "Running services:\n"
 msgstr "Startade samling \"%s\".\n"
 
-#: src/arm/gnunet-arm.c:622
+#: src/arm/gnunet-arm.c:624
 #, c-format
 msgid "Now only monitoring, press CTRL-C to stop.\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:654
+#: src/arm/gnunet-arm.c:656
 #, c-format
 msgid "Stopped %s.\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:657
+#: src/arm/gnunet-arm.c:659
 #, fuzzy, c-format
 msgid "Starting %s...\n"
 msgstr "Startade samling \"%s\".\n"
 
-#: src/arm/gnunet-arm.c:660
+#: src/arm/gnunet-arm.c:662
 #, c-format
 msgid "Stopping %s...\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:674
+#: src/arm/gnunet-arm.c:676
 #, fuzzy, c-format
 msgid "Unknown status %u for service %s.\n"
 msgstr "Okänd operation \"%s\"\n"
 
-#: src/arm/gnunet-arm.c:756
+#: src/arm/gnunet-arm.c:774
 msgid "stop all GNUnet services"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:758
+#: src/arm/gnunet-arm.c:776
 msgid "start a particular service"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:760
+#: src/arm/gnunet-arm.c:778
 msgid "stop a particular service"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:762
+#: src/arm/gnunet-arm.c:780
 msgid "start all GNUnet default services"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:765
+#: src/arm/gnunet-arm.c:783
 msgid "stop and start all GNUnet default services"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:768
+#: src/arm/gnunet-arm.c:786
 msgid "delete config file and directory on exit"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:771
+#: src/arm/gnunet-arm.c:789
 msgid "monitor ARM activities"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:773
+#: src/arm/gnunet-arm.c:791
 msgid "don't print status messages"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:776
+#: src/arm/gnunet-arm.c:794
 msgid "exit with error status if operation does not finish after DELAY"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:778
+#: src/arm/gnunet-arm.c:796
 #, fuzzy
 msgid "list currently running services"
 msgstr "Startade samling \"%s\".\n"
 
-#: src/arm/gnunet-arm.c:780
+#: src/arm/gnunet-arm.c:798
 msgid "don't let gnunet-service-arm inherit standard output"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:782
+#: src/arm/gnunet-arm.c:800
 msgid "don't let gnunet-service-arm inherit standard error"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:794
+#: src/arm/gnunet-arm.c:812
 msgid "Control services and the Automated Restart Manager (ARM)"
 msgstr ""
 
@@ -251,20 +251,21 @@ msgstr ""
 #: src/arm/gnunet-service-arm.c:393 src/arm/gnunet-service-arm.c:399
 #: src/transport/plugin_transport_tcp.c:652
 #: src/transport/plugin_transport_tcp.c:658
-#: src/transport/plugin_transport_tcp.c:3309 src/util/service.c:584
-#: src/util/service.c:590 src/util/service_new.c:637 src/util/service_new.c:643
+#: src/transport/plugin_transport_tcp.c:3337 src/util/service.c:584
+#: src/util/service.c:590 src/util/service_new.c:637
+#: src/util/service_new.c:643
 #, c-format
 msgid "Require valid port number for service `%s' in configuration!\n"
 msgstr ""
 
 #: src/arm/gnunet-service-arm.c:430 src/transport/plugin_transport_tcp.c:689
-#: src/util/client.c:464 src/util/service.c:621 src/util/service_new.c:682
+#: src/util/client.c:466 src/util/service.c:621 src/util/service_new.c:682
 #, c-format
 msgid "UNIXPATH `%s' too long, maximum length is %llu\n"
 msgstr ""
 
 #: src/arm/gnunet-service-arm.c:434 src/transport/plugin_transport_tcp.c:693
-#: src/util/client.c:469 src/util/service.c:625 src/util/service_new.c:687
+#: src/util/client.c:471 src/util/service.c:625 src/util/service_new.c:687
 #, fuzzy, c-format
 msgid "Using `%s' instead\n"
 msgstr "%s: flagga \"%s\" är tvetydig\n"
@@ -387,11 +388,13 @@ msgid ""
 "%llu\n"
 msgstr ""
 
-#: src/ats/gnunet-ats-solver-eval.c:3293 src/ats-tests/gnunet-solver-eval.c:935
+#: 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:938
+#: 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 ""
@@ -645,95 +648,110 @@ msgstr ""
 msgid "Print information about ATS state"
 msgstr "Skriv ut information om GNUnets motparter."
 
-#: src/auction/gnunet-auction-create.c:69
+#: src/auction/gnunet-auction-create.c:160
 msgid "description of the item to be sold"
 msgstr ""
 
-#: src/auction/gnunet-auction-create.c:72
+#: src/auction/gnunet-auction-create.c:163
 msgid "mapping of possible prices"
 msgstr ""
 
-#: src/auction/gnunet-auction-create.c:75
+#: src/auction/gnunet-auction-create.c:166
 msgid "max duration per round"
 msgstr ""
 
-#: src/auction/gnunet-auction-create.c:78
+#: src/auction/gnunet-auction-create.c:169
 msgid "duration until auction starts"
 msgstr ""
 
-#: src/auction/gnunet-auction-create.c:81
-msgid "number of items to sell, 0 for first price auction"
+#: src/auction/gnunet-auction-create.c:172
+msgid ""
+"number of items to sell\n"
+"0 for first price auction\n"
+">0 for vickrey/M+1st price auction"
 msgstr ""
 
-#: src/auction/gnunet-auction-create.c:84
+#: src/auction/gnunet-auction-create.c:177
 msgid "public auction outcome"
 msgstr ""
 
-#: src/auction/gnunet-auction-create.c:94 src/auction/gnunet-auction-info.c:76
-#: src/auction/gnunet-auction-join.c:76
+#: src/auction/gnunet-auction-create.c:180
+msgid "keep running in foreground until auction completes"
+msgstr ""
+
+#: src/auction/gnunet-auction-create.c:190
+msgid "create a new auction and start listening for bidders"
+msgstr ""
+
+#: src/auction/gnunet-auction-info.c:76 src/auction/gnunet-auction-join.c:76
 #: src/conversation/gnunet-conversation-test.c:243
 #: src/revocation/gnunet-revocation.c:550 src/template/gnunet-template.c:76
 #, fuzzy
 msgid "help text"
 msgstr "hjälptext för -t"
 
-#: src/cadet/gnunet-cadet.c:511
-#, fuzzy, c-format
-msgid "Invalid target `%s'\n"
-msgstr "Ogiltigt argument: \"%s\"\n"
-
-#: src/cadet/gnunet-cadet.c:787
+#: src/cadet/gnunet-cadet.c:668
 #, fuzzy, c-format
 msgid "Invalid peer ID `%s'\n"
 msgstr "Ogiltiga argument: "
 
-#: src/cadet/gnunet-cadet.c:825
+#: src/cadet/gnunet-cadet.c:706
 #, fuzzy, c-format
 msgid "Invalid tunnel owner `%s'\n"
 msgstr "Ogiltigt format för IP: \"%s\"\n"
 
-#: src/cadet/gnunet-cadet.c:892
+#: src/cadet/gnunet-cadet.c:779
 msgid "You must NOT give a TARGET when using 'request all' options\n"
 msgstr ""
 
-#: src/cadet/gnunet-cadet.c:982
+#: src/cadet/gnunet-cadet.c:870
+#, fuzzy, c-format
+msgid "Invalid target `%s'\n"
+msgstr "Ogiltigt argument: \"%s\"\n"
+
+#: src/cadet/gnunet-cadet.c:907
+#, fuzzy
+msgid "No action requested\n"
+msgstr "Samling stoppad.\n"
+
+#: src/cadet/gnunet-cadet.c:929
 #, fuzzy
 msgid "provide information about a particular connection"
 msgstr "Skriv ut information om GNUnets motparter."
 
-#: src/cadet/gnunet-cadet.c:985
+#: src/cadet/gnunet-cadet.c:932
 msgid "activate echo mode"
 msgstr ""
 
-#: src/cadet/gnunet-cadet.c:988
+#: src/cadet/gnunet-cadet.c:935
 msgid "dump debug information to STDERR"
 msgstr ""
 
-#: src/cadet/gnunet-cadet.c:994
+#: src/cadet/gnunet-cadet.c:938
 msgid "port to listen to"
 msgstr ""
 
-#: src/cadet/gnunet-cadet.c:997
+#: src/cadet/gnunet-cadet.c:941
 #, fuzzy
 msgid "provide information about a patricular peer"
 msgstr "Skriv ut information om GNUnets motparter."
 
-#: src/cadet/gnunet-cadet.c:1000
+#: src/cadet/gnunet-cadet.c:944
 #, fuzzy
 msgid "provide information about all peers"
 msgstr "Skriv ut information om GNUnets motparter."
 
-#: src/cadet/gnunet-cadet.c:1003
+#: src/cadet/gnunet-cadet.c:947
 #, fuzzy
 msgid "provide information about a particular tunnel"
 msgstr "Skriv ut information om GNUnets motparter."
 
-#: src/cadet/gnunet-cadet.c:1006
+#: src/cadet/gnunet-cadet.c:950
 #, fuzzy
 msgid "provide information about all tunnels"
 msgstr "Skriv ut information om GNUnets motparter."
 
-#: src/cadet/gnunet-service-cadet_peer.c:686
+#: src/cadet/gnunet-service-cadet_peer.c:687
 msgid "Wrong CORE service\n"
 msgstr ""
 
@@ -1292,12 +1310,12 @@ msgstr "# krypterade PONG-meddelanden mottagna"
 msgid "# messages discarded (session disconnected)"
 msgstr "Nätverksannonsering avstängd i konfigurationen!\n"
 
-#: src/core/gnunet-service-core.c:928
+#: src/core/gnunet-service-core.c:937
 #, fuzzy
 msgid "Core service is lacking HOSTKEY configuration setting.  Exiting.\n"
 msgstr "GNUnet-konfiguration"
 
-#: src/core/gnunet-service-core.c:949
+#: src/core/gnunet-service-core.c:958
 #, fuzzy, c-format
 msgid "Core service of `%s' ready.\n"
 msgstr "\"%s\" är inte en fil.\n"
@@ -1422,36 +1440,36 @@ msgstr ""
 msgid "# sessions terminated by key expiration"
 msgstr "# byte kastade via TCP (utgående)"
 
-#: src/core/gnunet-service-core_kx.c:1554
-#: src/core/gnunet-service-core_kx.c:1580
+#: src/core/gnunet-service-core_kx.c:1557
+#: src/core/gnunet-service-core_kx.c:1583
 #, fuzzy
 msgid "# bytes dropped (duplicates)"
 msgstr "# byte kastade via UDP (utgående)"
 
-#: src/core/gnunet-service-core_kx.c:1567
+#: src/core/gnunet-service-core_kx.c:1570
 #, fuzzy
 msgid "# bytes dropped (out of sequence)"
 msgstr "# byte kastade via UDP (utgående)"
 
-#: src/core/gnunet-service-core_kx.c:1609
+#: src/core/gnunet-service-core_kx.c:1612
 #, fuzzy
 msgid "# bytes dropped (ancient message)"
 msgstr "# byte kastade via UDP (utgående)"
 
-#: src/core/gnunet-service-core_kx.c:1617
+#: src/core/gnunet-service-core_kx.c:1620
 #, fuzzy
 msgid "# bytes of payload decrypted"
 msgstr "# byte dekrypterade"
 
-#: src/core/gnunet-service-core_kx.c:1674
+#: src/core/gnunet-service-core_kx.c:1681
 #, fuzzy
 msgid "# PAYLOAD dropped (out of order)"
 msgstr "# byte kastade via UDP (utgående)"
 
-#: src/core/gnunet-service-core_sessions.c: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/core/gnunet-service-core_sessions.c:266
+#: src/core/gnunet-service-core_sessions.c:356
+#: src/dht/gnunet-service-dht_neighbours.c:732
+#: src/dht/gnunet-service-dht_neighbours.c:794
 #: 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
@@ -1461,27 +1479,27 @@ msgstr "# byte kastade via UDP (utgående)"
 msgid "# peers connected"
 msgstr "# av anslutna parter"
 
-#: src/core/gnunet-service-core_sessions.c:287
+#: src/core/gnunet-service-core_sessions.c:302
 msgid "# type map refreshes sent"
 msgstr ""
 
-#: src/core/gnunet-service-core_sessions.c:407
+#: src/core/gnunet-service-core_sessions.c:422
 #, fuzzy
 msgid "# outdated typemap confirmations received"
 msgstr "Kunde inte spara konfiguration!"
 
-#: src/core/gnunet-service-core_sessions.c:418
+#: src/core/gnunet-service-core_sessions.c:439
 #, fuzzy
 msgid "# valid typemap confirmations received"
 msgstr "Kunde inte spara konfiguration!"
 
 #: src/core/gnunet-service-core_typemap.c:169
-#: src/core/gnunet-service-core_typemap.c:180
+#: src/core/gnunet-service-core_typemap.c:181
 #, fuzzy
 msgid "# type maps received"
 msgstr "# krypterade PONG-meddelanden mottagna"
 
-#: src/core/gnunet-service-core_typemap.c:210
+#: src/core/gnunet-service-core_typemap.c:212
 msgid "# updates to my type map"
 msgstr ""
 
@@ -1525,7 +1543,7 @@ msgstr "# byte mottogs via TCP"
 msgid "# proximity search requests received"
 msgstr "# klartext PONG-meddelanden mottagna"
 
-#: src/datacache/plugin_datacache_heap.c:467
+#: src/datacache/plugin_datacache_heap.c:466
 msgid "Heap datacache running\n"
 msgstr ""
 
@@ -1546,7 +1564,7 @@ msgstr ""
 #: 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:691 src/include/gnunet_common.h:700
+#: src/include/gnunet_common.h:720 src/include/gnunet_common.h:729
 #: src/scalarproduct/scalarproduct.h:35
 #, c-format
 msgid "`%s' failed at %s:%d with error: %s\n"
@@ -1605,23 +1623,19 @@ msgstr ""
 msgid "# RELEASE RESERVE requests executed"
 msgstr ""
 
-#: src/datastore/datastore_api.c:1187
-msgid "# UPDATE requests executed"
-msgstr ""
-
-#: src/datastore/datastore_api.c:1271
+#: src/datastore/datastore_api.c:1205
 msgid "# REMOVE requests executed"
 msgstr ""
 
-#: src/datastore/datastore_api.c:1331
+#: src/datastore/datastore_api.c:1265
 msgid "# GET REPLICATION requests executed"
 msgstr ""
 
-#: src/datastore/datastore_api.c:1397
+#: src/datastore/datastore_api.c:1331
 msgid "# GET ZERO ANONYMITY requests executed"
 msgstr ""
 
-#: src/datastore/datastore_api.c:1477
+#: src/datastore/datastore_api.c:1411
 msgid "# GET requests executed"
 msgstr ""
 
@@ -1686,7 +1700,7 @@ msgstr ""
 #: 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
+#: src/datastore/gnunet-service-datastore.c:1619
 msgid "# reserved"
 msgstr ""
 
@@ -1713,97 +1727,92 @@ msgstr "# byte mottogs via TCP"
 msgid "# requests filtered by bloomfilter"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1115
-#, fuzzy
-msgid "# UPDATE requests received"
-msgstr "# byte mottogs via TCP"
-
-#: src/datastore/gnunet-service-datastore.c:1146
+#: src/datastore/gnunet-service-datastore.c:1097
 msgid "# GET REPLICATION requests received"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1179
+#: src/datastore/gnunet-service-datastore.c:1130
 msgid "# GET ZERO ANONYMITY requests received"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1226
+#: src/datastore/gnunet-service-datastore.c:1177
 #, fuzzy
 msgid "Content not found"
 msgstr "Kommando \"%s\" hittades inte!\n"
 
-#: src/datastore/gnunet-service-datastore.c:1235
+#: src/datastore/gnunet-service-datastore.c:1186
 msgid "# bytes removed (explicit request)"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1282
+#: src/datastore/gnunet-service-datastore.c:1233
 #, fuzzy
 msgid "# REMOVE requests received"
 msgstr "# byte mottogs via TCP"
 
-#: src/datastore/gnunet-service-datastore.c:1336
+#: src/datastore/gnunet-service-datastore.c:1287
 #, c-format
 msgid ""
 "Datastore payload must have been inaccurate (%lld < %lld). Recomputing it.\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1342
-#: src/datastore/gnunet-service-datastore.c:1517
+#: src/datastore/gnunet-service-datastore.c:1293
+#: src/datastore/gnunet-service-datastore.c:1468
 #, c-format
 msgid "New payload: %lld\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1396
+#: src/datastore/gnunet-service-datastore.c:1347
 #, c-format
 msgid "Loading `%s' datastore plugin\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1408
+#: src/datastore/gnunet-service-datastore.c:1359
 #, 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:1468
+#: src/datastore/gnunet-service-datastore.c:1419
 msgid "Bloomfilter construction complete.\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1524
+#: src/datastore/gnunet-service-datastore.c:1475
 msgid "Rebuilding bloomfilter.  Please be patient.\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1535
+#: src/datastore/gnunet-service-datastore.c:1486
 msgid "Plugin does not support get_keys function. Please fix!\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1705
+#: src/datastore/gnunet-service-datastore.c:1656
 #, fuzzy, c-format
 msgid "# bytes used in file-sharing datastore `%s'"
 msgstr "# byte krypterade"
 
-#: src/datastore/gnunet-service-datastore.c:1721
+#: src/datastore/gnunet-service-datastore.c:1672
 msgid "# quota"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1726
+#: src/datastore/gnunet-service-datastore.c:1677
 msgid "# cache size"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1742
+#: src/datastore/gnunet-service-datastore.c:1693
 #, c-format
 msgid "Could not use specified filename `%s' for bloomfilter.\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1760
-#: src/datastore/gnunet-service-datastore.c:1776
+#: src/datastore/gnunet-service-datastore.c:1711
+#: src/datastore/gnunet-service-datastore.c:1727
 #, fuzzy, c-format
 msgid "Failed to remove bogus bloomfilter file `%s'\n"
 msgstr "Kunde inte spara konfigurationsfil \"%s\":"
 
-#: src/datastore/gnunet-service-datastore.c:1808
+#: src/datastore/gnunet-service-datastore.c:1759
 #, fuzzy
 msgid "Failed to initialize bloomfilter.\n"
 msgstr "Misslyckades att initiera tjänsten \"%s\".\n"
 
-#: src/datastore/plugin_datastore_heap.c:826
+#: src/datastore/plugin_datastore_heap.c:824
 msgid "Heap database running\n"
 msgstr ""
 
@@ -1885,56 +1894,56 @@ msgstr ""
 msgid "Template database running\n"
 msgstr ""
 
-#: src/dht/gnunet-dht-get.c:155
+#: src/dht/gnunet-dht-get.c:157
 #, c-format
 msgid ""
 "Result %d, type %d:\n"
 "%.*s\n"
 msgstr ""
 
-#: src/dht/gnunet-dht-get.c:181
+#: src/dht/gnunet-dht-get.c:204
 msgid "Must provide key for DHT GET!\n"
 msgstr ""
 
-#: src/dht/gnunet-dht-get.c:187 src/dht/gnunet-dht-monitor.c:248
+#: src/dht/gnunet-dht-get.c:210 src/dht/gnunet-dht-monitor.c:248
 #, fuzzy
 msgid "Failed to connect to DHT service!\n"
 msgstr "Misslyckades att ansluta till gnunetd.\n"
 
-#: src/dht/gnunet-dht-get.c:195
+#: src/dht/gnunet-dht-get.c:218
 msgid "Issueing DHT GET with key"
 msgstr ""
 
-#: src/dht/gnunet-dht-get.c:212 src/dht/gnunet-dht-monitor.c:289
-#: src/dht/gnunet-dht-put.c:198
+#: src/dht/gnunet-dht-get.c:235 src/dht/gnunet-dht-monitor.c:289
+#: src/dht/gnunet-dht-put.c:207
 msgid "the query key"
 msgstr ""
 
-#: src/dht/gnunet-dht-get.c:215
+#: src/dht/gnunet-dht-get.c:238
 msgid "how many parallel requests (replicas) to create"
 msgstr ""
 
-#: src/dht/gnunet-dht-get.c:218 src/dht/gnunet-dht-monitor.c:292
+#: src/dht/gnunet-dht-get.c:241 src/dht/gnunet-dht-monitor.c:292
 msgid "the type of data to look for"
 msgstr ""
 
-#: src/dht/gnunet-dht-get.c:221
+#: src/dht/gnunet-dht-get.c:244
 msgid "how long to execute this query before giving up?"
 msgstr ""
 
-#: src/dht/gnunet-dht-get.c:224 src/dht/gnunet-dht-put.c:201
+#: src/dht/gnunet-dht-get.c:247 src/dht/gnunet-dht-put.c:210
 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:210 src/fs/gnunet-auto-share.c:780
+#: src/dht/gnunet-dht-get.c:250 src/dht/gnunet-dht-monitor.c:298
+#: src/dht/gnunet-dht-put.c:222 src/fs/gnunet-auto-share.c:780
 #: src/fs/gnunet-download.c:327 src/fs/gnunet-publish.c:951
 #: src/fs/gnunet-search.c:322 src/fs/gnunet-unindex.c:167
 #: src/nse/gnunet-nse-profiler.c:855
 msgid "be verbose (print progress information)"
 msgstr ""
 
-#: src/dht/gnunet-dht-get.c:248
+#: src/dht/gnunet-dht-get.c:271
 msgid "Issue a GET request to the GNUnet DHT, prints results."
 msgstr ""
 
@@ -1946,7 +1955,8 @@ msgstr ""
 msgid "Prints all packets that go through the DHT."
 msgstr ""
 
-#: src/dht/gnunet_dht_profiler.c:1161 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"
@@ -1992,67 +2002,71 @@ msgstr ""
 msgid "Measure quality and performance of the DHT service."
 msgstr "Kan inte tillgå tjänsten"
 
-#: src/dht/gnunet-dht-put.c:115
+#: src/dht/gnunet-dht-put.c:120
 #, fuzzy
 msgid "PUT request sent with key"
 msgstr "# byte mottogs via TCP"
 
-#: src/dht/gnunet-dht-put.c:118
+#: src/dht/gnunet-dht-put.c:123
 msgid "Timeout sending PUT request!\n"
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:121
+#: src/dht/gnunet-dht-put.c:126
 #, fuzzy
 msgid "PUT request not confirmed!\n"
 msgstr "# byte mottogs via TCP"
 
-#: src/dht/gnunet-dht-put.c:151
+#: src/dht/gnunet-dht-put.c:157
 msgid "Must provide KEY and DATA for DHT put!\n"
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:158
+#: src/dht/gnunet-dht-put.c:164
 #, fuzzy, c-format
 msgid "Could not connect to %s service!\n"
 msgstr "Kunde inte ansluta till gnunetd.\n"
 
-#: src/dht/gnunet-dht-put.c:172
+#: src/dht/gnunet-dht-put.c:175
 #, c-format
 msgid "Issuing put request for `%s' with data `%s'!\n"
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:192
+#: src/dht/gnunet-dht-put.c:201
 msgid "the data to insert under the key"
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:195
+#: src/dht/gnunet-dht-put.c:204
 msgid "how long to store this entry in the dht (in seconds)"
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:204
+#: src/dht/gnunet-dht-put.c:213
 msgid "how many replicas to create"
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:207
+#: src/dht/gnunet-dht-put.c:216
+msgid "use DHT's record route option"
+msgstr ""
+
+#: src/dht/gnunet-dht-put.c:219
 msgid "the type to insert data as"
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:232
+#: src/dht/gnunet-dht-put.c:247
 msgid "Issue a PUT request to the GNUnet DHT insert DATA under KEY."
 msgstr ""
 
-#: src/dht/gnunet-service-dht_clients.c:370
+#: src/dht/gnunet-service-dht_clients.c:369
 #: src/dht/gnunet-service-wdht_clients.c:864
 #, fuzzy
 msgid "# GET requests from clients injected"
 msgstr "# byte mottogs via TCP"
 
-#: src/dht/gnunet-service-dht_clients.c:481
+#: src/dht/gnunet-service-dht_clients.c:482
 #: 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:620
+#: src/dht/gnunet-service-dht_clients.c:621
 #: src/dht/gnunet-service-wdht_clients.c:1011
 #, fuzzy
 msgid "# GET requests received from clients"
@@ -2074,19 +2088,19 @@ msgstr ""
 msgid "# Duplicate REPLIES to CLIENT request dropped"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_clients.c:1094
+#: src/dht/gnunet-service-dht_clients.c:1093
 #: src/dht/gnunet-service-wdht_clients.c:566
 #, c-format
 msgid "Unsupported block type (%u) in request!\n"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_clients.c:1101
+#: src/dht/gnunet-service-dht_clients.c:1100
 #: src/dht/gnunet-service-wdht_clients.c:589
 #, fuzzy
 msgid "# RESULTS queued for clients"
 msgstr "Meddelande mottaget från klient är ogiltig.\n"
 
-#: src/dht/gnunet-service-dht_clients.c:1179
+#: src/dht/gnunet-service-dht_clients.c:1178
 #: src/dht/gnunet-service-wdht_clients.c:643
 #: src/dht/gnunet-service-wdht_clients.c:693
 msgid "# REPLIES ignored for CLIENTS (no match)"
@@ -2101,74 +2115,75 @@ msgstr "# byte mottagna av typen %d"
 msgid "# ITEMS stored in datacache"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_datacache.c:199
+#: src/dht/gnunet-service-dht_datacache.c:198
 msgid "# Good RESULTS found in datacache"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_datacache.c:211
+#: src/dht/gnunet-service-dht_datacache.c:210
 msgid "# Duplicate RESULTS found in datacache"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_datacache.c:217
+#: src/dht/gnunet-service-dht_datacache.c:216
 msgid "# Invalid RESULTS found in datacache"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_datacache.c:223
+#: src/dht/gnunet-service-dht_datacache.c:222
 msgid "# Irrelevant RESULTS found in datacache"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_datacache.c:235
+#: src/dht/gnunet-service-dht_datacache.c:234
 msgid "# Unsupported RESULTS found in datacache"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_datacache.c:239
+#: src/dht/gnunet-service-dht_datacache.c:238
 #, c-format
 msgid "Unsupported block type (%u) in local response!\n"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_datacache.c:276
+#: src/dht/gnunet-service-dht_datacache.c:273
 #, 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:86
+#: src/dht/gnunet-service-xdht_hello.c:82
 #, fuzzy
 msgid "# HELLOs obtained from peerinfo"
 msgstr "Meddelande mottaget från klient är ogiltig.\n"
 
-#: src/dht/gnunet-service-dht_neighbours.c:685
+#: src/dht/gnunet-service-dht_neighbours.c:671
 #, fuzzy
 msgid "# FIND PEER messages initiated"
 msgstr "# PING-meddelanden skapade"
 
-#: src/dht/gnunet-service-dht_neighbours.c:851
+#: src/dht/gnunet-service-dht_neighbours.c:842
 #, fuzzy
 msgid "# requests TTL-dropped"
 msgstr "# byte mottogs via TCP"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1054
-#: src/dht/gnunet-service-dht_neighbours.c:1091
+#: src/dht/gnunet-service-dht_neighbours.c:1045
+#: src/dht/gnunet-service-dht_neighbours.c:1082
 msgid "# Peers excluded from routing due to Bloomfilter"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1071
-#: src/dht/gnunet-service-dht_neighbours.c:1107
+#: src/dht/gnunet-service-dht_neighbours.c:1062
+#: src/dht/gnunet-service-dht_neighbours.c:1098
 msgid "# Peer selection failed"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1255
+#: src/dht/gnunet-service-dht_neighbours.c:1246
 #, fuzzy
 msgid "# PUT requests routed"
 msgstr "# byte mottogs via TCP"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1288
+#: src/dht/gnunet-service-dht_neighbours.c:1279
 #, fuzzy
 msgid "# PUT messages queued for transmission"
 msgstr "# PING-meddelanden skapade"
 
-#: 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-dht_neighbours.c:1290
+#: src/dht/gnunet-service-dht_neighbours.c:1430
+#: src/dht/gnunet-service-dht_neighbours.c:1533
 #: src/dht/gnunet-service-xdht_neighbours.c:946
 #: src/dht/gnunet-service-xdht_neighbours.c:1007
 #: src/dht/gnunet-service-xdht_neighbours.c:1047
@@ -2182,65 +2197,65 @@ msgstr "# PING-meddelanden skapade"
 msgid "# P2P messages dropped due to full queue"
 msgstr "Nätverksannonsering avstängd i konfigurationen!\n"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1383
+#: src/dht/gnunet-service-dht_neighbours.c:1375
 #, fuzzy
 msgid "# GET requests routed"
 msgstr "# byte mottogs via TCP"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1415
+#: src/dht/gnunet-service-dht_neighbours.c:1418
 #, fuzzy
 msgid "# GET messages queued for transmission"
 msgstr "# PING-meddelanden skapade"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1547
+#: src/dht/gnunet-service-dht_neighbours.c:1548
 #, fuzzy
 msgid "# RESULT messages queued for transmission"
 msgstr "# PING-meddelanden skapade"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1646
+#: src/dht/gnunet-service-dht_neighbours.c:1647
 #, fuzzy
 msgid "# P2P PUT requests received"
 msgstr "# byte mottogs via TCP"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1650
+#: src/dht/gnunet-service-dht_neighbours.c:1651
 #, fuzzy
 msgid "# P2P PUT bytes received"
 msgstr "# byte mottogs via TCP"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1858
+#: src/dht/gnunet-service-dht_neighbours.c:1869
 msgid "# FIND PEER requests ignored due to Bloomfilter"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1866
+#: src/dht/gnunet-service-dht_neighbours.c:1877
 msgid "# FIND PEER requests ignored due to lack of HELLO"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:2022
+#: src/dht/gnunet-service-dht_neighbours.c:2029
 #, fuzzy
 msgid "# P2P GET requests received"
 msgstr "# byte mottogs via TCP"
 
-#: src/dht/gnunet-service-dht_neighbours.c:2026
+#: src/dht/gnunet-service-dht_neighbours.c:2033
 #, fuzzy
 msgid "# P2P GET bytes received"
 msgstr "# byte mottogs via TCP"
 
-#: src/dht/gnunet-service-dht_neighbours.c:2101
+#: src/dht/gnunet-service-dht_neighbours.c:2104
 #, fuzzy
 msgid "# P2P FIND PEER requests processed"
 msgstr "# byte mottogs via TCP"
 
-#: src/dht/gnunet-service-dht_neighbours.c:2124
+#: src/dht/gnunet-service-dht_neighbours.c:2125
 #, fuzzy
 msgid "# P2P GET requests ONLY routed"
 msgstr "# byte mottogs via TCP"
 
-#: src/dht/gnunet-service-dht_neighbours.c:2226
+#: src/dht/gnunet-service-dht_neighbours.c:2223
 #, fuzzy
 msgid "# P2P RESULTS received"
 msgstr "# krypterade PONG-meddelanden mottagna"
 
-#: src/dht/gnunet-service-dht_neighbours.c:2230
+#: src/dht/gnunet-service-dht_neighbours.c:2227
 #, fuzzy
 msgid "# P2P RESULT bytes received"
 msgstr "# krypterade PONG-meddelanden mottagna"
@@ -2250,27 +2265,27 @@ msgstr "# krypterade PONG-meddelanden mottagna"
 msgid "# Network size estimates received"
 msgstr "# byte mottogs via TCP"
 
-#: src/dht/gnunet-service-dht_routing.c:220
+#: src/dht/gnunet-service-dht_routing.c:218
 msgid "# Good REPLIES matched against routing table"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_routing.c:229
+#: src/dht/gnunet-service-dht_routing.c:232
 msgid "# Duplicate REPLIES matched against routing table"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_routing.c:235
+#: src/dht/gnunet-service-dht_routing.c:238
 msgid "# Invalid REPLIES matched against routing table"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_routing.c:241
+#: src/dht/gnunet-service-dht_routing.c:244
 msgid "# Irrelevant REPLIES matched against routing table"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_routing.c:253
+#: src/dht/gnunet-service-dht_routing.c:256
 msgid "# Unsupported REPLIES matched against routing table"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_routing.c:329
+#: src/dht/gnunet-service-dht_routing.c:335
 msgid "# Entries removed from routing table"
 msgstr ""
 
@@ -2278,7 +2293,7 @@ msgstr ""
 msgid "# Entries added to routing table"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_routing.c:429
+#: src/dht/gnunet-service-dht_routing.c:433
 #, fuzzy
 msgid "# DHT requests combined"
 msgstr "# byte mottogs via TCP"
@@ -2392,16 +2407,16 @@ msgid ""
 "SUPU %s, %s, %d, trail->prev_hop = %s"
 msgstr ""
 
-#: src/dht/plugin_block_dht.c:144
+#: src/dht/plugin_block_dht.c:167
 #, fuzzy, c-format
 msgid "Block not of type %u\n"
 msgstr "Ingen transport av typ %d är känd.\n"
 
-#: src/dht/plugin_block_dht.c:151
+#: src/dht/plugin_block_dht.c:174
 msgid "Size mismatch for block\n"
 msgstr ""
 
-#: src/dht/plugin_block_dht.c:161
+#: src/dht/plugin_block_dht.c:184
 #, c-format
 msgid "Block of type %u is malformed\n"
 msgstr ""
@@ -2507,7 +2522,7 @@ msgstr ""
 msgid "# DNS requests received via TUN interface"
 msgstr "Meddelande mottaget från klient är ogiltig.\n"
 
-#: src/dns/gnunet-service-dns.c:1078 src/exit/gnunet-daemon-exit.c:3643
+#: src/dns/gnunet-service-dns.c:1078 src/exit/gnunet-daemon-exit.c:3642
 #, fuzzy
 msgid "need a valid IPv4 or IPv6 address\n"
 msgstr "Ogiltigt svar på \"%s\".\n"
@@ -2526,214 +2541,214 @@ msgstr ""
 msgid "Print information about DV state"
 msgstr "Skriv ut information om GNUnets motparter."
 
-#: src/exit/gnunet-daemon-exit.c:805 src/exit/gnunet-daemon-exit.c:3109
+#: src/exit/gnunet-daemon-exit.c:804 src/exit/gnunet-daemon-exit.c:3108
 #, fuzzy
 msgid "# Inbound CADET channels created"
 msgstr "# PING-meddelanden skapade"
 
-#: src/exit/gnunet-daemon-exit.c:861
+#: src/exit/gnunet-daemon-exit.c:860
 #, c-format
 msgid "Got duplicate service records for `%s:%u'\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:914
+#: src/exit/gnunet-daemon-exit.c:913
 #, fuzzy
 msgid "# Bytes transmitted via cadet channels"
 msgstr "# byte skickade av typen %d"
 
-#: 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
+#: src/exit/gnunet-daemon-exit.c:1032 src/exit/gnunet-daemon-exit.c:2492
+#: src/exit/gnunet-daemon-exit.c:2745 src/vpn/gnunet-service-vpn.c:1454
+#: src/vpn/gnunet-service-vpn.c:1845 src/vpn/gnunet-service-vpn.c:2008
 msgid "# ICMPv4 packets dropped (type not allowed)"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c: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
+#: src/exit/gnunet-daemon-exit.c:1069 src/exit/gnunet-daemon-exit.c:2551
+#: src/exit/gnunet-daemon-exit.c:2804 src/vpn/gnunet-service-vpn.c:1510
+#: src/vpn/gnunet-service-vpn.c:1904 src/vpn/gnunet-service-vpn.c:2041
 msgid "# ICMPv6 packets dropped (type not allowed)"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:1118
+#: src/exit/gnunet-daemon-exit.c:1117
 msgid "# ICMP packets dropped (not allowed)"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:1126
+#: src/exit/gnunet-daemon-exit.c:1125
 msgid "ICMP Packet dropped, have no matching connection information\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:1203
+#: src/exit/gnunet-daemon-exit.c:1202
 msgid "UDP Packet dropped, have no matching connection information\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:1278
+#: src/exit/gnunet-daemon-exit.c:1277
 msgid "TCP Packet dropped, have no matching connection information\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:1331
+#: src/exit/gnunet-daemon-exit.c:1330
 #, fuzzy
 msgid "# Packets received from TUN"
 msgstr "# byte mottagna via HTTP"
 
-#: src/exit/gnunet-daemon-exit.c:1345
+#: src/exit/gnunet-daemon-exit.c:1344
 #, fuzzy
 msgid "# Bytes received from TUN"
 msgstr "# byte mottagna via HTTP"
 
-#: src/exit/gnunet-daemon-exit.c:1371
+#: src/exit/gnunet-daemon-exit.c:1370
 msgid "IPv4 packet options received.  Ignored.\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:1398
+#: src/exit/gnunet-daemon-exit.c:1397
 #, c-format
 msgid "IPv4 packet with unsupported next header %u received.  Ignored.\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:1444
+#: src/exit/gnunet-daemon-exit.c:1443
 #, c-format
 msgid "IPv6 packet with unsupported next header %d received.  Ignored.\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:1452
+#: src/exit/gnunet-daemon-exit.c:1451
 #, c-format
 msgid "Packet from unknown protocol %u received.  Ignored.\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:1853
+#: src/exit/gnunet-daemon-exit.c:1852
 #, fuzzy
 msgid "# TCP packets sent via TUN"
 msgstr "# byte skickade via UDP"
 
-#: src/exit/gnunet-daemon-exit.c:1977
+#: src/exit/gnunet-daemon-exit.c:1976
 #, fuzzy
 msgid "# TCP service creation requests received via cadet"
 msgstr "# byte mottogs via TCP"
 
-#: src/exit/gnunet-daemon-exit.c: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
+#: src/exit/gnunet-daemon-exit.c:1980 src/exit/gnunet-daemon-exit.c:2059
+#: src/exit/gnunet-daemon-exit.c:2166 src/exit/gnunet-daemon-exit.c:2416
+#: src/exit/gnunet-daemon-exit.c:2666 src/exit/gnunet-daemon-exit.c:2953
+#: src/exit/gnunet-daemon-exit.c:3056
 #, fuzzy
 msgid "# Bytes received from CADET"
 msgstr "# byte mottagna via HTTP"
 
-#: src/exit/gnunet-daemon-exit.c:2063
+#: src/exit/gnunet-daemon-exit.c:2062
 #, fuzzy
 msgid "# TCP IP-exit creation requests received via cadet"
 msgstr "# byte mottogs via TCP"
 
-#: src/exit/gnunet-daemon-exit.c:2170
+#: src/exit/gnunet-daemon-exit.c:2169
 #, fuzzy
 msgid "# TCP data requests received via cadet"
 msgstr "# byte mottogs via TCP"
 
-#: src/exit/gnunet-daemon-exit.c:2184
+#: src/exit/gnunet-daemon-exit.c:2183
 #, fuzzy
 msgid "# TCP DATA requests dropped (no session)"
 msgstr "# byte mottogs via TCP"
 
-#: src/exit/gnunet-daemon-exit.c:2246
+#: src/exit/gnunet-daemon-exit.c:2245
 #, fuzzy
 msgid "# ICMP packets sent via TUN"
 msgstr "# byte skickade via UDP"
 
-#: src/exit/gnunet-daemon-exit.c:2420
+#: src/exit/gnunet-daemon-exit.c:2419
 #, fuzzy
 msgid "# ICMP IP-exit requests received via cadet"
 msgstr "# byte mottogs via TCP"
 
-#: src/exit/gnunet-daemon-exit.c:2670
+#: src/exit/gnunet-daemon-exit.c:2669
 #, fuzzy
 msgid "# ICMP service requests received via cadet"
 msgstr "Meddelande mottaget från klient är ogiltig.\n"
 
-#: src/exit/gnunet-daemon-exit.c:2731 src/vpn/gnunet-service-vpn.c:1445
-#: src/vpn/gnunet-service-vpn.c:2003
+#: src/exit/gnunet-daemon-exit.c:2730 src/vpn/gnunet-service-vpn.c:1444
+#: src/vpn/gnunet-service-vpn.c:2002
 msgid "# ICMPv4 packets dropped (impossible PT to v6)"
 msgstr ""
 
-#: 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
+#: src/exit/gnunet-daemon-exit.c:2789 src/vpn/gnunet-service-vpn.c:1480
+#: src/vpn/gnunet-service-vpn.c:1492 src/vpn/gnunet-service-vpn.c:1892
 msgid "# ICMPv6 packets dropped (impossible PT to v4)"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:2841
+#: src/exit/gnunet-daemon-exit.c:2840
 #, fuzzy
 msgid "# UDP packets sent via TUN"
 msgstr "# byte skickade via UDP"
 
-#: src/exit/gnunet-daemon-exit.c:2957
+#: src/exit/gnunet-daemon-exit.c:2956
 #, fuzzy
 msgid "# UDP IP-exit requests received via cadet"
 msgstr "# byte mottogs via TCP"
 
-#: src/exit/gnunet-daemon-exit.c:3060
+#: src/exit/gnunet-daemon-exit.c:3059
 #, fuzzy
 msgid "# UDP service requests received via cadet"
 msgstr "# byte mottogs via TCP"
 
-#: src/exit/gnunet-daemon-exit.c:3327 src/exit/gnunet-daemon-exit.c:3337
+#: src/exit/gnunet-daemon-exit.c:3326 src/exit/gnunet-daemon-exit.c:3336
 #, fuzzy, c-format
 msgid "Option `%s' for domain `%s' is not formatted correctly!\n"
 msgstr "%s: flagga \"%s\" är tvetydig\n"
 
-#: src/exit/gnunet-daemon-exit.c:3351 src/exit/gnunet-daemon-exit.c:3359
+#: src/exit/gnunet-daemon-exit.c:3350 src/exit/gnunet-daemon-exit.c:3358
 #, c-format
 msgid "`%s' is not a valid port number (for domain `%s')!"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3400
+#: src/exit/gnunet-daemon-exit.c:3399
 #, c-format
 msgid "No addresses found for hostname `%s' of service `%s'!\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3414 src/exit/gnunet-daemon-exit.c:3427
+#: src/exit/gnunet-daemon-exit.c:3413 src/exit/gnunet-daemon-exit.c:3426
 #, c-format
 msgid "Service `%s' configured for IPv4, but IPv4 is disabled!\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3439
+#: src/exit/gnunet-daemon-exit.c:3438
 #, c-format
 msgid "No IP addresses found for hostname `%s' of service `%s'!\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3584
+#: src/exit/gnunet-daemon-exit.c:3583
 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:3592
+#: src/exit/gnunet-daemon-exit.c:3591
 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:3599
+#: src/exit/gnunet-daemon-exit.c:3598
 msgid ""
 "Cannot enable IPv4 exit but disable IPv4 on TUN interface, will use "
 "ENABLE_IPv4=YES\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3605
+#: src/exit/gnunet-daemon-exit.c:3604
 msgid ""
 "Cannot enable IPv6 exit but disable IPv6 on TUN interface, will use "
 "ENABLE_IPv6=YES\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3765
+#: src/exit/gnunet-daemon-exit.c:3764
 msgid "Must be a number"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3872
+#: src/exit/gnunet-daemon-exit.c:3871
 #, 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
+#: src/exit/gnunet-daemon-exit.c:3883 src/pt/gnunet-daemon-pt.c:1279
 msgid "No useful service enabled.  Exiting.\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:4029
+#: src/exit/gnunet-daemon-exit.c:4028
 msgid "Daemon to run to provide an IP exit node for the VPN"
 msgstr ""
 
@@ -2779,15 +2794,15 @@ msgstr ""
 msgid "# total size of fragmented messages"
 msgstr ""
 
-#: src/fragmentation/fragmentation.c:455
+#: src/fragmentation/fragmentation.c:456
 msgid "# fragment acknowledgements received"
 msgstr ""
 
-#: src/fragmentation/fragmentation.c:462
+#: src/fragmentation/fragmentation.c:463
 msgid "# bits removed from fragmentation ACKs"
 msgstr ""
 
-#: src/fragmentation/fragmentation.c:486
+#: src/fragmentation/fragmentation.c:487
 #, fuzzy
 msgid "# fragmentation transmissions completed"
 msgstr "# klartext PONG-meddelanden mottagna"
@@ -2817,46 +2832,46 @@ msgstr "Misslyckades att leverera \"%s\" meddelande.\n"
 msgid "Failure while resuming publishing operation `%s': %s\n"
 msgstr ""
 
-#: src/fs/fs_api.c:1660
+#: src/fs/fs_api.c:1662
 #, fuzzy, c-format
 msgid "Failed to resume publishing operation `%s': %s\n"
 msgstr "Misslyckades att leverera \"%s\" meddelande.\n"
 
-#: src/fs/fs_api.c:2318
+#: src/fs/fs_api.c:2322
 #, c-format
 msgid "Failure while resuming unindexing operation `%s': %s\n"
 msgstr ""
 
-#: src/fs/fs_api.c:2328
+#: src/fs/fs_api.c:2332
 #, fuzzy, c-format
 msgid "Failed to resume unindexing operation `%s': %s\n"
 msgstr "Misslyckades att leverera \"%s\" meddelande.\n"
 
-#: src/fs/fs_api.c:2456 src/fs/fs_api.c:2703
+#: src/fs/fs_api.c:2460 src/fs/fs_api.c:2706
 #, fuzzy, c-format
 msgid "Failed to resume sub-download `%s': %s\n"
 msgstr "Misslyckades att leverera \"%s\" meddelande.\n"
 
-#: src/fs/fs_api.c:2474
+#: src/fs/fs_api.c:2478
 #, fuzzy, c-format
 msgid "Failed to resume sub-search `%s': %s\n"
 msgstr "Misslyckades att leverera \"%s\" meddelande.\n"
 
-#: src/fs/fs_api.c:2489 src/fs/fs_api.c:2508 src/fs/fs_api.c:3006
+#: src/fs/fs_api.c:2493 src/fs/fs_api.c:2512 src/fs/fs_api.c:3016
 #, c-format
 msgid "Failure while resuming search operation `%s': %s\n"
 msgstr ""
 
-#: src/fs/fs_api.c:2693
+#: src/fs/fs_api.c:2696
 #, c-format
 msgid "Failed to resume sub-download `%s': could not open file `%s'\n"
 msgstr ""
 
-#: src/fs/fs_api.c:2949
+#: src/fs/fs_api.c:2959
 msgid "Could not resume running search, will resume as paused search\n"
 msgstr ""
 
-#: src/fs/fs_api.c:3044
+#: src/fs/fs_api.c:3054
 #, c-format
 msgid "Failure while resuming download operation `%s': %s\n"
 msgstr ""
@@ -2917,7 +2932,7 @@ msgstr "Misslyckades att leverera \"%s\" meddelande.\n"
 msgid "internal error decoding tree"
 msgstr "=\tFel vid läsning av katalog.\n"
 
-#: src/fs/fs_download.c:1838
+#: src/fs/fs_download.c:1845
 #, fuzzy
 msgid "Invalid URI"
 msgstr "Ogiltiga argument: "
@@ -3662,49 +3677,49 @@ msgstr ""
 msgid "Hash mismatch trying to index file `%s' which does not have hash `%s'\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs.c:1288
+#: src/fs/gnunet-service-fs.c:1287
 #, fuzzy
 msgid "FS service is lacking HOSTKEY configuration setting.  Exiting.\n"
 msgstr "GNUnet-konfiguration"
 
-#: src/fs/gnunet-service-fs.c:1313 src/hostlist/gnunet-daemon-hostlist.c:355
+#: src/fs/gnunet-service-fs.c:1312 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:494
+#: src/fs/gnunet-service-fs_cadet_client.c:370
 #, fuzzy
 msgid "# replies received via cadet"
 msgstr "# byte mottagna av typen %d"
 
-#: src/fs/gnunet-service-fs_cadet_client.c:508
+#: src/fs/gnunet-service-fs_cadet_client.c:384
 #, fuzzy
 msgid "# replies received via cadet dropped"
 msgstr "# byte mottagna av typen %d"
 
-#: src/fs/gnunet-service-fs_cadet_server.c:258
-#, fuzzy
-msgid "# Blocks transferred via cadet"
-msgstr "# byte skickade av typen %d"
-
-#: src/fs/gnunet-service-fs_cadet_server.c:360
+#: src/fs/gnunet-service-fs_cadet_server.c:263
 #, fuzzy
 msgid "# queries received via CADET not answered"
 msgstr "# byte mottogs via TCP"
 
-#: src/fs/gnunet-service-fs_cadet_server.c:440
+#: src/fs/gnunet-service-fs_cadet_server.c:317
+#, fuzzy
+msgid "# Blocks transferred via cadet"
+msgstr "# byte skickade av typen %d"
+
+#: src/fs/gnunet-service-fs_cadet_server.c:343
 #, fuzzy
 msgid "# queries received via cadet"
 msgstr "# byte mottogs via TCP"
 
-#: src/fs/gnunet-service-fs_cadet_server.c:484
+#: src/fs/gnunet-service-fs_cadet_server.c:384
 #, fuzzy
 msgid "# cadet client connections rejected"
 msgstr "Nätverksanslutning"
 
-#: src/fs/gnunet-service-fs_cadet_server.c:490
-#: src/fs/gnunet-service-fs_cadet_server.c:530
+#: src/fs/gnunet-service-fs_cadet_server.c:391
+#: src/fs/gnunet-service-fs_cadet_server.c:431
 #, fuzzy
 msgid "# cadet connections active"
 msgstr "Nätverksanslutning"
@@ -3862,112 +3877,112 @@ msgstr "# byte mottogs via TCP"
 msgid "# query plan entries"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:315
+#: src/fs/gnunet-service-fs_pr.c:327
 #, fuzzy
 msgid "# Pending requests created"
 msgstr "# byte mottogs via TCP"
 
-#: src/fs/gnunet-service-fs_pr.c:411 src/fs/gnunet-service-fs_pr.c:661
+#: src/fs/gnunet-service-fs_pr.c:428 src/fs/gnunet-service-fs_pr.c:675
 msgid "# Pending requests active"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:842
+#: src/fs/gnunet-service-fs_pr.c:856
 #, fuzzy
 msgid "# replies received and matched"
 msgstr "# byte mottagna av typen %d"
 
-#: src/fs/gnunet-service-fs_pr.c:879
+#: src/fs/gnunet-service-fs_pr.c:892
 msgid "# duplicate replies discarded (bloomfilter)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:888
+#: src/fs/gnunet-service-fs_pr.c:901
 msgid "# irrelevant replies discarded"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:903
+#: src/fs/gnunet-service-fs_pr.c:916
 #, c-format
 msgid "Unsupported block type %u\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:920
+#: src/fs/gnunet-service-fs_pr.c:933
 msgid "# results found locally"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1050
+#: src/fs/gnunet-service-fs_pr.c:1063
 msgid "# Datastore `PUT' failures"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1078
+#: src/fs/gnunet-service-fs_pr.c:1091
 #, fuzzy
 msgid "# storage requests dropped due to high load"
 msgstr "Nätverksannonsering avstängd i konfigurationen!\n"
 
-#: src/fs/gnunet-service-fs_pr.c:1116
+#: src/fs/gnunet-service-fs_pr.c:1129
 #, fuzzy
 msgid "# Replies received from DHT"
 msgstr "# byte mottagna via HTTP"
 
-#: src/fs/gnunet-service-fs_pr.c:1247
+#: src/fs/gnunet-service-fs_pr.c:1260
 #, fuzzy
 msgid "# Replies received from CADET"
 msgstr "# byte mottagna via HTTP"
 
-#: src/fs/gnunet-service-fs_pr.c:1299
+#: src/fs/gnunet-service-fs_pr.c:1312
 #, c-format
 msgid "Datastore lookup already took %s!\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1320
+#: src/fs/gnunet-service-fs_pr.c:1333
 #, c-format
 msgid "On-demand lookup already took %s!\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1372
+#: src/fs/gnunet-service-fs_pr.c:1385
 msgid "# Datastore lookups concluded (no results)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1387
+#: src/fs/gnunet-service-fs_pr.c:1400
 msgid "# Datastore lookups concluded (seen all)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1396
+#: src/fs/gnunet-service-fs_pr.c:1409
 msgid "# Datastore lookups aborted (more than MAX_RESULTS)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1411
+#: src/fs/gnunet-service-fs_pr.c:1424
 msgid "# requested DBLOCK or IBLOCK not found"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1425
+#: src/fs/gnunet-service-fs_pr.c:1438
 msgid "# on-demand blocks matched requests"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1438
+#: src/fs/gnunet-service-fs_pr.c:1451
 msgid "# on-demand lookups performed successfully"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1443
+#: src/fs/gnunet-service-fs_pr.c:1456
 msgid "# on-demand lookups failed"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1469 src/fs/gnunet-service-fs_pr.c:1508
-#: src/fs/gnunet-service-fs_pr.c:1675
+#: src/fs/gnunet-service-fs_pr.c:1482 src/fs/gnunet-service-fs_pr.c:1521
+#: src/fs/gnunet-service-fs_pr.c:1688
 msgid "# Datastore lookups concluded (error queueing)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1527
+#: src/fs/gnunet-service-fs_pr.c:1540
 msgid "# Datastore lookups concluded (found last result)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1539
+#: src/fs/gnunet-service-fs_pr.c:1552
 msgid "# Datastore lookups concluded (load too high)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1652
+#: src/fs/gnunet-service-fs_pr.c:1665
 msgid "# Datastore lookups initiated"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1732
+#: src/fs/gnunet-service-fs_pr.c:1745
 #, fuzzy
 msgid "# GAP PUT messages received"
 msgstr "# krypterade PONG-meddelanden mottagna"
@@ -4332,7 +4347,7 @@ msgid "Failed to connect to the namecache!\n"
 msgstr "Misslyckades att ansluta till gnunetd.\n"
 
 #: src/gns/gnunet-service-gns.c:612
-#: src/zonemaster/gnunet-service-zonemaster.c:740
+#: src/zonemaster/gnunet-service-zonemaster.c:741
 #, fuzzy
 msgid "Could not connect to DHT!\n"
 msgstr "Kunde inte ansluta till gnunetd.\n"
@@ -4814,7 +4829,7 @@ msgid "# hostlist advertisements send"
 msgstr ""
 
 #: src/hostlist/gnunet-daemon-hostlist_server.c:679
-#: src/transport/gnunet-service-transport.c:2802
+#: src/transport/gnunet-service-transport.c:2803
 #, fuzzy
 msgid "Could not access PEERINFO service.  Exiting.\n"
 msgstr "Kunde inte komma åt namnrymdsinformation.\n"
@@ -5179,7 +5194,8 @@ msgstr ""
 msgid "Invalid public key for reverse lookup `%s'\n"
 msgstr "Ogiltigt argument: \"%s\"\n"
 
-#: src/namestore/gnunet-namestore.c:979 src/peerinfo-tool/gnunet-peerinfo.c:775
+#: src/namestore/gnunet-namestore.c:979
+#: src/peerinfo-tool/gnunet-peerinfo.c:775
 #, fuzzy, c-format
 msgid "Invalid URI `%s'\n"
 msgstr "Ogiltiga argument: "
@@ -5388,23 +5404,22 @@ msgid "Failed to connect to `gnunet-nat-server'\n"
 msgstr "Misslyckades att ansluta till gnunetd.\n"
 
 #: src/nat-auto/gnunet-nat-auto_legacy.c:518
-#: src/nat-auto/nat_auto_api_test.c:520
 #, c-format
 msgid "Failed to create listen socket bound to `%s' for NAT test: %s\n"
 msgstr ""
 
 #: src/nat-auto/gnunet-nat-auto_legacy.c:568
-#: src/nat-auto/nat_auto_api_test.c:569
+#: src/nat-auto/nat_auto_api_test.c:571
 #, fuzzy
 msgid "NAT test failed to start NAT library\n"
 msgstr "Misslyckades att starta samling.\n"
 
-#: src/nat-auto/gnunet-nat-server.c:336
+#: src/nat-auto/gnunet-nat-server.c:338
 #, c-format
 msgid "Please pass valid port number as the first argument! (got `%s')\n"
 msgstr ""
 
-#: src/nat-auto/gnunet-nat-server.c:386
+#: src/nat-auto/gnunet-nat-server.c:388
 msgid "GNUnet NAT traversal test helper daemon"
 msgstr ""
 
@@ -5554,6 +5569,11 @@ msgstr ""
 msgid "Failed to find valid PORT in section `%s'\n"
 msgstr "Misslyckades att binda till UDP-port %d.\n"
 
+#: src/nat-auto/nat_auto_api_test.c:522
+#, fuzzy, c-format
+msgid "Failed to create socket bound to `%s' for NAT test: %s\n"
+msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
+
 #: src/nat/gnunet-nat.c:424
 msgid "which IP and port are we locally using to bind/listen to"
 msgstr ""
@@ -5580,32 +5600,32 @@ msgstr ""
 msgid "GNUnet NAT traversal autoconfigure daemon"
 msgstr ""
 
-#: src/nat/gnunet-service-nat.c:1313
+#: src/nat/gnunet-service-nat.c:1317
 #, c-format
 msgid "Malformed punched hole specification `%s' (lacks port)\n"
 msgstr ""
 
-#: src/nat/gnunet-service-nat.c:1323
+#: src/nat/gnunet-service-nat.c:1327
 #, c-format
 msgid "Invalid port number in punched hole specification `%s' (lacks port)\n"
 msgstr ""
 
-#: src/nat/gnunet-service-nat.c:1339
+#: src/nat/gnunet-service-nat.c:1343
 #, c-format
 msgid "Malformed punched hole specification `%s' (lacks `]')\n"
 msgstr ""
 
-#: src/nat/gnunet-service-nat.c:1350
+#: src/nat/gnunet-service-nat.c:1354
 #, c-format
 msgid "Malformed punched hole specification `%s' (IPv6 address invalid)"
 msgstr ""
 
-#: src/nat/gnunet-service-nat.c:1803
+#: src/nat/gnunet-service-nat.c:1813
 #, fuzzy
 msgid "Connection reversal request failed\n"
 msgstr "Samling stoppad.\n"
 
-#: src/nat/gnunet-service-nat.c:1876
+#: src/nat/gnunet-service-nat.c:1886
 msgid ""
 "UPnP enabled in configuration, but UPnP client `upnpc` command not found, "
 "disabling UPnP\n"
@@ -5625,7 +5645,7 @@ msgstr "Misslyckades att starta samling.\n"
 msgid "`external-ip' command not found\n"
 msgstr ""
 
-#: src/nat/gnunet-service-nat_mini.c:654
+#: src/nat/gnunet-service-nat_mini.c:656
 msgid "`upnpc' command not found\n"
 msgstr ""
 
@@ -5660,7 +5680,7 @@ msgstr ""
 msgid "Measure quality and performance of the NSE service."
 msgstr "Kan inte tillgå tjänsten"
 
-#: src/nse/gnunet-service-nse.c:1536
+#: src/nse/gnunet-service-nse.c:1534
 #: src/revocation/gnunet-service-revocation.c:832 src/util/gnunet-scrypt.c:276
 msgid "Value is too large.\n"
 msgstr ""
@@ -5869,7 +5889,7 @@ msgstr "Kunde inte skapa namnrymd \"%s\" (existerar?).\n"
 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:195
+#: src/postgres/postgres.c:192
 #, fuzzy, c-format
 msgid "Unable to connect to Postgres database '%s': %s\n"
 msgstr "Kunde inte spara konfigurationsfil \"%s\":"
@@ -6203,7 +6223,7 @@ msgstr ""
 msgid "Revocation certificate not ready, calculating proof of work\n"
 msgstr ""
 
-#: src/revocation/gnunet-revocation.c:437 src/social/gnunet-social.c:1159
+#: src/revocation/gnunet-revocation.c:437 src/social/gnunet-social.c:1176
 #, fuzzy, c-format
 msgid "Public key `%s' malformed\n"
 msgstr "Ogiltigt argument: \"%s\"\n"
@@ -6339,10 +6359,10 @@ msgstr ""
 msgid "Calculate the Vectorproduct with a GNUnet peer."
 msgstr ""
 
-#: 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
+#: src/scalarproduct/gnunet-service-scalarproduct_alice.c:1404
+#: src/scalarproduct/gnunet-service-scalarproduct_bob.c:1342
+#: src/scalarproduct/gnunet-service-scalarproduct-ecc_alice.c:1177
+#: src/scalarproduct/gnunet-service-scalarproduct-ecc_bob.c:1060
 #, fuzzy
 msgid "Connect to CADET failed\n"
 msgstr " Anslutning misslyckades (fel?)\n"
@@ -6367,9 +6387,9 @@ msgstr ""
 msgid "also profile decryption"
 msgstr ""
 
-#: src/set/gnunet-service-set.c:1991
+#: src/set/gnunet-service-set.c:2068
 #, fuzzy
-msgid "Could not connect to cadet service\n"
+msgid "Could not connect to CADET service\n"
 msgstr "Kunde inte ansluta till gnunetd.\n"
 
 #: src/set/gnunet-set-ibf-profiler.c:249
@@ -6398,129 +6418,129 @@ msgstr ""
 msgid "operation to execute"
 msgstr ""
 
-#: src/social/gnunet-social.c:1146
+#: src/social/gnunet-social.c:1163
 #, fuzzy
 msgid "--place missing or invalid.\n"
 msgstr "Ogiltigt argument: \"%s\"\n"
 
-#: src/social/gnunet-social.c:1195
+#: src/social/gnunet-social.c:1212
 msgid "assign --name in state to --data"
 msgstr ""
 
-#: src/social/gnunet-social.c:1199
+#: src/social/gnunet-social.c:1216
 msgid "say good-bye and leave somebody else's place"
 msgstr ""
 
-#: src/social/gnunet-social.c:1203
+#: src/social/gnunet-social.c:1220
 msgid "create a place"
 msgstr ""
 
-#: src/social/gnunet-social.c:1207
+#: src/social/gnunet-social.c:1224
 msgid "destroy a place we were hosting"
 msgstr ""
 
-#: src/social/gnunet-social.c:1211
+#: src/social/gnunet-social.c:1228
 msgid "enter somebody else's place"
 msgstr ""
 
-#: src/social/gnunet-social.c:1215
+#: src/social/gnunet-social.c:1232
 msgid "find state matching name prefix"
 msgstr ""
 
-#: src/social/gnunet-social.c:1219
+#: src/social/gnunet-social.c:1236
 msgid "replay history of messages up to the given --limit"
 msgstr ""
 
-#: src/social/gnunet-social.c:1223
+#: src/social/gnunet-social.c:1240
 msgid "reconnect to a previously created place"
 msgstr ""
 
-#: src/social/gnunet-social.c:1227
+#: src/social/gnunet-social.c:1244
 msgid "publish something to a place we are hosting"
 msgstr ""
 
-#: src/social/gnunet-social.c:1231
+#: src/social/gnunet-social.c:1248
 msgid "reconnect to a previously entered place"
 msgstr ""
 
-#: src/social/gnunet-social.c:1235
+#: src/social/gnunet-social.c:1252
 msgid "search for state matching exact name"
 msgstr ""
 
-#: src/social/gnunet-social.c:1239
+#: src/social/gnunet-social.c:1256
 msgid "submit something to somebody's place"
 msgstr ""
 
-#: src/social/gnunet-social.c:1243
+#: src/social/gnunet-social.c:1260
 msgid "list of egos and subscribed places"
 msgstr ""
 
-#: src/social/gnunet-social.c:1247
+#: src/social/gnunet-social.c:1264
 msgid "extract and replay history between message IDs --start and --until"
 msgstr ""
 
-#: src/social/gnunet-social.c:1254
+#: src/social/gnunet-social.c:1271
 msgid "application ID to use when connecting"
 msgstr ""
 
-#: src/social/gnunet-social.c:1258
+#: src/social/gnunet-social.c:1275
 msgid "message body or state value"
 msgstr ""
 
-#: src/social/gnunet-social.c:1262
+#: src/social/gnunet-social.c:1279
 #, fuzzy
 msgid "name or public key of ego"
 msgstr "Ogiltigt argument: \"%s\"\n"
 
-#: src/social/gnunet-social.c:1266
+#: src/social/gnunet-social.c:1283
 #, fuzzy
 msgid "wait for incoming messages"
 msgstr "Misslyckades att leverera \"%s\" meddelande.\n"
 
-#: src/social/gnunet-social.c:1270
+#: src/social/gnunet-social.c:1287
 #, fuzzy
 msgid "GNS name"
 msgstr "Visa _namn"
 
-#: src/social/gnunet-social.c:1274
+#: src/social/gnunet-social.c:1291
 msgid "peer ID for --guest-enter"
 msgstr ""
 
-#: src/social/gnunet-social.c:1278
+#: src/social/gnunet-social.c:1295
 msgid "name (key) to query from state"
 msgstr ""
 
-#: src/social/gnunet-social.c:1282
+#: src/social/gnunet-social.c:1299
 #, fuzzy
 msgid "method name"
 msgstr "Visa _namn"
 
-#: src/social/gnunet-social.c:1286
+#: src/social/gnunet-social.c:1303
 #, fuzzy
 msgid "number of messages to replay from history"
 msgstr "antal meddelanden att använda per iteration"
 
-#: src/social/gnunet-social.c:1290
+#: src/social/gnunet-social.c:1307
 msgid "key address of place"
 msgstr ""
 
-#: src/social/gnunet-social.c:1294
+#: src/social/gnunet-social.c:1311
 msgid "start message ID for history replay"
 msgstr ""
 
-#: src/social/gnunet-social.c:1298
+#: src/social/gnunet-social.c:1315
 msgid "respond to entry requests by admitting all guests"
 msgstr ""
 
-#: src/social/gnunet-social.c:1302
+#: src/social/gnunet-social.c:1319
 msgid "end message ID for history replay"
 msgstr ""
 
-#: src/social/gnunet-social.c:1306
+#: src/social/gnunet-social.c:1323
 msgid "respond to entry requests by refusing all guests"
 msgstr ""
 
-#: src/social/gnunet-social.c:1316
+#: src/social/gnunet-social.c:1333
 msgid ""
 "gnunet-social - Interact with the social service: enter/leave, send/receive "
 "messages, access history and state.\n"
@@ -7062,37 +7082,37 @@ msgstr ""
 msgid "# bytes payload discarded due to not connected peer"
 msgstr "Nätverksannonsering avstängd i konfigurationen!\n"
 
-#: src/transport/gnunet-service-transport.c:1698
+#: src/transport/gnunet-service-transport.c:1699
 #, fuzzy
 msgid "# bytes total received"
 msgstr "# byte krypterade"
 
-#: src/transport/gnunet-service-transport.c:1795
+#: src/transport/gnunet-service-transport.c:1796
 #, fuzzy
 msgid "# bytes payload received"
 msgstr "# byte dekrypterade"
 
-#: src/transport/gnunet-service-transport.c:2112
-#: src/transport/gnunet-service-transport.c:2584
+#: src/transport/gnunet-service-transport.c:2113
+#: src/transport/gnunet-service-transport.c:2585
 msgid "# disconnects due to blacklist"
 msgstr ""
 
-#: src/transport/gnunet-service-transport.c:2588
+#: src/transport/gnunet-service-transport.c:2589
 #, 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
+#: src/transport/gnunet-service-transport.c:2697
 #, 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
+#: src/transport/gnunet-service-transport.c:2706
 #, c-format
 msgid "Adding blacklisting entry for peer `%s':`%s'\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport.c:2770
+#: src/transport/gnunet-service-transport.c:2771
 #, fuzzy
 msgid "Transport service is lacking key configuration settings. Exiting.\n"
 msgstr "GNUnet-konfiguration"
@@ -7245,74 +7265,74 @@ msgstr "# PING-meddelanden skapade"
 msgid "SYN request from peer `%s' ignored due impending shutdown\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:2598
+#: src/transport/gnunet-service-transport_neighbours.c:2606
 msgid "# Attempts to switch addresses"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3080
+#: src/transport/gnunet-service-transport_neighbours.c:3088
 #, fuzzy
 msgid "# SYN_ACK messages received"
 msgstr "# krypterade PONG-meddelanden mottagna"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3088
+#: src/transport/gnunet-service-transport_neighbours.c:3096
 #, fuzzy
 msgid "# unexpected SYN_ACK messages (no peer)"
 msgstr "skicka ANTAL meddelanden"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3106
-#: src/transport/gnunet-service-transport_neighbours.c:3130
+#: src/transport/gnunet-service-transport_neighbours.c:3114
+#: src/transport/gnunet-service-transport_neighbours.c:3138
 #, fuzzy
 msgid "# unexpected SYN_ACK messages (not ready)"
 msgstr "skicka ANTAL meddelanden"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3142
+#: src/transport/gnunet-service-transport_neighbours.c:3150
 #, fuzzy
 msgid "# unexpected SYN_ACK messages (waiting on ATS)"
 msgstr "skicka ANTAL meddelanden"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3167
+#: src/transport/gnunet-service-transport_neighbours.c:3175
 msgid "# Successful attempts to switch addresses"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3180
+#: src/transport/gnunet-service-transport_neighbours.c:3188
 #, fuzzy
 msgid "# unexpected SYN_ACK messages (disconnecting)"
 msgstr "skicka ANTAL meddelanden"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3352
+#: src/transport/gnunet-service-transport_neighbours.c:3360
 #, fuzzy
 msgid "# ACK messages received"
 msgstr "# krypterade PONG-meddelanden mottagna"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3388
+#: src/transport/gnunet-service-transport_neighbours.c:3396
 #, fuzzy
 msgid "# unexpected ACK messages"
 msgstr "# krypterade PONG-meddelanden skickade"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3476
+#: src/transport/gnunet-service-transport_neighbours.c:3484
 #, fuzzy
 msgid "# quota messages ignored (malformed)"
 msgstr "# byte mottogs via TCP"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3483
+#: src/transport/gnunet-service-transport_neighbours.c:3491
 #, fuzzy
 msgid "# QUOTA messages received"
 msgstr "# krypterade PONG-meddelanden mottagna"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3523
+#: src/transport/gnunet-service-transport_neighbours.c:3531
 msgid "# disconnect messages ignored (malformed)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3530
+#: src/transport/gnunet-service-transport_neighbours.c:3538
 #, fuzzy
 msgid "# DISCONNECT messages received"
 msgstr "# krypterade PONG-meddelanden mottagna"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3541
+#: src/transport/gnunet-service-transport_neighbours.c:3549
 msgid "# disconnect messages ignored (timestamp)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3675
+#: src/transport/gnunet-service-transport_neighbours.c:3683
 #, fuzzy
 msgid "# disconnected from peer upon explicit request"
 msgstr "# av anslutna parter"
@@ -7618,8 +7638,8 @@ msgstr "meddelandestorlek"
 #: src/transport/plugin_transport_http_client.c:1477
 #: src/transport/plugin_transport_http_server.c:2248
 #: src/transport/plugin_transport_http_server.c:3462
-#: src/transport/plugin_transport_tcp.c:3375
-#: src/transport/plugin_transport_tcp.c:3382
+#: src/transport/plugin_transport_tcp.c:3403
+#: src/transport/plugin_transport_tcp.c:3410
 msgid "TCP_STEALTH not supported on this platform.\n"
 msgstr ""
 
@@ -7690,7 +7710,7 @@ msgid "Found %u addresses to report to NAT service\n"
 msgstr ""
 
 #: src/transport/plugin_transport_http_server.c:2837
-#: src/transport/plugin_transport_udp.c:3623
+#: src/transport/plugin_transport_udp.c:3613
 msgid "Disabling IPv6 since it is not supported on this system!\n"
 msgstr ""
 
@@ -7801,15 +7821,15 @@ msgid "# bytes dropped by SMTP (outgoing)"
 msgstr "# byte kastade via TCP (utgående)"
 
 #: src/transport/plugin_transport_tcp.c:1060
-#: src/transport/plugin_transport_tcp.c:2379
+#: src/transport/plugin_transport_tcp.c:2386
 #, c-format
 msgid "Unexpected address length: %u bytes\n"
 msgstr ""
 
 #: src/transport/plugin_transport_tcp.c:1243
 #: src/transport/plugin_transport_tcp.c:1467
-#: src/transport/plugin_transport_tcp.c:2643
-#: src/transport/plugin_transport_tcp.c:3498
+#: src/transport/plugin_transport_tcp.c:2650
+#: src/transport/plugin_transport_tcp.c:3526
 #, fuzzy
 msgid "# TCP sessions active"
 msgstr "# sessionsnycklar accepterade"
@@ -7839,65 +7859,65 @@ msgstr "# byte kastade via TCP (utgående)"
 msgid "# bytes transmitted via TCP"
 msgstr "# byte skickade av typen %d"
 
-#: src/transport/plugin_transport_tcp.c:2041
+#: src/transport/plugin_transport_tcp.c:2048
 msgid "# requests to create session with invalid address"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2217
+#: src/transport/plugin_transport_tcp.c:2224
 msgid "# transport-service disconnect requests for TCP"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2702
+#: src/transport/plugin_transport_tcp.c:2716
 #, fuzzy
 msgid "# TCP WELCOME messages received"
 msgstr "# krypterade PONG-meddelanden mottagna"
 
-#: src/transport/plugin_transport_tcp.c:2893
+#: src/transport/plugin_transport_tcp.c:2921
 msgid "# bytes received via TCP"
 msgstr "# byte mottogs via TCP"
 
-#: src/transport/plugin_transport_tcp.c:2944
-#: src/transport/plugin_transport_tcp.c:3002
+#: src/transport/plugin_transport_tcp.c:2972
+#: src/transport/plugin_transport_tcp.c:3030
 #, fuzzy
 msgid "# TCP server connections active"
 msgstr "Nätverksanslutning"
 
-#: src/transport/plugin_transport_tcp.c:2948
+#: src/transport/plugin_transport_tcp.c:2976
 #, fuzzy
 msgid "# TCP server connect events"
 msgstr "# av anslutna parter"
 
-#: src/transport/plugin_transport_tcp.c:2954
+#: src/transport/plugin_transport_tcp.c:2982
 msgid "TCP connection limit reached, suspending server\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2956
+#: src/transport/plugin_transport_tcp.c:2984
 msgid "# TCP service suspended"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2996
+#: src/transport/plugin_transport_tcp.c:3024
 msgid "# TCP service resumed"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:3006
+#: src/transport/plugin_transport_tcp.c:3034
 msgid "# network-level TCP disconnect events"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:3325
+#: src/transport/plugin_transport_tcp.c:3353
 #, fuzzy
 msgid "Failed to start service.\n"
 msgstr "Misslyckades att starta samling.\n"
 
-#: src/transport/plugin_transport_tcp.c:3486
+#: src/transport/plugin_transport_tcp.c:3514
 #, c-format
 msgid "TCP transport listening on port %llu\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:3490
+#: src/transport/plugin_transport_tcp.c:3518
 msgid "TCP transport not listening on any port (client only)\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:3494
+#: src/transport/plugin_transport_tcp.c:3522
 #, c-format
 msgid "TCP transport advertises itself as being on port %llu\n"
 msgstr ""
@@ -7917,50 +7937,50 @@ msgstr ""
 msgid "Failed to set IPv4 broadcast option for broadcast socket on port %d\n"
 msgstr ""
 
-#: src/transport/plugin_transport_udp.c:3367
+#: src/transport/plugin_transport_udp.c:3357
 #, c-format
 msgid ""
 "UDP could not transmit message to `%s': Network seems down, please check "
 "your network configuration\n"
 msgstr ""
 
-#: src/transport/plugin_transport_udp.c:3381
+#: src/transport/plugin_transport_udp.c:3371
 msgid ""
 "UDP could not transmit IPv6 message! Please check your network configuration "
 "and disable IPv6 if your connection does not have a global IPv6 address\n"
 msgstr ""
 
-#: src/transport/plugin_transport_udp.c:3699
-#: src/transport/plugin_transport_udp.c:3798
+#: src/transport/plugin_transport_udp.c:3689
+#: src/transport/plugin_transport_udp.c:3788
 #, fuzzy, c-format
 msgid "Failed to bind UDP socket to %s: %s\n"
 msgstr "Misslyckades att binda till UDP6-port %d.\n"
 
-#: src/transport/plugin_transport_udp.c:3717
+#: src/transport/plugin_transport_udp.c:3707
 msgid "Disabling IPv4 since it is not supported on this system!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_udp.c:3808
+#: src/transport/plugin_transport_udp.c:3798
 #, fuzzy
 msgid "Failed to open UDP sockets\n"
 msgstr "Misslyckades att binda till UDP6-port %d.\n"
 
-#: src/transport/plugin_transport_udp.c:3879
-#: src/transport/plugin_transport_udp.c:3893
+#: src/transport/plugin_transport_udp.c:3869
+#: src/transport/plugin_transport_udp.c:3883
 msgid "must be in [0,65535]"
 msgstr ""
 
-#: src/transport/plugin_transport_udp.c:3925
+#: src/transport/plugin_transport_udp.c:3915
 #, fuzzy
 msgid "must be valid IPv4 address"
 msgstr "\"%s\" är inte tillgänglig."
 
-#: src/transport/plugin_transport_udp.c:3952
+#: src/transport/plugin_transport_udp.c:3942
 #, fuzzy
 msgid "must be valid IPv6 address"
 msgstr "\"%s\" är inte tillgänglig."
 
-#: src/transport/plugin_transport_udp.c:4018
+#: src/transport/plugin_transport_udp.c:4008
 #, fuzzy
 msgid "Failed to create UDP network sockets\n"
 msgstr "Kunde inte skapa namnrymd \"%s\" (existerar?).\n"
@@ -8082,7 +8102,7 @@ msgstr ""
 msgid "Metadata `%s' failed to deserialize"
 msgstr ""
 
-#: src/util/client.c:864
+#: src/util/client.c:868
 #, c-format
 msgid "Need a non-empty hostname for service `%s'.\n"
 msgstr ""
@@ -8120,20 +8140,20 @@ msgstr ""
 msgid "INVALID"
 msgstr ""
 
-#: src/util/common_logging.c:1248
+#: src/util/common_logging.c:1302
 msgid "unknown address"
 msgstr ""
 
-#: src/util/common_logging.c:1290
+#: src/util/common_logging.c:1344
 msgid "invalid address"
 msgstr ""
 
-#: src/util/common_logging.c:1308
+#: src/util/common_logging.c:1362
 #, fuzzy, c-format
 msgid "Configuration fails to specify option `%s' in section `%s'!\n"
 msgstr "Konfigurationsfil \"%s\" skapad.\n"
 
-#: src/util/common_logging.c:1329
+#: src/util/common_logging.c:1383
 #, fuzzy, c-format
 msgid ""
 "Configuration specifies invalid value for option `%s' in section `%s': %s\n"
@@ -8190,22 +8210,22 @@ msgid ""
 "%llu)\n"
 msgstr ""
 
-#: src/util/crypto_ecc.c:756
+#: src/util/crypto_ecc.c:777
 #, fuzzy, c-format
 msgid "ECC signing failed at %s:%d: %s\n"
 msgstr "\"%s\" misslyckades vid %s:%d med fel: \"%s\".\n"
 
-#: src/util/crypto_ecc.c:806
+#: src/util/crypto_ecc.c:827
 #, fuzzy, c-format
 msgid "EdDSA signing failed at %s:%d: %s\n"
 msgstr "\"%s\" misslyckades vid %s:%d med fel: \"%s\".\n"
 
-#: src/util/crypto_ecc.c:880
+#: src/util/crypto_ecc.c:901
 #, fuzzy, c-format
 msgid "ECDSA signature verification failed at %s:%d: %s\n"
 msgstr "\"%s\" misslyckades vid %s:%d med fel: \"%s\".\n"
 
-#: src/util/crypto_ecc.c:937
+#: src/util/crypto_ecc.c:958
 #, fuzzy, c-format
 msgid "EdDSA signature verification failed at %s:%d: %s\n"
 msgstr "\"%s\" misslyckades vid %s:%d med fel: \"%s\".\n"
@@ -8685,7 +8705,7 @@ msgid ""
 "`GNUNET_SERVER_receive_done' after %s\n"
 msgstr ""
 
-#: src/util/service.c:347 src/util/service_new.c:2343
+#: src/util/service.c:347 src/util/service_new.c:2344
 #, fuzzy, c-format
 msgid "Unknown address family %d\n"
 msgstr "Okänd operation \"%s\"\n"
@@ -8922,93 +8942,93 @@ msgstr "# PING-meddelanden skapade"
 msgid "Protocol %u not supported, dropping\n"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:1145
+#: src/vpn/gnunet-service-vpn.c:1144
 #, fuzzy
 msgid "# Packets dropped (channel not yet online)"
 msgstr "# byte kastade via UDP (utgående)"
 
-#: src/vpn/gnunet-service-vpn.c:1353
+#: src/vpn/gnunet-service-vpn.c:1352
 msgid "# ICMPv4 packets dropped (not allowed)"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:1374
+#: src/vpn/gnunet-service-vpn.c:1373
 msgid "# ICMPv6 packets dropped (not allowed)"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:1580
+#: src/vpn/gnunet-service-vpn.c:1579
 #, fuzzy
 msgid "# Packets received from TUN interface"
 msgstr "Meddelande mottaget från klient är ogiltig.\n"
 
-#: src/vpn/gnunet-service-vpn.c:1613 src/vpn/gnunet-service-vpn.c:1649
+#: src/vpn/gnunet-service-vpn.c:1612 src/vpn/gnunet-service-vpn.c:1648
 #, c-format
 msgid "Packet received for unmapped destination `%s' (dropping it)\n"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:1659
+#: src/vpn/gnunet-service-vpn.c:1658
 msgid "Received IPv4 packet with options (dropping it)\n"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:1673
+#: src/vpn/gnunet-service-vpn.c:1672
 #, c-format
 msgid "Received packet of unknown protocol %d from TUN (dropping it)\n"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:1755
+#: src/vpn/gnunet-service-vpn.c:1754
 #, fuzzy
 msgid "# ICMP packets received from cadet"
 msgstr "Meddelande mottaget från klient är ogiltig.\n"
 
-#: src/vpn/gnunet-service-vpn.c:2095
+#: src/vpn/gnunet-service-vpn.c:2093
 #, fuzzy
 msgid "# UDP packets received from cadet"
 msgstr "Meddelande mottaget från klient är ogiltig.\n"
 
-#: src/vpn/gnunet-service-vpn.c:2251
+#: src/vpn/gnunet-service-vpn.c:2248
 #, fuzzy
 msgid "# TCP packets received from cadet"
 msgstr "Meddelande mottaget från klient är ogiltig.\n"
 
-#: src/vpn/gnunet-service-vpn.c:2403
+#: src/vpn/gnunet-service-vpn.c:2399
 msgid "Failed to find unallocated IPv4 address in VPN's range\n"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:2458
+#: src/vpn/gnunet-service-vpn.c:2454
 msgid "Failed to find unallocated IPv6 address in VPN's range\n"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:2500 src/vpn/gnunet-service-vpn.c:2722
+#: src/vpn/gnunet-service-vpn.c:2496 src/vpn/gnunet-service-vpn.c:2718
 #, fuzzy
 msgid "# Active destinations"
 msgstr "Nätverksanslutning"
 
-#: src/vpn/gnunet-service-vpn.c:2771
+#: src/vpn/gnunet-service-vpn.c:2767
 msgid "Failed to allocate IP address for new destination\n"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:3063
+#: src/vpn/gnunet-service-vpn.c:3059
 #, fuzzy
 msgid "Must specify valid IPv6 address"
 msgstr "\"%s\" är inte tillgänglig."
 
-#: src/vpn/gnunet-service-vpn.c:3087
+#: src/vpn/gnunet-service-vpn.c:3083
 msgid "Must specify valid IPv6 mask"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:3095
+#: src/vpn/gnunet-service-vpn.c:3091
 msgid "IPv6 support disabled as this system does not support IPv6\n"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:3108
+#: src/vpn/gnunet-service-vpn.c:3104
 #, fuzzy
 msgid "Must specify valid IPv4 address"
 msgstr "\"%s\" är inte tillgänglig."
 
-#: src/vpn/gnunet-service-vpn.c:3121
+#: src/vpn/gnunet-service-vpn.c:3117
 msgid "Must specify valid IPv4 mask"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:3131
+#: src/vpn/gnunet-service-vpn.c:3127
 msgid "IPv4 support disabled as this system does not support IPv4\n"
 msgstr ""
 
@@ -9080,23 +9100,31 @@ msgstr "# byte mottagna via UDP"
 msgid "Setup tunnels via VPN."
 msgstr ""
 
-#: src/include/gnunet_common.h:645 src/include/gnunet_common.h:652
-#: src/include/gnunet_common.h:662 src/include/gnunet_common.h:670
+#: src/include/gnunet_common.h:674 src/include/gnunet_common.h:681
+#: src/include/gnunet_common.h:691 src/include/gnunet_common.h:699
 #, fuzzy, c-format
 msgid "Assertion failed at %s:%d.\n"
 msgstr "\"%s\" misslyckades vid %s:%d med fel: \"%s\".\n"
 
-#: src/include/gnunet_common.h:682
+#: src/include/gnunet_common.h:711
 #, c-format
 msgid "External protocol violation detected at %s:%d.\n"
 msgstr ""
 
-#: src/include/gnunet_common.h:709 src/include/gnunet_common.h:718
+#: src/include/gnunet_common.h:738 src/include/gnunet_common.h:747
 #, 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 "# UPDATE requests received"
+#~ msgstr "# byte mottogs via TCP"
+
+#, fuzzy
+#~ msgid "Could not connect to cadet service\n"
+#~ msgstr "Kunde inte ansluta till gnunetd.\n"
+
+#, fuzzy
 #~ msgid "Failed to run upnp client for port %u\n"
 #~ msgstr "Misslyckades att initiera tjänsten \"%s\".\n"
 
diff --git a/po/vi.po b/po/vi.po
index 36ba909b4..d72459daa 100644
--- a/po/vi.po
+++ b/po/vi.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnunet 0.8.0a\n"
 "Report-Msgid-Bugs-To: address@hidden"
-"POT-Creation-Date: 2017-01-12 17:19+0100\n"
+"POT-Creation-Date: 2017-02-20 11:12-0600\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,231 +19,231 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 "X-Generator: LocFactoryEditor 1.7b3\n"
 
-#: src/arm/gnunet-arm.c:152
+#: src/arm/gnunet-arm.c:156
 #, 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:158
+#: src/arm/gnunet-arm.c:162
 #, 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:213 src/testbed/gnunet-service-testbed_peers.c:1139
+#: src/arm/gnunet-arm.c:222 src/testbed/gnunet-service-testbed_peers.c:1139
 msgid "Message was sent successfully"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:215
+#: src/arm/gnunet-arm.c:224
 #, 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:217 src/testbed/gnunet-service-testbed_peers.c:1143
+#: src/arm/gnunet-arm.c:226 src/testbed/gnunet-service-testbed_peers.c:1143
 #, fuzzy
 msgid "We disconnected from ARM before we could send a request"
 msgstr "# các yêu cầu lỗ hổng bị bỏ do trọng tải"
 
-#: src/arm/gnunet-arm.c:219 src/testbed/gnunet-service-testbed_peers.c:1145
+#: src/arm/gnunet-arm.c:228 src/testbed/gnunet-service-testbed_peers.c:1145
 msgid "ARM API is busy"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:221 src/testbed/gnunet-service-testbed_peers.c:1147
+#: src/arm/gnunet-arm.c:230 src/testbed/gnunet-service-testbed_peers.c:1147
 #, fuzzy
 msgid "Request timed out"
 msgstr "# các khoá phiên chạy được chấp nhận"
 
-#: src/arm/gnunet-arm.c:223 src/testbed/gnunet-service-testbed_peers.c:1149
+#: src/arm/gnunet-arm.c:232 src/testbed/gnunet-service-testbed_peers.c:1149
 #, fuzzy
 msgid "Unknown request status"
 msgstr "Không rõ người dùng « %s »\n"
 
-#: src/arm/gnunet-arm.c:239 src/testbed/gnunet-service-testbed_peers.c:1165
+#: src/arm/gnunet-arm.c:248 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:241 src/testbed/gnunet-service-testbed_peers.c:1167
+#: src/arm/gnunet-arm.c:250 src/testbed/gnunet-service-testbed_peers.c:1167
 #, c-format
 msgid "%s is starting"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:243 src/testbed/gnunet-service-testbed_peers.c:1169
+#: src/arm/gnunet-arm.c:252 src/testbed/gnunet-service-testbed_peers.c:1169
 #, c-format
 msgid "%s is stopping"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:245 src/testbed/gnunet-service-testbed_peers.c:1171
+#: src/arm/gnunet-arm.c:254 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:247 src/testbed/gnunet-service-testbed_peers.c:1173
+#: src/arm/gnunet-arm.c:256 src/testbed/gnunet-service-testbed_peers.c:1173
 #, c-format
 msgid "%s is stopping already"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:249 src/testbed/gnunet-service-testbed_peers.c:1175
+#: src/arm/gnunet-arm.c:258 src/testbed/gnunet-service-testbed_peers.c:1175
 #, c-format
 msgid "%s is started already"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:251 src/testbed/gnunet-service-testbed_peers.c:1177
+#: src/arm/gnunet-arm.c:260 src/testbed/gnunet-service-testbed_peers.c:1177
 #, c-format
 msgid "%s is stopped already"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:253 src/testbed/gnunet-service-testbed_peers.c:1179
+#: src/arm/gnunet-arm.c:262 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:255 src/testbed/gnunet-service-testbed_peers.c:1181
+#: src/arm/gnunet-arm.c:264 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:257
+#: src/arm/gnunet-arm.c:266
 #, 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:259 src/testbed/gnunet-service-testbed_peers.c:1185
+#: src/arm/gnunet-arm.c:268 src/testbed/gnunet-service-testbed_peers.c:1185
 #, c-format
 msgid "%.s Unknown result code."
 msgstr ""
 
-#: src/arm/gnunet-arm.c:291
+#: src/arm/gnunet-arm.c:300
 msgid "Fatal error initializing ARM API.\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:320 src/arm/gnunet-arm.c:329
+#: src/arm/gnunet-arm.c:328 src/arm/gnunet-arm.c:337
 #, 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:364
+#: src/arm/gnunet-arm.c:371
 #, 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:375
+#: src/arm/gnunet-arm.c:382
 #, 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:417
+#: src/arm/gnunet-arm.c:422
 #, fuzzy, c-format
-msgid "Failed to send a request to start the `%s' service: %%s\n"
+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:428
+#: src/arm/gnunet-arm.c:432
 #, 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:467
+#: src/arm/gnunet-arm.c:469
 #, 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:478
+#: src/arm/gnunet-arm.c:480
 #, 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:519
+#: src/arm/gnunet-arm.c:521
 #, 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:528
+#: src/arm/gnunet-arm.c:530
 #, 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:534
+#: src/arm/gnunet-arm.c:536
 #, fuzzy
 msgid "Running services:\n"
 msgstr "Đang nạp và khởi động dùng « %s ».\n"
 
-#: src/arm/gnunet-arm.c:622
+#: src/arm/gnunet-arm.c:624
 #, c-format
 msgid "Now only monitoring, press CTRL-C to stop.\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:654
+#: src/arm/gnunet-arm.c:656
 #, c-format
 msgid "Stopped %s.\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:657
+#: src/arm/gnunet-arm.c:659
 #, fuzzy, c-format
 msgid "Starting %s...\n"
 msgstr "Đang bắt đầu tài về « %s »\n"
 
-#: src/arm/gnunet-arm.c:660
+#: src/arm/gnunet-arm.c:662
 #, c-format
 msgid "Stopping %s...\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:674
+#: src/arm/gnunet-arm.c:676
 #, 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:756
+#: src/arm/gnunet-arm.c:774
 #, fuzzy
 msgid "stop all GNUnet services"
 msgstr "hủy cài đặt dịch vụ GNUnet"
 
-#: src/arm/gnunet-arm.c:758
+#: src/arm/gnunet-arm.c:776
 msgid "start a particular service"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:760
+#: src/arm/gnunet-arm.c:778
 msgid "stop a particular service"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:762
+#: src/arm/gnunet-arm.c:780
 #, fuzzy
 msgid "start all GNUnet default services"
 msgstr "hủy cài đặt dịch vụ GNUnet"
 
-#: src/arm/gnunet-arm.c:765
+#: src/arm/gnunet-arm.c:783
 #, fuzzy
 msgid "stop and start all GNUnet default services"
 msgstr "hủy cài đặt dịch vụ GNUnet"
 
-#: src/arm/gnunet-arm.c:768
+#: src/arm/gnunet-arm.c:786
 msgid "delete config file and directory on exit"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:771
+#: src/arm/gnunet-arm.c:789
 msgid "monitor ARM activities"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:773
+#: src/arm/gnunet-arm.c:791
 msgid "don't print status messages"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:776
+#: src/arm/gnunet-arm.c:794
 msgid "exit with error status if operation does not finish after DELAY"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:778
+#: src/arm/gnunet-arm.c:796
 #, fuzzy
 msgid "list currently running services"
 msgstr "Đang nạp và khởi động dùng « %s ».\n"
 
-#: src/arm/gnunet-arm.c:780
+#: src/arm/gnunet-arm.c:798
 msgid "don't let gnunet-service-arm inherit standard output"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:782
+#: src/arm/gnunet-arm.c:800
 msgid "don't let gnunet-service-arm inherit standard error"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:794
+#: src/arm/gnunet-arm.c:812
 msgid "Control services and the Automated Restart Manager (ARM)"
 msgstr ""
 
@@ -257,20 +257,21 @@ msgstr ""
 #: src/arm/gnunet-service-arm.c:393 src/arm/gnunet-service-arm.c:399
 #: src/transport/plugin_transport_tcp.c:652
 #: src/transport/plugin_transport_tcp.c:658
-#: src/transport/plugin_transport_tcp.c:3309 src/util/service.c:584
-#: src/util/service.c:590 src/util/service_new.c:637 src/util/service_new.c:643
+#: src/transport/plugin_transport_tcp.c:3337 src/util/service.c:584
+#: src/util/service.c:590 src/util/service_new.c:637
+#: src/util/service_new.c:643
 #, c-format
 msgid "Require valid port number for service `%s' in configuration!\n"
 msgstr ""
 
 #: src/arm/gnunet-service-arm.c:430 src/transport/plugin_transport_tcp.c:689
-#: src/util/client.c:464 src/util/service.c:621 src/util/service_new.c:682
+#: src/util/client.c:466 src/util/service.c:621 src/util/service_new.c:682
 #, c-format
 msgid "UNIXPATH `%s' too long, maximum length is %llu\n"
 msgstr ""
 
 #: src/arm/gnunet-service-arm.c:434 src/transport/plugin_transport_tcp.c:693
-#: src/util/client.c:469 src/util/service.c:625 src/util/service_new.c:687
+#: src/util/client.c:471 src/util/service.c:625 src/util/service_new.c:687
 #, fuzzy, c-format
 msgid "Using `%s' instead\n"
 msgstr "%s: tùy chọn « %s » là mơ hồ\n"
@@ -393,11 +394,13 @@ msgid ""
 "%llu\n"
 msgstr ""
 
-#: src/ats/gnunet-ats-solver-eval.c:3293 src/ats-tests/gnunet-solver-eval.c:935
+#: 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:938
+#: 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 ""
@@ -653,95 +656,110 @@ msgstr ""
 msgid "Print information about ATS state"
 msgstr "In ra thông tin về các đồng đẳng GNUnet."
 
-#: src/auction/gnunet-auction-create.c:69
+#: src/auction/gnunet-auction-create.c:160
 msgid "description of the item to be sold"
 msgstr ""
 
-#: src/auction/gnunet-auction-create.c:72
+#: src/auction/gnunet-auction-create.c:163
 msgid "mapping of possible prices"
 msgstr ""
 
-#: src/auction/gnunet-auction-create.c:75
+#: src/auction/gnunet-auction-create.c:166
 msgid "max duration per round"
 msgstr ""
 
-#: src/auction/gnunet-auction-create.c:78
+#: src/auction/gnunet-auction-create.c:169
 msgid "duration until auction starts"
 msgstr ""
 
-#: src/auction/gnunet-auction-create.c:81
-msgid "number of items to sell, 0 for first price auction"
+#: src/auction/gnunet-auction-create.c:172
+msgid ""
+"number of items to sell\n"
+"0 for first price auction\n"
+">0 for vickrey/M+1st price auction"
 msgstr ""
 
-#: src/auction/gnunet-auction-create.c:84
+#: src/auction/gnunet-auction-create.c:177
 #, fuzzy
 msgid "public auction outcome"
 msgstr "Ứng dụng bị hủy bỏ."
 
-#: src/auction/gnunet-auction-create.c:94 src/auction/gnunet-auction-info.c:76
-#: src/auction/gnunet-auction-join.c:76
+#: src/auction/gnunet-auction-create.c:180
+msgid "keep running in foreground until auction completes"
+msgstr ""
+
+#: src/auction/gnunet-auction-create.c:190
+msgid "create a new auction and start listening for bidders"
+msgstr ""
+
+#: src/auction/gnunet-auction-info.c:76 src/auction/gnunet-auction-join.c:76
 #: src/conversation/gnunet-conversation-test.c:243
 #: src/revocation/gnunet-revocation.c:550 src/template/gnunet-template.c:76
 msgid "help text"
 msgstr ""
 
-#: 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:787
+#: src/cadet/gnunet-cadet.c:668
 #, 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:825
+#: src/cadet/gnunet-cadet.c:706
 #, fuzzy, c-format
 msgid "Invalid tunnel owner `%s'\n"
 msgstr "Địa chỉ IP định dạng sai: %s\n"
 
-#: src/cadet/gnunet-cadet.c:892
+#: src/cadet/gnunet-cadet.c:779
 msgid "You must NOT give a TARGET when using 'request all' options\n"
 msgstr ""
 
-#: src/cadet/gnunet-cadet.c:982
+#: src/cadet/gnunet-cadet.c:870
+#, fuzzy, c-format
+msgid "Invalid target `%s'\n"
+msgstr "Đối số không hợp lệ cho « %s ».\n"
+
+#: src/cadet/gnunet-cadet.c:907
+#, fuzzy
+msgid "No action requested\n"
+msgstr "Thu thập bị dừng.\n"
+
+#: src/cadet/gnunet-cadet.c:929
 #, 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:985
+#: src/cadet/gnunet-cadet.c:932
 msgid "activate echo mode"
 msgstr ""
 
-#: src/cadet/gnunet-cadet.c:988
+#: src/cadet/gnunet-cadet.c:935
 msgid "dump debug information to STDERR"
 msgstr ""
 
-#: src/cadet/gnunet-cadet.c:994
+#: src/cadet/gnunet-cadet.c:938
 msgid "port to listen to"
 msgstr ""
 
-#: src/cadet/gnunet-cadet.c:997
+#: src/cadet/gnunet-cadet.c:941
 #, 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:1000
+#: src/cadet/gnunet-cadet.c:944
 #, fuzzy
 msgid "provide information about all peers"
 msgstr "In ra thông tin về các đồng đẳng GNUnet."
 
-#: src/cadet/gnunet-cadet.c:1003
+#: src/cadet/gnunet-cadet.c:947
 #, 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:1006
+#: src/cadet/gnunet-cadet.c:950
 #, 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:686
+#: src/cadet/gnunet-service-cadet_peer.c:687
 msgid "Wrong CORE service\n"
 msgstr ""
 
@@ -1299,12 +1317,12 @@ msgstr "# các byte nhiễu được nhận"
 msgid "# messages discarded (session disconnected)"
 msgstr "# các thông báo được chắp liền"
 
-#: src/core/gnunet-service-core.c:928
+#: src/core/gnunet-service-core.c:937
 #, 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
+#: src/core/gnunet-service-core.c:958
 #, fuzzy, c-format
 msgid "Core service of `%s' ready.\n"
 msgstr "Không gian tên « %s » có đánh giá %d.\n"
@@ -1429,36 +1447,36 @@ msgstr ""
 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:1554
-#: src/core/gnunet-service-core_kx.c:1580
+#: src/core/gnunet-service-core_kx.c:1557
+#: src/core/gnunet-service-core_kx.c:1583
 #, fuzzy
 msgid "# bytes dropped (duplicates)"
 msgstr "# các byte loại bỏ bởi UDP (đi ra)"
 
-#: src/core/gnunet-service-core_kx.c:1567
+#: src/core/gnunet-service-core_kx.c:1570
 #, 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:1609
+#: src/core/gnunet-service-core_kx.c:1612
 #, 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:1617
+#: src/core/gnunet-service-core_kx.c:1620
 #, fuzzy
 msgid "# bytes of payload decrypted"
 msgstr "# các byte đã giải mã"
 
-#: src/core/gnunet-service-core_kx.c:1674
+#: src/core/gnunet-service-core_kx.c:1681
 #, fuzzy
 msgid "# PAYLOAD dropped (out of order)"
 msgstr "# các byte loại bỏ bởi UDP (đi ra)"
 
-#: src/core/gnunet-service-core_sessions.c: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/core/gnunet-service-core_sessions.c:266
+#: src/core/gnunet-service-core_sessions.c:356
+#: src/dht/gnunet-service-dht_neighbours.c:732
+#: src/dht/gnunet-service-dht_neighbours.c:794
 #: 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
@@ -1468,28 +1486,28 @@ msgstr "# các byte loại bỏ bởi UDP (đi ra)"
 msgid "# peers connected"
 msgstr "# của các đồng đẳng đã kết nối"
 
-#: src/core/gnunet-service-core_sessions.c:287
+#: src/core/gnunet-service-core_sessions.c:302
 #, 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:407
+#: src/core/gnunet-service-core_sessions.c:422
 #, fuzzy
 msgid "# outdated typemap confirmations received"
 msgstr "Lỗi lưu cấu hình."
 
-#: src/core/gnunet-service-core_sessions.c:418
+#: src/core/gnunet-service-core_sessions.c:439
 #, fuzzy
 msgid "# valid typemap confirmations received"
 msgstr "Lỗi lưu cấu hình."
 
 #: src/core/gnunet-service-core_typemap.c:169
-#: src/core/gnunet-service-core_typemap.c:180
+#: src/core/gnunet-service-core_typemap.c:181
 #, fuzzy
 msgid "# type maps received"
 msgstr "# các thông báo phát hiện dht được nhận"
 
-#: src/core/gnunet-service-core_typemap.c:210
+#: src/core/gnunet-service-core_typemap.c:212
 msgid "# updates to my type map"
 msgstr ""
 
@@ -1533,7 +1551,7 @@ msgstr "# tổng số yêu cầu lỗ hổng được nhận"
 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:467
+#: src/datacache/plugin_datacache_heap.c:466
 #, fuzzy
 msgid "Heap datacache running\n"
 msgstr "kho dữ liệu sqlite"
@@ -1555,7 +1573,7 @@ msgstr "kho dữ liệu sqlite"
 #: 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:691 src/include/gnunet_common.h:700
+#: src/include/gnunet_common.h:720 src/include/gnunet_common.h:729
 #: src/scalarproduct/scalarproduct.h:35
 #, c-format
 msgid "`%s' failed at %s:%d with error: %s\n"
@@ -1616,25 +1634,20 @@ msgstr "# các yêu cầu dht được định tuyến"
 msgid "# RELEASE RESERVE requests executed"
 msgstr ""
 
-#: 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:1271
+#: src/datastore/datastore_api.c:1205
 #, fuzzy
 msgid "# REMOVE requests executed"
 msgstr "# các yêu cầu dht được định tuyến"
 
-#: src/datastore/datastore_api.c:1331
+#: src/datastore/datastore_api.c:1265
 msgid "# GET REPLICATION requests executed"
 msgstr ""
 
-#: src/datastore/datastore_api.c:1397
+#: src/datastore/datastore_api.c:1331
 msgid "# GET ZERO ANONYMITY requests executed"
 msgstr ""
 
-#: src/datastore/datastore_api.c:1477
+#: src/datastore/datastore_api.c:1411
 #, fuzzy
 msgid "# GET requests executed"
 msgstr "# các yêu cầu dht được định tuyến"
@@ -1700,7 +1713,7 @@ msgstr ""
 #: 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
+#: src/datastore/gnunet-service-datastore.c:1619
 msgid "# reserved"
 msgstr ""
 
@@ -1728,98 +1741,93 @@ msgstr "# các yêu cầu get (lấy) dht được nhận"
 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: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:1146
+#: src/datastore/gnunet-service-datastore.c:1097
 #, 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:1179
+#: src/datastore/gnunet-service-datastore.c:1130
 #, 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:1226
+#: src/datastore/gnunet-service-datastore.c:1177
 msgid "Content not found"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1235
+#: src/datastore/gnunet-service-datastore.c:1186
 msgid "# bytes removed (explicit request)"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1282
+#: src/datastore/gnunet-service-datastore.c:1233
 #, 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:1336
+#: src/datastore/gnunet-service-datastore.c:1287
 #, c-format
 msgid ""
 "Datastore payload must have been inaccurate (%lld < %lld). Recomputing it.\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1342
-#: src/datastore/gnunet-service-datastore.c:1517
+#: src/datastore/gnunet-service-datastore.c:1293
+#: src/datastore/gnunet-service-datastore.c:1468
 #, c-format
 msgid "New payload: %lld\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1396
+#: src/datastore/gnunet-service-datastore.c:1347
 #, c-format
 msgid "Loading `%s' datastore plugin\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1408
+#: src/datastore/gnunet-service-datastore.c:1359
 #, 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:1468
+#: src/datastore/gnunet-service-datastore.c:1419
 msgid "Bloomfilter construction complete.\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1524
+#: src/datastore/gnunet-service-datastore.c:1475
 msgid "Rebuilding bloomfilter.  Please be patient.\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1535
+#: src/datastore/gnunet-service-datastore.c:1486
 msgid "Plugin does not support get_keys function. Please fix!\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1705
+#: src/datastore/gnunet-service-datastore.c:1656
 #, 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:1721
+#: src/datastore/gnunet-service-datastore.c:1672
 msgid "# quota"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1726
+#: src/datastore/gnunet-service-datastore.c:1677
 msgid "# cache size"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1742
+#: src/datastore/gnunet-service-datastore.c:1693
 #, c-format
 msgid "Could not use specified filename `%s' for bloomfilter.\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1760
-#: src/datastore/gnunet-service-datastore.c:1776
+#: src/datastore/gnunet-service-datastore.c:1711
+#: src/datastore/gnunet-service-datastore.c:1727
 #, 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:1808
+#: src/datastore/gnunet-service-datastore.c:1759
 #, fuzzy
 msgid "Failed to initialize bloomfilter.\n"
 msgstr "Lỗi sơ khởi dịch vụ « %s ».\n"
 
-#: src/datastore/plugin_datastore_heap.c:826
+#: src/datastore/plugin_datastore_heap.c:824
 #, fuzzy
 msgid "Heap database running\n"
 msgstr "kho dữ liệu sqlite"
@@ -1906,56 +1914,56 @@ msgstr "kho dữ liệu sqlite"
 msgid "Template database running\n"
 msgstr ""
 
-#: src/dht/gnunet-dht-get.c:155
+#: src/dht/gnunet-dht-get.c:157
 #, c-format
 msgid ""
 "Result %d, type %d:\n"
 "%.*s\n"
 msgstr ""
 
-#: src/dht/gnunet-dht-get.c:181
+#: src/dht/gnunet-dht-get.c:204
 msgid "Must provide key for DHT GET!\n"
 msgstr ""
 
-#: src/dht/gnunet-dht-get.c:187 src/dht/gnunet-dht-monitor.c:248
+#: src/dht/gnunet-dht-get.c:210 src/dht/gnunet-dht-monitor.c:248
 #, fuzzy
 msgid "Failed to connect to DHT service!\n"
 msgstr "Lỗi kết nối đến gnunetd.\n"
 
-#: src/dht/gnunet-dht-get.c:195
+#: src/dht/gnunet-dht-get.c:218
 msgid "Issueing DHT GET with key"
 msgstr ""
 
-#: src/dht/gnunet-dht-get.c:212 src/dht/gnunet-dht-monitor.c:289
-#: src/dht/gnunet-dht-put.c:198
+#: src/dht/gnunet-dht-get.c:235 src/dht/gnunet-dht-monitor.c:289
+#: src/dht/gnunet-dht-put.c:207
 msgid "the query key"
 msgstr ""
 
-#: src/dht/gnunet-dht-get.c:215
+#: src/dht/gnunet-dht-get.c:238
 msgid "how many parallel requests (replicas) to create"
 msgstr ""
 
-#: src/dht/gnunet-dht-get.c:218 src/dht/gnunet-dht-monitor.c:292
+#: src/dht/gnunet-dht-get.c:241 src/dht/gnunet-dht-monitor.c:292
 msgid "the type of data to look for"
 msgstr ""
 
-#: src/dht/gnunet-dht-get.c:221
+#: src/dht/gnunet-dht-get.c:244
 msgid "how long to execute this query before giving up?"
 msgstr ""
 
-#: src/dht/gnunet-dht-get.c:224 src/dht/gnunet-dht-put.c:201
+#: src/dht/gnunet-dht-get.c:247 src/dht/gnunet-dht-put.c:210
 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:210 src/fs/gnunet-auto-share.c:780
+#: src/dht/gnunet-dht-get.c:250 src/dht/gnunet-dht-monitor.c:298
+#: src/dht/gnunet-dht-put.c:222 src/fs/gnunet-auto-share.c:780
 #: src/fs/gnunet-download.c:327 src/fs/gnunet-publish.c:951
 #: src/fs/gnunet-search.c:322 src/fs/gnunet-unindex.c:167
 #: src/nse/gnunet-nse-profiler.c:855
 msgid "be verbose (print progress information)"
 msgstr ""
 
-#: src/dht/gnunet-dht-get.c:248
+#: src/dht/gnunet-dht-get.c:271
 msgid "Issue a GET request to the GNUnet DHT, prints results."
 msgstr ""
 
@@ -1967,7 +1975,8 @@ msgstr ""
 msgid "Prints all packets that go through the DHT."
 msgstr ""
 
-#: src/dht/gnunet_dht_profiler.c:1161 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"
@@ -2013,67 +2022,71 @@ msgstr ""
 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:115
+#: src/dht/gnunet-dht-put.c:120
 #, fuzzy
 msgid "PUT request sent with key"
 msgstr "# độ tin cậy được tiêu phí"
 
-#: src/dht/gnunet-dht-put.c:118
+#: src/dht/gnunet-dht-put.c:123
 msgid "Timeout sending PUT request!\n"
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:121
+#: src/dht/gnunet-dht-put.c:126
 #, fuzzy
 msgid "PUT request not confirmed!\n"
 msgstr "# độ tin cậy được tiêu phí"
 
-#: src/dht/gnunet-dht-put.c:151
+#: src/dht/gnunet-dht-put.c:157
 msgid "Must provide KEY and DATA for DHT put!\n"
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:158
+#: src/dht/gnunet-dht-put.c:164
 #, fuzzy, c-format
 msgid "Could not connect to %s service!\n"
 msgstr "Không thể kết nối tới %s:%u: %s\n"
 
-#: src/dht/gnunet-dht-put.c:172
+#: src/dht/gnunet-dht-put.c:175
 #, c-format
 msgid "Issuing put request for `%s' with data `%s'!\n"
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:192
+#: src/dht/gnunet-dht-put.c:201
 msgid "the data to insert under the key"
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:195
+#: src/dht/gnunet-dht-put.c:204
 msgid "how long to store this entry in the dht (in seconds)"
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:204
+#: src/dht/gnunet-dht-put.c:213
 msgid "how many replicas to create"
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:207
+#: src/dht/gnunet-dht-put.c:216
+msgid "use DHT's record route option"
+msgstr ""
+
+#: src/dht/gnunet-dht-put.c:219
 msgid "the type to insert data as"
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:232
+#: src/dht/gnunet-dht-put.c:247
 msgid "Issue a PUT request to the GNUnet DHT insert DATA under KEY."
 msgstr ""
 
-#: src/dht/gnunet-service-dht_clients.c:370
+#: src/dht/gnunet-service-dht_clients.c:369
 #: src/dht/gnunet-service-wdht_clients.c:864
 #, fuzzy
 msgid "# GET requests from clients injected"
 msgstr "# các yêu cầu get (lấy) dht được nhận"
 
-#: src/dht/gnunet-service-dht_clients.c:481
+#: src/dht/gnunet-service-dht_clients.c:482
 #: 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:620
+#: src/dht/gnunet-service-dht_clients.c:621
 #: src/dht/gnunet-service-wdht_clients.c:1011
 #, fuzzy
 msgid "# GET requests received from clients"
@@ -2095,18 +2108,18 @@ msgstr ""
 msgid "# Duplicate REPLIES to CLIENT request dropped"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_clients.c:1094
+#: src/dht/gnunet-service-dht_clients.c:1093
 #: src/dht/gnunet-service-wdht_clients.c:566
 #, c-format
 msgid "Unsupported block type (%u) in request!\n"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_clients.c:1101
+#: src/dht/gnunet-service-dht_clients.c:1100
 #: src/dht/gnunet-service-wdht_clients.c:589
 msgid "# RESULTS queued for clients"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_clients.c:1179
+#: src/dht/gnunet-service-dht_clients.c:1178
 #: src/dht/gnunet-service-wdht_clients.c:643
 #: src/dht/gnunet-service-wdht_clients.c:693
 msgid "# REPLIES ignored for CLIENTS (no match)"
@@ -2121,75 +2134,76 @@ msgstr "# các byte kiểu %d được nhận"
 msgid "# ITEMS stored in datacache"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_datacache.c:199
+#: src/dht/gnunet-service-dht_datacache.c:198
 msgid "# Good RESULTS found in datacache"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_datacache.c:211
+#: src/dht/gnunet-service-dht_datacache.c:210
 msgid "# Duplicate RESULTS found in datacache"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_datacache.c:217
+#: src/dht/gnunet-service-dht_datacache.c:216
 msgid "# Invalid RESULTS found in datacache"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_datacache.c:223
+#: src/dht/gnunet-service-dht_datacache.c:222
 msgid "# Irrelevant RESULTS found in datacache"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_datacache.c:235
+#: src/dht/gnunet-service-dht_datacache.c:234
 msgid "# Unsupported RESULTS found in datacache"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_datacache.c:239
+#: src/dht/gnunet-service-dht_datacache.c:238
 #, c-format
 msgid "Unsupported block type (%u) in local response!\n"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_datacache.c:276
+#: src/dht/gnunet-service-dht_datacache.c:273
 #, 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:86
+#: src/dht/gnunet-service-xdht_hello.c:82
 #, fuzzy
 msgid "# HELLOs obtained from peerinfo"
 msgstr "Nhận được thông báo « %s » sai từ đồng đẳng « %s ».\n"
 
-#: src/dht/gnunet-service-dht_neighbours.c:685
+#: src/dht/gnunet-service-dht_neighbours.c:671
 #, fuzzy
 msgid "# FIND PEER messages initiated"
 msgstr "# các thông báo PING được tạo"
 
-#: src/dht/gnunet-service-dht_neighbours.c:851
+#: src/dht/gnunet-service-dht_neighbours.c:842
 #, 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:1054
-#: src/dht/gnunet-service-dht_neighbours.c:1091
+#: src/dht/gnunet-service-dht_neighbours.c:1045
+#: src/dht/gnunet-service-dht_neighbours.c:1082
 msgid "# Peers excluded from routing due to Bloomfilter"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1071
-#: src/dht/gnunet-service-dht_neighbours.c:1107
+#: src/dht/gnunet-service-dht_neighbours.c:1062
+#: src/dht/gnunet-service-dht_neighbours.c:1098
 #, 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:1255
+#: src/dht/gnunet-service-dht_neighbours.c:1246
 #, fuzzy
 msgid "# PUT requests routed"
 msgstr "# các yêu cầu dht được định tuyến"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1288
+#: src/dht/gnunet-service-dht_neighbours.c:1279
 #, 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:1299
-#: src/dht/gnunet-service-dht_neighbours.c:1427
-#: src/dht/gnunet-service-dht_neighbours.c:1532
+#: src/dht/gnunet-service-dht_neighbours.c:1290
+#: src/dht/gnunet-service-dht_neighbours.c:1430
+#: src/dht/gnunet-service-dht_neighbours.c:1533
 #: src/dht/gnunet-service-xdht_neighbours.c:946
 #: src/dht/gnunet-service-xdht_neighbours.c:1007
 #: src/dht/gnunet-service-xdht_neighbours.c:1047
@@ -2203,66 +2217,66 @@ msgstr "# các thông báo PING được tạo"
 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:1383
+#: src/dht/gnunet-service-dht_neighbours.c:1375
 #, fuzzy
 msgid "# GET requests routed"
 msgstr "# các yêu cầu dht được định tuyến"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1415
+#: src/dht/gnunet-service-dht_neighbours.c:1418
 #, 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:1547
+#: src/dht/gnunet-service-dht_neighbours.c:1548
 #, 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:1646
+#: src/dht/gnunet-service-dht_neighbours.c:1647
 #, 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:1650
+#: src/dht/gnunet-service-dht_neighbours.c:1651
 #, 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:1858
+#: src/dht/gnunet-service-dht_neighbours.c:1869
 #, 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:1866
+#: src/dht/gnunet-service-dht_neighbours.c:1877
 msgid "# FIND PEER requests ignored due to lack of HELLO"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:2022
+#: src/dht/gnunet-service-dht_neighbours.c:2029
 #, 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:2026
+#: src/dht/gnunet-service-dht_neighbours.c:2033
 #, 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:2101
+#: src/dht/gnunet-service-dht_neighbours.c:2104
 #, 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:2124
+#: src/dht/gnunet-service-dht_neighbours.c:2125
 #, 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:2226
+#: src/dht/gnunet-service-dht_neighbours.c:2223
 #, fuzzy
 msgid "# P2P RESULTS received"
 msgstr "# Tín hiệu HTTP PUT được nhận"
 
-#: src/dht/gnunet-service-dht_neighbours.c:2230
+#: src/dht/gnunet-service-dht_neighbours.c:2227
 #, fuzzy
 msgid "# P2P RESULT bytes received"
 msgstr "# Tín hiệu HTTP PUT được nhận"
@@ -2272,27 +2286,27 @@ msgstr "# Tín hiệu HTTP PUT được nhận"
 msgid "# Network size estimates received"
 msgstr "# các yêu cầu get (lấy) dht được nhận"
 
-#: src/dht/gnunet-service-dht_routing.c:220
+#: src/dht/gnunet-service-dht_routing.c:218
 msgid "# Good REPLIES matched against routing table"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_routing.c:229
+#: src/dht/gnunet-service-dht_routing.c:232
 msgid "# Duplicate REPLIES matched against routing table"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_routing.c:235
+#: src/dht/gnunet-service-dht_routing.c:238
 msgid "# Invalid REPLIES matched against routing table"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_routing.c:241
+#: src/dht/gnunet-service-dht_routing.c:244
 msgid "# Irrelevant REPLIES matched against routing table"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_routing.c:253
+#: src/dht/gnunet-service-dht_routing.c:256
 msgid "# Unsupported REPLIES matched against routing table"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_routing.c:329
+#: src/dht/gnunet-service-dht_routing.c:335
 msgid "# Entries removed from routing table"
 msgstr ""
 
@@ -2300,7 +2314,7 @@ msgstr ""
 msgid "# Entries added to routing table"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_routing.c:429
+#: src/dht/gnunet-service-dht_routing.c:433
 #, fuzzy
 msgid "# DHT requests combined"
 msgstr "# các yêu cầu get (lấy) dht được nhận"
@@ -2413,16 +2427,16 @@ msgid ""
 "SUPU %s, %s, %d, trail->prev_hop = %s"
 msgstr ""
 
-#: src/dht/plugin_block_dht.c:144
+#: src/dht/plugin_block_dht.c:167
 #, fuzzy, c-format
 msgid "Block not of type %u\n"
 msgstr "Không biết truyền tải nào kiểu %d.\n"
 
-#: src/dht/plugin_block_dht.c:151
+#: src/dht/plugin_block_dht.c:174
 msgid "Size mismatch for block\n"
 msgstr ""
 
-#: src/dht/plugin_block_dht.c:161
+#: src/dht/plugin_block_dht.c:184
 #, c-format
 msgid "Block of type %u is malformed\n"
 msgstr ""
@@ -2528,7 +2542,7 @@ msgstr ""
 msgid "# DNS requests received via TUN interface"
 msgstr "# các đáp ứng lỗ hổng được gửi cho trình/máy khách"
 
-#: src/dns/gnunet-service-dns.c:1078 src/exit/gnunet-daemon-exit.c:3643
+#: src/dns/gnunet-service-dns.c:1078 src/exit/gnunet-daemon-exit.c:3642
 #, 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"
@@ -2547,214 +2561,214 @@ msgstr ""
 msgid "Print information about DV state"
 msgstr "In ra thông tin về các đồng đẳng GNUnet."
 
-#: src/exit/gnunet-daemon-exit.c:805 src/exit/gnunet-daemon-exit.c:3109
+#: src/exit/gnunet-daemon-exit.c:804 src/exit/gnunet-daemon-exit.c:3108
 #, 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
+#: src/exit/gnunet-daemon-exit.c:860
 #, c-format
 msgid "Got duplicate service records for `%s:%u'\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:914
+#: src/exit/gnunet-daemon-exit.c:913
 #, fuzzy
 msgid "# Bytes transmitted via cadet channels"
 msgstr "# các byte được gửi"
 
-#: 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
+#: src/exit/gnunet-daemon-exit.c:1032 src/exit/gnunet-daemon-exit.c:2492
+#: src/exit/gnunet-daemon-exit.c:2745 src/vpn/gnunet-service-vpn.c:1454
+#: src/vpn/gnunet-service-vpn.c:1845 src/vpn/gnunet-service-vpn.c:2008
 msgid "# ICMPv4 packets dropped (type not allowed)"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c: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
+#: src/exit/gnunet-daemon-exit.c:1069 src/exit/gnunet-daemon-exit.c:2551
+#: src/exit/gnunet-daemon-exit.c:2804 src/vpn/gnunet-service-vpn.c:1510
+#: src/vpn/gnunet-service-vpn.c:1904 src/vpn/gnunet-service-vpn.c:2041
 msgid "# ICMPv6 packets dropped (type not allowed)"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:1118
+#: src/exit/gnunet-daemon-exit.c:1117
 msgid "# ICMP packets dropped (not allowed)"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:1126
+#: src/exit/gnunet-daemon-exit.c:1125
 msgid "ICMP Packet dropped, have no matching connection information\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:1203
+#: src/exit/gnunet-daemon-exit.c:1202
 msgid "UDP Packet dropped, have no matching connection information\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:1278
+#: src/exit/gnunet-daemon-exit.c:1277
 msgid "TCP Packet dropped, have no matching connection information\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:1331
+#: src/exit/gnunet-daemon-exit.c:1330
 #, fuzzy
 msgid "# Packets received from TUN"
 msgstr "# các byte đã nhận qua HTTP"
 
-#: src/exit/gnunet-daemon-exit.c:1345
+#: src/exit/gnunet-daemon-exit.c:1344
 #, fuzzy
 msgid "# Bytes received from TUN"
 msgstr "# các byte đã nhận qua HTTP"
 
-#: src/exit/gnunet-daemon-exit.c:1371
+#: src/exit/gnunet-daemon-exit.c:1370
 msgid "IPv4 packet options received.  Ignored.\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:1398
+#: src/exit/gnunet-daemon-exit.c:1397
 #, c-format
 msgid "IPv4 packet with unsupported next header %u received.  Ignored.\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:1444
+#: src/exit/gnunet-daemon-exit.c:1443
 #, c-format
 msgid "IPv6 packet with unsupported next header %d received.  Ignored.\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:1452
+#: src/exit/gnunet-daemon-exit.c:1451
 #, c-format
 msgid "Packet from unknown protocol %u received.  Ignored.\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:1853
+#: src/exit/gnunet-daemon-exit.c:1852
 #, fuzzy
 msgid "# TCP packets sent via TUN"
 msgstr "# các byte đã gửi qua UDP"
 
-#: src/exit/gnunet-daemon-exit.c:1977
+#: src/exit/gnunet-daemon-exit.c:1976
 #, 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: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
+#: src/exit/gnunet-daemon-exit.c:1980 src/exit/gnunet-daemon-exit.c:2059
+#: src/exit/gnunet-daemon-exit.c:2166 src/exit/gnunet-daemon-exit.c:2416
+#: src/exit/gnunet-daemon-exit.c:2666 src/exit/gnunet-daemon-exit.c:2953
+#: src/exit/gnunet-daemon-exit.c:3056
 #, fuzzy
 msgid "# Bytes received from CADET"
 msgstr "# các byte đã nhận qua HTTP"
 
-#: src/exit/gnunet-daemon-exit.c:2063
+#: src/exit/gnunet-daemon-exit.c:2062
 #, fuzzy
 msgid "# TCP IP-exit creation requests received via cadet"
 msgstr "# các yêu cầu danh sách máy được nhận"
 
-#: src/exit/gnunet-daemon-exit.c:2170
+#: src/exit/gnunet-daemon-exit.c:2169
 #, 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:2184
+#: src/exit/gnunet-daemon-exit.c:2183
 #, fuzzy
 msgid "# TCP DATA requests dropped (no session)"
 msgstr "# các yêu cầu lỗ hổng bị bỏ do trọng tải"
 
-#: src/exit/gnunet-daemon-exit.c:2246
+#: src/exit/gnunet-daemon-exit.c:2245
 #, fuzzy
 msgid "# ICMP packets sent via TUN"
 msgstr "# các byte đã gửi qua UDP"
 
-#: src/exit/gnunet-daemon-exit.c:2420
+#: src/exit/gnunet-daemon-exit.c:2419
 #, 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:2670
+#: src/exit/gnunet-daemon-exit.c:2669
 #, 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:2731 src/vpn/gnunet-service-vpn.c:1445
-#: src/vpn/gnunet-service-vpn.c:2003
+#: src/exit/gnunet-daemon-exit.c:2730 src/vpn/gnunet-service-vpn.c:1444
+#: src/vpn/gnunet-service-vpn.c:2002
 msgid "# ICMPv4 packets dropped (impossible PT to v6)"
 msgstr ""
 
-#: 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
+#: src/exit/gnunet-daemon-exit.c:2789 src/vpn/gnunet-service-vpn.c:1480
+#: src/vpn/gnunet-service-vpn.c:1492 src/vpn/gnunet-service-vpn.c:1892
 msgid "# ICMPv6 packets dropped (impossible PT to v4)"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:2841
+#: src/exit/gnunet-daemon-exit.c:2840
 #, fuzzy
 msgid "# UDP packets sent via TUN"
 msgstr "# các byte đã gửi qua UDP"
 
-#: src/exit/gnunet-daemon-exit.c:2957
+#: src/exit/gnunet-daemon-exit.c:2956
 #, 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:3060
+#: src/exit/gnunet-daemon-exit.c:3059
 #, 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:3327 src/exit/gnunet-daemon-exit.c:3337
+#: src/exit/gnunet-daemon-exit.c:3326 src/exit/gnunet-daemon-exit.c:3336
 #, fuzzy, c-format
 msgid "Option `%s' for domain `%s' is not formatted correctly!\n"
 msgstr "Bị từ chối đặt tùy chọn « %s » trong phần « %s » thành « %s ».\n"
 
-#: src/exit/gnunet-daemon-exit.c:3351 src/exit/gnunet-daemon-exit.c:3359
+#: src/exit/gnunet-daemon-exit.c:3350 src/exit/gnunet-daemon-exit.c:3358
 #, c-format
 msgid "`%s' is not a valid port number (for domain `%s')!"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3400
+#: src/exit/gnunet-daemon-exit.c:3399
 #, c-format
 msgid "No addresses found for hostname `%s' of service `%s'!\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3414 src/exit/gnunet-daemon-exit.c:3427
+#: src/exit/gnunet-daemon-exit.c:3413 src/exit/gnunet-daemon-exit.c:3426
 #, c-format
 msgid "Service `%s' configured for IPv4, but IPv4 is disabled!\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3439
+#: src/exit/gnunet-daemon-exit.c:3438
 #, c-format
 msgid "No IP addresses found for hostname `%s' of service `%s'!\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3584
+#: src/exit/gnunet-daemon-exit.c:3583
 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:3592
+#: src/exit/gnunet-daemon-exit.c:3591
 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:3599
+#: src/exit/gnunet-daemon-exit.c:3598
 msgid ""
 "Cannot enable IPv4 exit but disable IPv4 on TUN interface, will use "
 "ENABLE_IPv4=YES\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3605
+#: src/exit/gnunet-daemon-exit.c:3604
 msgid ""
 "Cannot enable IPv6 exit but disable IPv6 on TUN interface, will use "
 "ENABLE_IPv6=YES\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3765
+#: src/exit/gnunet-daemon-exit.c:3764
 msgid "Must be a number"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3872
+#: src/exit/gnunet-daemon-exit.c:3871
 #, 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
+#: src/exit/gnunet-daemon-exit.c:3883 src/pt/gnunet-daemon-pt.c:1279
 msgid "No useful service enabled.  Exiting.\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:4029
+#: src/exit/gnunet-daemon-exit.c:4028
 msgid "Daemon to run to provide an IP exit node for the VPN"
 msgstr ""
 
@@ -2800,16 +2814,16 @@ msgstr "# các thông báo bị tế phân"
 msgid "# total size of fragmented messages"
 msgstr ""
 
-#: src/fragmentation/fragmentation.c:455
+#: src/fragmentation/fragmentation.c:456
 #, fuzzy
 msgid "# fragment acknowledgements received"
 msgstr "# Các quảng cáo đồng đẳng được nhận"
 
-#: src/fragmentation/fragmentation.c:462
+#: src/fragmentation/fragmentation.c:463
 msgid "# bits removed from fragmentation ACKs"
 msgstr ""
 
-#: src/fragmentation/fragmentation.c:486
+#: src/fragmentation/fragmentation.c:487
 #, fuzzy
 msgid "# fragmentation transmissions completed"
 msgstr "# các sự truyền PONG bị lỗi"
@@ -2839,46 +2853,46 @@ msgstr "Lỗi mở tập tin ghi sự kiện « %s »: %s\n"
 msgid "Failure while resuming publishing operation `%s': %s\n"
 msgstr ""
 
-#: src/fs/fs_api.c:1660
+#: src/fs/fs_api.c:1662
 #, 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:2318
+#: src/fs/fs_api.c:2322
 #, c-format
 msgid "Failure while resuming unindexing operation `%s': %s\n"
 msgstr ""
 
-#: src/fs/fs_api.c:2328
+#: src/fs/fs_api.c:2332
 #, 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:2456 src/fs/fs_api.c:2703
+#: src/fs/fs_api.c:2460 src/fs/fs_api.c:2706
 #, 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:2474
+#: src/fs/fs_api.c:2478
 #, 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:2489 src/fs/fs_api.c:2508 src/fs/fs_api.c:3006
+#: src/fs/fs_api.c:2493 src/fs/fs_api.c:2512 src/fs/fs_api.c:3016
 #, c-format
 msgid "Failure while resuming search operation `%s': %s\n"
 msgstr ""
 
-#: src/fs/fs_api.c:2693
+#: src/fs/fs_api.c:2696
 #, c-format
 msgid "Failed to resume sub-download `%s': could not open file `%s'\n"
 msgstr ""
 
-#: src/fs/fs_api.c:2949
+#: src/fs/fs_api.c:2959
 msgid "Could not resume running search, will resume as paused search\n"
 msgstr ""
 
-#: src/fs/fs_api.c:3044
+#: src/fs/fs_api.c:3054
 #, c-format
 msgid "Failure while resuming download operation `%s': %s\n"
 msgstr ""
@@ -2939,7 +2953,7 @@ msgstr "Lỗi mở tập tin ghi sự kiện « %s »: %s\n"
 msgid "internal error decoding tree"
 msgstr "=\tLỗi đọc thư mục.\n"
 
-#: src/fs/fs_download.c:1838
+#: src/fs/fs_download.c:1845
 #, fuzzy
 msgid "Invalid URI"
 msgstr "Dữ liệu nhập không hợp lệ.\n"
@@ -3698,49 +3712,49 @@ msgstr ""
 msgid "Hash mismatch trying to index file `%s' which does not have hash `%s'\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs.c:1288
+#: src/fs/gnunet-service-fs.c:1287
 #, 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:1313 src/hostlist/gnunet-daemon-hostlist.c:355
+#: src/fs/gnunet-service-fs.c:1312 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:494
+#: src/fs/gnunet-service-fs_cadet_client.c:370
 #, fuzzy
 msgid "# replies received via cadet"
 msgstr "# các byte kiểu %d được nhận"
 
-#: src/fs/gnunet-service-fs_cadet_client.c:508
+#: src/fs/gnunet-service-fs_cadet_client.c:384
 #, fuzzy
 msgid "# replies received via cadet dropped"
 msgstr "# các byte kiểu %d được nhận"
 
-#: src/fs/gnunet-service-fs_cadet_server.c:258
-#, fuzzy
-msgid "# Blocks transferred via cadet"
-msgstr "# các byte được gửi"
-
-#: src/fs/gnunet-service-fs_cadet_server.c:360
+#: src/fs/gnunet-service-fs_cadet_server.c:263
 #, fuzzy
 msgid "# queries received via CADET not answered"
 msgstr "# các byte đã nhận qua TCP"
 
-#: src/fs/gnunet-service-fs_cadet_server.c:440
+#: src/fs/gnunet-service-fs_cadet_server.c:317
+#, fuzzy
+msgid "# Blocks transferred via cadet"
+msgstr "# các byte được gửi"
+
+#: src/fs/gnunet-service-fs_cadet_server.c:343
 #, fuzzy
 msgid "# queries received via cadet"
 msgstr "# các byte đã nhận qua TCP"
 
-#: src/fs/gnunet-service-fs_cadet_server.c:484
+#: src/fs/gnunet-service-fs_cadet_server.c:384
 #, fuzzy
 msgid "# cadet client connections rejected"
 msgstr "# các kết nối dht"
 
-#: src/fs/gnunet-service-fs_cadet_server.c:490
-#: src/fs/gnunet-service-fs_cadet_server.c:530
+#: src/fs/gnunet-service-fs_cadet_server.c:391
+#: src/fs/gnunet-service-fs_cadet_server.c:431
 #, fuzzy
 msgid "# cadet connections active"
 msgstr "# các kết nối dht"
@@ -3904,114 +3918,114 @@ msgstr "# các yêu cầu get (lấy) dht được nhận"
 msgid "# query plan entries"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:315
+#: src/fs/gnunet-service-fs_pr.c:327
 #, fuzzy
 msgid "# Pending requests created"
 msgstr "# các yêu cầu get (lấy) dht được nhận"
 
-#: src/fs/gnunet-service-fs_pr.c:411 src/fs/gnunet-service-fs_pr.c:661
+#: src/fs/gnunet-service-fs_pr.c:428 src/fs/gnunet-service-fs_pr.c:675
 #, 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:842
+#: src/fs/gnunet-service-fs_pr.c:856
 #, fuzzy
 msgid "# replies received and matched"
 msgstr "# các byte kiểu %d được nhận"
 
-#: src/fs/gnunet-service-fs_pr.c:879
+#: src/fs/gnunet-service-fs_pr.c:892
 msgid "# duplicate replies discarded (bloomfilter)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:888
+#: src/fs/gnunet-service-fs_pr.c:901
 msgid "# irrelevant replies discarded"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:903
+#: src/fs/gnunet-service-fs_pr.c:916
 #, c-format
 msgid "Unsupported block type %u\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:920
+#: src/fs/gnunet-service-fs_pr.c:933
 #, 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:1050
+#: src/fs/gnunet-service-fs_pr.c:1063
 msgid "# Datastore `PUT' failures"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1078
+#: src/fs/gnunet-service-fs_pr.c:1091
 #, 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:1116
+#: src/fs/gnunet-service-fs_pr.c:1129
 #, fuzzy
 msgid "# Replies received from DHT"
 msgstr "# các byte đã nhận qua HTTP"
 
-#: src/fs/gnunet-service-fs_pr.c:1247
+#: src/fs/gnunet-service-fs_pr.c:1260
 #, fuzzy
 msgid "# Replies received from CADET"
 msgstr "# các byte đã nhận qua HTTP"
 
-#: src/fs/gnunet-service-fs_pr.c:1299
+#: src/fs/gnunet-service-fs_pr.c:1312
 #, c-format
 msgid "Datastore lookup already took %s!\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1320
+#: src/fs/gnunet-service-fs_pr.c:1333
 #, c-format
 msgid "On-demand lookup already took %s!\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1372
+#: src/fs/gnunet-service-fs_pr.c:1385
 msgid "# Datastore lookups concluded (no results)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1387
+#: src/fs/gnunet-service-fs_pr.c:1400
 msgid "# Datastore lookups concluded (seen all)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1396
+#: src/fs/gnunet-service-fs_pr.c:1409
 msgid "# Datastore lookups aborted (more than MAX_RESULTS)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1411
+#: src/fs/gnunet-service-fs_pr.c:1424
 msgid "# requested DBLOCK or IBLOCK not found"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1425
+#: src/fs/gnunet-service-fs_pr.c:1438
 msgid "# on-demand blocks matched requests"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1438
+#: src/fs/gnunet-service-fs_pr.c:1451
 msgid "# on-demand lookups performed successfully"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1443
+#: src/fs/gnunet-service-fs_pr.c:1456
 msgid "# on-demand lookups failed"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1469 src/fs/gnunet-service-fs_pr.c:1508
-#: src/fs/gnunet-service-fs_pr.c:1675
+#: src/fs/gnunet-service-fs_pr.c:1482 src/fs/gnunet-service-fs_pr.c:1521
+#: src/fs/gnunet-service-fs_pr.c:1688
 msgid "# Datastore lookups concluded (error queueing)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1527
+#: src/fs/gnunet-service-fs_pr.c:1540
 msgid "# Datastore lookups concluded (found last result)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1539
+#: src/fs/gnunet-service-fs_pr.c:1552
 msgid "# Datastore lookups concluded (load too high)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1652
+#: src/fs/gnunet-service-fs_pr.c:1665
 msgid "# Datastore lookups initiated"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1732
+#: src/fs/gnunet-service-fs_pr.c:1745
 #, fuzzy
 msgid "# GAP PUT messages received"
 msgstr "# các thông báo PONG đã mật mã được nhận"
@@ -4376,7 +4390,7 @@ msgid "Failed to connect to the namecache!\n"
 msgstr "Không kết nối được đến trình nền gnunetd."
 
 #: src/gns/gnunet-service-gns.c:612
-#: src/zonemaster/gnunet-service-zonemaster.c:740
+#: src/zonemaster/gnunet-service-zonemaster.c:741
 #, fuzzy
 msgid "Could not connect to DHT!\n"
 msgstr "Không thể kết nối tới %s:%u: %s\n"
@@ -4871,7 +4885,7 @@ 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:679
-#: src/transport/gnunet-service-transport.c:2802
+#: src/transport/gnunet-service-transport.c:2803
 #, 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"
@@ -5231,7 +5245,8 @@ msgstr ""
 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:979 src/peerinfo-tool/gnunet-peerinfo.c:775
+#: 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"
@@ -5441,23 +5456,22 @@ msgid "Failed to connect to `gnunet-nat-server'\n"
 msgstr "Lỗi kết nối đến gnunetd.\n"
 
 #: src/nat-auto/gnunet-nat-auto_legacy.c:518
-#: src/nat-auto/nat_auto_api_test.c:520
 #, c-format
 msgid "Failed to create listen socket bound to `%s' for NAT test: %s\n"
 msgstr ""
 
 #: src/nat-auto/gnunet-nat-auto_legacy.c:568
-#: src/nat-auto/nat_auto_api_test.c:569
+#: src/nat-auto/nat_auto_api_test.c:571
 #, fuzzy
 msgid "NAT test failed to start NAT library\n"
 msgstr "Lỗi bắt đầu thu thập.\n"
 
-#: src/nat-auto/gnunet-nat-server.c:336
+#: src/nat-auto/gnunet-nat-server.c:338
 #, c-format
 msgid "Please pass valid port number as the first argument! (got `%s')\n"
 msgstr ""
 
-#: src/nat-auto/gnunet-nat-server.c:386
+#: src/nat-auto/gnunet-nat-server.c:388
 msgid "GNUnet NAT traversal test helper daemon"
 msgstr ""
 
@@ -5602,6 +5616,11 @@ msgstr ""
 msgid "Failed to find valid PORT in section `%s'\n"
 msgstr "Lỗi đóng kết đến cổng %s %d.\n"
 
+#: src/nat-auto/nat_auto_api_test.c:522
+#, fuzzy, c-format
+msgid "Failed to create socket bound to `%s' for NAT test: %s\n"
+msgstr "Lỗi đọc danh sách bạn bè từ « %s »\n"
+
 #: src/nat/gnunet-nat.c:424
 msgid "which IP and port are we locally using to bind/listen to"
 msgstr ""
@@ -5628,32 +5647,32 @@ msgstr ""
 msgid "GNUnet NAT traversal autoconfigure daemon"
 msgstr ""
 
-#: src/nat/gnunet-service-nat.c:1313
+#: src/nat/gnunet-service-nat.c:1317
 #, c-format
 msgid "Malformed punched hole specification `%s' (lacks port)\n"
 msgstr ""
 
-#: src/nat/gnunet-service-nat.c:1323
+#: src/nat/gnunet-service-nat.c:1327
 #, c-format
 msgid "Invalid port number in punched hole specification `%s' (lacks port)\n"
 msgstr ""
 
-#: src/nat/gnunet-service-nat.c:1339
+#: src/nat/gnunet-service-nat.c:1343
 #, c-format
 msgid "Malformed punched hole specification `%s' (lacks `]')\n"
 msgstr ""
 
-#: src/nat/gnunet-service-nat.c:1350
+#: src/nat/gnunet-service-nat.c:1354
 #, c-format
 msgid "Malformed punched hole specification `%s' (IPv6 address invalid)"
 msgstr ""
 
-#: src/nat/gnunet-service-nat.c:1803
+#: src/nat/gnunet-service-nat.c:1813
 #, fuzzy
 msgid "Connection reversal request failed\n"
 msgstr "Thu thập bị dừng.\n"
 
-#: src/nat/gnunet-service-nat.c:1876
+#: src/nat/gnunet-service-nat.c:1886
 msgid ""
 "UPnP enabled in configuration, but UPnP client `upnpc` command not found, "
 "disabling UPnP\n"
@@ -5673,7 +5692,7 @@ msgstr "Lỗi bắt đầu thu thập.\n"
 msgid "`external-ip' command not found\n"
 msgstr ""
 
-#: src/nat/gnunet-service-nat_mini.c:654
+#: src/nat/gnunet-service-nat_mini.c:656
 msgid "`upnpc' command not found\n"
 msgstr ""
 
@@ -5708,7 +5727,7 @@ msgstr ""
 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:1536
+#: src/nse/gnunet-service-nse.c:1534
 #: src/revocation/gnunet-service-revocation.c:832 src/util/gnunet-scrypt.c:276
 #, fuzzy
 msgid "Value is too large.\n"
@@ -5923,7 +5942,7 @@ msgstr "Không thể tạo miền tên.\n"
 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:195
+#: src/postgres/postgres.c:192
 #, fuzzy, c-format
 msgid "Unable to connect to Postgres database '%s': %s\n"
 msgstr "Không thể lưu tập tin cấu hình « %s »:"
@@ -6256,7 +6275,7 @@ msgstr ""
 msgid "Revocation certificate not ready, calculating proof of work\n"
 msgstr ""
 
-#: src/revocation/gnunet-revocation.c:437 src/social/gnunet-social.c:1159
+#: src/revocation/gnunet-revocation.c:437 src/social/gnunet-social.c:1176
 #, fuzzy, c-format
 msgid "Public key `%s' malformed\n"
 msgstr "Đối số không hợp lệ cho « %s ».\n"
@@ -6392,10 +6411,10 @@ msgstr ""
 msgid "Calculate the Vectorproduct with a GNUnet peer."
 msgstr ""
 
-#: 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
+#: src/scalarproduct/gnunet-service-scalarproduct_alice.c:1404
+#: src/scalarproduct/gnunet-service-scalarproduct_bob.c:1342
+#: src/scalarproduct/gnunet-service-scalarproduct-ecc_alice.c:1177
+#: src/scalarproduct/gnunet-service-scalarproduct-ecc_bob.c:1060
 #, fuzzy
 msgid "Connect to CADET failed\n"
 msgstr " Không kết nối được (lỗi ?)\n"
@@ -6420,9 +6439,9 @@ msgstr ""
 msgid "also profile decryption"
 msgstr ""
 
-#: src/set/gnunet-service-set.c:1991
+#: src/set/gnunet-service-set.c:2068
 #, fuzzy
-msgid "Could not connect to cadet service\n"
+msgid "Could not connect to CADET service\n"
 msgstr "Không thể kết nối tới %s:%u: %s\n"
 
 #: src/set/gnunet-set-ibf-profiler.c:249
@@ -6451,127 +6470,127 @@ msgstr ""
 msgid "operation to execute"
 msgstr ""
 
-#: src/social/gnunet-social.c:1146
+#: src/social/gnunet-social.c:1163
 #, fuzzy
 msgid "--place missing or invalid.\n"
 msgstr "Đối số không hợp lệ cho « %s ».\n"
 
-#: src/social/gnunet-social.c:1195
+#: src/social/gnunet-social.c:1212
 msgid "assign --name in state to --data"
 msgstr ""
 
-#: src/social/gnunet-social.c:1199
+#: src/social/gnunet-social.c:1216
 msgid "say good-bye and leave somebody else's place"
 msgstr ""
 
-#: src/social/gnunet-social.c:1203
+#: src/social/gnunet-social.c:1220
 msgid "create a place"
 msgstr ""
 
-#: src/social/gnunet-social.c:1207
+#: src/social/gnunet-social.c:1224
 msgid "destroy a place we were hosting"
 msgstr ""
 
-#: src/social/gnunet-social.c:1211
+#: src/social/gnunet-social.c:1228
 msgid "enter somebody else's place"
 msgstr ""
 
-#: src/social/gnunet-social.c:1215
+#: src/social/gnunet-social.c:1232
 msgid "find state matching name prefix"
 msgstr ""
 
-#: src/social/gnunet-social.c:1219
+#: src/social/gnunet-social.c:1236
 msgid "replay history of messages up to the given --limit"
 msgstr ""
 
-#: src/social/gnunet-social.c:1223
+#: src/social/gnunet-social.c:1240
 msgid "reconnect to a previously created place"
 msgstr ""
 
-#: src/social/gnunet-social.c:1227
+#: src/social/gnunet-social.c:1244
 msgid "publish something to a place we are hosting"
 msgstr ""
 
-#: src/social/gnunet-social.c:1231
+#: src/social/gnunet-social.c:1248
 msgid "reconnect to a previously entered place"
 msgstr ""
 
-#: src/social/gnunet-social.c:1235
+#: src/social/gnunet-social.c:1252
 msgid "search for state matching exact name"
 msgstr ""
 
-#: src/social/gnunet-social.c:1239
+#: src/social/gnunet-social.c:1256
 msgid "submit something to somebody's place"
 msgstr ""
 
-#: src/social/gnunet-social.c:1243
+#: src/social/gnunet-social.c:1260
 msgid "list of egos and subscribed places"
 msgstr ""
 
-#: src/social/gnunet-social.c:1247
+#: src/social/gnunet-social.c:1264
 msgid "extract and replay history between message IDs --start and --until"
 msgstr ""
 
-#: src/social/gnunet-social.c:1254
+#: src/social/gnunet-social.c:1271
 msgid "application ID to use when connecting"
 msgstr ""
 
-#: src/social/gnunet-social.c:1258
+#: src/social/gnunet-social.c:1275
 msgid "message body or state value"
 msgstr ""
 
-#: src/social/gnunet-social.c:1262
+#: src/social/gnunet-social.c:1279
 #, fuzzy
 msgid "name or public key of ego"
 msgstr "Đối số không hợp lệ cho « %s ».\n"
 
-#: src/social/gnunet-social.c:1266
+#: src/social/gnunet-social.c:1283
 #, fuzzy
 msgid "wait for incoming messages"
 msgstr "Lỗi gửi tin nhẳn.\n"
 
-#: src/social/gnunet-social.c:1270
+#: src/social/gnunet-social.c:1287
 msgid "GNS name"
 msgstr ""
 
-#: src/social/gnunet-social.c:1274
+#: src/social/gnunet-social.c:1291
 msgid "peer ID for --guest-enter"
 msgstr ""
 
-#: src/social/gnunet-social.c:1278
+#: src/social/gnunet-social.c:1295
 msgid "name (key) to query from state"
 msgstr ""
 
-#: src/social/gnunet-social.c:1282
+#: src/social/gnunet-social.c:1299
 msgid "method name"
 msgstr ""
 
-#: src/social/gnunet-social.c:1286
+#: src/social/gnunet-social.c:1303
 #, 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:1290
+#: src/social/gnunet-social.c:1307
 msgid "key address of place"
 msgstr ""
 
-#: src/social/gnunet-social.c:1294
+#: src/social/gnunet-social.c:1311
 msgid "start message ID for history replay"
 msgstr ""
 
-#: src/social/gnunet-social.c:1298
+#: src/social/gnunet-social.c:1315
 msgid "respond to entry requests by admitting all guests"
 msgstr ""
 
-#: src/social/gnunet-social.c:1302
+#: src/social/gnunet-social.c:1319
 msgid "end message ID for history replay"
 msgstr ""
 
-#: src/social/gnunet-social.c:1306
+#: src/social/gnunet-social.c:1323
 msgid "respond to entry requests by refusing all guests"
 msgstr ""
 
-#: src/social/gnunet-social.c:1316
+#: src/social/gnunet-social.c:1333
 msgid ""
 "gnunet-social - Interact with the social service: enter/leave, send/receive "
 "messages, access history and state.\n"
@@ -7120,37 +7139,37 @@ msgstr ""
 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:1698
+#: src/transport/gnunet-service-transport.c:1699
 #, fuzzy
 msgid "# bytes total received"
 msgstr "# tổng số nội dung lỗ hổng được nhận"
 
-#: src/transport/gnunet-service-transport.c:1795
+#: src/transport/gnunet-service-transport.c:1796
 #, fuzzy
 msgid "# bytes payload received"
 msgstr "# các byte đã giải mã"
 
-#: src/transport/gnunet-service-transport.c:2112
-#: src/transport/gnunet-service-transport.c:2584
+#: src/transport/gnunet-service-transport.c:2113
+#: src/transport/gnunet-service-transport.c:2585
 msgid "# disconnects due to blacklist"
 msgstr ""
 
-#: src/transport/gnunet-service-transport.c:2588
+#: src/transport/gnunet-service-transport.c:2589
 #, 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
+#: src/transport/gnunet-service-transport.c:2697
 #, 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
+#: src/transport/gnunet-service-transport.c:2706
 #, c-format
 msgid "Adding blacklisting entry for peer `%s':`%s'\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport.c:2770
+#: src/transport/gnunet-service-transport.c:2771
 #, fuzzy
 msgid "Transport service is lacking key configuration settings. Exiting.\n"
 msgstr "Lưu cấu hình ngay bây giờ không?"
@@ -7305,74 +7324,74 @@ msgstr "# các thông báo PING được tạo"
 msgid "SYN request from peer `%s' ignored due impending shutdown\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:2598
+#: src/transport/gnunet-service-transport_neighbours.c:2606
 msgid "# Attempts to switch addresses"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3080
+#: src/transport/gnunet-service-transport_neighbours.c:3088
 #, 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:3088
+#: src/transport/gnunet-service-transport_neighbours.c:3096
 #, fuzzy
 msgid "# unexpected SYN_ACK messages (no peer)"
 msgstr "gửi ĐẾM thông báo"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3106
-#: src/transport/gnunet-service-transport_neighbours.c:3130
+#: src/transport/gnunet-service-transport_neighbours.c:3114
+#: src/transport/gnunet-service-transport_neighbours.c:3138
 #, fuzzy
 msgid "# unexpected SYN_ACK messages (not ready)"
 msgstr "gửi ĐẾM thông báo"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3142
+#: src/transport/gnunet-service-transport_neighbours.c:3150
 #, fuzzy
 msgid "# unexpected SYN_ACK messages (waiting on ATS)"
 msgstr "gửi ĐẾM thông báo"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3167
+#: src/transport/gnunet-service-transport_neighbours.c:3175
 msgid "# Successful attempts to switch addresses"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3180
+#: src/transport/gnunet-service-transport_neighbours.c:3188
 #, fuzzy
 msgid "# unexpected SYN_ACK messages (disconnecting)"
 msgstr "gửi ĐẾM thông báo"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3352
+#: src/transport/gnunet-service-transport_neighbours.c:3360
 #, 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:3388
+#: src/transport/gnunet-service-transport_neighbours.c:3396
 #, 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:3476
+#: src/transport/gnunet-service-transport_neighbours.c:3484
 #, 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:3483
+#: src/transport/gnunet-service-transport_neighbours.c:3491
 #, 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:3523
+#: src/transport/gnunet-service-transport_neighbours.c:3531
 msgid "# disconnect messages ignored (malformed)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3530
+#: src/transport/gnunet-service-transport_neighbours.c:3538
 #, 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:3541
+#: src/transport/gnunet-service-transport_neighbours.c:3549
 msgid "# disconnect messages ignored (timestamp)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3675
+#: src/transport/gnunet-service-transport_neighbours.c:3683
 #, 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"
@@ -7679,8 +7698,8 @@ msgstr "kích cỡ tin nhắn"
 #: src/transport/plugin_transport_http_client.c:1477
 #: src/transport/plugin_transport_http_server.c:2248
 #: src/transport/plugin_transport_http_server.c:3462
-#: src/transport/plugin_transport_tcp.c:3375
-#: src/transport/plugin_transport_tcp.c:3382
+#: src/transport/plugin_transport_tcp.c:3403
+#: src/transport/plugin_transport_tcp.c:3410
 msgid "TCP_STEALTH not supported on this platform.\n"
 msgstr ""
 
@@ -7750,7 +7769,7 @@ msgid "Found %u addresses to report to NAT service\n"
 msgstr ""
 
 #: src/transport/plugin_transport_http_server.c:2837
-#: src/transport/plugin_transport_udp.c:3623
+#: src/transport/plugin_transport_udp.c:3613
 msgid "Disabling IPv6 since it is not supported on this system!\n"
 msgstr ""
 
@@ -7853,15 +7872,15 @@ msgid "# bytes dropped by SMTP (outgoing)"
 msgstr "# các byte loại đi bởi SMTP (đi ra)"
 
 #: src/transport/plugin_transport_tcp.c:1060
-#: src/transport/plugin_transport_tcp.c:2379
+#: src/transport/plugin_transport_tcp.c:2386
 #, fuzzy, c-format
 msgid "Unexpected address length: %u bytes\n"
 msgstr "Gặp sự kiện bất thường: %d\n"
 
 #: src/transport/plugin_transport_tcp.c:1243
 #: src/transport/plugin_transport_tcp.c:1467
-#: src/transport/plugin_transport_tcp.c:2643
-#: src/transport/plugin_transport_tcp.c:3498
+#: src/transport/plugin_transport_tcp.c:2650
+#: src/transport/plugin_transport_tcp.c:3526
 #, fuzzy
 msgid "# TCP sessions active"
 msgstr "# các khoá phiên chạy được chấp nhận"
@@ -7891,65 +7910,65 @@ msgstr "# các byte loại đi bởi TCP (đi ra)"
 msgid "# bytes transmitted via TCP"
 msgstr "# các byte được gửi"
 
-#: src/transport/plugin_transport_tcp.c:2041
+#: src/transport/plugin_transport_tcp.c:2048
 msgid "# requests to create session with invalid address"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2217
+#: src/transport/plugin_transport_tcp.c:2224
 msgid "# transport-service disconnect requests for TCP"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2702
+#: src/transport/plugin_transport_tcp.c:2716
 #, 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:2893
+#: src/transport/plugin_transport_tcp.c:2921
 msgid "# bytes received via TCP"
 msgstr "# các byte đã nhận qua TCP"
 
-#: src/transport/plugin_transport_tcp.c:2944
-#: src/transport/plugin_transport_tcp.c:3002
+#: src/transport/plugin_transport_tcp.c:2972
+#: src/transport/plugin_transport_tcp.c:3030
 #, fuzzy
 msgid "# TCP server connections active"
 msgstr "# các kết nối dht"
 
-#: src/transport/plugin_transport_tcp.c:2948
+#: src/transport/plugin_transport_tcp.c:2976
 #, fuzzy
 msgid "# TCP server connect events"
 msgstr "# của các đồng đẳng đã kết nối"
 
-#: src/transport/plugin_transport_tcp.c:2954
+#: src/transport/plugin_transport_tcp.c:2982
 msgid "TCP connection limit reached, suspending server\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2956
+#: src/transport/plugin_transport_tcp.c:2984
 msgid "# TCP service suspended"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2996
+#: src/transport/plugin_transport_tcp.c:3024
 msgid "# TCP service resumed"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:3006
+#: src/transport/plugin_transport_tcp.c:3034
 msgid "# network-level TCP disconnect events"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:3325
+#: src/transport/plugin_transport_tcp.c:3353
 #, fuzzy
 msgid "Failed to start service.\n"
 msgstr "Lỗi bắt đầu thu thập.\n"
 
-#: src/transport/plugin_transport_tcp.c:3486
+#: src/transport/plugin_transport_tcp.c:3514
 #, c-format
 msgid "TCP transport listening on port %llu\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:3490
+#: src/transport/plugin_transport_tcp.c:3518
 msgid "TCP transport not listening on any port (client only)\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:3494
+#: src/transport/plugin_transport_tcp.c:3522
 #, c-format
 msgid "TCP transport advertises itself as being on port %llu\n"
 msgstr ""
@@ -7969,50 +7988,50 @@ msgstr ""
 msgid "Failed to set IPv4 broadcast option for broadcast socket on port %d\n"
 msgstr ""
 
-#: src/transport/plugin_transport_udp.c:3367
+#: src/transport/plugin_transport_udp.c:3357
 #, c-format
 msgid ""
 "UDP could not transmit message to `%s': Network seems down, please check "
 "your network configuration\n"
 msgstr ""
 
-#: src/transport/plugin_transport_udp.c:3381
+#: src/transport/plugin_transport_udp.c:3371
 msgid ""
 "UDP could not transmit IPv6 message! Please check your network configuration "
 "and disable IPv6 if your connection does not have a global IPv6 address\n"
 msgstr ""
 
-#: src/transport/plugin_transport_udp.c:3699
-#: src/transport/plugin_transport_udp.c:3798
+#: src/transport/plugin_transport_udp.c:3689
+#: src/transport/plugin_transport_udp.c:3788
 #, fuzzy, c-format
 msgid "Failed to bind UDP socket to %s: %s\n"
 msgstr "Lỗi mở tập tin ghi sự kiện « %s »: %s\n"
 
-#: src/transport/plugin_transport_udp.c:3717
+#: src/transport/plugin_transport_udp.c:3707
 msgid "Disabling IPv4 since it is not supported on this system!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_udp.c:3808
+#: src/transport/plugin_transport_udp.c:3798
 #, fuzzy
 msgid "Failed to open UDP sockets\n"
 msgstr "Lỗi mở tập tin ghi sự kiện « %s »: %s\n"
 
-#: src/transport/plugin_transport_udp.c:3879
-#: src/transport/plugin_transport_udp.c:3893
+#: src/transport/plugin_transport_udp.c:3869
+#: src/transport/plugin_transport_udp.c:3883
 msgid "must be in [0,65535]"
 msgstr ""
 
-#: src/transport/plugin_transport_udp.c:3925
+#: src/transport/plugin_transport_udp.c:3915
 #, fuzzy
 msgid "must be valid IPv4 address"
 msgstr "« %s » không sẵn sàng.\n"
 
-#: src/transport/plugin_transport_udp.c:3952
+#: src/transport/plugin_transport_udp.c:3942
 #, fuzzy
 msgid "must be valid IPv6 address"
 msgstr "« %s » không sẵn sàng.\n"
 
-#: src/transport/plugin_transport_udp.c:4018
+#: src/transport/plugin_transport_udp.c:4008
 #, fuzzy
 msgid "Failed to create UDP network sockets\n"
 msgstr "Không thể tạo miền tên.\n"
@@ -8133,7 +8152,7 @@ msgstr ""
 msgid "Metadata `%s' failed to deserialize"
 msgstr ""
 
-#: src/util/client.c:864
+#: src/util/client.c:868
 #, c-format
 msgid "Need a non-empty hostname for service `%s'.\n"
 msgstr ""
@@ -8171,21 +8190,21 @@ msgstr "Thông điệp « %.*s » đã lặp lại %u lần trong 
%llu giây tr
 msgid "INVALID"
 msgstr ""
 
-#: src/util/common_logging.c:1248
+#: src/util/common_logging.c:1302
 msgid "unknown address"
 msgstr ""
 
-#: src/util/common_logging.c:1290
+#: src/util/common_logging.c:1344
 msgid "invalid address"
 msgstr ""
 
-#: src/util/common_logging.c:1308
+#: src/util/common_logging.c:1362
 #, 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:1329
+#: src/util/common_logging.c:1383
 #, fuzzy, c-format
 msgid ""
 "Configuration specifies invalid value for option `%s' in section `%s': %s\n"
@@ -8245,22 +8264,22 @@ msgid ""
 "%llu)\n"
 msgstr ""
 
-#: src/util/crypto_ecc.c:756
+#: src/util/crypto_ecc.c:777
 #, fuzzy, c-format
 msgid "ECC signing failed at %s:%d: %s\n"
 msgstr "%s bị lỗi tại %s:%d: « %s »\n"
 
-#: src/util/crypto_ecc.c:806
+#: src/util/crypto_ecc.c:827
 #, fuzzy, c-format
 msgid "EdDSA signing failed at %s:%d: %s\n"
 msgstr "%s bị lỗi tại %s:%d: « %s »\n"
 
-#: src/util/crypto_ecc.c:880
+#: src/util/crypto_ecc.c:901
 #, fuzzy, c-format
 msgid "ECDSA 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/crypto_ecc.c:937
+#: src/util/crypto_ecc.c:958
 #, fuzzy, c-format
 msgid "EdDSA signature verification failed at %s:%d: %s\n"
 msgstr "Lỗi thẩm tra chữ ký RSA tại %s:%d: %s\n"
@@ -8736,7 +8755,7 @@ msgid ""
 "`GNUNET_SERVER_receive_done' after %s\n"
 msgstr ""
 
-#: src/util/service.c:347 src/util/service_new.c:2343
+#: src/util/service.c:347 src/util/service_new.c:2344
 #, fuzzy, c-format
 msgid "Unknown address family %d\n"
 msgstr "\tKhông rõ miền tên « %s »\n"
@@ -8974,93 +8993,93 @@ msgstr "# các truy vấn lỗ hổng được định tuyến"
 msgid "Protocol %u not supported, dropping\n"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:1145
+#: src/vpn/gnunet-service-vpn.c:1144
 #, 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:1353
+#: src/vpn/gnunet-service-vpn.c:1352
 msgid "# ICMPv4 packets dropped (not allowed)"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:1374
+#: src/vpn/gnunet-service-vpn.c:1373
 msgid "# ICMPv6 packets dropped (not allowed)"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:1580
+#: src/vpn/gnunet-service-vpn.c:1579
 #, 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:1613 src/vpn/gnunet-service-vpn.c:1649
+#: src/vpn/gnunet-service-vpn.c:1612 src/vpn/gnunet-service-vpn.c:1648
 #, c-format
 msgid "Packet received for unmapped destination `%s' (dropping it)\n"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:1659
+#: src/vpn/gnunet-service-vpn.c:1658
 msgid "Received IPv4 packet with options (dropping it)\n"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:1673
+#: src/vpn/gnunet-service-vpn.c:1672
 #, c-format
 msgid "Received packet of unknown protocol %d from TUN (dropping it)\n"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:1755
+#: src/vpn/gnunet-service-vpn.c:1754
 #, 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:2095
+#: src/vpn/gnunet-service-vpn.c:2093
 #, fuzzy
 msgid "# UDP packets received from cadet"
 msgstr "# các đáp ứng lỗ hổng được gửi cho trình/máy khách"
 
-#: src/vpn/gnunet-service-vpn.c:2251
+#: src/vpn/gnunet-service-vpn.c:2248
 #, fuzzy
 msgid "# TCP packets received from cadet"
 msgstr "# các đáp ứng lỗ hổng được gửi cho trình/máy khách"
 
-#: src/vpn/gnunet-service-vpn.c:2403
+#: src/vpn/gnunet-service-vpn.c:2399
 msgid "Failed to find unallocated IPv4 address in VPN's range\n"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:2458
+#: src/vpn/gnunet-service-vpn.c:2454
 msgid "Failed to find unallocated IPv6 address in VPN's range\n"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:2500 src/vpn/gnunet-service-vpn.c:2722
+#: src/vpn/gnunet-service-vpn.c:2496 src/vpn/gnunet-service-vpn.c:2718
 #, fuzzy
 msgid "# Active destinations"
 msgstr "# các kết nối dht"
 
-#: src/vpn/gnunet-service-vpn.c:2771
+#: src/vpn/gnunet-service-vpn.c:2767
 msgid "Failed to allocate IP address for new destination\n"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:3063
+#: src/vpn/gnunet-service-vpn.c:3059
 #, fuzzy
 msgid "Must specify valid IPv6 address"
 msgstr "« %s » không sẵn sàng.\n"
 
-#: src/vpn/gnunet-service-vpn.c:3087
+#: src/vpn/gnunet-service-vpn.c:3083
 msgid "Must specify valid IPv6 mask"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:3095
+#: src/vpn/gnunet-service-vpn.c:3091
 msgid "IPv6 support disabled as this system does not support IPv6\n"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:3108
+#: src/vpn/gnunet-service-vpn.c:3104
 #, fuzzy
 msgid "Must specify valid IPv4 address"
 msgstr "« %s » không sẵn sàng.\n"
 
-#: src/vpn/gnunet-service-vpn.c:3121
+#: src/vpn/gnunet-service-vpn.c:3117
 msgid "Must specify valid IPv4 mask"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:3131
+#: src/vpn/gnunet-service-vpn.c:3127
 msgid "IPv4 support disabled as this system does not support IPv4\n"
 msgstr ""
 
@@ -9132,23 +9151,35 @@ msgstr "# các byte đã nhận qua UDP"
 msgid "Setup tunnels via VPN."
 msgstr ""
 
-#: src/include/gnunet_common.h:645 src/include/gnunet_common.h:652
-#: src/include/gnunet_common.h:662 src/include/gnunet_common.h:670
+#: src/include/gnunet_common.h:674 src/include/gnunet_common.h:681
+#: src/include/gnunet_common.h:691 src/include/gnunet_common.h:699
 #, fuzzy, c-format
 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:682
+#: src/include/gnunet_common.h:711
 #, 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:709 src/include/gnunet_common.h:718
+#: src/include/gnunet_common.h:738 src/include/gnunet_common.h:747
 #, 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 "# UPDATE requests executed"
+#~ msgstr "# các yêu cầu dht được định tuyến"
+
+#, fuzzy
+#~ msgid "# UPDATE requests received"
+#~ msgstr "# các yêu cầu get (lấy) dht được nhận"
+
+#, fuzzy
+#~ msgid "Could not connect to cadet service\n"
+#~ msgstr "Không thể kết nối tới %s:%u: %s\n"
+
+#, fuzzy
 #~ msgid "Failed to run upnp client for port %u\n"
 #~ msgstr "Lỗi sơ khởi dịch vụ « %s ».\n"
 
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 579bc8364..ef3e1830b 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnunet-0.8.1\n"
 "Report-Msgid-Bugs-To: address@hidden"
-"POT-Creation-Date: 2017-01-12 17:19+0100\n"
+"POT-Creation-Date: 2017-02-20 11:12-0600\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,227 +16,227 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: src/arm/gnunet-arm.c:152
+#: src/arm/gnunet-arm.c:156
 #, fuzzy, c-format
 msgid "Failed to remove configuration file %s\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/arm/gnunet-arm.c:158
+#: src/arm/gnunet-arm.c:162
 #, c-format
 msgid "Failed to remove servicehome directory %s\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:213 src/testbed/gnunet-service-testbed_peers.c:1139
+#: src/arm/gnunet-arm.c:222 src/testbed/gnunet-service-testbed_peers.c:1139
 msgid "Message was sent successfully"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:215
+#: src/arm/gnunet-arm.c:224
 #, fuzzy
 msgid "Misconfiguration (can not connect to the ARM service)"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/arm/gnunet-arm.c:217 src/testbed/gnunet-service-testbed_peers.c:1143
+#: src/arm/gnunet-arm.c:226 src/testbed/gnunet-service-testbed_peers.c:1143
 msgid "We disconnected from ARM before we could send a request"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:219 src/testbed/gnunet-service-testbed_peers.c:1145
+#: src/arm/gnunet-arm.c:228 src/testbed/gnunet-service-testbed_peers.c:1145
 msgid "ARM API is busy"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:221 src/testbed/gnunet-service-testbed_peers.c:1147
+#: src/arm/gnunet-arm.c:230 src/testbed/gnunet-service-testbed_peers.c:1147
 msgid "Request timed out"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:223 src/testbed/gnunet-service-testbed_peers.c:1149
+#: src/arm/gnunet-arm.c:232 src/testbed/gnunet-service-testbed_peers.c:1149
 #, fuzzy
 msgid "Unknown request status"
 msgstr "未知的用户“%s”\n"
 
-#: src/arm/gnunet-arm.c:239 src/testbed/gnunet-service-testbed_peers.c:1165
+#: src/arm/gnunet-arm.c:248 src/testbed/gnunet-service-testbed_peers.c:1165
 #, c-format
 msgid "%s is stopped"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:241 src/testbed/gnunet-service-testbed_peers.c:1167
+#: src/arm/gnunet-arm.c:250 src/testbed/gnunet-service-testbed_peers.c:1167
 #, c-format
 msgid "%s is starting"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:243 src/testbed/gnunet-service-testbed_peers.c:1169
+#: src/arm/gnunet-arm.c:252 src/testbed/gnunet-service-testbed_peers.c:1169
 #, c-format
 msgid "%s is stopping"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:245 src/testbed/gnunet-service-testbed_peers.c:1171
+#: src/arm/gnunet-arm.c:254 src/testbed/gnunet-service-testbed_peers.c:1171
 #, c-format
 msgid "%s is starting already"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:247 src/testbed/gnunet-service-testbed_peers.c:1173
+#: src/arm/gnunet-arm.c:256 src/testbed/gnunet-service-testbed_peers.c:1173
 #, c-format
 msgid "%s is stopping already"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:249 src/testbed/gnunet-service-testbed_peers.c:1175
+#: src/arm/gnunet-arm.c:258 src/testbed/gnunet-service-testbed_peers.c:1175
 #, c-format
 msgid "%s is started already"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:251 src/testbed/gnunet-service-testbed_peers.c:1177
+#: src/arm/gnunet-arm.c:260 src/testbed/gnunet-service-testbed_peers.c:1177
 #, c-format
 msgid "%s is stopped already"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:253 src/testbed/gnunet-service-testbed_peers.c:1179
+#: src/arm/gnunet-arm.c:262 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:255 src/testbed/gnunet-service-testbed_peers.c:1181
+#: src/arm/gnunet-arm.c:264 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:257
+#: src/arm/gnunet-arm.c:266
 #, c-format
 msgid "%s service cannot be started because ARM is shutting down"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:259 src/testbed/gnunet-service-testbed_peers.c:1185
+#: src/arm/gnunet-arm.c:268 src/testbed/gnunet-service-testbed_peers.c:1185
 #, c-format
 msgid "%.s Unknown result code."
 msgstr ""
 
-#: src/arm/gnunet-arm.c:291
+#: src/arm/gnunet-arm.c:300
 msgid "Fatal error initializing ARM API.\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:320 src/arm/gnunet-arm.c:329
+#: src/arm/gnunet-arm.c:328 src/arm/gnunet-arm.c:337
 #, fuzzy, c-format
 msgid "Failed to start the ARM service: %s\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/arm/gnunet-arm.c:364
+#: src/arm/gnunet-arm.c:371
 #, fuzzy, c-format
 msgid "Failed to send a stop request to the ARM service: %s\n"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/arm/gnunet-arm.c:375
+#: src/arm/gnunet-arm.c:382
 #, fuzzy, c-format
 msgid "Failed to stop the ARM service: %s\n"
 msgstr "打开日志文件“%s”失败:%s\n"
 
-#: src/arm/gnunet-arm.c:417
+#: src/arm/gnunet-arm.c:422
 #, fuzzy, c-format
-msgid "Failed to send a request to start the `%s' service: %%s\n"
+msgid "Failed to send a request to start the `%s' service: %s\n"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/arm/gnunet-arm.c:428
+#: src/arm/gnunet-arm.c:432
 #, fuzzy, c-format
 msgid "Failed to start the `%s' service: %s\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/arm/gnunet-arm.c:467
+#: src/arm/gnunet-arm.c:469
 #, fuzzy, c-format
 msgid "Failed to send a request to kill the `%s' service: %%s\n"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/arm/gnunet-arm.c:478
+#: src/arm/gnunet-arm.c:480
 #, fuzzy, c-format
 msgid "Failed to kill the `%s' service: %s\n"
 msgstr "运行 %s失败:%s %d\n"
 
-#: src/arm/gnunet-arm.c:519
+#: src/arm/gnunet-arm.c:521
 #, fuzzy, c-format
 msgid "Failed to request a list of services: %s\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/arm/gnunet-arm.c:528
+#: src/arm/gnunet-arm.c:530
 #, fuzzy
 msgid "Error communicating with ARM. ARM not running?\n"
 msgstr "连接 %s:%u 出错。守护程序在运行吗?\n"
 
-#: src/arm/gnunet-arm.c:534
+#: src/arm/gnunet-arm.c:536
 msgid "Running services:\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:622
+#: src/arm/gnunet-arm.c:624
 #, c-format
 msgid "Now only monitoring, press CTRL-C to stop.\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:654
+#: src/arm/gnunet-arm.c:656
 #, c-format
 msgid "Stopped %s.\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:657
+#: src/arm/gnunet-arm.c:659
 #, fuzzy, c-format
 msgid "Starting %s...\n"
 msgstr "未知的命令“%s”。\n"
 
-#: src/arm/gnunet-arm.c:660
+#: src/arm/gnunet-arm.c:662
 #, c-format
 msgid "Stopping %s...\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:674
+#: src/arm/gnunet-arm.c:676
 #, fuzzy, c-format
 msgid "Unknown status %u for service %s.\n"
 msgstr "未知的用户“%s”\n"
 
-#: src/arm/gnunet-arm.c:756
+#: src/arm/gnunet-arm.c:774
 #, fuzzy
 msgid "stop all GNUnet services"
 msgstr "卸载 GNUnet 服务"
 
-#: src/arm/gnunet-arm.c:758
+#: src/arm/gnunet-arm.c:776
 msgid "start a particular service"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:760
+#: src/arm/gnunet-arm.c:778
 msgid "stop a particular service"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:762
+#: src/arm/gnunet-arm.c:780
 #, fuzzy
 msgid "start all GNUnet default services"
 msgstr "卸载 GNUnet 服务"
 
-#: src/arm/gnunet-arm.c:765
+#: src/arm/gnunet-arm.c:783
 #, fuzzy
 msgid "stop and start all GNUnet default services"
 msgstr "卸载 GNUnet 服务"
 
-#: src/arm/gnunet-arm.c:768
+#: src/arm/gnunet-arm.c:786
 msgid "delete config file and directory on exit"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:771
+#: src/arm/gnunet-arm.c:789
 msgid "monitor ARM activities"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:773
+#: src/arm/gnunet-arm.c:791
 msgid "don't print status messages"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:776
+#: src/arm/gnunet-arm.c:794
 msgid "exit with error status if operation does not finish after DELAY"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:778
+#: src/arm/gnunet-arm.c:796
 msgid "list currently running services"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:780
+#: src/arm/gnunet-arm.c:798
 msgid "don't let gnunet-service-arm inherit standard output"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:782
+#: src/arm/gnunet-arm.c:800
 msgid "don't let gnunet-service-arm inherit standard error"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:794
+#: src/arm/gnunet-arm.c:812
 msgid "Control services and the Automated Restart Manager (ARM)"
 msgstr ""
 
@@ -250,20 +250,21 @@ msgstr ""
 #: src/arm/gnunet-service-arm.c:393 src/arm/gnunet-service-arm.c:399
 #: src/transport/plugin_transport_tcp.c:652
 #: src/transport/plugin_transport_tcp.c:658
-#: src/transport/plugin_transport_tcp.c:3309 src/util/service.c:584
-#: src/util/service.c:590 src/util/service_new.c:637 src/util/service_new.c:643
+#: src/transport/plugin_transport_tcp.c:3337 src/util/service.c:584
+#: src/util/service.c:590 src/util/service_new.c:637
+#: src/util/service_new.c:643
 #, c-format
 msgid "Require valid port number for service `%s' in configuration!\n"
 msgstr ""
 
 #: src/arm/gnunet-service-arm.c:430 src/transport/plugin_transport_tcp.c:689
-#: src/util/client.c:464 src/util/service.c:621 src/util/service_new.c:682
+#: src/util/client.c:466 src/util/service.c:621 src/util/service_new.c:682
 #, c-format
 msgid "UNIXPATH `%s' too long, maximum length is %llu\n"
 msgstr ""
 
 #: src/arm/gnunet-service-arm.c:434 src/transport/plugin_transport_tcp.c:693
-#: src/util/client.c:469 src/util/service.c:625 src/util/service_new.c:687
+#: src/util/client.c:471 src/util/service.c:625 src/util/service_new.c:687
 #, fuzzy, c-format
 msgid "Using `%s' instead\n"
 msgstr "%s:选项“%s”有歧义\n"
@@ -386,11 +387,13 @@ msgid ""
 "%llu\n"
 msgstr ""
 
-#: src/ats/gnunet-ats-solver-eval.c:3293 src/ats-tests/gnunet-solver-eval.c:935
+#: 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:938
+#: 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 ""
@@ -644,94 +647,108 @@ msgstr ""
 msgid "Print information about ATS state"
 msgstr "无法获取有关用户“%s”的信息:%s\n"
 
-#: src/auction/gnunet-auction-create.c:69
+#: src/auction/gnunet-auction-create.c:160
 msgid "description of the item to be sold"
 msgstr ""
 
-#: src/auction/gnunet-auction-create.c:72
+#: src/auction/gnunet-auction-create.c:163
 msgid "mapping of possible prices"
 msgstr ""
 
-#: src/auction/gnunet-auction-create.c:75
+#: src/auction/gnunet-auction-create.c:166
 msgid "max duration per round"
 msgstr ""
 
-#: src/auction/gnunet-auction-create.c:78
+#: src/auction/gnunet-auction-create.c:169
 msgid "duration until auction starts"
 msgstr ""
 
-#: src/auction/gnunet-auction-create.c:81
-msgid "number of items to sell, 0 for first price auction"
+#: src/auction/gnunet-auction-create.c:172
+msgid ""
+"number of items to sell\n"
+"0 for first price auction\n"
+">0 for vickrey/M+1st price auction"
 msgstr ""
 
-#: src/auction/gnunet-auction-create.c:84
+#: src/auction/gnunet-auction-create.c:177
 msgid "public auction outcome"
 msgstr ""
 
-#: src/auction/gnunet-auction-create.c:94 src/auction/gnunet-auction-info.c:76
-#: src/auction/gnunet-auction-join.c:76
+#: src/auction/gnunet-auction-create.c:180
+msgid "keep running in foreground until auction completes"
+msgstr ""
+
+#: src/auction/gnunet-auction-create.c:190
+msgid "create a new auction and start listening for bidders"
+msgstr ""
+
+#: src/auction/gnunet-auction-info.c:76 src/auction/gnunet-auction-join.c:76
 #: src/conversation/gnunet-conversation-test.c:243
 #: src/revocation/gnunet-revocation.c:550 src/template/gnunet-template.c:76
 msgid "help text"
 msgstr ""
 
-#: src/cadet/gnunet-cadet.c:511
-#, fuzzy, c-format
-msgid "Invalid target `%s'\n"
-msgstr "“%s”的参数无效。\n"
-
-#: src/cadet/gnunet-cadet.c:787
+#: src/cadet/gnunet-cadet.c:668
 #, fuzzy, c-format
 msgid "Invalid peer ID `%s'\n"
 msgstr "无效条目。\n"
 
-#: src/cadet/gnunet-cadet.c:825
+#: src/cadet/gnunet-cadet.c:706
 #, fuzzy, c-format
 msgid "Invalid tunnel owner `%s'\n"
 msgstr "IP 格式无效:“%s”\n"
 
-#: src/cadet/gnunet-cadet.c:892
+#: src/cadet/gnunet-cadet.c:779
 msgid "You must NOT give a TARGET when using 'request all' options\n"
 msgstr ""
 
-#: src/cadet/gnunet-cadet.c:982
+#: src/cadet/gnunet-cadet.c:870
+#, fuzzy, c-format
+msgid "Invalid target `%s'\n"
+msgstr "“%s”的参数无效。\n"
+
+#: src/cadet/gnunet-cadet.c:907
+msgid "No action requested\n"
+msgstr ""
+
+#: src/cadet/gnunet-cadet.c:929
 #, fuzzy
 msgid "provide information about a particular connection"
 msgstr "无法获取有关用户“%s”的信息:%s\n"
 
-#: src/cadet/gnunet-cadet.c:985
+#: src/cadet/gnunet-cadet.c:932
 msgid "activate echo mode"
 msgstr ""
 
-#: src/cadet/gnunet-cadet.c:988
+#: src/cadet/gnunet-cadet.c:935
 msgid "dump debug information to STDERR"
 msgstr ""
 
-#: src/cadet/gnunet-cadet.c:994
+#: src/cadet/gnunet-cadet.c:938
 msgid "port to listen to"
 msgstr ""
 
-#: src/cadet/gnunet-cadet.c:997
+#: src/cadet/gnunet-cadet.c:941
 #, fuzzy
 msgid "provide information about a patricular peer"
 msgstr "无法获取有关用户“%s”的信息:%s\n"
 
-#: src/cadet/gnunet-cadet.c:1000
+#: src/cadet/gnunet-cadet.c:944
 #, fuzzy
 msgid "provide information about all peers"
 msgstr "无法获取有关用户“%s”的信息:%s\n"
 
-#: src/cadet/gnunet-cadet.c:1003
+#: src/cadet/gnunet-cadet.c:947
 #, fuzzy
 msgid "provide information about a particular tunnel"
 msgstr "无法获取有关用户“%s”的信息:%s\n"
 
-#: src/cadet/gnunet-cadet.c:1006
+#: src/cadet/gnunet-cadet.c:950
 #, fuzzy
 msgid "provide information about all tunnels"
 msgstr "无法获取有关用户“%s”的信息:%s\n"
 
-#: src/cadet/gnunet-service-cadet_peer.c:686
+#: src/cadet/gnunet-service-cadet_peer.c:687
 msgid "Wrong CORE service\n"
 msgstr ""
 
@@ -1279,12 +1296,12 @@ msgstr ""
 msgid "# messages discarded (session disconnected)"
 msgstr ""
 
-#: src/core/gnunet-service-core.c:928
+#: src/core/gnunet-service-core.c:937
 #, fuzzy
 msgid "Core service is lacking HOSTKEY configuration setting.  Exiting.\n"
 msgstr "立即保存配置?"
 
-#: src/core/gnunet-service-core.c:949
+#: src/core/gnunet-service-core.c:958
 #, fuzzy, c-format
 msgid "Core service of `%s' ready.\n"
 msgstr "服务已删除。\n"
@@ -1393,31 +1410,31 @@ msgstr ""
 msgid "# sessions terminated by key expiration"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1554
-#: src/core/gnunet-service-core_kx.c:1580
+#: src/core/gnunet-service-core_kx.c:1557
+#: src/core/gnunet-service-core_kx.c:1583
 msgid "# bytes dropped (duplicates)"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1567
+#: src/core/gnunet-service-core_kx.c:1570
 msgid "# bytes dropped (out of sequence)"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1609
+#: src/core/gnunet-service-core_kx.c:1612
 msgid "# bytes dropped (ancient message)"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1617
+#: src/core/gnunet-service-core_kx.c:1620
 msgid "# bytes of payload decrypted"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1674
+#: src/core/gnunet-service-core_kx.c:1681
 msgid "# PAYLOAD dropped (out of order)"
 msgstr ""
 
-#: 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/core/gnunet-service-core_sessions.c:266
+#: src/core/gnunet-service-core_sessions.c:356
+#: src/dht/gnunet-service-dht_neighbours.c:732
+#: src/dht/gnunet-service-dht_neighbours.c:794
 #: 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
@@ -1426,26 +1443,26 @@ msgstr ""
 msgid "# peers connected"
 msgstr ""
 
-#: src/core/gnunet-service-core_sessions.c:287
+#: src/core/gnunet-service-core_sessions.c:302
 msgid "# type map refreshes sent"
 msgstr ""
 
-#: src/core/gnunet-service-core_sessions.c:407
+#: src/core/gnunet-service-core_sessions.c:422
 #, fuzzy
 msgid "# outdated typemap confirmations received"
 msgstr "保存配置失败。"
 
-#: src/core/gnunet-service-core_sessions.c:418
+#: src/core/gnunet-service-core_sessions.c:439
 #, fuzzy
 msgid "# valid typemap confirmations received"
 msgstr "保存配置失败。"
 
 #: src/core/gnunet-service-core_typemap.c:169
-#: src/core/gnunet-service-core_typemap.c:180
+#: src/core/gnunet-service-core_typemap.c:181
 msgid "# type maps received"
 msgstr ""
 
-#: src/core/gnunet-service-core_typemap.c:210
+#: src/core/gnunet-service-core_typemap.c:212
 msgid "# updates to my type map"
 msgstr ""
 
@@ -1484,7 +1501,7 @@ msgstr ""
 msgid "# proximity search requests received"
 msgstr ""
 
-#: src/datacache/plugin_datacache_heap.c:467
+#: src/datacache/plugin_datacache_heap.c:466
 #, fuzzy
 msgid "Heap datacache running\n"
 msgstr "sqlite 数据仓库"
@@ -1506,7 +1523,7 @@ msgstr "sqlite 数据仓库"
 #: 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:691 src/include/gnunet_common.h:700
+#: src/include/gnunet_common.h:720 src/include/gnunet_common.h:729
 #: src/scalarproduct/scalarproduct.h:35
 #, fuzzy, c-format
 msgid "`%s' failed at %s:%d with error: %s\n"
@@ -1561,23 +1578,19 @@ msgstr ""
 msgid "# RELEASE RESERVE requests executed"
 msgstr ""
 
-#: src/datastore/datastore_api.c:1187
-msgid "# UPDATE requests executed"
-msgstr ""
-
-#: src/datastore/datastore_api.c:1271
+#: src/datastore/datastore_api.c:1205
 msgid "# REMOVE requests executed"
 msgstr ""
 
-#: src/datastore/datastore_api.c:1331
+#: src/datastore/datastore_api.c:1265
 msgid "# GET REPLICATION requests executed"
 msgstr ""
 
-#: src/datastore/datastore_api.c:1397
+#: src/datastore/datastore_api.c:1331
 msgid "# GET ZERO ANONYMITY requests executed"
 msgstr ""
 
-#: src/datastore/datastore_api.c:1477
+#: src/datastore/datastore_api.c:1411
 msgid "# GET requests executed"
 msgstr ""
 
@@ -1641,7 +1654,7 @@ msgstr ""
 #: 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
+#: src/datastore/gnunet-service-datastore.c:1619
 msgid "# reserved"
 msgstr ""
 
@@ -1666,94 +1679,90 @@ msgstr ""
 msgid "# requests filtered by bloomfilter"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1115
-msgid "# UPDATE requests received"
-msgstr ""
-
-#: src/datastore/gnunet-service-datastore.c:1146
+#: src/datastore/gnunet-service-datastore.c:1097
 msgid "# GET REPLICATION requests received"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1179
+#: src/datastore/gnunet-service-datastore.c:1130
 msgid "# GET ZERO ANONYMITY requests received"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1226
+#: src/datastore/gnunet-service-datastore.c:1177
 msgid "Content not found"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1235
+#: src/datastore/gnunet-service-datastore.c:1186
 msgid "# bytes removed (explicit request)"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1282
+#: src/datastore/gnunet-service-datastore.c:1233
 msgid "# REMOVE requests received"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1336
+#: src/datastore/gnunet-service-datastore.c:1287
 #, c-format
 msgid ""
 "Datastore payload must have been inaccurate (%lld < %lld). Recomputing it.\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1342
-#: src/datastore/gnunet-service-datastore.c:1517
+#: src/datastore/gnunet-service-datastore.c:1293
+#: src/datastore/gnunet-service-datastore.c:1468
 #, c-format
 msgid "New payload: %lld\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1396
+#: src/datastore/gnunet-service-datastore.c:1347
 #, c-format
 msgid "Loading `%s' datastore plugin\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1408
+#: src/datastore/gnunet-service-datastore.c:1359
 #, fuzzy, c-format
 msgid "Failed to load datastore plugin for `%s'\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/datastore/gnunet-service-datastore.c:1468
+#: src/datastore/gnunet-service-datastore.c:1419
 msgid "Bloomfilter construction complete.\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1524
+#: src/datastore/gnunet-service-datastore.c:1475
 msgid "Rebuilding bloomfilter.  Please be patient.\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1535
+#: src/datastore/gnunet-service-datastore.c:1486
 msgid "Plugin does not support get_keys function. Please fix!\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1705
+#: src/datastore/gnunet-service-datastore.c:1656
 #, c-format
 msgid "# bytes used in file-sharing datastore `%s'"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1721
+#: src/datastore/gnunet-service-datastore.c:1672
 msgid "# quota"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1726
+#: src/datastore/gnunet-service-datastore.c:1677
 msgid "# cache size"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1742
+#: src/datastore/gnunet-service-datastore.c:1693
 #, c-format
 msgid "Could not use specified filename `%s' for bloomfilter.\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1760
-#: src/datastore/gnunet-service-datastore.c:1776
+#: src/datastore/gnunet-service-datastore.c:1711
+#: src/datastore/gnunet-service-datastore.c:1727
 #, fuzzy, c-format
 msgid "Failed to remove bogus bloomfilter file `%s'\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/datastore/gnunet-service-datastore.c:1808
+#: src/datastore/gnunet-service-datastore.c:1759
 #, fuzzy
 msgid "Failed to initialize bloomfilter.\n"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/datastore/plugin_datastore_heap.c:826
+#: src/datastore/plugin_datastore_heap.c:824
 #, fuzzy
 msgid "Heap database running\n"
 msgstr "sqlite 数据仓库"
@@ -1838,56 +1847,56 @@ msgstr "sqlite 数据仓库"
 msgid "Template database running\n"
 msgstr ""
 
-#: src/dht/gnunet-dht-get.c:155
+#: src/dht/gnunet-dht-get.c:157
 #, c-format
 msgid ""
 "Result %d, type %d:\n"
 "%.*s\n"
 msgstr ""
 
-#: src/dht/gnunet-dht-get.c:181
+#: src/dht/gnunet-dht-get.c:204
 msgid "Must provide key for DHT GET!\n"
 msgstr ""
 
-#: src/dht/gnunet-dht-get.c:187 src/dht/gnunet-dht-monitor.c:248
+#: src/dht/gnunet-dht-get.c:210 src/dht/gnunet-dht-monitor.c:248
 #, fuzzy
 msgid "Failed to connect to DHT service!\n"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/dht/gnunet-dht-get.c:195
+#: src/dht/gnunet-dht-get.c:218
 msgid "Issueing DHT GET with key"
 msgstr ""
 
-#: src/dht/gnunet-dht-get.c:212 src/dht/gnunet-dht-monitor.c:289
-#: src/dht/gnunet-dht-put.c:198
+#: src/dht/gnunet-dht-get.c:235 src/dht/gnunet-dht-monitor.c:289
+#: src/dht/gnunet-dht-put.c:207
 msgid "the query key"
 msgstr ""
 
-#: src/dht/gnunet-dht-get.c:215
+#: src/dht/gnunet-dht-get.c:238
 msgid "how many parallel requests (replicas) to create"
 msgstr ""
 
-#: src/dht/gnunet-dht-get.c:218 src/dht/gnunet-dht-monitor.c:292
+#: src/dht/gnunet-dht-get.c:241 src/dht/gnunet-dht-monitor.c:292
 msgid "the type of data to look for"
 msgstr ""
 
-#: src/dht/gnunet-dht-get.c:221
+#: src/dht/gnunet-dht-get.c:244
 msgid "how long to execute this query before giving up?"
 msgstr ""
 
-#: src/dht/gnunet-dht-get.c:224 src/dht/gnunet-dht-put.c:201
+#: src/dht/gnunet-dht-get.c:247 src/dht/gnunet-dht-put.c:210
 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:210 src/fs/gnunet-auto-share.c:780
+#: src/dht/gnunet-dht-get.c:250 src/dht/gnunet-dht-monitor.c:298
+#: src/dht/gnunet-dht-put.c:222 src/fs/gnunet-auto-share.c:780
 #: src/fs/gnunet-download.c:327 src/fs/gnunet-publish.c:951
 #: src/fs/gnunet-search.c:322 src/fs/gnunet-unindex.c:167
 #: src/nse/gnunet-nse-profiler.c:855
 msgid "be verbose (print progress information)"
 msgstr ""
 
-#: src/dht/gnunet-dht-get.c:248
+#: src/dht/gnunet-dht-get.c:271
 msgid "Issue a GET request to the GNUnet DHT, prints results."
 msgstr ""
 
@@ -1899,7 +1908,8 @@ msgstr ""
 msgid "Prints all packets that go through the DHT."
 msgstr ""
 
-#: src/dht/gnunet_dht_profiler.c:1161 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 的最大连接数"
@@ -1945,63 +1955,67 @@ msgstr ""
 msgid "Measure quality and performance of the DHT service."
 msgstr "无法访问该服务"
 
-#: src/dht/gnunet-dht-put.c:115
+#: src/dht/gnunet-dht-put.c:120
 msgid "PUT request sent with key"
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:118
+#: src/dht/gnunet-dht-put.c:123
 msgid "Timeout sending PUT request!\n"
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:121
+#: src/dht/gnunet-dht-put.c:126
 msgid "PUT request not confirmed!\n"
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:151
+#: src/dht/gnunet-dht-put.c:157
 msgid "Must provide KEY and DATA for DHT put!\n"
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:158
+#: src/dht/gnunet-dht-put.c:164
 #, fuzzy, c-format
 msgid "Could not connect to %s service!\n"
 msgstr "无法连接到 %s:%u:%s\n"
 
-#: src/dht/gnunet-dht-put.c:172
+#: src/dht/gnunet-dht-put.c:175
 #, c-format
 msgid "Issuing put request for `%s' with data `%s'!\n"
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:192
+#: src/dht/gnunet-dht-put.c:201
 msgid "the data to insert under the key"
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:195
+#: src/dht/gnunet-dht-put.c:204
 msgid "how long to store this entry in the dht (in seconds)"
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:204
+#: src/dht/gnunet-dht-put.c:213
 msgid "how many replicas to create"
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:207
+#: src/dht/gnunet-dht-put.c:216
+msgid "use DHT's record route option"
+msgstr ""
+
+#: src/dht/gnunet-dht-put.c:219
 msgid "the type to insert data as"
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:232
+#: src/dht/gnunet-dht-put.c:247
 msgid "Issue a PUT request to the GNUnet DHT insert DATA under KEY."
 msgstr ""
 
-#: src/dht/gnunet-service-dht_clients.c:370
+#: src/dht/gnunet-service-dht_clients.c:369
 #: src/dht/gnunet-service-wdht_clients.c:864
 msgid "# GET requests from clients injected"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_clients.c:481
+#: src/dht/gnunet-service-dht_clients.c:482
 #: src/dht/gnunet-service-wdht_clients.c:945
 msgid "# PUT requests received from clients"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_clients.c:620
+#: src/dht/gnunet-service-dht_clients.c:621
 #: src/dht/gnunet-service-wdht_clients.c:1011
 msgid "# GET requests received from clients"
 msgstr ""
@@ -2021,18 +2035,18 @@ msgstr ""
 msgid "# Duplicate REPLIES to CLIENT request dropped"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_clients.c:1094
+#: src/dht/gnunet-service-dht_clients.c:1093
 #: src/dht/gnunet-service-wdht_clients.c:566
 #, c-format
 msgid "Unsupported block type (%u) in request!\n"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_clients.c:1101
+#: src/dht/gnunet-service-dht_clients.c:1100
 #: src/dht/gnunet-service-wdht_clients.c:589
 msgid "# RESULTS queued for clients"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_clients.c:1179
+#: src/dht/gnunet-service-dht_clients.c:1178
 #: src/dht/gnunet-service-wdht_clients.c:643
 #: src/dht/gnunet-service-wdht_clients.c:693
 msgid "# REPLIES ignored for CLIENTS (no match)"
@@ -2047,68 +2061,69 @@ msgstr ""
 msgid "# ITEMS stored in datacache"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_datacache.c:199
+#: src/dht/gnunet-service-dht_datacache.c:198
 msgid "# Good RESULTS found in datacache"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_datacache.c:211
+#: src/dht/gnunet-service-dht_datacache.c:210
 msgid "# Duplicate RESULTS found in datacache"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_datacache.c:217
+#: src/dht/gnunet-service-dht_datacache.c:216
 msgid "# Invalid RESULTS found in datacache"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_datacache.c:223
+#: src/dht/gnunet-service-dht_datacache.c:222
 msgid "# Irrelevant RESULTS found in datacache"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_datacache.c:235
+#: src/dht/gnunet-service-dht_datacache.c:234
 msgid "# Unsupported RESULTS found in datacache"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_datacache.c:239
+#: src/dht/gnunet-service-dht_datacache.c:238
 #, c-format
 msgid "Unsupported block type (%u) in local response!\n"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_datacache.c:276
+#: src/dht/gnunet-service-dht_datacache.c:273
 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:86
+#: src/dht/gnunet-service-xdht_hello.c:82
 msgid "# HELLOs obtained from peerinfo"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:685
+#: src/dht/gnunet-service-dht_neighbours.c:671
 msgid "# FIND PEER messages initiated"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:851
+#: src/dht/gnunet-service-dht_neighbours.c:842
 msgid "# requests TTL-dropped"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1054
-#: src/dht/gnunet-service-dht_neighbours.c:1091
+#: src/dht/gnunet-service-dht_neighbours.c:1045
+#: src/dht/gnunet-service-dht_neighbours.c:1082
 msgid "# Peers excluded from routing due to Bloomfilter"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1071
-#: src/dht/gnunet-service-dht_neighbours.c:1107
+#: src/dht/gnunet-service-dht_neighbours.c:1062
+#: src/dht/gnunet-service-dht_neighbours.c:1098
 msgid "# Peer selection failed"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1255
+#: src/dht/gnunet-service-dht_neighbours.c:1246
 msgid "# PUT requests routed"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1288
+#: src/dht/gnunet-service-dht_neighbours.c:1279
 msgid "# PUT messages queued for transmission"
 msgstr ""
 
-#: 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-dht_neighbours.c:1290
+#: src/dht/gnunet-service-dht_neighbours.c:1430
+#: src/dht/gnunet-service-dht_neighbours.c:1533
 #: src/dht/gnunet-service-xdht_neighbours.c:946
 #: src/dht/gnunet-service-xdht_neighbours.c:1007
 #: src/dht/gnunet-service-xdht_neighbours.c:1047
@@ -2121,55 +2136,55 @@ msgstr ""
 msgid "# P2P messages dropped due to full queue"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1383
+#: src/dht/gnunet-service-dht_neighbours.c:1375
 msgid "# GET requests routed"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1415
+#: src/dht/gnunet-service-dht_neighbours.c:1418
 msgid "# GET messages queued for transmission"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1547
+#: src/dht/gnunet-service-dht_neighbours.c:1548
 msgid "# RESULT messages queued for transmission"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1646
+#: src/dht/gnunet-service-dht_neighbours.c:1647
 msgid "# P2P PUT requests received"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1650
+#: src/dht/gnunet-service-dht_neighbours.c:1651
 msgid "# P2P PUT bytes received"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1858
+#: src/dht/gnunet-service-dht_neighbours.c:1869
 msgid "# FIND PEER requests ignored due to Bloomfilter"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1866
+#: src/dht/gnunet-service-dht_neighbours.c:1877
 msgid "# FIND PEER requests ignored due to lack of HELLO"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:2022
+#: src/dht/gnunet-service-dht_neighbours.c:2029
 msgid "# P2P GET requests received"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:2026
+#: src/dht/gnunet-service-dht_neighbours.c:2033
 msgid "# P2P GET bytes received"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:2101
+#: src/dht/gnunet-service-dht_neighbours.c:2104
 msgid "# P2P FIND PEER requests processed"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:2124
+#: src/dht/gnunet-service-dht_neighbours.c:2125
 msgid "# P2P GET requests ONLY routed"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:2226
+#: src/dht/gnunet-service-dht_neighbours.c:2223
 msgid "# P2P RESULTS received"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:2230
+#: src/dht/gnunet-service-dht_neighbours.c:2227
 msgid "# P2P RESULT bytes received"
 msgstr ""
 
@@ -2177,27 +2192,27 @@ msgstr ""
 msgid "# Network size estimates received"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_routing.c:220
+#: src/dht/gnunet-service-dht_routing.c:218
 msgid "# Good REPLIES matched against routing table"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_routing.c:229
+#: src/dht/gnunet-service-dht_routing.c:232
 msgid "# Duplicate REPLIES matched against routing table"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_routing.c:235
+#: src/dht/gnunet-service-dht_routing.c:238
 msgid "# Invalid REPLIES matched against routing table"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_routing.c:241
+#: src/dht/gnunet-service-dht_routing.c:244
 msgid "# Irrelevant REPLIES matched against routing table"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_routing.c:253
+#: src/dht/gnunet-service-dht_routing.c:256
 msgid "# Unsupported REPLIES matched against routing table"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_routing.c:329
+#: src/dht/gnunet-service-dht_routing.c:335
 msgid "# Entries removed from routing table"
 msgstr ""
 
@@ -2205,7 +2220,7 @@ msgstr ""
 msgid "# Entries added to routing table"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_routing.c:429
+#: src/dht/gnunet-service-dht_routing.c:433
 msgid "# DHT requests combined"
 msgstr ""
 
@@ -2316,16 +2331,16 @@ msgid ""
 "SUPU %s, %s, %d, trail->prev_hop = %s"
 msgstr ""
 
-#: src/dht/plugin_block_dht.c:144
+#: src/dht/plugin_block_dht.c:167
 #, c-format
 msgid "Block not of type %u\n"
 msgstr ""
 
-#: src/dht/plugin_block_dht.c:151
+#: src/dht/plugin_block_dht.c:174
 msgid "Size mismatch for block\n"
 msgstr ""
 
-#: src/dht/plugin_block_dht.c:161
+#: src/dht/plugin_block_dht.c:184
 #, c-format
 msgid "Block of type %u is malformed\n"
 msgstr ""
@@ -2430,7 +2445,7 @@ msgstr ""
 msgid "# DNS requests received via TUN interface"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:1078 src/exit/gnunet-daemon-exit.c:3643
+#: src/dns/gnunet-service-dns.c:1078 src/exit/gnunet-daemon-exit.c:3642
 #, fuzzy
 msgid "need a valid IPv4 or IPv6 address\n"
 msgstr "无效的进程优先级“%s”\n"
@@ -2449,204 +2464,204 @@ msgstr ""
 msgid "Print information about DV state"
 msgstr "无法获取有关用户“%s”的信息:%s\n"
 
-#: src/exit/gnunet-daemon-exit.c:805 src/exit/gnunet-daemon-exit.c:3109
+#: src/exit/gnunet-daemon-exit.c:804 src/exit/gnunet-daemon-exit.c:3108
 #, fuzzy
 msgid "# Inbound CADET channels created"
 msgstr ""
 "\n"
 "按任意键继续\n"
 
-#: src/exit/gnunet-daemon-exit.c:861
+#: src/exit/gnunet-daemon-exit.c:860
 #, c-format
 msgid "Got duplicate service records for `%s:%u'\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:914
+#: src/exit/gnunet-daemon-exit.c:913
 #, fuzzy
 msgid "# Bytes transmitted via cadet channels"
 msgstr ""
 "\n"
 "按任意键继续\n"
 
-#: 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
+#: src/exit/gnunet-daemon-exit.c:1032 src/exit/gnunet-daemon-exit.c:2492
+#: src/exit/gnunet-daemon-exit.c:2745 src/vpn/gnunet-service-vpn.c:1454
+#: src/vpn/gnunet-service-vpn.c:1845 src/vpn/gnunet-service-vpn.c:2008
 msgid "# ICMPv4 packets dropped (type not allowed)"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c: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
+#: src/exit/gnunet-daemon-exit.c:1069 src/exit/gnunet-daemon-exit.c:2551
+#: src/exit/gnunet-daemon-exit.c:2804 src/vpn/gnunet-service-vpn.c:1510
+#: src/vpn/gnunet-service-vpn.c:1904 src/vpn/gnunet-service-vpn.c:2041
 msgid "# ICMPv6 packets dropped (type not allowed)"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:1118
+#: src/exit/gnunet-daemon-exit.c:1117
 msgid "# ICMP packets dropped (not allowed)"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:1126
+#: src/exit/gnunet-daemon-exit.c:1125
 msgid "ICMP Packet dropped, have no matching connection information\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:1203
+#: src/exit/gnunet-daemon-exit.c:1202
 msgid "UDP Packet dropped, have no matching connection information\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:1278
+#: src/exit/gnunet-daemon-exit.c:1277
 msgid "TCP Packet dropped, have no matching connection information\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:1331
+#: src/exit/gnunet-daemon-exit.c:1330
 msgid "# Packets received from TUN"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:1345
+#: src/exit/gnunet-daemon-exit.c:1344
 msgid "# Bytes received from TUN"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:1371
+#: src/exit/gnunet-daemon-exit.c:1370
 msgid "IPv4 packet options received.  Ignored.\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:1398
+#: src/exit/gnunet-daemon-exit.c:1397
 #, c-format
 msgid "IPv4 packet with unsupported next header %u received.  Ignored.\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:1444
+#: src/exit/gnunet-daemon-exit.c:1443
 #, c-format
 msgid "IPv6 packet with unsupported next header %d received.  Ignored.\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:1452
+#: src/exit/gnunet-daemon-exit.c:1451
 #, c-format
 msgid "Packet from unknown protocol %u received.  Ignored.\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:1853
+#: src/exit/gnunet-daemon-exit.c:1852
 msgid "# TCP packets sent via TUN"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:1977
+#: src/exit/gnunet-daemon-exit.c:1976
 msgid "# TCP service creation requests received via cadet"
 msgstr ""
 
-#: 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
+#: src/exit/gnunet-daemon-exit.c:1980 src/exit/gnunet-daemon-exit.c:2059
+#: src/exit/gnunet-daemon-exit.c:2166 src/exit/gnunet-daemon-exit.c:2416
+#: src/exit/gnunet-daemon-exit.c:2666 src/exit/gnunet-daemon-exit.c:2953
+#: src/exit/gnunet-daemon-exit.c:3056
 msgid "# Bytes received from CADET"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:2063
+#: src/exit/gnunet-daemon-exit.c:2062
 msgid "# TCP IP-exit creation requests received via cadet"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:2170
+#: src/exit/gnunet-daemon-exit.c:2169
 msgid "# TCP data requests received via cadet"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:2184
+#: src/exit/gnunet-daemon-exit.c:2183
 msgid "# TCP DATA requests dropped (no session)"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:2246
+#: src/exit/gnunet-daemon-exit.c:2245
 msgid "# ICMP packets sent via TUN"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:2420
+#: src/exit/gnunet-daemon-exit.c:2419
 msgid "# ICMP IP-exit requests received via cadet"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:2670
+#: src/exit/gnunet-daemon-exit.c:2669
 msgid "# ICMP service requests received via cadet"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:2731 src/vpn/gnunet-service-vpn.c:1445
-#: src/vpn/gnunet-service-vpn.c:2003
+#: src/exit/gnunet-daemon-exit.c:2730 src/vpn/gnunet-service-vpn.c:1444
+#: src/vpn/gnunet-service-vpn.c:2002
 msgid "# ICMPv4 packets dropped (impossible PT to v6)"
 msgstr ""
 
-#: 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
+#: src/exit/gnunet-daemon-exit.c:2789 src/vpn/gnunet-service-vpn.c:1480
+#: src/vpn/gnunet-service-vpn.c:1492 src/vpn/gnunet-service-vpn.c:1892
 msgid "# ICMPv6 packets dropped (impossible PT to v4)"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:2841
+#: src/exit/gnunet-daemon-exit.c:2840
 msgid "# UDP packets sent via TUN"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:2957
+#: src/exit/gnunet-daemon-exit.c:2956
 msgid "# UDP IP-exit requests received via cadet"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3060
+#: src/exit/gnunet-daemon-exit.c:3059
 msgid "# UDP service requests received via cadet"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3327 src/exit/gnunet-daemon-exit.c:3337
+#: src/exit/gnunet-daemon-exit.c:3326 src/exit/gnunet-daemon-exit.c:3336
 #, fuzzy, c-format
 msgid "Option `%s' for domain `%s' is not formatted correctly!\n"
 msgstr "%s:选项“%s”有歧义\n"
 
-#: src/exit/gnunet-daemon-exit.c:3351 src/exit/gnunet-daemon-exit.c:3359
+#: src/exit/gnunet-daemon-exit.c:3350 src/exit/gnunet-daemon-exit.c:3358
 #, c-format
 msgid "`%s' is not a valid port number (for domain `%s')!"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3400
+#: src/exit/gnunet-daemon-exit.c:3399
 #, c-format
 msgid "No addresses found for hostname `%s' of service `%s'!\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3414 src/exit/gnunet-daemon-exit.c:3427
+#: src/exit/gnunet-daemon-exit.c:3413 src/exit/gnunet-daemon-exit.c:3426
 #, c-format
 msgid "Service `%s' configured for IPv4, but IPv4 is disabled!\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3439
+#: src/exit/gnunet-daemon-exit.c:3438
 #, c-format
 msgid "No IP addresses found for hostname `%s' of service `%s'!\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3584
+#: src/exit/gnunet-daemon-exit.c:3583
 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:3592
+#: src/exit/gnunet-daemon-exit.c:3591
 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:3599
+#: src/exit/gnunet-daemon-exit.c:3598
 msgid ""
 "Cannot enable IPv4 exit but disable IPv4 on TUN interface, will use "
 "ENABLE_IPv4=YES\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3605
+#: src/exit/gnunet-daemon-exit.c:3604
 msgid ""
 "Cannot enable IPv6 exit but disable IPv6 on TUN interface, will use "
 "ENABLE_IPv6=YES\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3765
+#: src/exit/gnunet-daemon-exit.c:3764
 msgid "Must be a number"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3872
+#: src/exit/gnunet-daemon-exit.c:3871
 #, 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
+#: src/exit/gnunet-daemon-exit.c:3883 src/pt/gnunet-daemon-pt.c:1279
 msgid "No useful service enabled.  Exiting.\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:4029
+#: src/exit/gnunet-daemon-exit.c:4028
 msgid "Daemon to run to provide an IP exit node for the VPN"
 msgstr ""
 
@@ -2687,15 +2702,15 @@ msgstr ""
 msgid "# total size of fragmented messages"
 msgstr ""
 
-#: src/fragmentation/fragmentation.c:455
+#: src/fragmentation/fragmentation.c:456
 msgid "# fragment acknowledgements received"
 msgstr ""
 
-#: src/fragmentation/fragmentation.c:462
+#: src/fragmentation/fragmentation.c:463
 msgid "# bits removed from fragmentation ACKs"
 msgstr ""
 
-#: src/fragmentation/fragmentation.c:486
+#: src/fragmentation/fragmentation.c:487
 msgid "# fragmentation transmissions completed"
 msgstr ""
 
@@ -2724,46 +2739,46 @@ msgstr "打开日志文件“%s”失败:%s\n"
 msgid "Failure while resuming publishing operation `%s': %s\n"
 msgstr ""
 
-#: src/fs/fs_api.c:1660
+#: src/fs/fs_api.c:1662
 #, fuzzy, c-format
 msgid "Failed to resume publishing operation `%s': %s\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/fs/fs_api.c:2318
+#: src/fs/fs_api.c:2322
 #, c-format
 msgid "Failure while resuming unindexing operation `%s': %s\n"
 msgstr ""
 
-#: src/fs/fs_api.c:2328
+#: src/fs/fs_api.c:2332
 #, fuzzy, c-format
 msgid "Failed to resume unindexing operation `%s': %s\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/fs/fs_api.c:2456 src/fs/fs_api.c:2703
+#: src/fs/fs_api.c:2460 src/fs/fs_api.c:2706
 #, fuzzy, c-format
 msgid "Failed to resume sub-download `%s': %s\n"
 msgstr "打开日志文件“%s”失败:%s\n"
 
-#: src/fs/fs_api.c:2474
+#: src/fs/fs_api.c:2478
 #, fuzzy, c-format
 msgid "Failed to resume sub-search `%s': %s\n"
 msgstr "打开日志文件“%s”失败:%s\n"
 
-#: src/fs/fs_api.c:2489 src/fs/fs_api.c:2508 src/fs/fs_api.c:3006
+#: src/fs/fs_api.c:2493 src/fs/fs_api.c:2512 src/fs/fs_api.c:3016
 #, c-format
 msgid "Failure while resuming search operation `%s': %s\n"
 msgstr ""
 
-#: src/fs/fs_api.c:2693
+#: src/fs/fs_api.c:2696
 #, fuzzy, c-format
 msgid "Failed to resume sub-download `%s': could not open file `%s'\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/fs/fs_api.c:2949
+#: src/fs/fs_api.c:2959
 msgid "Could not resume running search, will resume as paused search\n"
 msgstr ""
 
-#: src/fs/fs_api.c:3044
+#: src/fs/fs_api.c:3054
 #, c-format
 msgid "Failure while resuming download operation `%s': %s\n"
 msgstr ""
@@ -2823,7 +2838,7 @@ msgstr "解析配置文件“%s”失败\n"
 msgid "internal error decoding tree"
 msgstr "未知错误。\n"
 
-#: src/fs/fs_download.c:1838
+#: src/fs/fs_download.c:1845
 #, fuzzy
 msgid "Invalid URI"
 msgstr "无效条目。\n"
@@ -3543,46 +3558,46 @@ msgstr ""
 msgid "Hash mismatch trying to index file `%s' which does not have hash `%s'\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs.c:1288
+#: src/fs/gnunet-service-fs.c:1287
 #, fuzzy
 msgid "FS service is lacking HOSTKEY configuration setting.  Exiting.\n"
 msgstr "立即保存配置?"
 
-#: src/fs/gnunet-service-fs.c:1313 src/hostlist/gnunet-daemon-hostlist.c:355
+#: src/fs/gnunet-service-fs.c:1312 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:494
+#: src/fs/gnunet-service-fs_cadet_client.c:370
 msgid "# replies received via cadet"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cadet_client.c:508
+#: src/fs/gnunet-service-fs_cadet_client.c:384
 msgid "# replies received via cadet dropped"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cadet_server.c:258
-msgid "# Blocks transferred via cadet"
+#: src/fs/gnunet-service-fs_cadet_server.c:263
+msgid "# queries received via CADET not answered"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cadet_server.c:360
-msgid "# queries received via CADET not answered"
+#: src/fs/gnunet-service-fs_cadet_server.c:317
+msgid "# Blocks transferred via cadet"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cadet_server.c:440
+#: src/fs/gnunet-service-fs_cadet_server.c:343
 msgid "# queries received via cadet"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cadet_server.c:484
+#: src/fs/gnunet-service-fs_cadet_server.c:384
 #, fuzzy
 msgid "# cadet client connections rejected"
 msgstr ""
 "\n"
 "按任意键继续\n"
 
-#: src/fs/gnunet-service-fs_cadet_server.c:490
-#: src/fs/gnunet-service-fs_cadet_server.c:530
+#: src/fs/gnunet-service-fs_cadet_server.c:391
+#: src/fs/gnunet-service-fs_cadet_server.c:431
 #, fuzzy
 msgid "# cadet connections active"
 msgstr ""
@@ -3732,107 +3747,107 @@ msgstr ""
 msgid "# query plan entries"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:315
+#: src/fs/gnunet-service-fs_pr.c:327
 msgid "# Pending requests created"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:411 src/fs/gnunet-service-fs_pr.c:661
+#: src/fs/gnunet-service-fs_pr.c:428 src/fs/gnunet-service-fs_pr.c:675
 msgid "# Pending requests active"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:842
+#: src/fs/gnunet-service-fs_pr.c:856
 msgid "# replies received and matched"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:879
+#: src/fs/gnunet-service-fs_pr.c:892
 msgid "# duplicate replies discarded (bloomfilter)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:888
+#: src/fs/gnunet-service-fs_pr.c:901
 msgid "# irrelevant replies discarded"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:903
+#: src/fs/gnunet-service-fs_pr.c:916
 #, c-format
 msgid "Unsupported block type %u\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:920
+#: src/fs/gnunet-service-fs_pr.c:933
 msgid "# results found locally"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1050
+#: src/fs/gnunet-service-fs_pr.c:1063
 msgid "# Datastore `PUT' failures"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1078
+#: src/fs/gnunet-service-fs_pr.c:1091
 msgid "# storage requests dropped due to high load"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1116
+#: src/fs/gnunet-service-fs_pr.c:1129
 msgid "# Replies received from DHT"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1247
+#: src/fs/gnunet-service-fs_pr.c:1260
 msgid "# Replies received from CADET"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1299
+#: src/fs/gnunet-service-fs_pr.c:1312
 #, c-format
 msgid "Datastore lookup already took %s!\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1320
+#: src/fs/gnunet-service-fs_pr.c:1333
 #, c-format
 msgid "On-demand lookup already took %s!\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1372
+#: src/fs/gnunet-service-fs_pr.c:1385
 msgid "# Datastore lookups concluded (no results)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1387
+#: src/fs/gnunet-service-fs_pr.c:1400
 msgid "# Datastore lookups concluded (seen all)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1396
+#: src/fs/gnunet-service-fs_pr.c:1409
 msgid "# Datastore lookups aborted (more than MAX_RESULTS)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1411
+#: src/fs/gnunet-service-fs_pr.c:1424
 msgid "# requested DBLOCK or IBLOCK not found"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1425
+#: src/fs/gnunet-service-fs_pr.c:1438
 msgid "# on-demand blocks matched requests"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1438
+#: src/fs/gnunet-service-fs_pr.c:1451
 msgid "# on-demand lookups performed successfully"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1443
+#: src/fs/gnunet-service-fs_pr.c:1456
 msgid "# on-demand lookups failed"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1469 src/fs/gnunet-service-fs_pr.c:1508
-#: src/fs/gnunet-service-fs_pr.c:1675
+#: src/fs/gnunet-service-fs_pr.c:1482 src/fs/gnunet-service-fs_pr.c:1521
+#: src/fs/gnunet-service-fs_pr.c:1688
 msgid "# Datastore lookups concluded (error queueing)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1527
+#: src/fs/gnunet-service-fs_pr.c:1540
 msgid "# Datastore lookups concluded (found last result)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1539
+#: src/fs/gnunet-service-fs_pr.c:1552
 msgid "# Datastore lookups concluded (load too high)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1652
+#: src/fs/gnunet-service-fs_pr.c:1665
 msgid "# Datastore lookups initiated"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1732
+#: src/fs/gnunet-service-fs_pr.c:1745
 msgid "# GAP PUT messages received"
 msgstr ""
 
@@ -4185,7 +4200,7 @@ msgid "Failed to connect to the namecache!\n"
 msgstr "初始化“%s”服务失败。\n"
 
 #: src/gns/gnunet-service-gns.c:612
-#: src/zonemaster/gnunet-service-zonemaster.c:740
+#: src/zonemaster/gnunet-service-zonemaster.c:741
 #, fuzzy
 msgid "Could not connect to DHT!\n"
 msgstr "无法连接到 %s:%u:%s\n"
@@ -4661,7 +4676,7 @@ msgid "# hostlist advertisements send"
 msgstr ""
 
 #: src/hostlist/gnunet-daemon-hostlist_server.c:679
-#: src/transport/gnunet-service-transport.c:2802
+#: src/transport/gnunet-service-transport.c:2803
 msgid "Could not access PEERINFO service.  Exiting.\n"
 msgstr ""
 
@@ -5017,7 +5032,8 @@ msgstr ""
 msgid "Invalid public key for reverse lookup `%s'\n"
 msgstr "“%s”的参数无效。\n"
 
-#: src/namestore/gnunet-namestore.c:979 src/peerinfo-tool/gnunet-peerinfo.c:775
+#: src/namestore/gnunet-namestore.c:979
+#: src/peerinfo-tool/gnunet-peerinfo.c:775
 #, fuzzy, c-format
 msgid "Invalid URI `%s'\n"
 msgstr "无效条目。\n"
@@ -5225,23 +5241,22 @@ msgid "Failed to connect to `gnunet-nat-server'\n"
 msgstr ""
 
 #: src/nat-auto/gnunet-nat-auto_legacy.c:518
-#: src/nat-auto/nat_auto_api_test.c:520
 #, c-format
 msgid "Failed to create listen socket bound to `%s' for NAT test: %s\n"
 msgstr ""
 
 #: src/nat-auto/gnunet-nat-auto_legacy.c:568
-#: src/nat-auto/nat_auto_api_test.c:569
+#: src/nat-auto/nat_auto_api_test.c:571
 #, fuzzy
 msgid "NAT test failed to start NAT library\n"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/nat-auto/gnunet-nat-server.c:336
+#: src/nat-auto/gnunet-nat-server.c:338
 #, c-format
 msgid "Please pass valid port number as the first argument! (got `%s')\n"
 msgstr ""
 
-#: src/nat-auto/gnunet-nat-server.c:386
+#: src/nat-auto/gnunet-nat-server.c:388
 msgid "GNUnet NAT traversal test helper daemon"
 msgstr ""
 
@@ -5385,6 +5400,11 @@ msgstr ""
 msgid "Failed to find valid PORT in section `%s'\n"
 msgstr "解析配置文件“%s”失败\n"
 
+#: src/nat-auto/nat_auto_api_test.c:522
+#, fuzzy, c-format
+msgid "Failed to create socket bound to `%s' for NAT test: %s\n"
+msgstr "解析配置文件“%s”失败\n"
+
 #: src/nat/gnunet-nat.c:424
 msgid "which IP and port are we locally using to bind/listen to"
 msgstr ""
@@ -5411,31 +5431,31 @@ msgstr ""
 msgid "GNUnet NAT traversal autoconfigure daemon"
 msgstr ""
 
-#: src/nat/gnunet-service-nat.c:1313
+#: src/nat/gnunet-service-nat.c:1317
 #, c-format
 msgid "Malformed punched hole specification `%s' (lacks port)\n"
 msgstr ""
 
-#: src/nat/gnunet-service-nat.c:1323
+#: src/nat/gnunet-service-nat.c:1327
 #, c-format
 msgid "Invalid port number in punched hole specification `%s' (lacks port)\n"
 msgstr ""
 
-#: src/nat/gnunet-service-nat.c:1339
+#: src/nat/gnunet-service-nat.c:1343
 #, c-format
 msgid "Malformed punched hole specification `%s' (lacks `]')\n"
 msgstr ""
 
-#: src/nat/gnunet-service-nat.c:1350
+#: src/nat/gnunet-service-nat.c:1354
 #, c-format
 msgid "Malformed punched hole specification `%s' (IPv6 address invalid)"
 msgstr ""
 
-#: src/nat/gnunet-service-nat.c:1803
+#: src/nat/gnunet-service-nat.c:1813
 msgid "Connection reversal request failed\n"
 msgstr ""
 
-#: src/nat/gnunet-service-nat.c:1876
+#: src/nat/gnunet-service-nat.c:1886
 msgid ""
 "UPnP enabled in configuration, but UPnP client `upnpc` command not found, "
 "disabling UPnP\n"
@@ -5455,7 +5475,7 @@ msgstr "运行 %s失败:%s %d\n"
 msgid "`external-ip' command not found\n"
 msgstr ""
 
-#: src/nat/gnunet-service-nat_mini.c:654
+#: src/nat/gnunet-service-nat_mini.c:656
 msgid "`upnpc' command not found\n"
 msgstr ""
 
@@ -5488,7 +5508,7 @@ msgstr ""
 msgid "Measure quality and performance of the NSE service."
 msgstr "无法访问该服务"
 
-#: src/nse/gnunet-service-nse.c:1536
+#: src/nse/gnunet-service-nse.c:1534
 #: src/revocation/gnunet-service-revocation.c:832 src/util/gnunet-scrypt.c:276
 #, fuzzy
 msgid "Value is too large.\n"
@@ -5698,7 +5718,7 @@ msgstr "发送消息失败。\n"
 msgid "`%s:%s' failed at %s:%d with error: %s\n"
 msgstr "“%s”于 %s:%d 处失败,错误为:%s\n"
 
-#: src/postgres/postgres.c:195
+#: src/postgres/postgres.c:192
 #, fuzzy, c-format
 msgid "Unable to connect to Postgres database '%s': %s\n"
 msgstr "无法保存配置文件“%s”:"
@@ -6021,7 +6041,7 @@ msgstr ""
 msgid "Revocation certificate not ready, calculating proof of work\n"
 msgstr ""
 
-#: src/revocation/gnunet-revocation.c:437 src/social/gnunet-social.c:1159
+#: src/revocation/gnunet-revocation.c:437 src/social/gnunet-social.c:1176
 #, fuzzy, c-format
 msgid "Public key `%s' malformed\n"
 msgstr "“%s”的参数无效。\n"
@@ -6156,10 +6176,10 @@ msgstr ""
 msgid "Calculate the Vectorproduct with a GNUnet peer."
 msgstr ""
 
-#: 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
+#: src/scalarproduct/gnunet-service-scalarproduct_alice.c:1404
+#: src/scalarproduct/gnunet-service-scalarproduct_bob.c:1342
+#: src/scalarproduct/gnunet-service-scalarproduct-ecc_alice.c:1177
+#: src/scalarproduct/gnunet-service-scalarproduct-ecc_bob.c:1060
 #, fuzzy
 msgid "Connect to CADET failed\n"
 msgstr "“%s”已连接到“%s”。\n"
@@ -6184,9 +6204,9 @@ msgstr ""
 msgid "also profile decryption"
 msgstr ""
 
-#: src/set/gnunet-service-set.c:1991
+#: src/set/gnunet-service-set.c:2068
 #, fuzzy
-msgid "Could not connect to cadet service\n"
+msgid "Could not connect to CADET service\n"
 msgstr "无法连接到 %s:%u:%s\n"
 
 #: src/set/gnunet-set-ibf-profiler.c:249
@@ -6215,127 +6235,127 @@ msgstr ""
 msgid "operation to execute"
 msgstr ""
 
-#: src/social/gnunet-social.c:1146
+#: src/social/gnunet-social.c:1163
 #, fuzzy
 msgid "--place missing or invalid.\n"
 msgstr "“%s”的参数无效。\n"
 
-#: src/social/gnunet-social.c:1195
+#: src/social/gnunet-social.c:1212
 msgid "assign --name in state to --data"
 msgstr ""
 
-#: src/social/gnunet-social.c:1199
+#: src/social/gnunet-social.c:1216
 msgid "say good-bye and leave somebody else's place"
 msgstr ""
 
-#: src/social/gnunet-social.c:1203
+#: src/social/gnunet-social.c:1220
 msgid "create a place"
 msgstr ""
 
-#: src/social/gnunet-social.c:1207
+#: src/social/gnunet-social.c:1224
 msgid "destroy a place we were hosting"
 msgstr ""
 
-#: src/social/gnunet-social.c:1211
+#: src/social/gnunet-social.c:1228
 msgid "enter somebody else's place"
 msgstr ""
 
-#: src/social/gnunet-social.c:1215
+#: src/social/gnunet-social.c:1232
 msgid "find state matching name prefix"
 msgstr ""
 
-#: src/social/gnunet-social.c:1219
+#: src/social/gnunet-social.c:1236
 msgid "replay history of messages up to the given --limit"
 msgstr ""
 
-#: src/social/gnunet-social.c:1223
+#: src/social/gnunet-social.c:1240
 msgid "reconnect to a previously created place"
 msgstr ""
 
-#: src/social/gnunet-social.c:1227
+#: src/social/gnunet-social.c:1244
 msgid "publish something to a place we are hosting"
 msgstr ""
 
-#: src/social/gnunet-social.c:1231
+#: src/social/gnunet-social.c:1248
 msgid "reconnect to a previously entered place"
 msgstr ""
 
-#: src/social/gnunet-social.c:1235
+#: src/social/gnunet-social.c:1252
 msgid "search for state matching exact name"
 msgstr ""
 
-#: src/social/gnunet-social.c:1239
+#: src/social/gnunet-social.c:1256
 msgid "submit something to somebody's place"
 msgstr ""
 
-#: src/social/gnunet-social.c:1243
+#: src/social/gnunet-social.c:1260
 msgid "list of egos and subscribed places"
 msgstr ""
 
-#: src/social/gnunet-social.c:1247
+#: src/social/gnunet-social.c:1264
 msgid "extract and replay history between message IDs --start and --until"
 msgstr ""
 
-#: src/social/gnunet-social.c:1254
+#: src/social/gnunet-social.c:1271
 msgid "application ID to use when connecting"
 msgstr ""
 
-#: src/social/gnunet-social.c:1258
+#: src/social/gnunet-social.c:1275
 msgid "message body or state value"
 msgstr ""
 
-#: src/social/gnunet-social.c:1262
+#: src/social/gnunet-social.c:1279
 #, fuzzy
 msgid "name or public key of ego"
 msgstr "“%s”的参数无效。\n"
 
-#: src/social/gnunet-social.c:1266
+#: src/social/gnunet-social.c:1283
 #, fuzzy
 msgid "wait for incoming messages"
 msgstr "发送消息失败。\n"
 
-#: src/social/gnunet-social.c:1270
+#: src/social/gnunet-social.c:1287
 msgid "GNS name"
 msgstr ""
 
-#: src/social/gnunet-social.c:1274
+#: src/social/gnunet-social.c:1291
 msgid "peer ID for --guest-enter"
 msgstr ""
 
-#: src/social/gnunet-social.c:1278
+#: src/social/gnunet-social.c:1295
 msgid "name (key) to query from state"
 msgstr ""
 
-#: src/social/gnunet-social.c:1282
+#: src/social/gnunet-social.c:1299
 msgid "method name"
 msgstr ""
 
-#: src/social/gnunet-social.c:1286
+#: src/social/gnunet-social.c:1303
 #, fuzzy
 msgid "number of messages to replay from history"
 msgstr "每次迭代所使用的消息数量"
 
-#: src/social/gnunet-social.c:1290
+#: src/social/gnunet-social.c:1307
 msgid "key address of place"
 msgstr ""
 
-#: src/social/gnunet-social.c:1294
+#: src/social/gnunet-social.c:1311
 msgid "start message ID for history replay"
 msgstr ""
 
-#: src/social/gnunet-social.c:1298
+#: src/social/gnunet-social.c:1315
 msgid "respond to entry requests by admitting all guests"
 msgstr ""
 
-#: src/social/gnunet-social.c:1302
+#: src/social/gnunet-social.c:1319
 msgid "end message ID for history replay"
 msgstr ""
 
-#: src/social/gnunet-social.c:1306
+#: src/social/gnunet-social.c:1323
 msgid "respond to entry requests by refusing all guests"
 msgstr ""
 
-#: src/social/gnunet-social.c:1316
+#: src/social/gnunet-social.c:1333
 msgid ""
 "gnunet-social - Interact with the social service: enter/leave, send/receive "
 "messages, access history and state.\n"
@@ -6875,35 +6895,35 @@ msgstr ""
 msgid "# bytes payload discarded due to not connected peer"
 msgstr ""
 
-#: src/transport/gnunet-service-transport.c:1698
+#: src/transport/gnunet-service-transport.c:1699
 msgid "# bytes total received"
 msgstr ""
 
-#: src/transport/gnunet-service-transport.c:1795
+#: src/transport/gnunet-service-transport.c:1796
 msgid "# bytes payload received"
 msgstr ""
 
-#: src/transport/gnunet-service-transport.c:2112
-#: src/transport/gnunet-service-transport.c:2584
+#: src/transport/gnunet-service-transport.c:2113
+#: src/transport/gnunet-service-transport.c:2585
 msgid "# disconnects due to blacklist"
 msgstr ""
 
-#: src/transport/gnunet-service-transport.c:2588
+#: src/transport/gnunet-service-transport.c:2589
 #, fuzzy, c-format
 msgid "Disallowing connection to peer `%s' on transport %s\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/transport/gnunet-service-transport.c:2696
+#: src/transport/gnunet-service-transport.c:2697
 #, fuzzy, c-format
 msgid "Adding blacklisting entry for peer `%s'\n"
 msgstr "卸载 GNUnet 服务"
 
-#: src/transport/gnunet-service-transport.c:2705
+#: src/transport/gnunet-service-transport.c:2706
 #, c-format
 msgid "Adding blacklisting entry for peer `%s':`%s'\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport.c:2770
+#: src/transport/gnunet-service-transport.c:2771
 #, fuzzy
 msgid "Transport service is lacking key configuration settings. Exiting.\n"
 msgstr "立即保存配置?"
@@ -7041,64 +7061,64 @@ msgstr ""
 msgid "SYN request from peer `%s' ignored due impending shutdown\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:2598
+#: src/transport/gnunet-service-transport_neighbours.c:2606
 msgid "# Attempts to switch addresses"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3080
+#: src/transport/gnunet-service-transport_neighbours.c:3088
 msgid "# SYN_ACK messages received"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3088
+#: src/transport/gnunet-service-transport_neighbours.c:3096
 msgid "# unexpected SYN_ACK messages (no peer)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3106
-#: src/transport/gnunet-service-transport_neighbours.c:3130
+#: src/transport/gnunet-service-transport_neighbours.c:3114
+#: src/transport/gnunet-service-transport_neighbours.c:3138
 msgid "# unexpected SYN_ACK messages (not ready)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3142
+#: src/transport/gnunet-service-transport_neighbours.c:3150
 msgid "# unexpected SYN_ACK messages (waiting on ATS)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3167
+#: src/transport/gnunet-service-transport_neighbours.c:3175
 msgid "# Successful attempts to switch addresses"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3180
+#: src/transport/gnunet-service-transport_neighbours.c:3188
 msgid "# unexpected SYN_ACK messages (disconnecting)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3352
+#: src/transport/gnunet-service-transport_neighbours.c:3360
 msgid "# ACK messages received"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3388
+#: src/transport/gnunet-service-transport_neighbours.c:3396
 msgid "# unexpected ACK messages"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3476
+#: src/transport/gnunet-service-transport_neighbours.c:3484
 msgid "# quota messages ignored (malformed)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3483
+#: src/transport/gnunet-service-transport_neighbours.c:3491
 msgid "# QUOTA messages received"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3523
+#: src/transport/gnunet-service-transport_neighbours.c:3531
 msgid "# disconnect messages ignored (malformed)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3530
+#: src/transport/gnunet-service-transport_neighbours.c:3538
 msgid "# DISCONNECT messages received"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3541
+#: src/transport/gnunet-service-transport_neighbours.c:3549
 msgid "# disconnect messages ignored (timestamp)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3675
+#: src/transport/gnunet-service-transport_neighbours.c:3683
 msgid "# disconnected from peer upon explicit request"
 msgstr ""
 
@@ -7397,8 +7417,8 @@ msgstr "消息尺寸"
 #: src/transport/plugin_transport_http_client.c:1477
 #: src/transport/plugin_transport_http_server.c:2248
 #: src/transport/plugin_transport_http_server.c:3462
-#: src/transport/plugin_transport_tcp.c:3375
-#: src/transport/plugin_transport_tcp.c:3382
+#: src/transport/plugin_transport_tcp.c:3403
+#: src/transport/plugin_transport_tcp.c:3410
 msgid "TCP_STEALTH not supported on this platform.\n"
 msgstr ""
 
@@ -7468,7 +7488,7 @@ msgid "Found %u addresses to report to NAT service\n"
 msgstr ""
 
 #: src/transport/plugin_transport_http_server.c:2837
-#: src/transport/plugin_transport_udp.c:3623
+#: src/transport/plugin_transport_udp.c:3613
 msgid "Disabling IPv6 since it is not supported on this system!\n"
 msgstr ""
 
@@ -7571,15 +7591,15 @@ msgid "# bytes dropped by SMTP (outgoing)"
 msgstr ""
 
 #: src/transport/plugin_transport_tcp.c:1060
-#: src/transport/plugin_transport_tcp.c:2379
+#: src/transport/plugin_transport_tcp.c:2386
 #, c-format
 msgid "Unexpected address length: %u bytes\n"
 msgstr ""
 
 #: src/transport/plugin_transport_tcp.c:1243
 #: src/transport/plugin_transport_tcp.c:1467
-#: src/transport/plugin_transport_tcp.c:2643
-#: src/transport/plugin_transport_tcp.c:3498
+#: src/transport/plugin_transport_tcp.c:2650
+#: src/transport/plugin_transport_tcp.c:3526
 msgid "# TCP sessions active"
 msgstr ""
 
@@ -7604,68 +7624,68 @@ msgstr ""
 msgid "# bytes transmitted via TCP"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2041
+#: src/transport/plugin_transport_tcp.c:2048
 msgid "# requests to create session with invalid address"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2217
+#: src/transport/plugin_transport_tcp.c:2224
 msgid "# transport-service disconnect requests for TCP"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2702
+#: src/transport/plugin_transport_tcp.c:2716
 msgid "# TCP WELCOME messages received"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2893
+#: src/transport/plugin_transport_tcp.c:2921
 msgid "# bytes received via TCP"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2944
-#: src/transport/plugin_transport_tcp.c:3002
+#: src/transport/plugin_transport_tcp.c:2972
+#: src/transport/plugin_transport_tcp.c:3030
 #, fuzzy
 msgid "# TCP server connections active"
 msgstr ""
 "\n"
 "按任意键继续\n"
 
-#: src/transport/plugin_transport_tcp.c:2948
+#: src/transport/plugin_transport_tcp.c:2976
 #, fuzzy
 msgid "# TCP server connect events"
 msgstr ""
 "\n"
 "按任意键继续\n"
 
-#: src/transport/plugin_transport_tcp.c:2954
+#: src/transport/plugin_transport_tcp.c:2982
 msgid "TCP connection limit reached, suspending server\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2956
+#: src/transport/plugin_transport_tcp.c:2984
 msgid "# TCP service suspended"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2996
+#: src/transport/plugin_transport_tcp.c:3024
 msgid "# TCP service resumed"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:3006
+#: src/transport/plugin_transport_tcp.c:3034
 msgid "# network-level TCP disconnect events"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:3325
+#: src/transport/plugin_transport_tcp.c:3353
 #, fuzzy
 msgid "Failed to start service.\n"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/transport/plugin_transport_tcp.c:3486
+#: src/transport/plugin_transport_tcp.c:3514
 #, c-format
 msgid "TCP transport listening on port %llu\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:3490
+#: src/transport/plugin_transport_tcp.c:3518
 msgid "TCP transport not listening on any port (client only)\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:3494
+#: src/transport/plugin_transport_tcp.c:3522
 #, c-format
 msgid "TCP transport advertises itself as being on port %llu\n"
 msgstr ""
@@ -7684,50 +7704,50 @@ msgstr ""
 msgid "Failed to set IPv4 broadcast option for broadcast socket on port %d\n"
 msgstr ""
 
-#: src/transport/plugin_transport_udp.c:3367
+#: src/transport/plugin_transport_udp.c:3357
 #, c-format
 msgid ""
 "UDP could not transmit message to `%s': Network seems down, please check "
 "your network configuration\n"
 msgstr ""
 
-#: src/transport/plugin_transport_udp.c:3381
+#: src/transport/plugin_transport_udp.c:3371
 msgid ""
 "UDP could not transmit IPv6 message! Please check your network configuration "
 "and disable IPv6 if your connection does not have a global IPv6 address\n"
 msgstr ""
 
-#: src/transport/plugin_transport_udp.c:3699
-#: src/transport/plugin_transport_udp.c:3798
+#: src/transport/plugin_transport_udp.c:3689
+#: src/transport/plugin_transport_udp.c:3788
 #, fuzzy, c-format
 msgid "Failed to bind UDP socket to %s: %s\n"
 msgstr "打开日志文件“%s”失败:%s\n"
 
-#: src/transport/plugin_transport_udp.c:3717
+#: src/transport/plugin_transport_udp.c:3707
 msgid "Disabling IPv4 since it is not supported on this system!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_udp.c:3808
+#: src/transport/plugin_transport_udp.c:3798
 #, fuzzy
 msgid "Failed to open UDP sockets\n"
 msgstr "打开日志文件“%s”失败:%s\n"
 
-#: src/transport/plugin_transport_udp.c:3879
-#: src/transport/plugin_transport_udp.c:3893
+#: src/transport/plugin_transport_udp.c:3869
+#: src/transport/plugin_transport_udp.c:3883
 msgid "must be in [0,65535]"
 msgstr ""
 
-#: src/transport/plugin_transport_udp.c:3925
+#: src/transport/plugin_transport_udp.c:3915
 #, fuzzy
 msgid "must be valid IPv4 address"
 msgstr "“%s”不可用。\n"
 
-#: src/transport/plugin_transport_udp.c:3952
+#: src/transport/plugin_transport_udp.c:3942
 #, fuzzy
 msgid "must be valid IPv6 address"
 msgstr "“%s”不可用。\n"
 
-#: src/transport/plugin_transport_udp.c:4018
+#: src/transport/plugin_transport_udp.c:4008
 #, fuzzy
 msgid "Failed to create UDP network sockets\n"
 msgstr "发送消息失败。\n"
@@ -7838,7 +7858,7 @@ msgstr ""
 msgid "Metadata `%s' failed to deserialize"
 msgstr ""
 
-#: src/util/client.c:864
+#: src/util/client.c:868
 #, c-format
 msgid "Need a non-empty hostname for service `%s'.\n"
 msgstr ""
@@ -7876,20 +7896,20 @@ msgstr "消息“%.*s”重复了 %u 次,在最近 %llu 秒内\n"
 msgid "INVALID"
 msgstr ""
 
-#: src/util/common_logging.c:1248
+#: src/util/common_logging.c:1302
 msgid "unknown address"
 msgstr ""
 
-#: src/util/common_logging.c:1290
+#: src/util/common_logging.c:1344
 msgid "invalid address"
 msgstr ""
 
-#: src/util/common_logging.c:1308
+#: src/util/common_logging.c:1362
 #, fuzzy, c-format
 msgid "Configuration fails to specify option `%s' in section `%s'!\n"
 msgstr "配置不满足配置规范文件“%s”的约束!\n"
 
-#: src/util/common_logging.c:1329
+#: src/util/common_logging.c:1383
 #, fuzzy, c-format
 msgid ""
 "Configuration specifies invalid value for option `%s' in section `%s': %s\n"
@@ -7946,22 +7966,22 @@ msgid ""
 "%llu)\n"
 msgstr ""
 
-#: src/util/crypto_ecc.c:756
+#: src/util/crypto_ecc.c:777
 #, fuzzy, c-format
 msgid "ECC signing failed at %s:%d: %s\n"
 msgstr "对驱动器“%2$s”的“%1$s”操作失败:%3$u\n"
 
-#: src/util/crypto_ecc.c:806
+#: src/util/crypto_ecc.c:827
 #, fuzzy, c-format
 msgid "EdDSA signing failed at %s:%d: %s\n"
 msgstr "对驱动器“%2$s”的“%1$s”操作失败:%3$u\n"
 
-#: src/util/crypto_ecc.c:880
+#: src/util/crypto_ecc.c:901
 #, fuzzy, c-format
 msgid "ECDSA signature verification failed at %s:%d: %s\n"
 msgstr "对驱动器“%2$s”的“%1$s”操作失败:%3$u\n"
 
-#: src/util/crypto_ecc.c:937
+#: src/util/crypto_ecc.c:958
 #, fuzzy, c-format
 msgid "EdDSA signature verification failed at %s:%d: %s\n"
 msgstr "对驱动器“%2$s”的“%1$s”操作失败:%3$u\n"
@@ -8434,7 +8454,7 @@ msgid ""
 "`GNUNET_SERVER_receive_done' after %s\n"
 msgstr ""
 
-#: src/util/service.c:347 src/util/service_new.c:2343
+#: src/util/service.c:347 src/util/service_new.c:2344
 #, c-format
 msgid "Unknown address family %d\n"
 msgstr ""
@@ -8670,87 +8690,87 @@ msgstr ""
 msgid "Protocol %u not supported, dropping\n"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:1145
+#: src/vpn/gnunet-service-vpn.c:1144
 msgid "# Packets dropped (channel not yet online)"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:1353
+#: src/vpn/gnunet-service-vpn.c:1352
 msgid "# ICMPv4 packets dropped (not allowed)"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:1374
+#: src/vpn/gnunet-service-vpn.c:1373
 msgid "# ICMPv6 packets dropped (not allowed)"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:1580
+#: src/vpn/gnunet-service-vpn.c:1579
 msgid "# Packets received from TUN interface"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:1613 src/vpn/gnunet-service-vpn.c:1649
+#: src/vpn/gnunet-service-vpn.c:1612 src/vpn/gnunet-service-vpn.c:1648
 #, c-format
 msgid "Packet received for unmapped destination `%s' (dropping it)\n"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:1659
+#: src/vpn/gnunet-service-vpn.c:1658
 msgid "Received IPv4 packet with options (dropping it)\n"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:1673
+#: src/vpn/gnunet-service-vpn.c:1672
 #, c-format
 msgid "Received packet of unknown protocol %d from TUN (dropping it)\n"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:1755
+#: src/vpn/gnunet-service-vpn.c:1754
 msgid "# ICMP packets received from cadet"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:2095
+#: src/vpn/gnunet-service-vpn.c:2093
 msgid "# UDP packets received from cadet"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:2251
+#: src/vpn/gnunet-service-vpn.c:2248
 msgid "# TCP packets received from cadet"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:2403
+#: src/vpn/gnunet-service-vpn.c:2399
 msgid "Failed to find unallocated IPv4 address in VPN's range\n"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:2458
+#: src/vpn/gnunet-service-vpn.c:2454
 msgid "Failed to find unallocated IPv6 address in VPN's range\n"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:2500 src/vpn/gnunet-service-vpn.c:2722
+#: src/vpn/gnunet-service-vpn.c:2496 src/vpn/gnunet-service-vpn.c:2718
 msgid "# Active destinations"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:2771
+#: src/vpn/gnunet-service-vpn.c:2767
 msgid "Failed to allocate IP address for new destination\n"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:3063
+#: src/vpn/gnunet-service-vpn.c:3059
 #, fuzzy
 msgid "Must specify valid IPv6 address"
 msgstr "“%s”不可用。\n"
 
-#: src/vpn/gnunet-service-vpn.c:3087
+#: src/vpn/gnunet-service-vpn.c:3083
 msgid "Must specify valid IPv6 mask"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:3095
+#: src/vpn/gnunet-service-vpn.c:3091
 msgid "IPv6 support disabled as this system does not support IPv6\n"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:3108
+#: src/vpn/gnunet-service-vpn.c:3104
 #, fuzzy
 msgid "Must specify valid IPv4 address"
 msgstr "“%s”不可用。\n"
 
-#: src/vpn/gnunet-service-vpn.c:3121
+#: src/vpn/gnunet-service-vpn.c:3117
 msgid "Must specify valid IPv4 mask"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:3131
+#: src/vpn/gnunet-service-vpn.c:3127
 msgid "IPv4 support disabled as this system does not support IPv4\n"
 msgstr ""
 
@@ -8820,23 +8840,27 @@ msgstr ""
 msgid "Setup tunnels via VPN."
 msgstr ""
 
-#: src/include/gnunet_common.h:645 src/include/gnunet_common.h:652
-#: src/include/gnunet_common.h:662 src/include/gnunet_common.h:670
+#: src/include/gnunet_common.h:674 src/include/gnunet_common.h:681
+#: src/include/gnunet_common.h:691 src/include/gnunet_common.h:699
 #, c-format
 msgid "Assertion failed at %s:%d.\n"
 msgstr ""
 
-#: src/include/gnunet_common.h:682
+#: src/include/gnunet_common.h:711
 #, c-format
 msgid "External protocol violation detected at %s:%d.\n"
 msgstr ""
 
-#: src/include/gnunet_common.h:709 src/include/gnunet_common.h:718
+#: src/include/gnunet_common.h:738 src/include/gnunet_common.h:747
 #, c-format
 msgid "`%s' failed on file `%s' at %s:%d with error: %s\n"
 msgstr ""
 
 #, fuzzy
+#~ msgid "Could not connect to cadet service\n"
+#~ msgstr "无法连接到 %s:%u:%s\n"
+
+#, fuzzy
 #~ msgid "Failed to run upnp client for port %u\n"
 #~ msgstr "初始化“%s”服务失败。\n"
 
diff --git a/src/datastore/datastore.h b/src/datastore/datastore.h
index dc3d9d1f2..9de72f064 100644
--- a/src/datastore/datastore.h
+++ b/src/datastore/datastore.h
@@ -180,35 +180,6 @@ struct GetZeroAnonymityMessage
 
 
 /**
- * Message to the datastore service requesting an update
- * to the priority or expiration for some content.
- */
-struct UpdateMessage
-{
-  /**
-   * Type is GNUNET_MESSAGE_TYPE_DATASTORE_UPDATE.
-   */
-  struct GNUNET_MessageHeader header;
-
-  /**
-   * Desired priority increase.
-   */
-  int32_t priority GNUNET_PACKED;
-
-  /**
-   * Desired new expiration time.
-   */
-  struct GNUNET_TIME_AbsoluteNBO expiration;
-
-  /**
-   * Unique ID for the content.
-   */
-  uint64_t uid;
-
-};
-
-
-/**
  * Message transmitting content from or to the datastore
  * service.
  */
diff --git a/src/datastore/datastore_api.c b/src/datastore/datastore_api.c
index db485364e..311a61283 100644
--- a/src/datastore/datastore_api.c
+++ b/src/datastore/datastore_api.c
@@ -1126,72 +1126,6 @@ GNUNET_DATASTORE_release_reserve (struct 
GNUNET_DATASTORE_Handle *h,
 
 
 /**
- * Update a value in the datastore.
- *
- * @param h handle to the datastore
- * @param uid identifier for the value
- * @param priority how much to increase the priority of the value
- * @param expiration new expiration value should be MAX of existing and this 
argument
- * @param queue_priority ranking of this request in the priority queue
- * @param max_queue_size at what queue size should this request be dropped
- *        (if other requests of higher priority are in the queue)
- * @param cont continuation to call when done
- * @param cont_cls closure for @a cont
- * @return NULL if the entry was not queued, otherwise a handle that can be 
used to
- *         cancel; note that even if NULL is returned, the callback will be 
invoked
- *         (or rather, will already have been invoked)
- */
-struct GNUNET_DATASTORE_QueueEntry *
-GNUNET_DATASTORE_update (struct GNUNET_DATASTORE_Handle *h,
-                         uint64_t uid,
-                         uint32_t priority,
-                         struct GNUNET_TIME_Absolute expiration,
-                         unsigned int queue_priority,
-                         unsigned int max_queue_size,
-                         GNUNET_DATASTORE_ContinuationWithStatus cont,
-                         void *cont_cls)
-{
-  struct GNUNET_DATASTORE_QueueEntry *qe;
-  struct GNUNET_MQ_Envelope *env;
-  struct UpdateMessage *um;
-  union QueueContext qc;
-
-  if (NULL == cont)
-    cont = &drop_status_cont;
-  LOG (GNUNET_ERROR_TYPE_DEBUG,
-       "Asked to update entry %llu raising priority by %u and expiration to 
%s\n",
-       uid,
-       (unsigned int) priority,
-       GNUNET_STRINGS_absolute_time_to_string (expiration));
-  env = GNUNET_MQ_msg (um,
-                       GNUNET_MESSAGE_TYPE_DATASTORE_UPDATE);
-  um->priority = htonl (priority);
-  um->expiration = GNUNET_TIME_absolute_hton (expiration);
-  um->uid = GNUNET_htonll (uid);
-
-  qc.sc.cont = cont;
-  qc.sc.cont_cls = cont_cls;
-  qe = make_queue_entry (h,
-                         env,
-                         queue_priority,
-                         max_queue_size,
-                         GNUNET_MESSAGE_TYPE_DATASTORE_STATUS,
-                         &qc);
-  if (NULL == qe)
-  {
-    LOG (GNUNET_ERROR_TYPE_DEBUG,
-         "Could not create queue entry for UPDATE\n");
-    return NULL;
-  }
-  GNUNET_STATISTICS_update (h->stats,
-                            gettext_noop ("# UPDATE requests executed"), 1,
-                            GNUNET_NO);
-  process_queue (h);
-  return qe;
-}
-
-
-/**
  * Explicitly remove some content from the database.
  * The @a cont continuation will be called with `status`
  * #GNUNET_OK" if content was removed, #GNUNET_NO
diff --git a/src/datastore/gnunet-service-datastore.c 
b/src/datastore/gnunet-service-datastore.c
index e632e33e0..6f1bd2b6d 100644
--- a/src/datastore/gnunet-service-datastore.c
+++ b/src/datastore/gnunet-service-datastore.c
@@ -1080,55 +1080,6 @@ handle_get_key (void *cls,
 
 
 /**
- * Function called with the result of an update operation.
- *
- * @param cls closure
- * @param status #GNUNET_OK or #GNUNET_SYSERR
- * @param msg error message on error
- */
-static void
-update_continuation (void *cls,
-                    int status,
-                    const char *msg)
-{
-  struct GNUNET_SERVICE_Client *client = cls;
-
-  transmit_status (client,
-                   status,
-                   msg);
-}
-
-
-/**
- * Handle UPDATE-message.
- *
- * @param cls client identification of the client
- * @param message the actual message
- */
-static void
-handle_update (void *cls,
-               const struct UpdateMessage *msg)
-{
-  struct GNUNET_SERVICE_Client *client = cls;
-
-  GNUNET_STATISTICS_update (stats,
-                            gettext_noop ("# UPDATE requests received"),
-                            1,
-                            GNUNET_NO);
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "Processing UPDATE request for %llu\n",
-              (unsigned long long) GNUNET_ntohll (msg->uid));
-  plugin->api->update (plugin->api->cls,
-                       GNUNET_ntohll (msg->uid),
-                       (int32_t) ntohl (msg->priority),
-                       GNUNET_TIME_absolute_ntoh (msg->expiration),
-                       &update_continuation,
-                       client);
-  GNUNET_SERVICE_client_continue (client);
-}
-
-
-/**
  * Handle GET_REPLICATION-message.
  *
  * @param cls identification of the client
@@ -1857,10 +1808,6 @@ GNUNET_SERVICE_MAIN
                         GNUNET_MESSAGE_TYPE_DATASTORE_PUT,
                         struct DataMessage,
                         NULL),
- GNUNET_MQ_hd_fixed_size (update,
-                          GNUNET_MESSAGE_TYPE_DATASTORE_UPDATE,
-                          struct UpdateMessage,
-                          NULL),
  GNUNET_MQ_hd_fixed_size (get,
                           GNUNET_MESSAGE_TYPE_DATASTORE_GET,
                           struct GetMessage,
diff --git a/src/datastore/test_datastore_api.c 
b/src/datastore/test_datastore_api.c
index 9f89d4087..a99668240 100644
--- a/src/datastore/test_datastore_api.c
+++ b/src/datastore/test_datastore_api.c
@@ -130,8 +130,6 @@ enum RunPhase
   RP_PUT_MULTIPLE_NEXT = 8,
   RP_GET_MULTIPLE = 9,
   RP_GET_MULTIPLE_NEXT = 10,
-  RP_UPDATE = 11,
-  RP_UPDATE_VALIDATE = 12,
 
   /**
    * Execution failed with some kind of error.
@@ -349,7 +347,7 @@ check_multiple (void *cls,
     break;
   case RP_GET_MULTIPLE_NEXT:
     GNUNET_assert (uid != crc->first_uid);
-    crc->phase = RP_UPDATE;
+    crc->phase = RP_DONE;
     break;
   default:
     GNUNET_break (0);
@@ -362,32 +360,6 @@ check_multiple (void *cls,
 }
 
 
-static void
-check_update (void *cls,
-              const struct GNUNET_HashCode *key,
-              size_t size,
-              const void *data,
-              enum GNUNET_BLOCK_Type type,
-              uint32_t priority,
-              uint32_t anonymity,
-              struct GNUNET_TIME_Absolute expiration,
-              uint64_t uid)
-{
-  struct CpsRunContext *crc = cls;
-
-  GNUNET_assert (key != NULL);
-  if ((anonymity == get_anonymity (42)) && (size == get_size (42)) &&
-      (priority == get_priority (42) + 100))
-    crc->phase = RP_DONE;
-  else
-  {
-    GNUNET_assert (size == get_size (43));
-    crc->offset++;
-  }
-  GNUNET_SCHEDULER_add_now (&run_continuation, crc);
-}
-
-
 /**
  * Main state machine.  Executes the next step of the test
  * depending on the current state.
@@ -525,24 +497,6 @@ run_continuation (void *cls)
                                              1, 1,
                                              &check_multiple, crc));
     break;
-  case RP_UPDATE:
-    GNUNET_assert (crc->uid > 0);
-    crc->phase = RP_UPDATE_VALIDATE;
-    GNUNET_DATASTORE_update (datastore,
-                             crc->uid, 100,
-                             get_expiration (42), 1,
-                             1,
-                             &check_success, crc);
-    break;
-  case RP_UPDATE_VALIDATE:
-    GNUNET_assert (NULL !=
-                   GNUNET_DATASTORE_get_key (datastore,
-                                             crc->offset,
-                                             &crc->key,
-                                             get_type (42),
-                                             1, 1,
-                                             &check_update, crc));
-    break;
   case RP_DONE:
     GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
                 "Finished, disconnecting\n");
diff --git a/src/include/gnunet_protocols.h b/src/include/gnunet_protocols.h
index 1b6152206..eeb9a8a92 100644
--- a/src/include/gnunet_protocols.h
+++ b/src/include/gnunet_protocols.h
@@ -424,11 +424,6 @@ extern "C"
 #define GNUNET_MESSAGE_TYPE_DATASTORE_PUT 95
 
 /**
- * Message sent by datastore client to update data.
- */
-#define GNUNET_MESSAGE_TYPE_DATASTORE_UPDATE 96
-
-/**
  * Message sent by datastore client to get data.
  */
 #define GNUNET_MESSAGE_TYPE_DATASTORE_GET 97

-- 
To stop receiving notification emails like this one, please contact
address@hidden



reply via email to

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