skeleton for secretsharing

14 files changed, 10113 insertions, 6808 deletions

diff --git a/configure.ac b/configure.ac
index e2346803b..d5c4e6c66 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1384,6 +1384,8 @@ src/regex/Makefile
 src/regex/regex.conf
 src/revocation/Makefile
 src/revocation/revocation.conf
+src/secretsharing/Makefile
+src/secretsharing/secretsharing.conf
 src/scalarproduct/Makefile
 src/scalarproduct/scalarproduct.conf
 src/set/Makefile
diff --git a/po/POTFILES.in b/po/POTFILES.in
index b638ef593..6aec4505d 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -29,6 +29,7 @@ src/conversation/gnunet-helper-audio-playback.c
 src/conversation/gnunet-helper-audio-record.c
 src/conversation/gnunet-service-conversation.c
 src/conversation/microphone.c
+src/conversation/plugin_gnsrecord_conversation.c
 src/conversation/speaker.c
 src/core/core_api.c
 src/core/core_api_iterate_peers.c
@@ -140,6 +141,12 @@ src/gns/gnunet-service-gns_shorten.c
 src/gns/nss/nss_gns.c
 src/gns/nss/nss_gns_query.c
 src/gns/plugin_block_gns.c
+src/gns/plugin_gnsrecord_gns.c
+src/gnsrecord/gnsrecord.c
+src/gnsrecord/gnsrecord_crypto.c
+src/gnsrecord/gnsrecord_misc.c
+src/gnsrecord/gnsrecord_serialization.c
+src/gnsrecord/plugin_gnsrecord_dns.c
 src/gns/w32nsp.c
 src/gns/w32nsp-install.c
 src/gns/w32nsp-resolve.c
@@ -175,11 +182,15 @@ src/multicast/gnunet-multicast.c
 src/multicast/gnunet-service-multicast.c
 src/multicast/multicast_api.c
 src/mysql/mysql.c
+src/namecache/gnunet-namecache.c
+src/namecache/gnunet-service-namecache.c
+src/namecache/namecache_api.c
+src/namecache/plugin_namecache_postgres.c
+src/namecache/plugin_namecache_sqlite.c
 src/namestore/gnunet-namestore.c
 src/namestore/gnunet-namestore-fcfsd.c
 src/namestore/gnunet-service-namestore.c
 src/namestore/namestore_api.c
-src/namestore/namestore_api_common.c
 src/namestore/namestore_api_monitor.c
 src/namestore/plugin_namestore_postgres.c
 src/namestore/plugin_namestore_sqlite.c
@@ -226,6 +237,8 @@ src/revocation/revocation_api.c
 src/scalarproduct/gnunet-scalarproduct.c
 src/scalarproduct/gnunet-service-scalarproduct.c
 src/scalarproduct/scalarproduct_api.c
+src/secretsharing/gnunet-service-secretsharing.c
+src/secretsharing/secretsharing_api.c
 src/set/gnunet-service-set.c
 src/set/gnunet-service-set_intersection.c
 src/set/gnunet-service-set_union.c
diff --git a/po/de.po b/po/de.po
index 42413f163..ee8fea3c4 100644
--- a/po/de.po
+++ b/po/de.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: GNUnet 0.7.0b\n"
 "Report-Msgid-Bugs-To: gnunet-developers@mail.gnu.org\n"
-"POT-Creation-Date: 2013-09-16 15:01+0200\n"
+"POT-Creation-Date: 2013-11-05 02:07+0100\n"
 "PO-Revision-Date: 2006-03-17 21:37+0100\n"
 "Last-Translator: Nils Durner <durner@gnunet.org>\n"
 "Language-Team: German <de@li.org>\n"
@@ -17,7 +17,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: src/arm/arm_api.c:335
+#: src/arm/arm_api.c:336
 msgid "Client was disconnected from arm service, trying to reconnect.\n"
 msgstr ""
 
@@ -31,416 +31,426 @@ msgstr ""
 msgid "Failed to remove configuration file %s\n"
 msgstr "Fehler beim Speichern der Konfigurationsdatei `%s':"
 
-#: src/arm/gnunet-arm.c:169
+#: src/arm/gnunet-arm.c:170
 #, fuzzy, c-format
 msgid "Failed to remove servicehome directory %s\n"
 msgstr "Dateiformat fehlerhaft (kein GNUnet Verzeichnis?)\n"
 
-#: src/arm/gnunet-arm.c:214 src/testbed/gnunet-service-testbed_peers.c:971
+#: src/arm/gnunet-arm.c:216 src/testbed/gnunet-service-testbed_peers.c:1010
 msgid "Message was sent successfully"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:216
+#: src/arm/gnunet-arm.c:218
 #, fuzzy
 msgid "Misconfiguration (can not connect to the ARM service)"
 msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
 
-#: src/arm/gnunet-arm.c:218 src/testbed/gnunet-service-testbed_peers.c:975
+#: src/arm/gnunet-arm.c:220 src/testbed/gnunet-service-testbed_peers.c:1014
 #, fuzzy
 msgid "We disconnected from ARM before we could send a request"
 msgstr "# gap Anfragen verworfen: Kollision in RT"
 
-#: src/arm/gnunet-arm.c:220 src/testbed/gnunet-service-testbed_peers.c:977
+#: src/arm/gnunet-arm.c:222 src/testbed/gnunet-service-testbed_peers.c:1016
 msgid "ARM API is busy"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:222
+#: src/arm/gnunet-arm.c:224
 msgid "Request does not fit into a message"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:224 src/testbed/gnunet-service-testbed_peers.c:981
+#: src/arm/gnunet-arm.c:226 src/testbed/gnunet-service-testbed_peers.c:1020
 #, fuzzy
 msgid "Request timed out"
 msgstr "# Sitzungsschlüssel akzeptiert"
 
-#: src/arm/gnunet-arm.c:226 src/testbed/gnunet-service-testbed_peers.c:983
+#: src/arm/gnunet-arm.c:228 src/testbed/gnunet-service-testbed_peers.c:1022
 #, fuzzy
 msgid "Unknown request status"
 msgstr "Unbekannte Operation `%s'\n"
 
-#: src/arm/gnunet-arm.c:242 src/testbed/gnunet-service-testbed_peers.c:999
+#: src/arm/gnunet-arm.c:244 src/testbed/gnunet-service-testbed_peers.c:1038
 #, fuzzy, c-format
 msgid "%s is stopped"
 msgstr "# bytes in der Datenbank"
 
-#: src/arm/gnunet-arm.c:244 src/testbed/gnunet-service-testbed_peers.c:1001
+#: src/arm/gnunet-arm.c:246 src/testbed/gnunet-service-testbed_peers.c:1040
 #, fuzzy, c-format
 msgid "%s is starting"
 msgstr "`%s' startet\n"
 
-#: src/arm/gnunet-arm.c:246 src/testbed/gnunet-service-testbed_peers.c:1003
+#: src/arm/gnunet-arm.c:248 src/testbed/gnunet-service-testbed_peers.c:1042
 #, c-format
 msgid "%s is stopping"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:248 src/testbed/gnunet-service-testbed_peers.c:1005
+#: src/arm/gnunet-arm.c:250 src/testbed/gnunet-service-testbed_peers.c:1044
 #, fuzzy, c-format
 msgid "%s is starting already"
 msgstr "`%s' startet\n"
 
-#: src/arm/gnunet-arm.c:250 src/testbed/gnunet-service-testbed_peers.c:1007
+#: src/arm/gnunet-arm.c:252 src/testbed/gnunet-service-testbed_peers.c:1046
 #, c-format
 msgid "%s is stopping already"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:252 src/testbed/gnunet-service-testbed_peers.c:1009
+#: src/arm/gnunet-arm.c:254 src/testbed/gnunet-service-testbed_peers.c:1048
 #, c-format
 msgid "%s is started already"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:254 src/testbed/gnunet-service-testbed_peers.c:1011
+#: src/arm/gnunet-arm.c:256 src/testbed/gnunet-service-testbed_peers.c:1050
 #, c-format
 msgid "%s is stopped already"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:256 src/testbed/gnunet-service-testbed_peers.c:1013
+#: src/arm/gnunet-arm.c:258 src/testbed/gnunet-service-testbed_peers.c:1052
 #, fuzzy, c-format
 msgid "%s service is not known to ARM"
 msgstr "Namespace `%s' hat das Rating %d.\n"
 
-#: src/arm/gnunet-arm.c:258 src/testbed/gnunet-service-testbed_peers.c:1015
+#: src/arm/gnunet-arm.c:260 src/testbed/gnunet-service-testbed_peers.c:1054
 #, fuzzy, c-format
 msgid "%s service failed to start"
 msgstr "Fehler beim Starten der Collection.\n"
 
-#: src/arm/gnunet-arm.c:260
+#: src/arm/gnunet-arm.c:262
 #, fuzzy, c-format
 msgid "%s service cannot be started because ARM is shutting down"
 msgstr "`%s' fährt herunter.\n"
 
-#: src/arm/gnunet-arm.c:262 src/testbed/gnunet-service-testbed_peers.c:1019
+#: src/arm/gnunet-arm.c:264 src/testbed/gnunet-service-testbed_peers.c:1058
 #, c-format
 msgid "%.s Unknown result code."
 msgstr ""
 
-#: src/arm/gnunet-arm.c:295
+#: src/arm/gnunet-arm.c:297
 msgid "Fatal error initializing ARM API.\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:324 src/arm/gnunet-arm.c:333
+#: src/arm/gnunet-arm.c:326 src/arm/gnunet-arm.c:335
 #, fuzzy, c-format
 msgid "Failed to start the ARM service: %s\n"
 msgstr "Der Transportdienst auf Port %d konnte nicht gestartet werden.\n"
 
-#: src/arm/gnunet-arm.c:367
+#: src/arm/gnunet-arm.c:369
 #, fuzzy, c-format
 msgid "Failed to send a stop request to the ARM service: %s\n"
 msgstr "Der Transportdienst auf Port %d konnte nicht gestartet werden.\n"
 
-#: src/arm/gnunet-arm.c:377
+#: src/arm/gnunet-arm.c:379
 #, fuzzy, c-format
 msgid "Failed to stop the ARM service: %s\n"
 msgstr "Fehler beim Binden an UDP Port %d.\n"
 
-#: src/arm/gnunet-arm.c:418
+#: src/arm/gnunet-arm.c:420
 #, fuzzy, c-format
 msgid "Failed to send a request to start the `%s' service: %%s\n"
 msgstr "Der Transportdienst auf Port %d konnte nicht gestartet werden.\n"
 
-#: src/arm/gnunet-arm.c:427
+#: src/arm/gnunet-arm.c:429
 #, fuzzy, c-format
 msgid "Failed to start the `%s' service: %s\n"
 msgstr "Der Transportdienst auf Port %d konnte nicht gestartet werden.\n"
 
-#: src/arm/gnunet-arm.c:463
+#: src/arm/gnunet-arm.c:465
 #, fuzzy, c-format
 msgid "Failed to send a request to kill the `%s' service: %%s\n"
 msgstr "Der Transportdienst auf Port %d konnte nicht gestartet werden.\n"
 
-#: src/arm/gnunet-arm.c:474
+#: src/arm/gnunet-arm.c:476
 #, fuzzy, c-format
 msgid "Failed to kill the `%s' service: %s\n"
 msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
 
-#: src/arm/gnunet-arm.c:510
+#: src/arm/gnunet-arm.c:512
 #, fuzzy, c-format
 msgid "Failed to request a list of services: %s\n"
 msgstr "Der Transportdienst auf Port %d konnte nicht gestartet werden.\n"
 
-#: src/arm/gnunet-arm.c:517
+#: src/arm/gnunet-arm.c:519
 #, fuzzy
 msgid "Error communicating with ARM. ARM not running?\n"
 msgstr "Informationen über andere GNUnet Knoten ausgeben."
 
-#: src/arm/gnunet-arm.c:521
+#: src/arm/gnunet-arm.c:523
 #, fuzzy
 msgid "Running services:\n"
 msgstr "Collection `%s' begonnen.\n"
 
-#: src/arm/gnunet-arm.c:603
+#: src/arm/gnunet-arm.c:605
 #, c-format
 msgid "Now only monitoring, press CTRL-C to stop.\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:634
+#: src/arm/gnunet-arm.c:636
 #, c-format
 msgid "Stopped %s.\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:637
+#: src/arm/gnunet-arm.c:639
 #, fuzzy, c-format
 msgid "Starting %s...\n"
 msgstr "Collection `%s' begonnen.\n"
 
-#: src/arm/gnunet-arm.c:640
+#: src/arm/gnunet-arm.c:642
 #, c-format
 msgid "Stopping %s...\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:651
+#: src/arm/gnunet-arm.c:653
 #, fuzzy, c-format
 msgid "Unknown status %u for service %s.\n"
 msgstr "Unbekannte Operation `%s'\n"
 
-#: src/arm/gnunet-arm.c:715
+#: src/arm/gnunet-arm.c:717
 msgid "stop all GNUnet services"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:717
+#: src/arm/gnunet-arm.c:719
 msgid "start a particular service"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:719
+#: src/arm/gnunet-arm.c:721
 msgid "stop a particular service"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:721
+#: src/arm/gnunet-arm.c:723
 msgid "start all GNUnet default services"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:724
+#: src/arm/gnunet-arm.c:726
 msgid "stop and start all GNUnet default services"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:727
+#: src/arm/gnunet-arm.c:729
 msgid "delete config file and directory on exit"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:730
+#: src/arm/gnunet-arm.c:732
 msgid "monitor ARM activities"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:732
+#: src/arm/gnunet-arm.c:734
 msgid "don't print status messages"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:735
+#: src/arm/gnunet-arm.c:737
 #, fuzzy
 msgid "timeout in MSECS milliseconds for completing current operation"
 msgstr "Zeit, die gewartet wird, bis der Durchlauf fertiggestellt wird (in ms)"
 
-#: src/arm/gnunet-arm.c:737
+#: src/arm/gnunet-arm.c:739
 #, fuzzy
 msgid "list currently running services"
 msgstr "Collection `%s' begonnen.\n"
 
-#: src/arm/gnunet-arm.c:739
+#: src/arm/gnunet-arm.c:741
 msgid "don't let gnunet-service-arm inherit standard output"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:741
+#: src/arm/gnunet-arm.c:743
 msgid "don't let gnunet-service-arm inherit standard error"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:752
+#: src/arm/gnunet-arm.c:754
 msgid "Control services and the Automated Restart Manager (ARM)"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:257
+#: src/arm/gnunet-service-arm.c:268
 #, fuzzy
 msgid "Could not send status result to client\n"
 msgstr "Anfrage konnte nicht an gnunetd gesendet werden.\n"
 
-#: src/arm/gnunet-service-arm.c:291
+#: src/arm/gnunet-service-arm.c:304
 #, fuzzy
 msgid "Could not send list result to client\n"
 msgstr "Anfrage konnte nicht an gnunetd gesendet werden.\n"
 
-#: src/arm/gnunet-service-arm.c:500
+#: src/arm/gnunet-service-arm.c:519
 #, fuzzy, c-format
 msgid "Failed to start service `%s'\n"
 msgstr "Der Transportdienst auf Port %d konnte nicht gestartet werden.\n"
 
-#: src/arm/gnunet-service-arm.c:507
+#: src/arm/gnunet-service-arm.c:526
 #, fuzzy, c-format
 msgid "Starting service `%s'\n"
 msgstr "Collection `%s' begonnen.\n"
 
-#: src/arm/gnunet-service-arm.c:602
+#: src/arm/gnunet-service-arm.c:625
 #, fuzzy, c-format
 msgid "Unable to create socket for service `%s': %s\n"
 msgstr "Fehler beim Anlegen des Benutzerkontos:"
 
-#: src/arm/gnunet-service-arm.c:624
+#: src/arm/gnunet-service-arm.c:647
 #, c-format
 msgid "Unable to bind listening socket for service `%s' to address `%s': %s\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:638
+#: src/arm/gnunet-service-arm.c:676
 #, c-format
 msgid "ARM now monitors connections to service `%s' at `%s'\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:771
+#: src/arm/gnunet-service-arm.c:809
 #, fuzzy, c-format
 msgid "Preparing to stop `%s'\n"
 msgstr "Collection `%s' begonnen.\n"
 
-#: src/arm/gnunet-service-arm.c:1022
+#: src/arm/gnunet-service-arm.c:1070
 #, fuzzy, c-format
 msgid "Restarting service `%s'.\n"
 msgstr "Collection `%s' begonnen.\n"
 
-#: src/arm/gnunet-service-arm.c:1115
+#: src/arm/gnunet-service-arm.c:1163
 msgid "exit"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:1120
+#: src/arm/gnunet-service-arm.c:1168
 msgid "signal"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:1125
+#: src/arm/gnunet-service-arm.c:1173
 #, fuzzy
 msgid "unknown"
 msgstr "Unbekannter Fehler"
 
-#: src/arm/gnunet-service-arm.c:1131
+#: src/arm/gnunet-service-arm.c:1179
 #, fuzzy, c-format
 msgid "Service `%s' took %s to terminate\n"
 msgstr "Dienst gelöscht.\n"
 
-#: src/arm/gnunet-service-arm.c:1153
+#: src/arm/gnunet-service-arm.c:1201
 #, c-format
 msgid "Service `%s' terminated normally, will restart at any time\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:1168
+#: src/arm/gnunet-service-arm.c:1216
 #, c-format
 msgid "Service `%s' terminated with status %s/%d, will restart in %s\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:1386
+#: src/arm/gnunet-service-arm.c:1463
 #, fuzzy, c-format
 msgid "Starting default services `%s'\n"
 msgstr "Collection `%s' begonnen.\n"
 
-#: src/arm/gnunet-service-arm.c:1397
+#: src/arm/gnunet-service-arm.c:1474
 #, c-format
 msgid "Default service `%s' not configured correctly!\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:1411
+#: src/arm/gnunet-service-arm.c:1488
 msgid ""
 "No default services configured, GNUnet will not really start right now.\n"
 msgstr ""
 
-#: src/arm/mockup-service.c:46
+#: src/arm/mockup-service.c:41
 msgid "Initiating shutdown as requested by client.\n"
 msgstr ""
 
-#: src/ats/ats_api_performance.c:475
+#: src/ats/ats_api_performance.c:468
 #, fuzzy, c-format
 msgid "Received %s message\n"
 msgstr "ungültige `%s' Nachricht empfangen\n"
 
-#: src/ats/ats_api_performance.c:518
+#: src/ats/ats_api_performance.c:511
 #, fuzzy, c-format
 msgid "Received last message for %s \n"
 msgstr "GAP hat ungültige Inhalte von `%s' empfangen.\n"
 
-#: src/ats/gnunet-service-ats_addresses.c:1607
-#: src/ats/gnunet-service-ats_addresses.c:1641
+#: src/ats/gnunet-service-ats_addresses.c:1475
+#: src/ats/gnunet-service-ats_addresses.c:1519
 #, c-format
 msgid ""
 "Could not load quota for network `%s':  `%s', assigning default bandwidth "
 "%llu\n"
 msgstr ""
 
-#: src/ats/gnunet-service-ats_addresses.c:1613
+#: src/ats/gnunet-service-ats_addresses.c:1482
 #, c-format
 msgid "Outbound quota configure for network `%s' is %llu\n"
 msgstr ""
 
-#: src/ats/gnunet-service-ats_addresses.c:1620
+#: src/ats/gnunet-service-ats_addresses.c:1490
 #, c-format
 msgid ""
 "No outbound quota configured for network `%s', assigning default bandwidth "
 "%llu\n"
 msgstr ""
 
-#: src/ats/gnunet-service-ats_addresses.c:1647
+#: src/ats/gnunet-service-ats_addresses.c:1526
 #, c-format
 msgid "Inbound quota configured for network `%s' is %llu\n"
 msgstr ""
 
-#: src/ats/gnunet-service-ats_addresses.c:1654
+#: src/ats/gnunet-service-ats_addresses.c:1534
 #, c-format
 msgid ""
 "No outbound quota configure for network `%s', assigning default bandwidth "
 "%llu\n"
 msgstr ""
 
-#: src/ats/gnunet-service-ats_addresses.c:1888
+#: src/ats/gnunet-service-ats_addresses.c:1700
+#, c-format
+msgid "Initializing solver `%s '`%s'\n"
+msgstr ""
+
+#: src/ats/gnunet-service-ats_addresses.c:1703
+#, fuzzy, c-format
+msgid "Failed to initialize solver `%s'!\n"
+msgstr "SQLite Datenbank konnte nicht initialisiert werden: %s.\n"
+
+#: src/ats/gnunet-service-ats_addresses.c:1726
 #, fuzzy
 msgid "Failed to initialize solver!\n"
 msgstr "SQLite Datenbank konnte nicht initialisiert werden: %s.\n"
 
-#: src/ats/gnunet-service-ats-solver_mlp.c:849
+#: src/ats/libgnunet_plugin_ats_mlp.c:868
 msgid "Problem size too large, cannot allocate memory!\n"
 msgstr ""
 
-#: src/ats/gnunet-service-ats-solver_mlp.c:1193
+#: src/ats/libgnunet_plugin_ats_mlp.c:1239
 #, fuzzy, c-format
 msgid "Adding address for peer `%s' multiple times\n"
 msgstr "Adresse des Knotens `%s' konnte nicht ermittelt werden.\n"
 
-#: src/ats/gnunet-service-ats-solver_mlp.c:1238
+#: src/ats/libgnunet_plugin_ats_mlp.c:1286
 #, c-format
 msgid "Updating address property `%s' for peer `%s' %p not added before\n"
 msgstr ""
 
-#: src/ats/gnunet-service-ats-solver_mlp.c:1956
+#: src/ats/libgnunet_plugin_ats_mlp.c:2010
 #, c-format
 msgid ""
 "Adjusting inconsistent outbound quota configuration for network `%s', is "
 "%llu must be at least %llu\n"
 msgstr ""
 
-#: src/ats/gnunet-service-ats-solver_mlp.c:1964
+#: src/ats/libgnunet_plugin_ats_mlp.c:2018
 #, c-format
 msgid ""
 "Adjusting inconsistent inbound quota configuration for network `%s', is %llu "
 "must be at least %llu\n"
 msgstr ""
 
-#: src/ats/gnunet-service-ats-solver_mlp.c:1974
+#: src/ats/libgnunet_plugin_ats_mlp.c:2028
 #, c-format
 msgid ""
 "Adjusting outbound quota configuration for network `%s'from %llu to %.0f\n"
 msgstr ""
 
-#: src/ats/gnunet-service-ats-solver_mlp.c:1982
+#: src/ats/libgnunet_plugin_ats_mlp.c:2036
 #, c-format
 msgid ""
 "Adjusting inbound quota configuration for network `%s' from %llu to %.0f\n"
 msgstr ""
 
-#: src/ats/gnunet-service-ats-solver_mlp.c:1993
+#: src/ats/libgnunet_plugin_ats_mlp.c:2047
 #, c-format
 msgid "Using default quota configuration for network `%s' (in/out) %llu/%llu\n"
 msgstr ""
 
-#: src/ats/gnunet-service-ats-solver_proportional.c:1296
+#: src/ats/libgnunet_plugin_ats_proportional.c:1438
 #, fuzzy, c-format
 msgid "Invalid network type `%u' `%s': Disconnect!\n"
 msgstr "IP des Hosts `%s' konnte nicht ermittelt werden: %s\n"
@@ -467,161 +477,521 @@ msgstr "Knoten `%s' mit Vertrauen %8u und Adresse `%s'\n"
 msgid "Quota for network `%11s' (in/out): %10s / %10s\n"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:347 src/namestore/gnunet-namestore.c:438
-#: src/transport/gnunet-transport.c:812
+#: src/ats-tool/gnunet-ats.c:347 src/namestore/gnunet-namestore.c:520
+#: src/transport/gnunet-transport.c:807
 #, fuzzy, c-format
 msgid "Service `%s' is not running\n"
 msgstr "`%s' ist keine Datei.\n"
 
-#: src/ats-tool/gnunet-ats.c:357 src/transport/gnunet-transport.c:819
+#: src/ats-tool/gnunet-ats.c:359 src/transport/gnunet-transport.c:816
 #, fuzzy, c-format
 msgid "Failed to parse peer identity `%s'\n"
 msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
 
-#: src/ats-tool/gnunet-ats.c:365
+#: src/ats-tool/gnunet-ats.c:367
 #, c-format
 msgid "Please select one operation : %s or %s or %s or %s or %s\n"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:381 src/ats-tool/gnunet-ats.c:400
-#: src/ats-tool/gnunet-ats.c:417 src/ats-tool/gnunet-ats.c:455
+#: src/ats-tool/gnunet-ats.c:383 src/ats-tool/gnunet-ats.c:402
+#: src/ats-tool/gnunet-ats.c:419 src/ats-tool/gnunet-ats.c:457
 #, fuzzy, c-format
 msgid "Cannot connect to ATS service, exiting...\n"
 msgstr "`%s' Dienst konnte nicht initialisiert werden.\n"
 
-#: src/ats-tool/gnunet-ats.c:390 src/ats-tool/gnunet-ats.c:407
+#: src/ats-tool/gnunet-ats.c:392 src/ats-tool/gnunet-ats.c:409
 #, fuzzy, c-format
 msgid "Cannot issue request to ATS service, exiting...\n"
 msgstr "`%s' Dienst konnte nicht initialisiert werden.\n"
 
-#: src/ats-tool/gnunet-ats.c:425
+#: src/ats-tool/gnunet-ats.c:427
 #, fuzzy, c-format
 msgid "No preference type given!\n"
 msgstr "Informationen über andere GNUnet Knoten ausgeben."
 
-#: src/ats-tool/gnunet-ats.c:430
+#: src/ats-tool/gnunet-ats.c:432
 #, c-format
 msgid "No peer given!\n"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:448
+#: src/ats-tool/gnunet-ats.c:450
 msgid "Valid type required\n"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:506
+#: src/ats-tool/gnunet-ats.c:508
 msgid "get list of active addresses currently used"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:509
+#: src/ats-tool/gnunet-ats.c:511
 msgid "get list of all active addresses"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:512
+#: src/ats-tool/gnunet-ats.c:514
 #, fuzzy
 msgid "do not resolve IP addresses to hostnames"
 msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
 
-#: src/ats-tool/gnunet-ats.c:515
+#: src/ats-tool/gnunet-ats.c:517
 msgid "monitor mode"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:518
+#: src/ats-tool/gnunet-ats.c:520
 #, fuzzy
 msgid "set preference for the given peer"
 msgstr "Informationen über andere GNUnet Knoten ausgeben."
 
-#: src/ats-tool/gnunet-ats.c:521
+#: src/ats-tool/gnunet-ats.c:523
 msgid "print all configured quotas"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:524
+#: src/ats-tool/gnunet-ats.c:526
 msgid "peer id"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:527
+#: src/ats-tool/gnunet-ats.c:529
 msgid "preference type to set: latency | bandwidth"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:530
+#: src/ats-tool/gnunet-ats.c:532
 msgid "preference value"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:533
+#: src/ats-tool/gnunet-ats.c:535
 msgid "verbose output (include ATS address properties)"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:542
+#: src/ats-tool/gnunet-ats.c:544
 #, fuzzy
 msgid "Print information about ATS state"
 msgstr "Informationen über andere GNUnet Knoten ausgeben."
 
-#: src/block/block.c:105
-#, fuzzy, c-format
-msgid "Loading block plugin `%s'\n"
-msgstr "Teste Transport(e) %s\n"
-
-#: src/consensus/gnunet-consensus-profiler.c:393
+#: src/consensus/gnunet-consensus-profiler.c:394
 #, fuzzy
 msgid "number of peers in consensus"
 msgstr "Anzahl an Durchläufen"
 
-#: src/consensus/gnunet-consensus-profiler.c:396
+#: src/consensus/gnunet-consensus-profiler.c:397
 msgid "how many peers receive one value?"
 msgstr ""
 
-#: src/consensus/gnunet-consensus-profiler.c:399
-#: src/set/gnunet-set-profiler.c:287 src/set/gnunet-set-profiler.c:290
-#: src/set/gnunet-set-profiler.c:293
+#: src/consensus/gnunet-consensus-profiler.c:400
+#: src/set/gnunet-set-profiler.c:286 src/set/gnunet-set-profiler.c:289
+#: src/set/gnunet-set-profiler.c:292
 #, fuzzy
 msgid "number of values"
 msgstr "Anzahl an Durchläufen"
 
-#: src/consensus/gnunet-consensus-profiler.c:402
+#: src/consensus/gnunet-consensus-profiler.c:403
 #, fuzzy
 msgid "consensus timeout"
 msgstr "# Sitzungsschlüssel akzeptiert"
 
-#: src/consensus/gnunet-consensus-profiler.c:405
+#: src/consensus/gnunet-consensus-profiler.c:406
 msgid "be more verbose (print received values)"
 msgstr ""
 
-#: src/core/core_api.c:752
+#: src/conversation/conversation_api.c:333
+#: src/conversation/conversation_api.c:959
+#, fuzzy, c-format
+msgid "Internal error %d\n"
+msgstr "Unbekannter Fehler.\n"
+
+#: src/conversation/gnunet-conversation.c:186
+#, c-format
+msgid ""
+"Incoming call from `%s'.\n"
+"Please /accept or /cancel the call.\n"
+msgstr ""
+
+#: src/conversation/gnunet-conversation.c:206
+#: src/conversation/gnunet-conversation.c:315
+#, c-format
+msgid "Call terminated: %s\n"
+msgstr ""
+
+#: src/conversation/gnunet-conversation.c:226
+#, c-format
+msgid "Ego `%s' no longer available, phone is now down.\n"
+msgstr ""
+
+#: src/conversation/gnunet-conversation.c:239
+#, fuzzy
+msgid "Failed to setup phone (internal error)\n"
+msgstr "Statistiken über den Netzwerkverkehr konnten nicht ermittelt werden.\n"
+
+#: src/conversation/gnunet-conversation.c:252
+#, c-format
+msgid "Phone active on line %u\n"
+msgstr ""
+
+#: src/conversation/gnunet-conversation.c:284
+msgid "Resolved address. Now ringing other party.\n"
+msgstr ""
+
+#: src/conversation/gnunet-conversation.c:290
+#, fuzzy, c-format
+msgid "Connection established to `%s': %s\n"
+msgstr "`%s' schlug fehl bei %s:%d mit dem Fehler: `%s'.\n"
+
+#: src/conversation/gnunet-conversation.c:298
+#, fuzzy, c-format
+msgid "Failed to resolve `%s'\n"
+msgstr "Datei wurde als `%s' gespeichert.\n"
+
+#: src/conversation/gnunet-conversation.c:307
+msgid "Line busy\n"
+msgstr ""
+
+#: src/conversation/gnunet-conversation.c:385
+#, fuzzy, c-format
+msgid "Unknown command `%s'\n"
+msgstr "Unbekannte Operation `%s'\n"
+
+#: src/conversation/gnunet-conversation.c:401
+#: src/conversation/gnunet-conversation.c:409
+#, fuzzy, c-format
+msgid "Ego `%s' not available\n"
+msgstr "gconfig ist nicht verfügbar\n"
+
+#: src/conversation/gnunet-conversation.c:417
+#, c-format
+msgid "Hanging up on incoming phone call from `%s' to call `%s'.\n"
+msgstr ""
+
+#: src/conversation/gnunet-conversation.c:424
+#: src/conversation/gnunet-conversation.c:438
+#, c-format
+msgid "You are already in a conversation with `%s', refusing to call `%s'.\n"
+msgstr ""
+
+#: src/conversation/gnunet-conversation.c:431
+#, fuzzy, c-format
+msgid "Aborting call to `%s'\n"
+msgstr "Fehler beim Anlegen des Benutzers"
+
+#: src/conversation/gnunet-conversation.c:478
+msgid "There is no incoming call to be accepted!\n"
+msgstr ""
+
+#: src/conversation/gnunet-conversation.c:485
+#: src/conversation/gnunet-conversation.c:496
+#, fuzzy, c-format
+msgid "You are already in a conversation with `%s'.\n"
+msgstr "Konfigurationsdatei `%s' konnte nicht geparst werden.\n"
+
+#: src/conversation/gnunet-conversation.c:491
+#, c-format
+msgid "You are trying to call `%s', cannot accept incoming calls right now.\n"
+msgstr ""
+
+#: src/conversation/gnunet-conversation.c:521
+msgid "We currently do not have an address.\n"
+msgstr ""
+
+#: src/conversation/gnunet-conversation.c:542
+#, c-format
+msgid "We are currently trying to locate the private key for the ego `%s'.\n"
+msgstr ""
+
+#: src/conversation/gnunet-conversation.c:547
+#, c-format
+msgid "We are listening for incoming calls for ego `%s' on line %u.\n"
+msgstr ""
+
+#: src/conversation/gnunet-conversation.c:553
+#, c-format
+msgid "The phone is rining. `%s' is trying to call us.\n"
+msgstr ""
+
+#: src/conversation/gnunet-conversation.c:559
+#, c-format
+msgid "You are having a conversation with `%s'.\n"
+msgstr ""
+
+#: src/conversation/gnunet-conversation.c:564
+#, fuzzy, c-format
+msgid "We are trying to find the network address to call `%s'.\n"
+msgstr "GNUnet verwendet nun die IP-Adresse %u.%u.%u.%u.\n"
+
+#: src/conversation/gnunet-conversation.c:569
+#, c-format
+msgid "We are calling `%s', his phone should be ringing.\n"
+msgstr ""
+
+#: src/conversation/gnunet-conversation.c:574
+msgid ""
+"We had an internal error setting up our phone line. You can still make "
+"calls.\n"
+msgstr ""
+
+#: src/conversation/gnunet-conversation.c:595
+msgid "There is no call that could be cancelled right now.\n"
+msgstr ""
+
+#: src/conversation/gnunet-conversation.c:626
+msgid "Use `/address' to find out which address this phone should have in GNS"
+msgstr ""
+
+#: src/conversation/gnunet-conversation.c:628
+msgid "Use `/call USER.gnu' to call USER"
+msgstr ""
+
+#: src/conversation/gnunet-conversation.c:630
+msgid "Use `/accept MESSAGE' to accept an incoming call"
+msgstr ""
+
+#: src/conversation/gnunet-conversation.c:632
+msgid "Use `/cancel MESSAGE' to reject or terminate a call"
+msgstr ""
+
+#: src/conversation/gnunet-conversation.c:634
+msgid "Use `/status' to print status information"
+msgstr ""
+
+#: src/conversation/gnunet-conversation.c:636
+#, fuzzy
+msgid "Use `/quit' to terminate gnunet-conversation"
+msgstr "Erlaubt es Clients die Konfiguration von gnunetd abzufragen"
+
+#: src/conversation/gnunet-conversation.c:638
+msgid "Use `/help command' to get help for a specific command"
+msgstr ""
+
+#: src/conversation/gnunet-conversation.c:793
+#, fuzzy, c-format
+msgid "Name of our ego changed to `%s'\n"
+msgstr "Namespace `%s' konnte nicht erstellt werden (existiert bereits?).\n"
+
+#: src/conversation/gnunet-conversation.c:806
+#, fuzzy, c-format
+msgid "Our ego `%s' was deleted!\n"
+msgstr "Pseudonym `%s' wurde gelöscht.\n"
+
+#: src/conversation/gnunet-conversation.c:841
+#, fuzzy
+msgid "You must specify the NAME of an ego to use\n"
+msgstr "Sie müssen eine Liste von Dateien zum Einfügen angeben.\n"
+
+#: src/conversation/gnunet-conversation.c:867
+msgid "sets the NAME of the ego to use for the phone (and name resolution)"
+msgstr ""
+
+#: src/conversation/gnunet-conversation.c:870
+msgid "sets the LINE to use for the phone"
+msgstr ""
+
+#: src/conversation/gnunet-conversation.c:885
+msgid "Enables having a conversation with other GNUnet users."
+msgstr ""
+
+#: src/conversation/gnunet-conversation-test.c:121
+#, c-format
+msgid ""
+"\n"
+"End of transmission.  Have a GNU day.\n"
+msgstr ""
+
+#: src/conversation/gnunet-conversation-test.c:149
+#, c-format
+msgid ""
+"\n"
+"We are now playing your recording back.  If you can hear it, your audio "
+"settings are working..."
+msgstr ""
+
+#: src/conversation/gnunet-conversation-test.c:215
+#, c-format
+msgid ""
+"We will now be recording you for %s. After that time, the recording will be "
+"played back to you..."
+msgstr ""
+
+#: src/conversation/gnunet-conversation-test.c:248
+#: src/integration-tests/connection_watchdog.c:1114
+#: src/multicast/gnunet-multicast.c:70 src/revocation/gnunet-revocation.c:510
+#: src/template/gnunet-template.c:70
+#, fuzzy
+msgid "help text"
+msgstr "Hilfetext für -t"
+
+#: src/conversation/gnunet-helper-audio-playback.c:137
+#, fuzzy, c-format
+msgid "pa_stream_write() failed: %s\n"
+msgstr "`%s' schlug fehl: %s\n"
+
+#: src/conversation/gnunet-helper-audio-playback.c:186
+msgid "gnunet-helper-audio-playback - Got signal, exiting\n"
+msgstr ""
+
+#: src/conversation/gnunet-helper-audio-playback.c:211
+#: src/conversation/gnunet-helper-audio-record.c:363
+#, fuzzy
+msgid "Connection established.\n"
+msgstr "Collection beendet.\n"
+
+#: src/conversation/gnunet-helper-audio-playback.c:216
+#: src/conversation/gnunet-helper-audio-record.c:368
+#, fuzzy, c-format
+msgid "pa_stream_new() failed: %s\n"
+msgstr "`%s' schlug fehl: %s\n"
+
+#: src/conversation/gnunet-helper-audio-playback.c:230
+#, c-format
+msgid "pa_stream_connect_playback() failed: %s\n"
+msgstr ""
+
+#: src/conversation/gnunet-helper-audio-playback.c:243
+#: src/conversation/gnunet-helper-audio-record.c:394
+#, fuzzy, c-format
+msgid "Connection failure: %s\n"
+msgstr "`%s' schlug fehl bei %s:%d mit dem Fehler: `%s'.\n"
+
+#: src/conversation/gnunet-helper-audio-playback.c:264
+#: src/conversation/gnunet-helper-audio-record.c:417
+msgid "Wrong Spec\n"
+msgstr ""
+
+#: src/conversation/gnunet-helper-audio-playback.c:270
+#: src/conversation/gnunet-helper-audio-record.c:423
+#, fuzzy
+msgid "pa_mainloop_new() failed.\n"
+msgstr "Absicherung fehlgeschlagen bei %s:%d.\n"
+
+#: src/conversation/gnunet-helper-audio-playback.c:284
+#: src/conversation/gnunet-helper-audio-record.c:438
+#, fuzzy
+msgid "pa_context_new() failed.\n"
+msgstr "Absicherung fehlgeschlagen bei %s:%d.\n"
+
+#: src/conversation/gnunet-helper-audio-playback.c:291
+#: src/conversation/gnunet-helper-audio-record.c:444
+#, fuzzy, c-format
+msgid "pa_context_connect() failed: %s\n"
+msgstr "`%s' schlug fehl: %s\n"
+
+#: src/conversation/gnunet-helper-audio-playback.c:297
+#: src/conversation/gnunet-helper-audio-record.c:450
+#, fuzzy
+msgid "pa_mainloop_run() failed.\n"
+msgstr "Absicherung fehlgeschlagen bei %s:%d.\n"
+
+#: src/conversation/gnunet-helper-audio-playback.c:366
+#, c-format
+msgid "Read error from STDIN: %s\n"
+msgstr ""
+
+#: src/conversation/gnunet-helper-audio-record.c:237
+#, fuzzy, c-format
+msgid "pa_stream_peek() failed: %s\n"
+msgstr "`%s' schlug fehl: %s\n"
+
+#: src/conversation/gnunet-helper-audio-record.c:275
+msgid "Got signal, exiting.\n"
+msgstr ""
+
+#: src/conversation/gnunet-helper-audio-record.c:301
+#, fuzzy
+msgid "Stream successfully created.\n"
+msgstr "Zugriff verweigert für `%s' bei %s:%d.\n"
+
+#: src/conversation/gnunet-helper-audio-record.c:306
+#, fuzzy, c-format
+msgid "pa_stream_get_buffer_attr() failed: %s\n"
+msgstr "`%s' schlug fehl: %s\n"
+
+#: src/conversation/gnunet-helper-audio-record.c:314
+#, c-format
+msgid "Buffer metrics: maxlength=%u, fragsize=%u\n"
+msgstr ""
+
+#: src/conversation/gnunet-helper-audio-record.c:318
+#, c-format
+msgid "Using sample spec '%s', channel map '%s'.\n"
+msgstr ""
+
+#: src/conversation/gnunet-helper-audio-record.c:325
+#, fuzzy, c-format
+msgid "Connected to device %s (%u, %ssuspended).\n"
+msgstr "`%s' hat sich mit `%s' verbunden.\n"
+
+#: src/conversation/gnunet-helper-audio-record.c:334
+#, c-format
+msgid "Stream error: %s\n"
+msgstr ""
+
+#: src/conversation/gnunet-helper-audio-record.c:381
+#, fuzzy, c-format
+msgid "pa_stream_connect_record() failed: %s\n"
+msgstr ""
+"\n"
+"Fehler beim Uploaden der Datei: %s\n"
+
+#: src/conversation/gnunet-service-conversation.c:612
+msgid "Mesh audio channel not ready; audio data dropped\n"
+msgstr ""
+
+#: src/conversation/gnunet-service-conversation.c:700
+#, c-format
+msgid "No available phone for incoming call on line %u, sending BUSY signal\n"
+msgstr ""
+
+#: src/conversation/gnunet-service-conversation.c:1054
+#, c-format
+msgid "Received incoming tunnel on port %u\n"
+msgstr ""
+
+#: src/conversation/microphone.c:121
+#, fuzzy
+msgid "Could not start record audio helper\n"
+msgstr "Auf die Namespace Informationen konnte nicht zugegriffen werden.\n"
+
+#: src/conversation/plugin_gnsrecord_conversation.c:116
+#, fuzzy, c-format
+msgid "Unable to parse PHONE record `%s'\n"
+msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
+
+#: src/conversation/speaker.c:75
+#, fuzzy
+msgid "Could not start playback audio helper.\n"
+msgstr "Anwendung `%s' konnte nicht initialisiert werden.\n"
+
+#: src/core/core_api.c:761
 msgid "Client was disconnected from core service, trying to reconnect.\n"
 msgstr ""
 
-#: src/core/gnunet-core.c:83
+#: src/core/gnunet-core.c:80
 #, fuzzy, c-format
 msgid "Peer `%s'\n"
 msgstr "Ich bin Peer `%s'.\n"
 
-#: src/core/gnunet-core.c:112 src/core/gnunet-core.c:140
-#: src/transport/gnunet-transport.c:606 src/transport/gnunet-transport.c:630
+#: src/core/gnunet-core.c:110 src/core/gnunet-core.c:138
+#: src/transport/gnunet-transport.c:601 src/transport/gnunet-transport.c:625
 #, c-format
 msgid "%24s: %-17s %4s   (%u connections in total)\n"
 msgstr ""
 
-#: src/core/gnunet-core.c:114 src/transport/gnunet-transport.c:608
+#: src/core/gnunet-core.c:112 src/transport/gnunet-transport.c:603
 #, fuzzy
 msgid "Connected to"
 msgstr "`%s' hat sich mit `%s' verbunden.\n"
 
-#: src/core/gnunet-core.c:142 src/transport/gnunet-transport.c:632
+#: src/core/gnunet-core.c:140 src/transport/gnunet-transport.c:627
 #, fuzzy
 msgid "Disconnected from"
 msgstr "`%s' hat sich mit `%s' verbunden.\n"
 
-#: src/core/gnunet-core.c:166 src/mesh/gnunet-mesh.c:170
-#: src/peerinfo-tool/gnunet-peerinfo.c:653
+#: src/core/gnunet-core.c:164 src/mesh/gnunet-mesh.c:174
+#: src/peerinfo-tool/gnunet-peerinfo.c:645
 #, fuzzy, c-format
 msgid "Invalid command line argument `%s'\n"
 msgstr "Ungültige Kommandozeilen Parameter:\n"
 
-#: src/core/gnunet-core.c:203 src/transport/gnunet-transport.c:1004
+#: src/core/gnunet-core.c:201 src/transport/gnunet-transport.c:999
 #, fuzzy
 msgid "provide information about all current connections (continuously)"
 msgstr "Informationen über andere GNUnet Knoten ausgeben."
 
-#: src/core/gnunet-core.c:214
+#: src/core/gnunet-core.c:212
 #, fuzzy
 msgid "Print information about connected peers."
 msgstr "Informationen über andere GNUnet Knoten ausgeben."
@@ -651,150 +1021,150 @@ msgstr "# defragmentierter Nachrichten"
 msgid "# bytes of messages of type %u received"
 msgstr "# Bytes Rauschen empfangen"
 
-#: src/core/gnunet-service-core_kx.c:532
+#: src/core/gnunet-service-core_kx.c:531
 msgid "# bytes encrypted"
 msgstr "# Bytes verschlüsselt"
 
-#: src/core/gnunet-service-core_kx.c:583
+#: src/core/gnunet-service-core_kx.c:582
 msgid "# bytes decrypted"
 msgstr "# Bytes entschlüsselt"
 
-#: src/core/gnunet-service-core_kx.c:667
+#: src/core/gnunet-service-core_kx.c:668
 msgid "# key exchanges initiated"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:697
+#: src/core/gnunet-service-core_kx.c:701
 msgid "# key exchanges stopped"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:761
+#: src/core/gnunet-service-core_kx.c:764
 msgid "# old ephemeral keys ignored"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:767
+#: src/core/gnunet-service-core_kx.c:770
 #, fuzzy
 msgid "# ephemeral keys received"
 msgstr "# verschlüsselter PING Nachrichten empfangen"
 
-#: src/core/gnunet-service-core_kx.c:803
+#: src/core/gnunet-service-core_kx.c:804
 #, c-format
 msgid ""
 "Ephemeral key message from peer `%s' rejected as its validity range does not "
 "match our system time (%llu not in [%llu,%llu]).\n"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:819
+#: src/core/gnunet-service-core_kx.c:820
 #, fuzzy
 msgid "# EPHEMERAL_KEY messages decrypted"
 msgstr "# defragmentierter Nachrichten"
 
-#: src/core/gnunet-service-core_kx.c:922
-#: src/transport/gnunet-service-transport_validation.c:933
+#: src/core/gnunet-service-core_kx.c:923
+#: src/transport/gnunet-service-transport_validation.c:938
 #, fuzzy
 msgid "# PING messages received"
 msgstr "# PING Nachrichten erstellt"
 
-#: src/core/gnunet-service-core_kx.c:930
+#: src/core/gnunet-service-core_kx.c:931
 #, fuzzy
 msgid "# PING messages dropped (out of order)"
 msgstr "# gap Anfragen verworfen: Kollision in RT"
 
-#: src/core/gnunet-service-core_kx.c:957
+#: src/core/gnunet-service-core_kx.c:958
 #, c-format
 msgid ""
 "Received PING from `%s' for different identity: I am `%s', PONG identity: `"
 "%s'\n"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:974
+#: src/core/gnunet-service-core_kx.c:975
 #, fuzzy
 msgid "# PONG messages created"
 msgstr "# PING Nachrichten erstellt"
 
-#: src/core/gnunet-service-core_kx.c:1000
+#: src/core/gnunet-service-core_kx.c:1001
 #, fuzzy
 msgid "# sessions terminated by timeout"
 msgstr "# Bytes verworfen von TCP (ausgehend)"
 
-#: src/core/gnunet-service-core_kx.c:1010
+#: src/core/gnunet-service-core_kx.c:1011
 #, fuzzy
 msgid "# keepalive messages sent"
 msgstr "# Klartext PING Nachrichten gesendet"
 
-#: src/core/gnunet-service-core_kx.c:1067
-#: src/transport/gnunet-service-transport_validation.c:1224
+#: src/core/gnunet-service-core_kx.c:1068
+#: src/transport/gnunet-service-transport_validation.c:1233
 #, fuzzy
 msgid "# PONG messages received"
 msgstr "# verschlüsselter PONG Nachrichten empfangen"
 
-#: src/core/gnunet-service-core_kx.c:1073
+#: src/core/gnunet-service-core_kx.c:1074
 #, fuzzy
 msgid "# PONG messages dropped (connection down)"
 msgstr "# verschlüsselter PONG Nachrichten empfangen"
 
-#: src/core/gnunet-service-core_kx.c:1078
+#: src/core/gnunet-service-core_kx.c:1079
 #, fuzzy
 msgid "# PONG messages dropped (out of order)"
 msgstr "# gap Anfragen verworfen: Kollision in RT"
 
-#: src/core/gnunet-service-core_kx.c:1108
+#: src/core/gnunet-service-core_kx.c:1109
 #, fuzzy
 msgid "# PONG messages decrypted"
 msgstr "# PING Nachrichten erstellt"
 
-#: src/core/gnunet-service-core_kx.c:1142
+#: src/core/gnunet-service-core_kx.c:1143
 #, fuzzy
 msgid "# session keys confirmed via PONG"
 msgstr "# Knotenankündigungen empfangen"
 
-#: src/core/gnunet-service-core_kx.c:1152
+#: src/core/gnunet-service-core_kx.c:1153
 #, fuzzy
 msgid "# timeouts prevented via PONG"
 msgstr "# Bytes empfangen über TCP"
 
-#: src/core/gnunet-service-core_kx.c:1159
+#: src/core/gnunet-service-core_kx.c:1160
 #, fuzzy
 msgid "# rekey operations confirmed via PONG"
 msgstr "# Knotenankündigungen empfangen"
 
-#: src/core/gnunet-service-core_kx.c:1299
+#: src/core/gnunet-service-core_kx.c:1300
 #, fuzzy
 msgid "# DATA message dropped (out of order)"
 msgstr "# Bytes verworfen von UDP (outgoing)"
 
-#: src/core/gnunet-service-core_kx.c:1306
+#: src/core/gnunet-service-core_kx.c:1307
 #, c-format
 msgid ""
 "Session to peer `%s' went down due to key expiration (should not happen)\n"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1309
+#: src/core/gnunet-service-core_kx.c:1310
 #, fuzzy
 msgid "# sessions terminated by key expiration"
 msgstr "# Bytes verworfen von TCP (ausgehend)"
 
-#: src/core/gnunet-service-core_kx.c:1352
-#: src/core/gnunet-service-core_kx.c:1377
+#: src/core/gnunet-service-core_kx.c:1353
+#: src/core/gnunet-service-core_kx.c:1378
 #, fuzzy
 msgid "# bytes dropped (duplicates)"
 msgstr "# Bytes verworfen von UDP (outgoing)"
 
-#: src/core/gnunet-service-core_kx.c:1364
+#: src/core/gnunet-service-core_kx.c:1365
 #, fuzzy
 msgid "# bytes dropped (out of sequence)"
 msgstr "# Bytes verworfen von UDP (outgoing)"
 
-#: src/core/gnunet-service-core_kx.c:1405
+#: src/core/gnunet-service-core_kx.c:1406
 #, fuzzy
 msgid "# bytes dropped (ancient message)"
 msgstr "# Bytes verworfen von UDP (outgoing)"
 
-#: src/core/gnunet-service-core_kx.c:1413
+#: src/core/gnunet-service-core_kx.c:1414
 #, fuzzy
 msgid "# bytes of payload decrypted"
 msgstr "# Bytes entschlüsselt"
 
-#: src/core/gnunet-service-core_kx.c:1444
+#: src/core/gnunet-service-core_kx.c:1445
 #, fuzzy
 msgid "# PAYLOAD dropped (out of order)"
 msgstr "# Bytes verworfen von UDP (outgoing)"
@@ -818,28 +1188,28 @@ msgstr ""
 msgid "Unsupported message of type %u (%u bytes) received from peer `%s'\n"
 msgstr "Ungültige Nachricht des Typs %u empfangen. Nachricht wird verworfen.\n"
 
-#: src/core/gnunet-service-core_sessions.c:209
-#: src/core/gnunet-service-core_sessions.c:279
-#: src/dht/gnunet-service-dht_neighbours.c:641
-#: src/dht/gnunet-service-dht_neighbours.c:700
-#: src/fs/gnunet-service-fs_cp.c:601 src/fs/gnunet-service-fs_cp.c:1495
-#: src/topology/gnunet-daemon-topology.c:700
-#: src/topology/gnunet-daemon-topology.c:801
-#: src/transport/gnunet-service-transport_neighbours.c:1041
-#: src/transport/gnunet-service-transport_neighbours.c:1265
-#: src/transport/gnunet-service-transport_neighbours.c:1274
+#: src/core/gnunet-service-core_sessions.c:208
+#: src/core/gnunet-service-core_sessions.c:278
+#: src/dht/gnunet-service-dht_neighbours.c:662
+#: src/dht/gnunet-service-dht_neighbours.c:727
+#: src/fs/gnunet-service-fs_cp.c:604 src/fs/gnunet-service-fs_cp.c:1499
+#: src/topology/gnunet-daemon-topology.c:706
+#: src/topology/gnunet-daemon-topology.c:807
+#: src/transport/gnunet-service-transport_neighbours.c:904
+#: src/transport/gnunet-service-transport_neighbours.c:1129
+#: src/transport/gnunet-service-transport_neighbours.c:1138
 #: src/transport/gnunet-service-transport_neighbours.c:2799
-#: src/transport/gnunet-service-transport_neighbours.c:3053
+#: src/transport/gnunet-service-transport_neighbours.c:3052
 #, fuzzy
 msgid "# peers connected"
 msgstr "# verbundener Knoten"
 
-#: src/core/gnunet-service-core_sessions.c:247
+#: src/core/gnunet-service-core_sessions.c:246
 #, fuzzy
 msgid "# type map refreshes sent"
 msgstr "# p2p Trace-Antworten gesendet"
 
-#: src/core/gnunet-service-core_sessions.c:416
+#: src/core/gnunet-service-core_sessions.c:415
 msgid "# messages discarded (expired prior to transmission)"
 msgstr ""
 
@@ -906,11 +1276,13 @@ msgstr ""
 #: src/datastore/plugin_datastore_sqlite.c:57 src/mysql/mysql.c:41
 #: src/mysql/mysql.c:48 src/mysql/mysql.c:522 src/mysql/mysql.c:531
 #: src/mysql/mysql.c:591 src/mysql/mysql.c:607
+#: src/namecache/plugin_namecache_postgres.c:52
+#: src/namecache/plugin_namecache_sqlite.c:52
 #: src/namestore/plugin_namestore_postgres.c:52
-#: src/namestore/plugin_namestore_sqlite.c:51
-#: src/testbed/testbed_api_hosts.c:69 src/util/crypto_ecc.c:54
-#: src/include/gnunet_common.h:654 src/include/gnunet_common.h:663
-#: src/scalarproduct/scalarproduct.h:56
+#: src/namestore/plugin_namestore_sqlite.c:52
+#: src/testbed/testbed_api_hosts.c:69 src/util/crypto_ecc.c:53
+#: src/include/gnunet_common.h:602 src/include/gnunet_common.h:611
+#: src/scalarproduct/scalarproduct.h:61
 #, c-format
 msgid "`%s' failed at %s:%d with error: %s\n"
 msgstr "`%s' schlug bei %s:%d mit dem Fehler %s fehl\n"
@@ -921,7 +1293,8 @@ msgstr ""
 
 #: src/datacache/plugin_datacache_sqlite.c:484
 #: src/datastore/plugin_datastore_sqlite.c:401
-#: src/namestore/plugin_namestore_sqlite.c:374
+#: src/namecache/plugin_namecache_sqlite.c:295
+#: src/namestore/plugin_namestore_sqlite.c:327
 msgid "Tried to close sqlite without finalizing all prepared statements.\n"
 msgstr ""
 
@@ -961,7 +1334,7 @@ msgstr "# gap Anfragen verworfen: Kollision in RT"
 msgid "# datastore connections (re)created"
 msgstr ""
 
-#: src/datastore/datastore_api.c:608 src/scalarproduct/scalarproduct_api.c:276
+#: src/datastore/datastore_api.c:608 src/scalarproduct/scalarproduct_api.c:279
 #, fuzzy
 msgid "# transmission request failures"
 msgstr "# Klartext PONG Nachrichten empfangen"
@@ -1247,7 +1620,8 @@ msgstr ""
 "Fehler beim Empfangen der Antwort von gnunetd.\n"
 
 #: src/datastore/plugin_datastore_postgres.c:860
-#: src/namestore/plugin_namestore_postgres.c:735
+#: src/namecache/plugin_namecache_postgres.c:414
+#: src/namestore/plugin_namestore_postgres.c:564
 msgid "Postgres database running\n"
 msgstr ""
 
@@ -1257,7 +1631,8 @@ msgid "`%s' failed at %s:%u with error: %s"
 msgstr "`%s' schlug bei %s:%d mit dem Fehler %s fehl\n"
 
 #: src/datastore/plugin_datastore_sqlite.c:253
-#: src/namestore/plugin_namestore_sqlite.c:220
+#: src/namecache/plugin_namecache_sqlite.c:193
+#: src/namestore/plugin_namestore_sqlite.c:204
 #: src/psycstore/plugin_psycstore_sqlite.c:319
 #, c-format
 msgid "Unable to initialize SQLite: %s.\n"
@@ -1280,7 +1655,8 @@ msgid ""
 msgstr ""
 
 #: src/datastore/plugin_datastore_sqlite.c:1194
-#: src/namestore/plugin_namestore_sqlite.c:893
+#: src/namecache/plugin_namecache_sqlite.c:583
+#: src/namestore/plugin_namestore_sqlite.c:719
 #, fuzzy
 msgid "Sqlite database running\n"
 msgstr "sqlite Datenspeicher"
@@ -1289,7 +1665,7 @@ msgstr "sqlite Datenspeicher"
 msgid "Template database running\n"
 msgstr ""
 
-#: src/dht/dht_api.c:375
+#: src/dht/dht_api.c:376
 #, fuzzy
 msgid "Failed to connect to the DHT service!\n"
 msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
@@ -1337,9 +1713,9 @@ msgstr ""
 
 #: src/dht/gnunet-dht-get.c:201 src/dht/gnunet-dht-monitor.c:271
 #: src/dht/gnunet-dht-put.c:213 src/fs/gnunet-auto-share.c:753
-#: src/fs/gnunet-download.c:328 src/fs/gnunet-publish.c:864
+#: src/fs/gnunet-download.c:328 src/fs/gnunet-publish.c:877
 #: src/fs/gnunet-search.c:294 src/fs/gnunet-unindex.c:168
-#: src/nse/gnunet-nse-profiler.c:904
+#: src/nse/gnunet-nse-profiler.c:873
 msgid "be verbose (print progress information)"
 msgstr ""
 
@@ -1408,50 +1784,50 @@ msgstr ""
 msgid "Failed to connect to transport service!\n"
 msgstr "Der Transportdienst auf Port %d konnte nicht gestartet werden.\n"
 
-#: src/dht/gnunet-service-dht_clients.c:414
+#: src/dht/gnunet-service-dht_clients.c:417
 #, fuzzy
 msgid "# GET requests from clients injected"
 msgstr "# Client Trace-Anfragen empfangen"
 
-#: src/dht/gnunet-service-dht_clients.c:508
+#: src/dht/gnunet-service-dht_clients.c:511
 #, fuzzy
 msgid "# PUT requests received from clients"
 msgstr "Empfangene Client-Nachricht ist ungültig.\n"
 
-#: src/dht/gnunet-service-dht_clients.c:592
+#: src/dht/gnunet-service-dht_clients.c:595
 #, fuzzy
 msgid "# GET requests received from clients"
 msgstr "Empfangene Client-Nachricht ist ungültig.\n"
 
-#: src/dht/gnunet-service-dht_clients.c:793
+#: src/dht/gnunet-service-dht_clients.c:796
 #, fuzzy
 msgid "# GET STOP requests received from clients"
 msgstr "Empfangene Client-Nachricht ist ungültig.\n"
 
-#: src/dht/gnunet-service-dht_clients.c:1033
+#: src/dht/gnunet-service-dht_clients.c:1037
 msgid "# Key match, type mismatches in REPLY to CLIENT"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_clients.c:1046
+#: src/dht/gnunet-service-dht_clients.c:1050
 msgid "# Duplicate REPLIES to CLIENT request dropped"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_clients.c:1083
+#: src/dht/gnunet-service-dht_clients.c:1087
 #, fuzzy, c-format
 msgid "Unsupported block type (%u) in request!\n"
 msgstr "Ungültige Nachricht des Typs %u empfangen. Nachricht wird verworfen.\n"
 
-#: src/dht/gnunet-service-dht_clients.c:1106
+#: src/dht/gnunet-service-dht_clients.c:1110
 #, fuzzy
 msgid "# RESULTS queued for clients"
 msgstr "Empfangene Client-Nachricht ist ungültig.\n"
 
-#: src/dht/gnunet-service-dht_clients.c:1157
-#: src/dht/gnunet-service-dht_clients.c:1199
+#: src/dht/gnunet-service-dht_clients.c:1164
+#: src/dht/gnunet-service-dht_clients.c:1206
 msgid "# REPLIES ignored for CLIENTS (no match)"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_clients.c:1167
+#: src/dht/gnunet-service-dht_clients.c:1174
 #, fuzzy
 msgid "Could not pass reply to client, message too big!\n"
 msgstr "'join' Nachricht konnte nicht an gnunetd gesendet werden.\n"
@@ -1500,122 +1876,122 @@ msgstr "# Client Trace-Anfragen empfangen"
 msgid "# HELLOs obtained from peerinfo"
 msgstr "Empfangene Client-Nachricht ist ungültig.\n"
 
-#: src/dht/gnunet-service-dht_neighbours.c:501
+#: src/dht/gnunet-service-dht_neighbours.c:516
 msgid "# Preference updates given to core"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:591
+#: src/dht/gnunet-service-dht_neighbours.c:610
 #, fuzzy
 msgid "# FIND PEER messages initiated"
 msgstr "# PING Nachrichten erstellt"
 
-#: src/dht/gnunet-service-dht_neighbours.c:734
+#: src/dht/gnunet-service-dht_neighbours.c:764
 #, fuzzy
 msgid "# Queued messages discarded (peer disconnected)"
 msgstr "# defragmentierter Nachrichten"
 
-#: src/dht/gnunet-service-dht_neighbours.c:789
+#: src/dht/gnunet-service-dht_neighbours.c:819
 #, fuzzy
 msgid "# Bytes transmitted to other peers"
 msgstr "# Bytes des Typs %d übertragen"
 
-#: src/dht/gnunet-service-dht_neighbours.c:827
+#: src/dht/gnunet-service-dht_neighbours.c:857
 #, fuzzy
 msgid "# Bytes of bandwidth requested from core"
 msgstr "# Client Trace-Anfragen empfangen"
 
-#: src/dht/gnunet-service-dht_neighbours.c:859
+#: src/dht/gnunet-service-dht_neighbours.c:889
 #, fuzzy
 msgid "# requests TTL-dropped"
 msgstr "# Client Trace-Anfragen empfangen"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1052
-#: src/dht/gnunet-service-dht_neighbours.c:1086
+#: src/dht/gnunet-service-dht_neighbours.c:1093
+#: src/dht/gnunet-service-dht_neighbours.c:1130
 msgid "# Peers excluded from routing due to Bloomfilter"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1067
-#: src/dht/gnunet-service-dht_neighbours.c:1101
+#: src/dht/gnunet-service-dht_neighbours.c:1108
+#: src/dht/gnunet-service-dht_neighbours.c:1145
 #, fuzzy
 msgid "# Peer selection failed"
 msgstr " Verbindung fehlgeschlagen\n"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1235
+#: src/dht/gnunet-service-dht_neighbours.c:1287
 #, fuzzy
 msgid "# PUT requests routed"
 msgstr "# dht Anfragen weitergeleitet"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1264
+#: src/dht/gnunet-service-dht_neighbours.c:1316
 #, fuzzy
 msgid "# PUT messages queued for transmission"
 msgstr "# PING Nachrichten erstellt"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1271
-#: src/dht/gnunet-service-dht_neighbours.c:1384
-#: src/dht/gnunet-service-dht_neighbours.c:1484
+#: src/dht/gnunet-service-dht_neighbours.c:1323
+#: src/dht/gnunet-service-dht_neighbours.c:1440
+#: src/dht/gnunet-service-dht_neighbours.c:1543
 #, fuzzy
 msgid "# P2P messages dropped due to full queue"
 msgstr "# gap Anfragen verworfen: Kollision in RT"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1349
+#: src/dht/gnunet-service-dht_neighbours.c:1405
 #, fuzzy
 msgid "# GET requests routed"
 msgstr "# dht Anfragen weitergeleitet"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1376
+#: src/dht/gnunet-service-dht_neighbours.c:1432
 #, fuzzy
 msgid "# GET messages queued for transmission"
 msgstr "# PING Nachrichten erstellt"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1491
+#: src/dht/gnunet-service-dht_neighbours.c:1550
 #, fuzzy
 msgid "# RESULT messages queued for transmission"
 msgstr "# PING Nachrichten erstellt"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1573
+#: src/dht/gnunet-service-dht_neighbours.c:1637
 #, fuzzy
 msgid "# P2P PUT requests received"
 msgstr "# Client Trace-Anfragen empfangen"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1576
+#: src/dht/gnunet-service-dht_neighbours.c:1640
 #, fuzzy
 msgid "# P2P PUT bytes received"
 msgstr "# Client Trace-Anfragen empfangen"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1731
+#: src/dht/gnunet-service-dht_neighbours.c:1803
 msgid "# FIND PEER requests ignored due to Bloomfilter"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1739
+#: src/dht/gnunet-service-dht_neighbours.c:1811
 msgid "# FIND PEER requests ignored due to lack of HELLO"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1830
+#: src/dht/gnunet-service-dht_neighbours.c:1904
 #, fuzzy
 msgid "# P2P GET requests received"
 msgstr "# Client Trace-Anfragen empfangen"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1833
+#: src/dht/gnunet-service-dht_neighbours.c:1907
 #, fuzzy
 msgid "# P2P GET bytes received"
 msgstr "# Client Trace-Anfragen empfangen"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1886
+#: src/dht/gnunet-service-dht_neighbours.c:1961
 #, fuzzy
 msgid "# P2P FIND PEER requests processed"
 msgstr "# Client Trace-Anfragen empfangen"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1900
+#: src/dht/gnunet-service-dht_neighbours.c:1975
 #, fuzzy
 msgid "# P2P GET requests ONLY routed"
 msgstr "# dht Anfragen weitergeleitet"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1977
+#: src/dht/gnunet-service-dht_neighbours.c:2052
 #, fuzzy
 msgid "# P2P RESULTS received"
 msgstr "# Bytes empfangen über TCP"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1980
+#: src/dht/gnunet-service-dht_neighbours.c:2055
 #, fuzzy
 msgid "# P2P RESULT bytes received"
 msgstr "# Bytes empfangen über TCP"
@@ -1658,51 +2034,51 @@ msgstr ""
 msgid "# DHT requests combined"
 msgstr "# Client Trace-Anfragen empfangen"
 
-#: src/dht/plugin_block_dht.c:136
+#: src/dht/plugin_block_dht.c:138
 #, fuzzy, c-format
 msgid "Block not of type %u\n"
 msgstr "Kein Transport des Typs %d bekannt.\n"
 
-#: src/dht/plugin_block_dht.c:143
+#: src/dht/plugin_block_dht.c:145
 msgid "Size mismatch for block\n"
 msgstr ""
 
-#: src/dht/plugin_block_dht.c:152
+#: src/dht/plugin_block_dht.c:154
 #, c-format
 msgid "Block of type %u is malformed\n"
 msgstr ""
 
-#: src/dns/dnsparser.c:233
+#: src/dns/dnsparser.c:239
 #, fuzzy, c-format
 msgid "Failed to convert DNS IDNA name `%s' to UTF-8: %s\n"
 msgstr "Datei wurde als `%s' gespeichert.\n"
 
-#: src/dns/dnsparser.c:751
+#: src/dns/dnsparser.c:800
 #, fuzzy, c-format
 msgid "Failed to convert UTF-8 name `%s' to DNS IDNA format: %s\n"
 msgstr "Datei wurde als `%s' gespeichert.\n"
 
-#: src/dns/dnsstub.c:176
+#: src/dns/dnsstub.c:175
 #, fuzzy, c-format
 msgid "Could not bind to any port: %s\n"
 msgstr "IP des Hosts `%s' konnte nicht ermittelt werden: %s\n"
 
-#: src/dns/dnsstub.c:296 src/dns/dnsstub.c:384
+#: src/dns/dnsstub.c:295 src/dns/dnsstub.c:383
 #, fuzzy, c-format
 msgid "Failed to send DNS request to %s\n"
 msgstr "HTTP Anfrage konnte nicht an Host `%s' gesendet werden: %s\n"
 
-#: src/dns/dnsstub.c:300
+#: src/dns/dnsstub.c:299
 #, fuzzy, c-format
 msgid "Sent DNS request to %s\n"
 msgstr "# Client Trace-Anfragen empfangen"
 
-#: src/dns/dnsstub.c:369
+#: src/dns/dnsstub.c:368
 #, c-format
 msgid "Configured DNS exit `%s' is not working / valid.\n"
 msgstr ""
 
-#: src/dns/dnsstub.c:441
+#: src/dns/dnsstub.c:440
 #, c-format
 msgid "Received DNS response that is too small (%u bytes)"
 msgstr ""
@@ -1769,12 +2145,12 @@ msgstr ""
 msgid "# DNS requests received via TUN interface"
 msgstr "Empfangene Client-Nachricht ist ungültig.\n"
 
-#: src/dns/gnunet-service-dns.c:1049 src/exit/gnunet-daemon-exit.c:3359
+#: src/dns/gnunet-service-dns.c:1049 src/exit/gnunet-daemon-exit.c:3498
 #, c-format
 msgid "`%s' must be installed SUID, refusing to run\n"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:1069 src/exit/gnunet-daemon-exit.c:3415
+#: src/dns/gnunet-service-dns.c:1069 src/exit/gnunet-daemon-exit.c:3555
 #, fuzzy
 msgid "need a valid IPv4 or IPv6 address\n"
 msgstr "Ungültiger Parameter: `%s'\n"
@@ -1788,354 +2164,343 @@ msgstr ""
 msgid "Print information about DV state"
 msgstr "Informationen über andere GNUnet Knoten ausgeben."
 
-#: src/exit/gnunet-daemon-exit.c:756
+#: src/exit/gnunet-daemon-exit.c:802
 #, c-format
 msgid "Got duplicate service records for `%s:%u'\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:807
+#: src/exit/gnunet-daemon-exit.c:853
 #, fuzzy
 msgid "# Bytes transmitted via mesh tunnels"
 msgstr "# Bytes des Typs %d übertragen"
 
-#: src/exit/gnunet-daemon-exit.c:924 src/exit/gnunet-daemon-exit.c:2349
-#: src/exit/gnunet-daemon-exit.c:2606 src/vpn/gnunet-service-vpn.c:1451
-#: src/vpn/gnunet-service-vpn.c:1850 src/vpn/gnunet-service-vpn.c:2013
+#: src/exit/gnunet-daemon-exit.c:970 src/exit/gnunet-daemon-exit.c:2394
+#: src/exit/gnunet-daemon-exit.c:2651 src/vpn/gnunet-service-vpn.c:1409
+#: src/vpn/gnunet-service-vpn.c:1799 src/vpn/gnunet-service-vpn.c:1962
 msgid "# ICMPv4 packets dropped (type not allowed)"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:961 src/exit/gnunet-daemon-exit.c:2408
-#: src/exit/gnunet-daemon-exit.c:2665 src/vpn/gnunet-service-vpn.c:1507
-#: src/vpn/gnunet-service-vpn.c:1909 src/vpn/gnunet-service-vpn.c:2046
+#: src/exit/gnunet-daemon-exit.c:1007 src/exit/gnunet-daemon-exit.c:2453
+#: src/exit/gnunet-daemon-exit.c:2710 src/vpn/gnunet-service-vpn.c:1465
+#: src/vpn/gnunet-service-vpn.c:1858 src/vpn/gnunet-service-vpn.c:1995
 msgid "# ICMPv6 packets dropped (type not allowed)"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:1001
+#: src/exit/gnunet-daemon-exit.c:1047
 msgid "# ICMP packets dropped (not allowed)"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:1008
+#: src/exit/gnunet-daemon-exit.c:1054
 msgid "ICMP Packet dropped, have no matching connection information\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:1084
+#: src/exit/gnunet-daemon-exit.c:1130
 msgid "UDP Packet dropped, have no matching connection information\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:1158
+#: src/exit/gnunet-daemon-exit.c:1204
 msgid "TCP Packet dropped, have no matching connection information\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:1210
+#: src/exit/gnunet-daemon-exit.c:1256
 #, fuzzy
 msgid "# Packets received from TUN"
 msgstr "# Bytes empfangen über HTTP"
 
-#: src/exit/gnunet-daemon-exit.c:1224
+#: src/exit/gnunet-daemon-exit.c:1270
 #, fuzzy
 msgid "# Bytes received from TUN"
 msgstr "# Bytes empfangen über HTTP"
 
-#: src/exit/gnunet-daemon-exit.c:1250
+#: src/exit/gnunet-daemon-exit.c:1296
 msgid "IPv4 packet options received.  Ignored.\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:1277
+#: src/exit/gnunet-daemon-exit.c:1323
 #, c-format
 msgid "IPv4 packet with unsupported next header %u received.  Ignored.\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:1323
+#: src/exit/gnunet-daemon-exit.c:1369
 #, c-format
 msgid "IPv6 packet with unsupported next header %d received.  Ignored.\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:1331
+#: src/exit/gnunet-daemon-exit.c:1377
 #, c-format
 msgid "Packet from unknown protocol %u received.  Ignored.\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:1713
+#: src/exit/gnunet-daemon-exit.c:1759
 #, fuzzy
 msgid "# TCP packets sent via TUN"
 msgstr "# Bytes gesendet über UDP"
 
-#: src/exit/gnunet-daemon-exit.c:1826
+#: src/exit/gnunet-daemon-exit.c:1872
 #, fuzzy
 msgid "# TCP service creation requests received via mesh"
 msgstr "# Client Trace-Anfragen empfangen"
 
-#: src/exit/gnunet-daemon-exit.c:1829 src/exit/gnunet-daemon-exit.c:1919
-#: src/exit/gnunet-daemon-exit.c:2035 src/exit/gnunet-daemon-exit.c:2273
-#: src/exit/gnunet-daemon-exit.c:2522 src/exit/gnunet-daemon-exit.c:2811
-#: src/exit/gnunet-daemon-exit.c:2918
+#: src/exit/gnunet-daemon-exit.c:1875 src/exit/gnunet-daemon-exit.c:1965
+#: src/exit/gnunet-daemon-exit.c:2070 src/exit/gnunet-daemon-exit.c:2318
+#: src/exit/gnunet-daemon-exit.c:2567 src/exit/gnunet-daemon-exit.c:2856
+#: src/exit/gnunet-daemon-exit.c:2963
 #, fuzzy
 msgid "# Bytes received from MESH"
 msgstr "# Bytes empfangen über HTTP"
 
-#: src/exit/gnunet-daemon-exit.c:1861 src/exit/gnunet-daemon-exit.c:2940
+#: src/exit/gnunet-daemon-exit.c:1907 src/exit/gnunet-daemon-exit.c:2985
 #, c-format
 msgid "No service found for %s on port %d!\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:1865
+#: src/exit/gnunet-daemon-exit.c:1911
 #, fuzzy
 msgid "# TCP requests dropped (no such service)"
 msgstr "# gap Anfragen verworfen: Kollision in RT"
 
-#: src/exit/gnunet-daemon-exit.c:1922
+#: src/exit/gnunet-daemon-exit.c:1968
 #, fuzzy
 msgid "# TCP IP-exit creation requests received via mesh"
 msgstr "# Client Trace-Anfragen empfangen"
 
-#: src/exit/gnunet-daemon-exit.c:2038
+#: src/exit/gnunet-daemon-exit.c:2073
 #, fuzzy
 msgid "# TCP data requests received via mesh"
 msgstr "# Client Trace-Anfragen empfangen"
 
-#: src/exit/gnunet-daemon-exit.c:2052
+#: src/exit/gnunet-daemon-exit.c:2087
 #, fuzzy
 msgid "# TCP DATA requests dropped (no session)"
 msgstr "# gap Anfragen verworfen: Kollision in RT"
 
-#: src/exit/gnunet-daemon-exit.c:2102
+#: src/exit/gnunet-daemon-exit.c:2147
 #, fuzzy
 msgid "# ICMP packets sent via TUN"
 msgstr "# Bytes gesendet über UDP"
 
-#: src/exit/gnunet-daemon-exit.c:2276
+#: src/exit/gnunet-daemon-exit.c:2321
 #, fuzzy
 msgid "# ICMP IP-exit requests received via mesh"
 msgstr "# Client Trace-Anfragen empfangen"
 
-#: src/exit/gnunet-daemon-exit.c:2525
+#: src/exit/gnunet-daemon-exit.c:2570
 #, fuzzy
 msgid "# ICMP service requests received via mesh"
 msgstr "Empfangene Client-Nachricht ist ungültig.\n"
 
-#: src/exit/gnunet-daemon-exit.c:2591 src/vpn/gnunet-service-vpn.c:1441
-#: src/vpn/gnunet-service-vpn.c:2007
+#: src/exit/gnunet-daemon-exit.c:2636 src/vpn/gnunet-service-vpn.c:1399
+#: src/vpn/gnunet-service-vpn.c:1956
 msgid "# ICMPv4 packets dropped (impossible PT to v6)"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:2650 src/vpn/gnunet-service-vpn.c:1477
-#: src/vpn/gnunet-service-vpn.c:1489 src/vpn/gnunet-service-vpn.c:1897
+#: src/exit/gnunet-daemon-exit.c:2695 src/vpn/gnunet-service-vpn.c:1435
+#: src/vpn/gnunet-service-vpn.c:1447 src/vpn/gnunet-service-vpn.c:1846
 msgid "# ICMPv6 packets dropped (impossible PT to v4)"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:2700
+#: src/exit/gnunet-daemon-exit.c:2745
 #, fuzzy
 msgid "# UDP packets sent via TUN"
 msgstr "# Bytes gesendet über UDP"
 
-#: src/exit/gnunet-daemon-exit.c:2814
+#: src/exit/gnunet-daemon-exit.c:2859
 #, fuzzy
 msgid "# UDP IP-exit requests received via mesh"
 msgstr "# Client Trace-Anfragen empfangen"
 
-#: src/exit/gnunet-daemon-exit.c:2921
+#: src/exit/gnunet-daemon-exit.c:2966
 #, fuzzy
 msgid "# UDP service requests received via mesh"
 msgstr "# Client Trace-Anfragen empfangen"
 
-#: src/exit/gnunet-daemon-exit.c:2944
+#: src/exit/gnunet-daemon-exit.c:2989
 #, fuzzy
 msgid "# UDP requests dropped (no such service)"
 msgstr "# gap Anfragen verworfen: Kollision in RT"
 
-#: src/exit/gnunet-daemon-exit.c:2977
+#: src/exit/gnunet-daemon-exit.c:3024
 msgid "# Inbound MESH tunnels created"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3216
+#: src/exit/gnunet-daemon-exit.c:3285
 #, c-format
 msgid "No addresses found for hostname `%s' of service `%s'!\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3230 src/exit/gnunet-daemon-exit.c:3242
+#: src/exit/gnunet-daemon-exit.c:3299 src/exit/gnunet-daemon-exit.c:3311
 #, c-format
 msgid "Service `%s' configured for IPv4, but IPv4 is disabled!\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3253
+#: src/exit/gnunet-daemon-exit.c:3322
 #, c-format
 msgid "No IP addresses found for hostname `%s' of service `%s'!\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3372
+#: src/exit/gnunet-daemon-exit.c:3511
 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:3380
+#: src/exit/gnunet-daemon-exit.c:3519
 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:3387
+#: src/exit/gnunet-daemon-exit.c:3526
 msgid ""
 "Cannot enable IPv4 exit but disable IPv4 on TUN interface, will use "
 "ENABLE_IPv4=YES\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3393
+#: src/exit/gnunet-daemon-exit.c:3532
 msgid ""
 "Cannot enable IPv6 exit but disable IPv6 on TUN interface, will use "
 "ENABLE_IPv6=YES\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3399 src/pt/gnunet-daemon-pt.c:887
+#: src/exit/gnunet-daemon-exit.c:3538 src/pt/gnunet-daemon-pt.c:1248
 msgid "No useful service enabled.  Exiting.\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3647
+#: src/exit/gnunet-daemon-exit.c:3654
+msgid "Must be a number"
+msgstr ""
+
+#: src/exit/gnunet-daemon-exit.c:3796
 msgid "Daemon to run to provide an IP exit node for the VPN"
 msgstr ""
 
-#: src/experimentation/gnunet-daemon-experimentation.c:56
+#: src/experimentation/gnunet-daemon-experimentation.c:55
 msgid "Experimentation daemon shutting down ...\n"
 msgstr ""
 
-#: src/experimentation/gnunet-daemon-experimentation.c:78
+#: src/experimentation/gnunet-daemon-experimentation.c:77
 msgid "Experimentation daemon starting ...\n"
 msgstr ""
 
-#: src/experimentation/gnunet-daemon-experimentation.c:84
+#: src/experimentation/gnunet-daemon-experimentation.c:83
 #, fuzzy
 msgid "Failed to create statistics!\n"
 msgstr "Namespace `%s' konnte nicht erstellt werden (existiert bereits?).\n"
 
-#: src/experimentation/gnunet-daemon-experimentation.c:121
+#: src/experimentation/gnunet-daemon-experimentation.c:120
 msgid "GNUnet experimentation daemon"
 msgstr ""
 
-#: src/experimentation/gnunet-daemon-experimentation_experiments.c:264
+#: src/experimentation/gnunet-daemon-experimentation_experiments.c:241
 #, c-format
 msgid "Experiment `%s': Experiment signature is invalid\n"
 msgstr ""
 
-#: src/experimentation/gnunet-daemon-experimentation_experiments.c:271
+#: src/experimentation/gnunet-daemon-experimentation_experiments.c:250
 #, c-format
 msgid ""
 "Adding experiment `%s' running from `%s' to `%s' every %llu sec. for %llu "
 "sec. \n"
 msgstr ""
 
-#: src/experimentation/gnunet-daemon-experimentation_experiments.c:316
+#: src/experimentation/gnunet-daemon-experimentation_experiments.c:303
 #, c-format
 msgid "Experiment `%s': Issuer missing\n"
 msgstr ""
 
-#: src/experimentation/gnunet-daemon-experimentation_experiments.c:321
+#: src/experimentation/gnunet-daemon-experimentation_experiments.c:312
 #, c-format
 msgid "Experiment `%s': Issuer invalid\n"
 msgstr ""
 
-#: src/experimentation/gnunet-daemon-experimentation_experiments.c:327
+#: src/experimentation/gnunet-daemon-experimentation_experiments.c:320
 #, c-format
 msgid "Experiment `%s': Issuer not accepted!\n"
 msgstr ""
 
-#: src/experimentation/gnunet-daemon-experimentation_experiments.c:336
+#: src/experimentation/gnunet-daemon-experimentation_experiments.c:330
 #, c-format
 msgid "Experiment `%s': Version missing or invalid \n"
 msgstr ""
 
-#: src/experimentation/gnunet-daemon-experimentation_experiments.c:344
+#: src/experimentation/gnunet-daemon-experimentation_experiments.c:339
 #, c-format
 msgid "Experiment `%s': Required capabilities missing \n"
 msgstr ""
 
-#: src/experimentation/gnunet-daemon-experimentation_experiments.c:349
+#: src/experimentation/gnunet-daemon-experimentation_experiments.c:345
 #, c-format
 msgid "Experiment `%s': Required capabilities invalid \n"
 msgstr ""
 
-#: src/experimentation/gnunet-daemon-experimentation_experiments.c:392
+#: src/experimentation/gnunet-daemon-experimentation_experiments.c:390
 #, fuzzy, c-format
 msgid "Failed to parse file `%s'\n"
 msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
 
-#: src/experimentation/gnunet-daemon-experimentation_experiments.c:418
-#: src/experimentation/gnunet-daemon-experimentation_experiments.c:443
+#: src/experimentation/gnunet-daemon-experimentation_experiments.c:420
+#: src/experimentation/gnunet-daemon-experimentation_experiments.c:452
 msgid ""
-"No valid experiment issuers configured! Set value to peer id of issuer! "
-"Exit...\n"
+"No valid experiment issuers configured! Set value to public keys of issuers! "
+"Exiting.\n"
 msgstr ""
 
-#: src/experimentation/gnunet-daemon-experimentation_experiments.c:428
-#, fuzzy, c-format
-msgid "Invalid value `%s'\n"
-msgstr "Ungültiger Parameter: `%s'\n"
-
-#: src/experimentation/gnunet-daemon-experimentation_experiments.c:452
-#, fuzzy, c-format
-msgid "Invalid public key `%s'\n"
+#: src/experimentation/gnunet-daemon-experimentation_experiments.c:435
+#, fuzzy
+msgid "Invalid value for public key\n"
 msgstr "Ungültiger Parameter: `%s'\n"
 
-#: src/experimentation/gnunet-daemon-experimentation_experiments.c:459
-#, fuzzy, c-format
-msgid "Found issuer for public key `%s'\n"
-msgstr "Teste Transport(e) %s\n"
-
-#: src/experimentation/gnunet-daemon-experimentation_experiments.c:462
-#, fuzzy, c-format
-msgid "No issuer for public key `%s'\n"
-msgstr "Dienst `%s' konnte nicht ordentlich entladen werden!\n"
-
-#: src/experimentation/gnunet-daemon-experimentation_experiments.c:479
+#: src/experimentation/gnunet-daemon-experimentation_experiments.c:473
 #, fuzzy, c-format
 msgid "Cannot read experiments file `%s'\n"
 msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
 
-#: src/experimentation/gnunet-daemon-experimentation_nodes.c:221
+#: src/experimentation/gnunet-daemon-experimentation_nodes.c:219
 #, c-format
 msgid "Cannot send message to peer `%s' for experiment `%s'\n"
 msgstr ""
 
-#: src/experimentation/gnunet-daemon-experimentation_nodes.c:291
+#: src/experimentation/gnunet-daemon-experimentation_nodes.c:307
 #, c-format
 msgid "Sending experimentation request to peer %s\n"
 msgstr ""
 
-#: src/experimentation/gnunet-daemon-experimentation_nodes.c:422
+#: src/experimentation/gnunet-daemon-experimentation_nodes.c:451
 #, c-format
 msgid "Added peer `%s' as active node\n"
 msgstr ""
 
-#: src/experimentation/gnunet-daemon-experimentation_nodes.c:849
+#: src/experimentation/gnunet-daemon-experimentation_nodes.c:889
 #, fuzzy, c-format
 msgid "Connected to peer %s\n"
 msgstr "`%s' hat sich mit `%s' verbunden.\n"
 
-#: src/experimentation/gnunet-daemon-experimentation_nodes.c:878
+#: src/experimentation/gnunet-daemon-experimentation_nodes.c:919
 #, fuzzy, c-format
 msgid "Disconnected from peer %s\n"
 msgstr "`%s' hat sich mit `%s' verbunden.\n"
 
-#: src/experimentation/gnunet-daemon-experimentation_nodes.c:1058
+#: src/experimentation/gnunet-daemon-experimentation_nodes.c:1102
 #, fuzzy
 msgid "Failed to connect to CORE service!\n"
 msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
 
-#: src/experimentation/gnunet-daemon-experimentation_scheduler.c:109
+#: src/experimentation/gnunet-daemon-experimentation_scheduler.c:108
 #, c-format
 msgid "Peer `%s' did not respond to request for experiment `%s'\n"
 msgstr ""
 
-#: src/experimentation/gnunet-daemon-experimentation_scheduler.c:144
+#: src/experimentation/gnunet-daemon-experimentation_scheduler.c:143
 #, fuzzy, c-format
 msgid "Starting inbound experiment `%s' with peer `%s'\n"
 msgstr "Collection `%s' begonnen.\n"
 
-#: src/experimentation/gnunet-daemon-experimentation_scheduler.c:278
+#: src/experimentation/gnunet-daemon-experimentation_scheduler.c:276
 #, fuzzy, c-format
 msgid "Starting outbound experiment `%s' with peer `%s'\n"
 msgstr "Collection `%s' begonnen.\n"
 
-#: src/experimentation/gnunet-daemon-experimentation_scheduler.c:296
+#: src/experimentation/gnunet-daemon-experimentation_scheduler.c:294
 #, fuzzy, c-format
 msgid "Received %s message from peer %s for experiment `%s'\n"
 msgstr "GAP hat ungültige Inhalte von `%s' empfangen.\n"
@@ -2210,56 +2575,56 @@ msgstr "Datei wurde als `%s' gespeichert.\n"
 msgid "Short read reading from file `%s'!"
 msgstr ""
 
-#: src/fs/fs_api.c:1062
+#: src/fs/fs_api.c:1064
 #, fuzzy, c-format
 msgid "Failed to resume publishing information `%s': %s\n"
 msgstr "Datei wurde als `%s' gespeichert.\n"
 
-#: src/fs/fs_api.c:1565
+#: src/fs/fs_api.c:1569
 #, c-format
 msgid "Failure while resuming publishing operation `%s': %s\n"
 msgstr ""
 
-#: src/fs/fs_api.c:1579
+#: src/fs/fs_api.c:1583
 #, fuzzy, c-format
 msgid "Failed to resume publishing operation `%s': %s\n"
 msgstr "Datei wurde als `%s' gespeichert.\n"
 
-#: src/fs/fs_api.c:2236
+#: src/fs/fs_api.c:2240
 #, c-format
 msgid "Failure while resuming unindexing operation `%s': %s\n"
 msgstr ""
 
-#: src/fs/fs_api.c:2246
+#: src/fs/fs_api.c:2250
 #, fuzzy, c-format
 msgid "Failed to resume unindexing operation `%s': %s\n"
 msgstr "Datei wurde als `%s' gespeichert.\n"
 
-#: src/fs/fs_api.c:2372 src/fs/fs_api.c:2612
+#: src/fs/fs_api.c:2376 src/fs/fs_api.c:2616
 #, fuzzy, c-format
 msgid "Failed to resume sub-download `%s': %s\n"
 msgstr "Datei wurde als `%s' gespeichert.\n"
 
-#: src/fs/fs_api.c:2389
+#: src/fs/fs_api.c:2393
 #, fuzzy, c-format
 msgid "Failed to resume sub-search `%s': %s\n"
 msgstr "Datei wurde als `%s' gespeichert.\n"
 
-#: src/fs/fs_api.c:2402 src/fs/fs_api.c:2421 src/fs/fs_api.c:2904
+#: src/fs/fs_api.c:2406 src/fs/fs_api.c:2425 src/fs/fs_api.c:2908
 #, c-format
 msgid "Failure while resuming search operation `%s': %s\n"
 msgstr ""
 
-#: src/fs/fs_api.c:2603
+#: src/fs/fs_api.c:2607
 #, c-format
 msgid "Failed to resume sub-download `%s': could not open file `%s'\n"
 msgstr ""
 
-#: src/fs/fs_api.c:2848
+#: src/fs/fs_api.c:2852
 msgid "Could not resume running search, will resume as paused search\n"
 msgstr ""
 
-#: src/fs/fs_api.c:2942
+#: src/fs/fs_api.c:2946
 #, c-format
 msgid "Failure while resuming download operation `%s': %s\n"
 msgstr ""
@@ -2373,69 +2738,69 @@ msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
 msgid "Failed to connect to datastore."
 msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden."
 
-#: src/fs/fs_publish.c:125 src/fs/fs_publish.c:414
+#: src/fs/fs_publish.c:125 src/fs/fs_publish.c:415
 #, fuzzy, c-format
 msgid "Publishing failed: %s"
 msgstr ""
 "\n"
 "Fehler beim Uploaden der Datei: %s\n"
 
-#: src/fs/fs_publish.c:642 src/fs/fs_publish.c:659 src/fs/fs_publish.c:698
-#: src/fs/fs_publish.c:719 src/fs/fs_publish.c:743 src/fs/fs_publish.c:889
+#: src/fs/fs_publish.c:667 src/fs/fs_publish.c:684 src/fs/fs_publish.c:723
+#: src/fs/fs_publish.c:744 src/fs/fs_publish.c:768 src/fs/fs_publish.c:914
 #, fuzzy, c-format
 msgid "Can not index file `%s': %s.  Will try to insert instead.\n"
 msgstr "Indizieren der Datei `%s' schlug fehl.  Versuch Datei einzufügen...\n"
 
-#: src/fs/fs_publish.c:644
+#: src/fs/fs_publish.c:669
 msgid "timeout on index-start request to `fs' service"
 msgstr ""
 
-#: src/fs/fs_publish.c:656
+#: src/fs/fs_publish.c:681
 #, fuzzy
 msgid "unknown error"
 msgstr "Unbekannter Fehler"
 
-#: src/fs/fs_publish.c:700
+#: src/fs/fs_publish.c:725
 msgid "failed to compute hash"
 msgstr ""
 
-#: src/fs/fs_publish.c:720
+#: src/fs/fs_publish.c:745
 msgid "filename too long"
 msgstr ""
 
-#: src/fs/fs_publish.c:745
+#: src/fs/fs_publish.c:770
 #, fuzzy
 msgid "could not connect to `fs' service"
 msgstr "Verbindung zu gnunetd konnte nicht hergestellt werden.\n"
 
-#: src/fs/fs_publish.c:768
+#: src/fs/fs_publish.c:793
 #, fuzzy, c-format
 msgid "Failed to get file identifiers for `%s'\n"
 msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
 
-#: src/fs/fs_publish.c:837
+#: src/fs/fs_publish.c:862
 #, fuzzy, c-format
 msgid "Recursive upload failed at `%s': %s"
 msgstr "`%s' schlug fehl bei %s:%d mit dem Fehler: `%s'.\n"
 
-#: src/fs/fs_publish.c:843
+#: src/fs/fs_publish.c:868
 #, fuzzy, c-format
 msgid "Recursive upload failed: %s"
 msgstr ""
 "\n"
 "Fehler beim Uploaden der Datei: %s\n"
 
-#: src/fs/fs_publish.c:890
+#: src/fs/fs_publish.c:915
 #, fuzzy
 msgid "needs to be an actual file"
 msgstr "`%s' ist keine normale Datei.\n"
 
-#: src/fs/fs_publish.c:1126
+#: src/fs/fs_publish.c:1151
 #, c-format
 msgid "Insufficient space for publishing: %s"
 msgstr ""
 
-#: src/fs/fs_publish.c:1198
+#: src/fs/fs_publish.c:1243
 #, c-format
 msgid "Reserving space for %u entries and %llu bytes for publication\n"
 msgstr ""
@@ -2450,12 +2815,12 @@ msgstr "Verbindung zu gnunetd konnte nicht hergestellt werden.\n"
 msgid "Internal error."
 msgstr "Unbekannter Fehler.\n"
 
-#: src/fs/fs_search.c:815
+#: src/fs/fs_search.c:819
 #, fuzzy, c-format
 msgid "Failed to parse URI `%s': %s\n"
 msgstr "Datei `%s' hat URI: %s\n"
 
-#: src/fs/fs_search.c:874
+#: src/fs/fs_search.c:878
 #, c-format
 msgid "Got result with unknown block type `%d', ignoring"
 msgstr ""
@@ -2575,21 +2940,21 @@ msgstr ""
 msgid "Unrecognized URI type"
 msgstr ""
 
-#: src/fs/fs_uri.c:912
+#: src/fs/fs_uri.c:910
 #, fuzzy
 msgid "Lacking key configuration settings.\n"
 msgstr "GNUnet Konfiguration"
 
-#: src/fs/fs_uri.c:918
+#: src/fs/fs_uri.c:916
 #, fuzzy, c-format
 msgid "Could not access hostkey file `%s'.\n"
 msgstr "Konfigurationsdatei `%s' konnte nicht geparst werden.\n"
 
-#: src/fs/fs_uri.c:1102 src/fs/fs_uri.c:1129
+#: src/fs/fs_uri.c:1100 src/fs/fs_uri.c:1127
 msgid "No keywords specified!\n"
 msgstr "Keine Schlüsselwörter angegeben!\n"
 
-#: src/fs/fs_uri.c:1135
+#: src/fs/fs_uri.c:1133
 msgid "Number of double-quotes not balanced!\n"
 msgstr ""
 
@@ -2627,23 +2992,23 @@ msgid ""
 "You must specify one and only one directory name for automatic publication.\n"
 msgstr "Sie dürfen nur eine Datei zum Deindizieren angeben.\n"
 
-#: src/fs/gnunet-auto-share.c:737 src/fs/gnunet-publish.c:811
+#: src/fs/gnunet-auto-share.c:737 src/fs/gnunet-publish.c:824
 msgid "set the desired LEVEL of sender-anonymity"
 msgstr "Gewünschten Grad an Sender-Anonymität festlegen"
 
-#: src/fs/gnunet-auto-share.c:741 src/fs/gnunet-publish.c:815
+#: src/fs/gnunet-auto-share.c:741 src/fs/gnunet-publish.c:828
 msgid "disable adding the creation time to the metadata of the uploaded file"
 msgstr ""
 
-#: src/fs/gnunet-auto-share.c:744 src/fs/gnunet-publish.c:818
+#: src/fs/gnunet-auto-share.c:744 src/fs/gnunet-publish.c:831
 msgid "do not use libextractor to add keywords or metadata"
 msgstr ""
 
-#: src/fs/gnunet-auto-share.c:747 src/fs/gnunet-publish.c:842
+#: src/fs/gnunet-auto-share.c:747 src/fs/gnunet-publish.c:855
 msgid "specify the priority of the content"
 msgstr "Die Priorität des Inhalts angeben"
 
-#: src/fs/gnunet-auto-share.c:750 src/fs/gnunet-publish.c:849
+#: src/fs/gnunet-auto-share.c:750 src/fs/gnunet-publish.c:862
 msgid "set the desired replication LEVEL"
 msgstr ""
 
@@ -2651,7 +3016,7 @@ msgstr ""
 msgid "Automatically publish files from a directory on GNUnet"
 msgstr ""
 
-#: src/fs/gnunet-daemon-fsprofiler.c:657
+#: src/fs/gnunet-daemon-fsprofiler.c:660
 msgid "Daemon to use file-sharing to measure its performance."
 msgstr ""
 
@@ -2717,7 +3082,7 @@ msgstr "Fehler beim Download: %s\n"
 msgid "Downloading `%s' done (%s/s).\n"
 msgstr "Upload abgewiesen!"
 
-#: src/fs/gnunet-download.c:209 src/fs/gnunet-publish.c:273
+#: src/fs/gnunet-download.c:209 src/fs/gnunet-publish.c:286
 #: src/fs/gnunet-search.c:193 src/fs/gnunet-unindex.c:108
 #, c-format
 msgid "Unexpected status: %d\n"
@@ -2728,7 +3093,7 @@ msgstr ""
 msgid "You need to specify a URI argument.\n"
 msgstr "Sie müssen einen Empfänger angeben!\n"
 
-#: src/fs/gnunet-download.c:240 src/fs/gnunet-publish.c:652
+#: src/fs/gnunet-download.c:240 src/fs/gnunet-publish.c:665
 #, fuzzy, c-format
 msgid "Failed to parse URI: %s\n"
 msgstr "Datei `%s' hat URI: %s\n"
@@ -2741,7 +3106,7 @@ msgstr ""
 msgid "Target filename must be specified.\n"
 msgstr ""
 
-#: src/fs/gnunet-download.c:268 src/fs/gnunet-publish.c:784
+#: src/fs/gnunet-download.c:268 src/fs/gnunet-publish.c:797
 #: src/fs/gnunet-search.c:243 src/fs/gnunet-unindex.c:140
 #, fuzzy, c-format
 msgid "Could not initialize `%s' subsystem.\n"
@@ -2806,128 +3171,128 @@ msgstr ""
 msgid "run a testbed to measure file-sharing performance"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:230
+#: src/fs/gnunet-publish.c:231 src/fs/gnunet-publish.c:243
 #, c-format
 msgid "Publishing `%s' at %llu/%llu (%s remaining)\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:237
+#: src/fs/gnunet-publish.c:250
 #, fuzzy, c-format
 msgid "Error publishing: %s.\n"
 msgstr "Fehler beim Download: %s\n"
 
-#: src/fs/gnunet-publish.c:247
+#: src/fs/gnunet-publish.c:260
 #, c-format
 msgid "Publishing `%s' done.\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:251
+#: src/fs/gnunet-publish.c:264
 #, fuzzy, c-format
 msgid "URI is `%s'.\n"
 msgstr "Ich bin Peer `%s'.\n"
 
-#: src/fs/gnunet-publish.c:270
+#: src/fs/gnunet-publish.c:283
 #, fuzzy
 msgid "Cleanup after abort complete.\n"
 msgstr "`%s' Startvorgang abgeschlossen.\n"
 
-#: src/fs/gnunet-publish.c:388
+#: src/fs/gnunet-publish.c:401
 #, fuzzy, c-format
 msgid "Meta data for file `%s' (%s)\n"
 msgstr "Daten des Moduls `%s' werden aktualisiert\n"
 
-#: src/fs/gnunet-publish.c:390
+#: src/fs/gnunet-publish.c:403
 #, fuzzy, c-format
 msgid "Keywords for file `%s' (%s)\n"
 msgstr "Schlüsselwörter für Datei `%s':\n"
 
-#: src/fs/gnunet-publish.c:529
+#: src/fs/gnunet-publish.c:542
 #, fuzzy
 msgid "Could not publish\n"
 msgstr "`%s' konnte nicht aufgelöst werden: %s\n"
 
-#: src/fs/gnunet-publish.c:552
+#: src/fs/gnunet-publish.c:565
 #, fuzzy
 msgid "Could not start publishing.\n"
 msgstr "Anwendung `%s' konnte nicht initialisiert werden.\n"
 
-#: src/fs/gnunet-publish.c:585
+#: src/fs/gnunet-publish.c:598
 #, fuzzy, c-format
 msgid "Scanning directory `%s'.\n"
 msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
 
-#: src/fs/gnunet-publish.c:587
+#: src/fs/gnunet-publish.c:600
 #, fuzzy, c-format
 msgid "Scanning file `%s'.\n"
 msgstr "Collection `%s' begonnen.\n"
 
-#: src/fs/gnunet-publish.c:592
+#: src/fs/gnunet-publish.c:605
 #, c-format
 msgid "There was trouble processing file `%s', skipping it.\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:597
+#: src/fs/gnunet-publish.c:610
 #, fuzzy
 msgid "Preprocessing complete.\n"
 msgstr "GNUnet wurde erfolgreich heruntergefahren.\n"
 
-#: src/fs/gnunet-publish.c:601
+#: src/fs/gnunet-publish.c:614
 #, fuzzy, c-format
 msgid "Extracting meta data from file `%s' complete.\n"
 msgstr "Daten des Moduls `%s' werden aktualisiert\n"
 
-#: src/fs/gnunet-publish.c:605
+#: src/fs/gnunet-publish.c:618
 msgid "Meta data extraction has finished.\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:612
+#: src/fs/gnunet-publish.c:625
 #, fuzzy
 msgid "Internal error scanning directory.\n"
 msgstr "=\tFehler beim Lesen des Verzeichnisses.\n"
 
-#: src/fs/gnunet-publish.c:643
+#: src/fs/gnunet-publish.c:656
 #, fuzzy, c-format
 msgid "Selected pseudonym `%s' unknown\n"
 msgstr "Namespace `%s' hat das Rating %d.\n"
 
-#: src/fs/gnunet-publish.c:669
+#: src/fs/gnunet-publish.c:682
 #, fuzzy, c-format
 msgid "Failed to access `%s': %s\n"
 msgstr "Datei wurde als `%s' gespeichert.\n"
 
-#: src/fs/gnunet-publish.c:682
+#: src/fs/gnunet-publish.c:695
 msgid ""
 "Failed to start meta directory scanner.  Is gnunet-helper-publish-fs "
 "installed?\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:734
+#: src/fs/gnunet-publish.c:747
 #, c-format
 msgid "Cannot extract metadata from a URI!\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:741
+#: src/fs/gnunet-publish.c:754
 #, c-format
 msgid "You must specify one and only one filename for insertion.\n"
 msgstr "Sie dürfen nur eine Datei zum Deindizieren angeben.\n"
 
-#: src/fs/gnunet-publish.c:747
+#: src/fs/gnunet-publish.c:760
 #, fuzzy, c-format
 msgid "You must NOT specify an URI and a filename.\n"
 msgstr "Sie müssen einen Empfänger angeben!\n"
 
-#: src/fs/gnunet-publish.c:755 src/vpn/gnunet-vpn.c:213
+#: src/fs/gnunet-publish.c:768 src/vpn/gnunet-vpn.c:208
 #, fuzzy, c-format
 msgid "Option `%s' is required when using option `%s'.\n"
 msgstr "Option `%s' macht keinen Sinn ohne die Option `%s'.\n"
 
-#: src/fs/gnunet-publish.c:765 src/fs/gnunet-publish.c:772
-#: src/transport/gnunet-transport.c:843 src/transport/gnunet-transport.c:873
+#: src/fs/gnunet-publish.c:778 src/fs/gnunet-publish.c:785
+#: src/transport/gnunet-transport.c:840 src/transport/gnunet-transport.c:870
 #, c-format
 msgid "Option `%s' makes no sense without option `%s'.\n"
 msgstr "Option `%s' macht keinen Sinn ohne die Option `%s'.\n"
 
-#: src/fs/gnunet-publish.c:822
+#: src/fs/gnunet-publish.c:835
 msgid ""
 "print list of extracted keywords that would be used, but do not perform "
 "upload"
@@ -2935,7 +3300,7 @@ msgstr ""
 "Liste der extrahierten Schlüsselworte, die verwendet werden würden, "
 "ausgeben, aber keinen Upload durchführen"
 
-#: src/fs/gnunet-publish.c:826
+#: src/fs/gnunet-publish.c:839
 msgid ""
 "add an additional keyword for the top-level file or directory (this option "
 "can be specified multiple times)"
@@ -2943,13 +3308,13 @@ msgstr ""
 "Ein zusätzliches Schlüsselwort für die Datei oder das Verzeichnis auf der "
 "obersten Ebene hinzufügen (diese Option kann mehrmals angegeben werden)"
 
-#: src/fs/gnunet-publish.c:830
+#: src/fs/gnunet-publish.c:843
 msgid "set the meta-data for the given TYPE to the given VALUE"
 msgstr ""
 "Die Meta-Daten des angegebenen Typs TYPE auf den angegebenen Wert VALUE "
 "setzen"
 
-#: src/fs/gnunet-publish.c:833
+#: src/fs/gnunet-publish.c:846
 msgid ""
 "do not index, perform full insertion (stores entire file in encrypted form "
 "in GNUnet database)"
@@ -2957,7 +3322,7 @@ msgstr ""
 "Nicht indizieren, sondern komplett einfügen (speichert die gesamte Datei in "
 "verschlüsselter Form in der GNUnet Datenbank)"
 
-#: src/fs/gnunet-publish.c:838
+#: src/fs/gnunet-publish.c:851
 msgid ""
 "specify ID of an updated version to be published in the future (for "
 "namespace insertions only)"
@@ -2965,32 +3330,32 @@ msgstr ""
 "ID einer aktualisierten Version angeben, die in der Zukunft veröffentlich "
 "werden soll. (nur für das Einfügen in Namespaces)"
 
-#: src/fs/gnunet-publish.c:846
+#: src/fs/gnunet-publish.c:859
 msgid "publish the files under the pseudonym NAME (place file into namespace)"
 msgstr ""
 "Die Datei unter dem Pseudonym NAME veröffentlichen (platziert die Datei in "
 "einem Namespace)"
 
-#: src/fs/gnunet-publish.c:852
+#: src/fs/gnunet-publish.c:865
 msgid ""
 "only simulate the process but do not do any actual publishing (useful to "
 "compute URIs)"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:856
+#: src/fs/gnunet-publish.c:869
 msgid ""
 "set the ID of this version of the publication (for namespace insertions only)"
 msgstr ""
 "die ID dieser Version der Veröffentlichung setzen (nur für das Einfügen in "
 "Namespaces)"
 
-#: src/fs/gnunet-publish.c:860
+#: src/fs/gnunet-publish.c:873
 msgid ""
 "URI to be published (can be used instead of passing a file to add keywords "
 "to the file with the respective URI)"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:876
+#: src/fs/gnunet-publish.c:889
 msgid "Publish a file or directory on GNUnet"
 msgstr ""
 
@@ -3040,101 +3405,101 @@ msgid "# Loopback routes suppressed"
 msgstr "# gap Routing erfolgreich (insgesamt)"
 
 #: src/fs/gnunet-service-fs.c:639 src/hostlist/gnunet-daemon-hostlist.c:293
-#: src/topology/gnunet-daemon-topology.c:1315
-#: src/topology/gnunet-daemon-topology.c:1322
+#: src/topology/gnunet-daemon-topology.c:1253
+#: src/topology/gnunet-daemon-topology.c:1260
 #, fuzzy, c-format
 msgid "Failed to connect to `%s' service.\n"
 msgstr "`%s' Dienst konnte nicht initialisiert werden.\n"
 
-#: src/fs/gnunet-service-fs_cp.c:677
+#: src/fs/gnunet-service-fs_cp.c:680
 #, fuzzy
 msgid "# migration stop messages received"
 msgstr "# verschlüsselter PING Nachrichten empfangen"
 
-#: src/fs/gnunet-service-fs_cp.c:681
+#: src/fs/gnunet-service-fs_cp.c:684
 #, c-format
 msgid "Migration of content to peer `%s' blocked for %s\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:716
+#: src/fs/gnunet-service-fs_cp.c:719
 #, fuzzy
 msgid "# replies transmitted to other peers"
 msgstr "# Bytes des Typs %d übertragen"
 
-#: src/fs/gnunet-service-fs_cp.c:722
+#: src/fs/gnunet-service-fs_cp.c:725
 msgid "# replies dropped"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:747 src/fs/gnunet-service-fs_cp.c:1296
+#: src/fs/gnunet-service-fs_cp.c:750 src/fs/gnunet-service-fs_cp.c:1299
 msgid "# P2P searches active"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:840
+#: src/fs/gnunet-service-fs_cp.c:843
 msgid "# artificial delays introduced (ms)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:893
+#: src/fs/gnunet-service-fs_cp.c:896
 #, fuzzy
 msgid "# replies dropped due to type mismatch"
 msgstr "# gap Anfragen verworfen: Kollision in RT"
 
-#: src/fs/gnunet-service-fs_cp.c:901
+#: src/fs/gnunet-service-fs_cp.c:904
 #, fuzzy
 msgid "# replies received for other peers"
 msgstr "# Bytes des Typs %d empfangen"
 
-#: src/fs/gnunet-service-fs_cp.c:915
+#: src/fs/gnunet-service-fs_cp.c:918
 msgid "# replies dropped due to insufficient cover traffic"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:953
+#: src/fs/gnunet-service-fs_cp.c:956
 msgid "# P2P searches destroyed due to ultimate reply"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1021
+#: src/fs/gnunet-service-fs_cp.c:1024
 #, fuzzy
 msgid "# requests done for free (low load)"
 msgstr "# gap Anfragen verworfen: Kollision in RT"
 
-#: src/fs/gnunet-service-fs_cp.c:1046
+#: src/fs/gnunet-service-fs_cp.c:1049
 msgid "# request dropped, priority insufficient"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1056
+#: src/fs/gnunet-service-fs_cp.c:1059
 #, fuzzy
 msgid "# requests done for a price (normal load)"
 msgstr "# gap Anfragen verworfen: Kollision in RT"
 
-#: src/fs/gnunet-service-fs_cp.c:1134
+#: src/fs/gnunet-service-fs_cp.c:1137
 msgid "# GET requests received (from other peers)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1168
+#: src/fs/gnunet-service-fs_cp.c:1171
 #, fuzzy
 msgid "# requests dropped due to initiator not being connected"
 msgstr "# gap Anfragen verworfen: Kollision in RT"
 
-#: src/fs/gnunet-service-fs_cp.c:1191
+#: src/fs/gnunet-service-fs_cp.c:1194
 #, fuzzy
 msgid "# requests dropped due to missing reverse route"
 msgstr "# gap Anfragen verworfen: Kollision in RT"
 
-#: src/fs/gnunet-service-fs_cp.c:1241
+#: src/fs/gnunet-service-fs_cp.c:1244
 #, fuzzy
 msgid "# requests dropped due TTL underflow"
 msgstr "# gap Anfragen verworfen: Kollision in RT"
 
-#: src/fs/gnunet-service-fs_cp.c:1265
+#: src/fs/gnunet-service-fs_cp.c:1268
 #, fuzzy
 msgid "# requests dropped due to higher-TTL request"
 msgstr "# gap Anfragen verworfen: Kollision in RT"
 
-#: src/fs/gnunet-service-fs_cp.c:1294
+#: src/fs/gnunet-service-fs_cp.c:1297
 #, fuzzy
 msgid "# P2P query messages received and processed"
 msgstr "# verschlüsselter PING Nachrichten empfangen"
 
-#: src/fs/gnunet-service-fs_cp.c:1664
+#: src/fs/gnunet-service-fs_cp.c:1668
 #, fuzzy
 msgid "# migration stop messages sent"
 msgstr "# verschlüsselter PING Nachrichten empfangen"
@@ -3274,118 +3639,118 @@ msgstr "# Client Trace-Anfragen empfangen"
 msgid "# query plan entries"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:310
+#: src/fs/gnunet-service-fs_pr.c:311
 #, fuzzy
 msgid "# Pending requests created"
 msgstr "# Client Trace-Anfragen empfangen"
 
-#: src/fs/gnunet-service-fs_pr.c:393 src/fs/gnunet-service-fs_pr.c:644
+#: src/fs/gnunet-service-fs_pr.c:394 src/fs/gnunet-service-fs_pr.c:645
 #, fuzzy
 msgid "# Pending requests active"
 msgstr "# Client Trace-Anfragen empfangen"
 
-#: src/fs/gnunet-service-fs_pr.c:812
+#: src/fs/gnunet-service-fs_pr.c:813
 #, fuzzy
 msgid "# replies received and matched"
 msgstr "# Bytes empfangen über TCP"
 
-#: src/fs/gnunet-service-fs_pr.c:842
+#: src/fs/gnunet-service-fs_pr.c:843
 msgid "# duplicate replies discarded (bloomfilter)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:851
+#: src/fs/gnunet-service-fs_pr.c:852
 msgid "# irrelevant replies discarded"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:865
+#: src/fs/gnunet-service-fs_pr.c:866
 #, c-format
 msgid "Unsupported block type %u\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:878
+#: src/fs/gnunet-service-fs_pr.c:879
 msgid "# results found locally"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:999
+#: src/fs/gnunet-service-fs_pr.c:1000
 msgid "# Datastore `PUT' failures"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1026
+#: src/fs/gnunet-service-fs_pr.c:1027
 #, fuzzy
 msgid "# storage requests dropped due to high load"
 msgstr "# gap Anfragen verworfen: Kollision in RT"
 
-#: src/fs/gnunet-service-fs_pr.c:1061
+#: src/fs/gnunet-service-fs_pr.c:1062
 #, fuzzy
 msgid "# Replies received from DHT"
 msgstr "# Bytes empfangen über HTTP"
 
-#: src/fs/gnunet-service-fs_pr.c:1189
+#: src/fs/gnunet-service-fs_pr.c:1190
 #, fuzzy
 msgid "# Replies received from MESH"
 msgstr "# Bytes empfangen über HTTP"
 
-#: src/fs/gnunet-service-fs_pr.c:1241
+#: src/fs/gnunet-service-fs_pr.c:1242
 #, c-format
 msgid "Datastore lookup already took %s!\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1261
+#: src/fs/gnunet-service-fs_pr.c:1262
 #, c-format
 msgid "On-demand lookup already took %s!\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1308
+#: src/fs/gnunet-service-fs_pr.c:1309
 msgid "# Datastore lookups concluded (no results)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1323
+#: src/fs/gnunet-service-fs_pr.c:1324
 msgid "# Datastore lookups concluded (seen all)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1332
+#: src/fs/gnunet-service-fs_pr.c:1333
 msgid "# Datastore lookups aborted (more than MAX_RESULTS)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1347
+#: src/fs/gnunet-service-fs_pr.c:1348
 msgid "# requested DBLOCK or IBLOCK not found"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1361
+#: src/fs/gnunet-service-fs_pr.c:1362
 msgid "# on-demand blocks matched requests"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1374
+#: src/fs/gnunet-service-fs_pr.c:1375
 msgid "# on-demand lookups performed successfully"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1379
+#: src/fs/gnunet-service-fs_pr.c:1380
 msgid "# on-demand lookups failed"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1406 src/fs/gnunet-service-fs_pr.c:1446
-#: src/fs/gnunet-service-fs_pr.c:1587
+#: src/fs/gnunet-service-fs_pr.c:1407 src/fs/gnunet-service-fs_pr.c:1447
+#: src/fs/gnunet-service-fs_pr.c:1588
 msgid "# Datastore lookups concluded (error queueing)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1464
+#: src/fs/gnunet-service-fs_pr.c:1465
 msgid "# Datastore lookups concluded (found last result)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1475
+#: src/fs/gnunet-service-fs_pr.c:1476
 msgid "# Datastore lookups concluded (load too high)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1563
+#: src/fs/gnunet-service-fs_pr.c:1564
 msgid "# Datastore lookups initiated"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1648
+#: src/fs/gnunet-service-fs_pr.c:1649
 #, fuzzy
 msgid "# GAP PUT messages received"
 msgstr "# verschlüsselter PONG Nachrichten empfangen"
 
-#: src/fs/gnunet-service-fs_push.c:629
+#: src/fs/gnunet-service-fs_push.c:631
 msgid "time required, content pushing disabled"
 msgstr ""
 
@@ -3420,7 +3785,7 @@ msgstr "Auf die Namespace Informationen konnte nicht zugegriffen werden.\n"
 msgid "Unindex a file that was previously indexed with gnunet-publish."
 msgstr ""
 
-#: src/gns/gns_api.c:385
+#: src/gns/gns_api.c:387
 #, fuzzy
 msgid "Failed to serialize lookup reply from GNS service!\n"
 msgstr "Fehler beim Empfangen der Antwort von gnunetd auf die `%s' Nachricht\n"
@@ -3445,204 +3810,345 @@ msgstr "GAP hat ungültige Inhalte von `%s' empfangen.\n"
 msgid "Received unsupported DNS request from %s\n"
 msgstr "GAP hat ungültige Inhalte von `%s' empfangen.\n"
 
-#: src/gns/gnunet-dns2gns.c:703
+#: src/gns/gnunet-dns2gns.c:701
 msgid "No ego configured for `dns2gns` subsystem\n"
 msgstr ""
 
-#: src/gns/gnunet-dns2gns.c:729
+#: src/gns/gnunet-dns2gns.c:727
 #, fuzzy
 msgid "No DNS server specified!\n"
 msgstr "Keine Schlüsselwörter angegeben!\n"
 
-#: src/gns/gnunet-dns2gns.c:751
+#: src/gns/gnunet-dns2gns.c:749
 #, fuzzy
 msgid "No valid GNS zone specified!\n"
 msgstr "Keine Schlüsselwörter angegeben!\n"
 
-#: src/gns/gnunet-dns2gns.c:772
+#: src/gns/gnunet-dns2gns.c:770
 msgid "IP of recursive DNS resolver to use (required)"
 msgstr ""
 
-#: src/gns/gnunet-dns2gns.c:775
+#: src/gns/gnunet-dns2gns.c:773
 msgid "Authoritative FCFS suffix to use (optional); default: fcfs.zkey.eu"
 msgstr ""
 
-#: src/gns/gnunet-dns2gns.c:778
+#: src/gns/gnunet-dns2gns.c:776
 msgid "Authoritative DNS suffix to use (optional); default: zkey.eu"
 msgstr ""
 
-#: src/gns/gnunet-dns2gns.c:781
+#: src/gns/gnunet-dns2gns.c:779
 msgid "UDP port to listen on for inbound DNS requests; default: 53"
 msgstr ""
 
-#: src/gns/gnunet-dns2gns.c:784
+#: src/gns/gnunet-dns2gns.c:782
 msgid "Public key of the GNS zone to use (overrides default)"
 msgstr ""
 
-#: src/gns/gnunet-dns2gns.c:797
+#: src/gns/gnunet-dns2gns.c:795
 msgid "GNUnet DNS-to-GNS proxy (a DNS server)"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:205
+#: src/gns/gnunet-gns.c:217
 #, c-format
 msgid "Please specify name to lookup!\n"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:285
+#: src/gns/gnunet-gns.c:297
 #, c-format
 msgid "Ego for `%s' not found, cannot perform lookup.\n"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:323
+#: src/gns/gnunet-gns.c:335
 #, c-format
 msgid ""
 "Ego for `master-zone' not found, cannot perform lookup.  Did you run gnunet-"
 "gns-import.sh?\n"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:352
+#: src/gns/gnunet-gns.c:364
 #, fuzzy, c-format
 msgid "Failed to connect to GNS\n"
 msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
 
-#: src/gns/gnunet-gns.c:365
+#: src/gns/gnunet-gns.c:377
 #, c-format
 msgid "Public key `%s' is not well-formed\n"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:414
+#: src/gns/gnunet-gns.c:426
 msgid "Lookup a record for the given name"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:417
+#: src/gns/gnunet-gns.c:429
 #, fuzzy
 msgid "Specify the type of the record to lookup"
 msgstr "Die Priorität des Inhalts angeben"
 
-#: src/gns/gnunet-gns.c:420
+#: src/gns/gnunet-gns.c:432
 msgid "No unneeded output"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:423
+#: src/gns/gnunet-gns.c:435
 #, fuzzy
 msgid "Specify the public key of the zone to lookup the record in"
 msgstr "Die Priorität des Inhalts angeben"
 
-#: src/gns/gnunet-gns.c:426
+#: src/gns/gnunet-gns.c:438
 #, fuzzy
 msgid "Specify the name of the ego of the zone to lookup the record in"
 msgstr "Die Priorität des Inhalts angeben"
 
-#: src/gns/gnunet-gns.c:439
+#: src/gns/gnunet-gns.c:451
 #, fuzzy
 msgid "GNUnet GNS resolver tool"
 msgstr "GNUnet Netzwerk Topologie tracen."
 
-#: src/gns/gnunet-gns-proxy.c:60 src/hostlist/hostlist-client.c:469
+#: src/gns/gnunet-gns-proxy.c:105 src/hostlist/hostlist-client.c:469
 #: src/hostlist/hostlist-client.c:680 src/hostlist/hostlist-client.c:686
 #: src/hostlist/hostlist-client.c:738 src/hostlist/hostlist-client.c:747
 #: src/hostlist/hostlist-client.c:868 src/hostlist/hostlist-client.c:960
 #: src/hostlist/hostlist-client.c:965
-#: src/transport/plugin_transport_http_client.c:1068
-#: src/transport/plugin_transport_http_client.c:1083
+#: src/transport/plugin_transport_http_client.c:1067
+#: src/transport/plugin_transport_http_client.c:1082
 #, c-format
 msgid "%s failed at %s:%d: `%s'\n"
 msgstr "`%s' schlug fehl bei %s:%d mit dem Fehler: `%s'.\n"
 
-#: src/gns/gnunet-gns-proxy.c:2344
+#: src/gns/gnunet-gns-proxy.c:839
+#, fuzzy, c-format
+msgid "Unsupported CURL SSL backend %d\n"
+msgstr "Ungültige Nachricht des Typs %u empfangen. Nachricht wird verworfen.\n"
+
+#: src/gns/gnunet-gns-proxy.c:862
+#, fuzzy, c-format
+msgid "Failed to fetch CN from cert: %s\n"
+msgstr "HTTP Anfrage konnte nicht an Host `%s' gesendet werden: %s\n"
+
+#: src/gns/gnunet-gns-proxy.c:885
+#, fuzzy, c-format
+msgid "Failed to initialize DANE: %s\n"
+msgstr "SQLite Datenbank konnte nicht initialisiert werden: %s.\n"
+
+#: src/gns/gnunet-gns-proxy.c:898
+#, fuzzy, c-format
+msgid "Failed to parse DANE record: %s\n"
+msgstr "Fehler beim Senden einer `%s' Anfrage an den SMTP Server.\n"
+
+#: src/gns/gnunet-gns-proxy.c:913
+#, fuzzy, c-format
+msgid "Failed to verify TLS connection using DANE: %s\n"
+msgstr "Fehler beim Speichern der Konfigurationsdatei `%s':"
+
+#: src/gns/gnunet-gns-proxy.c:923
+#, c-format
+msgid "Failed DANE verification failed with GnuTLS verify status code: %u\n"
+msgstr ""
+
+#: src/gns/gnunet-gns-proxy.c:947
+#, c-format
+msgid "SSL certificate subject name (%s) does not match `%s'\n"
+msgstr ""
+
+#: src/gns/gnunet-gns-proxy.c:1092
+#, c-format
+msgid "Cookie domain `%s' supplied by server is invalid\n"
+msgstr ""
+
+#: src/gns/gnunet-gns-proxy.c:1609
+#, fuzzy, c-format
+msgid "Unsupported HTTP method `%s'\n"
+msgstr "Ungültige Nachricht des Typs %u empfangen. Nachricht wird verworfen.\n"
+
+#: src/gns/gnunet-gns-proxy.c:1979
 #, fuzzy, c-format
 msgid "Unable to import private key from file `%s'\n"
 msgstr "Fehler beim Anlegen des Benutzerkontos:"
 
-#: src/gns/gnunet-gns-proxy.c:2372
+#: src/gns/gnunet-gns-proxy.c:2009
 #, fuzzy, c-format
 msgid "Unable to import certificate %s\n"
 msgstr "Fehler beim Speichern der Konfigurationsdatei `%s':"
 
-#: src/gns/gnunet-gns-proxy.c:2637 src/namestore/gnunet-namestore-fcfsd.c:958
-#, fuzzy
-msgid "Failed to start HTTP server\n"
+#: src/gns/gnunet-gns-proxy.c:2178
+#, fuzzy, c-format
+msgid "Failed to start HTTPS server for `%s'\n"
 msgstr "Fehler beim Starten der Collection.\n"
 
-#: src/gns/gnunet-gns-proxy.c:3020
+#: src/gns/gnunet-gns-proxy.c:2197
+#, fuzzy
+msgid "Failed to pass client to MHD\n"
+msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
+
+#: src/gns/gnunet-gns-proxy.c:2505
+#, fuzzy, c-format
+msgid "Unsupported socks version %d\n"
+msgstr "Ungültige Nachricht des Typs %u empfangen. Nachricht wird verworfen.\n"
+
+#: src/gns/gnunet-gns-proxy.c:2534
+#, fuzzy, c-format
+msgid "Unsupported socks command %d\n"
+msgstr "Ungültige Nachricht des Typs %u empfangen. Nachricht wird verworfen.\n"
+
+#: src/gns/gnunet-gns-proxy.c:2616
+#, fuzzy, c-format
+msgid "Unsupported socks address type %d\n"
+msgstr "Ungültige Nachricht des Typs %u empfangen. Nachricht wird verworfen.\n"
+
+#: src/gns/gnunet-gns-proxy.c:2955
 msgid "No ego configured for `shorten-zone`\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:3060
-msgid "No ego configured for `master-zone`\n"
+#: src/gns/gnunet-gns-proxy.c:2995
+#, c-format
+msgid "No ego configured for `%s`\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:3120
+#: src/gns/gnunet-gns-proxy.c:3057
 #, fuzzy, c-format
 msgid "Failed to load SSL/TLS key and certificate from `%s'\n"
 msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
 
-#: src/gns/gnunet-gns-proxy.c:3156
+#: src/gns/gnunet-gns-proxy.c:3098
 msgid "listen on specified port (default: 7777)"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:3159
+#: src/gns/gnunet-gns-proxy.c:3101
 msgid "pem file to use as CA"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:3178
+#: src/gns/gnunet-gns-proxy.c:3120
 msgid "GNUnet GNS proxy"
 msgstr ""
 
-#: src/gns/gnunet-service-gns.c:649
+#: src/gns/gnunet-service-gns.c:860
 #, fuzzy
 msgid "Failed to connect to the namestore!\n"
 msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden."
 
-#: src/gns/gnunet-service-gns.c:692
+#: src/gns/gnunet-service-gns.c:868
+#, fuzzy
+msgid "Failed to connect to the namecache!\n"
+msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden."
+
+#: src/gns/gnunet-service-gns.c:901
 #, fuzzy
 msgid "Could not connect to DHT!\n"
 msgstr "Verbindung zu gnunetd konnte nicht hergestellt werden.\n"
 
-#: src/gns/gnunet-service-gns.c:708
+#: src/gns/gnunet-service-gns.c:917
 #, fuzzy
 msgid "valid public key required"
 msgstr "Ungültiger Parameter: `%s'\n"
 
-#: src/gns/gnunet-service-gns_interceptor.c:201
+#: src/gns/gnunet-service-gns_interceptor.c:263
 #, fuzzy
 msgid "Error converting GNS response to DNS response!\n"
 msgstr "Fehler beim Konvertieren von Parametern in URI!\n"
 
-#: src/gns/gnunet-service-gns_interceptor.c:307
+#: src/gns/gnunet-service-gns_interceptor.c:369
 #, fuzzy
 msgid "Failed to connect to the DNS service!\n"
 msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
 
-#: src/gns/gnunet-service-gns_resolver.c:717
+#: src/gns/gnunet-service-gns_resolver.c:771
 #, fuzzy
 msgid "Failed to parse DNS response\n"
 msgstr "Fehler beim Senden einer `%s' Anfrage an den SMTP Server.\n"
 
-#: src/gns/gnunet-service-gns_resolver.c:843
+#: src/gns/gnunet-service-gns_resolver.c:913
 #, c-format
 msgid "Skipping record of unsupported type %d\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns_resolver.c:1475
+#: src/gns/gnunet-service-gns_resolver.c:1646
 #, c-format
 msgid "GNS lookup resulted in DNS name that is too long (`%s')\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns_resolver.c:1499
+#: src/gns/gnunet-service-gns_resolver.c:1686
 msgid "GNS lookup recursion failed (no delegation record found)\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns_resolver.c:1523
+#: src/gns/gnunet-service-gns_resolver.c:1710
 #, fuzzy, c-format
 msgid "Failed to cache GNS resolution: %s\n"
 msgstr "HTTP Anfrage konnte nicht an Host `%s' gesendet werden: %s\n"
 
-#: src/gns/gnunet-service-gns_resolver.c:1782
+#: src/gns/gnunet-service-gns_resolver.c:1932
+#, c-format
+msgid "Zone %s was revoked, resolution fails\n"
+msgstr ""
+
+#: src/gns/gnunet-service-gns_resolver.c:2054
 #, c-format
 msgid "Hostname `%s' is not well-formed, resolution fails\n"
 msgstr ""
 
+#: src/gns/plugin_gnsrecord_gns.c:142
+#, fuzzy, c-format
+msgid "Unable to parse PKEY record `%s'\n"
+msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
+
+#: src/gns/plugin_gnsrecord_gns.c:172
+#, fuzzy, c-format
+msgid "Failed to serialize GNS2DNS record with value `%s'\n"
+msgstr "Konfigurationsdatei `%s' konnte nicht geparst werden.\n"
+
+#: src/gns/plugin_gnsrecord_gns.c:186
+#, fuzzy, c-format
+msgid "Unable to parse VPN record string `%s'\n"
+msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
+
+#: src/gnsrecord/plugin_gnsrecord_dns.c:261
+#, fuzzy, c-format
+msgid "Unable to parse IPv4 address `%s'\n"
+msgstr "Ungültiger Parameter: `%s'\n"
+
+#: src/gnsrecord/plugin_gnsrecord_dns.c:282
+#, fuzzy, c-format
+msgid "Failed to serialize NS record with value `%s'\n"
+msgstr "Konfigurationsdatei `%s' konnte nicht geparst werden.\n"
+
+#: src/gnsrecord/plugin_gnsrecord_dns.c:304
+#, fuzzy, c-format
+msgid "Failed to serialize CNAME record with value `%s'\n"
+msgstr "Konfigurationsdatei `%s' konnte nicht geparst werden.\n"
+
+#: src/gnsrecord/plugin_gnsrecord_dns.c:332
+#, fuzzy, c-format
+msgid "Unable to parse SOA record `%s'\n"
+msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
+
+#: src/gnsrecord/plugin_gnsrecord_dns.c:351
+#, fuzzy, c-format
+msgid "Failed to serialize SOA record with mname `%s' and rname `%s'\n"
+msgstr "Konfigurationsdatei `%s' konnte nicht geparst werden.\n"
+
+#: src/gnsrecord/plugin_gnsrecord_dns.c:374
+#, fuzzy, c-format
+msgid "Failed to serialize PTR record with value `%s'\n"
+msgstr "Konfigurationsdatei `%s' konnte nicht geparst werden.\n"
+
+#: src/gnsrecord/plugin_gnsrecord_dns.c:394
+#, fuzzy, c-format
+msgid "Unable to parse MX record `%s'\n"
+msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
+
+#: src/gnsrecord/plugin_gnsrecord_dns.c:409
+#, fuzzy, c-format
+msgid "Failed to serialize MX record with hostname `%s'\n"
+msgstr "Konfigurationsdatei `%s' konnte nicht geparst werden.\n"
+
+#: src/gnsrecord/plugin_gnsrecord_dns.c:429
+#, fuzzy, c-format
+msgid "Unable to parse IPv6 address `%s'\n"
+msgstr "Ungültiger Parameter: `%s'\n"
+
+#: src/gnsrecord/plugin_gnsrecord_dns.c:447
+#, fuzzy, c-format
+msgid "Unable to parse TLSA record string `%s'\n"
+msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
+
 #: src/hello/gnunet-hello.c:123
 msgid "Call with name of HELLO file to modify.\n"
 msgstr ""
@@ -3682,37 +4188,37 @@ msgstr "Fehler beim Anlegen des Benutzers"
 msgid "Modified %u addresses \n"
 msgstr ""
 
-#: src/hello/hello.c:947
+#: src/hello/hello.c:943
 #, fuzzy
 msgid "Failed to parse HELLO message: missing expiration time\n"
 msgstr "Fehler beim Speichern der Konfiguration!"
 
-#: src/hello/hello.c:956
+#: src/hello/hello.c:952
 #, fuzzy
 msgid "Failed to parse HELLO message: invalid expiration time\n"
 msgstr "Fehler beim Speichern der Konfiguration!"
 
-#: src/hello/hello.c:966
+#: src/hello/hello.c:962
 #, fuzzy
 msgid "Failed to parse HELLO message: malformed\n"
 msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
 
-#: src/hello/hello.c:976
+#: src/hello/hello.c:972
 #, fuzzy
 msgid "Failed to parse HELLO message: missing transport plugin\n"
 msgstr "Anwendung `%s' konnte nicht initialisiert werden.\n"
 
-#: src/hello/hello.c:993
+#: src/hello/hello.c:989
 #, c-format
 msgid "Plugin `%s' not found\n"
 msgstr ""
 
-#: src/hello/hello.c:1002
+#: src/hello/hello.c:998
 #, c-format
 msgid "Plugin `%s' does not support URIs yet\n"
 msgstr ""
 
-#: src/hello/hello.c:1021
+#: src/hello/hello.c:1017
 #, fuzzy, c-format
 msgid "Failed to parse `%s' as an address for plugin `%s'\n"
 msgstr "Fehler beim Binden an UDP Port %d.\n"
@@ -3904,10 +4410,10 @@ msgid "expired addresses encountered"
 msgstr ""
 
 #: src/hostlist/hostlist-server.c:189 src/hostlist/hostlist-server.c:424
-#: src/peerinfo-tool/gnunet-peerinfo.c:358
-#: src/peerinfo-tool/gnunet-peerinfo.c:428
-#: src/peerinfo-tool/gnunet-peerinfo.c:499
-#: src/topology/gnunet-daemon-topology.c:918
+#: src/peerinfo-tool/gnunet-peerinfo.c:350
+#: src/peerinfo-tool/gnunet-peerinfo.c:419
+#: src/peerinfo-tool/gnunet-peerinfo.c:490
+#: src/topology/gnunet-daemon-topology.c:924
 #, fuzzy, c-format
 msgid "Error in communication with PEERINFO service: %s\n"
 msgstr "Informationen über andere GNUnet Knoten ausgeben."
@@ -3967,8 +4473,8 @@ msgstr "# Bekanntmachungen von anderen übertragen"
 msgid "Advertisement message could not be queued by core\n"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:560 src/peerinfo-tool/gnunet-peerinfo.c:659
-#: src/transport/gnunet-service-transport.c:806
+#: src/hostlist/hostlist-server.c:560 src/peerinfo-tool/gnunet-peerinfo.c:651
+#: src/transport/gnunet-service-transport.c:790
 #, fuzzy
 msgid "Could not access PEERINFO service.  Exiting.\n"
 msgstr "Auf die Namespace Informationen konnte nicht zugegriffen werden.\n"
@@ -4085,57 +4591,55 @@ msgstr "Fehler beim Speichern der Konfigurationsdatei `%s':"
 msgid "Failed to create directory `%s' for storing egos\n"
 msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
 
-#: src/integration-tests/connection_watchdog.c:998
+#: src/integration-tests/connection_watchdog.c:1012
 #, fuzzy, c-format
 msgid "Transport plugin: `%s' port %llu\n"
 msgstr "Der Transportdienst auf Port %d konnte nicht gestartet werden.\n"
 
-#: src/integration-tests/connection_watchdog.c:1031
+#: src/integration-tests/connection_watchdog.c:1045
 #, fuzzy, c-format
 msgid "Found %u transport plugins: `%s'\n"
 msgstr "Teste Transport(e) %s\n"
 
-#: src/integration-tests/connection_watchdog.c:1091
+#: src/integration-tests/connection_watchdog.c:1105
 msgid "Send ping messages to test connectivity (default == NO)"
 msgstr ""
 
-#: src/integration-tests/connection_watchdog.c:1100
-#: src/multicast/gnunet-multicast.c:70 src/template/gnunet-template.c:70
-#, fuzzy
-msgid "help text"
-msgstr "Hilfetext für -t"
+#: src/mesh/gnunet-mesh.c:146
+#, fuzzy, c-format
+msgid "Invalid tunnel owner `%s'\n"
+msgstr "Ungültiger Parameter: `%s'\n"
 
-#: src/mesh/gnunet-mesh.c:205
+#: src/mesh/gnunet-mesh.c:209
 #, fuzzy
 msgid "provide information about all tunnels (continuously) NOT IMPLEMENTED"
 msgstr "Informationen über andere GNUnet Knoten ausgeben."
 
-#: src/mesh/gnunet-mesh.c:208
+#: src/mesh/gnunet-mesh.c:212
 #, fuzzy
 msgid "provide information about a particular tunnel"
 msgstr "Informationen über andere GNUnet Knoten ausgeben."
 
-#: src/mesh/gnunet-mesh.c:218
+#: src/mesh/gnunet-mesh.c:222
 #, fuzzy
 msgid "Print information about mesh tunnels and peers."
 msgstr "Informationen über andere GNUnet Knoten ausgeben."
 
-#: src/mesh/gnunet-service-mesh.c:5634 src/mesh/gnunet-service-mesh-enc.c:7060
+#: src/mesh/gnunet-service-mesh.c:5633 src/mesh/gnunet-service-mesh_peer.c:350
 msgid "Wrong CORE service\n"
 msgstr ""
 
-#: src/mesh/gnunet-service-mesh.c:5774 src/mesh/gnunet-service-mesh.c:5786
-#: src/mesh/gnunet-service-mesh.c:5798 src/mesh/gnunet-service-mesh.c:5810
-#: src/mesh/gnunet-service-mesh.c:5822 src/mesh/gnunet-service-mesh.c:5834
-#: src/nse/gnunet-service-nse.c:1440 src/nse/gnunet-service-nse.c:1458
+#: src/mesh/gnunet-service-mesh.c:5773 src/mesh/gnunet-service-mesh.c:5785
+#: src/mesh/gnunet-service-mesh.c:5797 src/mesh/gnunet-service-mesh.c:5809
+#: src/mesh/gnunet-service-mesh.c:5821 src/mesh/gnunet-service-mesh.c:5833
 #: src/regex/gnunet-daemon-regexprofiler.c:270
 #: src/regex/gnunet-regex-simulation-profiler.c:659
 #, fuzzy, c-format
 msgid "%s service is lacking key configuration settings (%s).  Exiting.\n"
 msgstr "GNUnet Konfiguration"
 
-#: src/mesh/gnunet-service-mesh.c:5846 src/mesh/gnunet-service-mesh.c:5856
-#: src/mesh/gnunet-service-mesh.c:5881
+#: src/mesh/gnunet-service-mesh.c:5845 src/mesh/gnunet-service-mesh.c:5855
+#: src/mesh/gnunet-service-mesh.c:5880
 #, fuzzy, c-format
 msgid ""
 "%s service is lacking key configuration settings (%s). Using default (%u).\n"
@@ -4151,244 +4655,237 @@ msgstr "Versuche, Datei `%s' für MySQL Konfiguration zu verwenden.\n"
 msgid "Could not access file `%s': %s\n"
 msgstr "`%s' konnte nicht aufgelöst werden: %s\n"
 
-#: src/namestore/gnunet-namestore.c:258
+#: src/namecache/gnunet-namecache.c:109
+#, fuzzy, c-format
+msgid "No records found for `%s'"
+msgstr "Dienst `%s' konnte nicht ordentlich entladen werden!\n"
+
+#: src/namecache/gnunet-namecache.c:124 src/namestore/gnunet-namestore.c:367
+#, c-format
+msgid "\tCorrupt or unsupported record of type %u\n"
+msgstr ""
+
+#: src/namecache/gnunet-namecache.c:185 src/namestore/gnunet-namestore.c:777
+#, fuzzy, c-format
+msgid "You must specify which zone should be accessed\n"
+msgstr "Gibt an, welcher TRANSPORT getestet werden soll"
+
+#: src/namecache/gnunet-namecache.c:195 src/namestore/gnunet-namestore.c:665
+#, fuzzy, c-format
+msgid "Invalid public key for reverse lookup `%s'\n"
+msgstr "Ungültiger Parameter: `%s'\n"
+
+#: src/namecache/gnunet-namecache.c:226 src/namestore/gnunet-namestore.c:821
+msgid "name of the record to add/delete/display"
+msgstr ""
+
+#: src/namecache/gnunet-namecache.c:229
+#, fuzzy
+msgid "spezifies the public key of the zone to look in"
+msgstr "Die Priorität des Inhalts angeben"
+
+#: src/namecache/gnunet-namecache.c:240 src/namestore/gnunet-namestore.c:853
+#, fuzzy
+msgid "GNUnet zone manipulation tool"
+msgstr "GNUnet Konfiguration"
+
+#: src/namecache/namecache_api.c:276
+msgid "Namecache failed to cache block"
+msgstr ""
+
+#: src/namecache/plugin_namecache_postgres.c:89
+#: src/namestore/plugin_namestore_postgres.c:93
+#, fuzzy
+msgid "Failed to create indices\n"
+msgstr "Namespace `%s' konnte nicht erstellt werden (existiert bereits?).\n"
+
+#: src/namestore/gnunet-namestore.c:278
 #, fuzzy, c-format
 msgid "Adding record failed: %s\n"
 msgstr ""
 "\n"
 "Fehler beim Uploaden der Datei: %s\n"
 
-#: src/namestore/gnunet-namestore.c:289
+#: src/namestore/gnunet-namestore.c:306
 #, fuzzy, c-format
-msgid "Deleting record failed: %s\n"
+msgid "Deleting record failed, record does not exist%s%s\n"
 msgstr ""
 "\n"
 "Fehler beim Uploaden der Datei: %s\n"
 
-#: src/namestore/gnunet-namestore.c:338
-#, c-format
-msgid "\tCorrupt or unsupported record of type %u\n"
+#: src/namestore/gnunet-namestore.c:313
+#, fuzzy, c-format
+msgid "Deleting record failed%s%s\n"
 msgstr ""
+"\n"
+"Fehler beim Uploaden der Datei: %s\n"
 
-#: src/namestore/gnunet-namestore.c:446
+#: src/namestore/gnunet-namestore.c:528
 #, c-format
 msgid "No options given\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:456
-#: src/namestore/gnunet-namestore-fcfsd.c:992
+#: src/namestore/gnunet-namestore.c:539
+#: src/namestore/gnunet-namestore-fcfsd.c:964
 #, fuzzy
 msgid "Failed to connect to namestore\n"
 msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden."
 
-#: src/namestore/gnunet-namestore.c:464 src/namestore/gnunet-namestore.c:473
-#: src/namestore/gnunet-namestore.c:490 src/namestore/gnunet-namestore.c:512
-#: src/namestore/gnunet-namestore.c:554
+#: src/namestore/gnunet-namestore.c:547 src/namestore/gnunet-namestore.c:556
+#: src/namestore/gnunet-namestore.c:573 src/namestore/gnunet-namestore.c:595
+#: src/namestore/gnunet-namestore.c:635
 #, fuzzy, c-format
 msgid "Missing option `%s' for operation `%s'\n"
 msgstr "Konfigurationsdatei `%s' wurde erzeugt.\n"
 
-#: src/namestore/gnunet-namestore.c:465 src/namestore/gnunet-namestore.c:474
-#: src/namestore/gnunet-namestore.c:491 src/namestore/gnunet-namestore.c:513
+#: src/namestore/gnunet-namestore.c:548 src/namestore/gnunet-namestore.c:557
+#: src/namestore/gnunet-namestore.c:574 src/namestore/gnunet-namestore.c:596
 msgid "add"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:482
+#: src/namestore/gnunet-namestore.c:565
 #, fuzzy, c-format
 msgid "Unsupported type `%s'\n"
 msgstr "Ungültige Nachricht des Typs %u empfangen. Nachricht wird verworfen.\n"
 
-#: src/namestore/gnunet-namestore.c:502
+#: src/namestore/gnunet-namestore.c:585
 #, fuzzy, c-format
 msgid "Value `%s' invalid for record type `%s'\n"
 msgstr "%s: Symbolwert `%s' ist ungültig für %s\n"
 
-#: src/namestore/gnunet-namestore.c:538
+#: src/namestore/gnunet-namestore.c:621
 #, fuzzy, c-format
 msgid "Invalid time format `%s'\n"
 msgstr "Ungültiger Parameter: `%s'\n"
 
-#: src/namestore/gnunet-namestore.c:555
+#: src/namestore/gnunet-namestore.c:636
 msgid "del"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:588
-#: src/peerinfo-tool/gnunet-peerinfo.c:711
+#: src/namestore/gnunet-namestore.c:689
+#: src/peerinfo-tool/gnunet-peerinfo.c:703
 #, fuzzy, c-format
 msgid "Invalid URI `%s'\n"
 msgstr "Ungültiger Parameter: `%s'\n"
 
-#: src/namestore/gnunet-namestore.c:645
+#: src/namestore/gnunet-namestore.c:747
 #, fuzzy, c-format
 msgid "Ego `%s' not known to identity service\n"
 msgstr "`%s': unbekannter Dienst: %s\n"
 
-#: src/namestore/gnunet-namestore.c:674
-#, fuzzy, c-format
-msgid "You must specify which zone should be accessed\n"
-msgstr "Gibt an, welcher TRANSPORT getestet werden soll"
-
-#: src/namestore/gnunet-namestore.c:702
+#: src/namestore/gnunet-namestore.c:806
 msgid "add record"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:705
+#: src/namestore/gnunet-namestore.c:809
 msgid "delete record"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:708
+#: src/namestore/gnunet-namestore.c:812
 msgid "display records"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:711
+#: src/namestore/gnunet-namestore.c:815
 msgid ""
 "expiration time for record to use (for adding only), \"never\" is possible"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:714
+#: src/namestore/gnunet-namestore.c:818
 #, fuzzy
 msgid "monitor changes in the namestore"
 msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden."
 
-#: src/namestore/gnunet-namestore.c:717
-msgid "name of the record to add/delete/display"
-msgstr ""
+#: src/namestore/gnunet-namestore.c:824
+#, fuzzy
+msgid "determine our name for the given PKEY"
+msgstr "Informationen über andere GNUnet Knoten ausgeben."
 
-#: src/namestore/gnunet-namestore.c:720
+#: src/namestore/gnunet-namestore.c:827
 msgid "type of the record to add/delete/display"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:723
+#: src/namestore/gnunet-namestore.c:830
 msgid "URI to import into our zone"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:726
+#: src/namestore/gnunet-namestore.c:833
 msgid "value of the record to add/delete"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:729
+#: src/namestore/gnunet-namestore.c:836
 msgid "create or list public record"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:732
+#: src/namestore/gnunet-namestore.c:839
 msgid ""
 "create shadow record (only valid if all other records of the same type have "
 "expired"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:735
+#: src/namestore/gnunet-namestore.c:842
 msgid "name of the ego controlling the zone"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:746
-#, fuzzy
-msgid "GNUnet zone manipulation tool"
-msgstr "GNUnet Konfiguration"
-
-#: src/namestore/gnunet-namestore-fcfsd.c:456
+#: src/namestore/gnunet-namestore-fcfsd.c:462
 #, fuzzy, c-format
 msgid "Unsupported form value `%s'\n"
 msgstr "Kommando `%s' wird nicht unterstützt. Vorgang wird abgebrochen.\n"
 
-#: src/namestore/gnunet-namestore-fcfsd.c:485
+#: src/namestore/gnunet-namestore-fcfsd.c:489
 #, fuzzy, c-format
 msgid "Failed to create record for domain `%s': %s\n"
 msgstr "Konfigurationsdatei `%s' konnte nicht geparst werden.\n"
 
-#: src/namestore/gnunet-namestore-fcfsd.c:520
+#: src/namestore/gnunet-namestore-fcfsd.c:524
 #, c-format
 msgid "Found existing name `%s' for the given key\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:560
+#: src/namestore/gnunet-namestore-fcfsd.c:590
 #, c-format
 msgid "Found %u existing records for domain `%s'\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:670
+#: src/namestore/gnunet-namestore-fcfsd.c:646
 #, fuzzy, c-format
 msgid "Failed to create page for `%s'\n"
 msgstr "Namespace `%s' konnte nicht erstellt werden (existiert bereits?).\n"
 
-#: src/namestore/gnunet-namestore-fcfsd.c:686
+#: src/namestore/gnunet-namestore-fcfsd.c:662
 #, fuzzy, c-format
 msgid "Failed to setup post processor for `%s'\n"
 msgstr "Fehler beim Aktualisieren der Daten des Moduls `%s'\n"
 
-#: src/namestore/gnunet-namestore-fcfsd.c:722
+#: src/namestore/gnunet-namestore-fcfsd.c:698
 msgid "Domain name must not contain `.'\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:730
+#: src/namestore/gnunet-namestore-fcfsd.c:706
 msgid "Domain name must not contain `+'\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:932
+#: src/namestore/gnunet-namestore-fcfsd.c:904
 msgid "No ego configured for `fcfsd` subsystem\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:1027
-msgid "GNU Name System First Come First Serve name registration service"
-msgstr ""
+#: src/namestore/gnunet-namestore-fcfsd.c:930
+#, fuzzy
+msgid "Failed to start HTTP server\n"
+msgstr "Fehler beim Starten der Collection.\n"
 
-#: src/namestore/gnunet-service-namestore.c:674
-msgid "Failed to cache encrypted block of my own zone!\n"
+#: src/namestore/gnunet-namestore-fcfsd.c:999
+msgid "GNU Name System First Come First Serve name registration service"
 msgstr ""
 
-#: src/namestore/namestore_api.c:319
-msgid "Namestore failed to cache block"
-msgstr ""
+#: src/namestore/gnunet-service-namestore.c:494
+#, fuzzy, c-format
+msgid "Failed to replicate block in namecache: %s\n"
+msgstr "Fehler beim Aktualisieren der Daten des Moduls `%s'\n"
 
-#: src/namestore/namestore_api.c:345
+#: src/namestore/namestore_api.c:273
 msgid "Namestore failed to store record\n"
 msgstr ""
 
-#: src/namestore/namestore_api_common.c:691
-#: src/namestore/namestore_api_common.c:831
-#, fuzzy, c-format
-msgid "Unsupported record type %d\n"
-msgstr "Ungültige Nachricht des Typs %u empfangen. Nachricht wird verworfen.\n"
-
-#: src/namestore/namestore_api_common.c:698
-#, fuzzy, c-format
-msgid "Unable to parse IPv4 address `%s'\n"
-msgstr "Ungültiger Parameter: `%s'\n"
-
-#: src/namestore/namestore_api_common.c:721
-#, fuzzy, c-format
-msgid "Unable to parse SOA record `%s'\n"
-msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
-
-#: src/namestore/namestore_api_common.c:744
-#, fuzzy, c-format
-msgid "Unable to parse MX record `%s'\n"
-msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
-
-#: src/namestore/namestore_api_common.c:762
-#, fuzzy, c-format
-msgid "Unable to parse IPv6 address `%s'\n"
-msgstr "Ungültiger Parameter: `%s'\n"
-
-#: src/namestore/namestore_api_common.c:775
-#, fuzzy, c-format
-msgid "Unable to parse PKEY record `%s'\n"
-msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
-
-#: src/namestore/namestore_api_common.c:796
-#, fuzzy, c-format
-msgid "Unable to parse VPN record string `%s'\n"
-msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
-
-#: src/namestore/namestore_api_common.c:822
-#, fuzzy, c-format
-msgid "Unable to parse TLSA record string `%s'\n"
-msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
-
-#: src/namestore/plugin_namestore_postgres.c:95
-#, fuzzy
-msgid "Failed to create indices\n"
-msgstr "Namespace `%s' konnte nicht erstellt werden (existiert bereits?).\n"
-
 #: src/nat/gnunet-nat-server.c:279
 #, c-format
 msgid "Please pass valid port number as the first argument! (got `%s')\n"
@@ -4502,40 +4999,40 @@ msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
 msgid "Failed to create listen socket bound to `%s' for NAT test: %s\n"
 msgstr ""
 
-#: src/nse/gnunet-nse-profiler.c:889
+#: src/nse/gnunet-nse-profiler.c:858
 #, fuzzy
 msgid "limit to the number of connections to NSE services, 0 for none"
 msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden."
 
-#: src/nse/gnunet-nse-profiler.c:892
+#: src/nse/gnunet-nse-profiler.c:861
 msgid "name of the file for writing connection information and statistics"
 msgstr ""
 
-#: src/nse/gnunet-nse-profiler.c:895 src/testbed/gnunet-testbed-profiler.c:287
+#: src/nse/gnunet-nse-profiler.c:864 src/testbed/gnunet-testbed-profiler.c:306
 msgid "name of the file with the login information for the testbed"
 msgstr ""
 
-#: src/nse/gnunet-nse-profiler.c:898
+#: src/nse/gnunet-nse-profiler.c:867
 msgid "name of the file for writing the main results"
 msgstr ""
 
-#: src/nse/gnunet-nse-profiler.c:901
+#: src/nse/gnunet-nse-profiler.c:870
 msgid "Number of peers to run in each round, separated by commas"
 msgstr ""
 
-#: src/nse/gnunet-nse-profiler.c:907
+#: src/nse/gnunet-nse-profiler.c:876
 msgid "delay between rounds"
 msgstr ""
 
-#: src/nse/gnunet-nse-profiler.c:916
+#: src/nse/gnunet-nse-profiler.c:885
 #, fuzzy
 msgid "Measure quality and performance of the NSE service."
 msgstr "Auf den Dienst konnte nicht zugegriffen werden"
 
-#: src/nse/gnunet-service-nse.c:1448
-#, fuzzy
-msgid "Invalid work requirement for NSE service. Exiting.\n"
-msgstr "Ungültige Parameter. Abbruch.\n"
+#: src/nse/gnunet-service-nse.c:1460
+#: src/revocation/gnunet-service-revocation.c:580
+msgid "Value is too large.\n"
+msgstr ""
 
 #: src/nse/gnunet-service-nse.c:1487
 msgid "NSE service is lacking key configuration settings.  Exiting.\n"
@@ -4546,21 +5043,21 @@ msgstr ""
 msgid "Removing expired address of transport `%s'\n"
 msgstr "Verfügbare(r) Transport(e): %s\n"
 
-#: src/peerinfo/gnunet-service-peerinfo.c:353
+#: src/peerinfo/gnunet-service-peerinfo.c:352
 #, fuzzy, c-format
 msgid "Failed to parse HELLO in file `%s': %s\n"
 msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
 
-#: src/peerinfo/gnunet-service-peerinfo.c:370
+#: src/peerinfo/gnunet-service-peerinfo.c:369
 #, fuzzy, c-format
 msgid "Failed to parse HELLO in file `%s': %s %u \n"
 msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
 
-#: src/peerinfo/gnunet-service-peerinfo.c:448
+#: src/peerinfo/gnunet-service-peerinfo.c:447
 msgid "# peers known"
 msgstr ""
 
-#: src/peerinfo/gnunet-service-peerinfo.c:484
+#: src/peerinfo/gnunet-service-peerinfo.c:483
 #, c-format
 msgid ""
 "File `%s' in directory `%s' does not match naming convention. Removed.\n"
@@ -4568,140 +5065,140 @@ msgstr ""
 "Die Datei `%s' im Verzeichnis `%s' entspricht nicht der Namenskonvention. "
 "Datei wurde entfernt.\n"
 
-#: src/peerinfo/gnunet-service-peerinfo.c:637
+#: src/peerinfo/gnunet-service-peerinfo.c:638
 #, fuzzy, c-format
 msgid "Scanning directory `%s'\n"
 msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
 
-#: src/peerinfo/gnunet-service-peerinfo.c:642
+#: src/peerinfo/gnunet-service-peerinfo.c:643
 #, fuzzy, c-format
 msgid "Still no peers found in `%s'!\n"
 msgstr "Dienst `%s' konnte nicht ordentlich entladen werden!\n"
 
-#: src/peerinfo/gnunet-service-peerinfo.c:975
+#: src/peerinfo/gnunet-service-peerinfo.c:979
 #, fuzzy, c-format
 msgid "Cleaning up directory `%s'\n"
 msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
 
-#: src/peerinfo/gnunet-service-peerinfo.c:1265
+#: src/peerinfo/gnunet-service-peerinfo.c:1269
 #, c-format
 msgid "Importing HELLOs from `%s'\n"
 msgstr ""
 
-#: src/peerinfo/peerinfo_api.c:239
+#: src/peerinfo/peerinfo_api.c:236
 msgid "aborted due to explicit disconnect request"
 msgstr ""
 
-#: src/peerinfo/peerinfo_api.c:359
+#: src/peerinfo/peerinfo_api.c:356
 #, fuzzy
 msgid "failed to transmit request (service down?)"
 msgstr "Fehler beim Senden einer `%s' Anfrage an den SMTP Server.\n"
 
-#: src/peerinfo/peerinfo_api.c:509
+#: src/peerinfo/peerinfo_api.c:506
 #, fuzzy
 msgid "Failed to receive response from `PEERINFO' service."
 msgstr "Fehler beim Empfangen der Antwort von gnunetd auf die `%s' Nachricht\n"
 
-#: src/peerinfo/peerinfo_api.c:550 src/peerinfo/peerinfo_api.c:569
-#: src/peerinfo/peerinfo_api.c:584 src/peerinfo/peerinfo_api.c:595
-#: src/peerinfo/peerinfo_api.c:606
+#: src/peerinfo/peerinfo_api.c:547 src/peerinfo/peerinfo_api.c:566
+#: src/peerinfo/peerinfo_api.c:581 src/peerinfo/peerinfo_api.c:592
+#: src/peerinfo/peerinfo_api.c:603
 #, fuzzy
 msgid "Received invalid message from `PEERINFO' service."
 msgstr "Ungültige `%s' Anfrage von `%s' empfangen.\n"
 
-#: src/peerinfo/peerinfo_api.c:681
+#: src/peerinfo/peerinfo_api.c:678
 #, fuzzy
 msgid "Timeout transmitting iteration request to `PEERINFO' service."
 msgstr "Fehler beim Senden einer `%s' Anfrage an den SMTP Server.\n"
 
-#: src/peerinfo/peerinfo_api_notify.c:269
+#: src/peerinfo/peerinfo_api_notify.c:268
 #, fuzzy, c-format
 msgid "Could not connect to `%s' service.\n"
 msgstr "Verbindung zu gnunetd konnte nicht hergestellt werden.\n"
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:239
+#: src/peerinfo-tool/gnunet-peerinfo.c:232
 #, fuzzy, c-format
 msgid "%sPeer `%s'\n"
 msgstr "Ich bin Peer `%s'.\n"
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:246
+#: src/peerinfo-tool/gnunet-peerinfo.c:239
 #, c-format
 msgid "\tExpires: %s \t %s\n"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:437
+#: src/peerinfo-tool/gnunet-peerinfo.c:428
 #, fuzzy, c-format
 msgid "Failure: Did not receive %s\n"
 msgstr "Datei wurde als `%s' gespeichert.\n"
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:445
+#: src/peerinfo-tool/gnunet-peerinfo.c:436
 #, fuzzy, c-format
 msgid "Failure: Received invalid %s\n"
 msgstr "ungültige `%s' Nachricht empfangen: %s.\n"
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:454
+#: src/peerinfo-tool/gnunet-peerinfo.c:445
 #, fuzzy, c-format
 msgid "Failed to write HELLO with %u bytes to file `%s'\n"
 msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:467
+#: src/peerinfo-tool/gnunet-peerinfo.c:458
 #, c-format
 msgid "Wrote %s HELLO containing %u addresses with %u bytes to file `%s'\n"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:531
+#: src/peerinfo-tool/gnunet-peerinfo.c:522
 #, fuzzy, c-format
 msgid "Failure adding HELLO: %s\n"
 msgstr "Fehler bei %s:%d.\n"
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:669
+#: src/peerinfo-tool/gnunet-peerinfo.c:661
 #, fuzzy, c-format
 msgid "Could not find option `%s:%s' in configuration.\n"
 msgstr "Knoten `%s' konnte nicht in der Routing Tabelle gefunden werden!\n"
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:675
+#: src/peerinfo-tool/gnunet-peerinfo.c:667
 #, fuzzy, c-format
 msgid "Loading hostkey from `%s' failed.\n"
 msgstr "Das Parsen des Hello von `%s' schlug fehl.\n"
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:734
+#: src/peerinfo-tool/gnunet-peerinfo.c:725
 #, c-format
 msgid "I am peer `%s'.\n"
 msgstr "Ich bin Peer `%s'.\n"
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:777
+#: src/peerinfo-tool/gnunet-peerinfo.c:769
 msgid "don't resolve host names"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:780
+#: src/peerinfo-tool/gnunet-peerinfo.c:772
 msgid "output only the identity strings"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:783
+#: src/peerinfo-tool/gnunet-peerinfo.c:775
 msgid "include friend-only information"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:786
+#: src/peerinfo-tool/gnunet-peerinfo.c:778
 msgid "output our own identity only"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:789
+#: src/peerinfo-tool/gnunet-peerinfo.c:781
 msgid "list all known peers"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:792
+#: src/peerinfo-tool/gnunet-peerinfo.c:784
 msgid "dump hello to file"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:795
+#: src/peerinfo-tool/gnunet-peerinfo.c:787
 msgid "also output HELLO uri(s)"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:798
+#: src/peerinfo-tool/gnunet-peerinfo.c:790
 msgid "add given HELLO uri to the database"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:809
+#: src/peerinfo-tool/gnunet-peerinfo.c:801
 #, fuzzy
 msgid "Print information about peers."
 msgstr "Informationen über andere GNUnet Knoten ausgeben."
@@ -4734,89 +5231,84 @@ msgstr "`%s' schlug bei %s:%d mit dem Fehler %s fehl\n"
 msgid "Unable to initialize Postgres: %s"
 msgstr "SQLite Datenbank konnte nicht initialisiert werden: %s.\n"
 
-#: src/psycstore/gnunet-service-psycstore.c:203
+#: src/psycstore/gnunet-service-psycstore.c:200
 #, fuzzy
 msgid "Failed to store membership information!\n"
 msgstr "Datei wurde als `%s' gespeichert.\n"
 
-#: src/psycstore/gnunet-service-psycstore.c:227
+#: src/psycstore/gnunet-service-psycstore.c:224
 #, fuzzy
 msgid "Failed to test membership!\n"
 msgstr "Statistiken über den Netzwerkverkehr konnten nicht ermittelt werden.\n"
 
-#: src/psycstore/gnunet-service-psycstore.c:249
+#: src/psycstore/gnunet-service-psycstore.c:246
 #, fuzzy
 msgid "Failed to store fragment!\n"
 msgstr "Fehler beim Starten der Collection.\n"
 
-#: src/psycstore/gnunet-service-psycstore.c:275
+#: src/psycstore/gnunet-service-psycstore.c:272
 #, fuzzy
 msgid "Failed to get fragment!\n"
 msgstr "Statistiken über den Netzwerkverkehr konnten nicht ermittelt werden.\n"
 
-#: src/psycstore/gnunet-service-psycstore.c:302
+#: src/psycstore/gnunet-service-psycstore.c:299
 #, fuzzy
 msgid "Failed to get message!\n"
 msgstr "Statistiken über den Netzwerkverkehr konnten nicht ermittelt werden.\n"
 
-#: src/psycstore/gnunet-service-psycstore.c:331
+#: src/psycstore/gnunet-service-psycstore.c:328
 #, fuzzy
 msgid "Failed to get message fragment!\n"
 msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
 
-#: src/psycstore/gnunet-service-psycstore.c:357
+#: src/psycstore/gnunet-service-psycstore.c:356
 #, fuzzy
 msgid "Failed to get master counters!\n"
 msgstr "Statistiken über den Netzwerkverkehr konnten nicht ermittelt werden.\n"
 
-#: src/psycstore/gnunet-service-psycstore.c:395
-#, fuzzy
-msgid "Failed to get slave counters!\n"
-msgstr "Statistiken über den Netzwerkverkehr konnten nicht ermittelt werden.\n"
-
-#: src/psycstore/gnunet-service-psycstore.c:429
-#: src/psycstore/gnunet-service-psycstore.c:502
+#: src/psycstore/gnunet-service-psycstore.c:392
+#: src/psycstore/gnunet-service-psycstore.c:465
 msgid "Tried to set invalid state variable name!\n"
 msgstr ""
 
-#: src/psycstore/gnunet-service-psycstore.c:445
+#: src/psycstore/gnunet-service-psycstore.c:408
 #, fuzzy
 msgid "Failed to begin modifying state!\n"
 msgstr "Fehler beim Starten der Collection.\n"
 
-#: src/psycstore/gnunet-service-psycstore.c:468
+#: src/psycstore/gnunet-service-psycstore.c:431
 #, fuzzy, c-format
 msgid "Unknown operator: %c\n"
 msgstr "Unbekannte Operation `%s'\n"
 
-#: src/psycstore/gnunet-service-psycstore.c:478
+#: src/psycstore/gnunet-service-psycstore.c:441
 #, fuzzy
 msgid "Failed to end modifying state!\n"
 msgstr "Fehler beim Starten der Collection.\n"
 
-#: src/psycstore/gnunet-service-psycstore.c:516
+#: src/psycstore/gnunet-service-psycstore.c:479
 #, fuzzy
 msgid "Failed to begin synchronizing state!\n"
 msgstr "Statistiken über den Netzwerkverkehr konnten nicht ermittelt werden.\n"
 
-#: src/psycstore/gnunet-service-psycstore.c:532
+#: src/psycstore/gnunet-service-psycstore.c:495
 #, fuzzy
 msgid "Failed to end synchronizing state!\n"
 msgstr "Statistiken über den Netzwerkverkehr konnten nicht ermittelt werden.\n"
 
-#: src/psycstore/gnunet-service-psycstore.c:552
-#: src/psycstore/gnunet-service-psycstore.c:571
+#: src/psycstore/gnunet-service-psycstore.c:515
+#: src/psycstore/gnunet-service-psycstore.c:534
 #, fuzzy
 msgid "Failed to reset state!\n"
 msgstr "Statistiken über den Netzwerkverkehr konnten nicht ermittelt werden.\n"
 
-#: src/psycstore/gnunet-service-psycstore.c:594
-#: src/psycstore/gnunet-service-psycstore.c:645
+#: src/psycstore/gnunet-service-psycstore.c:557
+#: src/psycstore/gnunet-service-psycstore.c:608
 msgid "Tried to get invalid state variable name!\n"
 msgstr ""
 
-#: src/psycstore/gnunet-service-psycstore.c:621
-#: src/psycstore/gnunet-service-psycstore.c:660
+#: src/psycstore/gnunet-service-psycstore.c:584
+#: src/psycstore/gnunet-service-psycstore.c:623
 #, fuzzy
 msgid "Failed to get state variable!\n"
 msgstr "Statistiken über den Netzwerkverkehr konnten nicht ermittelt werden.\n"
@@ -4845,70 +5337,67 @@ msgstr "Fehler beim Anlegen des Benutzers"
 msgid "SQLite database running\n"
 msgstr "sqlite Datenspeicher"
 
-#: src/pt/gnunet-daemon-pt.c:266
+#: src/pt/gnunet-daemon-pt.c:483
 #, fuzzy
 msgid "Failed to pack DNS request.  Dropping.\n"
 msgstr "Fehler beim Senden einer `%s' Anfrage an den SMTP Server.\n"
 
-#: src/pt/gnunet-daemon-pt.c:272
+#: src/pt/gnunet-daemon-pt.c:489
 #, fuzzy
 msgid "# DNS requests mapped to VPN"
 msgstr "# Client Trace-Anfragen empfangen"
 
-#: src/pt/gnunet-daemon-pt.c:325
+#: src/pt/gnunet-daemon-pt.c:542
 msgid "# DNS records modified"
 msgstr ""
 
-#: src/pt/gnunet-daemon-pt.c:502
+#: src/pt/gnunet-daemon-pt.c:718
 msgid "# DNS replies intercepted"
 msgstr ""
 
-#: src/pt/gnunet-daemon-pt.c:508
+#: src/pt/gnunet-daemon-pt.c:724
 #, fuzzy
 msgid "Failed to parse DNS request.  Dropping.\n"
 msgstr "Fehler beim Senden einer `%s' Anfrage an den SMTP Server.\n"
 
-#: src/pt/gnunet-daemon-pt.c:604
+#: src/pt/gnunet-daemon-pt.c:827
 #, fuzzy
 msgid "# DNS requests dropped (timeout)"
 msgstr "# gap Anfragen verworfen: Kollision in RT"
 
-#: src/pt/gnunet-daemon-pt.c:634
+#: src/pt/gnunet-daemon-pt.c:884
 #, fuzzy
 msgid "# DNS requests intercepted"
 msgstr "# Client Trace-Anfragen empfangen"
 
-#: src/pt/gnunet-daemon-pt.c:639
+#: src/pt/gnunet-daemon-pt.c:889
 #, fuzzy
 msgid "# DNS requests dropped (DNS mesh tunnel down)"
 msgstr "# gap Anfragen verworfen: Kollision in RT"
 
-#: src/pt/gnunet-daemon-pt.c:647
+#: src/pt/gnunet-daemon-pt.c:897
 #, fuzzy
 msgid "# DNS requests dropped (malformed)"
 msgstr "# gap Anfragen verworfen: Kollision in RT"
 
-#: src/pt/gnunet-daemon-pt.c:715
+#: src/pt/gnunet-daemon-pt.c:970
 #, fuzzy
 msgid "# DNS replies received"
 msgstr "# Client Trace-Anfragen empfangen"
 
-#: src/pt/gnunet-daemon-pt.c:729
+#: src/pt/gnunet-daemon-pt.c:986
 #, fuzzy
 msgid "# DNS replies dropped (too late?)"
 msgstr "# gap Anfragen verworfen: Kollision in RT"
 
-#: src/pt/gnunet-daemon-pt.c:747 src/pt/gnunet-daemon-pt.c:759
-msgid "# DNS requests aborted (tunnel down)"
-msgstr ""
-
-#: src/pt/gnunet-daemon-pt.c:901 src/pt/gnunet-daemon-pt.c:910
-#: src/pt/gnunet-daemon-pt.c:930 src/pt/gnunet-daemon-pt.c:940
+#: src/pt/gnunet-daemon-pt.c:1262 src/pt/gnunet-daemon-pt.c:1271
+#: src/pt/gnunet-daemon-pt.c:1291 src/pt/gnunet-daemon-pt.c:1302
+#: src/pt/gnunet-daemon-pt.c:1311
 #, fuzzy, c-format
 msgid "Failed to connect to %s service.  Exiting.\n"
 msgstr "`%s' Dienst konnte nicht initialisiert werden.\n"
 
-#: src/pt/gnunet-daemon-pt.c:977
+#: src/pt/gnunet-daemon-pt.c:1348
 msgid "Daemon to run to perform IP protocol translation to GNUnet"
 msgstr ""
 
@@ -4916,66 +5405,66 @@ msgstr ""
 msgid "Daemon to announce regular expressions for the peer using mesh."
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1281
+#: src/regex/gnunet-regex-profiler.c:1288
 #, fuzzy
 msgid "No configuration file given. Exiting\n"
 msgstr "Konfigurationsdatei FILENAME verwenden"
 
-#: src/regex/gnunet-regex-profiler.c:1292
+#: src/regex/gnunet-regex-profiler.c:1299
 #, fuzzy
 msgid "Configuration option \"regex_prefix\" missing. Exiting\n"
 msgstr "Konfigurationsdatei `%s' wurde erzeugt.\n"
 
-#: src/regex/gnunet-regex-profiler.c:1321
+#: src/regex/gnunet-regex-profiler.c:1328
 #: src/regex/gnunet-regex-simulation-profiler.c:622
 #, c-format
 msgid "No policy directory specified on command line. Exiting.\n"
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1327
+#: src/regex/gnunet-regex-profiler.c:1334
 #: src/regex/gnunet-regex-simulation-profiler.c:629
 #, c-format
 msgid "Specified policies directory does not exist. Exiting.\n"
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1334
+#: src/regex/gnunet-regex-profiler.c:1341
 #, fuzzy, c-format
 msgid "No files found in `%s'\n"
 msgstr "Dienst `%s' konnte nicht ordentlich entladen werden!\n"
 
-#: src/regex/gnunet-regex-profiler.c:1343
+#: src/regex/gnunet-regex-profiler.c:1350
 msgid "No search strings file given. Exiting.\n"
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1363
+#: src/regex/gnunet-regex-profiler.c:1370
 #, fuzzy
 msgid "Error loading search strings. Exiting.\n"
 msgstr "Fehler beim Verlassen der DHT.\n"
 
-#: src/regex/gnunet-regex-profiler.c:1445
+#: src/regex/gnunet-regex-profiler.c:1455
 #, fuzzy
 msgid "name of the file for writing statistics"
 msgstr "Statistiken über den Netzwerkverkehr konnten nicht ermittelt werden.\n"
 
-#: src/regex/gnunet-regex-profiler.c:1448
+#: src/regex/gnunet-regex-profiler.c:1458
 msgid "wait TIMEOUT before ending the experiment"
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1451
+#: src/regex/gnunet-regex-profiler.c:1461
 msgid "directory with policy files"
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1454
+#: src/regex/gnunet-regex-profiler.c:1464
 #, fuzzy
 msgid "name of file with input strings"
 msgstr "Statistiken über den Netzwerkverkehr konnten nicht ermittelt werden.\n"
 
-#: src/regex/gnunet-regex-profiler.c:1457
+#: src/regex/gnunet-regex-profiler.c:1467
 #, fuzzy
 msgid "name of file with hosts' names"
 msgstr "Statistiken über den Netzwerkverkehr konnten nicht ermittelt werden.\n"
 
-#: src/regex/gnunet-regex-profiler.c:1469
+#: src/regex/gnunet-regex-profiler.c:1479
 msgid "Profiler for regex"
 msgstr ""
 
@@ -4991,397 +5480,497 @@ msgstr ""
 msgid "Profiler for regex library"
 msgstr ""
 
-#: src/scalarproduct/gnunet-scalarproduct.c:195
+#: src/revocation/gnunet-revocation.c:121
+#, fuzzy, c-format
+msgid "Key `%s' is valid\n"
+msgstr "Format des Pseudonyms `%s' ist ungültig.\n"
+
+#: src/revocation/gnunet-revocation.c:126
+#, fuzzy, c-format
+msgid "Key `%s' has been revoked\n"
+msgstr "Dienst gelöscht.\n"
+
+#: src/revocation/gnunet-revocation.c:132
+#, fuzzy
+msgid "Internal error\n"
+msgstr "Unbekannter Fehler.\n"
+
+#: src/revocation/gnunet-revocation.c:158
+#, c-format
+msgid "Key for ego `%s' is still valid, revocation failed (!)\n"
+msgstr ""
+
+#: src/revocation/gnunet-revocation.c:163
+#, fuzzy
+msgid "Revocation failed (!)\n"
+msgstr "Absicherung fehlgeschlagen bei %s:%d.\n"
+
+#: src/revocation/gnunet-revocation.c:168
+#, c-format
+msgid "Key for ego `%s' has been successfully revoked\n"
+msgstr ""
+
+#: src/revocation/gnunet-revocation.c:173
+msgid "Revocation successful.\n"
+msgstr ""
+
+#: src/revocation/gnunet-revocation.c:178
+msgid "Internal error, key revocation might have failed\n"
+msgstr ""
+
+#: src/revocation/gnunet-revocation.c:289
+#, c-format
+msgid "Revocation certificate for `%s' stored in `%s'\n"
+msgstr ""
+
+#: src/revocation/gnunet-revocation.c:319
+#, fuzzy, c-format
+msgid "Ego `%s' not found.\n"
+msgstr "`%s' fehlgeschlagen: Tabelle nicht gefunden!\n"
+
+#: src/revocation/gnunet-revocation.c:340
+#, c-format
+msgid "Error: revocation certificate in `%s' is not for `%s'\n"
+msgstr ""
+
+#: src/revocation/gnunet-revocation.c:360
+msgid "Revocation certificate ready\n"
+msgstr ""
+
+#: src/revocation/gnunet-revocation.c:370
+msgid "Revocation certificate not ready, calculating proof of work\n"
+msgstr ""
+
+#: src/revocation/gnunet-revocation.c:402
+#, fuzzy, c-format
+msgid "Public key `%s' malformed\n"
+msgstr "Ungültiger Parameter: `%s'\n"
+
+#: src/revocation/gnunet-revocation.c:416
+msgid ""
+"Testing and revoking at the same time is not allowed, only executing test.\n"
+msgstr ""
+
+#: src/revocation/gnunet-revocation.c:451
+#, fuzzy, c-format
+msgid "Failed to read revocation certificate from `%s'\n"
+msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
+
+#: src/revocation/gnunet-revocation.c:476
+#, fuzzy
+msgid "No action specified. Nothing to do.\n"
+msgstr "Keine Oberfläche angegeben, verwende Standard\n"
+
+#: src/revocation/gnunet-revocation.c:492
+msgid "use NAME for the name of the revocation file"
+msgstr ""
+
+#: src/revocation/gnunet-revocation.c:495
+msgid "revoke the private key associated with the ego NAME "
+msgstr ""
+
+#: src/revocation/gnunet-revocation.c:498
+msgid ""
+"actually perform the revocation revocation file, otherwise we just do the "
+"precomputation"
+msgstr ""
+
+#: src/revocation/gnunet-revocation.c:501
+msgid "test if the public key KEY has been revoked"
+msgstr ""
+
+#: src/revocation/gnunet-service-revocation.c:250
+msgid "Duplicate revocation received from peer. Ignored.\n"
+msgstr ""
+
+#: src/revocation/gnunet-service-revocation.c:599
+#, fuzzy
+msgid "Could not open revocation database file!"
+msgstr "Verbindung zu gnunetd konnte nicht hergestellt werden.\n"
+
+#: src/scalarproduct/gnunet-scalarproduct.c:194
 #, fuzzy
 msgid "You must specify at least one message ID to check!\n"
 msgstr "Sie müssen eine Liste von Dateien zum Einfügen angeben.\n"
 
-#: src/scalarproduct/gnunet-scalarproduct.c:201
+#: src/scalarproduct/gnunet-scalarproduct.c:200
 msgid "This program needs a session identifier for comparing vectors.\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-scalarproduct.c:207
+#: src/scalarproduct/gnunet-scalarproduct.c:206
 msgid "Please give a session key for --input_key!\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-scalarproduct.c:216
+#: src/scalarproduct/gnunet-scalarproduct.c:215
 #, c-format
 msgid ""
 "Tried to set initiator mode, as peer ID was given. However, `%s' is not a "
 "valid peer identifier.\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-scalarproduct.c:240
-#: src/scalarproduct/gnunet-scalarproduct.c:298
+#: src/scalarproduct/gnunet-scalarproduct.c:239
+#: src/scalarproduct/gnunet-scalarproduct.c:297
 #, fuzzy, c-format
 msgid "Could not convert `%s' to int32_t.\n"
 msgstr "Verbindung zu gnunetd konnte nicht hergestellt werden.\n"
 
-#: src/scalarproduct/gnunet-scalarproduct.c:247
+#: src/scalarproduct/gnunet-scalarproduct.c:246
 msgid "Need elements to compute the vectorproduct, got none.\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-scalarproduct.c:348
+#: src/scalarproduct/gnunet-scalarproduct.c:347
 msgid ""
 "A comma separated list of elements to compare as vector with our remote peer."
 msgstr ""
 
-#: src/scalarproduct/gnunet-scalarproduct.c:351
+#: src/scalarproduct/gnunet-scalarproduct.c:350
 msgid ""
 "A comma separated mask to select which elements should actually be compared."
 msgstr ""
 
-#: src/scalarproduct/gnunet-scalarproduct.c:354
+#: src/scalarproduct/gnunet-scalarproduct.c:353
 msgid ""
 "[Optional] peer to calculate our scalarproduct with. If this parameter is "
 "not given, the service will wait for a remote peer to compute the request."
 msgstr ""
 
-#: src/scalarproduct/gnunet-scalarproduct.c:357
+#: src/scalarproduct/gnunet-scalarproduct.c:356
 msgid "Transaction ID shared with peer."
 msgstr ""
 
-#: src/scalarproduct/gnunet-scalarproduct.c:366
+#: src/scalarproduct/gnunet-scalarproduct.c:365
 msgid "Calculate the Vectorproduct with a GNUnet peer."
 msgstr ""
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:381
+#: src/scalarproduct/gnunet-service-scalarproduct.c:450
 #, c-format
 msgid "Generated key set with key length %d bits.\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:691
+#: src/scalarproduct/gnunet-service-scalarproduct.c:775
 #, fuzzy, c-format
 msgid "Client (%p) disconnected from us.\n"
 msgstr "`%s' hat sich mit `%s' verbunden.\n"
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:762
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1696
+#: src/scalarproduct/gnunet-service-scalarproduct.c:847
+#: src/scalarproduct/gnunet-service-scalarproduct.c:936
 #, fuzzy, c-format
 msgid "Could not send message to client (%p)!\n"
 msgstr "Nachricht konnte nicht an gnunetd gesendet werden.\n"
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:768
+#: src/scalarproduct/gnunet-service-scalarproduct.c:853
 #, c-format
 msgid "Sending session-end notification to client (%p) for session %s\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:891
-msgid "Message too large, fragmentation is currently not supported!)\n"
+#: src/scalarproduct/gnunet-service-scalarproduct.c:946
+#, c-format
+msgid "Sent result to client (%p), this session (%s) has ended!\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:896
+#: src/scalarproduct/gnunet-service-scalarproduct.c:1025
+#: src/scalarproduct/gnunet-service-scalarproduct.c:1163
 #, fuzzy
 msgid "Could not send service-response message via mesh!)\n"
 msgstr "Nachricht konnte nicht an gnunetd gesendet werden.\n"
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1092
+#: src/scalarproduct/gnunet-service-scalarproduct.c:1376
 #, c-format
 msgid "Failed to communicate with `%s', scalar product calculation aborted.\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1145
-#, fuzzy, c-format
-msgid "Successfully created new tunnel to peer (%s)!\n"
-msgstr "Zugriff verweigert für `%s' bei %s:%d.\n"
-
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1157
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1873
-msgid "Message too large, fragmentation is currently not supported!\n"
-msgstr ""
-
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1223
+#: src/scalarproduct/gnunet-service-scalarproduct.c:1476
+#: src/scalarproduct/gnunet-service-scalarproduct.c:1603
 #, fuzzy
 msgid "Transmitting service request.\n"
 msgstr "Collection `%s' begonnen.\n"
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1233
+#: src/scalarproduct/gnunet-service-scalarproduct.c:1485
 #, fuzzy
-msgid "Could not send mutlicast message to tunnel!\n"
+msgid "Could not send service-request multipart message to tunnel!\n"
 msgstr "Nachricht konnte nicht an gnunetd gesendet werden.\n"
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1283
+#: src/scalarproduct/gnunet-service-scalarproduct.c:1525
+#, fuzzy, c-format
+msgid "Successfully created new tunnel to peer (%s)!\n"
+msgstr "Zugriff verweigert für `%s' bei %s:%d.\n"
+
+#: src/scalarproduct/gnunet-service-scalarproduct.c:1612
+#, fuzzy
+msgid "Could not send message to tunnel!\n"
+msgstr "Nachricht konnte nicht an gnunetd gesendet werden.\n"
+
+#: src/scalarproduct/gnunet-service-scalarproduct.c:1669
 #, fuzzy
 msgid "Too short message received from client!\n"
 msgstr "Empfangene Client-Nachricht ist ungültig.\n"
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1297
+#: src/scalarproduct/gnunet-service-scalarproduct.c:1682
 #, fuzzy
 msgid "Invalid message received from client, session information incorrect!\n"
 msgstr "Ungültige `%s' Nachricht von Knoten `%s' empfangen.\n"
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1309
+#: src/scalarproduct/gnunet-service-scalarproduct.c:1693
 #, c-format
 msgid ""
 "Duplicate session information received, cannot create new session with key `"
 "%s'\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1330
+#: src/scalarproduct/gnunet-service-scalarproduct.c:1713
 #, c-format
 msgid ""
 "Got client-request-session with key %s, preparing tunnel to remote service.\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1369
+#: src/scalarproduct/gnunet-service-scalarproduct.c:1749
 #, c-format
-msgid "Creating new tunnel to for session with key %s.\n"
+msgid "Creating new tunnel for session with key %s.\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1417
+#: src/scalarproduct/gnunet-service-scalarproduct.c:1794
 #, c-format
 msgid ""
 "Got client-responder-session with key %s and a matching service-request-"
 "session set, processing.\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1425
+#: src/scalarproduct/gnunet-service-scalarproduct.c:1802
 #, c-format
 msgid ""
 "Got client-responder-session with key %s but NO matching service-request-"
 "session set, queuing element for later use.\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1481
-#, c-format
-msgid "Peer disconnected, terminating session %s with peer (%s)\n"
-msgstr ""
+#: src/scalarproduct/gnunet-service-scalarproduct.c:1828
+#, fuzzy, c-format
+msgid "New incoming tunnel from peer %s.\n"
+msgstr "`%s' hat sich mit `%s' verbunden.\n"
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1706
+#: src/scalarproduct/gnunet-service-scalarproduct.c:1859
 #, c-format
-msgid "Sent result to client (%p), this session (%s) has ended!\n"
+msgid "Peer disconnected, terminating session %s with peer (%s)\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1790
+#: src/scalarproduct/gnunet-service-scalarproduct.c:2047
+#: src/scalarproduct/gnunet-service-scalarproduct.c:2196
 #, c-format
-msgid ""
-"Got message with duplicate session key (`%s'), ignoring service request.\n"
-msgstr ""
-
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1813
-#, fuzzy
-msgid "Could not translate remote public key to sexpression!\n"
-msgstr "Die öffentliche IPv6-Adresse konnte nicht ermittelt werden.\n"
-
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1849
-#, fuzzy, c-format
-msgid ""
-"Could not translate E[a%d] to MPI!\n"
-"%s/%s\n"
+msgid "Got session with key %s and a matching element set, processing.\n"
 msgstr ""
-"Es konnte keine IP für das Gerät `%s' unter Verwendung von `%s' ermittelt "
-"werden.\n"
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1857
+#: src/scalarproduct/gnunet-service-scalarproduct.c:2054
+#: src/scalarproduct/gnunet-service-scalarproduct.c:2203
 #, c-format
-msgid "Got session with key %s and a matching element set, processing.\n"
+msgid "Got session with key %s without a matching element set, queueing.\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1866
+#: src/scalarproduct/gnunet-service-scalarproduct.c:2142
 #, c-format
-msgid "Got session with key %s without a matching element set, queueing.\n"
+msgid ""
+"Got message with duplicate session key (`%s'), ignoring service request.\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:2039
+#: src/scalarproduct/gnunet-service-scalarproduct.c:2425
 msgid "Shutting down, initiating cleanup.\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:2100
+#: src/scalarproduct/gnunet-service-scalarproduct.c:2490
 msgid "Generating Paillier-Keyset.\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:2116
+#: src/scalarproduct/gnunet-service-scalarproduct.c:2505
 #, fuzzy
 msgid "Connect to MESH failed\n"
 msgstr " Verbindung fehlgeschlagen (Bug?)\n"
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:2120
+#: src/scalarproduct/gnunet-service-scalarproduct.c:2509
 #, fuzzy
 msgid "Mesh initialized\n"
 msgstr " Verbindung fehlgeschlagen\n"
 
-#: src/scalarproduct/scalarproduct_api.c:243
+#: src/scalarproduct/scalarproduct_api.c:246
 #, fuzzy
 msgid "# SUC responder result messages received"
 msgstr "# verschlüsselter PING Nachrichten empfangen"
 
-#: src/scalarproduct/scalarproduct_api.c:297
+#: src/scalarproduct/scalarproduct_api.c:300
 #, fuzzy
 msgid "# bytes sent to scalarproduct"
 msgstr "# bytes in der Datenbank"
 
-#: src/scalarproduct/scalarproduct_api.c:340
-#: src/scalarproduct/scalarproduct_api.c:433
+#: src/scalarproduct/scalarproduct_api.c:345
+#: src/scalarproduct/scalarproduct_api.c:440
 #, fuzzy
 msgid "Failed to connect to the scalarproduct service\n"
 msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
 
-#: src/scalarproduct/scalarproduct_api.c:348
-#: src/scalarproduct/scalarproduct_api.c:441
+#: src/scalarproduct/scalarproduct_api.c:353
+#: src/scalarproduct/scalarproduct_api.c:448
 #, fuzzy
 msgid "Failed to send a message to the statistics service\n"
 msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
 
-#: src/scalarproduct/scalarproduct_api.c:382
-#: src/scalarproduct/scalarproduct_api.c:478
+#: src/scalarproduct/scalarproduct_api.c:387
+#: src/scalarproduct/scalarproduct_api.c:485
 #, fuzzy
 msgid "Failed to send a message to the scalarproduct service\n"
 msgstr "Der Transportdienst auf Port %d konnte nicht gestartet werden.\n"
 
-#: src/set/gnunet-set-ibf-profiler.c:224
+#: src/set/gnunet-set-ibf-profiler.c:221
 #, fuzzy
 msgid "number of element in set A-B"
 msgstr "Anzahl an Durchläufen"
 
-#: src/set/gnunet-set-ibf-profiler.c:227
+#: src/set/gnunet-set-ibf-profiler.c:224
 #, fuzzy
 msgid "number of element in set B-A"
 msgstr "Anzahl an Durchläufen"
 
-#: src/set/gnunet-set-ibf-profiler.c:230
+#: src/set/gnunet-set-ibf-profiler.c:227
 msgid "number of common elements in A and B"
 msgstr ""
 
-#: src/set/gnunet-set-ibf-profiler.c:233
+#: src/set/gnunet-set-ibf-profiler.c:230
 msgid "hash num"
 msgstr ""
 
-#: src/set/gnunet-set-ibf-profiler.c:236
+#: src/set/gnunet-set-ibf-profiler.c:233
 msgid "ibf size"
 msgstr ""
 
-#: src/set/gnunet-set-profiler.c:296
+#: src/set/gnunet-set-profiler.c:295
 msgid "oeration to execute"
 msgstr ""
 
-#: src/statistics/gnunet-service-statistics.c:271
+#: src/statistics/gnunet-service-statistics.c:280
 #, fuzzy, c-format
 msgid "Loading %llu bytes of statistics from `%s'\n"
 msgstr "Dateien aus dem GNUnet herunterladen."
 
-#: src/statistics/gnunet-service-statistics.c:330
+#: src/statistics/gnunet-service-statistics.c:346
 #, fuzzy, c-format
 msgid "Wrote %llu bytes of statistics to `%s'\n"
 msgstr "Dateien aus dem GNUnet herunterladen."
 
-#: src/statistics/gnunet-statistics.c:142
+#: src/statistics/gnunet-statistics.c:140
 #, fuzzy
 msgid "Failed to obtain statistics.\n"
 msgstr "Statistiken über den Netzwerkverkehr konnten nicht ermittelt werden.\n"
 
-#: src/statistics/gnunet-statistics.c:144
+#: src/statistics/gnunet-statistics.c:142
 #, fuzzy, c-format
 msgid "Failed to obtain statistics from host `%s:%llu'\n"
 msgstr "Statistiken über den Netzwerkverkehr konnten nicht ermittelt werden.\n"
 
-#: src/statistics/gnunet-statistics.c:191
+#: src/statistics/gnunet-statistics.c:189
 msgid "Missing argument: subsystem \n"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:197
+#: src/statistics/gnunet-statistics.c:195
 msgid "Missing argument: name\n"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:228
+#: src/statistics/gnunet-statistics.c:226
 #, c-format
 msgid "No subsystem or name given\n"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:236
+#: src/statistics/gnunet-statistics.c:234
 #, fuzzy, c-format
 msgid "Failed to initialize watch routine\n"
 msgstr "SQLite Datenbank konnte nicht initialisiert werden.\n"
 
-#: src/statistics/gnunet-statistics.c:263
+#: src/statistics/gnunet-statistics.c:261
 #, fuzzy, c-format
 msgid "Trying to connect to remote host, but service `%s' is not running\n"
 msgstr "Verbindung zu gnunetd konnte nicht hergestellt werden.\n"
 
-#: src/statistics/gnunet-statistics.c:271
+#: src/statistics/gnunet-statistics.c:269
 #, fuzzy, c-format
 msgid "A port is required to connect to host `%s'\n"
 msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
 
-#: src/statistics/gnunet-statistics.c:278
+#: src/statistics/gnunet-statistics.c:276
 #, c-format
 msgid "A port has to be between 1 and 65535 to connect to host `%s'\n"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:310
+#: src/statistics/gnunet-statistics.c:308
 #, fuzzy, c-format
 msgid "Invalid argument `%s'\n"
 msgstr "Ungültiger Parameter: `%s'\n"
 
-#: src/statistics/gnunet-statistics.c:336
+#: src/statistics/gnunet-statistics.c:334
 msgid "limit output to statistics for the given NAME"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:339
+#: src/statistics/gnunet-statistics.c:337
 msgid "make the value being set persistent"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:342
+#: src/statistics/gnunet-statistics.c:340
 msgid "limit output to the given SUBSYSTEM"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:345
+#: src/statistics/gnunet-statistics.c:343
 msgid "just print the statistics value"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:348
+#: src/statistics/gnunet-statistics.c:346
 msgid "watch value continuously"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:351
+#: src/statistics/gnunet-statistics.c:349
 msgid "connect to remote host"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:354
+#: src/statistics/gnunet-statistics.c:352
 msgid "port for remote host"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:366
+#: src/statistics/gnunet-statistics.c:364
 msgid "Print statistics about GNUnet operations."
 msgstr "Statistiken der GNUnet Aktivitäten ausgeben."
 
-#: src/statistics/statistics_api.c:512
+#: src/statistics/statistics_api.c:509
 #, fuzzy
 msgid "Could not save some persistent statistics\n"
 msgstr ""
 "IP(v4) dieses Hosts konnte nicht ermittelt werden. Bitte geben Sie die IP in "
 "der Konfigurationsdatei an.\n"
 
-#: src/statistics/statistics_api.c:1057
+#: src/statistics/statistics_api.c:1054
 msgid ""
 "Failed to receive acknowledgement from statistics service, some statistics "
 "might have been lost!\n"
 msgstr ""
 
+#: src/testbed/gnunet-daemon-testbed-blacklist.c:264
+msgid ""
+"Daemon to restrict incoming transport layer connections during testbed "
+"deployments"
+msgstr ""
+
 #: src/testbed/gnunet-service-testbed_cpustatus.c:727
 #, c-format
 msgid ""
 "Cannot open %s for writing load statistics.  Not logging load statistics\n"
 msgstr ""
 
-#: src/testbed/gnunet-service-testbed_peers.c:973
+#: src/testbed/gnunet-service-testbed_peers.c:1012
 #, fuzzy
 msgid "Misconfiguration (can't connect to the ARM service)"
 msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
 
-#: src/testbed/gnunet-service-testbed_peers.c:979
+#: src/testbed/gnunet-service-testbed_peers.c:1018
 msgid "Request doesn't fit into a message"
 msgstr ""
 
-#: src/testbed/gnunet-service-testbed_peers.c:1017
+#: src/testbed/gnunet-service-testbed_peers.c:1056
 #, fuzzy, c-format
 msgid "%s service can't be started because ARM is shutting down"
 msgstr "`%s' fährt herunter.\n"
 
-#: src/testbed/gnunet_testbed_ll_master.c:57
-#, fuzzy, c-format
-msgid "Job command file not given. Exiting\n"
-msgstr "Konfigurationsdatei FILENAME verwenden"
-
 #: src/testbed/gnunet_testbed_mpi_spawn.c:125
 #, fuzzy
 msgid "Waiting for child to exit.\n"
@@ -5394,19 +5983,26 @@ msgstr ""
 msgid "Spawning process `%s'\n"
 msgstr "Collection `%s' begonnen.\n"
 
-#: src/testbed/gnunet-testbed-profiler.c:254
+#: src/testbed/gnunet-testbed-profiler.c:267
 #, fuzzy, c-format
 msgid "Exiting as the number of peers is %u\n"
 msgstr "Maximale Anzahl an Chat Clients erreicht.\n"
 
-#: src/testbed/gnunet-testbed-profiler.c:280
+#: src/testbed/gnunet-testbed-profiler.c:293
 msgid "create COUNT number of peers"
 msgstr ""
 
-#: src/testbed/gnunet-testbed-profiler.c:283
+#: src/testbed/gnunet-testbed-profiler.c:296
 msgid "tolerate COUNT number of continious timeout failures"
 msgstr ""
 
+#: src/testbed/gnunet-testbed-profiler.c:299
+msgid ""
+"run profiler in non-interactive mode where upon testbed setup the profiler "
+"does not wait for a keystroke but continues to run until a termination "
+"signal is received"
+msgstr ""
+
 #: src/testbed/testbed_api_hosts.c:415
 #, fuzzy, c-format
 msgid "Hosts file %s not found\n"
@@ -5427,7 +6023,7 @@ msgstr "Sitzungsschlüssel von Knoten `%s' konnte nicht überprüft werden.\n"
 msgid "The function %s is only available when compiled with (--with-ll)\n"
 msgstr ""
 
-#: src/testbed/testbed_api_hosts.c:1572
+#: src/testbed/testbed_api_hosts.c:1586
 #, fuzzy, c-format
 msgid "Adding host %u failed with error: %s\n"
 msgstr "`%s' schlug bei %s:%d mit dem Fehler %s fehl\n"
@@ -5572,161 +6168,133 @@ msgstr ""
 msgid "Command line tool to access the testing library"
 msgstr ""
 
-#: src/testing/testing.c:276
+#: src/testing/testing.c:277
 #, c-format
 msgid "Hostkeys file not found: %s\n"
 msgstr ""
 
-#: src/testing/testing.c:292
+#: src/testing/testing.c:293
 #, c-format
 msgid "Incorrect hostkey file format: %s\n"
 msgstr ""
 
-#: src/testing/testing.c:711
+#: src/testing/testing.c:716
 #, fuzzy, c-format
 msgid "Key number %u does not exist\n"
 msgstr "Anzahl an Nachrichten, die pro Durchlauf verwendet wird"
 
-#: src/testing/testing.c:722
-#, fuzzy, c-format
-msgid "Error while decoding key %u\n"
-msgstr "Fehler beim Download: %s\n"
-
-#: src/testing/testing.c:1158
+#: src/testing/testing.c:1155
 #, c-format
 msgid ""
 "You attempted to create a testbed with more than %u hosts.  Please "
 "precompute more hostkeys first.\n"
 msgstr ""
 
-#: src/testing/testing.c:1167
+#: src/testing/testing.c:1164
 #, fuzzy, c-format
 msgid "Failed to initialize hostkey for peer %u\n"
 msgstr "SQLite Datenbank konnte nicht initialisiert werden.\n"
 
-#: src/testing/testing.c:1177
+#: src/testing/testing.c:1174
 #, fuzzy
 msgid "PRIVATE_KEY option in PEER section missing in configuration\n"
 msgstr "In der Konfigurationsdatei wurden keine Anwendungen definiert!\n"
 
-#: src/testing/testing.c:1190
+#: src/testing/testing.c:1187
 #, fuzzy
 msgid "Failed to create configuration for peer (not enough free ports?)\n"
 msgstr "Auf die Namespace Informationen konnte nicht zugegriffen werden.\n"
 
-#: src/testing/testing.c:1204
+#: src/testing/testing.c:1201
 #, fuzzy, c-format
 msgid "Cannot open hostkey file `%s': %s\n"
 msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
 
-#: src/testing/testing.c:1216
+#: src/testing/testing.c:1213
 #, fuzzy, c-format
 msgid "Failed to write hostkey file for peer %u: %s\n"
 msgstr "Dateiformat fehlerhaft (kein GNUnet Verzeichnis?)\n"
 
-#: src/testing/testing.c:1238
+#: src/testing/testing.c:1235
 #, fuzzy, c-format
 msgid "Failed to write configuration file `%s' for peer %u: %s\n"
 msgstr "Fehler beim Speichern der Konfigurationsdatei `%s':"
 
-#: src/testing/testing.c:1338
+#: src/testing/testing.c:1335
 #, fuzzy, c-format
 msgid "Failed to start `%s': %s\n"
 msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
 
-#: src/testing/testing.c:1702
+#: src/testing/testing.c:1699
 #, fuzzy, c-format
 msgid "Failed to load configuration from %s\n"
 msgstr "Fehler beim Speichern der Konfigurationsdatei `%s':"
 
-#: src/topology/gnunet-daemon-topology.c:254
+#: src/topology/friends.c:100
+#, fuzzy, c-format
+msgid "Syntax error in FRIENDS file at offset %llu, skipping bytes `%.*s'.\n"
+msgstr "Syntaxfehler in Topologieangabe, überspringe Bytes `%s'.\n"
+
+#: src/topology/gnunet-daemon-topology.c:255
 msgid "# peers blacklisted"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:387
+#: src/topology/gnunet-daemon-topology.c:388
 #, fuzzy
 msgid "# connect requests issued to transport"
 msgstr "# Client Trace-Anfragen empfangen"
 
-#: src/topology/gnunet-daemon-topology.c:721
-#: src/topology/gnunet-daemon-topology.c:806
+#: src/topology/gnunet-daemon-topology.c:727
+#: src/topology/gnunet-daemon-topology.c:812
 #, fuzzy
 msgid "# friends connected"
 msgstr "# verbundener Knoten"
 
-#: src/topology/gnunet-daemon-topology.c:986
+#: src/topology/gnunet-daemon-topology.c:992
 msgid "Failed to connect to core service, can not manage topology!\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:1031
-#, fuzzy, c-format
-msgid "Could not read friends list `%s'\n"
-msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
-
-#: src/topology/gnunet-daemon-topology.c:1037
+#: src/topology/gnunet-daemon-topology.c:1021
 #, c-format
-msgid "Friends file `%s' is empty.\n"
+msgid "Found myself `%s' in friend list (useless, ignored)\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:1046
-#, fuzzy, c-format
-msgid "Failed to read friends list from `%s': out of memory\n"
-msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
-
-#: src/topology/gnunet-daemon-topology.c:1054
-#, c-format
-msgid "Failed to read friends list from `%s'\n"
-msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
-
-#: src/topology/gnunet-daemon-topology.c:1074
-#, fuzzy, c-format
-msgid ""
-"Syntax error in topology specification at offset %llu, skipping bytes.\n"
-msgstr "Syntaxfehler in Topolgieangabe, Bytes werden übersprungen.\n"
-
-#: src/topology/gnunet-daemon-topology.c:1087
-#, fuzzy, c-format
-msgid ""
-"Syntax error in topology specification at offset %llu, skipping bytes `%s'.\n"
-msgstr "Syntaxfehler in Topologieangabe, überspringe Bytes `%s'.\n"
-
-#: src/topology/gnunet-daemon-topology.c:1097
+#: src/topology/gnunet-daemon-topology.c:1028
 #, fuzzy, c-format
 msgid "Found friend `%s' in configuration\n"
 msgstr " gconfig\tGTK Konfiguration\n"
 
-#: src/topology/gnunet-daemon-topology.c:1103
-#, c-format
-msgid "Found myself `%s' in friend list (useless, ignored)\n"
+#: src/topology/gnunet-daemon-topology.c:1049
+msgid "Encountered errors parsing friends list!\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:1113
+#: src/topology/gnunet-daemon-topology.c:1051
 #, fuzzy
 msgid "# friends in configuration"
 msgstr " gconfig\tGTK Konfiguration\n"
 
-#: src/topology/gnunet-daemon-topology.c:1119
+#: src/topology/gnunet-daemon-topology.c:1056
 msgid ""
 "Fewer friends specified than required by minimum friend count. Will only "
 "connect to friends.\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:1126
+#: src/topology/gnunet-daemon-topology.c:1062
 msgid ""
 "More friendly connections required than target total number of connections.\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:1157
+#: src/topology/gnunet-daemon-topology.c:1093
 #, fuzzy
 msgid "# HELLO messages received"
 msgstr "# verschlüsselter PONG Nachrichten empfangen"
 
-#: src/topology/gnunet-daemon-topology.c:1212
+#: src/topology/gnunet-daemon-topology.c:1150
 #, fuzzy
 msgid "# HELLO messages gossipped"
 msgstr "# ausgehender Nachrichten verworfen"
 
-#: src/topology/gnunet-daemon-topology.c:1351
+#: src/topology/gnunet-daemon-topology.c:1289
 msgid "GNUnet topology control (maintaining P2P mesh and F2F constraints)"
 msgstr ""
 
@@ -5740,41 +6308,41 @@ msgstr "Adresse des Knotens `%s' konnte nicht ermittelt werden.\n"
 msgid "Adding blacklisting entry for peer `%s':`%s'\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_blacklist.c:453
-#: src/transport/gnunet-service-transport_blacklist.c:717
+#: src/transport/gnunet-service-transport_blacklist.c:455
+#: src/transport/gnunet-service-transport_blacklist.c:722
 msgid "# disconnects due to blacklist"
 msgstr ""
 
-#: src/transport/gnunet-service-transport.c:168
+#: src/transport/gnunet-service-transport.c:163
 #, fuzzy
 msgid "# bytes payload discarded due to not connected peer "
 msgstr "# Knotenankündigungen empfangen"
 
-#: src/transport/gnunet-service-transport.c:234
+#: src/transport/gnunet-service-transport.c:229
 #, fuzzy
 msgid "# bytes total received"
 msgstr "# gap Anfragen insgesamt empfangen"
 
-#: src/transport/gnunet-service-transport.c:281
+#: src/transport/gnunet-service-transport.c:277
 #, fuzzy
 msgid "# bytes payload received"
 msgstr "# Bytes entschlüsselt"
 
-#: src/transport/gnunet-service-transport.c:432
+#: src/transport/gnunet-service-transport.c:429
 #, fuzzy, c-format
 msgid "Could not obtain a valid network for `%s' %s\n"
 msgstr ""
 "Es konnte keine IP für das Gerät `%s' unter Verwendung von `%s' ermittelt "
 "werden.\n"
 
-#: src/transport/gnunet-service-transport.c:480
+#: src/transport/gnunet-service-transport.c:479
 #, c-format
 msgid ""
 "Address or session unknown: failed to update properties for peer `%s' plugin "
 "`%s' address `%s' session %p\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport.c:775
+#: src/transport/gnunet-service-transport.c:760
 msgid "Transport service is lacking key configuration settings.  Exiting.\n"
 msgstr ""
 
@@ -5793,80 +6361,80 @@ msgstr "# gap Anfragen verworfen: Kollision in RT"
 msgid "Rejecting control connection from peer `%s', which is not me!\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_clients.c:677
+#: src/transport/gnunet-service-transport_clients.c:672
 msgid "# bytes payload dropped (other peer was not connected)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_clients.c:733
+#: src/transport/gnunet-service-transport_clients.c:728
 #, fuzzy
 msgid "# REQUEST CONNECT messages received"
 msgstr "# verschlüsselter PONG Nachrichten empfangen"
 
-#: src/transport/gnunet-service-transport_hello.c:179
+#: src/transport/gnunet-service-transport_hello.c:181
 msgid "# refreshed my HELLO"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1216
+#: src/transport/gnunet-service-transport_neighbours.c:1080
 #, fuzzy
 msgid "# DISCONNECT messages sent"
 msgstr "# verschlüsselter PONG Nachrichten empfangen"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1346
-#: src/transport/gnunet-service-transport_neighbours.c:1681
+#: src/transport/gnunet-service-transport_neighbours.c:1210
+#: src/transport/gnunet-service-transport_neighbours.c:1545
 #, fuzzy
 msgid "# bytes in message queue for other peers"
 msgstr "# Bytes ausgehender Nachrichten verworfen"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1351
+#: src/transport/gnunet-service-transport_neighbours.c:1215
 #, fuzzy
 msgid "# messages transmitted to other peers"
 msgstr "# Bytes des Typs %d übertragen"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1356
+#: src/transport/gnunet-service-transport_neighbours.c:1220
 #, fuzzy
 msgid "# transmission failures for messages to other peers"
 msgstr "# Bytes ausgehender Nachrichten verworfen"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1413
+#: src/transport/gnunet-service-transport_neighbours.c:1277
 msgid "# messages timed out while in transport queue"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1455
+#: src/transport/gnunet-service-transport_neighbours.c:1319
 #, fuzzy
 msgid "# keepalives sent"
 msgstr "# p2p Trace-Antworten gesendet"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1479
+#: src/transport/gnunet-service-transport_neighbours.c:1343
 #, fuzzy
 msgid "# KEEPALIVE messages discarded (peer unknown)"
 msgstr "# defragmentierter Nachrichten"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1487
+#: src/transport/gnunet-service-transport_neighbours.c:1351
 #, fuzzy
 msgid "# KEEPALIVE messages discarded (no session)"
 msgstr "# defragmentierter Nachrichten"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1520
+#: src/transport/gnunet-service-transport_neighbours.c:1384
 #, fuzzy
 msgid "# KEEPALIVE_RESPONSE messages discarded (not connected)"
 msgstr "# defragmentierter Nachrichten"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1529
+#: src/transport/gnunet-service-transport_neighbours.c:1393
 #, fuzzy
 msgid "# KEEPALIVE_RESPONSE messages discarded (not expected)"
 msgstr "# defragmentierter Nachrichten"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1586
+#: src/transport/gnunet-service-transport_neighbours.c:1450
 #, fuzzy
 msgid "# messages discarded due to lack of neighbour record"
 msgstr "# defragmentierter Nachrichten"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1620
+#: src/transport/gnunet-service-transport_neighbours.c:1484
 #, fuzzy
 msgid "# bandwidth quota violations by other peers"
 msgstr "Verfolgt die Bandbreitennutzung von gnunetd"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1636
+#: src/transport/gnunet-service-transport_neighbours.c:1500
 msgid "# ms throttling suggested"
 msgstr ""
 
@@ -5891,32 +6459,32 @@ msgstr "COUNT Nachrichten versenden"
 msgid "# unexpected CONNECT_ACK messages (disconnecting)"
 msgstr "COUNT Nachrichten versenden"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3046
+#: src/transport/gnunet-service-transport_neighbours.c:3045
 #, fuzzy
 msgid "# unexpected SESSION ACK messages"
 msgstr "# verschlüsselter PONG Nachrichten gesendet"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3099
+#: src/transport/gnunet-service-transport_neighbours.c:3098
 msgid "# SET QUOTA messages ignored (no such peer)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3113
+#: src/transport/gnunet-service-transport_neighbours.c:3112
 msgid "# disconnects due to quota of 0"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3144
+#: src/transport/gnunet-service-transport_neighbours.c:3143
 msgid "# disconnect messages ignored (old format)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3155
+#: src/transport/gnunet-service-transport_neighbours.c:3154
 msgid "# disconnect messages ignored (timestamp)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3194
+#: src/transport/gnunet-service-transport_neighbours.c:3193
 msgid "# other peer asked to disconnect from us"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3289
+#: src/transport/gnunet-service-transport_neighbours.c:3288
 #, fuzzy
 msgid "# disconnected from peer upon explicit request"
 msgstr "# gap Anfragen verworfen: Kollision in RT"
@@ -5942,334 +6510,334 @@ msgstr "Anwendung `%s' konnte nicht initialisiert werden.\n"
 msgid "Did not load plugin `%s' due to missing functions\n"
 msgstr "Fehler beim Laden des Plugins `%s' bei %s:%d. Plugin wird entladen.\n"
 
-#: src/transport/gnunet-service-transport_validation.c:455
+#: src/transport/gnunet-service-transport_validation.c:456
 msgid "# address records discarded"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:518
+#: src/transport/gnunet-service-transport_validation.c:519
 #, c-format
 msgid ""
 "Not transmitting `%s' with `%s', message too big (%u bytes!). This should "
 "not happen.\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:575
+#: src/transport/gnunet-service-transport_validation.c:577
 #, fuzzy
 msgid "# PING without HELLO messages sent"
 msgstr "# Klartext PING Nachrichten gesendet"
 
-#: src/transport/gnunet-service-transport_validation.c:660
+#: src/transport/gnunet-service-transport_validation.c:662
 msgid "# address revalidations started"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:928
+#: src/transport/gnunet-service-transport_validation.c:933
 #, fuzzy
 msgid "# PING message for different peer received"
 msgstr "# PING Nachrichten erstellt"
 
-#: src/transport/gnunet-service-transport_validation.c:987
+#: src/transport/gnunet-service-transport_validation.c:992
 msgid "# failed address checks during validation"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:997
+#: src/transport/gnunet-service-transport_validation.c:1002
 msgid "# successful address checks during validation"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1016
+#: src/transport/gnunet-service-transport_validation.c:1021
 #, c-format
 msgid "Received a PING message with validation bug from `%s'\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1070
+#: src/transport/gnunet-service-transport_validation.c:1075
 #, fuzzy, c-format
 msgid "Failed to create PONG signature for peer `%s'\n"
 msgstr "Namespace `%s' konnte nicht erstellt werden (existiert bereits?).\n"
 
-#: src/transport/gnunet-service-transport_validation.c:1115
+#: src/transport/gnunet-service-transport_validation.c:1124
 msgid "# PONGs unicast via reliable transport"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1124
+#: src/transport/gnunet-service-transport_validation.c:1133
 msgid "# PONGs multicast to all available addresses"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1251
+#: src/transport/gnunet-service-transport_validation.c:1260
 msgid "# PONGs dropped, no matching pending validation"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1266
+#: src/transport/gnunet-service-transport_validation.c:1275
 msgid "# PONGs dropped, signature expired"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1372
+#: src/transport/gnunet-service-transport_validation.c:1381
 #, fuzzy, c-format
 msgid "Adding `%s' without addresses for peer `%s'\n"
 msgstr "Adresse des Knotens `%s' konnte nicht ermittelt werden.\n"
 
-#: src/transport/gnunet-transport.c:266
+#: src/transport/gnunet-transport.c:259
 #, fuzzy, c-format
 msgid "Transmitted %llu bytes/s (%llu bytes in %s)\n"
 msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
 
-#: src/transport/gnunet-transport.c:273
+#: src/transport/gnunet-transport.c:266
 #, fuzzy, c-format
 msgid "Received %llu bytes/s (%llu bytes in %s)\n"
 msgstr "GAP hat ungültige Inhalte von `%s' empfangen.\n"
 
-#: src/transport/gnunet-transport.c:303
+#: src/transport/gnunet-transport.c:296
 #, fuzzy, c-format
 msgid "Failed to connect to `%s'\n"
 msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
 
-#: src/transport/gnunet-transport.c:316
+#: src/transport/gnunet-transport.c:309
 #, fuzzy, c-format
 msgid "Failed to resolve address for peer `%s'\n"
 msgstr "Fehler beim Binden an UDP Port %d.\n"
 
-#: src/transport/gnunet-transport.c:325
+#: src/transport/gnunet-transport.c:318
 #, fuzzy
 msgid "Failed to list connections, timeout occured\n"
 msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden."
 
-#: src/transport/gnunet-transport.c:429
+#: src/transport/gnunet-transport.c:422
 msgid "No transport plugins configured, peer will never communicate\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:442
+#: src/transport/gnunet-transport.c:435
 #, c-format
 msgid "No port configured for plugin `%s', cannot test it\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:506
+#: src/transport/gnunet-transport.c:499
 #, fuzzy, c-format
 msgid "Transmitting %u bytes to %s\n"
 msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
 
-#: src/transport/gnunet-transport.c:528
+#: src/transport/gnunet-transport.c:522
 #, fuzzy, c-format
 msgid "Successfully connected to `%s'\n"
 msgstr "Zugriff verweigert für `%s' bei %s:%d.\n"
 
-#: src/transport/gnunet-transport.c:550
+#: src/transport/gnunet-transport.c:545
 #, c-format
 msgid ""
 "Successfully connected to `%s', starting to send benchmark data in %u Kb "
 "blocks\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:585
+#: src/transport/gnunet-transport.c:580
 #, fuzzy, c-format
 msgid "Disconnected from peer `%s' while benchmarking\n"
 msgstr "`%s' hat sich mit `%s' verbunden.\n"
 
-#: src/transport/gnunet-transport.c:655
+#: src/transport/gnunet-transport.c:650
 #, fuzzy, c-format
 msgid "Received %u bytes from %s\n"
 msgstr "GAP hat ungültige Inhalte von `%s' empfangen.\n"
 
-#: src/transport/gnunet-transport.c:678
+#: src/transport/gnunet-transport.c:673
 #, fuzzy, c-format
 msgid "Peer `%s': %s %s\n"
 msgstr "Ich bin Peer `%s'.\n"
 
-#: src/transport/gnunet-transport.c:693
+#: src/transport/gnunet-transport.c:688
 #, c-format
 msgid "Peer `%s': %s <unable to resolve address>\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:757
+#: src/transport/gnunet-transport.c:752
 #, fuzzy, c-format
 msgid "Peer `%s' disconnected\n"
 msgstr "# verbundener Knoten"
 
-#: src/transport/gnunet-transport.c:785
+#: src/transport/gnunet-transport.c:780
 #, fuzzy
 msgid "Failed to send connect request to transport service\n"
 msgstr "Der Transportdienst auf Port %d konnte nicht gestartet werden.\n"
 
-#: src/transport/gnunet-transport.c:828
+#: src/transport/gnunet-transport.c:825
 #, c-format
 msgid ""
 "Multiple operations given. Please choose only one operation: %s, %s, %s, %s, "
 "%s, %s\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:834
+#: src/transport/gnunet-transport.c:831
 #, c-format
 msgid ""
 "No operation given. Please choose one operation: %s, %s, %s, %s, %s, %s\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:854 src/transport/gnunet-transport.c:884
-#: src/transport/gnunet-transport.c:906 src/transport/gnunet-transport.c:945
+#: src/transport/gnunet-transport.c:851 src/transport/gnunet-transport.c:881
+#: src/transport/gnunet-transport.c:903 src/transport/gnunet-transport.c:940
 #, fuzzy
 msgid "Failed to connect to transport service\n"
 msgstr "Der Transportdienst auf Port %d konnte nicht gestartet werden.\n"
 
-#: src/transport/gnunet-transport.c:861 src/transport/gnunet-transport.c:891
+#: src/transport/gnunet-transport.c:858 src/transport/gnunet-transport.c:888
 #, fuzzy
 msgid "Failed to send request to transport service\n"
 msgstr "Der Transportdienst auf Port %d konnte nicht gestartet werden.\n"
 
-#: src/transport/gnunet-transport.c:911
+#: src/transport/gnunet-transport.c:908
 msgid "Starting to receive benchmark data\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:995
+#: src/transport/gnunet-transport.c:990
 msgid "measure how fast we are receiving data from all peers (until CTRL-C)"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:998
+#: src/transport/gnunet-transport.c:993
 #, fuzzy
 msgid "connect to a peer"
 msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
 
-#: src/transport/gnunet-transport.c:1001
+#: src/transport/gnunet-transport.c:996
 #, fuzzy
 msgid "provide information about all current connections (once)"
 msgstr "Informationen über andere GNUnet Knoten ausgeben."
 
-#: src/transport/gnunet-transport.c:1007
+#: src/transport/gnunet-transport.c:1002
 #, fuzzy
 msgid ""
 "provide information about all connects and disconnect events (continuously)"
 msgstr "Informationen über andere GNUnet Knoten ausgeben."
 
-#: src/transport/gnunet-transport.c:1010
+#: src/transport/gnunet-transport.c:1005
 #, fuzzy
 msgid "do not resolve hostnames"
 msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
 
-#: src/transport/gnunet-transport.c:1013
+#: src/transport/gnunet-transport.c:1008
 msgid "peer identity"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1017
+#: src/transport/gnunet-transport.c:1012
 msgid "send data for benchmarking to the other peer (until CTRL-C)"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1020
+#: src/transport/gnunet-transport.c:1015
 msgid "test transport configuration (involves external server)"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1031
+#: src/transport/gnunet-transport.c:1026
 #, fuzzy
 msgid "Direct access to transport service."
 msgstr "Der Transportdienst auf Port %d konnte nicht gestartet werden.\n"
 
-#: src/transport/plugin_transport_bluetooth.c:612
+#: src/transport/plugin_transport_bluetooth.c:616
 msgid "# Bluetooth ACKs sent"
 msgstr ""
 
-#: src/transport/plugin_transport_bluetooth.c:631
+#: src/transport/plugin_transport_bluetooth.c:635
 #, fuzzy
 msgid "# Bluetooth messages defragmented"
 msgstr "# defragmentierter Nachrichten"
 
-#: src/transport/plugin_transport_bluetooth.c:677
-#: src/transport/plugin_transport_bluetooth.c:727
-#: src/transport/plugin_transport_bluetooth.c:1833
+#: src/transport/plugin_transport_bluetooth.c:681
+#: src/transport/plugin_transport_bluetooth.c:731
+#: src/transport/plugin_transport_bluetooth.c:1837
 #, fuzzy
 msgid "# Bluetooth sessions allocated"
 msgstr "# Sitzungsschlüssel akzeptiert"
 
-#: src/transport/plugin_transport_bluetooth.c:802
+#: src/transport/plugin_transport_bluetooth.c:806
 #, fuzzy
 msgid "# Bluetooth message fragments sent"
 msgstr "# fragmentierter Nachrichten"
 
-#: src/transport/plugin_transport_bluetooth.c:826
+#: src/transport/plugin_transport_bluetooth.c:830
 msgid "# Bluetooth messages pending (with fragmentation)"
 msgstr ""
 
-#: src/transport/plugin_transport_bluetooth.c:934
-#: src/transport/plugin_transport_bluetooth.c:1019
-#: src/transport/plugin_transport_bluetooth.c:1835
+#: src/transport/plugin_transport_bluetooth.c:938
+#: src/transport/plugin_transport_bluetooth.c:1023
+#: src/transport/plugin_transport_bluetooth.c:1839
 #, fuzzy
 msgid "# Bluetooth MAC endpoints allocated"
 msgstr "# Client Trace-Anfragen empfangen"
 
-#: src/transport/plugin_transport_bluetooth.c:1214
+#: src/transport/plugin_transport_bluetooth.c:1218
 #, fuzzy
 msgid "# HELLO messages received via Bluetooth"
 msgstr "# verschlüsselter PONG Nachrichten empfangen"
 
-#: src/transport/plugin_transport_bluetooth.c:1240
+#: src/transport/plugin_transport_bluetooth.c:1244
 #, fuzzy
 msgid "# fragments received via Bluetooth"
 msgstr "# verworfener Nachrichten"
 
-#: src/transport/plugin_transport_bluetooth.c:1250
+#: src/transport/plugin_transport_bluetooth.c:1254
 #, fuzzy
 msgid "# ACKs received via Bluetooth"
 msgstr "# Bytes empfangen über TCP"
 
-#: src/transport/plugin_transport_bluetooth.c:1307
+#: src/transport/plugin_transport_bluetooth.c:1311
 #, fuzzy
 msgid "# Bluetooth DATA messages discarded due to CRC32 error"
 msgstr "# defragmentierter Nachrichten"
 
-#: src/transport/plugin_transport_bluetooth.c:1419
+#: src/transport/plugin_transport_bluetooth.c:1423
 #, fuzzy
 msgid "# DATA messages received via Bluetooth"
 msgstr "# verschlüsselter PONG Nachrichten empfangen"
 
-#: src/transport/plugin_transport_bluetooth.c:1454
+#: src/transport/plugin_transport_bluetooth.c:1458
 #, fuzzy
 msgid "# Bluetooth DATA messages processed"
 msgstr "# verschlüsselter PONG Nachrichten empfangen"
 
-#: src/transport/plugin_transport_bluetooth.c:1517
+#: src/transport/plugin_transport_bluetooth.c:1521
 #, fuzzy
 msgid "# HELLO beacons sent via Bluetooth"
 msgstr "# Bytes gesendet über UDP"
 
-#: src/transport/plugin_transport_bluetooth.c:1630
+#: src/transport/plugin_transport_bluetooth.c:1634
 msgid "Bluetooth address with invalid size encountered\n"
 msgstr ""
 
-#: src/transport/plugin_transport_bluetooth.c:1814
+#: src/transport/plugin_transport_bluetooth.c:1818
 #, c-format
 msgid "Helper binary `%s' not SUID, cannot run bluetooth transport\n"
 msgstr ""
 
 #: src/transport/plugin_transport_http.c:815
-#: src/transport/plugin_transport_http_server.c:2614
+#: src/transport/plugin_transport_http_server.c:2602
 msgid "Disabling IPv6 since it is not supported on this system!\n"
 msgstr ""
 
 #: src/transport/plugin_transport_http.c:864
-#: src/transport/plugin_transport_http_server.c:2382
+#: src/transport/plugin_transport_http_server.c:2370
 #, fuzzy
 msgid "Require valid port number for service in configuration!\n"
 msgstr "In der Konfigurationsdatei wurden keine Anwendungen definiert!\n"
 
 #: src/transport/plugin_transport_http.c:896
-#: src/transport/plugin_transport_http_server.c:2414 src/util/service.c:1062
+#: src/transport/plugin_transport_http_server.c:2402 src/util/service.c:696
 #, fuzzy, c-format
 msgid "Failed to resolve `%s': %s\n"
 msgstr "Datei wurde als `%s' gespeichert.\n"
 
 #: src/transport/plugin_transport_http.c:913
-#: src/transport/plugin_transport_http_server.c:2431 src/util/service.c:1079
+#: src/transport/plugin_transport_http_server.c:2419 src/util/service.c:713
 #, fuzzy, c-format
 msgid "Failed to find %saddress for `%s'.\n"
 msgstr "Fehler beim Binden an UDP Port %d.\n"
 
 #: src/transport/plugin_transport_http.c:1018
-#: src/transport/plugin_transport_http_server.c:2542
+#: src/transport/plugin_transport_http_server.c:2530
 #, c-format
 msgid "Found %u addresses to report to NAT service\n"
 msgstr ""
 
 #: src/transport/plugin_transport_http.c:1131
-#: src/transport/plugin_transport_http_server.c:2722
+#: src/transport/plugin_transport_http_server.c:2710
 #, fuzzy
 msgid "Neither IPv4 nor IPv6 are enabled! Fix in configuration\n"
 msgstr "Netzwerkbekanntmachungen wurden per Konfiguration deaktiviert!\n"
 
 #: src/transport/plugin_transport_http.c:1144
-#: src/transport/plugin_transport_http_server.c:2733
+#: src/transport/plugin_transport_http_server.c:2721
 #, fuzzy
 msgid "Port is required! Fix in configuration\n"
 msgstr " gconfig\tGTK Konfiguration\n"
@@ -6293,7 +6861,7 @@ msgid ""
 msgstr ""
 
 #: src/transport/plugin_transport_http.c:1221
-#: src/transport/plugin_transport_http_server.c:2848
+#: src/transport/plugin_transport_http_server.c:2836
 #, fuzzy, c-format
 msgid "Using external hostname `%s'\n"
 msgstr "Collection `%s' begonnen.\n"
@@ -6302,99 +6870,100 @@ msgstr "Collection `%s' begonnen.\n"
 msgid "No external hostname configured\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_client.c:1587
+#: src/transport/plugin_transport_http_client.c:1586
 #, c-format
 msgid "Could not initialize curl multi handle, failed to start %s plugin!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_client.c:1724
-#: src/transport/plugin_transport_http_server.c:2978
+#: src/transport/plugin_transport_http_client.c:1723
+#: src/transport/plugin_transport_http_server.c:2966
 #, fuzzy, c-format
 msgid "Shutting down plugin `%s'\n"
 msgstr "Teste Transport(e) %s\n"
 
-#: src/transport/plugin_transport_http_client.c:1749
-#: src/transport/plugin_transport_http_server.c:3038
+#: src/transport/plugin_transport_http_client.c:1748
+#: src/transport/plugin_transport_http_server.c:3026
 #, fuzzy, c-format
 msgid "Shutdown for plugin `%s' complete\n"
 msgstr ""
 "Upload von `%s' komplett, derzeitige durchschnittliche Geschwindigkeit "
 "beträgt %8.3f KB/s.\n"
 
-#: src/transport/plugin_transport_http_client.c:1777
-#: src/transport/plugin_transport_http_server.c:2878
+#: src/transport/plugin_transport_http_client.c:1776
+#: src/transport/plugin_transport_http_server.c:2866
 #, fuzzy, c-format
 msgid "Maximum number of connections is %u\n"
 msgstr "Maximale Anzahl an Chat Clients erreicht.\n"
 
-#: src/transport/plugin_transport_http_server.c:1379
+#: src/transport/plugin_transport_http_server.c:1381
 #, c-format
 msgid ""
 "Access from connection %p (%u of %u) for `%s' `%s' url `%s' with upload data "
 "size %u\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:1644
+#: src/transport/plugin_transport_http_server.c:1646
 #, c-format
 msgid "Accepting connection (%u of %u) from `%s'\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:1652
+#: src/transport/plugin_transport_http_server.c:1654
 #, c-format
 msgid ""
 "Server reached maximum number connections (%u), rejecting new connection\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:1953
+#: src/transport/plugin_transport_http_server.c:1941
 msgid ""
 "Could not create a new TLS certificate, program `gnunet-transport-"
 "certificate-creation' could not be started!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:1977
-msgid "No usable TLS certificate found and creating one failed!\n"
+#: src/transport/plugin_transport_http_server.c:1965
+#, c-format
+msgid "No usable TLS certificate found and creating one at `%s/%s' failed!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:2701
+#: src/transport/plugin_transport_http_server.c:2689
 #, c-format
 msgid "IPv4 support is %s\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:2715
+#: src/transport/plugin_transport_http_server.c:2703
 #, c-format
 msgid "IPv6 support is %s\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:2740
+#: src/transport/plugin_transport_http_server.c:2728
 #, fuzzy, c-format
 msgid "Using port %u\n"
 msgstr "Teste Transport(e) %s\n"
 
-#: src/transport/plugin_transport_http_server.c:2755
+#: src/transport/plugin_transport_http_server.c:2743
 #, fuzzy, c-format
 msgid "Specific IPv4 address `%s' in configuration file is invalid!\n"
 msgstr ""
 "Sie müssen für `%s' in der Sektion `%s' der Konfigurationsdatei eine "
 "positive Zahl angeben.\n"
 
-#: src/transport/plugin_transport_http_server.c:2765
+#: src/transport/plugin_transport_http_server.c:2753
 #, fuzzy, c-format
 msgid "Binding to IPv4 address %s\n"
 msgstr "Ungültiger Parameter: `%s'\n"
 
-#: src/transport/plugin_transport_http_server.c:2786
+#: src/transport/plugin_transport_http_server.c:2774
 #, fuzzy, c-format
 msgid "Specific IPv6 address `%s' in configuration file is invalid!\n"
 msgstr ""
 "Sie müssen für `%s' in der Sektion `%s' der Konfigurationsdatei eine "
 "positive Zahl angeben.\n"
 
-#: src/transport/plugin_transport_http_server.c:2796
+#: src/transport/plugin_transport_http_server.c:2784
 #, fuzzy, c-format
 msgid "Binding to IPv6 address %s\n"
 msgstr "Ungültiger Parameter: `%s'\n"
 
-#: src/transport/plugin_transport_http_server.c:2864
+#: src/transport/plugin_transport_http_server.c:2852
 #, fuzzy, c-format
 msgid "Notifying transport only about hostname `%s'\n"
 msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
@@ -6458,16 +7027,16 @@ msgstr ""
 #: src/transport/plugin_transport_tcp.c:923
 #: src/transport/plugin_transport_tcp.c:973
 #: src/transport/plugin_transport_tcp.c:1059
-#: src/transport/plugin_transport_tcp.c:1202
-#: src/transport/plugin_transport_tcp.c:1219
+#: src/transport/plugin_transport_tcp.c:1206
+#: src/transport/plugin_transport_tcp.c:1223
 #, fuzzy
 msgid "# bytes currently in TCP buffers"
 msgstr "# Bytes gesendet über TCP"
 
 #: src/transport/plugin_transport_tcp.c:841
 #: src/transport/plugin_transport_tcp.c:1030
-#: src/transport/plugin_transport_tcp.c:2009
-#: src/transport/plugin_transport_tcp.c:2690
+#: src/transport/plugin_transport_tcp.c:2015
+#: src/transport/plugin_transport_tcp.c:2696
 #, fuzzy
 msgid "# TCP sessions active"
 msgstr "# Sitzungsschlüssel akzeptiert"
@@ -6487,54 +7056,54 @@ msgstr "# Bytes des Typs %d übertragen"
 msgid "# bytes discarded by TCP (disconnect)"
 msgstr "# Bytes verworfen von TCP (ausgehend)"
 
-#: src/transport/plugin_transport_tcp.c:1176
+#: src/transport/plugin_transport_tcp.c:1180
 #, c-format
 msgid "Trying to send with invalid session %p\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:1413
-#: src/transport/plugin_transport_udp.c:1449
+#: src/transport/plugin_transport_tcp.c:1417
+#: src/transport/plugin_transport_udp.c:1440
 msgid "# requests to create session with invalid address"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:1530
+#: src/transport/plugin_transport_tcp.c:1534
 msgid "# transport-service disconnect requests for TCP"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2059
+#: src/transport/plugin_transport_tcp.c:2065
 #, fuzzy
 msgid "# TCP WELCOME messages received"
 msgstr "# verschlüsselter PONG Nachrichten empfangen"
 
-#: src/transport/plugin_transport_tcp.c:2242
+#: src/transport/plugin_transport_tcp.c:2248
 msgid "# bytes received via TCP"
 msgstr "# Bytes empfangen über TCP"
 
-#: src/transport/plugin_transport_tcp.c:2322
+#: src/transport/plugin_transport_tcp.c:2328
 msgid "# network-level TCP disconnect events"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2570 src/util/service.c:957
-#: src/util/service.c:963
+#: src/transport/plugin_transport_tcp.c:2576 src/util/service.c:589
+#: src/util/service.c:595
 #, c-format
 msgid "Require valid port number for service `%s' in configuration!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2584
+#: src/transport/plugin_transport_tcp.c:2590
 #, fuzzy
 msgid "Failed to start service.\n"
 msgstr "Fehler beim Starten der Collection.\n"
 
-#: src/transport/plugin_transport_tcp.c:2677
+#: src/transport/plugin_transport_tcp.c:2683
 #, fuzzy, c-format
 msgid "TCP transport listening on port %llu\n"
 msgstr "Der Transportdienst auf Port %d konnte nicht gestartet werden.\n"
 
-#: src/transport/plugin_transport_tcp.c:2681
+#: src/transport/plugin_transport_tcp.c:2687
 msgid "TCP transport not listening on any port (client only)\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2685
+#: src/transport/plugin_transport_tcp.c:2691
 #, c-format
 msgid "TCP transport advertises itself as being on port %llu\n"
 msgstr ""
@@ -6559,21 +7128,21 @@ msgstr ""
 msgid "Failed to set IPv4 broadcast option for broadcast socket on port %d\n"
 msgstr ""
 
-#: src/transport/plugin_transport_udp.c:1555
+#: src/transport/plugin_transport_udp.c:1550
 #, c-format
 msgid ""
 "Trying to create session for address of unexpected length %u (should be %u "
 "or %u)\n"
 msgstr ""
 
-#: src/transport/plugin_transport_udp.c:2590
+#: src/transport/plugin_transport_udp.c:2602
 #, c-format
 msgid ""
 "UDP could not transmit message to `%s': Network seems down, please check "
 "your network configuration\n"
 msgstr ""
 
-#: src/transport/plugin_transport_udp.c:2604
+#: src/transport/plugin_transport_udp.c:2616
 #, c-format
 msgid ""
 "UDP could not transmit message to `%s': Please check your network "
@@ -6581,27 +7150,27 @@ msgid ""
 "IPv6 address\n"
 msgstr ""
 
-#: src/transport/plugin_transport_udp.c:2905
+#: src/transport/plugin_transport_udp.c:2917
 #, fuzzy
 msgid "Failed to open UDP sockets\n"
 msgstr "Fehler beim Binden an UDP6 Port %d.\n"
 
-#: src/transport/plugin_transport_udp.c:3003
+#: src/transport/plugin_transport_udp.c:3015
 #, c-format
 msgid "Given `%s' option is out of range: %llu > %u\n"
 msgstr ""
 
-#: src/transport/plugin_transport_udp.c:3046
+#: src/transport/plugin_transport_udp.c:3058
 #, fuzzy, c-format
 msgid "Invalid IPv6 address: `%s'\n"
 msgstr "Ungültiger Parameter: `%s'\n"
 
-#: src/transport/plugin_transport_udp.c:3105
+#: src/transport/plugin_transport_udp.c:3117
 #, fuzzy
 msgid "Failed to create network sockets, plugin failed\n"
 msgstr "Namespace `%s' konnte nicht erstellt werden (existiert bereits?).\n"
 
-#: src/transport/plugin_transport_unix.c:1640
+#: src/transport/plugin_transport_unix.c:1627
 #, fuzzy
 msgid "Failed to open UNIX listen socket\n"
 msgstr "Datei wurde als `%s' gespeichert.\n"
@@ -6616,169 +7185,174 @@ msgid "# WLAN messages defragmented"
 msgstr "# defragmentierter Nachrichten"
 
 #: src/transport/plugin_transport_wlan.c:688
-#: src/transport/plugin_transport_wlan.c:756
-#: src/transport/plugin_transport_wlan.c:1899
+#: src/transport/plugin_transport_wlan.c:758
+#: src/transport/plugin_transport_wlan.c:1903
 #, fuzzy
 msgid "# WLAN sessions allocated"
 msgstr "# Sitzungsschlüssel akzeptiert"
 
-#: src/transport/plugin_transport_wlan.c:860
+#: src/transport/plugin_transport_wlan.c:863
 #, fuzzy
 msgid "# WLAN message fragments sent"
 msgstr "# fragmentierter Nachrichten"
 
-#: src/transport/plugin_transport_wlan.c:884
+#: src/transport/plugin_transport_wlan.c:887
 msgid "# WLAN messages pending (with fragmentation)"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:992
-#: src/transport/plugin_transport_wlan.c:1077
-#: src/transport/plugin_transport_wlan.c:1901
+#: src/transport/plugin_transport_wlan.c:995
+#: src/transport/plugin_transport_wlan.c:1080
+#: src/transport/plugin_transport_wlan.c:1905
 #, fuzzy
 msgid "# WLAN MAC endpoints allocated"
 msgstr "# Client Trace-Anfragen empfangen"
 
-#: src/transport/plugin_transport_wlan.c:1272
+#: src/transport/plugin_transport_wlan.c:1275
 #, fuzzy
 msgid "# HELLO messages received via WLAN"
 msgstr "# verschlüsselter PONG Nachrichten empfangen"
 
-#: src/transport/plugin_transport_wlan.c:1298
+#: src/transport/plugin_transport_wlan.c:1301
 #, fuzzy
 msgid "# fragments received via WLAN"
 msgstr "# verworfener Nachrichten"
 
-#: src/transport/plugin_transport_wlan.c:1308
+#: src/transport/plugin_transport_wlan.c:1311
 #, fuzzy
 msgid "# ACKs received via WLAN"
 msgstr "# Bytes empfangen über TCP"
 
-#: src/transport/plugin_transport_wlan.c:1365
+#: src/transport/plugin_transport_wlan.c:1368
 #, fuzzy
 msgid "# WLAN DATA messages discarded due to CRC32 error"
 msgstr "# defragmentierter Nachrichten"
 
-#: src/transport/plugin_transport_wlan.c:1485
+#: src/transport/plugin_transport_wlan.c:1489
 #, fuzzy
 msgid "# DATA messages received via WLAN"
 msgstr "# verschlüsselter PONG Nachrichten empfangen"
 
-#: src/transport/plugin_transport_wlan.c:1520
+#: src/transport/plugin_transport_wlan.c:1524
 #, fuzzy
 msgid "# WLAN DATA messages processed"
 msgstr "# verschlüsselter PONG Nachrichten empfangen"
 
-#: src/transport/plugin_transport_wlan.c:1583
+#: src/transport/plugin_transport_wlan.c:1587
 #, fuzzy
 msgid "# HELLO beacons sent via WLAN"
 msgstr "# Bytes gesendet über UDP"
 
-#: src/transport/plugin_transport_wlan.c:1696
+#: src/transport/plugin_transport_wlan.c:1700
 msgid "WLAN address with invalid size encountered\n"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:1880
+#: src/transport/plugin_transport_wlan.c:1884
 #, c-format
 msgid "Helper binary `%s' not SUID, cannot run WLAN transport\n"
 msgstr ""
 
-#: src/transport/transport_api.c:651
+#: src/transport/transport_api.c:647
 #, fuzzy, c-format
 msgid "Received unexpected message of type %u in %s:%u\n"
 msgstr "Es wurde eine unbekannte Testbed Nachricht des Typs %u empfangen.\n"
 
-#: src/transport/transport-testing.c:585
+#: src/transport/transport-testing.c:584
 #, fuzzy
 msgid "Failed to initialize testing library!\n"
 msgstr "SQLite Datenbank konnte nicht initialisiert werden.\n"
 
-#: src/util/bio.c:137 src/util/bio.c:145
+#: src/tun/regex.c:129
+#, c-format
+msgid "Bad mask: %d\n"
+msgstr ""
+
+#: src/util/bio.c:170 src/util/bio.c:178
 #, fuzzy, c-format
 msgid "Error reading `%s': %s"
 msgstr "Fehler beim Anlegen des Benutzers"
 
-#: src/util/bio.c:147
+#: src/util/bio.c:180
 #, fuzzy
 msgid "End of file"
 msgstr "Eine Konfigurationsdatei laden"
 
-#: src/util/bio.c:199
+#: src/util/bio.c:237
 #, c-format
 msgid "Error reading length of string `%s'"
 msgstr ""
 
-#: src/util/bio.c:209
+#: src/util/bio.c:247
 #, c-format
 msgid "String `%s' longer than allowed (%u > %u)"
 msgstr ""
 
-#: src/util/bio.c:254
+#: src/util/bio.c:293
 #, c-format
 msgid "Serialized metadata `%s' larger than allowed (%u>%u)"
 msgstr ""
 
-#: src/util/bio.c:268
+#: src/util/bio.c:307
 #, c-format
 msgid "Metadata `%s' failed to deserialize"
 msgstr ""
 
-#: src/util/client.c:261 src/util/client.c:839 src/util/service.c:993
+#: src/util/client.c:261 src/util/client.c:851 src/util/service.c:625
 #, c-format
 msgid "UNIXPATH `%s' too long, maximum length is %llu\n"
 msgstr ""
 
-#: src/util/client.c:265 src/util/client.c:843 src/util/service.c:997
+#: src/util/client.c:265 src/util/client.c:856 src/util/service.c:629
 #, fuzzy, c-format
 msgid "Using `%s' instead\n"
 msgstr "%s: Option `%s' ist mehrdeutig\n"
 
-#: src/util/client.c:357
+#: src/util/client.c:360
 #, c-format
 msgid ""
 "Could not determine valid hostname and port for service `%s' from "
 "configuration.\n"
 msgstr ""
 
-#: src/util/client.c:365
+#: src/util/client.c:368
 #, c-format
 msgid "Need a non-empty hostname for service `%s'.\n"
 msgstr ""
 
-#: src/util/client.c:981
+#: src/util/client.c:991
 #, fuzzy, c-format
 msgid "Could not connect to service `%s', configuration broken.\n"
 msgstr "Verbindung zu gnunetd konnte nicht hergestellt werden.\n"
 
-#: src/util/client.c:993
+#: src/util/client.c:1003
 #, fuzzy, c-format
 msgid "Failure to transmit request to service `%s'\n"
 msgstr "Fehler beim Senden einer `%s' Anfrage an den SMTP Server.\n"
 
-#: src/util/client.c:1259
+#: src/util/client.c:1274
 msgid "Could not submit request, not expecting to receive a response.\n"
 msgstr ""
 
-#: src/util/common_logging.c:256 src/util/common_logging.c:1033
+#: src/util/common_logging.c:254 src/util/common_logging.c:1039
 msgid "DEBUG"
 msgstr "DEBUG"
 
-#: src/util/common_logging.c:258 src/util/common_logging.c:1031
+#: src/util/common_logging.c:256 src/util/common_logging.c:1037
 msgid "INFO"
 msgstr "INFO"
 
-#: src/util/common_logging.c:260 src/util/common_logging.c:1029
+#: src/util/common_logging.c:258 src/util/common_logging.c:1035
 msgid "WARNING"
 msgstr "WARNUNG"
 
-#: src/util/common_logging.c:262 src/util/common_logging.c:1027
+#: src/util/common_logging.c:260 src/util/common_logging.c:1033
 msgid "ERROR"
 msgstr "FEHLER"
 
-#: src/util/common_logging.c:264 src/util/common_logging.c:1035
+#: src/util/common_logging.c:262 src/util/common_logging.c:1041
 msgid "NONE"
 msgstr ""
 
-#: src/util/common_logging.c:393
+#: src/util/common_logging.c:391
 #, fuzzy, c-format
 msgid "Failed to create or access directory for log file `%s'\n"
 msgstr "Konfigurationsdatei `%s' konnte nicht geparst werden.\n"
@@ -6788,28 +7362,28 @@ msgstr "Konfigurationsdatei `%s' konnte nicht geparst werden.\n"
 msgid "Message `%.*s' repeated %u times in the last %s\n"
 msgstr ""
 
-#: src/util/common_logging.c:1036
+#: src/util/common_logging.c:1042
 msgid "INVALID"
 msgstr ""
 
-#: src/util/common_logging.c:1138
+#: src/util/common_logging.c:1150
 #, fuzzy
 msgid "unknown address"
 msgstr "Unbekannter Fehler"
 
-#: src/util/common_logging.c:1177
+#: src/util/common_logging.c:1189
 #, fuzzy
 msgid "invalid address"
 msgstr "Ungültige Parameter: "
 
-#: src/util/common_logging.c:1195
+#: src/util/common_logging.c:1207
 #, 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:1216
+#: src/util/common_logging.c:1228
 #, fuzzy, c-format
 msgid ""
 "Configuration specifies invalid value for option `%s' in section `%s': %s\n"
@@ -6817,177 +7391,200 @@ msgstr ""
 "Die Konfigurationsdatei muss in der Sektion `%s' unter `%s' ein Verzeichnis "
 "angeben, in dem FS Daten gespeichert werden.\n"
 
-#: src/util/configuration.c:291
+#: src/util/configuration.c:288
 #, fuzzy, c-format
 msgid "Syntax error while deserializing in line %u\n"
 msgstr "Syntaxfehler in Konfigurationsdatei `%s' in Zeile %d.\n"
 
-#: src/util/configuration.c:984
+#: src/util/configuration.c:996
 #, c-format
 msgid ""
 "Configuration value '%s' for '%s' in section '%s' is not in set of legal "
 "choices\n"
 msgstr ""
 
-#: src/util/connection.c:424
+#: src/util/configuration.c:1065
+#, c-format
+msgid "Recursive expansion suspected, aborting $-expansion for term `%s'\n"
+msgstr ""
+
+#: src/util/configuration.c:1097
+#, fuzzy, c-format
+msgid "Missing closing `%s' in option `%s'\n"
+msgstr "Konfigurationsdatei `%s' wurde erzeugt.\n"
+
+#: src/util/configuration.c:1170
+#, c-format
+msgid ""
+"Failed to expand `%s' in `%s' as it is neither found in [PATHS] nor defined "
+"as an environmental variable\n"
+msgstr ""
+
+#: src/util/connection.c:423
 #, fuzzy, c-format
 msgid "Access denied to `%s'\n"
 msgstr "Zugriff verweigert für `%s' bei %s:%d.\n"
 
-#: src/util/connection.c:439
+#: src/util/connection.c:438
 #, c-format
 msgid "Accepting connection from `%s': %p\n"
 msgstr ""
 
-#: src/util/connection.c:554
+#: src/util/connection.c:553
 #, fuzzy, c-format
 msgid ""
 "Failed to establish TCP connection to `%s:%u', no further addresses to try.\n"
 msgstr "Fehler beim Aufbauen einer Verbindung mit gnunetd.\n"
 
-#: src/util/connection.c:752 src/util/connection.c:919
+#: src/util/connection.c:751 src/util/connection.c:909
 #, fuzzy, c-format
 msgid "Trying to connect to `%s' (%p)\n"
 msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
 
-#: src/util/connection.c:910
+#: src/util/connection.c:900
 #, fuzzy, c-format
 msgid "Attempt to connect to `%s' failed\n"
 msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
 
-#: src/util/container_bloomfilter.c:518
+#: src/util/container_bloomfilter.c:516
 #, c-format
 msgid ""
 "Size of file on disk is incorrect for this Bloom filter (want %llu, have "
 "%llu)\n"
 msgstr ""
 
-#: src/util/crypto_ecc.c:580 src/util/crypto_ecc.c:618
+#: src/util/crypto_ecc.c:940 src/util/crypto_ecc.c:978
+#: src/util/crypto_ecc.c:1096 src/util/crypto_ecc.c:1134
 #, fuzzy, c-format
 msgid "Could not acquire lock on file `%s': %s...\n"
 msgstr "PID konnte nicht in Datei `%s' geschrieben werden: %s.\n"
 
-#: src/util/crypto_ecc.c:585
+#: src/util/crypto_ecc.c:945 src/util/crypto_ecc.c:1101
 #, fuzzy
 msgid "Creating a new private key.  This may take a while.\n"
 msgstr "Ein neuer Hostkey wird erzeugt (dies kann eine Weile dauern).\n"
 
-#: src/util/crypto_ecc.c:622
+#: src/util/crypto_ecc.c:982 src/util/crypto_ecc.c:1138
 msgid "This may be ok if someone is currently generating a private key.\n"
 msgstr ""
 
-#: src/util/crypto_ecc.c:653
+#: src/util/crypto_ecc.c:1012 src/util/crypto_ecc.c:1168
 #, c-format
 msgid ""
 "When trying to read key file `%s' I found %u bytes but I need at least %u.\n"
 msgstr ""
 
-#: src/util/crypto_ecc.c:658
+#: src/util/crypto_ecc.c:1016 src/util/crypto_ecc.c:1172
 msgid "This may be ok if someone is currently generating a key.\n"
 msgstr ""
 
-#: src/util/crypto_ecc.c:741
+#: src/util/crypto_ecc.c:1254
 #, fuzzy
 msgid "Could not load peer's private key\n"
 msgstr "Konfigurationsdatei `%s' konnte nicht geparst werden.\n"
 
-#: src/util/crypto_ecc.c:803
+#: src/util/crypto_ecc.c:1343
 #, 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:883
+#: src/util/crypto_ecc.c:1393
+#, 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:1472
+#, 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:1534
 #, fuzzy, c-format
-msgid "ECC signature verification failed at %s:%d: %s\n"
+msgid "EdDSA signature verification failed at %s:%d: %s\n"
 msgstr "RSA Signaturüberprüfung fehlgeschlagen bei %s:%d: %s\n"
 
-#: src/util/crypto_random.c:281
+#: src/util/crypto_random.c:320
 #, c-format
 msgid "Starting `%s' process to generate entropy\n"
 msgstr ""
 
-#: src/util/crypto_random.c:312
+#: src/util/crypto_random.c:351
 #, c-format
 msgid "libgcrypt has not the expected version (version %s is required).\n"
 msgstr ""
 "libgcrypt hat nicht die erwartete Version (Version %s wird vorausgesetzt).\n"
 
-#: src/util/disk.c:1150
+#: src/util/disk.c:1185
 #, fuzzy, c-format
 msgid "Expected `%s' to be a directory!\n"
 msgstr "`%s' erwartet, dass `%s' ein Verzeichnis ist!\n"
 
-#: src/util/disk.c:1507 src/util/service.c:1674
+#: src/util/disk.c:1543 src/util/service.c:1315
 #, fuzzy, c-format
 msgid "Cannot obtain information about user `%s': %s\n"
 msgstr "Fehler beim Speichern der Konfigurationsdatei: `%s': %s.\n"
 
-#: src/util/disk.c:1954
-#, fuzzy, c-format
-msgid "No `%s' specified for service `%s' in configuration.\n"
-msgstr "In der Konfigurationsdatei wurden keine Anwendungen definiert!\n"
-
-#: src/util/getopt.c:570
+#: src/util/getopt.c:568
 #, c-format
 msgid "%s: option `%s' is ambiguous\n"
 msgstr "%s: Option `%s' ist mehrdeutig\n"
 
-#: src/util/getopt.c:594
+#: src/util/getopt.c:592
 #, c-format
 msgid "%s: option `--%s' does not allow an argument\n"
 msgstr "%s: Option '--%s' erlaubt keinen Parameter\n"
 
-#: src/util/getopt.c:599
+#: src/util/getopt.c:597
 #, c-format
 msgid "%s: option `%c%s' does not allow an argument\n"
 msgstr "%s: Option '%c%s' erlaubt keinen Parameter\n"
 
-#: src/util/getopt.c:616 src/util/getopt.c:783
+#: src/util/getopt.c:614 src/util/getopt.c:781
 #, c-format
 msgid "%s: option `%s' requires an argument\n"
 msgstr "%s: Option `%s' benötigt einen Parameter\n"
 
-#: src/util/getopt.c:645
+#: src/util/getopt.c:643
 #, c-format
 msgid "%s: unrecognized option `--%s'\n"
 msgstr "%s: unbekannte Option '--%s'\n"
 
-#: src/util/getopt.c:649
+#: src/util/getopt.c:647
 #, c-format
 msgid "%s: unrecognized option `%c%s'\n"
 msgstr "%s: unbekannte Option '%c%s'\n"
 
-#: src/util/getopt.c:674
+#: src/util/getopt.c:672
 #, c-format
 msgid "%s: illegal option -- %c\n"
 msgstr "%s: unerlaubte Option -- %c\n"
 
-#: src/util/getopt.c:676
+#: src/util/getopt.c:674
 #, c-format
 msgid "%s: invalid option -- %c\n"
 msgstr "%s: ungültige Option -- %c\n"
 
-#: src/util/getopt.c:704 src/util/getopt.c:831
+#: src/util/getopt.c:702 src/util/getopt.c:829
 #, c-format
 msgid "%s: option requires an argument -- %c\n"
 msgstr "%s: Option benötigt einen Parameter -- %c\n"
 
-#: src/util/getopt.c:752
+#: src/util/getopt.c:750
 #, c-format
 msgid "%s: option `-W %s' is ambiguous\n"
 msgstr "%s: Option '-W %s' ist mehrdeutig\n"
 
-#: src/util/getopt.c:770
+#: src/util/getopt.c:768
 #, c-format
 msgid "%s: option `-W %s' does not allow an argument\n"
 msgstr "%s: Option '-W %s' erlaubt keinen Parameter\n"
 
-#: src/util/getopt.c:935
+#: src/util/getopt.c:933
 #, fuzzy, c-format
 msgid "Use %s to get a list of options.\n"
 msgstr "Verwenden Sie --help, um eine Liste der Optionen zu erhalten.\n"
 
-#: src/util/getopt_helpers.c:86
+#: src/util/getopt_helpers.c:84
 #, c-format
 msgid ""
 "Arguments mandatory for long options are also mandatory for short options.\n"
@@ -6995,12 +7592,12 @@ msgstr ""
 "Parameter, die für lange Optionen zwingend sind, sind auch für kurze "
 "Optionen zwingend.\n"
 
-#: src/util/getopt_helpers.c:270 src/util/getopt_helpers.c:328
+#: src/util/getopt_helpers.c:268 src/util/getopt_helpers.c:326
 #, c-format
 msgid "You must pass a number to the `%s' option.\n"
 msgstr "Sie müssen für die Option `%s' zusätzlich eine Zahl angeben.\n"
 
-#: src/util/getopt_helpers.c:300
+#: src/util/getopt_helpers.c:298
 #, fuzzy, c-format
 msgid "You must pass relative time to the `%s' option.\n"
 msgstr "Sie müssen eine positive Zahl zu der Option `%s' übergeben.\n"
@@ -7068,24 +7665,23 @@ msgid ""
 "Error, %u keys not generated\n"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:118
-#, c-format
+#: src/util/gnunet-ecc.c:119
 msgid "No hostkey file specified on command line\n"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:163
+#: src/util/gnunet-ecc.c:168
 msgid "create COUNT public-private key pairs (for testing)"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:166
+#: src/util/gnunet-ecc.c:171
 msgid "print the public key in ASCII format"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:169
+#: src/util/gnunet-ecc.c:174
 msgid "print the hash of the public key in ASCII format"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:180
+#: src/util/gnunet-ecc.c:185
 msgid "Manipulate GNUnet private ECC key files"
 msgstr ""
 
@@ -7132,76 +7728,76 @@ msgstr ""
 msgid "Perform default-actions for GNUnet URIs"
 msgstr ""
 
-#: src/util/helper.c:330
+#: src/util/helper.c:338
 #, fuzzy, c-format
 msgid "Error reading from `%s': %s\n"
 msgstr "Fehler beim Anlegen des Benutzers"
 
-#: src/util/helper.c:375
+#: src/util/helper.c:383
 #, fuzzy, c-format
 msgid "Failed to parse inbound message from helper `%s'\n"
 msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
 
-#: src/util/helper.c:572
+#: src/util/helper.c:609
 #, fuzzy, c-format
 msgid "Error writing to `%s': %s\n"
 msgstr "Fehler beim Anlegen des Benutzers"
 
-#: src/util/network.c:132
+#: src/util/network.c:134
 #, c-format
 msgid "Unable to shorten unix path `%s' while keeping name unique\n"
 msgstr ""
 
-#: src/util/network.c:1370
+#: src/util/network.c:1397
 #, c-format
 msgid ""
 "Fatal internal logic error, process hangs in `%s' (abort with CTRL-C)!\n"
 msgstr ""
 
-#: src/util/os_installation.c:423
+#: src/util/os_installation.c:421
 #, c-format
 msgid ""
 "Could not determine installation path for %s.  Set `%s' environment "
 "variable.\n"
 msgstr ""
 
-#: src/util/os_installation.c:709
+#: src/util/os_installation.c:710
 #, fuzzy, c-format
 msgid "Could not find binary `%s' in PATH!\n"
 msgstr "Knoten `%s' konnte nicht in der Routing Tabelle gefunden werden!\n"
 
-#: src/util/os_installation.c:769
+#: src/util/os_installation.c:770
 #, fuzzy, c-format
 msgid "CreateProcess failed for binary %s (%d).\n"
 msgstr "`%s' fehlgeschlagen für Laufwerk %s: %u\n"
 
-#: src/util/os_installation.c:779
+#: src/util/os_installation.c:780
 #, c-format
 msgid "GetExitCodeProcess failed for binary %s (%d).\n"
 msgstr ""
 
-#: src/util/plugin.c:89
+#: src/util/plugin.c:87
 #, c-format
 msgid "Initialization of plugin mechanism failed: %s!\n"
 msgstr "Initialisierung des Plugin Mechanismuses fehlgeschlagen: %s!\n"
 
-#: src/util/plugin.c:146
+#: src/util/plugin.c:144
 #, fuzzy, c-format
 msgid "`%s' failed to resolve method '%s' with error: %s\n"
 msgstr ""
 "`%s' konnte die Methode '%s%s' nicht auflösen. Ort: %s:%d. Fehler: %s\n"
 
-#: src/util/plugin.c:219
+#: src/util/plugin.c:217
 #, fuzzy, c-format
 msgid "`%s' failed for library `%s' with error: %s\n"
 msgstr "`%s' fehlgeschlagen für die Bibliothek `%s'. Ort: %s:%d. Fehler: %s\n"
 
-#: src/util/plugin.c:349
+#: src/util/plugin.c:347
 #, fuzzy
 msgid "Could not determine plugin installation path.\n"
 msgstr "Öffentliche IP-Adresse konnte nicht ermittelt werden.\n"
 
-#: src/util/program.c:254 src/util/service.c:1796
+#: src/util/program.c:262 src/util/service.c:1452
 #, fuzzy, c-format
 msgid "Could not access configuration file `%s'\n"
 msgstr "Konfigurationsdatei `%s' konnte nicht geparst werden.\n"
@@ -7211,7 +7807,7 @@ msgstr "Konfigurationsdatei `%s' konnte nicht geparst werden.\n"
 msgid "Must specify `%s' for `%s' in configuration!\n"
 msgstr "Versuche, Datei `%s' für MySQL Konfiguration zu verwenden.\n"
 
-#: src/util/resolver_api.c:217
+#: src/util/resolver_api.c:216
 #, fuzzy, c-format
 msgid ""
 "Must specify `%s' or numeric IP address for `%s' of `%s' in configuration!\n"
@@ -7229,451 +7825,530 @@ msgstr "GNUnet verwendet nun die IP-Adresse %u.%u.%u.%u.\n"
 msgid "Timeout trying to resolve hostname `%s'.\n"
 msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
 
-#: src/util/resolver_api.c:886
+#: src/util/resolver_api.c:891
 #, fuzzy, c-format
 msgid "Could not resolve our FQDN : %s\n"
 msgstr "`%s' konnte nicht aufgelöst werden: %s\n"
 
-#: src/util/scheduler.c:802
+#: src/util/scheduler.c:804
 msgid "Looks like we're busy waiting...\n"
 msgstr ""
 
-#: src/util/scheduler.c:933
+#: src/util/scheduler.c:938
 #, c-format
 msgid "Attempt to cancel dead task %llu!\n"
 msgstr ""
 
-#: src/util/server.c:482
+#: src/util/server.c:484
 #, fuzzy, c-format
 msgid "`%s' failed for port %d (%s).\n"
 msgstr "`%s' fehlgeschlagen für Laufwerk %s: %u\n"
 
-#: src/util/server.c:491
+#: src/util/server.c:493
 #, fuzzy, c-format
 msgid "`%s' failed for port %d (%s): address already in use\n"
 msgstr "`%s' schlug fehl für Port %d: %s. Läuft gnunetd bereits?\n"
 
-#: src/util/server.c:502
+#: src/util/server.c:499
 #, fuzzy, c-format
-msgid "`%s' failed for `%.*s': address already in use\n"
+msgid "`%s' failed for `%s': address already in use\n"
 msgstr "`%s' schlug fehl für Port %d: %s. Läuft gnunetd bereits?\n"
 
-#: src/util/server.c:894
+#: src/util/server.c:892
 #, c-format
 msgid ""
 "Processing code for message of type %u did not call "
 "`GNUNET_SERVER_receive_done' after %s\n"
 msgstr ""
 
-#: src/util/service.c:151 src/util/service.c:177 src/util/service.c:220
-#: src/util/service.c:241 src/util/service.c:248
-#, c-format
-msgid "Invalid format for IP: `%s'\n"
-msgstr "Ungültiges Format für IP: `%s'\n"
-
-#: src/util/service.c:204
-#, c-format
-msgid "Invalid network notation ('/%d' is not legal in IPv4 CIDR)."
-msgstr "Ungültige Netzwerk Notation ('/%d ist nicht gültig in IPv4 CIDR)."
-
-#: src/util/service.c:297
-#, c-format
-msgid "Invalid network notation (does not end with ';': `%s')\n"
-msgstr "Ungültige Netzwerk Notation (endet nicht mit ';': `%s')\n"
-
-#: src/util/service.c:329
-#, fuzzy, c-format
-msgid "Wrong format `%s' for netmask\n"
-msgstr "Falsches Format `%s' für Netzmaske: %s\n"
-
-#: src/util/service.c:359
-#, fuzzy, c-format
-msgid "Wrong format `%s' for network\n"
-msgstr "Falsches Format `%s' für Netzwerk: %s\n"
-
-#: src/util/service.c:716
-#, c-format
-msgid "Access denied to UID %d / GID %d\n"
-msgstr ""
-
-#: src/util/service.c:721
+#: src/util/service.c:362
 #, fuzzy, c-format
 msgid "Unknown address family %d\n"
 msgstr "Unbekannte Operation `%s'\n"
 
-#: src/util/service.c:728
+#: src/util/service.c:369
 #, c-format
 msgid "Access from `%s' denied to service `%s'\n"
 msgstr ""
 
-#: src/util/service.c:783
+#: src/util/service.c:424
 #, c-format
 msgid "Could not parse IPv4 network specification `%s' for `%s:%s'\n"
 msgstr ""
 
-#: src/util/service.c:820
+#: src/util/service.c:461
 #, c-format
 msgid "Could not parse IPv6 network specification `%s' for `%s:%s'\n"
 msgstr ""
 
-#: src/util/service.c:938
+#: src/util/service.c:570
 #, c-format
 msgid ""
 "Disabling IPv6 support for service `%s', failed to create IPv6 socket: %s\n"
 msgstr ""
 
-#: src/util/service.c:1016
+#: src/util/service.c:651
 #, c-format
 msgid ""
 "Disabling UNIX domain socket support for service `%s', failed to create UNIX "
 "domain socket: %s\n"
 msgstr ""
 
-#: src/util/service.c:1033
+#: src/util/service.c:667
 #, c-format
 msgid "Have neither PORT nor UNIXPATH for service `%s', but one is required\n"
 msgstr ""
 
-#: src/util/service.c:1267
+#: src/util/service.c:901
 msgid "Could not access a pre-bound socket, will try to bind myself\n"
 msgstr ""
 
-#: src/util/service.c:1316 src/util/service.c:1334
+#: src/util/service.c:950 src/util/service.c:968
 #, c-format
 msgid "Specified value for `%s' of service `%s' is invalid\n"
 msgstr ""
 
-#: src/util/service.c:1359
+#: src/util/service.c:993
 #, c-format
 msgid "Could not access pre-bound socket %u, will try to bind myself\n"
 msgstr ""
 
-#: src/util/service.c:1530
+#: src/util/service.c:1163
 #, fuzzy, c-format
 msgid "Failed to start `%s' at `%s'\n"
 msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
 
-#: src/util/service.c:1563
+#: src/util/service.c:1204
 #, fuzzy, c-format
 msgid "Service `%s' runs at %s\n"
 msgstr "Knoten `%s' mit Vertrauen %8u und Adresse `%s'\n"
 
-#: src/util/service.c:1612
+#: src/util/service.c:1253
 msgid "Service process failed to initialize\n"
 msgstr ""
 
-#: src/util/service.c:1616
+#: src/util/service.c:1257
 msgid "Service process could not initialize server function\n"
 msgstr ""
 
-#: src/util/service.c:1620
+#: src/util/service.c:1261
 msgid "Service process failed to report status\n"
 msgstr ""
 
-#: src/util/service.c:1675
+#: src/util/service.c:1316
 msgid "No such user"
 msgstr ""
 
-#: src/util/service.c:1688
+#: src/util/service.c:1329
 #, c-format
 msgid "Cannot change user/group to `%s': %s\n"
 msgstr "Benutzer/Gruppe kann nicht zu `%s' gewechselt werden: %s\n"
 
-#: src/util/service.c:1754
+#: src/util/service.c:1399
 msgid "do daemonize (detach from terminal)"
 msgstr ""
 
-#: src/util/signal.c:80
+#: src/util/signal.c:79
 #, fuzzy, c-format
 msgid "signal (%d, %p) returned %d.\n"
 msgstr "Aufruf von `%s' gibt %d zurück.\n"
 
-#: src/util/strings.c:146
+#: src/util/strings.c:145
 msgid "b"
 msgstr "b"
 
-#: src/util/strings.c:429
+#: src/util/strings.c:444
 #, c-format
 msgid "Character sets requested were `%s'->`%s'\n"
 msgstr ""
 
-#: src/util/strings.c:544
+#: src/util/strings.c:572
 msgid "Failed to expand `$HOME': environment variable `HOME' not set"
 msgstr ""
 
-#: src/util/strings.c:641
+#: src/util/strings.c:669
 msgid "µs"
 msgstr ""
 
-#: src/util/strings.c:645
+#: src/util/strings.c:673
 msgid "forever"
 msgstr ""
 
-#: src/util/strings.c:647
+#: src/util/strings.c:675
 msgid "0 ms"
 msgstr ""
 
-#: src/util/strings.c:653
+#: src/util/strings.c:681
 msgid "ms"
 msgstr "ms"
 
-#: src/util/strings.c:659
+#: src/util/strings.c:687
 msgid "s"
 msgstr "s"
 
-#: src/util/strings.c:665
+#: src/util/strings.c:693
 msgid "m"
 msgstr "m"
 
-#: src/util/strings.c:671
+#: src/util/strings.c:699
 msgid "h"
 msgstr "h"
 
-#: src/util/strings.c:678
+#: src/util/strings.c:706
 #, fuzzy
 msgid "day"
 msgstr " Tage"
 
-#: src/util/strings.c:680
+#: src/util/strings.c:708
 #, fuzzy
 msgid "days"
 msgstr " Tage"
 
-#: src/util/strings.c:708
+#: src/util/strings.c:737
 msgid "end of time"
 msgstr ""
 
-#: src/util/strings.c:1109
+#: src/util/strings.c:1141
 msgid "IPv6 address did not start with `['\n"
 msgstr ""
 
-#: src/util/strings.c:1117
+#: src/util/strings.c:1149
 msgid "IPv6 address did contain ':' to separate port number\n"
 msgstr ""
 
-#: src/util/strings.c:1123
+#: src/util/strings.c:1155
 msgid "IPv6 address did contain ']' before ':' to separate port number\n"
 msgstr ""
 
-#: src/util/strings.c:1130
+#: src/util/strings.c:1162
 msgid "IPv6 address did contain a valid port number after the last ':'\n"
 msgstr ""
 
-#: src/util/strings.c:1139
+#: src/util/strings.c:1171
 #, fuzzy, c-format
 msgid "Invalid IPv6 address `%s': %s\n"
 msgstr "Ungültiger Parameter: `%s'\n"
 
-#: src/vpn/gnunet-service-vpn.c:523 src/vpn/gnunet-service-vpn.c:1128
+#: src/util/strings.c:1377 src/util/strings.c:1393
+msgid "Port not in range\n"
+msgstr ""
+
+#: src/util/strings.c:1402
+#, fuzzy, c-format
+msgid "Malformed port policy `%s'\n"
+msgstr "Der Transportdienst auf Port %d konnte nicht gestartet werden.\n"
+
+#: src/util/strings.c:1486 src/util/strings.c:1517 src/util/strings.c:1565
+#: src/util/strings.c:1586
+#, c-format
+msgid "Invalid format for IP: `%s'\n"
+msgstr "Ungültiges Format für IP: `%s'\n"
+
+#: src/util/strings.c:1543
+#, c-format
+msgid "Invalid network notation ('/%d' is not legal in IPv4 CIDR)."
+msgstr "Ungültige Netzwerk Notation ('/%d ist nicht gültig in IPv4 CIDR)."
+
+#: src/util/strings.c:1595
+#, fuzzy, c-format
+msgid "Invalid format: `%s'\n"
+msgstr "Ungültiger Parameter: `%s'\n"
+
+#: src/util/strings.c:1647
+#, c-format
+msgid "Invalid network notation (does not end with ';': `%s')\n"
+msgstr "Ungültige Netzwerk Notation (endet nicht mit ';': `%s')\n"
+
+#: src/util/strings.c:1697
+#, fuzzy, c-format
+msgid "Wrong format `%s' for netmask\n"
+msgstr "Falsches Format `%s' für Netzmaske: %s\n"
+
+#: src/util/strings.c:1728
+#, fuzzy, c-format
+msgid "Wrong format `%s' for network\n"
+msgstr "Falsches Format `%s' für Netzwerk: %s\n"
+
+#: src/vpn/gnunet-service-vpn.c:550 src/vpn/gnunet-service-vpn.c:1088
 #, fuzzy
 msgid "# Active tunnels"
 msgstr "GNUnet Konfiguration"
 
-#: src/vpn/gnunet-service-vpn.c:622 src/vpn/gnunet-service-vpn.c:661
-#, fuzzy
-msgid "# peers connected to mesh tunnels"
-msgstr "# verbundener Knoten"
-
-#: src/vpn/gnunet-service-vpn.c:712
+#: src/vpn/gnunet-service-vpn.c:642
 #, fuzzy
 msgid "# Bytes given to mesh for transmission"
 msgstr "# PING Nachrichten erstellt"
 
-#: src/vpn/gnunet-service-vpn.c:750
+#: src/vpn/gnunet-service-vpn.c:680
 #, fuzzy
 msgid "# Bytes dropped in mesh queue (overflow)"
 msgstr "# Bytes verworfen von UDP (outgoing)"
 
-#: src/vpn/gnunet-service-vpn.c:814
+#: src/vpn/gnunet-service-vpn.c:754
 #, fuzzy
 msgid "# Mesh tunnels created"
 msgstr "# dht Anfragen weitergeleitet"
 
-#: src/vpn/gnunet-service-vpn.c:839
+#: src/vpn/gnunet-service-vpn.c:786
 #, fuzzy
 msgid "Failed to setup mesh tunnel!\n"
 msgstr "Statistiken über den Netzwerkverkehr konnten nicht ermittelt werden.\n"
 
-#: src/vpn/gnunet-service-vpn.c:1032
+#: src/vpn/gnunet-service-vpn.c:980
 #, c-format
 msgid "Protocol %u not supported, dropping\n"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:1348
+#: src/vpn/gnunet-service-vpn.c:1307
 msgid "# ICMPv4 packets dropped (not allowed)"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:1369
+#: src/vpn/gnunet-service-vpn.c:1328
 msgid "# ICMPv6 packets dropped (not allowed)"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:1574
+#: src/vpn/gnunet-service-vpn.c:1533
 #, fuzzy
 msgid "# Packets received from TUN interface"
 msgstr "Empfangene Client-Nachricht ist ungültig.\n"
 
-#: src/vpn/gnunet-service-vpn.c:1612 src/vpn/gnunet-service-vpn.c:1653
+#: src/vpn/gnunet-service-vpn.c:1566 src/vpn/gnunet-service-vpn.c:1602
 #, c-format
 msgid "Packet received for unmapped destination `%s' (dropping it)\n"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:1663
+#: src/vpn/gnunet-service-vpn.c:1612
 msgid "Received IPv4 packet with options (dropping it)\n"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:1677
+#: src/vpn/gnunet-service-vpn.c:1626
 #, c-format
 msgid "Received packet of unknown protocol %d from TUN (dropping it)\n"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:1759
+#: src/vpn/gnunet-service-vpn.c:1708
 #, fuzzy
 msgid "# ICMP packets received from mesh"
 msgstr "Empfangene Client-Nachricht ist ungültig.\n"
 
-#: src/vpn/gnunet-service-vpn.c:2098
+#: src/vpn/gnunet-service-vpn.c:2047
 #, fuzzy
 msgid "# UDP packets received from mesh"
 msgstr "Empfangene Client-Nachricht ist ungültig.\n"
 
-#: src/vpn/gnunet-service-vpn.c:2253
+#: src/vpn/gnunet-service-vpn.c:2202
 #, fuzzy
 msgid "# TCP packets received from mesh"
 msgstr "Empfangene Client-Nachricht ist ungültig.\n"
 
-#: src/vpn/gnunet-service-vpn.c:2404
+#: src/vpn/gnunet-service-vpn.c:2353
 msgid "Failed to find unallocated IPv4 address in VPN's range\n"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:2459
+#: src/vpn/gnunet-service-vpn.c:2408
 #, 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:2498 src/vpn/gnunet-service-vpn.c:2711
+#: src/vpn/gnunet-service-vpn.c:2449 src/vpn/gnunet-service-vpn.c:2665
 #, fuzzy
 msgid "# Active destinations"
 msgstr "GNUnet Konfiguration"
 
-#: src/vpn/gnunet-service-vpn.c:2784
+#: src/vpn/gnunet-service-vpn.c:2717
 msgid "Failed to allocate IP address for new destination\n"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:3112
+#: src/vpn/gnunet-service-vpn.c:2984
 #, fuzzy
 msgid "Must specify valid IPv6 address"
 msgstr "`%s' ist nicht verfügbar."
 
-#: src/vpn/gnunet-service-vpn.c:3133
+#: src/vpn/gnunet-service-vpn.c:3008
 msgid "Must specify valid IPv6 mask"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:3141
+#: src/vpn/gnunet-service-vpn.c:3016
 msgid "IPv6 support disabled as this system does not support IPv6\n"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:3153
+#: src/vpn/gnunet-service-vpn.c:3029
 #, fuzzy
 msgid "Must specify valid IPv4 address"
 msgstr "`%s' ist nicht verfügbar."
 
-#: src/vpn/gnunet-service-vpn.c:3164
+#: src/vpn/gnunet-service-vpn.c:3042
 msgid "Must specify valid IPv4 mask"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:3173
+#: src/vpn/gnunet-service-vpn.c:3052
 msgid "IPv4 support disabled as this system does not support IPv4\n"
 msgstr ""
 
-#: src/vpn/gnunet-vpn.c:151
+#: src/vpn/gnunet-vpn.c:146
 #, fuzzy
 msgid "Error creating tunnel\n"
 msgstr "Hostkey wurde erfolgreich erzeugt.\n"
 
-#: src/vpn/gnunet-vpn.c:194 src/vpn/gnunet-vpn.c:225
+#: src/vpn/gnunet-vpn.c:189 src/vpn/gnunet-vpn.c:220
 #, fuzzy, c-format
 msgid "Option `%s' makes no sense with option `%s'.\n"
 msgstr "Option `%s' macht keinen Sinn ohne die Option `%s'.\n"
 
-#: src/vpn/gnunet-vpn.c:207
+#: src/vpn/gnunet-vpn.c:202
 #, fuzzy, c-format
 msgid "Option `%s' or `%s' is required.\n"
 msgstr "%s: Option `%s' ist mehrdeutig\n"
 
-#: src/vpn/gnunet-vpn.c:219
+#: src/vpn/gnunet-vpn.c:214
 #, fuzzy, c-format
 msgid "Option `%s' or `%s' is required when using option `%s'.\n"
 msgstr "Option `%s' macht keinen Sinn ohne die Option `%s'.\n"
 
-#: src/vpn/gnunet-vpn.c:237
+#: src/vpn/gnunet-vpn.c:233
 #, fuzzy, c-format
 msgid "`%s' is not a valid peer identifier.\n"
 msgstr "`%s' ist nicht verfügbar."
 
-#: src/vpn/gnunet-vpn.c:259
+#: src/vpn/gnunet-vpn.c:254
 #, fuzzy, c-format
 msgid "`%s' is not a valid IP address.\n"
 msgstr "`%s' ist nicht verfügbar."
 
-#: src/vpn/gnunet-vpn.c:295
+#: src/vpn/gnunet-vpn.c:289
 msgid "request that result should be an IPv4 address"
 msgstr ""
 
-#: src/vpn/gnunet-vpn.c:298
+#: src/vpn/gnunet-vpn.c:292
 msgid "request that result should be an IPv6 address"
 msgstr ""
 
-#: src/vpn/gnunet-vpn.c:301
-msgid "print IP address only after mesh tunnel has been created"
-msgstr ""
-
-#: src/vpn/gnunet-vpn.c:304
+#: src/vpn/gnunet-vpn.c:295
 msgid "how long should the mapping be valid for new tunnels?"
 msgstr ""
 
-#: src/vpn/gnunet-vpn.c:307
+#: src/vpn/gnunet-vpn.c:298
 msgid "destination IP for the tunnel"
 msgstr ""
 
-#: src/vpn/gnunet-vpn.c:310
+#: src/vpn/gnunet-vpn.c:301
 msgid "peer offering the service we would like to access"
 msgstr ""
 
-#: src/vpn/gnunet-vpn.c:313
+#: src/vpn/gnunet-vpn.c:304
 msgid "name of the service we would like to access"
 msgstr ""
 
-#: src/vpn/gnunet-vpn.c:316
+#: src/vpn/gnunet-vpn.c:307
 #, fuzzy
 msgid "service is offered via TCP"
 msgstr "# Bytes empfangen über TCP"
 
-#: src/vpn/gnunet-vpn.c:319
+#: src/vpn/gnunet-vpn.c:310
 #, fuzzy
 msgid "service is offered via UDP"
 msgstr "# Bytes empfangen über UDP"
 
-#: src/vpn/gnunet-vpn.c:331
+#: src/vpn/gnunet-vpn.c:322
 msgid "Setup tunnels via VPN."
 msgstr ""
 
-#: src/include/gnunet_common.h:618 src/include/gnunet_common.h:625
-#: src/include/gnunet_common.h:633
+#: src/include/gnunet_common.h:566 src/include/gnunet_common.h:573
+#: src/include/gnunet_common.h:581
 #, fuzzy, c-format
 msgid "Assertion failed at %s:%d.\n"
 msgstr "Absicherung fehlgeschlagen bei %s:%d.\n"
 
-#: src/include/gnunet_common.h:645
+#: src/include/gnunet_common.h:593
 #, fuzzy, c-format
 msgid "External protocol violation detected at %s:%d.\n"
 msgstr "Absicherung fehlgeschlagen bei %s:%d.\n"
 
-#: src/include/gnunet_common.h:672 src/include/gnunet_common.h:681
+#: src/include/gnunet_common.h:620 src/include/gnunet_common.h:629
 #, 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 "Loading block plugin `%s'\n"
+#~ msgstr "Teste Transport(e) %s\n"
+
+#, fuzzy
+#~ msgid "Invalid value `%s'\n"
+#~ msgstr "Ungültiger Parameter: `%s'\n"
+
+#, fuzzy
+#~ msgid "Found issuer for public key `%s'\n"
+#~ msgstr "Teste Transport(e) %s\n"
+
+#, fuzzy
+#~ msgid "No issuer for public key `%s'\n"
+#~ msgstr "Dienst `%s' konnte nicht ordentlich entladen werden!\n"
+
+#, fuzzy
+#~ msgid "Invalid work requirement for NSE service. Exiting.\n"
+#~ msgstr "Ungültige Parameter. Abbruch.\n"
+
+#, fuzzy
+#~ msgid "Failed to get slave counters!\n"
+#~ msgstr ""
+#~ "Statistiken über den Netzwerkverkehr konnten nicht ermittelt werden.\n"
+
+#, fuzzy
+#~ msgid "Could not translate remote public key to sexpression!\n"
+#~ msgstr "Die öffentliche IPv6-Adresse konnte nicht ermittelt werden.\n"
+
+#, fuzzy
+#~ msgid ""
+#~ "Could not translate E[a%d] to MPI!\n"
+#~ "%s/%s\n"
+#~ msgstr ""
+#~ "Es konnte keine IP für das Gerät `%s' unter Verwendung von `%s' ermittelt "
+#~ "werden.\n"
+
+#, fuzzy
+#~ msgid "Job command file not given. Exiting\n"
+#~ msgstr "Konfigurationsdatei FILENAME verwenden"
+
+#, fuzzy
+#~ msgid "Error while decoding key %u\n"
+#~ msgstr "Fehler beim Download: %s\n"
+
+#, fuzzy
+#~ msgid "Could not read friends list `%s'\n"
+#~ msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
+
+#, fuzzy
+#~ msgid "Failed to read friends list from `%s': out of memory\n"
+#~ msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
+
+#~ msgid "Failed to read friends list from `%s'\n"
+#~ msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
+
+#, fuzzy
+#~ msgid ""
+#~ "Syntax error in topology specification at offset %llu, skipping bytes.\n"
+#~ msgstr "Syntaxfehler in Topolgieangabe, Bytes werden übersprungen.\n"
+
+#, fuzzy
+#~ msgid ""
+#~ "Syntax error in topology specification at offset %llu, skipping bytes `"
+#~ "%s'.\n"
+#~ msgstr "Syntaxfehler in Topologieangabe, überspringe Bytes `%s'.\n"
+
+#, fuzzy
+#~ msgid "ECC signature verification failed at %s:%d: %s\n"
+#~ msgstr "RSA Signaturüberprüfung fehlgeschlagen bei %s:%d: %s\n"
+
+#, fuzzy
+#~ msgid "No `%s' specified for service `%s' in configuration.\n"
+#~ msgstr "In der Konfigurationsdatei wurden keine Anwendungen definiert!\n"
+
+#, fuzzy
+#~ msgid "# peers connected to mesh tunnels"
+#~ msgstr "# verbundener Knoten"
+
+#, fuzzy
 #~ msgid "Failed to parse metadata about pseudonym from file `%s': %s\n"
 #~ msgstr "Fehler beim Parsen der Gerätedaten von `%s' bei %s:%d.\n"
 
@@ -7747,20 +8422,12 @@ msgstr "`%s' schlug bei Datei `%s' fehl. Ort: %s:%d. Fehler: %s\n"
 #~ msgstr "Fehler beim Aktualisieren der Daten des Moduls `%s'\n"
 
 #, fuzzy
-#~ msgid "Failed to read private key for namespace `%s'\n"
-#~ msgstr "Fehler beim Aktualisieren der Daten des Moduls `%s'\n"
-
-#, fuzzy
 #~ msgid "Failed to read namespace private key file `%s', deleting it!\n"
 #~ msgstr ""
 #~ "Der Eintrag konnte dem Namespace `%s' nicht hinzugefügt werden (existiert "
 #~ "er?)\n"
 
 #, fuzzy
-#~ msgid "ECDSA signature verification failed at %s:%d: %s\n"
-#~ msgstr "RSA Signaturüberprüfung fehlgeschlagen bei %s:%d: %s\n"
-
-#, fuzzy
 #~ msgid "print names of local namespaces"
 #~ msgstr "das Rating eines Namespaces setzen"
 
@@ -7866,10 +8533,6 @@ msgstr "`%s' schlug bei Datei `%s' fehl. Ort: %s:%d. Fehler: %s\n"
 #~ msgstr "Fehler beim Senden einer `%s' Anfrage an den SMTP Server.\n"
 
 #, fuzzy
-#~ msgid "Service `%s' has been stopped.\n"
-#~ msgstr "Dienst gelöscht.\n"
-
-#, fuzzy
 #~ msgid "Service `%s' was already running.\n"
 #~ msgstr "Diese Suche läuft bereits!\n"
 
@@ -7894,10 +8557,6 @@ msgstr "`%s' schlug bei Datei `%s' fehl. Ort: %s:%d. Fehler: %s\n"
 #~ msgstr "Informationen über andere GNUnet Knoten ausgeben."
 
 #, fuzzy
-#~ msgid "Operation failed.\n"
-#~ msgstr "Absicherung fehlgeschlagen bei %s:%d.\n"
-
-#, fuzzy
 #~ msgid "Error in communication with PEERINFO service\n"
 #~ msgstr "Informationen über andere GNUnet Knoten ausgeben."
 
@@ -7934,11 +8593,6 @@ msgstr "`%s' schlug bei Datei `%s' fehl. Ort: %s:%d. Fehler: %s\n"
 #~ msgstr "Syntaxfehler in Topolgieangabe, Bytes werden übersprungen.\n"
 
 #, fuzzy
-#~ msgid ""
-#~ "Syntax error in blacklist file at offset %llu, skipping bytes `%s'.\n"
-#~ msgstr "Syntaxfehler in Topologieangabe, überspringe Bytes `%s'.\n"
-
-#, fuzzy
 #~ msgid "Failed to read hostkey: %s\n"
 #~ msgstr "Fehler beim Starten der Collection.\n"
 
@@ -8109,10 +8763,6 @@ msgstr "`%s' schlug bei Datei `%s' fehl. Ort: %s:%d. Fehler: %s\n"
 #~ msgstr "Benutzer/Gruppe kann nicht zu `%s' gewechselt werden: %s\n"
 
 #, fuzzy
-#~ msgid "Unknown command `%s'\n"
-#~ msgstr "Unbekannte Operation `%s'\n"
-
-#, fuzzy
 #~ msgid "You must specify a nickname\n"
 #~ msgstr "Sie müssen einen Empfänger angeben!\n"
 
@@ -8323,10 +8973,6 @@ msgstr "`%s' schlug bei Datei `%s' fehl. Ort: %s:%d. Fehler: %s\n"
 #~ msgstr "`%s' schlug fehl: %s\n"
 
 #, fuzzy
-#~ msgid "stat (%s) failed: %s\n"
-#~ msgstr "`%s' schlug fehl: %s\n"
-
-#, fuzzy
 #~ msgid "# Peers connected"
 #~ msgstr "# verbundener Knoten"
 
@@ -8542,10 +9188,6 @@ msgstr "`%s' schlug bei Datei `%s' fehl. Ort: %s:%d. Fehler: %s\n"
 #~ msgstr "# Bytes empfangen über TCP"
 
 #, fuzzy
-#~ msgid "Connection: %X: %s failed at %s:%d: `%s'\n"
-#~ msgstr "`%s' schlug fehl bei %s:%d mit dem Fehler: `%s'.\n"
-
-#, fuzzy
 #~ msgid "Misconfigured address to bind to in configuration!\n"
 #~ msgstr "In der Konfigurationsdatei wurden keine Anwendungen definiert!\n"
 
@@ -8933,10 +9575,6 @@ msgstr "`%s' schlug bei Datei `%s' fehl. Ort: %s:%d. Fehler: %s\n"
 #~ msgstr "Ungültige Kommandozeilen Parameter.\n"
 
 #, fuzzy
-#~ msgid "No interface specified, using default.\n"
-#~ msgstr "Keine Oberfläche angegeben, verwende Standard\n"
-
-#, fuzzy
 #~ msgid "Configuration file `%s' must be a filename (but is a directory).\n"
 #~ msgstr ""
 #~ "Konfigurationsdatei `%s' nicht gefunden. Bitte führen Sie gnunet-setup "
@@ -9522,15 +10160,9 @@ msgstr "`%s' schlug bei Datei `%s' fehl. Ort: %s:%d. Fehler: %s\n"
 #~ msgid "\tRating (after update): %d\n"
 #~ msgstr "\tRating (nach Update): %d\n"
 
-#~ msgid "Collection stopped.\n"
-#~ msgstr "Collection beendet.\n"
-
 #~ msgid "Failed to stop collection (not active?).\n"
 #~ msgstr "Fehler beim Beenden der Collection (nicht aktiv?).\n"
 
-#~ msgid "Pseudonym `%s' deleted.\n"
-#~ msgstr "Pseudonym `%s' wurde gelöscht.\n"
-
 #~ msgid "Error deleting pseudonym `%s' (does not exist?).\n"
 #~ msgstr "Fehler beim Löschen des Pseudonyms `%s' (existiert nicht?).\n"
 
@@ -9733,9 +10365,6 @@ msgstr "`%s' schlug bei Datei `%s' fehl. Ort: %s:%d. Fehler: %s\n"
 #~ msgid "LOC URI not allowed for search.\n"
 #~ msgstr "LOC URI ist nicht erlaubt für Suchen.\n"
 
-#~ msgid "Format of pseudonym `%s' is invalid.\n"
-#~ msgstr "Format des Pseudonyms `%s' ist ungültig.\n"
-
 #, fuzzy
 #~ msgid "Format of file `%s' is invalid, trying to remove.\n"
 #~ msgstr "Format der Datei `%s' ist ungültig.\n"
@@ -9825,9 +10454,6 @@ msgstr "`%s' schlug bei Datei `%s' fehl. Ort: %s:%d. Fehler: %s\n"
 #~ msgid "`%s' registering client handler %d\n"
 #~ msgstr "`%s' registriert Client-Handler %d\n"
 
-#~ msgid "allows clients to determine gnunetd's configuration"
-#~ msgstr "Erlaubt es Clients die Konfiguration von gnunetd abzufragen"
-
 #~ msgid "`%s' registering client handler %d and %d\n"
 #~ msgstr "`%s' registriert Client-Handler %d and %d\n"
 
@@ -11643,9 +12269,6 @@ msgstr "`%s' schlug bei Datei `%s' fehl. Ort: %s:%d. Fehler: %s\n"
 #~ msgid "wizard-gtk is not available\n"
 #~ msgstr "wizard-gtk ist nicht verfügbar\n"
 
-#~ msgid "gconfig is not available\n"
-#~ msgstr "gconfig ist nicht verfügbar\n"
-
 #~ msgid ""
 #~ "Indexing file `%s' failed. Check file permissions and consult your GNUnet "
 #~ "server's logs.\n"
diff --git a/po/es.po b/po/es.po
index e834ff403..b1df14660 100644
--- a/po/es.po
+++ b/po/es.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnunet 0.9.5a\n"
 "Report-Msgid-Bugs-To: gnunet-developers@mail.gnu.org\n"
-"POT-Creation-Date: 2013-09-16 15:01+0200\n"
+"POT-Creation-Date: 2013-11-05 02:07+0100\n"
 "PO-Revision-Date: 2013-02-23 17:50+0100\n"
 "Last-Translator: Miguel Ángel Arruga Vivas <rosen644835@gmail.com>\n"
 "Language-Team: Spanish <es@li.org>\n"
@@ -17,7 +17,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: src/arm/arm_api.c:335
+#: src/arm/arm_api.c:336
 #, fuzzy
 msgid "Client was disconnected from arm service, trying to reconnect.\n"
 msgstr ""
@@ -35,78 +35,78 @@ msgstr ""
 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:169
+#: src/arm/gnunet-arm.c:170
 #, 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:214 src/testbed/gnunet-service-testbed_peers.c:971
+#: src/arm/gnunet-arm.c:216 src/testbed/gnunet-service-testbed_peers.c:1010
 #, fuzzy
 msgid "Message was sent successfully"
 msgstr "El almacén de nombres añadió el registro satisfactoriamente"
 
-#: src/arm/gnunet-arm.c:216
+#: src/arm/gnunet-arm.c:218
 #, 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:218 src/testbed/gnunet-service-testbed_peers.c:975
+#: src/arm/gnunet-arm.c:220 src/testbed/gnunet-service-testbed_peers.c:1014
 #, 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:220 src/testbed/gnunet-service-testbed_peers.c:977
+#: src/arm/gnunet-arm.c:222 src/testbed/gnunet-service-testbed_peers.c:1016
 msgid "ARM API is busy"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:222
+#: src/arm/gnunet-arm.c:224
 #, fuzzy
 msgid "Request does not fit into a message"
 msgstr "no imprime mensajes de estado"
 
 # Miguel: "timeout" lo he traducido como plazo, pero no se
 # si hay alguna palabra que lo describa mejor.
-#: src/arm/gnunet-arm.c:224 src/testbed/gnunet-service-testbed_peers.c:981
+#: src/arm/gnunet-arm.c:226 src/testbed/gnunet-service-testbed_peers.c:1020
 #, fuzzy
 msgid "Request timed out"
 msgstr "plazo de consenso"
 
-#: src/arm/gnunet-arm.c:226 src/testbed/gnunet-service-testbed_peers.c:983
+#: src/arm/gnunet-arm.c:228 src/testbed/gnunet-service-testbed_peers.c:1022
 #, fuzzy
 msgid "Unknown request status"
 msgstr "Usuario desconocido «%s»\n"
 
-#: src/arm/gnunet-arm.c:242 src/testbed/gnunet-service-testbed_peers.c:999
+#: src/arm/gnunet-arm.c:244 src/testbed/gnunet-service-testbed_peers.c:1038
 #, fuzzy, c-format
 msgid "%s is stopped"
 msgstr "# elementos almacenados"
 
-#: src/arm/gnunet-arm.c:244 src/testbed/gnunet-service-testbed_peers.c:1001
+#: src/arm/gnunet-arm.c:246 src/testbed/gnunet-service-testbed_peers.c:1040
 #, fuzzy, c-format
 msgid "%s is starting"
 msgstr "'%s' comenzando\n"
 
-#: src/arm/gnunet-arm.c:246 src/testbed/gnunet-service-testbed_peers.c:1003
+#: src/arm/gnunet-arm.c:248 src/testbed/gnunet-service-testbed_peers.c:1042
 #, c-format
 msgid "%s is stopping"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:248 src/testbed/gnunet-service-testbed_peers.c:1005
+#: src/arm/gnunet-arm.c:250 src/testbed/gnunet-service-testbed_peers.c:1044
 #, fuzzy, c-format
 msgid "%s is starting already"
 msgstr "'%s' comenzando\n"
 
-#: src/arm/gnunet-arm.c:250 src/testbed/gnunet-service-testbed_peers.c:1007
+#: src/arm/gnunet-arm.c:252 src/testbed/gnunet-service-testbed_peers.c:1046
 #, c-format
 msgid "%s is stopping already"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:252 src/testbed/gnunet-service-testbed_peers.c:1009
+#: src/arm/gnunet-arm.c:254 src/testbed/gnunet-service-testbed_peers.c:1048
 #, c-format
 msgid "%s is started already"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:254 src/testbed/gnunet-service-testbed_peers.c:1011
+#: src/arm/gnunet-arm.c:256 src/testbed/gnunet-service-testbed_peers.c:1050
 #, c-format
 msgid "%s is stopped already"
 msgstr ""
@@ -114,187 +114,187 @@ 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:256 src/testbed/gnunet-service-testbed_peers.c:1013
+#: src/arm/gnunet-arm.c:258 src/testbed/gnunet-service-testbed_peers.c:1052
 #, 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:258 src/testbed/gnunet-service-testbed_peers.c:1015
+#: src/arm/gnunet-arm.c:260 src/testbed/gnunet-service-testbed_peers.c:1054
 #, 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:260
+#: src/arm/gnunet-arm.c:262
 #, 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:262 src/testbed/gnunet-service-testbed_peers.c:1019
+#: src/arm/gnunet-arm.c:264 src/testbed/gnunet-service-testbed_peers.c:1058
 #, fuzzy, c-format
 msgid "%.s Unknown result code."
 msgstr "Código de respuesta del ARM desconocido.\n"
 
-#: src/arm/gnunet-arm.c:295
+#: src/arm/gnunet-arm.c:297
 msgid "Fatal error initializing ARM API.\n"
 msgstr "Error fatal al inicializar la API del ARM.\n"
 
-#: src/arm/gnunet-arm.c:324 src/arm/gnunet-arm.c:333
+#: src/arm/gnunet-arm.c:326 src/arm/gnunet-arm.c:335
 #, fuzzy, c-format
 msgid "Failed to start the ARM service: %s\n"
 msgstr "Se produjo un fallo al iniciar el servicio «%s»\n"
 
-#: src/arm/gnunet-arm.c:367
+#: src/arm/gnunet-arm.c:369
 #, fuzzy, c-format
 msgid "Failed to send a stop request to the ARM service: %s\n"
 msgstr "Se produjo un fallo al enviar una petición al servicio de transporte\n"
 
-#: src/arm/gnunet-arm.c:377
+#: src/arm/gnunet-arm.c:379
 #, fuzzy, c-format
 msgid "Failed to stop the ARM service: %s\n"
 msgstr "Fichero almacenado en '%s'.\n"
 
-#: src/arm/gnunet-arm.c:418
+#: src/arm/gnunet-arm.c:420
 #, fuzzy, c-format
 msgid "Failed to send a request to start the `%s' service: %%s\n"
 msgstr "Se produjo un fallo al enviar una petición al servicio de transporte\n"
 
-#: src/arm/gnunet-arm.c:427
+#: src/arm/gnunet-arm.c:429
 #, fuzzy, c-format
 msgid "Failed to start the `%s' service: %s\n"
 msgstr "Se produjo un fallo al iniciar el servicio «%s»\n"
 
-#: src/arm/gnunet-arm.c:463
+#: src/arm/gnunet-arm.c:465
 #, 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:474
+#: src/arm/gnunet-arm.c:476
 #, 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:510
+#: src/arm/gnunet-arm.c:512
 #, 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:517
+#: src/arm/gnunet-arm.c:519
 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:521
+#: src/arm/gnunet-arm.c:523
 msgid "Running services:\n"
 msgstr "Servicios en ejecución:\n"
 
-#: src/arm/gnunet-arm.c:603
+#: src/arm/gnunet-arm.c:605
 #, c-format
 msgid "Now only monitoring, press CTRL-C to stop.\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:634
+#: src/arm/gnunet-arm.c:636
 #, c-format
 msgid "Stopped %s.\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:637
+#: src/arm/gnunet-arm.c:639
 #, fuzzy, c-format
 msgid "Starting %s...\n"
 msgstr "Iniciando descarga «%s».\n"
 
-#: src/arm/gnunet-arm.c:640
+#: src/arm/gnunet-arm.c:642
 #, c-format
 msgid "Stopping %s...\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:651
+#: src/arm/gnunet-arm.c:653
 #, fuzzy, c-format
 msgid "Unknown status %u for service %s.\n"
 msgstr "Solicitando incio del servicio «%s».\n"
 
-#: src/arm/gnunet-arm.c:715
+#: src/arm/gnunet-arm.c:717
 msgid "stop all GNUnet services"
 msgstr "detiene todos los servicios de GNUnet"
 
-#: src/arm/gnunet-arm.c:717
+#: src/arm/gnunet-arm.c:719
 msgid "start a particular service"
 msgstr "inicia un servicio particular"
 
-#: src/arm/gnunet-arm.c:719
+#: src/arm/gnunet-arm.c:721
 msgid "stop a particular service"
 msgstr "detiene un servicio particular"
 
-#: src/arm/gnunet-arm.c:721
+#: src/arm/gnunet-arm.c:723
 msgid "start all GNUnet default services"
 msgstr "inicia todos los servicios predeterminados de GNUnet"
 
-#: src/arm/gnunet-arm.c:724
+#: src/arm/gnunet-arm.c:726
 msgid "stop and start all GNUnet default services"
 msgstr "detiene e inicia todos los servicios predeterminados de GNUnet"
 
-#: src/arm/gnunet-arm.c:727
+#: src/arm/gnunet-arm.c:729
 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:730
+#: src/arm/gnunet-arm.c:732
 msgid "monitor ARM activities"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:732
+#: src/arm/gnunet-arm.c:734
 msgid "don't print status messages"
 msgstr "no imprime mensajes de estado"
 
-#: src/arm/gnunet-arm.c:735
+#: src/arm/gnunet-arm.c:737
 msgid "timeout in MSECS milliseconds for completing current operation"
 msgstr "plazo en milisegundos (MSECS) para completar la operación actual"
 
-#: src/arm/gnunet-arm.c:737
+#: src/arm/gnunet-arm.c:739
 msgid "list currently running services"
 msgstr "lista de servicios actualmente en ejecución"
 
-#: src/arm/gnunet-arm.c:739
+#: src/arm/gnunet-arm.c:741
 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:741
+#: src/arm/gnunet-arm.c:743
 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:752
+#: src/arm/gnunet-arm.c:754
 msgid "Control services and the Automated Restart Manager (ARM)"
 msgstr ""
 "Servicios de control y el Gestor de Reinicio Automático (ARM en inglés)"
 
 # Miguel: Si no me equivoco, "status result" es un
 # resultado de tipo estado.
-#: src/arm/gnunet-service-arm.c:257
+#: src/arm/gnunet-service-arm.c:268
 msgid "Could not send status result to client\n"
 msgstr "No se pudo mandar el resultado (estado) al cliente\n"
 
 # Miguel: Si no me equivoco, "list result" es un resultado
 # de tipo lista.
-#: src/arm/gnunet-service-arm.c:291
+#: src/arm/gnunet-service-arm.c:304
 msgid "Could not send list result to client\n"
 msgstr "No se pudo mandar el resultado (lista) al cliente\n"
 
-#: src/arm/gnunet-service-arm.c:500
+#: src/arm/gnunet-service-arm.c:519
 #, c-format
 msgid "Failed to start service `%s'\n"
 msgstr "Se produjo un fallo al iniciar el servicio «%s»\n"
 
-#: src/arm/gnunet-service-arm.c:507
+#: src/arm/gnunet-service-arm.c:526
 #, c-format
 msgid "Starting service `%s'\n"
 msgstr "Iniciando el servicio «%s»\n"
 
 # Miguel: ¿Alguna idea para "socket"?
-#: src/arm/gnunet-service-arm.c:602
+#: src/arm/gnunet-service-arm.c:625
 #, c-format
 msgid "Unable to create socket for service `%s': %s\n"
 msgstr "Imposible crear un «socket» para el servicio «%s»: %s\n"
 
-#: src/arm/gnunet-service-arm.c:624
+#: src/arm/gnunet-service-arm.c:647
 #, c-format
 msgid "Unable to bind listening socket for service `%s' to address `%s': %s\n"
 msgstr ""
@@ -305,49 +305,49 @@ msgstr ""
 # no es exactamente lo mismo que el texto en inglés, pero
 # es fiel a la realidad puesto que el ARM reinicia
 # las conexiones cuando se caen.
-#: src/arm/gnunet-service-arm.c:638
+#: src/arm/gnunet-service-arm.c:676
 #, c-format
 msgid "ARM now monitors connections to service `%s' at `%s'\n"
 msgstr "El ARM ahora gestiona las conexiones del servicio «%s» en «%s»\n"
 
-#: src/arm/gnunet-service-arm.c:771
+#: src/arm/gnunet-service-arm.c:809
 #, c-format
 msgid "Preparing to stop `%s'\n"
 msgstr "Preparando para parar «%s»\n"
 
-#: src/arm/gnunet-service-arm.c:1022
+#: src/arm/gnunet-service-arm.c:1070
 #, c-format
 msgid "Restarting service `%s'.\n"
 msgstr "Reiniciando el servicio «%s»\n"
 
-#: src/arm/gnunet-service-arm.c:1115
+#: src/arm/gnunet-service-arm.c:1163
 msgid "exit"
 msgstr "salida"
 
-#: src/arm/gnunet-service-arm.c:1120
+#: src/arm/gnunet-service-arm.c:1168
 msgid "signal"
 msgstr "señal"
 
-#: src/arm/gnunet-service-arm.c:1125
+#: src/arm/gnunet-service-arm.c:1173
 msgid "unknown"
 msgstr "desconocido"
 
-#: src/arm/gnunet-service-arm.c:1131
+#: src/arm/gnunet-service-arm.c:1179
 #, c-format
 msgid "Service `%s' took %s to terminate\n"
 msgstr "El servicio «%s» tardó %s en finalizar\n"
 
-#: src/arm/gnunet-service-arm.c:1153
+#: src/arm/gnunet-service-arm.c:1201
 #, fuzzy, c-format
 msgid "Service `%s' terminated normally, will restart at any time\n"
 msgstr "El servicio «%s» finalizó con estado %s/%d, se reiniciará en %llu ms\n"
 
-#: src/arm/gnunet-service-arm.c:1168
+#: src/arm/gnunet-service-arm.c:1216
 #, fuzzy, c-format
 msgid "Service `%s' terminated with status %s/%d, will restart in %s\n"
 msgstr "El servicio «%s» finalizó con estado %s/%d, se reiniciará en %llu ms\n"
 
-#: src/arm/gnunet-service-arm.c:1386
+#: src/arm/gnunet-service-arm.c:1463
 #, c-format
 msgid "Starting default services `%s'\n"
 msgstr "Iniciando servicios predeterminados «%s»\n"
@@ -355,35 +355,35 @@ msgstr "Iniciando servicios predeterminados «%s»\n"
 # Miguel: He traducido "default" por "predeterminado", la locución
 # "por defecto" no tiene sentido en sitios como este y he tratado
 # de ser consistente.
-#: src/arm/gnunet-service-arm.c:1397
+#: src/arm/gnunet-service-arm.c:1474
 #, c-format
 msgid "Default service `%s' not configured correctly!\n"
 msgstr "¡El servicio predeterminado «%s» no está configurado correctamente!\n"
 
 # Miguel: ¿No hay servicios -> no hay ningún servicio?
-#: src/arm/gnunet-service-arm.c:1411
+#: src/arm/gnunet-service-arm.c:1488
 msgid ""
 "No default services configured, GNUnet will not really start right now.\n"
 msgstr ""
 "No hay servicios predeterminados configurados, GNUnet no va a iniciarse "
 "realmente ahora.\n"
 
-#: src/arm/mockup-service.c:46
+#: src/arm/mockup-service.c:41
 msgid "Initiating shutdown as requested by client.\n"
 msgstr "Iniciando apagado bajo petición del cliente.\n"
 
-#: src/ats/ats_api_performance.c:475
+#: src/ats/ats_api_performance.c:468
 #, c-format
 msgid "Received %s message\n"
 msgstr "Recibido mensaje %s\n"
 
-#: src/ats/ats_api_performance.c:518
+#: src/ats/ats_api_performance.c:511
 #, c-format
 msgid "Received last message for %s \n"
 msgstr "Recibido último mensaje para %s\n"
 
-#: src/ats/gnunet-service-ats_addresses.c:1607
-#: src/ats/gnunet-service-ats_addresses.c:1641
+#: src/ats/gnunet-service-ats_addresses.c:1475
+#: src/ats/gnunet-service-ats_addresses.c:1519
 #, c-format
 msgid ""
 "Could not load quota for network `%s':  `%s', assigning default bandwidth "
@@ -393,12 +393,12 @@ msgstr ""
 "de banda predeterminado %llu\n"
 
 # Miguel: "Outbound" lo he traducido como salida en todo el texto.
-#: src/ats/gnunet-service-ats_addresses.c:1613
+#: src/ats/gnunet-service-ats_addresses.c:1482
 #, c-format
 msgid "Outbound quota configure for network `%s' is %llu\n"
 msgstr "La cuota de salida configurada para la red «%s» es %llu\n"
 
-#: src/ats/gnunet-service-ats_addresses.c:1620
+#: src/ats/gnunet-service-ats_addresses.c:1490
 #, c-format
 msgid ""
 "No outbound quota configured for network `%s', assigning default bandwidth "
@@ -408,12 +408,12 @@ msgstr ""
 "de banda predeterminado %llu\n"
 
 # Miguel: "Inbound" lo he traducido como entrada en todo el texto.
-#: src/ats/gnunet-service-ats_addresses.c:1647
+#: src/ats/gnunet-service-ats_addresses.c:1526
 #, c-format
 msgid "Inbound quota configured for network `%s' is %llu\n"
 msgstr "La cuota de entrada configurada para la red «%s» es %llu\n"
 
-#: src/ats/gnunet-service-ats_addresses.c:1654
+#: src/ats/gnunet-service-ats_addresses.c:1534
 #, c-format
 msgid ""
 "No outbound quota configure for network `%s', assigning default bandwidth "
@@ -422,26 +422,36 @@ msgstr ""
 "No hay configurada una cuota de salida para la red «%s», asignando el ancho "
 "de banda predeterminado %llu\n"
 
-#: src/ats/gnunet-service-ats_addresses.c:1888
+#: src/ats/gnunet-service-ats_addresses.c:1700
+#, c-format
+msgid "Initializing solver `%s '`%s'\n"
+msgstr ""
+
+#: src/ats/gnunet-service-ats_addresses.c:1703
+#, fuzzy, c-format
+msgid "Failed to initialize solver `%s'!\n"
+msgstr "¡No se puede inicializar el resolvedor!\n"
+
+#: src/ats/gnunet-service-ats_addresses.c:1726
 #, fuzzy
 msgid "Failed to initialize solver!\n"
 msgstr "¡No se puede inicializar el resolvedor!\n"
 
-#: src/ats/gnunet-service-ats-solver_mlp.c:849
+#: src/ats/libgnunet_plugin_ats_mlp.c:868
 msgid "Problem size too large, cannot allocate memory!\n"
 msgstr ""
 
-#: src/ats/gnunet-service-ats-solver_mlp.c:1193
+#: src/ats/libgnunet_plugin_ats_mlp.c:1239
 #, fuzzy, c-format
 msgid "Adding address for peer `%s' multiple times\n"
 msgstr "Añadiendo «%s» sin direcciones para el par «%s»\n"
 
-#: src/ats/gnunet-service-ats-solver_mlp.c:1238
+#: src/ats/libgnunet_plugin_ats_mlp.c:1286
 #, c-format
 msgid "Updating address property `%s' for peer `%s' %p not added before\n"
 msgstr ""
 
-#: src/ats/gnunet-service-ats-solver_mlp.c:1956
+#: src/ats/libgnunet_plugin_ats_mlp.c:2010
 #, fuzzy, c-format
 msgid ""
 "Adjusting inconsistent outbound quota configuration for network `%s', is "
@@ -450,7 +460,7 @@ msgstr ""
 "No hay configurada una cuota de salida para la red «%s», asignando el ancho "
 "de banda predeterminado %llu\n"
 
-#: src/ats/gnunet-service-ats-solver_mlp.c:1964
+#: src/ats/libgnunet_plugin_ats_mlp.c:2018
 #, fuzzy, c-format
 msgid ""
 "Adjusting inconsistent inbound quota configuration for network `%s', is %llu "
@@ -460,26 +470,26 @@ msgstr ""
 "ancho de banda predeterminado (%llu)\n"
 
 # Miguel: "Outbound" lo he traducido como salida en todo el texto.
-#: src/ats/gnunet-service-ats-solver_mlp.c:1974
+#: src/ats/libgnunet_plugin_ats_mlp.c:2028
 #, fuzzy, c-format
 msgid ""
 "Adjusting outbound quota configuration for network `%s'from %llu to %.0f\n"
 msgstr "La cuota de salida configurada para la red «%s» es %llu\n"
 
 # Miguel: "Outbound" lo he traducido como salida en todo el texto.
-#: src/ats/gnunet-service-ats-solver_mlp.c:1982
+#: src/ats/libgnunet_plugin_ats_mlp.c:2036
 #, fuzzy, c-format
 msgid ""
 "Adjusting inbound quota configuration for network `%s' from %llu to %.0f\n"
 msgstr "La cuota de salida configurada para la red «%s» es %llu\n"
 
 # Miguel: "Outbound" lo he traducido como salida en todo el texto.
-#: src/ats/gnunet-service-ats-solver_mlp.c:1993
+#: src/ats/libgnunet_plugin_ats_mlp.c:2047
 #, fuzzy, c-format
 msgid "Using default quota configuration for network `%s' (in/out) %llu/%llu\n"
 msgstr "La cuota de salida configurada para la red «%s» es %llu\n"
 
-#: src/ats/gnunet-service-ats-solver_proportional.c:1296
+#: src/ats/libgnunet_plugin_ats_proportional.c:1438
 #, fuzzy, c-format
 msgid "Invalid network type `%u' `%s': Disconnect!\n"
 msgstr "No se encontró la IP del host «%s»: %s\n"
@@ -514,166 +524,525 @@ msgstr ""
 msgid "Quota for network `%11s' (in/out): %10s / %10s\n"
 msgstr "Cuota para la red «%11s» (entrada/salida): %10s / %10s\n"
 
-#: src/ats-tool/gnunet-ats.c:347 src/namestore/gnunet-namestore.c:438
-#: src/transport/gnunet-transport.c:812
+#: src/ats-tool/gnunet-ats.c:347 src/namestore/gnunet-namestore.c:520
+#: src/transport/gnunet-transport.c:807
 #, c-format
 msgid "Service `%s' is not running\n"
 msgstr "El servicio «%s» no está ejecutandose\n"
 
-#: src/ats-tool/gnunet-ats.c:357 src/transport/gnunet-transport.c:819
+#: src/ats-tool/gnunet-ats.c:359 src/transport/gnunet-transport.c:816
 #, c-format
 msgid "Failed to parse peer identity `%s'\n"
 msgstr "Se produjo un fallo al procesar la identidad del par «%s»\n"
 
-#: src/ats-tool/gnunet-ats.c:365
+#: src/ats-tool/gnunet-ats.c:367
 #, c-format
 msgid "Please select one operation : %s or %s or %s or %s or %s\n"
 msgstr "Por favor, seleccione una operación: %s o %s o %s o %s o %s\n"
 
-#: src/ats-tool/gnunet-ats.c:381 src/ats-tool/gnunet-ats.c:400
-#: src/ats-tool/gnunet-ats.c:417 src/ats-tool/gnunet-ats.c:455
+#: src/ats-tool/gnunet-ats.c:383 src/ats-tool/gnunet-ats.c:402
+#: src/ats-tool/gnunet-ats.c:419 src/ats-tool/gnunet-ats.c:457
 #, c-format
 msgid "Cannot connect to ATS service, exiting...\n"
 msgstr "No se puede conectar al servicio ATS, saliendo...\n"
 
-#: src/ats-tool/gnunet-ats.c:390 src/ats-tool/gnunet-ats.c:407
+#: src/ats-tool/gnunet-ats.c:392 src/ats-tool/gnunet-ats.c:409
 #, c-format
 msgid "Cannot issue request to ATS service, exiting...\n"
 msgstr "No se puede iniciar una petición al servicio ATS, saliendo...\n"
 
-#: src/ats-tool/gnunet-ats.c:425
+#: src/ats-tool/gnunet-ats.c:427
 #, fuzzy, c-format
 msgid "No preference type given!\n"
 msgstr "establece las preferencias para el par dado"
 
-#: src/ats-tool/gnunet-ats.c:430
+#: src/ats-tool/gnunet-ats.c:432
 #, fuzzy, c-format
 msgid "No peer given!\n"
 msgstr "No se han proporcionado opciones\n"
 
-#: src/ats-tool/gnunet-ats.c:448
+#: src/ats-tool/gnunet-ats.c:450
 #, fuzzy
 msgid "Valid type required\n"
 msgstr "Tipo requerido\n"
 
-#: src/ats-tool/gnunet-ats.c:506
+#: src/ats-tool/gnunet-ats.c:508
 msgid "get list of active addresses currently used"
 msgstr "obtiene una lista de direcciones activas usadas actualmente"
 
-#: src/ats-tool/gnunet-ats.c:509
+#: src/ats-tool/gnunet-ats.c:511
 msgid "get list of all active addresses"
 msgstr "obtiene una lista de todas las direcciones activas"
 
-#: src/ats-tool/gnunet-ats.c:512
+#: src/ats-tool/gnunet-ats.c:514
 msgid "do not resolve IP addresses to hostnames"
 msgstr "no resuelve direcciones IP a nombres de máquina"
 
 # Miguel: Aquí he dejado monitorización porque esto es
 # del servicio de traducción de direcciones.
-#: src/ats-tool/gnunet-ats.c:515
+#: src/ats-tool/gnunet-ats.c:517
 msgid "monitor mode"
 msgstr "modo de monitorización"
 
-#: src/ats-tool/gnunet-ats.c:518
+#: src/ats-tool/gnunet-ats.c:520
 msgid "set preference for the given peer"
 msgstr "establece las preferencias para el par dado"
 
-#: src/ats-tool/gnunet-ats.c:521
+#: src/ats-tool/gnunet-ats.c:523
 msgid "print all configured quotas"
 msgstr "imprime todas las cuotas configuradas"
 
 # Miguel: He preferido extender id a identificación por claridad.
-#: src/ats-tool/gnunet-ats.c:524
+#: src/ats-tool/gnunet-ats.c:526
 msgid "peer id"
 msgstr "identificación del par"
 
 # Miguel: No me he encontrado esta opción todavía,
 # pero creo que son palabras clave.
-#: src/ats-tool/gnunet-ats.c:527
+#: src/ats-tool/gnunet-ats.c:529
 msgid "preference type to set: latency | bandwidth"
 msgstr ""
 "tipo de preferencia a modificar: latency (latencia) | bandwidth (ancho de "
 "banda)"
 
-#: src/ats-tool/gnunet-ats.c:530
+#: src/ats-tool/gnunet-ats.c:532
 msgid "preference value"
 msgstr "valor de preferencia"
 
 # Miguel: ¿Algo menos forzado que "salida prolija"?
-#: src/ats-tool/gnunet-ats.c:533
+#: src/ats-tool/gnunet-ats.c:535
 msgid "verbose output (include ATS address properties)"
 msgstr "salida prolija (incluye las propiedades de direcciones del ATS)"
 
-#: src/ats-tool/gnunet-ats.c:542
+#: src/ats-tool/gnunet-ats.c:544
 msgid "Print information about ATS state"
 msgstr "Imprime información acerca del estado del ATS"
 
-#: src/block/block.c:105
-#, c-format
-msgid "Loading block plugin `%s'\n"
-msgstr "Cargando el módulo de bloques «%s»\n"
-
-#: src/consensus/gnunet-consensus-profiler.c:393
+#: src/consensus/gnunet-consensus-profiler.c:394
 msgid "number of peers in consensus"
 msgstr "número de pares en consenso"
 
-#: src/consensus/gnunet-consensus-profiler.c:396
+#: src/consensus/gnunet-consensus-profiler.c:397
 msgid "how many peers receive one value?"
 msgstr "¿cuántos pares reciben un valor?"
 
-#: src/consensus/gnunet-consensus-profiler.c:399
-#: src/set/gnunet-set-profiler.c:287 src/set/gnunet-set-profiler.c:290
-#: src/set/gnunet-set-profiler.c:293
+#: src/consensus/gnunet-consensus-profiler.c:400
+#: src/set/gnunet-set-profiler.c:286 src/set/gnunet-set-profiler.c:289
+#: src/set/gnunet-set-profiler.c:292
 msgid "number of values"
 msgstr "número de valores"
 
 # Miguel: "timeout" lo he traducido como plazo, pero no se
 # si hay alguna palabra que lo describa mejor.
-#: src/consensus/gnunet-consensus-profiler.c:402
+#: src/consensus/gnunet-consensus-profiler.c:403
 msgid "consensus timeout"
 msgstr "plazo de consenso"
 
-#: src/consensus/gnunet-consensus-profiler.c:405
+#: src/consensus/gnunet-consensus-profiler.c:406
 msgid "be more verbose (print received values)"
 msgstr ""
 
-#: src/core/core_api.c:752
+#: src/conversation/conversation_api.c:333
+#: src/conversation/conversation_api.c:959
+#, fuzzy, c-format
+msgid "Internal error %d\n"
+msgstr "Error interno."
+
+#: src/conversation/gnunet-conversation.c:186
+#, c-format
+msgid ""
+"Incoming call from `%s'.\n"
+"Please /accept or /cancel the call.\n"
+msgstr ""
+
+#: src/conversation/gnunet-conversation.c:206
+#: src/conversation/gnunet-conversation.c:315
+#, c-format
+msgid "Call terminated: %s\n"
+msgstr ""
+
+#: src/conversation/gnunet-conversation.c:226
+#, c-format
+msgid "Ego `%s' no longer available, phone is now down.\n"
+msgstr ""
+
+#: src/conversation/gnunet-conversation.c:239
+#, fuzzy
+msgid "Failed to setup phone (internal error)\n"
+msgstr "¡Se produjo un fallo al configurar el túnel mesh!\n"
+
+#: src/conversation/gnunet-conversation.c:252
+#, c-format
+msgid "Phone active on line %u\n"
+msgstr ""
+
+#: src/conversation/gnunet-conversation.c:284
+msgid "Resolved address. Now ringing other party.\n"
+msgstr ""
+
+#: src/conversation/gnunet-conversation.c:290
+#, fuzzy, c-format
+msgid "Connection established to `%s': %s\n"
+msgstr "'%s' falló en %s: %d con error: '%s'.\n"
+
+#: src/conversation/gnunet-conversation.c:298
+#, fuzzy, c-format
+msgid "Failed to resolve `%s'\n"
+msgstr "Se produjo un fallo al resolver «%s»: %s\n"
+
+#: src/conversation/gnunet-conversation.c:307
+msgid "Line busy\n"
+msgstr ""
+
+#: src/conversation/gnunet-conversation.c:385
+#, c-format
+msgid "Unknown command `%s'\n"
+msgstr "Comando desconocido «%s»\n"
+
+#: src/conversation/gnunet-conversation.c:401
+#: src/conversation/gnunet-conversation.c:409
+#, c-format
+msgid "Ego `%s' not available\n"
+msgstr ""
+
+#: src/conversation/gnunet-conversation.c:417
+#, c-format
+msgid "Hanging up on incoming phone call from `%s' to call `%s'.\n"
+msgstr ""
+
+#: src/conversation/gnunet-conversation.c:424
+#: src/conversation/gnunet-conversation.c:438
+#, c-format
+msgid "You are already in a conversation with `%s', refusing to call `%s'.\n"
+msgstr ""
+
+#: src/conversation/gnunet-conversation.c:431
+#, fuzzy, c-format
+msgid "Aborting call to `%s'\n"
+msgstr "Error escribiendo a «%s»: %s\n"
+
+#: src/conversation/gnunet-conversation.c:478
+msgid "There is no incoming call to be accepted!\n"
+msgstr ""
+
+#: src/conversation/gnunet-conversation.c:485
+#: src/conversation/gnunet-conversation.c:496
+#, fuzzy, c-format
+msgid "You are already in a conversation with `%s'.\n"
+msgstr "No se pudo acceder al fichero de configuración «%s»\n"
+
+#: src/conversation/gnunet-conversation.c:491
+#, c-format
+msgid "You are trying to call `%s', cannot accept incoming calls right now.\n"
+msgstr ""
+
+#: src/conversation/gnunet-conversation.c:521
+msgid "We currently do not have an address.\n"
+msgstr ""
+
+#: src/conversation/gnunet-conversation.c:542
+#, c-format
+msgid "We are currently trying to locate the private key for the ego `%s'.\n"
+msgstr ""
+
+#: src/conversation/gnunet-conversation.c:547
+#, c-format
+msgid "We are listening for incoming calls for ego `%s' on line %u.\n"
+msgstr ""
+
+#: src/conversation/gnunet-conversation.c:553
+#, c-format
+msgid "The phone is rining. `%s' is trying to call us.\n"
+msgstr ""
+
+#: src/conversation/gnunet-conversation.c:559
+#, c-format
+msgid "You are having a conversation with `%s'.\n"
+msgstr ""
+
+#: src/conversation/gnunet-conversation.c:564
+#, fuzzy, c-format
+msgid "We are trying to find the network address to call `%s'.\n"
+msgstr "Detectada dirección de la red interna «%s».\n"
+
+#: src/conversation/gnunet-conversation.c:569
+#, c-format
+msgid "We are calling `%s', his phone should be ringing.\n"
+msgstr ""
+
+#: src/conversation/gnunet-conversation.c:574
+msgid ""
+"We had an internal error setting up our phone line. You can still make "
+"calls.\n"
+msgstr ""
+
+#: src/conversation/gnunet-conversation.c:595
+msgid "There is no call that could be cancelled right now.\n"
+msgstr ""
+
+#: src/conversation/gnunet-conversation.c:626
+msgid "Use `/address' to find out which address this phone should have in GNS"
+msgstr ""
+
+#: src/conversation/gnunet-conversation.c:628
+msgid "Use `/call USER.gnu' to call USER"
+msgstr ""
+
+#: src/conversation/gnunet-conversation.c:630
+msgid "Use `/accept MESSAGE' to accept an incoming call"
+msgstr ""
+
+#: src/conversation/gnunet-conversation.c:632
+msgid "Use `/cancel MESSAGE' to reject or terminate a call"
+msgstr ""
+
+#: src/conversation/gnunet-conversation.c:634
+#, fuzzy
+msgid "Use `/status' to print status information"
+msgstr "ser prolijo (imprime información de progreso)"
+
+#: src/conversation/gnunet-conversation.c:636
+#, fuzzy
+msgid "Use `/quit' to terminate gnunet-conversation"
+msgstr "Use «/quit» para finalizar «gnunet-chat»"
+
+#: src/conversation/gnunet-conversation.c:638
+msgid "Use `/help command' to get help for a specific command"
+msgstr "Use «/help comando» para obtener ayuda sobre un comando específico"
+
+#: src/conversation/gnunet-conversation.c:793
+#, fuzzy, c-format
+msgid "Name of our ego changed to `%s'\n"
+msgstr "Se produjo un fallo al crear la página para «%s»\n"
+
+#: src/conversation/gnunet-conversation.c:806
+#, fuzzy, c-format
+msgid "Our ego `%s' was deleted!\n"
+msgstr "El pseudónimo '%s' fue borrado.\n"
+
+#: src/conversation/gnunet-conversation.c:841
+#, fuzzy
+msgid "You must specify the NAME of an ego to use\n"
+msgstr "Debes especificar un fichero a inspeccionar.\n"
+
+#: src/conversation/gnunet-conversation.c:867
+msgid "sets the NAME of the ego to use for the phone (and name resolution)"
+msgstr ""
+
+#: src/conversation/gnunet-conversation.c:870
+msgid "sets the LINE to use for the phone"
+msgstr ""
+
+#: src/conversation/gnunet-conversation.c:885
+msgid "Enables having a conversation with other GNUnet users."
+msgstr ""
+
+#: src/conversation/gnunet-conversation-test.c:121
+#, c-format
+msgid ""
+"\n"
+"End of transmission.  Have a GNU day.\n"
+msgstr ""
+
+#: src/conversation/gnunet-conversation-test.c:149
+#, c-format
+msgid ""
+"\n"
+"We are now playing your recording back.  If you can hear it, your audio "
+"settings are working..."
+msgstr ""
+
+#: src/conversation/gnunet-conversation-test.c:215
+#, c-format
+msgid ""
+"We will now be recording you for %s. After that time, the recording will be "
+"played back to you..."
+msgstr ""
+
+#: src/conversation/gnunet-conversation-test.c:248
+#: src/integration-tests/connection_watchdog.c:1114
+#: src/multicast/gnunet-multicast.c:70 src/revocation/gnunet-revocation.c:510
+#: src/template/gnunet-template.c:70
+msgid "help text"
+msgstr "texto de ayuda"
+
+#: src/conversation/gnunet-helper-audio-playback.c:137
+#, fuzzy, c-format
+msgid "pa_stream_write() failed: %s\n"
+msgstr "stadísticas (%s) falló: %s\n"
+
+#: src/conversation/gnunet-helper-audio-playback.c:186
+msgid "gnunet-helper-audio-playback - Got signal, exiting\n"
+msgstr ""
+
+#: src/conversation/gnunet-helper-audio-playback.c:211
+#: src/conversation/gnunet-helper-audio-record.c:363
+#, fuzzy
+msgid "Connection established.\n"
+msgstr "Colección detenida.\n"
+
+#: src/conversation/gnunet-helper-audio-playback.c:216
+#: src/conversation/gnunet-helper-audio-record.c:368
+#, fuzzy, c-format
+msgid "pa_stream_new() failed: %s\n"
+msgstr "stadísticas (%s) falló: %s\n"
+
+#: src/conversation/gnunet-helper-audio-playback.c:230
+#, c-format
+msgid "pa_stream_connect_playback() failed: %s\n"
+msgstr ""
+
+#: src/conversation/gnunet-helper-audio-playback.c:243
+#: src/conversation/gnunet-helper-audio-record.c:394
+#, fuzzy, c-format
+msgid "Connection failure: %s\n"
+msgstr "'%s' falló en %s: %d con error: '%s'.\n"
+
+#: src/conversation/gnunet-helper-audio-playback.c:264
+#: src/conversation/gnunet-helper-audio-record.c:417
+#, fuzzy
+msgid "Wrong Spec\n"
+msgstr "Servicio principal (CORE) erróneo\n"
+
+#: src/conversation/gnunet-helper-audio-playback.c:270
+#: src/conversation/gnunet-helper-audio-record.c:423
+#, fuzzy
+msgid "pa_mainloop_new() failed.\n"
+msgstr "La operación ha fallado.\n"
+
+#: src/conversation/gnunet-helper-audio-playback.c:284
+#: src/conversation/gnunet-helper-audio-record.c:438
+#, fuzzy
+msgid "pa_context_new() failed.\n"
+msgstr "La operación ha fallado.\n"
+
+#: src/conversation/gnunet-helper-audio-playback.c:291
+#: src/conversation/gnunet-helper-audio-record.c:444
+#, fuzzy, c-format
+msgid "pa_context_connect() failed: %s\n"
+msgstr "# reconexiones rápidas fallidas"
+
+#: src/conversation/gnunet-helper-audio-playback.c:297
+#: src/conversation/gnunet-helper-audio-record.c:450
+#, fuzzy
+msgid "pa_mainloop_run() failed.\n"
+msgstr "La operación ha fallado.\n"
+
+#: src/conversation/gnunet-helper-audio-playback.c:366
+#, c-format
+msgid "Read error from STDIN: %s\n"
+msgstr ""
+
+#: src/conversation/gnunet-helper-audio-record.c:237
+#, fuzzy, c-format
+msgid "pa_stream_peek() failed: %s\n"
+msgstr "stadísticas (%s) falló: %s\n"
+
+#: src/conversation/gnunet-helper-audio-record.c:275
+msgid "Got signal, exiting.\n"
+msgstr ""
+
+#: src/conversation/gnunet-helper-audio-record.c:301
+#, fuzzy
+msgid "Stream successfully created.\n"
+msgstr "Conectado satisfactoriamente a «%s»\n"
+
+#: src/conversation/gnunet-helper-audio-record.c:306
+#, fuzzy, c-format
+msgid "pa_stream_get_buffer_attr() failed: %s\n"
+msgstr "stadísticas (%s) falló: %s\n"
+
+#: src/conversation/gnunet-helper-audio-record.c:314
+#, c-format
+msgid "Buffer metrics: maxlength=%u, fragsize=%u\n"
+msgstr ""
+
+#: src/conversation/gnunet-helper-audio-record.c:318
+#, c-format
+msgid "Using sample spec '%s', channel map '%s'.\n"
+msgstr ""
+
+#: src/conversation/gnunet-helper-audio-record.c:325
+#, fuzzy, c-format
+msgid "Connected to device %s (%u, %ssuspended).\n"
+msgstr "Conectado a %s.\n"
+
+#: src/conversation/gnunet-helper-audio-record.c:334
+#, c-format
+msgid "Stream error: %s\n"
+msgstr ""
+
+#: src/conversation/gnunet-helper-audio-record.c:381
+#, fuzzy, c-format
+msgid "pa_stream_connect_record() failed: %s\n"
+msgstr "No se pudo borrar el registro: %s\n"
+
+#: src/conversation/gnunet-service-conversation.c:612
+msgid "Mesh audio channel not ready; audio data dropped\n"
+msgstr ""
+
+#: src/conversation/gnunet-service-conversation.c:700
+#, c-format
+msgid "No available phone for incoming call on line %u, sending BUSY signal\n"
+msgstr ""
+
+#: src/conversation/gnunet-service-conversation.c:1054
+#, c-format
+msgid "Received incoming tunnel on port %u\n"
+msgstr ""
+
+#: src/conversation/microphone.c:121
+#, fuzzy
+msgid "Could not start record audio helper\n"
+msgstr "No se pudo empezar la operación de desindexado.\n"
+
+#: src/conversation/plugin_gnsrecord_conversation.c:116
+#, fuzzy, c-format
+msgid "Unable to parse PHONE record `%s'\n"
+msgstr "No se pudo procesar el registro PKEY «%s»\n"
+
+#: src/conversation/speaker.c:75
+#, fuzzy
+msgid "Could not start playback audio helper.\n"
+msgstr "No se pudo empezar a publicar.\n"
+
+#: src/core/core_api.c:761
 msgid "Client was disconnected from core service, trying to reconnect.\n"
 msgstr ""
 "El cliente se desconectó del servicio principal, tratando de reconectar.\n"
 
-#: src/core/gnunet-core.c:83
+#: src/core/gnunet-core.c:80
 #, c-format
 msgid "Peer `%s'\n"
 msgstr "Par «%s»\n"
 
-#: src/core/gnunet-core.c:112 src/core/gnunet-core.c:140
-#: src/transport/gnunet-transport.c:606 src/transport/gnunet-transport.c:630
+#: src/core/gnunet-core.c:110 src/core/gnunet-core.c:138
+#: src/transport/gnunet-transport.c:601 src/transport/gnunet-transport.c:625
 #, c-format
 msgid "%24s: %-17s %4s   (%u connections in total)\n"
 msgstr "%24s: %-17s %4s   (%u conexiones en total)\n"
 
-#: src/core/gnunet-core.c:114 src/transport/gnunet-transport.c:608
+#: src/core/gnunet-core.c:112 src/transport/gnunet-transport.c:603
 msgid "Connected to"
 msgstr "Conectado a"
 
-#: src/core/gnunet-core.c:142 src/transport/gnunet-transport.c:632
+#: src/core/gnunet-core.c:140 src/transport/gnunet-transport.c:627
 msgid "Disconnected from"
 msgstr "Desconectado de"
 
-#: src/core/gnunet-core.c:166 src/mesh/gnunet-mesh.c:170
-#: src/peerinfo-tool/gnunet-peerinfo.c:653
+#: src/core/gnunet-core.c:164 src/mesh/gnunet-mesh.c:174
+#: src/peerinfo-tool/gnunet-peerinfo.c:645
 #, c-format
 msgid "Invalid command line argument `%s'\n"
 msgstr "Parámetro no válido «%s» en la línea de comandos\n"
 
 # Miguel: ¿Quizá continuamente fuese mejor?
-#: src/core/gnunet-core.c:203 src/transport/gnunet-transport.c:1004
+#: src/core/gnunet-core.c:201 src/transport/gnunet-transport.c:999
 msgid "provide information about all current connections (continuously)"
 msgstr ""
 "provee información sobre todas las conexiones actuales (de forma continua)"
 
-#: src/core/gnunet-core.c:214
+#: src/core/gnunet-core.c:212
 msgid "Print information about connected peers."
 msgstr "Imprime información sobre los pares conectados."
 
@@ -701,54 +1070,54 @@ msgstr "# mensajes descartados (sesión desconectada)"
 msgid "# bytes of messages of type %u received"
 msgstr "# bytes de mensajes del tipo %u recibidos"
 
-#: src/core/gnunet-service-core_kx.c:532
+#: src/core/gnunet-service-core_kx.c:531
 msgid "# bytes encrypted"
 msgstr "# bytes cifrados"
 
-#: src/core/gnunet-service-core_kx.c:583
+#: src/core/gnunet-service-core_kx.c:582
 msgid "# bytes decrypted"
 msgstr "# bytes descifrados"
 
-#: src/core/gnunet-service-core_kx.c:667
+#: src/core/gnunet-service-core_kx.c:668
 msgid "# key exchanges initiated"
 msgstr "# intercambio de claves iniciados"
 
-#: src/core/gnunet-service-core_kx.c:697
+#: src/core/gnunet-service-core_kx.c:701
 msgid "# key exchanges stopped"
 msgstr "# intercambio de claves parados"
 
-#: src/core/gnunet-service-core_kx.c:761
+#: src/core/gnunet-service-core_kx.c:764
 msgid "# old ephemeral keys ignored"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:767
+#: src/core/gnunet-service-core_kx.c:770
 #, fuzzy
 msgid "# ephemeral keys received"
 msgstr "# mapas de tipos recibidos"
 
-#: src/core/gnunet-service-core_kx.c:803
+#: src/core/gnunet-service-core_kx.c:804
 #, c-format
 msgid ""
 "Ephemeral key message from peer `%s' rejected as its validity range does not "
 "match our system time (%llu not in [%llu,%llu]).\n"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:819
+#: src/core/gnunet-service-core_kx.c:820
 #, fuzzy
 msgid "# EPHEMERAL_KEY messages decrypted"
 msgstr "# mensajes «SET_KEY» descifrados"
 
-#: src/core/gnunet-service-core_kx.c:922
-#: src/transport/gnunet-service-transport_validation.c:933
+#: src/core/gnunet-service-core_kx.c:923
+#: src/transport/gnunet-service-transport_validation.c:938
 msgid "# PING messages received"
 msgstr "# mensajes PING recibidos"
 
-#: src/core/gnunet-service-core_kx.c:930
+#: src/core/gnunet-service-core_kx.c:931
 #, fuzzy
 msgid "# PING messages dropped (out of order)"
 msgstr "# Mensajes P2P omitidos debido a saturación de la cola"
 
-#: src/core/gnunet-service-core_kx.c:957
+#: src/core/gnunet-service-core_kx.c:958
 #, c-format
 msgid ""
 "Received PING from `%s' for different identity: I am `%s', PONG identity: `"
@@ -757,84 +1126,84 @@ msgstr ""
 "Recibido PING de «%s» para una identidad diferente: Yo soy «%s», identidad "
 "del PONG: «%s»\n"
 
-#: src/core/gnunet-service-core_kx.c:974
+#: src/core/gnunet-service-core_kx.c:975
 msgid "# PONG messages created"
 msgstr "# mensajes PONG creados"
 
-#: src/core/gnunet-service-core_kx.c:1000
+#: src/core/gnunet-service-core_kx.c:1001
 msgid "# sessions terminated by timeout"
 msgstr "# sesiones terminadas por plazo de expiración"
 
-#: src/core/gnunet-service-core_kx.c:1010
+#: src/core/gnunet-service-core_kx.c:1011
 msgid "# keepalive messages sent"
 msgstr "# mensajes «keepalive» enviados"
 
-#: src/core/gnunet-service-core_kx.c:1067
-#: src/transport/gnunet-service-transport_validation.c:1224
+#: src/core/gnunet-service-core_kx.c:1068
+#: src/transport/gnunet-service-transport_validation.c:1233
 msgid "# PONG messages received"
 msgstr "# mensajes PONG recibidos"
 
-#: src/core/gnunet-service-core_kx.c:1073
+#: src/core/gnunet-service-core_kx.c:1074
 #, fuzzy
 msgid "# PONG messages dropped (connection down)"
 msgstr "# mensajes PONG recibidos"
 
-#: src/core/gnunet-service-core_kx.c:1078
+#: src/core/gnunet-service-core_kx.c:1079
 #, fuzzy
 msgid "# PONG messages dropped (out of order)"
 msgstr "# Mensajes P2P omitidos debido a saturación de la cola"
 
-#: src/core/gnunet-service-core_kx.c:1108
+#: src/core/gnunet-service-core_kx.c:1109
 msgid "# PONG messages decrypted"
 msgstr "# mensajes PONG descifrados"
 
-#: src/core/gnunet-service-core_kx.c:1142
+#: src/core/gnunet-service-core_kx.c:1143
 msgid "# session keys confirmed via PONG"
 msgstr "# claves de sesión confirmadas vía PONG"
 
-#: src/core/gnunet-service-core_kx.c:1152
+#: src/core/gnunet-service-core_kx.c:1153
 #, fuzzy
 msgid "# timeouts prevented via PONG"
 msgstr "# bytes recibidos vía TCP"
 
-#: src/core/gnunet-service-core_kx.c:1159
+#: src/core/gnunet-service-core_kx.c:1160
 msgid "# rekey operations confirmed via PONG"
 msgstr "# operaciones de cambio de clave confirmadas vía PONG"
 
-#: src/core/gnunet-service-core_kx.c:1299
+#: src/core/gnunet-service-core_kx.c:1300
 #, fuzzy
 msgid "# DATA message dropped (out of order)"
 msgstr "# bytes omitidos (fuera de secuencia)"
 
-#: src/core/gnunet-service-core_kx.c:1306
+#: src/core/gnunet-service-core_kx.c:1307
 #, c-format
 msgid ""
 "Session to peer `%s' went down due to key expiration (should not happen)\n"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1309
+#: src/core/gnunet-service-core_kx.c:1310
 #, fuzzy
 msgid "# sessions terminated by key expiration"
 msgstr "# sesiones terminadas por plazo de expiración"
 
-#: src/core/gnunet-service-core_kx.c:1352
-#: src/core/gnunet-service-core_kx.c:1377
+#: src/core/gnunet-service-core_kx.c:1353
+#: src/core/gnunet-service-core_kx.c:1378
 msgid "# bytes dropped (duplicates)"
 msgstr "# bytes omitidos (duplicados)"
 
-#: src/core/gnunet-service-core_kx.c:1364
+#: src/core/gnunet-service-core_kx.c:1365
 msgid "# bytes dropped (out of sequence)"
 msgstr "# bytes omitidos (fuera de secuencia)"
 
-#: src/core/gnunet-service-core_kx.c:1405
+#: src/core/gnunet-service-core_kx.c:1406
 msgid "# bytes dropped (ancient message)"
 msgstr "# bytes omitidos (mensaje antiguo)"
 
-#: src/core/gnunet-service-core_kx.c:1413
+#: src/core/gnunet-service-core_kx.c:1414
 msgid "# bytes of payload decrypted"
 msgstr "# bytes de «payload» descifrados"
 
-#: src/core/gnunet-service-core_kx.c:1444
+#: src/core/gnunet-service-core_kx.c:1445
 #, fuzzy
 msgid "# PAYLOAD dropped (out of order)"
 msgstr "# bytes omitidos (fuera de secuencia)"
@@ -857,26 +1226,26 @@ msgstr "# bytes cifrados dados al transporte"
 msgid "Unsupported message of type %u (%u bytes) received from peer `%s'\n"
 msgstr "Mensaje no soportado del tipo %u (%u bytes) recibido del par «%s»\n"
 
-#: src/core/gnunet-service-core_sessions.c:209
-#: src/core/gnunet-service-core_sessions.c:279
-#: src/dht/gnunet-service-dht_neighbours.c:641
-#: src/dht/gnunet-service-dht_neighbours.c:700
-#: src/fs/gnunet-service-fs_cp.c:601 src/fs/gnunet-service-fs_cp.c:1495
-#: src/topology/gnunet-daemon-topology.c:700
-#: src/topology/gnunet-daemon-topology.c:801
-#: src/transport/gnunet-service-transport_neighbours.c:1041
-#: src/transport/gnunet-service-transport_neighbours.c:1265
-#: src/transport/gnunet-service-transport_neighbours.c:1274
+#: src/core/gnunet-service-core_sessions.c:208
+#: src/core/gnunet-service-core_sessions.c:278
+#: src/dht/gnunet-service-dht_neighbours.c:662
+#: src/dht/gnunet-service-dht_neighbours.c:727
+#: src/fs/gnunet-service-fs_cp.c:604 src/fs/gnunet-service-fs_cp.c:1499
+#: src/topology/gnunet-daemon-topology.c:706
+#: src/topology/gnunet-daemon-topology.c:807
+#: src/transport/gnunet-service-transport_neighbours.c:904
+#: src/transport/gnunet-service-transport_neighbours.c:1129
+#: src/transport/gnunet-service-transport_neighbours.c:1138
 #: src/transport/gnunet-service-transport_neighbours.c:2799
-#: src/transport/gnunet-service-transport_neighbours.c:3053
+#: src/transport/gnunet-service-transport_neighbours.c:3052
 msgid "# peers connected"
 msgstr "# pares conectados"
 
-#: src/core/gnunet-service-core_sessions.c:247
+#: src/core/gnunet-service-core_sessions.c:246
 msgid "# type map refreshes sent"
 msgstr "# envíos de refrescos del mapa de tipos"
 
-#: src/core/gnunet-service-core_sessions.c:416
+#: src/core/gnunet-service-core_sessions.c:415
 msgid "# messages discarded (expired prior to transmission)"
 msgstr "# mensajes descartados (expirados antes de su transmisión)"
 
@@ -939,11 +1308,13 @@ msgstr "Caché de datos Postgres ejecutándose\n"
 #: src/datastore/plugin_datastore_sqlite.c:57 src/mysql/mysql.c:41
 #: src/mysql/mysql.c:48 src/mysql/mysql.c:522 src/mysql/mysql.c:531
 #: src/mysql/mysql.c:591 src/mysql/mysql.c:607
+#: src/namecache/plugin_namecache_postgres.c:52
+#: src/namecache/plugin_namecache_sqlite.c:52
 #: src/namestore/plugin_namestore_postgres.c:52
-#: src/namestore/plugin_namestore_sqlite.c:51
-#: src/testbed/testbed_api_hosts.c:69 src/util/crypto_ecc.c:54
-#: src/include/gnunet_common.h:654 src/include/gnunet_common.h:663
-#: src/scalarproduct/scalarproduct.h:56
+#: src/namestore/plugin_namestore_sqlite.c:52
+#: src/testbed/testbed_api_hosts.c:69 src/util/crypto_ecc.c:53
+#: src/include/gnunet_common.h:602 src/include/gnunet_common.h:611
+#: src/scalarproduct/scalarproduct.h:61
 #, c-format
 msgid "`%s' failed at %s:%d with error: %s\n"
 msgstr "«%s» falló en %s: %d con el error: %s\n"
@@ -954,7 +1325,8 @@ msgstr "Caché de datos Sqlite ejecutándose\n"
 
 #: src/datacache/plugin_datacache_sqlite.c:484
 #: src/datastore/plugin_datastore_sqlite.c:401
-#: src/namestore/plugin_namestore_sqlite.c:374
+#: src/namecache/plugin_namecache_sqlite.c:295
+#: src/namestore/plugin_namestore_sqlite.c:327
 msgid "Tried to close sqlite without finalizing all prepared statements.\n"
 msgstr ""
 "Se intentó cerrar sqlite sin finalizar todas las sentencias preparadas.\n"
@@ -996,7 +1368,7 @@ msgstr "# Peticiones omitidas de la cola del almacén de datos"
 msgid "# datastore connections (re)created"
 msgstr "# conexiones a almacenes de datos (re)creadas"
 
-#: src/datastore/datastore_api.c:608 src/scalarproduct/scalarproduct_api.c:276
+#: src/datastore/datastore_api.c:608 src/scalarproduct/scalarproduct_api.c:279
 msgid "# transmission request failures"
 msgstr "# fallos en peticiones de transmisión"
 
@@ -1269,7 +1641,8 @@ msgid "Failed to drop table from database.\n"
 msgstr "Se produjo un fallo al borrar una tabla de la base de datos.\n"
 
 #: src/datastore/plugin_datastore_postgres.c:860
-#: src/namestore/plugin_namestore_postgres.c:735
+#: src/namecache/plugin_namecache_postgres.c:414
+#: src/namestore/plugin_namestore_postgres.c:564
 msgid "Postgres database running\n"
 msgstr "Base de datos Postgres ejecutándose\n"
 
@@ -1279,7 +1652,8 @@ msgid "`%s' failed at %s:%u with error: %s"
 msgstr "«%s» falló en %s:%u con el error: %s"
 
 #: src/datastore/plugin_datastore_sqlite.c:253
-#: src/namestore/plugin_namestore_sqlite.c:220
+#: src/namecache/plugin_namecache_sqlite.c:193
+#: src/namestore/plugin_namestore_sqlite.c:204
 #: src/psycstore/plugin_psycstore_sqlite.c:319
 #, c-format
 msgid "Unable to initialize SQLite: %s.\n"
@@ -1307,7 +1681,8 @@ msgstr ""
 "páginas de %llu bytes de tamaño)\n"
 
 #: src/datastore/plugin_datastore_sqlite.c:1194
-#: src/namestore/plugin_namestore_sqlite.c:893
+#: src/namecache/plugin_namecache_sqlite.c:583
+#: src/namestore/plugin_namestore_sqlite.c:719
 msgid "Sqlite database running\n"
 msgstr "Base de datos sqlite ejecutándose\n"
 
@@ -1315,7 +1690,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/dht_api.c:375
+#: src/dht/dht_api.c:376
 msgid "Failed to connect to the DHT service!\n"
 msgstr "¡Se produjo un fallo al conectar con el servicio DHT!\n"
 
@@ -1363,9 +1738,9 @@ msgstr "opción para usar el demultiplexado de la DHT siempre"
 
 #: src/dht/gnunet-dht-get.c:201 src/dht/gnunet-dht-monitor.c:271
 #: src/dht/gnunet-dht-put.c:213 src/fs/gnunet-auto-share.c:753
-#: src/fs/gnunet-download.c:328 src/fs/gnunet-publish.c:864
+#: src/fs/gnunet-download.c:328 src/fs/gnunet-publish.c:877
 #: src/fs/gnunet-search.c:294 src/fs/gnunet-unindex.c:168
-#: src/nse/gnunet-nse-profiler.c:904
+#: src/nse/gnunet-nse-profiler.c:873
 msgid "be verbose (print progress information)"
 msgstr "ser prolijo (imprime información de progreso)"
 
@@ -1434,49 +1809,49 @@ msgstr ""
 msgid "Failed to connect to transport service!\n"
 msgstr "¡Se produjo un fallo al conectar con el servicio de transporte!\n"
 
-#: src/dht/gnunet-service-dht_clients.c:414
+#: src/dht/gnunet-service-dht_clients.c:417
 msgid "# GET requests from clients injected"
 msgstr "# peticiones «GET» inyectadas de clientes"
 
-#: src/dht/gnunet-service-dht_clients.c:508
+#: src/dht/gnunet-service-dht_clients.c:511
 msgid "# PUT requests received from clients"
 msgstr "# peticiones «PUT» recibidas de clientes"
 
-#: src/dht/gnunet-service-dht_clients.c:592
+#: src/dht/gnunet-service-dht_clients.c:595
 msgid "# GET requests received from clients"
 msgstr "# peticiones «GET» recibidas de clientes"
 
-#: src/dht/gnunet-service-dht_clients.c:793
+#: src/dht/gnunet-service-dht_clients.c:796
 msgid "# GET STOP requests received from clients"
 msgstr "# peticiones «GET STOP» recibidas de clientes"
 
-#: src/dht/gnunet-service-dht_clients.c:1033
+#: src/dht/gnunet-service-dht_clients.c:1037
 msgid "# Key match, type mismatches in REPLY to CLIENT"
 msgstr ""
 "# Coincidencias de clave, diferencias de tipo en la respuesta (REPLY) del "
 "cliente (CLIENT)"
 
-#: src/dht/gnunet-service-dht_clients.c:1046
+#: src/dht/gnunet-service-dht_clients.c:1050
 msgid "# Duplicate REPLIES to CLIENT request dropped"
 msgstr ""
 "# Peticiones duplicadas de respuestas (REPLIES) a clientes (CLIENT) omitidas"
 
-#: src/dht/gnunet-service-dht_clients.c:1083
+#: src/dht/gnunet-service-dht_clients.c:1087
 #, 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:1106
+#: src/dht/gnunet-service-dht_clients.c:1110
 msgid "# RESULTS queued for clients"
 msgstr "# Resultados (RESULTS) encolados para clientes"
 
-#: src/dht/gnunet-service-dht_clients.c:1157
-#: src/dht/gnunet-service-dht_clients.c:1199
+#: src/dht/gnunet-service-dht_clients.c:1164
+#: src/dht/gnunet-service-dht_clients.c:1206
 msgid "# REPLIES ignored for CLIENTS (no match)"
 msgstr ""
 "# Respuestas (REPLIES) ignoradas para clientes (CLIENTS) (sin coincidencia)"
 
-#: src/dht/gnunet-service-dht_clients.c:1167
+#: src/dht/gnunet-service-dht_clients.c:1174
 msgid "Could not pass reply to client, message too big!\n"
 msgstr ""
 "¡No se pudo enviar respuesta al cliente, el mensaje es demasiado grande!\n"
@@ -1523,106 +1898,106 @@ msgstr "# Peticiones «GET» realizadas a la caché de datos"
 msgid "# HELLOs obtained from peerinfo"
 msgstr "# «HELLO» obtenidos de «peerinfo»"
 
-#: src/dht/gnunet-service-dht_neighbours.c:501
+#: src/dht/gnunet-service-dht_neighbours.c:516
 msgid "# Preference updates given to core"
 msgstr "# Actualizaciones de preferencias dadas al servicio principal"
 
-#: src/dht/gnunet-service-dht_neighbours.c:591
+#: src/dht/gnunet-service-dht_neighbours.c:610
 msgid "# FIND PEER messages initiated"
 msgstr "# mensajes «FIND PEER» iniciados"
 
-#: src/dht/gnunet-service-dht_neighbours.c:734
+#: src/dht/gnunet-service-dht_neighbours.c:764
 msgid "# Queued messages discarded (peer disconnected)"
 msgstr "# Mensajes encolados descartados (par desconectado)"
 
-#: src/dht/gnunet-service-dht_neighbours.c:789
+#: src/dht/gnunet-service-dht_neighbours.c:819
 msgid "# Bytes transmitted to other peers"
 msgstr "# Bytes transmitidos a otros pares"
 
-#: src/dht/gnunet-service-dht_neighbours.c:827
+#: src/dht/gnunet-service-dht_neighbours.c:857
 msgid "# Bytes of bandwidth requested from core"
 msgstr "# Bytes de ancho de banda solicitados por el servicio principal"
 
-#: src/dht/gnunet-service-dht_neighbours.c:859
+#: src/dht/gnunet-service-dht_neighbours.c:889
 #, fuzzy
 msgid "# requests TTL-dropped"
 msgstr "# peticiones unidas"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1052
-#: src/dht/gnunet-service-dht_neighbours.c:1086
+#: src/dht/gnunet-service-dht_neighbours.c:1093
+#: src/dht/gnunet-service-dht_neighbours.c:1130
 msgid "# Peers excluded from routing due to Bloomfilter"
 msgstr "# Pares excluidos del encaminado debido a «Bloomfilter»"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1067
-#: src/dht/gnunet-service-dht_neighbours.c:1101
+#: src/dht/gnunet-service-dht_neighbours.c:1108
+#: src/dht/gnunet-service-dht_neighbours.c:1145
 msgid "# Peer selection failed"
 msgstr "# Selecciones de pares fallidas"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1235
+#: src/dht/gnunet-service-dht_neighbours.c:1287
 msgid "# PUT requests routed"
 msgstr "# Peticiones «PUT» encaminadas"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1264
+#: src/dht/gnunet-service-dht_neighbours.c:1316
 msgid "# PUT messages queued for transmission"
 msgstr "# mensajes «PUT» encolados para transmisión"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1271
-#: src/dht/gnunet-service-dht_neighbours.c:1384
-#: src/dht/gnunet-service-dht_neighbours.c:1484
+#: src/dht/gnunet-service-dht_neighbours.c:1323
+#: src/dht/gnunet-service-dht_neighbours.c:1440
+#: src/dht/gnunet-service-dht_neighbours.c:1543
 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:1349
+#: src/dht/gnunet-service-dht_neighbours.c:1405
 msgid "# GET requests routed"
 msgstr "# Peticiones «GET» encaminadas"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1376
+#: src/dht/gnunet-service-dht_neighbours.c:1432
 msgid "# GET messages queued for transmission"
 msgstr "# Mensajes «GET» encolados para transmisión"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1491
+#: src/dht/gnunet-service-dht_neighbours.c:1550
 msgid "# RESULT messages queued for transmission"
 msgstr "# Mensajes «RESULT» encolados para transmisión"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1573
+#: src/dht/gnunet-service-dht_neighbours.c:1637
 msgid "# P2P PUT requests received"
 msgstr "# Peticiones «PUT» P2P recibidas"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1576
+#: src/dht/gnunet-service-dht_neighbours.c:1640
 #, fuzzy
 msgid "# P2P PUT bytes received"
 msgstr "# Peticiones «PUT» P2P recibidas"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1731
+#: src/dht/gnunet-service-dht_neighbours.c:1803
 msgid "# FIND PEER requests ignored due to Bloomfilter"
 msgstr "# Peticiones «FIND PEER» ignoradas debido a «Bloomfilter»"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1739
+#: src/dht/gnunet-service-dht_neighbours.c:1811
 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:1830
+#: src/dht/gnunet-service-dht_neighbours.c:1904
 msgid "# P2P GET requests received"
 msgstr "# Peticiones «GET» P2P recibidas"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1833
+#: src/dht/gnunet-service-dht_neighbours.c:1907
 #, fuzzy
 msgid "# P2P GET bytes received"
 msgstr "# Peticiones «GET» P2P recibidas"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1886
+#: src/dht/gnunet-service-dht_neighbours.c:1961
 msgid "# P2P FIND PEER requests processed"
 msgstr "# Peticiones «FIND PEER» P2P procesadas"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1900
+#: src/dht/gnunet-service-dht_neighbours.c:1975
 msgid "# P2P GET requests ONLY routed"
 msgstr "# Peticiones «GET» P2P SOLAMENTE encaminadas"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1977
+#: src/dht/gnunet-service-dht_neighbours.c:2052
 msgid "# P2P RESULTS received"
 msgstr "# Resultados (RESULTS) P2P recibidos"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1980
+#: src/dht/gnunet-service-dht_neighbours.c:2055
 #, fuzzy
 msgid "# P2P RESULT bytes received"
 msgstr "# Resultados (RESULTS) P2P recibidos"
@@ -1669,55 +2044,55 @@ msgstr "# Entradas añadidas a la tabla de encaminamiento"
 msgid "# DHT requests combined"
 msgstr "# Peticiones a la DHT combinadas"
 
-#: src/dht/plugin_block_dht.c:136
+#: src/dht/plugin_block_dht.c:138
 #, c-format
 msgid "Block not of type %u\n"
 msgstr "El bloque no es del tipo %u\n"
 
-#: src/dht/plugin_block_dht.c:143
+#: src/dht/plugin_block_dht.c:145
 msgid "Size mismatch for block\n"
 msgstr "Discrepancias de tamaños para el bloque\n"
 
-#: src/dht/plugin_block_dht.c:152
+#: src/dht/plugin_block_dht.c:154
 #, c-format
 msgid "Block of type %u is malformed\n"
 msgstr "El bloque del tipo %u está mal formado\n"
 
-#: src/dns/dnsparser.c:233
+#: src/dns/dnsparser.c:239
 #, c-format
 msgid "Failed to convert DNS IDNA name `%s' to UTF-8: %s\n"
 msgstr ""
 "Se produjo un fallo al convertir el nombre en formato DNS IDNA «%s» a UTF-8: "
 "%s\n"
 
-#: src/dns/dnsparser.c:751
+#: src/dns/dnsparser.c:800
 #, c-format
 msgid "Failed to convert UTF-8 name `%s' to DNS IDNA format: %s\n"
 msgstr ""
 "Se produjo un fallo al convertir el nombre en UTF-8 «%s» al formato DNS "
 "IDNA: %s\n"
 
-#: src/dns/dnsstub.c:176
+#: src/dns/dnsstub.c:175
 #, c-format
 msgid "Could not bind to any port: %s\n"
 msgstr "No se pudo asociar con ningún puerto: %s\n"
 
-#: src/dns/dnsstub.c:296 src/dns/dnsstub.c:384
+#: src/dns/dnsstub.c:295 src/dns/dnsstub.c:383
 #, c-format
 msgid "Failed to send DNS request to %s\n"
 msgstr "Se produjo un fallo al mandar la petición DNS a %s\n"
 
-#: src/dns/dnsstub.c:300
+#: src/dns/dnsstub.c:299
 #, c-format
 msgid "Sent DNS request to %s\n"
 msgstr "Petición DNS enviada a %s\n"
 
-#: src/dns/dnsstub.c:369
+#: src/dns/dnsstub.c:368
 #, c-format
 msgid "Configured DNS exit `%s' is not working / valid.\n"
 msgstr "La salida DNS configurada «%s» no funciona o no es válida.\n"
 
-#: src/dns/dnsstub.c:441
+#: src/dns/dnsstub.c:440
 #, c-format
 msgid "Received DNS response that is too small (%u bytes)"
 msgstr "Recibida respuesta DNS demasiado pequeña (%u bytes)"
@@ -1783,12 +2158,12 @@ 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:1049 src/exit/gnunet-daemon-exit.c:3359
+#: src/dns/gnunet-service-dns.c:1049 src/exit/gnunet-daemon-exit.c:3498
 #, c-format
 msgid "`%s' must be installed SUID, refusing to run\n"
 msgstr "«%s» debe ser instalado con SUID, se niega a arrancar\n"
 
-#: src/dns/gnunet-service-dns.c:1069 src/exit/gnunet-daemon-exit.c:3415
+#: src/dns/gnunet-service-dns.c:1069 src/exit/gnunet-daemon-exit.c:3555
 msgid "need a valid IPv4 or IPv6 address\n"
 msgstr "se necesita una dirección IPv4 o IPv6 válida\n"
 
@@ -1801,170 +2176,170 @@ msgstr ""
 msgid "Print information about DV state"
 msgstr "Imprime información acerca del estado del ATS"
 
-#: src/exit/gnunet-daemon-exit.c:756
+#: src/exit/gnunet-daemon-exit.c:802
 #, 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:807
+#: src/exit/gnunet-daemon-exit.c:853
 msgid "# Bytes transmitted via mesh tunnels"
 msgstr "# Bytes transmitidos vía túneles MESH"
 
-#: src/exit/gnunet-daemon-exit.c:924 src/exit/gnunet-daemon-exit.c:2349
-#: src/exit/gnunet-daemon-exit.c:2606 src/vpn/gnunet-service-vpn.c:1451
-#: src/vpn/gnunet-service-vpn.c:1850 src/vpn/gnunet-service-vpn.c:2013
+#: src/exit/gnunet-daemon-exit.c:970 src/exit/gnunet-daemon-exit.c:2394
+#: src/exit/gnunet-daemon-exit.c:2651 src/vpn/gnunet-service-vpn.c:1409
+#: src/vpn/gnunet-service-vpn.c:1799 src/vpn/gnunet-service-vpn.c:1962
 msgid "# ICMPv4 packets dropped (type not allowed)"
 msgstr "# Paquetes ICMPv4 omitidos (tipo no permitido)"
 
-#: src/exit/gnunet-daemon-exit.c:961 src/exit/gnunet-daemon-exit.c:2408
-#: src/exit/gnunet-daemon-exit.c:2665 src/vpn/gnunet-service-vpn.c:1507
-#: src/vpn/gnunet-service-vpn.c:1909 src/vpn/gnunet-service-vpn.c:2046
+#: src/exit/gnunet-daemon-exit.c:1007 src/exit/gnunet-daemon-exit.c:2453
+#: src/exit/gnunet-daemon-exit.c:2710 src/vpn/gnunet-service-vpn.c:1465
+#: src/vpn/gnunet-service-vpn.c:1858 src/vpn/gnunet-service-vpn.c:1995
 msgid "# ICMPv6 packets dropped (type not allowed)"
 msgstr "# Paquetes ICMPv6 omitidos (tipo no permitido)"
 
-#: src/exit/gnunet-daemon-exit.c:1001
+#: src/exit/gnunet-daemon-exit.c:1047
 msgid "# ICMP packets dropped (not allowed)"
 msgstr "# Paquetes ICMP omitidos (tipo no permitido)"
 
-#: src/exit/gnunet-daemon-exit.c:1008
+#: src/exit/gnunet-daemon-exit.c:1054
 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:1084
+#: src/exit/gnunet-daemon-exit.c:1130
 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:1158
+#: src/exit/gnunet-daemon-exit.c:1204
 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:1210
+#: src/exit/gnunet-daemon-exit.c:1256
 msgid "# Packets received from TUN"
 msgstr "# Paquetes recibidos de TUN"
 
-#: src/exit/gnunet-daemon-exit.c:1224
+#: src/exit/gnunet-daemon-exit.c:1270
 msgid "# Bytes received from TUN"
 msgstr "# Bytes recibidos de TUN"
 
-#: src/exit/gnunet-daemon-exit.c:1250
+#: src/exit/gnunet-daemon-exit.c:1296
 msgid "IPv4 packet options received.  Ignored.\n"
 msgstr "Opciones de paquete IPv4 recibidas.  Ignoradas.\n"
 
-#: src/exit/gnunet-daemon-exit.c:1277
+#: src/exit/gnunet-daemon-exit.c:1323
 #, 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:1323
+#: src/exit/gnunet-daemon-exit.c:1369
 #, 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:1331
+#: src/exit/gnunet-daemon-exit.c:1377
 #, 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:1713
+#: src/exit/gnunet-daemon-exit.c:1759
 msgid "# TCP packets sent via TUN"
 msgstr "# Paquetes TCP enviados vía TUN"
 
-#: src/exit/gnunet-daemon-exit.c:1826
+#: src/exit/gnunet-daemon-exit.c:1872
 msgid "# TCP service creation requests received via mesh"
 msgstr "# Peticiones de creaciones de servicio TCP recibidas vía mesh"
 
-#: src/exit/gnunet-daemon-exit.c:1829 src/exit/gnunet-daemon-exit.c:1919
-#: src/exit/gnunet-daemon-exit.c:2035 src/exit/gnunet-daemon-exit.c:2273
-#: src/exit/gnunet-daemon-exit.c:2522 src/exit/gnunet-daemon-exit.c:2811
-#: src/exit/gnunet-daemon-exit.c:2918
+#: src/exit/gnunet-daemon-exit.c:1875 src/exit/gnunet-daemon-exit.c:1965
+#: src/exit/gnunet-daemon-exit.c:2070 src/exit/gnunet-daemon-exit.c:2318
+#: src/exit/gnunet-daemon-exit.c:2567 src/exit/gnunet-daemon-exit.c:2856
+#: src/exit/gnunet-daemon-exit.c:2963
 msgid "# Bytes received from MESH"
 msgstr "# Bytes recibidos de MESH"
 
-#: src/exit/gnunet-daemon-exit.c:1861 src/exit/gnunet-daemon-exit.c:2940
+#: src/exit/gnunet-daemon-exit.c:1907 src/exit/gnunet-daemon-exit.c:2985
 #, c-format
 msgid "No service found for %s on port %d!\n"
 msgstr "¡Ningún servicio encontrado para %s en el puerto %d!\n"
 
-#: src/exit/gnunet-daemon-exit.c:1865
+#: src/exit/gnunet-daemon-exit.c:1911
 msgid "# TCP requests dropped (no such service)"
 msgstr "# Peticiones TCP omitidas (no existe tal servicio)"
 
-#: src/exit/gnunet-daemon-exit.c:1922
+#: src/exit/gnunet-daemon-exit.c:1968
 msgid "# TCP IP-exit creation requests received via mesh"
 msgstr "# Peticiones de creación de salida IP por TCP recibidas vía mesh"
 
-#: src/exit/gnunet-daemon-exit.c:2038
+#: src/exit/gnunet-daemon-exit.c:2073
 msgid "# TCP data requests received via mesh"
 msgstr "# Peticiones de datos TCP recibidas vía mesh"
 
-#: src/exit/gnunet-daemon-exit.c:2052
+#: src/exit/gnunet-daemon-exit.c:2087
 msgid "# TCP DATA requests dropped (no session)"
 msgstr "# Peticiones de datos (DATA) TCP omitidas (no hay sesión)"
 
-#: src/exit/gnunet-daemon-exit.c:2102
+#: src/exit/gnunet-daemon-exit.c:2147
 msgid "# ICMP packets sent via TUN"
 msgstr "# Paquetes ICMP enviados vía TUN"
 
-#: src/exit/gnunet-daemon-exit.c:2276
+#: src/exit/gnunet-daemon-exit.c:2321
 msgid "# ICMP IP-exit requests received via mesh"
 msgstr "# Peticiones de salida IP por ICMP recibidas vía mesh"
 
-#: src/exit/gnunet-daemon-exit.c:2525
+#: src/exit/gnunet-daemon-exit.c:2570
 msgid "# ICMP service requests received via mesh"
 msgstr "# Peticiones de servicio ICMP recibidas vía mesh"
 
-#: src/exit/gnunet-daemon-exit.c:2591 src/vpn/gnunet-service-vpn.c:1441
-#: src/vpn/gnunet-service-vpn.c:2007
+#: src/exit/gnunet-daemon-exit.c:2636 src/vpn/gnunet-service-vpn.c:1399
+#: src/vpn/gnunet-service-vpn.c:1956
 msgid "# ICMPv4 packets dropped (impossible PT to v6)"
 msgstr "# Paquetes ICMPv4 omitidos (imposible atravesar v6)"
 
-#: src/exit/gnunet-daemon-exit.c:2650 src/vpn/gnunet-service-vpn.c:1477
-#: src/vpn/gnunet-service-vpn.c:1489 src/vpn/gnunet-service-vpn.c:1897
+#: src/exit/gnunet-daemon-exit.c:2695 src/vpn/gnunet-service-vpn.c:1435
+#: src/vpn/gnunet-service-vpn.c:1447 src/vpn/gnunet-service-vpn.c:1846
 msgid "# ICMPv6 packets dropped (impossible PT to v4)"
 msgstr "# Paquetes ICMPv6 omitidos (imposible atravesar v4)"
 
-#: src/exit/gnunet-daemon-exit.c:2700
+#: src/exit/gnunet-daemon-exit.c:2745
 msgid "# UDP packets sent via TUN"
 msgstr "# Paquetes UDP enviados vía TUN"
 
-#: src/exit/gnunet-daemon-exit.c:2814
+#: src/exit/gnunet-daemon-exit.c:2859
 msgid "# UDP IP-exit requests received via mesh"
 msgstr "# Peticiones de salida IP por UDP recibidas vía mesh"
 
-#: src/exit/gnunet-daemon-exit.c:2921
+#: src/exit/gnunet-daemon-exit.c:2966
 msgid "# UDP service requests received via mesh"
 msgstr "# Peticiones de servicio UDP recibidas vía mesh"
 
-#: src/exit/gnunet-daemon-exit.c:2944
+#: src/exit/gnunet-daemon-exit.c:2989
 msgid "# UDP requests dropped (no such service)"
 msgstr "# Peticiones UDP omitidas (no existe tal servicio)"
 
-#: src/exit/gnunet-daemon-exit.c:2977
+#: src/exit/gnunet-daemon-exit.c:3024
 msgid "# Inbound MESH tunnels created"
 msgstr "# Túneles interiores MESH creados"
 
-#: src/exit/gnunet-daemon-exit.c:3216
+#: src/exit/gnunet-daemon-exit.c:3285
 #, 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:3230 src/exit/gnunet-daemon-exit.c:3242
+#: src/exit/gnunet-daemon-exit.c:3299 src/exit/gnunet-daemon-exit.c:3311
 #, 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:3253
+#: src/exit/gnunet-daemon-exit.c:3322
 #, 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:3372
+#: src/exit/gnunet-daemon-exit.c:3511
 msgid ""
 "This system does not support IPv4, will disable IPv4 functions despite them "
 "being enabled in the configuration\n"
@@ -1972,7 +2347,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:3380
+#: src/exit/gnunet-daemon-exit.c:3519
 msgid ""
 "This system does not support IPv6, will disable IPv6 functions despite them "
 "being enabled in the configuration\n"
@@ -1980,7 +2355,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:3387
+#: src/exit/gnunet-daemon-exit.c:3526
 msgid ""
 "Cannot enable IPv4 exit but disable IPv4 on TUN interface, will use "
 "ENABLE_IPv4=YES\n"
@@ -1988,7 +2363,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:3393
+#: src/exit/gnunet-daemon-exit.c:3532
 msgid ""
 "Cannot enable IPv6 exit but disable IPv6 on TUN interface, will use "
 "ENABLE_IPv6=YES\n"
@@ -1996,156 +2371,145 @@ 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:3399 src/pt/gnunet-daemon-pt.c:887
+#: src/exit/gnunet-daemon-exit.c:3538 src/pt/gnunet-daemon-pt.c:1248
 msgid "No useful service enabled.  Exiting.\n"
 msgstr "Ningún servicio útil habilitado.  Saliendo.\n"
 
-#: src/exit/gnunet-daemon-exit.c:3647
+#: src/exit/gnunet-daemon-exit.c:3654
+msgid "Must be a number"
+msgstr ""
+
+#: src/exit/gnunet-daemon-exit.c:3796
 msgid "Daemon to run to provide an IP exit node for the VPN"
 msgstr "Demonio a ejecutar para obtener un nodo de salida IP para la VPN"
 
-#: src/experimentation/gnunet-daemon-experimentation.c:56
+#: src/experimentation/gnunet-daemon-experimentation.c:55
 msgid "Experimentation daemon shutting down ...\n"
 msgstr ""
 
-#: src/experimentation/gnunet-daemon-experimentation.c:78
+#: src/experimentation/gnunet-daemon-experimentation.c:77
 msgid "Experimentation daemon starting ...\n"
 msgstr ""
 
-#: src/experimentation/gnunet-daemon-experimentation.c:84
+#: src/experimentation/gnunet-daemon-experimentation.c:83
 #, fuzzy
 msgid "Failed to create statistics!\n"
 msgstr "Se produjo un fallo al crear los índices\n"
 
-#: src/experimentation/gnunet-daemon-experimentation.c:121
+#: src/experimentation/gnunet-daemon-experimentation.c:120
 msgid "GNUnet experimentation daemon"
 msgstr ""
 
-#: src/experimentation/gnunet-daemon-experimentation_experiments.c:264
+#: src/experimentation/gnunet-daemon-experimentation_experiments.c:241
 #, c-format
 msgid "Experiment `%s': Experiment signature is invalid\n"
 msgstr ""
 
-#: src/experimentation/gnunet-daemon-experimentation_experiments.c:271
+#: src/experimentation/gnunet-daemon-experimentation_experiments.c:250
 #, c-format
 msgid ""
 "Adding experiment `%s' running from `%s' to `%s' every %llu sec. for %llu "
 "sec. \n"
 msgstr ""
 
-#: src/experimentation/gnunet-daemon-experimentation_experiments.c:316
+#: src/experimentation/gnunet-daemon-experimentation_experiments.c:303
 #, c-format
 msgid "Experiment `%s': Issuer missing\n"
 msgstr ""
 
-#: src/experimentation/gnunet-daemon-experimentation_experiments.c:321
+#: src/experimentation/gnunet-daemon-experimentation_experiments.c:312
 #, c-format
 msgid "Experiment `%s': Issuer invalid\n"
 msgstr ""
 
-#: src/experimentation/gnunet-daemon-experimentation_experiments.c:327
+#: src/experimentation/gnunet-daemon-experimentation_experiments.c:320
 #, c-format
 msgid "Experiment `%s': Issuer not accepted!\n"
 msgstr ""
 
-#: src/experimentation/gnunet-daemon-experimentation_experiments.c:336
+#: src/experimentation/gnunet-daemon-experimentation_experiments.c:330
 #, c-format
 msgid "Experiment `%s': Version missing or invalid \n"
 msgstr ""
 
-#: src/experimentation/gnunet-daemon-experimentation_experiments.c:344
+#: src/experimentation/gnunet-daemon-experimentation_experiments.c:339
 #, c-format
 msgid "Experiment `%s': Required capabilities missing \n"
 msgstr ""
 
-#: src/experimentation/gnunet-daemon-experimentation_experiments.c:349
+#: src/experimentation/gnunet-daemon-experimentation_experiments.c:345
 #, c-format
 msgid "Experiment `%s': Required capabilities invalid \n"
 msgstr ""
 
-#: src/experimentation/gnunet-daemon-experimentation_experiments.c:392
+#: src/experimentation/gnunet-daemon-experimentation_experiments.c:390
 #, fuzzy, c-format
 msgid "Failed to parse file `%s'\n"
 msgstr "Se produjo un fallo al procesar «HELLO» en el fichero «%s»\n"
 
-#: src/experimentation/gnunet-daemon-experimentation_experiments.c:418
-#: src/experimentation/gnunet-daemon-experimentation_experiments.c:443
+#: src/experimentation/gnunet-daemon-experimentation_experiments.c:420
+#: src/experimentation/gnunet-daemon-experimentation_experiments.c:452
 msgid ""
-"No valid experiment issuers configured! Set value to peer id of issuer! "
-"Exit...\n"
+"No valid experiment issuers configured! Set value to public keys of issuers! "
+"Exiting.\n"
 msgstr ""
 
-#: src/experimentation/gnunet-daemon-experimentation_experiments.c:428
-#, fuzzy, c-format
-msgid "Invalid value `%s'\n"
-msgstr "Parámetro no válido «%s»\n"
-
-#: src/experimentation/gnunet-daemon-experimentation_experiments.c:452
-#, fuzzy, c-format
-msgid "Invalid public key `%s'\n"
+#: src/experimentation/gnunet-daemon-experimentation_experiments.c:435
+#, fuzzy
+msgid "Invalid value for public key\n"
 msgstr "Parámetro no válido «%s»\n"
 
-#: src/experimentation/gnunet-daemon-experimentation_experiments.c:459
-#, fuzzy, c-format
-msgid "Found issuer for public key `%s'\n"
-msgstr "Encontrados %u módulos de transporte: «%s»\n"
-
-#: src/experimentation/gnunet-daemon-experimentation_experiments.c:462
-#, fuzzy, c-format
-msgid "No issuer for public key `%s'\n"
-msgstr "No se han encontrado ficheros en «%s»\n"
-
-#: src/experimentation/gnunet-daemon-experimentation_experiments.c:479
+#: src/experimentation/gnunet-daemon-experimentation_experiments.c:473
 #, fuzzy, c-format
 msgid "Cannot read experiments file `%s'\n"
 msgstr "No se pudo leer la lista de amigos «%s»\n"
 
-#: src/experimentation/gnunet-daemon-experimentation_nodes.c:221
+#: src/experimentation/gnunet-daemon-experimentation_nodes.c:219
 #, c-format
 msgid "Cannot send message to peer `%s' for experiment `%s'\n"
 msgstr ""
 
-#: src/experimentation/gnunet-daemon-experimentation_nodes.c:291
+#: src/experimentation/gnunet-daemon-experimentation_nodes.c:307
 #, c-format
 msgid "Sending experimentation request to peer %s\n"
 msgstr ""
 
-#: src/experimentation/gnunet-daemon-experimentation_nodes.c:422
+#: src/experimentation/gnunet-daemon-experimentation_nodes.c:451
 #, c-format
 msgid "Added peer `%s' as active node\n"
 msgstr ""
 
-#: src/experimentation/gnunet-daemon-experimentation_nodes.c:849
+#: src/experimentation/gnunet-daemon-experimentation_nodes.c:889
 #, fuzzy, c-format
 msgid "Connected to peer %s\n"
 msgstr "Conectado a %s.\n"
 
-#: src/experimentation/gnunet-daemon-experimentation_nodes.c:878
+#: src/experimentation/gnunet-daemon-experimentation_nodes.c:919
 #, fuzzy, c-format
 msgid "Disconnected from peer %s\n"
 msgstr "Desconectado de %s\n"
 
-#: src/experimentation/gnunet-daemon-experimentation_nodes.c:1058
+#: src/experimentation/gnunet-daemon-experimentation_nodes.c:1102
 #, fuzzy
 msgid "Failed to connect to CORE service!\n"
 msgstr "¡Se produjo un fallo al conectar con el servicio DHT!\n"
 
-#: src/experimentation/gnunet-daemon-experimentation_scheduler.c:109
+#: src/experimentation/gnunet-daemon-experimentation_scheduler.c:108
 #, c-format
 msgid "Peer `%s' did not respond to request for experiment `%s'\n"
 msgstr ""
 
-#: src/experimentation/gnunet-daemon-experimentation_scheduler.c:144
+#: src/experimentation/gnunet-daemon-experimentation_scheduler.c:143
 #, fuzzy, c-format
 msgid "Starting inbound experiment `%s' with peer `%s'\n"
 msgstr "Iniciando el servicio %s para el par «%4s»\n"
 
-#: src/experimentation/gnunet-daemon-experimentation_scheduler.c:278
+#: src/experimentation/gnunet-daemon-experimentation_scheduler.c:276
 #, fuzzy, c-format
 msgid "Starting outbound experiment `%s' with peer `%s'\n"
 msgstr "Iniciando el servicio %s para el par «%4s»\n"
 
-#: src/experimentation/gnunet-daemon-experimentation_scheduler.c:296
+#: src/experimentation/gnunet-daemon-experimentation_scheduler.c:294
 #, fuzzy, c-format
 msgid "Received %s message from peer %s for experiment `%s'\n"
 msgstr "Recibido último mensaje para %s\n"
@@ -2214,63 +2578,63 @@ msgstr "No se pudo leer el fichero «%s»: %s"
 msgid "Short read reading from file `%s'!"
 msgstr "¡Lectura corta leyendo del fichero «%s»!"
 
-#: src/fs/fs_api.c:1062
+#: src/fs/fs_api.c:1064
 #, c-format
 msgid "Failed to resume publishing information `%s': %s\n"
 msgstr "Se produjo un fallo al retomar la operación de publicación «%s»: %s\n"
 
-#: src/fs/fs_api.c:1565
+#: src/fs/fs_api.c:1569
 #, c-format
 msgid "Failure while resuming publishing operation `%s': %s\n"
 msgstr "Fallo mientras se reiniciaba la operación de publicación «%s»: %s\n"
 
-#: src/fs/fs_api.c:1579
+#: src/fs/fs_api.c:1583
 #, 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:2236
+#: src/fs/fs_api.c:2240
 #, 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:2246
+#: src/fs/fs_api.c:2250
 #, 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:2372 src/fs/fs_api.c:2612
+#: src/fs/fs_api.c:2376 src/fs/fs_api.c:2616
 #, 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:2389
+#: src/fs/fs_api.c:2393
 #, 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:2402 src/fs/fs_api.c:2421 src/fs/fs_api.c:2904
+#: src/fs/fs_api.c:2406 src/fs/fs_api.c:2425 src/fs/fs_api.c:2908
 #, 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:2603
+#: src/fs/fs_api.c:2607
 #, 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:2848
+#: src/fs/fs_api.c:2852
 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:2942
+#: src/fs/fs_api.c:2946
 #, c-format
 msgid "Failure while resuming download operation `%s': %s\n"
 msgstr ""
@@ -2400,65 +2764,65 @@ msgstr "Se produjo un fallo al escribir «%s»: %s\n"
 msgid "Failed to connect to datastore."
 msgstr "Se produjo un fallo al conectar con el almacén de datos."
 
-#: src/fs/fs_publish.c:125 src/fs/fs_publish.c:414
+#: src/fs/fs_publish.c:125 src/fs/fs_publish.c:415
 #, c-format
 msgid "Publishing failed: %s"
 msgstr "Publicación fallida: %s"
 
-#: src/fs/fs_publish.c:642 src/fs/fs_publish.c:659 src/fs/fs_publish.c:698
-#: src/fs/fs_publish.c:719 src/fs/fs_publish.c:743 src/fs/fs_publish.c:889
+#: src/fs/fs_publish.c:667 src/fs/fs_publish.c:684 src/fs/fs_publish.c:723
+#: src/fs/fs_publish.c:744 src/fs/fs_publish.c:768 src/fs/fs_publish.c:914
 #, c-format
 msgid "Can not index file `%s': %s.  Will try to insert instead.\n"
 msgstr "No se pudo indexar el fichero «%s»: %s.  Se intentará insertar.\n"
 
-#: src/fs/fs_publish.c:644
+#: src/fs/fs_publish.c:669
 msgid "timeout on index-start request to `fs' service"
 msgstr ""
 "expiración del plazo en la petición de inicio de indexado (index-start) al "
 "servicio «fs»"
 
-#: src/fs/fs_publish.c:656
+#: src/fs/fs_publish.c:681
 msgid "unknown error"
 msgstr "error desconocido"
 
-#: src/fs/fs_publish.c:700
+#: src/fs/fs_publish.c:725
 msgid "failed to compute hash"
 msgstr "se produjo un fallo al calcular el hash"
 
-#: src/fs/fs_publish.c:720
+#: src/fs/fs_publish.c:745
 msgid "filename too long"
 msgstr "nombre de fichero demasiado largo"
 
-#: src/fs/fs_publish.c:745
+#: src/fs/fs_publish.c:770
 msgid "could not connect to `fs' service"
 msgstr "no se pudo conectar con el servicio «fs»"
 
-#: src/fs/fs_publish.c:768
+#: src/fs/fs_publish.c:793
 #, c-format
 msgid "Failed to get file identifiers for `%s'\n"
 msgstr ""
 "Se produjo un fallo al obtener los identificadores de fichero para «%s»\n"
 
-#: src/fs/fs_publish.c:837
+#: src/fs/fs_publish.c:862
 #, c-format
 msgid "Recursive upload failed at `%s': %s"
 msgstr "La subida recursiva falló en «%s»: %s"
 
-#: src/fs/fs_publish.c:843
+#: src/fs/fs_publish.c:868
 #, c-format
 msgid "Recursive upload failed: %s"
 msgstr "Subida recursiva fallida: %s"
 
-#: src/fs/fs_publish.c:890
+#: src/fs/fs_publish.c:915
 msgid "needs to be an actual file"
 msgstr "tiene que ser un fichero de verdad"
 
-#: src/fs/fs_publish.c:1126
+#: src/fs/fs_publish.c:1151
 #, c-format
 msgid "Insufficient space for publishing: %s"
 msgstr "Espacio insuficiente para publicar: %s"
 
-#: src/fs/fs_publish.c:1198
+#: src/fs/fs_publish.c:1243
 #, c-format
 msgid "Reserving space for %u entries and %llu bytes for publication\n"
 msgstr "Reservando espacio para %u entradas y %llu bytes para publicación\n"
@@ -2471,12 +2835,12 @@ msgstr "No se pudo conectar con el almacén de datos."
 msgid "Internal error."
 msgstr "Error interno."
 
-#: src/fs/fs_search.c:815
+#: src/fs/fs_search.c:819
 #, fuzzy, c-format
 msgid "Failed to parse URI `%s': %s\n"
 msgstr "Se produjo un fallo al procesar la URI: %s\n"
 
-#: src/fs/fs_search.c:874
+#: src/fs/fs_search.c:878
 #, c-format
 msgid "Got result with unknown block type `%d', ignoring"
 msgstr ""
@@ -2595,20 +2959,20 @@ msgstr "URI SKS mal formada (se produjo un fallo al validar la firma)"
 msgid "Unrecognized URI type"
 msgstr "Tipo de URI no reconocido"
 
-#: src/fs/fs_uri.c:912
+#: src/fs/fs_uri.c:910
 msgid "Lacking key configuration settings.\n"
 msgstr "Falta configuración sobre las opciones de claves.\n"
 
-#: src/fs/fs_uri.c:918
+#: src/fs/fs_uri.c:916
 #, c-format
 msgid "Could not access hostkey file `%s'.\n"
 msgstr "No se pudo acceder al fichero de clave de máquina «%s».\n"
 
-#: src/fs/fs_uri.c:1102 src/fs/fs_uri.c:1129
+#: src/fs/fs_uri.c:1100 src/fs/fs_uri.c:1127
 msgid "No keywords specified!\n"
 msgstr "¡Ninguna palabra clave especificada!\n"
 
-#: src/fs/fs_uri.c:1135
+#: src/fs/fs_uri.c:1133
 msgid "Number of double-quotes not balanced!\n"
 msgstr "¡Número de comillas dobles no balanceado!\n"
 
@@ -2646,24 +3010,24 @@ msgstr ""
 "Debes especificar uno y solo un nombre de directorio para publicación "
 "automática.\n"
 
-#: src/fs/gnunet-auto-share.c:737 src/fs/gnunet-publish.c:811
+#: src/fs/gnunet-auto-share.c:737 src/fs/gnunet-publish.c:824
 msgid "set the desired LEVEL of sender-anonymity"
 msgstr "establece el nivel LEVEL deseado de anonimato del emisor"
 
-#: src/fs/gnunet-auto-share.c:741 src/fs/gnunet-publish.c:815
+#: src/fs/gnunet-auto-share.c:741 src/fs/gnunet-publish.c:828
 msgid "disable adding the creation time to the metadata of the uploaded file"
 msgstr ""
 "deshabilitar añadir tiempo de creación a los metadatos del fichero subido"
 
-#: src/fs/gnunet-auto-share.c:744 src/fs/gnunet-publish.c:818
+#: src/fs/gnunet-auto-share.c:744 src/fs/gnunet-publish.c:831
 msgid "do not use libextractor to add keywords or metadata"
 msgstr "no usar libextractor para añadir palabras clave o metadatos"
 
-#: src/fs/gnunet-auto-share.c:747 src/fs/gnunet-publish.c:842
+#: src/fs/gnunet-auto-share.c:747 src/fs/gnunet-publish.c:855
 msgid "specify the priority of the content"
 msgstr "especificar la prioridad del contenido"
 
-#: src/fs/gnunet-auto-share.c:750 src/fs/gnunet-publish.c:849
+#: src/fs/gnunet-auto-share.c:750 src/fs/gnunet-publish.c:862
 msgid "set the desired replication LEVEL"
 msgstr "establece el nivel LEVEL deseado de replicación"
 
@@ -2671,7 +3035,7 @@ msgstr "establece el nivel LEVEL deseado de replicación"
 msgid "Automatically publish files from a directory on GNUnet"
 msgstr "Publicar automáticamente ficheros de un directorio en GNUnet"
 
-#: src/fs/gnunet-daemon-fsprofiler.c:657
+#: src/fs/gnunet-daemon-fsprofiler.c:660
 msgid "Daemon to use file-sharing to measure its performance."
 msgstr "Demonio para medir el rendimiento de usar compartición de archivos."
 
@@ -2736,7 +3100,7 @@ msgstr "Error descargando: %s.\n"
 msgid "Downloading `%s' done (%s/s).\n"
 msgstr "Finalizada descarga «%s» (%s/s).\n"
 
-#: src/fs/gnunet-download.c:209 src/fs/gnunet-publish.c:273
+#: src/fs/gnunet-download.c:209 src/fs/gnunet-publish.c:286
 #: src/fs/gnunet-search.c:193 src/fs/gnunet-unindex.c:108
 #, c-format
 msgid "Unexpected status: %d\n"
@@ -2746,7 +3110,7 @@ msgstr "Estado inesperado: %d\n"
 msgid "You need to specify a URI argument.\n"
 msgstr "Tiene que especificar una URI como parámetro.\n"
 
-#: src/fs/gnunet-download.c:240 src/fs/gnunet-publish.c:652
+#: src/fs/gnunet-download.c:240 src/fs/gnunet-publish.c:665
 #, c-format
 msgid "Failed to parse URI: %s\n"
 msgstr "Se produjo un fallo al procesar la URI: %s\n"
@@ -2759,7 +3123,7 @@ msgstr "Sólo URI «CHK» o «LOC» soportadas.\n"
 msgid "Target filename must be specified.\n"
 msgstr "El nombre de fichero de destino debe ser especificado.\n"
 
-#: src/fs/gnunet-download.c:268 src/fs/gnunet-publish.c:784
+#: src/fs/gnunet-download.c:268 src/fs/gnunet-publish.c:797
 #: src/fs/gnunet-search.c:243 src/fs/gnunet-unindex.c:140
 #, c-format
 msgid "Could not initialize `%s' subsystem.\n"
@@ -2829,91 +3193,91 @@ msgstr ""
 "ejecuta una batería de pruebas para medir el rendimiento de la compartición "
 "de ficheros"
 
-#: src/fs/gnunet-publish.c:230
+#: src/fs/gnunet-publish.c:231 src/fs/gnunet-publish.c:243
 #, c-format
 msgid "Publishing `%s' at %llu/%llu (%s remaining)\n"
 msgstr "Publicando «%s» en %llu/%llu (%s restantes)\n"
 
-#: src/fs/gnunet-publish.c:237
+#: src/fs/gnunet-publish.c:250
 #, c-format
 msgid "Error publishing: %s.\n"
 msgstr "Error publicando: %s.\n"
 
-#: src/fs/gnunet-publish.c:247
+#: src/fs/gnunet-publish.c:260
 #, c-format
 msgid "Publishing `%s' done.\n"
 msgstr "Publicación «%s» finalizada.\n"
 
-#: src/fs/gnunet-publish.c:251
+#: src/fs/gnunet-publish.c:264
 #, c-format
 msgid "URI is `%s'.\n"
 msgstr "La URI es «%s».\n"
 
-#: src/fs/gnunet-publish.c:270
+#: src/fs/gnunet-publish.c:283
 msgid "Cleanup after abort complete.\n"
 msgstr "Limpieza completada\n"
 
-#: src/fs/gnunet-publish.c:388
+#: src/fs/gnunet-publish.c:401
 #, c-format
 msgid "Meta data for file `%s' (%s)\n"
 msgstr "Metadatos para el fichero «%s» (%s)\n"
 
-#: src/fs/gnunet-publish.c:390
+#: src/fs/gnunet-publish.c:403
 #, c-format
 msgid "Keywords for file `%s' (%s)\n"
 msgstr "Palabras clave para el fichero «%s» (%s)\n"
 
-#: src/fs/gnunet-publish.c:529
+#: src/fs/gnunet-publish.c:542
 msgid "Could not publish\n"
 msgstr "No se pudo publicar\n"
 
-#: src/fs/gnunet-publish.c:552
+#: src/fs/gnunet-publish.c:565
 msgid "Could not start publishing.\n"
 msgstr "No se pudo empezar a publicar.\n"
 
-#: src/fs/gnunet-publish.c:585
+#: src/fs/gnunet-publish.c:598
 #, c-format
 msgid "Scanning directory `%s'.\n"
 msgstr "Escaneando directorio «%s».\n"
 
-#: src/fs/gnunet-publish.c:587
+#: src/fs/gnunet-publish.c:600
 #, c-format
 msgid "Scanning file `%s'.\n"
 msgstr "Escaneando fichero «%s».\n"
 
-#: src/fs/gnunet-publish.c:592
+#: src/fs/gnunet-publish.c:605
 #, c-format
 msgid "There was trouble processing file `%s', skipping it.\n"
 msgstr "Hubo un problema procesando el fichero «%s», omitiéndolo.\n"
 
-#: src/fs/gnunet-publish.c:597
+#: src/fs/gnunet-publish.c:610
 msgid "Preprocessing complete.\n"
 msgstr "Preprocesado completo.\n"
 
-#: src/fs/gnunet-publish.c:601
+#: src/fs/gnunet-publish.c:614
 #, c-format
 msgid "Extracting meta data from file `%s' complete.\n"
 msgstr "Extracción de metadatos del fichero «%s» completa.\n"
 
-#: src/fs/gnunet-publish.c:605
+#: src/fs/gnunet-publish.c:618
 msgid "Meta data extraction has finished.\n"
 msgstr "La extracción de metadatos ha finalizado.\n"
 
-#: src/fs/gnunet-publish.c:612
+#: src/fs/gnunet-publish.c:625
 msgid "Internal error scanning directory.\n"
 msgstr "Error interno escaneando directorio.\n"
 
-#: src/fs/gnunet-publish.c:643
+#: src/fs/gnunet-publish.c:656
 #, fuzzy, c-format
 msgid "Selected pseudonym `%s' unknown\n"
 msgstr "Espacio de nombres «%s» desconocido.\n"
 
-#: src/fs/gnunet-publish.c:669
+#: src/fs/gnunet-publish.c:682
 #, c-format
 msgid "Failed to access `%s': %s\n"
 msgstr "Se produjo un fallo al acceder «%s»: %s\n"
 
-#: src/fs/gnunet-publish.c:682
+#: src/fs/gnunet-publish.c:695
 msgid ""
 "Failed to start meta directory scanner.  Is gnunet-helper-publish-fs "
 "installed?\n"
@@ -2921,33 +3285,33 @@ msgstr ""
 "Se produjo un fallo al iniciar el meta-escáner de directorios.  ¿Está "
 "«gnunet-helper-publish-fs» instalado?\n"
 
-#: src/fs/gnunet-publish.c:734
+#: src/fs/gnunet-publish.c:747
 #, c-format
 msgid "Cannot extract metadata from a URI!\n"
 msgstr "¡No se pueden extraer metadatos de una URI!\n"
 
-#: src/fs/gnunet-publish.c:741
+#: src/fs/gnunet-publish.c:754
 #, c-format
 msgid "You must specify one and only one filename for insertion.\n"
 msgstr "Se debe especificar uno y solo un nombre de fichero para insertar.\n"
 
-#: src/fs/gnunet-publish.c:747
+#: src/fs/gnunet-publish.c:760
 #, c-format
 msgid "You must NOT specify an URI and a filename.\n"
 msgstr "No se puede especificar una URI y un nombre de fichero.\n"
 
-#: src/fs/gnunet-publish.c:755 src/vpn/gnunet-vpn.c:213
+#: src/fs/gnunet-publish.c:768 src/vpn/gnunet-vpn.c:208
 #, c-format
 msgid "Option `%s' is required when using option `%s'.\n"
 msgstr "La opción «%s» es obligatoria cuando se usa la opción «%s».\n"
 
-#: src/fs/gnunet-publish.c:765 src/fs/gnunet-publish.c:772
-#: src/transport/gnunet-transport.c:843 src/transport/gnunet-transport.c:873
+#: src/fs/gnunet-publish.c:778 src/fs/gnunet-publish.c:785
+#: src/transport/gnunet-transport.c:840 src/transport/gnunet-transport.c:870
 #, c-format
 msgid "Option `%s' makes no sense without option `%s'.\n"
 msgstr "La opción «%s» no tiene sentido sin la opción «%s».\n"
 
-#: src/fs/gnunet-publish.c:822
+#: src/fs/gnunet-publish.c:835
 msgid ""
 "print list of extracted keywords that would be used, but do not perform "
 "upload"
@@ -2955,7 +3319,7 @@ msgstr ""
 "imprimir una lista de las palabras clave extraídas que podrían ser usadas, "
 "pero sin realizar la subida"
 
-#: src/fs/gnunet-publish.c:826
+#: src/fs/gnunet-publish.c:839
 msgid ""
 "add an additional keyword for the top-level file or directory (this option "
 "can be specified multiple times)"
@@ -2963,11 +3327,11 @@ msgstr ""
 "añadir una palabra clave adicional para el fichero del nivel más alto o el "
 "directorio (esta opción puede ser especificada varias veces)"
 
-#: src/fs/gnunet-publish.c:830
+#: src/fs/gnunet-publish.c:843
 msgid "set the meta-data for the given TYPE to the given VALUE"
 msgstr "establece los metadatos para el tipo TYPE dado al valor VALUE dado"
 
-#: src/fs/gnunet-publish.c:833
+#: src/fs/gnunet-publish.c:846
 msgid ""
 "do not index, perform full insertion (stores entire file in encrypted form "
 "in GNUnet database)"
@@ -2975,7 +3339,7 @@ msgstr ""
 "no indexar, hacer inserciones totales (almacena el fichero entero de forma "
 "cifrada en la base de datos de GNUnet)"
 
-#: src/fs/gnunet-publish.c:838
+#: src/fs/gnunet-publish.c:851
 msgid ""
 "specify ID of an updated version to be published in the future (for "
 "namespace insertions only)"
@@ -2983,13 +3347,13 @@ msgstr ""
 "especificar la ID de una versión actualizada para ser publicada en el futuro "
 "(para inserciones en el espacio de nombres únicamente)"
 
-#: src/fs/gnunet-publish.c:846
+#: src/fs/gnunet-publish.c:859
 msgid "publish the files under the pseudonym NAME (place file into namespace)"
 msgstr ""
 "publicar los ficheros bajo el seudónimo NAME (coloca el fichero en el "
 "espacio)"
 
-#: src/fs/gnunet-publish.c:852
+#: src/fs/gnunet-publish.c:865
 msgid ""
 "only simulate the process but do not do any actual publishing (useful to "
 "compute URIs)"
@@ -2997,14 +3361,14 @@ msgstr ""
 "únicamente simular el proceso pero no publicar nada realmente (útil para "
 "calcular URI)"
 
-#: src/fs/gnunet-publish.c:856
+#: src/fs/gnunet-publish.c:869
 msgid ""
 "set the ID of this version of the publication (for namespace insertions only)"
 msgstr ""
 "establece la ID de esta versión de la publicación (para inserciones en el "
 "espacio únicamente)"
 
-#: src/fs/gnunet-publish.c:860
+#: src/fs/gnunet-publish.c:873
 msgid ""
 "URI to be published (can be used instead of passing a file to add keywords "
 "to the file with the respective URI)"
@@ -3012,7 +3376,7 @@ msgstr ""
 "URI a ser publicada (puede ser usado en vez de pasar un fichero para añadir "
 "claves con el fichero con la URI respectiva)"
 
-#: src/fs/gnunet-publish.c:876
+#: src/fs/gnunet-publish.c:889
 msgid "Publish a file or directory on GNUnet"
 msgstr "Publicar un fichero o un directorio en GNUnet"
 
@@ -3061,90 +3425,90 @@ msgid "# Loopback routes suppressed"
 msgstr "# Rutas en bucle local eliminadas"
 
 #: src/fs/gnunet-service-fs.c:639 src/hostlist/gnunet-daemon-hostlist.c:293
-#: src/topology/gnunet-daemon-topology.c:1315
-#: src/topology/gnunet-daemon-topology.c:1322
+#: src/topology/gnunet-daemon-topology.c:1253
+#: src/topology/gnunet-daemon-topology.c:1260
 #, 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_cp.c:677
+#: src/fs/gnunet-service-fs_cp.c:680
 msgid "# migration stop messages received"
 msgstr "# mensajes de detención de migración recibidos"
 
-#: src/fs/gnunet-service-fs_cp.c:681
+#: src/fs/gnunet-service-fs_cp.c:684
 #, c-format
 msgid "Migration of content to peer `%s' blocked for %s\n"
 msgstr "Migración de contenido al par «%s» bloqueada durante %s\n"
 
-#: src/fs/gnunet-service-fs_cp.c:716
+#: src/fs/gnunet-service-fs_cp.c:719
 msgid "# replies transmitted to other peers"
 msgstr "# respuestas transmitidas a otros pares"
 
-#: src/fs/gnunet-service-fs_cp.c:722
+#: src/fs/gnunet-service-fs_cp.c:725
 msgid "# replies dropped"
 msgstr "# respuestas omitidas"
 
-#: src/fs/gnunet-service-fs_cp.c:747 src/fs/gnunet-service-fs_cp.c:1296
+#: src/fs/gnunet-service-fs_cp.c:750 src/fs/gnunet-service-fs_cp.c:1299
 msgid "# P2P searches active"
 msgstr "# busquedas P2P activas"
 
-#: src/fs/gnunet-service-fs_cp.c:840
+#: src/fs/gnunet-service-fs_cp.c:843
 msgid "# artificial delays introduced (ms)"
 msgstr "# retardos artificiales introducidos (ms)"
 
-#: src/fs/gnunet-service-fs_cp.c:893
+#: src/fs/gnunet-service-fs_cp.c:896
 msgid "# replies dropped due to type mismatch"
 msgstr "# respuestas omitidas debido a incompatibilidad de tipos"
 
-#: src/fs/gnunet-service-fs_cp.c:901
+#: src/fs/gnunet-service-fs_cp.c:904
 msgid "# replies received for other peers"
 msgstr "# respuestas recibidas de otros pares"
 
-#: src/fs/gnunet-service-fs_cp.c:915
+#: src/fs/gnunet-service-fs_cp.c:918
 msgid "# replies dropped due to insufficient cover traffic"
 msgstr "# respuestas omitidas debido a insuficiente tráfico de cobertura"
 
-#: src/fs/gnunet-service-fs_cp.c:953
+#: src/fs/gnunet-service-fs_cp.c:956
 msgid "# P2P searches destroyed due to ultimate reply"
 msgstr "# búsquedas P2P destruidas debido a respuesta definitiva"
 
-#: src/fs/gnunet-service-fs_cp.c:1021
+#: src/fs/gnunet-service-fs_cp.c:1024
 msgid "# requests done for free (low load)"
 msgstr "# peticiones realizadas gratuitamente (baja carga)"
 
-#: src/fs/gnunet-service-fs_cp.c:1046
+#: src/fs/gnunet-service-fs_cp.c:1049
 msgid "# request dropped, priority insufficient"
 msgstr "# peticiones omitidas, prioridad insuficiente"
 
-#: src/fs/gnunet-service-fs_cp.c:1056
+#: src/fs/gnunet-service-fs_cp.c:1059
 msgid "# requests done for a price (normal load)"
 msgstr "# peticiones realizadas por un precio (carga normal)"
 
-#: src/fs/gnunet-service-fs_cp.c:1134
+#: src/fs/gnunet-service-fs_cp.c:1137
 msgid "# GET requests received (from other peers)"
 msgstr "# peticiones «GET» recibidas (de otros pares)"
 
-#: src/fs/gnunet-service-fs_cp.c:1168
+#: src/fs/gnunet-service-fs_cp.c:1171
 msgid "# requests dropped due to initiator not being connected"
 msgstr "# peticiones omitidas debido a que el iniciador no está conectado"
 
-#: src/fs/gnunet-service-fs_cp.c:1191
+#: src/fs/gnunet-service-fs_cp.c:1194
 msgid "# requests dropped due to missing reverse route"
 msgstr "# peticiones omitidas debido a falta de ruta inversa"
 
-#: src/fs/gnunet-service-fs_cp.c:1241
+#: src/fs/gnunet-service-fs_cp.c:1244
 msgid "# requests dropped due TTL underflow"
 msgstr "# peticiones omitidas debido a expiración del TTL"
 
-#: src/fs/gnunet-service-fs_cp.c:1265
+#: src/fs/gnunet-service-fs_cp.c:1268
 msgid "# requests dropped due to higher-TTL request"
 msgstr "# peticiones omitidas debido a una petición de mayor TTL"
 
-#: src/fs/gnunet-service-fs_cp.c:1294
+#: src/fs/gnunet-service-fs_cp.c:1297
 msgid "# P2P query messages received and processed"
 msgstr "# mensajes de búsqueda P2P recibidos y procesados"
 
-#: src/fs/gnunet-service-fs_cp.c:1664
+#: src/fs/gnunet-service-fs_cp.c:1668
 msgid "# migration stop messages sent"
 msgstr "# mensajes de detención de migración enviados"
 
@@ -3282,113 +3646,113 @@ msgstr "# peticiones refrescadas"
 msgid "# query plan entries"
 msgstr "# entradas de planes de búsqueda"
 
-#: src/fs/gnunet-service-fs_pr.c:310
+#: src/fs/gnunet-service-fs_pr.c:311
 msgid "# Pending requests created"
 msgstr "# Peticiones pendientes creadas"
 
-#: src/fs/gnunet-service-fs_pr.c:393 src/fs/gnunet-service-fs_pr.c:644
+#: src/fs/gnunet-service-fs_pr.c:394 src/fs/gnunet-service-fs_pr.c:645
 msgid "# Pending requests active"
 msgstr "# Peticiones pendientes activas"
 
-#: src/fs/gnunet-service-fs_pr.c:812
+#: src/fs/gnunet-service-fs_pr.c:813
 msgid "# replies received and matched"
 msgstr "# respuestas recibidas y asociadas"
 
-#: src/fs/gnunet-service-fs_pr.c:842
+#: src/fs/gnunet-service-fs_pr.c:843
 msgid "# duplicate replies discarded (bloomfilter)"
 msgstr "# respuestas duplicadas descartadas (bloomfilter)"
 
-#: src/fs/gnunet-service-fs_pr.c:851
+#: src/fs/gnunet-service-fs_pr.c:852
 msgid "# irrelevant replies discarded"
 msgstr "# respuestas irrelevantes descartadas"
 
-#: src/fs/gnunet-service-fs_pr.c:865
+#: src/fs/gnunet-service-fs_pr.c:866
 #, c-format
 msgid "Unsupported block type %u\n"
 msgstr "Tipo de bloque %u no soportado\n"
 
-#: src/fs/gnunet-service-fs_pr.c:878
+#: src/fs/gnunet-service-fs_pr.c:879
 msgid "# results found locally"
 msgstr "# resultados hallados localmente"
 
-#: src/fs/gnunet-service-fs_pr.c:999
+#: src/fs/gnunet-service-fs_pr.c:1000
 msgid "# Datastore `PUT' failures"
 msgstr "# «PUT» en el almacén de datos fallidos"
 
-#: src/fs/gnunet-service-fs_pr.c:1026
+#: src/fs/gnunet-service-fs_pr.c:1027
 msgid "# storage requests dropped due to high load"
 msgstr "# peticiones de almacenamiento omitidas debido a alta carga"
 
-#: src/fs/gnunet-service-fs_pr.c:1061
+#: src/fs/gnunet-service-fs_pr.c:1062
 msgid "# Replies received from DHT"
 msgstr "# Respuestas recibidas de la DHT"
 
-#: src/fs/gnunet-service-fs_pr.c:1189
+#: src/fs/gnunet-service-fs_pr.c:1190
 #, fuzzy
 msgid "# Replies received from MESH"
 msgstr "# Respuestas recibidas de la DHT"
 
-#: src/fs/gnunet-service-fs_pr.c:1241
+#: src/fs/gnunet-service-fs_pr.c:1242
 #, 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:1261
+#: src/fs/gnunet-service-fs_pr.c:1262
 #, 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:1308
+#: src/fs/gnunet-service-fs_pr.c:1309
 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:1323
+#: src/fs/gnunet-service-fs_pr.c:1324
 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:1332
+#: src/fs/gnunet-service-fs_pr.c:1333
 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:1347
+#: src/fs/gnunet-service-fs_pr.c:1348
 msgid "# requested DBLOCK or IBLOCK not found"
 msgstr "# «DBLOCK» o «IBLOCK» pedido no encontrado"
 
-#: src/fs/gnunet-service-fs_pr.c:1361
+#: src/fs/gnunet-service-fs_pr.c:1362
 msgid "# on-demand blocks matched requests"
 msgstr "# peticiones asociadas de bloques bajo demanda"
 
-#: src/fs/gnunet-service-fs_pr.c:1374
+#: src/fs/gnunet-service-fs_pr.c:1375
 msgid "# on-demand lookups performed successfully"
 msgstr "# búsquedas satisfactorias de bloques bajo demanda"
 
-#: src/fs/gnunet-service-fs_pr.c:1379
+#: src/fs/gnunet-service-fs_pr.c:1380
 msgid "# on-demand lookups failed"
 msgstr "# búsquedas fallidas de bloques bajo demanda"
 
-#: src/fs/gnunet-service-fs_pr.c:1406 src/fs/gnunet-service-fs_pr.c:1446
-#: src/fs/gnunet-service-fs_pr.c:1587
+#: src/fs/gnunet-service-fs_pr.c:1407 src/fs/gnunet-service-fs_pr.c:1447
+#: src/fs/gnunet-service-fs_pr.c:1588
 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:1464
+#: src/fs/gnunet-service-fs_pr.c:1465
 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:1475
+#: src/fs/gnunet-service-fs_pr.c:1476
 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:1563
+#: src/fs/gnunet-service-fs_pr.c:1564
 msgid "# Datastore lookups initiated"
 msgstr "# Búsquedas en el almacén de datos iniciadas"
 
-#: src/fs/gnunet-service-fs_pr.c:1648
+#: src/fs/gnunet-service-fs_pr.c:1649
 msgid "# GAP PUT messages received"
 msgstr "# Mensajes «GAP PUT» recibidos"
 
-#: src/fs/gnunet-service-fs_push.c:629
+#: src/fs/gnunet-service-fs_push.c:631
 msgid "time required, content pushing disabled"
 msgstr "se requiere tiempo, publicación de contenido deshabilitada"
 
@@ -3419,7 +3783,7 @@ msgstr "No se pudo empezar la operación de desindexado.\n"
 msgid "Unindex a file that was previously indexed with gnunet-publish."
 msgstr "Desindexa un fichero previamente indexado con «gnunet-publish»."
 
-#: src/gns/gns_api.c:385
+#: src/gns/gns_api.c:387
 msgid "Failed to serialize lookup reply from GNS service!\n"
 msgstr ""
 "¡Se produjo un fallo al serializar la respuesta de la búsqueda desde el "
@@ -3445,203 +3809,356 @@ msgstr "Recibida petición DNS mal formada de %s\n"
 msgid "Received unsupported DNS request from %s\n"
 msgstr "Recibida petición DNS no soportada de %s\n"
 
-#: src/gns/gnunet-dns2gns.c:703
+#: src/gns/gnunet-dns2gns.c:701
 msgid "No ego configured for `dns2gns` subsystem\n"
 msgstr ""
 
-#: src/gns/gnunet-dns2gns.c:729
+#: src/gns/gnunet-dns2gns.c:727
 #, fuzzy
 msgid "No DNS server specified!\n"
 msgstr "¡Ninguna palabra clave especificada!\n"
 
-#: src/gns/gnunet-dns2gns.c:751
+#: src/gns/gnunet-dns2gns.c:749
 #, fuzzy
 msgid "No valid GNS zone specified!\n"
 msgstr "¡Ninguna palabra clave especificada!\n"
 
-#: src/gns/gnunet-dns2gns.c:772
+#: src/gns/gnunet-dns2gns.c:770
 msgid "IP of recursive DNS resolver to use (required)"
 msgstr "IP del resolvedor recursivo DNS a usar (requerido)"
 
-#: src/gns/gnunet-dns2gns.c:775
+#: src/gns/gnunet-dns2gns.c:773
 msgid "Authoritative FCFS suffix to use (optional); default: fcfs.zkey.eu"
 msgstr ""
 "Sufijo FCFS autoritativo a usar (opcional); predeterminado: fcfs.zkey.eu"
 
-#: src/gns/gnunet-dns2gns.c:778
+#: src/gns/gnunet-dns2gns.c:776
 msgid "Authoritative DNS suffix to use (optional); default: zkey.eu"
 msgstr "Sufijo DNS autoritativo a usar (opcional); predeterminado: zkey.eu"
 
-#: src/gns/gnunet-dns2gns.c:781
+#: src/gns/gnunet-dns2gns.c:779
 msgid "UDP port to listen on for inbound DNS requests; default: 53"
 msgstr ""
 "Puerto UDP en el que escuchar para peticiones DNS entrantes; predeterminado: "
 "53"
 
-#: src/gns/gnunet-dns2gns.c:784
+#: src/gns/gnunet-dns2gns.c:782
 msgid "Public key of the GNS zone to use (overrides default)"
 msgstr ""
 
-#: src/gns/gnunet-dns2gns.c:797
+#: src/gns/gnunet-dns2gns.c:795
 msgid "GNUnet DNS-to-GNS proxy (a DNS server)"
 msgstr "Pasarela GNUnet DNS-a-GNS (un servidor DNS)"
 
-#: src/gns/gnunet-gns.c:205
+#: src/gns/gnunet-gns.c:217
 #, c-format
 msgid "Please specify name to lookup!\n"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:285
+#: src/gns/gnunet-gns.c:297
 #, c-format
 msgid "Ego for `%s' not found, cannot perform lookup.\n"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:323
+#: src/gns/gnunet-gns.c:335
 #, c-format
 msgid ""
 "Ego for `master-zone' not found, cannot perform lookup.  Did you run gnunet-"
 "gns-import.sh?\n"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:352
+#: src/gns/gnunet-gns.c:364
 #, c-format
 msgid "Failed to connect to GNS\n"
 msgstr "Se produjo un fallo al conectar con GNS\n"
 
-#: src/gns/gnunet-gns.c:365
+#: src/gns/gnunet-gns.c:377
 #, c-format
 msgid "Public key `%s' is not well-formed\n"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:414
+#: src/gns/gnunet-gns.c:426
 msgid "Lookup a record for the given name"
 msgstr "Buscar el registro para el nombre dado"
 
-#: src/gns/gnunet-gns.c:417
+#: src/gns/gnunet-gns.c:429
 msgid "Specify the type of the record to lookup"
 msgstr "Especificar el tipo del registro a buscar"
 
-#: src/gns/gnunet-gns.c:420
+#: src/gns/gnunet-gns.c:432
 msgid "No unneeded output"
 msgstr "Sin salida innecesaria"
 
-#: src/gns/gnunet-gns.c:423
+#: src/gns/gnunet-gns.c:435
 #, fuzzy
 msgid "Specify the public key of the zone to lookup the record in"
 msgstr "Especificar el tipo del registro a buscar"
 
-#: src/gns/gnunet-gns.c:426
+#: src/gns/gnunet-gns.c:438
 #, fuzzy
 msgid "Specify the name of the ego of the zone to lookup the record in"
 msgstr "Especificar el tipo del registro a buscar"
 
-#: src/gns/gnunet-gns.c:439
+#: src/gns/gnunet-gns.c:451
 #, fuzzy
 msgid "GNUnet GNS resolver tool"
 msgstr "Herramienta de acceso GNUnet GNS"
 
-#: src/gns/gnunet-gns-proxy.c:60 src/hostlist/hostlist-client.c:469
+#: src/gns/gnunet-gns-proxy.c:105 src/hostlist/hostlist-client.c:469
 #: src/hostlist/hostlist-client.c:680 src/hostlist/hostlist-client.c:686
 #: src/hostlist/hostlist-client.c:738 src/hostlist/hostlist-client.c:747
 #: src/hostlist/hostlist-client.c:868 src/hostlist/hostlist-client.c:960
 #: src/hostlist/hostlist-client.c:965
-#: src/transport/plugin_transport_http_client.c:1068
-#: src/transport/plugin_transport_http_client.c:1083
+#: src/transport/plugin_transport_http_client.c:1067
+#: src/transport/plugin_transport_http_client.c:1082
 #, c-format
 msgid "%s failed at %s:%d: `%s'\n"
 msgstr "%s falló en %s:%d: «%s».\n"
 
-#: src/gns/gnunet-gns-proxy.c:2344
+#: src/gns/gnunet-gns-proxy.c:839
+#, fuzzy, c-format
+msgid "Unsupported CURL SSL backend %d\n"
+msgstr "Tipo de bloque %u no soportado\n"
+
+#: src/gns/gnunet-gns-proxy.c:862
+#, fuzzy, c-format
+msgid "Failed to fetch CN from cert: %s\n"
+msgstr "Se produjo un fallo al mandar la petición DNS a %s\n"
+
+#: src/gns/gnunet-gns-proxy.c:885
+#, fuzzy, c-format
+msgid "Failed to initialize DANE: %s\n"
+msgstr "¡No se puede inicializar el resolvedor!\n"
+
+#: src/gns/gnunet-gns-proxy.c:898
+#, fuzzy, c-format
+msgid "Failed to parse DANE record: %s\n"
+msgstr "Se produjo un fallo al procesar la petición DNS.  Omitiendo.\n"
+
+#: src/gns/gnunet-gns-proxy.c:913
+#, fuzzy, c-format
+msgid "Failed to verify TLS connection using DANE: %s\n"
+msgstr "Se produjo un fallo al borrar el fichero de configuración %s\n"
+
+#: src/gns/gnunet-gns-proxy.c:923
+#, c-format
+msgid "Failed DANE verification failed with GnuTLS verify status code: %u\n"
+msgstr ""
+
+#: src/gns/gnunet-gns-proxy.c:947
+#, c-format
+msgid "SSL certificate subject name (%s) does not match `%s'\n"
+msgstr ""
+
+#: src/gns/gnunet-gns-proxy.c:1092
+#, c-format
+msgid "Cookie domain `%s' supplied by server is invalid\n"
+msgstr ""
+
+#: src/gns/gnunet-gns-proxy.c:1609
+#, fuzzy, c-format
+msgid "Unsupported HTTP method `%s'\n"
+msgstr "Tipo no soportado «%s»\n"
+
+#: src/gns/gnunet-gns-proxy.c:1979
 #, c-format
 msgid "Unable to import private key from file `%s'\n"
 msgstr "No se pudo importar la clave privada del fichero «%s»\n"
 
-#: src/gns/gnunet-gns-proxy.c:2372
+#: src/gns/gnunet-gns-proxy.c:2009
 #, c-format
 msgid "Unable to import certificate %s\n"
 msgstr "No se pudo importar el certificado %s\n"
 
-#: src/gns/gnunet-gns-proxy.c:2637 src/namestore/gnunet-namestore-fcfsd.c:958
-msgid "Failed to start HTTP server\n"
+#: src/gns/gnunet-gns-proxy.c:2178
+#, fuzzy, c-format
+msgid "Failed to start HTTPS server for `%s'\n"
 msgstr "Se produjo un fallo al iniciar el servidor HTTP\n"
 
-#: src/gns/gnunet-gns-proxy.c:3020
+#: src/gns/gnunet-gns-proxy.c:2197
+#, fuzzy
+msgid "Failed to pass client to MHD\n"
+msgstr "Se produjo un fallo al conectar con GNS\n"
+
+#: src/gns/gnunet-gns-proxy.c:2505
+#, fuzzy, c-format
+msgid "Unsupported socks version %d\n"
+msgstr "Tipo de bloque %u no soportado\n"
+
+#: src/gns/gnunet-gns-proxy.c:2534
+#, fuzzy, c-format
+msgid "Unsupported socks command %d\n"
+msgstr "Tipo de bloque %u no soportado\n"
+
+#: src/gns/gnunet-gns-proxy.c:2616
+#, fuzzy, c-format
+msgid "Unsupported socks address type %d\n"
+msgstr "Tipo de bloque %u no soportado\n"
+
+#: src/gns/gnunet-gns-proxy.c:2955
 msgid "No ego configured for `shorten-zone`\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:3060
-msgid "No ego configured for `master-zone`\n"
+#: src/gns/gnunet-gns-proxy.c:2995
+#, fuzzy, c-format
+msgid "No ego configured for `%s`\n"
 msgstr ""
+"Ningún puerto fue configurado para el módulo «%s», no se puede probar\n"
 
-#: src/gns/gnunet-gns-proxy.c:3120
+#: src/gns/gnunet-gns-proxy.c:3057
 #, fuzzy, c-format
 msgid "Failed to load SSL/TLS key and certificate from `%s'\n"
 msgstr "Se produjo un fallo al leer la lista de amigos de «%s»\n"
 
-#: src/gns/gnunet-gns-proxy.c:3156
+#: src/gns/gnunet-gns-proxy.c:3098
 msgid "listen on specified port (default: 7777)"
 msgstr "escuchar en el puerto especificado (predeterminado: 7777)"
 
-#: src/gns/gnunet-gns-proxy.c:3159
+#: src/gns/gnunet-gns-proxy.c:3101
 msgid "pem file to use as CA"
 msgstr "fichero pem para usar como autoridad de certificación (CA)"
 
-#: src/gns/gnunet-gns-proxy.c:3178
+#: src/gns/gnunet-gns-proxy.c:3120
 msgid "GNUnet GNS proxy"
 msgstr "Proxy GNUnet GNS"
 
-#: src/gns/gnunet-service-gns.c:649
+#: src/gns/gnunet-service-gns.c:860
 msgid "Failed to connect to the namestore!\n"
 msgstr "¡Se produjo un fallo al conectar con el almacén de nombres!\n"
 
-#: src/gns/gnunet-service-gns.c:692
+#: src/gns/gnunet-service-gns.c:868
+#, fuzzy
+msgid "Failed to connect to the namecache!\n"
+msgstr "¡Se produjo un fallo al conectar con el almacén de nombres!\n"
+
+#: src/gns/gnunet-service-gns.c:901
 msgid "Could not connect to DHT!\n"
 msgstr "¡No se pudo conectar a la DHT!\n"
 
-#: src/gns/gnunet-service-gns.c:708
+#: src/gns/gnunet-service-gns.c:917
 #, fuzzy
 msgid "valid public key required"
 msgstr "Tipo requerido\n"
 
-#: src/gns/gnunet-service-gns_interceptor.c:201
+#: src/gns/gnunet-service-gns_interceptor.c:263
 #, fuzzy
 msgid "Error converting GNS response to DNS response!\n"
 msgstr "¡Se produjo un error al convertir los argumentos a una URI!\n"
 
-#: src/gns/gnunet-service-gns_interceptor.c:307
+#: src/gns/gnunet-service-gns_interceptor.c:369
 #, fuzzy
 msgid "Failed to connect to the DNS service!\n"
 msgstr "¡Se produjo un fallo al conectar con el servicio GNS!\n"
 
-#: src/gns/gnunet-service-gns_resolver.c:717
+#: src/gns/gnunet-service-gns_resolver.c:771
 #, fuzzy
 msgid "Failed to parse DNS response\n"
 msgstr "Se produjo un fallo al procesar la petición DNS.  Omitiendo.\n"
 
-#: src/gns/gnunet-service-gns_resolver.c:843
+#: src/gns/gnunet-service-gns_resolver.c:913
 #, c-format
 msgid "Skipping record of unsupported type %d\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns_resolver.c:1475
+#: src/gns/gnunet-service-gns_resolver.c:1646
 #, c-format
 msgid "GNS lookup resulted in DNS name that is too long (`%s')\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns_resolver.c:1499
+#: src/gns/gnunet-service-gns_resolver.c:1686
 msgid "GNS lookup recursion failed (no delegation record found)\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns_resolver.c:1523
+#: src/gns/gnunet-service-gns_resolver.c:1710
 #, fuzzy, c-format
 msgid "Failed to cache GNS resolution: %s\n"
 msgstr "Se produjo un fallo al mandar la petición DNS a %s\n"
 
-#: src/gns/gnunet-service-gns_resolver.c:1782
+#: src/gns/gnunet-service-gns_resolver.c:1932
+#, c-format
+msgid "Zone %s was revoked, resolution fails\n"
+msgstr ""
+
+#: src/gns/gnunet-service-gns_resolver.c:2054
 #, c-format
 msgid "Hostname `%s' is not well-formed, resolution fails\n"
 msgstr ""
 
+#: src/gns/plugin_gnsrecord_gns.c:142
+#, c-format
+msgid "Unable to parse PKEY record `%s'\n"
+msgstr "No se pudo procesar el registro PKEY «%s»\n"
+
+#: src/gns/plugin_gnsrecord_gns.c:172
+#, fuzzy, c-format
+msgid "Failed to serialize GNS2DNS record with value `%s'\n"
+msgstr ""
+"Se produjo un fallo al escribir el directorio con los resultados de búsqueda "
+"de «%s»\n"
+
+#: src/gns/plugin_gnsrecord_gns.c:186
+#, c-format
+msgid "Unable to parse VPN record string `%s'\n"
+msgstr "No se pudo procesar la cadena de registro VPN «%s»\n"
+
+#: src/gnsrecord/plugin_gnsrecord_dns.c:261
+#, c-format
+msgid "Unable to parse IPv4 address `%s'\n"
+msgstr "No se pudo procesar la dirección IPv4 «%s»\n"
+
+#: src/gnsrecord/plugin_gnsrecord_dns.c:282
+#, fuzzy, c-format
+msgid "Failed to serialize NS record with value `%s'\n"
+msgstr ""
+"Se produjo un fallo al escribir el directorio con los resultados de búsqueda "
+"de «%s»\n"
+
+#: src/gnsrecord/plugin_gnsrecord_dns.c:304
+#, fuzzy, c-format
+msgid "Failed to serialize CNAME record with value `%s'\n"
+msgstr ""
+"Se produjo un fallo al escribir el directorio con los resultados de búsqueda "
+"de «%s»\n"
+
+#: src/gnsrecord/plugin_gnsrecord_dns.c:332
+#, c-format
+msgid "Unable to parse SOA record `%s'\n"
+msgstr "No se pudo procesar el registro SOA «%s»\n"
+
+#: src/gnsrecord/plugin_gnsrecord_dns.c:351
+#, fuzzy, c-format
+msgid "Failed to serialize SOA record with mname `%s' and rname `%s'\n"
+msgstr "Se produjo un fallo al crear un registro para el dominio «%s»: %s\n"
+
+#: src/gnsrecord/plugin_gnsrecord_dns.c:374
+#, fuzzy, c-format
+msgid "Failed to serialize PTR record with value `%s'\n"
+msgstr ""
+"Se produjo un fallo al escribir el directorio con los resultados de búsqueda "
+"de «%s»\n"
+
+#: src/gnsrecord/plugin_gnsrecord_dns.c:394
+#, c-format
+msgid "Unable to parse MX record `%s'\n"
+msgstr "No se pudo procesar el registro MX «%s»\n"
+
+#: src/gnsrecord/plugin_gnsrecord_dns.c:409
+#, fuzzy, c-format
+msgid "Failed to serialize MX record with hostname `%s'\n"
+msgstr ""
+"Se produjo un fallo al escribir el directorio con los resultados de búsqueda "
+"de «%s»\n"
+
+#: src/gnsrecord/plugin_gnsrecord_dns.c:429
+#, c-format
+msgid "Unable to parse IPv6 address `%s'\n"
+msgstr "No se pudo procesar dirección IPv4 «%s»\n"
+
+#: src/gnsrecord/plugin_gnsrecord_dns.c:447
+#, c-format
+msgid "Unable to parse TLSA record string `%s'\n"
+msgstr "No se pudo procesar la cadena de registro TLSA «%s»\n"
+
 #: src/hello/gnunet-hello.c:123
 msgid "Call with name of HELLO file to modify.\n"
 msgstr "Llamar con el nombre del fichero «HELLO» para modificar.\n"
@@ -3681,39 +4198,39 @@ msgstr "Error escribiendo «HELLO» al fichero «%s»: %s\n"
 msgid "Modified %u addresses \n"
 msgstr ""
 
-#: src/hello/hello.c:947
+#: src/hello/hello.c:943
 msgid "Failed to parse HELLO message: missing expiration time\n"
 msgstr ""
 "Se produjo un fallo al procesar un mensaje «HELLO»: falta el tiempo de "
 "expiración\n"
 
-#: src/hello/hello.c:956
+#: src/hello/hello.c:952
 msgid "Failed to parse HELLO message: invalid expiration time\n"
 msgstr ""
 "Se produjo un fallo al procesar un mensaje «HELLO»: tiempo de expiración no "
 "válido\n"
 
-#: src/hello/hello.c:966
+#: src/hello/hello.c:962
 msgid "Failed to parse HELLO message: malformed\n"
 msgstr "Se produjo un fallo al procesar un mensaje «HELLO»: mal formado\n"
 
-#: src/hello/hello.c:976
+#: src/hello/hello.c:972
 msgid "Failed to parse HELLO message: missing transport plugin\n"
 msgstr ""
 "Se produjo un fallo al procesar un mensaje «HELLO»: falta el módulo de "
 "transporte\n"
 
-#: src/hello/hello.c:993
+#: src/hello/hello.c:989
 #, c-format
 msgid "Plugin `%s' not found\n"
 msgstr "Módulo «%s» no encontrado\n"
 
-#: src/hello/hello.c:1002
+#: src/hello/hello.c:998
 #, c-format
 msgid "Plugin `%s' does not support URIs yet\n"
 msgstr "El módulo «%s» no soporta URI todavía\n"
 
-#: src/hello/hello.c:1021
+#: src/hello/hello.c:1017
 #, c-format
 msgid "Failed to parse `%s' as an address for plugin `%s'\n"
 msgstr ""
@@ -3913,10 +4430,10 @@ msgid "expired addresses encountered"
 msgstr "direcciones expiradas encontradas"
 
 #: src/hostlist/hostlist-server.c:189 src/hostlist/hostlist-server.c:424
-#: src/peerinfo-tool/gnunet-peerinfo.c:358
-#: src/peerinfo-tool/gnunet-peerinfo.c:428
-#: src/peerinfo-tool/gnunet-peerinfo.c:499
-#: src/topology/gnunet-daemon-topology.c:918
+#: src/peerinfo-tool/gnunet-peerinfo.c:350
+#: src/peerinfo-tool/gnunet-peerinfo.c:419
+#: src/peerinfo-tool/gnunet-peerinfo.c:490
+#: src/topology/gnunet-daemon-topology.c:924
 #, c-format
 msgid "Error in communication with PEERINFO service: %s\n"
 msgstr ""
@@ -3976,8 +4493,8 @@ msgid "Advertisement message could not be queued by core\n"
 msgstr ""
 "Los mensajes de anuncio no pudieron encolarse por el servicio principal\n"
 
-#: src/hostlist/hostlist-server.c:560 src/peerinfo-tool/gnunet-peerinfo.c:659
-#: src/transport/gnunet-service-transport.c:806
+#: src/hostlist/hostlist-server.c:560 src/peerinfo-tool/gnunet-peerinfo.c:651
+#: src/transport/gnunet-service-transport.c:790
 msgid "Could not access PEERINFO service.  Exiting.\n"
 msgstr ""
 "No se pudo acceder al servicio de información de pares (PEERINFO).  "
@@ -4103,48 +4620,47 @@ msgstr "Se produjo un fallo al borrar el fichero de configuración %s\n"
 msgid "Failed to create directory `%s' for storing egos\n"
 msgstr "Se produjo un fallo al leer el directorio «%s»\n"
 
-#: src/integration-tests/connection_watchdog.c:998
+#: src/integration-tests/connection_watchdog.c:1012
 #, c-format
 msgid "Transport plugin: `%s' port %llu\n"
 msgstr "Módulo de transporte: «%s» puerto %llu\n"
 
-#: src/integration-tests/connection_watchdog.c:1031
+#: src/integration-tests/connection_watchdog.c:1045
 #, c-format
 msgid "Found %u transport plugins: `%s'\n"
 msgstr "Encontrados %u módulos de transporte: «%s»\n"
 
-#: src/integration-tests/connection_watchdog.c:1091
+#: src/integration-tests/connection_watchdog.c:1105
 msgid "Send ping messages to test connectivity (default == NO)"
 msgstr ""
 "Enviar mensajes «ping» para probar la conectividad (predeterminado: NO)"
 
-#: src/integration-tests/connection_watchdog.c:1100
-#: src/multicast/gnunet-multicast.c:70 src/template/gnunet-template.c:70
-msgid "help text"
-msgstr "texto de ayuda"
+#: src/mesh/gnunet-mesh.c:146
+#, fuzzy, c-format
+msgid "Invalid tunnel owner `%s'\n"
+msgstr "Formato de tiempo no válido «%s»\n"
 
-#: src/mesh/gnunet-mesh.c:205
+#: src/mesh/gnunet-mesh.c:209
 msgid "provide information about all tunnels (continuously) NOT IMPLEMENTED"
 msgstr ""
 "proveer información acerca de todos los túneles (de forma continua) SIN "
 "IMPLEMENTAR"
 
-#: src/mesh/gnunet-mesh.c:208
+#: src/mesh/gnunet-mesh.c:212
 msgid "provide information about a particular tunnel"
 msgstr "proveer información acerca de un túnel en particular"
 
-#: src/mesh/gnunet-mesh.c:218
+#: src/mesh/gnunet-mesh.c:222
 msgid "Print information about mesh tunnels and peers."
 msgstr "Imprimir información acerca de tuneles mesh y pares."
 
-#: src/mesh/gnunet-service-mesh.c:5634 src/mesh/gnunet-service-mesh-enc.c:7060
+#: src/mesh/gnunet-service-mesh.c:5633 src/mesh/gnunet-service-mesh_peer.c:350
 msgid "Wrong CORE service\n"
 msgstr "Servicio principal (CORE) erróneo\n"
 
-#: src/mesh/gnunet-service-mesh.c:5774 src/mesh/gnunet-service-mesh.c:5786
-#: src/mesh/gnunet-service-mesh.c:5798 src/mesh/gnunet-service-mesh.c:5810
-#: src/mesh/gnunet-service-mesh.c:5822 src/mesh/gnunet-service-mesh.c:5834
-#: src/nse/gnunet-service-nse.c:1440 src/nse/gnunet-service-nse.c:1458
+#: src/mesh/gnunet-service-mesh.c:5773 src/mesh/gnunet-service-mesh.c:5785
+#: src/mesh/gnunet-service-mesh.c:5797 src/mesh/gnunet-service-mesh.c:5809
+#: src/mesh/gnunet-service-mesh.c:5821 src/mesh/gnunet-service-mesh.c:5833
 #: src/regex/gnunet-daemon-regexprofiler.c:270
 #: src/regex/gnunet-regex-simulation-profiler.c:659
 #, c-format
@@ -4153,8 +4669,8 @@ msgstr ""
 "El servicio %s carece de opciones de configuración de clave (%s).  "
 "Saliendo.\n"
 
-#: src/mesh/gnunet-service-mesh.c:5846 src/mesh/gnunet-service-mesh.c:5856
-#: src/mesh/gnunet-service-mesh.c:5881
+#: src/mesh/gnunet-service-mesh.c:5845 src/mesh/gnunet-service-mesh.c:5855
+#: src/mesh/gnunet-service-mesh.c:5880
 #, c-format
 msgid ""
 "%s service is lacking key configuration settings (%s). Using default (%u).\n"
@@ -4172,244 +4688,234 @@ msgstr "Intentando usar el fichero «%s» para la configuración de MySQL.\n"
 msgid "Could not access file `%s': %s\n"
 msgstr "No se pudo acceder al fichero «%s»: %s\n"
 
-#: src/namestore/gnunet-namestore.c:258
+#: src/namecache/gnunet-namecache.c:109
+#, fuzzy, c-format
+msgid "No records found for `%s'"
+msgstr "No se han encontrado ficheros en «%s»\n"
+
+#: src/namecache/gnunet-namecache.c:124 src/namestore/gnunet-namestore.c:367
+#, c-format
+msgid "\tCorrupt or unsupported record of type %u\n"
+msgstr "\tRegistro corrupto o no soportado del tipo %u\n"
+
+#: src/namecache/gnunet-namecache.c:185 src/namestore/gnunet-namestore.c:777
+#, fuzzy, c-format
+msgid "You must specify which zone should be accessed\n"
+msgstr "Se debe especificar un apodo\n"
+
+#: src/namecache/gnunet-namecache.c:195 src/namestore/gnunet-namestore.c:665
+#, fuzzy, c-format
+msgid "Invalid public key for reverse lookup `%s'\n"
+msgstr "Parámetro no válido «%s»\n"
+
+#: src/namecache/gnunet-namecache.c:226 src/namestore/gnunet-namestore.c:821
+msgid "name of the record to add/delete/display"
+msgstr "nombre del registro a añadir/borrar/mostrar"
+
+#: src/namecache/gnunet-namecache.c:229
+#, fuzzy
+msgid "spezifies the public key of the zone to look in"
+msgstr "Especificar el tipo del registro a buscar"
+
+#: src/namecache/gnunet-namecache.c:240 src/namestore/gnunet-namestore.c:853
+msgid "GNUnet zone manipulation tool"
+msgstr "Herramienta de manipulación de zona de GNUnet"
+
+#: src/namecache/namecache_api.c:276
+#, fuzzy
+msgid "Namecache failed to cache block"
+msgstr "El almacén de nombres no pudo añadir el registro"
+
+#: src/namecache/plugin_namecache_postgres.c:89
+#: src/namestore/plugin_namestore_postgres.c:93
+msgid "Failed to create indices\n"
+msgstr "Se produjo un fallo al crear los índices\n"
+
+#: src/namestore/gnunet-namestore.c:278
 #, c-format
 msgid "Adding record failed: %s\n"
 msgstr "No se pudo añadir el registro: %s\n"
 
-#: src/namestore/gnunet-namestore.c:289
-#, c-format
-msgid "Deleting record failed: %s\n"
+#: src/namestore/gnunet-namestore.c:306
+#, fuzzy, c-format
+msgid "Deleting record failed, record does not exist%s%s\n"
 msgstr "No se pudo borrar el registro: %s\n"
 
-#: src/namestore/gnunet-namestore.c:338
-#, c-format
-msgid "\tCorrupt or unsupported record of type %u\n"
-msgstr "\tRegistro corrupto o no soportado del tipo %u\n"
+#: src/namestore/gnunet-namestore.c:313
+#, fuzzy, c-format
+msgid "Deleting record failed%s%s\n"
+msgstr "No se pudo borrar el registro: %s\n"
 
-#: src/namestore/gnunet-namestore.c:446
+#: src/namestore/gnunet-namestore.c:528
 #, c-format
 msgid "No options given\n"
 msgstr "No se han proporcionado opciones\n"
 
-#: src/namestore/gnunet-namestore.c:456
-#: src/namestore/gnunet-namestore-fcfsd.c:992
+#: src/namestore/gnunet-namestore.c:539
+#: src/namestore/gnunet-namestore-fcfsd.c:964
 msgid "Failed to connect to namestore\n"
 msgstr "Se produjo un fallo al conectar con el almacén de nombres\n"
 
-#: src/namestore/gnunet-namestore.c:464 src/namestore/gnunet-namestore.c:473
-#: src/namestore/gnunet-namestore.c:490 src/namestore/gnunet-namestore.c:512
-#: src/namestore/gnunet-namestore.c:554
+#: src/namestore/gnunet-namestore.c:547 src/namestore/gnunet-namestore.c:556
+#: src/namestore/gnunet-namestore.c:573 src/namestore/gnunet-namestore.c:595
+#: src/namestore/gnunet-namestore.c:635
 #, c-format
 msgid "Missing option `%s' for operation `%s'\n"
 msgstr "Falta la opción «%s» para la operación «%s»\n"
 
-#: src/namestore/gnunet-namestore.c:465 src/namestore/gnunet-namestore.c:474
-#: src/namestore/gnunet-namestore.c:491 src/namestore/gnunet-namestore.c:513
+#: src/namestore/gnunet-namestore.c:548 src/namestore/gnunet-namestore.c:557
+#: src/namestore/gnunet-namestore.c:574 src/namestore/gnunet-namestore.c:596
 msgid "add"
 msgstr "añadir"
 
-#: src/namestore/gnunet-namestore.c:482
+#: src/namestore/gnunet-namestore.c:565
 #, c-format
 msgid "Unsupported type `%s'\n"
 msgstr "Tipo no soportado «%s»\n"
 
-#: src/namestore/gnunet-namestore.c:502
+#: src/namestore/gnunet-namestore.c:585
 #, c-format
 msgid "Value `%s' invalid for record type `%s'\n"
 msgstr "Valor «%s» no válido para el tipo de registro «%s»\n"
 
-#: src/namestore/gnunet-namestore.c:538
+#: src/namestore/gnunet-namestore.c:621
 #, c-format
 msgid "Invalid time format `%s'\n"
 msgstr "Formato de tiempo no válido «%s»\n"
 
-#: src/namestore/gnunet-namestore.c:555
+#: src/namestore/gnunet-namestore.c:636
 msgid "del"
 msgstr "borrar"
 
-#: src/namestore/gnunet-namestore.c:588
-#: src/peerinfo-tool/gnunet-peerinfo.c:711
+#: src/namestore/gnunet-namestore.c:689
+#: src/peerinfo-tool/gnunet-peerinfo.c:703
 #, c-format
 msgid "Invalid URI `%s'\n"
 msgstr "URI no válida: «%s»\n"
 
-#: src/namestore/gnunet-namestore.c:645
+#: src/namestore/gnunet-namestore.c:747
 #, fuzzy, c-format
 msgid "Ego `%s' not known to identity service\n"
 msgstr "'%s': servicio desconocido: %s\n"
 
-#: src/namestore/gnunet-namestore.c:674
-#, fuzzy, c-format
-msgid "You must specify which zone should be accessed\n"
-msgstr "Se debe especificar un apodo\n"
-
-#: src/namestore/gnunet-namestore.c:702
+#: src/namestore/gnunet-namestore.c:806
 msgid "add record"
 msgstr "añadir registro"
 
-#: src/namestore/gnunet-namestore.c:705
+#: src/namestore/gnunet-namestore.c:809
 msgid "delete record"
 msgstr "borrar registro"
 
-#: src/namestore/gnunet-namestore.c:708
+#: src/namestore/gnunet-namestore.c:812
 msgid "display records"
 msgstr "mostrar registros"
 
-#: src/namestore/gnunet-namestore.c:711
+#: src/namestore/gnunet-namestore.c:815
 msgid ""
 "expiration time for record to use (for adding only), \"never\" is possible"
 msgstr ""
 "tiempo de expiración del registro a usar (únicamente para añadir), nunca "
 "(\"never\") es posible"
 
-#: src/namestore/gnunet-namestore.c:714
+#: src/namestore/gnunet-namestore.c:818
 #, fuzzy
 msgid "monitor changes in the namestore"
 msgstr "¡Se produjo un fallo al conectar con el almacén de nombres!\n"
 
-#: src/namestore/gnunet-namestore.c:717
-msgid "name of the record to add/delete/display"
-msgstr "nombre del registro a añadir/borrar/mostrar"
+#: src/namestore/gnunet-namestore.c:824
+#, fuzzy
+msgid "determine our name for the given PKEY"
+msgstr "establece las preferencias para el par dado"
 
-#: src/namestore/gnunet-namestore.c:720
+#: src/namestore/gnunet-namestore.c:827
 msgid "type of the record to add/delete/display"
 msgstr "tipo del registro a añadir/borrar/mostrar"
 
-#: src/namestore/gnunet-namestore.c:723
+#: src/namestore/gnunet-namestore.c:830
 msgid "URI to import into our zone"
 msgstr "URI a importar a nuestra zona"
 
-#: src/namestore/gnunet-namestore.c:726
+#: src/namestore/gnunet-namestore.c:833
 msgid "value of the record to add/delete"
 msgstr "valor del registro a añadir/borrar"
 
-#: src/namestore/gnunet-namestore.c:729
+#: src/namestore/gnunet-namestore.c:836
 msgid "create or list public record"
 msgstr "crear o listar registros públicos"
 
-#: src/namestore/gnunet-namestore.c:732
+#: src/namestore/gnunet-namestore.c:839
 msgid ""
 "create shadow record (only valid if all other records of the same type have "
 "expired"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:735
+#: src/namestore/gnunet-namestore.c:842
 #, fuzzy
 msgid "name of the ego controlling the zone"
 msgstr "nombre de la sección a la que acceder"
 
-#: src/namestore/gnunet-namestore.c:746
-msgid "GNUnet zone manipulation tool"
-msgstr "Herramienta de manipulación de zona de GNUnet"
-
 # form??
-#: src/namestore/gnunet-namestore-fcfsd.c:456
+#: src/namestore/gnunet-namestore-fcfsd.c:462
 #, c-format
 msgid "Unsupported form value `%s'\n"
 msgstr "Forma de valor no soportada «%s»\n"
 
-#: src/namestore/gnunet-namestore-fcfsd.c:485
+#: src/namestore/gnunet-namestore-fcfsd.c:489
 #, c-format
 msgid "Failed to create record for domain `%s': %s\n"
 msgstr "Se produjo un fallo al crear un registro para el dominio «%s»: %s\n"
 
-#: src/namestore/gnunet-namestore-fcfsd.c:520
+#: src/namestore/gnunet-namestore-fcfsd.c:524
 #, c-format
 msgid "Found existing name `%s' for the given key\n"
 msgstr "Encontrado nombre «%s» para la clave dada\n"
 
-#: src/namestore/gnunet-namestore-fcfsd.c:560
+#: src/namestore/gnunet-namestore-fcfsd.c:590
 #, c-format
 msgid "Found %u existing records for domain `%s'\n"
 msgstr "Encontrados %u registros para el dominio «%s»\n"
 
-#: src/namestore/gnunet-namestore-fcfsd.c:670
+#: src/namestore/gnunet-namestore-fcfsd.c:646
 #, c-format
 msgid "Failed to create page for `%s'\n"
 msgstr "Se produjo un fallo al crear la página para «%s»\n"
 
-#: src/namestore/gnunet-namestore-fcfsd.c:686
+#: src/namestore/gnunet-namestore-fcfsd.c:662
 #, c-format
 msgid "Failed to setup post processor for `%s'\n"
 msgstr "Se produjo un fallo al configurar el post-procesador para «%s»\n"
 
-#: src/namestore/gnunet-namestore-fcfsd.c:722
+#: src/namestore/gnunet-namestore-fcfsd.c:698
 msgid "Domain name must not contain `.'\n"
 msgstr "El nombre de dominio no puede contener «.»\n"
 
-#: src/namestore/gnunet-namestore-fcfsd.c:730
+#: src/namestore/gnunet-namestore-fcfsd.c:706
 msgid "Domain name must not contain `+'\n"
 msgstr "El nombre de dominio no puede contener «+»\n"
 
-#: src/namestore/gnunet-namestore-fcfsd.c:932
+#: src/namestore/gnunet-namestore-fcfsd.c:904
 msgid "No ego configured for `fcfsd` subsystem\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:1027
+#: src/namestore/gnunet-namestore-fcfsd.c:930
+msgid "Failed to start HTTP server\n"
+msgstr "Se produjo un fallo al iniciar el servidor HTTP\n"
+
+#: src/namestore/gnunet-namestore-fcfsd.c:999
 #, fuzzy
 msgid "GNU Name System First Come First Serve name registration service"
 msgstr "Servicio de registro GNUnet GNS primero en llegar, primero en servirse"
 
-#: src/namestore/gnunet-service-namestore.c:674
-msgid "Failed to cache encrypted block of my own zone!\n"
-msgstr ""
-
-#: src/namestore/namestore_api.c:319
-#, fuzzy
-msgid "Namestore failed to cache block"
-msgstr "El almacén de nombres no pudo añadir el registro"
+#: src/namestore/gnunet-service-namestore.c:494
+#, fuzzy, c-format
+msgid "Failed to replicate block in namecache: %s\n"
+msgstr "Se produjo un fallo al crear el espacio de nombres «%s»\n"
 
-#: src/namestore/namestore_api.c:345
+#: src/namestore/namestore_api.c:273
 #, fuzzy
 msgid "Namestore failed to store record\n"
 msgstr "El almacén de nombres no pudo añadir el registro\n"
 
-#: src/namestore/namestore_api_common.c:691
-#: src/namestore/namestore_api_common.c:831
-#, c-format
-msgid "Unsupported record type %d\n"
-msgstr "Tipo de registro %d no soportado\n"
-
-#: src/namestore/namestore_api_common.c:698
-#, c-format
-msgid "Unable to parse IPv4 address `%s'\n"
-msgstr "No se pudo procesar la dirección IPv4 «%s»\n"
-
-#: src/namestore/namestore_api_common.c:721
-#, c-format
-msgid "Unable to parse SOA record `%s'\n"
-msgstr "No se pudo procesar el registro SOA «%s»\n"
-
-#: src/namestore/namestore_api_common.c:744
-#, c-format
-msgid "Unable to parse MX record `%s'\n"
-msgstr "No se pudo procesar el registro MX «%s»\n"
-
-#: src/namestore/namestore_api_common.c:762
-#, c-format
-msgid "Unable to parse IPv6 address `%s'\n"
-msgstr "No se pudo procesar dirección IPv4 «%s»\n"
-
-#: src/namestore/namestore_api_common.c:775
-#, c-format
-msgid "Unable to parse PKEY record `%s'\n"
-msgstr "No se pudo procesar el registro PKEY «%s»\n"
-
-#: src/namestore/namestore_api_common.c:796
-#, c-format
-msgid "Unable to parse VPN record string `%s'\n"
-msgstr "No se pudo procesar la cadena de registro VPN «%s»\n"
-
-#: src/namestore/namestore_api_common.c:822
-#, c-format
-msgid "Unable to parse TLSA record string `%s'\n"
-msgstr "No se pudo procesar la cadena de registro TLSA «%s»\n"
-
-#: src/namestore/plugin_namestore_postgres.c:95
-msgid "Failed to create indices\n"
-msgstr "Se produjo un fallo al crear los índices\n"
-
 #: src/nat/gnunet-nat-server.c:279
 #, c-format
 msgid "Please pass valid port number as the first argument! (got `%s')\n"
@@ -4531,40 +5037,41 @@ msgstr ""
 "Se produjo un fallo al crear el «socket» de escucha asociado a «%s» para "
 "pruebas NAT: %s\n"
 
-#: src/nse/gnunet-nse-profiler.c:889
+#: src/nse/gnunet-nse-profiler.c:858
 msgid "limit to the number of connections to NSE services, 0 for none"
 msgstr "límite al número de conexiones a servicios NSE, 0 para ilimitadas"
 
-#: src/nse/gnunet-nse-profiler.c:892
+#: src/nse/gnunet-nse-profiler.c:861
 msgid "name of the file for writing connection information and statistics"
 msgstr ""
 "nombre del fichero para escribir información y estadísticas de la conexión"
 
-#: src/nse/gnunet-nse-profiler.c:895 src/testbed/gnunet-testbed-profiler.c:287
+#: src/nse/gnunet-nse-profiler.c:864 src/testbed/gnunet-testbed-profiler.c:306
 msgid "name of the file with the login information for the testbed"
 msgstr ""
 "nombre del fichero con la información de acceso usada para la batería de "
 "pruebas"
 
-#: src/nse/gnunet-nse-profiler.c:898
+#: src/nse/gnunet-nse-profiler.c:867
 msgid "name of the file for writing the main results"
 msgstr "nombre del fichero en el que escribir los resultados principales"
 
-#: src/nse/gnunet-nse-profiler.c:901
+#: src/nse/gnunet-nse-profiler.c:870
 msgid "Number of peers to run in each round, separated by commas"
 msgstr "Número de pares a ejecutar en cada ronda, separados por comas"
 
-#: src/nse/gnunet-nse-profiler.c:907
+#: src/nse/gnunet-nse-profiler.c:876
 msgid "delay between rounds"
 msgstr "retraso entre rondas"
 
-#: src/nse/gnunet-nse-profiler.c:916
+#: src/nse/gnunet-nse-profiler.c:885
 msgid "Measure quality and performance of the NSE service."
 msgstr "Medir la calidad y rendimiento del servicio NSE."
 
-#: src/nse/gnunet-service-nse.c:1448
-msgid "Invalid work requirement for NSE service. Exiting.\n"
-msgstr "Requisitos de trabajo no válidos para el servicio NSE. Saliendo.\n"
+#: src/nse/gnunet-service-nse.c:1460
+#: src/revocation/gnunet-service-revocation.c:580
+msgid "Value is too large.\n"
+msgstr ""
 
 #: src/nse/gnunet-service-nse.c:1487
 msgid "NSE service is lacking key configuration settings.  Exiting.\n"
@@ -4576,21 +5083,21 @@ msgstr ""
 msgid "Removing expired address of transport `%s'\n"
 msgstr "Eliminando dirección de transporte «%s»\n"
 
-#: src/peerinfo/gnunet-service-peerinfo.c:353
+#: src/peerinfo/gnunet-service-peerinfo.c:352
 #, fuzzy, c-format
 msgid "Failed to parse HELLO in file `%s': %s\n"
 msgstr "Se produjo un fallo al procesar «HELLO» en el fichero «%s»\n"
 
-#: src/peerinfo/gnunet-service-peerinfo.c:370
+#: src/peerinfo/gnunet-service-peerinfo.c:369
 #, fuzzy, c-format
 msgid "Failed to parse HELLO in file `%s': %s %u \n"
 msgstr "Se produjo un fallo al procesar «HELLO» en el fichero «%s»\n"
 
-#: src/peerinfo/gnunet-service-peerinfo.c:448
+#: src/peerinfo/gnunet-service-peerinfo.c:447
 msgid "# peers known"
 msgstr "# pares conocidos"
 
-#: src/peerinfo/gnunet-service-peerinfo.c:484
+#: src/peerinfo/gnunet-service-peerinfo.c:483
 #, c-format
 msgid ""
 "File `%s' in directory `%s' does not match naming convention. Removed.\n"
@@ -4598,143 +5105,143 @@ msgstr ""
 "El fichero «%s» en el directorio «%s» no sigue la convención de nombres. "
 "Eliminado.\n"
 
-#: src/peerinfo/gnunet-service-peerinfo.c:637
+#: src/peerinfo/gnunet-service-peerinfo.c:638
 #, fuzzy, c-format
 msgid "Scanning directory `%s'\n"
 msgstr "Escaneando directorio «%s».\n"
 
-#: src/peerinfo/gnunet-service-peerinfo.c:642
+#: src/peerinfo/gnunet-service-peerinfo.c:643
 #, c-format
 msgid "Still no peers found in `%s'!\n"
 msgstr "¡Aún no se han encontrado pares en «%s»!\n"
 
-#: src/peerinfo/gnunet-service-peerinfo.c:975
+#: src/peerinfo/gnunet-service-peerinfo.c:979
 #, fuzzy, c-format
 msgid "Cleaning up directory `%s'\n"
 msgstr "Escaneando directorio «%s».\n"
 
-#: src/peerinfo/gnunet-service-peerinfo.c:1265
+#: src/peerinfo/gnunet-service-peerinfo.c:1269
 #, c-format
 msgid "Importing HELLOs from `%s'\n"
 msgstr "Importando HELLO de «%s»\n"
 
-#: src/peerinfo/peerinfo_api.c:239
+#: src/peerinfo/peerinfo_api.c:236
 msgid "aborted due to explicit disconnect request"
 msgstr "abortado debido a petición de desconexión explícita"
 
-#: src/peerinfo/peerinfo_api.c:359
+#: src/peerinfo/peerinfo_api.c:356
 msgid "failed to transmit request (service down?)"
 msgstr ""
 "se produjo un fallo al transmitir la petición (¿está caido el servicio?)"
 
 # Miguel: "Failed to receive" también aquí está traducido como
 # "no se obtuvo respuesta" por claridad.
-#: src/peerinfo/peerinfo_api.c:509
+#: src/peerinfo/peerinfo_api.c:506
 msgid "Failed to receive response from `PEERINFO' service."
 msgstr ""
 "No se obtuvo respuesta del servicio de información de pares (PEERINFO)."
 
-#: src/peerinfo/peerinfo_api.c:550 src/peerinfo/peerinfo_api.c:569
-#: src/peerinfo/peerinfo_api.c:584 src/peerinfo/peerinfo_api.c:595
-#: src/peerinfo/peerinfo_api.c:606
+#: src/peerinfo/peerinfo_api.c:547 src/peerinfo/peerinfo_api.c:566
+#: src/peerinfo/peerinfo_api.c:581 src/peerinfo/peerinfo_api.c:592
+#: src/peerinfo/peerinfo_api.c:603
 msgid "Received invalid message from `PEERINFO' service."
 msgstr ""
 "Recibido mensaje no válido del servicio de información de pares (PEERINFO)."
 
-#: src/peerinfo/peerinfo_api.c:681
+#: src/peerinfo/peerinfo_api.c:678
 msgid "Timeout transmitting iteration request to `PEERINFO' service."
 msgstr ""
 "Petición de transmisión de iteración de expiración al servicio de "
 "información de pares (PEERINFO)."
 
-#: src/peerinfo/peerinfo_api_notify.c:269
+#: src/peerinfo/peerinfo_api_notify.c:268
 #, c-format
 msgid "Could not connect to `%s' service.\n"
 msgstr "No se pudo conectar al servicio %s.\n"
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:239
+#: src/peerinfo-tool/gnunet-peerinfo.c:232
 #, fuzzy, c-format
 msgid "%sPeer `%s'\n"
 msgstr "Par «%s»\n"
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:246
+#: src/peerinfo-tool/gnunet-peerinfo.c:239
 #, c-format
 msgid "\tExpires: %s \t %s\n"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:437
+#: src/peerinfo-tool/gnunet-peerinfo.c:428
 #, fuzzy, c-format
 msgid "Failure: Did not receive %s\n"
 msgstr "Se produjo un fallo al resolver «%s»: %s\n"
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:445
+#: src/peerinfo-tool/gnunet-peerinfo.c:436
 #, fuzzy, c-format
 msgid "Failure: Received invalid %s\n"
 msgstr "recibido mensaje '%s' no válido: %s.\n"
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:454
+#: src/peerinfo-tool/gnunet-peerinfo.c:445
 #, fuzzy, c-format
 msgid "Failed to write HELLO with %u bytes to file `%s'\n"
 msgstr "Se produjo un fallo al procesar «HELLO» en el fichero «%s»\n"
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:467
+#: src/peerinfo-tool/gnunet-peerinfo.c:458
 #, c-format
 msgid "Wrote %s HELLO containing %u addresses with %u bytes to file `%s'\n"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:531
+#: src/peerinfo-tool/gnunet-peerinfo.c:522
 #, c-format
 msgid "Failure adding HELLO: %s\n"
 msgstr "Fallo añadiendo «HELLO»: %s\n"
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:669
+#: src/peerinfo-tool/gnunet-peerinfo.c:661
 #, c-format
 msgid "Could not find option `%s:%s' in configuration.\n"
 msgstr "No se pudo encontrar la opción «%s:%s» en la configuración.\n"
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:675
+#: src/peerinfo-tool/gnunet-peerinfo.c:667
 #, c-format
 msgid "Loading hostkey from `%s' failed.\n"
 msgstr "La carga de la clave de la máquina desde «%s» ha fallado.\n"
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:734
+#: src/peerinfo-tool/gnunet-peerinfo.c:725
 #, c-format
 msgid "I am peer `%s'.\n"
 msgstr "Yo soy el par «%s».\n"
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:777
+#: src/peerinfo-tool/gnunet-peerinfo.c:769
 msgid "don't resolve host names"
 msgstr "no resolver nombres de máquina"
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:780
+#: src/peerinfo-tool/gnunet-peerinfo.c:772
 msgid "output only the identity strings"
 msgstr "mostrar únicamente las cadenas de identidad"
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:783
+#: src/peerinfo-tool/gnunet-peerinfo.c:775
 msgid "include friend-only information"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:786
+#: src/peerinfo-tool/gnunet-peerinfo.c:778
 msgid "output our own identity only"
 msgstr "muestra únicamente nuestra propia identidad"
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:789
+#: src/peerinfo-tool/gnunet-peerinfo.c:781
 msgid "list all known peers"
 msgstr "mostrar todos los pares conocidos"
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:792
+#: src/peerinfo-tool/gnunet-peerinfo.c:784
 msgid "dump hello to file"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:795
+#: src/peerinfo-tool/gnunet-peerinfo.c:787
 msgid "also output HELLO uri(s)"
 msgstr "también mostrar las URI de «HELLO»"
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:798
+#: src/peerinfo-tool/gnunet-peerinfo.c:790
 msgid "add given HELLO uri to the database"
 msgstr "añade la URI de «HELLO» dada a la base de datos"
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:809
+#: src/peerinfo-tool/gnunet-peerinfo.c:801
 msgid "Print information about peers."
 msgstr "Imprimir información sobre los pares."
 
@@ -4766,89 +5273,84 @@ msgstr "«%s:%s» falló en %s:%d con error: %s"
 msgid "Unable to initialize Postgres: %s"
 msgstr "No se pudo inicializar Postgres: %s"
 
-#: src/psycstore/gnunet-service-psycstore.c:203
+#: src/psycstore/gnunet-service-psycstore.c:200
 #, fuzzy
 msgid "Failed to store membership information!\n"
 msgstr "Se produjo un fallo al retomar la operación de publicación «%s»: %s\n"
 
-#: src/psycstore/gnunet-service-psycstore.c:227
+#: src/psycstore/gnunet-service-psycstore.c:224
 #, fuzzy
 msgid "Failed to test membership!\n"
 msgstr "¡Se produjo un fallo al configurar el túnel mesh!\n"
 
-#: src/psycstore/gnunet-service-psycstore.c:249
+#: src/psycstore/gnunet-service-psycstore.c:246
 #, fuzzy
 msgid "Failed to store fragment!\n"
 msgstr "Se produjo un fallo al iniciar el demonio: %s\n"
 
-#: src/psycstore/gnunet-service-psycstore.c:275
+#: src/psycstore/gnunet-service-psycstore.c:272
 #, fuzzy
 msgid "Failed to get fragment!\n"
 msgstr "¡Se produjo un fallo al obtener la clave de máquina!\n"
 
-#: src/psycstore/gnunet-service-psycstore.c:302
+#: src/psycstore/gnunet-service-psycstore.c:299
 #, fuzzy
 msgid "Failed to get message!\n"
 msgstr "¡Se produjo un fallo al obtener la clave de máquina!\n"
 
-#: src/psycstore/gnunet-service-psycstore.c:331
+#: src/psycstore/gnunet-service-psycstore.c:328
 #, fuzzy
 msgid "Failed to get message fragment!\n"
 msgstr "Se produjo un fallo al procesar un mensaje «HELLO»: mal formado\n"
 
-#: src/psycstore/gnunet-service-psycstore.c:357
+#: src/psycstore/gnunet-service-psycstore.c:356
 #, fuzzy
 msgid "Failed to get master counters!\n"
 msgstr "¡Se produjo un fallo al obtener la clave de máquina!\n"
 
-#: src/psycstore/gnunet-service-psycstore.c:395
-#, fuzzy
-msgid "Failed to get slave counters!\n"
-msgstr "¡Se produjo un fallo al obtener la clave de máquina!\n"
-
-#: src/psycstore/gnunet-service-psycstore.c:429
-#: src/psycstore/gnunet-service-psycstore.c:502
+#: src/psycstore/gnunet-service-psycstore.c:392
+#: src/psycstore/gnunet-service-psycstore.c:465
 msgid "Tried to set invalid state variable name!\n"
 msgstr ""
 
-#: src/psycstore/gnunet-service-psycstore.c:445
+#: src/psycstore/gnunet-service-psycstore.c:408
 #, fuzzy
 msgid "Failed to begin modifying state!\n"
 msgstr "Se produjo un fallo al cargar el estado: %s\n"
 
-#: src/psycstore/gnunet-service-psycstore.c:468
+#: src/psycstore/gnunet-service-psycstore.c:431
 #, fuzzy, c-format
 msgid "Unknown operator: %c\n"
 msgstr "Operación desconocida '%s'\n"
 
-#: src/psycstore/gnunet-service-psycstore.c:478
+#: src/psycstore/gnunet-service-psycstore.c:441
 #, fuzzy
 msgid "Failed to end modifying state!\n"
 msgstr "Se produjo un fallo al cargar el estado: %s\n"
 
-#: src/psycstore/gnunet-service-psycstore.c:516
+#: src/psycstore/gnunet-service-psycstore.c:479
 #, fuzzy
 msgid "Failed to begin synchronizing state!\n"
 msgstr "¡Se produjo un fallo al obtener la clave de máquina!\n"
 
-#: src/psycstore/gnunet-service-psycstore.c:532
+#: src/psycstore/gnunet-service-psycstore.c:495
 #, fuzzy
 msgid "Failed to end synchronizing state!\n"
 msgstr "¡Se produjo un fallo al obtener la clave de máquina!\n"
 
-#: src/psycstore/gnunet-service-psycstore.c:552
-#: src/psycstore/gnunet-service-psycstore.c:571
+#: src/psycstore/gnunet-service-psycstore.c:515
+#: src/psycstore/gnunet-service-psycstore.c:534
 #, fuzzy
 msgid "Failed to reset state!\n"
 msgstr "¡Se produjo un fallo al obtener la clave de máquina!\n"
 
-#: src/psycstore/gnunet-service-psycstore.c:594
-#: src/psycstore/gnunet-service-psycstore.c:645
+#: src/psycstore/gnunet-service-psycstore.c:557
+#: src/psycstore/gnunet-service-psycstore.c:608
 msgid "Tried to get invalid state variable name!\n"
 msgstr ""
 
-#: src/psycstore/gnunet-service-psycstore.c:621
-#: src/psycstore/gnunet-service-psycstore.c:660
+#: src/psycstore/gnunet-service-psycstore.c:584
+#: src/psycstore/gnunet-service-psycstore.c:623
 #, fuzzy
 msgid "Failed to get state variable!\n"
 msgstr "¡Se produjo un fallo al obtener la clave de máquina!\n"
@@ -4877,61 +5379,58 @@ msgstr "Error abriendo fichero «%s»: %s\n"
 msgid "SQLite database running\n"
 msgstr "Base de datos sqlite ejecutándose\n"
 
-#: src/pt/gnunet-daemon-pt.c:266
+#: src/pt/gnunet-daemon-pt.c:483
 msgid "Failed to pack DNS request.  Dropping.\n"
 msgstr "Se produjo un fallo al empaquetar la petición DNS.  Omitiendo.\n"
 
-#: src/pt/gnunet-daemon-pt.c:272
+#: src/pt/gnunet-daemon-pt.c:489
 msgid "# DNS requests mapped to VPN"
 msgstr "# Peticiones DNS asociadas a la VPN"
 
-#: src/pt/gnunet-daemon-pt.c:325
+#: src/pt/gnunet-daemon-pt.c:542
 msgid "# DNS records modified"
 msgstr "# Registros DNS modificados"
 
-#: src/pt/gnunet-daemon-pt.c:502
+#: src/pt/gnunet-daemon-pt.c:718
 msgid "# DNS replies intercepted"
 msgstr "# Respuestas DNS interceptadas"
 
-#: src/pt/gnunet-daemon-pt.c:508
+#: src/pt/gnunet-daemon-pt.c:724
 msgid "Failed to parse DNS request.  Dropping.\n"
 msgstr "Se produjo un fallo al procesar la petición DNS.  Omitiendo.\n"
 
-#: src/pt/gnunet-daemon-pt.c:604
+#: src/pt/gnunet-daemon-pt.c:827
 msgid "# DNS requests dropped (timeout)"
 msgstr "# Peticiones DNS omitidas (expiradas)"
 
-#: src/pt/gnunet-daemon-pt.c:634
+#: src/pt/gnunet-daemon-pt.c:884
 msgid "# DNS requests intercepted"
 msgstr "# Peticiones DNS interceptadas"
 
-#: src/pt/gnunet-daemon-pt.c:639
+#: src/pt/gnunet-daemon-pt.c:889
 msgid "# DNS requests dropped (DNS mesh tunnel down)"
 msgstr "# Peticiones DNS omitidas (túnel mesh DNS caído)"
 
-#: src/pt/gnunet-daemon-pt.c:647
+#: src/pt/gnunet-daemon-pt.c:897
 msgid "# DNS requests dropped (malformed)"
 msgstr "# Peticiones DNS omitidas (mal formadas)"
 
-#: src/pt/gnunet-daemon-pt.c:715
+#: src/pt/gnunet-daemon-pt.c:970
 msgid "# DNS replies received"
 msgstr "# Respuestas DNS recibidas"
 
-#: src/pt/gnunet-daemon-pt.c:729
+#: src/pt/gnunet-daemon-pt.c:986
 msgid "# DNS replies dropped (too late?)"
 msgstr "# Respuestas DNS (¿demasiado tarde?)"
 
-#: src/pt/gnunet-daemon-pt.c:747 src/pt/gnunet-daemon-pt.c:759
-msgid "# DNS requests aborted (tunnel down)"
-msgstr "# Peticiones DNS abortadas (túnel caído)"
-
-#: src/pt/gnunet-daemon-pt.c:901 src/pt/gnunet-daemon-pt.c:910
-#: src/pt/gnunet-daemon-pt.c:930 src/pt/gnunet-daemon-pt.c:940
+#: src/pt/gnunet-daemon-pt.c:1262 src/pt/gnunet-daemon-pt.c:1271
+#: src/pt/gnunet-daemon-pt.c:1291 src/pt/gnunet-daemon-pt.c:1302
+#: src/pt/gnunet-daemon-pt.c:1311
 #, c-format
 msgid "Failed to connect to %s service.  Exiting.\n"
 msgstr "Se produjo un fallo al conectar con el servicio %s.  Saliendo.\n"
 
-#: src/pt/gnunet-daemon-pt.c:977
+#: src/pt/gnunet-daemon-pt.c:1348
 msgid "Daemon to run to perform IP protocol translation to GNUnet"
 msgstr ""
 "Demonio a ejecutar para realizar la traducción de protocolo IP a GNUnet"
@@ -4940,16 +5439,16 @@ msgstr ""
 msgid "Daemon to announce regular expressions for the peer using mesh."
 msgstr "Demonio para anunciar expresiones regulares para el par usando mesh."
 
-#: src/regex/gnunet-regex-profiler.c:1281
+#: src/regex/gnunet-regex-profiler.c:1288
 msgid "No configuration file given. Exiting\n"
 msgstr "No se ha introducido ningún fichero de configuración. Saliendo\n"
 
-#: src/regex/gnunet-regex-profiler.c:1292
+#: src/regex/gnunet-regex-profiler.c:1299
 #, fuzzy
 msgid "Configuration option \"regex_prefix\" missing. Exiting\n"
 msgstr "Falta una opción de configuración (regex_prefix). Saliendo\n"
 
-#: src/regex/gnunet-regex-profiler.c:1321
+#: src/regex/gnunet-regex-profiler.c:1328
 #: src/regex/gnunet-regex-simulation-profiler.c:622
 #, c-format
 msgid "No policy directory specified on command line. Exiting.\n"
@@ -4957,51 +5456,51 @@ msgstr ""
 "No se ha especificado una política de directorios en la línea de comandos. "
 "Saliendo.\n"
 
-#: src/regex/gnunet-regex-profiler.c:1327
+#: src/regex/gnunet-regex-profiler.c:1334
 #: src/regex/gnunet-regex-simulation-profiler.c:629
 #, c-format
 msgid "Specified policies directory does not exist. Exiting.\n"
 msgstr "Las políticas de directorio especificadas no existen. Saliendo.\n"
 
-#: src/regex/gnunet-regex-profiler.c:1334
+#: src/regex/gnunet-regex-profiler.c:1341
 #, c-format
 msgid "No files found in `%s'\n"
 msgstr "No se han encontrado ficheros en «%s»\n"
 
-#: src/regex/gnunet-regex-profiler.c:1343
+#: src/regex/gnunet-regex-profiler.c:1350
 msgid "No search strings file given. Exiting.\n"
 msgstr "No se ha proporcionado un fichero de cadenas de búsqueda. Saliendo.\n"
 
-#: src/regex/gnunet-regex-profiler.c:1363
+#: src/regex/gnunet-regex-profiler.c:1370
 msgid "Error loading search strings. Exiting.\n"
 msgstr "Error cargando cadenas de búsqueda. Saliendo.\n"
 
-#: src/regex/gnunet-regex-profiler.c:1445
+#: src/regex/gnunet-regex-profiler.c:1455
 msgid "name of the file for writing statistics"
 msgstr "nombre del fichero para escribir las estadísticas"
 
-#: src/regex/gnunet-regex-profiler.c:1448
+#: src/regex/gnunet-regex-profiler.c:1458
 #, fuzzy
 msgid "wait TIMEOUT before ending the experiment"
 msgstr ""
 "esperar «TIMEOUT» antes de considerar que una coincidencia de cadenas como "
 "fallida"
 
-#: src/regex/gnunet-regex-profiler.c:1451
+#: src/regex/gnunet-regex-profiler.c:1461
 msgid "directory with policy files"
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1454
+#: src/regex/gnunet-regex-profiler.c:1464
 #, fuzzy
 msgid "name of file with input strings"
 msgstr "nombre del fichero para escribir las estadísticas"
 
-#: src/regex/gnunet-regex-profiler.c:1457
+#: src/regex/gnunet-regex-profiler.c:1467
 #, fuzzy
 msgid "name of file with hosts' names"
 msgstr "nombre del fichero para escribir las estadísticas"
 
-#: src/regex/gnunet-regex-profiler.c:1469
+#: src/regex/gnunet-regex-profiler.c:1479
 msgid "Profiler for regex"
 msgstr "Perfilador para expresiones regulares."
 
@@ -5018,367 +5517,474 @@ msgstr "longitud de la máxima compresión de rutas"
 msgid "Profiler for regex library"
 msgstr "Analizador de rendimiento para la biblioteca de expresiones regulares"
 
-#: src/scalarproduct/gnunet-scalarproduct.c:195
+#: src/revocation/gnunet-revocation.c:121
+#, fuzzy, c-format
+msgid "Key `%s' is valid\n"
+msgstr "Formato del pseudónimo '%s' no es válido.\n"
+
+# Miguel: ¿Quizá fuese mejor «Se ha parado el servicio x»?
+# Esto también es aplicable a las siguientes traducciones.
+#: src/revocation/gnunet-revocation.c:126
+#, fuzzy, c-format
+msgid "Key `%s' has been revoked\n"
+msgstr "El servicio «%s» se ha parado.\n"
+
+#: src/revocation/gnunet-revocation.c:132
+#, fuzzy
+msgid "Internal error\n"
+msgstr "Error interno."
+
+#: src/revocation/gnunet-revocation.c:158
+#, c-format
+msgid "Key for ego `%s' is still valid, revocation failed (!)\n"
+msgstr ""
+
+#: src/revocation/gnunet-revocation.c:163
+#, fuzzy
+msgid "Revocation failed (!)\n"
+msgstr "La operación ha fallado.\n"
+
+#: src/revocation/gnunet-revocation.c:168
+#, c-format
+msgid "Key for ego `%s' has been successfully revoked\n"
+msgstr ""
+
+#: src/revocation/gnunet-revocation.c:173
+msgid "Revocation successful.\n"
+msgstr ""
+
+#: src/revocation/gnunet-revocation.c:178
+msgid "Internal error, key revocation might have failed\n"
+msgstr ""
+
+#: src/revocation/gnunet-revocation.c:289
+#, c-format
+msgid "Revocation certificate for `%s' stored in `%s'\n"
+msgstr ""
+
+#: src/revocation/gnunet-revocation.c:319
+#, fuzzy, c-format
+msgid "Ego `%s' not found.\n"
+msgstr "Módulo «%s» no encontrado\n"
+
+#: src/revocation/gnunet-revocation.c:340
+#, c-format
+msgid "Error: revocation certificate in `%s' is not for `%s'\n"
+msgstr ""
+
+#: src/revocation/gnunet-revocation.c:360
+msgid "Revocation certificate ready\n"
+msgstr ""
+
+#: src/revocation/gnunet-revocation.c:370
+msgid "Revocation certificate not ready, calculating proof of work\n"
+msgstr ""
+
+#: src/revocation/gnunet-revocation.c:402
+#, fuzzy, c-format
+msgid "Public key `%s' malformed\n"
+msgstr "El bloque del tipo %u está mal formado\n"
+
+#: src/revocation/gnunet-revocation.c:416
+msgid ""
+"Testing and revoking at the same time is not allowed, only executing test.\n"
+msgstr ""
+
+#: src/revocation/gnunet-revocation.c:451
+#, fuzzy, c-format
+msgid "Failed to read revocation certificate from `%s'\n"
+msgstr "Se produjo un fallo al leer la lista de amigos de «%s»\n"
+
+#: src/revocation/gnunet-revocation.c:476
+#, fuzzy
+msgid "No action specified. Nothing to do.\n"
+msgstr "Ninguna interfaz especificada, usando la marcada por defecto\n"
+
+#: src/revocation/gnunet-revocation.c:492
+msgid "use NAME for the name of the revocation file"
+msgstr ""
+
+#: src/revocation/gnunet-revocation.c:495
+msgid "revoke the private key associated with the ego NAME "
+msgstr ""
+
+#: src/revocation/gnunet-revocation.c:498
+msgid ""
+"actually perform the revocation revocation file, otherwise we just do the "
+"precomputation"
+msgstr ""
+
+#: src/revocation/gnunet-revocation.c:501
+msgid "test if the public key KEY has been revoked"
+msgstr ""
+
+#: src/revocation/gnunet-service-revocation.c:250
+#, fuzzy
+msgid "Duplicate revocation received from peer. Ignored.\n"
+msgstr "Opciones de paquete IPv4 recibidas.  Ignoradas.\n"
+
+#: src/revocation/gnunet-service-revocation.c:599
+#, fuzzy
+msgid "Could not open revocation database file!"
+msgstr "No se pudo conectar con el almacén de datos."
+
+#: src/scalarproduct/gnunet-scalarproduct.c:194
 #, fuzzy
 msgid "You must specify at least one message ID to check!\n"
 msgstr "Debes especificar un fichero a inspeccionar.\n"
 
-#: src/scalarproduct/gnunet-scalarproduct.c:201
+#: src/scalarproduct/gnunet-scalarproduct.c:200
 msgid "This program needs a session identifier for comparing vectors.\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-scalarproduct.c:207
+#: src/scalarproduct/gnunet-scalarproduct.c:206
 msgid "Please give a session key for --input_key!\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-scalarproduct.c:216
+#: src/scalarproduct/gnunet-scalarproduct.c:215
 #, c-format
 msgid ""
 "Tried to set initiator mode, as peer ID was given. However, `%s' is not a "
 "valid peer identifier.\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-scalarproduct.c:240
-#: src/scalarproduct/gnunet-scalarproduct.c:298
+#: src/scalarproduct/gnunet-scalarproduct.c:239
+#: src/scalarproduct/gnunet-scalarproduct.c:297
 #, fuzzy, c-format
 msgid "Could not convert `%s' to int32_t.\n"
 msgstr "No se pudo conectar al servicio %s.\n"
 
-#: src/scalarproduct/gnunet-scalarproduct.c:247
+#: src/scalarproduct/gnunet-scalarproduct.c:246
 msgid "Need elements to compute the vectorproduct, got none.\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-scalarproduct.c:348
+#: src/scalarproduct/gnunet-scalarproduct.c:347
 msgid ""
 "A comma separated list of elements to compare as vector with our remote peer."
 msgstr ""
 
-#: src/scalarproduct/gnunet-scalarproduct.c:351
+#: src/scalarproduct/gnunet-scalarproduct.c:350
 msgid ""
 "A comma separated mask to select which elements should actually be compared."
 msgstr ""
 
-#: src/scalarproduct/gnunet-scalarproduct.c:354
+#: src/scalarproduct/gnunet-scalarproduct.c:353
 msgid ""
 "[Optional] peer to calculate our scalarproduct with. If this parameter is "
 "not given, the service will wait for a remote peer to compute the request."
 msgstr ""
 
-#: src/scalarproduct/gnunet-scalarproduct.c:357
+#: src/scalarproduct/gnunet-scalarproduct.c:356
 msgid "Transaction ID shared with peer."
 msgstr ""
 
-#: src/scalarproduct/gnunet-scalarproduct.c:366
+#: src/scalarproduct/gnunet-scalarproduct.c:365
 msgid "Calculate the Vectorproduct with a GNUnet peer."
 msgstr ""
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:381
+#: src/scalarproduct/gnunet-service-scalarproduct.c:450
 #, c-format
 msgid "Generated key set with key length %d bits.\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:691
+#: src/scalarproduct/gnunet-service-scalarproduct.c:775
 #, fuzzy, c-format
 msgid "Client (%p) disconnected from us.\n"
 msgstr "Desconectado de %s\n"
 
 # Miguel: Si no me equivoco, "status result" es un
 # resultado de tipo estado.
-#: src/scalarproduct/gnunet-service-scalarproduct.c:762
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1696
+#: src/scalarproduct/gnunet-service-scalarproduct.c:847
+#: src/scalarproduct/gnunet-service-scalarproduct.c:936
 #, fuzzy, c-format
 msgid "Could not send message to client (%p)!\n"
 msgstr "No se pudo mandar el resultado (estado) al cliente\n"
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:768
+#: src/scalarproduct/gnunet-service-scalarproduct.c:853
 #, c-format
 msgid "Sending session-end notification to client (%p) for session %s\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:891
-msgid "Message too large, fragmentation is currently not supported!)\n"
+#: src/scalarproduct/gnunet-service-scalarproduct.c:946
+#, c-format
+msgid "Sent result to client (%p), this session (%s) has ended!\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:896
+#: src/scalarproduct/gnunet-service-scalarproduct.c:1025
+#: src/scalarproduct/gnunet-service-scalarproduct.c:1163
 msgid "Could not send service-response message via mesh!)\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1092
+#: src/scalarproduct/gnunet-service-scalarproduct.c:1376
 #, c-format
 msgid "Failed to communicate with `%s', scalar product calculation aborted.\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1145
-#, fuzzy, c-format
-msgid "Successfully created new tunnel to peer (%s)!\n"
-msgstr "Conectado satisfactoriamente a «%s»\n"
-
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1157
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1873
-msgid "Message too large, fragmentation is currently not supported!\n"
-msgstr ""
-
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1223
+#: src/scalarproduct/gnunet-service-scalarproduct.c:1476
+#: src/scalarproduct/gnunet-service-scalarproduct.c:1603
 #, fuzzy
 msgid "Transmitting service request.\n"
 msgstr "Reiniciando el servicio «%s»\n"
 
 # Miguel: Si no me equivoco, "list result" es un resultado
 # de tipo lista.
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1233
+#: src/scalarproduct/gnunet-service-scalarproduct.c:1485
+#, fuzzy
+msgid "Could not send service-request multipart message to tunnel!\n"
+msgstr "No se pudo mandar el resultado (lista) al cliente\n"
+
+#: src/scalarproduct/gnunet-service-scalarproduct.c:1525
+#, fuzzy, c-format
+msgid "Successfully created new tunnel to peer (%s)!\n"
+msgstr "Conectado satisfactoriamente a «%s»\n"
+
+# Miguel: Si no me equivoco, "list result" es un resultado
+# de tipo lista.
+#: src/scalarproduct/gnunet-service-scalarproduct.c:1612
 #, fuzzy
-msgid "Could not send mutlicast message to tunnel!\n"
+msgid "Could not send message to tunnel!\n"
 msgstr "No se pudo mandar el resultado (lista) al cliente\n"
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1283
+#: src/scalarproduct/gnunet-service-scalarproduct.c:1669
 #, fuzzy
 msgid "Too short message received from client!\n"
 msgstr "# peticiones «PUT» recibidas de clientes"
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1297
+#: src/scalarproduct/gnunet-service-scalarproduct.c:1682
 #, fuzzy
 msgid "Invalid message received from client, session information incorrect!\n"
 msgstr "Mensaje «%s» no válido recibido de la lista de máquinas en «%s»\n"
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1309
+#: src/scalarproduct/gnunet-service-scalarproduct.c:1693
 #, c-format
 msgid ""
 "Duplicate session information received, cannot create new session with key `"
 "%s'\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1330
+#: src/scalarproduct/gnunet-service-scalarproduct.c:1713
 #, c-format
 msgid ""
 "Got client-request-session with key %s, preparing tunnel to remote service.\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1369
+#: src/scalarproduct/gnunet-service-scalarproduct.c:1749
 #, c-format
-msgid "Creating new tunnel to for session with key %s.\n"
+msgid "Creating new tunnel for session with key %s.\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1417
+#: src/scalarproduct/gnunet-service-scalarproduct.c:1794
 #, c-format
 msgid ""
 "Got client-responder-session with key %s and a matching service-request-"
 "session set, processing.\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1425
+#: src/scalarproduct/gnunet-service-scalarproduct.c:1802
 #, c-format
 msgid ""
 "Got client-responder-session with key %s but NO matching service-request-"
 "session set, queuing element for later use.\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1481
-#, c-format
-msgid "Peer disconnected, terminating session %s with peer (%s)\n"
-msgstr ""
+#: src/scalarproduct/gnunet-service-scalarproduct.c:1828
+#, fuzzy, c-format
+msgid "New incoming tunnel from peer %s.\n"
+msgstr "Desconectado de %s\n"
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1706
+#: src/scalarproduct/gnunet-service-scalarproduct.c:1859
 #, c-format
-msgid "Sent result to client (%p), this session (%s) has ended!\n"
+msgid "Peer disconnected, terminating session %s with peer (%s)\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1790
+#: src/scalarproduct/gnunet-service-scalarproduct.c:2047
+#: src/scalarproduct/gnunet-service-scalarproduct.c:2196
 #, c-format
-msgid ""
-"Got message with duplicate session key (`%s'), ignoring service request.\n"
-msgstr ""
-
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1813
-msgid "Could not translate remote public key to sexpression!\n"
+msgid "Got session with key %s and a matching element set, processing.\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1849
-#, fuzzy, c-format
-msgid ""
-"Could not translate E[a%d] to MPI!\n"
-"%s/%s\n"
-msgstr "Imposible obtener IP para la interfaz '%s' usando '%s'.\n"
-
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1857
+#: src/scalarproduct/gnunet-service-scalarproduct.c:2054
+#: src/scalarproduct/gnunet-service-scalarproduct.c:2203
 #, c-format
-msgid "Got session with key %s and a matching element set, processing.\n"
+msgid "Got session with key %s without a matching element set, queueing.\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1866
+#: src/scalarproduct/gnunet-service-scalarproduct.c:2142
 #, c-format
-msgid "Got session with key %s without a matching element set, queueing.\n"
+msgid ""
+"Got message with duplicate session key (`%s'), ignoring service request.\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:2039
+#: src/scalarproduct/gnunet-service-scalarproduct.c:2425
 msgid "Shutting down, initiating cleanup.\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:2100
+#: src/scalarproduct/gnunet-service-scalarproduct.c:2490
 msgid "Generating Paillier-Keyset.\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:2116
+#: src/scalarproduct/gnunet-service-scalarproduct.c:2505
 #, fuzzy
 msgid "Connect to MESH failed\n"
 msgstr "Conexión fallida (¿bug?)\n"
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:2120
+#: src/scalarproduct/gnunet-service-scalarproduct.c:2509
 #, fuzzy
 msgid "Mesh initialized\n"
 msgstr "Conexión fallida\n"
 
-#: src/scalarproduct/scalarproduct_api.c:243
+#: src/scalarproduct/scalarproduct_api.c:246
 #, fuzzy
 msgid "# SUC responder result messages received"
 msgstr "# mensajes de detención de migración recibidos"
 
-#: src/scalarproduct/scalarproduct_api.c:297
+#: src/scalarproduct/scalarproduct_api.c:300
 #, fuzzy
 msgid "# bytes sent to scalarproduct"
 msgstr "# bytes mandados al almacén de datos"
 
-#: src/scalarproduct/scalarproduct_api.c:340
-#: src/scalarproduct/scalarproduct_api.c:433
+#: src/scalarproduct/scalarproduct_api.c:345
+#: src/scalarproduct/scalarproduct_api.c:440
 #, fuzzy
 msgid "Failed to connect to the scalarproduct service\n"
 msgstr "Se produjo un fallo al conectar con el servicio de chat\n"
 
-#: src/scalarproduct/scalarproduct_api.c:348
-#: src/scalarproduct/scalarproduct_api.c:441
+#: src/scalarproduct/scalarproduct_api.c:353
+#: src/scalarproduct/scalarproduct_api.c:448
 #, fuzzy
 msgid "Failed to send a message to the statistics service\n"
 msgstr "¡Se produjo un fallo al conectar al servicio de estadísticas!\n"
 
-#: src/scalarproduct/scalarproduct_api.c:382
-#: src/scalarproduct/scalarproduct_api.c:478
+#: src/scalarproduct/scalarproduct_api.c:387
+#: src/scalarproduct/scalarproduct_api.c:485
 #, fuzzy
 msgid "Failed to send a message to the scalarproduct service\n"
 msgstr "Se produjo un fallo al enviar una petición al servicio de transporte\n"
 
 # Miguel: Conjunto resta.
-#: src/set/gnunet-set-ibf-profiler.c:224
+#: src/set/gnunet-set-ibf-profiler.c:221
 msgid "number of element in set A-B"
 msgstr "número de elementos en el conjunto A-B"
 
-#: src/set/gnunet-set-ibf-profiler.c:227
+#: src/set/gnunet-set-ibf-profiler.c:224
 msgid "number of element in set B-A"
 msgstr "número de elementos en el conjunto B-A"
 
 # Miguel: Conjunto unión.
-#: src/set/gnunet-set-ibf-profiler.c:230
+#: src/set/gnunet-set-ibf-profiler.c:227
 msgid "number of common elements in A and B"
 msgstr "número de elementos comunes en A y B"
 
 # Miguel: "hash" me tiene un poco frito. ¿Existe alguna traducción buena?
-#: src/set/gnunet-set-ibf-profiler.c:233
+#: src/set/gnunet-set-ibf-profiler.c:230
 msgid "hash num"
 msgstr "número de hash"
 
-#: src/set/gnunet-set-ibf-profiler.c:236
+#: src/set/gnunet-set-ibf-profiler.c:233
 msgid "ibf size"
 msgstr "tamaño ibf"
 
-#: src/set/gnunet-set-profiler.c:296
+#: src/set/gnunet-set-profiler.c:295
 msgid "oeration to execute"
 msgstr ""
 
-#: src/statistics/gnunet-service-statistics.c:271
+#: src/statistics/gnunet-service-statistics.c:280
 #, c-format
 msgid "Loading %llu bytes of statistics from `%s'\n"
 msgstr "Cargando %llu bytes de estadísticas de «%s»\n"
 
-#: src/statistics/gnunet-service-statistics.c:330
+#: src/statistics/gnunet-service-statistics.c:346
 #, c-format
 msgid "Wrote %llu bytes of statistics to `%s'\n"
 msgstr "Escritos %llu bytes de estadísticas a «%s»\n"
 
-#: src/statistics/gnunet-statistics.c:142
+#: src/statistics/gnunet-statistics.c:140
 msgid "Failed to obtain statistics.\n"
 msgstr "Se produjo un fallo al obtener las estadísticas.\n"
 
-#: src/statistics/gnunet-statistics.c:144
+#: src/statistics/gnunet-statistics.c:142
 #, c-format
 msgid "Failed to obtain statistics from host `%s:%llu'\n"
 msgstr ""
 "Se produjo un fallo al obtener las estadísticas de la máquina «%s:%llu»\n"
 
-#: src/statistics/gnunet-statistics.c:191
+#: src/statistics/gnunet-statistics.c:189
 msgid "Missing argument: subsystem \n"
 msgstr "Falta el parámetro: subsistema\n"
 
-#: src/statistics/gnunet-statistics.c:197
+#: src/statistics/gnunet-statistics.c:195
 msgid "Missing argument: name\n"
 msgstr "Falta el argumento: nombre\n"
 
-#: src/statistics/gnunet-statistics.c:228
+#: src/statistics/gnunet-statistics.c:226
 #, c-format
 msgid "No subsystem or name given\n"
 msgstr "No se proporcionó un subsistema o un nombre\n"
 
-#: src/statistics/gnunet-statistics.c:236
+#: src/statistics/gnunet-statistics.c:234
 #, c-format
 msgid "Failed to initialize watch routine\n"
 msgstr "Se produjo un fallo al inicializar la rutina de visualización\n"
 
-#: src/statistics/gnunet-statistics.c:263
+#: src/statistics/gnunet-statistics.c:261
 #, c-format
 msgid "Trying to connect to remote host, but service `%s' is not running\n"
 msgstr ""
 "Intentando conectar con máquina remota, pero el servicio «%s» no se está "
 "ejecutando\n"
 
-#: src/statistics/gnunet-statistics.c:271
+#: src/statistics/gnunet-statistics.c:269
 #, c-format
 msgid "A port is required to connect to host `%s'\n"
 msgstr "Se necesita un puerto para conectar con la máquina «%s»\n"
 
-#: src/statistics/gnunet-statistics.c:278
+#: src/statistics/gnunet-statistics.c:276
 #, c-format
 msgid "A port has to be between 1 and 65535 to connect to host `%s'\n"
 msgstr "Un puerto debe estar entre 1 y 65534 para conectar a la máquina «%s»\n"
 
-#: src/statistics/gnunet-statistics.c:310
+#: src/statistics/gnunet-statistics.c:308
 #, c-format
 msgid "Invalid argument `%s'\n"
 msgstr "Parámetro no válido «%s»\n"
 
-#: src/statistics/gnunet-statistics.c:336
+#: src/statistics/gnunet-statistics.c:334
 msgid "limit output to statistics for the given NAME"
 msgstr "limita la salida de estadísticas para el nombre (NAME) dado"
 
-#: src/statistics/gnunet-statistics.c:339
+#: src/statistics/gnunet-statistics.c:337
 msgid "make the value being set persistent"
 msgstr "hacer el valor persistente"
 
-#: src/statistics/gnunet-statistics.c:342
+#: src/statistics/gnunet-statistics.c:340
 msgid "limit output to the given SUBSYSTEM"
 msgstr "límite de salida para el subsistema (SUBSYSTEM) dado"
 
-#: src/statistics/gnunet-statistics.c:345
+#: src/statistics/gnunet-statistics.c:343
 msgid "just print the statistics value"
 msgstr "imprime el valor de las estadísticas"
 
-#: src/statistics/gnunet-statistics.c:348
+#: src/statistics/gnunet-statistics.c:346
 msgid "watch value continuously"
 msgstr "visualiza el valor continuamente"
 
-#: src/statistics/gnunet-statistics.c:351
+#: src/statistics/gnunet-statistics.c:349
 msgid "connect to remote host"
 msgstr "conectar a equipo remoto"
 
-#: src/statistics/gnunet-statistics.c:354
+#: src/statistics/gnunet-statistics.c:352
 msgid "port for remote host"
 msgstr "puerto del equipo remoto"
 
-#: src/statistics/gnunet-statistics.c:366
+#: src/statistics/gnunet-statistics.c:364
 msgid "Print statistics about GNUnet operations."
 msgstr "Imprime estadísticas acerca de las operaciones de GNUnet."
 
-#: src/statistics/statistics_api.c:512
+#: src/statistics/statistics_api.c:509
 msgid "Could not save some persistent statistics\n"
 msgstr "No se pudieron guardar algunas estadísticas persistentes\n"
 
-#: src/statistics/statistics_api.c:1057
+#: src/statistics/statistics_api.c:1054
 msgid ""
 "Failed to receive acknowledgement from statistics service, some statistics "
 "might have been lost!\n"
@@ -5386,33 +5992,34 @@ msgstr ""
 "¡No se ha recibido el reconocimiento del servicio de estadísticas, algunas "
 "estadísticas se pueden haber perdido!\n"
 
+#: src/testbed/gnunet-daemon-testbed-blacklist.c:264
+msgid ""
+"Daemon to restrict incoming transport layer connections during testbed "
+"deployments"
+msgstr ""
+
 #: src/testbed/gnunet-service-testbed_cpustatus.c:727
 #, c-format
 msgid ""
 "Cannot open %s for writing load statistics.  Not logging load statistics\n"
 msgstr ""
 
-#: src/testbed/gnunet-service-testbed_peers.c:973
+#: src/testbed/gnunet-service-testbed_peers.c:1012
 #, fuzzy
 msgid "Misconfiguration (can't connect to the ARM service)"
 msgstr "¡Se produjo un fallo al conectar con el servicio dv!\n"
 
-#: src/testbed/gnunet-service-testbed_peers.c:979
+#: src/testbed/gnunet-service-testbed_peers.c:1018
 #, fuzzy
 msgid "Request doesn't fit into a message"
 msgstr "no imprime mensajes de estado"
 
 # Miguel: ¿Es mejor «ya que» que «porque» o «debido al apagado»?
-#: src/testbed/gnunet-service-testbed_peers.c:1017
+#: src/testbed/gnunet-service-testbed_peers.c:1056
 #, fuzzy, c-format
 msgid "%s service can't be started because ARM is shutting down"
 msgstr "Petición ignorada porque el ARM se está apagando.\n"
 
-#: src/testbed/gnunet_testbed_ll_master.c:57
-#, c-format
-msgid "Job command file not given. Exiting\n"
-msgstr "Fichero de configuración de trabajos no proporcionado. Saliendo\n"
-
 #: src/testbed/gnunet_testbed_mpi_spawn.c:125
 #, fuzzy
 msgid "Waiting for child to exit.\n"
@@ -5423,19 +6030,26 @@ msgstr "Esperando a los pares para conectar (%u ciclos restantes)...\n"
 msgid "Spawning process `%s'\n"
 msgstr "Iniciando el proceso auxiliar (HELPER) «%s»\n"
 
-#: src/testbed/gnunet-testbed-profiler.c:254
+#: src/testbed/gnunet-testbed-profiler.c:267
 #, fuzzy, c-format
 msgid "Exiting as the number of peers is %u\n"
 msgstr "El número máximo de conexiones es %u\n"
 
-#: src/testbed/gnunet-testbed-profiler.c:280
+#: src/testbed/gnunet-testbed-profiler.c:293
 msgid "create COUNT number of peers"
 msgstr "crea «COUNT» número de pares"
 
-#: src/testbed/gnunet-testbed-profiler.c:283
+#: src/testbed/gnunet-testbed-profiler.c:296
 msgid "tolerate COUNT number of continious timeout failures"
 msgstr "tolerar un número «COUNT» de continuas expiraciones de plazo"
 
+#: src/testbed/gnunet-testbed-profiler.c:299
+msgid ""
+"run profiler in non-interactive mode where upon testbed setup the profiler "
+"does not wait for a keystroke but continues to run until a termination "
+"signal is received"
+msgstr ""
+
 #: src/testbed/testbed_api_hosts.c:415
 #, c-format
 msgid "Hosts file %s not found\n"
@@ -5456,7 +6070,7 @@ msgstr "El archivo de máquinas %s no puede leerse\n"
 msgid "The function %s is only available when compiled with (--with-ll)\n"
 msgstr ""
 
-#: src/testbed/testbed_api_hosts.c:1572
+#: src/testbed/testbed_api_hosts.c:1586
 #, c-format
 msgid "Adding host %u failed with error: %s\n"
 msgstr "No se pudo añadir la máquina %u por el error: %s\n"
@@ -5606,29 +6220,24 @@ msgid "Command line tool to access the testing library"
 msgstr ""
 "Herramienta de línea de comandos para acceder a la biblioteca de pruebas"
 
-#: src/testing/testing.c:276
+#: src/testing/testing.c:277
 #, c-format
 msgid "Hostkeys file not found: %s\n"
 msgstr "El fichero de máquinas no fue encontrado: %s\n"
 
-#: src/testing/testing.c:292
+#: src/testing/testing.c:293
 #, c-format
 msgid "Incorrect hostkey file format: %s\n"
 msgstr "El fichero de máquinas no tiene el formato correcto: %s\n"
 
-#: src/testing/testing.c:711
+#: src/testing/testing.c:716
 #, c-format
 msgid "Key number %u does not exist\n"
 msgstr "El número de clave %u no existe\n"
 
-#: src/testing/testing.c:722
-#, c-format
-msgid "Error while decoding key %u\n"
-msgstr "Error decodificando clave %u\n"
-
 # Miguel: "testbed" lo he traducido como batería de pruebas, pero
 # no es una traducción muy literal.
-#: src/testing/testing.c:1158
+#: src/testing/testing.c:1155
 #, c-format
 msgid ""
 "You attempted to create a testbed with more than %u hosts.  Please "
@@ -5637,123 +6246,96 @@ msgstr ""
 "Se ha intentado crear una batería de pruebas con más de %u máquinas.  Por "
 "favor, pre-compute más claves de máquinas primero.\n"
 
-#: src/testing/testing.c:1167
+#: src/testing/testing.c:1164
 #, c-format
 msgid "Failed to initialize hostkey for peer %u\n"
 msgstr ""
 "Se produjo un fallo al inicializar la clave de la máquina desde el par %u\n"
 
-#: src/testing/testing.c:1177
+#: src/testing/testing.c:1174
 #, fuzzy
 msgid "PRIVATE_KEY option in PEER section missing in configuration\n"
 msgstr "¡Falta la opción «%s» en la sección «%s» de la configuración!\n"
 
-#: src/testing/testing.c:1190
+#: src/testing/testing.c:1187
 msgid "Failed to create configuration for peer (not enough free ports?)\n"
 msgstr ""
 "Se produjo un fallo al crear la configuración para el par (¿no hay "
 "suficientes puertos libres?)\n"
 
-#: src/testing/testing.c:1204
+#: src/testing/testing.c:1201
 #, fuzzy, c-format
 msgid "Cannot open hostkey file `%s': %s\n"
 msgstr "No se pudo abrir el fichero de claves de máquina: %s\n"
 
-#: src/testing/testing.c:1216
+#: src/testing/testing.c:1213
 #, c-format
 msgid "Failed to write hostkey file for peer %u: %s\n"
 msgstr ""
 "Se produjo un fallo al escribir la clave de la máquina para el par %u: %s\n"
 
-#: src/testing/testing.c:1238
+#: src/testing/testing.c:1235
 #, c-format
 msgid "Failed to write configuration file `%s' for peer %u: %s\n"
 msgstr ""
 "Se produjo un fallo al escribir el fichero de configuración «%s» para el par "
 "%u: %s\n"
 
-#: src/testing/testing.c:1338
+#: src/testing/testing.c:1335
 #, c-format
 msgid "Failed to start `%s': %s\n"
 msgstr "Se produjo un fallo al arrancar «%s»: %s\n"
 
-#: src/testing/testing.c:1702
+#: src/testing/testing.c:1699
 #, c-format
 msgid "Failed to load configuration from %s\n"
 msgstr "Se produjo un fallo al cargar la configuración de %s\n"
 
-#: src/topology/gnunet-daemon-topology.c:254
+#: src/topology/friends.c:100
+#, fuzzy, c-format
+msgid "Syntax error in FRIENDS file at offset %llu, skipping bytes `%.*s'.\n"
+msgstr ""
+"Error de sintaxis en el fichero de la lista negra en el desplazamiento %llu, "
+"omitiendo bytes «%s».\n"
+
+#: src/topology/gnunet-daemon-topology.c:255
 msgid "# peers blacklisted"
 msgstr "# pares en la lista negra"
 
-#: src/topology/gnunet-daemon-topology.c:387
+#: src/topology/gnunet-daemon-topology.c:388
 msgid "# connect requests issued to transport"
 msgstr "# peticiones de conexión requeridas al servicio de transporte"
 
-#: src/topology/gnunet-daemon-topology.c:721
-#: src/topology/gnunet-daemon-topology.c:806
+#: src/topology/gnunet-daemon-topology.c:727
+#: src/topology/gnunet-daemon-topology.c:812
 msgid "# friends connected"
 msgstr "# amigos conectados"
 
-#: src/topology/gnunet-daemon-topology.c:986
+#: src/topology/gnunet-daemon-topology.c:992
 msgid "Failed to connect to core service, can not manage topology!\n"
 msgstr ""
 "¡Se produjo un fallo al conectar con el servicio principal, no se puede "
 "gestionar la topología!\n"
 
-#: src/topology/gnunet-daemon-topology.c:1031
+#: src/topology/gnunet-daemon-topology.c:1021
 #, c-format
-msgid "Could not read friends list `%s'\n"
-msgstr "No se pudo leer la lista de amigos «%s»\n"
-
-#: src/topology/gnunet-daemon-topology.c:1037
-#, c-format
-msgid "Friends file `%s' is empty.\n"
-msgstr "El archivo de amigos «%s» está vacío.\n"
-
-#: src/topology/gnunet-daemon-topology.c:1046
-#, c-format
-msgid "Failed to read friends list from `%s': out of memory\n"
-msgstr ""
-"Se produjo un fallo al leer la lista de amigos de «%s»: no hay memoria "
-"disponible\n"
-
-#: src/topology/gnunet-daemon-topology.c:1054
-#, c-format
-msgid "Failed to read friends list from `%s'\n"
-msgstr "Se produjo un fallo al leer la lista de amigos de «%s»\n"
-
-#: src/topology/gnunet-daemon-topology.c:1074
-#, c-format
-msgid ""
-"Syntax error in topology specification at offset %llu, skipping bytes.\n"
-msgstr ""
-"Error de sintaxis en la especificación de topología en el desplazamiento "
-"%llu, omitiendo bytes.\n"
-
-#: src/topology/gnunet-daemon-topology.c:1087
-#, c-format
-msgid ""
-"Syntax error in topology specification at offset %llu, skipping bytes `%s'.\n"
-msgstr ""
-"Error de sintaxis en la especificación de topología en el desplazamiento "
-"%llu, omitiendo bytes «%s».\n"
+msgid "Found myself `%s' in friend list (useless, ignored)\n"
+msgstr "Me he encontrado «%s» en mi lista de amigos (inútil, ignorado)\n"
 
-#: src/topology/gnunet-daemon-topology.c:1097
+#: src/topology/gnunet-daemon-topology.c:1028
 #, c-format
 msgid "Found friend `%s' in configuration\n"
 msgstr "Encontrado amigo «%s» en la configuración\n"
 
-#: src/topology/gnunet-daemon-topology.c:1103
-#, c-format
-msgid "Found myself `%s' in friend list (useless, ignored)\n"
-msgstr "Me he encontrado «%s» en mi lista de amigos (inútil, ignorado)\n"
+#: src/topology/gnunet-daemon-topology.c:1049
+msgid "Encountered errors parsing friends list!\n"
+msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:1113
+#: src/topology/gnunet-daemon-topology.c:1051
 msgid "# friends in configuration"
 msgstr "# amigos en configuración"
 
-#: src/topology/gnunet-daemon-topology.c:1119
+#: src/topology/gnunet-daemon-topology.c:1056
 msgid ""
 "Fewer friends specified than required by minimum friend count. Will only "
 "connect to friends.\n"
@@ -5761,23 +6343,23 @@ msgstr ""
 "Menos amigos especificados que los requeridos por el contador mínimo de "
 "amigos. Sólo me conectaré a amigos.\n"
 
-#: src/topology/gnunet-daemon-topology.c:1126
+#: src/topology/gnunet-daemon-topology.c:1062
 msgid ""
 "More friendly connections required than target total number of connections.\n"
 msgstr ""
 "Más conexiones amistosas requeridas que el número objetivo total de "
 "conexiones.\n"
 
-#: src/topology/gnunet-daemon-topology.c:1157
+#: src/topology/gnunet-daemon-topology.c:1093
 msgid "# HELLO messages received"
 msgstr "# mensajes «HELLO» recibidos"
 
 # gossiped??
-#: src/topology/gnunet-daemon-topology.c:1212
+#: src/topology/gnunet-daemon-topology.c:1150
 msgid "# HELLO messages gossipped"
 msgstr "# Mensajes «HELLO» rumoreados"
 
-#: src/topology/gnunet-daemon-topology.c:1351
+#: src/topology/gnunet-daemon-topology.c:1289
 msgid "GNUnet topology control (maintaining P2P mesh and F2F constraints)"
 msgstr ""
 "Control de topología de GNUnet (manteniendo las restricciones del mesh de "
@@ -5793,36 +6375,36 @@ msgstr "Añadiendo «%s» sin direcciones para el par «%s»\n"
 msgid "Adding blacklisting entry for peer `%s':`%s'\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_blacklist.c:453
-#: src/transport/gnunet-service-transport_blacklist.c:717
+#: src/transport/gnunet-service-transport_blacklist.c:455
+#: src/transport/gnunet-service-transport_blacklist.c:722
 msgid "# disconnects due to blacklist"
 msgstr "# desconexiones debido a la lista negra"
 
-#: src/transport/gnunet-service-transport.c:168
+#: src/transport/gnunet-service-transport.c:163
 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:234
+#: src/transport/gnunet-service-transport.c:229
 msgid "# bytes total received"
 msgstr "# total de bytes recibidos"
 
-#: src/transport/gnunet-service-transport.c:281
+#: src/transport/gnunet-service-transport.c:277
 msgid "# bytes payload received"
 msgstr "# bytes de «payload» recibidos"
 
-#: src/transport/gnunet-service-transport.c:432
+#: src/transport/gnunet-service-transport.c:429
 #, fuzzy, c-format
 msgid "Could not obtain a valid network for `%s' %s\n"
 msgstr "Imposible obtener IP para la interfaz '%s' usando '%s'.\n"
 
-#: src/transport/gnunet-service-transport.c:480
+#: src/transport/gnunet-service-transport.c:479
 #, c-format
 msgid ""
 "Address or session unknown: failed to update properties for peer `%s' plugin "
 "`%s' address `%s' session %p\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport.c:775
+#: src/transport/gnunet-service-transport.c:760
 msgid "Transport service is lacking key configuration settings.  Exiting.\n"
 msgstr ""
 "El servicio de transporte carece de opciones de configuración de clave.  "
@@ -5843,69 +6425,69 @@ msgstr "# mensajes omitidos debido a un cliente lento"
 msgid "Rejecting control connection from peer `%s', which is not me!\n"
 msgstr "¡Rechazando conexión de control del par «%s», que no soy yo!\n"
 
-#: src/transport/gnunet-service-transport_clients.c:677
+#: src/transport/gnunet-service-transport_clients.c:672
 msgid "# bytes payload dropped (other peer was not connected)"
 msgstr "# bytes de «payload» omitidos (el otro par no estaba conectado)"
 
-#: src/transport/gnunet-service-transport_clients.c:733
+#: src/transport/gnunet-service-transport_clients.c:728
 msgid "# REQUEST CONNECT messages received"
 msgstr "# mensajes «REQUEST CONNECT» recibidos"
 
-#: src/transport/gnunet-service-transport_hello.c:179
+#: src/transport/gnunet-service-transport_hello.c:181
 msgid "# refreshed my HELLO"
 msgstr "# refrescos de mi «HELLO»"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1216
+#: src/transport/gnunet-service-transport_neighbours.c:1080
 msgid "# DISCONNECT messages sent"
 msgstr "# Mensajes «DISCONNECT» enviados"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1346
-#: src/transport/gnunet-service-transport_neighbours.c:1681
+#: src/transport/gnunet-service-transport_neighbours.c:1210
+#: src/transport/gnunet-service-transport_neighbours.c:1545
 msgid "# bytes in message queue for other peers"
 msgstr "# bytes en la cola de mensajes para otros pares"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1351
+#: src/transport/gnunet-service-transport_neighbours.c:1215
 msgid "# messages transmitted to other peers"
 msgstr "# mensajes transmitidos a otros pares"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1356
+#: src/transport/gnunet-service-transport_neighbours.c:1220
 msgid "# transmission failures for messages to other peers"
 msgstr "# fallos de transmisión en mensajes a otros pares"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1413
+#: src/transport/gnunet-service-transport_neighbours.c:1277
 msgid "# messages timed out while in transport queue"
 msgstr "# mensajes expirados mientras estaban en la cola de transporte"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1455
+#: src/transport/gnunet-service-transport_neighbours.c:1319
 msgid "# keepalives sent"
 msgstr "# «keepalives» enviados"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1479
+#: src/transport/gnunet-service-transport_neighbours.c:1343
 msgid "# KEEPALIVE messages discarded (peer unknown)"
 msgstr "# Mensajes «KEEPALIVE» descartados (par desconocido)"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1487
+#: src/transport/gnunet-service-transport_neighbours.c:1351
 msgid "# KEEPALIVE messages discarded (no session)"
 msgstr "# mensajes «KEEPALIVE» descartados (no hay sesión)"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1520
+#: src/transport/gnunet-service-transport_neighbours.c:1384
 msgid "# KEEPALIVE_RESPONSE messages discarded (not connected)"
 msgstr "# mensajes «KEEPALIVE_RESPONSE» descartados (no conectado)"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1529
+#: src/transport/gnunet-service-transport_neighbours.c:1393
 msgid "# KEEPALIVE_RESPONSE messages discarded (not expected)"
 msgstr "# Mensajes «KEEPALIVE_RESPONSE» descartados (no esperado)"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1586
+#: src/transport/gnunet-service-transport_neighbours.c:1450
 msgid "# messages discarded due to lack of neighbour record"
 msgstr "# mensajes descartados debido a la falta de registro vecinal"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1620
+#: src/transport/gnunet-service-transport_neighbours.c:1484
 msgid "# bandwidth quota violations by other peers"
 msgstr "# violaciones de la cuota de ancho de banda por otros pares"
 
 # throttling?
-#: src/transport/gnunet-service-transport_neighbours.c:1636
+#: src/transport/gnunet-service-transport_neighbours.c:1500
 msgid "# ms throttling suggested"
 msgstr "# ms de impulso sugeridos"
 
@@ -5926,31 +6508,31 @@ msgstr "# Mensajes «CONNECT_ACK» inesperados (esperando en el ATS)"
 msgid "# unexpected CONNECT_ACK messages (disconnecting)"
 msgstr "# Mensajes «CONNECT_ACK» inesperados (desconectando)"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3046
+#: src/transport/gnunet-service-transport_neighbours.c:3045
 msgid "# unexpected SESSION ACK messages"
 msgstr "# Mensajes «SESSION ACK» inesperados"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3099
+#: src/transport/gnunet-service-transport_neighbours.c:3098
 msgid "# SET QUOTA messages ignored (no such peer)"
 msgstr "# Mensajes «SET QUOTA» ignorados (no existe tal par)"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3113
+#: src/transport/gnunet-service-transport_neighbours.c:3112
 msgid "# disconnects due to quota of 0"
 msgstr "# desconexiones debido a una cuota de 0"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3144
+#: src/transport/gnunet-service-transport_neighbours.c:3143
 msgid "# disconnect messages ignored (old format)"
 msgstr "# mensajes de desconexión ignorados (formato antiguo)"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3155
+#: src/transport/gnunet-service-transport_neighbours.c:3154
 msgid "# disconnect messages ignored (timestamp)"
 msgstr "# mensajes de desconexión ignorados (marca temporal)"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3194
+#: src/transport/gnunet-service-transport_neighbours.c:3193
 msgid "# other peer asked to disconnect from us"
 msgstr "# peticiones de otro par para desconectarse de nosotros"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3289
+#: src/transport/gnunet-service-transport_neighbours.c:3288
 msgid "# disconnected from peer upon explicit request"
 msgstr "# desconexiones del par debido a una petición explícita"
 
@@ -5975,11 +6557,11 @@ msgstr "Se produjo un fallo al cargar el módulo del transporte para «%s»\n"
 msgid "Did not load plugin `%s' due to missing functions\n"
 msgstr "Falló al cargar el plugin '%s' en %s:%d. Descargando plugin.\n"
 
-#: src/transport/gnunet-service-transport_validation.c:455
+#: src/transport/gnunet-service-transport_validation.c:456
 msgid "# address records discarded"
 msgstr "# registros de direcciones descartados"
 
-#: src/transport/gnunet-service-transport_validation.c:518
+#: src/transport/gnunet-service-transport_validation.c:519
 #, c-format
 msgid ""
 "Not transmitting `%s' with `%s', message too big (%u bytes!). This should "
@@ -5988,105 +6570,105 @@ msgstr ""
 "No transmitiendo «%s» con «%s», mensaje demasiado grande (¡%u bytes!). Esto "
 "no debería suceder.\n"
 
-#: src/transport/gnunet-service-transport_validation.c:575
+#: src/transport/gnunet-service-transport_validation.c:577
 msgid "# PING without HELLO messages sent"
 msgstr "# Mensajes PING sin HELLO mandados"
 
-#: src/transport/gnunet-service-transport_validation.c:660
+#: src/transport/gnunet-service-transport_validation.c:662
 msgid "# address revalidations started"
 msgstr "# revalidaciones de direcciones iniciadas"
 
-#: src/transport/gnunet-service-transport_validation.c:928
+#: src/transport/gnunet-service-transport_validation.c:933
 msgid "# PING message for different peer received"
 msgstr "# Mensajes PING recibidos para un par diferente"
 
-#: src/transport/gnunet-service-transport_validation.c:987
+#: src/transport/gnunet-service-transport_validation.c:992
 msgid "# failed address checks during validation"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:997
+#: src/transport/gnunet-service-transport_validation.c:1002
 msgid "# successful address checks during validation"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1016
+#: src/transport/gnunet-service-transport_validation.c:1021
 #, c-format
 msgid "Received a PING message with validation bug from `%s'\n"
 msgstr "Recibido un mensaje PING con un error de validación de «%s»\n"
 
-#: src/transport/gnunet-service-transport_validation.c:1070
+#: src/transport/gnunet-service-transport_validation.c:1075
 #, fuzzy, c-format
 msgid "Failed to create PONG signature for peer `%s'\n"
 msgstr "Se produjo un fallo al crear la página para «%s»\n"
 
-#: src/transport/gnunet-service-transport_validation.c:1115
+#: src/transport/gnunet-service-transport_validation.c:1124
 msgid "# PONGs unicast via reliable transport"
 msgstr "# unicast de PONG vía transporte confiable"
 
-#: src/transport/gnunet-service-transport_validation.c:1124
+#: src/transport/gnunet-service-transport_validation.c:1133
 msgid "# PONGs multicast to all available addresses"
 msgstr "# multicast de PONG a todas las direcciones disponibles"
 
-#: src/transport/gnunet-service-transport_validation.c:1251
+#: src/transport/gnunet-service-transport_validation.c:1260
 msgid "# PONGs dropped, no matching pending validation"
 msgstr "# PONG omitidos, no hay una validación pendiente coincidente"
 
-#: src/transport/gnunet-service-transport_validation.c:1266
+#: src/transport/gnunet-service-transport_validation.c:1275
 msgid "# PONGs dropped, signature expired"
 msgstr "# Mensajes PONG omitidos, firma expirada"
 
-#: src/transport/gnunet-service-transport_validation.c:1372
+#: src/transport/gnunet-service-transport_validation.c:1381
 #, c-format
 msgid "Adding `%s' without addresses for peer `%s'\n"
 msgstr "Añadiendo «%s» sin direcciones para el par «%s»\n"
 
-#: src/transport/gnunet-transport.c:266
+#: src/transport/gnunet-transport.c:259
 #, c-format
 msgid "Transmitted %llu bytes/s (%llu bytes in %s)\n"
 msgstr "Transmitidos %llu bytes/s (%llu bytes en %s)\n"
 
-#: src/transport/gnunet-transport.c:273
+#: src/transport/gnunet-transport.c:266
 #, c-format
 msgid "Received %llu bytes/s (%llu bytes in %s)\n"
 msgstr "Recibidos %llu bytes/s (%llu bytes en %s)\n"
 
-#: src/transport/gnunet-transport.c:303
+#: src/transport/gnunet-transport.c:296
 #, c-format
 msgid "Failed to connect to `%s'\n"
 msgstr "Se produjo un fallo al conectar con «%s»\n"
 
-#: src/transport/gnunet-transport.c:316
+#: src/transport/gnunet-transport.c:309
 #, c-format
 msgid "Failed to resolve address for peer `%s'\n"
 msgstr "Se produjo un fallo al resolver la dirección para el par «%s»\n"
 
 # Miguel: La traducción no es literal, pero me parece más correcta
 # en castellano.
-#: src/transport/gnunet-transport.c:325
+#: src/transport/gnunet-transport.c:318
 msgid "Failed to list connections, timeout occured\n"
 msgstr "No se pudieron listar las conexiones, expiró el plazo\n"
 
-#: src/transport/gnunet-transport.c:429
+#: src/transport/gnunet-transport.c:422
 msgid "No transport plugins configured, peer will never communicate\n"
 msgstr ""
 "No hay módulos de transporte configurados, el par nunca se comunicará\n"
 
-#: src/transport/gnunet-transport.c:442
+#: src/transport/gnunet-transport.c:435
 #, c-format
 msgid "No port configured for plugin `%s', cannot test it\n"
 msgstr ""
 "Ningún puerto fue configurado para el módulo «%s», no se puede probar\n"
 
-#: src/transport/gnunet-transport.c:506
+#: src/transport/gnunet-transport.c:499
 #, c-format
 msgid "Transmitting %u bytes to %s\n"
 msgstr "Transmitiendo %u bytes a %s\n"
 
-#: src/transport/gnunet-transport.c:528
+#: src/transport/gnunet-transport.c:522
 #, c-format
 msgid "Successfully connected to `%s'\n"
 msgstr "Conectado satisfactoriamente a «%s»\n"
 
-#: src/transport/gnunet-transport.c:550
+#: src/transport/gnunet-transport.c:545
 #, c-format
 msgid ""
 "Successfully connected to `%s', starting to send benchmark data in %u Kb "
@@ -6095,38 +6677,38 @@ msgstr ""
 "Conectado satisfactoriamente a «%s», empezando a mandar datos de prueba en "
 "bloques de %u Kb\n"
 
-#: src/transport/gnunet-transport.c:585
+#: src/transport/gnunet-transport.c:580
 #, c-format
 msgid "Disconnected from peer `%s' while benchmarking\n"
 msgstr "Desconectado del par «%s» mientras probaba\n"
 
-#: src/transport/gnunet-transport.c:655
+#: src/transport/gnunet-transport.c:650
 #, c-format
 msgid "Received %u bytes from %s\n"
 msgstr "Recibidos %u bytes de %s\n"
 
-#: src/transport/gnunet-transport.c:678
+#: src/transport/gnunet-transport.c:673
 #, c-format
 msgid "Peer `%s': %s %s\n"
 msgstr "Par «%s»: %s %s\n"
 
-#: src/transport/gnunet-transport.c:693
+#: src/transport/gnunet-transport.c:688
 #, c-format
 msgid "Peer `%s': %s <unable to resolve address>\n"
 msgstr "Par «%s»: %s <no se puede resolver la dirección>\n"
 
-#: src/transport/gnunet-transport.c:757
+#: src/transport/gnunet-transport.c:752
 #, c-format
 msgid "Peer `%s' disconnected\n"
 msgstr "Par «%s» desconectado\n"
 
-#: src/transport/gnunet-transport.c:785
+#: src/transport/gnunet-transport.c:780
 msgid "Failed to send connect request to transport service\n"
 msgstr ""
 "Se produjo un fallo al enviar una petición de conexión al servicio de "
 "transporte\n"
 
-#: src/transport/gnunet-transport.c:828
+#: src/transport/gnunet-transport.c:825
 #, c-format
 msgid ""
 "Multiple operations given. Please choose only one operation: %s, %s, %s, %s, "
@@ -6135,7 +6717,7 @@ msgstr ""
 "Múltiples operaciones introducidas. Por favor, seleccione únicamente una "
 "operación: %s, %s, %s, %s, %s, %s\n"
 
-#: src/transport/gnunet-transport.c:834
+#: src/transport/gnunet-transport.c:831
 #, c-format
 msgid ""
 "No operation given. Please choose one operation: %s, %s, %s, %s, %s, %s\n"
@@ -6143,133 +6725,133 @@ msgstr ""
 "Ninguna operación introducida. Por favor, seleccione alguna operación: %s, "
 "%s, %s, %s, %s, %s\n"
 
-#: src/transport/gnunet-transport.c:854 src/transport/gnunet-transport.c:884
-#: src/transport/gnunet-transport.c:906 src/transport/gnunet-transport.c:945
+#: src/transport/gnunet-transport.c:851 src/transport/gnunet-transport.c:881
+#: src/transport/gnunet-transport.c:903 src/transport/gnunet-transport.c:940
 msgid "Failed to connect to transport service\n"
 msgstr "Se produjo un fallo al conectar con el servicio de transporte\n"
 
-#: src/transport/gnunet-transport.c:861 src/transport/gnunet-transport.c:891
+#: src/transport/gnunet-transport.c:858 src/transport/gnunet-transport.c:888
 msgid "Failed to send request to transport service\n"
 msgstr "Se produjo un fallo al enviar una petición al servicio de transporte\n"
 
-#: src/transport/gnunet-transport.c:911
+#: src/transport/gnunet-transport.c:908
 msgid "Starting to receive benchmark data\n"
 msgstr "Empezando a recibir datos de prueba\n"
 
-#: src/transport/gnunet-transport.c:995
+#: src/transport/gnunet-transport.c:990
 msgid "measure how fast we are receiving data from all peers (until CTRL-C)"
 msgstr "medir cómo de rápido recibimos datos de todos los pares (hasta CTRL-C)"
 
-#: src/transport/gnunet-transport.c:998
+#: src/transport/gnunet-transport.c:993
 msgid "connect to a peer"
 msgstr "conectar a un par"
 
-#: src/transport/gnunet-transport.c:1001
+#: src/transport/gnunet-transport.c:996
 msgid "provide information about all current connections (once)"
 msgstr "provee información sobre todas las conexiones actuales (una vez)"
 
-#: src/transport/gnunet-transport.c:1007
+#: src/transport/gnunet-transport.c:1002
 msgid ""
 "provide information about all connects and disconnect events (continuously)"
 msgstr ""
 "provee información sobre todas los eventos de conexión y desconexión "
 "(continuamente)"
 
-#: src/transport/gnunet-transport.c:1010
+#: src/transport/gnunet-transport.c:1005
 msgid "do not resolve hostnames"
 msgstr "no resolver nombres de máquinas"
 
-#: src/transport/gnunet-transport.c:1013
+#: src/transport/gnunet-transport.c:1008
 msgid "peer identity"
 msgstr "identidad del par"
 
-#: src/transport/gnunet-transport.c:1017
+#: src/transport/gnunet-transport.c:1012
 msgid "send data for benchmarking to the other peer (until CTRL-C)"
 msgstr "enviar data para prueba a otro par (hasta CTRL-C)"
 
-#: src/transport/gnunet-transport.c:1020
+#: src/transport/gnunet-transport.c:1015
 msgid "test transport configuration (involves external server)"
 msgstr "probar configuración de transporte (requiere un servidor externo)"
 
-#: src/transport/gnunet-transport.c:1031
+#: src/transport/gnunet-transport.c:1026
 msgid "Direct access to transport service."
 msgstr "Acceso directo al servicio de transporte."
 
-#: src/transport/plugin_transport_bluetooth.c:612
+#: src/transport/plugin_transport_bluetooth.c:616
 #, fuzzy
 msgid "# Bluetooth ACKs sent"
 msgstr "# ACK WLAN enviados"
 
-#: src/transport/plugin_transport_bluetooth.c:631
+#: src/transport/plugin_transport_bluetooth.c:635
 #, fuzzy
 msgid "# Bluetooth messages defragmented"
 msgstr "# mensajes defragmentados"
 
-#: src/transport/plugin_transport_bluetooth.c:677
-#: src/transport/plugin_transport_bluetooth.c:727
-#: src/transport/plugin_transport_bluetooth.c:1833
+#: src/transport/plugin_transport_bluetooth.c:681
+#: src/transport/plugin_transport_bluetooth.c:731
+#: src/transport/plugin_transport_bluetooth.c:1837
 #, fuzzy
 msgid "# Bluetooth sessions allocated"
 msgstr "# sesiones WLAN alojadas"
 
-#: src/transport/plugin_transport_bluetooth.c:802
+#: src/transport/plugin_transport_bluetooth.c:806
 #, fuzzy
 msgid "# Bluetooth message fragments sent"
 msgstr "# fragmentos de mensaje WLAN enviados"
 
-#: src/transport/plugin_transport_bluetooth.c:826
+#: src/transport/plugin_transport_bluetooth.c:830
 #, fuzzy
 msgid "# Bluetooth messages pending (with fragmentation)"
 msgstr "# mensajes WLAN pendientes (con fragmentación)"
 
-#: src/transport/plugin_transport_bluetooth.c:934
-#: src/transport/plugin_transport_bluetooth.c:1019
-#: src/transport/plugin_transport_bluetooth.c:1835
+#: src/transport/plugin_transport_bluetooth.c:938
+#: src/transport/plugin_transport_bluetooth.c:1023
+#: src/transport/plugin_transport_bluetooth.c:1839
 #, fuzzy
 msgid "# Bluetooth MAC endpoints allocated"
 msgstr "# MAC de destino WLAN alojadas"
 
-#: src/transport/plugin_transport_bluetooth.c:1214
+#: src/transport/plugin_transport_bluetooth.c:1218
 #, fuzzy
 msgid "# HELLO messages received via Bluetooth"
 msgstr "# mensajes HELLO recibidos vía WLAN"
 
-#: src/transport/plugin_transport_bluetooth.c:1240
+#: src/transport/plugin_transport_bluetooth.c:1244
 #, fuzzy
 msgid "# fragments received via Bluetooth"
 msgstr "# fragmentos recibidos vía WLAN"
 
-#: src/transport/plugin_transport_bluetooth.c:1250
+#: src/transport/plugin_transport_bluetooth.c:1254
 #, fuzzy
 msgid "# ACKs received via Bluetooth"
 msgstr "# ACK recibidos vía WLAN"
 
-#: src/transport/plugin_transport_bluetooth.c:1307
+#: src/transport/plugin_transport_bluetooth.c:1311
 #, fuzzy
 msgid "# Bluetooth DATA messages discarded due to CRC32 error"
 msgstr "# mensajes DATA WLAN descartados debido a un error en el CRC32"
 
-#: src/transport/plugin_transport_bluetooth.c:1419
+#: src/transport/plugin_transport_bluetooth.c:1423
 #, fuzzy
 msgid "# DATA messages received via Bluetooth"
 msgstr "# mensajes «DATA» recibidos vía WLAN"
 
-#: src/transport/plugin_transport_bluetooth.c:1454
+#: src/transport/plugin_transport_bluetooth.c:1458
 #, fuzzy
 msgid "# Bluetooth DATA messages processed"
 msgstr "# mensajes «DATA» WLAN procesados"
 
-#: src/transport/plugin_transport_bluetooth.c:1517
+#: src/transport/plugin_transport_bluetooth.c:1521
 #, fuzzy
 msgid "# HELLO beacons sent via Bluetooth"
 msgstr "# «beacons HELLO» enviados vía WLAN"
 
-#: src/transport/plugin_transport_bluetooth.c:1630
+#: src/transport/plugin_transport_bluetooth.c:1634
 #, fuzzy
 msgid "Bluetooth address with invalid size encountered\n"
 msgstr "Dirección WLAN con tamaño no válido encontrada\n"
 
-#: src/transport/plugin_transport_bluetooth.c:1814
+#: src/transport/plugin_transport_bluetooth.c:1818
 #, fuzzy, c-format
 msgid "Helper binary `%s' not SUID, cannot run bluetooth transport\n"
 msgstr ""
@@ -6277,40 +6859,40 @@ msgstr ""
 "ejecutar el transporte WLAN\n"
 
 #: src/transport/plugin_transport_http.c:815
-#: src/transport/plugin_transport_http_server.c:2614
+#: src/transport/plugin_transport_http_server.c:2602
 msgid "Disabling IPv6 since it is not supported on this system!\n"
 msgstr "¡Deshabilitando IPv6 ya que no está soportado en este sistema!\n"
 
 #: src/transport/plugin_transport_http.c:864
-#: src/transport/plugin_transport_http_server.c:2382
+#: src/transport/plugin_transport_http_server.c:2370
 msgid "Require valid port number for service in configuration!\n"
 msgstr "¡Se necesita un puerto válido para el servicio en la configuración!\n"
 
 #: src/transport/plugin_transport_http.c:896
-#: src/transport/plugin_transport_http_server.c:2414 src/util/service.c:1062
+#: src/transport/plugin_transport_http_server.c:2402 src/util/service.c:696
 #, c-format
 msgid "Failed to resolve `%s': %s\n"
 msgstr "Se produjo un fallo al resolver «%s»: %s\n"
 
 #: src/transport/plugin_transport_http.c:913
-#: src/transport/plugin_transport_http_server.c:2431 src/util/service.c:1079
+#: src/transport/plugin_transport_http_server.c:2419 src/util/service.c:713
 #, c-format
 msgid "Failed to find %saddress for `%s'.\n"
 msgstr "No se encontró la dirección %s para «%s».\n"
 
 #: src/transport/plugin_transport_http.c:1018
-#: src/transport/plugin_transport_http_server.c:2542
+#: src/transport/plugin_transport_http_server.c:2530
 #, c-format
 msgid "Found %u addresses to report to NAT service\n"
 msgstr "Encontradas %u direcciones para comunicar al servicio NAT\n"
 
 #: src/transport/plugin_transport_http.c:1131
-#: src/transport/plugin_transport_http_server.c:2722
+#: src/transport/plugin_transport_http_server.c:2710
 msgid "Neither IPv4 nor IPv6 are enabled! Fix in configuration\n"
 msgstr "¡Ni IPv4 ni IPv6 están habilitadas! Corrija la configuración\n"
 
 #: src/transport/plugin_transport_http.c:1144
-#: src/transport/plugin_transport_http_server.c:2733
+#: src/transport/plugin_transport_http_server.c:2721
 msgid "Port is required! Fix in configuration\n"
 msgstr "¡El puerto es necesario! Corrija la configuración\n"
 
@@ -6337,7 +6919,7 @@ msgstr ""
 "configuración no es válida! ¡Asociándose a todas las direcciones!\n"
 
 #: src/transport/plugin_transport_http.c:1221
-#: src/transport/plugin_transport_http_server.c:2848
+#: src/transport/plugin_transport_http_server.c:2836
 #, c-format
 msgid "Using external hostname `%s'\n"
 msgstr "Usando nombre de máquina externo «%s»\n"
@@ -6346,32 +6928,32 @@ msgstr "Usando nombre de máquina externo «%s»\n"
 msgid "No external hostname configured\n"
 msgstr "No hay nombre de máquina externo configurado\n"
 
-#: src/transport/plugin_transport_http_client.c:1587
+#: src/transport/plugin_transport_http_client.c:1586
 #, c-format
 msgid "Could not initialize curl multi handle, failed to start %s plugin!\n"
 msgstr ""
 "¡No se pudo inicializar el multi-manejador de curl, no se pudo iniciar el "
 "módulo %s!\n"
 
-#: src/transport/plugin_transport_http_client.c:1724
-#: src/transport/plugin_transport_http_server.c:2978
+#: src/transport/plugin_transport_http_client.c:1723
+#: src/transport/plugin_transport_http_server.c:2966
 #, c-format
 msgid "Shutting down plugin `%s'\n"
 msgstr "Finalizando el módulo «%s»\n"
 
-#: src/transport/plugin_transport_http_client.c:1749
-#: src/transport/plugin_transport_http_server.c:3038
+#: src/transport/plugin_transport_http_client.c:1748
+#: src/transport/plugin_transport_http_server.c:3026
 #, c-format
 msgid "Shutdown for plugin `%s' complete\n"
 msgstr "Finalización del módulo «%s» completa\n"
 
-#: src/transport/plugin_transport_http_client.c:1777
-#: src/transport/plugin_transport_http_server.c:2878
+#: src/transport/plugin_transport_http_client.c:1776
+#: src/transport/plugin_transport_http_server.c:2866
 #, c-format
 msgid "Maximum number of connections is %u\n"
 msgstr "El número máximo de conexiones es %u\n"
 
-#: src/transport/plugin_transport_http_server.c:1379
+#: src/transport/plugin_transport_http_server.c:1381
 #, c-format
 msgid ""
 "Access from connection %p (%u of %u) for `%s' `%s' url `%s' with upload data "
@@ -6380,12 +6962,12 @@ msgstr ""
 "Acceso desde la conexión %p (%u de %u) para «%s» «%s» URL «%s» con tamaño de "
 "los datos de subida %u\n"
 
-#: src/transport/plugin_transport_http_server.c:1644
+#: src/transport/plugin_transport_http_server.c:1646
 #, c-format
 msgid "Accepting connection (%u of %u) from `%s'\n"
 msgstr "Aceptando conexión (%u de %u) desde «%s»\n"
 
-#: src/transport/plugin_transport_http_server.c:1652
+#: src/transport/plugin_transport_http_server.c:1654
 #, c-format
 msgid ""
 "Server reached maximum number connections (%u), rejecting new connection\n"
@@ -6393,7 +6975,7 @@ msgstr ""
 "El servidor ha alcanzado el número máximo de conexiones (%u), rechazando "
 "nueva conexión\n"
 
-#: src/transport/plugin_transport_http_server.c:1953
+#: src/transport/plugin_transport_http_server.c:1941
 msgid ""
 "Could not create a new TLS certificate, program `gnunet-transport-"
 "certificate-creation' could not be started!\n"
@@ -6401,52 +6983,53 @@ msgstr ""
 "¡No se pudo crear un certificado TLS nuevo, el programa «gnunet-transport-"
 "certificate-creation» no pudo ser iniciado!\n"
 
-#: src/transport/plugin_transport_http_server.c:1977
-msgid "No usable TLS certificate found and creating one failed!\n"
+#: src/transport/plugin_transport_http_server.c:1965
+#, fuzzy, c-format
+msgid "No usable TLS certificate found and creating one at `%s/%s' failed!\n"
 msgstr ""
 "¡No se encontró ningún certificado TLS útil y se produjo un fallo al crear "
 "uno!\n"
 
-#: src/transport/plugin_transport_http_server.c:2701
+#: src/transport/plugin_transport_http_server.c:2689
 #, c-format
 msgid "IPv4 support is %s\n"
 msgstr "El soporte IPv4 es %s\n"
 
-#: src/transport/plugin_transport_http_server.c:2715
+#: src/transport/plugin_transport_http_server.c:2703
 #, c-format
 msgid "IPv6 support is %s\n"
 msgstr "El soporte IPv6 es %s\n"
 
-#: src/transport/plugin_transport_http_server.c:2740
+#: src/transport/plugin_transport_http_server.c:2728
 #, c-format
 msgid "Using port %u\n"
 msgstr "Usando puerto %u\n"
 
-#: src/transport/plugin_transport_http_server.c:2755
+#: src/transport/plugin_transport_http_server.c:2743
 #, c-format
 msgid "Specific IPv4 address `%s' in configuration file is invalid!\n"
 msgstr ""
 "¡La dirección IPv4 «%s» especificada en el fichero de configuración no es "
 "válida!\n"
 
-#: src/transport/plugin_transport_http_server.c:2765
+#: src/transport/plugin_transport_http_server.c:2753
 #, c-format
 msgid "Binding to IPv4 address %s\n"
 msgstr "Asociando a la dirección IPv4 %s\n"
 
-#: src/transport/plugin_transport_http_server.c:2786
+#: src/transport/plugin_transport_http_server.c:2774
 #, c-format
 msgid "Specific IPv6 address `%s' in configuration file is invalid!\n"
 msgstr ""
 "¡La dirección IPv6 «%s» especificada en el fichero de configuración no es "
 "válida!\n"
 
-#: src/transport/plugin_transport_http_server.c:2796
+#: src/transport/plugin_transport_http_server.c:2784
 #, c-format
 msgid "Binding to IPv6 address %s\n"
 msgstr "Asociando a la dirección IPv6 %s\n"
 
-#: src/transport/plugin_transport_http_server.c:2864
+#: src/transport/plugin_transport_http_server.c:2852
 #, c-format
 msgid "Notifying transport only about hostname `%s'\n"
 msgstr "Notificando al transporte sólo el nombre de máquina «%s»\n"
@@ -6505,15 +7088,15 @@ msgstr "Longitud de dirección inesperada: %u bytes\n"
 #: src/transport/plugin_transport_tcp.c:923
 #: src/transport/plugin_transport_tcp.c:973
 #: src/transport/plugin_transport_tcp.c:1059
-#: src/transport/plugin_transport_tcp.c:1202
-#: src/transport/plugin_transport_tcp.c:1219
+#: src/transport/plugin_transport_tcp.c:1206
+#: src/transport/plugin_transport_tcp.c:1223
 msgid "# bytes currently in TCP buffers"
 msgstr "# bytes actualmente en los buffer TCP"
 
 #: src/transport/plugin_transport_tcp.c:841
 #: src/transport/plugin_transport_tcp.c:1030
-#: src/transport/plugin_transport_tcp.c:2009
-#: src/transport/plugin_transport_tcp.c:2690
+#: src/transport/plugin_transport_tcp.c:2015
+#: src/transport/plugin_transport_tcp.c:2696
 msgid "# TCP sessions active"
 msgstr "# Sesiones TCP activas"
 
@@ -6529,54 +7112,54 @@ msgstr "# bytes recibidos vía TCP"
 msgid "# bytes discarded by TCP (disconnect)"
 msgstr "# bytes descartados por TCP (desconectado)"
 
-#: src/transport/plugin_transport_tcp.c:1176
+#: src/transport/plugin_transport_tcp.c:1180
 #, c-format
 msgid "Trying to send with invalid session %p\n"
 msgstr "Intentando enviar con una sesión no válida %p\n"
 
-#: src/transport/plugin_transport_tcp.c:1413
-#: src/transport/plugin_transport_udp.c:1449
+#: src/transport/plugin_transport_tcp.c:1417
+#: src/transport/plugin_transport_udp.c:1440
 msgid "# requests to create session with invalid address"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:1530
+#: src/transport/plugin_transport_tcp.c:1534
 msgid "# transport-service disconnect requests for TCP"
 msgstr "# peticiones de desconexión del servicio de transporte por TCP"
 
-#: src/transport/plugin_transport_tcp.c:2059
+#: src/transport/plugin_transport_tcp.c:2065
 msgid "# TCP WELCOME messages received"
 msgstr "# Mensajes «WELCOME» TCP recibidos"
 
-#: src/transport/plugin_transport_tcp.c:2242
+#: src/transport/plugin_transport_tcp.c:2248
 msgid "# bytes received via TCP"
 msgstr "# bytes recibidos vía TCP"
 
-#: src/transport/plugin_transport_tcp.c:2322
+#: src/transport/plugin_transport_tcp.c:2328
 msgid "# network-level TCP disconnect events"
 msgstr "# eventos de desconexión TCP a nivel de red"
 
-#: src/transport/plugin_transport_tcp.c:2570 src/util/service.c:957
-#: src/util/service.c:963
+#: src/transport/plugin_transport_tcp.c:2576 src/util/service.c:589
+#: src/util/service.c:595
 #, c-format
 msgid "Require valid port number for service `%s' in configuration!\n"
 msgstr ""
 "¡Se requiere un número de puerto válido para el servicio «%s» en la "
 "configuración!\n"
 
-#: src/transport/plugin_transport_tcp.c:2584
+#: src/transport/plugin_transport_tcp.c:2590
 msgid "Failed to start service.\n"
 msgstr "Se produjo un fallo al iniciar el servicio.\n"
 
-#: src/transport/plugin_transport_tcp.c:2677
+#: src/transport/plugin_transport_tcp.c:2683
 #, 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:2681
+#: src/transport/plugin_transport_tcp.c:2687
 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:2685
+#: src/transport/plugin_transport_tcp.c:2691
 #, 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"
@@ -6601,14 +7184,14 @@ 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:1555
+#: src/transport/plugin_transport_udp.c:1550
 #, c-format
 msgid ""
 "Trying to create session for address of unexpected length %u (should be %u "
 "or %u)\n"
 msgstr ""
 
-#: src/transport/plugin_transport_udp.c:2590
+#: src/transport/plugin_transport_udp.c:2602
 #, c-format
 msgid ""
 "UDP could not transmit message to `%s': Network seems down, please check "
@@ -6617,7 +7200,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:2604
+#: src/transport/plugin_transport_udp.c:2616
 #, c-format
 msgid ""
 "UDP could not transmit message to `%s': Please check your network "
@@ -6628,26 +7211,26 @@ 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:2905
+#: src/transport/plugin_transport_udp.c:2917
 msgid "Failed to open UDP sockets\n"
 msgstr "Se produjo un fallo al abrir los «sockets» UDP\n"
 
-#: src/transport/plugin_transport_udp.c:3003
+#: src/transport/plugin_transport_udp.c:3015
 #, c-format
 msgid "Given `%s' option is out of range: %llu > %u\n"
 msgstr "La opción «%s» dada está fuera de rango: %llu > %u\n"
 
-#: src/transport/plugin_transport_udp.c:3046
+#: src/transport/plugin_transport_udp.c:3058
 #, c-format
 msgid "Invalid IPv6 address: `%s'\n"
 msgstr "Dirección IPv6 no válida: «%s»\n"
 
-#: src/transport/plugin_transport_udp.c:3105
+#: src/transport/plugin_transport_udp.c:3117
 #, fuzzy
 msgid "Failed to create network sockets, plugin failed\n"
 msgstr "Se produjo un fallo al crear una nueva firma"
 
-#: src/transport/plugin_transport_unix.c:1640
+#: src/transport/plugin_transport_unix.c:1627
 #, fuzzy
 msgid "Failed to open UNIX listen socket\n"
 msgstr "Se produjo un fallo al abrir los «sockets» UNIX\n"
@@ -6661,114 +7244,119 @@ msgid "# WLAN messages defragmented"
 msgstr "# mensajes WLAN defragmentados"
 
 #: src/transport/plugin_transport_wlan.c:688
-#: src/transport/plugin_transport_wlan.c:756
-#: src/transport/plugin_transport_wlan.c:1899
+#: src/transport/plugin_transport_wlan.c:758
+#: src/transport/plugin_transport_wlan.c:1903
 msgid "# WLAN sessions allocated"
 msgstr "# sesiones WLAN alojadas"
 
-#: src/transport/plugin_transport_wlan.c:860
+#: src/transport/plugin_transport_wlan.c:863
 msgid "# WLAN message fragments sent"
 msgstr "# fragmentos de mensaje WLAN enviados"
 
-#: src/transport/plugin_transport_wlan.c:884
+#: src/transport/plugin_transport_wlan.c:887
 msgid "# WLAN messages pending (with fragmentation)"
 msgstr "# mensajes WLAN pendientes (con fragmentación)"
 
-#: src/transport/plugin_transport_wlan.c:992
-#: src/transport/plugin_transport_wlan.c:1077
-#: src/transport/plugin_transport_wlan.c:1901
+#: src/transport/plugin_transport_wlan.c:995
+#: src/transport/plugin_transport_wlan.c:1080
+#: src/transport/plugin_transport_wlan.c:1905
 msgid "# WLAN MAC endpoints allocated"
 msgstr "# MAC de destino WLAN alojadas"
 
-#: src/transport/plugin_transport_wlan.c:1272
+#: src/transport/plugin_transport_wlan.c:1275
 msgid "# HELLO messages received via WLAN"
 msgstr "# mensajes HELLO recibidos vía WLAN"
 
-#: src/transport/plugin_transport_wlan.c:1298
+#: src/transport/plugin_transport_wlan.c:1301
 msgid "# fragments received via WLAN"
 msgstr "# fragmentos recibidos vía WLAN"
 
-#: src/transport/plugin_transport_wlan.c:1308
+#: src/transport/plugin_transport_wlan.c:1311
 msgid "# ACKs received via WLAN"
 msgstr "# ACK recibidos vía WLAN"
 
-#: src/transport/plugin_transport_wlan.c:1365
+#: src/transport/plugin_transport_wlan.c:1368
 msgid "# WLAN DATA messages discarded due to CRC32 error"
 msgstr "# mensajes DATA WLAN descartados debido a un error en el CRC32"
 
-#: src/transport/plugin_transport_wlan.c:1485
+#: src/transport/plugin_transport_wlan.c:1489
 msgid "# DATA messages received via WLAN"
 msgstr "# mensajes «DATA» recibidos vía WLAN"
 
-#: src/transport/plugin_transport_wlan.c:1520
+#: src/transport/plugin_transport_wlan.c:1524
 msgid "# WLAN DATA messages processed"
 msgstr "# mensajes «DATA» WLAN procesados"
 
-#: src/transport/plugin_transport_wlan.c:1583
+#: src/transport/plugin_transport_wlan.c:1587
 msgid "# HELLO beacons sent via WLAN"
 msgstr "# «beacons HELLO» enviados vía WLAN"
 
-#: src/transport/plugin_transport_wlan.c:1696
+#: src/transport/plugin_transport_wlan.c:1700
 msgid "WLAN address with invalid size encountered\n"
 msgstr "Dirección WLAN con tamaño no válido encontrada\n"
 
-#: src/transport/plugin_transport_wlan.c:1880
+#: src/transport/plugin_transport_wlan.c:1884
 #, c-format
 msgid "Helper binary `%s' not SUID, cannot run WLAN transport\n"
 msgstr ""
 "El ejecutable auxiliar «%s» no tiene activado el bit SUID, no se puede "
 "ejecutar el transporte WLAN\n"
 
-#: src/transport/transport_api.c:651
+#: src/transport/transport_api.c:647
 #, c-format
 msgid "Received unexpected message of type %u in %s:%u\n"
 msgstr "Recibido mensaje inesperado del tipo %u en %s:%u\n"
 
-#: src/transport/transport-testing.c:585
+#: src/transport/transport-testing.c:584
 msgid "Failed to initialize testing library!\n"
 msgstr "¡Se produjo un fallo al inicializar la biblioteca de pruebas!\n"
 
-#: src/util/bio.c:137 src/util/bio.c:145
+#: src/tun/regex.c:129
+#, c-format
+msgid "Bad mask: %d\n"
+msgstr ""
+
+#: src/util/bio.c:170 src/util/bio.c:178
 #, c-format
 msgid "Error reading `%s': %s"
 msgstr "Error leyendo «%s»: %s"
 
-#: src/util/bio.c:147
+#: src/util/bio.c:180
 msgid "End of file"
 msgstr "Fin del fichero"
 
-#: src/util/bio.c:199
+#: src/util/bio.c:237
 #, c-format
 msgid "Error reading length of string `%s'"
 msgstr "Se produjo un error leyendo la cadena «%s»"
 
-#: src/util/bio.c:209
+#: src/util/bio.c:247
 #, c-format
 msgid "String `%s' longer than allowed (%u > %u)"
 msgstr "La cadena «%s» es mayor de lo permitido (%u > %u)"
 
-#: src/util/bio.c:254
+#: src/util/bio.c:293
 #, c-format
 msgid "Serialized metadata `%s' larger than allowed (%u>%u)"
 msgstr "Los metadatos serializados «%s» son mayores de lo permitido (%u>%u)"
 
-#: src/util/bio.c:268
+#: src/util/bio.c:307
 #, c-format
 msgid "Metadata `%s' failed to deserialize"
 msgstr "Se produjo un fallo al deserializar los metadatos «%s»"
 
-#: src/util/client.c:261 src/util/client.c:839 src/util/service.c:993
+#: src/util/client.c:261 src/util/client.c:851 src/util/service.c:625
 #, c-format
 msgid "UNIXPATH `%s' too long, maximum length is %llu\n"
 msgstr ""
 "La ruta tipo UNIX «%s» es demasiado larga, la longitud máxima es %llu\n"
 
-#: src/util/client.c:265 src/util/client.c:843 src/util/service.c:997
+#: src/util/client.c:265 src/util/client.c:856 src/util/service.c:629
 #, c-format
 msgid "Using `%s' instead\n"
 msgstr "Usando «%s» en su defecto\n"
 
-#: src/util/client.c:357
+#: src/util/client.c:360
 #, c-format
 msgid ""
 "Could not determine valid hostname and port for service `%s' from "
@@ -6777,48 +7365,48 @@ msgstr ""
 "No se pudo determinar un nombre de máquina y un puerto válidos para el "
 "servicio «%s» a partir de la configuración.\n"
 
-#: src/util/client.c:365
+#: src/util/client.c:368
 #, c-format
 msgid "Need a non-empty hostname for service `%s'.\n"
 msgstr "Se necesita un nombre de máquina no vacío para el servicio «%s».\n"
 
-#: src/util/client.c:981
+#: src/util/client.c:991
 #, fuzzy, c-format
 msgid "Could not connect to service `%s', configuration broken.\n"
 msgstr "No se pudo conectar con el servicio «%s», no debe estar corriendo.\n"
 
-#: src/util/client.c:993
+#: src/util/client.c:1003
 #, c-format
 msgid "Failure to transmit request to service `%s'\n"
 msgstr "Se produjo un fallo al transmitir la petición al servicio «%s»\n"
 
-#: src/util/client.c:1259
+#: src/util/client.c:1274
 msgid "Could not submit request, not expecting to receive a response.\n"
 msgstr ""
 "No se pudo enviar correctamente la petición, no se espera recibir una "
 "respuesta.\n"
 
-#: src/util/common_logging.c:256 src/util/common_logging.c:1033
+#: src/util/common_logging.c:254 src/util/common_logging.c:1039
 msgid "DEBUG"
 msgstr "DEPURACIÓN"
 
-#: src/util/common_logging.c:258 src/util/common_logging.c:1031
+#: src/util/common_logging.c:256 src/util/common_logging.c:1037
 msgid "INFO"
 msgstr "INFORMACIÓN"
 
-#: src/util/common_logging.c:260 src/util/common_logging.c:1029
+#: src/util/common_logging.c:258 src/util/common_logging.c:1035
 msgid "WARNING"
 msgstr "PELIGRO"
 
-#: src/util/common_logging.c:262 src/util/common_logging.c:1027
+#: src/util/common_logging.c:260 src/util/common_logging.c:1033
 msgid "ERROR"
 msgstr "ERROR"
 
-#: src/util/common_logging.c:264 src/util/common_logging.c:1035
+#: src/util/common_logging.c:262 src/util/common_logging.c:1041
 msgid "NONE"
 msgstr "NINGUNO"
 
-#: src/util/common_logging.c:393
+#: src/util/common_logging.c:391
 #, c-format
 msgid "Failed to create or access directory for log file `%s'\n"
 msgstr ""
@@ -6830,24 +7418,24 @@ msgstr ""
 msgid "Message `%.*s' repeated %u times in the last %s\n"
 msgstr "Mensaje `%.*s» repetido %u veces en el último %s\n"
 
-#: src/util/common_logging.c:1036
+#: src/util/common_logging.c:1042
 msgid "INVALID"
 msgstr "NO VÁLIDO"
 
-#: src/util/common_logging.c:1138
+#: src/util/common_logging.c:1150
 msgid "unknown address"
 msgstr "dirección desconocida"
 
-#: src/util/common_logging.c:1177
+#: src/util/common_logging.c:1189
 msgid "invalid address"
 msgstr "dirección no válida"
 
-#: src/util/common_logging.c:1195
+#: src/util/common_logging.c:1207
 #, 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:1216
+#: src/util/common_logging.c:1228
 #, c-format
 msgid ""
 "Configuration specifies invalid value for option `%s' in section `%s': %s\n"
@@ -6855,12 +7443,12 @@ msgstr ""
 "La configuración especifica un valor no válido en la opción «%s» de la "
 "sección «%s»: %s\n"
 
-#: src/util/configuration.c:291
+#: src/util/configuration.c:288
 #, c-format
 msgid "Syntax error while deserializing in line %u\n"
 msgstr "Error de sintaxis en la línea %u mientras se deserializaba\n"
 
-#: src/util/configuration.c:984
+#: src/util/configuration.c:996
 #, c-format
 msgid ""
 "Configuration value '%s' for '%s' in section '%s' is not in set of legal "
@@ -6869,17 +7457,34 @@ msgstr ""
 "El valor de configuración «%s» para «%s» de la sección «%s» no está dentro "
 "de las opciones legales\n"
 
-#: src/util/connection.c:424
+#: src/util/configuration.c:1065
+#, c-format
+msgid "Recursive expansion suspected, aborting $-expansion for term `%s'\n"
+msgstr ""
+
+#: src/util/configuration.c:1097
+#, fuzzy, c-format
+msgid "Missing closing `%s' in option `%s'\n"
+msgstr "Falta la opción «%s» para la operación «%s»\n"
+
+#: src/util/configuration.c:1170
+#, c-format
+msgid ""
+"Failed to expand `%s' in `%s' as it is neither found in [PATHS] nor defined "
+"as an environmental variable\n"
+msgstr ""
+
+#: src/util/connection.c:423
 #, c-format
 msgid "Access denied to `%s'\n"
 msgstr "Acceso denegado a «%s»\n"
 
-#: src/util/connection.c:439
+#: src/util/connection.c:438
 #, c-format
 msgid "Accepting connection from `%s': %p\n"
 msgstr "Aceptando conexión desde «%s»: %p\n"
 
-#: src/util/connection.c:554
+#: src/util/connection.c:553
 #, c-format
 msgid ""
 "Failed to establish TCP connection to `%s:%u', no further addresses to try.\n"
@@ -6887,17 +7492,17 @@ msgstr ""
 "Se produjo un fallo al establecer la conexión TCP a «%s:%u», no quedan "
 "direcciones por probar.\n"
 
-#: src/util/connection.c:752 src/util/connection.c:919
+#: src/util/connection.c:751 src/util/connection.c:909
 #, c-format
 msgid "Trying to connect to `%s' (%p)\n"
 msgstr "Intentando conectar a «%s» (%p)\n"
 
-#: src/util/connection.c:910
+#: src/util/connection.c:900
 #, c-format
 msgid "Attempt to connect to `%s' failed\n"
 msgstr "El intento de conectar a «%s» falló\n"
 
-#: src/util/container_bloomfilter.c:518
+#: src/util/container_bloomfilter.c:516
 #, c-format
 msgid ""
 "Size of file on disk is incorrect for this Bloom filter (want %llu, have "
@@ -6906,22 +7511,23 @@ msgstr ""
 "El tamaño del fichero en disco es incorrecto para este «Bloom "
 "filter» (esperado %llu, tiene %llu)\n"
 
-#: src/util/crypto_ecc.c:580 src/util/crypto_ecc.c:618
+#: src/util/crypto_ecc.c:940 src/util/crypto_ecc.c:978
+#: src/util/crypto_ecc.c:1096 src/util/crypto_ecc.c:1134
 #, c-format
 msgid "Could not acquire lock on file `%s': %s...\n"
 msgstr "No se pudo bloquear el fichero «%s»: %s...\n"
 
-#: src/util/crypto_ecc.c:585
+#: src/util/crypto_ecc.c:945 src/util/crypto_ecc.c:1101
 msgid "Creating a new private key.  This may take a while.\n"
 msgstr "Generando una clave privada nueva.  Esto puede tomar un tiempo.\n"
 
-#: src/util/crypto_ecc.c:622
+#: src/util/crypto_ecc.c:982 src/util/crypto_ecc.c:1138
 msgid "This may be ok if someone is currently generating a private key.\n"
 msgstr ""
 "Esto puede estar bien si alguien está actualmente generando una clave "
 "privada.\n"
 
-#: src/util/crypto_ecc.c:653
+#: src/util/crypto_ecc.c:1012 src/util/crypto_ecc.c:1168
 #, c-format
 msgid ""
 "When trying to read key file `%s' I found %u bytes but I need at least %u.\n"
@@ -6929,113 +7535,118 @@ msgstr ""
 "Cuando se intentaba leer el fichero de claves «%s» se encontraron %u bytes "
 "pero al menos %u son necesarios.\n"
 
-#: src/util/crypto_ecc.c:658
+#: src/util/crypto_ecc.c:1016 src/util/crypto_ecc.c:1172
 msgid "This may be ok if someone is currently generating a key.\n"
 msgstr ""
 "Esto puede ser correcto si alguien está actualmente generando una clave de "
 "máquina.\n"
 
-#: src/util/crypto_ecc.c:741
+#: src/util/crypto_ecc.c:1254
 #, fuzzy
 msgid "Could not load peer's private key\n"
 msgstr "No se pudo acceder a la clave de máquina.\n"
 
-#: src/util/crypto_ecc.c:803
+#: src/util/crypto_ecc.c:1343
 #, 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:883
-#, c-format
-msgid "ECC signature verification failed at %s:%d: %s\n"
-msgstr "La verificación de firma ECC falló en %s:%d: %s\n"
+#: src/util/crypto_ecc.c:1393
+#, 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:1472
+#, 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:1534
+#, 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"
 
-#: src/util/crypto_random.c:281
+#: src/util/crypto_random.c:320
 #, c-format
 msgid "Starting `%s' process to generate entropy\n"
 msgstr "Iniciando el proceso «%s» para generar entropía\n"
 
-#: src/util/crypto_random.c:312
+#: src/util/crypto_random.c:351
 #, c-format
 msgid "libgcrypt has not the expected version (version %s is required).\n"
 msgstr "libgcrypt no tiene la versión esperada (se necesita la versión %s).\n"
 
-#: src/util/disk.c:1150
+#: src/util/disk.c:1185
 #, c-format
 msgid "Expected `%s' to be a directory!\n"
 msgstr "¡Se esperaba que «%s» fuera un directorio!\n"
 
-#: src/util/disk.c:1507 src/util/service.c:1674
+#: src/util/disk.c:1543 src/util/service.c:1315
 #, c-format
 msgid "Cannot obtain information about user `%s': %s\n"
 msgstr "No se pudo obtener información acerca del usuario «%s»: %s\n"
 
-#: src/util/disk.c:1954
-#, c-format
-msgid "No `%s' specified for service `%s' in configuration.\n"
-msgstr "Ningún «%s» especificado para el servicio «%s» en la configuración.\n"
-
-#: src/util/getopt.c:570
+#: src/util/getopt.c:568
 #, c-format
 msgid "%s: option `%s' is ambiguous\n"
 msgstr "%s: la opción «%s» es ambigua\n"
 
-#: src/util/getopt.c:594
+#: src/util/getopt.c:592
 #, c-format
 msgid "%s: option `--%s' does not allow an argument\n"
 msgstr "%s: la opción «--%s» no permite un parámetro\n"
 
-#: src/util/getopt.c:599
+#: src/util/getopt.c:597
 #, c-format
 msgid "%s: option `%c%s' does not allow an argument\n"
 msgstr "%s: la opción «%c%s» no permite un parámetro\n"
 
-#: src/util/getopt.c:616 src/util/getopt.c:783
+#: src/util/getopt.c:614 src/util/getopt.c:781
 #, c-format
 msgid "%s: option `%s' requires an argument\n"
 msgstr "%s: la opción «%s» requiere un parámetro\n"
 
-#: src/util/getopt.c:645
+#: src/util/getopt.c:643
 #, c-format
 msgid "%s: unrecognized option `--%s'\n"
 msgstr "%s: opción no reconocida «--%s»\n"
 
-#: src/util/getopt.c:649
+#: src/util/getopt.c:647
 #, c-format
 msgid "%s: unrecognized option `%c%s'\n"
 msgstr "%s: opción no reconocida «%c%s»\n"
 
-#: src/util/getopt.c:674
+#: src/util/getopt.c:672
 #, c-format
 msgid "%s: illegal option -- %c\n"
 msgstr "%s: opción ilegal -- %c\n"
 
-#: src/util/getopt.c:676
+#: src/util/getopt.c:674
 #, c-format
 msgid "%s: invalid option -- %c\n"
 msgstr "%s: opción no válida -- %c\n"
 
-#: src/util/getopt.c:704 src/util/getopt.c:831
+#: src/util/getopt.c:702 src/util/getopt.c:829
 #, c-format
 msgid "%s: option requires an argument -- %c\n"
 msgstr "%s: la opción requiere un parámetro -- %c\n"
 
-#: src/util/getopt.c:752
+#: src/util/getopt.c:750
 #, c-format
 msgid "%s: option `-W %s' is ambiguous\n"
 msgstr "%s: la opción «-W %s» es ambigua\n"
 
-#: src/util/getopt.c:770
+#: src/util/getopt.c:768
 #, c-format
 msgid "%s: option `-W %s' does not allow an argument\n"
 msgstr "%s: la opción «-W %s» no permite un parámetro\n"
 
-#: src/util/getopt.c:935
+#: src/util/getopt.c:933
 #, c-format
 msgid "Use %s to get a list of options.\n"
 msgstr "Use %s para obtener una lista de opciones.\n"
 
-#: src/util/getopt_helpers.c:86
+#: src/util/getopt_helpers.c:84
 #, c-format
 msgid ""
 "Arguments mandatory for long options are also mandatory for short options.\n"
@@ -7043,12 +7654,12 @@ msgstr ""
 "Los parámetros obligatorios para las opciones largas también lo son para sus "
 "versiones cortas.\n"
 
-#: src/util/getopt_helpers.c:270 src/util/getopt_helpers.c:328
+#: src/util/getopt_helpers.c:268 src/util/getopt_helpers.c:326
 #, c-format
 msgid "You must pass a number to the `%s' option.\n"
 msgstr "Tienes que introducir un número en la opción «%s».\n"
 
-#: src/util/getopt_helpers.c:300
+#: src/util/getopt_helpers.c:298
 #, c-format
 msgid "You must pass relative time to the `%s' option.\n"
 msgstr "Debes introducir un tiempo relativo en la opción «%s».\n"
@@ -7117,24 +7728,23 @@ msgid ""
 "Error, %u keys not generated\n"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:118
-#, c-format
+#: src/util/gnunet-ecc.c:119
 msgid "No hostkey file specified on command line\n"
 msgstr "No se ha especificado la clave de máquina en la línea de comandos\n"
 
-#: src/util/gnunet-ecc.c:163
+#: src/util/gnunet-ecc.c:168
 msgid "create COUNT public-private key pairs (for testing)"
 msgstr "crea «COUNT» pares de claves pública-privada (para pruebas)"
 
-#: src/util/gnunet-ecc.c:166
+#: src/util/gnunet-ecc.c:171
 msgid "print the public key in ASCII format"
 msgstr "imprime la clave pública en formato ASCII"
 
-#: src/util/gnunet-ecc.c:169
+#: src/util/gnunet-ecc.c:174
 msgid "print the hash of the public key in ASCII format"
 msgstr "imprime el hash de la clave pública en formato ASCII"
 
-#: src/util/gnunet-ecc.c:180
+#: src/util/gnunet-ecc.c:185
 msgid "Manipulate GNUnet private ECC key files"
 msgstr "Manipular los ficheros de clave privada ECC de GNUnet"
 
@@ -7181,29 +7791,29 @@ msgstr "No hay un manejador conocido para el subsistema «%s»\n"
 msgid "Perform default-actions for GNUnet URIs"
 msgstr "Realizar las acciones predeterminadas para URI de GNUnet"
 
-#: src/util/helper.c:330
+#: src/util/helper.c:338
 #, c-format
 msgid "Error reading from `%s': %s\n"
 msgstr "Error leyendo de «%s»: %s\n"
 
-#: src/util/helper.c:375
+#: src/util/helper.c:383
 #, c-format
 msgid "Failed to parse inbound message from helper `%s'\n"
 msgstr ""
 "Se produjo un fallo al procesar el mensaje interno del programa auxiliar "
 "«%s»\n"
 
-#: src/util/helper.c:572
+#: src/util/helper.c:609
 #, c-format
 msgid "Error writing to `%s': %s\n"
 msgstr "Error escribiendo a «%s»: %s\n"
 
-#: src/util/network.c:132
+#: src/util/network.c:134
 #, c-format
 msgid "Unable to shorten unix path `%s' while keeping name unique\n"
 msgstr "Imposible acortar la ruta unix «%s» manteniendo el nombre único\n"
 
-#: src/util/network.c:1370
+#: src/util/network.c:1397
 #, c-format
 msgid ""
 "Fatal internal logic error, process hangs in `%s' (abort with CTRL-C)!\n"
@@ -7211,7 +7821,7 @@ msgstr ""
 "¡Error lógico interno fatal, el proceso está colgado en «%s» (abortar con "
 "CTRL-C)!\n"
 
-#: src/util/os_installation.c:423
+#: src/util/os_installation.c:421
 #, c-format
 msgid ""
 "Could not determine installation path for %s.  Set `%s' environment "
@@ -7220,41 +7830,41 @@ msgstr ""
 "No se pudo determinar la ruta de instalación de %s.  Establezca la variable "
 "de entorno «%s».\n"
 
-#: src/util/os_installation.c:709
+#: src/util/os_installation.c:710
 #, c-format
 msgid "Could not find binary `%s' in PATH!\n"
 msgstr "¡No se pudo encontrar el programa llamado «%s» en PATH!\n"
 
-#: src/util/os_installation.c:769
+#: src/util/os_installation.c:770
 #, fuzzy, c-format
 msgid "CreateProcess failed for binary %s (%d).\n"
 msgstr "«%s» falló para el puerto %d (%s).\n"
 
-#: src/util/os_installation.c:779
+#: src/util/os_installation.c:780
 #, c-format
 msgid "GetExitCodeProcess failed for binary %s (%d).\n"
 msgstr ""
 
-#: src/util/plugin.c:89
+#: src/util/plugin.c:87
 #, c-format
 msgid "Initialization of plugin mechanism failed: %s!\n"
 msgstr "¡La inicialización del mecanismo de módulos falló: %s!\n"
 
-#: src/util/plugin.c:146
+#: src/util/plugin.c:144
 #, c-format
 msgid "`%s' failed to resolve method '%s' with error: %s\n"
 msgstr "«%s» falló al resolver el método «%s» con error: %s\n"
 
-#: src/util/plugin.c:219
+#: src/util/plugin.c:217
 #, c-format
 msgid "`%s' failed for library `%s' with error: %s\n"
 msgstr "Falló «%s» para la biblioteca «%s» con error: %s\n"
 
-#: src/util/plugin.c:349
+#: src/util/plugin.c:347
 msgid "Could not determine plugin installation path.\n"
 msgstr "No se pudo determinar la ruta de instalación de los módulos.\n"
 
-#: src/util/program.c:254 src/util/service.c:1796
+#: src/util/program.c:262 src/util/service.c:1452
 #, c-format
 msgid "Could not access configuration file `%s'\n"
 msgstr "No se pudo acceder al fichero de configuración «%s»\n"
@@ -7264,7 +7874,7 @@ msgstr "No se pudo acceder al fichero de configuración «%s»\n"
 msgid "Must specify `%s' for `%s' in configuration!\n"
 msgstr "¡Se debe especificar «%s» para «%s» en la configuración!\n"
 
-#: src/util/resolver_api.c:217
+#: src/util/resolver_api.c:216
 #, c-format
 msgid ""
 "Must specify `%s' or numeric IP address for `%s' of `%s' in configuration!\n"
@@ -7282,37 +7892,37 @@ msgstr "Expiración de plazo intentando resolver la dirección IP «%s».\n"
 msgid "Timeout trying to resolve hostname `%s'.\n"
 msgstr "Expiración de plazo intentando resolver el nombre de máquina «%s».\n"
 
-#: src/util/resolver_api.c:886
+#: src/util/resolver_api.c:891
 #, c-format
 msgid "Could not resolve our FQDN : %s\n"
 msgstr ""
 "No se pudo resolver nuestro nombre de dominio cualificado (FQDN) : %s\n"
 
-#: src/util/scheduler.c:802
+#: src/util/scheduler.c:804
 msgid "Looks like we're busy waiting...\n"
 msgstr "Parece que estamos en espera ocupada...\n"
 
-#: src/util/scheduler.c:933
+#: src/util/scheduler.c:938
 #, c-format
 msgid "Attempt to cancel dead task %llu!\n"
 msgstr "¡Intento de cancelar la tarea muerta %llu!\n"
 
-#: src/util/server.c:482
+#: src/util/server.c:484
 #, c-format
 msgid "`%s' failed for port %d (%s).\n"
 msgstr "«%s» falló para el puerto %d (%s).\n"
 
-#: src/util/server.c:491
+#: src/util/server.c:493
 #, c-format
 msgid "`%s' failed for port %d (%s): address already in use\n"
 msgstr "«%s» falló para el puerto %d (%s): dirección en uso actualmente\n"
 
-#: src/util/server.c:502
-#, c-format
-msgid "`%s' failed for `%.*s': address already in use\n"
+#: src/util/server.c:499
+#, fuzzy, c-format
+msgid "`%s' failed for `%s': address already in use\n"
 msgstr "«%s» falló para «%.*s»: dirección en uso actualmente\n"
 
-#: src/util/server.c:894
+#: src/util/server.c:892
 #, c-format
 msgid ""
 "Processing code for message of type %u did not call "
@@ -7321,58 +7931,27 @@ 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:151 src/util/service.c:177 src/util/service.c:220
-#: src/util/service.c:241 src/util/service.c:248
-#, c-format
-msgid "Invalid format for IP: `%s'\n"
-msgstr "Formato no válido para la IP: «%s»\n"
-
-#: src/util/service.c:204
-#, c-format
-msgid "Invalid network notation ('/%d' is not legal in IPv4 CIDR)."
-msgstr "Notación de red no válida («/%d» no es válido en IPv4 CIDR)."
-
-#: src/util/service.c:297
-#, c-format
-msgid "Invalid network notation (does not end with ';': `%s')\n"
-msgstr "Notación de red no válida (no termina con «;»: «%s»)\n"
-
-#: src/util/service.c:329
-#, c-format
-msgid "Wrong format `%s' for netmask\n"
-msgstr "Formato «%s» erroneo para máscara de red\n"
-
-#: src/util/service.c:359
-#, c-format
-msgid "Wrong format `%s' for network\n"
-msgstr "Formato «%s» erroneo para red\n"
-
-#: src/util/service.c:716
-#, c-format
-msgid "Access denied to UID %d / GID %d\n"
-msgstr "Acceso denegado al UID %d / GID %d\n"
-
-#: src/util/service.c:721
+#: src/util/service.c:362
 #, c-format
 msgid "Unknown address family %d\n"
 msgstr "Familia de direcciones %d desconocida\n"
 
-#: src/util/service.c:728
+#: src/util/service.c:369
 #, c-format
 msgid "Access from `%s' denied to service `%s'\n"
 msgstr "Acceso denegado desde «%s» al servicio «%s»\n"
 
-#: src/util/service.c:783
+#: src/util/service.c:424
 #, c-format
 msgid "Could not parse IPv4 network specification `%s' for `%s:%s'\n"
 msgstr "No se pudo procesar la especificación de red IPv4 «%s» para «%s:%s»\n"
 
-#: src/util/service.c:820
+#: src/util/service.c:461
 #, c-format
 msgid "Could not parse IPv6 network specification `%s' for `%s:%s'\n"
 msgstr "No se pudo procesar la especificación de red IPv6 «%s» para «%s:%s»\n"
 
-#: src/util/service.c:938
+#: src/util/service.c:570
 #, c-format
 msgid ""
 "Disabling IPv6 support for service `%s', failed to create IPv6 socket: %s\n"
@@ -7380,7 +7959,7 @@ msgstr ""
 "Deshabilitando el soporte para IPv6 para el servicio «%s», se produjo un "
 "fallo al crear un «socket» IPv6: %s\n"
 
-#: src/util/service.c:1016
+#: src/util/service.c:651
 #, c-format
 msgid ""
 "Disabling UNIX domain socket support for service `%s', failed to create UNIX "
@@ -7389,350 +7968,465 @@ msgstr ""
 "Deshabilitando el soporte de dominio de «sockets» UNIX para el servicio "
 "«%s», no se pudo crear un «socket» UNIX: %s\n"
 
-#: src/util/service.c:1033
+#: src/util/service.c:667
 #, c-format
 msgid "Have neither PORT nor UNIXPATH for service `%s', but one is required\n"
 msgstr ""
 "No hay ni puerto (PORT) ni ruta unix (UNIXPATH) para el servicio «%s», pero "
 "uno es necesario\n"
 
-#: src/util/service.c:1267
+#: src/util/service.c:901
 msgid "Could not access a pre-bound socket, will try to bind myself\n"
 msgstr ""
 "No se pudo acceder a un «socket» pre-ascociado, lo intentaré asociar yo "
 "mismo\n"
 
-#: src/util/service.c:1316 src/util/service.c:1334
+#: src/util/service.c:950 src/util/service.c:968
 #, c-format
 msgid "Specified value for `%s' of service `%s' is invalid\n"
 msgstr "El valor especificado «%s» para el servicio «%s» no es válido\n"
 
-#: src/util/service.c:1359
+#: src/util/service.c:993
 #, c-format
 msgid "Could not access pre-bound socket %u, will try to bind myself\n"
 msgstr ""
 "No se pudo acceder al «socket» pre-ascociado %u, lo intentaré asociar yo "
 "mismo\n"
 
-#: src/util/service.c:1530
+#: src/util/service.c:1163
 #, c-format
 msgid "Failed to start `%s' at `%s'\n"
 msgstr "Se produjo un fallo al inciar «%s» en «%s»\n"
 
-#: src/util/service.c:1563
+#: src/util/service.c:1204
 #, c-format
 msgid "Service `%s' runs at %s\n"
 msgstr "El servicio «%s» se ejecuta en %s\n"
 
-#: src/util/service.c:1612
+#: src/util/service.c:1253
 msgid "Service process failed to initialize\n"
 msgstr "No se pudo inicializar el proceso del servicio\n"
 
-#: src/util/service.c:1616
+#: src/util/service.c:1257
 msgid "Service process could not initialize server function\n"
 msgstr ""
 "No se pudo inicializar la función del servidor en el proceso del servicio\n"
 
-#: src/util/service.c:1620
+#: src/util/service.c:1261
 msgid "Service process failed to report status\n"
 msgstr "El proceso del servicio no devolvió un estado\n"
 
-#: src/util/service.c:1675
+#: src/util/service.c:1316
 msgid "No such user"
 msgstr "No existe tal usuario"
 
-#: src/util/service.c:1688
+#: src/util/service.c:1329
 #, c-format
 msgid "Cannot change user/group to `%s': %s\n"
 msgstr "Imposible cambiar el usuario/grupo a «%s»: %s\n"
 
-#: src/util/service.c:1754
+#: src/util/service.c:1399
 msgid "do daemonize (detach from terminal)"
 msgstr "demonizar (desasociar del terminal)"
 
-#: src/util/signal.c:80
+#: src/util/signal.c:79
 #, c-format
 msgid "signal (%d, %p) returned %d.\n"
 msgstr "señal (%d, %p) devolvió %d.\n"
 
-#: src/util/strings.c:146
+#: src/util/strings.c:145
 msgid "b"
 msgstr "b"
 
-#: src/util/strings.c:429
+#: src/util/strings.c:444
 #, c-format
 msgid "Character sets requested were `%s'->`%s'\n"
 msgstr "Los conjuntos de caracteres pedidos fueron «%s»->«%s»\n"
 
-#: src/util/strings.c:544
+#: src/util/strings.c:572
 msgid "Failed to expand `$HOME': environment variable `HOME' not set"
 msgstr ""
 "Se produjo un fallo al expandir «$HOME»: variable de entorno «HOME» no "
 "establecida"
 
-#: src/util/strings.c:641
+#: src/util/strings.c:669
 msgid "µs"
 msgstr ""
 
-#: src/util/strings.c:645
+#: src/util/strings.c:673
 msgid "forever"
 msgstr "para siempre"
 
-#: src/util/strings.c:647
+#: src/util/strings.c:675
 msgid "0 ms"
 msgstr "0 ms"
 
-#: src/util/strings.c:653
+#: src/util/strings.c:681
 msgid "ms"
 msgstr "ms"
 
-#: src/util/strings.c:659
+#: src/util/strings.c:687
 msgid "s"
 msgstr "s"
 
-#: src/util/strings.c:665
+#: src/util/strings.c:693
 msgid "m"
 msgstr "m"
 
-#: src/util/strings.c:671
+#: src/util/strings.c:699
 msgid "h"
 msgstr "h"
 
-#: src/util/strings.c:678
+#: src/util/strings.c:706
 msgid "day"
 msgstr "día"
 
-#: src/util/strings.c:680
+#: src/util/strings.c:708
 msgid "days"
 msgstr "días"
 
-#: src/util/strings.c:708
+#: src/util/strings.c:737
 msgid "end of time"
 msgstr "fin del plazo"
 
-#: src/util/strings.c:1109
+#: src/util/strings.c:1141
 msgid "IPv6 address did not start with `['\n"
 msgstr "La dirección IPv6 no empezaba con «[»\n"
 
-#: src/util/strings.c:1117
+#: src/util/strings.c:1149
 msgid "IPv6 address did contain ':' to separate port number\n"
 msgstr "La dirección IPv6 contenía «:» para separar el número de puerto\n"
 
-#: src/util/strings.c:1123
+#: src/util/strings.c:1155
 msgid "IPv6 address did contain ']' before ':' to separate port number\n"
 msgstr ""
 "La dirección IPv6 contenía «]» antes de «:» para separar el número de "
 "puerto\n"
 
-#: src/util/strings.c:1130
+#: src/util/strings.c:1162
 msgid "IPv6 address did contain a valid port number after the last ':'\n"
 msgstr ""
 "La dirección IPv6 contenía un número de puerto válido después del último "
 "«:»\n"
 
-#: src/util/strings.c:1139
+#: src/util/strings.c:1171
 #, c-format
 msgid "Invalid IPv6 address `%s': %s\n"
 msgstr "Dirección IPv6 «%s» no válida: %s\n"
 
-#: src/vpn/gnunet-service-vpn.c:523 src/vpn/gnunet-service-vpn.c:1128
+#: src/util/strings.c:1377 src/util/strings.c:1393
+msgid "Port not in range\n"
+msgstr ""
+
+#: src/util/strings.c:1402
+#, fuzzy, c-format
+msgid "Malformed port policy `%s'\n"
+msgstr "Se produjo un fallo al iniciar el servicio «%s»\n"
+
+#: src/util/strings.c:1486 src/util/strings.c:1517 src/util/strings.c:1565
+#: src/util/strings.c:1586
+#, c-format
+msgid "Invalid format for IP: `%s'\n"
+msgstr "Formato no válido para la IP: «%s»\n"
+
+#: src/util/strings.c:1543
+#, c-format
+msgid "Invalid network notation ('/%d' is not legal in IPv4 CIDR)."
+msgstr "Notación de red no válida («/%d» no es válido en IPv4 CIDR)."
+
+#: src/util/strings.c:1595
+#, fuzzy, c-format
+msgid "Invalid format: `%s'\n"
+msgstr "Formato de tiempo no válido «%s»\n"
+
+#: src/util/strings.c:1647
+#, c-format
+msgid "Invalid network notation (does not end with ';': `%s')\n"
+msgstr "Notación de red no válida (no termina con «;»: «%s»)\n"
+
+#: src/util/strings.c:1697
+#, c-format
+msgid "Wrong format `%s' for netmask\n"
+msgstr "Formato «%s» erroneo para máscara de red\n"
+
+#: src/util/strings.c:1728
+#, c-format
+msgid "Wrong format `%s' for network\n"
+msgstr "Formato «%s» erroneo para red\n"
+
+#: src/vpn/gnunet-service-vpn.c:550 src/vpn/gnunet-service-vpn.c:1088
 msgid "# Active tunnels"
 msgstr "# Túneles activos"
 
-#: src/vpn/gnunet-service-vpn.c:622 src/vpn/gnunet-service-vpn.c:661
-msgid "# peers connected to mesh tunnels"
-msgstr "# pares conectados a túneles mesh"
-
-#: src/vpn/gnunet-service-vpn.c:712
+#: src/vpn/gnunet-service-vpn.c:642
 msgid "# Bytes given to mesh for transmission"
 msgstr "# Bytes dados para transmisión a mesh"
 
-#: src/vpn/gnunet-service-vpn.c:750
+#: src/vpn/gnunet-service-vpn.c:680
 msgid "# Bytes dropped in mesh queue (overflow)"
 msgstr "# Bytes omitidos en la cola mesh (desbordamiento)"
 
-#: src/vpn/gnunet-service-vpn.c:814
+#: src/vpn/gnunet-service-vpn.c:754
 msgid "# Mesh tunnels created"
 msgstr "# Túneles mesh creados"
 
-#: src/vpn/gnunet-service-vpn.c:839
+#: src/vpn/gnunet-service-vpn.c:786
 msgid "Failed to setup mesh tunnel!\n"
 msgstr "¡Se produjo un fallo al configurar el túnel mesh!\n"
 
-#: src/vpn/gnunet-service-vpn.c:1032
+#: src/vpn/gnunet-service-vpn.c:980
 #, c-format
 msgid "Protocol %u not supported, dropping\n"
 msgstr "Protocolo %u no soportado, omitiendo\n"
 
-#: src/vpn/gnunet-service-vpn.c:1348
+#: src/vpn/gnunet-service-vpn.c:1307
 msgid "# ICMPv4 packets dropped (not allowed)"
 msgstr "# Paquetes ICMPv4 omitidos (no permitido)"
 
-#: src/vpn/gnunet-service-vpn.c:1369
+#: src/vpn/gnunet-service-vpn.c:1328
 msgid "# ICMPv6 packets dropped (not allowed)"
 msgstr "# Paquetes ICMPv6 omitidos (no permitido)"
 
-#: src/vpn/gnunet-service-vpn.c:1574
+#: src/vpn/gnunet-service-vpn.c:1533
 msgid "# Packets received from TUN interface"
 msgstr "# Paquetes recibidos de la interfaz TUN"
 
-#: src/vpn/gnunet-service-vpn.c:1612 src/vpn/gnunet-service-vpn.c:1653
+#: src/vpn/gnunet-service-vpn.c:1566 src/vpn/gnunet-service-vpn.c:1602
 #, 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:1663
+#: src/vpn/gnunet-service-vpn.c:1612
 msgid "Received IPv4 packet with options (dropping it)\n"
 msgstr "Recibido paquete IPv4 con opciones (omitiéndolo)\n"
 
-#: src/vpn/gnunet-service-vpn.c:1677
+#: src/vpn/gnunet-service-vpn.c:1626
 #, 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:1759
+#: src/vpn/gnunet-service-vpn.c:1708
 msgid "# ICMP packets received from mesh"
 msgstr "# Paquetes ICMP recibidos de mesh"
 
-#: src/vpn/gnunet-service-vpn.c:2098
+#: src/vpn/gnunet-service-vpn.c:2047
 msgid "# UDP packets received from mesh"
 msgstr "# Paquetes UDP recibidos de mesh"
 
-#: src/vpn/gnunet-service-vpn.c:2253
+#: src/vpn/gnunet-service-vpn.c:2202
 msgid "# TCP packets received from mesh"
 msgstr "# Paquetes TCP recibidos de mesh"
 
-#: src/vpn/gnunet-service-vpn.c:2404
+#: src/vpn/gnunet-service-vpn.c:2353
 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:2459
+#: src/vpn/gnunet-service-vpn.c:2408
 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:2498 src/vpn/gnunet-service-vpn.c:2711
+#: src/vpn/gnunet-service-vpn.c:2449 src/vpn/gnunet-service-vpn.c:2665
 msgid "# Active destinations"
 msgstr "# Destinos activos"
 
-#: src/vpn/gnunet-service-vpn.c:2784
+#: src/vpn/gnunet-service-vpn.c:2717
 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:3112
+#: src/vpn/gnunet-service-vpn.c:2984
 #, fuzzy
 msgid "Must specify valid IPv6 address"
 msgstr "«%s» no es una dirección IP válida.\n"
 
-#: src/vpn/gnunet-service-vpn.c:3133
+#: src/vpn/gnunet-service-vpn.c:3008
 msgid "Must specify valid IPv6 mask"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:3141
+#: src/vpn/gnunet-service-vpn.c:3016
 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:3153
+#: src/vpn/gnunet-service-vpn.c:3029
 #, fuzzy
 msgid "Must specify valid IPv4 address"
 msgstr "«%s» no es una dirección IP válida.\n"
 
-#: src/vpn/gnunet-service-vpn.c:3164
+#: src/vpn/gnunet-service-vpn.c:3042
 msgid "Must specify valid IPv4 mask"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:3173
+#: src/vpn/gnunet-service-vpn.c:3052
 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"
 
-#: src/vpn/gnunet-vpn.c:151
+#: src/vpn/gnunet-vpn.c:146
 msgid "Error creating tunnel\n"
 msgstr "Error creando el túnel\n"
 
-#: src/vpn/gnunet-vpn.c:194 src/vpn/gnunet-vpn.c:225
+#: src/vpn/gnunet-vpn.c:189 src/vpn/gnunet-vpn.c:220
 #, c-format
 msgid "Option `%s' makes no sense with option `%s'.\n"
 msgstr "La opción «%s» no tiene sentido con la opción «%s».\n"
 
-#: src/vpn/gnunet-vpn.c:207
+#: src/vpn/gnunet-vpn.c:202
 #, c-format
 msgid "Option `%s' or `%s' is required.\n"
 msgstr "Las opción «%s» o «%s» es necesaria.\n"
 
-#: src/vpn/gnunet-vpn.c:219
+#: src/vpn/gnunet-vpn.c:214
 #, c-format
 msgid "Option `%s' or `%s' is required when using option `%s'.\n"
 msgstr "Las opción «%s» o «%s» es necesaria cuando se usa la opción «%s».\n"
 
-#: src/vpn/gnunet-vpn.c:237
+#: src/vpn/gnunet-vpn.c:233
 #, c-format
 msgid "`%s' is not a valid peer identifier.\n"
 msgstr "«%s» no es un identificador de par válido\n"
 
-#: src/vpn/gnunet-vpn.c:259
+#: src/vpn/gnunet-vpn.c:254
 #, c-format
 msgid "`%s' is not a valid IP address.\n"
 msgstr "«%s» no es una dirección IP válida.\n"
 
-#: src/vpn/gnunet-vpn.c:295
+#: src/vpn/gnunet-vpn.c:289
 msgid "request that result should be an IPv4 address"
 msgstr "petición cuyo resultado debe ser una dirección IPv4"
 
-#: src/vpn/gnunet-vpn.c:298
+#: src/vpn/gnunet-vpn.c:292
 msgid "request that result should be an IPv6 address"
 msgstr "petición cuyo resultado debe ser una dirección IPv6"
 
-#: src/vpn/gnunet-vpn.c:301
-msgid "print IP address only after mesh tunnel has been created"
-msgstr ""
-"imprimir direcciones IP solamente después de haber creado el túnel mesh"
-
-#: src/vpn/gnunet-vpn.c:304
+#: src/vpn/gnunet-vpn.c:295
 msgid "how long should the mapping be valid for new tunnels?"
 msgstr "¿cuánto tiempo debe ser válido el mapeado para túneles nuevos?"
 
-#: src/vpn/gnunet-vpn.c:307
+#: src/vpn/gnunet-vpn.c:298
 msgid "destination IP for the tunnel"
 msgstr "IP de destino para el túnel"
 
-#: src/vpn/gnunet-vpn.c:310
+#: src/vpn/gnunet-vpn.c:301
 msgid "peer offering the service we would like to access"
 msgstr "par que ofrece el servicio al que nos gustaría acceder"
 
-#: src/vpn/gnunet-vpn.c:313
+#: src/vpn/gnunet-vpn.c:304
 msgid "name of the service we would like to access"
 msgstr "nombre del servicio al que nos gustaría acceder"
 
-#: src/vpn/gnunet-vpn.c:316
+#: src/vpn/gnunet-vpn.c:307
 msgid "service is offered via TCP"
 msgstr "el servicio es ofrecido vía TCP"
 
-#: src/vpn/gnunet-vpn.c:319
+#: src/vpn/gnunet-vpn.c:310
 msgid "service is offered via UDP"
 msgstr "el servicio es ofrecido vía UDP"
 
-#: src/vpn/gnunet-vpn.c:331
+#: src/vpn/gnunet-vpn.c:322
 msgid "Setup tunnels via VPN."
 msgstr "Configurar túneles vía VPN."
 
-#: src/include/gnunet_common.h:618 src/include/gnunet_common.h:625
-#: src/include/gnunet_common.h:633
+#: src/include/gnunet_common.h:566 src/include/gnunet_common.h:573
+#: src/include/gnunet_common.h:581
 #, c-format
 msgid "Assertion failed at %s:%d.\n"
 msgstr "Aserción fallida en %s:%d.\n"
 
-#: src/include/gnunet_common.h:645
+#: src/include/gnunet_common.h:593
 #, 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:672 src/include/gnunet_common.h:681
+#: src/include/gnunet_common.h:620 src/include/gnunet_common.h:629
 #, 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 "Loading block plugin `%s'\n"
+#~ msgstr "Cargando el módulo de bloques «%s»\n"
+
+#, fuzzy
+#~ msgid "Invalid value `%s'\n"
+#~ msgstr "Parámetro no válido «%s»\n"
+
+#, fuzzy
+#~ msgid "Found issuer for public key `%s'\n"
+#~ msgstr "Encontrados %u módulos de transporte: «%s»\n"
+
+#, fuzzy
+#~ msgid "No issuer for public key `%s'\n"
+#~ msgstr "No se han encontrado ficheros en «%s»\n"
+
+#~ msgid "Unsupported record type %d\n"
+#~ msgstr "Tipo de registro %d no soportado\n"
+
+#~ msgid "Invalid work requirement for NSE service. Exiting.\n"
+#~ msgstr "Requisitos de trabajo no válidos para el servicio NSE. Saliendo.\n"
+
+#, fuzzy
+#~ msgid "Failed to get slave counters!\n"
+#~ msgstr "¡Se produjo un fallo al obtener la clave de máquina!\n"
+
+#~ msgid "# DNS requests aborted (tunnel down)"
+#~ msgstr "# Peticiones DNS abortadas (túnel caído)"
+
+#, fuzzy
+#~ msgid ""
+#~ "Could not translate E[a%d] to MPI!\n"
+#~ "%s/%s\n"
+#~ msgstr "Imposible obtener IP para la interfaz '%s' usando '%s'.\n"
+
+#~ msgid "Job command file not given. Exiting\n"
+#~ msgstr "Fichero de configuración de trabajos no proporcionado. Saliendo\n"
+
+#~ msgid "Error while decoding key %u\n"
+#~ msgstr "Error decodificando clave %u\n"
+
+#~ msgid "Could not read friends list `%s'\n"
+#~ msgstr "No se pudo leer la lista de amigos «%s»\n"
+
+#~ msgid "Friends file `%s' is empty.\n"
+#~ msgstr "El archivo de amigos «%s» está vacío.\n"
+
+#~ msgid "Failed to read friends list from `%s': out of memory\n"
+#~ msgstr ""
+#~ "Se produjo un fallo al leer la lista de amigos de «%s»: no hay memoria "
+#~ "disponible\n"
+
+#~ msgid "Failed to read friends list from `%s'\n"
+#~ msgstr "Se produjo un fallo al leer la lista de amigos de «%s»\n"
+
+#~ msgid ""
+#~ "Syntax error in topology specification at offset %llu, skipping bytes.\n"
+#~ msgstr ""
+#~ "Error de sintaxis en la especificación de topología en el desplazamiento "
+#~ "%llu, omitiendo bytes.\n"
+
+#~ msgid ""
+#~ "Syntax error in topology specification at offset %llu, skipping bytes `"
+#~ "%s'.\n"
+#~ msgstr ""
+#~ "Error de sintaxis en la especificación de topología en el desplazamiento "
+#~ "%llu, omitiendo bytes «%s».\n"
+
+#~ msgid "ECC signature verification failed at %s:%d: %s\n"
+#~ msgstr "La verificación de firma ECC falló en %s:%d: %s\n"
+
+#~ msgid "No `%s' specified for service `%s' in configuration.\n"
+#~ msgstr ""
+#~ "Ningún «%s» especificado para el servicio «%s» en la configuración.\n"
+
+#~ msgid "Access denied to UID %d / GID %d\n"
+#~ msgstr "Acceso denegado al UID %d / GID %d\n"
+
+#~ msgid "# peers connected to mesh tunnels"
+#~ msgstr "# pares conectados a túneles mesh"
+
+#~ msgid "print IP address only after mesh tunnel has been created"
+#~ msgstr ""
+#~ "imprimir direcciones IP solamente después de haber creado el túnel mesh"
+
 #~ msgid "Failed to parse metadata about pseudonym from file `%s': %s\n"
 #~ msgstr ""
 #~ "Se produjo un fallo al procesar los metadatos del fichero «%s» acerca del "
@@ -7886,10 +8580,6 @@ msgstr "«%s» falló en el fichero «%s» en %s:%d con el error: %s\n"
 #~ msgstr ""
 #~ "Identificadores o URI demasiado largos para crear un bloque S (SBlock)"
 
-#, fuzzy
-#~ msgid "ECDSA signature verification failed at %s:%d: %s\n"
-#~ msgstr "La verificación de la firma RSA fallo en %s:%d: %s\n"
-
 #~ msgid "print names of local namespaces"
 #~ msgstr "imprime los nombres de los espacios de nombres locales"
 
@@ -8027,11 +8717,6 @@ msgstr "«%s» falló en el fichero «%s» en %s:%d con el error: %s\n"
 #~ msgstr ""
 #~ "Se produjo un fallo al transmitir una petición de apagado al cliente.\n"
 
-# Miguel: ¿Quizá fuese mejor «Se ha parado el servicio x»?
-# Esto también es aplicable a las siguientes traducciones.
-#~ msgid "Service `%s' has been stopped.\n"
-#~ msgstr "El servicio «%s» se ha parado.\n"
-
 #~ msgid "Service `%s' was already running.\n"
 #~ msgstr "El servicio «%s» aún estaba ejecutándose.\n"
 
@@ -8051,9 +8736,6 @@ msgstr "«%s» falló en el fichero «%s» en %s:%d con el error: %s\n"
 #~ msgid "Timeout communicating with ARM service.\n"
 #~ msgstr "Fin del tiempo de espera en la comunicación con el servicio ARM.\n"
 
-#~ msgid "Operation failed.\n"
-#~ msgstr "La operación ha fallado.\n"
-
 #~ msgid "Error in communication with PEERINFO service\n"
 #~ msgstr ""
 #~ "Error en la comunicación con el servicio de información de pares "
@@ -8131,12 +8813,6 @@ msgstr "«%s» falló en el fichero «%s» en %s:%d con el error: %s\n"
 #~ "Error de sintaxis en el fichero de la lista negra en el desplazamiento "
 #~ "%llu, omitiendo bytes.\n"
 
-#~ msgid ""
-#~ "Syntax error in blacklist file at offset %llu, skipping bytes `%s'.\n"
-#~ msgstr ""
-#~ "Error de sintaxis en el fichero de la lista negra en el desplazamiento "
-#~ "%llu, omitiendo bytes «%s».\n"
-
 #~ msgid "Found myself `%s' in blacklist (useless, ignored)\n"
 #~ msgstr "Me he encontrado «%s» en mi lista negra (inútil, ignorado)\n"
 
@@ -8409,9 +9085,6 @@ msgstr "«%s» falló en el fichero «%s» en %s:%d con el error: %s\n"
 #~ msgid "User `%s' is currently not in the room!\n"
 #~ msgstr "¡El usuario «%s» no está actualmente en la sala!\n"
 
-#~ msgid "Unknown command `%s'\n"
-#~ msgstr "Comando desconocido «%s»\n"
-
 #~ msgid ""
 #~ "Use `/join #roomname' to join a chat room. Joining a room will cause you "
 #~ "to leave the current room"
@@ -8453,9 +9126,6 @@ msgstr "«%s» falló en el fichero «%s» en %s:%d con el error: %s\n"
 #~ msgid "The `/anon' command is an alias for `/anonymous'"
 #~ msgstr "El comando «/anon» es un alias para «/anonymous»"
 
-#~ msgid "Use `/quit' to terminate gnunet-chat"
-#~ msgstr "Use «/quit» para finalizar «gnunet-chat»"
-
 #~ msgid "The `/leave' command is an alias for `/quit'"
 #~ msgstr "El comando «/leave» es un alias para «/quit»"
 
@@ -8464,9 +9134,6 @@ msgstr "«%s» falló en el fichero «%s» en %s:%d con el error: %s\n"
 #~ "Use «/names» para mostrar una lista de los miembros actuales de la sala "
 #~ "de chat"
 
-#~ msgid "Use `/help command' to get help for a specific command"
-#~ msgstr "Use «/help comando» para obtener ayuda sobre un comando específico"
-
 #~ msgid "Failed to join room `%s'\n"
 #~ msgstr "Se produjo un fallo al unirse a la sala «%s»\n"
 
@@ -8526,9 +9193,6 @@ msgstr "«%s» falló en el fichero «%s» en %s:%d con el error: %s\n"
 #~ msgstr ""
 #~ "El fichero de configuración debe especificar «%s» en la sección «%s»\n"
 
-#~ msgid "Failed to create namespace `%s'\n"
-#~ msgstr "Se produjo un fallo al crear el espacio de nombres «%s»\n"
-
 #~ msgid "Could not create namespace `%s'\n"
 #~ msgstr "No se pudo crear el espacio de nombres «%s»\n"
 
@@ -8964,9 +9628,6 @@ msgstr "«%s» falló en el fichero «%s» en %s:%d con el error: %s\n"
 #~ msgid "# peers disconnected due to external request"
 #~ msgstr "# pares desconectados debido a petición externa"
 
-#~ msgid "# fast reconnects failed"
-#~ msgstr "# reconexiones rápidas fallidas"
-
 #~ msgid "# peers disconnected due to timeout"
 #~ msgstr "# pares desconectados debido a expiración de plazo"
 
@@ -9095,9 +9756,6 @@ msgstr "«%s» falló en el fichero «%s» en %s:%d con el error: %s\n"
 #~ msgid "access (%s, X_OK) failed: %s\n"
 #~ msgstr "acceso (%s, X_OK) falló: %s\n"
 
-#~ msgid "stat (%s) failed: %s\n"
-#~ msgstr "stadísticas (%s) falló: %s\n"
-
 #~ msgid "Resolver returns `%s' for IP `%s'.\n"
 #~ msgstr "El resolvedor devuelve «%s» para la IP «%s».\n"
 
@@ -9308,10 +9966,6 @@ msgstr "«%s» falló en el fichero «%s» en %s:%d con el error: %s\n"
 #~ msgstr "# bytes recibidos por TCP"
 
 #, fuzzy
-#~ msgid "Connection: %X: %s failed at %s:%d: `%s'\n"
-#~ msgstr "'%s' falló en %s: %d con error: '%s'.\n"
-
-#, fuzzy
 #~ msgid "Misconfigured address to bind to in configuration!\n"
 #~ msgstr "¡Ninguna aplicación definida en la configuración!\n"
 
@@ -9683,10 +10337,6 @@ msgstr "«%s» falló en el fichero «%s» en %s:%d con el error: %s\n"
 #~ msgstr "Argumentos en la linea de comandos inválidos.\n"
 
 #, fuzzy
-#~ msgid "No interface specified, using default.\n"
-#~ msgstr "Ninguna interfaz especificada, usando la marcada por defecto\n"
-
-#, fuzzy
 #~ msgid "Configuration file `%s' must be a filename (but is a directory).\n"
 #~ msgstr ""
 #~ "El fichero de configuración '%s' no ha sido encontrado.  ¡Ejecute gnunet-"
@@ -10156,15 +10806,9 @@ msgstr "«%s» falló en el fichero «%s» en %s:%d con el error: %s\n"
 #~ msgid "\tRating (after update): %d\n"
 #~ msgstr "\tValoración (después de la actualización): %d\n"
 
-#~ msgid "Collection stopped.\n"
-#~ msgstr "Colección detenida.\n"
-
 #~ msgid "Failed to stop collection (not active?).\n"
 #~ msgstr "Falló al parar la recolección (¿no está activa?).\n"
 
-#~ msgid "Pseudonym `%s' deleted.\n"
-#~ msgstr "El pseudónimo '%s' fue borrado.\n"
-
 #~ msgid "Error deleting pseudonym `%s' (does not exist?).\n"
 #~ msgstr "Error borrando el pseudónimo '%s' (¿no existe?).\n"
 
@@ -10375,9 +11019,6 @@ msgstr "«%s» falló en el fichero «%s» en %s:%d con el error: %s\n"
 #~ msgid "File `%s' does not contain a pseudonym.\n"
 #~ msgstr "El fichero '%s' no contiene un pseudónimo.\n"
 
-#~ msgid "Format of pseudonym `%s' is invalid.\n"
-#~ msgstr "Formato del pseudónimo '%s' no es válido.\n"
-
 #, fuzzy
 #~ msgid "Format of file `%s' is invalid, trying to remove.\n"
 #~ msgstr "El formato del fichero '%s' no es válido.\n"
diff --git a/po/sv.po b/po/sv.po
index 9904e19c6..cb261cf2b 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: GNUnet 0.7.0b\n"
 "Report-Msgid-Bugs-To: gnunet-developers@mail.gnu.org\n"
-"POT-Creation-Date: 2013-09-16 15:01+0200\n"
+"POT-Creation-Date: 2013-11-05 02:07+0100\n"
 "PO-Revision-Date: 2006-01-21 17:16+0100\n"
 "Last-Translator: Daniel Nylander <po@danielnylander.se>\n"
 "Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n"
@@ -16,7 +16,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: src/arm/arm_api.c:335
+#: src/arm/arm_api.c:336
 msgid "Client was disconnected from arm service, trying to reconnect.\n"
 msgstr ""
 
@@ -30,415 +30,425 @@ msgstr ""
 msgid "Failed to remove configuration file %s\n"
 msgstr "Kunde inte spara konfigurationsfil \"%s\":"
 
-#: src/arm/gnunet-arm.c:169
+#: src/arm/gnunet-arm.c:170
 #, fuzzy, c-format
 msgid "Failed to remove servicehome directory %s\n"
 msgstr "Filformatsfel (inte en GNUnet-katalog?)\n"
 
-#: src/arm/gnunet-arm.c:214 src/testbed/gnunet-service-testbed_peers.c:971
+#: src/arm/gnunet-arm.c:216 src/testbed/gnunet-service-testbed_peers.c:1010
 msgid "Message was sent successfully"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:216
+#: src/arm/gnunet-arm.c:218
 #, fuzzy
 msgid "Misconfiguration (can not connect to the ARM service)"
 msgstr "Misslyckades att ansluta till gnunetd.\n"
 
-#: src/arm/gnunet-arm.c:218 src/testbed/gnunet-service-testbed_peers.c:975
+#: src/arm/gnunet-arm.c:220 src/testbed/gnunet-service-testbed_peers.c:1014
 #, fuzzy
 msgid "We disconnected from ARM before we could send a request"
 msgstr "# av anslutna parter"
 
-#: src/arm/gnunet-arm.c:220 src/testbed/gnunet-service-testbed_peers.c:977
+#: src/arm/gnunet-arm.c:222 src/testbed/gnunet-service-testbed_peers.c:1016
 msgid "ARM API is busy"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:222
+#: src/arm/gnunet-arm.c:224
 msgid "Request does not fit into a message"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:224 src/testbed/gnunet-service-testbed_peers.c:981
+#: src/arm/gnunet-arm.c:226 src/testbed/gnunet-service-testbed_peers.c:1020
 #, fuzzy
 msgid "Request timed out"
 msgstr "# sessionsnycklar accepterade"
 
-#: src/arm/gnunet-arm.c:226 src/testbed/gnunet-service-testbed_peers.c:983
+#: src/arm/gnunet-arm.c:228 src/testbed/gnunet-service-testbed_peers.c:1022
 #, fuzzy
 msgid "Unknown request status"
 msgstr "Okänd operation \"%s\"\n"
 
-#: src/arm/gnunet-arm.c:242 src/testbed/gnunet-service-testbed_peers.c:999
+#: src/arm/gnunet-arm.c:244 src/testbed/gnunet-service-testbed_peers.c:1038
 #, fuzzy, c-format
 msgid "%s is stopped"
 msgstr "# byte krypterade"
 
-#: src/arm/gnunet-arm.c:244 src/testbed/gnunet-service-testbed_peers.c:1001
+#: src/arm/gnunet-arm.c:246 src/testbed/gnunet-service-testbed_peers.c:1040
 #, fuzzy, c-format
 msgid "%s is starting"
 msgstr "\"%s\" startar\n"
 
-#: src/arm/gnunet-arm.c:246 src/testbed/gnunet-service-testbed_peers.c:1003
+#: src/arm/gnunet-arm.c:248 src/testbed/gnunet-service-testbed_peers.c:1042
 #, c-format
 msgid "%s is stopping"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:248 src/testbed/gnunet-service-testbed_peers.c:1005
+#: src/arm/gnunet-arm.c:250 src/testbed/gnunet-service-testbed_peers.c:1044
 #, fuzzy, c-format
 msgid "%s is starting already"
 msgstr "\"%s\" startar\n"
 
-#: src/arm/gnunet-arm.c:250 src/testbed/gnunet-service-testbed_peers.c:1007
+#: src/arm/gnunet-arm.c:252 src/testbed/gnunet-service-testbed_peers.c:1046
 #, c-format
 msgid "%s is stopping already"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:252 src/testbed/gnunet-service-testbed_peers.c:1009
+#: src/arm/gnunet-arm.c:254 src/testbed/gnunet-service-testbed_peers.c:1048
 #, c-format
 msgid "%s is started already"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:254 src/testbed/gnunet-service-testbed_peers.c:1011
+#: src/arm/gnunet-arm.c:256 src/testbed/gnunet-service-testbed_peers.c:1050
 #, c-format
 msgid "%s is stopped already"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:256 src/testbed/gnunet-service-testbed_peers.c:1013
+#: src/arm/gnunet-arm.c:258 src/testbed/gnunet-service-testbed_peers.c:1052
 #, fuzzy, c-format
 msgid "%s service is not known to ARM"
 msgstr "\"%s\" är inte en fil.\n"
 
-#: src/arm/gnunet-arm.c:258 src/testbed/gnunet-service-testbed_peers.c:1015
+#: src/arm/gnunet-arm.c:260 src/testbed/gnunet-service-testbed_peers.c:1054
 #, fuzzy, c-format
 msgid "%s service failed to start"
 msgstr "Misslyckades att starta samling.\n"
 
-#: src/arm/gnunet-arm.c:260
+#: src/arm/gnunet-arm.c:262
 #, c-format
 msgid "%s service cannot be started because ARM is shutting down"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:262 src/testbed/gnunet-service-testbed_peers.c:1019
+#: src/arm/gnunet-arm.c:264 src/testbed/gnunet-service-testbed_peers.c:1058
 #, c-format
 msgid "%.s Unknown result code."
 msgstr ""
 
-#: src/arm/gnunet-arm.c:295
+#: src/arm/gnunet-arm.c:297
 msgid "Fatal error initializing ARM API.\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:324 src/arm/gnunet-arm.c:333
+#: src/arm/gnunet-arm.c:326 src/arm/gnunet-arm.c:335
 #, fuzzy, c-format
 msgid "Failed to start the ARM service: %s\n"
 msgstr "Misslyckades att starta samling.\n"
 
-#: src/arm/gnunet-arm.c:367
+#: src/arm/gnunet-arm.c:369
 #, fuzzy, c-format
 msgid "Failed to send a stop request to the ARM service: %s\n"
 msgstr "Misslyckades att ansluta till gnunetd.\n"
 
-#: src/arm/gnunet-arm.c:377
+#: src/arm/gnunet-arm.c:379
 #, 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:418
+#: src/arm/gnunet-arm.c:420
 #, fuzzy, c-format
 msgid "Failed to send a request to start the `%s' service: %%s\n"
 msgstr "Misslyckades att ansluta till gnunetd.\n"
 
-#: src/arm/gnunet-arm.c:427
+#: src/arm/gnunet-arm.c:429
 #, fuzzy, c-format
 msgid "Failed to start the `%s' service: %s\n"
 msgstr "Misslyckades att starta samling.\n"
 
-#: src/arm/gnunet-arm.c:463
+#: src/arm/gnunet-arm.c:465
 #, 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:474
+#: src/arm/gnunet-arm.c:476
 #, fuzzy, c-format
 msgid "Failed to kill the `%s' service: %s\n"
 msgstr "Fel vid %s:%d.\n"
 
-#: src/arm/gnunet-arm.c:510
+#: src/arm/gnunet-arm.c:512
 #, fuzzy, c-format
 msgid "Failed to request a list of services: %s\n"
 msgstr "Misslyckades att starta samling.\n"
 
-#: src/arm/gnunet-arm.c:517
+#: src/arm/gnunet-arm.c:519
 #, fuzzy
 msgid "Error communicating with ARM. ARM not running?\n"
 msgstr "Skriv ut information om GNUnets motparter."
 
-#: src/arm/gnunet-arm.c:521
+#: src/arm/gnunet-arm.c:523
 #, fuzzy
 msgid "Running services:\n"
 msgstr "Startade samling \"%s\".\n"
 
-#: src/arm/gnunet-arm.c:603
+#: src/arm/gnunet-arm.c:605
 #, c-format
 msgid "Now only monitoring, press CTRL-C to stop.\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:634
+#: src/arm/gnunet-arm.c:636
 #, c-format
 msgid "Stopped %s.\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:637
+#: src/arm/gnunet-arm.c:639
 #, fuzzy, c-format
 msgid "Starting %s...\n"
 msgstr "Startade samling \"%s\".\n"
 
-#: src/arm/gnunet-arm.c:640
+#: src/arm/gnunet-arm.c:642
 #, c-format
 msgid "Stopping %s...\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:651
+#: src/arm/gnunet-arm.c:653
 #, fuzzy, c-format
 msgid "Unknown status %u for service %s.\n"
 msgstr "Okänd operation \"%s\"\n"
 
-#: src/arm/gnunet-arm.c:715
+#: src/arm/gnunet-arm.c:717
 msgid "stop all GNUnet services"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:717
+#: src/arm/gnunet-arm.c:719
 msgid "start a particular service"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:719
+#: src/arm/gnunet-arm.c:721
 msgid "stop a particular service"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:721
+#: src/arm/gnunet-arm.c:723
 msgid "start all GNUnet default services"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:724
+#: src/arm/gnunet-arm.c:726
 msgid "stop and start all GNUnet default services"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:727
+#: src/arm/gnunet-arm.c:729
 msgid "delete config file and directory on exit"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:730
+#: src/arm/gnunet-arm.c:732
 msgid "monitor ARM activities"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:732
+#: src/arm/gnunet-arm.c:734
 msgid "don't print status messages"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:735
+#: src/arm/gnunet-arm.c:737
 msgid "timeout in MSECS milliseconds for completing current operation"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:737
+#: src/arm/gnunet-arm.c:739
 #, fuzzy
 msgid "list currently running services"
 msgstr "Startade samling \"%s\".\n"
 
-#: src/arm/gnunet-arm.c:739
+#: src/arm/gnunet-arm.c:741
 msgid "don't let gnunet-service-arm inherit standard output"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:741
+#: src/arm/gnunet-arm.c:743
 msgid "don't let gnunet-service-arm inherit standard error"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:752
+#: src/arm/gnunet-arm.c:754
 msgid "Control services and the Automated Restart Manager (ARM)"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:257
+#: src/arm/gnunet-service-arm.c:268
 #, fuzzy
 msgid "Could not send status result to client\n"
 msgstr "Kunde inte skicka begäran till gnunetd.\n"
 
-#: src/arm/gnunet-service-arm.c:291
+#: src/arm/gnunet-service-arm.c:304
 #, fuzzy
 msgid "Could not send list result to client\n"
 msgstr "Kunde inte skicka begäran till gnunetd.\n"
 
-#: src/arm/gnunet-service-arm.c:500
+#: src/arm/gnunet-service-arm.c:519
 #, fuzzy, c-format
 msgid "Failed to start service `%s'\n"
 msgstr "Misslyckades att starta samling.\n"
 
-#: src/arm/gnunet-service-arm.c:507
+#: src/arm/gnunet-service-arm.c:526
 #, fuzzy, c-format
 msgid "Starting service `%s'\n"
 msgstr "Startade samling \"%s\".\n"
 
-#: src/arm/gnunet-service-arm.c:602
+#: src/arm/gnunet-service-arm.c:625
 #, fuzzy, c-format
 msgid "Unable to create socket for service `%s': %s\n"
 msgstr "Kunde inte skapa användarkonto:"
 
-#: src/arm/gnunet-service-arm.c:624
+#: src/arm/gnunet-service-arm.c:647
 #, c-format
 msgid "Unable to bind listening socket for service `%s' to address `%s': %s\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:638
+#: src/arm/gnunet-service-arm.c:676
 #, c-format
 msgid "ARM now monitors connections to service `%s' at `%s'\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:771
+#: src/arm/gnunet-service-arm.c:809
 #, fuzzy, c-format
 msgid "Preparing to stop `%s'\n"
 msgstr "Startade samling \"%s\".\n"
 
-#: src/arm/gnunet-service-arm.c:1022
+#: src/arm/gnunet-service-arm.c:1070
 #, fuzzy, c-format
 msgid "Restarting service `%s'.\n"
 msgstr "Startade samling \"%s\".\n"
 
-#: src/arm/gnunet-service-arm.c:1115
+#: src/arm/gnunet-service-arm.c:1163
 msgid "exit"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:1120
+#: src/arm/gnunet-service-arm.c:1168
 msgid "signal"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:1125
+#: src/arm/gnunet-service-arm.c:1173
 #, fuzzy
 msgid "unknown"
 msgstr "Okänt fel"
 
-#: src/arm/gnunet-service-arm.c:1131
+#: src/arm/gnunet-service-arm.c:1179
 #, fuzzy, c-format
 msgid "Service `%s' took %s to terminate\n"
 msgstr "Tjänst borttagen.\n"
 
-#: src/arm/gnunet-service-arm.c:1153
+#: src/arm/gnunet-service-arm.c:1201
 #, c-format
 msgid "Service `%s' terminated normally, will restart at any time\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:1168
+#: src/arm/gnunet-service-arm.c:1216
 #, c-format
 msgid "Service `%s' terminated with status %s/%d, will restart in %s\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:1386
+#: src/arm/gnunet-service-arm.c:1463
 #, fuzzy, c-format
 msgid "Starting default services `%s'\n"
 msgstr "Startade samling \"%s\".\n"
 
-#: src/arm/gnunet-service-arm.c:1397
+#: src/arm/gnunet-service-arm.c:1474
 #, c-format
 msgid "Default service `%s' not configured correctly!\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:1411
+#: src/arm/gnunet-service-arm.c:1488
 msgid ""
 "No default services configured, GNUnet will not really start right now.\n"
 msgstr ""
 
-#: src/arm/mockup-service.c:46
+#: src/arm/mockup-service.c:41
 msgid "Initiating shutdown as requested by client.\n"
 msgstr ""
 
-#: src/ats/ats_api_performance.c:475
+#: src/ats/ats_api_performance.c:468
 #, fuzzy, c-format
 msgid "Received %s message\n"
 msgstr "mottog ogiltigt \"%s\" meddelande\n"
 
-#: src/ats/ats_api_performance.c:518
+#: src/ats/ats_api_performance.c:511
 #, fuzzy, c-format
 msgid "Received last message for %s \n"
 msgstr "Mottog ogiltigt \"%s\" meddelande från \"%s\".\n"
 
-#: src/ats/gnunet-service-ats_addresses.c:1607
-#: src/ats/gnunet-service-ats_addresses.c:1641
+#: src/ats/gnunet-service-ats_addresses.c:1475
+#: src/ats/gnunet-service-ats_addresses.c:1519
 #, c-format
 msgid ""
 "Could not load quota for network `%s':  `%s', assigning default bandwidth "
 "%llu\n"
 msgstr ""
 
-#: src/ats/gnunet-service-ats_addresses.c:1613
+#: src/ats/gnunet-service-ats_addresses.c:1482
 #, c-format
 msgid "Outbound quota configure for network `%s' is %llu\n"
 msgstr ""
 
-#: src/ats/gnunet-service-ats_addresses.c:1620
+#: src/ats/gnunet-service-ats_addresses.c:1490
 #, c-format
 msgid ""
 "No outbound quota configured for network `%s', assigning default bandwidth "
 "%llu\n"
 msgstr ""
 
-#: src/ats/gnunet-service-ats_addresses.c:1647
+#: src/ats/gnunet-service-ats_addresses.c:1526
 #, c-format
 msgid "Inbound quota configured for network `%s' is %llu\n"
 msgstr ""
 
-#: src/ats/gnunet-service-ats_addresses.c:1654
+#: src/ats/gnunet-service-ats_addresses.c:1534
 #, c-format
 msgid ""
 "No outbound quota configure for network `%s', assigning default bandwidth "
 "%llu\n"
 msgstr ""
 
-#: src/ats/gnunet-service-ats_addresses.c:1888
+#: src/ats/gnunet-service-ats_addresses.c:1700
+#, c-format
+msgid "Initializing solver `%s '`%s'\n"
+msgstr ""
+
+#: src/ats/gnunet-service-ats_addresses.c:1703
+#, fuzzy, c-format
+msgid "Failed to initialize solver `%s'!\n"
+msgstr "Kunde inte initiera SQLite.\n"
+
+#: src/ats/gnunet-service-ats_addresses.c:1726
 #, fuzzy
 msgid "Failed to initialize solver!\n"
 msgstr "Kunde inte initiera SQLite.\n"
 
-#: src/ats/gnunet-service-ats-solver_mlp.c:849
+#: src/ats/libgnunet_plugin_ats_mlp.c:868
 msgid "Problem size too large, cannot allocate memory!\n"
 msgstr ""
 
-#: src/ats/gnunet-service-ats-solver_mlp.c:1193
+#: src/ats/libgnunet_plugin_ats_mlp.c:1239
 #, fuzzy, c-format
 msgid "Adding address for peer `%s' multiple times\n"
 msgstr "Motpart \"%s\" med pålitlighet %8u och adress \"%s\"\n"
 
-#: src/ats/gnunet-service-ats-solver_mlp.c:1238
+#: src/ats/libgnunet_plugin_ats_mlp.c:1286
 #, c-format
 msgid "Updating address property `%s' for peer `%s' %p not added before\n"
 msgstr ""
 
-#: src/ats/gnunet-service-ats-solver_mlp.c:1956
+#: src/ats/libgnunet_plugin_ats_mlp.c:2010
 #, c-format
 msgid ""
 "Adjusting inconsistent outbound quota configuration for network `%s', is "
 "%llu must be at least %llu\n"
 msgstr ""
 
-#: src/ats/gnunet-service-ats-solver_mlp.c:1964
+#: src/ats/libgnunet_plugin_ats_mlp.c:2018
 #, c-format
 msgid ""
 "Adjusting inconsistent inbound quota configuration for network `%s', is %llu "
 "must be at least %llu\n"
 msgstr ""
 
-#: src/ats/gnunet-service-ats-solver_mlp.c:1974
+#: src/ats/libgnunet_plugin_ats_mlp.c:2028
 #, c-format
 msgid ""
 "Adjusting outbound quota configuration for network `%s'from %llu to %.0f\n"
 msgstr ""
 
-#: src/ats/gnunet-service-ats-solver_mlp.c:1982
+#: src/ats/libgnunet_plugin_ats_mlp.c:2036
 #, c-format
 msgid ""
 "Adjusting inbound quota configuration for network `%s' from %llu to %.0f\n"
 msgstr ""
 
-#: src/ats/gnunet-service-ats-solver_mlp.c:1993
+#: src/ats/libgnunet_plugin_ats_mlp.c:2047
 #, c-format
 msgid "Using default quota configuration for network `%s' (in/out) %llu/%llu\n"
 msgstr ""
 
-#: src/ats/gnunet-service-ats-solver_proportional.c:1296
+#: src/ats/libgnunet_plugin_ats_proportional.c:1438
 #, fuzzy, c-format
 msgid "Invalid network type `%u' `%s': Disconnect!\n"
 msgstr "Kan inte öppna konfigurationsfil \"%s\".\n"
@@ -465,161 +475,521 @@ msgstr "Motpart \"%s\" med pålitlighet %8u och adress \"%s\"\n"
 msgid "Quota for network `%11s' (in/out): %10s / %10s\n"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:347 src/namestore/gnunet-namestore.c:438
-#: src/transport/gnunet-transport.c:812
+#: src/ats-tool/gnunet-ats.c:347 src/namestore/gnunet-namestore.c:520
+#: src/transport/gnunet-transport.c:807
 #, fuzzy, c-format
 msgid "Service `%s' is not running\n"
 msgstr "\"%s\" är inte en fil.\n"
 
-#: src/ats-tool/gnunet-ats.c:357 src/transport/gnunet-transport.c:819
+#: src/ats-tool/gnunet-ats.c:359 src/transport/gnunet-transport.c:816
 #, fuzzy, c-format
 msgid "Failed to parse peer identity `%s'\n"
 msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 
-#: src/ats-tool/gnunet-ats.c:365
+#: src/ats-tool/gnunet-ats.c:367
 #, c-format
 msgid "Please select one operation : %s or %s or %s or %s or %s\n"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:381 src/ats-tool/gnunet-ats.c:400
-#: src/ats-tool/gnunet-ats.c:417 src/ats-tool/gnunet-ats.c:455
+#: src/ats-tool/gnunet-ats.c:383 src/ats-tool/gnunet-ats.c:402
+#: src/ats-tool/gnunet-ats.c:419 src/ats-tool/gnunet-ats.c:457
 #, fuzzy, c-format
 msgid "Cannot connect to ATS service, exiting...\n"
 msgstr "Misslyckades att initiera tjänsten \"%s\".\n"
 
-#: src/ats-tool/gnunet-ats.c:390 src/ats-tool/gnunet-ats.c:407
+#: src/ats-tool/gnunet-ats.c:392 src/ats-tool/gnunet-ats.c:409
 #, fuzzy, c-format
 msgid "Cannot issue request to ATS service, exiting...\n"
 msgstr "Misslyckades att initiera tjänsten \"%s\".\n"
 
-#: src/ats-tool/gnunet-ats.c:425
+#: src/ats-tool/gnunet-ats.c:427
 #, fuzzy, c-format
 msgid "No preference type given!\n"
 msgstr "Skriv ut information om GNUnets motparter."
 
-#: src/ats-tool/gnunet-ats.c:430
+#: src/ats-tool/gnunet-ats.c:432
 #, c-format
 msgid "No peer given!\n"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:448
+#: src/ats-tool/gnunet-ats.c:450
 msgid "Valid type required\n"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:506
+#: src/ats-tool/gnunet-ats.c:508
 msgid "get list of active addresses currently used"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:509
+#: src/ats-tool/gnunet-ats.c:511
 msgid "get list of all active addresses"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:512
+#: src/ats-tool/gnunet-ats.c:514
 #, fuzzy
 msgid "do not resolve IP addresses to hostnames"
 msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 
-#: src/ats-tool/gnunet-ats.c:515
+#: src/ats-tool/gnunet-ats.c:517
 msgid "monitor mode"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:518
+#: src/ats-tool/gnunet-ats.c:520
 #, fuzzy
 msgid "set preference for the given peer"
 msgstr "Skriv ut information om GNUnets motparter."
 
-#: src/ats-tool/gnunet-ats.c:521
+#: src/ats-tool/gnunet-ats.c:523
 msgid "print all configured quotas"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:524
+#: src/ats-tool/gnunet-ats.c:526
 msgid "peer id"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:527
+#: src/ats-tool/gnunet-ats.c:529
 msgid "preference type to set: latency | bandwidth"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:530
+#: src/ats-tool/gnunet-ats.c:532
 msgid "preference value"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:533
+#: src/ats-tool/gnunet-ats.c:535
 msgid "verbose output (include ATS address properties)"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:542
+#: src/ats-tool/gnunet-ats.c:544
 #, fuzzy
 msgid "Print information about ATS state"
 msgstr "Skriv ut information om GNUnets motparter."
 
-#: src/block/block.c:105
-#, fuzzy, c-format
-msgid "Loading block plugin `%s'\n"
-msgstr "Testar transport(er) %s\n"
-
-#: src/consensus/gnunet-consensus-profiler.c:393
+#: src/consensus/gnunet-consensus-profiler.c:394
 #, fuzzy
 msgid "number of peers in consensus"
 msgstr "antal iterationer"
 
-#: src/consensus/gnunet-consensus-profiler.c:396
+#: src/consensus/gnunet-consensus-profiler.c:397
 msgid "how many peers receive one value?"
 msgstr ""
 
-#: src/consensus/gnunet-consensus-profiler.c:399
-#: src/set/gnunet-set-profiler.c:287 src/set/gnunet-set-profiler.c:290
-#: src/set/gnunet-set-profiler.c:293
+#: src/consensus/gnunet-consensus-profiler.c:400
+#: src/set/gnunet-set-profiler.c:286 src/set/gnunet-set-profiler.c:289
+#: src/set/gnunet-set-profiler.c:292
 #, fuzzy
 msgid "number of values"
 msgstr "antal iterationer"
 
-#: src/consensus/gnunet-consensus-profiler.c:402
+#: src/consensus/gnunet-consensus-profiler.c:403
 #, fuzzy
 msgid "consensus timeout"
 msgstr "# sessionsnycklar accepterade"
 
-#: src/consensus/gnunet-consensus-profiler.c:405
+#: src/consensus/gnunet-consensus-profiler.c:406
 msgid "be more verbose (print received values)"
 msgstr ""
 
-#: src/core/core_api.c:752
+#: src/conversation/conversation_api.c:333
+#: src/conversation/conversation_api.c:959
+#, fuzzy, c-format
+msgid "Internal error %d\n"
+msgstr "Okänt fel.\n"
+
+#: src/conversation/gnunet-conversation.c:186
+#, c-format
+msgid ""
+"Incoming call from `%s'.\n"
+"Please /accept or /cancel the call.\n"
+msgstr ""
+
+#: src/conversation/gnunet-conversation.c:206
+#: src/conversation/gnunet-conversation.c:315
+#, c-format
+msgid "Call terminated: %s\n"
+msgstr ""
+
+#: src/conversation/gnunet-conversation.c:226
+#, c-format
+msgid "Ego `%s' no longer available, phone is now down.\n"
+msgstr ""
+
+#: src/conversation/gnunet-conversation.c:239
+#, fuzzy
+msgid "Failed to setup phone (internal error)\n"
+msgstr "Kunde inte skapa värdnyckel!\n"
+
+#: src/conversation/gnunet-conversation.c:252
+#, c-format
+msgid "Phone active on line %u\n"
+msgstr ""
+
+#: src/conversation/gnunet-conversation.c:284
+msgid "Resolved address. Now ringing other party.\n"
+msgstr ""
+
+#: src/conversation/gnunet-conversation.c:290
+#, fuzzy, c-format
+msgid "Connection established to `%s': %s\n"
+msgstr "Misslyckades att leverera \"%s\" meddelande.\n"
+
+#: src/conversation/gnunet-conversation.c:298
+#, fuzzy, c-format
+msgid "Failed to resolve `%s'\n"
+msgstr "Misslyckades att leverera \"%s\" meddelande.\n"
+
+#: src/conversation/gnunet-conversation.c:307
+msgid "Line busy\n"
+msgstr ""
+
+#: src/conversation/gnunet-conversation.c:385
+#, fuzzy, c-format
+msgid "Unknown command `%s'\n"
+msgstr "Okänd operation \"%s\"\n"
+
+#: src/conversation/gnunet-conversation.c:401
+#: src/conversation/gnunet-conversation.c:409
+#, c-format
+msgid "Ego `%s' not available\n"
+msgstr ""
+
+#: src/conversation/gnunet-conversation.c:417
+#, c-format
+msgid "Hanging up on incoming phone call from `%s' to call `%s'.\n"
+msgstr ""
+
+#: src/conversation/gnunet-conversation.c:424
+#: src/conversation/gnunet-conversation.c:438
+#, c-format
+msgid "You are already in a conversation with `%s', refusing to call `%s'.\n"
+msgstr ""
+
+#: src/conversation/gnunet-conversation.c:431
+#, fuzzy, c-format
+msgid "Aborting call to `%s'\n"
+msgstr "Fel vid skapandet av användare"
+
+#: src/conversation/gnunet-conversation.c:478
+msgid "There is no incoming call to be accepted!\n"
+msgstr ""
+
+#: src/conversation/gnunet-conversation.c:485
+#: src/conversation/gnunet-conversation.c:496
+#, fuzzy, c-format
+msgid "You are already in a conversation with `%s'.\n"
+msgstr "Kunde inte tolka konfigurationsfil \"%s\".\n"
+
+#: src/conversation/gnunet-conversation.c:491
+#, c-format
+msgid "You are trying to call `%s', cannot accept incoming calls right now.\n"
+msgstr ""
+
+#: src/conversation/gnunet-conversation.c:521
+msgid "We currently do not have an address.\n"
+msgstr ""
+
+#: src/conversation/gnunet-conversation.c:542
+#, c-format
+msgid "We are currently trying to locate the private key for the ego `%s'.\n"
+msgstr ""
+
+#: src/conversation/gnunet-conversation.c:547
+#, c-format
+msgid "We are listening for incoming calls for ego `%s' on line %u.\n"
+msgstr ""
+
+#: src/conversation/gnunet-conversation.c:553
+#, c-format
+msgid "The phone is rining. `%s' is trying to call us.\n"
+msgstr ""
+
+#: src/conversation/gnunet-conversation.c:559
+#, c-format
+msgid "You are having a conversation with `%s'.\n"
+msgstr ""
+
+#: src/conversation/gnunet-conversation.c:564
+#, c-format
+msgid "We are trying to find the network address to call `%s'.\n"
+msgstr ""
+
+#: src/conversation/gnunet-conversation.c:569
+#, c-format
+msgid "We are calling `%s', his phone should be ringing.\n"
+msgstr ""
+
+#: src/conversation/gnunet-conversation.c:574
+msgid ""
+"We had an internal error setting up our phone line. You can still make "
+"calls.\n"
+msgstr ""
+
+#: src/conversation/gnunet-conversation.c:595
+msgid "There is no call that could be cancelled right now.\n"
+msgstr ""
+
+#: src/conversation/gnunet-conversation.c:626
+msgid "Use `/address' to find out which address this phone should have in GNS"
+msgstr ""
+
+#: src/conversation/gnunet-conversation.c:628
+msgid "Use `/call USER.gnu' to call USER"
+msgstr ""
+
+#: src/conversation/gnunet-conversation.c:630
+msgid "Use `/accept MESSAGE' to accept an incoming call"
+msgstr ""
+
+#: src/conversation/gnunet-conversation.c:632
+msgid "Use `/cancel MESSAGE' to reject or terminate a call"
+msgstr ""
+
+#: src/conversation/gnunet-conversation.c:634
+msgid "Use `/status' to print status information"
+msgstr ""
+
+#: src/conversation/gnunet-conversation.c:636
+#, fuzzy
+msgid "Use `/quit' to terminate gnunet-conversation"
+msgstr "tillåter klienter att fastställa gnunetds konfiguration"
+
+#: src/conversation/gnunet-conversation.c:638
+msgid "Use `/help command' to get help for a specific command"
+msgstr ""
+
+#: src/conversation/gnunet-conversation.c:793
+#, fuzzy, c-format
+msgid "Name of our ego changed to `%s'\n"
+msgstr "Kunde inte skapa namnrymd \"%s\" (existerar?).\n"
+
+#: src/conversation/gnunet-conversation.c:806
+#, fuzzy, c-format
+msgid "Our ego `%s' was deleted!\n"
+msgstr "Pseudonym \"%s\" togs bort.\n"
+
+#: src/conversation/gnunet-conversation.c:841
+#, fuzzy
+msgid "You must specify the NAME of an ego to use\n"
+msgstr "Du måste ange en lista av filer att lägga in.\n"
+
+#: src/conversation/gnunet-conversation.c:867
+msgid "sets the NAME of the ego to use for the phone (and name resolution)"
+msgstr ""
+
+#: src/conversation/gnunet-conversation.c:870
+msgid "sets the LINE to use for the phone"
+msgstr ""
+
+#: src/conversation/gnunet-conversation.c:885
+msgid "Enables having a conversation with other GNUnet users."
+msgstr ""
+
+#: src/conversation/gnunet-conversation-test.c:121
+#, c-format
+msgid ""
+"\n"
+"End of transmission.  Have a GNU day.\n"
+msgstr ""
+
+#: src/conversation/gnunet-conversation-test.c:149
+#, c-format
+msgid ""
+"\n"
+"We are now playing your recording back.  If you can hear it, your audio "
+"settings are working..."
+msgstr ""
+
+#: src/conversation/gnunet-conversation-test.c:215
+#, c-format
+msgid ""
+"We will now be recording you for %s. After that time, the recording will be "
+"played back to you..."
+msgstr ""
+
+#: src/conversation/gnunet-conversation-test.c:248
+#: src/integration-tests/connection_watchdog.c:1114
+#: src/multicast/gnunet-multicast.c:70 src/revocation/gnunet-revocation.c:510
+#: src/template/gnunet-template.c:70
+#, fuzzy
+msgid "help text"
+msgstr "hjälptext för -t"
+
+#: src/conversation/gnunet-helper-audio-playback.c:137
+#, fuzzy, c-format
+msgid "pa_stream_write() failed: %s\n"
+msgstr "\"%s\" %s misslyckades: %s\n"
+
+#: src/conversation/gnunet-helper-audio-playback.c:186
+msgid "gnunet-helper-audio-playback - Got signal, exiting\n"
+msgstr ""
+
+#: src/conversation/gnunet-helper-audio-playback.c:211
+#: src/conversation/gnunet-helper-audio-record.c:363
+#, fuzzy
+msgid "Connection established.\n"
+msgstr "Samling stoppad.\n"
+
+#: src/conversation/gnunet-helper-audio-playback.c:216
+#: src/conversation/gnunet-helper-audio-record.c:368
+#, fuzzy, c-format
+msgid "pa_stream_new() failed: %s\n"
+msgstr "\"%s\" %s misslyckades: %s\n"
+
+#: src/conversation/gnunet-helper-audio-playback.c:230
+#, c-format
+msgid "pa_stream_connect_playback() failed: %s\n"
+msgstr ""
+
+#: src/conversation/gnunet-helper-audio-playback.c:243
+#: src/conversation/gnunet-helper-audio-record.c:394
+#, fuzzy, c-format
+msgid "Connection failure: %s\n"
+msgstr " Anslutning misslyckades (fel?)\n"
+
+#: src/conversation/gnunet-helper-audio-playback.c:264
+#: src/conversation/gnunet-helper-audio-record.c:417
+msgid "Wrong Spec\n"
+msgstr ""
+
+#: src/conversation/gnunet-helper-audio-playback.c:270
+#: src/conversation/gnunet-helper-audio-record.c:423
+#, fuzzy
+msgid "pa_mainloop_new() failed.\n"
+msgstr "\"%s\" misslyckades vid %s:%d med fel: \"%s\".\n"
+
+#: src/conversation/gnunet-helper-audio-playback.c:284
+#: src/conversation/gnunet-helper-audio-record.c:438
+#, fuzzy
+msgid "pa_context_new() failed.\n"
+msgstr "\"%s\" misslyckades vid %s:%d med fel: \"%s\".\n"
+
+#: src/conversation/gnunet-helper-audio-playback.c:291
+#: src/conversation/gnunet-helper-audio-record.c:444
+#, fuzzy, c-format
+msgid "pa_context_connect() failed: %s\n"
+msgstr "# av anslutna parter"
+
+#: src/conversation/gnunet-helper-audio-playback.c:297
+#: src/conversation/gnunet-helper-audio-record.c:450
+#, fuzzy
+msgid "pa_mainloop_run() failed.\n"
+msgstr "\"%s\" misslyckades vid %s:%d med fel: \"%s\".\n"
+
+#: src/conversation/gnunet-helper-audio-playback.c:366
+#, c-format
+msgid "Read error from STDIN: %s\n"
+msgstr ""
+
+#: src/conversation/gnunet-helper-audio-record.c:237
+#, fuzzy, c-format
+msgid "pa_stream_peek() failed: %s\n"
+msgstr "\"%s\" %s misslyckades: %s\n"
+
+#: src/conversation/gnunet-helper-audio-record.c:275
+msgid "Got signal, exiting.\n"
+msgstr ""
+
+#: src/conversation/gnunet-helper-audio-record.c:301
+#, fuzzy
+msgid "Stream successfully created.\n"
+msgstr "Åtkomst nekad för \"%s\" vid %s:%d.\n"
+
+#: src/conversation/gnunet-helper-audio-record.c:306
+#, fuzzy, c-format
+msgid "pa_stream_get_buffer_attr() failed: %s\n"
+msgstr "\"%s\" %s misslyckades: %s\n"
+
+#: src/conversation/gnunet-helper-audio-record.c:314
+#, c-format
+msgid "Buffer metrics: maxlength=%u, fragsize=%u\n"
+msgstr ""
+
+#: src/conversation/gnunet-helper-audio-record.c:318
+#, c-format
+msgid "Using sample spec '%s', channel map '%s'.\n"
+msgstr ""
+
+#: src/conversation/gnunet-helper-audio-record.c:325
+#, fuzzy, c-format
+msgid "Connected to device %s (%u, %ssuspended).\n"
+msgstr "\"%s\" ansluten till \"%s\".\n"
+
+#: src/conversation/gnunet-helper-audio-record.c:334
+#, c-format
+msgid "Stream error: %s\n"
+msgstr ""
+
+#: src/conversation/gnunet-helper-audio-record.c:381
+#, fuzzy, c-format
+msgid "pa_stream_connect_record() failed: %s\n"
+msgstr ""
+"\n"
+"Fel vid uppladdning av fil: %s\n"
+
+#: src/conversation/gnunet-service-conversation.c:612
+msgid "Mesh audio channel not ready; audio data dropped\n"
+msgstr ""
+
+#: src/conversation/gnunet-service-conversation.c:700
+#, c-format
+msgid "No available phone for incoming call on line %u, sending BUSY signal\n"
+msgstr ""
+
+#: src/conversation/gnunet-service-conversation.c:1054
+#, c-format
+msgid "Received incoming tunnel on port %u\n"
+msgstr ""
+
+#: src/conversation/microphone.c:121
+#, fuzzy
+msgid "Could not start record audio helper\n"
+msgstr "Kunde inte komma åt namnrymdsinformation.\n"
+
+#: src/conversation/plugin_gnsrecord_conversation.c:116
+#, fuzzy, c-format
+msgid "Unable to parse PHONE record `%s'\n"
+msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
+
+#: src/conversation/speaker.c:75
+#, fuzzy
+msgid "Could not start playback audio helper.\n"
+msgstr "Kunde inte slå upp \"%s\": %s\n"
+
+#: src/core/core_api.c:761
 msgid "Client was disconnected from core service, trying to reconnect.\n"
 msgstr ""
 
-#: src/core/gnunet-core.c:83
+#: src/core/gnunet-core.c:80
 #, fuzzy, c-format
 msgid "Peer `%s'\n"
 msgstr "Jag är ändpunkt \"%s\".\n"
 
-#: src/core/gnunet-core.c:112 src/core/gnunet-core.c:140
-#: src/transport/gnunet-transport.c:606 src/transport/gnunet-transport.c:630
+#: src/core/gnunet-core.c:110 src/core/gnunet-core.c:138
+#: src/transport/gnunet-transport.c:601 src/transport/gnunet-transport.c:625
 #, c-format
 msgid "%24s: %-17s %4s   (%u connections in total)\n"
 msgstr ""
 
-#: src/core/gnunet-core.c:114 src/transport/gnunet-transport.c:608
+#: src/core/gnunet-core.c:112 src/transport/gnunet-transport.c:603
 #, fuzzy
 msgid "Connected to"
 msgstr "\"%s\" ansluten till \"%s\".\n"
 
-#: src/core/gnunet-core.c:142 src/transport/gnunet-transport.c:632
+#: src/core/gnunet-core.c:140 src/transport/gnunet-transport.c:627
 #, fuzzy
 msgid "Disconnected from"
 msgstr "\"%s\" ansluten till \"%s\".\n"
 
-#: src/core/gnunet-core.c:166 src/mesh/gnunet-mesh.c:170
-#: src/peerinfo-tool/gnunet-peerinfo.c:653
+#: src/core/gnunet-core.c:164 src/mesh/gnunet-mesh.c:174
+#: src/peerinfo-tool/gnunet-peerinfo.c:645
 #, fuzzy, c-format
 msgid "Invalid command line argument `%s'\n"
 msgstr "Ogiltiga kommandoradsargument:\n"
 
-#: src/core/gnunet-core.c:203 src/transport/gnunet-transport.c:1004
+#: src/core/gnunet-core.c:201 src/transport/gnunet-transport.c:999
 #, fuzzy
 msgid "provide information about all current connections (continuously)"
 msgstr "Skriv ut information om GNUnets motparter."
 
-#: src/core/gnunet-core.c:214
+#: src/core/gnunet-core.c:212
 #, fuzzy
 msgid "Print information about connected peers."
 msgstr "Skriv ut information om GNUnets motparter."
@@ -648,150 +1018,150 @@ msgstr "Nätverksannonsering avstängd i konfigurationen!\n"
 msgid "# bytes of messages of type %u received"
 msgstr "# krypterade PONG-meddelanden mottagna"
 
-#: src/core/gnunet-service-core_kx.c:532
+#: src/core/gnunet-service-core_kx.c:531
 msgid "# bytes encrypted"
 msgstr "# byte krypterade"
 
-#: src/core/gnunet-service-core_kx.c:583
+#: src/core/gnunet-service-core_kx.c:582
 msgid "# bytes decrypted"
 msgstr "# byte dekrypterade"
 
-#: src/core/gnunet-service-core_kx.c:667
+#: src/core/gnunet-service-core_kx.c:668
 msgid "# key exchanges initiated"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:697
+#: src/core/gnunet-service-core_kx.c:701
 msgid "# key exchanges stopped"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:761
+#: src/core/gnunet-service-core_kx.c:764
 msgid "# old ephemeral keys ignored"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:767
+#: src/core/gnunet-service-core_kx.c:770
 #, fuzzy
 msgid "# ephemeral keys received"
 msgstr "# krypterade PONG-meddelanden mottagna"
 
-#: src/core/gnunet-service-core_kx.c:803
+#: src/core/gnunet-service-core_kx.c:804
 #, c-format
 msgid ""
 "Ephemeral key message from peer `%s' rejected as its validity range does not "
 "match our system time (%llu not in [%llu,%llu]).\n"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:819
+#: src/core/gnunet-service-core_kx.c:820
 #, fuzzy
 msgid "# EPHEMERAL_KEY messages decrypted"
 msgstr "# PING-meddelanden skapade"
 
-#: src/core/gnunet-service-core_kx.c:922
-#: src/transport/gnunet-service-transport_validation.c:933
+#: src/core/gnunet-service-core_kx.c:923
+#: src/transport/gnunet-service-transport_validation.c:938
 #, fuzzy
 msgid "# PING messages received"
 msgstr "# PING-meddelanden skapade"
 
-#: src/core/gnunet-service-core_kx.c:930
+#: src/core/gnunet-service-core_kx.c:931
 #, fuzzy
 msgid "# PING messages dropped (out of order)"
 msgstr "Nätverksannonsering avstängd i konfigurationen!\n"
 
-#: src/core/gnunet-service-core_kx.c:957
+#: src/core/gnunet-service-core_kx.c:958
 #, c-format
 msgid ""
 "Received PING from `%s' for different identity: I am `%s', PONG identity: `"
 "%s'\n"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:974
+#: src/core/gnunet-service-core_kx.c:975
 #, fuzzy
 msgid "# PONG messages created"
 msgstr "# PING-meddelanden skapade"
 
-#: src/core/gnunet-service-core_kx.c:1000
+#: src/core/gnunet-service-core_kx.c:1001
 #, fuzzy
 msgid "# sessions terminated by timeout"
 msgstr "# byte kastade via TCP (utgående)"
 
-#: src/core/gnunet-service-core_kx.c:1010
+#: src/core/gnunet-service-core_kx.c:1011
 #, fuzzy
 msgid "# keepalive messages sent"
 msgstr "# PING-meddelanden i klartext skickade"
 
-#: src/core/gnunet-service-core_kx.c:1067
-#: src/transport/gnunet-service-transport_validation.c:1224
+#: src/core/gnunet-service-core_kx.c:1068
+#: src/transport/gnunet-service-transport_validation.c:1233
 #, fuzzy
 msgid "# PONG messages received"
 msgstr "# krypterade PONG-meddelanden mottagna"
 
-#: src/core/gnunet-service-core_kx.c:1073
+#: src/core/gnunet-service-core_kx.c:1074
 #, fuzzy
 msgid "# PONG messages dropped (connection down)"
 msgstr "# krypterade PONG-meddelanden mottagna"
 
-#: src/core/gnunet-service-core_kx.c:1078
+#: src/core/gnunet-service-core_kx.c:1079
 #, fuzzy
 msgid "# PONG messages dropped (out of order)"
 msgstr "Nätverksannonsering avstängd i konfigurationen!\n"
 
-#: src/core/gnunet-service-core_kx.c:1108
+#: src/core/gnunet-service-core_kx.c:1109
 #, fuzzy
 msgid "# PONG messages decrypted"
 msgstr "# PING-meddelanden skapade"
 
-#: src/core/gnunet-service-core_kx.c:1142
+#: src/core/gnunet-service-core_kx.c:1143
 #, fuzzy
 msgid "# session keys confirmed via PONG"
 msgstr "# sessionnycklar vägrade"
 
-#: src/core/gnunet-service-core_kx.c:1152
+#: src/core/gnunet-service-core_kx.c:1153
 #, fuzzy
 msgid "# timeouts prevented via PONG"
 msgstr "# byte mottogs via TCP"
 
-#: src/core/gnunet-service-core_kx.c:1159
+#: src/core/gnunet-service-core_kx.c:1160
 #, fuzzy
 msgid "# rekey operations confirmed via PONG"
 msgstr "# sessionnycklar vägrade"
 
-#: src/core/gnunet-service-core_kx.c:1299
+#: src/core/gnunet-service-core_kx.c:1300
 #, fuzzy
 msgid "# DATA message dropped (out of order)"
 msgstr "# byte kastade via UDP (utgående)"
 
-#: src/core/gnunet-service-core_kx.c:1306
+#: src/core/gnunet-service-core_kx.c:1307
 #, c-format
 msgid ""
 "Session to peer `%s' went down due to key expiration (should not happen)\n"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1309
+#: src/core/gnunet-service-core_kx.c:1310
 #, fuzzy
 msgid "# sessions terminated by key expiration"
 msgstr "# byte kastade via TCP (utgående)"
 
-#: src/core/gnunet-service-core_kx.c:1352
-#: src/core/gnunet-service-core_kx.c:1377
+#: src/core/gnunet-service-core_kx.c:1353
+#: src/core/gnunet-service-core_kx.c:1378
 #, fuzzy
 msgid "# bytes dropped (duplicates)"
 msgstr "# byte kastade via UDP (utgående)"
 
-#: src/core/gnunet-service-core_kx.c:1364
+#: src/core/gnunet-service-core_kx.c:1365
 #, fuzzy
 msgid "# bytes dropped (out of sequence)"
 msgstr "# byte kastade via UDP (utgående)"
 
-#: src/core/gnunet-service-core_kx.c:1405
+#: src/core/gnunet-service-core_kx.c:1406
 #, fuzzy
 msgid "# bytes dropped (ancient message)"
 msgstr "# byte kastade via UDP (utgående)"
 
-#: src/core/gnunet-service-core_kx.c:1413
+#: src/core/gnunet-service-core_kx.c:1414
 #, fuzzy
 msgid "# bytes of payload decrypted"
 msgstr "# byte dekrypterade"
 
-#: src/core/gnunet-service-core_kx.c:1444
+#: src/core/gnunet-service-core_kx.c:1445
 #, fuzzy
 msgid "# PAYLOAD dropped (out of order)"
 msgstr "# byte kastade via UDP (utgående)"
@@ -815,27 +1185,27 @@ msgstr ""
 msgid "Unsupported message of type %u (%u bytes) received from peer `%s'\n"
 msgstr ""
 
-#: src/core/gnunet-service-core_sessions.c:209
-#: src/core/gnunet-service-core_sessions.c:279
-#: src/dht/gnunet-service-dht_neighbours.c:641
-#: src/dht/gnunet-service-dht_neighbours.c:700
-#: src/fs/gnunet-service-fs_cp.c:601 src/fs/gnunet-service-fs_cp.c:1495
-#: src/topology/gnunet-daemon-topology.c:700
-#: src/topology/gnunet-daemon-topology.c:801
-#: src/transport/gnunet-service-transport_neighbours.c:1041
-#: src/transport/gnunet-service-transport_neighbours.c:1265
-#: src/transport/gnunet-service-transport_neighbours.c:1274
+#: src/core/gnunet-service-core_sessions.c:208
+#: src/core/gnunet-service-core_sessions.c:278
+#: src/dht/gnunet-service-dht_neighbours.c:662
+#: src/dht/gnunet-service-dht_neighbours.c:727
+#: src/fs/gnunet-service-fs_cp.c:604 src/fs/gnunet-service-fs_cp.c:1499
+#: src/topology/gnunet-daemon-topology.c:706
+#: src/topology/gnunet-daemon-topology.c:807
+#: src/transport/gnunet-service-transport_neighbours.c:904
+#: src/transport/gnunet-service-transport_neighbours.c:1129
+#: src/transport/gnunet-service-transport_neighbours.c:1138
 #: src/transport/gnunet-service-transport_neighbours.c:2799
-#: src/transport/gnunet-service-transport_neighbours.c:3053
+#: src/transport/gnunet-service-transport_neighbours.c:3052
 #, fuzzy
 msgid "# peers connected"
 msgstr "# av anslutna parter"
 
-#: src/core/gnunet-service-core_sessions.c:247
+#: src/core/gnunet-service-core_sessions.c:246
 msgid "# type map refreshes sent"
 msgstr ""
 
-#: src/core/gnunet-service-core_sessions.c:416
+#: src/core/gnunet-service-core_sessions.c:415
 msgid "# messages discarded (expired prior to transmission)"
 msgstr ""
 
@@ -901,11 +1271,13 @@ msgstr ""
 #: src/datastore/plugin_datastore_sqlite.c:57 src/mysql/mysql.c:41
 #: src/mysql/mysql.c:48 src/mysql/mysql.c:522 src/mysql/mysql.c:531
 #: src/mysql/mysql.c:591 src/mysql/mysql.c:607
+#: src/namecache/plugin_namecache_postgres.c:52
+#: src/namecache/plugin_namecache_sqlite.c:52
 #: src/namestore/plugin_namestore_postgres.c:52
-#: src/namestore/plugin_namestore_sqlite.c:51
-#: src/testbed/testbed_api_hosts.c:69 src/util/crypto_ecc.c:54
-#: src/include/gnunet_common.h:654 src/include/gnunet_common.h:663
-#: src/scalarproduct/scalarproduct.h:56
+#: src/namestore/plugin_namestore_sqlite.c:52
+#: src/testbed/testbed_api_hosts.c:69 src/util/crypto_ecc.c:53
+#: src/include/gnunet_common.h:602 src/include/gnunet_common.h:611
+#: src/scalarproduct/scalarproduct.h:61
 #, c-format
 msgid "`%s' failed at %s:%d with error: %s\n"
 msgstr "\"%s\" misslyckades vid %s:%d med fel: %s\n"
@@ -916,7 +1288,8 @@ msgstr ""
 
 #: src/datacache/plugin_datacache_sqlite.c:484
 #: src/datastore/plugin_datastore_sqlite.c:401
-#: src/namestore/plugin_namestore_sqlite.c:374
+#: src/namecache/plugin_namecache_sqlite.c:295
+#: src/namestore/plugin_namestore_sqlite.c:327
 msgid "Tried to close sqlite without finalizing all prepared statements.\n"
 msgstr ""
 
@@ -956,7 +1329,7 @@ msgstr ""
 msgid "# datastore connections (re)created"
 msgstr "Nätverksanslutning"
 
-#: src/datastore/datastore_api.c:608 src/scalarproduct/scalarproduct_api.c:276
+#: src/datastore/datastore_api.c:608 src/scalarproduct/scalarproduct_api.c:279
 #, fuzzy
 msgid "# transmission request failures"
 msgstr "# klartext PONG-meddelanden mottagna"
@@ -1227,7 +1600,8 @@ msgid "Failed to drop table from database.\n"
 msgstr "Misslyckades att ta emot svar till \"%s\" meddelande från gnunetd\n"
 
 #: src/datastore/plugin_datastore_postgres.c:860
-#: src/namestore/plugin_namestore_postgres.c:735
+#: src/namecache/plugin_namecache_postgres.c:414
+#: src/namestore/plugin_namestore_postgres.c:564
 msgid "Postgres database running\n"
 msgstr ""
 
@@ -1237,7 +1611,8 @@ msgid "`%s' failed at %s:%u with error: %s"
 msgstr "\"%s\" misslyckades vid %s:%d med fel: %s\n"
 
 #: src/datastore/plugin_datastore_sqlite.c:253
-#: src/namestore/plugin_namestore_sqlite.c:220
+#: src/namecache/plugin_namecache_sqlite.c:193
+#: src/namestore/plugin_namestore_sqlite.c:204
 #: src/psycstore/plugin_psycstore_sqlite.c:319
 #, fuzzy, c-format
 msgid "Unable to initialize SQLite: %s.\n"
@@ -1259,7 +1634,8 @@ msgid ""
 msgstr ""
 
 #: src/datastore/plugin_datastore_sqlite.c:1194
-#: src/namestore/plugin_namestore_sqlite.c:893
+#: src/namecache/plugin_namecache_sqlite.c:583
+#: src/namestore/plugin_namestore_sqlite.c:719
 msgid "Sqlite database running\n"
 msgstr ""
 
@@ -1267,7 +1643,7 @@ msgstr ""
 msgid "Template database running\n"
 msgstr ""
 
-#: src/dht/dht_api.c:375
+#: src/dht/dht_api.c:376
 #, fuzzy
 msgid "Failed to connect to the DHT service!\n"
 msgstr "Misslyckades att ansluta till gnunetd.\n"
@@ -1315,9 +1691,9 @@ msgstr ""
 
 #: src/dht/gnunet-dht-get.c:201 src/dht/gnunet-dht-monitor.c:271
 #: src/dht/gnunet-dht-put.c:213 src/fs/gnunet-auto-share.c:753
-#: src/fs/gnunet-download.c:328 src/fs/gnunet-publish.c:864
+#: src/fs/gnunet-download.c:328 src/fs/gnunet-publish.c:877
 #: src/fs/gnunet-search.c:294 src/fs/gnunet-unindex.c:168
-#: src/nse/gnunet-nse-profiler.c:904
+#: src/nse/gnunet-nse-profiler.c:873
 msgid "be verbose (print progress information)"
 msgstr ""
 
@@ -1386,50 +1762,50 @@ msgstr ""
 msgid "Failed to connect to transport service!\n"
 msgstr "Misslyckades att ansluta till gnunetd.\n"
 
-#: src/dht/gnunet-service-dht_clients.c:414
+#: src/dht/gnunet-service-dht_clients.c:417
 #, fuzzy
 msgid "# GET requests from clients injected"
 msgstr "# byte mottogs via TCP"
 
-#: src/dht/gnunet-service-dht_clients.c:508
+#: src/dht/gnunet-service-dht_clients.c:511
 #, fuzzy
 msgid "# PUT requests received from clients"
 msgstr "Meddelande mottaget från klient är ogiltig.\n"
 
-#: src/dht/gnunet-service-dht_clients.c:592
+#: src/dht/gnunet-service-dht_clients.c:595
 #, fuzzy
 msgid "# GET requests received from clients"
 msgstr "Meddelande mottaget från klient är ogiltig.\n"
 
-#: src/dht/gnunet-service-dht_clients.c:793
+#: src/dht/gnunet-service-dht_clients.c:796
 #, fuzzy
 msgid "# GET STOP requests received from clients"
 msgstr "Meddelande mottaget från klient är ogiltig.\n"
 
-#: src/dht/gnunet-service-dht_clients.c:1033
+#: src/dht/gnunet-service-dht_clients.c:1037
 msgid "# Key match, type mismatches in REPLY to CLIENT"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_clients.c:1046
+#: src/dht/gnunet-service-dht_clients.c:1050
 msgid "# Duplicate REPLIES to CLIENT request dropped"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_clients.c:1083
+#: src/dht/gnunet-service-dht_clients.c:1087
 #, c-format
 msgid "Unsupported block type (%u) in request!\n"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_clients.c:1106
+#: src/dht/gnunet-service-dht_clients.c:1110
 #, fuzzy
 msgid "# RESULTS queued for clients"
 msgstr "Meddelande mottaget från klient är ogiltig.\n"
 
-#: src/dht/gnunet-service-dht_clients.c:1157
-#: src/dht/gnunet-service-dht_clients.c:1199
+#: src/dht/gnunet-service-dht_clients.c:1164
+#: src/dht/gnunet-service-dht_clients.c:1206
 msgid "# REPLIES ignored for CLIENTS (no match)"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_clients.c:1167
+#: src/dht/gnunet-service-dht_clients.c:1174
 #, fuzzy
 msgid "Could not pass reply to client, message too big!\n"
 msgstr "Kunde inte skicka meddelande till gnunetd\n"
@@ -1478,120 +1854,120 @@ msgstr "# byte mottogs via TCP"
 msgid "# HELLOs obtained from peerinfo"
 msgstr "Meddelande mottaget från klient är ogiltig.\n"
 
-#: src/dht/gnunet-service-dht_neighbours.c:501
+#: src/dht/gnunet-service-dht_neighbours.c:516
 msgid "# Preference updates given to core"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:591
+#: src/dht/gnunet-service-dht_neighbours.c:610
 #, fuzzy
 msgid "# FIND PEER messages initiated"
 msgstr "# PING-meddelanden skapade"
 
-#: src/dht/gnunet-service-dht_neighbours.c:734
+#: src/dht/gnunet-service-dht_neighbours.c:764
 #, fuzzy
 msgid "# Queued messages discarded (peer disconnected)"
 msgstr "Nätverksannonsering avstängd i konfigurationen!\n"
 
-#: src/dht/gnunet-service-dht_neighbours.c:789
+#: src/dht/gnunet-service-dht_neighbours.c:819
 #, fuzzy
 msgid "# Bytes transmitted to other peers"
 msgstr "# byte skickade av typen %d"
 
-#: src/dht/gnunet-service-dht_neighbours.c:827
+#: src/dht/gnunet-service-dht_neighbours.c:857
 msgid "# Bytes of bandwidth requested from core"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:859
+#: src/dht/gnunet-service-dht_neighbours.c:889
 #, fuzzy
 msgid "# requests TTL-dropped"
 msgstr "# byte mottogs via TCP"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1052
-#: src/dht/gnunet-service-dht_neighbours.c:1086
+#: src/dht/gnunet-service-dht_neighbours.c:1093
+#: src/dht/gnunet-service-dht_neighbours.c:1130
 msgid "# Peers excluded from routing due to Bloomfilter"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1067
-#: src/dht/gnunet-service-dht_neighbours.c:1101
+#: src/dht/gnunet-service-dht_neighbours.c:1108
+#: src/dht/gnunet-service-dht_neighbours.c:1145
 msgid "# Peer selection failed"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1235
+#: src/dht/gnunet-service-dht_neighbours.c:1287
 #, fuzzy
 msgid "# PUT requests routed"
 msgstr "# byte mottogs via TCP"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1264
+#: src/dht/gnunet-service-dht_neighbours.c:1316
 #, fuzzy
 msgid "# PUT messages queued for transmission"
 msgstr "# PING-meddelanden skapade"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1271
-#: src/dht/gnunet-service-dht_neighbours.c:1384
-#: src/dht/gnunet-service-dht_neighbours.c:1484
+#: src/dht/gnunet-service-dht_neighbours.c:1323
+#: src/dht/gnunet-service-dht_neighbours.c:1440
+#: src/dht/gnunet-service-dht_neighbours.c:1543
 #, fuzzy
 msgid "# P2P messages dropped due to full queue"
 msgstr "Nätverksannonsering avstängd i konfigurationen!\n"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1349
+#: src/dht/gnunet-service-dht_neighbours.c:1405
 #, fuzzy
 msgid "# GET requests routed"
 msgstr "# byte mottogs via TCP"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1376
+#: src/dht/gnunet-service-dht_neighbours.c:1432
 #, fuzzy
 msgid "# GET messages queued for transmission"
 msgstr "# PING-meddelanden skapade"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1491
+#: src/dht/gnunet-service-dht_neighbours.c:1550
 #, fuzzy
 msgid "# RESULT messages queued for transmission"
 msgstr "# PING-meddelanden skapade"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1573
+#: src/dht/gnunet-service-dht_neighbours.c:1637
 #, fuzzy
 msgid "# P2P PUT requests received"
 msgstr "# byte mottogs via TCP"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1576
+#: src/dht/gnunet-service-dht_neighbours.c:1640
 #, fuzzy
 msgid "# P2P PUT bytes received"
 msgstr "# byte mottogs via TCP"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1731
+#: src/dht/gnunet-service-dht_neighbours.c:1803
 msgid "# FIND PEER requests ignored due to Bloomfilter"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1739
+#: src/dht/gnunet-service-dht_neighbours.c:1811
 msgid "# FIND PEER requests ignored due to lack of HELLO"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1830
+#: src/dht/gnunet-service-dht_neighbours.c:1904
 #, fuzzy
 msgid "# P2P GET requests received"
 msgstr "# byte mottogs via TCP"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1833
+#: src/dht/gnunet-service-dht_neighbours.c:1907
 #, fuzzy
 msgid "# P2P GET bytes received"
 msgstr "# byte mottogs via TCP"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1886
+#: src/dht/gnunet-service-dht_neighbours.c:1961
 #, fuzzy
 msgid "# P2P FIND PEER requests processed"
 msgstr "# byte mottogs via TCP"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1900
+#: src/dht/gnunet-service-dht_neighbours.c:1975
 #, fuzzy
 msgid "# P2P GET requests ONLY routed"
 msgstr "# byte mottogs via TCP"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1977
+#: src/dht/gnunet-service-dht_neighbours.c:2052
 #, fuzzy
 msgid "# P2P RESULTS received"
 msgstr "# krypterade PONG-meddelanden mottagna"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1980
+#: src/dht/gnunet-service-dht_neighbours.c:2055
 #, fuzzy
 msgid "# P2P RESULT bytes received"
 msgstr "# krypterade PONG-meddelanden mottagna"
@@ -1634,51 +2010,51 @@ msgstr ""
 msgid "# DHT requests combined"
 msgstr "# byte mottogs via TCP"
 
-#: src/dht/plugin_block_dht.c:136
+#: src/dht/plugin_block_dht.c:138
 #, 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:143
+#: src/dht/plugin_block_dht.c:145
 msgid "Size mismatch for block\n"
 msgstr ""
 
-#: src/dht/plugin_block_dht.c:152
+#: src/dht/plugin_block_dht.c:154
 #, c-format
 msgid "Block of type %u is malformed\n"
 msgstr ""
 
-#: src/dns/dnsparser.c:233
+#: src/dns/dnsparser.c:239
 #, fuzzy, c-format
 msgid "Failed to convert DNS IDNA name `%s' to UTF-8: %s\n"
 msgstr "Misslyckades att leverera \"%s\" meddelande.\n"
 
-#: src/dns/dnsparser.c:751
+#: src/dns/dnsparser.c:800
 #, fuzzy, c-format
 msgid "Failed to convert UTF-8 name `%s' to DNS IDNA format: %s\n"
 msgstr "Misslyckades att leverera \"%s\" meddelande.\n"
 
-#: src/dns/dnsstub.c:176
+#: src/dns/dnsstub.c:175
 #, fuzzy, c-format
 msgid "Could not bind to any port: %s\n"
 msgstr "Kunde inte köra \"%s\": %s\n"
 
-#: src/dns/dnsstub.c:296 src/dns/dnsstub.c:384
+#: src/dns/dnsstub.c:295 src/dns/dnsstub.c:383
 #, fuzzy, c-format
 msgid "Failed to send DNS request to %s\n"
 msgstr "Misslyckades att skicka HTTP-begäran till värd \"%s\": %s\n"
 
-#: src/dns/dnsstub.c:300
+#: src/dns/dnsstub.c:299
 #, fuzzy, c-format
 msgid "Sent DNS request to %s\n"
 msgstr "Misslyckades att skicka HTTP-begäran till värd \"%s\": %s\n"
 
-#: src/dns/dnsstub.c:369
+#: src/dns/dnsstub.c:368
 #, c-format
 msgid "Configured DNS exit `%s' is not working / valid.\n"
 msgstr ""
 
-#: src/dns/dnsstub.c:441
+#: src/dns/dnsstub.c:440
 #, c-format
 msgid "Received DNS response that is too small (%u bytes)"
 msgstr ""
@@ -1745,12 +2121,12 @@ msgstr ""
 msgid "# DNS requests received via TUN interface"
 msgstr "Meddelande mottaget från klient är ogiltig.\n"
 
-#: src/dns/gnunet-service-dns.c:1049 src/exit/gnunet-daemon-exit.c:3359
+#: src/dns/gnunet-service-dns.c:1049 src/exit/gnunet-daemon-exit.c:3498
 #, c-format
 msgid "`%s' must be installed SUID, refusing to run\n"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:1069 src/exit/gnunet-daemon-exit.c:3415
+#: src/dns/gnunet-service-dns.c:1069 src/exit/gnunet-daemon-exit.c:3555
 #, fuzzy
 msgid "need a valid IPv4 or IPv6 address\n"
 msgstr "Ogiltigt svar på \"%s\".\n"
@@ -1764,353 +2140,342 @@ msgstr ""
 msgid "Print information about DV state"
 msgstr "Skriv ut information om GNUnets motparter."
 
-#: src/exit/gnunet-daemon-exit.c:756
+#: src/exit/gnunet-daemon-exit.c:802
 #, c-format
 msgid "Got duplicate service records for `%s:%u'\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:807
+#: src/exit/gnunet-daemon-exit.c:853
 #, fuzzy
 msgid "# Bytes transmitted via mesh tunnels"
 msgstr "# byte skickade av typen %d"
 
-#: src/exit/gnunet-daemon-exit.c:924 src/exit/gnunet-daemon-exit.c:2349
-#: src/exit/gnunet-daemon-exit.c:2606 src/vpn/gnunet-service-vpn.c:1451
-#: src/vpn/gnunet-service-vpn.c:1850 src/vpn/gnunet-service-vpn.c:2013
+#: src/exit/gnunet-daemon-exit.c:970 src/exit/gnunet-daemon-exit.c:2394
+#: src/exit/gnunet-daemon-exit.c:2651 src/vpn/gnunet-service-vpn.c:1409
+#: src/vpn/gnunet-service-vpn.c:1799 src/vpn/gnunet-service-vpn.c:1962
 msgid "# ICMPv4 packets dropped (type not allowed)"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:961 src/exit/gnunet-daemon-exit.c:2408
-#: src/exit/gnunet-daemon-exit.c:2665 src/vpn/gnunet-service-vpn.c:1507
-#: src/vpn/gnunet-service-vpn.c:1909 src/vpn/gnunet-service-vpn.c:2046
+#: src/exit/gnunet-daemon-exit.c:1007 src/exit/gnunet-daemon-exit.c:2453
+#: src/exit/gnunet-daemon-exit.c:2710 src/vpn/gnunet-service-vpn.c:1465
+#: src/vpn/gnunet-service-vpn.c:1858 src/vpn/gnunet-service-vpn.c:1995
 msgid "# ICMPv6 packets dropped (type not allowed)"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:1001
+#: src/exit/gnunet-daemon-exit.c:1047
 msgid "# ICMP packets dropped (not allowed)"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:1008
+#: src/exit/gnunet-daemon-exit.c:1054
 msgid "ICMP Packet dropped, have no matching connection information\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:1084
+#: src/exit/gnunet-daemon-exit.c:1130
 msgid "UDP Packet dropped, have no matching connection information\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:1158
+#: src/exit/gnunet-daemon-exit.c:1204
 msgid "TCP Packet dropped, have no matching connection information\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:1210
+#: src/exit/gnunet-daemon-exit.c:1256
 #, fuzzy
 msgid "# Packets received from TUN"
 msgstr "# byte mottagna via HTTP"
 
-#: src/exit/gnunet-daemon-exit.c:1224
+#: src/exit/gnunet-daemon-exit.c:1270
 #, fuzzy
 msgid "# Bytes received from TUN"
 msgstr "# byte mottagna via HTTP"
 
-#: src/exit/gnunet-daemon-exit.c:1250
+#: src/exit/gnunet-daemon-exit.c:1296
 msgid "IPv4 packet options received.  Ignored.\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:1277
+#: src/exit/gnunet-daemon-exit.c:1323
 #, c-format
 msgid "IPv4 packet with unsupported next header %u received.  Ignored.\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:1323
+#: src/exit/gnunet-daemon-exit.c:1369
 #, c-format
 msgid "IPv6 packet with unsupported next header %d received.  Ignored.\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:1331
+#: src/exit/gnunet-daemon-exit.c:1377
 #, c-format
 msgid "Packet from unknown protocol %u received.  Ignored.\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:1713
+#: src/exit/gnunet-daemon-exit.c:1759
 #, fuzzy
 msgid "# TCP packets sent via TUN"
 msgstr "# byte skickade via UDP"
 
-#: src/exit/gnunet-daemon-exit.c:1826
+#: src/exit/gnunet-daemon-exit.c:1872
 msgid "# TCP service creation requests received via mesh"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:1829 src/exit/gnunet-daemon-exit.c:1919
-#: src/exit/gnunet-daemon-exit.c:2035 src/exit/gnunet-daemon-exit.c:2273
-#: src/exit/gnunet-daemon-exit.c:2522 src/exit/gnunet-daemon-exit.c:2811
-#: src/exit/gnunet-daemon-exit.c:2918
+#: src/exit/gnunet-daemon-exit.c:1875 src/exit/gnunet-daemon-exit.c:1965
+#: src/exit/gnunet-daemon-exit.c:2070 src/exit/gnunet-daemon-exit.c:2318
+#: src/exit/gnunet-daemon-exit.c:2567 src/exit/gnunet-daemon-exit.c:2856
+#: src/exit/gnunet-daemon-exit.c:2963
 #, fuzzy
 msgid "# Bytes received from MESH"
 msgstr "# byte mottagna via HTTP"
 
-#: src/exit/gnunet-daemon-exit.c:1861 src/exit/gnunet-daemon-exit.c:2940
+#: src/exit/gnunet-daemon-exit.c:1907 src/exit/gnunet-daemon-exit.c:2985
 #, c-format
 msgid "No service found for %s on port %d!\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:1865
+#: src/exit/gnunet-daemon-exit.c:1911
 #, fuzzy
 msgid "# TCP requests dropped (no such service)"
 msgstr "# byte mottogs via TCP"
 
-#: src/exit/gnunet-daemon-exit.c:1922
+#: src/exit/gnunet-daemon-exit.c:1968
 #, fuzzy
 msgid "# TCP IP-exit creation requests received via mesh"
 msgstr "# byte mottogs via TCP"
 
-#: src/exit/gnunet-daemon-exit.c:2038
+#: src/exit/gnunet-daemon-exit.c:2073
 #, fuzzy
 msgid "# TCP data requests received via mesh"
 msgstr "# byte mottogs via TCP"
 
-#: src/exit/gnunet-daemon-exit.c:2052
+#: src/exit/gnunet-daemon-exit.c:2087
 #, fuzzy
 msgid "# TCP DATA requests dropped (no session)"
 msgstr "# byte mottogs via TCP"
 
-#: src/exit/gnunet-daemon-exit.c:2102
+#: src/exit/gnunet-daemon-exit.c:2147
 #, fuzzy
 msgid "# ICMP packets sent via TUN"
 msgstr "# byte skickade via UDP"
 
-#: src/exit/gnunet-daemon-exit.c:2276
+#: src/exit/gnunet-daemon-exit.c:2321
 #, fuzzy
 msgid "# ICMP IP-exit requests received via mesh"
 msgstr "# byte mottogs via TCP"
 
-#: src/exit/gnunet-daemon-exit.c:2525
+#: src/exit/gnunet-daemon-exit.c:2570
 #, fuzzy
 msgid "# ICMP service requests received via mesh"
 msgstr "Meddelande mottaget från klient är ogiltig.\n"
 
-#: src/exit/gnunet-daemon-exit.c:2591 src/vpn/gnunet-service-vpn.c:1441
-#: src/vpn/gnunet-service-vpn.c:2007
+#: src/exit/gnunet-daemon-exit.c:2636 src/vpn/gnunet-service-vpn.c:1399
+#: src/vpn/gnunet-service-vpn.c:1956
 msgid "# ICMPv4 packets dropped (impossible PT to v6)"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:2650 src/vpn/gnunet-service-vpn.c:1477
-#: src/vpn/gnunet-service-vpn.c:1489 src/vpn/gnunet-service-vpn.c:1897
+#: src/exit/gnunet-daemon-exit.c:2695 src/vpn/gnunet-service-vpn.c:1435
+#: src/vpn/gnunet-service-vpn.c:1447 src/vpn/gnunet-service-vpn.c:1846
 msgid "# ICMPv6 packets dropped (impossible PT to v4)"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:2700
+#: src/exit/gnunet-daemon-exit.c:2745
 #, fuzzy
 msgid "# UDP packets sent via TUN"
 msgstr "# byte skickade via UDP"
 
-#: src/exit/gnunet-daemon-exit.c:2814
+#: src/exit/gnunet-daemon-exit.c:2859
 #, fuzzy
 msgid "# UDP IP-exit requests received via mesh"
 msgstr "# byte mottogs via TCP"
 
-#: src/exit/gnunet-daemon-exit.c:2921
+#: src/exit/gnunet-daemon-exit.c:2966
 #, fuzzy
 msgid "# UDP service requests received via mesh"
 msgstr "# byte mottogs via TCP"
 
-#: src/exit/gnunet-daemon-exit.c:2944
+#: src/exit/gnunet-daemon-exit.c:2989
 #, fuzzy
 msgid "# UDP requests dropped (no such service)"
 msgstr "# byte mottogs via TCP"
 
-#: src/exit/gnunet-daemon-exit.c:2977
+#: src/exit/gnunet-daemon-exit.c:3024
 msgid "# Inbound MESH tunnels created"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3216
+#: src/exit/gnunet-daemon-exit.c:3285
 #, c-format
 msgid "No addresses found for hostname `%s' of service `%s'!\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3230 src/exit/gnunet-daemon-exit.c:3242
+#: src/exit/gnunet-daemon-exit.c:3299 src/exit/gnunet-daemon-exit.c:3311
 #, c-format
 msgid "Service `%s' configured for IPv4, but IPv4 is disabled!\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3253
+#: src/exit/gnunet-daemon-exit.c:3322
 #, c-format
 msgid "No IP addresses found for hostname `%s' of service `%s'!\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3372
+#: src/exit/gnunet-daemon-exit.c:3511
 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:3380
+#: src/exit/gnunet-daemon-exit.c:3519
 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:3387
+#: src/exit/gnunet-daemon-exit.c:3526
 msgid ""
 "Cannot enable IPv4 exit but disable IPv4 on TUN interface, will use "
 "ENABLE_IPv4=YES\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3393
+#: src/exit/gnunet-daemon-exit.c:3532
 msgid ""
 "Cannot enable IPv6 exit but disable IPv6 on TUN interface, will use "
 "ENABLE_IPv6=YES\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3399 src/pt/gnunet-daemon-pt.c:887
+#: src/exit/gnunet-daemon-exit.c:3538 src/pt/gnunet-daemon-pt.c:1248
 msgid "No useful service enabled.  Exiting.\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3647
+#: src/exit/gnunet-daemon-exit.c:3654
+msgid "Must be a number"
+msgstr ""
+
+#: src/exit/gnunet-daemon-exit.c:3796
 msgid "Daemon to run to provide an IP exit node for the VPN"
 msgstr ""
 
-#: src/experimentation/gnunet-daemon-experimentation.c:56
+#: src/experimentation/gnunet-daemon-experimentation.c:55
 msgid "Experimentation daemon shutting down ...\n"
 msgstr ""
 
-#: src/experimentation/gnunet-daemon-experimentation.c:78
+#: src/experimentation/gnunet-daemon-experimentation.c:77
 msgid "Experimentation daemon starting ...\n"
 msgstr ""
 
-#: src/experimentation/gnunet-daemon-experimentation.c:84
+#: src/experimentation/gnunet-daemon-experimentation.c:83
 #, fuzzy
 msgid "Failed to create statistics!\n"
 msgstr "Kunde inte skapa namnrymd \"%s\" (existerar?).\n"
 
-#: src/experimentation/gnunet-daemon-experimentation.c:121
+#: src/experimentation/gnunet-daemon-experimentation.c:120
 msgid "GNUnet experimentation daemon"
 msgstr ""
 
-#: src/experimentation/gnunet-daemon-experimentation_experiments.c:264
+#: src/experimentation/gnunet-daemon-experimentation_experiments.c:241
 #, c-format
 msgid "Experiment `%s': Experiment signature is invalid\n"
 msgstr ""
 
-#: src/experimentation/gnunet-daemon-experimentation_experiments.c:271
+#: src/experimentation/gnunet-daemon-experimentation_experiments.c:250
 #, c-format
 msgid ""
 "Adding experiment `%s' running from `%s' to `%s' every %llu sec. for %llu "
 "sec. \n"
 msgstr ""
 
-#: src/experimentation/gnunet-daemon-experimentation_experiments.c:316
+#: src/experimentation/gnunet-daemon-experimentation_experiments.c:303
 #, c-format
 msgid "Experiment `%s': Issuer missing\n"
 msgstr ""
 
-#: src/experimentation/gnunet-daemon-experimentation_experiments.c:321
+#: src/experimentation/gnunet-daemon-experimentation_experiments.c:312
 #, c-format
 msgid "Experiment `%s': Issuer invalid\n"
 msgstr ""
 
-#: src/experimentation/gnunet-daemon-experimentation_experiments.c:327
+#: src/experimentation/gnunet-daemon-experimentation_experiments.c:320
 #, c-format
 msgid "Experiment `%s': Issuer not accepted!\n"
 msgstr ""
 
-#: src/experimentation/gnunet-daemon-experimentation_experiments.c:336
+#: src/experimentation/gnunet-daemon-experimentation_experiments.c:330
 #, c-format
 msgid "Experiment `%s': Version missing or invalid \n"
 msgstr ""
 
-#: src/experimentation/gnunet-daemon-experimentation_experiments.c:344
+#: src/experimentation/gnunet-daemon-experimentation_experiments.c:339
 #, c-format
 msgid "Experiment `%s': Required capabilities missing \n"
 msgstr ""
 
-#: src/experimentation/gnunet-daemon-experimentation_experiments.c:349
+#: src/experimentation/gnunet-daemon-experimentation_experiments.c:345
 #, c-format
 msgid "Experiment `%s': Required capabilities invalid \n"
 msgstr ""
 
-#: src/experimentation/gnunet-daemon-experimentation_experiments.c:392
+#: src/experimentation/gnunet-daemon-experimentation_experiments.c:390
 #, fuzzy, c-format
 msgid "Failed to parse file `%s'\n"
 msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 
-#: src/experimentation/gnunet-daemon-experimentation_experiments.c:418
-#: src/experimentation/gnunet-daemon-experimentation_experiments.c:443
+#: src/experimentation/gnunet-daemon-experimentation_experiments.c:420
+#: src/experimentation/gnunet-daemon-experimentation_experiments.c:452
 msgid ""
-"No valid experiment issuers configured! Set value to peer id of issuer! "
-"Exit...\n"
+"No valid experiment issuers configured! Set value to public keys of issuers! "
+"Exiting.\n"
 msgstr ""
 
-#: src/experimentation/gnunet-daemon-experimentation_experiments.c:428
-#, fuzzy, c-format
-msgid "Invalid value `%s'\n"
-msgstr "Ogiltigt argument: \"%s\"\n"
-
-#: src/experimentation/gnunet-daemon-experimentation_experiments.c:452
-#, fuzzy, c-format
-msgid "Invalid public key `%s'\n"
+#: src/experimentation/gnunet-daemon-experimentation_experiments.c:435
+#, fuzzy
+msgid "Invalid value for public key\n"
 msgstr "Ogiltigt argument: \"%s\"\n"
 
-#: src/experimentation/gnunet-daemon-experimentation_experiments.c:459
-#, fuzzy, c-format
-msgid "Found issuer for public key `%s'\n"
-msgstr "Testar transport(er) %s\n"
-
-#: src/experimentation/gnunet-daemon-experimentation_experiments.c:462
-#, fuzzy, c-format
-msgid "No issuer for public key `%s'\n"
-msgstr "%d filer hittades i katalog.\n"
-
-#: src/experimentation/gnunet-daemon-experimentation_experiments.c:479
+#: src/experimentation/gnunet-daemon-experimentation_experiments.c:473
 #, fuzzy, c-format
 msgid "Cannot read experiments file `%s'\n"
 msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 
-#: src/experimentation/gnunet-daemon-experimentation_nodes.c:221
+#: src/experimentation/gnunet-daemon-experimentation_nodes.c:219
 #, c-format
 msgid "Cannot send message to peer `%s' for experiment `%s'\n"
 msgstr ""
 
-#: src/experimentation/gnunet-daemon-experimentation_nodes.c:291
+#: src/experimentation/gnunet-daemon-experimentation_nodes.c:307
 #, c-format
 msgid "Sending experimentation request to peer %s\n"
 msgstr ""
 
-#: src/experimentation/gnunet-daemon-experimentation_nodes.c:422
+#: src/experimentation/gnunet-daemon-experimentation_nodes.c:451
 #, c-format
 msgid "Added peer `%s' as active node\n"
 msgstr ""
 
-#: src/experimentation/gnunet-daemon-experimentation_nodes.c:849
+#: src/experimentation/gnunet-daemon-experimentation_nodes.c:889
 #, fuzzy, c-format
 msgid "Connected to peer %s\n"
 msgstr "\"%s\" ansluten till \"%s\".\n"
 
-#: src/experimentation/gnunet-daemon-experimentation_nodes.c:878
+#: src/experimentation/gnunet-daemon-experimentation_nodes.c:919
 #, fuzzy, c-format
 msgid "Disconnected from peer %s\n"
 msgstr "\"%s\" ansluten till \"%s\".\n"
 
-#: src/experimentation/gnunet-daemon-experimentation_nodes.c:1058
+#: src/experimentation/gnunet-daemon-experimentation_nodes.c:1102
 #, fuzzy
 msgid "Failed to connect to CORE service!\n"
 msgstr "Misslyckades att ansluta till gnunetd.\n"
 
-#: src/experimentation/gnunet-daemon-experimentation_scheduler.c:109
+#: src/experimentation/gnunet-daemon-experimentation_scheduler.c:108
 #, c-format
 msgid "Peer `%s' did not respond to request for experiment `%s'\n"
 msgstr ""
 
-#: src/experimentation/gnunet-daemon-experimentation_scheduler.c:144
+#: src/experimentation/gnunet-daemon-experimentation_scheduler.c:143
 #, fuzzy, c-format
 msgid "Starting inbound experiment `%s' with peer `%s'\n"
 msgstr "Startade samling \"%s\".\n"
 
-#: src/experimentation/gnunet-daemon-experimentation_scheduler.c:278
+#: src/experimentation/gnunet-daemon-experimentation_scheduler.c:276
 #, fuzzy, c-format
 msgid "Starting outbound experiment `%s' with peer `%s'\n"
 msgstr "Startade samling \"%s\".\n"
 
-#: src/experimentation/gnunet-daemon-experimentation_scheduler.c:296
+#: src/experimentation/gnunet-daemon-experimentation_scheduler.c:294
 #, fuzzy, c-format
 msgid "Received %s message from peer %s for experiment `%s'\n"
 msgstr "Mottog ogiltigt \"%s\" meddelande från \"%s\".\n"
@@ -2184,56 +2549,56 @@ msgstr "Kunde inte slå upp \"%s\": %s\n"
 msgid "Short read reading from file `%s'!"
 msgstr ""
 
-#: src/fs/fs_api.c:1062
+#: src/fs/fs_api.c:1064
 #, fuzzy, c-format
 msgid "Failed to resume publishing information `%s': %s\n"
 msgstr "Misslyckades att leverera \"%s\" meddelande.\n"
 
-#: src/fs/fs_api.c:1565
+#: src/fs/fs_api.c:1569
 #, c-format
 msgid "Failure while resuming publishing operation `%s': %s\n"
 msgstr ""
 
-#: src/fs/fs_api.c:1579
+#: src/fs/fs_api.c:1583
 #, fuzzy, c-format
 msgid "Failed to resume publishing operation `%s': %s\n"
 msgstr "Misslyckades att leverera \"%s\" meddelande.\n"
 
-#: src/fs/fs_api.c:2236
+#: src/fs/fs_api.c:2240
 #, c-format
 msgid "Failure while resuming unindexing operation `%s': %s\n"
 msgstr ""
 
-#: src/fs/fs_api.c:2246
+#: src/fs/fs_api.c:2250
 #, fuzzy, c-format
 msgid "Failed to resume unindexing operation `%s': %s\n"
 msgstr "Misslyckades att leverera \"%s\" meddelande.\n"
 
-#: src/fs/fs_api.c:2372 src/fs/fs_api.c:2612
+#: src/fs/fs_api.c:2376 src/fs/fs_api.c:2616
 #, fuzzy, c-format
 msgid "Failed to resume sub-download `%s': %s\n"
 msgstr "Misslyckades att leverera \"%s\" meddelande.\n"
 
-#: src/fs/fs_api.c:2389
+#: src/fs/fs_api.c:2393
 #, fuzzy, c-format
 msgid "Failed to resume sub-search `%s': %s\n"
 msgstr "Misslyckades att leverera \"%s\" meddelande.\n"
 
-#: src/fs/fs_api.c:2402 src/fs/fs_api.c:2421 src/fs/fs_api.c:2904
+#: src/fs/fs_api.c:2406 src/fs/fs_api.c:2425 src/fs/fs_api.c:2908
 #, c-format
 msgid "Failure while resuming search operation `%s': %s\n"
 msgstr ""
 
-#: src/fs/fs_api.c:2603
+#: src/fs/fs_api.c:2607
 #, c-format
 msgid "Failed to resume sub-download `%s': could not open file `%s'\n"
 msgstr ""
 
-#: src/fs/fs_api.c:2848
+#: src/fs/fs_api.c:2852
 msgid "Could not resume running search, will resume as paused search\n"
 msgstr ""
 
-#: src/fs/fs_api.c:2942
+#: src/fs/fs_api.c:2946
 #, c-format
 msgid "Failure while resuming download operation `%s': %s\n"
 msgstr ""
@@ -2346,68 +2711,68 @@ msgstr "Fel vid %s:%d.\n"
 msgid "Failed to connect to datastore."
 msgstr "Misslyckades att ansluta till gnunetd.\n"
 
-#: src/fs/fs_publish.c:125 src/fs/fs_publish.c:414
+#: src/fs/fs_publish.c:125 src/fs/fs_publish.c:415
 #, fuzzy, c-format
 msgid "Publishing failed: %s"
 msgstr ""
 "\n"
 "Fel vid uppladdning av fil: %s\n"
 
-#: src/fs/fs_publish.c:642 src/fs/fs_publish.c:659 src/fs/fs_publish.c:698
-#: src/fs/fs_publish.c:719 src/fs/fs_publish.c:743 src/fs/fs_publish.c:889
+#: src/fs/fs_publish.c:667 src/fs/fs_publish.c:684 src/fs/fs_publish.c:723
+#: src/fs/fs_publish.c:744 src/fs/fs_publish.c:768 src/fs/fs_publish.c:914
 #, fuzzy, c-format
 msgid "Can not index file `%s': %s.  Will try to insert instead.\n"
 msgstr "Indexering av fil \"%s\" misslyckades. Försöker att infoga fil...\n"
 
-#: src/fs/fs_publish.c:644
+#: src/fs/fs_publish.c:669
 msgid "timeout on index-start request to `fs' service"
 msgstr ""
 
-#: src/fs/fs_publish.c:656
+#: src/fs/fs_publish.c:681
 #, fuzzy
 msgid "unknown error"
 msgstr "Okänt fel"
 
-#: src/fs/fs_publish.c:700
+#: src/fs/fs_publish.c:725
 msgid "failed to compute hash"
 msgstr ""
 
-#: src/fs/fs_publish.c:720
+#: src/fs/fs_publish.c:745
 msgid "filename too long"
 msgstr ""
 
-#: src/fs/fs_publish.c:745
+#: src/fs/fs_publish.c:770
 #, fuzzy
 msgid "could not connect to `fs' service"
 msgstr "Kunde inte ansluta till gnunetd.\n"
 
-#: src/fs/fs_publish.c:768
+#: src/fs/fs_publish.c:793
 #, fuzzy, c-format
 msgid "Failed to get file identifiers for `%s'\n"
 msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 
-#: src/fs/fs_publish.c:837
+#: src/fs/fs_publish.c:862
 #, fuzzy, c-format
 msgid "Recursive upload failed at `%s': %s"
 msgstr "\"%s\" misslyckades vid %s:%d med fel: \"%s\".\n"
 
-#: src/fs/fs_publish.c:843
+#: src/fs/fs_publish.c:868
 #, fuzzy, c-format
 msgid "Recursive upload failed: %s"
 msgstr ""
 "\n"
 "Fel vid uppladdning av fil: %s\n"
 
-#: src/fs/fs_publish.c:890
+#: src/fs/fs_publish.c:915
 msgid "needs to be an actual file"
 msgstr ""
 
-#: src/fs/fs_publish.c:1126
+#: src/fs/fs_publish.c:1151
 #, c-format
 msgid "Insufficient space for publishing: %s"
 msgstr ""
 
-#: src/fs/fs_publish.c:1198
+#: src/fs/fs_publish.c:1243
 #, c-format
 msgid "Reserving space for %u entries and %llu bytes for publication\n"
 msgstr ""
@@ -2422,12 +2787,12 @@ msgstr "Kunde inte ansluta till gnunetd.\n"
 msgid "Internal error."
 msgstr "Okänt fel.\n"
 
-#: src/fs/fs_search.c:815
+#: src/fs/fs_search.c:819
 #, fuzzy, c-format
 msgid "Failed to parse URI `%s': %s\n"
 msgstr "Fil \"%s\" har URI: %s\n"
 
-#: src/fs/fs_search.c:874
+#: src/fs/fs_search.c:878
 #, c-format
 msgid "Got result with unknown block type `%d', ignoring"
 msgstr ""
@@ -2547,21 +2912,21 @@ msgstr ""
 msgid "Unrecognized URI type"
 msgstr ""
 
-#: src/fs/fs_uri.c:912
+#: src/fs/fs_uri.c:910
 #, fuzzy
 msgid "Lacking key configuration settings.\n"
 msgstr "GNUnet-konfiguration"
 
-#: src/fs/fs_uri.c:918
+#: src/fs/fs_uri.c:916
 #, fuzzy, c-format
 msgid "Could not access hostkey file `%s'.\n"
 msgstr "Kunde inte tolka konfigurationsfil \"%s\".\n"
 
-#: src/fs/fs_uri.c:1102 src/fs/fs_uri.c:1129
+#: src/fs/fs_uri.c:1100 src/fs/fs_uri.c:1127
 msgid "No keywords specified!\n"
 msgstr "Inga nyckelord angivna!\n"
 
-#: src/fs/fs_uri.c:1135
+#: src/fs/fs_uri.c:1133
 msgid "Number of double-quotes not balanced!\n"
 msgstr ""
 
@@ -2599,23 +2964,23 @@ msgid ""
 "You must specify one and only one directory name for automatic publication.\n"
 msgstr "Du måste ange en och endast en fil att avindexera.\n"
 
-#: src/fs/gnunet-auto-share.c:737 src/fs/gnunet-publish.c:811
+#: src/fs/gnunet-auto-share.c:737 src/fs/gnunet-publish.c:824
 msgid "set the desired LEVEL of sender-anonymity"
 msgstr ""
 
-#: src/fs/gnunet-auto-share.c:741 src/fs/gnunet-publish.c:815
+#: src/fs/gnunet-auto-share.c:741 src/fs/gnunet-publish.c:828
 msgid "disable adding the creation time to the metadata of the uploaded file"
 msgstr ""
 
-#: src/fs/gnunet-auto-share.c:744 src/fs/gnunet-publish.c:818
+#: src/fs/gnunet-auto-share.c:744 src/fs/gnunet-publish.c:831
 msgid "do not use libextractor to add keywords or metadata"
 msgstr ""
 
-#: src/fs/gnunet-auto-share.c:747 src/fs/gnunet-publish.c:842
+#: src/fs/gnunet-auto-share.c:747 src/fs/gnunet-publish.c:855
 msgid "specify the priority of the content"
 msgstr "ange prioritet för innehållet"
 
-#: src/fs/gnunet-auto-share.c:750 src/fs/gnunet-publish.c:849
+#: src/fs/gnunet-auto-share.c:750 src/fs/gnunet-publish.c:862
 msgid "set the desired replication LEVEL"
 msgstr ""
 
@@ -2623,7 +2988,7 @@ msgstr ""
 msgid "Automatically publish files from a directory on GNUnet"
 msgstr ""
 
-#: src/fs/gnunet-daemon-fsprofiler.c:657
+#: src/fs/gnunet-daemon-fsprofiler.c:660
 msgid "Daemon to use file-sharing to measure its performance."
 msgstr ""
 
@@ -2689,7 +3054,7 @@ msgstr "Fel vid nedladdning: %s\n"
 msgid "Downloading `%s' done (%s/s).\n"
 msgstr "Uppladdning vägrades!"
 
-#: src/fs/gnunet-download.c:209 src/fs/gnunet-publish.c:273
+#: src/fs/gnunet-download.c:209 src/fs/gnunet-publish.c:286
 #: src/fs/gnunet-search.c:193 src/fs/gnunet-unindex.c:108
 #, c-format
 msgid "Unexpected status: %d\n"
@@ -2700,7 +3065,7 @@ msgstr ""
 msgid "You need to specify a URI argument.\n"
 msgstr "Du måste ange en och endast en fil att avindexera.\n"
 
-#: src/fs/gnunet-download.c:240 src/fs/gnunet-publish.c:652
+#: src/fs/gnunet-download.c:240 src/fs/gnunet-publish.c:665
 #, fuzzy, c-format
 msgid "Failed to parse URI: %s\n"
 msgstr "Fil \"%s\" har URI: %s\n"
@@ -2713,7 +3078,7 @@ msgstr ""
 msgid "Target filename must be specified.\n"
 msgstr ""
 
-#: src/fs/gnunet-download.c:268 src/fs/gnunet-publish.c:784
+#: src/fs/gnunet-download.c:268 src/fs/gnunet-publish.c:797
 #: src/fs/gnunet-search.c:243 src/fs/gnunet-unindex.c:140
 #, fuzzy, c-format
 msgid "Could not initialize `%s' subsystem.\n"
@@ -2778,177 +3143,177 @@ msgstr ""
 msgid "run a testbed to measure file-sharing performance"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:230
+#: src/fs/gnunet-publish.c:231 src/fs/gnunet-publish.c:243
 #, c-format
 msgid "Publishing `%s' at %llu/%llu (%s remaining)\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:237
+#: src/fs/gnunet-publish.c:250
 #, fuzzy, c-format
 msgid "Error publishing: %s.\n"
 msgstr "Fel vid nedladdning: %s\n"
 
-#: src/fs/gnunet-publish.c:247
+#: src/fs/gnunet-publish.c:260
 #, c-format
 msgid "Publishing `%s' done.\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:251
+#: src/fs/gnunet-publish.c:264
 #, fuzzy, c-format
 msgid "URI is `%s'.\n"
 msgstr "Jag är ändpunkt \"%s\".\n"
 
-#: src/fs/gnunet-publish.c:270
+#: src/fs/gnunet-publish.c:283
 #, fuzzy
 msgid "Cleanup after abort complete.\n"
 msgstr "\"%s\" uppstart klar.\n"
 
-#: src/fs/gnunet-publish.c:388
+#: src/fs/gnunet-publish.c:401
 #, fuzzy, c-format
 msgid "Meta data for file `%s' (%s)\n"
 msgstr "Uppdaterar data för modul \"%s\"\n"
 
-#: src/fs/gnunet-publish.c:390
+#: src/fs/gnunet-publish.c:403
 #, fuzzy, c-format
 msgid "Keywords for file `%s' (%s)\n"
 msgstr "Nyckelord för fil \"%s\":\n"
 
-#: src/fs/gnunet-publish.c:529
+#: src/fs/gnunet-publish.c:542
 #, fuzzy
 msgid "Could not publish\n"
 msgstr "Kunde inte köra \"%s\": %s\n"
 
-#: src/fs/gnunet-publish.c:552
+#: src/fs/gnunet-publish.c:565
 #, fuzzy
 msgid "Could not start publishing.\n"
 msgstr "Kunde inte slå upp \"%s\": %s\n"
 
-#: src/fs/gnunet-publish.c:585
+#: src/fs/gnunet-publish.c:598
 #, fuzzy, c-format
 msgid "Scanning directory `%s'.\n"
 msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 
-#: src/fs/gnunet-publish.c:587
+#: src/fs/gnunet-publish.c:600
 #, fuzzy, c-format
 msgid "Scanning file `%s'.\n"
 msgstr "Startade samling \"%s\".\n"
 
-#: src/fs/gnunet-publish.c:592
+#: src/fs/gnunet-publish.c:605
 #, c-format
 msgid "There was trouble processing file `%s', skipping it.\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:597
+#: src/fs/gnunet-publish.c:610
 #, fuzzy
 msgid "Preprocessing complete.\n"
 msgstr "Nedstängning klar.\n"
 
-#: src/fs/gnunet-publish.c:601
+#: src/fs/gnunet-publish.c:614
 #, fuzzy, c-format
 msgid "Extracting meta data from file `%s' complete.\n"
 msgstr "Uppdaterar data för modul \"%s\"\n"
 
-#: src/fs/gnunet-publish.c:605
+#: src/fs/gnunet-publish.c:618
 msgid "Meta data extraction has finished.\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:612
+#: src/fs/gnunet-publish.c:625
 #, fuzzy
 msgid "Internal error scanning directory.\n"
 msgstr "=\tFel vid läsning av katalog.\n"
 
-#: src/fs/gnunet-publish.c:643
+#: src/fs/gnunet-publish.c:656
 #, fuzzy, c-format
 msgid "Selected pseudonym `%s' unknown\n"
 msgstr "Namnrymd \"%s\" skapad(rot: %s).\n"
 
-#: src/fs/gnunet-publish.c:669
+#: src/fs/gnunet-publish.c:682
 #, fuzzy, c-format
 msgid "Failed to access `%s': %s\n"
 msgstr "Misslyckades att leverera \"%s\" meddelande.\n"
 
-#: src/fs/gnunet-publish.c:682
+#: src/fs/gnunet-publish.c:695
 msgid ""
 "Failed to start meta directory scanner.  Is gnunet-helper-publish-fs "
 "installed?\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:734
+#: src/fs/gnunet-publish.c:747
 #, c-format
 msgid "Cannot extract metadata from a URI!\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:741
+#: src/fs/gnunet-publish.c:754
 #, fuzzy, c-format
 msgid "You must specify one and only one filename for insertion.\n"
 msgstr "Du måste ange en och endast en fil att avindexera.\n"
 
-#: src/fs/gnunet-publish.c:747
+#: src/fs/gnunet-publish.c:760
 #, fuzzy, c-format
 msgid "You must NOT specify an URI and a filename.\n"
 msgstr "Du måste ange en och endast en fil att avindexera.\n"
 
-#: src/fs/gnunet-publish.c:755 src/vpn/gnunet-vpn.c:213
+#: src/fs/gnunet-publish.c:768 src/vpn/gnunet-vpn.c:208
 #, fuzzy, c-format
 msgid "Option `%s' is required when using option `%s'.\n"
 msgstr "Kommando \"%s\" kräver ett argument (\"%s\").\n"
 
-#: src/fs/gnunet-publish.c:765 src/fs/gnunet-publish.c:772
-#: src/transport/gnunet-transport.c:843 src/transport/gnunet-transport.c:873
+#: src/fs/gnunet-publish.c:778 src/fs/gnunet-publish.c:785
+#: src/transport/gnunet-transport.c:840 src/transport/gnunet-transport.c:870
 #, c-format
 msgid "Option `%s' makes no sense without option `%s'.\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:822
+#: src/fs/gnunet-publish.c:835
 msgid ""
 "print list of extracted keywords that would be used, but do not perform "
 "upload"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:826
+#: src/fs/gnunet-publish.c:839
 msgid ""
 "add an additional keyword for the top-level file or directory (this option "
 "can be specified multiple times)"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:830
+#: src/fs/gnunet-publish.c:843
 msgid "set the meta-data for the given TYPE to the given VALUE"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:833
+#: src/fs/gnunet-publish.c:846
 msgid ""
 "do not index, perform full insertion (stores entire file in encrypted form "
 "in GNUnet database)"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:838
+#: src/fs/gnunet-publish.c:851
 msgid ""
 "specify ID of an updated version to be published in the future (for "
 "namespace insertions only)"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:846
+#: src/fs/gnunet-publish.c:859
 msgid "publish the files under the pseudonym NAME (place file into namespace)"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:852
+#: src/fs/gnunet-publish.c:865
 msgid ""
 "only simulate the process but do not do any actual publishing (useful to "
 "compute URIs)"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:856
+#: src/fs/gnunet-publish.c:869
 msgid ""
 "set the ID of this version of the publication (for namespace insertions only)"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:860
+#: src/fs/gnunet-publish.c:873
 msgid ""
 "URI to be published (can be used instead of passing a file to add keywords "
 "to the file with the respective URI)"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:876
+#: src/fs/gnunet-publish.c:889
 msgid "Publish a file or directory on GNUnet"
 msgstr ""
 
@@ -2997,95 +3362,95 @@ msgid "# Loopback routes suppressed"
 msgstr ""
 
 #: src/fs/gnunet-service-fs.c:639 src/hostlist/gnunet-daemon-hostlist.c:293
-#: src/topology/gnunet-daemon-topology.c:1315
-#: src/topology/gnunet-daemon-topology.c:1322
+#: src/topology/gnunet-daemon-topology.c:1253
+#: src/topology/gnunet-daemon-topology.c:1260
 #, fuzzy, c-format
 msgid "Failed to connect to `%s' service.\n"
 msgstr "Misslyckades att initiera tjänsten \"%s\".\n"
 
-#: src/fs/gnunet-service-fs_cp.c:677
+#: src/fs/gnunet-service-fs_cp.c:680
 #, fuzzy
 msgid "# migration stop messages received"
 msgstr "# krypterade PONG-meddelanden mottagna"
 
-#: src/fs/gnunet-service-fs_cp.c:681
+#: src/fs/gnunet-service-fs_cp.c:684
 #, c-format
 msgid "Migration of content to peer `%s' blocked for %s\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:716
+#: src/fs/gnunet-service-fs_cp.c:719
 #, fuzzy
 msgid "# replies transmitted to other peers"
 msgstr "# byte skickade av typen %d"
 
-#: src/fs/gnunet-service-fs_cp.c:722
+#: src/fs/gnunet-service-fs_cp.c:725
 msgid "# replies dropped"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:747 src/fs/gnunet-service-fs_cp.c:1296
+#: src/fs/gnunet-service-fs_cp.c:750 src/fs/gnunet-service-fs_cp.c:1299
 msgid "# P2P searches active"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:840
+#: src/fs/gnunet-service-fs_cp.c:843
 msgid "# artificial delays introduced (ms)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:893
+#: src/fs/gnunet-service-fs_cp.c:896
 #, fuzzy
 msgid "# replies dropped due to type mismatch"
 msgstr "# byte mottagna av typen %d"
 
-#: src/fs/gnunet-service-fs_cp.c:901
+#: src/fs/gnunet-service-fs_cp.c:904
 #, fuzzy
 msgid "# replies received for other peers"
 msgstr "# byte mottagna av typen %d"
 
-#: src/fs/gnunet-service-fs_cp.c:915
+#: src/fs/gnunet-service-fs_cp.c:918
 msgid "# replies dropped due to insufficient cover traffic"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:953
+#: src/fs/gnunet-service-fs_cp.c:956
 msgid "# P2P searches destroyed due to ultimate reply"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1021
+#: src/fs/gnunet-service-fs_cp.c:1024
 msgid "# requests done for free (low load)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1046
+#: src/fs/gnunet-service-fs_cp.c:1049
 msgid "# request dropped, priority insufficient"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1056
+#: src/fs/gnunet-service-fs_cp.c:1059
 msgid "# requests done for a price (normal load)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1134
+#: src/fs/gnunet-service-fs_cp.c:1137
 msgid "# GET requests received (from other peers)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1168
+#: src/fs/gnunet-service-fs_cp.c:1171
 msgid "# requests dropped due to initiator not being connected"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1191
+#: src/fs/gnunet-service-fs_cp.c:1194
 msgid "# requests dropped due to missing reverse route"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1241
+#: src/fs/gnunet-service-fs_cp.c:1244
 msgid "# requests dropped due TTL underflow"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1265
+#: src/fs/gnunet-service-fs_cp.c:1268
 msgid "# requests dropped due to higher-TTL request"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1294
+#: src/fs/gnunet-service-fs_cp.c:1297
 #, fuzzy
 msgid "# P2P query messages received and processed"
 msgstr "# krypterade PONG-meddelanden mottagna"
 
-#: src/fs/gnunet-service-fs_cp.c:1664
+#: src/fs/gnunet-service-fs_cp.c:1668
 #, fuzzy
 msgid "# migration stop messages sent"
 msgstr "# krypterade PONG-meddelanden mottagna"
@@ -3224,117 +3589,117 @@ msgstr "# byte mottogs via TCP"
 msgid "# query plan entries"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:310
+#: src/fs/gnunet-service-fs_pr.c:311
 #, fuzzy
 msgid "# Pending requests created"
 msgstr "# byte mottogs via TCP"
 
-#: src/fs/gnunet-service-fs_pr.c:393 src/fs/gnunet-service-fs_pr.c:644
+#: src/fs/gnunet-service-fs_pr.c:394 src/fs/gnunet-service-fs_pr.c:645
 msgid "# Pending requests active"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:812
+#: src/fs/gnunet-service-fs_pr.c:813
 #, fuzzy
 msgid "# replies received and matched"
 msgstr "# byte mottagna av typen %d"
 
-#: src/fs/gnunet-service-fs_pr.c:842
+#: src/fs/gnunet-service-fs_pr.c:843
 msgid "# duplicate replies discarded (bloomfilter)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:851
+#: src/fs/gnunet-service-fs_pr.c:852
 msgid "# irrelevant replies discarded"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:865
+#: src/fs/gnunet-service-fs_pr.c:866
 #, c-format
 msgid "Unsupported block type %u\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:878
+#: src/fs/gnunet-service-fs_pr.c:879
 msgid "# results found locally"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:999
+#: src/fs/gnunet-service-fs_pr.c:1000
 msgid "# Datastore `PUT' failures"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1026
+#: src/fs/gnunet-service-fs_pr.c:1027
 #, fuzzy
 msgid "# storage requests dropped due to high load"
 msgstr "Nätverksannonsering avstängd i konfigurationen!\n"
 
-#: src/fs/gnunet-service-fs_pr.c:1061
+#: src/fs/gnunet-service-fs_pr.c:1062
 #, fuzzy
 msgid "# Replies received from DHT"
 msgstr "# byte mottagna via HTTP"
 
-#: src/fs/gnunet-service-fs_pr.c:1189
+#: src/fs/gnunet-service-fs_pr.c:1190
 #, fuzzy
 msgid "# Replies received from MESH"
 msgstr "# byte mottagna via HTTP"
 
-#: src/fs/gnunet-service-fs_pr.c:1241
+#: src/fs/gnunet-service-fs_pr.c:1242
 #, c-format
 msgid "Datastore lookup already took %s!\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1261
+#: src/fs/gnunet-service-fs_pr.c:1262
 #, c-format
 msgid "On-demand lookup already took %s!\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1308
+#: src/fs/gnunet-service-fs_pr.c:1309
 msgid "# Datastore lookups concluded (no results)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1323
+#: src/fs/gnunet-service-fs_pr.c:1324
 msgid "# Datastore lookups concluded (seen all)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1332
+#: src/fs/gnunet-service-fs_pr.c:1333
 msgid "# Datastore lookups aborted (more than MAX_RESULTS)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1347
+#: src/fs/gnunet-service-fs_pr.c:1348
 msgid "# requested DBLOCK or IBLOCK not found"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1361
+#: src/fs/gnunet-service-fs_pr.c:1362
 msgid "# on-demand blocks matched requests"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1374
+#: src/fs/gnunet-service-fs_pr.c:1375
 msgid "# on-demand lookups performed successfully"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1379
+#: src/fs/gnunet-service-fs_pr.c:1380
 msgid "# on-demand lookups failed"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1406 src/fs/gnunet-service-fs_pr.c:1446
-#: src/fs/gnunet-service-fs_pr.c:1587
+#: src/fs/gnunet-service-fs_pr.c:1407 src/fs/gnunet-service-fs_pr.c:1447
+#: src/fs/gnunet-service-fs_pr.c:1588
 msgid "# Datastore lookups concluded (error queueing)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1464
+#: src/fs/gnunet-service-fs_pr.c:1465
 msgid "# Datastore lookups concluded (found last result)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1475
+#: src/fs/gnunet-service-fs_pr.c:1476
 msgid "# Datastore lookups concluded (load too high)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1563
+#: src/fs/gnunet-service-fs_pr.c:1564
 msgid "# Datastore lookups initiated"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1648
+#: src/fs/gnunet-service-fs_pr.c:1649
 #, fuzzy
 msgid "# GAP PUT messages received"
 msgstr "# krypterade PONG-meddelanden mottagna"
 
-#: src/fs/gnunet-service-fs_push.c:629
+#: src/fs/gnunet-service-fs_push.c:631
 msgid "time required, content pushing disabled"
 msgstr ""
 
@@ -3369,7 +3734,7 @@ msgstr "Kunde inte komma åt namnrymdsinformation.\n"
 msgid "Unindex a file that was previously indexed with gnunet-publish."
 msgstr ""
 
-#: src/gns/gns_api.c:385
+#: src/gns/gns_api.c:387
 #, fuzzy
 msgid "Failed to serialize lookup reply from GNS service!\n"
 msgstr "Misslyckades att ta emot svar till \"%s\" meddelande från gnunetd\n"
@@ -3394,203 +3759,344 @@ msgstr "Mottog ogiltig \"%s\" begäran (storlek %d)\n"
 msgid "Received unsupported DNS request from %s\n"
 msgstr "Mottog okänd typ av begäran %d vid %s:%d\n"
 
-#: src/gns/gnunet-dns2gns.c:703
+#: src/gns/gnunet-dns2gns.c:701
 msgid "No ego configured for `dns2gns` subsystem\n"
 msgstr ""
 
-#: src/gns/gnunet-dns2gns.c:729
+#: src/gns/gnunet-dns2gns.c:727
 #, fuzzy
 msgid "No DNS server specified!\n"
 msgstr "Inga nyckelord angivna!\n"
 
-#: src/gns/gnunet-dns2gns.c:751
+#: src/gns/gnunet-dns2gns.c:749
 #, fuzzy
 msgid "No valid GNS zone specified!\n"
 msgstr "Inga nyckelord angivna!\n"
 
-#: src/gns/gnunet-dns2gns.c:772
+#: src/gns/gnunet-dns2gns.c:770
 msgid "IP of recursive DNS resolver to use (required)"
 msgstr ""
 
-#: src/gns/gnunet-dns2gns.c:775
+#: src/gns/gnunet-dns2gns.c:773
 msgid "Authoritative FCFS suffix to use (optional); default: fcfs.zkey.eu"
 msgstr ""
 
-#: src/gns/gnunet-dns2gns.c:778
+#: src/gns/gnunet-dns2gns.c:776
 msgid "Authoritative DNS suffix to use (optional); default: zkey.eu"
 msgstr ""
 
-#: src/gns/gnunet-dns2gns.c:781
+#: src/gns/gnunet-dns2gns.c:779
 msgid "UDP port to listen on for inbound DNS requests; default: 53"
 msgstr ""
 
-#: src/gns/gnunet-dns2gns.c:784
+#: src/gns/gnunet-dns2gns.c:782
 msgid "Public key of the GNS zone to use (overrides default)"
 msgstr ""
 
-#: src/gns/gnunet-dns2gns.c:797
+#: src/gns/gnunet-dns2gns.c:795
 msgid "GNUnet DNS-to-GNS proxy (a DNS server)"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:205
+#: src/gns/gnunet-gns.c:217
 #, c-format
 msgid "Please specify name to lookup!\n"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:285
+#: src/gns/gnunet-gns.c:297
 #, c-format
 msgid "Ego for `%s' not found, cannot perform lookup.\n"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:323
+#: src/gns/gnunet-gns.c:335
 #, c-format
 msgid ""
 "Ego for `master-zone' not found, cannot perform lookup.  Did you run gnunet-"
 "gns-import.sh?\n"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:352
+#: src/gns/gnunet-gns.c:364
 #, fuzzy, c-format
 msgid "Failed to connect to GNS\n"
 msgstr "Misslyckades att ansluta till gnunetd.\n"
 
-#: src/gns/gnunet-gns.c:365
+#: src/gns/gnunet-gns.c:377
 #, c-format
 msgid "Public key `%s' is not well-formed\n"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:414
+#: src/gns/gnunet-gns.c:426
 msgid "Lookup a record for the given name"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:417
+#: src/gns/gnunet-gns.c:429
 #, fuzzy
 msgid "Specify the type of the record to lookup"
 msgstr "ange prioritet för innehållet"
 
-#: src/gns/gnunet-gns.c:420
+#: src/gns/gnunet-gns.c:432
 msgid "No unneeded output"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:423
+#: src/gns/gnunet-gns.c:435
 #, fuzzy
 msgid "Specify the public key of the zone to lookup the record in"
 msgstr "ange prioritet för innehållet"
 
-#: src/gns/gnunet-gns.c:426
+#: src/gns/gnunet-gns.c:438
 #, fuzzy
 msgid "Specify the name of the ego of the zone to lookup the record in"
 msgstr "ange prioritet för innehållet"
 
-#: src/gns/gnunet-gns.c:439
+#: src/gns/gnunet-gns.c:451
 #, fuzzy
 msgid "GNUnet GNS resolver tool"
 msgstr "Spåra GNUnets nätverkstopologi."
 
-#: src/gns/gnunet-gns-proxy.c:60 src/hostlist/hostlist-client.c:469
+#: src/gns/gnunet-gns-proxy.c:105 src/hostlist/hostlist-client.c:469
 #: src/hostlist/hostlist-client.c:680 src/hostlist/hostlist-client.c:686
 #: src/hostlist/hostlist-client.c:738 src/hostlist/hostlist-client.c:747
 #: src/hostlist/hostlist-client.c:868 src/hostlist/hostlist-client.c:960
 #: src/hostlist/hostlist-client.c:965
-#: src/transport/plugin_transport_http_client.c:1068
-#: src/transport/plugin_transport_http_client.c:1083
+#: src/transport/plugin_transport_http_client.c:1067
+#: src/transport/plugin_transport_http_client.c:1082
 #, fuzzy, c-format
 msgid "%s failed at %s:%d: `%s'\n"
 msgstr "\"%s\" misslyckades vid %s:%d med fel: \"%s\".\n"
 
-#: src/gns/gnunet-gns-proxy.c:2344
+#: src/gns/gnunet-gns-proxy.c:839
+#, fuzzy, c-format
+msgid "Unsupported CURL SSL backend %d\n"
+msgstr "Kommando \"%s\" stöds ej.  Avbryter.\n"
+
+#: src/gns/gnunet-gns-proxy.c:862
+#, fuzzy, c-format
+msgid "Failed to fetch CN from cert: %s\n"
+msgstr "Misslyckades att skicka HTTP-begäran till värd \"%s\": %s\n"
+
+#: src/gns/gnunet-gns-proxy.c:885
+#, fuzzy, c-format
+msgid "Failed to initialize DANE: %s\n"
+msgstr "Kunde inte initiera SQLite.\n"
+
+#: src/gns/gnunet-gns-proxy.c:898
+#, fuzzy, c-format
+msgid "Failed to parse DANE record: %s\n"
+msgstr "Misslyckades att skicka HTTP-begäran till värd \"%s\": %s\n"
+
+#: src/gns/gnunet-gns-proxy.c:913
+#, fuzzy, c-format
+msgid "Failed to verify TLS connection using DANE: %s\n"
+msgstr "Kunde inte spara konfigurationsfil \"%s\":"
+
+#: src/gns/gnunet-gns-proxy.c:923
+#, c-format
+msgid "Failed DANE verification failed with GnuTLS verify status code: %u\n"
+msgstr ""
+
+#: src/gns/gnunet-gns-proxy.c:947
+#, c-format
+msgid "SSL certificate subject name (%s) does not match `%s'\n"
+msgstr ""
+
+#: src/gns/gnunet-gns-proxy.c:1092
+#, c-format
+msgid "Cookie domain `%s' supplied by server is invalid\n"
+msgstr ""
+
+#: src/gns/gnunet-gns-proxy.c:1609
+#, fuzzy, c-format
+msgid "Unsupported HTTP method `%s'\n"
+msgstr "Kommando \"%s\" stöds ej.  Avbryter.\n"
+
+#: src/gns/gnunet-gns-proxy.c:1979
 #, fuzzy, c-format
 msgid "Unable to import private key from file `%s'\n"
 msgstr "Kunde inte skapa användarkonto:"
 
-#: src/gns/gnunet-gns-proxy.c:2372
+#: src/gns/gnunet-gns-proxy.c:2009
 #, fuzzy, c-format
 msgid "Unable to import certificate %s\n"
 msgstr "Kunde inte spara konfigurationsfil \"%s\":"
 
-#: src/gns/gnunet-gns-proxy.c:2637 src/namestore/gnunet-namestore-fcfsd.c:958
-#, fuzzy
-msgid "Failed to start HTTP server\n"
+#: src/gns/gnunet-gns-proxy.c:2178
+#, fuzzy, c-format
+msgid "Failed to start HTTPS server for `%s'\n"
 msgstr "Misslyckades att starta samling.\n"
 
-#: src/gns/gnunet-gns-proxy.c:3020
+#: src/gns/gnunet-gns-proxy.c:2197
+#, fuzzy
+msgid "Failed to pass client to MHD\n"
+msgstr "Misslyckades att ansluta till gnunetd.\n"
+
+#: src/gns/gnunet-gns-proxy.c:2505
+#, fuzzy, c-format
+msgid "Unsupported socks version %d\n"
+msgstr "Kommando \"%s\" stöds ej.  Avbryter.\n"
+
+#: src/gns/gnunet-gns-proxy.c:2534
+#, fuzzy, c-format
+msgid "Unsupported socks command %d\n"
+msgstr "Kommando \"%s\" stöds ej.  Avbryter.\n"
+
+#: src/gns/gnunet-gns-proxy.c:2616
+#, fuzzy, c-format
+msgid "Unsupported socks address type %d\n"
+msgstr "Kommando \"%s\" stöds ej.  Avbryter.\n"
+
+#: src/gns/gnunet-gns-proxy.c:2955
 msgid "No ego configured for `shorten-zone`\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:3060
-msgid "No ego configured for `master-zone`\n"
+#: src/gns/gnunet-gns-proxy.c:2995
+#, c-format
+msgid "No ego configured for `%s`\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:3120
+#: src/gns/gnunet-gns-proxy.c:3057
 #, fuzzy, c-format
 msgid "Failed to load SSL/TLS key and certificate from `%s'\n"
 msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 
-#: src/gns/gnunet-gns-proxy.c:3156
+#: src/gns/gnunet-gns-proxy.c:3098
 msgid "listen on specified port (default: 7777)"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:3159
+#: src/gns/gnunet-gns-proxy.c:3101
 msgid "pem file to use as CA"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:3178
+#: src/gns/gnunet-gns-proxy.c:3120
 msgid "GNUnet GNS proxy"
 msgstr ""
 
-#: src/gns/gnunet-service-gns.c:649
+#: src/gns/gnunet-service-gns.c:860
 #, fuzzy
 msgid "Failed to connect to the namestore!\n"
 msgstr "Misslyckades att ansluta till gnunetd.\n"
 
-#: src/gns/gnunet-service-gns.c:692
+#: src/gns/gnunet-service-gns.c:868
+#, fuzzy
+msgid "Failed to connect to the namecache!\n"
+msgstr "Misslyckades att ansluta till gnunetd.\n"
+
+#: src/gns/gnunet-service-gns.c:901
 #, fuzzy
 msgid "Could not connect to DHT!\n"
 msgstr "Kunde inte ansluta till gnunetd.\n"
 
-#: src/gns/gnunet-service-gns.c:708
+#: src/gns/gnunet-service-gns.c:917
 #, fuzzy
 msgid "valid public key required"
 msgstr "Ogiltigt argument: \"%s\"\n"
 
-#: src/gns/gnunet-service-gns_interceptor.c:201
+#: src/gns/gnunet-service-gns_interceptor.c:263
 msgid "Error converting GNS response to DNS response!\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns_interceptor.c:307
+#: src/gns/gnunet-service-gns_interceptor.c:369
 #, fuzzy
 msgid "Failed to connect to the DNS service!\n"
 msgstr "Misslyckades att ansluta till gnunetd.\n"
 
-#: src/gns/gnunet-service-gns_resolver.c:717
+#: src/gns/gnunet-service-gns_resolver.c:771
 #, fuzzy
 msgid "Failed to parse DNS response\n"
 msgstr "Misslyckades att skicka HTTP-begäran till värd \"%s\": %s\n"
 
-#: src/gns/gnunet-service-gns_resolver.c:843
+#: src/gns/gnunet-service-gns_resolver.c:913
 #, c-format
 msgid "Skipping record of unsupported type %d\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns_resolver.c:1475
+#: src/gns/gnunet-service-gns_resolver.c:1646
 #, c-format
 msgid "GNS lookup resulted in DNS name that is too long (`%s')\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns_resolver.c:1499
+#: src/gns/gnunet-service-gns_resolver.c:1686
 msgid "GNS lookup recursion failed (no delegation record found)\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns_resolver.c:1523
+#: src/gns/gnunet-service-gns_resolver.c:1710
 #, fuzzy, c-format
 msgid "Failed to cache GNS resolution: %s\n"
 msgstr "Misslyckades att skicka HTTP-begäran till värd \"%s\": %s\n"
 
-#: src/gns/gnunet-service-gns_resolver.c:1782
+#: src/gns/gnunet-service-gns_resolver.c:1932
+#, c-format
+msgid "Zone %s was revoked, resolution fails\n"
+msgstr ""
+
+#: src/gns/gnunet-service-gns_resolver.c:2054
 #, c-format
 msgid "Hostname `%s' is not well-formed, resolution fails\n"
 msgstr ""
 
+#: src/gns/plugin_gnsrecord_gns.c:142
+#, fuzzy, c-format
+msgid "Unable to parse PKEY record `%s'\n"
+msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
+
+#: src/gns/plugin_gnsrecord_gns.c:172
+#, fuzzy, c-format
+msgid "Failed to serialize GNS2DNS record with value `%s'\n"
+msgstr "Kunde inte tolka konfigurationsfil \"%s\".\n"
+
+#: src/gns/plugin_gnsrecord_gns.c:186
+#, fuzzy, c-format
+msgid "Unable to parse VPN record string `%s'\n"
+msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
+
+#: src/gnsrecord/plugin_gnsrecord_dns.c:261
+#, fuzzy, c-format
+msgid "Unable to parse IPv4 address `%s'\n"
+msgstr "Ogiltigt svar på \"%s\".\n"
+
+#: src/gnsrecord/plugin_gnsrecord_dns.c:282
+#, fuzzy, c-format
+msgid "Failed to serialize NS record with value `%s'\n"
+msgstr "Kunde inte tolka konfigurationsfil \"%s\".\n"
+
+#: src/gnsrecord/plugin_gnsrecord_dns.c:304
+#, fuzzy, c-format
+msgid "Failed to serialize CNAME record with value `%s'\n"
+msgstr "Kunde inte tolka konfigurationsfil \"%s\".\n"
+
+#: src/gnsrecord/plugin_gnsrecord_dns.c:332
+#, fuzzy, c-format
+msgid "Unable to parse SOA record `%s'\n"
+msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
+
+#: src/gnsrecord/plugin_gnsrecord_dns.c:351
+#, fuzzy, c-format
+msgid "Failed to serialize SOA record with mname `%s' and rname `%s'\n"
+msgstr "Kunde inte tolka konfigurationsfil \"%s\".\n"
+
+#: src/gnsrecord/plugin_gnsrecord_dns.c:374
+#, fuzzy, c-format
+msgid "Failed to serialize PTR record with value `%s'\n"
+msgstr "Kunde inte tolka konfigurationsfil \"%s\".\n"
+
+#: src/gnsrecord/plugin_gnsrecord_dns.c:394
+#, fuzzy, c-format
+msgid "Unable to parse MX record `%s'\n"
+msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
+
+#: src/gnsrecord/plugin_gnsrecord_dns.c:409
+#, fuzzy, c-format
+msgid "Failed to serialize MX record with hostname `%s'\n"
+msgstr "Kunde inte tolka konfigurationsfil \"%s\".\n"
+
+#: src/gnsrecord/plugin_gnsrecord_dns.c:429
+#, fuzzy, c-format
+msgid "Unable to parse IPv6 address `%s'\n"
+msgstr "Ogiltigt svar på \"%s\".\n"
+
+#: src/gnsrecord/plugin_gnsrecord_dns.c:447
+#, fuzzy, c-format
+msgid "Unable to parse TLSA record string `%s'\n"
+msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
+
 #: src/hello/gnunet-hello.c:123
 msgid "Call with name of HELLO file to modify.\n"
 msgstr ""
@@ -3630,37 +4136,37 @@ msgstr "Fel vid skapandet av användare"
 msgid "Modified %u addresses \n"
 msgstr ""
 
-#: src/hello/hello.c:947
+#: src/hello/hello.c:943
 #, fuzzy
 msgid "Failed to parse HELLO message: missing expiration time\n"
 msgstr "Kunde inte spara konfiguration!"
 
-#: src/hello/hello.c:956
+#: src/hello/hello.c:952
 #, fuzzy
 msgid "Failed to parse HELLO message: invalid expiration time\n"
 msgstr "Kunde inte spara konfiguration!"
 
-#: src/hello/hello.c:966
+#: src/hello/hello.c:962
 #, fuzzy
 msgid "Failed to parse HELLO message: malformed\n"
 msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 
-#: src/hello/hello.c:976
+#: src/hello/hello.c:972
 #, fuzzy
 msgid "Failed to parse HELLO message: missing transport plugin\n"
 msgstr "Kunde inte slå upp \"%s\": %s\n"
 
-#: src/hello/hello.c:993
+#: src/hello/hello.c:989
 #, c-format
 msgid "Plugin `%s' not found\n"
 msgstr ""
 
-#: src/hello/hello.c:1002
+#: src/hello/hello.c:998
 #, c-format
 msgid "Plugin `%s' does not support URIs yet\n"
 msgstr ""
 
-#: src/hello/hello.c:1021
+#: src/hello/hello.c:1017
 #, fuzzy, c-format
 msgid "Failed to parse `%s' as an address for plugin `%s'\n"
 msgstr "Misslyckades att binda till UDP-port %d.\n"
@@ -3848,10 +4354,10 @@ msgid "expired addresses encountered"
 msgstr ""
 
 #: src/hostlist/hostlist-server.c:189 src/hostlist/hostlist-server.c:424
-#: src/peerinfo-tool/gnunet-peerinfo.c:358
-#: src/peerinfo-tool/gnunet-peerinfo.c:428
-#: src/peerinfo-tool/gnunet-peerinfo.c:499
-#: src/topology/gnunet-daemon-topology.c:918
+#: src/peerinfo-tool/gnunet-peerinfo.c:350
+#: src/peerinfo-tool/gnunet-peerinfo.c:419
+#: src/peerinfo-tool/gnunet-peerinfo.c:490
+#: src/topology/gnunet-daemon-topology.c:924
 #, fuzzy, c-format
 msgid "Error in communication with PEERINFO service: %s\n"
 msgstr "Skriv ut information om GNUnets motparter."
@@ -3906,8 +4412,8 @@ msgstr ""
 msgid "Advertisement message could not be queued by core\n"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:560 src/peerinfo-tool/gnunet-peerinfo.c:659
-#: src/transport/gnunet-service-transport.c:806
+#: src/hostlist/hostlist-server.c:560 src/peerinfo-tool/gnunet-peerinfo.c:651
+#: src/transport/gnunet-service-transport.c:790
 #, fuzzy
 msgid "Could not access PEERINFO service.  Exiting.\n"
 msgstr "Kunde inte komma åt namnrymdsinformation.\n"
@@ -4024,57 +4530,55 @@ msgstr "Kunde inte spara konfigurationsfil \"%s\":"
 msgid "Failed to create directory `%s' for storing egos\n"
 msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 
-#: src/integration-tests/connection_watchdog.c:998
+#: src/integration-tests/connection_watchdog.c:1012
 #, fuzzy, c-format
 msgid "Transport plugin: `%s' port %llu\n"
 msgstr "Testar transport(er) %s\n"
 
-#: src/integration-tests/connection_watchdog.c:1031
+#: src/integration-tests/connection_watchdog.c:1045
 #, fuzzy, c-format
 msgid "Found %u transport plugins: `%s'\n"
 msgstr "Testar transport(er) %s\n"
 
-#: src/integration-tests/connection_watchdog.c:1091
+#: src/integration-tests/connection_watchdog.c:1105
 msgid "Send ping messages to test connectivity (default == NO)"
 msgstr ""
 
-#: src/integration-tests/connection_watchdog.c:1100
-#: src/multicast/gnunet-multicast.c:70 src/template/gnunet-template.c:70
-#, fuzzy
-msgid "help text"
-msgstr "hjälptext för -t"
+#: src/mesh/gnunet-mesh.c:146
+#, fuzzy, c-format
+msgid "Invalid tunnel owner `%s'\n"
+msgstr "Ogiltigt format för IP: \"%s\"\n"
 
-#: src/mesh/gnunet-mesh.c:205
+#: src/mesh/gnunet-mesh.c:209
 #, fuzzy
 msgid "provide information about all tunnels (continuously) NOT IMPLEMENTED"
 msgstr "Skriv ut information om GNUnets motparter."
 
-#: src/mesh/gnunet-mesh.c:208
+#: src/mesh/gnunet-mesh.c:212
 #, fuzzy
 msgid "provide information about a particular tunnel"
 msgstr "Skriv ut information om GNUnets motparter."
 
-#: src/mesh/gnunet-mesh.c:218
+#: src/mesh/gnunet-mesh.c:222
 #, fuzzy
 msgid "Print information about mesh tunnels and peers."
 msgstr "Skriv ut information om GNUnets motparter."
 
-#: src/mesh/gnunet-service-mesh.c:5634 src/mesh/gnunet-service-mesh-enc.c:7060
+#: src/mesh/gnunet-service-mesh.c:5633 src/mesh/gnunet-service-mesh_peer.c:350
 msgid "Wrong CORE service\n"
 msgstr ""
 
-#: src/mesh/gnunet-service-mesh.c:5774 src/mesh/gnunet-service-mesh.c:5786
-#: src/mesh/gnunet-service-mesh.c:5798 src/mesh/gnunet-service-mesh.c:5810
-#: src/mesh/gnunet-service-mesh.c:5822 src/mesh/gnunet-service-mesh.c:5834
-#: src/nse/gnunet-service-nse.c:1440 src/nse/gnunet-service-nse.c:1458
+#: src/mesh/gnunet-service-mesh.c:5773 src/mesh/gnunet-service-mesh.c:5785
+#: src/mesh/gnunet-service-mesh.c:5797 src/mesh/gnunet-service-mesh.c:5809
+#: src/mesh/gnunet-service-mesh.c:5821 src/mesh/gnunet-service-mesh.c:5833
 #: src/regex/gnunet-daemon-regexprofiler.c:270
 #: src/regex/gnunet-regex-simulation-profiler.c:659
 #, fuzzy, c-format
 msgid "%s service is lacking key configuration settings (%s).  Exiting.\n"
 msgstr "GNUnet-konfiguration"
 
-#: src/mesh/gnunet-service-mesh.c:5846 src/mesh/gnunet-service-mesh.c:5856
-#: src/mesh/gnunet-service-mesh.c:5881
+#: src/mesh/gnunet-service-mesh.c:5845 src/mesh/gnunet-service-mesh.c:5855
+#: src/mesh/gnunet-service-mesh.c:5880
 #, fuzzy, c-format
 msgid ""
 "%s service is lacking key configuration settings (%s). Using default (%u).\n"
@@ -4090,244 +4594,237 @@ msgstr "Försöker använda fil \"%s\" för MySQL-konfiguration.\n"
 msgid "Could not access file `%s': %s\n"
 msgstr "Kunde inte köra \"%s\": %s\n"
 
-#: src/namestore/gnunet-namestore.c:258
+#: src/namecache/gnunet-namecache.c:109
+#, fuzzy, c-format
+msgid "No records found for `%s'"
+msgstr "%d filer hittades i katalog.\n"
+
+#: src/namecache/gnunet-namecache.c:124 src/namestore/gnunet-namestore.c:367
+#, c-format
+msgid "\tCorrupt or unsupported record of type %u\n"
+msgstr ""
+
+#: src/namecache/gnunet-namecache.c:185 src/namestore/gnunet-namestore.c:777
+#, fuzzy, c-format
+msgid "You must specify which zone should be accessed\n"
+msgstr "anger vilken TRANSPORT som ska testas"
+
+#: src/namecache/gnunet-namecache.c:195 src/namestore/gnunet-namestore.c:665
+#, fuzzy, c-format
+msgid "Invalid public key for reverse lookup `%s'\n"
+msgstr "Ogiltigt argument: \"%s\"\n"
+
+#: src/namecache/gnunet-namecache.c:226 src/namestore/gnunet-namestore.c:821
+msgid "name of the record to add/delete/display"
+msgstr ""
+
+#: src/namecache/gnunet-namecache.c:229
+#, fuzzy
+msgid "spezifies the public key of the zone to look in"
+msgstr "ange prioritet för innehållet"
+
+#: src/namecache/gnunet-namecache.c:240 src/namestore/gnunet-namestore.c:853
+#, fuzzy
+msgid "GNUnet zone manipulation tool"
+msgstr "GNUnet-konfiguration"
+
+#: src/namecache/namecache_api.c:276
+msgid "Namecache failed to cache block"
+msgstr ""
+
+#: src/namecache/plugin_namecache_postgres.c:89
+#: src/namestore/plugin_namestore_postgres.c:93
+#, fuzzy
+msgid "Failed to create indices\n"
+msgstr "Kunde inte skapa namnrymd \"%s\" (existerar?).\n"
+
+#: src/namestore/gnunet-namestore.c:278
 #, fuzzy, c-format
 msgid "Adding record failed: %s\n"
 msgstr ""
 "\n"
 "Fel vid uppladdning av fil: %s\n"
 
-#: src/namestore/gnunet-namestore.c:289
+#: src/namestore/gnunet-namestore.c:306
 #, fuzzy, c-format
-msgid "Deleting record failed: %s\n"
+msgid "Deleting record failed, record does not exist%s%s\n"
 msgstr ""
 "\n"
 "Fel vid uppladdning av fil: %s\n"
 
-#: src/namestore/gnunet-namestore.c:338
-#, c-format
-msgid "\tCorrupt or unsupported record of type %u\n"
+#: src/namestore/gnunet-namestore.c:313
+#, fuzzy, c-format
+msgid "Deleting record failed%s%s\n"
 msgstr ""
+"\n"
+"Fel vid uppladdning av fil: %s\n"
 
-#: src/namestore/gnunet-namestore.c:446
+#: src/namestore/gnunet-namestore.c:528
 #, c-format
 msgid "No options given\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:456
-#: src/namestore/gnunet-namestore-fcfsd.c:992
+#: src/namestore/gnunet-namestore.c:539
+#: src/namestore/gnunet-namestore-fcfsd.c:964
 #, fuzzy
 msgid "Failed to connect to namestore\n"
 msgstr "Misslyckades att ansluta till gnunetd.\n"
 
-#: src/namestore/gnunet-namestore.c:464 src/namestore/gnunet-namestore.c:473
-#: src/namestore/gnunet-namestore.c:490 src/namestore/gnunet-namestore.c:512
-#: src/namestore/gnunet-namestore.c:554
+#: src/namestore/gnunet-namestore.c:547 src/namestore/gnunet-namestore.c:556
+#: src/namestore/gnunet-namestore.c:573 src/namestore/gnunet-namestore.c:595
+#: src/namestore/gnunet-namestore.c:635
 #, fuzzy, c-format
 msgid "Missing option `%s' for operation `%s'\n"
 msgstr "Konfigurationsfil \"%s\" skapad.\n"
 
-#: src/namestore/gnunet-namestore.c:465 src/namestore/gnunet-namestore.c:474
-#: src/namestore/gnunet-namestore.c:491 src/namestore/gnunet-namestore.c:513
+#: src/namestore/gnunet-namestore.c:548 src/namestore/gnunet-namestore.c:557
+#: src/namestore/gnunet-namestore.c:574 src/namestore/gnunet-namestore.c:596
 msgid "add"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:482
+#: src/namestore/gnunet-namestore.c:565
 #, fuzzy, c-format
 msgid "Unsupported type `%s'\n"
 msgstr "Kommando \"%s\" stöds ej.  Avbryter.\n"
 
-#: src/namestore/gnunet-namestore.c:502
+#: src/namestore/gnunet-namestore.c:585
 #, fuzzy, c-format
 msgid "Value `%s' invalid for record type `%s'\n"
 msgstr "%s: symbolvärde \"%s\" ogiltigt för %s\n"
 
-#: src/namestore/gnunet-namestore.c:538
+#: src/namestore/gnunet-namestore.c:621
 #, fuzzy, c-format
 msgid "Invalid time format `%s'\n"
 msgstr "Ogiltigt format för IP: \"%s\"\n"
 
-#: src/namestore/gnunet-namestore.c:555
+#: src/namestore/gnunet-namestore.c:636
 msgid "del"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:588
-#: src/peerinfo-tool/gnunet-peerinfo.c:711
+#: src/namestore/gnunet-namestore.c:689
+#: src/peerinfo-tool/gnunet-peerinfo.c:703
 #, fuzzy, c-format
 msgid "Invalid URI `%s'\n"
 msgstr "Ogiltiga argument: "
 
-#: src/namestore/gnunet-namestore.c:645
+#: src/namestore/gnunet-namestore.c:747
 #, fuzzy, c-format
 msgid "Ego `%s' not known to identity service\n"
 msgstr "\"%s\": okänd tjänst: %s\n"
 
-#: src/namestore/gnunet-namestore.c:674
-#, fuzzy, c-format
-msgid "You must specify which zone should be accessed\n"
-msgstr "anger vilken TRANSPORT som ska testas"
-
-#: src/namestore/gnunet-namestore.c:702
+#: src/namestore/gnunet-namestore.c:806
 msgid "add record"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:705
+#: src/namestore/gnunet-namestore.c:809
 msgid "delete record"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:708
+#: src/namestore/gnunet-namestore.c:812
 msgid "display records"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:711
+#: src/namestore/gnunet-namestore.c:815
 msgid ""
 "expiration time for record to use (for adding only), \"never\" is possible"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:714
+#: src/namestore/gnunet-namestore.c:818
 #, fuzzy
 msgid "monitor changes in the namestore"
 msgstr "Misslyckades att ansluta till gnunetd.\n"
 
-#: src/namestore/gnunet-namestore.c:717
-msgid "name of the record to add/delete/display"
-msgstr ""
+#: src/namestore/gnunet-namestore.c:824
+#, fuzzy
+msgid "determine our name for the given PKEY"
+msgstr "Skriv ut information om GNUnets motparter."
 
-#: src/namestore/gnunet-namestore.c:720
+#: src/namestore/gnunet-namestore.c:827
 msgid "type of the record to add/delete/display"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:723
+#: src/namestore/gnunet-namestore.c:830
 msgid "URI to import into our zone"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:726
+#: src/namestore/gnunet-namestore.c:833
 msgid "value of the record to add/delete"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:729
+#: src/namestore/gnunet-namestore.c:836
 msgid "create or list public record"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:732
+#: src/namestore/gnunet-namestore.c:839
 msgid ""
 "create shadow record (only valid if all other records of the same type have "
 "expired"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:735
+#: src/namestore/gnunet-namestore.c:842
 #, fuzzy
 msgid "name of the ego controlling the zone"
 msgstr "Visa värde av alternativet"
 
-#: src/namestore/gnunet-namestore.c:746
-#, fuzzy
-msgid "GNUnet zone manipulation tool"
-msgstr "GNUnet-konfiguration"
-
-#: src/namestore/gnunet-namestore-fcfsd.c:456
+#: src/namestore/gnunet-namestore-fcfsd.c:462
 #, fuzzy, c-format
 msgid "Unsupported form value `%s'\n"
 msgstr "Kommando \"%s\" stöds ej.  Avbryter.\n"
 
-#: src/namestore/gnunet-namestore-fcfsd.c:485
+#: src/namestore/gnunet-namestore-fcfsd.c:489
 #, fuzzy, c-format
 msgid "Failed to create record for domain `%s': %s\n"
 msgstr "Kunde inte tolka konfigurationsfil \"%s\".\n"
 
-#: src/namestore/gnunet-namestore-fcfsd.c:520
+#: src/namestore/gnunet-namestore-fcfsd.c:524
 #, c-format
 msgid "Found existing name `%s' for the given key\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:560
+#: src/namestore/gnunet-namestore-fcfsd.c:590
 #, c-format
 msgid "Found %u existing records for domain `%s'\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:670
+#: src/namestore/gnunet-namestore-fcfsd.c:646
 #, fuzzy, c-format
 msgid "Failed to create page for `%s'\n"
 msgstr "Kunde inte skapa namnrymd \"%s\" (existerar?).\n"
 
-#: src/namestore/gnunet-namestore-fcfsd.c:686
+#: src/namestore/gnunet-namestore-fcfsd.c:662
 #, fuzzy, c-format
 msgid "Failed to setup post processor for `%s'\n"
 msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 
-#: src/namestore/gnunet-namestore-fcfsd.c:722
+#: src/namestore/gnunet-namestore-fcfsd.c:698
 msgid "Domain name must not contain `.'\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:730
+#: src/namestore/gnunet-namestore-fcfsd.c:706
 msgid "Domain name must not contain `+'\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:932
+#: src/namestore/gnunet-namestore-fcfsd.c:904
 msgid "No ego configured for `fcfsd` subsystem\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:1027
-msgid "GNU Name System First Come First Serve name registration service"
-msgstr ""
-
-#: src/namestore/gnunet-service-namestore.c:674
-msgid "Failed to cache encrypted block of my own zone!\n"
-msgstr ""
-
-#: src/namestore/namestore_api.c:319
-msgid "Namestore failed to cache block"
-msgstr ""
+#: src/namestore/gnunet-namestore-fcfsd.c:930
+#, fuzzy
+msgid "Failed to start HTTP server\n"
+msgstr "Misslyckades att starta samling.\n"
 
-#: src/namestore/namestore_api.c:345
-msgid "Namestore failed to store record\n"
+#: src/namestore/gnunet-namestore-fcfsd.c:999
+msgid "GNU Name System First Come First Serve name registration service"
 msgstr ""
 
-#: src/namestore/namestore_api_common.c:691
-#: src/namestore/namestore_api_common.c:831
-#, fuzzy, c-format
-msgid "Unsupported record type %d\n"
-msgstr "Kommando \"%s\" stöds ej.  Avbryter.\n"
-
-#: src/namestore/namestore_api_common.c:698
-#, fuzzy, c-format
-msgid "Unable to parse IPv4 address `%s'\n"
-msgstr "Ogiltigt svar på \"%s\".\n"
-
-#: src/namestore/namestore_api_common.c:721
-#, fuzzy, c-format
-msgid "Unable to parse SOA record `%s'\n"
-msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
-
-#: src/namestore/namestore_api_common.c:744
-#, fuzzy, c-format
-msgid "Unable to parse MX record `%s'\n"
-msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
-
-#: src/namestore/namestore_api_common.c:762
-#, fuzzy, c-format
-msgid "Unable to parse IPv6 address `%s'\n"
-msgstr "Ogiltigt svar på \"%s\".\n"
-
-#: src/namestore/namestore_api_common.c:775
-#, fuzzy, c-format
-msgid "Unable to parse PKEY record `%s'\n"
-msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
-
-#: src/namestore/namestore_api_common.c:796
-#, fuzzy, c-format
-msgid "Unable to parse VPN record string `%s'\n"
-msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
-
-#: src/namestore/namestore_api_common.c:822
+#: src/namestore/gnunet-service-namestore.c:494
 #, fuzzy, c-format
-msgid "Unable to parse TLSA record string `%s'\n"
+msgid "Failed to replicate block in namecache: %s\n"
 msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 
-#: src/namestore/plugin_namestore_postgres.c:95
-#, fuzzy
-msgid "Failed to create indices\n"
-msgstr "Kunde inte skapa namnrymd \"%s\" (existerar?).\n"
+#: src/namestore/namestore_api.c:273
+msgid "Namestore failed to store record\n"
+msgstr ""
 
 #: src/nat/gnunet-nat-server.c:279
 #, c-format
@@ -4442,40 +4939,40 @@ msgstr "Misslyckades att ansluta till gnunetd.\n"
 msgid "Failed to create listen socket bound to `%s' for NAT test: %s\n"
 msgstr ""
 
-#: src/nse/gnunet-nse-profiler.c:889
+#: src/nse/gnunet-nse-profiler.c:858
 #, fuzzy
 msgid "limit to the number of connections to NSE services, 0 for none"
 msgstr "Misslyckades att ansluta till gnunetd.\n"
 
-#: src/nse/gnunet-nse-profiler.c:892
+#: src/nse/gnunet-nse-profiler.c:861
 msgid "name of the file for writing connection information and statistics"
 msgstr ""
 
-#: src/nse/gnunet-nse-profiler.c:895 src/testbed/gnunet-testbed-profiler.c:287
+#: src/nse/gnunet-nse-profiler.c:864 src/testbed/gnunet-testbed-profiler.c:306
 msgid "name of the file with the login information for the testbed"
 msgstr ""
 
-#: src/nse/gnunet-nse-profiler.c:898
+#: src/nse/gnunet-nse-profiler.c:867
 msgid "name of the file for writing the main results"
 msgstr ""
 
-#: src/nse/gnunet-nse-profiler.c:901
+#: src/nse/gnunet-nse-profiler.c:870
 msgid "Number of peers to run in each round, separated by commas"
 msgstr ""
 
-#: src/nse/gnunet-nse-profiler.c:907
+#: src/nse/gnunet-nse-profiler.c:876
 msgid "delay between rounds"
 msgstr ""
 
-#: src/nse/gnunet-nse-profiler.c:916
+#: src/nse/gnunet-nse-profiler.c:885
 #, fuzzy
 msgid "Measure quality and performance of the NSE service."
 msgstr "Kan inte tillgå tjänsten"
 
-#: src/nse/gnunet-service-nse.c:1448
-#, fuzzy
-msgid "Invalid work requirement for NSE service. Exiting.\n"
-msgstr "Ogiltiga argument. Avslutar.\n"
+#: src/nse/gnunet-service-nse.c:1460
+#: src/revocation/gnunet-service-revocation.c:580
+msgid "Value is too large.\n"
+msgstr ""
 
 #: src/nse/gnunet-service-nse.c:1487
 msgid "NSE service is lacking key configuration settings.  Exiting.\n"
@@ -4486,160 +4983,160 @@ msgstr ""
 msgid "Removing expired address of transport `%s'\n"
 msgstr "Tillgängliga transport(er): %s\n"
 
-#: src/peerinfo/gnunet-service-peerinfo.c:353
+#: src/peerinfo/gnunet-service-peerinfo.c:352
 #, fuzzy, c-format
 msgid "Failed to parse HELLO in file `%s': %s\n"
 msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 
-#: src/peerinfo/gnunet-service-peerinfo.c:370
+#: src/peerinfo/gnunet-service-peerinfo.c:369
 #, fuzzy, c-format
 msgid "Failed to parse HELLO in file `%s': %s %u \n"
 msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 
-#: src/peerinfo/gnunet-service-peerinfo.c:448
+#: src/peerinfo/gnunet-service-peerinfo.c:447
 msgid "# peers known"
 msgstr ""
 
-#: src/peerinfo/gnunet-service-peerinfo.c:484
+#: src/peerinfo/gnunet-service-peerinfo.c:483
 #, c-format
 msgid ""
 "File `%s' in directory `%s' does not match naming convention. Removed.\n"
 msgstr ""
 
-#: src/peerinfo/gnunet-service-peerinfo.c:637
+#: src/peerinfo/gnunet-service-peerinfo.c:638
 #, fuzzy, c-format
 msgid "Scanning directory `%s'\n"
 msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 
-#: src/peerinfo/gnunet-service-peerinfo.c:642
+#: src/peerinfo/gnunet-service-peerinfo.c:643
 #, c-format
 msgid "Still no peers found in `%s'!\n"
 msgstr ""
 
-#: src/peerinfo/gnunet-service-peerinfo.c:975
+#: src/peerinfo/gnunet-service-peerinfo.c:979
 #, fuzzy, c-format
 msgid "Cleaning up directory `%s'\n"
 msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 
-#: src/peerinfo/gnunet-service-peerinfo.c:1265
+#: src/peerinfo/gnunet-service-peerinfo.c:1269
 #, c-format
 msgid "Importing HELLOs from `%s'\n"
 msgstr ""
 
-#: src/peerinfo/peerinfo_api.c:239
+#: src/peerinfo/peerinfo_api.c:236
 msgid "aborted due to explicit disconnect request"
 msgstr ""
 
-#: src/peerinfo/peerinfo_api.c:359
+#: src/peerinfo/peerinfo_api.c:356
 #, fuzzy
 msgid "failed to transmit request (service down?)"
 msgstr "Misslyckades att skicka HTTP-begäran till värd \"%s\": %s\n"
 
-#: src/peerinfo/peerinfo_api.c:509
+#: src/peerinfo/peerinfo_api.c:506
 #, fuzzy
 msgid "Failed to receive response from `PEERINFO' service."
 msgstr "Misslyckades att ta emot svar till \"%s\" meddelande från gnunetd\n"
 
-#: src/peerinfo/peerinfo_api.c:550 src/peerinfo/peerinfo_api.c:569
-#: src/peerinfo/peerinfo_api.c:584 src/peerinfo/peerinfo_api.c:595
-#: src/peerinfo/peerinfo_api.c:606
+#: src/peerinfo/peerinfo_api.c:547 src/peerinfo/peerinfo_api.c:566
+#: src/peerinfo/peerinfo_api.c:581 src/peerinfo/peerinfo_api.c:592
+#: src/peerinfo/peerinfo_api.c:603
 #, fuzzy
 msgid "Received invalid message from `PEERINFO' service."
 msgstr "mottog ogiltigt \"%s\" meddelande: %s.\n"
 
-#: src/peerinfo/peerinfo_api.c:681
+#: src/peerinfo/peerinfo_api.c:678
 #, fuzzy
 msgid "Timeout transmitting iteration request to `PEERINFO' service."
 msgstr "Misslyckades att initiera tjänsten \"%s\".\n"
 
-#: src/peerinfo/peerinfo_api_notify.c:269
+#: src/peerinfo/peerinfo_api_notify.c:268
 #, fuzzy, c-format
 msgid "Could not connect to `%s' service.\n"
 msgstr "Kunde inte ansluta till gnunetd.\n"
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:239
+#: src/peerinfo-tool/gnunet-peerinfo.c:232
 #, fuzzy, c-format
 msgid "%sPeer `%s'\n"
 msgstr "Jag är ändpunkt \"%s\".\n"
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:246
+#: src/peerinfo-tool/gnunet-peerinfo.c:239
 #, c-format
 msgid "\tExpires: %s \t %s\n"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:437
+#: src/peerinfo-tool/gnunet-peerinfo.c:428
 #, fuzzy, c-format
 msgid "Failure: Did not receive %s\n"
 msgstr "Misslyckades att leverera \"%s\" meddelande.\n"
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:445
+#: src/peerinfo-tool/gnunet-peerinfo.c:436
 #, c-format
 msgid "Failure: Received invalid %s\n"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:454
+#: src/peerinfo-tool/gnunet-peerinfo.c:445
 #, fuzzy, c-format
 msgid "Failed to write HELLO with %u bytes to file `%s'\n"
 msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:467
+#: src/peerinfo-tool/gnunet-peerinfo.c:458
 #, c-format
 msgid "Wrote %s HELLO containing %u addresses with %u bytes to file `%s'\n"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:531
+#: src/peerinfo-tool/gnunet-peerinfo.c:522
 #, c-format
 msgid "Failure adding HELLO: %s\n"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:669
+#: src/peerinfo-tool/gnunet-peerinfo.c:661
 #, fuzzy, c-format
 msgid "Could not find option `%s:%s' in configuration.\n"
 msgstr "Kunde inte hitta motpart \"%s\" i routingtabell!\n"
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:675
+#: src/peerinfo-tool/gnunet-peerinfo.c:667
 #, fuzzy, c-format
 msgid "Loading hostkey from `%s' failed.\n"
 msgstr "Tolkning av HTTP-svar för URL \"%s\" misslyckades.\n"
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:734
+#: src/peerinfo-tool/gnunet-peerinfo.c:725
 #, c-format
 msgid "I am peer `%s'.\n"
 msgstr "Jag är ändpunkt \"%s\".\n"
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:777
+#: src/peerinfo-tool/gnunet-peerinfo.c:769
 msgid "don't resolve host names"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:780
+#: src/peerinfo-tool/gnunet-peerinfo.c:772
 msgid "output only the identity strings"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:783
+#: src/peerinfo-tool/gnunet-peerinfo.c:775
 msgid "include friend-only information"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:786
+#: src/peerinfo-tool/gnunet-peerinfo.c:778
 msgid "output our own identity only"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:789
+#: src/peerinfo-tool/gnunet-peerinfo.c:781
 msgid "list all known peers"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:792
+#: src/peerinfo-tool/gnunet-peerinfo.c:784
 msgid "dump hello to file"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:795
+#: src/peerinfo-tool/gnunet-peerinfo.c:787
 msgid "also output HELLO uri(s)"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:798
+#: src/peerinfo-tool/gnunet-peerinfo.c:790
 msgid "add given HELLO uri to the database"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:809
+#: src/peerinfo-tool/gnunet-peerinfo.c:801
 #, fuzzy
 msgid "Print information about peers."
 msgstr "Skriv ut information om GNUnets motparter."
@@ -4672,89 +5169,84 @@ msgstr "\"%s\" misslyckades vid %s:%d med fel: %s\n"
 msgid "Unable to initialize Postgres: %s"
 msgstr "Kunde inte initiera SQLite.\n"
 
-#: src/psycstore/gnunet-service-psycstore.c:203
+#: src/psycstore/gnunet-service-psycstore.c:200
 #, fuzzy
 msgid "Failed to store membership information!\n"
 msgstr "Misslyckades att leverera \"%s\" meddelande.\n"
 
-#: src/psycstore/gnunet-service-psycstore.c:227
+#: src/psycstore/gnunet-service-psycstore.c:224
 #, fuzzy
 msgid "Failed to test membership!\n"
 msgstr "Kunde inte skapa värdnyckel!\n"
 
-#: src/psycstore/gnunet-service-psycstore.c:249
+#: src/psycstore/gnunet-service-psycstore.c:246
 #, fuzzy
 msgid "Failed to store fragment!\n"
 msgstr "Misslyckades att starta samling.\n"
 
-#: src/psycstore/gnunet-service-psycstore.c:275
+#: src/psycstore/gnunet-service-psycstore.c:272
 #, fuzzy
 msgid "Failed to get fragment!\n"
 msgstr "Kunde inte skapa värdnyckel!\n"
 
-#: src/psycstore/gnunet-service-psycstore.c:302
+#: src/psycstore/gnunet-service-psycstore.c:299
 #, fuzzy
 msgid "Failed to get message!\n"
 msgstr "Kunde inte skapa värdnyckel!\n"
 
-#: src/psycstore/gnunet-service-psycstore.c:331
+#: src/psycstore/gnunet-service-psycstore.c:328
 #, fuzzy
 msgid "Failed to get message fragment!\n"
 msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 
-#: src/psycstore/gnunet-service-psycstore.c:357
+#: src/psycstore/gnunet-service-psycstore.c:356
 #, fuzzy
 msgid "Failed to get master counters!\n"
 msgstr "Kunde inte skapa värdnyckel!\n"
 
-#: src/psycstore/gnunet-service-psycstore.c:395
-#, fuzzy
-msgid "Failed to get slave counters!\n"
-msgstr "Kunde inte skapa värdnyckel!\n"
-
-#: src/psycstore/gnunet-service-psycstore.c:429
-#: src/psycstore/gnunet-service-psycstore.c:502
+#: src/psycstore/gnunet-service-psycstore.c:392
+#: src/psycstore/gnunet-service-psycstore.c:465
 msgid "Tried to set invalid state variable name!\n"
 msgstr ""
 
-#: src/psycstore/gnunet-service-psycstore.c:445
+#: src/psycstore/gnunet-service-psycstore.c:408
 #, fuzzy
 msgid "Failed to begin modifying state!\n"
 msgstr "Misslyckades att starta samling.\n"
 
-#: src/psycstore/gnunet-service-psycstore.c:468
+#: src/psycstore/gnunet-service-psycstore.c:431
 #, fuzzy, c-format
 msgid "Unknown operator: %c\n"
 msgstr "Okänd operation \"%s\"\n"
 
-#: src/psycstore/gnunet-service-psycstore.c:478
+#: src/psycstore/gnunet-service-psycstore.c:441
 #, fuzzy
 msgid "Failed to end modifying state!\n"
 msgstr "Misslyckades att starta samling.\n"
 
-#: src/psycstore/gnunet-service-psycstore.c:516
+#: src/psycstore/gnunet-service-psycstore.c:479
 #, fuzzy
 msgid "Failed to begin synchronizing state!\n"
 msgstr "Kunde inte skapa värdnyckel!\n"
 
-#: src/psycstore/gnunet-service-psycstore.c:532
+#: src/psycstore/gnunet-service-psycstore.c:495
 #, fuzzy
 msgid "Failed to end synchronizing state!\n"
 msgstr "Kunde inte skapa värdnyckel!\n"
 
-#: src/psycstore/gnunet-service-psycstore.c:552
-#: src/psycstore/gnunet-service-psycstore.c:571
+#: src/psycstore/gnunet-service-psycstore.c:515
+#: src/psycstore/gnunet-service-psycstore.c:534
 #, fuzzy
 msgid "Failed to reset state!\n"
 msgstr "Kunde inte skapa värdnyckel!\n"
 
-#: src/psycstore/gnunet-service-psycstore.c:594
-#: src/psycstore/gnunet-service-psycstore.c:645
+#: src/psycstore/gnunet-service-psycstore.c:557
+#: src/psycstore/gnunet-service-psycstore.c:608
 msgid "Tried to get invalid state variable name!\n"
 msgstr ""
 
-#: src/psycstore/gnunet-service-psycstore.c:621
-#: src/psycstore/gnunet-service-psycstore.c:660
+#: src/psycstore/gnunet-service-psycstore.c:584
+#: src/psycstore/gnunet-service-psycstore.c:623
 #, fuzzy
 msgid "Failed to get state variable!\n"
 msgstr "Kunde inte skapa värdnyckel!\n"
@@ -4782,69 +5274,66 @@ msgstr "Fel vid skapandet av användare"
 msgid "SQLite database running\n"
 msgstr ""
 
-#: src/pt/gnunet-daemon-pt.c:266
+#: src/pt/gnunet-daemon-pt.c:483
 #, fuzzy
 msgid "Failed to pack DNS request.  Dropping.\n"
 msgstr "Misslyckades att skicka HTTP-begäran till värd \"%s\": %s\n"
 
-#: src/pt/gnunet-daemon-pt.c:272
+#: src/pt/gnunet-daemon-pt.c:489
 #, fuzzy
 msgid "# DNS requests mapped to VPN"
 msgstr "# byte mottogs via TCP"
 
-#: src/pt/gnunet-daemon-pt.c:325
+#: src/pt/gnunet-daemon-pt.c:542
 msgid "# DNS records modified"
 msgstr ""
 
-#: src/pt/gnunet-daemon-pt.c:502
+#: src/pt/gnunet-daemon-pt.c:718
 msgid "# DNS replies intercepted"
 msgstr ""
 
-#: src/pt/gnunet-daemon-pt.c:508
+#: src/pt/gnunet-daemon-pt.c:724
 #, fuzzy
 msgid "Failed to parse DNS request.  Dropping.\n"
 msgstr "Misslyckades att skicka HTTP-begäran till värd \"%s\": %s\n"
 
-#: src/pt/gnunet-daemon-pt.c:604
+#: src/pt/gnunet-daemon-pt.c:827
 #, fuzzy
 msgid "# DNS requests dropped (timeout)"
 msgstr "Nätverksannonsering avstängd i konfigurationen!\n"
 
-#: src/pt/gnunet-daemon-pt.c:634
+#: src/pt/gnunet-daemon-pt.c:884
 #, fuzzy
 msgid "# DNS requests intercepted"
 msgstr "# byte mottogs via TCP"
 
-#: src/pt/gnunet-daemon-pt.c:639
+#: src/pt/gnunet-daemon-pt.c:889
 msgid "# DNS requests dropped (DNS mesh tunnel down)"
 msgstr ""
 
-#: src/pt/gnunet-daemon-pt.c:647
+#: src/pt/gnunet-daemon-pt.c:897
 #, fuzzy
 msgid "# DNS requests dropped (malformed)"
 msgstr "# byte mottogs via TCP"
 
-#: src/pt/gnunet-daemon-pt.c:715
+#: src/pt/gnunet-daemon-pt.c:970
 #, fuzzy
 msgid "# DNS replies received"
 msgstr "# byte mottogs via TCP"
 
-#: src/pt/gnunet-daemon-pt.c:729
+#: src/pt/gnunet-daemon-pt.c:986
 #, fuzzy
 msgid "# DNS replies dropped (too late?)"
 msgstr "# byte mottagna av typen %d"
 
-#: src/pt/gnunet-daemon-pt.c:747 src/pt/gnunet-daemon-pt.c:759
-msgid "# DNS requests aborted (tunnel down)"
-msgstr ""
-
-#: src/pt/gnunet-daemon-pt.c:901 src/pt/gnunet-daemon-pt.c:910
-#: src/pt/gnunet-daemon-pt.c:930 src/pt/gnunet-daemon-pt.c:940
+#: src/pt/gnunet-daemon-pt.c:1262 src/pt/gnunet-daemon-pt.c:1271
+#: src/pt/gnunet-daemon-pt.c:1291 src/pt/gnunet-daemon-pt.c:1302
+#: src/pt/gnunet-daemon-pt.c:1311
 #, fuzzy, c-format
 msgid "Failed to connect to %s service.  Exiting.\n"
 msgstr "Misslyckades att initiera tjänsten \"%s\".\n"
 
-#: src/pt/gnunet-daemon-pt.c:977
+#: src/pt/gnunet-daemon-pt.c:1348
 msgid "Daemon to run to perform IP protocol translation to GNUnet"
 msgstr ""
 
@@ -4852,66 +5341,66 @@ msgstr ""
 msgid "Daemon to announce regular expressions for the peer using mesh."
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1281
+#: src/regex/gnunet-regex-profiler.c:1288
 #, fuzzy
 msgid "No configuration file given. Exiting\n"
 msgstr "använd konfigurationsfil FILNAMN"
 
-#: src/regex/gnunet-regex-profiler.c:1292
+#: src/regex/gnunet-regex-profiler.c:1299
 #, fuzzy
 msgid "Configuration option \"regex_prefix\" missing. Exiting\n"
 msgstr "Konfigurationsfil \"%s\" skapad.\n"
 
-#: src/regex/gnunet-regex-profiler.c:1321
+#: src/regex/gnunet-regex-profiler.c:1328
 #: src/regex/gnunet-regex-simulation-profiler.c:622
 #, c-format
 msgid "No policy directory specified on command line. Exiting.\n"
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1327
+#: src/regex/gnunet-regex-profiler.c:1334
 #: src/regex/gnunet-regex-simulation-profiler.c:629
 #, c-format
 msgid "Specified policies directory does not exist. Exiting.\n"
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1334
+#: src/regex/gnunet-regex-profiler.c:1341
 #, fuzzy, c-format
 msgid "No files found in `%s'\n"
 msgstr "%d filer hittades i katalog.\n"
 
-#: src/regex/gnunet-regex-profiler.c:1343
+#: src/regex/gnunet-regex-profiler.c:1350
 msgid "No search strings file given. Exiting.\n"
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1363
+#: src/regex/gnunet-regex-profiler.c:1370
 #, fuzzy
 msgid "Error loading search strings. Exiting.\n"
 msgstr "Fel vid lämning av DHT.\n"
 
-#: src/regex/gnunet-regex-profiler.c:1445
+#: src/regex/gnunet-regex-profiler.c:1455
 #, fuzzy
 msgid "name of the file for writing statistics"
 msgstr "Visa värde av alternativet"
 
-#: src/regex/gnunet-regex-profiler.c:1448
+#: src/regex/gnunet-regex-profiler.c:1458
 msgid "wait TIMEOUT before ending the experiment"
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1451
+#: src/regex/gnunet-regex-profiler.c:1461
 msgid "directory with policy files"
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1454
+#: src/regex/gnunet-regex-profiler.c:1464
 #, fuzzy
 msgid "name of file with input strings"
 msgstr "Visa värde av alternativet"
 
-#: src/regex/gnunet-regex-profiler.c:1457
+#: src/regex/gnunet-regex-profiler.c:1467
 #, fuzzy
 msgid "name of file with hosts' names"
 msgstr "Visa värde av alternativet"
 
-#: src/regex/gnunet-regex-profiler.c:1469
+#: src/regex/gnunet-regex-profiler.c:1479
 msgid "Profiler for regex"
 msgstr ""
 
@@ -4928,391 +5417,494 @@ msgstr ""
 msgid "Profiler for regex library"
 msgstr ""
 
-#: src/scalarproduct/gnunet-scalarproduct.c:195
+#: src/revocation/gnunet-revocation.c:121
+#, fuzzy, c-format
+msgid "Key `%s' is valid\n"
+msgstr "Formatet på pseudonym \"%s\" är ogiltig.\n"
+
+#: src/revocation/gnunet-revocation.c:126
+#, fuzzy, c-format
+msgid "Key `%s' has been revoked\n"
+msgstr "Tjänst borttagen.\n"
+
+#: src/revocation/gnunet-revocation.c:132
+#, fuzzy
+msgid "Internal error\n"
+msgstr "Okänt fel.\n"
+
+#: src/revocation/gnunet-revocation.c:158
+#, c-format
+msgid "Key for ego `%s' is still valid, revocation failed (!)\n"
+msgstr ""
+
+#: src/revocation/gnunet-revocation.c:163
+#, fuzzy
+msgid "Revocation failed (!)\n"
+msgstr "\"%s\" misslyckades vid %s:%d med fel: \"%s\".\n"
+
+#: src/revocation/gnunet-revocation.c:168
+#, c-format
+msgid "Key for ego `%s' has been successfully revoked\n"
+msgstr ""
+
+#: src/revocation/gnunet-revocation.c:173
+msgid "Revocation successful.\n"
+msgstr ""
+
+#: src/revocation/gnunet-revocation.c:178
+msgid "Internal error, key revocation might have failed\n"
+msgstr ""
+
+#: src/revocation/gnunet-revocation.c:289
+#, c-format
+msgid "Revocation certificate for `%s' stored in `%s'\n"
+msgstr ""
+
+#: src/revocation/gnunet-revocation.c:319
+#, fuzzy, c-format
+msgid "Ego `%s' not found.\n"
+msgstr "\"%s\" misslyckades: tabell hittades inte!\n"
+
+#: src/revocation/gnunet-revocation.c:340
+#, c-format
+msgid "Error: revocation certificate in `%s' is not for `%s'\n"
+msgstr ""
+
+#: src/revocation/gnunet-revocation.c:360
+msgid "Revocation certificate ready\n"
+msgstr ""
+
+#: src/revocation/gnunet-revocation.c:370
+msgid "Revocation certificate not ready, calculating proof of work\n"
+msgstr ""
+
+#: src/revocation/gnunet-revocation.c:402
+#, fuzzy, c-format
+msgid "Public key `%s' malformed\n"
+msgstr "Ogiltigt argument: \"%s\"\n"
+
+#: src/revocation/gnunet-revocation.c:416
+msgid ""
+"Testing and revoking at the same time is not allowed, only executing test.\n"
+msgstr ""
+
+#: src/revocation/gnunet-revocation.c:451
+#, fuzzy, c-format
+msgid "Failed to read revocation certificate from `%s'\n"
+msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
+
+#: src/revocation/gnunet-revocation.c:476
+#, fuzzy
+msgid "No action specified. Nothing to do.\n"
+msgstr "Inget tabellnamn angivet, använder \"%s\".\n"
+
+#: src/revocation/gnunet-revocation.c:492
+msgid "use NAME for the name of the revocation file"
+msgstr ""
+
+#: src/revocation/gnunet-revocation.c:495
+msgid "revoke the private key associated with the ego NAME "
+msgstr ""
+
+#: src/revocation/gnunet-revocation.c:498
+msgid ""
+"actually perform the revocation revocation file, otherwise we just do the "
+"precomputation"
+msgstr ""
+
+#: src/revocation/gnunet-revocation.c:501
+msgid "test if the public key KEY has been revoked"
+msgstr ""
+
+#: src/revocation/gnunet-service-revocation.c:250
+msgid "Duplicate revocation received from peer. Ignored.\n"
+msgstr ""
+
+#: src/revocation/gnunet-service-revocation.c:599
+#, fuzzy
+msgid "Could not open revocation database file!"
+msgstr "Kunde inte ansluta till gnunetd.\n"
+
+#: src/scalarproduct/gnunet-scalarproduct.c:194
 #, fuzzy
 msgid "You must specify at least one message ID to check!\n"
 msgstr "Du måste ange en lista av filer att lägga in.\n"
 
-#: src/scalarproduct/gnunet-scalarproduct.c:201
+#: src/scalarproduct/gnunet-scalarproduct.c:200
 msgid "This program needs a session identifier for comparing vectors.\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-scalarproduct.c:207
+#: src/scalarproduct/gnunet-scalarproduct.c:206
 msgid "Please give a session key for --input_key!\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-scalarproduct.c:216
+#: src/scalarproduct/gnunet-scalarproduct.c:215
 #, c-format
 msgid ""
 "Tried to set initiator mode, as peer ID was given. However, `%s' is not a "
 "valid peer identifier.\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-scalarproduct.c:240
-#: src/scalarproduct/gnunet-scalarproduct.c:298
+#: src/scalarproduct/gnunet-scalarproduct.c:239
+#: src/scalarproduct/gnunet-scalarproduct.c:297
 #, fuzzy, c-format
 msgid "Could not convert `%s' to int32_t.\n"
 msgstr "Kunde inte ansluta till gnunetd.\n"
 
-#: src/scalarproduct/gnunet-scalarproduct.c:247
+#: src/scalarproduct/gnunet-scalarproduct.c:246
 msgid "Need elements to compute the vectorproduct, got none.\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-scalarproduct.c:348
+#: src/scalarproduct/gnunet-scalarproduct.c:347
 msgid ""
 "A comma separated list of elements to compare as vector with our remote peer."
 msgstr ""
 
-#: src/scalarproduct/gnunet-scalarproduct.c:351
+#: src/scalarproduct/gnunet-scalarproduct.c:350
 msgid ""
 "A comma separated mask to select which elements should actually be compared."
 msgstr ""
 
-#: src/scalarproduct/gnunet-scalarproduct.c:354
+#: src/scalarproduct/gnunet-scalarproduct.c:353
 msgid ""
 "[Optional] peer to calculate our scalarproduct with. If this parameter is "
 "not given, the service will wait for a remote peer to compute the request."
 msgstr ""
 
-#: src/scalarproduct/gnunet-scalarproduct.c:357
+#: src/scalarproduct/gnunet-scalarproduct.c:356
 msgid "Transaction ID shared with peer."
 msgstr ""
 
-#: src/scalarproduct/gnunet-scalarproduct.c:366
+#: src/scalarproduct/gnunet-scalarproduct.c:365
 msgid "Calculate the Vectorproduct with a GNUnet peer."
 msgstr ""
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:381
+#: src/scalarproduct/gnunet-service-scalarproduct.c:450
 #, c-format
 msgid "Generated key set with key length %d bits.\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:691
+#: src/scalarproduct/gnunet-service-scalarproduct.c:775
 #, fuzzy, c-format
 msgid "Client (%p) disconnected from us.\n"
 msgstr "\"%s\" ansluten till \"%s\".\n"
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:762
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1696
+#: src/scalarproduct/gnunet-service-scalarproduct.c:847
+#: src/scalarproduct/gnunet-service-scalarproduct.c:936
 #, fuzzy, c-format
 msgid "Could not send message to client (%p)!\n"
 msgstr "Kunde inte skicka begäran till gnunetd.\n"
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:768
+#: src/scalarproduct/gnunet-service-scalarproduct.c:853
 #, c-format
 msgid "Sending session-end notification to client (%p) for session %s\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:891
-msgid "Message too large, fragmentation is currently not supported!)\n"
+#: src/scalarproduct/gnunet-service-scalarproduct.c:946
+#, c-format
+msgid "Sent result to client (%p), this session (%s) has ended!\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:896
+#: src/scalarproduct/gnunet-service-scalarproduct.c:1025
+#: src/scalarproduct/gnunet-service-scalarproduct.c:1163
 msgid "Could not send service-response message via mesh!)\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1092
+#: src/scalarproduct/gnunet-service-scalarproduct.c:1376
 #, c-format
 msgid "Failed to communicate with `%s', scalar product calculation aborted.\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1145
-#, fuzzy, c-format
-msgid "Successfully created new tunnel to peer (%s)!\n"
-msgstr "Åtkomst nekad för \"%s\" vid %s:%d.\n"
-
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1157
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1873
-msgid "Message too large, fragmentation is currently not supported!\n"
-msgstr ""
-
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1223
+#: src/scalarproduct/gnunet-service-scalarproduct.c:1476
+#: src/scalarproduct/gnunet-service-scalarproduct.c:1603
 #, fuzzy
 msgid "Transmitting service request.\n"
 msgstr "Startade samling \"%s\".\n"
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1233
+#: src/scalarproduct/gnunet-service-scalarproduct.c:1485
+#, fuzzy
+msgid "Could not send service-request multipart message to tunnel!\n"
+msgstr "Kunde inte skicka begäran till gnunetd.\n"
+
+#: src/scalarproduct/gnunet-service-scalarproduct.c:1525
+#, fuzzy, c-format
+msgid "Successfully created new tunnel to peer (%s)!\n"
+msgstr "Åtkomst nekad för \"%s\" vid %s:%d.\n"
+
+#: src/scalarproduct/gnunet-service-scalarproduct.c:1612
 #, fuzzy
-msgid "Could not send mutlicast message to tunnel!\n"
+msgid "Could not send message to tunnel!\n"
 msgstr "Kunde inte skicka begäran till gnunetd.\n"
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1283
+#: src/scalarproduct/gnunet-service-scalarproduct.c:1669
 #, fuzzy
 msgid "Too short message received from client!\n"
 msgstr "Meddelande mottaget från klient är ogiltig.\n"
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1297
+#: src/scalarproduct/gnunet-service-scalarproduct.c:1682
 #, fuzzy
 msgid "Invalid message received from client, session information incorrect!\n"
 msgstr "Ogiltigt meddelande mottogs den %s:%d."
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1309
+#: src/scalarproduct/gnunet-service-scalarproduct.c:1693
 #, c-format
 msgid ""
 "Duplicate session information received, cannot create new session with key `"
 "%s'\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1330
+#: src/scalarproduct/gnunet-service-scalarproduct.c:1713
 #, c-format
 msgid ""
 "Got client-request-session with key %s, preparing tunnel to remote service.\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1369
+#: src/scalarproduct/gnunet-service-scalarproduct.c:1749
 #, c-format
-msgid "Creating new tunnel to for session with key %s.\n"
+msgid "Creating new tunnel for session with key %s.\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1417
+#: src/scalarproduct/gnunet-service-scalarproduct.c:1794
 #, c-format
 msgid ""
 "Got client-responder-session with key %s and a matching service-request-"
 "session set, processing.\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1425
+#: src/scalarproduct/gnunet-service-scalarproduct.c:1802
 #, c-format
 msgid ""
 "Got client-responder-session with key %s but NO matching service-request-"
 "session set, queuing element for later use.\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1481
+#: src/scalarproduct/gnunet-service-scalarproduct.c:1828
+#, fuzzy, c-format
+msgid "New incoming tunnel from peer %s.\n"
+msgstr "\"%s\" ansluten till \"%s\".\n"
+
+#: src/scalarproduct/gnunet-service-scalarproduct.c:1859
 #, c-format
 msgid "Peer disconnected, terminating session %s with peer (%s)\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1706
+#: src/scalarproduct/gnunet-service-scalarproduct.c:2047
+#: src/scalarproduct/gnunet-service-scalarproduct.c:2196
 #, c-format
-msgid "Sent result to client (%p), this session (%s) has ended!\n"
+msgid "Got session with key %s and a matching element set, processing.\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1790
+#: src/scalarproduct/gnunet-service-scalarproduct.c:2054
+#: src/scalarproduct/gnunet-service-scalarproduct.c:2203
 #, c-format
-msgid ""
-"Got message with duplicate session key (`%s'), ignoring service request.\n"
-msgstr ""
-
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1813
-msgid "Could not translate remote public key to sexpression!\n"
-msgstr ""
-
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1849
-#, fuzzy, c-format
-msgid ""
-"Could not translate E[a%d] to MPI!\n"
-"%s/%s\n"
-msgstr "Kunde inte köra \"%s\": %s\n"
-
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1857
-#, c-format
-msgid "Got session with key %s and a matching element set, processing.\n"
+msgid "Got session with key %s without a matching element set, queueing.\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1866
+#: src/scalarproduct/gnunet-service-scalarproduct.c:2142
 #, c-format
-msgid "Got session with key %s without a matching element set, queueing.\n"
+msgid ""
+"Got message with duplicate session key (`%s'), ignoring service request.\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:2039
+#: src/scalarproduct/gnunet-service-scalarproduct.c:2425
 msgid "Shutting down, initiating cleanup.\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:2100
+#: src/scalarproduct/gnunet-service-scalarproduct.c:2490
 msgid "Generating Paillier-Keyset.\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:2116
+#: src/scalarproduct/gnunet-service-scalarproduct.c:2505
 #, fuzzy
 msgid "Connect to MESH failed\n"
 msgstr " Anslutning misslyckades (fel?)\n"
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:2120
+#: src/scalarproduct/gnunet-service-scalarproduct.c:2509
 #, fuzzy
 msgid "Mesh initialized\n"
 msgstr " Anslutning misslyckades\n"
 
-#: src/scalarproduct/scalarproduct_api.c:243
+#: src/scalarproduct/scalarproduct_api.c:246
 #, fuzzy
 msgid "# SUC responder result messages received"
 msgstr "# krypterade PONG-meddelanden mottagna"
 
-#: src/scalarproduct/scalarproduct_api.c:297
+#: src/scalarproduct/scalarproduct_api.c:300
 #, fuzzy
 msgid "# bytes sent to scalarproduct"
 msgstr "# byte krypterade"
 
-#: src/scalarproduct/scalarproduct_api.c:340
-#: src/scalarproduct/scalarproduct_api.c:433
+#: src/scalarproduct/scalarproduct_api.c:345
+#: src/scalarproduct/scalarproduct_api.c:440
 #, fuzzy
 msgid "Failed to connect to the scalarproduct service\n"
 msgstr "Misslyckades att ansluta till gnunetd.\n"
 
-#: src/scalarproduct/scalarproduct_api.c:348
-#: src/scalarproduct/scalarproduct_api.c:441
+#: src/scalarproduct/scalarproduct_api.c:353
+#: src/scalarproduct/scalarproduct_api.c:448
 #, fuzzy
 msgid "Failed to send a message to the statistics service\n"
 msgstr "Misslyckades att ansluta till gnunetd.\n"
 
-#: src/scalarproduct/scalarproduct_api.c:382
-#: src/scalarproduct/scalarproduct_api.c:478
+#: src/scalarproduct/scalarproduct_api.c:387
+#: src/scalarproduct/scalarproduct_api.c:485
 #, fuzzy
 msgid "Failed to send a message to the scalarproduct service\n"
 msgstr "Misslyckades att ansluta till gnunetd.\n"
 
-#: src/set/gnunet-set-ibf-profiler.c:224
+#: src/set/gnunet-set-ibf-profiler.c:221
 #, fuzzy
 msgid "number of element in set A-B"
 msgstr "antal iterationer"
 
-#: src/set/gnunet-set-ibf-profiler.c:227
+#: src/set/gnunet-set-ibf-profiler.c:224
 #, fuzzy
 msgid "number of element in set B-A"
 msgstr "antal iterationer"
 
-#: src/set/gnunet-set-ibf-profiler.c:230
+#: src/set/gnunet-set-ibf-profiler.c:227
 msgid "number of common elements in A and B"
 msgstr ""
 
-#: src/set/gnunet-set-ibf-profiler.c:233
+#: src/set/gnunet-set-ibf-profiler.c:230
 msgid "hash num"
 msgstr ""
 
-#: src/set/gnunet-set-ibf-profiler.c:236
+#: src/set/gnunet-set-ibf-profiler.c:233
 msgid "ibf size"
 msgstr ""
 
-#: src/set/gnunet-set-profiler.c:296
+#: src/set/gnunet-set-profiler.c:295
 msgid "oeration to execute"
 msgstr ""
 
-#: src/statistics/gnunet-service-statistics.c:271
+#: src/statistics/gnunet-service-statistics.c:280
 #, fuzzy, c-format
 msgid "Loading %llu bytes of statistics from `%s'\n"
 msgstr "Ladda ner filer från GNUnet."
 
-#: src/statistics/gnunet-service-statistics.c:330
+#: src/statistics/gnunet-service-statistics.c:346
 #, fuzzy, c-format
 msgid "Wrote %llu bytes of statistics to `%s'\n"
 msgstr "Ladda ner filer från GNUnet."
 
-#: src/statistics/gnunet-statistics.c:142
+#: src/statistics/gnunet-statistics.c:140
 #, fuzzy
 msgid "Failed to obtain statistics.\n"
 msgstr "Misslyckades att binda till UDP-port %d.\n"
 
-#: src/statistics/gnunet-statistics.c:144
+#: src/statistics/gnunet-statistics.c:142
 #, fuzzy, c-format
 msgid "Failed to obtain statistics from host `%s:%llu'\n"
 msgstr "Misslyckades att binda till UDP-port %d.\n"
 
-#: src/statistics/gnunet-statistics.c:191
+#: src/statistics/gnunet-statistics.c:189
 msgid "Missing argument: subsystem \n"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:197
+#: src/statistics/gnunet-statistics.c:195
 msgid "Missing argument: name\n"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:228
+#: src/statistics/gnunet-statistics.c:226
 #, c-format
 msgid "No subsystem or name given\n"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:236
+#: src/statistics/gnunet-statistics.c:234
 #, fuzzy, c-format
 msgid "Failed to initialize watch routine\n"
 msgstr "Misslyckades att initiera tjänsten \"%s\".\n"
 
-#: src/statistics/gnunet-statistics.c:263
+#: src/statistics/gnunet-statistics.c:261
 #, fuzzy, c-format
 msgid "Trying to connect to remote host, but service `%s' is not running\n"
 msgstr "Kunde inte ansluta till gnunetd.\n"
 
-#: src/statistics/gnunet-statistics.c:271
+#: src/statistics/gnunet-statistics.c:269
 #, fuzzy, c-format
 msgid "A port is required to connect to host `%s'\n"
 msgstr "Kan inte ansluta till %u.%u.%u.%u:%u: %s\n"
 
-#: src/statistics/gnunet-statistics.c:278
+#: src/statistics/gnunet-statistics.c:276
 #, c-format
 msgid "A port has to be between 1 and 65535 to connect to host `%s'\n"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:310
+#: src/statistics/gnunet-statistics.c:308
 #, fuzzy, c-format
 msgid "Invalid argument `%s'\n"
 msgstr "Ogiltigt argument: \"%s\"\n"
 
-#: src/statistics/gnunet-statistics.c:336
+#: src/statistics/gnunet-statistics.c:334
 msgid "limit output to statistics for the given NAME"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:339
+#: src/statistics/gnunet-statistics.c:337
 msgid "make the value being set persistent"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:342
+#: src/statistics/gnunet-statistics.c:340
 msgid "limit output to the given SUBSYSTEM"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:345
+#: src/statistics/gnunet-statistics.c:343
 msgid "just print the statistics value"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:348
+#: src/statistics/gnunet-statistics.c:346
 msgid "watch value continuously"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:351
+#: src/statistics/gnunet-statistics.c:349
 msgid "connect to remote host"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:354
+#: src/statistics/gnunet-statistics.c:352
 msgid "port for remote host"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:366
+#: src/statistics/gnunet-statistics.c:364
 msgid "Print statistics about GNUnet operations."
 msgstr "Skriv ut statistik om GNUnet-operationer."
 
-#: src/statistics/statistics_api.c:512
+#: src/statistics/statistics_api.c:509
 #, fuzzy
 msgid "Could not save some persistent statistics\n"
 msgstr "Kunde inte skapa värdnyckel!\n"
 
-#: src/statistics/statistics_api.c:1057
+#: src/statistics/statistics_api.c:1054
 msgid ""
 "Failed to receive acknowledgement from statistics service, some statistics "
 "might have been lost!\n"
 msgstr ""
 
+#: src/testbed/gnunet-daemon-testbed-blacklist.c:264
+msgid ""
+"Daemon to restrict incoming transport layer connections during testbed "
+"deployments"
+msgstr ""
+
 #: src/testbed/gnunet-service-testbed_cpustatus.c:727
 #, c-format
 msgid ""
 "Cannot open %s for writing load statistics.  Not logging load statistics\n"
 msgstr ""
 
-#: src/testbed/gnunet-service-testbed_peers.c:973
+#: src/testbed/gnunet-service-testbed_peers.c:1012
 #, fuzzy
 msgid "Misconfiguration (can't connect to the ARM service)"
 msgstr "Misslyckades att ansluta till gnunetd.\n"
 
-#: src/testbed/gnunet-service-testbed_peers.c:979
+#: src/testbed/gnunet-service-testbed_peers.c:1018
 msgid "Request doesn't fit into a message"
 msgstr ""
 
-#: src/testbed/gnunet-service-testbed_peers.c:1017
+#: src/testbed/gnunet-service-testbed_peers.c:1056
 #, c-format
 msgid "%s service can't be started because ARM is shutting down"
 msgstr ""
 
-#: src/testbed/gnunet_testbed_ll_master.c:57
-#, fuzzy, c-format
-msgid "Job command file not given. Exiting\n"
-msgstr "använd konfigurationsfil FILNAMN"
-
 #: src/testbed/gnunet_testbed_mpi_spawn.c:125
 #, fuzzy
 msgid "Waiting for child to exit.\n"
@@ -5323,19 +5915,26 @@ msgstr "Väntar på att motparter ska ansluta (%u iterationer kvar)...\n"
 msgid "Spawning process `%s'\n"
 msgstr "Startade samling \"%s\".\n"
 
-#: src/testbed/gnunet-testbed-profiler.c:254
+#: src/testbed/gnunet-testbed-profiler.c:267
 #, fuzzy, c-format
 msgid "Exiting as the number of peers is %u\n"
 msgstr "Maximalt antal chattklienter uppnått.\n"
 
-#: src/testbed/gnunet-testbed-profiler.c:280
+#: src/testbed/gnunet-testbed-profiler.c:293
 msgid "create COUNT number of peers"
 msgstr ""
 
-#: src/testbed/gnunet-testbed-profiler.c:283
+#: src/testbed/gnunet-testbed-profiler.c:296
 msgid "tolerate COUNT number of continious timeout failures"
 msgstr ""
 
+#: src/testbed/gnunet-testbed-profiler.c:299
+msgid ""
+"run profiler in non-interactive mode where upon testbed setup the profiler "
+"does not wait for a keystroke but continues to run until a termination "
+"signal is received"
+msgstr ""
+
 #: src/testbed/testbed_api_hosts.c:415
 #, fuzzy, c-format
 msgid "Hosts file %s not found\n"
@@ -5356,7 +5955,7 @@ msgstr ""
 msgid "The function %s is only available when compiled with (--with-ll)\n"
 msgstr ""
 
-#: src/testbed/testbed_api_hosts.c:1572
+#: src/testbed/testbed_api_hosts.c:1586
 #, fuzzy, c-format
 msgid "Adding host %u failed with error: %s\n"
 msgstr "\"%s\" misslyckades vid %s:%d med fel: %s\n"
@@ -5498,160 +6097,132 @@ msgstr ""
 msgid "Command line tool to access the testing library"
 msgstr ""
 
-#: src/testing/testing.c:276
+#: src/testing/testing.c:277
 #, c-format
 msgid "Hostkeys file not found: %s\n"
 msgstr ""
 
-#: src/testing/testing.c:292
+#: src/testing/testing.c:293
 #, c-format
 msgid "Incorrect hostkey file format: %s\n"
 msgstr ""
 
-#: src/testing/testing.c:711
+#: src/testing/testing.c:716
 #, fuzzy, c-format
 msgid "Key number %u does not exist\n"
 msgstr "antal meddelanden att använda per iteration"
 
-#: src/testing/testing.c:722
-#, fuzzy, c-format
-msgid "Error while decoding key %u\n"
-msgstr "Fel vid nedladdning: %s\n"
-
-#: src/testing/testing.c:1158
+#: src/testing/testing.c:1155
 #, c-format
 msgid ""
 "You attempted to create a testbed with more than %u hosts.  Please "
 "precompute more hostkeys first.\n"
 msgstr ""
 
-#: src/testing/testing.c:1167
+#: src/testing/testing.c:1164
 #, fuzzy, c-format
 msgid "Failed to initialize hostkey for peer %u\n"
 msgstr "Misslyckades att initiera tjänsten \"%s\".\n"
 
-#: src/testing/testing.c:1177
+#: src/testing/testing.c:1174
 #, fuzzy
 msgid "PRIVATE_KEY option in PEER section missing in configuration\n"
 msgstr "Inga applikationer definierade i konfiguration!\n"
 
-#: src/testing/testing.c:1190
+#: src/testing/testing.c:1187
 #, fuzzy
 msgid "Failed to create configuration for peer (not enough free ports?)\n"
 msgstr "Kunde inte komma åt namnrymdsinformation.\n"
 
-#: src/testing/testing.c:1204
+#: src/testing/testing.c:1201
 #, fuzzy, c-format
 msgid "Cannot open hostkey file `%s': %s\n"
 msgstr "Kunde inte skapa värdnyckel!\n"
 
-#: src/testing/testing.c:1216
+#: src/testing/testing.c:1213
 #, fuzzy, c-format
 msgid "Failed to write hostkey file for peer %u: %s\n"
 msgstr "Kunde inte skapa användarkonto:"
 
-#: src/testing/testing.c:1238
+#: src/testing/testing.c:1235
 #, fuzzy, c-format
 msgid "Failed to write configuration file `%s' for peer %u: %s\n"
 msgstr "Kunde inte spara konfigurationsfil \"%s\":"
 
-#: src/testing/testing.c:1338
+#: src/testing/testing.c:1335
 #, fuzzy, c-format
 msgid "Failed to start `%s': %s\n"
 msgstr "Fel vid %s:%d.\n"
 
-#: src/testing/testing.c:1702
+#: src/testing/testing.c:1699
 #, fuzzy, c-format
 msgid "Failed to load configuration from %s\n"
 msgstr "Kunde inte spara konfigurationsfil \"%s\":"
 
-#: src/topology/gnunet-daemon-topology.c:254
+#: src/topology/friends.c:100
+#, fuzzy, c-format
+msgid "Syntax error in FRIENDS file at offset %llu, skipping bytes `%.*s'.\n"
+msgstr "Syntaxfel i konfigurationsfil \"%s\" på rad %d.\n"
+
+#: src/topology/gnunet-daemon-topology.c:255
 msgid "# peers blacklisted"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:387
+#: src/topology/gnunet-daemon-topology.c:388
 #, fuzzy
 msgid "# connect requests issued to transport"
 msgstr "# byte mottogs via TCP"
 
-#: src/topology/gnunet-daemon-topology.c:721
-#: src/topology/gnunet-daemon-topology.c:806
+#: src/topology/gnunet-daemon-topology.c:727
+#: src/topology/gnunet-daemon-topology.c:812
 #, fuzzy
 msgid "# friends connected"
 msgstr "# av anslutna parter"
 
-#: src/topology/gnunet-daemon-topology.c:986
+#: src/topology/gnunet-daemon-topology.c:992
 msgid "Failed to connect to core service, can not manage topology!\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:1031
-#, fuzzy, c-format
-msgid "Could not read friends list `%s'\n"
-msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
-
-#: src/topology/gnunet-daemon-topology.c:1037
-#, c-format
-msgid "Friends file `%s' is empty.\n"
-msgstr ""
-
-#: src/topology/gnunet-daemon-topology.c:1046
-#, fuzzy, c-format
-msgid "Failed to read friends list from `%s': out of memory\n"
-msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
-
-#: src/topology/gnunet-daemon-topology.c:1054
-#, c-format
-msgid "Failed to read friends list from `%s'\n"
-msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
-
-#: src/topology/gnunet-daemon-topology.c:1074
-#, c-format
-msgid ""
-"Syntax error in topology specification at offset %llu, skipping bytes.\n"
-msgstr ""
-
-#: src/topology/gnunet-daemon-topology.c:1087
+#: src/topology/gnunet-daemon-topology.c:1021
 #, c-format
-msgid ""
-"Syntax error in topology specification at offset %llu, skipping bytes `%s'.\n"
+msgid "Found myself `%s' in friend list (useless, ignored)\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:1097
+#: src/topology/gnunet-daemon-topology.c:1028
 #, fuzzy, c-format
 msgid "Found friend `%s' in configuration\n"
 msgstr " gconfig\tGTK-konfiguration\n"
 
-#: src/topology/gnunet-daemon-topology.c:1103
-#, c-format
-msgid "Found myself `%s' in friend list (useless, ignored)\n"
+#: src/topology/gnunet-daemon-topology.c:1049
+msgid "Encountered errors parsing friends list!\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:1113
+#: src/topology/gnunet-daemon-topology.c:1051
 #, fuzzy
 msgid "# friends in configuration"
 msgstr " gconfig\tGTK-konfiguration\n"
 
-#: src/topology/gnunet-daemon-topology.c:1119
+#: src/topology/gnunet-daemon-topology.c:1056
 msgid ""
 "Fewer friends specified than required by minimum friend count. Will only "
 "connect to friends.\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:1126
+#: src/topology/gnunet-daemon-topology.c:1062
 msgid ""
 "More friendly connections required than target total number of connections.\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:1157
+#: src/topology/gnunet-daemon-topology.c:1093
 #, fuzzy
 msgid "# HELLO messages received"
 msgstr "# krypterade PONG-meddelanden mottagna"
 
-#: src/topology/gnunet-daemon-topology.c:1212
+#: src/topology/gnunet-daemon-topology.c:1150
 msgid "# HELLO messages gossipped"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:1351
+#: src/topology/gnunet-daemon-topology.c:1289
 msgid "GNUnet topology control (maintaining P2P mesh and F2F constraints)"
 msgstr ""
 
@@ -5665,39 +6236,39 @@ msgstr "Motpart \"%s\" med pålitlighet %8u och adress \"%s\"\n"
 msgid "Adding blacklisting entry for peer `%s':`%s'\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_blacklist.c:453
-#: src/transport/gnunet-service-transport_blacklist.c:717
+#: src/transport/gnunet-service-transport_blacklist.c:455
+#: src/transport/gnunet-service-transport_blacklist.c:722
 msgid "# disconnects due to blacklist"
 msgstr ""
 
-#: src/transport/gnunet-service-transport.c:168
+#: src/transport/gnunet-service-transport.c:163
 #, fuzzy
 msgid "# bytes payload discarded due to not connected peer "
 msgstr "Nätverksannonsering avstängd i konfigurationen!\n"
 
-#: src/transport/gnunet-service-transport.c:234
+#: src/transport/gnunet-service-transport.c:229
 #, fuzzy
 msgid "# bytes total received"
 msgstr "# byte krypterade"
 
-#: src/transport/gnunet-service-transport.c:281
+#: src/transport/gnunet-service-transport.c:277
 #, fuzzy
 msgid "# bytes payload received"
 msgstr "# byte dekrypterade"
 
-#: src/transport/gnunet-service-transport.c:432
+#: src/transport/gnunet-service-transport.c:429
 #, fuzzy, c-format
 msgid "Could not obtain a valid network for `%s' %s\n"
 msgstr "Kunde inte köra \"%s\": %s\n"
 
-#: src/transport/gnunet-service-transport.c:480
+#: src/transport/gnunet-service-transport.c:479
 #, c-format
 msgid ""
 "Address or session unknown: failed to update properties for peer `%s' plugin "
 "`%s' address `%s' session %p\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport.c:775
+#: src/transport/gnunet-service-transport.c:760
 msgid "Transport service is lacking key configuration settings.  Exiting.\n"
 msgstr ""
 
@@ -5715,78 +6286,78 @@ msgstr ""
 msgid "Rejecting control connection from peer `%s', which is not me!\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_clients.c:677
+#: src/transport/gnunet-service-transport_clients.c:672
 msgid "# bytes payload dropped (other peer was not connected)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_clients.c:733
+#: src/transport/gnunet-service-transport_clients.c:728
 #, fuzzy
 msgid "# REQUEST CONNECT messages received"
 msgstr "# krypterade PONG-meddelanden mottagna"
 
-#: src/transport/gnunet-service-transport_hello.c:179
+#: src/transport/gnunet-service-transport_hello.c:181
 msgid "# refreshed my HELLO"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1216
+#: src/transport/gnunet-service-transport_neighbours.c:1080
 #, fuzzy
 msgid "# DISCONNECT messages sent"
 msgstr "# krypterade PONG-meddelanden mottagna"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1346
-#: src/transport/gnunet-service-transport_neighbours.c:1681
+#: src/transport/gnunet-service-transport_neighbours.c:1210
+#: src/transport/gnunet-service-transport_neighbours.c:1545
 msgid "# bytes in message queue for other peers"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1351
+#: src/transport/gnunet-service-transport_neighbours.c:1215
 #, fuzzy
 msgid "# messages transmitted to other peers"
 msgstr "# byte skickade av typen %d"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1356
+#: src/transport/gnunet-service-transport_neighbours.c:1220
 #, fuzzy
 msgid "# transmission failures for messages to other peers"
 msgstr "# byte skickade av typen %d"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1413
+#: src/transport/gnunet-service-transport_neighbours.c:1277
 msgid "# messages timed out while in transport queue"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1455
+#: src/transport/gnunet-service-transport_neighbours.c:1319
 #, fuzzy
 msgid "# keepalives sent"
 msgstr "# sessionsnycklar skickade"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1479
+#: src/transport/gnunet-service-transport_neighbours.c:1343
 #, fuzzy
 msgid "# KEEPALIVE messages discarded (peer unknown)"
 msgstr "Nätverksannonsering avstängd i konfigurationen!\n"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1487
+#: src/transport/gnunet-service-transport_neighbours.c:1351
 #, fuzzy
 msgid "# KEEPALIVE messages discarded (no session)"
 msgstr "Nätverksannonsering avstängd i konfigurationen!\n"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1520
+#: src/transport/gnunet-service-transport_neighbours.c:1384
 #, fuzzy
 msgid "# KEEPALIVE_RESPONSE messages discarded (not connected)"
 msgstr "Nätverksannonsering avstängd i konfigurationen!\n"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1529
+#: src/transport/gnunet-service-transport_neighbours.c:1393
 #, fuzzy
 msgid "# KEEPALIVE_RESPONSE messages discarded (not expected)"
 msgstr "Nätverksannonsering avstängd i konfigurationen!\n"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1586
+#: src/transport/gnunet-service-transport_neighbours.c:1450
 #, fuzzy
 msgid "# messages discarded due to lack of neighbour record"
 msgstr "Nätverksannonsering avstängd i konfigurationen!\n"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1620
+#: src/transport/gnunet-service-transport_neighbours.c:1484
 msgid "# bandwidth quota violations by other peers"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1636
+#: src/transport/gnunet-service-transport_neighbours.c:1500
 msgid "# ms throttling suggested"
 msgstr ""
 
@@ -5811,32 +6382,32 @@ msgstr "skicka ANTAL meddelanden"
 msgid "# unexpected CONNECT_ACK messages (disconnecting)"
 msgstr "skicka ANTAL meddelanden"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3046
+#: src/transport/gnunet-service-transport_neighbours.c:3045
 #, fuzzy
 msgid "# unexpected SESSION ACK messages"
 msgstr "# krypterade PONG-meddelanden skickade"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3099
+#: src/transport/gnunet-service-transport_neighbours.c:3098
 msgid "# SET QUOTA messages ignored (no such peer)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3113
+#: src/transport/gnunet-service-transport_neighbours.c:3112
 msgid "# disconnects due to quota of 0"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3144
+#: src/transport/gnunet-service-transport_neighbours.c:3143
 msgid "# disconnect messages ignored (old format)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3155
+#: src/transport/gnunet-service-transport_neighbours.c:3154
 msgid "# disconnect messages ignored (timestamp)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3194
+#: src/transport/gnunet-service-transport_neighbours.c:3193
 msgid "# other peer asked to disconnect from us"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3289
+#: src/transport/gnunet-service-transport_neighbours.c:3288
 #, fuzzy
 msgid "# disconnected from peer upon explicit request"
 msgstr "# av anslutna parter"
@@ -5862,333 +6433,333 @@ msgstr "Kunde inte slå upp \"%s\": %s\n"
 msgid "Did not load plugin `%s' due to missing functions\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:455
+#: src/transport/gnunet-service-transport_validation.c:456
 msgid "# address records discarded"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:518
+#: src/transport/gnunet-service-transport_validation.c:519
 #, c-format
 msgid ""
 "Not transmitting `%s' with `%s', message too big (%u bytes!). This should "
 "not happen.\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:575
+#: src/transport/gnunet-service-transport_validation.c:577
 #, fuzzy
 msgid "# PING without HELLO messages sent"
 msgstr "# PING-meddelanden i klartext skickade"
 
-#: src/transport/gnunet-service-transport_validation.c:660
+#: src/transport/gnunet-service-transport_validation.c:662
 msgid "# address revalidations started"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:928
+#: src/transport/gnunet-service-transport_validation.c:933
 #, fuzzy
 msgid "# PING message for different peer received"
 msgstr "# PING-meddelanden skapade"
 
-#: src/transport/gnunet-service-transport_validation.c:987
+#: src/transport/gnunet-service-transport_validation.c:992
 msgid "# failed address checks during validation"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:997
+#: src/transport/gnunet-service-transport_validation.c:1002
 msgid "# successful address checks during validation"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1016
+#: src/transport/gnunet-service-transport_validation.c:1021
 #, c-format
 msgid "Received a PING message with validation bug from `%s'\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1070
+#: src/transport/gnunet-service-transport_validation.c:1075
 #, fuzzy, c-format
 msgid "Failed to create PONG signature for peer `%s'\n"
 msgstr "Kunde inte skapa namnrymd \"%s\" (existerar?).\n"
 
-#: src/transport/gnunet-service-transport_validation.c:1115
+#: src/transport/gnunet-service-transport_validation.c:1124
 msgid "# PONGs unicast via reliable transport"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1124
+#: src/transport/gnunet-service-transport_validation.c:1133
 msgid "# PONGs multicast to all available addresses"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1251
+#: src/transport/gnunet-service-transport_validation.c:1260
 msgid "# PONGs dropped, no matching pending validation"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1266
+#: src/transport/gnunet-service-transport_validation.c:1275
 msgid "# PONGs dropped, signature expired"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1372
+#: src/transport/gnunet-service-transport_validation.c:1381
 #, fuzzy, c-format
 msgid "Adding `%s' without addresses for peer `%s'\n"
 msgstr "Motpart \"%s\" med pålitlighet %8u och adress \"%s\"\n"
 
-#: src/transport/gnunet-transport.c:266
+#: src/transport/gnunet-transport.c:259
 #, fuzzy, c-format
 msgid "Transmitted %llu bytes/s (%llu bytes in %s)\n"
 msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 
-#: src/transport/gnunet-transport.c:273
+#: src/transport/gnunet-transport.c:266
 #, c-format
 msgid "Received %llu bytes/s (%llu bytes in %s)\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:303
+#: src/transport/gnunet-transport.c:296
 #, fuzzy, c-format
 msgid "Failed to connect to `%s'\n"
 msgstr "Misslyckades att ansluta till gnunetd.\n"
 
-#: src/transport/gnunet-transport.c:316
+#: src/transport/gnunet-transport.c:309
 #, fuzzy, c-format
 msgid "Failed to resolve address for peer `%s'\n"
 msgstr "Misslyckades att binda till UDP-port %d.\n"
 
-#: src/transport/gnunet-transport.c:325
+#: src/transport/gnunet-transport.c:318
 #, fuzzy
 msgid "Failed to list connections, timeout occured\n"
 msgstr "Misslyckades att ansluta till gnunetd.\n"
 
-#: src/transport/gnunet-transport.c:429
+#: src/transport/gnunet-transport.c:422
 msgid "No transport plugins configured, peer will never communicate\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:442
+#: src/transport/gnunet-transport.c:435
 #, c-format
 msgid "No port configured for plugin `%s', cannot test it\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:506
+#: src/transport/gnunet-transport.c:499
 #, fuzzy, c-format
 msgid "Transmitting %u bytes to %s\n"
 msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 
-#: src/transport/gnunet-transport.c:528
+#: src/transport/gnunet-transport.c:522
 #, fuzzy, c-format
 msgid "Successfully connected to `%s'\n"
 msgstr "Åtkomst nekad för \"%s\" vid %s:%d.\n"
 
-#: src/transport/gnunet-transport.c:550
+#: src/transport/gnunet-transport.c:545
 #, c-format
 msgid ""
 "Successfully connected to `%s', starting to send benchmark data in %u Kb "
 "blocks\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:585
+#: src/transport/gnunet-transport.c:580
 #, fuzzy, c-format
 msgid "Disconnected from peer `%s' while benchmarking\n"
 msgstr "\"%s\" ansluten till \"%s\".\n"
 
-#: src/transport/gnunet-transport.c:655
+#: src/transport/gnunet-transport.c:650
 #, c-format
 msgid "Received %u bytes from %s\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:678
+#: src/transport/gnunet-transport.c:673
 #, fuzzy, c-format
 msgid "Peer `%s': %s %s\n"
 msgstr "Jag är ändpunkt \"%s\".\n"
 
-#: src/transport/gnunet-transport.c:693
+#: src/transport/gnunet-transport.c:688
 #, c-format
 msgid "Peer `%s': %s <unable to resolve address>\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:757
+#: src/transport/gnunet-transport.c:752
 #, fuzzy, c-format
 msgid "Peer `%s' disconnected\n"
 msgstr "# av anslutna parter"
 
-#: src/transport/gnunet-transport.c:785
+#: src/transport/gnunet-transport.c:780
 #, fuzzy
 msgid "Failed to send connect request to transport service\n"
 msgstr "Misslyckades att ansluta till gnunetd.\n"
 
-#: src/transport/gnunet-transport.c:828
+#: src/transport/gnunet-transport.c:825
 #, c-format
 msgid ""
 "Multiple operations given. Please choose only one operation: %s, %s, %s, %s, "
 "%s, %s\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:834
+#: src/transport/gnunet-transport.c:831
 #, c-format
 msgid ""
 "No operation given. Please choose one operation: %s, %s, %s, %s, %s, %s\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:854 src/transport/gnunet-transport.c:884
-#: src/transport/gnunet-transport.c:906 src/transport/gnunet-transport.c:945
+#: src/transport/gnunet-transport.c:851 src/transport/gnunet-transport.c:881
+#: src/transport/gnunet-transport.c:903 src/transport/gnunet-transport.c:940
 #, fuzzy
 msgid "Failed to connect to transport service\n"
 msgstr "Misslyckades att ansluta till gnunetd.\n"
 
-#: src/transport/gnunet-transport.c:861 src/transport/gnunet-transport.c:891
+#: src/transport/gnunet-transport.c:858 src/transport/gnunet-transport.c:888
 #, fuzzy
 msgid "Failed to send request to transport service\n"
 msgstr "Misslyckades att ansluta till gnunetd.\n"
 
-#: src/transport/gnunet-transport.c:911
+#: src/transport/gnunet-transport.c:908
 msgid "Starting to receive benchmark data\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:995
+#: src/transport/gnunet-transport.c:990
 msgid "measure how fast we are receiving data from all peers (until CTRL-C)"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:998
+#: src/transport/gnunet-transport.c:993
 #, fuzzy
 msgid "connect to a peer"
 msgstr "Misslyckades att ansluta till gnunetd.\n"
 
-#: src/transport/gnunet-transport.c:1001
+#: src/transport/gnunet-transport.c:996
 #, fuzzy
 msgid "provide information about all current connections (once)"
 msgstr "Skriv ut information om GNUnets motparter."
 
-#: src/transport/gnunet-transport.c:1007
+#: src/transport/gnunet-transport.c:1002
 #, fuzzy
 msgid ""
 "provide information about all connects and disconnect events (continuously)"
 msgstr "Skriv ut information om GNUnets motparter."
 
-#: src/transport/gnunet-transport.c:1010
+#: src/transport/gnunet-transport.c:1005
 #, fuzzy
 msgid "do not resolve hostnames"
 msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 
-#: src/transport/gnunet-transport.c:1013
+#: src/transport/gnunet-transport.c:1008
 msgid "peer identity"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1017
+#: src/transport/gnunet-transport.c:1012
 msgid "send data for benchmarking to the other peer (until CTRL-C)"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1020
+#: src/transport/gnunet-transport.c:1015
 msgid "test transport configuration (involves external server)"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1031
+#: src/transport/gnunet-transport.c:1026
 #, fuzzy
 msgid "Direct access to transport service."
 msgstr "Misslyckades att ansluta till gnunetd.\n"
 
-#: src/transport/plugin_transport_bluetooth.c:612
+#: src/transport/plugin_transport_bluetooth.c:616
 msgid "# Bluetooth ACKs sent"
 msgstr ""
 
-#: src/transport/plugin_transport_bluetooth.c:631
+#: src/transport/plugin_transport_bluetooth.c:635
 #, fuzzy
 msgid "# Bluetooth messages defragmented"
 msgstr "# PING-meddelanden skapade"
 
-#: src/transport/plugin_transport_bluetooth.c:677
-#: src/transport/plugin_transport_bluetooth.c:727
-#: src/transport/plugin_transport_bluetooth.c:1833
+#: src/transport/plugin_transport_bluetooth.c:681
+#: src/transport/plugin_transport_bluetooth.c:731
+#: src/transport/plugin_transport_bluetooth.c:1837
 #, fuzzy
 msgid "# Bluetooth sessions allocated"
 msgstr "# sessionsnycklar accepterade"
 
-#: src/transport/plugin_transport_bluetooth.c:802
+#: src/transport/plugin_transport_bluetooth.c:806
 #, fuzzy
 msgid "# Bluetooth message fragments sent"
 msgstr "# byte mottogs via TCP"
 
-#: src/transport/plugin_transport_bluetooth.c:826
+#: src/transport/plugin_transport_bluetooth.c:830
 msgid "# Bluetooth messages pending (with fragmentation)"
 msgstr ""
 
-#: src/transport/plugin_transport_bluetooth.c:934
-#: src/transport/plugin_transport_bluetooth.c:1019
-#: src/transport/plugin_transport_bluetooth.c:1835
+#: src/transport/plugin_transport_bluetooth.c:938
+#: src/transport/plugin_transport_bluetooth.c:1023
+#: src/transport/plugin_transport_bluetooth.c:1839
 #, fuzzy
 msgid "# Bluetooth MAC endpoints allocated"
 msgstr "# byte mottogs via TCP"
 
-#: src/transport/plugin_transport_bluetooth.c:1214
+#: src/transport/plugin_transport_bluetooth.c:1218
 #, fuzzy
 msgid "# HELLO messages received via Bluetooth"
 msgstr "# krypterade PONG-meddelanden mottagna"
 
-#: src/transport/plugin_transport_bluetooth.c:1240
+#: src/transport/plugin_transport_bluetooth.c:1244
 #, fuzzy
 msgid "# fragments received via Bluetooth"
 msgstr "# byte mottogs via TCP"
 
-#: src/transport/plugin_transport_bluetooth.c:1250
+#: src/transport/plugin_transport_bluetooth.c:1254
 #, fuzzy
 msgid "# ACKs received via Bluetooth"
 msgstr "# byte mottogs via TCP"
 
-#: src/transport/plugin_transport_bluetooth.c:1307
+#: src/transport/plugin_transport_bluetooth.c:1311
 #, fuzzy
 msgid "# Bluetooth DATA messages discarded due to CRC32 error"
 msgstr "Nätverksannonsering avstängd i konfigurationen!\n"
 
-#: src/transport/plugin_transport_bluetooth.c:1419
+#: src/transport/plugin_transport_bluetooth.c:1423
 #, fuzzy
 msgid "# DATA messages received via Bluetooth"
 msgstr "# krypterade PONG-meddelanden mottagna"
 
-#: src/transport/plugin_transport_bluetooth.c:1454
+#: src/transport/plugin_transport_bluetooth.c:1458
 #, fuzzy
 msgid "# Bluetooth DATA messages processed"
 msgstr "# krypterade PONG-meddelanden mottagna"
 
-#: src/transport/plugin_transport_bluetooth.c:1517
+#: src/transport/plugin_transport_bluetooth.c:1521
 #, fuzzy
 msgid "# HELLO beacons sent via Bluetooth"
 msgstr "# byte skickade via UDP"
 
-#: src/transport/plugin_transport_bluetooth.c:1630
+#: src/transport/plugin_transport_bluetooth.c:1634
 msgid "Bluetooth address with invalid size encountered\n"
 msgstr ""
 
-#: src/transport/plugin_transport_bluetooth.c:1814
+#: src/transport/plugin_transport_bluetooth.c:1818
 #, c-format
 msgid "Helper binary `%s' not SUID, cannot run bluetooth transport\n"
 msgstr ""
 
 #: src/transport/plugin_transport_http.c:815
-#: src/transport/plugin_transport_http_server.c:2614
+#: src/transport/plugin_transport_http_server.c:2602
 msgid "Disabling IPv6 since it is not supported on this system!\n"
 msgstr ""
 
 #: src/transport/plugin_transport_http.c:864
-#: src/transport/plugin_transport_http_server.c:2382
+#: src/transport/plugin_transport_http_server.c:2370
 #, fuzzy
 msgid "Require valid port number for service in configuration!\n"
 msgstr "Inga applikationer definierade i konfiguration!\n"
 
 #: src/transport/plugin_transport_http.c:896
-#: src/transport/plugin_transport_http_server.c:2414 src/util/service.c:1062
+#: src/transport/plugin_transport_http_server.c:2402 src/util/service.c:696
 #, fuzzy, c-format
 msgid "Failed to resolve `%s': %s\n"
 msgstr "Misslyckades att leverera \"%s\" meddelande.\n"
 
 #: src/transport/plugin_transport_http.c:913
-#: src/transport/plugin_transport_http_server.c:2431 src/util/service.c:1079
+#: src/transport/plugin_transport_http_server.c:2419 src/util/service.c:713
 #, fuzzy, c-format
 msgid "Failed to find %saddress for `%s'.\n"
 msgstr "Misslyckades att binda till UDP-port %d.\n"
 
 #: src/transport/plugin_transport_http.c:1018
-#: src/transport/plugin_transport_http_server.c:2542
+#: src/transport/plugin_transport_http_server.c:2530
 #, c-format
 msgid "Found %u addresses to report to NAT service\n"
 msgstr ""
 
 #: src/transport/plugin_transport_http.c:1131
-#: src/transport/plugin_transport_http_server.c:2722
+#: src/transport/plugin_transport_http_server.c:2710
 msgid "Neither IPv4 nor IPv6 are enabled! Fix in configuration\n"
 msgstr ""
 
 #: src/transport/plugin_transport_http.c:1144
-#: src/transport/plugin_transport_http_server.c:2733
+#: src/transport/plugin_transport_http_server.c:2721
 #, fuzzy
 msgid "Port is required! Fix in configuration\n"
 msgstr " gconfig\tGTK-konfiguration\n"
@@ -6212,7 +6783,7 @@ msgid ""
 msgstr ""
 
 #: src/transport/plugin_transport_http.c:1221
-#: src/transport/plugin_transport_http_server.c:2848
+#: src/transport/plugin_transport_http_server.c:2836
 #, fuzzy, c-format
 msgid "Using external hostname `%s'\n"
 msgstr "Startade samling \"%s\".\n"
@@ -6221,98 +6792,99 @@ msgstr "Startade samling \"%s\".\n"
 msgid "No external hostname configured\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_client.c:1587
+#: src/transport/plugin_transport_http_client.c:1586
 #, c-format
 msgid "Could not initialize curl multi handle, failed to start %s plugin!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_client.c:1724
-#: src/transport/plugin_transport_http_server.c:2978
+#: src/transport/plugin_transport_http_client.c:1723
+#: src/transport/plugin_transport_http_server.c:2966
 #, fuzzy, c-format
 msgid "Shutting down plugin `%s'\n"
 msgstr "Testar transport(er) %s\n"
 
-#: src/transport/plugin_transport_http_client.c:1749
-#: src/transport/plugin_transport_http_server.c:3038
+#: src/transport/plugin_transport_http_client.c:1748
+#: src/transport/plugin_transport_http_server.c:3026
 #, fuzzy, c-format
 msgid "Shutdown for plugin `%s' complete\n"
 msgstr ""
 "Uppladdning av \"%s\" klar, aktuell genomsnittshastighet är %8.3f kbps.\n"
 
-#: src/transport/plugin_transport_http_client.c:1777
-#: src/transport/plugin_transport_http_server.c:2878
+#: src/transport/plugin_transport_http_client.c:1776
+#: src/transport/plugin_transport_http_server.c:2866
 #, fuzzy, c-format
 msgid "Maximum number of connections is %u\n"
 msgstr "Maximalt antal chattklienter uppnått.\n"
 
-#: src/transport/plugin_transport_http_server.c:1379
+#: src/transport/plugin_transport_http_server.c:1381
 #, c-format
 msgid ""
 "Access from connection %p (%u of %u) for `%s' `%s' url `%s' with upload data "
 "size %u\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:1644
+#: src/transport/plugin_transport_http_server.c:1646
 #, c-format
 msgid "Accepting connection (%u of %u) from `%s'\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:1652
+#: src/transport/plugin_transport_http_server.c:1654
 #, c-format
 msgid ""
 "Server reached maximum number connections (%u), rejecting new connection\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:1953
+#: src/transport/plugin_transport_http_server.c:1941
 msgid ""
 "Could not create a new TLS certificate, program `gnunet-transport-"
 "certificate-creation' could not be started!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:1977
-msgid "No usable TLS certificate found and creating one failed!\n"
+#: src/transport/plugin_transport_http_server.c:1965
+#, c-format
+msgid "No usable TLS certificate found and creating one at `%s/%s' failed!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:2701
+#: src/transport/plugin_transport_http_server.c:2689
 #, c-format
 msgid "IPv4 support is %s\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:2715
+#: src/transport/plugin_transport_http_server.c:2703
 #, c-format
 msgid "IPv6 support is %s\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:2740
+#: src/transport/plugin_transport_http_server.c:2728
 #, fuzzy, c-format
 msgid "Using port %u\n"
 msgstr "Testar transport(er) %s\n"
 
-#: src/transport/plugin_transport_http_server.c:2755
+#: src/transport/plugin_transport_http_server.c:2743
 #, fuzzy, c-format
 msgid "Specific IPv4 address `%s' in configuration file is invalid!\n"
 msgstr ""
 "Du måste ange ett positivt nummer för \"%s\" i konfigurationen i sektion \"%s"
 "\".\n"
 
-#: src/transport/plugin_transport_http_server.c:2765
+#: src/transport/plugin_transport_http_server.c:2753
 #, fuzzy, c-format
 msgid "Binding to IPv4 address %s\n"
 msgstr "Ogiltigt svar på \"%s\".\n"
 
-#: src/transport/plugin_transport_http_server.c:2786
+#: src/transport/plugin_transport_http_server.c:2774
 #, fuzzy, c-format
 msgid "Specific IPv6 address `%s' in configuration file is invalid!\n"
 msgstr ""
 "Du måste ange ett positivt nummer för \"%s\" i konfigurationen i sektion \"%s"
 "\".\n"
 
-#: src/transport/plugin_transport_http_server.c:2796
+#: src/transport/plugin_transport_http_server.c:2784
 #, fuzzy, c-format
 msgid "Binding to IPv6 address %s\n"
 msgstr "Ogiltigt svar på \"%s\".\n"
 
-#: src/transport/plugin_transport_http_server.c:2864
+#: src/transport/plugin_transport_http_server.c:2852
 #, fuzzy, c-format
 msgid "Notifying transport only about hostname `%s'\n"
 msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
@@ -6374,16 +6946,16 @@ msgstr ""
 #: src/transport/plugin_transport_tcp.c:923
 #: src/transport/plugin_transport_tcp.c:973
 #: src/transport/plugin_transport_tcp.c:1059
-#: src/transport/plugin_transport_tcp.c:1202
-#: src/transport/plugin_transport_tcp.c:1219
+#: src/transport/plugin_transport_tcp.c:1206
+#: src/transport/plugin_transport_tcp.c:1223
 #, fuzzy
 msgid "# bytes currently in TCP buffers"
 msgstr "# byte skickades via TCP"
 
 #: src/transport/plugin_transport_tcp.c:841
 #: src/transport/plugin_transport_tcp.c:1030
-#: src/transport/plugin_transport_tcp.c:2009
-#: src/transport/plugin_transport_tcp.c:2690
+#: src/transport/plugin_transport_tcp.c:2015
+#: src/transport/plugin_transport_tcp.c:2696
 #, fuzzy
 msgid "# TCP sessions active"
 msgstr "# sessionsnycklar accepterade"
@@ -6403,54 +6975,54 @@ msgstr "# byte skickade av typen %d"
 msgid "# bytes discarded by TCP (disconnect)"
 msgstr "# byte kastade via TCP (utgående)"
 
-#: src/transport/plugin_transport_tcp.c:1176
+#: src/transport/plugin_transport_tcp.c:1180
 #, c-format
 msgid "Trying to send with invalid session %p\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:1413
-#: src/transport/plugin_transport_udp.c:1449
+#: src/transport/plugin_transport_tcp.c:1417
+#: src/transport/plugin_transport_udp.c:1440
 msgid "# requests to create session with invalid address"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:1530
+#: src/transport/plugin_transport_tcp.c:1534
 msgid "# transport-service disconnect requests for TCP"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2059
+#: src/transport/plugin_transport_tcp.c:2065
 #, fuzzy
 msgid "# TCP WELCOME messages received"
 msgstr "# krypterade PONG-meddelanden mottagna"
 
-#: src/transport/plugin_transport_tcp.c:2242
+#: src/transport/plugin_transport_tcp.c:2248
 msgid "# bytes received via TCP"
 msgstr "# byte mottogs via TCP"
 
-#: src/transport/plugin_transport_tcp.c:2322
+#: src/transport/plugin_transport_tcp.c:2328
 msgid "# network-level TCP disconnect events"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2570 src/util/service.c:957
-#: src/util/service.c:963
+#: src/transport/plugin_transport_tcp.c:2576 src/util/service.c:589
+#: src/util/service.c:595
 #, c-format
 msgid "Require valid port number for service `%s' in configuration!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2584
+#: src/transport/plugin_transport_tcp.c:2590
 #, fuzzy
 msgid "Failed to start service.\n"
 msgstr "Misslyckades att starta samling.\n"
 
-#: src/transport/plugin_transport_tcp.c:2677
+#: src/transport/plugin_transport_tcp.c:2683
 #, c-format
 msgid "TCP transport listening on port %llu\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2681
+#: src/transport/plugin_transport_tcp.c:2687
 msgid "TCP transport not listening on any port (client only)\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2685
+#: src/transport/plugin_transport_tcp.c:2691
 #, c-format
 msgid "TCP transport advertises itself as being on port %llu\n"
 msgstr ""
@@ -6475,21 +7047,21 @@ msgstr ""
 msgid "Failed to set IPv4 broadcast option for broadcast socket on port %d\n"
 msgstr ""
 
-#: src/transport/plugin_transport_udp.c:1555
+#: src/transport/plugin_transport_udp.c:1550
 #, c-format
 msgid ""
 "Trying to create session for address of unexpected length %u (should be %u "
 "or %u)\n"
 msgstr ""
 
-#: src/transport/plugin_transport_udp.c:2590
+#: src/transport/plugin_transport_udp.c:2602
 #, c-format
 msgid ""
 "UDP could not transmit message to `%s': Network seems down, please check "
 "your network configuration\n"
 msgstr ""
 
-#: src/transport/plugin_transport_udp.c:2604
+#: src/transport/plugin_transport_udp.c:2616
 #, c-format
 msgid ""
 "UDP could not transmit message to `%s': Please check your network "
@@ -6497,27 +7069,27 @@ msgid ""
 "IPv6 address\n"
 msgstr ""
 
-#: src/transport/plugin_transport_udp.c:2905
+#: src/transport/plugin_transport_udp.c:2917
 #, fuzzy
 msgid "Failed to open UDP sockets\n"
 msgstr "Misslyckades att binda till UDP6-port %d.\n"
 
-#: src/transport/plugin_transport_udp.c:3003
+#: src/transport/plugin_transport_udp.c:3015
 #, c-format
 msgid "Given `%s' option is out of range: %llu > %u\n"
 msgstr ""
 
-#: src/transport/plugin_transport_udp.c:3046
+#: src/transport/plugin_transport_udp.c:3058
 #, fuzzy, c-format
 msgid "Invalid IPv6 address: `%s'\n"
 msgstr "Ogiltigt svar på \"%s\".\n"
 
-#: src/transport/plugin_transport_udp.c:3105
+#: src/transport/plugin_transport_udp.c:3117
 #, fuzzy
 msgid "Failed to create network sockets, plugin failed\n"
 msgstr "Kunde inte skapa namnrymd \"%s\" (existerar?).\n"
 
-#: src/transport/plugin_transport_unix.c:1640
+#: src/transport/plugin_transport_unix.c:1627
 #, fuzzy
 msgid "Failed to open UNIX listen socket\n"
 msgstr "Misslyckades att leverera \"%s\" meddelande.\n"
@@ -6532,169 +7104,174 @@ msgid "# WLAN messages defragmented"
 msgstr "# PING-meddelanden skapade"
 
 #: src/transport/plugin_transport_wlan.c:688
-#: src/transport/plugin_transport_wlan.c:756
-#: src/transport/plugin_transport_wlan.c:1899
+#: src/transport/plugin_transport_wlan.c:758
+#: src/transport/plugin_transport_wlan.c:1903
 #, fuzzy
 msgid "# WLAN sessions allocated"
 msgstr "# sessionsnycklar accepterade"
 
-#: src/transport/plugin_transport_wlan.c:860
+#: src/transport/plugin_transport_wlan.c:863
 #, fuzzy
 msgid "# WLAN message fragments sent"
 msgstr "# byte mottogs via TCP"
 
-#: src/transport/plugin_transport_wlan.c:884
+#: src/transport/plugin_transport_wlan.c:887
 msgid "# WLAN messages pending (with fragmentation)"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:992
-#: src/transport/plugin_transport_wlan.c:1077
-#: src/transport/plugin_transport_wlan.c:1901
+#: src/transport/plugin_transport_wlan.c:995
+#: src/transport/plugin_transport_wlan.c:1080
+#: src/transport/plugin_transport_wlan.c:1905
 #, fuzzy
 msgid "# WLAN MAC endpoints allocated"
 msgstr "# byte mottogs via TCP"
 
-#: src/transport/plugin_transport_wlan.c:1272
+#: src/transport/plugin_transport_wlan.c:1275
 #, fuzzy
 msgid "# HELLO messages received via WLAN"
 msgstr "# krypterade PONG-meddelanden mottagna"
 
-#: src/transport/plugin_transport_wlan.c:1298
+#: src/transport/plugin_transport_wlan.c:1301
 #, fuzzy
 msgid "# fragments received via WLAN"
 msgstr "# byte mottogs via TCP"
 
-#: src/transport/plugin_transport_wlan.c:1308
+#: src/transport/plugin_transport_wlan.c:1311
 #, fuzzy
 msgid "# ACKs received via WLAN"
 msgstr "# byte mottogs via TCP"
 
-#: src/transport/plugin_transport_wlan.c:1365
+#: src/transport/plugin_transport_wlan.c:1368
 #, fuzzy
 msgid "# WLAN DATA messages discarded due to CRC32 error"
 msgstr "Nätverksannonsering avstängd i konfigurationen!\n"
 
-#: src/transport/plugin_transport_wlan.c:1485
+#: src/transport/plugin_transport_wlan.c:1489
 #, fuzzy
 msgid "# DATA messages received via WLAN"
 msgstr "# krypterade PONG-meddelanden mottagna"
 
-#: src/transport/plugin_transport_wlan.c:1520
+#: src/transport/plugin_transport_wlan.c:1524
 #, fuzzy
 msgid "# WLAN DATA messages processed"
 msgstr "# krypterade PONG-meddelanden mottagna"
 
-#: src/transport/plugin_transport_wlan.c:1583
+#: src/transport/plugin_transport_wlan.c:1587
 #, fuzzy
 msgid "# HELLO beacons sent via WLAN"
 msgstr "# byte skickade via UDP"
 
-#: src/transport/plugin_transport_wlan.c:1696
+#: src/transport/plugin_transport_wlan.c:1700
 msgid "WLAN address with invalid size encountered\n"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:1880
+#: src/transport/plugin_transport_wlan.c:1884
 #, c-format
 msgid "Helper binary `%s' not SUID, cannot run WLAN transport\n"
 msgstr ""
 
-#: src/transport/transport_api.c:651
+#: src/transport/transport_api.c:647
 #, fuzzy, c-format
 msgid "Received unexpected message of type %u in %s:%u\n"
 msgstr "Mottog skadat meddelande från motpart \"%s\"i %s:%d.\n"
 
-#: src/transport/transport-testing.c:585
+#: src/transport/transport-testing.c:584
 #, fuzzy
 msgid "Failed to initialize testing library!\n"
 msgstr "Misslyckades att initiera tjänsten \"%s\".\n"
 
-#: src/util/bio.c:137 src/util/bio.c:145
+#: src/tun/regex.c:129
+#, c-format
+msgid "Bad mask: %d\n"
+msgstr ""
+
+#: src/util/bio.c:170 src/util/bio.c:178
 #, fuzzy, c-format
 msgid "Error reading `%s': %s"
 msgstr "Fel vid skapandet av användare"
 
-#: src/util/bio.c:147
+#: src/util/bio.c:180
 #, fuzzy
 msgid "End of file"
 msgstr "Läs in en konfigurationsfil"
 
-#: src/util/bio.c:199
+#: src/util/bio.c:237
 #, c-format
 msgid "Error reading length of string `%s'"
 msgstr ""
 
-#: src/util/bio.c:209
+#: src/util/bio.c:247
 #, c-format
 msgid "String `%s' longer than allowed (%u > %u)"
 msgstr ""
 
-#: src/util/bio.c:254
+#: src/util/bio.c:293
 #, c-format
 msgid "Serialized metadata `%s' larger than allowed (%u>%u)"
 msgstr ""
 
-#: src/util/bio.c:268
+#: src/util/bio.c:307
 #, c-format
 msgid "Metadata `%s' failed to deserialize"
 msgstr ""
 
-#: src/util/client.c:261 src/util/client.c:839 src/util/service.c:993
+#: src/util/client.c:261 src/util/client.c:851 src/util/service.c:625
 #, c-format
 msgid "UNIXPATH `%s' too long, maximum length is %llu\n"
 msgstr ""
 
-#: src/util/client.c:265 src/util/client.c:843 src/util/service.c:997
+#: src/util/client.c:265 src/util/client.c:856 src/util/service.c:629
 #, fuzzy, c-format
 msgid "Using `%s' instead\n"
 msgstr "%s: flagga \"%s\" är tvetydig\n"
 
-#: src/util/client.c:357
+#: src/util/client.c:360
 #, c-format
 msgid ""
 "Could not determine valid hostname and port for service `%s' from "
 "configuration.\n"
 msgstr ""
 
-#: src/util/client.c:365
+#: src/util/client.c:368
 #, c-format
 msgid "Need a non-empty hostname for service `%s'.\n"
 msgstr ""
 
-#: src/util/client.c:981
+#: src/util/client.c:991
 #, fuzzy, c-format
 msgid "Could not connect to service `%s', configuration broken.\n"
 msgstr "Kunde inte ansluta till gnunetd.\n"
 
-#: src/util/client.c:993
+#: src/util/client.c:1003
 #, fuzzy, c-format
 msgid "Failure to transmit request to service `%s'\n"
 msgstr "Misslyckades att skicka HTTP-begäran till värd \"%s\": %s\n"
 
-#: src/util/client.c:1259
+#: src/util/client.c:1274
 msgid "Could not submit request, not expecting to receive a response.\n"
 msgstr ""
 
-#: src/util/common_logging.c:256 src/util/common_logging.c:1033
+#: src/util/common_logging.c:254 src/util/common_logging.c:1039
 msgid "DEBUG"
 msgstr "FELSÖKNING"
 
-#: src/util/common_logging.c:258 src/util/common_logging.c:1031
+#: src/util/common_logging.c:256 src/util/common_logging.c:1037
 msgid "INFO"
 msgstr "INFO"
 
-#: src/util/common_logging.c:260 src/util/common_logging.c:1029
+#: src/util/common_logging.c:258 src/util/common_logging.c:1035
 msgid "WARNING"
 msgstr "VARNING"
 
-#: src/util/common_logging.c:262 src/util/common_logging.c:1027
+#: src/util/common_logging.c:260 src/util/common_logging.c:1033
 msgid "ERROR"
 msgstr "FEL"
 
-#: src/util/common_logging.c:264 src/util/common_logging.c:1035
+#: src/util/common_logging.c:262 src/util/common_logging.c:1041
 msgid "NONE"
 msgstr ""
 
-#: src/util/common_logging.c:393
+#: src/util/common_logging.c:391
 #, fuzzy, c-format
 msgid "Failed to create or access directory for log file `%s'\n"
 msgstr "Kunde inte tolka konfigurationsfil \"%s\".\n"
@@ -6704,199 +7281,222 @@ msgstr "Kunde inte tolka konfigurationsfil \"%s\".\n"
 msgid "Message `%.*s' repeated %u times in the last %s\n"
 msgstr ""
 
-#: src/util/common_logging.c:1036
+#: src/util/common_logging.c:1042
 msgid "INVALID"
 msgstr ""
 
-#: src/util/common_logging.c:1138
+#: src/util/common_logging.c:1150
 msgid "unknown address"
 msgstr ""
 
-#: src/util/common_logging.c:1177
+#: src/util/common_logging.c:1189
 msgid "invalid address"
 msgstr ""
 
-#: src/util/common_logging.c:1195
+#: src/util/common_logging.c:1207
 #, fuzzy, c-format
 msgid "Configuration fails to specify option `%s' in section `%s'!\n"
 msgstr "Konfigurationsfil \"%s\" skapad.\n"
 
-#: src/util/common_logging.c:1216
+#: src/util/common_logging.c:1228
 #, fuzzy, c-format
 msgid ""
 "Configuration specifies invalid value for option `%s' in section `%s': %s\n"
 msgstr "Konfigurationsfil \"%s\" hittades inte.  Kör \"gnunet-setup -d\"!\n"
 
-#: src/util/configuration.c:291
+#: src/util/configuration.c:288
 #, fuzzy, c-format
 msgid "Syntax error while deserializing in line %u\n"
 msgstr "Syntaxfel i konfigurationsfil \"%s\" på rad %d.\n"
 
-#: src/util/configuration.c:984
+#: src/util/configuration.c:996
 #, c-format
 msgid ""
 "Configuration value '%s' for '%s' in section '%s' is not in set of legal "
 "choices\n"
 msgstr ""
 
-#: src/util/connection.c:424
+#: src/util/configuration.c:1065
+#, c-format
+msgid "Recursive expansion suspected, aborting $-expansion for term `%s'\n"
+msgstr ""
+
+#: src/util/configuration.c:1097
+#, fuzzy, c-format
+msgid "Missing closing `%s' in option `%s'\n"
+msgstr "Konfigurationsfil \"%s\" skapad.\n"
+
+#: src/util/configuration.c:1170
+#, c-format
+msgid ""
+"Failed to expand `%s' in `%s' as it is neither found in [PATHS] nor defined "
+"as an environmental variable\n"
+msgstr ""
+
+#: src/util/connection.c:423
 #, fuzzy, c-format
 msgid "Access denied to `%s'\n"
 msgstr "Åtkomst nekad för \"%s\" vid %s:%d.\n"
 
-#: src/util/connection.c:439
+#: src/util/connection.c:438
 #, c-format
 msgid "Accepting connection from `%s': %p\n"
 msgstr ""
 
-#: src/util/connection.c:554
+#: src/util/connection.c:553
 #, fuzzy, c-format
 msgid ""
 "Failed to establish TCP connection to `%s:%u', no further addresses to try.\n"
 msgstr "Misslyckades att starta samling.\n"
 
-#: src/util/connection.c:752 src/util/connection.c:919
+#: src/util/connection.c:751 src/util/connection.c:909
 #, fuzzy, c-format
 msgid "Trying to connect to `%s' (%p)\n"
 msgstr "Kan inte ansluta till %u.%u.%u.%u:%u: %s\n"
 
-#: src/util/connection.c:910
+#: src/util/connection.c:900
 #, fuzzy, c-format
 msgid "Attempt to connect to `%s' failed\n"
 msgstr " Anslutning misslyckades\n"
 
-#: src/util/container_bloomfilter.c:518
+#: src/util/container_bloomfilter.c:516
 #, c-format
 msgid ""
 "Size of file on disk is incorrect for this Bloom filter (want %llu, have "
 "%llu)\n"
 msgstr ""
 
-#: src/util/crypto_ecc.c:580 src/util/crypto_ecc.c:618
+#: src/util/crypto_ecc.c:940 src/util/crypto_ecc.c:978
+#: src/util/crypto_ecc.c:1096 src/util/crypto_ecc.c:1134
 #, fuzzy, c-format
 msgid "Could not acquire lock on file `%s': %s...\n"
 msgstr "Kunde inte slå upp \"%s\": %s\n"
 
-#: src/util/crypto_ecc.c:585
+#: src/util/crypto_ecc.c:945 src/util/crypto_ecc.c:1101
 #, fuzzy
 msgid "Creating a new private key.  This may take a while.\n"
 msgstr "Skapar ny värdnyckel (det här kan ta en stund).\n"
 
-#: src/util/crypto_ecc.c:622
+#: src/util/crypto_ecc.c:982 src/util/crypto_ecc.c:1138
 msgid "This may be ok if someone is currently generating a private key.\n"
 msgstr ""
 
-#: src/util/crypto_ecc.c:653
+#: src/util/crypto_ecc.c:1012 src/util/crypto_ecc.c:1168
 #, c-format
 msgid ""
 "When trying to read key file `%s' I found %u bytes but I need at least %u.\n"
 msgstr ""
 
-#: src/util/crypto_ecc.c:658
+#: src/util/crypto_ecc.c:1016 src/util/crypto_ecc.c:1172
 msgid "This may be ok if someone is currently generating a key.\n"
 msgstr ""
 
-#: src/util/crypto_ecc.c:741
+#: src/util/crypto_ecc.c:1254
 #, fuzzy
 msgid "Could not load peer's private key\n"
 msgstr "Kunde inte tolka konfigurationsfil \"%s\".\n"
 
-#: src/util/crypto_ecc.c:803
+#: src/util/crypto_ecc.c:1343
 #, 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:883
+#: src/util/crypto_ecc.c:1393
+#, 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:1472
+#, 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:1534
 #, fuzzy, c-format
-msgid "ECC signature verification failed at %s:%d: %s\n"
+msgid "EdDSA signature verification failed at %s:%d: %s\n"
 msgstr "\"%s\" misslyckades vid %s:%d med fel: \"%s\".\n"
 
-#: src/util/crypto_random.c:281
+#: src/util/crypto_random.c:320
 #, c-format
 msgid "Starting `%s' process to generate entropy\n"
 msgstr ""
 
-#: src/util/crypto_random.c:312
+#: src/util/crypto_random.c:351
 #, c-format
 msgid "libgcrypt has not the expected version (version %s is required).\n"
 msgstr "libgcrypt har inte den förväntande versionen (version %s krävs).\n"
 
-#: src/util/disk.c:1150
+#: src/util/disk.c:1185
 #, fuzzy, c-format
 msgid "Expected `%s' to be a directory!\n"
 msgstr "\"%s\" förväntade att \"%s\" skulle vara en katalog!\n"
 
-#: src/util/disk.c:1507 src/util/service.c:1674
+#: src/util/disk.c:1543 src/util/service.c:1315
 #, fuzzy, c-format
 msgid "Cannot obtain information about user `%s': %s\n"
 msgstr "Kan inte öppna konfigurationsfil \"%s\".\n"
 
-#: src/util/disk.c:1954
-#, fuzzy, c-format
-msgid "No `%s' specified for service `%s' in configuration.\n"
-msgstr "Inga applikationer definierade i konfiguration!\n"
-
-#: src/util/getopt.c:570
+#: src/util/getopt.c:568
 #, c-format
 msgid "%s: option `%s' is ambiguous\n"
 msgstr "%s: flagga \"%s\" är tvetydig\n"
 
-#: src/util/getopt.c:594
+#: src/util/getopt.c:592
 #, c-format
 msgid "%s: option `--%s' does not allow an argument\n"
 msgstr "%s: flagga \"--%s\" tillåter inte ett argument\n"
 
-#: src/util/getopt.c:599
+#: src/util/getopt.c:597
 #, c-format
 msgid "%s: option `%c%s' does not allow an argument\n"
 msgstr "%s: flagga \"%c%s\" tillåter inte ett argument\n"
 
-#: src/util/getopt.c:616 src/util/getopt.c:783
+#: src/util/getopt.c:614 src/util/getopt.c:781
 #, c-format
 msgid "%s: option `%s' requires an argument\n"
 msgstr "%s: flagga \"%s\" kräver ett argument\n"
 
-#: src/util/getopt.c:645
+#: src/util/getopt.c:643
 #, c-format
 msgid "%s: unrecognized option `--%s'\n"
 msgstr "%s: okänd flagga \"--%s\"\n"
 
-#: src/util/getopt.c:649
+#: src/util/getopt.c:647
 #, c-format
 msgid "%s: unrecognized option `%c%s'\n"
 msgstr "%s: okänd flagga \"%c%s\"\n"
 
-#: src/util/getopt.c:674
+#: src/util/getopt.c:672
 #, c-format
 msgid "%s: illegal option -- %c\n"
 msgstr "%s: otillåten flagga -- %c\n"
 
-#: src/util/getopt.c:676
+#: src/util/getopt.c:674
 #, c-format
 msgid "%s: invalid option -- %c\n"
 msgstr "%s: ogiltig flagga -- %c\n"
 
-#: src/util/getopt.c:704 src/util/getopt.c:831
+#: src/util/getopt.c:702 src/util/getopt.c:829
 #, c-format
 msgid "%s: option requires an argument -- %c\n"
 msgstr "%s: flagga kräver ett argument -- %c\n"
 
-#: src/util/getopt.c:752
+#: src/util/getopt.c:750
 #, c-format
 msgid "%s: option `-W %s' is ambiguous\n"
 msgstr "%s: flagga \"-W %s\" är tvetydig\n"
 
-#: src/util/getopt.c:770
+#: src/util/getopt.c:768
 #, c-format
 msgid "%s: option `-W %s' does not allow an argument\n"
 msgstr "%s: flagga \"-W %s\" tillåter inte ett argument\n"
 
-#: src/util/getopt.c:935
+#: src/util/getopt.c:933
 #, fuzzy, c-format
 msgid "Use %s to get a list of options.\n"
 msgstr "Använd --help för att få en lista på flaggor.\n"
 
-#: src/util/getopt_helpers.c:86
+#: src/util/getopt_helpers.c:84
 #, c-format
 msgid ""
 "Arguments mandatory for long options are also mandatory for short options.\n"
@@ -6904,12 +7504,12 @@ msgstr ""
 "Argument som är obligatoriska för långa flaggor är också obligatoriska för "
 "korta flaggor.\n"
 
-#: src/util/getopt_helpers.c:270 src/util/getopt_helpers.c:328
+#: src/util/getopt_helpers.c:268 src/util/getopt_helpers.c:326
 #, c-format
 msgid "You must pass a number to the `%s' option.\n"
 msgstr "Du måste skicka med ett nummer till flaggan \"%s\".\n"
 
-#: src/util/getopt_helpers.c:300
+#: src/util/getopt_helpers.c:298
 #, fuzzy, c-format
 msgid "You must pass relative time to the `%s' option.\n"
 msgstr "Du måste skicka med ett nummer till flaggan \"%s\".\n"
@@ -6977,24 +7577,23 @@ msgid ""
 "Error, %u keys not generated\n"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:118
-#, c-format
+#: src/util/gnunet-ecc.c:119
 msgid "No hostkey file specified on command line\n"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:163
+#: src/util/gnunet-ecc.c:168
 msgid "create COUNT public-private key pairs (for testing)"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:166
+#: src/util/gnunet-ecc.c:171
 msgid "print the public key in ASCII format"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:169
+#: src/util/gnunet-ecc.c:174
 msgid "print the hash of the public key in ASCII format"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:180
+#: src/util/gnunet-ecc.c:185
 #, fuzzy
 msgid "Manipulate GNUnet private ECC key files"
 msgstr "skriv ut ett värde från konfigurationsfilen till standard ut"
@@ -7042,76 +7641,76 @@ msgstr ""
 msgid "Perform default-actions for GNUnet URIs"
 msgstr ""
 
-#: src/util/helper.c:330
+#: src/util/helper.c:338
 #, fuzzy, c-format
 msgid "Error reading from `%s': %s\n"
 msgstr "Fel vid skapandet av användare"
 
-#: src/util/helper.c:375
+#: src/util/helper.c:383
 #, fuzzy, c-format
 msgid "Failed to parse inbound message from helper `%s'\n"
 msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 
-#: src/util/helper.c:572
+#: src/util/helper.c:609
 #, fuzzy, c-format
 msgid "Error writing to `%s': %s\n"
 msgstr "Fel vid skapandet av användare"
 
-#: src/util/network.c:132
+#: src/util/network.c:134
 #, c-format
 msgid "Unable to shorten unix path `%s' while keeping name unique\n"
 msgstr ""
 
-#: src/util/network.c:1370
+#: src/util/network.c:1397
 #, c-format
 msgid ""
 "Fatal internal logic error, process hangs in `%s' (abort with CTRL-C)!\n"
 msgstr ""
 
-#: src/util/os_installation.c:423
+#: src/util/os_installation.c:421
 #, c-format
 msgid ""
 "Could not determine installation path for %s.  Set `%s' environment "
 "variable.\n"
 msgstr ""
 
-#: src/util/os_installation.c:709
+#: src/util/os_installation.c:710
 #, fuzzy, c-format
 msgid "Could not find binary `%s' in PATH!\n"
 msgstr "Kunde inte hitta motpart \"%s\" i routingtabell!\n"
 
 # drive = hard drive ?
-#: src/util/os_installation.c:769
+#: src/util/os_installation.c:770
 #, fuzzy, c-format
 msgid "CreateProcess failed for binary %s (%d).\n"
 msgstr "\"%s\" misslyckades för enhet %s: %u\n"
 
-#: src/util/os_installation.c:779
+#: src/util/os_installation.c:780
 #, c-format
 msgid "GetExitCodeProcess failed for binary %s (%d).\n"
 msgstr ""
 
-#: src/util/plugin.c:89
+#: src/util/plugin.c:87
 #, c-format
 msgid "Initialization of plugin mechanism failed: %s!\n"
 msgstr "Initiering av insticksmekanism misslyckades: %s!\n"
 
-#: src/util/plugin.c:146
+#: src/util/plugin.c:144
 #, fuzzy, c-format
 msgid "`%s' failed to resolve method '%s' with error: %s\n"
 msgstr "\"%s\" misslyckades för fil \"%s\" vid %s:%d med fel: %s\n"
 
-#: src/util/plugin.c:219
+#: src/util/plugin.c:217
 #, fuzzy, c-format
 msgid "`%s' failed for library `%s' with error: %s\n"
 msgstr "\"%s\" misslyckades vid %s:%d med fel: %s\n"
 
-#: src/util/plugin.c:349
+#: src/util/plugin.c:347
 #, fuzzy
 msgid "Could not determine plugin installation path.\n"
 msgstr "Kunde inte fastställa min publika IPv6-adress.\n"
 
-#: src/util/program.c:254 src/util/service.c:1796
+#: src/util/program.c:262 src/util/service.c:1452
 #, fuzzy, c-format
 msgid "Could not access configuration file `%s'\n"
 msgstr "Kunde inte tolka konfigurationsfil \"%s\".\n"
@@ -7121,7 +7720,7 @@ msgstr "Kunde inte tolka konfigurationsfil \"%s\".\n"
 msgid "Must specify `%s' for `%s' in configuration!\n"
 msgstr "Försöker använda fil \"%s\" för MySQL-konfiguration.\n"
 
-#: src/util/resolver_api.c:217
+#: src/util/resolver_api.c:216
 #, fuzzy, c-format
 msgid ""
 "Must specify `%s' or numeric IP address for `%s' of `%s' in configuration!\n"
@@ -7139,451 +7738,512 @@ msgstr ""
 msgid "Timeout trying to resolve hostname `%s'.\n"
 msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 
-#: src/util/resolver_api.c:886
+#: src/util/resolver_api.c:891
 #, fuzzy, c-format
 msgid "Could not resolve our FQDN : %s\n"
 msgstr "Kunde inte slå upp \"%s\": %s\n"
 
-#: src/util/scheduler.c:802
+#: src/util/scheduler.c:804
 msgid "Looks like we're busy waiting...\n"
 msgstr ""
 
-#: src/util/scheduler.c:933
+#: src/util/scheduler.c:938
 #, c-format
 msgid "Attempt to cancel dead task %llu!\n"
 msgstr ""
 
 # drive = hard drive ?
-#: src/util/server.c:482
+#: src/util/server.c:484
 #, fuzzy, c-format
 msgid "`%s' failed for port %d (%s).\n"
 msgstr "\"%s\" misslyckades för enhet %s: %u\n"
 
-#: src/util/server.c:491
+#: src/util/server.c:493
 #, fuzzy, c-format
 msgid "`%s' failed for port %d (%s): address already in use\n"
 msgstr "\"%s\" misslyckades för port %d: %s. Körs verkligen gnunetd?\n"
 
-#: src/util/server.c:502
+#: src/util/server.c:499
 #, fuzzy, c-format
-msgid "`%s' failed for `%.*s': address already in use\n"
+msgid "`%s' failed for `%s': address already in use\n"
 msgstr "\"%s\" misslyckades för port %d: %s. Körs verkligen gnunetd?\n"
 
-#: src/util/server.c:894
+#: src/util/server.c:892
 #, c-format
 msgid ""
 "Processing code for message of type %u did not call "
 "`GNUNET_SERVER_receive_done' after %s\n"
 msgstr ""
 
-#: src/util/service.c:151 src/util/service.c:177 src/util/service.c:220
-#: src/util/service.c:241 src/util/service.c:248
-#, c-format
-msgid "Invalid format for IP: `%s'\n"
-msgstr "Ogiltigt format för IP: \"%s\"\n"
-
-#: src/util/service.c:204
-#, c-format
-msgid "Invalid network notation ('/%d' is not legal in IPv4 CIDR)."
-msgstr "Ogiltig nätverksnotation (\"/%d\" är inte giltig i IPv4 CIDR)."
-
-#: src/util/service.c:297
-#, c-format
-msgid "Invalid network notation (does not end with ';': `%s')\n"
-msgstr "Ogiltig nätverksnotation (slutar inte med \";\": \"%s\")\n"
-
-#: src/util/service.c:329
-#, fuzzy, c-format
-msgid "Wrong format `%s' for netmask\n"
-msgstr "Fel format \"%s\" för nätmask: %s\n"
-
-#: src/util/service.c:359
-#, fuzzy, c-format
-msgid "Wrong format `%s' for network\n"
-msgstr "Fel format \"%s\" för nätverk: %s\n"
-
-#: src/util/service.c:716
-#, c-format
-msgid "Access denied to UID %d / GID %d\n"
-msgstr ""
-
-#: src/util/service.c:721
+#: src/util/service.c:362
 #, fuzzy, c-format
 msgid "Unknown address family %d\n"
 msgstr "Okänd operation \"%s\"\n"
 
-#: src/util/service.c:728
+#: src/util/service.c:369
 #, c-format
 msgid "Access from `%s' denied to service `%s'\n"
 msgstr ""
 
-#: src/util/service.c:783
+#: src/util/service.c:424
 #, c-format
 msgid "Could not parse IPv4 network specification `%s' for `%s:%s'\n"
 msgstr ""
 
-#: src/util/service.c:820
+#: src/util/service.c:461
 #, c-format
 msgid "Could not parse IPv6 network specification `%s' for `%s:%s'\n"
 msgstr ""
 
-#: src/util/service.c:938
+#: src/util/service.c:570
 #, c-format
 msgid ""
 "Disabling IPv6 support for service `%s', failed to create IPv6 socket: %s\n"
 msgstr ""
 
-#: src/util/service.c:1016
+#: src/util/service.c:651
 #, c-format
 msgid ""
 "Disabling UNIX domain socket support for service `%s', failed to create UNIX "
 "domain socket: %s\n"
 msgstr ""
 
-#: src/util/service.c:1033
+#: src/util/service.c:667
 #, c-format
 msgid "Have neither PORT nor UNIXPATH for service `%s', but one is required\n"
 msgstr ""
 
-#: src/util/service.c:1267
+#: src/util/service.c:901
 msgid "Could not access a pre-bound socket, will try to bind myself\n"
 msgstr ""
 
-#: src/util/service.c:1316 src/util/service.c:1334
+#: src/util/service.c:950 src/util/service.c:968
 #, c-format
 msgid "Specified value for `%s' of service `%s' is invalid\n"
 msgstr ""
 
-#: src/util/service.c:1359
+#: src/util/service.c:993
 #, c-format
 msgid "Could not access pre-bound socket %u, will try to bind myself\n"
 msgstr ""
 
-#: src/util/service.c:1530
+#: src/util/service.c:1163
 #, fuzzy, c-format
 msgid "Failed to start `%s' at `%s'\n"
 msgstr "Fel vid %s:%d.\n"
 
-#: src/util/service.c:1563
+#: src/util/service.c:1204
 #, fuzzy, c-format
 msgid "Service `%s' runs at %s\n"
 msgstr "Motpart \"%s\" med pålitlighet %8u och adress \"%s\"\n"
 
-#: src/util/service.c:1612
+#: src/util/service.c:1253
 msgid "Service process failed to initialize\n"
 msgstr ""
 
-#: src/util/service.c:1616
+#: src/util/service.c:1257
 msgid "Service process could not initialize server function\n"
 msgstr ""
 
-#: src/util/service.c:1620
+#: src/util/service.c:1261
 msgid "Service process failed to report status\n"
 msgstr ""
 
-#: src/util/service.c:1675
+#: src/util/service.c:1316
 msgid "No such user"
 msgstr ""
 
-#: src/util/service.c:1688
+#: src/util/service.c:1329
 #, c-format
 msgid "Cannot change user/group to `%s': %s\n"
 msgstr "Kan inte ändra användare/grupp till \"%s\": %s\n"
 
-#: src/util/service.c:1754
+#: src/util/service.c:1399
 msgid "do daemonize (detach from terminal)"
 msgstr ""
 
-#: src/util/signal.c:80
+#: src/util/signal.c:79
 #, fuzzy, c-format
 msgid "signal (%d, %p) returned %d.\n"
 msgstr "Anrop till \"%s\" returnerade %d.\n"
 
-#: src/util/strings.c:146
+#: src/util/strings.c:145
 msgid "b"
 msgstr "b"
 
-#: src/util/strings.c:429
+#: src/util/strings.c:444
 #, c-format
 msgid "Character sets requested were `%s'->`%s'\n"
 msgstr ""
 
-#: src/util/strings.c:544
+#: src/util/strings.c:572
 msgid "Failed to expand `$HOME': environment variable `HOME' not set"
 msgstr ""
 
-#: src/util/strings.c:641
+#: src/util/strings.c:669
 msgid "µs"
 msgstr ""
 
-#: src/util/strings.c:645
+#: src/util/strings.c:673
 msgid "forever"
 msgstr ""
 
-#: src/util/strings.c:647
+#: src/util/strings.c:675
 msgid "0 ms"
 msgstr ""
 
-#: src/util/strings.c:653
+#: src/util/strings.c:681
 msgid "ms"
 msgstr "ms"
 
-#: src/util/strings.c:659
+#: src/util/strings.c:687
 msgid "s"
 msgstr "s"
 
-#: src/util/strings.c:665
+#: src/util/strings.c:693
 msgid "m"
 msgstr "m"
 
-#: src/util/strings.c:671
+#: src/util/strings.c:699
 msgid "h"
 msgstr "h"
 
-#: src/util/strings.c:678
+#: src/util/strings.c:706
 #, fuzzy
 msgid "day"
 msgstr " dagar"
 
-#: src/util/strings.c:680
+#: src/util/strings.c:708
 #, fuzzy
 msgid "days"
 msgstr " dagar"
 
-#: src/util/strings.c:708
+#: src/util/strings.c:737
 msgid "end of time"
 msgstr ""
 
-#: src/util/strings.c:1109
+#: src/util/strings.c:1141
 msgid "IPv6 address did not start with `['\n"
 msgstr ""
 
-#: src/util/strings.c:1117
+#: src/util/strings.c:1149
 msgid "IPv6 address did contain ':' to separate port number\n"
 msgstr ""
 
-#: src/util/strings.c:1123
+#: src/util/strings.c:1155
 msgid "IPv6 address did contain ']' before ':' to separate port number\n"
 msgstr ""
 
-#: src/util/strings.c:1130
+#: src/util/strings.c:1162
 msgid "IPv6 address did contain a valid port number after the last ':'\n"
 msgstr ""
 
-#: src/util/strings.c:1139
+#: src/util/strings.c:1171
 #, fuzzy, c-format
 msgid "Invalid IPv6 address `%s': %s\n"
 msgstr "Ogiltigt svar på \"%s\".\n"
 
-#: src/vpn/gnunet-service-vpn.c:523 src/vpn/gnunet-service-vpn.c:1128
+#: src/util/strings.c:1377 src/util/strings.c:1393
+msgid "Port not in range\n"
+msgstr ""
+
+#: src/util/strings.c:1402
+#, fuzzy, c-format
+msgid "Malformed port policy `%s'\n"
+msgstr "Misslyckades att starta samling.\n"
+
+#: src/util/strings.c:1486 src/util/strings.c:1517 src/util/strings.c:1565
+#: src/util/strings.c:1586
+#, c-format
+msgid "Invalid format for IP: `%s'\n"
+msgstr "Ogiltigt format för IP: \"%s\"\n"
+
+#: src/util/strings.c:1543
+#, c-format
+msgid "Invalid network notation ('/%d' is not legal in IPv4 CIDR)."
+msgstr "Ogiltig nätverksnotation (\"/%d\" är inte giltig i IPv4 CIDR)."
+
+#: src/util/strings.c:1595
+#, fuzzy, c-format
+msgid "Invalid format: `%s'\n"
+msgstr "Ogiltigt format för IP: \"%s\"\n"
+
+#: src/util/strings.c:1647
+#, c-format
+msgid "Invalid network notation (does not end with ';': `%s')\n"
+msgstr "Ogiltig nätverksnotation (slutar inte med \";\": \"%s\")\n"
+
+#: src/util/strings.c:1697
+#, fuzzy, c-format
+msgid "Wrong format `%s' for netmask\n"
+msgstr "Fel format \"%s\" för nätmask: %s\n"
+
+#: src/util/strings.c:1728
+#, fuzzy, c-format
+msgid "Wrong format `%s' for network\n"
+msgstr "Fel format \"%s\" för nätverk: %s\n"
+
+#: src/vpn/gnunet-service-vpn.c:550 src/vpn/gnunet-service-vpn.c:1088
 #, fuzzy
 msgid "# Active tunnels"
 msgstr "Nätverksanslutning"
 
-#: src/vpn/gnunet-service-vpn.c:622 src/vpn/gnunet-service-vpn.c:661
-#, fuzzy
-msgid "# peers connected to mesh tunnels"
-msgstr "# av anslutna parter"
-
-#: src/vpn/gnunet-service-vpn.c:712
+#: src/vpn/gnunet-service-vpn.c:642
 #, fuzzy
 msgid "# Bytes given to mesh for transmission"
 msgstr "# PING-meddelanden skapade"
 
-#: src/vpn/gnunet-service-vpn.c:750
+#: src/vpn/gnunet-service-vpn.c:680
 #, fuzzy
 msgid "# Bytes dropped in mesh queue (overflow)"
 msgstr "# byte kastade via UDP (utgående)"
 
-#: src/vpn/gnunet-service-vpn.c:814
+#: src/vpn/gnunet-service-vpn.c:754
 #, fuzzy
 msgid "# Mesh tunnels created"
 msgstr "# PING-meddelanden skapade"
 
-#: src/vpn/gnunet-service-vpn.c:839
+#: src/vpn/gnunet-service-vpn.c:786
 #, fuzzy
 msgid "Failed to setup mesh tunnel!\n"
 msgstr "Kunde inte skapa värdnyckel!\n"
 
-#: src/vpn/gnunet-service-vpn.c:1032
+#: src/vpn/gnunet-service-vpn.c:980
 #, c-format
 msgid "Protocol %u not supported, dropping\n"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:1348
+#: src/vpn/gnunet-service-vpn.c:1307
 msgid "# ICMPv4 packets dropped (not allowed)"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:1369
+#: src/vpn/gnunet-service-vpn.c:1328
 msgid "# ICMPv6 packets dropped (not allowed)"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:1574
+#: src/vpn/gnunet-service-vpn.c:1533
 #, fuzzy
 msgid "# Packets received from TUN interface"
 msgstr "Meddelande mottaget från klient är ogiltig.\n"
 
-#: src/vpn/gnunet-service-vpn.c:1612 src/vpn/gnunet-service-vpn.c:1653
+#: src/vpn/gnunet-service-vpn.c:1566 src/vpn/gnunet-service-vpn.c:1602
 #, c-format
 msgid "Packet received for unmapped destination `%s' (dropping it)\n"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:1663
+#: src/vpn/gnunet-service-vpn.c:1612
 msgid "Received IPv4 packet with options (dropping it)\n"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:1677
+#: src/vpn/gnunet-service-vpn.c:1626
 #, c-format
 msgid "Received packet of unknown protocol %d from TUN (dropping it)\n"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:1759
+#: src/vpn/gnunet-service-vpn.c:1708
 #, fuzzy
 msgid "# ICMP packets received from mesh"
 msgstr "Meddelande mottaget från klient är ogiltig.\n"
 
-#: src/vpn/gnunet-service-vpn.c:2098
+#: src/vpn/gnunet-service-vpn.c:2047
 #, fuzzy
 msgid "# UDP packets received from mesh"
 msgstr "Meddelande mottaget från klient är ogiltig.\n"
 
-#: src/vpn/gnunet-service-vpn.c:2253
+#: src/vpn/gnunet-service-vpn.c:2202
 #, fuzzy
 msgid "# TCP packets received from mesh"
 msgstr "Meddelande mottaget från klient är ogiltig.\n"
 
-#: src/vpn/gnunet-service-vpn.c:2404
+#: src/vpn/gnunet-service-vpn.c:2353
 msgid "Failed to find unallocated IPv4 address in VPN's range\n"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:2459
+#: src/vpn/gnunet-service-vpn.c:2408
 msgid "Failed to find unallocated IPv6 address in VPN's range\n"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:2498 src/vpn/gnunet-service-vpn.c:2711
+#: src/vpn/gnunet-service-vpn.c:2449 src/vpn/gnunet-service-vpn.c:2665
 #, fuzzy
 msgid "# Active destinations"
 msgstr "Nätverksanslutning"
 
-#: src/vpn/gnunet-service-vpn.c:2784
+#: src/vpn/gnunet-service-vpn.c:2717
 msgid "Failed to allocate IP address for new destination\n"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:3112
+#: src/vpn/gnunet-service-vpn.c:2984
 #, fuzzy
 msgid "Must specify valid IPv6 address"
 msgstr "\"%s\" är inte tillgänglig."
 
-#: src/vpn/gnunet-service-vpn.c:3133
+#: src/vpn/gnunet-service-vpn.c:3008
 msgid "Must specify valid IPv6 mask"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:3141
+#: src/vpn/gnunet-service-vpn.c:3016
 msgid "IPv6 support disabled as this system does not support IPv6\n"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:3153
+#: src/vpn/gnunet-service-vpn.c:3029
 #, fuzzy
 msgid "Must specify valid IPv4 address"
 msgstr "\"%s\" är inte tillgänglig."
 
-#: src/vpn/gnunet-service-vpn.c:3164
+#: src/vpn/gnunet-service-vpn.c:3042
 msgid "Must specify valid IPv4 mask"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:3173
+#: src/vpn/gnunet-service-vpn.c:3052
 msgid "IPv4 support disabled as this system does not support IPv4\n"
 msgstr ""
 
-#: src/vpn/gnunet-vpn.c:151
+#: src/vpn/gnunet-vpn.c:146
 #, fuzzy
 msgid "Error creating tunnel\n"
 msgstr "Klar med skapandet av värdnyckel.\n"
 
-#: src/vpn/gnunet-vpn.c:194 src/vpn/gnunet-vpn.c:225
+#: src/vpn/gnunet-vpn.c:189 src/vpn/gnunet-vpn.c:220
 #, fuzzy, c-format
 msgid "Option `%s' makes no sense with option `%s'.\n"
 msgstr "Kommando \"%s\" kräver ett argument (\"%s\").\n"
 
-#: src/vpn/gnunet-vpn.c:207
+#: src/vpn/gnunet-vpn.c:202
 #, fuzzy, c-format
 msgid "Option `%s' or `%s' is required.\n"
 msgstr "%s: flagga \"%s\" är tvetydig\n"
 
-#: src/vpn/gnunet-vpn.c:219
+#: src/vpn/gnunet-vpn.c:214
 #, fuzzy, c-format
 msgid "Option `%s' or `%s' is required when using option `%s'.\n"
 msgstr "Kommando \"%s\" kräver ett argument (\"%s\").\n"
 
-#: src/vpn/gnunet-vpn.c:237
+#: src/vpn/gnunet-vpn.c:233
 #, fuzzy, c-format
 msgid "`%s' is not a valid peer identifier.\n"
 msgstr "\"%s\" är inte en vanlig fil.\n"
 
-#: src/vpn/gnunet-vpn.c:259
+#: src/vpn/gnunet-vpn.c:254
 #, fuzzy, c-format
 msgid "`%s' is not a valid IP address.\n"
 msgstr "\"%s\" är inte tillgänglig."
 
-#: src/vpn/gnunet-vpn.c:295
+#: src/vpn/gnunet-vpn.c:289
 msgid "request that result should be an IPv4 address"
 msgstr ""
 
-#: src/vpn/gnunet-vpn.c:298
+#: src/vpn/gnunet-vpn.c:292
 msgid "request that result should be an IPv6 address"
 msgstr ""
 
-#: src/vpn/gnunet-vpn.c:301
-msgid "print IP address only after mesh tunnel has been created"
-msgstr ""
-
-#: src/vpn/gnunet-vpn.c:304
+#: src/vpn/gnunet-vpn.c:295
 msgid "how long should the mapping be valid for new tunnels?"
 msgstr ""
 
-#: src/vpn/gnunet-vpn.c:307
+#: src/vpn/gnunet-vpn.c:298
 msgid "destination IP for the tunnel"
 msgstr ""
 
-#: src/vpn/gnunet-vpn.c:310
+#: src/vpn/gnunet-vpn.c:301
 msgid "peer offering the service we would like to access"
 msgstr ""
 
-#: src/vpn/gnunet-vpn.c:313
+#: src/vpn/gnunet-vpn.c:304
 msgid "name of the service we would like to access"
 msgstr ""
 
-#: src/vpn/gnunet-vpn.c:316
+#: src/vpn/gnunet-vpn.c:307
 #, fuzzy
 msgid "service is offered via TCP"
 msgstr "# byte mottogs via TCP"
 
-#: src/vpn/gnunet-vpn.c:319
+#: src/vpn/gnunet-vpn.c:310
 #, fuzzy
 msgid "service is offered via UDP"
 msgstr "# byte mottagna via UDP"
 
-#: src/vpn/gnunet-vpn.c:331
+#: src/vpn/gnunet-vpn.c:322
 msgid "Setup tunnels via VPN."
 msgstr ""
 
-#: src/include/gnunet_common.h:618 src/include/gnunet_common.h:625
-#: src/include/gnunet_common.h:633
+#: src/include/gnunet_common.h:566 src/include/gnunet_common.h:573
+#: src/include/gnunet_common.h:581
 #, 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:645
+#: src/include/gnunet_common.h:593
 #, c-format
 msgid "External protocol violation detected at %s:%d.\n"
 msgstr ""
 
-#: src/include/gnunet_common.h:672 src/include/gnunet_common.h:681
+#: src/include/gnunet_common.h:620 src/include/gnunet_common.h:629
 #, 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 "Loading block plugin `%s'\n"
+#~ msgstr "Testar transport(er) %s\n"
+
+#, fuzzy
+#~ msgid "Invalid value `%s'\n"
+#~ msgstr "Ogiltigt argument: \"%s\"\n"
+
+#, fuzzy
+#~ msgid "Found issuer for public key `%s'\n"
+#~ msgstr "Testar transport(er) %s\n"
+
+#, fuzzy
+#~ msgid "No issuer for public key `%s'\n"
+#~ msgstr "%d filer hittades i katalog.\n"
+
+#, fuzzy
+#~ msgid "Invalid work requirement for NSE service. Exiting.\n"
+#~ msgstr "Ogiltiga argument. Avslutar.\n"
+
+#, fuzzy
+#~ msgid "Failed to get slave counters!\n"
+#~ msgstr "Kunde inte skapa värdnyckel!\n"
+
+#, fuzzy
+#~ msgid ""
+#~ "Could not translate E[a%d] to MPI!\n"
+#~ "%s/%s\n"
+#~ msgstr "Kunde inte köra \"%s\": %s\n"
+
+#, fuzzy
+#~ msgid "Job command file not given. Exiting\n"
+#~ msgstr "använd konfigurationsfil FILNAMN"
+
+#, fuzzy
+#~ msgid "Error while decoding key %u\n"
+#~ msgstr "Fel vid nedladdning: %s\n"
+
+#, fuzzy
+#~ msgid "Could not read friends list `%s'\n"
+#~ msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
+
+#, fuzzy
+#~ msgid "Failed to read friends list from `%s': out of memory\n"
+#~ msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
+
+#~ msgid "Failed to read friends list from `%s'\n"
+#~ msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
+
+#, fuzzy
+#~ msgid "ECC signature verification failed at %s:%d: %s\n"
+#~ msgstr "\"%s\" misslyckades vid %s:%d med fel: \"%s\".\n"
+
+#, fuzzy
+#~ msgid "No `%s' specified for service `%s' in configuration.\n"
+#~ msgstr "Inga applikationer definierade i konfiguration!\n"
+
+#, fuzzy
+#~ msgid "# peers connected to mesh tunnels"
+#~ msgstr "# av anslutna parter"
+
+#, fuzzy
 #~ msgid "Failed to parse metadata about pseudonym from file `%s': %s\n"
 #~ msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 
@@ -7644,14 +8304,6 @@ msgstr "\"%s\" misslyckades för fil \"%s\" vid %s:%d med fel: %s\n"
 #~ msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 
 #, fuzzy
-#~ msgid "Failed to read private key for namespace `%s'\n"
-#~ msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
-
-#, fuzzy
-#~ msgid "ECDSA signature verification failed at %s:%d: %s\n"
-#~ msgstr "\"%s\" misslyckades vid %s:%d med fel: \"%s\".\n"
-
-#, fuzzy
 #~ msgid "Failed to create namespace `%s' (illegal filename?)\n"
 #~ msgstr "Kunde inte skapa namnrymd \"%s\" (existerar?).\n"
 
@@ -7745,10 +8397,6 @@ msgstr "\"%s\" misslyckades för fil \"%s\" vid %s:%d med fel: %s\n"
 #~ msgstr "\"%s\" misslyckades för enhet %s: %u\n"
 
 #, fuzzy
-#~ msgid "Service `%s' has been stopped.\n"
-#~ msgstr "Tjänst borttagen.\n"
-
-#, fuzzy
 #~ msgid "Service `%s' was already running.\n"
 #~ msgstr "\"%s\" är inte en fil.\n"
 
@@ -7773,10 +8421,6 @@ msgstr "\"%s\" misslyckades för fil \"%s\" vid %s:%d med fel: %s\n"
 #~ msgstr "Skriv ut information om GNUnets motparter."
 
 #, fuzzy
-#~ msgid "Operation failed.\n"
-#~ msgstr "\"%s\" misslyckades vid %s:%d med fel: \"%s\".\n"
-
-#, fuzzy
 #~ msgid "Error in communication with PEERINFO service\n"
 #~ msgstr "Skriv ut information om GNUnets motparter."
 
@@ -7809,11 +8453,6 @@ msgstr "\"%s\" misslyckades för fil \"%s\" vid %s:%d med fel: %s\n"
 #~ msgstr "Syntaxfel i konfigurationsfil \"%s\" på rad %d.\n"
 
 #, fuzzy
-#~ msgid ""
-#~ "Syntax error in blacklist file at offset %llu, skipping bytes `%s'.\n"
-#~ msgstr "Syntaxfel i konfigurationsfil \"%s\" på rad %d.\n"
-
-#, fuzzy
 #~ msgid "Failed to read hostkey: %s\n"
 #~ msgstr "Misslyckades att starta samling.\n"
 
@@ -7962,10 +8601,6 @@ msgstr "\"%s\" misslyckades för fil \"%s\" vid %s:%d med fel: %s\n"
 #~ msgstr "Kan inte ändra användare/grupp till \"%s\": %s\n"
 
 #, fuzzy
-#~ msgid "Unknown command `%s'\n"
-#~ msgstr "Okänd operation \"%s\"\n"
-
-#, fuzzy
 #~ msgid "You must specify a nickname\n"
 #~ msgstr "Du måste ange en mottagare!\n"
 
@@ -8126,10 +8761,6 @@ msgstr "\"%s\" misslyckades för fil \"%s\" vid %s:%d med fel: %s\n"
 #~ msgstr "\"%s\" %s misslyckades: %s\n"
 
 #, fuzzy
-#~ msgid "stat (%s) failed: %s\n"
-#~ msgstr "\"%s\" %s misslyckades: %s\n"
-
-#, fuzzy
 #~ msgid "# Peers connected"
 #~ msgstr "# av anslutna parter"
 
@@ -8174,10 +8805,6 @@ msgstr "\"%s\" misslyckades för fil \"%s\" vid %s:%d med fel: %s\n"
 #~ msgstr "# byte mottagna av typen %d"
 
 #, fuzzy
-#~ msgid "# fast reconnects failed"
-#~ msgstr "# av anslutna parter"
-
-#, fuzzy
 #~ msgid "# peers disconnected due to timeout"
 #~ msgstr "# av anslutna parter"
 
@@ -8222,10 +8849,6 @@ msgstr "\"%s\" misslyckades för fil \"%s\" vid %s:%d med fel: %s\n"
 #~ msgstr "# krypterade PONG-meddelanden mottagna"
 
 #, fuzzy
-#~ msgid "Failed to send to `%s': %s\n"
-#~ msgstr "Misslyckades att leverera \"%s\" meddelande.\n"
-
-#, fuzzy
 #~ msgid "Could not access file: %s\n"
 #~ msgstr "Kunde inte köra \"%s\": %s\n"
 
@@ -8507,10 +9130,6 @@ msgstr "\"%s\" misslyckades för fil \"%s\" vid %s:%d med fel: %s\n"
 #~ msgstr "Ogiltiga kommandoradsargument.\n"
 
 #, fuzzy
-#~ msgid "No interface specified, using default.\n"
-#~ msgstr "Inget tabellnamn angivet, använder \"%s\".\n"
-
-#, fuzzy
 #~ msgid "Configuration file `%s' must be a filename (but is a directory).\n"
 #~ msgstr "Konfigurationsfil \"%s\" skapad.\n"
 
@@ -8774,15 +9393,9 @@ msgstr "\"%s\" misslyckades för fil \"%s\" vid %s:%d med fel: %s\n"
 #~ "Skapa nya pseudonymer, ta bort pseudonymer eller lista existerande "
 #~ "pseudonymer."
 
-#~ msgid "Collection stopped.\n"
-#~ msgstr "Samling stoppad.\n"
-
 #~ msgid "Failed to stop collection (not active?).\n"
 #~ msgstr "Misslyckades att stoppa samling (inte aktiv?).\n"
 
-#~ msgid "Pseudonym `%s' deleted.\n"
-#~ msgstr "Pseudonym \"%s\" togs bort.\n"
-
 #~ msgid "Error deleting pseudonym `%s' (does not exist?).\n"
 #~ msgstr "Fel vid borttagning av pseudonym \"%s\" (existerar den?).\n"
 
@@ -8942,9 +9555,6 @@ msgstr "\"%s\" misslyckades för fil \"%s\" vid %s:%d med fel: %s\n"
 #~ msgid "LOC URI not allowed for search.\n"
 #~ msgstr "LOC URI tillåts inte för sökning.\n"
 
-#~ msgid "Format of pseudonym `%s' is invalid.\n"
-#~ msgstr "Formatet på pseudonym \"%s\" är ogiltig.\n"
-
 #, fuzzy
 #~ msgid "Format of file `%s' is invalid, trying to remove.\n"
 #~ msgstr "Formatet på filen \"%s\" är ogiltig.\n"
@@ -8976,9 +9586,6 @@ msgstr "\"%s\" misslyckades för fil \"%s\" vid %s:%d med fel: %s\n"
 #~ msgid "`%s' registering client handler %d\n"
 #~ msgstr "\"%s\" registrerar klienthandtag %d\n"
 
-#~ msgid "allows clients to determine gnunetd's configuration"
-#~ msgstr "tillåter klienter att fastställa gnunetds konfiguration"
-
 #~ msgid "`%s' registering client handler %d and %d\n"
 #~ msgstr "\"%s\" registrerar klienthandtagen %d och %d\n"
 
diff --git a/po/vi.po b/po/vi.po
index f18754d41..1ba8dfc3b 100644
--- a/po/vi.po
+++ b/po/vi.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnunet 0.8.0a\n"
 "Report-Msgid-Bugs-To: gnunet-developers@mail.gnu.org\n"
-"POT-Creation-Date: 2013-09-16 15:01+0200\n"
+"POT-Creation-Date: 2013-11-05 02:07+0100\n"
 "PO-Revision-Date: 2008-09-10 22:05+0930\n"
 "Last-Translator: Clytie Siddall <clytie@riverland.net.au>\n"
 "Language-Team: Vietnamese <vi-VN@googlegroups.com>\n"
@@ -19,7 +19,7 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 "X-Generator: LocFactoryEditor 1.7b3\n"
 
-#: src/arm/arm_api.c:335
+#: src/arm/arm_api.c:336
 msgid "Client was disconnected from arm service, trying to reconnect.\n"
 msgstr ""
 
@@ -33,418 +33,428 @@ msgstr ""
 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:169
+#: src/arm/gnunet-arm.c:170
 #, 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:214 src/testbed/gnunet-service-testbed_peers.c:971
+#: src/arm/gnunet-arm.c:216 src/testbed/gnunet-service-testbed_peers.c:1010
 msgid "Message was sent successfully"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:216
+#: src/arm/gnunet-arm.c:218
 #, 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:218 src/testbed/gnunet-service-testbed_peers.c:975
+#: src/arm/gnunet-arm.c:220 src/testbed/gnunet-service-testbed_peers.c:1014
 #, 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:220 src/testbed/gnunet-service-testbed_peers.c:977
+#: src/arm/gnunet-arm.c:222 src/testbed/gnunet-service-testbed_peers.c:1016
 msgid "ARM API is busy"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:222
+#: src/arm/gnunet-arm.c:224
 msgid "Request does not fit into a message"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:224 src/testbed/gnunet-service-testbed_peers.c:981
+#: src/arm/gnunet-arm.c:226 src/testbed/gnunet-service-testbed_peers.c:1020
 #, fuzzy
 msgid "Request timed out"
 msgstr "# các khoá phiên chạy được chấp nhận"
 
-#: src/arm/gnunet-arm.c:226 src/testbed/gnunet-service-testbed_peers.c:983
+#: src/arm/gnunet-arm.c:228 src/testbed/gnunet-service-testbed_peers.c:1022
 #, fuzzy
 msgid "Unknown request status"
 msgstr "Không rõ người dùng « %s »\n"
 
-#: src/arm/gnunet-arm.c:242 src/testbed/gnunet-service-testbed_peers.c:999
+#: src/arm/gnunet-arm.c:244 src/testbed/gnunet-service-testbed_peers.c:1038
 #, fuzzy, c-format
 msgid "%s is stopped"
 msgstr "# các byte trong kho dữ liệu"
 
-#: src/arm/gnunet-arm.c:244 src/testbed/gnunet-service-testbed_peers.c:1001
+#: src/arm/gnunet-arm.c:246 src/testbed/gnunet-service-testbed_peers.c:1040
 #, c-format
 msgid "%s is starting"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:246 src/testbed/gnunet-service-testbed_peers.c:1003
+#: src/arm/gnunet-arm.c:248 src/testbed/gnunet-service-testbed_peers.c:1042
 #, c-format
 msgid "%s is stopping"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:248 src/testbed/gnunet-service-testbed_peers.c:1005
+#: src/arm/gnunet-arm.c:250 src/testbed/gnunet-service-testbed_peers.c:1044
 #, 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:250 src/testbed/gnunet-service-testbed_peers.c:1007
+#: src/arm/gnunet-arm.c:252 src/testbed/gnunet-service-testbed_peers.c:1046
 #, c-format
 msgid "%s is stopping already"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:252 src/testbed/gnunet-service-testbed_peers.c:1009
+#: src/arm/gnunet-arm.c:254 src/testbed/gnunet-service-testbed_peers.c:1048
 #, c-format
 msgid "%s is started already"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:254 src/testbed/gnunet-service-testbed_peers.c:1011
+#: src/arm/gnunet-arm.c:256 src/testbed/gnunet-service-testbed_peers.c:1050
 #, c-format
 msgid "%s is stopped already"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:256 src/testbed/gnunet-service-testbed_peers.c:1013
+#: src/arm/gnunet-arm.c:258 src/testbed/gnunet-service-testbed_peers.c:1052
 #, 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:258 src/testbed/gnunet-service-testbed_peers.c:1015
+#: src/arm/gnunet-arm.c:260 src/testbed/gnunet-service-testbed_peers.c:1054
 #, fuzzy, c-format
 msgid "%s service failed to start"
 msgstr "Lỗi bắt đầu thu thập.\n"
 
-#: src/arm/gnunet-arm.c:260
+#: src/arm/gnunet-arm.c:262
 #, 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:262 src/testbed/gnunet-service-testbed_peers.c:1019
+#: src/arm/gnunet-arm.c:264 src/testbed/gnunet-service-testbed_peers.c:1058
 #, c-format
 msgid "%.s Unknown result code."
 msgstr ""
 
-#: src/arm/gnunet-arm.c:295
+#: src/arm/gnunet-arm.c:297
 msgid "Fatal error initializing ARM API.\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:324 src/arm/gnunet-arm.c:333
+#: src/arm/gnunet-arm.c:326 src/arm/gnunet-arm.c:335
 #, fuzzy, c-format
 msgid "Failed to start the ARM service: %s\n"
 msgstr "Lỗi bắt đầu thu thập.\n"
 
-#: src/arm/gnunet-arm.c:367
+#: src/arm/gnunet-arm.c:369
 #, fuzzy, c-format
 msgid "Failed to send a stop request to the ARM service: %s\n"
 msgstr "Lỗi kết nối đến gnunetd.\n"
 
-#: src/arm/gnunet-arm.c:377
+#: src/arm/gnunet-arm.c:379
 #, 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:418
+#: src/arm/gnunet-arm.c:420
 #, fuzzy, c-format
 msgid "Failed to send a request to start the `%s' service: %%s\n"
 msgstr "Lỗi kết nối đến gnunetd.\n"
 
-#: src/arm/gnunet-arm.c:427
+#: src/arm/gnunet-arm.c:429
 #, 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:463
+#: src/arm/gnunet-arm.c:465
 #, 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:474
+#: src/arm/gnunet-arm.c:476
 #, 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:510
+#: src/arm/gnunet-arm.c:512
 #, 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:517
+#: src/arm/gnunet-arm.c:519
 #, 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:521
+#: src/arm/gnunet-arm.c:523
 #, fuzzy
 msgid "Running services:\n"
 msgstr "Đang nạp và khởi động dùng « %s ».\n"
 
-#: src/arm/gnunet-arm.c:603
+#: src/arm/gnunet-arm.c:605
 #, c-format
 msgid "Now only monitoring, press CTRL-C to stop.\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:634
+#: src/arm/gnunet-arm.c:636
 #, c-format
 msgid "Stopped %s.\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:637
+#: src/arm/gnunet-arm.c:639
 #, fuzzy, c-format
 msgid "Starting %s...\n"
 msgstr "Đang bắt đầu tài về « %s »\n"
 
-#: src/arm/gnunet-arm.c:640
+#: src/arm/gnunet-arm.c:642
 #, c-format
 msgid "Stopping %s...\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:651
+#: src/arm/gnunet-arm.c:653
 #, 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:715
+#: src/arm/gnunet-arm.c:717
 #, fuzzy
 msgid "stop all GNUnet services"
 msgstr "hủy cài đặt dịch vụ GNUnet"
 
-#: src/arm/gnunet-arm.c:717
+#: src/arm/gnunet-arm.c:719
 msgid "start a particular service"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:719
+#: src/arm/gnunet-arm.c:721
 msgid "stop a particular service"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:721
+#: src/arm/gnunet-arm.c:723
 #, fuzzy
 msgid "start all GNUnet default services"
 msgstr "hủy cài đặt dịch vụ GNUnet"
 
-#: src/arm/gnunet-arm.c:724
+#: src/arm/gnunet-arm.c:726
 #, fuzzy
 msgid "stop and start all GNUnet default services"
 msgstr "hủy cài đặt dịch vụ GNUnet"
 
-#: src/arm/gnunet-arm.c:727
+#: src/arm/gnunet-arm.c:729
 msgid "delete config file and directory on exit"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:730
+#: src/arm/gnunet-arm.c:732
 msgid "monitor ARM activities"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:732
+#: src/arm/gnunet-arm.c:734
 msgid "don't print status messages"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:735
+#: src/arm/gnunet-arm.c:737
 #, fuzzy
 msgid "timeout in MSECS milliseconds for completing current operation"
 msgstr "thời gian chờ sự hoàn thành của một lần lặp (theo miligiây)"
 
-#: src/arm/gnunet-arm.c:737
+#: src/arm/gnunet-arm.c:739
 #, fuzzy
 msgid "list currently running services"
 msgstr "Đang nạp và khởi động dùng « %s ».\n"
 
-#: src/arm/gnunet-arm.c:739
+#: src/arm/gnunet-arm.c:741
 msgid "don't let gnunet-service-arm inherit standard output"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:741
+#: src/arm/gnunet-arm.c:743
 msgid "don't let gnunet-service-arm inherit standard error"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:752
+#: src/arm/gnunet-arm.c:754
 msgid "Control services and the Automated Restart Manager (ARM)"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:257
+#: src/arm/gnunet-service-arm.c:268
 msgid "Could not send status result to client\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:291
+#: src/arm/gnunet-service-arm.c:304
 #, fuzzy
 msgid "Could not send list result to client\n"
 msgstr "Không thể đọc danh sách bạn bè « %s »\n"
 
-#: src/arm/gnunet-service-arm.c:500
+#: src/arm/gnunet-service-arm.c:519
 #, fuzzy, c-format
 msgid "Failed to start service `%s'\n"
 msgstr "Lỗi bắt đầu thu thập.\n"
 
-#: src/arm/gnunet-service-arm.c:507
+#: src/arm/gnunet-service-arm.c:526
 #, fuzzy, c-format
 msgid "Starting service `%s'\n"
 msgstr "Đang bắt đầu tài về « %s »\n"
 
-#: src/arm/gnunet-service-arm.c:602
+#: src/arm/gnunet-service-arm.c:625
 #, fuzzy, c-format
 msgid "Unable to create socket for service `%s': %s\n"
 msgstr "Không thể tạo tài khoản người dùng:"
 
-#: src/arm/gnunet-service-arm.c:624
+#: src/arm/gnunet-service-arm.c:647
 #, c-format
 msgid "Unable to bind listening socket for service `%s' to address `%s': %s\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:638
+#: src/arm/gnunet-service-arm.c:676
 #, c-format
 msgid "ARM now monitors connections to service `%s' at `%s'\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:771
+#: src/arm/gnunet-service-arm.c:809
 #, fuzzy, c-format
 msgid "Preparing to stop `%s'\n"
 msgstr "Đang bắt đầu tài lên « %s ».\n"
 
-#: src/arm/gnunet-service-arm.c:1022
+#: src/arm/gnunet-service-arm.c:1070
 #, fuzzy, c-format
 msgid "Restarting service `%s'.\n"
 msgstr "Đang nạp và khởi động dùng « %s ».\n"
 
-#: src/arm/gnunet-service-arm.c:1115
+#: src/arm/gnunet-service-arm.c:1163
 msgid "exit"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:1120
+#: src/arm/gnunet-service-arm.c:1168
 msgid "signal"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:1125
+#: src/arm/gnunet-service-arm.c:1173
 #, fuzzy
 msgid "unknown"
 msgstr "Lỗi không rõ"
 
-#: src/arm/gnunet-service-arm.c:1131
+#: src/arm/gnunet-service-arm.c:1179
 #, fuzzy, c-format
 msgid "Service `%s' took %s to terminate\n"
 msgstr "Dịch vụ đã bị xoá.\n"
 
-#: src/arm/gnunet-service-arm.c:1153
+#: src/arm/gnunet-service-arm.c:1201
 #, c-format
 msgid "Service `%s' terminated normally, will restart at any time\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:1168
+#: src/arm/gnunet-service-arm.c:1216
 #, c-format
 msgid "Service `%s' terminated with status %s/%d, will restart in %s\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:1386
+#: src/arm/gnunet-service-arm.c:1463
 #, fuzzy, c-format
 msgid "Starting default services `%s'\n"
 msgstr "Đang bắt đầu tài về « %s »\n"
 
-#: src/arm/gnunet-service-arm.c:1397
+#: src/arm/gnunet-service-arm.c:1474
 #, c-format
 msgid "Default service `%s' not configured correctly!\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:1411
+#: src/arm/gnunet-service-arm.c:1488
 msgid ""
 "No default services configured, GNUnet will not really start right now.\n"
 msgstr ""
 
-#: src/arm/mockup-service.c:46
+#: src/arm/mockup-service.c:41
 msgid "Initiating shutdown as requested by client.\n"
 msgstr ""
 
-#: src/ats/ats_api_performance.c:475
+#: src/ats/ats_api_performance.c:468
 #, fuzzy, c-format
 msgid "Received %s message\n"
 msgstr "Nhận yêu cầu định tuyến\n"
 
-#: src/ats/ats_api_performance.c:518
+#: src/ats/ats_api_performance.c:511
 #, fuzzy, c-format
 msgid "Received last message for %s \n"
 msgstr "Nhận yêu cầu định tuyến\n"
 
-#: src/ats/gnunet-service-ats_addresses.c:1607
-#: src/ats/gnunet-service-ats_addresses.c:1641
+#: src/ats/gnunet-service-ats_addresses.c:1475
+#: src/ats/gnunet-service-ats_addresses.c:1519
 #, c-format
 msgid ""
 "Could not load quota for network `%s':  `%s', assigning default bandwidth "
 "%llu\n"
 msgstr ""
 
-#: src/ats/gnunet-service-ats_addresses.c:1613
+#: src/ats/gnunet-service-ats_addresses.c:1482
 #, c-format
 msgid "Outbound quota configure for network `%s' is %llu\n"
 msgstr ""
 
-#: src/ats/gnunet-service-ats_addresses.c:1620
+#: src/ats/gnunet-service-ats_addresses.c:1490
 #, c-format
 msgid ""
 "No outbound quota configured for network `%s', assigning default bandwidth "
 "%llu\n"
 msgstr ""
 
-#: src/ats/gnunet-service-ats_addresses.c:1647
+#: src/ats/gnunet-service-ats_addresses.c:1526
 #, c-format
 msgid "Inbound quota configured for network `%s' is %llu\n"
 msgstr ""
 
-#: src/ats/gnunet-service-ats_addresses.c:1654
+#: src/ats/gnunet-service-ats_addresses.c:1534
 #, c-format
 msgid ""
 "No outbound quota configure for network `%s', assigning default bandwidth "
 "%llu\n"
 msgstr ""
 
-#: src/ats/gnunet-service-ats_addresses.c:1888
+#: src/ats/gnunet-service-ats_addresses.c:1700
+#, c-format
+msgid "Initializing solver `%s '`%s'\n"
+msgstr ""
+
+#: src/ats/gnunet-service-ats_addresses.c:1703
+#, fuzzy, c-format
+msgid "Failed to initialize solver `%s'!\n"
+msgstr "Không thể sơ khởi SQLite: %s.\n"
+
+#: src/ats/gnunet-service-ats_addresses.c:1726
 #, fuzzy
 msgid "Failed to initialize solver!\n"
 msgstr "Không thể sơ khởi SQLite: %s.\n"
 
-#: src/ats/gnunet-service-ats-solver_mlp.c:849
+#: src/ats/libgnunet_plugin_ats_mlp.c:868
 msgid "Problem size too large, cannot allocate memory!\n"
 msgstr ""
 
-#: src/ats/gnunet-service-ats-solver_mlp.c:1193
+#: src/ats/libgnunet_plugin_ats_mlp.c:1239
 #, fuzzy, c-format
 msgid "Adding address for peer `%s' multiple times\n"
 msgstr "Không thể lấy địa chỉ của đồng đẳng « %s ».\n"
 
-#: src/ats/gnunet-service-ats-solver_mlp.c:1238
+#: src/ats/libgnunet_plugin_ats_mlp.c:1286
 #, c-format
 msgid "Updating address property `%s' for peer `%s' %p not added before\n"
 msgstr ""
 
-#: src/ats/gnunet-service-ats-solver_mlp.c:1956
+#: src/ats/libgnunet_plugin_ats_mlp.c:2010
 #, c-format
 msgid ""
 "Adjusting inconsistent outbound quota configuration for network `%s', is "
 "%llu must be at least %llu\n"
 msgstr ""
 
-#: src/ats/gnunet-service-ats-solver_mlp.c:1964
+#: src/ats/libgnunet_plugin_ats_mlp.c:2018
 #, c-format
 msgid ""
 "Adjusting inconsistent inbound quota configuration for network `%s', is %llu "
 "must be at least %llu\n"
 msgstr ""
 
-#: src/ats/gnunet-service-ats-solver_mlp.c:1974
+#: src/ats/libgnunet_plugin_ats_mlp.c:2028
 #, c-format
 msgid ""
 "Adjusting outbound quota configuration for network `%s'from %llu to %.0f\n"
 msgstr ""
 
-#: src/ats/gnunet-service-ats-solver_mlp.c:1982
+#: src/ats/libgnunet_plugin_ats_mlp.c:2036
 #, c-format
 msgid ""
 "Adjusting inbound quota configuration for network `%s' from %llu to %.0f\n"
 msgstr ""
 
-#: src/ats/gnunet-service-ats-solver_mlp.c:1993
+#: src/ats/libgnunet_plugin_ats_mlp.c:2047
 #, c-format
 msgid "Using default quota configuration for network `%s' (in/out) %llu/%llu\n"
 msgstr ""
 
-#: src/ats/gnunet-service-ats-solver_proportional.c:1296
+#: src/ats/libgnunet_plugin_ats_proportional.c:1438
 #, fuzzy, c-format
 msgid "Invalid network type `%u' `%s': Disconnect!\n"
 msgstr "Không tìm thấy địa chỉ IP của máy « %s »: %s\n"
@@ -471,161 +481,518 @@ msgstr "Đồng đẳng « %s » có mức tin cậy %8u và địa chỉ « %s
 msgid "Quota for network `%11s' (in/out): %10s / %10s\n"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:347 src/namestore/gnunet-namestore.c:438
-#: src/transport/gnunet-transport.c:812
+#: src/ats-tool/gnunet-ats.c:347 src/namestore/gnunet-namestore.c:520
+#: src/transport/gnunet-transport.c:807
 #, fuzzy, c-format
 msgid "Service `%s' is not running\n"
 msgstr "« %s » không phải là một tập tin.\n"
 
-#: src/ats-tool/gnunet-ats.c:357 src/transport/gnunet-transport.c:819
+#: src/ats-tool/gnunet-ats.c:359 src/transport/gnunet-transport.c:816
 #, fuzzy, c-format
 msgid "Failed to parse peer identity `%s'\n"
 msgstr "Lỗi đọc danh sách bạn bè từ « %s »\n"
 
-#: src/ats-tool/gnunet-ats.c:365
+#: src/ats-tool/gnunet-ats.c:367
 #, c-format
 msgid "Please select one operation : %s or %s or %s or %s or %s\n"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:381 src/ats-tool/gnunet-ats.c:400
-#: src/ats-tool/gnunet-ats.c:417 src/ats-tool/gnunet-ats.c:455
+#: src/ats-tool/gnunet-ats.c:383 src/ats-tool/gnunet-ats.c:402
+#: src/ats-tool/gnunet-ats.c:419 src/ats-tool/gnunet-ats.c:457
 #, fuzzy, c-format
 msgid "Cannot connect to ATS service, exiting...\n"
 msgstr "Lỗi sơ khởi dịch vụ « %s ».\n"
 
-#: src/ats-tool/gnunet-ats.c:390 src/ats-tool/gnunet-ats.c:407
+#: src/ats-tool/gnunet-ats.c:392 src/ats-tool/gnunet-ats.c:409
 #, fuzzy, c-format
 msgid "Cannot issue request to ATS service, exiting...\n"
 msgstr "Lỗi sơ khởi dịch vụ « %s ».\n"
 
-#: src/ats-tool/gnunet-ats.c:425
+#: src/ats-tool/gnunet-ats.c:427
 #, fuzzy, c-format
 msgid "No preference type given!\n"
 msgstr "In ra thông tin về các đồng đẳng GNUnet."
 
-#: src/ats-tool/gnunet-ats.c:430
+#: src/ats-tool/gnunet-ats.c:432
 #, fuzzy, c-format
 msgid "No peer given!\n"
 msgstr "chưa đưa ra tên"
 
-#: src/ats-tool/gnunet-ats.c:448
+#: src/ats-tool/gnunet-ats.c:450
 msgid "Valid type required\n"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:506
+#: src/ats-tool/gnunet-ats.c:508
 msgid "get list of active addresses currently used"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:509
+#: src/ats-tool/gnunet-ats.c:511
 msgid "get list of all active addresses"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:512
+#: src/ats-tool/gnunet-ats.c:514
 #, fuzzy
 msgid "do not resolve IP addresses to hostnames"
 msgstr "không quyết định các tên máy"
 
-#: src/ats-tool/gnunet-ats.c:515
+#: src/ats-tool/gnunet-ats.c:517
 msgid "monitor mode"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:518
+#: src/ats-tool/gnunet-ats.c:520
 #, fuzzy
 msgid "set preference for the given peer"
 msgstr "In ra thông tin về các đồng đẳng GNUnet."
 
-#: src/ats-tool/gnunet-ats.c:521
+#: src/ats-tool/gnunet-ats.c:523
 msgid "print all configured quotas"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:524
+#: src/ats-tool/gnunet-ats.c:526
 msgid "peer id"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:527
+#: src/ats-tool/gnunet-ats.c:529
 msgid "preference type to set: latency | bandwidth"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:530
+#: src/ats-tool/gnunet-ats.c:532
 msgid "preference value"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:533
+#: src/ats-tool/gnunet-ats.c:535
 msgid "verbose output (include ATS address properties)"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:542
+#: src/ats-tool/gnunet-ats.c:544
 #, fuzzy
 msgid "Print information about ATS state"
 msgstr "In ra thông tin về các đồng đẳng GNUnet."
 
-#: src/block/block.c:105
-#, fuzzy, c-format
-msgid "Loading block plugin `%s'\n"
-msgstr "Đang nạp các truyền tải « %s »\n"
-
-#: src/consensus/gnunet-consensus-profiler.c:393
+#: src/consensus/gnunet-consensus-profiler.c:394
 #, fuzzy
 msgid "number of peers in consensus"
 msgstr "số lần lặp lại"
 
-#: src/consensus/gnunet-consensus-profiler.c:396
+#: src/consensus/gnunet-consensus-profiler.c:397
 msgid "how many peers receive one value?"
 msgstr ""
 
-#: src/consensus/gnunet-consensus-profiler.c:399
-#: src/set/gnunet-set-profiler.c:287 src/set/gnunet-set-profiler.c:290
-#: src/set/gnunet-set-profiler.c:293
+#: src/consensus/gnunet-consensus-profiler.c:400
+#: src/set/gnunet-set-profiler.c:286 src/set/gnunet-set-profiler.c:289
+#: src/set/gnunet-set-profiler.c:292
 #, fuzzy
 msgid "number of values"
 msgstr "số lần lặp lại"
 
-#: src/consensus/gnunet-consensus-profiler.c:402
+#: src/consensus/gnunet-consensus-profiler.c:403
 #, fuzzy
 msgid "consensus timeout"
 msgstr "# các khoá phiên chạy được chấp nhận"
 
-#: src/consensus/gnunet-consensus-profiler.c:405
+#: src/consensus/gnunet-consensus-profiler.c:406
 msgid "be more verbose (print received values)"
 msgstr ""
 
-#: src/core/core_api.c:752
+#: src/conversation/conversation_api.c:333
+#: src/conversation/conversation_api.c:959
+#, fuzzy, c-format
+msgid "Internal error %d\n"
+msgstr "Lỗi VR."
+
+#: src/conversation/gnunet-conversation.c:186
+#, c-format
+msgid ""
+"Incoming call from `%s'.\n"
+"Please /accept or /cancel the call.\n"
+msgstr ""
+
+#: src/conversation/gnunet-conversation.c:206
+#: src/conversation/gnunet-conversation.c:315
+#, c-format
+msgid "Call terminated: %s\n"
+msgstr ""
+
+#: src/conversation/gnunet-conversation.c:226
+#, c-format
+msgid "Ego `%s' no longer available, phone is now down.\n"
+msgstr ""
+
+#: src/conversation/gnunet-conversation.c:239
+#, fuzzy
+msgid "Failed to setup phone (internal error)\n"
+msgstr "Lỗi lấy thông kê về truyền tải.\n"
+
+#: src/conversation/gnunet-conversation.c:252
+#, c-format
+msgid "Phone active on line %u\n"
+msgstr ""
+
+#: src/conversation/gnunet-conversation.c:284
+msgid "Resolved address. Now ringing other party.\n"
+msgstr ""
+
+#: src/conversation/gnunet-conversation.c:290
+#, fuzzy, c-format
+msgid "Connection established to `%s': %s\n"
+msgstr "%s bị lỗi tại %s:%d: « %s »\n"
+
+#: src/conversation/gnunet-conversation.c:298
+#, fuzzy, c-format
+msgid "Failed to resolve `%s'\n"
+msgstr "Lỗi mở tập tin ghi sự kiện « %s »: %s\n"
+
+#: src/conversation/gnunet-conversation.c:307
+msgid "Line busy\n"
+msgstr ""
+
+#: src/conversation/gnunet-conversation.c:385
+#, fuzzy, c-format
+msgid "Unknown command `%s'\n"
+msgstr "Không rõ câu lệnh « %s ».\n"
+
+#: src/conversation/gnunet-conversation.c:401
+#: src/conversation/gnunet-conversation.c:409
+#, c-format
+msgid "Ego `%s' not available\n"
+msgstr ""
+
+#: src/conversation/gnunet-conversation.c:417
+#, c-format
+msgid "Hanging up on incoming phone call from `%s' to call `%s'.\n"
+msgstr ""
+
+#: src/conversation/gnunet-conversation.c:424
+#: src/conversation/gnunet-conversation.c:438
+#, c-format
+msgid "You are already in a conversation with `%s', refusing to call `%s'.\n"
+msgstr ""
+
+#: src/conversation/gnunet-conversation.c:431
+#, fuzzy, c-format
+msgid "Aborting call to `%s'\n"
+msgstr "Gặp lỗi khi tạo người dùng"
+
+#: src/conversation/gnunet-conversation.c:478
+msgid "There is no incoming call to be accepted!\n"
+msgstr ""
+
+#: src/conversation/gnunet-conversation.c:485
+#: src/conversation/gnunet-conversation.c:496
+#, fuzzy, c-format
+msgid "You are already in a conversation with `%s'.\n"
+msgstr "Không thể truy cập đến tập tin gnunet-directory « %s »\n"
+
+#: src/conversation/gnunet-conversation.c:491
+#, c-format
+msgid "You are trying to call `%s', cannot accept incoming calls right now.\n"
+msgstr ""
+
+#: src/conversation/gnunet-conversation.c:521
+msgid "We currently do not have an address.\n"
+msgstr ""
+
+#: src/conversation/gnunet-conversation.c:542
+#, c-format
+msgid "We are currently trying to locate the private key for the ego `%s'.\n"
+msgstr ""
+
+#: src/conversation/gnunet-conversation.c:547
+#, c-format
+msgid "We are listening for incoming calls for ego `%s' on line %u.\n"
+msgstr ""
+
+#: src/conversation/gnunet-conversation.c:553
+#, c-format
+msgid "The phone is rining. `%s' is trying to call us.\n"
+msgstr ""
+
+#: src/conversation/gnunet-conversation.c:559
+#, c-format
+msgid "You are having a conversation with `%s'.\n"
+msgstr ""
+
+#: src/conversation/gnunet-conversation.c:564
+#, fuzzy, c-format
+msgid "We are trying to find the network address to call `%s'.\n"
+msgstr "GNUnet bây giờ sử dụng địa chỉ IP %s.\n"
+
+#: src/conversation/gnunet-conversation.c:569
+#, c-format
+msgid "We are calling `%s', his phone should be ringing.\n"
+msgstr ""
+
+#: src/conversation/gnunet-conversation.c:574
+msgid ""
+"We had an internal error setting up our phone line. You can still make "
+"calls.\n"
+msgstr ""
+
+#: src/conversation/gnunet-conversation.c:595
+msgid "There is no call that could be cancelled right now.\n"
+msgstr ""
+
+#: src/conversation/gnunet-conversation.c:626
+msgid "Use `/address' to find out which address this phone should have in GNS"
+msgstr ""
+
+#: src/conversation/gnunet-conversation.c:628
+msgid "Use `/call USER.gnu' to call USER"
+msgstr ""
+
+#: src/conversation/gnunet-conversation.c:630
+msgid "Use `/accept MESSAGE' to accept an incoming call"
+msgstr ""
+
+#: src/conversation/gnunet-conversation.c:632
+msgid "Use `/cancel MESSAGE' to reject or terminate a call"
+msgstr ""
+
+#: src/conversation/gnunet-conversation.c:634
+msgid "Use `/status' to print status information"
+msgstr ""
+
+#: src/conversation/gnunet-conversation.c:636
+#, fuzzy
+msgid "Use `/quit' to terminate gnunet-conversation"
+msgstr "Gõ chuỗi « /quit » để thoát khỏi trình gnunet-chat"
+
+#: src/conversation/gnunet-conversation.c:638
+msgid "Use `/help command' to get help for a specific command"
+msgstr "Gõ chuỗi « /help LỆNH » để xem trợ giúp về lệnh đó"
+
+#: src/conversation/gnunet-conversation.c:793
+#, fuzzy, c-format
+msgid "Name of our ego changed to `%s'\n"
+msgstr "Không thể tạo miền tên.\n"
+
+#: src/conversation/gnunet-conversation.c:806
+#, fuzzy, c-format
+msgid "Our ego `%s' was deleted!\n"
+msgstr "Biệt hiệu « %s » bị xoá.\n"
+
+#: src/conversation/gnunet-conversation.c:841
+#, fuzzy
+msgid "You must specify the NAME of an ego to use\n"
+msgstr "Phải ghi rõ chỉ một tên tập tin để chèn.\n"
+
+#: src/conversation/gnunet-conversation.c:867
+msgid "sets the NAME of the ego to use for the phone (and name resolution)"
+msgstr ""
+
+#: src/conversation/gnunet-conversation.c:870
+msgid "sets the LINE to use for the phone"
+msgstr ""
+
+#: src/conversation/gnunet-conversation.c:885
+msgid "Enables having a conversation with other GNUnet users."
+msgstr ""
+
+#: src/conversation/gnunet-conversation-test.c:121
+#, c-format
+msgid ""
+"\n"
+"End of transmission.  Have a GNU day.\n"
+msgstr ""
+
+#: src/conversation/gnunet-conversation-test.c:149
+#, c-format
+msgid ""
+"\n"
+"We are now playing your recording back.  If you can hear it, your audio "
+"settings are working..."
+msgstr ""
+
+#: src/conversation/gnunet-conversation-test.c:215
+#, c-format
+msgid ""
+"We will now be recording you for %s. After that time, the recording will be "
+"played back to you..."
+msgstr ""
+
+#: src/conversation/gnunet-conversation-test.c:248
+#: src/integration-tests/connection_watchdog.c:1114
+#: src/multicast/gnunet-multicast.c:70 src/revocation/gnunet-revocation.c:510
+#: src/template/gnunet-template.c:70
+msgid "help text"
+msgstr ""
+
+#: src/conversation/gnunet-helper-audio-playback.c:137
+#, fuzzy, c-format
+msgid "pa_stream_write() failed: %s\n"
+msgstr "SMTP: « %s » bị lỗi: %s\n"
+
+#: src/conversation/gnunet-helper-audio-playback.c:186
+msgid "gnunet-helper-audio-playback - Got signal, exiting\n"
+msgstr ""
+
+#: src/conversation/gnunet-helper-audio-playback.c:211
+#: src/conversation/gnunet-helper-audio-record.c:363
+#, fuzzy
+msgid "Connection established.\n"
+msgstr "Thu thập bị dừng.\n"
+
+#: src/conversation/gnunet-helper-audio-playback.c:216
+#: src/conversation/gnunet-helper-audio-record.c:368
+#, fuzzy, c-format
+msgid "pa_stream_new() failed: %s\n"
+msgstr "SMTP: « %s » bị lỗi: %s\n"
+
+#: src/conversation/gnunet-helper-audio-playback.c:230
+#, c-format
+msgid "pa_stream_connect_playback() failed: %s\n"
+msgstr ""
+
+#: src/conversation/gnunet-helper-audio-playback.c:243
+#: src/conversation/gnunet-helper-audio-record.c:394
+#, fuzzy, c-format
+msgid "Connection failure: %s\n"
+msgstr "%s bị lỗi tại %s:%d: « %s »\n"
+
+#: src/conversation/gnunet-helper-audio-playback.c:264
+#: src/conversation/gnunet-helper-audio-record.c:417
+msgid "Wrong Spec\n"
+msgstr ""
+
+#: src/conversation/gnunet-helper-audio-playback.c:270
+#: src/conversation/gnunet-helper-audio-record.c:423
+#, fuzzy
+msgid "pa_mainloop_new() failed.\n"
+msgstr "Lỗi nội bộ : khẳng định không thành công tại %s:%d.\n"
+
+#: src/conversation/gnunet-helper-audio-playback.c:284
+#: src/conversation/gnunet-helper-audio-record.c:438
+#, fuzzy
+msgid "pa_context_new() failed.\n"
+msgstr "Lỗi nội bộ : khẳng định không thành công tại %s:%d.\n"
+
+#: src/conversation/gnunet-helper-audio-playback.c:291
+#: src/conversation/gnunet-helper-audio-record.c:444
+#, fuzzy, c-format
+msgid "pa_context_connect() failed: %s\n"
+msgstr "# của các đồng đẳng đã kết nối"
+
+#: src/conversation/gnunet-helper-audio-playback.c:297
+#: src/conversation/gnunet-helper-audio-record.c:450
+#, fuzzy
+msgid "pa_mainloop_run() failed.\n"
+msgstr "Lỗi nội bộ : khẳng định không thành công tại %s:%d.\n"
+
+#: src/conversation/gnunet-helper-audio-playback.c:366
+#, c-format
+msgid "Read error from STDIN: %s\n"
+msgstr ""
+
+#: src/conversation/gnunet-helper-audio-record.c:237
+#, fuzzy, c-format
+msgid "pa_stream_peek() failed: %s\n"
+msgstr "SMTP: « %s » bị lỗi: %s\n"
+
+#: src/conversation/gnunet-helper-audio-record.c:275
+msgid "Got signal, exiting.\n"
+msgstr ""
+
+#: src/conversation/gnunet-helper-audio-record.c:301
+#, fuzzy
+msgid "Stream successfully created.\n"
+msgstr "Không đủ quyền cho « %s ».\n"
+
+#: src/conversation/gnunet-helper-audio-record.c:306
+#, fuzzy, c-format
+msgid "pa_stream_get_buffer_attr() failed: %s\n"
+msgstr "SMTP: « %s » bị lỗi: %s\n"
+
+#: src/conversation/gnunet-helper-audio-record.c:314
+#, c-format
+msgid "Buffer metrics: maxlength=%u, fragsize=%u\n"
+msgstr ""
+
+#: src/conversation/gnunet-helper-audio-record.c:318
+#, c-format
+msgid "Using sample spec '%s', channel map '%s'.\n"
+msgstr ""
+
+#: src/conversation/gnunet-helper-audio-record.c:325
+#, fuzzy, c-format
+msgid "Connected to device %s (%u, %ssuspended).\n"
+msgstr "« %s » được kết nối tới « %s ».\n"
+
+#: src/conversation/gnunet-helper-audio-record.c:334
+#, c-format
+msgid "Stream error: %s\n"
+msgstr ""
+
+#: src/conversation/gnunet-helper-audio-record.c:381
+#, fuzzy, c-format
+msgid "pa_stream_connect_record() failed: %s\n"
+msgstr "Gặp lỗi khi tải lên tập tin: %s\n"
+
+#: src/conversation/gnunet-service-conversation.c:612
+msgid "Mesh audio channel not ready; audio data dropped\n"
+msgstr ""
+
+#: src/conversation/gnunet-service-conversation.c:700
+#, c-format
+msgid "No available phone for incoming call on line %u, sending BUSY signal\n"
+msgstr ""
+
+#: src/conversation/gnunet-service-conversation.c:1054
+#, c-format
+msgid "Received incoming tunnel on port %u\n"
+msgstr ""
+
+#: src/conversation/microphone.c:121
+#, fuzzy
+msgid "Could not start record audio helper\n"
+msgstr "Không thể truy cập đến thông tin về không gian tên.\n"
+
+#: src/conversation/plugin_gnsrecord_conversation.c:116
+#, fuzzy, c-format
+msgid "Unable to parse PHONE record `%s'\n"
+msgstr "Lỗi đọc danh sách bạn bè từ « %s »\n"
+
+#: src/conversation/speaker.c:75
+#, fuzzy
+msgid "Could not start playback audio helper.\n"
+msgstr "Không thể nạp phần bổ sung truyền tải « %s »\n"
+
+#: src/core/core_api.c:761
 msgid "Client was disconnected from core service, trying to reconnect.\n"
 msgstr ""
 
-#: src/core/gnunet-core.c:83
+#: src/core/gnunet-core.c:80
 #, fuzzy, c-format
 msgid "Peer `%s'\n"
 msgstr "Tôi là đồng đẳng « %s ».\n"
 
-#: src/core/gnunet-core.c:112 src/core/gnunet-core.c:140
-#: src/transport/gnunet-transport.c:606 src/transport/gnunet-transport.c:630
+#: src/core/gnunet-core.c:110 src/core/gnunet-core.c:138
+#: src/transport/gnunet-transport.c:601 src/transport/gnunet-transport.c:625
 #, c-format
 msgid "%24s: %-17s %4s   (%u connections in total)\n"
 msgstr ""
 
-#: src/core/gnunet-core.c:114 src/transport/gnunet-transport.c:608
+#: src/core/gnunet-core.c:112 src/transport/gnunet-transport.c:603
 #, fuzzy
 msgid "Connected to"
 msgstr "« %s » được kết nối tới « %s ».\n"
 
-#: src/core/gnunet-core.c:142 src/transport/gnunet-transport.c:632
+#: src/core/gnunet-core.c:140 src/transport/gnunet-transport.c:627
 #, fuzzy
 msgid "Disconnected from"
 msgstr "« %.*s » được kết nối tới « %.*s ».\n"
 
-#: src/core/gnunet-core.c:166 src/mesh/gnunet-mesh.c:170
-#: src/peerinfo-tool/gnunet-peerinfo.c:653
+#: src/core/gnunet-core.c:164 src/mesh/gnunet-mesh.c:174
+#: src/peerinfo-tool/gnunet-peerinfo.c:645
 #, fuzzy, c-format
 msgid "Invalid command line argument `%s'\n"
 msgstr "Đối số không hợp lệ cho « %s ».\n"
 
-#: src/core/gnunet-core.c:203 src/transport/gnunet-transport.c:1004
+#: src/core/gnunet-core.c:201 src/transport/gnunet-transport.c:999
 #, fuzzy
 msgid "provide information about all current connections (continuously)"
 msgstr "In ra thông tin về các đồng đẳng GNUnet."
 
-#: src/core/gnunet-core.c:214
+#: src/core/gnunet-core.c:212
 #, fuzzy
 msgid "Print information about connected peers."
 msgstr "In ra thông tin về các đồng đẳng GNUnet."
@@ -655,150 +1022,150 @@ msgstr "# các thông báo được chắp liền"
 msgid "# bytes of messages of type %u received"
 msgstr "# các byte nhiễu được nhận"
 
-#: src/core/gnunet-service-core_kx.c:532
+#: src/core/gnunet-service-core_kx.c:531
 msgid "# bytes encrypted"
 msgstr "# các byte đã mã hoá"
 
-#: src/core/gnunet-service-core_kx.c:583
+#: src/core/gnunet-service-core_kx.c:582
 msgid "# bytes decrypted"
 msgstr "# các byte đã giải mã"
 
-#: src/core/gnunet-service-core_kx.c:667
+#: src/core/gnunet-service-core_kx.c:668
 msgid "# key exchanges initiated"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:697
+#: src/core/gnunet-service-core_kx.c:701
 msgid "# key exchanges stopped"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:761
+#: src/core/gnunet-service-core_kx.c:764
 msgid "# old ephemeral keys ignored"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:767
+#: src/core/gnunet-service-core_kx.c:770
 #, fuzzy
 msgid "# ephemeral keys received"
 msgstr "# các thông báo phát hiện dht được nhận"
 
-#: src/core/gnunet-service-core_kx.c:803
+#: src/core/gnunet-service-core_kx.c:804
 #, c-format
 msgid ""
 "Ephemeral key message from peer `%s' rejected as its validity range does not "
 "match our system time (%llu not in [%llu,%llu]).\n"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:819
+#: src/core/gnunet-service-core_kx.c:820
 #, fuzzy
 msgid "# EPHEMERAL_KEY messages decrypted"
 msgstr "# các thông báo được chắp liền"
 
-#: src/core/gnunet-service-core_kx.c:922
-#: src/transport/gnunet-service-transport_validation.c:933
+#: src/core/gnunet-service-core_kx.c:923
+#: src/transport/gnunet-service-transport_validation.c:938
 #, fuzzy
 msgid "# PING messages received"
 msgstr "# các thông báo PING được tạo"
 
-#: src/core/gnunet-service-core_kx.c:930
+#: src/core/gnunet-service-core_kx.c:931
 #, fuzzy
 msgid "# PING messages dropped (out of order)"
 msgstr "# các yêu cầu lỗ hổng bị bỏ do trọng tải"
 
-#: src/core/gnunet-service-core_kx.c:957
+#: src/core/gnunet-service-core_kx.c:958
 #, c-format
 msgid ""
 "Received PING from `%s' for different identity: I am `%s', PONG identity: `"
 "%s'\n"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:974
+#: src/core/gnunet-service-core_kx.c:975
 #, fuzzy
 msgid "# PONG messages created"
 msgstr "# các thông báo PING được tạo"
 
-#: src/core/gnunet-service-core_kx.c:1000
+#: src/core/gnunet-service-core_kx.c:1001
 #, fuzzy
 msgid "# sessions terminated by timeout"
 msgstr "# các byte loại đi bởi TCP (đi ra)"
 
-#: src/core/gnunet-service-core_kx.c:1010
+#: src/core/gnunet-service-core_kx.c:1011
 #, fuzzy
 msgid "# keepalive messages sent"
 msgstr "# các thông báo PING nhập thô được gửi"
 
-#: src/core/gnunet-service-core_kx.c:1067
-#: src/transport/gnunet-service-transport_validation.c:1224
+#: src/core/gnunet-service-core_kx.c:1068
+#: src/transport/gnunet-service-transport_validation.c:1233
 #, fuzzy
 msgid "# PONG messages received"
 msgstr "# các thông báo PONG đã mật mã được nhận"
 
-#: src/core/gnunet-service-core_kx.c:1073
+#: src/core/gnunet-service-core_kx.c:1074
 #, fuzzy
 msgid "# PONG messages dropped (connection down)"
 msgstr "# các thông báo PONG đã mật mã được nhận"
 
-#: src/core/gnunet-service-core_kx.c:1078
+#: src/core/gnunet-service-core_kx.c:1079
 #, fuzzy
 msgid "# PONG messages dropped (out of order)"
 msgstr "# các yêu cầu lỗ hổng bị bỏ do trọng tải"
 
-#: src/core/gnunet-service-core_kx.c:1108
+#: src/core/gnunet-service-core_kx.c:1109
 #, fuzzy
 msgid "# PONG messages decrypted"
 msgstr "# các thông báo PING được tạo"
 
-#: src/core/gnunet-service-core_kx.c:1142
+#: src/core/gnunet-service-core_kx.c:1143
 #, fuzzy
 msgid "# session keys confirmed via PONG"
 msgstr "# Các quảng cáo đồng đẳng được xác nhận qua PONG"
 
-#: src/core/gnunet-service-core_kx.c:1152
+#: src/core/gnunet-service-core_kx.c:1153
 #, fuzzy
 msgid "# timeouts prevented via PONG"
 msgstr "# các byte đã nhận qua TCP"
 
-#: src/core/gnunet-service-core_kx.c:1159
+#: src/core/gnunet-service-core_kx.c:1160
 #, fuzzy
 msgid "# rekey operations confirmed via PONG"
 msgstr "# Các quảng cáo đồng đẳng được xác nhận qua PONG"
 
-#: src/core/gnunet-service-core_kx.c:1299
+#: src/core/gnunet-service-core_kx.c:1300
 #, fuzzy
 msgid "# DATA message dropped (out of order)"
 msgstr "# các byte loại bỏ bởi UDP (đi ra)"
 
-#: src/core/gnunet-service-core_kx.c:1306
+#: src/core/gnunet-service-core_kx.c:1307
 #, c-format
 msgid ""
 "Session to peer `%s' went down due to key expiration (should not happen)\n"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1309
+#: src/core/gnunet-service-core_kx.c:1310
 #, fuzzy
 msgid "# sessions terminated by key expiration"
 msgstr "# các byte loại đi bởi TCP (đi ra)"
 
-#: src/core/gnunet-service-core_kx.c:1352
-#: src/core/gnunet-service-core_kx.c:1377
+#: src/core/gnunet-service-core_kx.c:1353
+#: src/core/gnunet-service-core_kx.c:1378
 #, fuzzy
 msgid "# bytes dropped (duplicates)"
 msgstr "# các byte loại bỏ bởi UDP (đi ra)"
 
-#: src/core/gnunet-service-core_kx.c:1364
+#: src/core/gnunet-service-core_kx.c:1365
 #, 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:1405
+#: src/core/gnunet-service-core_kx.c:1406
 #, 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:1413
+#: src/core/gnunet-service-core_kx.c:1414
 #, fuzzy
 msgid "# bytes of payload decrypted"
 msgstr "# các byte đã giải mã"
 
-#: src/core/gnunet-service-core_kx.c:1444
+#: src/core/gnunet-service-core_kx.c:1445
 #, fuzzy
 msgid "# PAYLOAD dropped (out of order)"
 msgstr "# các byte loại bỏ bởi UDP (đi ra)"
@@ -822,28 +1189,28 @@ msgstr ""
 msgid "Unsupported message of type %u (%u bytes) received from peer `%s'\n"
 msgstr ""
 
-#: src/core/gnunet-service-core_sessions.c:209
-#: src/core/gnunet-service-core_sessions.c:279
-#: src/dht/gnunet-service-dht_neighbours.c:641
-#: src/dht/gnunet-service-dht_neighbours.c:700
-#: src/fs/gnunet-service-fs_cp.c:601 src/fs/gnunet-service-fs_cp.c:1495
-#: src/topology/gnunet-daemon-topology.c:700
-#: src/topology/gnunet-daemon-topology.c:801
-#: src/transport/gnunet-service-transport_neighbours.c:1041
-#: src/transport/gnunet-service-transport_neighbours.c:1265
-#: src/transport/gnunet-service-transport_neighbours.c:1274
+#: src/core/gnunet-service-core_sessions.c:208
+#: src/core/gnunet-service-core_sessions.c:278
+#: src/dht/gnunet-service-dht_neighbours.c:662
+#: src/dht/gnunet-service-dht_neighbours.c:727
+#: src/fs/gnunet-service-fs_cp.c:604 src/fs/gnunet-service-fs_cp.c:1499
+#: src/topology/gnunet-daemon-topology.c:706
+#: src/topology/gnunet-daemon-topology.c:807
+#: src/transport/gnunet-service-transport_neighbours.c:904
+#: src/transport/gnunet-service-transport_neighbours.c:1129
+#: src/transport/gnunet-service-transport_neighbours.c:1138
 #: src/transport/gnunet-service-transport_neighbours.c:2799
-#: src/transport/gnunet-service-transport_neighbours.c:3053
+#: src/transport/gnunet-service-transport_neighbours.c:3052
 #, fuzzy
 msgid "# peers connected"
 msgstr "# của các đồng đẳng đã kết nối"
 
-#: src/core/gnunet-service-core_sessions.c:247
+#: src/core/gnunet-service-core_sessions.c:246
 #, 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:416
+#: src/core/gnunet-service-core_sessions.c:415
 msgid "# messages discarded (expired prior to transmission)"
 msgstr ""
 
@@ -910,11 +1277,13 @@ msgstr ""
 #: src/datastore/plugin_datastore_sqlite.c:57 src/mysql/mysql.c:41
 #: src/mysql/mysql.c:48 src/mysql/mysql.c:522 src/mysql/mysql.c:531
 #: src/mysql/mysql.c:591 src/mysql/mysql.c:607
+#: src/namecache/plugin_namecache_postgres.c:52
+#: src/namecache/plugin_namecache_sqlite.c:52
 #: src/namestore/plugin_namestore_postgres.c:52
-#: src/namestore/plugin_namestore_sqlite.c:51
-#: src/testbed/testbed_api_hosts.c:69 src/util/crypto_ecc.c:54
-#: src/include/gnunet_common.h:654 src/include/gnunet_common.h:663
-#: src/scalarproduct/scalarproduct.h:56
+#: src/namestore/plugin_namestore_sqlite.c:52
+#: src/testbed/testbed_api_hosts.c:69 src/util/crypto_ecc.c:53
+#: src/include/gnunet_common.h:602 src/include/gnunet_common.h:611
+#: src/scalarproduct/scalarproduct.h:61
 #, c-format
 msgid "`%s' failed at %s:%d with error: %s\n"
 msgstr "« %s » bị lỗi tại %s:%d với lỗi: %s\n"
@@ -925,7 +1294,8 @@ msgstr ""
 
 #: src/datacache/plugin_datacache_sqlite.c:484
 #: src/datastore/plugin_datastore_sqlite.c:401
-#: src/namestore/plugin_namestore_sqlite.c:374
+#: src/namecache/plugin_namecache_sqlite.c:295
+#: src/namestore/plugin_namestore_sqlite.c:327
 msgid "Tried to close sqlite without finalizing all prepared statements.\n"
 msgstr ""
 
@@ -965,7 +1335,7 @@ msgstr "# các yêu cầu lỗ hổng bị bỏ do trọng tải"
 msgid "# datastore connections (re)created"
 msgstr "# các kết nối dht"
 
-#: src/datastore/datastore_api.c:608 src/scalarproduct/scalarproduct_api.c:276
+#: src/datastore/datastore_api.c:608 src/scalarproduct/scalarproduct_api.c:279
 #, fuzzy
 msgid "# transmission request failures"
 msgstr "# các sự truyền PONG bị lỗi"
@@ -1250,7 +1620,8 @@ msgstr ""
 "Không nhận được đáp ứng từ gnunetd.\n"
 
 #: src/datastore/plugin_datastore_postgres.c:860
-#: src/namestore/plugin_namestore_postgres.c:735
+#: src/namecache/plugin_namecache_postgres.c:414
+#: src/namestore/plugin_namestore_postgres.c:564
 msgid "Postgres database running\n"
 msgstr ""
 
@@ -1260,7 +1631,8 @@ msgid "`%s' failed at %s:%u with error: %s"
 msgstr "« %s » bị lỗi tại %s:%d với lỗi: %s"
 
 #: src/datastore/plugin_datastore_sqlite.c:253
-#: src/namestore/plugin_namestore_sqlite.c:220
+#: src/namecache/plugin_namecache_sqlite.c:193
+#: src/namestore/plugin_namestore_sqlite.c:204
 #: src/psycstore/plugin_psycstore_sqlite.c:319
 #, c-format
 msgid "Unable to initialize SQLite: %s.\n"
@@ -1283,7 +1655,8 @@ msgid ""
 msgstr ""
 
 #: src/datastore/plugin_datastore_sqlite.c:1194
-#: src/namestore/plugin_namestore_sqlite.c:893
+#: src/namecache/plugin_namecache_sqlite.c:583
+#: src/namestore/plugin_namestore_sqlite.c:719
 #, fuzzy
 msgid "Sqlite database running\n"
 msgstr "kho dữ liệu sqlite"
@@ -1292,7 +1665,7 @@ msgstr "kho dữ liệu sqlite"
 msgid "Template database running\n"
 msgstr ""
 
-#: src/dht/dht_api.c:375
+#: src/dht/dht_api.c:376
 #, fuzzy
 msgid "Failed to connect to the DHT service!\n"
 msgstr "Lỗi kết nối đến gnunetd.\n"
@@ -1340,9 +1713,9 @@ msgstr ""
 
 #: src/dht/gnunet-dht-get.c:201 src/dht/gnunet-dht-monitor.c:271
 #: src/dht/gnunet-dht-put.c:213 src/fs/gnunet-auto-share.c:753
-#: src/fs/gnunet-download.c:328 src/fs/gnunet-publish.c:864
+#: src/fs/gnunet-download.c:328 src/fs/gnunet-publish.c:877
 #: src/fs/gnunet-search.c:294 src/fs/gnunet-unindex.c:168
-#: src/nse/gnunet-nse-profiler.c:904
+#: src/nse/gnunet-nse-profiler.c:873
 msgid "be verbose (print progress information)"
 msgstr ""
 
@@ -1411,49 +1784,49 @@ msgstr ""
 msgid "Failed to connect to transport service!\n"
 msgstr "Lỗi kết nối đến gnunetd.\n"
 
-#: src/dht/gnunet-service-dht_clients.c:414
+#: src/dht/gnunet-service-dht_clients.c:417
 #, 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:508
+#: src/dht/gnunet-service-dht_clients.c:511
 #, 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:592
+#: src/dht/gnunet-service-dht_clients.c:595
 #, fuzzy
 msgid "# GET requests received from clients"
 msgstr "# các yêu cầu get (lấy) dht được nhận"
 
-#: src/dht/gnunet-service-dht_clients.c:793
+#: src/dht/gnunet-service-dht_clients.c:796
 #, fuzzy
 msgid "# GET STOP requests received from clients"
 msgstr "# các yêu cầu get (lấy) dht được nhận"
 
-#: src/dht/gnunet-service-dht_clients.c:1033
+#: src/dht/gnunet-service-dht_clients.c:1037
 msgid "# Key match, type mismatches in REPLY to CLIENT"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_clients.c:1046
+#: src/dht/gnunet-service-dht_clients.c:1050
 msgid "# Duplicate REPLIES to CLIENT request dropped"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_clients.c:1083
+#: src/dht/gnunet-service-dht_clients.c:1087
 #, c-format
 msgid "Unsupported block type (%u) in request!\n"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_clients.c:1106
+#: src/dht/gnunet-service-dht_clients.c:1110
 msgid "# RESULTS queued for clients"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_clients.c:1157
-#: src/dht/gnunet-service-dht_clients.c:1199
+#: src/dht/gnunet-service-dht_clients.c:1164
+#: src/dht/gnunet-service-dht_clients.c:1206
 msgid "# REPLIES ignored for CLIENTS (no match)"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_clients.c:1167
+#: src/dht/gnunet-service-dht_clients.c:1174
 msgid "Could not pass reply to client, message too big!\n"
 msgstr ""
 
@@ -1501,123 +1874,123 @@ msgstr "# các yêu cầu get (lấy) dht được nhận"
 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:501
+#: src/dht/gnunet-service-dht_neighbours.c:516
 msgid "# Preference updates given to core"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:591
+#: src/dht/gnunet-service-dht_neighbours.c:610
 #, fuzzy
 msgid "# FIND PEER messages initiated"
 msgstr "# các thông báo PING được tạo"
 
-#: src/dht/gnunet-service-dht_neighbours.c:734
+#: src/dht/gnunet-service-dht_neighbours.c:764
 #, fuzzy
 msgid "# Queued messages discarded (peer disconnected)"
 msgstr "# các thông báo được chắp liền"
 
-#: src/dht/gnunet-service-dht_neighbours.c:789
+#: src/dht/gnunet-service-dht_neighbours.c:819
 #, fuzzy
 msgid "# Bytes transmitted to other peers"
 msgstr "# các byte kiểu %d được gửi "
 
-#: src/dht/gnunet-service-dht_neighbours.c:827
+#: src/dht/gnunet-service-dht_neighbours.c:857
 #, fuzzy
 msgid "# Bytes of bandwidth requested from core"
 msgstr "# các yêu cầu máy/trình khách lỗ hổng được phun vào"
 
-#: src/dht/gnunet-service-dht_neighbours.c:859
+#: src/dht/gnunet-service-dht_neighbours.c:889
 #, 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:1052
-#: src/dht/gnunet-service-dht_neighbours.c:1086
+#: src/dht/gnunet-service-dht_neighbours.c:1093
+#: src/dht/gnunet-service-dht_neighbours.c:1130
 msgid "# Peers excluded from routing due to Bloomfilter"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1067
-#: src/dht/gnunet-service-dht_neighbours.c:1101
+#: src/dht/gnunet-service-dht_neighbours.c:1108
+#: src/dht/gnunet-service-dht_neighbours.c:1145
 #, 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:1235
+#: src/dht/gnunet-service-dht_neighbours.c:1287
 #, fuzzy
 msgid "# PUT requests routed"
 msgstr "# các yêu cầu dht được định tuyến"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1264
+#: src/dht/gnunet-service-dht_neighbours.c:1316
 #, 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:1271
-#: src/dht/gnunet-service-dht_neighbours.c:1384
-#: src/dht/gnunet-service-dht_neighbours.c:1484
+#: src/dht/gnunet-service-dht_neighbours.c:1323
+#: src/dht/gnunet-service-dht_neighbours.c:1440
+#: src/dht/gnunet-service-dht_neighbours.c:1543
 #, fuzzy
 msgid "# P2P messages dropped due to full queue"
 msgstr "# các yêu cầu lỗ hổng bị bỏ do trọng tải"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1349
+#: src/dht/gnunet-service-dht_neighbours.c:1405
 #, fuzzy
 msgid "# GET requests routed"
 msgstr "# các yêu cầu dht được định tuyến"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1376
+#: src/dht/gnunet-service-dht_neighbours.c:1432
 #, 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:1491
+#: src/dht/gnunet-service-dht_neighbours.c:1550
 #, 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:1573
+#: src/dht/gnunet-service-dht_neighbours.c:1637
 #, 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:1576
+#: src/dht/gnunet-service-dht_neighbours.c:1640
 #, 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:1731
+#: src/dht/gnunet-service-dht_neighbours.c:1803
 #, 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:1739
+#: src/dht/gnunet-service-dht_neighbours.c:1811
 msgid "# FIND PEER requests ignored due to lack of HELLO"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1830
+#: src/dht/gnunet-service-dht_neighbours.c:1904
 #, 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:1833
+#: src/dht/gnunet-service-dht_neighbours.c:1907
 #, 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:1886
+#: src/dht/gnunet-service-dht_neighbours.c:1961
 #, 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:1900
+#: src/dht/gnunet-service-dht_neighbours.c:1975
 #, 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:1977
+#: src/dht/gnunet-service-dht_neighbours.c:2052
 #, fuzzy
 msgid "# P2P RESULTS received"
 msgstr "# Tín hiệu HTTP PUT được nhận"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1980
+#: src/dht/gnunet-service-dht_neighbours.c:2055
 #, fuzzy
 msgid "# P2P RESULT bytes received"
 msgstr "# Tín hiệu HTTP PUT được nhận"
@@ -1660,51 +2033,51 @@ msgstr ""
 msgid "# DHT requests combined"
 msgstr "# các yêu cầu get (lấy) dht được nhận"
 
-#: src/dht/plugin_block_dht.c:136
+#: src/dht/plugin_block_dht.c:138
 #, 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:143
+#: src/dht/plugin_block_dht.c:145
 msgid "Size mismatch for block\n"
 msgstr ""
 
-#: src/dht/plugin_block_dht.c:152
+#: src/dht/plugin_block_dht.c:154
 #, c-format
 msgid "Block of type %u is malformed\n"
 msgstr ""
 
-#: src/dns/dnsparser.c:233
+#: src/dns/dnsparser.c:239
 #, fuzzy, c-format
 msgid "Failed to convert DNS IDNA name `%s' to UTF-8: %s\n"
 msgstr "Lỗi mở tập tin ghi sự kiện « %s »: %s\n"
 
-#: src/dns/dnsparser.c:751
+#: src/dns/dnsparser.c:800
 #, fuzzy, c-format
 msgid "Failed to convert UTF-8 name `%s' to DNS IDNA format: %s\n"
 msgstr "Lỗi mở tập tin ghi sự kiện « %s »: %s\n"
 
-#: src/dns/dnsstub.c:176
+#: src/dns/dnsstub.c:175
 #, fuzzy, c-format
 msgid "Could not bind to any port: %s\n"
 msgstr "Không tìm thấy địa chỉ IP của máy « %s »: %s\n"
 
-#: src/dns/dnsstub.c:296 src/dns/dnsstub.c:384
+#: src/dns/dnsstub.c:295 src/dns/dnsstub.c:383
 #, fuzzy, c-format
 msgid "Failed to send DNS request to %s\n"
 msgstr "Lỗi mở tập tin ghi sự kiện « %s »: %s\n"
 
-#: src/dns/dnsstub.c:300
+#: src/dns/dnsstub.c:299
 #, fuzzy, c-format
 msgid "Sent DNS request to %s\n"
 msgstr "Lỗi mở tập tin ghi sự kiện « %s »: %s\n"
 
-#: src/dns/dnsstub.c:369
+#: src/dns/dnsstub.c:368
 #, c-format
 msgid "Configured DNS exit `%s' is not working / valid.\n"
 msgstr ""
 
-#: src/dns/dnsstub.c:441
+#: src/dns/dnsstub.c:440
 #, c-format
 msgid "Received DNS response that is too small (%u bytes)"
 msgstr ""
@@ -1771,12 +2144,12 @@ 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:1049 src/exit/gnunet-daemon-exit.c:3359
+#: src/dns/gnunet-service-dns.c:1049 src/exit/gnunet-daemon-exit.c:3498
 #, c-format
 msgid "`%s' must be installed SUID, refusing to run\n"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:1069 src/exit/gnunet-daemon-exit.c:3415
+#: src/dns/gnunet-service-dns.c:1069 src/exit/gnunet-daemon-exit.c:3555
 #, 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"
@@ -1790,354 +2163,343 @@ 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:756
+#: src/exit/gnunet-daemon-exit.c:802
 #, c-format
 msgid "Got duplicate service records for `%s:%u'\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:807
+#: src/exit/gnunet-daemon-exit.c:853
 #, fuzzy
 msgid "# Bytes transmitted via mesh tunnels"
 msgstr "# các byte được gửi"
 
-#: src/exit/gnunet-daemon-exit.c:924 src/exit/gnunet-daemon-exit.c:2349
-#: src/exit/gnunet-daemon-exit.c:2606 src/vpn/gnunet-service-vpn.c:1451
-#: src/vpn/gnunet-service-vpn.c:1850 src/vpn/gnunet-service-vpn.c:2013
+#: src/exit/gnunet-daemon-exit.c:970 src/exit/gnunet-daemon-exit.c:2394
+#: src/exit/gnunet-daemon-exit.c:2651 src/vpn/gnunet-service-vpn.c:1409
+#: src/vpn/gnunet-service-vpn.c:1799 src/vpn/gnunet-service-vpn.c:1962
 msgid "# ICMPv4 packets dropped (type not allowed)"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:961 src/exit/gnunet-daemon-exit.c:2408
-#: src/exit/gnunet-daemon-exit.c:2665 src/vpn/gnunet-service-vpn.c:1507
-#: src/vpn/gnunet-service-vpn.c:1909 src/vpn/gnunet-service-vpn.c:2046
+#: src/exit/gnunet-daemon-exit.c:1007 src/exit/gnunet-daemon-exit.c:2453
+#: src/exit/gnunet-daemon-exit.c:2710 src/vpn/gnunet-service-vpn.c:1465
+#: src/vpn/gnunet-service-vpn.c:1858 src/vpn/gnunet-service-vpn.c:1995
 msgid "# ICMPv6 packets dropped (type not allowed)"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:1001
+#: src/exit/gnunet-daemon-exit.c:1047
 msgid "# ICMP packets dropped (not allowed)"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:1008
+#: src/exit/gnunet-daemon-exit.c:1054
 msgid "ICMP Packet dropped, have no matching connection information\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:1084
+#: src/exit/gnunet-daemon-exit.c:1130
 msgid "UDP Packet dropped, have no matching connection information\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:1158
+#: src/exit/gnunet-daemon-exit.c:1204
 msgid "TCP Packet dropped, have no matching connection information\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:1210
+#: src/exit/gnunet-daemon-exit.c:1256
 #, fuzzy
 msgid "# Packets received from TUN"
 msgstr "# các byte đã nhận qua HTTP"
 
-#: src/exit/gnunet-daemon-exit.c:1224
+#: src/exit/gnunet-daemon-exit.c:1270
 #, fuzzy
 msgid "# Bytes received from TUN"
 msgstr "# các byte đã nhận qua HTTP"
 
-#: src/exit/gnunet-daemon-exit.c:1250
+#: src/exit/gnunet-daemon-exit.c:1296
 msgid "IPv4 packet options received.  Ignored.\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:1277
+#: src/exit/gnunet-daemon-exit.c:1323
 #, c-format
 msgid "IPv4 packet with unsupported next header %u received.  Ignored.\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:1323
+#: src/exit/gnunet-daemon-exit.c:1369
 #, c-format
 msgid "IPv6 packet with unsupported next header %d received.  Ignored.\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:1331
+#: src/exit/gnunet-daemon-exit.c:1377
 #, c-format
 msgid "Packet from unknown protocol %u received.  Ignored.\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:1713
+#: src/exit/gnunet-daemon-exit.c:1759
 #, fuzzy
 msgid "# TCP packets sent via TUN"
 msgstr "# các byte đã gửi qua UDP"
 
-#: src/exit/gnunet-daemon-exit.c:1826
+#: src/exit/gnunet-daemon-exit.c:1872
 #, fuzzy
 msgid "# TCP service creation requests received via mesh"
 msgstr "# các yêu cầu danh sách máy được nhận"
 
-#: src/exit/gnunet-daemon-exit.c:1829 src/exit/gnunet-daemon-exit.c:1919
-#: src/exit/gnunet-daemon-exit.c:2035 src/exit/gnunet-daemon-exit.c:2273
-#: src/exit/gnunet-daemon-exit.c:2522 src/exit/gnunet-daemon-exit.c:2811
-#: src/exit/gnunet-daemon-exit.c:2918
+#: src/exit/gnunet-daemon-exit.c:1875 src/exit/gnunet-daemon-exit.c:1965
+#: src/exit/gnunet-daemon-exit.c:2070 src/exit/gnunet-daemon-exit.c:2318
+#: src/exit/gnunet-daemon-exit.c:2567 src/exit/gnunet-daemon-exit.c:2856
+#: src/exit/gnunet-daemon-exit.c:2963
 #, fuzzy
 msgid "# Bytes received from MESH"
 msgstr "# các byte đã nhận qua HTTP"
 
-#: src/exit/gnunet-daemon-exit.c:1861 src/exit/gnunet-daemon-exit.c:2940
+#: src/exit/gnunet-daemon-exit.c:1907 src/exit/gnunet-daemon-exit.c:2985
 #, c-format
 msgid "No service found for %s on port %d!\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:1865
+#: src/exit/gnunet-daemon-exit.c:1911
 #, fuzzy
 msgid "# TCP requests dropped (no such service)"
 msgstr "# các yêu cầu lỗ hổng bị bỏ do trọng tải"
 
-#: src/exit/gnunet-daemon-exit.c:1922
+#: src/exit/gnunet-daemon-exit.c:1968
 #, fuzzy
 msgid "# TCP IP-exit creation requests received via mesh"
 msgstr "# các yêu cầu danh sách máy được nhận"
 
-#: src/exit/gnunet-daemon-exit.c:2038
+#: src/exit/gnunet-daemon-exit.c:2073
 #, fuzzy
 msgid "# TCP data requests received via mesh"
 msgstr "# các yêu cầu get (lấy) dht được nhận"
 
-#: src/exit/gnunet-daemon-exit.c:2052
+#: src/exit/gnunet-daemon-exit.c:2087
 #, 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:2102
+#: src/exit/gnunet-daemon-exit.c:2147
 #, fuzzy
 msgid "# ICMP packets sent via TUN"
 msgstr "# các byte đã gửi qua UDP"
 
-#: src/exit/gnunet-daemon-exit.c:2276
+#: src/exit/gnunet-daemon-exit.c:2321
 #, fuzzy
 msgid "# ICMP IP-exit requests received via mesh"
 msgstr "# các yêu cầu get (lấy) dht được nhận"
 
-#: src/exit/gnunet-daemon-exit.c:2525
+#: src/exit/gnunet-daemon-exit.c:2570
 #, fuzzy
 msgid "# ICMP service requests received via mesh"
 msgstr "# các đáp ứng lỗ hổng được gửi cho trình/máy khách"
 
-#: src/exit/gnunet-daemon-exit.c:2591 src/vpn/gnunet-service-vpn.c:1441
-#: src/vpn/gnunet-service-vpn.c:2007
+#: src/exit/gnunet-daemon-exit.c:2636 src/vpn/gnunet-service-vpn.c:1399
+#: src/vpn/gnunet-service-vpn.c:1956
 msgid "# ICMPv4 packets dropped (impossible PT to v6)"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:2650 src/vpn/gnunet-service-vpn.c:1477
-#: src/vpn/gnunet-service-vpn.c:1489 src/vpn/gnunet-service-vpn.c:1897
+#: src/exit/gnunet-daemon-exit.c:2695 src/vpn/gnunet-service-vpn.c:1435
+#: src/vpn/gnunet-service-vpn.c:1447 src/vpn/gnunet-service-vpn.c:1846
 msgid "# ICMPv6 packets dropped (impossible PT to v4)"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:2700
+#: src/exit/gnunet-daemon-exit.c:2745
 #, fuzzy
 msgid "# UDP packets sent via TUN"
 msgstr "# các byte đã gửi qua UDP"
 
-#: src/exit/gnunet-daemon-exit.c:2814
+#: src/exit/gnunet-daemon-exit.c:2859
 #, fuzzy
 msgid "# UDP IP-exit requests received via mesh"
 msgstr "# các yêu cầu get (lấy) dht được nhận"
 
-#: src/exit/gnunet-daemon-exit.c:2921
+#: src/exit/gnunet-daemon-exit.c:2966
 #, fuzzy
 msgid "# UDP service requests received via mesh"
 msgstr "# các yêu cầu get (lấy) dht được nhận"
 
-#: src/exit/gnunet-daemon-exit.c:2944
+#: src/exit/gnunet-daemon-exit.c:2989
 #, fuzzy
 msgid "# UDP requests dropped (no such service)"
 msgstr "# các yêu cầu lỗ hổng bị bỏ do trọng tải"
 
-#: src/exit/gnunet-daemon-exit.c:2977
+#: src/exit/gnunet-daemon-exit.c:3024
 msgid "# Inbound MESH tunnels created"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3216
+#: src/exit/gnunet-daemon-exit.c:3285
 #, c-format
 msgid "No addresses found for hostname `%s' of service `%s'!\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3230 src/exit/gnunet-daemon-exit.c:3242
+#: src/exit/gnunet-daemon-exit.c:3299 src/exit/gnunet-daemon-exit.c:3311
 #, c-format
 msgid "Service `%s' configured for IPv4, but IPv4 is disabled!\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3253
+#: src/exit/gnunet-daemon-exit.c:3322
 #, c-format
 msgid "No IP addresses found for hostname `%s' of service `%s'!\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3372
+#: src/exit/gnunet-daemon-exit.c:3511
 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:3380
+#: src/exit/gnunet-daemon-exit.c:3519
 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:3387
+#: src/exit/gnunet-daemon-exit.c:3526
 msgid ""
 "Cannot enable IPv4 exit but disable IPv4 on TUN interface, will use "
 "ENABLE_IPv4=YES\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3393
+#: src/exit/gnunet-daemon-exit.c:3532
 msgid ""
 "Cannot enable IPv6 exit but disable IPv6 on TUN interface, will use "
 "ENABLE_IPv6=YES\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3399 src/pt/gnunet-daemon-pt.c:887
+#: src/exit/gnunet-daemon-exit.c:3538 src/pt/gnunet-daemon-pt.c:1248
 msgid "No useful service enabled.  Exiting.\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3647
+#: src/exit/gnunet-daemon-exit.c:3654
+msgid "Must be a number"
+msgstr ""
+
+#: src/exit/gnunet-daemon-exit.c:3796
 msgid "Daemon to run to provide an IP exit node for the VPN"
 msgstr ""
 
-#: src/experimentation/gnunet-daemon-experimentation.c:56
+#: src/experimentation/gnunet-daemon-experimentation.c:55
 msgid "Experimentation daemon shutting down ...\n"
 msgstr ""
 
-#: src/experimentation/gnunet-daemon-experimentation.c:78
+#: src/experimentation/gnunet-daemon-experimentation.c:77
 msgid "Experimentation daemon starting ...\n"
 msgstr ""
 
-#: src/experimentation/gnunet-daemon-experimentation.c:84
+#: src/experimentation/gnunet-daemon-experimentation.c:83
 #, fuzzy
 msgid "Failed to create statistics!\n"
 msgstr "Không thể tạo miền tên.\n"
 
-#: src/experimentation/gnunet-daemon-experimentation.c:121
+#: src/experimentation/gnunet-daemon-experimentation.c:120
 msgid "GNUnet experimentation daemon"
 msgstr ""
 
-#: src/experimentation/gnunet-daemon-experimentation_experiments.c:264
+#: src/experimentation/gnunet-daemon-experimentation_experiments.c:241
 #, c-format
 msgid "Experiment `%s': Experiment signature is invalid\n"
 msgstr ""
 
-#: src/experimentation/gnunet-daemon-experimentation_experiments.c:271
+#: src/experimentation/gnunet-daemon-experimentation_experiments.c:250
 #, c-format
 msgid ""
 "Adding experiment `%s' running from `%s' to `%s' every %llu sec. for %llu "
 "sec. \n"
 msgstr ""
 
-#: src/experimentation/gnunet-daemon-experimentation_experiments.c:316
+#: src/experimentation/gnunet-daemon-experimentation_experiments.c:303
 #, c-format
 msgid "Experiment `%s': Issuer missing\n"
 msgstr ""
 
-#: src/experimentation/gnunet-daemon-experimentation_experiments.c:321
+#: src/experimentation/gnunet-daemon-experimentation_experiments.c:312
 #, c-format
 msgid "Experiment `%s': Issuer invalid\n"
 msgstr ""
 
-#: src/experimentation/gnunet-daemon-experimentation_experiments.c:327
+#: src/experimentation/gnunet-daemon-experimentation_experiments.c:320
 #, c-format
 msgid "Experiment `%s': Issuer not accepted!\n"
 msgstr ""
 
-#: src/experimentation/gnunet-daemon-experimentation_experiments.c:336
+#: src/experimentation/gnunet-daemon-experimentation_experiments.c:330
 #, c-format
 msgid "Experiment `%s': Version missing or invalid \n"
 msgstr ""
 
-#: src/experimentation/gnunet-daemon-experimentation_experiments.c:344
+#: src/experimentation/gnunet-daemon-experimentation_experiments.c:339
 #, c-format
 msgid "Experiment `%s': Required capabilities missing \n"
 msgstr ""
 
-#: src/experimentation/gnunet-daemon-experimentation_experiments.c:349
+#: src/experimentation/gnunet-daemon-experimentation_experiments.c:345
 #, c-format
 msgid "Experiment `%s': Required capabilities invalid \n"
 msgstr ""
 
-#: src/experimentation/gnunet-daemon-experimentation_experiments.c:392
+#: src/experimentation/gnunet-daemon-experimentation_experiments.c:390
 #, fuzzy, c-format
 msgid "Failed to parse file `%s'\n"
 msgstr "Lỗi đọc danh sách bạn bè từ « %s »\n"
 
-#: src/experimentation/gnunet-daemon-experimentation_experiments.c:418
-#: src/experimentation/gnunet-daemon-experimentation_experiments.c:443
+#: src/experimentation/gnunet-daemon-experimentation_experiments.c:420
+#: src/experimentation/gnunet-daemon-experimentation_experiments.c:452
 msgid ""
-"No valid experiment issuers configured! Set value to peer id of issuer! "
-"Exit...\n"
+"No valid experiment issuers configured! Set value to public keys of issuers! "
+"Exiting.\n"
 msgstr ""
 
-#: src/experimentation/gnunet-daemon-experimentation_experiments.c:428
-#, fuzzy, c-format
-msgid "Invalid value `%s'\n"
-msgstr "Đối số không hợp lệ cho « %s ».\n"
-
-#: src/experimentation/gnunet-daemon-experimentation_experiments.c:452
-#, fuzzy, c-format
-msgid "Invalid public key `%s'\n"
+#: src/experimentation/gnunet-daemon-experimentation_experiments.c:435
+#, fuzzy
+msgid "Invalid value for public key\n"
 msgstr "Đối số không hợp lệ cho « %s ».\n"
 
-#: src/experimentation/gnunet-daemon-experimentation_experiments.c:459
-#, fuzzy, c-format
-msgid "Found issuer for public key `%s'\n"
-msgstr "Đang nạp các truyền tải « %s »\n"
-
-#: src/experimentation/gnunet-daemon-experimentation_experiments.c:462
-#, fuzzy, c-format
-msgid "No issuer for public key `%s'\n"
-msgstr "Vẫn còn không tìm thấy đồng đẳng trong « %s ».\n"
-
-#: src/experimentation/gnunet-daemon-experimentation_experiments.c:479
+#: src/experimentation/gnunet-daemon-experimentation_experiments.c:473
 #, fuzzy, c-format
 msgid "Cannot read experiments file `%s'\n"
 msgstr "Không thể đọc danh sách bạn bè « %s »\n"
 
-#: src/experimentation/gnunet-daemon-experimentation_nodes.c:221
+#: src/experimentation/gnunet-daemon-experimentation_nodes.c:219
 #, c-format
 msgid "Cannot send message to peer `%s' for experiment `%s'\n"
 msgstr ""
 
-#: src/experimentation/gnunet-daemon-experimentation_nodes.c:291
+#: src/experimentation/gnunet-daemon-experimentation_nodes.c:307
 #, c-format
 msgid "Sending experimentation request to peer %s\n"
 msgstr ""
 
-#: src/experimentation/gnunet-daemon-experimentation_nodes.c:422
+#: src/experimentation/gnunet-daemon-experimentation_nodes.c:451
 #, c-format
 msgid "Added peer `%s' as active node\n"
 msgstr ""
 
-#: src/experimentation/gnunet-daemon-experimentation_nodes.c:849
+#: src/experimentation/gnunet-daemon-experimentation_nodes.c:889
 #, fuzzy, c-format
 msgid "Connected to peer %s\n"
 msgstr "« %s » được kết nối tới « %s ».\n"
 
-#: src/experimentation/gnunet-daemon-experimentation_nodes.c:878
+#: src/experimentation/gnunet-daemon-experimentation_nodes.c:919
 #, fuzzy, c-format
 msgid "Disconnected from peer %s\n"
 msgstr "« %.*s » được kết nối tới « %.*s ».\n"
 
-#: src/experimentation/gnunet-daemon-experimentation_nodes.c:1058
+#: src/experimentation/gnunet-daemon-experimentation_nodes.c:1102
 #, fuzzy
 msgid "Failed to connect to CORE service!\n"
 msgstr "Lỗi kết nối đến gnunetd.\n"
 
-#: src/experimentation/gnunet-daemon-experimentation_scheduler.c:109
+#: src/experimentation/gnunet-daemon-experimentation_scheduler.c:108
 #, c-format
 msgid "Peer `%s' did not respond to request for experiment `%s'\n"
 msgstr ""
 
-#: src/experimentation/gnunet-daemon-experimentation_scheduler.c:144
+#: src/experimentation/gnunet-daemon-experimentation_scheduler.c:143
 #, fuzzy, c-format
 msgid "Starting inbound experiment `%s' with peer `%s'\n"
 msgstr "Đang bắt đầu tài về « %s »\n"
 
-#: src/experimentation/gnunet-daemon-experimentation_scheduler.c:278
+#: src/experimentation/gnunet-daemon-experimentation_scheduler.c:276
 #, fuzzy, c-format
 msgid "Starting outbound experiment `%s' with peer `%s'\n"
 msgstr "Đang bắt đầu tài về « %s »\n"
 
-#: src/experimentation/gnunet-daemon-experimentation_scheduler.c:296
+#: src/experimentation/gnunet-daemon-experimentation_scheduler.c:294
 #, fuzzy, c-format
 msgid "Received %s message from peer %s for experiment `%s'\n"
 msgstr "Nhận yêu cầu định tuyến\n"
@@ -2212,56 +2574,56 @@ msgstr "Lỗi mở tập tin theo dõi « %s »: %s\n"
 msgid "Short read reading from file `%s'!"
 msgstr ""
 
-#: src/fs/fs_api.c:1062
+#: src/fs/fs_api.c:1064
 #, fuzzy, c-format
 msgid "Failed to resume publishing information `%s': %s\n"
 msgstr "Lỗi mở tập tin ghi sự kiện « %s »: %s\n"
 
-#: src/fs/fs_api.c:1565
+#: src/fs/fs_api.c:1569
 #, c-format
 msgid "Failure while resuming publishing operation `%s': %s\n"
 msgstr ""
 
-#: src/fs/fs_api.c:1579
+#: src/fs/fs_api.c:1583
 #, 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:2236
+#: src/fs/fs_api.c:2240
 #, c-format
 msgid "Failure while resuming unindexing operation `%s': %s\n"
 msgstr ""
 
-#: src/fs/fs_api.c:2246
+#: src/fs/fs_api.c:2250
 #, 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:2372 src/fs/fs_api.c:2612
+#: src/fs/fs_api.c:2376 src/fs/fs_api.c:2616
 #, 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:2389
+#: src/fs/fs_api.c:2393
 #, 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:2402 src/fs/fs_api.c:2421 src/fs/fs_api.c:2904
+#: src/fs/fs_api.c:2406 src/fs/fs_api.c:2425 src/fs/fs_api.c:2908
 #, c-format
 msgid "Failure while resuming search operation `%s': %s\n"
 msgstr ""
 
-#: src/fs/fs_api.c:2603
+#: src/fs/fs_api.c:2607
 #, c-format
 msgid "Failed to resume sub-download `%s': could not open file `%s'\n"
 msgstr ""
 
-#: src/fs/fs_api.c:2848
+#: src/fs/fs_api.c:2852
 msgid "Could not resume running search, will resume as paused search\n"
 msgstr ""
 
-#: src/fs/fs_api.c:2942
+#: src/fs/fs_api.c:2946
 #, c-format
 msgid "Failure while resuming download operation `%s': %s\n"
 msgstr ""
@@ -2376,64 +2738,64 @@ msgstr "Lỗi chạy %s: %s %d\n"
 msgid "Failed to connect to datastore."
 msgstr "Không kết nối được đến trình nền gnunetd."
 
-#: src/fs/fs_publish.c:125 src/fs/fs_publish.c:414
+#: src/fs/fs_publish.c:125 src/fs/fs_publish.c:415
 #, fuzzy, c-format
 msgid "Publishing failed: %s"
 msgstr "Gặp lỗi khi tải lên tập tin: %s\n"
 
-#: src/fs/fs_publish.c:642 src/fs/fs_publish.c:659 src/fs/fs_publish.c:698
-#: src/fs/fs_publish.c:719 src/fs/fs_publish.c:743 src/fs/fs_publish.c:889
+#: src/fs/fs_publish.c:667 src/fs/fs_publish.c:684 src/fs/fs_publish.c:723
+#: src/fs/fs_publish.c:744 src/fs/fs_publish.c:768 src/fs/fs_publish.c:914
 #, fuzzy, c-format
 msgid "Can not index file `%s': %s.  Will try to insert instead.\n"
 msgstr "Lỗi đánh chỉ mục tập tin « %s ». Đề nghị: thử chèn tập tin.\n"
 
-#: src/fs/fs_publish.c:644
+#: src/fs/fs_publish.c:669
 msgid "timeout on index-start request to `fs' service"
 msgstr ""
 
-#: src/fs/fs_publish.c:656
+#: src/fs/fs_publish.c:681
 #, fuzzy
 msgid "unknown error"
 msgstr "Lỗi không rõ"
 
-#: src/fs/fs_publish.c:700
+#: src/fs/fs_publish.c:725
 msgid "failed to compute hash"
 msgstr ""
 
-#: src/fs/fs_publish.c:720
+#: src/fs/fs_publish.c:745
 #, fuzzy
 msgid "filename too long"
 msgstr "tên tập tin"
 
-#: src/fs/fs_publish.c:745
+#: src/fs/fs_publish.c:770
 msgid "could not connect to `fs' service"
 msgstr ""
 
-#: src/fs/fs_publish.c:768
+#: src/fs/fs_publish.c:793
 #, fuzzy, c-format
 msgid "Failed to get file identifiers for `%s'\n"
 msgstr "Lỗi đọc danh sách bạn bè từ « %s »\n"
 
-#: src/fs/fs_publish.c:837
+#: src/fs/fs_publish.c:862
 #, fuzzy, c-format
 msgid "Recursive upload failed at `%s': %s"
 msgstr "%s bị lỗi tại %s:%d: « %s »\n"
 
-#: src/fs/fs_publish.c:843
+#: src/fs/fs_publish.c:868
 #, fuzzy, c-format
 msgid "Recursive upload failed: %s"
 msgstr "Gặp lỗi khi tải lên tập tin: %s\n"
 
-#: src/fs/fs_publish.c:890
+#: src/fs/fs_publish.c:915
 msgid "needs to be an actual file"
 msgstr ""
 
-#: src/fs/fs_publish.c:1126
+#: src/fs/fs_publish.c:1151
 #, fuzzy, c-format
 msgid "Insufficient space for publishing: %s"
 msgstr "Không đủ quyền truy cập cho « %s »: %s\n"
 
-#: src/fs/fs_publish.c:1198
+#: src/fs/fs_publish.c:1243
 #, c-format
 msgid "Reserving space for %u entries and %llu bytes for publication\n"
 msgstr ""
@@ -2448,12 +2810,12 @@ msgstr "« %s »: Không thể kết nối.\n"
 msgid "Internal error."
 msgstr "Lỗi VR."
 
-#: src/fs/fs_search.c:815
+#: src/fs/fs_search.c:819
 #, fuzzy, c-format
 msgid "Failed to parse URI `%s': %s\n"
 msgstr "Tập tin « %s » có URI: %s\n"
 
-#: src/fs/fs_search.c:874
+#: src/fs/fs_search.c:878
 #, c-format
 msgid "Got result with unknown block type `%d', ignoring"
 msgstr ""
@@ -2572,21 +2934,21 @@ msgstr ""
 msgid "Unrecognized URI type"
 msgstr ""
 
-#: src/fs/fs_uri.c:912
+#: src/fs/fs_uri.c:910
 #, fuzzy
 msgid "Lacking key configuration settings.\n"
 msgstr "Lưu cấu hình ngay bây giờ không?"
 
-#: src/fs/fs_uri.c:918
+#: src/fs/fs_uri.c:916
 #, fuzzy, c-format
 msgid "Could not access hostkey file `%s'.\n"
 msgstr "Không thể truy cập đến tập tin gnunet-directory « %s »\n"
 
-#: src/fs/fs_uri.c:1102 src/fs/fs_uri.c:1129
+#: src/fs/fs_uri.c:1100 src/fs/fs_uri.c:1127
 msgid "No keywords specified!\n"
 msgstr "Chưa ghi rõ từ khoá.\n"
 
-#: src/fs/fs_uri.c:1135
+#: src/fs/fs_uri.c:1133
 msgid "Number of double-quotes not balanced!\n"
 msgstr "Có dấu nháy kép thừa hay thiếu.\n"
 
@@ -2622,23 +2984,23 @@ msgid ""
 "You must specify one and only one directory name for automatic publication.\n"
 msgstr "Phải ghi rõ chỉ một tên tập tin để chèn.\n"
 
-#: src/fs/gnunet-auto-share.c:737 src/fs/gnunet-publish.c:811
+#: src/fs/gnunet-auto-share.c:737 src/fs/gnunet-publish.c:824
 msgid "set the desired LEVEL of sender-anonymity"
 msgstr "đặt CẤP mong muốn của tình trạng nặc danh của người gửi"
 
-#: src/fs/gnunet-auto-share.c:741 src/fs/gnunet-publish.c:815
+#: src/fs/gnunet-auto-share.c:741 src/fs/gnunet-publish.c:828
 msgid "disable adding the creation time to the metadata of the uploaded file"
 msgstr "tắt thêm giờ tạo vào siêu dữ liệu của tập tin đã tải lên"
 
-#: src/fs/gnunet-auto-share.c:744 src/fs/gnunet-publish.c:818
+#: src/fs/gnunet-auto-share.c:744 src/fs/gnunet-publish.c:831
 msgid "do not use libextractor to add keywords or metadata"
 msgstr ""
 
-#: src/fs/gnunet-auto-share.c:747 src/fs/gnunet-publish.c:842
+#: src/fs/gnunet-auto-share.c:747 src/fs/gnunet-publish.c:855
 msgid "specify the priority of the content"
 msgstr "xác định mức ưu tiên của nội dung"
 
-#: src/fs/gnunet-auto-share.c:750 src/fs/gnunet-publish.c:849
+#: src/fs/gnunet-auto-share.c:750 src/fs/gnunet-publish.c:862
 msgid "set the desired replication LEVEL"
 msgstr ""
 
@@ -2647,7 +3009,7 @@ msgstr ""
 msgid "Automatically publish files from a directory on GNUnet"
 msgstr "Tự động chia sẻ một thư mục."
 
-#: src/fs/gnunet-daemon-fsprofiler.c:657
+#: src/fs/gnunet-daemon-fsprofiler.c:660
 msgid "Daemon to use file-sharing to measure its performance."
 msgstr ""
 
@@ -2713,7 +3075,7 @@ msgstr "Gặp lỗi khi tải xuống: %s\n"
 msgid "Downloading `%s' done (%s/s).\n"
 msgstr "Tiến trình tải lên « %s » đã tiếp tục lại.\n"
 
-#: src/fs/gnunet-download.c:209 src/fs/gnunet-publish.c:273
+#: src/fs/gnunet-download.c:209 src/fs/gnunet-publish.c:286
 #: src/fs/gnunet-search.c:193 src/fs/gnunet-unindex.c:108
 #, fuzzy, c-format
 msgid "Unexpected status: %d\n"
@@ -2724,7 +3086,7 @@ msgstr "Gặp sự kiện bất thường: %d\n"
 msgid "You need to specify a URI argument.\n"
 msgstr "KHÔNG cho phép ghi rõ cả hai địa chỉ URI và tên tập tin.\n"
 
-#: src/fs/gnunet-download.c:240 src/fs/gnunet-publish.c:652
+#: src/fs/gnunet-download.c:240 src/fs/gnunet-publish.c:665
 #, fuzzy, c-format
 msgid "Failed to parse URI: %s\n"
 msgstr "Tập tin « %s » có URI: %s\n"
@@ -2737,7 +3099,7 @@ msgstr ""
 msgid "Target filename must be specified.\n"
 msgstr ""
 
-#: src/fs/gnunet-download.c:268 src/fs/gnunet-publish.c:784
+#: src/fs/gnunet-download.c:268 src/fs/gnunet-publish.c:797
 #: src/fs/gnunet-search.c:243 src/fs/gnunet-unindex.c:140
 #, fuzzy, c-format
 msgid "Could not initialize `%s' subsystem.\n"
@@ -2805,127 +3167,127 @@ msgstr ""
 msgid "run a testbed to measure file-sharing performance"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:230
+#: src/fs/gnunet-publish.c:231 src/fs/gnunet-publish.c:243
 #, c-format
 msgid "Publishing `%s' at %llu/%llu (%s remaining)\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:237
+#: src/fs/gnunet-publish.c:250
 #, fuzzy, c-format
 msgid "Error publishing: %s.\n"
 msgstr "Gặp lỗi khi tải xuống: %s\n"
 
-#: src/fs/gnunet-publish.c:247
+#: src/fs/gnunet-publish.c:260
 #, c-format
 msgid "Publishing `%s' done.\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:251
+#: src/fs/gnunet-publish.c:264
 #, fuzzy, c-format
 msgid "URI is `%s'.\n"
 msgstr "Tôi là đồng đẳng « %s ».\n"
 
-#: src/fs/gnunet-publish.c:270
+#: src/fs/gnunet-publish.c:283
 #, fuzzy
 msgid "Cleanup after abort complete.\n"
 msgstr "Hoàn thành khởi chạy « %s ».\n"
 
-#: src/fs/gnunet-publish.c:388
+#: src/fs/gnunet-publish.c:401
 #, fuzzy, c-format
 msgid "Meta data for file `%s' (%s)\n"
 msgstr "Đang cập nhật dữ liệu cho mô-đun « %s »\n"
 
-#: src/fs/gnunet-publish.c:390
+#: src/fs/gnunet-publish.c:403
 #, fuzzy, c-format
 msgid "Keywords for file `%s' (%s)\n"
 msgstr "Từ khoá cho tập tin « %s »:\n"
 
-#: src/fs/gnunet-publish.c:529
+#: src/fs/gnunet-publish.c:542
 #, fuzzy
 msgid "Could not publish\n"
 msgstr "Không thể truy cập đến « %s »: %s\n"
 
-#: src/fs/gnunet-publish.c:552
+#: src/fs/gnunet-publish.c:565
 #, fuzzy
 msgid "Could not start publishing.\n"
 msgstr "Không thể nạp phần bổ sung truyền tải « %s »\n"
 
-#: src/fs/gnunet-publish.c:585
+#: src/fs/gnunet-publish.c:598
 #, fuzzy, c-format
 msgid "Scanning directory `%s'.\n"
 msgstr "Lỗi đọc danh sách bạn bè từ « %s »\n"
 
-#: src/fs/gnunet-publish.c:587
+#: src/fs/gnunet-publish.c:600
 #, fuzzy, c-format
 msgid "Scanning file `%s'.\n"
 msgstr "Đang bắt đầu tài về « %s »\n"
 
-#: src/fs/gnunet-publish.c:592
+#: src/fs/gnunet-publish.c:605
 #, c-format
 msgid "There was trouble processing file `%s', skipping it.\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:597
+#: src/fs/gnunet-publish.c:610
 msgid "Preprocessing complete.\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:601
+#: src/fs/gnunet-publish.c:614
 #, fuzzy, c-format
 msgid "Extracting meta data from file `%s' complete.\n"
 msgstr "Đang cập nhật dữ liệu cho mô-đun « %s »\n"
 
-#: src/fs/gnunet-publish.c:605
+#: src/fs/gnunet-publish.c:618
 msgid "Meta data extraction has finished.\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:612
+#: src/fs/gnunet-publish.c:625
 #, fuzzy
 msgid "Internal error scanning directory.\n"
 msgstr "=\tLỗi đọc thư mục.\n"
 
-#: src/fs/gnunet-publish.c:643
+#: src/fs/gnunet-publish.c:656
 #, fuzzy, c-format
 msgid "Selected pseudonym `%s' unknown\n"
 msgstr "Không gian tên « %s » có đánh giá %d.\n"
 
-#: src/fs/gnunet-publish.c:669
+#: src/fs/gnunet-publish.c:682
 #, fuzzy, c-format
 msgid "Failed to access `%s': %s\n"
 msgstr "Lỗi mở tập tin ghi sự kiện « %s »: %s\n"
 
-#: src/fs/gnunet-publish.c:682
+#: src/fs/gnunet-publish.c:695
 msgid ""
 "Failed to start meta directory scanner.  Is gnunet-helper-publish-fs "
 "installed?\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:734
+#: src/fs/gnunet-publish.c:747
 #, c-format
 msgid "Cannot extract metadata from a URI!\n"
 msgstr "Không thể trích siêu dữ liệu ra một địa chỉ URI.\n"
 
-#: src/fs/gnunet-publish.c:741
+#: src/fs/gnunet-publish.c:754
 #, c-format
 msgid "You must specify one and only one filename for insertion.\n"
 msgstr "Phải ghi rõ chỉ một tên tập tin để chèn.\n"
 
-#: src/fs/gnunet-publish.c:747
+#: src/fs/gnunet-publish.c:760
 #, c-format
 msgid "You must NOT specify an URI and a filename.\n"
 msgstr "KHÔNG cho phép ghi rõ cả hai địa chỉ URI và tên tập tin.\n"
 
-#: src/fs/gnunet-publish.c:755 src/vpn/gnunet-vpn.c:213
+#: src/fs/gnunet-publish.c:768 src/vpn/gnunet-vpn.c:208
 #, c-format
 msgid "Option `%s' is required when using option `%s'.\n"
 msgstr "Tùy chọn « %s » cần thiết khi dùng tùy chọn « %s ».\n"
 
-#: src/fs/gnunet-publish.c:765 src/fs/gnunet-publish.c:772
-#: src/transport/gnunet-transport.c:843 src/transport/gnunet-transport.c:873
+#: src/fs/gnunet-publish.c:778 src/fs/gnunet-publish.c:785
+#: src/transport/gnunet-transport.c:840 src/transport/gnunet-transport.c:870
 #, c-format
 msgid "Option `%s' makes no sense without option `%s'.\n"
 msgstr "Tùy chọn « %s » không có nghĩa khi không có tùy chọn « %s ».\n"
 
-#: src/fs/gnunet-publish.c:822
+#: src/fs/gnunet-publish.c:835
 msgid ""
 "print list of extracted keywords that would be used, but do not perform "
 "upload"
@@ -2933,7 +3295,7 @@ msgstr ""
 "in ra danh sách các từ khóa đã giải phóng cần sử dụng, nhưng không thực hiện "
 "tải lên"
 
-#: src/fs/gnunet-publish.c:826
+#: src/fs/gnunet-publish.c:839
 msgid ""
 "add an additional keyword for the top-level file or directory (this option "
 "can be specified multiple times)"
@@ -2941,11 +3303,11 @@ msgstr ""
 "thêm một từ khoá bổ sung cho tập tin hoặc thư mục ở cấp đầu (có thể chỉ ra "
 "tùy chọn này nhiều lần)"
 
-#: src/fs/gnunet-publish.c:830
+#: src/fs/gnunet-publish.c:843
 msgid "set the meta-data for the given TYPE to the given VALUE"
 msgstr "đặt siêu dữ liệu cho KIỂU đưa ra thành GIÁ_TRỊ chỉ ra"
 
-#: src/fs/gnunet-publish.c:833
+#: src/fs/gnunet-publish.c:846
 msgid ""
 "do not index, perform full insertion (stores entire file in encrypted form "
 "in GNUnet database)"
@@ -2953,7 +3315,7 @@ msgstr ""
 "không đánh chỉ mục, thực hiện việc chèn đầy đủ (chứa toàn bộ tập tin ở dạng "
 "mã hóa trong cơ sở dữ liệu GNUnet)"
 
-#: src/fs/gnunet-publish.c:838
+#: src/fs/gnunet-publish.c:851
 msgid ""
 "specify ID of an updated version to be published in the future (for "
 "namespace insertions only)"
@@ -2961,12 +3323,12 @@ msgstr ""
 "chỉ ra mã số của một phiên bản đã cập nhật để công bố trong tương lai (chỉ "
 "cho sự chèn không gian tên)"
 
-#: src/fs/gnunet-publish.c:846
+#: src/fs/gnunet-publish.c:859
 msgid "publish the files under the pseudonym NAME (place file into namespace)"
 msgstr ""
 "công bố các tập tin dưới biệt hiệu TÊN (đặt tập tin vào không gian tên)"
 
-#: src/fs/gnunet-publish.c:852
+#: src/fs/gnunet-publish.c:865
 #, fuzzy
 msgid ""
 "only simulate the process but do not do any actual publishing (useful to "
@@ -2974,13 +3336,13 @@ msgid ""
 msgstr ""
 "chỉ mô phỏng tiến trình, không thật công bố (có ích để tính địa chỉ URI)"
 
-#: src/fs/gnunet-publish.c:856
+#: src/fs/gnunet-publish.c:869
 msgid ""
 "set the ID of this version of the publication (for namespace insertions only)"
 msgstr ""
 "đặt mã số của phiên bản này của sự công bố (chỉ cho chèn không gian tên)"
 
-#: src/fs/gnunet-publish.c:860
+#: src/fs/gnunet-publish.c:873
 msgid ""
 "URI to be published (can be used instead of passing a file to add keywords "
 "to the file with the respective URI)"
@@ -2988,7 +3350,7 @@ msgstr ""
 "Địa chỉ URI cần công bố (có thể được dùng thay vào gửi một tập tin để thêm "
 "từ khoá vào tập tin có địa chỉ URI tương ứng)"
 
-#: src/fs/gnunet-publish.c:876
+#: src/fs/gnunet-publish.c:889
 msgid "Publish a file or directory on GNUnet"
 msgstr ""
 
@@ -3039,102 +3401,102 @@ msgid "# Loopback routes suppressed"
 msgstr "# tổng số định tuyến lỗ hổng thành công"
 
 #: src/fs/gnunet-service-fs.c:639 src/hostlist/gnunet-daemon-hostlist.c:293
-#: src/topology/gnunet-daemon-topology.c:1315
-#: src/topology/gnunet-daemon-topology.c:1322
+#: src/topology/gnunet-daemon-topology.c:1253
+#: src/topology/gnunet-daemon-topology.c:1260
 #, 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_cp.c:677
+#: src/fs/gnunet-service-fs_cp.c:680
 #, fuzzy
 msgid "# migration stop messages received"
 msgstr "# các thông báo phát hiện dht được nhận"
 
-#: src/fs/gnunet-service-fs_cp.c:681
+#: src/fs/gnunet-service-fs_cp.c:684
 #, c-format
 msgid "Migration of content to peer `%s' blocked for %s\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:716
+#: src/fs/gnunet-service-fs_cp.c:719
 #, fuzzy
 msgid "# replies transmitted to other peers"
 msgstr "# các byte kiểu %d được gửi "
 
-#: src/fs/gnunet-service-fs_cp.c:722
+#: src/fs/gnunet-service-fs_cp.c:725
 #, fuzzy
 msgid "# replies dropped"
 msgstr "# các đáp ứng dht được định tuyến"
 
-#: src/fs/gnunet-service-fs_cp.c:747 src/fs/gnunet-service-fs_cp.c:1296
+#: src/fs/gnunet-service-fs_cp.c:750 src/fs/gnunet-service-fs_cp.c:1299
 msgid "# P2P searches active"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:840
+#: src/fs/gnunet-service-fs_cp.c:843
 msgid "# artificial delays introduced (ms)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:893
+#: src/fs/gnunet-service-fs_cp.c:896
 #, fuzzy
 msgid "# replies dropped due to type mismatch"
 msgstr "# các yêu cầu lỗ hổng bị bỏ do trọng tải"
 
-#: src/fs/gnunet-service-fs_cp.c:901
+#: src/fs/gnunet-service-fs_cp.c:904
 #, fuzzy
 msgid "# replies received for other peers"
 msgstr "# các byte kiểu %d được nhận"
 
-#: src/fs/gnunet-service-fs_cp.c:915
+#: src/fs/gnunet-service-fs_cp.c:918
 msgid "# replies dropped due to insufficient cover traffic"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:953
+#: src/fs/gnunet-service-fs_cp.c:956
 msgid "# P2P searches destroyed due to ultimate reply"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1021
+#: src/fs/gnunet-service-fs_cp.c:1024
 #, fuzzy
 msgid "# requests done for free (low load)"
 msgstr "# các yêu cầu lỗ hổng bị bỏ do trọng tải"
 
-#: src/fs/gnunet-service-fs_cp.c:1046
+#: src/fs/gnunet-service-fs_cp.c:1049
 msgid "# request dropped, priority insufficient"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1056
+#: src/fs/gnunet-service-fs_cp.c:1059
 #, fuzzy
 msgid "# requests done for a price (normal load)"
 msgstr "# các yêu cầu lỗ hổng bị bỏ do trọng tải"
 
-#: src/fs/gnunet-service-fs_cp.c:1134
+#: src/fs/gnunet-service-fs_cp.c:1137
 msgid "# GET requests received (from other peers)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1168
+#: src/fs/gnunet-service-fs_cp.c:1171
 #, fuzzy
 msgid "# requests dropped due to initiator not being connected"
 msgstr "# các yêu cầu lỗ hổng bị bỏ do trọng tải"
 
-#: src/fs/gnunet-service-fs_cp.c:1191
+#: src/fs/gnunet-service-fs_cp.c:1194
 #, fuzzy
 msgid "# requests dropped due to missing reverse route"
 msgstr "# các yêu cầu lỗ hổng bị bỏ do trọng tải"
 
-#: src/fs/gnunet-service-fs_cp.c:1241
+#: src/fs/gnunet-service-fs_cp.c:1244
 #, fuzzy
 msgid "# requests dropped due TTL underflow"
 msgstr "# các yêu cầu lỗ hổng bị bỏ do trọng tải"
 
-#: src/fs/gnunet-service-fs_cp.c:1265
+#: src/fs/gnunet-service-fs_cp.c:1268
 #, fuzzy
 msgid "# requests dropped due to higher-TTL request"
 msgstr "# các yêu cầu lỗ hổng bị bỏ do trọng tải"
 
-#: src/fs/gnunet-service-fs_cp.c:1294
+#: src/fs/gnunet-service-fs_cp.c:1297
 #, fuzzy
 msgid "# P2P query messages received and processed"
 msgstr "# các thông báo phát hiện dht được nhận"
 
-#: src/fs/gnunet-service-fs_cp.c:1664
+#: src/fs/gnunet-service-fs_cp.c:1668
 #, fuzzy
 msgid "# migration stop messages sent"
 msgstr "# các thông báo phát hiện dht được nhận"
@@ -3274,119 +3636,119 @@ 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:310
+#: src/fs/gnunet-service-fs_pr.c:311
 #, 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:393 src/fs/gnunet-service-fs_pr.c:644
+#: src/fs/gnunet-service-fs_pr.c:394 src/fs/gnunet-service-fs_pr.c:645
 #, 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:812
+#: src/fs/gnunet-service-fs_pr.c:813
 #, fuzzy
 msgid "# replies received and matched"
 msgstr "# các byte kiểu %d được nhận"
 
-#: src/fs/gnunet-service-fs_pr.c:842
+#: src/fs/gnunet-service-fs_pr.c:843
 msgid "# duplicate replies discarded (bloomfilter)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:851
+#: src/fs/gnunet-service-fs_pr.c:852
 msgid "# irrelevant replies discarded"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:865
+#: src/fs/gnunet-service-fs_pr.c:866
 #, c-format
 msgid "Unsupported block type %u\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:878
+#: src/fs/gnunet-service-fs_pr.c:879
 #, 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:999
+#: src/fs/gnunet-service-fs_pr.c:1000
 msgid "# Datastore `PUT' failures"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1026
+#: src/fs/gnunet-service-fs_pr.c:1027
 #, 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:1061
+#: src/fs/gnunet-service-fs_pr.c:1062
 #, fuzzy
 msgid "# Replies received from DHT"
 msgstr "# các byte đã nhận qua HTTP"
 
-#: src/fs/gnunet-service-fs_pr.c:1189
+#: src/fs/gnunet-service-fs_pr.c:1190
 #, fuzzy
 msgid "# Replies received from MESH"
 msgstr "# các byte đã nhận qua HTTP"
 
-#: src/fs/gnunet-service-fs_pr.c:1241
+#: src/fs/gnunet-service-fs_pr.c:1242
 #, c-format
 msgid "Datastore lookup already took %s!\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1261
+#: src/fs/gnunet-service-fs_pr.c:1262
 #, c-format
 msgid "On-demand lookup already took %s!\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1308
+#: src/fs/gnunet-service-fs_pr.c:1309
 msgid "# Datastore lookups concluded (no results)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1323
+#: src/fs/gnunet-service-fs_pr.c:1324
 msgid "# Datastore lookups concluded (seen all)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1332
+#: src/fs/gnunet-service-fs_pr.c:1333
 msgid "# Datastore lookups aborted (more than MAX_RESULTS)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1347
+#: src/fs/gnunet-service-fs_pr.c:1348
 msgid "# requested DBLOCK or IBLOCK not found"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1361
+#: src/fs/gnunet-service-fs_pr.c:1362
 msgid "# on-demand blocks matched requests"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1374
+#: src/fs/gnunet-service-fs_pr.c:1375
 msgid "# on-demand lookups performed successfully"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1379
+#: src/fs/gnunet-service-fs_pr.c:1380
 msgid "# on-demand lookups failed"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1406 src/fs/gnunet-service-fs_pr.c:1446
-#: src/fs/gnunet-service-fs_pr.c:1587
+#: src/fs/gnunet-service-fs_pr.c:1407 src/fs/gnunet-service-fs_pr.c:1447
+#: src/fs/gnunet-service-fs_pr.c:1588
 msgid "# Datastore lookups concluded (error queueing)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1464
+#: src/fs/gnunet-service-fs_pr.c:1465
 msgid "# Datastore lookups concluded (found last result)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1475
+#: src/fs/gnunet-service-fs_pr.c:1476
 msgid "# Datastore lookups concluded (load too high)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1563
+#: src/fs/gnunet-service-fs_pr.c:1564
 msgid "# Datastore lookups initiated"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1648
+#: src/fs/gnunet-service-fs_pr.c:1649
 #, fuzzy
 msgid "# GAP PUT messages received"
 msgstr "# các thông báo PONG đã mật mã được nhận"
 
-#: src/fs/gnunet-service-fs_push.c:629
+#: src/fs/gnunet-service-fs_push.c:631
 msgid "time required, content pushing disabled"
 msgstr ""
 
@@ -3421,7 +3783,7 @@ msgstr "Không thể truy cập đến thông tin về không gian tên.\n"
 msgid "Unindex a file that was previously indexed with gnunet-publish."
 msgstr ""
 
-#: src/gns/gns_api.c:385
+#: src/gns/gns_api.c:387
 #, fuzzy
 msgid "Failed to serialize lookup reply from GNS service!\n"
 msgstr ""
@@ -3448,204 +3810,345 @@ msgstr "Nhận yêu cầu định tuyến\n"
 msgid "Received unsupported DNS request from %s\n"
 msgstr "Nhận yêu cầu định tuyến\n"
 
-#: src/gns/gnunet-dns2gns.c:703
+#: src/gns/gnunet-dns2gns.c:701
 msgid "No ego configured for `dns2gns` subsystem\n"
 msgstr ""
 
-#: src/gns/gnunet-dns2gns.c:729
+#: src/gns/gnunet-dns2gns.c:727
 #, fuzzy
 msgid "No DNS server specified!\n"
 msgstr "Chưa ghi rõ từ khoá.\n"
 
-#: src/gns/gnunet-dns2gns.c:751
+#: src/gns/gnunet-dns2gns.c:749
 #, fuzzy
 msgid "No valid GNS zone specified!\n"
 msgstr "Chưa ghi rõ từ khoá.\n"
 
-#: src/gns/gnunet-dns2gns.c:772
+#: src/gns/gnunet-dns2gns.c:770
 msgid "IP of recursive DNS resolver to use (required)"
 msgstr ""
 
-#: src/gns/gnunet-dns2gns.c:775
+#: src/gns/gnunet-dns2gns.c:773
 msgid "Authoritative FCFS suffix to use (optional); default: fcfs.zkey.eu"
 msgstr ""
 
-#: src/gns/gnunet-dns2gns.c:778
+#: src/gns/gnunet-dns2gns.c:776
 msgid "Authoritative DNS suffix to use (optional); default: zkey.eu"
 msgstr ""
 
-#: src/gns/gnunet-dns2gns.c:781
+#: src/gns/gnunet-dns2gns.c:779
 msgid "UDP port to listen on for inbound DNS requests; default: 53"
 msgstr ""
 
-#: src/gns/gnunet-dns2gns.c:784
+#: src/gns/gnunet-dns2gns.c:782
 msgid "Public key of the GNS zone to use (overrides default)"
 msgstr ""
 
-#: src/gns/gnunet-dns2gns.c:797
+#: src/gns/gnunet-dns2gns.c:795
 msgid "GNUnet DNS-to-GNS proxy (a DNS server)"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:205
+#: src/gns/gnunet-gns.c:217
 #, c-format
 msgid "Please specify name to lookup!\n"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:285
+#: src/gns/gnunet-gns.c:297
 #, c-format
 msgid "Ego for `%s' not found, cannot perform lookup.\n"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:323
+#: src/gns/gnunet-gns.c:335
 #, c-format
 msgid ""
 "Ego for `master-zone' not found, cannot perform lookup.  Did you run gnunet-"
 "gns-import.sh?\n"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:352
+#: src/gns/gnunet-gns.c:364
 #, fuzzy, c-format
 msgid "Failed to connect to GNS\n"
 msgstr "Lỗi kết nối đến gnunetd.\n"
 
-#: src/gns/gnunet-gns.c:365
+#: src/gns/gnunet-gns.c:377
 #, c-format
 msgid "Public key `%s' is not well-formed\n"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:414
+#: src/gns/gnunet-gns.c:426
 msgid "Lookup a record for the given name"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:417
+#: src/gns/gnunet-gns.c:429
 #, fuzzy
 msgid "Specify the type of the record to lookup"
 msgstr "xác định mức ưu tiên của nội dung"
 
-#: src/gns/gnunet-gns.c:420
+#: src/gns/gnunet-gns.c:432
 msgid "No unneeded output"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:423
+#: src/gns/gnunet-gns.c:435
 #, fuzzy
 msgid "Specify the public key of the zone to lookup the record in"
 msgstr "xác định mức ưu tiên của nội dung"
 
-#: src/gns/gnunet-gns.c:426
+#: src/gns/gnunet-gns.c:438
 #, fuzzy
 msgid "Specify the name of the ego of the zone to lookup the record in"
 msgstr "xác định mức ưu tiên của nội dung"
 
-#: src/gns/gnunet-gns.c:439
+#: src/gns/gnunet-gns.c:451
 #, fuzzy
 msgid "GNUnet GNS resolver tool"
 msgstr "Bản ghi lỗi GNUnet"
 
-#: src/gns/gnunet-gns-proxy.c:60 src/hostlist/hostlist-client.c:469
+#: src/gns/gnunet-gns-proxy.c:105 src/hostlist/hostlist-client.c:469
 #: src/hostlist/hostlist-client.c:680 src/hostlist/hostlist-client.c:686
 #: src/hostlist/hostlist-client.c:738 src/hostlist/hostlist-client.c:747
 #: src/hostlist/hostlist-client.c:868 src/hostlist/hostlist-client.c:960
 #: src/hostlist/hostlist-client.c:965
-#: src/transport/plugin_transport_http_client.c:1068
-#: src/transport/plugin_transport_http_client.c:1083
+#: src/transport/plugin_transport_http_client.c:1067
+#: src/transport/plugin_transport_http_client.c:1082
 #, c-format
 msgid "%s failed at %s:%d: `%s'\n"
 msgstr "%s bị lỗi tại %s:%d: « %s »\n"
 
-#: src/gns/gnunet-gns-proxy.c:2344
+#: src/gns/gnunet-gns-proxy.c:839
+#, fuzzy, c-format
+msgid "Unsupported CURL SSL backend %d\n"
+msgstr "Lệnh không được hỗ trợ « %s ». Đang hủy bỏ.\n"
+
+#: src/gns/gnunet-gns-proxy.c:862
+#, fuzzy, c-format
+msgid "Failed to fetch CN from cert: %s\n"
+msgstr "Lỗi mở tập tin ghi sự kiện « %s »: %s\n"
+
+#: src/gns/gnunet-gns-proxy.c:885
+#, fuzzy, c-format
+msgid "Failed to initialize DANE: %s\n"
+msgstr "Không thể sơ khởi SQLite: %s.\n"
+
+#: src/gns/gnunet-gns-proxy.c:898
+#, fuzzy, c-format
+msgid "Failed to parse DANE record: %s\n"
+msgstr "Lỗi mở tập tin ghi sự kiện « %s »: %s\n"
+
+#: src/gns/gnunet-gns-proxy.c:913
+#, fuzzy, c-format
+msgid "Failed to verify TLS connection using DANE: %s\n"
+msgstr "Không thể lưu tập tin cấu hình « %s »:"
+
+#: src/gns/gnunet-gns-proxy.c:923
+#, c-format
+msgid "Failed DANE verification failed with GnuTLS verify status code: %u\n"
+msgstr ""
+
+#: src/gns/gnunet-gns-proxy.c:947
+#, c-format
+msgid "SSL certificate subject name (%s) does not match `%s'\n"
+msgstr ""
+
+#: src/gns/gnunet-gns-proxy.c:1092
+#, c-format
+msgid "Cookie domain `%s' supplied by server is invalid\n"
+msgstr ""
+
+#: src/gns/gnunet-gns-proxy.c:1609
+#, fuzzy, c-format
+msgid "Unsupported HTTP method `%s'\n"
+msgstr "Lệnh không được hỗ trợ « %s ». Đang hủy bỏ.\n"
+
+#: src/gns/gnunet-gns-proxy.c:1979
 #, fuzzy, c-format
 msgid "Unable to import private key from file `%s'\n"
 msgstr "Không thể tạo tài khoản người dùng:"
 
-#: src/gns/gnunet-gns-proxy.c:2372
+#: src/gns/gnunet-gns-proxy.c:2009
 #, fuzzy, c-format
 msgid "Unable to import certificate %s\n"
 msgstr "Không thể lưu tập tin cấu hình « %s »:"
 
-#: src/gns/gnunet-gns-proxy.c:2637 src/namestore/gnunet-namestore-fcfsd.c:958
-#, fuzzy
-msgid "Failed to start HTTP server\n"
+#: src/gns/gnunet-gns-proxy.c:2178
+#, fuzzy, c-format
+msgid "Failed to start HTTPS server for `%s'\n"
 msgstr "Lỗi bắt đầu thu thập.\n"
 
-#: src/gns/gnunet-gns-proxy.c:3020
+#: src/gns/gnunet-gns-proxy.c:2197
+#, fuzzy
+msgid "Failed to pass client to MHD\n"
+msgstr "Lỗi kết nối đến gnunetd.\n"
+
+#: src/gns/gnunet-gns-proxy.c:2505
+#, fuzzy, c-format
+msgid "Unsupported socks version %d\n"
+msgstr "Lệnh không được hỗ trợ « %s ». Đang hủy bỏ.\n"
+
+#: src/gns/gnunet-gns-proxy.c:2534
+#, fuzzy, c-format
+msgid "Unsupported socks command %d\n"
+msgstr "Lệnh không được hỗ trợ « %s ». Đang hủy bỏ.\n"
+
+#: src/gns/gnunet-gns-proxy.c:2616
+#, fuzzy, c-format
+msgid "Unsupported socks address type %d\n"
+msgstr "Lệnh không được hỗ trợ « %s ». Đang hủy bỏ.\n"
+
+#: src/gns/gnunet-gns-proxy.c:2955
 msgid "No ego configured for `shorten-zone`\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:3060
-msgid "No ego configured for `master-zone`\n"
+#: src/gns/gnunet-gns-proxy.c:2995
+#, c-format
+msgid "No ego configured for `%s`\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:3120
+#: src/gns/gnunet-gns-proxy.c:3057
 #, fuzzy, c-format
 msgid "Failed to load SSL/TLS key and certificate from `%s'\n"
 msgstr "Lỗi đọc danh sách bạn bè từ « %s »\n"
 
-#: src/gns/gnunet-gns-proxy.c:3156
+#: src/gns/gnunet-gns-proxy.c:3098
 msgid "listen on specified port (default: 7777)"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:3159
+#: src/gns/gnunet-gns-proxy.c:3101
 msgid "pem file to use as CA"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:3178
+#: src/gns/gnunet-gns-proxy.c:3120
 msgid "GNUnet GNS proxy"
 msgstr ""
 
-#: src/gns/gnunet-service-gns.c:649
+#: src/gns/gnunet-service-gns.c:860
 #, fuzzy
 msgid "Failed to connect to the namestore!\n"
 msgstr "Không kết nối được đến trình nền gnunetd."
 
-#: src/gns/gnunet-service-gns.c:692
+#: src/gns/gnunet-service-gns.c:868
+#, fuzzy
+msgid "Failed to connect to the namecache!\n"
+msgstr "Không kết nối được đến trình nền gnunetd."
+
+#: src/gns/gnunet-service-gns.c:901
 #, fuzzy
 msgid "Could not connect to DHT!\n"
 msgstr "Không thể kết nối tới %s:%u: %s\n"
 
-#: src/gns/gnunet-service-gns.c:708
+#: src/gns/gnunet-service-gns.c:917
 #, fuzzy
 msgid "valid public key required"
 msgstr "Đối số không hợp lệ cho « %s ».\n"
 
-#: src/gns/gnunet-service-gns_interceptor.c:201
+#: src/gns/gnunet-service-gns_interceptor.c:263
 #, fuzzy
 msgid "Error converting GNS response to DNS response!\n"
 msgstr "Gặp lỗi khi chuyển đổi các đối số sang URI.\n"
 
-#: src/gns/gnunet-service-gns_interceptor.c:307
+#: src/gns/gnunet-service-gns_interceptor.c:369
 #, fuzzy
 msgid "Failed to connect to the DNS service!\n"
 msgstr "Lỗi kết nối đến gnunetd.\n"
 
-#: src/gns/gnunet-service-gns_resolver.c:717
+#: src/gns/gnunet-service-gns_resolver.c:771
 #, fuzzy
 msgid "Failed to parse DNS response\n"
 msgstr "Lỗi mở tập tin ghi sự kiện « %s »: %s\n"
 
-#: src/gns/gnunet-service-gns_resolver.c:843
+#: src/gns/gnunet-service-gns_resolver.c:913
 #, c-format
 msgid "Skipping record of unsupported type %d\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns_resolver.c:1475
+#: src/gns/gnunet-service-gns_resolver.c:1646
 #, c-format
 msgid "GNS lookup resulted in DNS name that is too long (`%s')\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns_resolver.c:1499
+#: src/gns/gnunet-service-gns_resolver.c:1686
 msgid "GNS lookup recursion failed (no delegation record found)\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns_resolver.c:1523
+#: src/gns/gnunet-service-gns_resolver.c:1710
 #, fuzzy, c-format
 msgid "Failed to cache GNS resolution: %s\n"
 msgstr "Lỗi mở tập tin ghi sự kiện « %s »: %s\n"
 
-#: src/gns/gnunet-service-gns_resolver.c:1782
+#: src/gns/gnunet-service-gns_resolver.c:1932
+#, c-format
+msgid "Zone %s was revoked, resolution fails\n"
+msgstr ""
+
+#: src/gns/gnunet-service-gns_resolver.c:2054
 #, c-format
 msgid "Hostname `%s' is not well-formed, resolution fails\n"
 msgstr ""
 
+#: src/gns/plugin_gnsrecord_gns.c:142
+#, fuzzy, c-format
+msgid "Unable to parse PKEY record `%s'\n"
+msgstr "Lỗi đọc danh sách bạn bè từ « %s »\n"
+
+#: src/gns/plugin_gnsrecord_gns.c:172
+#, fuzzy, c-format
+msgid "Failed to serialize GNS2DNS record with value `%s'\n"
+msgstr "Không thể truy cập đến tập tin gnunet-directory « %s »\n"
+
+#: src/gns/plugin_gnsrecord_gns.c:186
+#, fuzzy, c-format
+msgid "Unable to parse VPN record string `%s'\n"
+msgstr "Lỗi đọc danh sách bạn bè từ « %s »\n"
+
+#: src/gnsrecord/plugin_gnsrecord_dns.c:261
+#, fuzzy, c-format
+msgid "Unable to parse IPv4 address `%s'\n"
+msgstr "Mức ưu tiên tiến trình không hợp lê « %s ».\n"
+
+#: src/gnsrecord/plugin_gnsrecord_dns.c:282
+#, fuzzy, c-format
+msgid "Failed to serialize NS record with value `%s'\n"
+msgstr "Không thể truy cập đến tập tin gnunet-directory « %s »\n"
+
+#: src/gnsrecord/plugin_gnsrecord_dns.c:304
+#, fuzzy, c-format
+msgid "Failed to serialize CNAME record with value `%s'\n"
+msgstr "Không thể truy cập đến tập tin gnunet-directory « %s »\n"
+
+#: src/gnsrecord/plugin_gnsrecord_dns.c:332
+#, fuzzy, c-format
+msgid "Unable to parse SOA record `%s'\n"
+msgstr "Lỗi đọc danh sách bạn bè từ « %s »\n"
+
+#: src/gnsrecord/plugin_gnsrecord_dns.c:351
+#, fuzzy, c-format
+msgid "Failed to serialize SOA record with mname `%s' and rname `%s'\n"
+msgstr "Không thể truy cập đến tập tin gnunet-directory « %s »\n"
+
+#: src/gnsrecord/plugin_gnsrecord_dns.c:374
+#, fuzzy, c-format
+msgid "Failed to serialize PTR record with value `%s'\n"
+msgstr "Không thể truy cập đến tập tin gnunet-directory « %s »\n"
+
+#: src/gnsrecord/plugin_gnsrecord_dns.c:394
+#, fuzzy, c-format
+msgid "Unable to parse MX record `%s'\n"
+msgstr "Lỗi đọc danh sách bạn bè từ « %s »\n"
+
+#: src/gnsrecord/plugin_gnsrecord_dns.c:409
+#, fuzzy, c-format
+msgid "Failed to serialize MX record with hostname `%s'\n"
+msgstr "Không thể truy cập đến tập tin gnunet-directory « %s »\n"
+
+#: src/gnsrecord/plugin_gnsrecord_dns.c:429
+#, fuzzy, c-format
+msgid "Unable to parse IPv6 address `%s'\n"
+msgstr "Mức ưu tiên tiến trình không hợp lê « %s ».\n"
+
+#: src/gnsrecord/plugin_gnsrecord_dns.c:447
+#, fuzzy, c-format
+msgid "Unable to parse TLSA record string `%s'\n"
+msgstr "Lỗi đọc danh sách bạn bè từ « %s »\n"
+
 #: src/hello/gnunet-hello.c:123
 msgid "Call with name of HELLO file to modify.\n"
 msgstr ""
@@ -3685,37 +4188,37 @@ msgstr "Gặp lỗi khi tạo người dùng"
 msgid "Modified %u addresses \n"
 msgstr ""
 
-#: src/hello/hello.c:947
+#: src/hello/hello.c:943
 #, fuzzy
 msgid "Failed to parse HELLO message: missing expiration time\n"
 msgstr "Lỗi lưu cấu hình."
 
-#: src/hello/hello.c:956
+#: src/hello/hello.c:952
 #, fuzzy
 msgid "Failed to parse HELLO message: invalid expiration time\n"
 msgstr "Lỗi lưu cấu hình."
 
-#: src/hello/hello.c:966
+#: src/hello/hello.c:962
 #, fuzzy
 msgid "Failed to parse HELLO message: malformed\n"
 msgstr "Lỗi đọc danh sách bạn bè từ « %s »\n"
 
-#: src/hello/hello.c:976
+#: src/hello/hello.c:972
 #, fuzzy
 msgid "Failed to parse HELLO message: missing transport plugin\n"
 msgstr "Không thể nạp phần bổ sung truyền tải « %s »\n"
 
-#: src/hello/hello.c:993
+#: src/hello/hello.c:989
 #, c-format
 msgid "Plugin `%s' not found\n"
 msgstr ""
 
-#: src/hello/hello.c:1002
+#: src/hello/hello.c:998
 #, c-format
 msgid "Plugin `%s' does not support URIs yet\n"
 msgstr ""
 
-#: src/hello/hello.c:1021
+#: src/hello/hello.c:1017
 #, fuzzy, c-format
 msgid "Failed to parse `%s' as an address for plugin `%s'\n"
 msgstr "Lỗi đóng kết đến cổng %s %d.\n"
@@ -3909,10 +4412,10 @@ msgid "expired addresses encountered"
 msgstr ""
 
 #: src/hostlist/hostlist-server.c:189 src/hostlist/hostlist-server.c:424
-#: src/peerinfo-tool/gnunet-peerinfo.c:358
-#: src/peerinfo-tool/gnunet-peerinfo.c:428
-#: src/peerinfo-tool/gnunet-peerinfo.c:499
-#: src/topology/gnunet-daemon-topology.c:918
+#: src/peerinfo-tool/gnunet-peerinfo.c:350
+#: src/peerinfo-tool/gnunet-peerinfo.c:419
+#: src/peerinfo-tool/gnunet-peerinfo.c:490
+#: src/topology/gnunet-daemon-topology.c:924
 #, fuzzy, c-format
 msgid "Error in communication with PEERINFO service: %s\n"
 msgstr "Cổng để liên lạc với giao diện người dùng GNUnet"
@@ -3973,8 +4476,8 @@ msgstr "# Các quảng cáo ngoại được chuyển tiếp"
 msgid "Advertisement message could not be queued by core\n"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:560 src/peerinfo-tool/gnunet-peerinfo.c:659
-#: src/transport/gnunet-service-transport.c:806
+#: src/hostlist/hostlist-server.c:560 src/peerinfo-tool/gnunet-peerinfo.c:651
+#: src/transport/gnunet-service-transport.c:790
 #, 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"
@@ -4091,56 +4594,55 @@ msgstr "Không thể lưu tập tin cấu hình « %s »:"
 msgid "Failed to create directory `%s' for storing egos\n"
 msgstr "Lỗi đọc danh sách bạn bè từ « %s »\n"
 
-#: src/integration-tests/connection_watchdog.c:998
+#: src/integration-tests/connection_watchdog.c:1012
 #, fuzzy, c-format
 msgid "Transport plugin: `%s' port %llu\n"
 msgstr "Đang nạp các truyền tải « %s »\n"
 
-#: src/integration-tests/connection_watchdog.c:1031
+#: src/integration-tests/connection_watchdog.c:1045
 #, fuzzy, c-format
 msgid "Found %u transport plugins: `%s'\n"
 msgstr "Đang nạp các truyền tải « %s »\n"
 
-#: src/integration-tests/connection_watchdog.c:1091
+#: src/integration-tests/connection_watchdog.c:1105
 msgid "Send ping messages to test connectivity (default == NO)"
 msgstr ""
 
-#: src/integration-tests/connection_watchdog.c:1100
-#: src/multicast/gnunet-multicast.c:70 src/template/gnunet-template.c:70
-msgid "help text"
-msgstr ""
+#: src/mesh/gnunet-mesh.c:146
+#, fuzzy, c-format
+msgid "Invalid tunnel owner `%s'\n"
+msgstr "Địa chỉ IP định dạng sai: %s\n"
 
-#: src/mesh/gnunet-mesh.c:205
+#: src/mesh/gnunet-mesh.c:209
 #, fuzzy
 msgid "provide information about all tunnels (continuously) NOT IMPLEMENTED"
 msgstr "In ra thông tin về các đồng đẳng GNUnet."
 
-#: src/mesh/gnunet-mesh.c:208
+#: src/mesh/gnunet-mesh.c:212
 #, fuzzy
 msgid "provide information about a particular tunnel"
 msgstr "In ra thông tin về các đồng đẳng GNUnet."
 
-#: src/mesh/gnunet-mesh.c:218
+#: src/mesh/gnunet-mesh.c:222
 #, fuzzy
 msgid "Print information about mesh tunnels and peers."
 msgstr "In ra thông tin về các đồng đẳng GNUnet."
 
-#: src/mesh/gnunet-service-mesh.c:5634 src/mesh/gnunet-service-mesh-enc.c:7060
+#: src/mesh/gnunet-service-mesh.c:5633 src/mesh/gnunet-service-mesh_peer.c:350
 msgid "Wrong CORE service\n"
 msgstr ""
 
-#: src/mesh/gnunet-service-mesh.c:5774 src/mesh/gnunet-service-mesh.c:5786
-#: src/mesh/gnunet-service-mesh.c:5798 src/mesh/gnunet-service-mesh.c:5810
-#: src/mesh/gnunet-service-mesh.c:5822 src/mesh/gnunet-service-mesh.c:5834
-#: src/nse/gnunet-service-nse.c:1440 src/nse/gnunet-service-nse.c:1458
+#: src/mesh/gnunet-service-mesh.c:5773 src/mesh/gnunet-service-mesh.c:5785
+#: src/mesh/gnunet-service-mesh.c:5797 src/mesh/gnunet-service-mesh.c:5809
+#: src/mesh/gnunet-service-mesh.c:5821 src/mesh/gnunet-service-mesh.c:5833
 #: src/regex/gnunet-daemon-regexprofiler.c:270
 #: src/regex/gnunet-regex-simulation-profiler.c:659
 #, fuzzy, c-format
 msgid "%s service is lacking key configuration settings (%s).  Exiting.\n"
 msgstr "Lưu cấu hình ngay bây giờ không?"
 
-#: src/mesh/gnunet-service-mesh.c:5846 src/mesh/gnunet-service-mesh.c:5856
-#: src/mesh/gnunet-service-mesh.c:5881
+#: src/mesh/gnunet-service-mesh.c:5845 src/mesh/gnunet-service-mesh.c:5855
+#: src/mesh/gnunet-service-mesh.c:5880
 #, fuzzy, c-format
 msgid ""
 "%s service is lacking key configuration settings (%s). Using default (%u).\n"
@@ -4156,240 +4658,231 @@ msgstr "Đang thử dùng tập tin « %s » cho cấu hình MySQL.\n"
 msgid "Could not access file `%s': %s\n"
 msgstr "Không thể truy cập đến « %s »: %s\n"
 
-#: src/namestore/gnunet-namestore.c:258
+#: src/namecache/gnunet-namecache.c:109
+#, fuzzy, c-format
+msgid "No records found for `%s'"
+msgstr "Vẫn còn không tìm thấy đồng đẳng trong « %s ».\n"
+
+#: src/namecache/gnunet-namecache.c:124 src/namestore/gnunet-namestore.c:367
+#, c-format
+msgid "\tCorrupt or unsupported record of type %u\n"
+msgstr ""
+
+#: src/namecache/gnunet-namecache.c:185 src/namestore/gnunet-namestore.c:777
+#, fuzzy, c-format
+msgid "You must specify which zone should be accessed\n"
+msgstr "chỉ ra TRUYỀN_TẢI nào cần được thử nghiệm"
+
+#: src/namecache/gnunet-namecache.c:195 src/namestore/gnunet-namestore.c:665
+#, fuzzy, c-format
+msgid "Invalid public key for reverse lookup `%s'\n"
+msgstr "Đối số không hợp lệ cho « %s ».\n"
+
+#: src/namecache/gnunet-namecache.c:226 src/namestore/gnunet-namestore.c:821
+msgid "name of the record to add/delete/display"
+msgstr ""
+
+#: src/namecache/gnunet-namecache.c:229
+#, fuzzy
+msgid "spezifies the public key of the zone to look in"
+msgstr "xác định mức ưu tiên của nội dung"
+
+#: src/namecache/gnunet-namecache.c:240 src/namestore/gnunet-namestore.c:853
+#, fuzzy
+msgid "GNUnet zone manipulation tool"
+msgstr "Cấu hình GNUnet"
+
+#: src/namecache/namecache_api.c:276
+msgid "Namecache failed to cache block"
+msgstr ""
+
+#: src/namecache/plugin_namecache_postgres.c:89
+#: src/namestore/plugin_namestore_postgres.c:93
+#, fuzzy
+msgid "Failed to create indices\n"
+msgstr "Không thể tạo miền tên.\n"
+
+#: src/namestore/gnunet-namestore.c:278
 #, fuzzy, c-format
 msgid "Adding record failed: %s\n"
 msgstr "Gặp lỗi khi tải lên tập tin: %s\n"
 
-#: src/namestore/gnunet-namestore.c:289
+#: src/namestore/gnunet-namestore.c:306
 #, fuzzy, c-format
-msgid "Deleting record failed: %s\n"
+msgid "Deleting record failed, record does not exist%s%s\n"
 msgstr "Gặp lỗi khi tải lên tập tin: %s\n"
 
-#: src/namestore/gnunet-namestore.c:338
-#, c-format
-msgid "\tCorrupt or unsupported record of type %u\n"
-msgstr ""
+#: src/namestore/gnunet-namestore.c:313
+#, fuzzy, c-format
+msgid "Deleting record failed%s%s\n"
+msgstr "Gặp lỗi khi tải lên tập tin: %s\n"
 
-#: src/namestore/gnunet-namestore.c:446
+#: src/namestore/gnunet-namestore.c:528
 #, fuzzy, c-format
 msgid "No options given\n"
 msgstr "chưa đưa ra tên"
 
-#: src/namestore/gnunet-namestore.c:456
-#: src/namestore/gnunet-namestore-fcfsd.c:992
+#: src/namestore/gnunet-namestore.c:539
+#: src/namestore/gnunet-namestore-fcfsd.c:964
 #, fuzzy
 msgid "Failed to connect to namestore\n"
 msgstr "Không kết nối được đến trình nền gnunetd."
 
-#: src/namestore/gnunet-namestore.c:464 src/namestore/gnunet-namestore.c:473
-#: src/namestore/gnunet-namestore.c:490 src/namestore/gnunet-namestore.c:512
-#: src/namestore/gnunet-namestore.c:554
+#: src/namestore/gnunet-namestore.c:547 src/namestore/gnunet-namestore.c:556
+#: src/namestore/gnunet-namestore.c:573 src/namestore/gnunet-namestore.c:595
+#: src/namestore/gnunet-namestore.c:635
 #, fuzzy, c-format
 msgid "Missing option `%s' for operation `%s'\n"
 msgstr "Giá trị cấu hình « %s » cho « %s » trong phần « %s » nên là con số\n"
 
-#: src/namestore/gnunet-namestore.c:465 src/namestore/gnunet-namestore.c:474
-#: src/namestore/gnunet-namestore.c:491 src/namestore/gnunet-namestore.c:513
+#: src/namestore/gnunet-namestore.c:548 src/namestore/gnunet-namestore.c:557
+#: src/namestore/gnunet-namestore.c:574 src/namestore/gnunet-namestore.c:596
 msgid "add"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:482
+#: src/namestore/gnunet-namestore.c:565
 #, fuzzy, c-format
 msgid "Unsupported type `%s'\n"
 msgstr "Lệnh không được hỗ trợ « %s ». Đang hủy bỏ.\n"
 
-#: src/namestore/gnunet-namestore.c:502
+#: src/namestore/gnunet-namestore.c:585
 #, c-format
 msgid "Value `%s' invalid for record type `%s'\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:538
+#: src/namestore/gnunet-namestore.c:621
 #, fuzzy, c-format
 msgid "Invalid time format `%s'\n"
 msgstr "Địa chỉ IP định dạng sai: %s\n"
 
-#: src/namestore/gnunet-namestore.c:555
+#: src/namestore/gnunet-namestore.c:636
 msgid "del"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:588
-#: src/peerinfo-tool/gnunet-peerinfo.c:711
+#: src/namestore/gnunet-namestore.c:689
+#: src/peerinfo-tool/gnunet-peerinfo.c:703
 #, fuzzy, c-format
 msgid "Invalid URI `%s'\n"
 msgstr "Dữ liệu nhập không hợp lệ.\n"
 
-#: src/namestore/gnunet-namestore.c:645
+#: src/namestore/gnunet-namestore.c:747
 #, c-format
 msgid "Ego `%s' not known to identity service\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:674
-#, fuzzy, c-format
-msgid "You must specify which zone should be accessed\n"
-msgstr "chỉ ra TRUYỀN_TẢI nào cần được thử nghiệm"
-
-#: src/namestore/gnunet-namestore.c:702
+#: src/namestore/gnunet-namestore.c:806
 msgid "add record"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:705
+#: src/namestore/gnunet-namestore.c:809
 msgid "delete record"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:708
+#: src/namestore/gnunet-namestore.c:812
 msgid "display records"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:711
+#: src/namestore/gnunet-namestore.c:815
 msgid ""
 "expiration time for record to use (for adding only), \"never\" is possible"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:714
+#: src/namestore/gnunet-namestore.c:818
 #, fuzzy
 msgid "monitor changes in the namestore"
 msgstr "Không kết nối được đến trình nền gnunetd."
 
-#: src/namestore/gnunet-namestore.c:717
-msgid "name of the record to add/delete/display"
-msgstr ""
+#: src/namestore/gnunet-namestore.c:824
+#, fuzzy
+msgid "determine our name for the given PKEY"
+msgstr "In ra thông tin về các đồng đẳng GNUnet."
 
-#: src/namestore/gnunet-namestore.c:720
+#: src/namestore/gnunet-namestore.c:827
 msgid "type of the record to add/delete/display"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:723
+#: src/namestore/gnunet-namestore.c:830
 msgid "URI to import into our zone"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:726
+#: src/namestore/gnunet-namestore.c:833
 msgid "value of the record to add/delete"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:729
+#: src/namestore/gnunet-namestore.c:836
 msgid "create or list public record"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:732
+#: src/namestore/gnunet-namestore.c:839
 msgid ""
 "create shadow record (only valid if all other records of the same type have "
 "expired"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:735
+#: src/namestore/gnunet-namestore.c:842
 msgid "name of the ego controlling the zone"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:746
-#, fuzzy
-msgid "GNUnet zone manipulation tool"
-msgstr "Cấu hình GNUnet"
-
-#: src/namestore/gnunet-namestore-fcfsd.c:456
+#: src/namestore/gnunet-namestore-fcfsd.c:462
 #, fuzzy, c-format
 msgid "Unsupported form value `%s'\n"
 msgstr "Lệnh không được hỗ trợ « %s ». Đang hủy bỏ.\n"
 
-#: src/namestore/gnunet-namestore-fcfsd.c:485
+#: src/namestore/gnunet-namestore-fcfsd.c:489
 #, fuzzy, c-format
 msgid "Failed to create record for domain `%s': %s\n"
 msgstr "Không thể truy cập đến tập tin gnunet-directory « %s »\n"
 
-#: src/namestore/gnunet-namestore-fcfsd.c:520
+#: src/namestore/gnunet-namestore-fcfsd.c:524
 #, c-format
 msgid "Found existing name `%s' for the given key\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:560
+#: src/namestore/gnunet-namestore-fcfsd.c:590
 #, c-format
 msgid "Found %u existing records for domain `%s'\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:670
+#: src/namestore/gnunet-namestore-fcfsd.c:646
 #, fuzzy, c-format
 msgid "Failed to create page for `%s'\n"
 msgstr "Không thể tạo miền tên.\n"
 
-#: src/namestore/gnunet-namestore-fcfsd.c:686
+#: src/namestore/gnunet-namestore-fcfsd.c:662
 #, fuzzy, c-format
 msgid "Failed to setup post processor for `%s'\n"
 msgstr "Lỗi cập nhật dữ liệu cho mô-đun « %s »\n"
 
-#: src/namestore/gnunet-namestore-fcfsd.c:722
+#: src/namestore/gnunet-namestore-fcfsd.c:698
 msgid "Domain name must not contain `.'\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:730
+#: src/namestore/gnunet-namestore-fcfsd.c:706
 msgid "Domain name must not contain `+'\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:932
+#: src/namestore/gnunet-namestore-fcfsd.c:904
 msgid "No ego configured for `fcfsd` subsystem\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:1027
-msgid "GNU Name System First Come First Serve name registration service"
-msgstr ""
+#: src/namestore/gnunet-namestore-fcfsd.c:930
+#, fuzzy
+msgid "Failed to start HTTP server\n"
+msgstr "Lỗi bắt đầu thu thập.\n"
 
-#: src/namestore/gnunet-service-namestore.c:674
-msgid "Failed to cache encrypted block of my own zone!\n"
+#: src/namestore/gnunet-namestore-fcfsd.c:999
+msgid "GNU Name System First Come First Serve name registration service"
 msgstr ""
 
-#: src/namestore/namestore_api.c:319
-msgid "Namestore failed to cache block"
-msgstr ""
+#: src/namestore/gnunet-service-namestore.c:494
+#, fuzzy, c-format
+msgid "Failed to replicate block in namecache: %s\n"
+msgstr "Lỗi cập nhật dữ liệu cho mô-đun « %s »\n"
 
-#: src/namestore/namestore_api.c:345
+#: src/namestore/namestore_api.c:273
 msgid "Namestore failed to store record\n"
 msgstr ""
 
-#: src/namestore/namestore_api_common.c:691
-#: src/namestore/namestore_api_common.c:831
-#, fuzzy, c-format
-msgid "Unsupported record type %d\n"
-msgstr "Lệnh không được hỗ trợ « %s ». Đang hủy bỏ.\n"
-
-#: src/namestore/namestore_api_common.c:698
-#, fuzzy, c-format
-msgid "Unable to parse IPv4 address `%s'\n"
-msgstr "Mức ưu tiên tiến trình không hợp lê « %s ».\n"
-
-#: src/namestore/namestore_api_common.c:721
-#, fuzzy, c-format
-msgid "Unable to parse SOA record `%s'\n"
-msgstr "Lỗi đọc danh sách bạn bè từ « %s »\n"
-
-#: src/namestore/namestore_api_common.c:744
-#, fuzzy, c-format
-msgid "Unable to parse MX record `%s'\n"
-msgstr "Lỗi đọc danh sách bạn bè từ « %s »\n"
-
-#: src/namestore/namestore_api_common.c:762
-#, fuzzy, c-format
-msgid "Unable to parse IPv6 address `%s'\n"
-msgstr "Mức ưu tiên tiến trình không hợp lê « %s ».\n"
-
-#: src/namestore/namestore_api_common.c:775
-#, fuzzy, c-format
-msgid "Unable to parse PKEY record `%s'\n"
-msgstr "Lỗi đọc danh sách bạn bè từ « %s »\n"
-
-#: src/namestore/namestore_api_common.c:796
-#, fuzzy, c-format
-msgid "Unable to parse VPN record string `%s'\n"
-msgstr "Lỗi đọc danh sách bạn bè từ « %s »\n"
-
-#: src/namestore/namestore_api_common.c:822
-#, fuzzy, c-format
-msgid "Unable to parse TLSA record string `%s'\n"
-msgstr "Lỗi đọc danh sách bạn bè từ « %s »\n"
-
-#: src/namestore/plugin_namestore_postgres.c:95
-#, fuzzy
-msgid "Failed to create indices\n"
-msgstr "Không thể tạo miền tên.\n"
-
 #: src/nat/gnunet-nat-server.c:279
 #, c-format
 msgid "Please pass valid port number as the first argument! (got `%s')\n"
@@ -4502,39 +4995,41 @@ msgstr "Lỗi kết nối đến gnunetd.\n"
 msgid "Failed to create listen socket bound to `%s' for NAT test: %s\n"
 msgstr ""
 
-#: src/nse/gnunet-nse-profiler.c:889
+#: src/nse/gnunet-nse-profiler.c:858
 #, fuzzy
 msgid "limit to the number of connections to NSE services, 0 for none"
 msgstr "Không kết nối được đến trình nền gnunetd."
 
-#: src/nse/gnunet-nse-profiler.c:892
+#: src/nse/gnunet-nse-profiler.c:861
 msgid "name of the file for writing connection information and statistics"
 msgstr ""
 
-#: src/nse/gnunet-nse-profiler.c:895 src/testbed/gnunet-testbed-profiler.c:287
+#: src/nse/gnunet-nse-profiler.c:864 src/testbed/gnunet-testbed-profiler.c:306
 msgid "name of the file with the login information for the testbed"
 msgstr ""
 
-#: src/nse/gnunet-nse-profiler.c:898
+#: src/nse/gnunet-nse-profiler.c:867
 msgid "name of the file for writing the main results"
 msgstr ""
 
-#: src/nse/gnunet-nse-profiler.c:901
+#: src/nse/gnunet-nse-profiler.c:870
 msgid "Number of peers to run in each round, separated by commas"
 msgstr ""
 
-#: src/nse/gnunet-nse-profiler.c:907
+#: src/nse/gnunet-nse-profiler.c:876
 msgid "delay between rounds"
 msgstr ""
 
-#: src/nse/gnunet-nse-profiler.c:916
+#: src/nse/gnunet-nse-profiler.c:885
 #, fuzzy
 msgid "Measure quality and performance of the NSE service."
 msgstr "Không thể truy cập đến dịch vụ"
 
-#: src/nse/gnunet-service-nse.c:1448
-msgid "Invalid work requirement for NSE service. Exiting.\n"
-msgstr ""
+#: src/nse/gnunet-service-nse.c:1460
+#: src/revocation/gnunet-service-revocation.c:580
+#, fuzzy
+msgid "Value is too large.\n"
+msgstr "Giá trị không nằm trong phạm vi được phép."
 
 #: src/nse/gnunet-service-nse.c:1487
 msgid "NSE service is lacking key configuration settings.  Exiting.\n"
@@ -4545,21 +5040,21 @@ msgstr ""
 msgid "Removing expired address of transport `%s'\n"
 msgstr "Đã nạp truyền tải « %s »\n"
 
-#: src/peerinfo/gnunet-service-peerinfo.c:353
+#: src/peerinfo/gnunet-service-peerinfo.c:352
 #, fuzzy, c-format
 msgid "Failed to parse HELLO in file `%s': %s\n"
 msgstr "Lỗi đọc danh sách bạn bè từ « %s »\n"
 
-#: src/peerinfo/gnunet-service-peerinfo.c:370
+#: src/peerinfo/gnunet-service-peerinfo.c:369
 #, fuzzy, c-format
 msgid "Failed to parse HELLO in file `%s': %s %u \n"
 msgstr "Lỗi đọc danh sách bạn bè từ « %s »\n"
 
-#: src/peerinfo/gnunet-service-peerinfo.c:448
+#: src/peerinfo/gnunet-service-peerinfo.c:447
 msgid "# peers known"
 msgstr ""
 
-#: src/peerinfo/gnunet-service-peerinfo.c:484
+#: src/peerinfo/gnunet-service-peerinfo.c:483
 #, c-format
 msgid ""
 "File `%s' in directory `%s' does not match naming convention. Removed.\n"
@@ -4567,145 +5062,145 @@ msgstr ""
 "Tập tin « %s » trong thư mục « %s » không tùy theo quy ước đặt tên. Bị gỡ "
 "bỏ.\n"
 
-#: src/peerinfo/gnunet-service-peerinfo.c:637
+#: src/peerinfo/gnunet-service-peerinfo.c:638
 #, fuzzy, c-format
 msgid "Scanning directory `%s'\n"
 msgstr "Lỗi đọc danh sách bạn bè từ « %s »\n"
 
-#: src/peerinfo/gnunet-service-peerinfo.c:642
+#: src/peerinfo/gnunet-service-peerinfo.c:643
 #, c-format
 msgid "Still no peers found in `%s'!\n"
 msgstr "Vẫn còn không tìm thấy đồng đẳng trong « %s ».\n"
 
-#: src/peerinfo/gnunet-service-peerinfo.c:975
+#: src/peerinfo/gnunet-service-peerinfo.c:979
 #, fuzzy, c-format
 msgid "Cleaning up directory `%s'\n"
 msgstr "Lỗi đọc danh sách bạn bè từ « %s »\n"
 
-#: src/peerinfo/gnunet-service-peerinfo.c:1265
+#: src/peerinfo/gnunet-service-peerinfo.c:1269
 #, c-format
 msgid "Importing HELLOs from `%s'\n"
 msgstr ""
 
-#: src/peerinfo/peerinfo_api.c:239
+#: src/peerinfo/peerinfo_api.c:236
 msgid "aborted due to explicit disconnect request"
 msgstr ""
 
-#: src/peerinfo/peerinfo_api.c:359
+#: src/peerinfo/peerinfo_api.c:356
 #, fuzzy
 msgid "failed to transmit request (service down?)"
 msgstr "Lỗi đọc danh sách bạn bè từ « %s »\n"
 
-#: src/peerinfo/peerinfo_api.c:509
+#: src/peerinfo/peerinfo_api.c:506
 #, fuzzy
 msgid "Failed to receive response from `PEERINFO' service."
 msgstr ""
 "\n"
 "Không nhận được đáp ứng từ gnunetd.\n"
 
-#: src/peerinfo/peerinfo_api.c:550 src/peerinfo/peerinfo_api.c:569
-#: src/peerinfo/peerinfo_api.c:584 src/peerinfo/peerinfo_api.c:595
-#: src/peerinfo/peerinfo_api.c:606
+#: src/peerinfo/peerinfo_api.c:547 src/peerinfo/peerinfo_api.c:566
+#: src/peerinfo/peerinfo_api.c:581 src/peerinfo/peerinfo_api.c:592
+#: src/peerinfo/peerinfo_api.c:603
 #, fuzzy
 msgid "Received invalid message from `PEERINFO' service."
 msgstr ""
 "\n"
 "Không nhận được đáp ứng từ gnunetd.\n"
 
-#: src/peerinfo/peerinfo_api.c:681
+#: src/peerinfo/peerinfo_api.c:678
 #, fuzzy
 msgid "Timeout transmitting iteration request to `PEERINFO' service."
 msgstr "Lỗi sơ khởi dịch vụ « %s ».\n"
 
-#: src/peerinfo/peerinfo_api_notify.c:269
+#: src/peerinfo/peerinfo_api_notify.c:268
 #, fuzzy, c-format
 msgid "Could not connect to `%s' service.\n"
 msgstr "Không thể kết nối tới %s:%u: %s\n"
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:239
+#: src/peerinfo-tool/gnunet-peerinfo.c:232
 #, fuzzy, c-format
 msgid "%sPeer `%s'\n"
 msgstr "Tôi là đồng đẳng « %s ».\n"
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:246
+#: src/peerinfo-tool/gnunet-peerinfo.c:239
 #, c-format
 msgid "\tExpires: %s \t %s\n"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:437
+#: src/peerinfo-tool/gnunet-peerinfo.c:428
 #, fuzzy, c-format
 msgid "Failure: Did not receive %s\n"
 msgstr "Lỗi mở tập tin ghi sự kiện « %s »: %s\n"
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:445
+#: src/peerinfo-tool/gnunet-peerinfo.c:436
 #, c-format
 msgid "Failure: Received invalid %s\n"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:454
+#: src/peerinfo-tool/gnunet-peerinfo.c:445
 #, fuzzy, c-format
 msgid "Failed to write HELLO with %u bytes to file `%s'\n"
 msgstr "Lỗi đọc danh sách bạn bè từ « %s »\n"
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:467
+#: src/peerinfo-tool/gnunet-peerinfo.c:458
 #, c-format
 msgid "Wrote %s HELLO containing %u addresses with %u bytes to file `%s'\n"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:531
+#: src/peerinfo-tool/gnunet-peerinfo.c:522
 #, c-format
 msgid "Failure adding HELLO: %s\n"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:669
+#: src/peerinfo-tool/gnunet-peerinfo.c:661
 #, fuzzy, c-format
 msgid "Could not find option `%s:%s' in configuration.\n"
 msgstr "Không tìm thấy phương pháp « %s%s » trong thư viện « %s ».\n"
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:675
+#: src/peerinfo-tool/gnunet-peerinfo.c:667
 #, c-format
 msgid "Loading hostkey from `%s' failed.\n"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:734
+#: src/peerinfo-tool/gnunet-peerinfo.c:725
 #, c-format
 msgid "I am peer `%s'.\n"
 msgstr "Tôi là đồng đẳng « %s ».\n"
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:777
+#: src/peerinfo-tool/gnunet-peerinfo.c:769
 msgid "don't resolve host names"
 msgstr "không quyết định các tên máy"
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:780
+#: src/peerinfo-tool/gnunet-peerinfo.c:772
 msgid "output only the identity strings"
 msgstr "chỉ xuất những chuỗi nhận diện"
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:783
+#: src/peerinfo-tool/gnunet-peerinfo.c:775
 msgid "include friend-only information"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:786
+#: src/peerinfo-tool/gnunet-peerinfo.c:778
 msgid "output our own identity only"
 msgstr "chỉ xuất nhận diện mình"
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:789
+#: src/peerinfo-tool/gnunet-peerinfo.c:781
 #, fuzzy
 msgid "list all known peers"
 msgstr "liệt kê mọi bộ tiếp hợp mạng"
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:792
+#: src/peerinfo-tool/gnunet-peerinfo.c:784
 msgid "dump hello to file"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:795
+#: src/peerinfo-tool/gnunet-peerinfo.c:787
 msgid "also output HELLO uri(s)"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:798
+#: src/peerinfo-tool/gnunet-peerinfo.c:790
 msgid "add given HELLO uri to the database"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:809
+#: src/peerinfo-tool/gnunet-peerinfo.c:801
 #, fuzzy
 msgid "Print information about peers."
 msgstr "In ra thông tin về các đồng đẳng GNUnet."
@@ -4738,89 +5233,84 @@ msgstr "« %s » bị lỗi tại %s:%d với lỗi: %s"
 msgid "Unable to initialize Postgres: %s"
 msgstr "Không thể sơ khởi SQLite: %s.\n"
 
-#: src/psycstore/gnunet-service-psycstore.c:203
+#: src/psycstore/gnunet-service-psycstore.c:200
 #, fuzzy
 msgid "Failed to store membership information!\n"
 msgstr "Lỗi mở tập tin ghi sự kiện « %s »: %s\n"
 
-#: src/psycstore/gnunet-service-psycstore.c:227
+#: src/psycstore/gnunet-service-psycstore.c:224
 #, fuzzy
 msgid "Failed to test membership!\n"
 msgstr "Lỗi lấy thông kê về truyền tải.\n"
 
-#: src/psycstore/gnunet-service-psycstore.c:249
+#: src/psycstore/gnunet-service-psycstore.c:246
 #, fuzzy
 msgid "Failed to store fragment!\n"
 msgstr "Lỗi bắt đầu thu thập.\n"
 
-#: src/psycstore/gnunet-service-psycstore.c:275
+#: src/psycstore/gnunet-service-psycstore.c:272
 #, fuzzy
 msgid "Failed to get fragment!\n"
 msgstr "Lỗi lấy thông kê về truyền tải.\n"
 
-#: src/psycstore/gnunet-service-psycstore.c:302
+#: src/psycstore/gnunet-service-psycstore.c:299
 #, fuzzy
 msgid "Failed to get message!\n"
 msgstr "Lỗi lấy thông kê về truyền tải.\n"
 
-#: src/psycstore/gnunet-service-psycstore.c:331
+#: src/psycstore/gnunet-service-psycstore.c:328
 #, fuzzy
 msgid "Failed to get message fragment!\n"
 msgstr "Lỗi đọc danh sách bạn bè từ « %s »\n"
 
-#: src/psycstore/gnunet-service-psycstore.c:357
+#: src/psycstore/gnunet-service-psycstore.c:356
 #, fuzzy
 msgid "Failed to get master counters!\n"
 msgstr "Lỗi lấy thông kê về truyền tải.\n"
 
-#: src/psycstore/gnunet-service-psycstore.c:395
-#, fuzzy
-msgid "Failed to get slave counters!\n"
-msgstr "Lỗi lấy thông kê về truyền tải.\n"
-
-#: src/psycstore/gnunet-service-psycstore.c:429
-#: src/psycstore/gnunet-service-psycstore.c:502
+#: src/psycstore/gnunet-service-psycstore.c:392
+#: src/psycstore/gnunet-service-psycstore.c:465
 msgid "Tried to set invalid state variable name!\n"
 msgstr ""
 
-#: src/psycstore/gnunet-service-psycstore.c:445
+#: src/psycstore/gnunet-service-psycstore.c:408
 #, fuzzy
 msgid "Failed to begin modifying state!\n"
 msgstr "Lỗi bắt đầu thu thập.\n"
 
-#: src/psycstore/gnunet-service-psycstore.c:468
+#: src/psycstore/gnunet-service-psycstore.c:431
 #, fuzzy, c-format
 msgid "Unknown operator: %c\n"
 msgstr "Không rõ thao tác « %s ».\n"
 
-#: src/psycstore/gnunet-service-psycstore.c:478
+#: src/psycstore/gnunet-service-psycstore.c:441
 #, fuzzy
 msgid "Failed to end modifying state!\n"
 msgstr "Lỗi bắt đầu thu thập.\n"
 
-#: src/psycstore/gnunet-service-psycstore.c:516
+#: src/psycstore/gnunet-service-psycstore.c:479
 #, fuzzy
 msgid "Failed to begin synchronizing state!\n"
 msgstr "Lỗi lấy thông kê về truyền tải.\n"
 
-#: src/psycstore/gnunet-service-psycstore.c:532
+#: src/psycstore/gnunet-service-psycstore.c:495
 #, fuzzy
 msgid "Failed to end synchronizing state!\n"
 msgstr "Lỗi lấy thông kê về truyền tải.\n"
 
-#: src/psycstore/gnunet-service-psycstore.c:552
-#: src/psycstore/gnunet-service-psycstore.c:571
+#: src/psycstore/gnunet-service-psycstore.c:515
+#: src/psycstore/gnunet-service-psycstore.c:534
 #, fuzzy
 msgid "Failed to reset state!\n"
 msgstr "Lỗi lấy thông kê về truyền tải.\n"
 
-#: src/psycstore/gnunet-service-psycstore.c:594
-#: src/psycstore/gnunet-service-psycstore.c:645
+#: src/psycstore/gnunet-service-psycstore.c:557
+#: src/psycstore/gnunet-service-psycstore.c:608
 msgid "Tried to get invalid state variable name!\n"
 msgstr ""
 
-#: src/psycstore/gnunet-service-psycstore.c:621
-#: src/psycstore/gnunet-service-psycstore.c:660
+#: src/psycstore/gnunet-service-psycstore.c:584
+#: src/psycstore/gnunet-service-psycstore.c:623
 #, fuzzy
 msgid "Failed to get state variable!\n"
 msgstr "Lỗi lấy thông kê về truyền tải.\n"
@@ -4849,69 +5339,66 @@ msgstr "Gặp lỗi khi tạo người dùng"
 msgid "SQLite database running\n"
 msgstr "kho dữ liệu sqlite"
 
-#: src/pt/gnunet-daemon-pt.c:266
+#: src/pt/gnunet-daemon-pt.c:483
 msgid "Failed to pack DNS request.  Dropping.\n"
 msgstr ""
 
-#: src/pt/gnunet-daemon-pt.c:272
+#: src/pt/gnunet-daemon-pt.c:489
 #, fuzzy
 msgid "# DNS requests mapped to VPN"
 msgstr "# các yêu cầu get (lấy) dht được nhận"
 
-#: src/pt/gnunet-daemon-pt.c:325
+#: src/pt/gnunet-daemon-pt.c:542
 msgid "# DNS records modified"
 msgstr ""
 
-#: src/pt/gnunet-daemon-pt.c:502
+#: src/pt/gnunet-daemon-pt.c:718
 #, fuzzy
 msgid "# DNS replies intercepted"
 msgstr "# các đáp ứng dht được định tuyến"
 
-#: src/pt/gnunet-daemon-pt.c:508
+#: src/pt/gnunet-daemon-pt.c:724
 msgid "Failed to parse DNS request.  Dropping.\n"
 msgstr ""
 
-#: src/pt/gnunet-daemon-pt.c:604
+#: src/pt/gnunet-daemon-pt.c:827
 #, fuzzy
 msgid "# DNS requests dropped (timeout)"
 msgstr "# các yêu cầu lỗ hổng bị bỏ do trọng tải"
 
-#: src/pt/gnunet-daemon-pt.c:634
+#: src/pt/gnunet-daemon-pt.c:884
 #, fuzzy
 msgid "# DNS requests intercepted"
 msgstr "# các yêu cầu get (lấy) dht được nhận"
 
-#: src/pt/gnunet-daemon-pt.c:639
+#: src/pt/gnunet-daemon-pt.c:889
 #, fuzzy
 msgid "# DNS requests dropped (DNS mesh tunnel down)"
 msgstr "# các yêu cầu lỗ hổng bị bỏ do trọng tải"
 
-#: src/pt/gnunet-daemon-pt.c:647
+#: src/pt/gnunet-daemon-pt.c:897
 #, fuzzy
 msgid "# DNS requests dropped (malformed)"
 msgstr "# các yêu cầu lỗ hổng bị bỏ do trọng tải"
 
-#: src/pt/gnunet-daemon-pt.c:715
+#: src/pt/gnunet-daemon-pt.c:970
 #, fuzzy
 msgid "# DNS replies received"
 msgstr "# các yêu cầu get (lấy) dht được nhận"
 
-#: src/pt/gnunet-daemon-pt.c:729
+#: src/pt/gnunet-daemon-pt.c:986
 #, fuzzy
 msgid "# DNS replies dropped (too late?)"
 msgstr "# các đáp ứng dht được định tuyến"
 
-#: src/pt/gnunet-daemon-pt.c:747 src/pt/gnunet-daemon-pt.c:759
-msgid "# DNS requests aborted (tunnel down)"
-msgstr ""
-
-#: src/pt/gnunet-daemon-pt.c:901 src/pt/gnunet-daemon-pt.c:910
-#: src/pt/gnunet-daemon-pt.c:930 src/pt/gnunet-daemon-pt.c:940
+#: src/pt/gnunet-daemon-pt.c:1262 src/pt/gnunet-daemon-pt.c:1271
+#: src/pt/gnunet-daemon-pt.c:1291 src/pt/gnunet-daemon-pt.c:1302
+#: src/pt/gnunet-daemon-pt.c:1311
 #, fuzzy, c-format
 msgid "Failed to connect to %s service.  Exiting.\n"
 msgstr "Lỗi sơ khởi dịch vụ « %s ».\n"
 
-#: src/pt/gnunet-daemon-pt.c:977
+#: src/pt/gnunet-daemon-pt.c:1348
 msgid "Daemon to run to perform IP protocol translation to GNUnet"
 msgstr ""
 
@@ -4919,66 +5406,66 @@ msgstr ""
 msgid "Daemon to announce regular expressions for the peer using mesh."
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1281
+#: src/regex/gnunet-regex-profiler.c:1288
 #, fuzzy
 msgid "No configuration file given. Exiting\n"
 msgstr "dùng tập tin cấu hình TÊN_TẬP_TIN"
 
-#: src/regex/gnunet-regex-profiler.c:1292
+#: src/regex/gnunet-regex-profiler.c:1299
 #, fuzzy
 msgid "Configuration option \"regex_prefix\" missing. Exiting\n"
 msgstr "Giá trị cấu hình « %s » cho « %s » trong phần « %s » nên là con số\n"
 
-#: src/regex/gnunet-regex-profiler.c:1321
+#: src/regex/gnunet-regex-profiler.c:1328
 #: src/regex/gnunet-regex-simulation-profiler.c:622
 #, c-format
 msgid "No policy directory specified on command line. Exiting.\n"
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1327
+#: src/regex/gnunet-regex-profiler.c:1334
 #: src/regex/gnunet-regex-simulation-profiler.c:629
 #, c-format
 msgid "Specified policies directory does not exist. Exiting.\n"
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1334
+#: src/regex/gnunet-regex-profiler.c:1341
 #, fuzzy, c-format
 msgid "No files found in `%s'\n"
 msgstr "Vẫn còn không tìm thấy đồng đẳng trong « %s ».\n"
 
-#: src/regex/gnunet-regex-profiler.c:1343
+#: src/regex/gnunet-regex-profiler.c:1350
 msgid "No search strings file given. Exiting.\n"
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1363
+#: src/regex/gnunet-regex-profiler.c:1370
 #, fuzzy
 msgid "Error loading search strings. Exiting.\n"
 msgstr "Gặp lỗi khi tải xuống: %s\n"
 
-#: src/regex/gnunet-regex-profiler.c:1445
+#: src/regex/gnunet-regex-profiler.c:1455
 #, fuzzy
 msgid "name of the file for writing statistics"
 msgstr "Lỗi lấy thông kê về truyền tải.\n"
 
-#: src/regex/gnunet-regex-profiler.c:1448
+#: src/regex/gnunet-regex-profiler.c:1458
 msgid "wait TIMEOUT before ending the experiment"
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1451
+#: src/regex/gnunet-regex-profiler.c:1461
 msgid "directory with policy files"
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1454
+#: src/regex/gnunet-regex-profiler.c:1464
 #, fuzzy
 msgid "name of file with input strings"
 msgstr "Lỗi lấy thông kê về truyền tải.\n"
 
-#: src/regex/gnunet-regex-profiler.c:1457
+#: src/regex/gnunet-regex-profiler.c:1467
 #, fuzzy
 msgid "name of file with hosts' names"
 msgstr "Lỗi lấy thông kê về truyền tải.\n"
 
-#: src/regex/gnunet-regex-profiler.c:1469
+#: src/regex/gnunet-regex-profiler.c:1479
 msgid "Profiler for regex"
 msgstr ""
 
@@ -4994,391 +5481,494 @@ msgstr ""
 msgid "Profiler for regex library"
 msgstr ""
 
-#: src/scalarproduct/gnunet-scalarproduct.c:195
+#: src/revocation/gnunet-revocation.c:121
+#, fuzzy, c-format
+msgid "Key `%s' is valid\n"
+msgstr "Định dạng của biệt hiệu « %s » là không hợp lệ.\n"
+
+#: src/revocation/gnunet-revocation.c:126
+#, fuzzy, c-format
+msgid "Key `%s' has been revoked\n"
+msgstr "Dịch vụ đã bị xoá.\n"
+
+#: src/revocation/gnunet-revocation.c:132
+#, fuzzy
+msgid "Internal error\n"
+msgstr "Lỗi VR."
+
+#: src/revocation/gnunet-revocation.c:158
+#, c-format
+msgid "Key for ego `%s' is still valid, revocation failed (!)\n"
+msgstr ""
+
+#: src/revocation/gnunet-revocation.c:163
+#, fuzzy
+msgid "Revocation failed (!)\n"
+msgstr "Lỗi nội bộ : khẳng định không thành công tại %s:%d.\n"
+
+#: src/revocation/gnunet-revocation.c:168
+#, c-format
+msgid "Key for ego `%s' has been successfully revoked\n"
+msgstr ""
+
+#: src/revocation/gnunet-revocation.c:173
+msgid "Revocation successful.\n"
+msgstr ""
+
+#: src/revocation/gnunet-revocation.c:178
+msgid "Internal error, key revocation might have failed\n"
+msgstr ""
+
+#: src/revocation/gnunet-revocation.c:289
+#, c-format
+msgid "Revocation certificate for `%s' stored in `%s'\n"
+msgstr ""
+
+#: src/revocation/gnunet-revocation.c:319
+#, fuzzy, c-format
+msgid "Ego `%s' not found.\n"
+msgstr "Khoá phiên chạy từ đồng đẳng « %s » không thể được thẩm tra.\n"
+
+#: src/revocation/gnunet-revocation.c:340
+#, c-format
+msgid "Error: revocation certificate in `%s' is not for `%s'\n"
+msgstr ""
+
+#: src/revocation/gnunet-revocation.c:360
+msgid "Revocation certificate ready\n"
+msgstr ""
+
+#: src/revocation/gnunet-revocation.c:370
+msgid "Revocation certificate not ready, calculating proof of work\n"
+msgstr ""
+
+#: src/revocation/gnunet-revocation.c:402
+#, fuzzy, c-format
+msgid "Public key `%s' malformed\n"
+msgstr "Đối số không hợp lệ cho « %s ».\n"
+
+#: src/revocation/gnunet-revocation.c:416
+msgid ""
+"Testing and revoking at the same time is not allowed, only executing test.\n"
+msgstr ""
+
+#: src/revocation/gnunet-revocation.c:451
+#, fuzzy, c-format
+msgid "Failed to read revocation certificate from `%s'\n"
+msgstr "Lỗi đọc danh sách bạn bè từ « %s »\n"
+
+#: src/revocation/gnunet-revocation.c:476
+#, fuzzy
+msgid "No action specified. Nothing to do.\n"
+msgstr "Chưa xác định giao diện nên dùng mặc định.\n"
+
+#: src/revocation/gnunet-revocation.c:492
+msgid "use NAME for the name of the revocation file"
+msgstr ""
+
+#: src/revocation/gnunet-revocation.c:495
+msgid "revoke the private key associated with the ego NAME "
+msgstr ""
+
+#: src/revocation/gnunet-revocation.c:498
+msgid ""
+"actually perform the revocation revocation file, otherwise we just do the "
+"precomputation"
+msgstr ""
+
+#: src/revocation/gnunet-revocation.c:501
+msgid "test if the public key KEY has been revoked"
+msgstr ""
+
+#: src/revocation/gnunet-service-revocation.c:250
+msgid "Duplicate revocation received from peer. Ignored.\n"
+msgstr ""
+
+#: src/revocation/gnunet-service-revocation.c:599
+#, fuzzy
+msgid "Could not open revocation database file!"
+msgstr "« %s »: Không thể kết nối.\n"
+
+#: src/scalarproduct/gnunet-scalarproduct.c:194
 #, fuzzy
 msgid "You must specify at least one message ID to check!\n"
 msgstr "Phải ghi rõ chỉ một tên tập tin để chèn.\n"
 
-#: src/scalarproduct/gnunet-scalarproduct.c:201
+#: src/scalarproduct/gnunet-scalarproduct.c:200
 msgid "This program needs a session identifier for comparing vectors.\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-scalarproduct.c:207
+#: src/scalarproduct/gnunet-scalarproduct.c:206
 msgid "Please give a session key for --input_key!\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-scalarproduct.c:216
+#: src/scalarproduct/gnunet-scalarproduct.c:215
 #, c-format
 msgid ""
 "Tried to set initiator mode, as peer ID was given. However, `%s' is not a "
 "valid peer identifier.\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-scalarproduct.c:240
-#: src/scalarproduct/gnunet-scalarproduct.c:298
+#: src/scalarproduct/gnunet-scalarproduct.c:239
+#: src/scalarproduct/gnunet-scalarproduct.c:297
 #, fuzzy, c-format
 msgid "Could not convert `%s' to int32_t.\n"
 msgstr "Không thể kết nối tới %s:%u: %s\n"
 
-#: src/scalarproduct/gnunet-scalarproduct.c:247
+#: src/scalarproduct/gnunet-scalarproduct.c:246
 msgid "Need elements to compute the vectorproduct, got none.\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-scalarproduct.c:348
+#: src/scalarproduct/gnunet-scalarproduct.c:347
 msgid ""
 "A comma separated list of elements to compare as vector with our remote peer."
 msgstr ""
 
-#: src/scalarproduct/gnunet-scalarproduct.c:351
+#: src/scalarproduct/gnunet-scalarproduct.c:350
 msgid ""
 "A comma separated mask to select which elements should actually be compared."
 msgstr ""
 
-#: src/scalarproduct/gnunet-scalarproduct.c:354
+#: src/scalarproduct/gnunet-scalarproduct.c:353
 msgid ""
 "[Optional] peer to calculate our scalarproduct with. If this parameter is "
 "not given, the service will wait for a remote peer to compute the request."
 msgstr ""
 
-#: src/scalarproduct/gnunet-scalarproduct.c:357
+#: src/scalarproduct/gnunet-scalarproduct.c:356
 msgid "Transaction ID shared with peer."
 msgstr ""
 
-#: src/scalarproduct/gnunet-scalarproduct.c:366
+#: src/scalarproduct/gnunet-scalarproduct.c:365
 msgid "Calculate the Vectorproduct with a GNUnet peer."
 msgstr ""
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:381
+#: src/scalarproduct/gnunet-service-scalarproduct.c:450
 #, c-format
 msgid "Generated key set with key length %d bits.\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:691
+#: src/scalarproduct/gnunet-service-scalarproduct.c:775
 #, fuzzy, c-format
 msgid "Client (%p) disconnected from us.\n"
 msgstr "« %.*s » được kết nối tới « %.*s ».\n"
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:762
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1696
+#: src/scalarproduct/gnunet-service-scalarproduct.c:847
+#: src/scalarproduct/gnunet-service-scalarproduct.c:936
 #, fuzzy, c-format
 msgid "Could not send message to client (%p)!\n"
 msgstr "Không thể đọc danh sách bạn bè « %s »\n"
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:768
+#: src/scalarproduct/gnunet-service-scalarproduct.c:853
 #, c-format
 msgid "Sending session-end notification to client (%p) for session %s\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:891
-msgid "Message too large, fragmentation is currently not supported!)\n"
+#: src/scalarproduct/gnunet-service-scalarproduct.c:946
+#, c-format
+msgid "Sent result to client (%p), this session (%s) has ended!\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:896
+#: src/scalarproduct/gnunet-service-scalarproduct.c:1025
+#: src/scalarproduct/gnunet-service-scalarproduct.c:1163
 msgid "Could not send service-response message via mesh!)\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1092
+#: src/scalarproduct/gnunet-service-scalarproduct.c:1376
 #, c-format
 msgid "Failed to communicate with `%s', scalar product calculation aborted.\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1145
-#, fuzzy, c-format
-msgid "Successfully created new tunnel to peer (%s)!\n"
-msgstr "Không đủ quyền cho « %s ».\n"
-
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1157
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1873
-msgid "Message too large, fragmentation is currently not supported!\n"
-msgstr ""
-
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1223
+#: src/scalarproduct/gnunet-service-scalarproduct.c:1476
+#: src/scalarproduct/gnunet-service-scalarproduct.c:1603
 #, fuzzy
 msgid "Transmitting service request.\n"
 msgstr "Đang nạp và khởi động dùng « %s ».\n"
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1233
+#: src/scalarproduct/gnunet-service-scalarproduct.c:1485
 #, fuzzy
-msgid "Could not send mutlicast message to tunnel!\n"
+msgid "Could not send service-request multipart message to tunnel!\n"
 msgstr "Không thể đọc danh sách bạn bè « %s »\n"
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1283
+#: src/scalarproduct/gnunet-service-scalarproduct.c:1525
+#, fuzzy, c-format
+msgid "Successfully created new tunnel to peer (%s)!\n"
+msgstr "Không đủ quyền cho « %s ».\n"
+
+#: src/scalarproduct/gnunet-service-scalarproduct.c:1612
+#, fuzzy
+msgid "Could not send message to tunnel!\n"
+msgstr "Không thể đọc danh sách bạn bè « %s »\n"
+
+#: src/scalarproduct/gnunet-service-scalarproduct.c:1669
 #, fuzzy
 msgid "Too short message received from client!\n"
 msgstr "# các đáp ứng lỗ hổng được gửi cho trình/máy khách"
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1297
+#: src/scalarproduct/gnunet-service-scalarproduct.c:1682
 #, fuzzy
 msgid "Invalid message received from client, session information incorrect!\n"
 msgstr "Nhận được thông báo « %s » sai từ đồng đẳng « %s ».\n"
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1309
+#: src/scalarproduct/gnunet-service-scalarproduct.c:1693
 #, c-format
 msgid ""
 "Duplicate session information received, cannot create new session with key `"
 "%s'\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1330
+#: src/scalarproduct/gnunet-service-scalarproduct.c:1713
 #, c-format
 msgid ""
 "Got client-request-session with key %s, preparing tunnel to remote service.\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1369
+#: src/scalarproduct/gnunet-service-scalarproduct.c:1749
 #, c-format
-msgid "Creating new tunnel to for session with key %s.\n"
+msgid "Creating new tunnel for session with key %s.\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1417
+#: src/scalarproduct/gnunet-service-scalarproduct.c:1794
 #, c-format
 msgid ""
 "Got client-responder-session with key %s and a matching service-request-"
 "session set, processing.\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1425
+#: src/scalarproduct/gnunet-service-scalarproduct.c:1802
 #, c-format
 msgid ""
 "Got client-responder-session with key %s but NO matching service-request-"
 "session set, queuing element for later use.\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1481
-#, c-format
-msgid "Peer disconnected, terminating session %s with peer (%s)\n"
-msgstr ""
+#: src/scalarproduct/gnunet-service-scalarproduct.c:1828
+#, fuzzy, c-format
+msgid "New incoming tunnel from peer %s.\n"
+msgstr "« %.*s » được kết nối tới « %.*s ».\n"
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1706
+#: src/scalarproduct/gnunet-service-scalarproduct.c:1859
 #, c-format
-msgid "Sent result to client (%p), this session (%s) has ended!\n"
+msgid "Peer disconnected, terminating session %s with peer (%s)\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1790
+#: src/scalarproduct/gnunet-service-scalarproduct.c:2047
+#: src/scalarproduct/gnunet-service-scalarproduct.c:2196
 #, c-format
-msgid ""
-"Got message with duplicate session key (`%s'), ignoring service request.\n"
-msgstr ""
-
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1813
-msgid "Could not translate remote public key to sexpression!\n"
+msgid "Got session with key %s and a matching element set, processing.\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1849
-#, fuzzy, c-format
-msgid ""
-"Could not translate E[a%d] to MPI!\n"
-"%s/%s\n"
-msgstr "Không thể lấy địa chỉ IP cho giao diện « %s », dùng « %s ».\n"
-
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1857
+#: src/scalarproduct/gnunet-service-scalarproduct.c:2054
+#: src/scalarproduct/gnunet-service-scalarproduct.c:2203
 #, c-format
-msgid "Got session with key %s and a matching element set, processing.\n"
+msgid "Got session with key %s without a matching element set, queueing.\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1866
+#: src/scalarproduct/gnunet-service-scalarproduct.c:2142
 #, c-format
-msgid "Got session with key %s without a matching element set, queueing.\n"
+msgid ""
+"Got message with duplicate session key (`%s'), ignoring service request.\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:2039
+#: src/scalarproduct/gnunet-service-scalarproduct.c:2425
 msgid "Shutting down, initiating cleanup.\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:2100
+#: src/scalarproduct/gnunet-service-scalarproduct.c:2490
 msgid "Generating Paillier-Keyset.\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:2116
+#: src/scalarproduct/gnunet-service-scalarproduct.c:2505
 #, fuzzy
 msgid "Connect to MESH failed\n"
 msgstr " Không kết nối được (lỗi ?)\n"
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:2120
+#: src/scalarproduct/gnunet-service-scalarproduct.c:2509
 #, fuzzy
 msgid "Mesh initialized\n"
 msgstr "Lỗi sơ khởi lõi.\n"
 
-#: src/scalarproduct/scalarproduct_api.c:243
+#: src/scalarproduct/scalarproduct_api.c:246
 #, fuzzy
 msgid "# SUC responder result messages received"
 msgstr "# các thông báo phát hiện dht được nhận"
 
-#: src/scalarproduct/scalarproduct_api.c:297
+#: src/scalarproduct/scalarproduct_api.c:300
 #, fuzzy
 msgid "# bytes sent to scalarproduct"
 msgstr "# các byte trong kho dữ liệu"
 
-#: src/scalarproduct/scalarproduct_api.c:340
-#: src/scalarproduct/scalarproduct_api.c:433
+#: src/scalarproduct/scalarproduct_api.c:345
+#: src/scalarproduct/scalarproduct_api.c:440
 #, fuzzy
 msgid "Failed to connect to the scalarproduct service\n"
 msgstr "Lỗi kết nối đến gnunetd.\n"
 
-#: src/scalarproduct/scalarproduct_api.c:348
-#: src/scalarproduct/scalarproduct_api.c:441
+#: src/scalarproduct/scalarproduct_api.c:353
+#: src/scalarproduct/scalarproduct_api.c:448
 #, fuzzy
 msgid "Failed to send a message to the statistics service\n"
 msgstr "Lỗi kết nối đến gnunetd.\n"
 
-#: src/scalarproduct/scalarproduct_api.c:382
-#: src/scalarproduct/scalarproduct_api.c:478
+#: src/scalarproduct/scalarproduct_api.c:387
+#: src/scalarproduct/scalarproduct_api.c:485
 #, fuzzy
 msgid "Failed to send a message to the scalarproduct service\n"
 msgstr "Lỗi kết nối đến gnunetd.\n"
 
-#: src/set/gnunet-set-ibf-profiler.c:224
+#: src/set/gnunet-set-ibf-profiler.c:221
 #, fuzzy
 msgid "number of element in set A-B"
 msgstr "số lần lặp lại"
 
-#: src/set/gnunet-set-ibf-profiler.c:227
+#: src/set/gnunet-set-ibf-profiler.c:224
 #, fuzzy
 msgid "number of element in set B-A"
 msgstr "số lần lặp lại"
 
-#: src/set/gnunet-set-ibf-profiler.c:230
+#: src/set/gnunet-set-ibf-profiler.c:227
 msgid "number of common elements in A and B"
 msgstr ""
 
-#: src/set/gnunet-set-ibf-profiler.c:233
+#: src/set/gnunet-set-ibf-profiler.c:230
 msgid "hash num"
 msgstr ""
 
-#: src/set/gnunet-set-ibf-profiler.c:236
+#: src/set/gnunet-set-ibf-profiler.c:233
 msgid "ibf size"
 msgstr ""
 
-#: src/set/gnunet-set-profiler.c:296
+#: src/set/gnunet-set-profiler.c:295
 msgid "oeration to execute"
 msgstr ""
 
-#: src/statistics/gnunet-service-statistics.c:271
+#: src/statistics/gnunet-service-statistics.c:280
 #, fuzzy, c-format
 msgid "Loading %llu bytes of statistics from `%s'\n"
 msgstr "Đã tải %llu byte xuống « %s ».\n"
 
-#: src/statistics/gnunet-service-statistics.c:330
+#: src/statistics/gnunet-service-statistics.c:346
 #, fuzzy, c-format
 msgid "Wrote %llu bytes of statistics to `%s'\n"
 msgstr "Đã tải %llu byte xuống « %s ».\n"
 
-#: src/statistics/gnunet-statistics.c:142
+#: src/statistics/gnunet-statistics.c:140
 #, fuzzy
 msgid "Failed to obtain statistics.\n"
 msgstr "Lỗi lấy thông kê về truyền tải.\n"
 
-#: src/statistics/gnunet-statistics.c:144
+#: src/statistics/gnunet-statistics.c:142
 #, fuzzy, c-format
 msgid "Failed to obtain statistics from host `%s:%llu'\n"
 msgstr "Lỗi lấy thông kê về truyền tải.\n"
 
-#: src/statistics/gnunet-statistics.c:191
+#: src/statistics/gnunet-statistics.c:189
 msgid "Missing argument: subsystem \n"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:197
+#: src/statistics/gnunet-statistics.c:195
 msgid "Missing argument: name\n"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:228
+#: src/statistics/gnunet-statistics.c:226
 #, fuzzy, c-format
 msgid "No subsystem or name given\n"
 msgstr "chưa đưa ra tên"
 
-#: src/statistics/gnunet-statistics.c:236
+#: src/statistics/gnunet-statistics.c:234
 #, fuzzy, c-format
 msgid "Failed to initialize watch routine\n"
 msgstr "Lỗi sơ khởi dịch vụ « %s ».\n"
 
-#: src/statistics/gnunet-statistics.c:263
+#: src/statistics/gnunet-statistics.c:261
 #, fuzzy, c-format
 msgid "Trying to connect to remote host, but service `%s' is not running\n"
 msgstr "Lỗi sơ khởi dịch vụ « %s ».\n"
 
-#: src/statistics/gnunet-statistics.c:271
+#: src/statistics/gnunet-statistics.c:269
 #, fuzzy, c-format
 msgid "A port is required to connect to host `%s'\n"
 msgstr "Không thể kết nối tới %s:%u: %s\n"
 
-#: src/statistics/gnunet-statistics.c:278
+#: src/statistics/gnunet-statistics.c:276
 #, c-format
 msgid "A port has to be between 1 and 65535 to connect to host `%s'\n"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:310
+#: src/statistics/gnunet-statistics.c:308
 #, fuzzy, c-format
 msgid "Invalid argument `%s'\n"
 msgstr "Đối số không hợp lệ cho « %s ».\n"
 
-#: src/statistics/gnunet-statistics.c:336
+#: src/statistics/gnunet-statistics.c:334
 msgid "limit output to statistics for the given NAME"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:339
+#: src/statistics/gnunet-statistics.c:337
 msgid "make the value being set persistent"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:342
+#: src/statistics/gnunet-statistics.c:340
 msgid "limit output to the given SUBSYSTEM"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:345
+#: src/statistics/gnunet-statistics.c:343
 msgid "just print the statistics value"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:348
+#: src/statistics/gnunet-statistics.c:346
 msgid "watch value continuously"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:351
+#: src/statistics/gnunet-statistics.c:349
 msgid "connect to remote host"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:354
+#: src/statistics/gnunet-statistics.c:352
 msgid "port for remote host"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:366
+#: src/statistics/gnunet-statistics.c:364
 msgid "Print statistics about GNUnet operations."
 msgstr "In ra thống kê về các thao tác GNUnet."
 
-#: src/statistics/statistics_api.c:512
+#: src/statistics/statistics_api.c:509
 #, fuzzy
 msgid "Could not save some persistent statistics\n"
 msgstr "Không thể tạo miền tên.\n"
 
-#: src/statistics/statistics_api.c:1057
+#: src/statistics/statistics_api.c:1054
 msgid ""
 "Failed to receive acknowledgement from statistics service, some statistics "
 "might have been lost!\n"
 msgstr ""
 
+#: src/testbed/gnunet-daemon-testbed-blacklist.c:264
+msgid ""
+"Daemon to restrict incoming transport layer connections during testbed "
+"deployments"
+msgstr ""
+
 #: src/testbed/gnunet-service-testbed_cpustatus.c:727
 #, c-format
 msgid ""
 "Cannot open %s for writing load statistics.  Not logging load statistics\n"
 msgstr ""
 
-#: src/testbed/gnunet-service-testbed_peers.c:973
+#: src/testbed/gnunet-service-testbed_peers.c:1012
 #, fuzzy
 msgid "Misconfiguration (can't connect to the ARM service)"
 msgstr "Lỗi kết nối đến gnunetd.\n"
 
-#: src/testbed/gnunet-service-testbed_peers.c:979
+#: src/testbed/gnunet-service-testbed_peers.c:1018
 msgid "Request doesn't fit into a message"
 msgstr ""
 
-#: src/testbed/gnunet-service-testbed_peers.c:1017
+#: src/testbed/gnunet-service-testbed_peers.c:1056
 #, fuzzy, c-format
 msgid "%s service can't be started because ARM is shutting down"
 msgstr "« %s » đang tắt.\n"
 
-#: src/testbed/gnunet_testbed_ll_master.c:57
-#, fuzzy, c-format
-msgid "Job command file not given. Exiting\n"
-msgstr "dùng tập tin cấu hình TÊN_TẬP_TIN"
-
 #: src/testbed/gnunet_testbed_mpi_spawn.c:125
 #, fuzzy
 msgid "Waiting for child to exit.\n"
@@ -5389,19 +5979,26 @@ msgstr "Đang đợi các đồng đẳng kết nối"
 msgid "Spawning process `%s'\n"
 msgstr "Đang bắt đầu tài về « %s »\n"
 
-#: src/testbed/gnunet-testbed-profiler.c:254
+#: src/testbed/gnunet-testbed-profiler.c:267
 #, fuzzy, c-format
 msgid "Exiting as the number of peers is %u\n"
 msgstr "tăng sổ tối đa các kết nối TCP/IP"
 
-#: src/testbed/gnunet-testbed-profiler.c:280
+#: src/testbed/gnunet-testbed-profiler.c:293
 msgid "create COUNT number of peers"
 msgstr ""
 
-#: src/testbed/gnunet-testbed-profiler.c:283
+#: src/testbed/gnunet-testbed-profiler.c:296
 msgid "tolerate COUNT number of continious timeout failures"
 msgstr ""
 
+#: src/testbed/gnunet-testbed-profiler.c:299
+msgid ""
+"run profiler in non-interactive mode where upon testbed setup the profiler "
+"does not wait for a keystroke but continues to run until a termination "
+"signal is received"
+msgstr ""
+
 #: src/testbed/testbed_api_hosts.c:415
 #, fuzzy, c-format
 msgid "Hosts file %s not found\n"
@@ -5422,7 +6019,7 @@ msgstr "Khoá phiên chạy từ đồng đẳng « %s » không thể được
 msgid "The function %s is only available when compiled with (--with-ll)\n"
 msgstr ""
 
-#: src/testbed/testbed_api_hosts.c:1572
+#: src/testbed/testbed_api_hosts.c:1586
 #, fuzzy, c-format
 msgid "Adding host %u failed with error: %s\n"
 msgstr "« %s » thất bại với mã lỗi %d: %s\n"
@@ -5564,166 +6161,138 @@ msgstr ""
 msgid "Command line tool to access the testing library"
 msgstr ""
 
-#: src/testing/testing.c:276
+#: src/testing/testing.c:277
 #, c-format
 msgid "Hostkeys file not found: %s\n"
 msgstr ""
 
-#: src/testing/testing.c:292
+#: src/testing/testing.c:293
 #, c-format
 msgid "Incorrect hostkey file format: %s\n"
 msgstr ""
 
-#: src/testing/testing.c:711
+#: src/testing/testing.c:716
 #, fuzzy, c-format
 msgid "Key number %u does not exist\n"
 msgstr "đặt số trình nền cần khởi chạy"
 
-#: src/testing/testing.c:722
-#, fuzzy, c-format
-msgid "Error while decoding key %u\n"
-msgstr "Gặp lỗi khi tải xuống: %s\n"
-
-#: src/testing/testing.c:1158
+#: src/testing/testing.c:1155
 #, c-format
 msgid ""
 "You attempted to create a testbed with more than %u hosts.  Please "
 "precompute more hostkeys first.\n"
 msgstr ""
 
-#: src/testing/testing.c:1167
+#: src/testing/testing.c:1164
 #, fuzzy, c-format
 msgid "Failed to initialize hostkey for peer %u\n"
 msgstr "Lỗi sơ khởi dịch vụ « %s ».\n"
 
-#: src/testing/testing.c:1177
+#: src/testing/testing.c:1174
 msgid "PRIVATE_KEY option in PEER section missing in configuration\n"
 msgstr ""
 
-#: src/testing/testing.c:1190
+#: src/testing/testing.c:1187
 #, fuzzy
 msgid "Failed to create configuration for peer (not enough free ports?)\n"
 msgstr "Không thể truy cập đến thông tin về không gian tên.\n"
 
-#: src/testing/testing.c:1204
+#: src/testing/testing.c:1201
 #, fuzzy, c-format
 msgid "Cannot open hostkey file `%s': %s\n"
 msgstr "Không thể đọc danh sách bạn bè « %s »\n"
 
-#: src/testing/testing.c:1216
+#: src/testing/testing.c:1213
 #, fuzzy, c-format
 msgid "Failed to write hostkey file for peer %u: %s\n"
 msgstr "Lỗi tạo thư mục tạm thời."
 
-#: src/testing/testing.c:1238
+#: src/testing/testing.c:1235
 #, fuzzy, c-format
 msgid "Failed to write configuration file `%s' for peer %u: %s\n"
 msgstr "Không thể lưu tập tin cấu hình « %s »:"
 
-#: src/testing/testing.c:1338
+#: src/testing/testing.c:1335
 #, fuzzy, c-format
 msgid "Failed to start `%s': %s\n"
 msgstr "Lỗi chạy %s: %s %d\n"
 
-#: src/testing/testing.c:1702
+#: src/testing/testing.c:1699
 #, fuzzy, c-format
 msgid "Failed to load configuration from %s\n"
 msgstr "Không thể lưu tập tin cấu hình « %s »:"
 
-#: src/topology/gnunet-daemon-topology.c:254
+#: src/topology/friends.c:100
+#, fuzzy, c-format
+msgid "Syntax error in FRIENDS file at offset %llu, skipping bytes `%.*s'.\n"
+msgstr ""
+"Lỗi cú pháp trong sự xác định địa hình học, đang bỏ qua các byte « %s ».\n"
+
+#: src/topology/gnunet-daemon-topology.c:255
 msgid "# peers blacklisted"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:387
+#: src/topology/gnunet-daemon-topology.c:388
 #, fuzzy
 msgid "# connect requests issued to transport"
 msgstr "# các yêu cầu máy/trình khách lỗ hổng được phun vào"
 
-#: src/topology/gnunet-daemon-topology.c:721
-#: src/topology/gnunet-daemon-topology.c:806
+#: src/topology/gnunet-daemon-topology.c:727
+#: src/topology/gnunet-daemon-topology.c:812
 #, fuzzy
 msgid "# friends connected"
 msgstr "# của các đồng đẳng đã kết nối"
 
-#: src/topology/gnunet-daemon-topology.c:986
+#: src/topology/gnunet-daemon-topology.c:992
 msgid "Failed to connect to core service, can not manage topology!\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:1031
-#, c-format
-msgid "Could not read friends list `%s'\n"
-msgstr "Không thể đọc danh sách bạn bè « %s »\n"
-
-#: src/topology/gnunet-daemon-topology.c:1037
-#, fuzzy, c-format
-msgid "Friends file `%s' is empty.\n"
-msgstr "Định dạng của tập tin « %s » là không hợp lệ.\n"
-
-#: src/topology/gnunet-daemon-topology.c:1046
-#, fuzzy, c-format
-msgid "Failed to read friends list from `%s': out of memory\n"
-msgstr "Lỗi đọc danh sách bạn bè từ « %s »\n"
-
-#: src/topology/gnunet-daemon-topology.c:1054
+#: src/topology/gnunet-daemon-topology.c:1021
 #, c-format
-msgid "Failed to read friends list from `%s'\n"
-msgstr "Lỗi đọc danh sách bạn bè từ « %s »\n"
-
-#: src/topology/gnunet-daemon-topology.c:1074
-#, fuzzy, c-format
-msgid ""
-"Syntax error in topology specification at offset %llu, skipping bytes.\n"
-msgstr "Lỗi cú pháp trong sự xác định địa hình học, đang bỏ qua các byte.\n"
-
-#: src/topology/gnunet-daemon-topology.c:1087
-#, fuzzy, c-format
-msgid ""
-"Syntax error in topology specification at offset %llu, skipping bytes `%s'.\n"
+msgid "Found myself `%s' in friend list (useless, ignored)\n"
 msgstr ""
-"Lỗi cú pháp trong sự xác định địa hình học, đang bỏ qua các byte « %s ».\n"
 
-#: src/topology/gnunet-daemon-topology.c:1097
+#: src/topology/gnunet-daemon-topology.c:1028
 #, fuzzy, c-format
 msgid "Found friend `%s' in configuration\n"
 msgstr ""
 "\n"
 "Kết thúc cấu hình.\n"
 
-#: src/topology/gnunet-daemon-topology.c:1103
-#, c-format
-msgid "Found myself `%s' in friend list (useless, ignored)\n"
+#: src/topology/gnunet-daemon-topology.c:1049
+msgid "Encountered errors parsing friends list!\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:1113
+#: src/topology/gnunet-daemon-topology.c:1051
 #, fuzzy
 msgid "# friends in configuration"
 msgstr ""
 "\n"
 "Kết thúc cấu hình.\n"
 
-#: src/topology/gnunet-daemon-topology.c:1119
+#: src/topology/gnunet-daemon-topology.c:1056
 msgid ""
 "Fewer friends specified than required by minimum friend count. Will only "
 "connect to friends.\n"
 msgstr ""
 "Xác định quá ít bạn bè (dưới số tối thiểu). Sẽ chỉ kết nối tới bạn bè.\n"
 
-#: src/topology/gnunet-daemon-topology.c:1126
+#: src/topology/gnunet-daemon-topology.c:1062
 msgid ""
 "More friendly connections required than target total number of connections.\n"
 msgstr "Cần thiết nhiều kết nối bạn bè hơn tổng số kết nối đích.\n"
 
-#: src/topology/gnunet-daemon-topology.c:1157
+#: src/topology/gnunet-daemon-topology.c:1093
 #, fuzzy
 msgid "# HELLO messages received"
 msgstr "# các thông báo PONG đã mật mã được nhận"
 
-#: src/topology/gnunet-daemon-topology.c:1212
+#: src/topology/gnunet-daemon-topology.c:1150
 #, fuzzy
 msgid "# HELLO messages gossipped"
 msgstr "# các thông báo gửi đi bị loại bỏ"
 
-#: src/topology/gnunet-daemon-topology.c:1351
+#: src/topology/gnunet-daemon-topology.c:1289
 msgid "GNUnet topology control (maintaining P2P mesh and F2F constraints)"
 msgstr ""
 
@@ -5737,39 +6306,39 @@ msgstr "Không thể lấy địa chỉ của đồng đẳng « %s ».\n"
 msgid "Adding blacklisting entry for peer `%s':`%s'\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_blacklist.c:453
-#: src/transport/gnunet-service-transport_blacklist.c:717
+#: src/transport/gnunet-service-transport_blacklist.c:455
+#: src/transport/gnunet-service-transport_blacklist.c:722
 msgid "# disconnects due to blacklist"
 msgstr ""
 
-#: src/transport/gnunet-service-transport.c:168
+#: src/transport/gnunet-service-transport.c:163
 #, fuzzy
 msgid "# bytes payload discarded due to not connected peer "
 msgstr "# Các quảng cáo đồng đẳng bị hủy do trọng tải"
 
-#: src/transport/gnunet-service-transport.c:234
+#: src/transport/gnunet-service-transport.c:229
 #, fuzzy
 msgid "# bytes total received"
 msgstr "# tổng số nội dung lỗ hổng được nhận"
 
-#: src/transport/gnunet-service-transport.c:281
+#: src/transport/gnunet-service-transport.c:277
 #, fuzzy
 msgid "# bytes payload received"
 msgstr "# các byte đã giải mã"
 
-#: src/transport/gnunet-service-transport.c:432
+#: src/transport/gnunet-service-transport.c:429
 #, fuzzy, c-format
 msgid "Could not obtain a valid network for `%s' %s\n"
 msgstr "Không thể lấy địa chỉ IP cho giao diện « %s », dùng « %s ».\n"
 
-#: src/transport/gnunet-service-transport.c:480
+#: src/transport/gnunet-service-transport.c:479
 #, c-format
 msgid ""
 "Address or session unknown: failed to update properties for peer `%s' plugin "
 "`%s' address `%s' session %p\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport.c:775
+#: src/transport/gnunet-service-transport.c:760
 msgid "Transport service is lacking key configuration settings.  Exiting.\n"
 msgstr ""
 
@@ -5788,80 +6357,80 @@ msgstr "# các yêu cầu lỗ hổng bị bỏ do trọng tải"
 msgid "Rejecting control connection from peer `%s', which is not me!\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_clients.c:677
+#: src/transport/gnunet-service-transport_clients.c:672
 msgid "# bytes payload dropped (other peer was not connected)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_clients.c:733
+#: src/transport/gnunet-service-transport_clients.c:728
 #, fuzzy
 msgid "# REQUEST CONNECT messages received"
 msgstr "# các thông báo PONG đã mật mã được nhận"
 
-#: src/transport/gnunet-service-transport_hello.c:179
+#: src/transport/gnunet-service-transport_hello.c:181
 msgid "# refreshed my HELLO"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1216
+#: src/transport/gnunet-service-transport_neighbours.c:1080
 #, fuzzy
 msgid "# DISCONNECT messages sent"
 msgstr "# các thông báo PONG đã mật mã được nhận"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1346
-#: src/transport/gnunet-service-transport_neighbours.c:1681
+#: src/transport/gnunet-service-transport_neighbours.c:1210
+#: src/transport/gnunet-service-transport_neighbours.c:1545
 #, fuzzy
 msgid "# bytes in message queue for other peers"
 msgstr "# các byte thông báo gửi đi bị loại bỏ"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1351
+#: src/transport/gnunet-service-transport_neighbours.c:1215
 #, fuzzy
 msgid "# messages transmitted to other peers"
 msgstr "# các byte kiểu %d được gửi "
 
-#: src/transport/gnunet-service-transport_neighbours.c:1356
+#: src/transport/gnunet-service-transport_neighbours.c:1220
 #, fuzzy
 msgid "# transmission failures for messages to other peers"
 msgstr "# các byte thông báo gửi đi bị loại bỏ"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1413
+#: src/transport/gnunet-service-transport_neighbours.c:1277
 msgid "# messages timed out while in transport queue"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1455
+#: src/transport/gnunet-service-transport_neighbours.c:1319
 #, fuzzy
 msgid "# keepalives sent"
 msgstr "# các khoá phiên chạy được gửi"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1479
+#: src/transport/gnunet-service-transport_neighbours.c:1343
 #, fuzzy
 msgid "# KEEPALIVE messages discarded (peer unknown)"
 msgstr "# các thông báo được chắp liền"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1487
+#: src/transport/gnunet-service-transport_neighbours.c:1351
 #, fuzzy
 msgid "# KEEPALIVE messages discarded (no session)"
 msgstr "# các thông báo được chắp liền"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1520
+#: src/transport/gnunet-service-transport_neighbours.c:1384
 #, fuzzy
 msgid "# KEEPALIVE_RESPONSE messages discarded (not connected)"
 msgstr "# các thông báo được chắp liền"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1529
+#: src/transport/gnunet-service-transport_neighbours.c:1393
 #, fuzzy
 msgid "# KEEPALIVE_RESPONSE messages discarded (not expected)"
 msgstr "# các thông báo được chắp liền"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1586
+#: src/transport/gnunet-service-transport_neighbours.c:1450
 #, fuzzy
 msgid "# messages discarded due to lack of neighbour record"
 msgstr "# các thông báo được chắp liền"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1620
+#: src/transport/gnunet-service-transport_neighbours.c:1484
 #, fuzzy
 msgid "# bandwidth quota violations by other peers"
 msgstr "theo dõi gnunetd sử dụng dải thông"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1636
+#: src/transport/gnunet-service-transport_neighbours.c:1500
 msgid "# ms throttling suggested"
 msgstr ""
 
@@ -5886,32 +6455,32 @@ msgstr "gửi ĐẾM thông báo"
 msgid "# unexpected CONNECT_ACK messages (disconnecting)"
 msgstr "gửi ĐẾM thông báo"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3046
+#: src/transport/gnunet-service-transport_neighbours.c:3045
 #, fuzzy
 msgid "# unexpected SESSION ACK messages"
 msgstr "# các thông báo PONG đã mật mã được gửi"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3099
+#: src/transport/gnunet-service-transport_neighbours.c:3098
 msgid "# SET QUOTA messages ignored (no such peer)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3113
+#: src/transport/gnunet-service-transport_neighbours.c:3112
 msgid "# disconnects due to quota of 0"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3144
+#: src/transport/gnunet-service-transport_neighbours.c:3143
 msgid "# disconnect messages ignored (old format)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3155
+#: src/transport/gnunet-service-transport_neighbours.c:3154
 msgid "# disconnect messages ignored (timestamp)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3194
+#: src/transport/gnunet-service-transport_neighbours.c:3193
 msgid "# other peer asked to disconnect from us"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3289
+#: src/transport/gnunet-service-transport_neighbours.c:3288
 #, 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"
@@ -5937,333 +6506,333 @@ msgstr "Không thể nạp phần bổ sung truyền tải « %s »\n"
 msgid "Did not load plugin `%s' due to missing functions\n"
 msgstr "Lỗi nạp phần bổ sung « %s » tại %s:%d. Đang hủy nạp phần bổ sung.\n"
 
-#: src/transport/gnunet-service-transport_validation.c:455
+#: src/transport/gnunet-service-transport_validation.c:456
 msgid "# address records discarded"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:518
+#: src/transport/gnunet-service-transport_validation.c:519
 #, c-format
 msgid ""
 "Not transmitting `%s' with `%s', message too big (%u bytes!). This should "
 "not happen.\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:575
+#: src/transport/gnunet-service-transport_validation.c:577
 #, fuzzy
 msgid "# PING without HELLO messages sent"
 msgstr "# các thông báo PONG nhập thô được gửi"
 
-#: src/transport/gnunet-service-transport_validation.c:660
+#: src/transport/gnunet-service-transport_validation.c:662
 msgid "# address revalidations started"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:928
+#: src/transport/gnunet-service-transport_validation.c:933
 #, fuzzy
 msgid "# PING message for different peer received"
 msgstr "# các thông báo PING được tạo"
 
-#: src/transport/gnunet-service-transport_validation.c:987
+#: src/transport/gnunet-service-transport_validation.c:992
 msgid "# failed address checks during validation"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:997
+#: src/transport/gnunet-service-transport_validation.c:1002
 msgid "# successful address checks during validation"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1016
+#: src/transport/gnunet-service-transport_validation.c:1021
 #, c-format
 msgid "Received a PING message with validation bug from `%s'\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1070
+#: src/transport/gnunet-service-transport_validation.c:1075
 #, fuzzy, c-format
 msgid "Failed to create PONG signature for peer `%s'\n"
 msgstr "Không thể tạo miền tên.\n"
 
-#: src/transport/gnunet-service-transport_validation.c:1115
+#: src/transport/gnunet-service-transport_validation.c:1124
 msgid "# PONGs unicast via reliable transport"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1124
+#: src/transport/gnunet-service-transport_validation.c:1133
 msgid "# PONGs multicast to all available addresses"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1251
+#: src/transport/gnunet-service-transport_validation.c:1260
 msgid "# PONGs dropped, no matching pending validation"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1266
+#: src/transport/gnunet-service-transport_validation.c:1275
 msgid "# PONGs dropped, signature expired"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1372
+#: src/transport/gnunet-service-transport_validation.c:1381
 #, fuzzy, c-format
 msgid "Adding `%s' without addresses for peer `%s'\n"
 msgstr "Không thể lấy địa chỉ của đồng đẳng « %s ».\n"
 
-#: src/transport/gnunet-transport.c:266
+#: src/transport/gnunet-transport.c:259
 #, fuzzy, c-format
 msgid "Transmitted %llu bytes/s (%llu bytes in %s)\n"
 msgstr "Đang thử tải danh sách các máy xuống « %s »\n"
 
-#: src/transport/gnunet-transport.c:273
+#: src/transport/gnunet-transport.c:266
 #, fuzzy, c-format
 msgid "Received %llu bytes/s (%llu bytes in %s)\n"
 msgstr "Nhận yêu cầu định tuyến\n"
 
-#: src/transport/gnunet-transport.c:303
+#: src/transport/gnunet-transport.c:296
 #, fuzzy, c-format
 msgid "Failed to connect to `%s'\n"
 msgstr "Lỗi kết nối đến gnunetd.\n"
 
-#: src/transport/gnunet-transport.c:316
+#: src/transport/gnunet-transport.c:309
 #, fuzzy, c-format
 msgid "Failed to resolve address for peer `%s'\n"
 msgstr "Lỗi đóng kết đến cổng %s %d.\n"
 
-#: src/transport/gnunet-transport.c:325
+#: src/transport/gnunet-transport.c:318
 #, fuzzy
 msgid "Failed to list connections, timeout occured\n"
 msgstr "Không kết nối được đến trình nền gnunetd."
 
-#: src/transport/gnunet-transport.c:429
+#: src/transport/gnunet-transport.c:422
 msgid "No transport plugins configured, peer will never communicate\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:442
+#: src/transport/gnunet-transport.c:435
 #, c-format
 msgid "No port configured for plugin `%s', cannot test it\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:506
+#: src/transport/gnunet-transport.c:499
 #, fuzzy, c-format
 msgid "Transmitting %u bytes to %s\n"
 msgstr "Đang thử tải danh sách các máy xuống « %s »\n"
 
-#: src/transport/gnunet-transport.c:528
+#: src/transport/gnunet-transport.c:522
 #, fuzzy, c-format
 msgid "Successfully connected to `%s'\n"
 msgstr "Không đủ quyền cho « %s ».\n"
 
-#: src/transport/gnunet-transport.c:550
+#: src/transport/gnunet-transport.c:545
 #, c-format
 msgid ""
 "Successfully connected to `%s', starting to send benchmark data in %u Kb "
 "blocks\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:585
+#: src/transport/gnunet-transport.c:580
 #, fuzzy, c-format
 msgid "Disconnected from peer `%s' while benchmarking\n"
 msgstr "« %.*s » được kết nối tới « %.*s ».\n"
 
-#: src/transport/gnunet-transport.c:655
+#: src/transport/gnunet-transport.c:650
 #, fuzzy, c-format
 msgid "Received %u bytes from %s\n"
 msgstr "Nhận yêu cầu định tuyến\n"
 
-#: src/transport/gnunet-transport.c:678
+#: src/transport/gnunet-transport.c:673
 #, fuzzy, c-format
 msgid "Peer `%s': %s %s\n"
 msgstr "Tôi là đồng đẳng « %s ».\n"
 
-#: src/transport/gnunet-transport.c:693
+#: src/transport/gnunet-transport.c:688
 #, c-format
 msgid "Peer `%s': %s <unable to resolve address>\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:757
+#: src/transport/gnunet-transport.c:752
 #, fuzzy, c-format
 msgid "Peer `%s' disconnected\n"
 msgstr "# của các đồng đẳng đã kết nối"
 
-#: src/transport/gnunet-transport.c:785
+#: src/transport/gnunet-transport.c:780
 #, fuzzy
 msgid "Failed to send connect request to transport service\n"
 msgstr "Lỗi kết nối đến gnunetd.\n"
 
-#: src/transport/gnunet-transport.c:828
+#: src/transport/gnunet-transport.c:825
 #, c-format
 msgid ""
 "Multiple operations given. Please choose only one operation: %s, %s, %s, %s, "
 "%s, %s\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:834
+#: src/transport/gnunet-transport.c:831
 #, c-format
 msgid ""
 "No operation given. Please choose one operation: %s, %s, %s, %s, %s, %s\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:854 src/transport/gnunet-transport.c:884
-#: src/transport/gnunet-transport.c:906 src/transport/gnunet-transport.c:945
+#: src/transport/gnunet-transport.c:851 src/transport/gnunet-transport.c:881
+#: src/transport/gnunet-transport.c:903 src/transport/gnunet-transport.c:940
 #, fuzzy
 msgid "Failed to connect to transport service\n"
 msgstr "Lỗi kết nối đến gnunetd.\n"
 
-#: src/transport/gnunet-transport.c:861 src/transport/gnunet-transport.c:891
+#: src/transport/gnunet-transport.c:858 src/transport/gnunet-transport.c:888
 #, fuzzy
 msgid "Failed to send request to transport service\n"
 msgstr "Lỗi kết nối đến gnunetd.\n"
 
-#: src/transport/gnunet-transport.c:911
+#: src/transport/gnunet-transport.c:908
 msgid "Starting to receive benchmark data\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:995
+#: src/transport/gnunet-transport.c:990
 msgid "measure how fast we are receiving data from all peers (until CTRL-C)"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:998
+#: src/transport/gnunet-transport.c:993
 #, fuzzy
 msgid "connect to a peer"
 msgstr "Lỗi kết nối đến gnunetd.\n"
 
-#: src/transport/gnunet-transport.c:1001
+#: src/transport/gnunet-transport.c:996
 #, fuzzy
 msgid "provide information about all current connections (once)"
 msgstr "In ra thông tin về các đồng đẳng GNUnet."
 
-#: src/transport/gnunet-transport.c:1007
+#: src/transport/gnunet-transport.c:1002
 #, fuzzy
 msgid ""
 "provide information about all connects and disconnect events (continuously)"
 msgstr "In ra thông tin về các đồng đẳng GNUnet."
 
-#: src/transport/gnunet-transport.c:1010
+#: src/transport/gnunet-transport.c:1005
 #, fuzzy
 msgid "do not resolve hostnames"
 msgstr "không quyết định các tên máy"
 
-#: src/transport/gnunet-transport.c:1013
+#: src/transport/gnunet-transport.c:1008
 msgid "peer identity"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1017
+#: src/transport/gnunet-transport.c:1012
 msgid "send data for benchmarking to the other peer (until CTRL-C)"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1020
+#: src/transport/gnunet-transport.c:1015
 msgid "test transport configuration (involves external server)"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1031
+#: src/transport/gnunet-transport.c:1026
 #, fuzzy
 msgid "Direct access to transport service."
 msgstr "Lỗi kết nối đến gnunetd.\n"
 
-#: src/transport/plugin_transport_bluetooth.c:612
+#: src/transport/plugin_transport_bluetooth.c:616
 msgid "# Bluetooth ACKs sent"
 msgstr ""
 
-#: src/transport/plugin_transport_bluetooth.c:631
+#: src/transport/plugin_transport_bluetooth.c:635
 #, fuzzy
 msgid "# Bluetooth messages defragmented"
 msgstr "# các thông báo được chắp liền"
 
-#: src/transport/plugin_transport_bluetooth.c:677
-#: src/transport/plugin_transport_bluetooth.c:727
-#: src/transport/plugin_transport_bluetooth.c:1833
+#: src/transport/plugin_transport_bluetooth.c:681
+#: src/transport/plugin_transport_bluetooth.c:731
+#: src/transport/plugin_transport_bluetooth.c:1837
 #, fuzzy
 msgid "# Bluetooth sessions allocated"
 msgstr "# các khoá phiên chạy được chấp nhận"
 
-#: src/transport/plugin_transport_bluetooth.c:802
+#: src/transport/plugin_transport_bluetooth.c:806
 #, fuzzy
 msgid "# Bluetooth message fragments sent"
 msgstr "# các thông báo bị tế phân"
 
-#: src/transport/plugin_transport_bluetooth.c:826
+#: src/transport/plugin_transport_bluetooth.c:830
 msgid "# Bluetooth messages pending (with fragmentation)"
 msgstr ""
 
-#: src/transport/plugin_transport_bluetooth.c:934
-#: src/transport/plugin_transport_bluetooth.c:1019
-#: src/transport/plugin_transport_bluetooth.c:1835
+#: src/transport/plugin_transport_bluetooth.c:938
+#: src/transport/plugin_transport_bluetooth.c:1023
+#: src/transport/plugin_transport_bluetooth.c:1839
 #, fuzzy
 msgid "# Bluetooth MAC endpoints allocated"
 msgstr "# các yêu cầu get (lấy) dht được nhận"
 
-#: src/transport/plugin_transport_bluetooth.c:1214
+#: src/transport/plugin_transport_bluetooth.c:1218
 #, fuzzy
 msgid "# HELLO messages received via Bluetooth"
 msgstr "# các thông báo PONG đã mật mã được nhận"
 
-#: src/transport/plugin_transport_bluetooth.c:1240
+#: src/transport/plugin_transport_bluetooth.c:1244
 #, fuzzy
 msgid "# fragments received via Bluetooth"
 msgstr "# các mảnh bị loại bỏ"
 
-#: src/transport/plugin_transport_bluetooth.c:1250
+#: src/transport/plugin_transport_bluetooth.c:1254
 #, fuzzy
 msgid "# ACKs received via Bluetooth"
 msgstr "# các byte đã nhận qua TCP"
 
-#: src/transport/plugin_transport_bluetooth.c:1307
+#: src/transport/plugin_transport_bluetooth.c:1311
 #, fuzzy
 msgid "# Bluetooth DATA messages discarded due to CRC32 error"
 msgstr "# các thông báo được chắp liền"
 
-#: src/transport/plugin_transport_bluetooth.c:1419
+#: src/transport/plugin_transport_bluetooth.c:1423
 #, fuzzy
 msgid "# DATA messages received via Bluetooth"
 msgstr "# các thông báo PONG đã mật mã được nhận"
 
-#: src/transport/plugin_transport_bluetooth.c:1454
+#: src/transport/plugin_transport_bluetooth.c:1458
 #, fuzzy
 msgid "# Bluetooth DATA messages processed"
 msgstr "# các thông báo PONG đã mật mã được nhận"
 
-#: src/transport/plugin_transport_bluetooth.c:1517
+#: src/transport/plugin_transport_bluetooth.c:1521
 #, fuzzy
 msgid "# HELLO beacons sent via Bluetooth"
 msgstr "# các byte đã gửi qua UDP"
 
-#: src/transport/plugin_transport_bluetooth.c:1630
+#: src/transport/plugin_transport_bluetooth.c:1634
 msgid "Bluetooth address with invalid size encountered\n"
 msgstr ""
 
-#: src/transport/plugin_transport_bluetooth.c:1814
+#: src/transport/plugin_transport_bluetooth.c:1818
 #, c-format
 msgid "Helper binary `%s' not SUID, cannot run bluetooth transport\n"
 msgstr ""
 
 #: src/transport/plugin_transport_http.c:815
-#: src/transport/plugin_transport_http_server.c:2614
+#: src/transport/plugin_transport_http_server.c:2602
 msgid "Disabling IPv6 since it is not supported on this system!\n"
 msgstr ""
 
 #: src/transport/plugin_transport_http.c:864
-#: src/transport/plugin_transport_http_server.c:2382
+#: src/transport/plugin_transport_http_server.c:2370
 #, fuzzy
 msgid "Require valid port number for service in configuration!\n"
 msgstr "Lỗi lưu cấu hình."
 
 #: src/transport/plugin_transport_http.c:896
-#: src/transport/plugin_transport_http_server.c:2414 src/util/service.c:1062
+#: src/transport/plugin_transport_http_server.c:2402 src/util/service.c:696
 #, fuzzy, c-format
 msgid "Failed to resolve `%s': %s\n"
 msgstr "Lỗi mở tập tin ghi sự kiện « %s »: %s\n"
 
 #: src/transport/plugin_transport_http.c:913
-#: src/transport/plugin_transport_http_server.c:2431 src/util/service.c:1079
+#: src/transport/plugin_transport_http_server.c:2419 src/util/service.c:713
 #, fuzzy, c-format
 msgid "Failed to find %saddress for `%s'.\n"
 msgstr "Lỗi đóng kết đến cổng %s %d.\n"
 
 #: src/transport/plugin_transport_http.c:1018
-#: src/transport/plugin_transport_http_server.c:2542
+#: src/transport/plugin_transport_http_server.c:2530
 #, c-format
 msgid "Found %u addresses to report to NAT service\n"
 msgstr ""
 
 #: src/transport/plugin_transport_http.c:1131
-#: src/transport/plugin_transport_http_server.c:2722
+#: src/transport/plugin_transport_http_server.c:2710
 msgid "Neither IPv4 nor IPv6 are enabled! Fix in configuration\n"
 msgstr ""
 
 #: src/transport/plugin_transport_http.c:1144
-#: src/transport/plugin_transport_http_server.c:2733
+#: src/transport/plugin_transport_http_server.c:2721
 #, fuzzy
 msgid "Port is required! Fix in configuration\n"
 msgstr ""
@@ -6289,7 +6858,7 @@ msgid ""
 msgstr ""
 
 #: src/transport/plugin_transport_http.c:1221
-#: src/transport/plugin_transport_http_server.c:2848
+#: src/transport/plugin_transport_http_server.c:2836
 #, fuzzy, c-format
 msgid "Using external hostname `%s'\n"
 msgstr "Đang bắt đầu tài về « %s »\n"
@@ -6298,93 +6867,94 @@ msgstr "Đang bắt đầu tài về « %s »\n"
 msgid "No external hostname configured\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_client.c:1587
+#: src/transport/plugin_transport_http_client.c:1586
 #, c-format
 msgid "Could not initialize curl multi handle, failed to start %s plugin!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_client.c:1724
-#: src/transport/plugin_transport_http_server.c:2978
+#: src/transport/plugin_transport_http_client.c:1723
+#: src/transport/plugin_transport_http_server.c:2966
 #, fuzzy, c-format
 msgid "Shutting down plugin `%s'\n"
 msgstr "Đang nạp các truyền tải « %s »\n"
 
-#: src/transport/plugin_transport_http_client.c:1749
-#: src/transport/plugin_transport_http_server.c:3038
+#: src/transport/plugin_transport_http_client.c:1748
+#: src/transport/plugin_transport_http_server.c:3026
 #, fuzzy, c-format
 msgid "Shutdown for plugin `%s' complete\n"
 msgstr "Tải lên « %s » hoàn thành, địa chỉ URI là « %s ».\n"
 
-#: src/transport/plugin_transport_http_client.c:1777
-#: src/transport/plugin_transport_http_server.c:2878
+#: src/transport/plugin_transport_http_client.c:1776
+#: src/transport/plugin_transport_http_server.c:2866
 #, fuzzy, c-format
 msgid "Maximum number of connections is %u\n"
 msgstr "tăng sổ tối đa các kết nối TCP/IP"
 
-#: src/transport/plugin_transport_http_server.c:1379
+#: src/transport/plugin_transport_http_server.c:1381
 #, c-format
 msgid ""
 "Access from connection %p (%u of %u) for `%s' `%s' url `%s' with upload data "
 "size %u\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:1644
+#: src/transport/plugin_transport_http_server.c:1646
 #, c-format
 msgid "Accepting connection (%u of %u) from `%s'\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:1652
+#: src/transport/plugin_transport_http_server.c:1654
 #, c-format
 msgid ""
 "Server reached maximum number connections (%u), rejecting new connection\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:1953
+#: src/transport/plugin_transport_http_server.c:1941
 msgid ""
 "Could not create a new TLS certificate, program `gnunet-transport-"
 "certificate-creation' could not be started!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:1977
-msgid "No usable TLS certificate found and creating one failed!\n"
+#: src/transport/plugin_transport_http_server.c:1965
+#, c-format
+msgid "No usable TLS certificate found and creating one at `%s/%s' failed!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:2701
+#: src/transport/plugin_transport_http_server.c:2689
 #, c-format
 msgid "IPv4 support is %s\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:2715
+#: src/transport/plugin_transport_http_server.c:2703
 #, c-format
 msgid "IPv6 support is %s\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:2740
+#: src/transport/plugin_transport_http_server.c:2728
 #, fuzzy, c-format
 msgid "Using port %u\n"
 msgstr "Đang thử nghiệm (các) truyền tải %s\n"
 
-#: src/transport/plugin_transport_http_server.c:2755
+#: src/transport/plugin_transport_http_server.c:2743
 #, fuzzy, c-format
 msgid "Specific IPv4 address `%s' in configuration file is invalid!\n"
 msgstr "Đang thử dùng tập tin « %s » cho cấu hình MySQL.\n"
 
-#: src/transport/plugin_transport_http_server.c:2765
+#: src/transport/plugin_transport_http_server.c:2753
 #, fuzzy, c-format
 msgid "Binding to IPv4 address %s\n"
 msgstr "Mức ưu tiên tiến trình không hợp lê « %s ».\n"
 
-#: src/transport/plugin_transport_http_server.c:2786
+#: src/transport/plugin_transport_http_server.c:2774
 #, fuzzy, c-format
 msgid "Specific IPv6 address `%s' in configuration file is invalid!\n"
 msgstr "Đang thử dùng tập tin « %s » cho cấu hình MySQL.\n"
 
-#: src/transport/plugin_transport_http_server.c:2796
+#: src/transport/plugin_transport_http_server.c:2784
 #, fuzzy, c-format
 msgid "Binding to IPv6 address %s\n"
 msgstr "Mức ưu tiên tiến trình không hợp lê « %s ».\n"
 
-#: src/transport/plugin_transport_http_server.c:2864
+#: src/transport/plugin_transport_http_server.c:2852
 #, fuzzy, c-format
 msgid "Notifying transport only about hostname `%s'\n"
 msgstr "không quyết định các tên máy"
@@ -6440,16 +7010,16 @@ msgstr "Gặp sự kiện bất thường: %d\n"
 #: src/transport/plugin_transport_tcp.c:923
 #: src/transport/plugin_transport_tcp.c:973
 #: src/transport/plugin_transport_tcp.c:1059
-#: src/transport/plugin_transport_tcp.c:1202
-#: src/transport/plugin_transport_tcp.c:1219
+#: src/transport/plugin_transport_tcp.c:1206
+#: src/transport/plugin_transport_tcp.c:1223
 #, fuzzy
 msgid "# bytes currently in TCP buffers"
 msgstr "# các byte đã gừi qua TCP"
 
 #: src/transport/plugin_transport_tcp.c:841
 #: src/transport/plugin_transport_tcp.c:1030
-#: src/transport/plugin_transport_tcp.c:2009
-#: src/transport/plugin_transport_tcp.c:2690
+#: src/transport/plugin_transport_tcp.c:2015
+#: src/transport/plugin_transport_tcp.c:2696
 #, fuzzy
 msgid "# TCP sessions active"
 msgstr "# các khoá phiên chạy được chấp nhận"
@@ -6469,54 +7039,54 @@ msgstr "# các byte được gửi"
 msgid "# bytes discarded by TCP (disconnect)"
 msgstr "# các byte loại đi bởi TCP (đi ra)"
 
-#: src/transport/plugin_transport_tcp.c:1176
+#: src/transport/plugin_transport_tcp.c:1180
 #, c-format
 msgid "Trying to send with invalid session %p\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:1413
-#: src/transport/plugin_transport_udp.c:1449
+#: src/transport/plugin_transport_tcp.c:1417
+#: src/transport/plugin_transport_udp.c:1440
 msgid "# requests to create session with invalid address"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:1530
+#: src/transport/plugin_transport_tcp.c:1534
 msgid "# transport-service disconnect requests for TCP"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2059
+#: src/transport/plugin_transport_tcp.c:2065
 #, 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:2242
+#: src/transport/plugin_transport_tcp.c:2248
 msgid "# bytes received via TCP"
 msgstr "# các byte đã nhận qua TCP"
 
-#: src/transport/plugin_transport_tcp.c:2322
+#: src/transport/plugin_transport_tcp.c:2328
 msgid "# network-level TCP disconnect events"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2570 src/util/service.c:957
-#: src/util/service.c:963
+#: src/transport/plugin_transport_tcp.c:2576 src/util/service.c:589
+#: src/util/service.c:595
 #, c-format
 msgid "Require valid port number for service `%s' in configuration!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2584
+#: src/transport/plugin_transport_tcp.c:2590
 #, fuzzy
 msgid "Failed to start service.\n"
 msgstr "Lỗi bắt đầu thu thập.\n"
 
-#: src/transport/plugin_transport_tcp.c:2677
+#: src/transport/plugin_transport_tcp.c:2683
 #, c-format
 msgid "TCP transport listening on port %llu\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2681
+#: src/transport/plugin_transport_tcp.c:2687
 msgid "TCP transport not listening on any port (client only)\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2685
+#: src/transport/plugin_transport_tcp.c:2691
 #, c-format
 msgid "TCP transport advertises itself as being on port %llu\n"
 msgstr ""
@@ -6541,21 +7111,21 @@ msgstr ""
 msgid "Failed to set IPv4 broadcast option for broadcast socket on port %d\n"
 msgstr ""
 
-#: src/transport/plugin_transport_udp.c:1555
+#: src/transport/plugin_transport_udp.c:1550
 #, c-format
 msgid ""
 "Trying to create session for address of unexpected length %u (should be %u "
 "or %u)\n"
 msgstr ""
 
-#: src/transport/plugin_transport_udp.c:2590
+#: src/transport/plugin_transport_udp.c:2602
 #, c-format
 msgid ""
 "UDP could not transmit message to `%s': Network seems down, please check "
 "your network configuration\n"
 msgstr ""
 
-#: src/transport/plugin_transport_udp.c:2604
+#: src/transport/plugin_transport_udp.c:2616
 #, c-format
 msgid ""
 "UDP could not transmit message to `%s': Please check your network "
@@ -6563,27 +7133,27 @@ msgid ""
 "IPv6 address\n"
 msgstr ""
 
-#: src/transport/plugin_transport_udp.c:2905
+#: src/transport/plugin_transport_udp.c:2917
 #, 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:3003
+#: src/transport/plugin_transport_udp.c:3015
 #, c-format
 msgid "Given `%s' option is out of range: %llu > %u\n"
 msgstr ""
 
-#: src/transport/plugin_transport_udp.c:3046
+#: src/transport/plugin_transport_udp.c:3058
 #, fuzzy, c-format
 msgid "Invalid IPv6 address: `%s'\n"
 msgstr "Mức ưu tiên tiến trình không hợp lê « %s ».\n"
 
-#: src/transport/plugin_transport_udp.c:3105
+#: src/transport/plugin_transport_udp.c:3117
 #, fuzzy
 msgid "Failed to create network sockets, plugin failed\n"
 msgstr "Không thể tạo miền tên.\n"
 
-#: src/transport/plugin_transport_unix.c:1640
+#: src/transport/plugin_transport_unix.c:1627
 #, fuzzy
 msgid "Failed to open UNIX listen socket\n"
 msgstr "Lỗi mở tập tin ghi sự kiện « %s »: %s\n"
@@ -6598,168 +7168,173 @@ msgid "# WLAN messages defragmented"
 msgstr "# các thông báo được chắp liền"
 
 #: src/transport/plugin_transport_wlan.c:688
-#: src/transport/plugin_transport_wlan.c:756
-#: src/transport/plugin_transport_wlan.c:1899
+#: src/transport/plugin_transport_wlan.c:758
+#: src/transport/plugin_transport_wlan.c:1903
 #, fuzzy
 msgid "# WLAN sessions allocated"
 msgstr "# các khoá phiên chạy được chấp nhận"
 
-#: src/transport/plugin_transport_wlan.c:860
+#: src/transport/plugin_transport_wlan.c:863
 #, fuzzy
 msgid "# WLAN message fragments sent"
 msgstr "# các thông báo bị tế phân"
 
-#: src/transport/plugin_transport_wlan.c:884
+#: src/transport/plugin_transport_wlan.c:887
 msgid "# WLAN messages pending (with fragmentation)"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:992
-#: src/transport/plugin_transport_wlan.c:1077
-#: src/transport/plugin_transport_wlan.c:1901
+#: src/transport/plugin_transport_wlan.c:995
+#: src/transport/plugin_transport_wlan.c:1080
+#: src/transport/plugin_transport_wlan.c:1905
 #, fuzzy
 msgid "# WLAN MAC endpoints allocated"
 msgstr "# các yêu cầu get (lấy) dht được nhận"
 
-#: src/transport/plugin_transport_wlan.c:1272
+#: src/transport/plugin_transport_wlan.c:1275
 #, fuzzy
 msgid "# HELLO messages received via WLAN"
 msgstr "# các thông báo PONG đã mật mã được nhận"
 
-#: src/transport/plugin_transport_wlan.c:1298
+#: src/transport/plugin_transport_wlan.c:1301
 #, fuzzy
 msgid "# fragments received via WLAN"
 msgstr "# các mảnh bị loại bỏ"
 
-#: src/transport/plugin_transport_wlan.c:1308
+#: src/transport/plugin_transport_wlan.c:1311
 #, fuzzy
 msgid "# ACKs received via WLAN"
 msgstr "# các byte đã nhận qua TCP"
 
-#: src/transport/plugin_transport_wlan.c:1365
+#: src/transport/plugin_transport_wlan.c:1368
 #, fuzzy
 msgid "# WLAN DATA messages discarded due to CRC32 error"
 msgstr "# các thông báo được chắp liền"
 
-#: src/transport/plugin_transport_wlan.c:1485
+#: src/transport/plugin_transport_wlan.c:1489
 #, fuzzy
 msgid "# DATA messages received via WLAN"
 msgstr "# các thông báo PONG đã mật mã được nhận"
 
-#: src/transport/plugin_transport_wlan.c:1520
+#: src/transport/plugin_transport_wlan.c:1524
 #, fuzzy
 msgid "# WLAN DATA messages processed"
 msgstr "# các thông báo PONG đã mật mã được nhận"
 
-#: src/transport/plugin_transport_wlan.c:1583
+#: src/transport/plugin_transport_wlan.c:1587
 #, fuzzy
 msgid "# HELLO beacons sent via WLAN"
 msgstr "# các byte đã gửi qua UDP"
 
-#: src/transport/plugin_transport_wlan.c:1696
+#: src/transport/plugin_transport_wlan.c:1700
 msgid "WLAN address with invalid size encountered\n"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:1880
+#: src/transport/plugin_transport_wlan.c:1884
 #, c-format
 msgid "Helper binary `%s' not SUID, cannot run WLAN transport\n"
 msgstr ""
 
-#: src/transport/transport_api.c:651
+#: src/transport/transport_api.c:647
 #, fuzzy, c-format
 msgid "Received unexpected message of type %u in %s:%u\n"
 msgstr "Nhận được thông báo bị hỏng từ đồng đẳng « %s » trong %s:%d.\n"
 
-#: src/transport/transport-testing.c:585
+#: src/transport/transport-testing.c:584
 #, fuzzy
 msgid "Failed to initialize testing library!\n"
 msgstr "Lỗi sơ khởi dịch vụ « %s ».\n"
 
-#: src/util/bio.c:137 src/util/bio.c:145
+#: src/tun/regex.c:129
+#, c-format
+msgid "Bad mask: %d\n"
+msgstr ""
+
+#: src/util/bio.c:170 src/util/bio.c:178
 #, fuzzy, c-format
 msgid "Error reading `%s': %s"
 msgstr "Gặp lỗi khi tạo người dùng"
 
-#: src/util/bio.c:147
+#: src/util/bio.c:180
 msgid "End of file"
 msgstr ""
 
-#: src/util/bio.c:199
+#: src/util/bio.c:237
 #, c-format
 msgid "Error reading length of string `%s'"
 msgstr ""
 
-#: src/util/bio.c:209
+#: src/util/bio.c:247
 #, c-format
 msgid "String `%s' longer than allowed (%u > %u)"
 msgstr ""
 
-#: src/util/bio.c:254
+#: src/util/bio.c:293
 #, c-format
 msgid "Serialized metadata `%s' larger than allowed (%u>%u)"
 msgstr ""
 
-#: src/util/bio.c:268
+#: src/util/bio.c:307
 #, c-format
 msgid "Metadata `%s' failed to deserialize"
 msgstr ""
 
-#: src/util/client.c:261 src/util/client.c:839 src/util/service.c:993
+#: src/util/client.c:261 src/util/client.c:851 src/util/service.c:625
 #, c-format
 msgid "UNIXPATH `%s' too long, maximum length is %llu\n"
 msgstr ""
 
-#: src/util/client.c:265 src/util/client.c:843 src/util/service.c:997
+#: src/util/client.c:265 src/util/client.c:856 src/util/service.c:629
 #, fuzzy, c-format
 msgid "Using `%s' instead\n"
 msgstr "%s: tùy chọn « %s » là mơ hồ\n"
 
-#: src/util/client.c:357
+#: src/util/client.c:360
 #, c-format
 msgid ""
 "Could not determine valid hostname and port for service `%s' from "
 "configuration.\n"
 msgstr ""
 
-#: src/util/client.c:365
+#: src/util/client.c:368
 #, c-format
 msgid "Need a non-empty hostname for service `%s'.\n"
 msgstr ""
 
-#: src/util/client.c:981
+#: src/util/client.c:991
 #, fuzzy, c-format
 msgid "Could not connect to service `%s', configuration broken.\n"
 msgstr "Không thể kết nối tới %s:%u: %s\n"
 
-#: src/util/client.c:993
+#: src/util/client.c:1003
 #, fuzzy, c-format
 msgid "Failure to transmit request to service `%s'\n"
 msgstr "Lỗi đọc danh sách bạn bè từ « %s »\n"
 
-#: src/util/client.c:1259
+#: src/util/client.c:1274
 msgid "Could not submit request, not expecting to receive a response.\n"
 msgstr ""
 
-#: src/util/common_logging.c:256 src/util/common_logging.c:1033
+#: src/util/common_logging.c:254 src/util/common_logging.c:1039
 msgid "DEBUG"
 msgstr "GỠ LỖI"
 
-#: src/util/common_logging.c:258 src/util/common_logging.c:1031
+#: src/util/common_logging.c:256 src/util/common_logging.c:1037
 msgid "INFO"
 msgstr "TIN"
 
-#: src/util/common_logging.c:260 src/util/common_logging.c:1029
+#: src/util/common_logging.c:258 src/util/common_logging.c:1035
 msgid "WARNING"
 msgstr "CẢNH BÁO"
 
-#: src/util/common_logging.c:262 src/util/common_logging.c:1027
+#: src/util/common_logging.c:260 src/util/common_logging.c:1033
 msgid "ERROR"
 msgstr "LỖI"
 
-#: src/util/common_logging.c:264 src/util/common_logging.c:1035
+#: src/util/common_logging.c:262 src/util/common_logging.c:1041
 msgid "NONE"
 msgstr ""
 
-#: src/util/common_logging.c:393
+#: src/util/common_logging.c:391
 #, fuzzy, c-format
 msgid "Failed to create or access directory for log file `%s'\n"
 msgstr "Không thể truy cập đến tập tin gnunet-directory « %s »\n"
@@ -6769,37 +7344,37 @@ msgstr "Không thể truy cập đến tập tin gnunet-directory « %s »\n"
 msgid "Message `%.*s' repeated %u times in the last %s\n"
 msgstr "Thông điệp « %.*s » đã lặp lại %u lần trong %llu giây trước\n"
 
-#: src/util/common_logging.c:1036
+#: src/util/common_logging.c:1042
 msgid "INVALID"
 msgstr ""
 
-#: src/util/common_logging.c:1138
+#: src/util/common_logging.c:1150
 msgid "unknown address"
 msgstr ""
 
-#: src/util/common_logging.c:1177
+#: src/util/common_logging.c:1189
 msgid "invalid address"
 msgstr ""
 
-#: src/util/common_logging.c:1195
+#: src/util/common_logging.c:1207
 #, 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:1216
+#: src/util/common_logging.c:1228
 #, fuzzy, c-format
 msgid ""
 "Configuration specifies invalid value for option `%s' in section `%s': %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/configuration.c:291
+#: src/util/configuration.c:288
 #, fuzzy, c-format
 msgid "Syntax error while deserializing in line %u\n"
 msgstr "Gặp lỗi cú pháp trong tập tin cấu hình « %s » tại dòng %d.\n"
 
-#: src/util/configuration.c:984
+#: src/util/configuration.c:996
 #, c-format
 msgid ""
 "Configuration value '%s' for '%s' in section '%s' is not in set of legal "
@@ -6808,165 +7383,188 @@ msgstr ""
 "Giá trị cấu hình « %s » cho « %s » trong phần « %s » không phải nằm trong "
 "tập hợp các sự chọn được phép\n"
 
-#: src/util/connection.c:424
+#: src/util/configuration.c:1065
+#, c-format
+msgid "Recursive expansion suspected, aborting $-expansion for term `%s'\n"
+msgstr ""
+
+#: src/util/configuration.c:1097
+#, fuzzy, c-format
+msgid "Missing closing `%s' in option `%s'\n"
+msgstr "Giá trị cấu hình « %s » cho « %s » trong phần « %s » nên là con số\n"
+
+#: src/util/configuration.c:1170
+#, c-format
+msgid ""
+"Failed to expand `%s' in `%s' as it is neither found in [PATHS] nor defined "
+"as an environmental variable\n"
+msgstr ""
+
+#: src/util/connection.c:423
 #, fuzzy, c-format
 msgid "Access denied to `%s'\n"
 msgstr "Không đủ quyền cho « %s ».\n"
 
-#: src/util/connection.c:439
+#: src/util/connection.c:438
 #, c-format
 msgid "Accepting connection from `%s': %p\n"
 msgstr ""
 
-#: src/util/connection.c:554
+#: src/util/connection.c:553
 #, fuzzy, c-format
 msgid ""
 "Failed to establish TCP connection to `%s:%u', no further addresses to try.\n"
 msgstr "Lỗi thiết lập kết nối với đồng đẳng.\n"
 
-#: src/util/connection.c:752 src/util/connection.c:919
+#: src/util/connection.c:751 src/util/connection.c:909
 #, fuzzy, c-format
 msgid "Trying to connect to `%s' (%p)\n"
 msgstr "Không thể kết nối tới %s:%u: %s\n"
 
-#: src/util/connection.c:910
+#: src/util/connection.c:900
 #, fuzzy, c-format
 msgid "Attempt to connect to `%s' failed\n"
 msgstr " Lỗi kết nối\n"
 
-#: src/util/container_bloomfilter.c:518
+#: src/util/container_bloomfilter.c:516
 #, c-format
 msgid ""
 "Size of file on disk is incorrect for this Bloom filter (want %llu, have "
 "%llu)\n"
 msgstr ""
 
-#: src/util/crypto_ecc.c:580 src/util/crypto_ecc.c:618
+#: src/util/crypto_ecc.c:940 src/util/crypto_ecc.c:978
+#: src/util/crypto_ecc.c:1096 src/util/crypto_ecc.c:1134
 #, fuzzy, c-format
 msgid "Could not acquire lock on file `%s': %s...\n"
 msgstr "Lỗi mở tập tin theo dõi « %s »: %s\n"
 
-#: src/util/crypto_ecc.c:585
+#: src/util/crypto_ecc.c:945 src/util/crypto_ecc.c:1101
 #, fuzzy
 msgid "Creating a new private key.  This may take a while.\n"
 msgstr "Đang tạo khoá máy mới (có thể hơi lâu).\n"
 
-#: src/util/crypto_ecc.c:622
+#: src/util/crypto_ecc.c:982 src/util/crypto_ecc.c:1138
 msgid "This may be ok if someone is currently generating a private key.\n"
 msgstr ""
 
-#: src/util/crypto_ecc.c:653
+#: src/util/crypto_ecc.c:1012 src/util/crypto_ecc.c:1168
 #, c-format
 msgid ""
 "When trying to read key file `%s' I found %u bytes but I need at least %u.\n"
 msgstr ""
 
-#: src/util/crypto_ecc.c:658
+#: src/util/crypto_ecc.c:1016 src/util/crypto_ecc.c:1172
 msgid "This may be ok if someone is currently generating a key.\n"
 msgstr ""
 
-#: src/util/crypto_ecc.c:741
+#: src/util/crypto_ecc.c:1254
 #, fuzzy
 msgid "Could not load peer's private key\n"
 msgstr "Không thể truy cập đến tập tin gnunet-directory « %s »\n"
 
-#: src/util/crypto_ecc.c:803
+#: src/util/crypto_ecc.c:1343
 #, 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:883
+#: src/util/crypto_ecc.c:1393
+#, 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:1472
 #, fuzzy, c-format
-msgid "ECC signature verification failed at %s:%d: %s\n"
+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_random.c:281
+#: src/util/crypto_ecc.c:1534
+#, 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"
+
+#: src/util/crypto_random.c:320
 #, c-format
 msgid "Starting `%s' process to generate entropy\n"
 msgstr ""
 
-#: src/util/crypto_random.c:312
+#: src/util/crypto_random.c:351
 #, c-format
 msgid "libgcrypt has not the expected version (version %s is required).\n"
 msgstr "libgcrypt không có phiên bản mong đợi (yêu cầu phiên bản %s).\n"
 
-#: src/util/disk.c:1150
+#: src/util/disk.c:1185
 #, c-format
 msgid "Expected `%s' to be a directory!\n"
 msgstr "Mong đợi « %s » là một thư mục.\n"
 
-#: src/util/disk.c:1507 src/util/service.c:1674
+#: src/util/disk.c:1543 src/util/service.c:1315
 #, c-format
 msgid "Cannot obtain information about user `%s': %s\n"
 msgstr "Không thể lấy thông tin về người dùng « %s »: %s\n"
 
-#: src/util/disk.c:1954
-#, c-format
-msgid "No `%s' specified for service `%s' in configuration.\n"
-msgstr ""
-
-#: src/util/getopt.c:570
+#: src/util/getopt.c:568
 #, c-format
 msgid "%s: option `%s' is ambiguous\n"
 msgstr "%s: tùy chọn « %s » là mơ hồ\n"
 
-#: src/util/getopt.c:594
+#: src/util/getopt.c:592
 #, c-format
 msgid "%s: option `--%s' does not allow an argument\n"
 msgstr "%s: tùy chọn « --%s » không cho phép đối số\n"
 
-#: src/util/getopt.c:599
+#: src/util/getopt.c:597
 #, c-format
 msgid "%s: option `%c%s' does not allow an argument\n"
 msgstr "%s: tùy chọn « %c%s » không cho phép đối số\n"
 
-#: src/util/getopt.c:616 src/util/getopt.c:783
+#: src/util/getopt.c:614 src/util/getopt.c:781
 #, c-format
 msgid "%s: option `%s' requires an argument\n"
 msgstr "%s: tùy chọn « %s » cần thiết đối số\n"
 
-#: src/util/getopt.c:645
+#: src/util/getopt.c:643
 #, c-format
 msgid "%s: unrecognized option `--%s'\n"
 msgstr "%s: không nhận ra tùy chọn « --%s »\n"
 
-#: src/util/getopt.c:649
+#: src/util/getopt.c:647
 #, c-format
 msgid "%s: unrecognized option `%c%s'\n"
 msgstr "%s: không nhận ra tùy chọn « %c%s »\n"
 
-#: src/util/getopt.c:674
+#: src/util/getopt.c:672
 #, c-format
 msgid "%s: illegal option -- %c\n"
 msgstr "%s: tùy chọn không được phép -- %c\n"
 
-#: src/util/getopt.c:676
+#: src/util/getopt.c:674
 #, c-format
 msgid "%s: invalid option -- %c\n"
 msgstr "%s: tùy chọn không hợp lệ -- %c\n"
 
-#: src/util/getopt.c:704 src/util/getopt.c:831
+#: src/util/getopt.c:702 src/util/getopt.c:829
 #, c-format
 msgid "%s: option requires an argument -- %c\n"
 msgstr "%s: tùy chọn cần thiết đối số -- %c\n"
 
-#: src/util/getopt.c:752
+#: src/util/getopt.c:750
 #, c-format
 msgid "%s: option `-W %s' is ambiguous\n"
 msgstr "%s: tùy chọn « -W %s » là mơ hồ\n"
 
-#: src/util/getopt.c:770
+#: src/util/getopt.c:768
 #, c-format
 msgid "%s: option `-W %s' does not allow an argument\n"
 msgstr "%s: tùy chọn « -W %s » không cho phép đối số\n"
 
-#: src/util/getopt.c:935
+#: src/util/getopt.c:933
 #, fuzzy, c-format
 msgid "Use %s to get a list of options.\n"
 msgstr ""
 "Hãy sử dụng câu lệnh trợ giúp « --help » để xem danh sách các tùy chọn.\n"
 
-#: src/util/getopt_helpers.c:86
+#: src/util/getopt_helpers.c:84
 #, c-format
 msgid ""
 "Arguments mandatory for long options are also mandatory for short options.\n"
@@ -6974,12 +7572,12 @@ msgstr ""
 "Mọi đối số bắt buộc phải sử dụng với tùy chọn dài cũng bắt buộc với tùy chọn "
 "ngắn.\n"
 
-#: src/util/getopt_helpers.c:270 src/util/getopt_helpers.c:328
+#: src/util/getopt_helpers.c:268 src/util/getopt_helpers.c:326
 #, c-format
 msgid "You must pass a number to the `%s' option.\n"
 msgstr "Phải gửi một con số cho tùy chọn « %s ».\n"
 
-#: src/util/getopt_helpers.c:300
+#: src/util/getopt_helpers.c:298
 #, fuzzy, c-format
 msgid "You must pass relative time to the `%s' option.\n"
 msgstr "Phải gửi một con số cho tùy chọn « %s ».\n"
@@ -7046,24 +7644,23 @@ msgid ""
 "Error, %u keys not generated\n"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:118
-#, c-format
+#: src/util/gnunet-ecc.c:119
 msgid "No hostkey file specified on command line\n"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:163
+#: src/util/gnunet-ecc.c:168
 msgid "create COUNT public-private key pairs (for testing)"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:166
+#: src/util/gnunet-ecc.c:171
 msgid "print the public key in ASCII format"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:169
+#: src/util/gnunet-ecc.c:174
 msgid "print the hash of the public key in ASCII format"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:180
+#: src/util/gnunet-ecc.c:185
 #, fuzzy
 msgid "Manipulate GNUnet private ECC key files"
 msgstr "cập nhật một giá trị trong tập tin cấu hình"
@@ -7111,75 +7708,75 @@ msgstr ""
 msgid "Perform default-actions for GNUnet URIs"
 msgstr ""
 
-#: src/util/helper.c:330
+#: src/util/helper.c:338
 #, fuzzy, c-format
 msgid "Error reading from `%s': %s\n"
 msgstr "Gặp lỗi khi tạo người dùng"
 
-#: src/util/helper.c:375
+#: src/util/helper.c:383
 #, fuzzy, c-format
 msgid "Failed to parse inbound message from helper `%s'\n"
 msgstr "Lỗi đọc danh sách bạn bè từ « %s »\n"
 
-#: src/util/helper.c:572
+#: src/util/helper.c:609
 #, fuzzy, c-format
 msgid "Error writing to `%s': %s\n"
 msgstr "Gặp lỗi khi tạo người dùng"
 
-#: src/util/network.c:132
+#: src/util/network.c:134
 #, c-format
 msgid "Unable to shorten unix path `%s' while keeping name unique\n"
 msgstr ""
 
-#: src/util/network.c:1370
+#: src/util/network.c:1397
 #, c-format
 msgid ""
 "Fatal internal logic error, process hangs in `%s' (abort with CTRL-C)!\n"
 msgstr ""
 
-#: src/util/os_installation.c:423
+#: src/util/os_installation.c:421
 #, c-format
 msgid ""
 "Could not determine installation path for %s.  Set `%s' environment "
 "variable.\n"
 msgstr ""
 
-#: src/util/os_installation.c:709
+#: src/util/os_installation.c:710
 #, fuzzy, c-format
 msgid "Could not find binary `%s' in PATH!\n"
 msgstr "Không thể đọc danh sách bạn bè « %s »\n"
 
-#: src/util/os_installation.c:769
+#: src/util/os_installation.c:770
 #, fuzzy, c-format
 msgid "CreateProcess failed for binary %s (%d).\n"
 msgstr "« %s » thất bại cho ổ đĩa « %s »: %u\n"
 
-#: src/util/os_installation.c:779
+#: src/util/os_installation.c:780
 #, c-format
 msgid "GetExitCodeProcess failed for binary %s (%d).\n"
 msgstr ""
 
-#: src/util/plugin.c:89
+#: src/util/plugin.c:87
 #, c-format
 msgid "Initialization of plugin mechanism failed: %s!\n"
 msgstr "Lỗi sơ khởi cơ chế phần bổ sung: %s\n"
 
-#: src/util/plugin.c:146
+#: src/util/plugin.c:144
 #, c-format
 msgid "`%s' failed to resolve method '%s' with error: %s\n"
 msgstr "« %s » không giải quyết được phương pháp « %s », với lỗi: %s\n"
 
-#: src/util/plugin.c:219
+#: src/util/plugin.c:217
 #, c-format
 msgid "`%s' failed for library `%s' with error: %s\n"
 msgstr "« %s » thất bại cho thư viện « %s » với lỗi: %s\n"
 
-#: src/util/plugin.c:349
+#: src/util/plugin.c:347
 #, fuzzy
 msgid "Could not determine plugin installation path.\n"
 msgstr "Không thể truy cập đến thông tin về không gian tên.\n"
 
-#: src/util/program.c:254 src/util/service.c:1796
+#: src/util/program.c:262 src/util/service.c:1452
 #, fuzzy, c-format
 msgid "Could not access configuration file `%s'\n"
 msgstr "Không thể truy cập đến tập tin gnunet-directory « %s »\n"
@@ -7189,7 +7786,7 @@ msgstr "Không thể truy cập đến tập tin gnunet-directory « %s »\n"
 msgid "Must specify `%s' for `%s' in configuration!\n"
 msgstr "Đang thử dùng tập tin « %s » cho cấu hình MySQL.\n"
 
-#: src/util/resolver_api.c:217
+#: src/util/resolver_api.c:216
 #, c-format
 msgid ""
 "Must specify `%s' or numeric IP address for `%s' of `%s' in configuration!\n"
@@ -7205,451 +7802,519 @@ msgstr "GNUnet bây giờ sử dụng địa chỉ IP %s.\n"
 msgid "Timeout trying to resolve hostname `%s'.\n"
 msgstr "không quyết định các tên máy"
 
-#: src/util/resolver_api.c:886
+#: src/util/resolver_api.c:891
 #, fuzzy, c-format
 msgid "Could not resolve our FQDN : %s\n"
 msgstr "Không thể giải quyết « %s » (%s): %s\n"
 
-#: src/util/scheduler.c:802
+#: src/util/scheduler.c:804
 msgid "Looks like we're busy waiting...\n"
 msgstr ""
 
-#: src/util/scheduler.c:933
+#: src/util/scheduler.c:938
 #, c-format
 msgid "Attempt to cancel dead task %llu!\n"
 msgstr ""
 
-#: src/util/server.c:482
+#: src/util/server.c:484
 #, fuzzy, c-format
 msgid "`%s' failed for port %d (%s).\n"
 msgstr "« %s » thất bại cho ổ đĩa « %s »: %u\n"
 
-#: src/util/server.c:491
+#: src/util/server.c:493
 #, fuzzy, c-format
 msgid "`%s' failed for port %d (%s): address already in use\n"
 msgstr "« %s » bị lỗi cho cổng %d. Trình gnunetd có chạy chưa?\n"
 
-#: src/util/server.c:502
+#: src/util/server.c:499
 #, fuzzy, c-format
-msgid "`%s' failed for `%.*s': address already in use\n"
+msgid "`%s' failed for `%s': address already in use\n"
 msgstr "« %s » bị lỗi cho cổng %d. Trình gnunetd có chạy chưa?\n"
 
-#: src/util/server.c:894
+#: src/util/server.c:892
 #, c-format
 msgid ""
 "Processing code for message of type %u did not call "
 "`GNUNET_SERVER_receive_done' after %s\n"
 msgstr ""
 
-#: src/util/service.c:151 src/util/service.c:177 src/util/service.c:220
-#: src/util/service.c:241 src/util/service.c:248
-#, c-format
-msgid "Invalid format for IP: `%s'\n"
-msgstr "Địa chỉ IP định dạng sai: %s\n"
-
-#: src/util/service.c:204
-#, c-format
-msgid "Invalid network notation ('/%d' is not legal in IPv4 CIDR)."
-msgstr "Ký hiệu mạng sai (« /%d » không hợp lệ trong CIDR IPv4)."
-
-#: src/util/service.c:297
-#, c-format
-msgid "Invalid network notation (does not end with ';': `%s')\n"
-msgstr "Ký hiệu mạng sai (không kết thúc với « ; »: « %s »)\n"
-
-#: src/util/service.c:329
-#, fuzzy, c-format
-msgid "Wrong format `%s' for netmask\n"
-msgstr "Mặt nạ mạng có định dạng sai « %s »: %s\n"
-
-#: src/util/service.c:359
-#, fuzzy, c-format
-msgid "Wrong format `%s' for network\n"
-msgstr "Mạng có định dạng sai « %s »: %s\n"
-
-#: src/util/service.c:716
-#, c-format
-msgid "Access denied to UID %d / GID %d\n"
-msgstr ""
-
-#: src/util/service.c:721
+#: src/util/service.c:362
 #, fuzzy, c-format
 msgid "Unknown address family %d\n"
 msgstr "\tKhông rõ miền tên « %s »\n"
 
-#: src/util/service.c:728
+#: src/util/service.c:369
 #, c-format
 msgid "Access from `%s' denied to service `%s'\n"
 msgstr ""
 
-#: src/util/service.c:783
+#: src/util/service.c:424
 #, c-format
 msgid "Could not parse IPv4 network specification `%s' for `%s:%s'\n"
 msgstr ""
 
-#: src/util/service.c:820
+#: src/util/service.c:461
 #, c-format
 msgid "Could not parse IPv6 network specification `%s' for `%s:%s'\n"
 msgstr ""
 
-#: src/util/service.c:938
+#: src/util/service.c:570
 #, c-format
 msgid ""
 "Disabling IPv6 support for service `%s', failed to create IPv6 socket: %s\n"
 msgstr ""
 
-#: src/util/service.c:1016
+#: src/util/service.c:651
 #, c-format
 msgid ""
 "Disabling UNIX domain socket support for service `%s', failed to create UNIX "
 "domain socket: %s\n"
 msgstr ""
 
-#: src/util/service.c:1033
+#: src/util/service.c:667
 #, c-format
 msgid "Have neither PORT nor UNIXPATH for service `%s', but one is required\n"
 msgstr ""
 
-#: src/util/service.c:1267
+#: src/util/service.c:901
 msgid "Could not access a pre-bound socket, will try to bind myself\n"
 msgstr ""
 
-#: src/util/service.c:1316 src/util/service.c:1334
+#: src/util/service.c:950 src/util/service.c:968
 #, c-format
 msgid "Specified value for `%s' of service `%s' is invalid\n"
 msgstr ""
 
-#: src/util/service.c:1359
+#: src/util/service.c:993
 #, c-format
 msgid "Could not access pre-bound socket %u, will try to bind myself\n"
 msgstr ""
 
-#: src/util/service.c:1530
+#: src/util/service.c:1163
 #, fuzzy, c-format
 msgid "Failed to start `%s' at `%s'\n"
 msgstr "Lỗi chạy %s: %s %d\n"
 
-#: src/util/service.c:1563
+#: src/util/service.c:1204
 #, fuzzy, c-format
 msgid "Service `%s' runs at %s\n"
 msgstr "Đồng đẳng « %s » có mức tin cậy %8u\n"
 
-#: src/util/service.c:1612
+#: src/util/service.c:1253
 msgid "Service process failed to initialize\n"
 msgstr ""
 
-#: src/util/service.c:1616
+#: src/util/service.c:1257
 msgid "Service process could not initialize server function\n"
 msgstr ""
 
-#: src/util/service.c:1620
+#: src/util/service.c:1261
 msgid "Service process failed to report status\n"
 msgstr ""
 
-#: src/util/service.c:1675
+#: src/util/service.c:1316
 msgid "No such user"
 msgstr "Không có người dùng như vậy"
 
-#: src/util/service.c:1688
+#: src/util/service.c:1329
 #, c-format
 msgid "Cannot change user/group to `%s': %s\n"
 msgstr "Không thể thay đổi người dùng/nhóm thành « %s »: %s\n"
 
-#: src/util/service.c:1754
+#: src/util/service.c:1399
 msgid "do daemonize (detach from terminal)"
 msgstr ""
 
-#: src/util/signal.c:80
+#: src/util/signal.c:79
 #, c-format
 msgid "signal (%d, %p) returned %d.\n"
 msgstr ""
 
-#: src/util/strings.c:146
+#: src/util/strings.c:145
 msgid "b"
 msgstr "b"
 
-#: src/util/strings.c:429
+#: src/util/strings.c:444
 #, c-format
 msgid "Character sets requested were `%s'->`%s'\n"
 msgstr ""
 
-#: src/util/strings.c:544
+#: src/util/strings.c:572
 msgid "Failed to expand `$HOME': environment variable `HOME' not set"
 msgstr ""
 "Lỗi mở rộng biến môi trường « $HOME »: chưa đặt biến môi trường « HOME »"
 
-#: src/util/strings.c:641
+#: src/util/strings.c:669
 msgid "µs"
 msgstr ""
 
-#: src/util/strings.c:645
+#: src/util/strings.c:673
 msgid "forever"
 msgstr ""
 
-#: src/util/strings.c:647
+#: src/util/strings.c:675
 msgid "0 ms"
 msgstr ""
 
-#: src/util/strings.c:653
+#: src/util/strings.c:681
 msgid "ms"
 msgstr "mg"
 
-#: src/util/strings.c:659
+#: src/util/strings.c:687
 msgid "s"
 msgstr "g"
 
-#: src/util/strings.c:665
+#: src/util/strings.c:693
 msgid "m"
 msgstr "p"
 
-#: src/util/strings.c:671
+#: src/util/strings.c:699
 msgid "h"
 msgstr "g"
 
-#: src/util/strings.c:678
+#: src/util/strings.c:706
 #, fuzzy
 msgid "day"
 msgstr " ngày"
 
-#: src/util/strings.c:680
+#: src/util/strings.c:708
 #, fuzzy
 msgid "days"
 msgstr " ngày"
 
-#: src/util/strings.c:708
+#: src/util/strings.c:737
 msgid "end of time"
 msgstr ""
 
-#: src/util/strings.c:1109
+#: src/util/strings.c:1141
 msgid "IPv6 address did not start with `['\n"
 msgstr ""
 
-#: src/util/strings.c:1117
+#: src/util/strings.c:1149
 msgid "IPv6 address did contain ':' to separate port number\n"
 msgstr ""
 
-#: src/util/strings.c:1123
+#: src/util/strings.c:1155
 msgid "IPv6 address did contain ']' before ':' to separate port number\n"
 msgstr ""
 
-#: src/util/strings.c:1130
+#: src/util/strings.c:1162
 msgid "IPv6 address did contain a valid port number after the last ':'\n"
 msgstr ""
 
-#: src/util/strings.c:1139
+#: src/util/strings.c:1171
 #, fuzzy, c-format
 msgid "Invalid IPv6 address `%s': %s\n"
 msgstr "Mức ưu tiên tiến trình không hợp lê « %s ».\n"
 
-#: src/vpn/gnunet-service-vpn.c:523 src/vpn/gnunet-service-vpn.c:1128
+#: src/util/strings.c:1377 src/util/strings.c:1393
+msgid "Port not in range\n"
+msgstr ""
+
+#: src/util/strings.c:1402
+#, fuzzy, c-format
+msgid "Malformed port policy `%s'\n"
+msgstr "Lỗi bắt đầu thu thập.\n"
+
+#: src/util/strings.c:1486 src/util/strings.c:1517 src/util/strings.c:1565
+#: src/util/strings.c:1586
+#, c-format
+msgid "Invalid format for IP: `%s'\n"
+msgstr "Địa chỉ IP định dạng sai: %s\n"
+
+#: src/util/strings.c:1543
+#, c-format
+msgid "Invalid network notation ('/%d' is not legal in IPv4 CIDR)."
+msgstr "Ký hiệu mạng sai (« /%d » không hợp lệ trong CIDR IPv4)."
+
+#: src/util/strings.c:1595
+#, fuzzy, c-format
+msgid "Invalid format: `%s'\n"
+msgstr "Địa chỉ IP định dạng sai: %s\n"
+
+#: src/util/strings.c:1647
+#, c-format
+msgid "Invalid network notation (does not end with ';': `%s')\n"
+msgstr "Ký hiệu mạng sai (không kết thúc với « ; »: « %s »)\n"
+
+#: src/util/strings.c:1697
+#, fuzzy, c-format
+msgid "Wrong format `%s' for netmask\n"
+msgstr "Mặt nạ mạng có định dạng sai « %s »: %s\n"
+
+#: src/util/strings.c:1728
+#, fuzzy, c-format
+msgid "Wrong format `%s' for network\n"
+msgstr "Mạng có định dạng sai « %s »: %s\n"
+
+#: src/vpn/gnunet-service-vpn.c:550 src/vpn/gnunet-service-vpn.c:1088
 #, fuzzy
 msgid "# Active tunnels"
 msgstr "# các kết nối dht"
 
-#: src/vpn/gnunet-service-vpn.c:622 src/vpn/gnunet-service-vpn.c:661
-#, fuzzy
-msgid "# peers connected to mesh tunnels"
-msgstr "# của các đồng đẳng đã kết nối"
-
-#: src/vpn/gnunet-service-vpn.c:712
+#: src/vpn/gnunet-service-vpn.c:642
 #, fuzzy
 msgid "# Bytes given to mesh for transmission"
 msgstr "# các thông báo PING được tạo"
 
-#: src/vpn/gnunet-service-vpn.c:750
+#: src/vpn/gnunet-service-vpn.c:680
 #, fuzzy
 msgid "# Bytes dropped in mesh queue (overflow)"
 msgstr "# các byte loại bỏ bởi UDP (đi ra)"
 
-#: src/vpn/gnunet-service-vpn.c:814
+#: src/vpn/gnunet-service-vpn.c:754
 #, fuzzy
 msgid "# Mesh tunnels created"
 msgstr "# các truy vấn lỗ hổng được định tuyến"
 
-#: src/vpn/gnunet-service-vpn.c:839
+#: src/vpn/gnunet-service-vpn.c:786
 #, fuzzy
 msgid "Failed to setup mesh tunnel!\n"
 msgstr "Lỗi lấy thông kê về truyền tải.\n"
 
-#: src/vpn/gnunet-service-vpn.c:1032
+#: src/vpn/gnunet-service-vpn.c:980
 #, c-format
 msgid "Protocol %u not supported, dropping\n"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:1348
+#: src/vpn/gnunet-service-vpn.c:1307
 msgid "# ICMPv4 packets dropped (not allowed)"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:1369
+#: src/vpn/gnunet-service-vpn.c:1328
 msgid "# ICMPv6 packets dropped (not allowed)"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:1574
+#: src/vpn/gnunet-service-vpn.c:1533
 #, fuzzy
 msgid "# Packets received from TUN interface"
 msgstr "# các đáp ứng lỗ hổng được gửi cho trình/máy khách"
 
-#: src/vpn/gnunet-service-vpn.c:1612 src/vpn/gnunet-service-vpn.c:1653
+#: src/vpn/gnunet-service-vpn.c:1566 src/vpn/gnunet-service-vpn.c:1602
 #, c-format
 msgid "Packet received for unmapped destination `%s' (dropping it)\n"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:1663
+#: src/vpn/gnunet-service-vpn.c:1612
 msgid "Received IPv4 packet with options (dropping it)\n"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:1677
+#: src/vpn/gnunet-service-vpn.c:1626
 #, c-format
 msgid "Received packet of unknown protocol %d from TUN (dropping it)\n"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:1759
+#: src/vpn/gnunet-service-vpn.c:1708
 #, fuzzy
 msgid "# ICMP packets received from mesh"
 msgstr "# các đáp ứng lỗ hổng được gửi cho trình/máy khách"
 
-#: src/vpn/gnunet-service-vpn.c:2098
+#: src/vpn/gnunet-service-vpn.c:2047
 #, fuzzy
 msgid "# UDP packets received from mesh"
 msgstr "# các đáp ứng lỗ hổng được gửi cho trình/máy khách"
 
-#: src/vpn/gnunet-service-vpn.c:2253
+#: src/vpn/gnunet-service-vpn.c:2202
 #, fuzzy
 msgid "# TCP packets received from mesh"
 msgstr "# các đáp ứng lỗ hổng được gửi cho trình/máy khách"
 
-#: src/vpn/gnunet-service-vpn.c:2404
+#: src/vpn/gnunet-service-vpn.c:2353
 msgid "Failed to find unallocated IPv4 address in VPN's range\n"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:2459
+#: src/vpn/gnunet-service-vpn.c:2408
 msgid "Failed to find unallocated IPv6 address in VPN's range\n"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:2498 src/vpn/gnunet-service-vpn.c:2711
+#: src/vpn/gnunet-service-vpn.c:2449 src/vpn/gnunet-service-vpn.c:2665
 #, fuzzy
 msgid "# Active destinations"
 msgstr "# các kết nối dht"
 
-#: src/vpn/gnunet-service-vpn.c:2784
+#: src/vpn/gnunet-service-vpn.c:2717
 msgid "Failed to allocate IP address for new destination\n"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:3112
+#: src/vpn/gnunet-service-vpn.c:2984
 #, fuzzy
 msgid "Must specify valid IPv6 address"
 msgstr "« %s » không sẵn sàng.\n"
 
-#: src/vpn/gnunet-service-vpn.c:3133
+#: src/vpn/gnunet-service-vpn.c:3008
 msgid "Must specify valid IPv6 mask"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:3141
+#: src/vpn/gnunet-service-vpn.c:3016
 msgid "IPv6 support disabled as this system does not support IPv6\n"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:3153
+#: src/vpn/gnunet-service-vpn.c:3029
 #, fuzzy
 msgid "Must specify valid IPv4 address"
 msgstr "« %s » không sẵn sàng.\n"
 
-#: src/vpn/gnunet-service-vpn.c:3164
+#: src/vpn/gnunet-service-vpn.c:3042
 msgid "Must specify valid IPv4 mask"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:3173
+#: src/vpn/gnunet-service-vpn.c:3052
 msgid "IPv4 support disabled as this system does not support IPv4\n"
 msgstr ""
 
-#: src/vpn/gnunet-vpn.c:151
+#: src/vpn/gnunet-vpn.c:146
 #, fuzzy
 msgid "Error creating tunnel\n"
 msgstr "Hoàn thành tạo khoá.\n"
 
-#: src/vpn/gnunet-vpn.c:194 src/vpn/gnunet-vpn.c:225
+#: src/vpn/gnunet-vpn.c:189 src/vpn/gnunet-vpn.c:220
 #, fuzzy, c-format
 msgid "Option `%s' makes no sense with option `%s'.\n"
 msgstr "Tùy chọn « %s » không có nghĩa khi không có tùy chọn « %s ».\n"
 
-#: src/vpn/gnunet-vpn.c:207
+#: src/vpn/gnunet-vpn.c:202
 #, fuzzy, c-format
 msgid "Option `%s' or `%s' is required.\n"
 msgstr "Bị từ chối đặt tùy chọn « %s » trong phần « %s » thành « %s ».\n"
 
-#: src/vpn/gnunet-vpn.c:219
+#: src/vpn/gnunet-vpn.c:214
 #, fuzzy, c-format
 msgid "Option `%s' or `%s' is required when using option `%s'.\n"
 msgstr "Tùy chọn « %s » cần thiết khi dùng tùy chọn « %s ».\n"
 
-#: src/vpn/gnunet-vpn.c:237
+#: src/vpn/gnunet-vpn.c:233
 #, fuzzy, c-format
 msgid "`%s' is not a valid peer identifier.\n"
 msgstr "« %s » không sẵn sàng.\n"
 
-#: src/vpn/gnunet-vpn.c:259
+#: src/vpn/gnunet-vpn.c:254
 #, fuzzy, c-format
 msgid "`%s' is not a valid IP address.\n"
 msgstr "« %s » không sẵn sàng.\n"
 
-#: src/vpn/gnunet-vpn.c:295
+#: src/vpn/gnunet-vpn.c:289
 msgid "request that result should be an IPv4 address"
 msgstr ""
 
-#: src/vpn/gnunet-vpn.c:298
+#: src/vpn/gnunet-vpn.c:292
 msgid "request that result should be an IPv6 address"
 msgstr ""
 
-#: src/vpn/gnunet-vpn.c:301
-msgid "print IP address only after mesh tunnel has been created"
-msgstr ""
-
-#: src/vpn/gnunet-vpn.c:304
+#: src/vpn/gnunet-vpn.c:295
 msgid "how long should the mapping be valid for new tunnels?"
 msgstr ""
 
-#: src/vpn/gnunet-vpn.c:307
+#: src/vpn/gnunet-vpn.c:298
 msgid "destination IP for the tunnel"
 msgstr ""
 
-#: src/vpn/gnunet-vpn.c:310
+#: src/vpn/gnunet-vpn.c:301
 msgid "peer offering the service we would like to access"
 msgstr ""
 
-#: src/vpn/gnunet-vpn.c:313
+#: src/vpn/gnunet-vpn.c:304
 msgid "name of the service we would like to access"
 msgstr ""
 
-#: src/vpn/gnunet-vpn.c:316
+#: src/vpn/gnunet-vpn.c:307
 #, fuzzy
 msgid "service is offered via TCP"
 msgstr "# các byte đã nhận qua TCP"
 
-#: src/vpn/gnunet-vpn.c:319
+#: src/vpn/gnunet-vpn.c:310
 #, fuzzy
 msgid "service is offered via UDP"
 msgstr "# các byte đã nhận qua UDP"
 
-#: src/vpn/gnunet-vpn.c:331
+#: src/vpn/gnunet-vpn.c:322
 msgid "Setup tunnels via VPN."
 msgstr ""
 
-#: src/include/gnunet_common.h:618 src/include/gnunet_common.h:625
-#: src/include/gnunet_common.h:633
+#: src/include/gnunet_common.h:566 src/include/gnunet_common.h:573
+#: src/include/gnunet_common.h:581
 #, 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:645
+#: src/include/gnunet_common.h:593
 #, 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:672 src/include/gnunet_common.h:681
+#: src/include/gnunet_common.h:620 src/include/gnunet_common.h:629
 #, 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 "Loading block plugin `%s'\n"
+#~ msgstr "Đang nạp các truyền tải « %s »\n"
+
+#, fuzzy
+#~ msgid "Invalid value `%s'\n"
+#~ msgstr "Đối số không hợp lệ cho « %s ».\n"
+
+#, fuzzy
+#~ msgid "Found issuer for public key `%s'\n"
+#~ msgstr "Đang nạp các truyền tải « %s »\n"
+
+#, fuzzy
+#~ msgid "No issuer for public key `%s'\n"
+#~ msgstr "Vẫn còn không tìm thấy đồng đẳng trong « %s ».\n"
+
+#, fuzzy
+#~ msgid "Failed to get slave counters!\n"
+#~ msgstr "Lỗi lấy thông kê về truyền tải.\n"
+
+#, fuzzy
+#~ msgid ""
+#~ "Could not translate E[a%d] to MPI!\n"
+#~ "%s/%s\n"
+#~ msgstr "Không thể lấy địa chỉ IP cho giao diện « %s », dùng « %s ».\n"
+
+#, fuzzy
+#~ msgid "Job command file not given. Exiting\n"
+#~ msgstr "dùng tập tin cấu hình TÊN_TẬP_TIN"
+
+#, fuzzy
+#~ msgid "Error while decoding key %u\n"
+#~ msgstr "Gặp lỗi khi tải xuống: %s\n"
+
+#~ msgid "Could not read friends list `%s'\n"
+#~ msgstr "Không thể đọc danh sách bạn bè « %s »\n"
+
+#, fuzzy
+#~ msgid "Friends file `%s' is empty.\n"
+#~ msgstr "Định dạng của tập tin « %s » là không hợp lệ.\n"
+
+#, fuzzy
+#~ msgid "Failed to read friends list from `%s': out of memory\n"
+#~ msgstr "Lỗi đọc danh sách bạn bè từ « %s »\n"
+
+#~ msgid "Failed to read friends list from `%s'\n"
+#~ msgstr "Lỗi đọc danh sách bạn bè từ « %s »\n"
+
+#, fuzzy
+#~ msgid ""
+#~ "Syntax error in topology specification at offset %llu, skipping bytes.\n"
+#~ msgstr "Lỗi cú pháp trong sự xác định địa hình học, đang bỏ qua các byte.\n"
+
+#, fuzzy
+#~ msgid ""
+#~ "Syntax error in topology specification at offset %llu, skipping bytes `"
+#~ "%s'.\n"
+#~ msgstr ""
+#~ "Lỗi cú pháp trong sự xác định địa hình học, đang bỏ qua các byte « %s ».\n"
+
+#, fuzzy
+#~ msgid "ECC signature verification failed at %s:%d: %s\n"
+#~ msgstr "Lỗi thẩm tra chữ ký RSA tại %s:%d: %s\n"
+
+#, fuzzy
+#~ msgid "# peers connected to mesh tunnels"
+#~ msgstr "# của các đồng đẳng đã kết nối"
+
+#, fuzzy
 #~ msgid "Failed to parse metadata about pseudonym from file `%s': %s\n"
 #~ msgstr "Lỗi phân tích dữ liệu giao diện từ « %s ».\n"
 
@@ -7725,18 +8390,10 @@ msgstr "« %s » thất bại ở tập tin « %s » tại %s:%d với lỗi: %s
 #~ msgstr "Lỗi cập nhật dữ liệu cho mô-đun « %s »\n"
 
 #, fuzzy
-#~ msgid "Failed to read private key for namespace `%s'\n"
-#~ msgstr "Lỗi cập nhật dữ liệu cho mô-đun « %s »\n"
-
-#, fuzzy
 #~ msgid "Failed to read namespace private key file `%s', deleting it!\n"
 #~ msgstr "Lỗi thêm mục nhập vào không gian tên « %s » (có chưa ?)\n"
 
 #, fuzzy
-#~ 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"
-
-#, fuzzy
 #~ msgid "print names of local namespaces"
 #~ msgstr "đặt đánh giá của một không gian tên"
 
@@ -7837,10 +8494,6 @@ msgstr "« %s » thất bại ở tập tin « %s » tại %s:%d với lỗi: %s
 #~ msgstr "« %s » thất bại cho ổ đĩa « %s »: %u\n"
 
 #, fuzzy
-#~ msgid "Service `%s' has been stopped.\n"
-#~ msgstr "Dịch vụ đã bị xoá.\n"
-
-#, fuzzy
 #~ msgid "Service `%s' was already running.\n"
 #~ msgstr "Không gian tên « %s » có đánh giá %d.\n"
 
@@ -7865,10 +8518,6 @@ msgstr "« %s » thất bại ở tập tin « %s » tại %s:%d với lỗi: %s
 #~ msgstr "Cổng để liên lạc với giao diện người dùng GNUnet"
 
 #, fuzzy
-#~ msgid "Operation failed.\n"
-#~ msgstr "Lỗi nội bộ : khẳng định không thành công tại %s:%d.\n"
-
-#, fuzzy
 #~ msgid "Error in communication with PEERINFO service\n"
 #~ msgstr "Cổng để liên lạc với giao diện người dùng GNUnet"
 
@@ -7901,12 +8550,6 @@ msgstr "« %s » thất bại ở tập tin « %s » tại %s:%d với lỗi: %s
 #~ msgstr "Lỗi cú pháp trong sự xác định địa hình học, đang bỏ qua các byte.\n"
 
 #, fuzzy
-#~ msgid ""
-#~ "Syntax error in blacklist file at offset %llu, skipping bytes `%s'.\n"
-#~ msgstr ""
-#~ "Lỗi cú pháp trong sự xác định địa hình học, đang bỏ qua các byte « %s ».\n"
-
-#, fuzzy
 #~ msgid "Failed to read hostkey: %s\n"
 #~ msgstr "Lỗi bắt đầu thu thập.\n"
 
@@ -8106,10 +8749,6 @@ msgstr "« %s » thất bại ở tập tin « %s » tại %s:%d với lỗi: %s
 #~ msgid "User `%s' is currently not in the room!\n"
 #~ msgstr "Người dùng « %s » hiện thời không có trong phòng này.\n"
 
-#, fuzzy
-#~ msgid "Unknown command `%s'\n"
-#~ msgstr "Không rõ câu lệnh « %s ».\n"
-
 #~ msgid ""
 #~ "Use `/join #roomname' to join a chat room. Joining a room will cause you "
 #~ "to leave the current room"
@@ -8147,9 +8786,6 @@ msgstr "« %s » thất bại ở tập tin « %s » tại %s:%d với lỗi: %s
 #~ msgid "The `/anon' command is an alias for `/anonymous'"
 #~ msgstr "Lệnh « /notice » là một biệt hiệu cho « /msg »"
 
-#~ msgid "Use `/quit' to terminate gnunet-chat"
-#~ msgstr "Gõ chuỗi « /quit » để thoát khỏi trình gnunet-chat"
-
 #~ msgid "The `/leave' command is an alias for `/quit'"
 #~ msgstr "Lệnh « /leave » là một biệt hiệu cho « /quit »"
 
@@ -8158,9 +8794,6 @@ msgstr "« %s » thất bại ở tập tin « %s » tại %s:%d với lỗi: %s
 #~ "Gõ chuỗi « /names » để liệt kê tất cả các thành viên hiện thời trong "
 #~ "phòng trò chuyện đó"
 
-#~ msgid "Use `/help command' to get help for a specific command"
-#~ msgstr "Gõ chuỗi « /help LỆNH » để xem trợ giúp về lệnh đó"
-
 #~ msgid "You must specify a nickname\n"
 #~ msgstr "Phải ghi rõ tên hiệu\n"
 
@@ -8364,10 +8997,6 @@ msgstr "« %s » thất bại ở tập tin « %s » tại %s:%d với lỗi: %s
 #~ msgstr "SMTP: « %s » bị lỗi: %s\n"
 
 #, fuzzy
-#~ msgid "stat (%s) failed: %s\n"
-#~ msgstr "SMTP: « %s » bị lỗi: %s\n"
-
-#, fuzzy
 #~ msgid "# Peers connected"
 #~ msgstr "# của các đồng đẳng đã kết nối"
 
@@ -8417,10 +9046,6 @@ msgstr "« %s » thất bại ở tập tin « %s » tại %s:%d với lỗi: %s
 #~ msgstr "# các byte kiểu %d được nhận"
 
 #, fuzzy
-#~ msgid "# fast reconnects failed"
-#~ msgstr "# của các đồng đẳng đã kết nối"
-
-#, fuzzy
 #~ msgid "# peers disconnected due to timeout"
 #~ msgstr "# các kết nối bị đóng (vấn đề truyền tải)"
 
@@ -8601,10 +9226,6 @@ msgstr "« %s » thất bại ở tập tin « %s » tại %s:%d với lỗi: %s
 #~ msgstr "# Tín hiệu HTTP GET được nhận"
 
 #, fuzzy
-#~ msgid "Connection: %X: %s failed at %s:%d: `%s'\n"
-#~ msgstr "%s bị lỗi tại %s:%d: « %s »\n"
-
-#, fuzzy
 #~ msgid "Failed to load transport plugin for http\n"
 #~ msgstr "Không thể nạp phần bổ sung truyền tải « %s »\n"
 
@@ -8892,9 +9513,6 @@ msgstr "« %s » thất bại ở tập tin « %s » tại %s:%d với lỗi: %s
 #~ msgid "Invalid input, expecting integer."
 #~ msgstr "Dữ liệu nhập sai, mong đợi số nguyên."
 
-#~ msgid "Value is not in legal range."
-#~ msgstr "Giá trị không nằm trong phạm vi được phép."
-
 #~ msgid "Configuration unchanged, no need to save.\n"
 #~ msgstr "Cấu hình chưa thay đổi thì không cần lưu lại.\n"
 
@@ -8982,9 +9600,6 @@ msgstr "« %s » thất bại ở tập tin « %s » tại %s:%d với lỗi: %s
 #~ msgid "Too many arguments.\n"
 #~ msgstr "Quá nhiều đối số.\n"
 
-#~ msgid "No interface specified, using default.\n"
-#~ msgstr "Chưa xác định giao diện nên dùng mặc định.\n"
-
 #~ msgid "Undefined option.\n"
 #~ msgstr "Tùy chọn không xác định.\n"
 
@@ -9660,15 +10275,9 @@ msgstr "« %s » thất bại ở tập tin « %s » tại %s:%d với lỗi: %s
 #~ msgid "\tRating (after update): %d\n"
 #~ msgstr "\tĐánh giá (sau khi cập nhật): %d\n"
 
-#~ msgid "Collection stopped.\n"
-#~ msgstr "Thu thập bị dừng.\n"
-
 #~ msgid "Failed to stop collection (not active?).\n"
 #~ msgstr "Lỗi dừng thu thập (không hoạt động ?).\n"
 
-#~ msgid "Pseudonym `%s' deleted.\n"
-#~ msgstr "Biệt hiệu « %s » bị xoá.\n"
-
 #~ msgid "Error deleting pseudonym `%s' (does not exist?).\n"
 #~ msgstr "Lỗ xoá biệt hiệu « %s » (không tồn tại ?).\n"
 
@@ -9888,9 +10497,6 @@ msgstr "« %s » thất bại ở tập tin « %s » tại %s:%d với lỗi: %s
 #~ msgid "File `%s' does not contain a pseudonym.\n"
 #~ msgstr "Tập tin « %s » không chứa biệt hiệu.\n"
 
-#~ msgid "Format of pseudonym `%s' is invalid.\n"
-#~ msgstr "Định dạng của biệt hiệu « %s » là không hợp lệ.\n"
-
 #~ msgid "Format of file `%s' is invalid, trying to remove.\n"
 #~ msgstr "Định dạng của tập tin « %s » là không hợp lệ nên thử gỡ bỏ.\n"
 
diff --git a/po/zh_CN.po b/po/zh_CN.po
index fe7d687b1..523ec2b5d 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnunet-0.8.1\n"
 "Report-Msgid-Bugs-To: gnunet-developers@mail.gnu.org\n"
-"POT-Creation-Date: 2013-09-16 15:01+0200\n"
+"POT-Creation-Date: 2013-11-05 02:07+0100\n"
 "PO-Revision-Date: 2011-07-09 12:12+0800\n"
 "Last-Translator: Wylmer Wang <wantinghard@gmail.com>\n"
 "Language-Team: Chinese (simplified) <i18n-zh@googlegroups.com>\n"
@@ -16,7 +16,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: src/arm/arm_api.c:335
+#: src/arm/arm_api.c:336
 msgid "Client was disconnected from arm service, trying to reconnect.\n"
 msgstr ""
 
@@ -30,414 +30,424 @@ msgstr ""
 msgid "Failed to remove configuration file %s\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/arm/gnunet-arm.c:169
+#: src/arm/gnunet-arm.c:170
 #, c-format
 msgid "Failed to remove servicehome directory %s\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:214 src/testbed/gnunet-service-testbed_peers.c:971
+#: src/arm/gnunet-arm.c:216 src/testbed/gnunet-service-testbed_peers.c:1010
 msgid "Message was sent successfully"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:216
+#: src/arm/gnunet-arm.c:218
 #, fuzzy
 msgid "Misconfiguration (can not connect to the ARM service)"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/arm/gnunet-arm.c:218 src/testbed/gnunet-service-testbed_peers.c:975
+#: src/arm/gnunet-arm.c:220 src/testbed/gnunet-service-testbed_peers.c:1014
 msgid "We disconnected from ARM before we could send a request"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:220 src/testbed/gnunet-service-testbed_peers.c:977
+#: src/arm/gnunet-arm.c:222 src/testbed/gnunet-service-testbed_peers.c:1016
 msgid "ARM API is busy"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:222
+#: src/arm/gnunet-arm.c:224
 msgid "Request does not fit into a message"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:224 src/testbed/gnunet-service-testbed_peers.c:981
+#: src/arm/gnunet-arm.c:226 src/testbed/gnunet-service-testbed_peers.c:1020
 msgid "Request timed out"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:226 src/testbed/gnunet-service-testbed_peers.c:983
+#: src/arm/gnunet-arm.c:228 src/testbed/gnunet-service-testbed_peers.c:1022
 #, fuzzy
 msgid "Unknown request status"
 msgstr "未知的用户“%s”\n"
 
-#: src/arm/gnunet-arm.c:242 src/testbed/gnunet-service-testbed_peers.c:999
+#: src/arm/gnunet-arm.c:244 src/testbed/gnunet-service-testbed_peers.c:1038
 #, c-format
 msgid "%s is stopped"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:244 src/testbed/gnunet-service-testbed_peers.c:1001
+#: src/arm/gnunet-arm.c:246 src/testbed/gnunet-service-testbed_peers.c:1040
 #, c-format
 msgid "%s is starting"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:246 src/testbed/gnunet-service-testbed_peers.c:1003
+#: src/arm/gnunet-arm.c:248 src/testbed/gnunet-service-testbed_peers.c:1042
 #, c-format
 msgid "%s is stopping"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:248 src/testbed/gnunet-service-testbed_peers.c:1005
+#: src/arm/gnunet-arm.c:250 src/testbed/gnunet-service-testbed_peers.c:1044
 #, c-format
 msgid "%s is starting already"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:250 src/testbed/gnunet-service-testbed_peers.c:1007
+#: src/arm/gnunet-arm.c:252 src/testbed/gnunet-service-testbed_peers.c:1046
 #, c-format
 msgid "%s is stopping already"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:252 src/testbed/gnunet-service-testbed_peers.c:1009
+#: src/arm/gnunet-arm.c:254 src/testbed/gnunet-service-testbed_peers.c:1048
 #, c-format
 msgid "%s is started already"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:254 src/testbed/gnunet-service-testbed_peers.c:1011
+#: src/arm/gnunet-arm.c:256 src/testbed/gnunet-service-testbed_peers.c:1050
 #, c-format
 msgid "%s is stopped already"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:256 src/testbed/gnunet-service-testbed_peers.c:1013
+#: src/arm/gnunet-arm.c:258 src/testbed/gnunet-service-testbed_peers.c:1052
 #, fuzzy, c-format
 msgid "%s service is not known to ARM"
 msgstr "服务已删除。\n"
 
-#: src/arm/gnunet-arm.c:258 src/testbed/gnunet-service-testbed_peers.c:1015
+#: src/arm/gnunet-arm.c:260 src/testbed/gnunet-service-testbed_peers.c:1054
 #, fuzzy, c-format
 msgid "%s service failed to start"
 msgstr "运行 %s失败：%s %d\n"
 
-#: src/arm/gnunet-arm.c:260
+#: src/arm/gnunet-arm.c:262
 #, c-format
 msgid "%s service cannot be started because ARM is shutting down"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:262 src/testbed/gnunet-service-testbed_peers.c:1019
+#: src/arm/gnunet-arm.c:264 src/testbed/gnunet-service-testbed_peers.c:1058
 #, c-format
 msgid "%.s Unknown result code."
 msgstr ""
 
-#: src/arm/gnunet-arm.c:295
+#: src/arm/gnunet-arm.c:297
 msgid "Fatal error initializing ARM API.\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:324 src/arm/gnunet-arm.c:333
+#: src/arm/gnunet-arm.c:326 src/arm/gnunet-arm.c:335
 #, fuzzy, c-format
 msgid "Failed to start the ARM service: %s\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/arm/gnunet-arm.c:367
+#: src/arm/gnunet-arm.c:369
 #, fuzzy, c-format
 msgid "Failed to send a stop request to the ARM service: %s\n"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/arm/gnunet-arm.c:377
+#: src/arm/gnunet-arm.c:379
 #, fuzzy, c-format
 msgid "Failed to stop the ARM service: %s\n"
 msgstr "打开日志文件“%s”失败：%s\n"
 
-#: src/arm/gnunet-arm.c:418
+#: src/arm/gnunet-arm.c:420
 #, fuzzy, c-format
 msgid "Failed to send a request to start the `%s' service: %%s\n"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/arm/gnunet-arm.c:427
+#: src/arm/gnunet-arm.c:429
 #, fuzzy, c-format
 msgid "Failed to start the `%s' service: %s\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/arm/gnunet-arm.c:463
+#: src/arm/gnunet-arm.c:465
 #, fuzzy, c-format
 msgid "Failed to send a request to kill the `%s' service: %%s\n"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/arm/gnunet-arm.c:474
+#: src/arm/gnunet-arm.c:476
 #, fuzzy, c-format
 msgid "Failed to kill the `%s' service: %s\n"
 msgstr "运行 %s失败：%s %d\n"
 
-#: src/arm/gnunet-arm.c:510
+#: src/arm/gnunet-arm.c:512
 #, fuzzy, c-format
 msgid "Failed to request a list of services: %s\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/arm/gnunet-arm.c:517
+#: src/arm/gnunet-arm.c:519
 #, fuzzy
 msgid "Error communicating with ARM. ARM not running?\n"
 msgstr "连接 %s:%u 出错。守护程序在运行吗？\n"
 
-#: src/arm/gnunet-arm.c:521
+#: src/arm/gnunet-arm.c:523
 msgid "Running services:\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:603
+#: src/arm/gnunet-arm.c:605
 #, c-format
 msgid "Now only monitoring, press CTRL-C to stop.\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:634
+#: src/arm/gnunet-arm.c:636
 #, c-format
 msgid "Stopped %s.\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:637
+#: src/arm/gnunet-arm.c:639
 #, fuzzy, c-format
 msgid "Starting %s...\n"
 msgstr "未知的命令“%s”。\n"
 
-#: src/arm/gnunet-arm.c:640
+#: src/arm/gnunet-arm.c:642
 #, c-format
 msgid "Stopping %s...\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:651
+#: src/arm/gnunet-arm.c:653
 #, fuzzy, c-format
 msgid "Unknown status %u for service %s.\n"
 msgstr "未知的用户“%s”\n"
 
-#: src/arm/gnunet-arm.c:715
+#: src/arm/gnunet-arm.c:717
 #, fuzzy
 msgid "stop all GNUnet services"
 msgstr "卸载 GNUnet 服务"
 
-#: src/arm/gnunet-arm.c:717
+#: src/arm/gnunet-arm.c:719
 msgid "start a particular service"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:719
+#: src/arm/gnunet-arm.c:721
 msgid "stop a particular service"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:721
+#: src/arm/gnunet-arm.c:723
 #, fuzzy
 msgid "start all GNUnet default services"
 msgstr "卸载 GNUnet 服务"
 
-#: src/arm/gnunet-arm.c:724
+#: src/arm/gnunet-arm.c:726
 #, fuzzy
 msgid "stop and start all GNUnet default services"
 msgstr "卸载 GNUnet 服务"
 
-#: src/arm/gnunet-arm.c:727
+#: src/arm/gnunet-arm.c:729
 msgid "delete config file and directory on exit"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:730
+#: src/arm/gnunet-arm.c:732
 msgid "monitor ARM activities"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:732
+#: src/arm/gnunet-arm.c:734
 msgid "don't print status messages"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:735
+#: src/arm/gnunet-arm.c:737
 #, fuzzy
 msgid "timeout in MSECS milliseconds for completing current operation"
 msgstr "等待一次迭代完成的时间(毫秒)"
 
-#: src/arm/gnunet-arm.c:737
+#: src/arm/gnunet-arm.c:739
 msgid "list currently running services"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:739
+#: src/arm/gnunet-arm.c:741
 msgid "don't let gnunet-service-arm inherit standard output"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:741
+#: src/arm/gnunet-arm.c:743
 msgid "don't let gnunet-service-arm inherit standard error"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:752
+#: src/arm/gnunet-arm.c:754
 msgid "Control services and the Automated Restart Manager (ARM)"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:257
+#: src/arm/gnunet-service-arm.c:268
 msgid "Could not send status result to client\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:291
+#: src/arm/gnunet-service-arm.c:304
 #, fuzzy
 msgid "Could not send list result to client\n"
 msgstr "找不到接口“%s”的一个 IP 地址。\n"
 
-#: src/arm/gnunet-service-arm.c:500
+#: src/arm/gnunet-service-arm.c:519
 #, fuzzy, c-format
 msgid "Failed to start service `%s'\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/arm/gnunet-service-arm.c:507
+#: src/arm/gnunet-service-arm.c:526
 #, c-format
 msgid "Starting service `%s'\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:602
+#: src/arm/gnunet-service-arm.c:625
 #, fuzzy, c-format
 msgid "Unable to create socket for service `%s': %s\n"
 msgstr "无法创建用户账户："
 
-#: src/arm/gnunet-service-arm.c:624
+#: src/arm/gnunet-service-arm.c:647
 #, c-format
 msgid "Unable to bind listening socket for service `%s' to address `%s': %s\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:638
+#: src/arm/gnunet-service-arm.c:676
 #, c-format
 msgid "ARM now monitors connections to service `%s' at `%s'\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:771
+#: src/arm/gnunet-service-arm.c:809
 #, c-format
 msgid "Preparing to stop `%s'\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:1022
+#: src/arm/gnunet-service-arm.c:1070
 #, c-format
 msgid "Restarting service `%s'.\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:1115
+#: src/arm/gnunet-service-arm.c:1163
 msgid "exit"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:1120
+#: src/arm/gnunet-service-arm.c:1168
 msgid "signal"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:1125
+#: src/arm/gnunet-service-arm.c:1173
 #, fuzzy
 msgid "unknown"
 msgstr "未知错误"
 
-#: src/arm/gnunet-service-arm.c:1131
+#: src/arm/gnunet-service-arm.c:1179
 #, fuzzy, c-format
 msgid "Service `%s' took %s to terminate\n"
 msgstr "服务已删除。\n"
 
-#: src/arm/gnunet-service-arm.c:1153
+#: src/arm/gnunet-service-arm.c:1201
 #, c-format
 msgid "Service `%s' terminated normally, will restart at any time\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:1168
+#: src/arm/gnunet-service-arm.c:1216
 #, c-format
 msgid "Service `%s' terminated with status %s/%d, will restart in %s\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:1386
+#: src/arm/gnunet-service-arm.c:1463
 #, fuzzy, c-format
 msgid "Starting default services `%s'\n"
 msgstr "卸载 GNUnet 服务"
 
-#: src/arm/gnunet-service-arm.c:1397
+#: src/arm/gnunet-service-arm.c:1474
 #, c-format
 msgid "Default service `%s' not configured correctly!\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:1411
+#: src/arm/gnunet-service-arm.c:1488
 msgid ""
 "No default services configured, GNUnet will not really start right now.\n"
 msgstr ""
 
-#: src/arm/mockup-service.c:46
+#: src/arm/mockup-service.c:41
 msgid "Initiating shutdown as requested by client.\n"
 msgstr ""
 
-#: src/ats/ats_api_performance.c:475
+#: src/ats/ats_api_performance.c:468
 #, c-format
 msgid "Received %s message\n"
 msgstr ""
 
-#: src/ats/ats_api_performance.c:518
+#: src/ats/ats_api_performance.c:511
 #, c-format
 msgid "Received last message for %s \n"
 msgstr ""
 
-#: src/ats/gnunet-service-ats_addresses.c:1607
-#: src/ats/gnunet-service-ats_addresses.c:1641
+#: src/ats/gnunet-service-ats_addresses.c:1475
+#: src/ats/gnunet-service-ats_addresses.c:1519
 #, c-format
 msgid ""
 "Could not load quota for network `%s':  `%s', assigning default bandwidth "
 "%llu\n"
 msgstr ""
 
-#: src/ats/gnunet-service-ats_addresses.c:1613
+#: src/ats/gnunet-service-ats_addresses.c:1482
 #, c-format
 msgid "Outbound quota configure for network `%s' is %llu\n"
 msgstr ""
 
-#: src/ats/gnunet-service-ats_addresses.c:1620
+#: src/ats/gnunet-service-ats_addresses.c:1490
 #, c-format
 msgid ""
 "No outbound quota configured for network `%s', assigning default bandwidth "
 "%llu\n"
 msgstr ""
 
-#: src/ats/gnunet-service-ats_addresses.c:1647
+#: src/ats/gnunet-service-ats_addresses.c:1526
 #, c-format
 msgid "Inbound quota configured for network `%s' is %llu\n"
 msgstr ""
 
-#: src/ats/gnunet-service-ats_addresses.c:1654
+#: src/ats/gnunet-service-ats_addresses.c:1534
 #, c-format
 msgid ""
 "No outbound quota configure for network `%s', assigning default bandwidth "
 "%llu\n"
 msgstr ""
 
-#: src/ats/gnunet-service-ats_addresses.c:1888
+#: src/ats/gnunet-service-ats_addresses.c:1700
+#, c-format
+msgid "Initializing solver `%s '`%s'\n"
+msgstr ""
+
+#: src/ats/gnunet-service-ats_addresses.c:1703
+#, fuzzy, c-format
+msgid "Failed to initialize solver `%s'!\n"
+msgstr "无法初始化 SQLite：%s。\n"
+
+#: src/ats/gnunet-service-ats_addresses.c:1726
 #, fuzzy
 msgid "Failed to initialize solver!\n"
 msgstr "无法初始化 SQLite：%s。\n"
 
-#: src/ats/gnunet-service-ats-solver_mlp.c:849
+#: src/ats/libgnunet_plugin_ats_mlp.c:868
 msgid "Problem size too large, cannot allocate memory!\n"
 msgstr ""
 
-#: src/ats/gnunet-service-ats-solver_mlp.c:1193
+#: src/ats/libgnunet_plugin_ats_mlp.c:1239
 #, c-format
 msgid "Adding address for peer `%s' multiple times\n"
 msgstr ""
 
-#: src/ats/gnunet-service-ats-solver_mlp.c:1238
+#: src/ats/libgnunet_plugin_ats_mlp.c:1286
 #, c-format
 msgid "Updating address property `%s' for peer `%s' %p not added before\n"
 msgstr ""
 
-#: src/ats/gnunet-service-ats-solver_mlp.c:1956
+#: src/ats/libgnunet_plugin_ats_mlp.c:2010
 #, c-format
 msgid ""
 "Adjusting inconsistent outbound quota configuration for network `%s', is "
 "%llu must be at least %llu\n"
 msgstr ""
 
-#: src/ats/gnunet-service-ats-solver_mlp.c:1964
+#: src/ats/libgnunet_plugin_ats_mlp.c:2018
 #, c-format
 msgid ""
 "Adjusting inconsistent inbound quota configuration for network `%s', is %llu "
 "must be at least %llu\n"
 msgstr ""
 
-#: src/ats/gnunet-service-ats-solver_mlp.c:1974
+#: src/ats/libgnunet_plugin_ats_mlp.c:2028
 #, c-format
 msgid ""
 "Adjusting outbound quota configuration for network `%s'from %llu to %.0f\n"
 msgstr ""
 
-#: src/ats/gnunet-service-ats-solver_mlp.c:1982
+#: src/ats/libgnunet_plugin_ats_mlp.c:2036
 #, c-format
 msgid ""
 "Adjusting inbound quota configuration for network `%s' from %llu to %.0f\n"
 msgstr ""
 
-#: src/ats/gnunet-service-ats-solver_mlp.c:1993
+#: src/ats/libgnunet_plugin_ats_mlp.c:2047
 #, c-format
 msgid "Using default quota configuration for network `%s' (in/out) %llu/%llu\n"
 msgstr ""
 
-#: src/ats/gnunet-service-ats-solver_proportional.c:1296
+#: src/ats/libgnunet_plugin_ats_proportional.c:1438
 #, fuzzy, c-format
 msgid "Invalid network type `%u' `%s': Disconnect!\n"
 msgstr "找不到主机“%s”的 IP：%s\n"
@@ -464,159 +474,510 @@ msgstr ""
 msgid "Quota for network `%11s' (in/out): %10s / %10s\n"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:347 src/namestore/gnunet-namestore.c:438
-#: src/transport/gnunet-transport.c:812
+#: src/ats-tool/gnunet-ats.c:347 src/namestore/gnunet-namestore.c:520
+#: src/transport/gnunet-transport.c:807
 #, fuzzy, c-format
 msgid "Service `%s' is not running\n"
 msgstr "服务已删除。\n"
 
-#: src/ats-tool/gnunet-ats.c:357 src/transport/gnunet-transport.c:819
+#: src/ats-tool/gnunet-ats.c:359 src/transport/gnunet-transport.c:816
 #, fuzzy, c-format
 msgid "Failed to parse peer identity `%s'\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/ats-tool/gnunet-ats.c:365
+#: src/ats-tool/gnunet-ats.c:367
 #, c-format
 msgid "Please select one operation : %s or %s or %s or %s or %s\n"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:381 src/ats-tool/gnunet-ats.c:400
-#: src/ats-tool/gnunet-ats.c:417 src/ats-tool/gnunet-ats.c:455
+#: src/ats-tool/gnunet-ats.c:383 src/ats-tool/gnunet-ats.c:402
+#: src/ats-tool/gnunet-ats.c:419 src/ats-tool/gnunet-ats.c:457
 #, fuzzy, c-format
 msgid "Cannot connect to ATS service, exiting...\n"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/ats-tool/gnunet-ats.c:390 src/ats-tool/gnunet-ats.c:407
+#: src/ats-tool/gnunet-ats.c:392 src/ats-tool/gnunet-ats.c:409
 #, fuzzy, c-format
 msgid "Cannot issue request to ATS service, exiting...\n"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/ats-tool/gnunet-ats.c:425
+#: src/ats-tool/gnunet-ats.c:427
 #, fuzzy, c-format
 msgid "No preference type given!\n"
 msgstr "无法获取有关用户“%s”的信息：%s\n"
 
-#: src/ats-tool/gnunet-ats.c:430
+#: src/ats-tool/gnunet-ats.c:432
 #, c-format
 msgid "No peer given!\n"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:448
+#: src/ats-tool/gnunet-ats.c:450
 msgid "Valid type required\n"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:506
+#: src/ats-tool/gnunet-ats.c:508
 msgid "get list of active addresses currently used"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:509
+#: src/ats-tool/gnunet-ats.c:511
 msgid "get list of all active addresses"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:512
+#: src/ats-tool/gnunet-ats.c:514
 #, fuzzy
 msgid "do not resolve IP addresses to hostnames"
 msgstr "GNUnet 现在使用 IP 地址 %s。\n"
 
-#: src/ats-tool/gnunet-ats.c:515
+#: src/ats-tool/gnunet-ats.c:517
 msgid "monitor mode"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:518
+#: src/ats-tool/gnunet-ats.c:520
 #, fuzzy
 msgid "set preference for the given peer"
 msgstr "无法获取有关用户“%s”的信息：%s\n"
 
-#: src/ats-tool/gnunet-ats.c:521
+#: src/ats-tool/gnunet-ats.c:523
 msgid "print all configured quotas"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:524
+#: src/ats-tool/gnunet-ats.c:526
 msgid "peer id"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:527
+#: src/ats-tool/gnunet-ats.c:529
 msgid "preference type to set: latency | bandwidth"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:530
+#: src/ats-tool/gnunet-ats.c:532
 msgid "preference value"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:533
+#: src/ats-tool/gnunet-ats.c:535
 msgid "verbose output (include ATS address properties)"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:542
+#: src/ats-tool/gnunet-ats.c:544
 #, fuzzy
 msgid "Print information about ATS state"
 msgstr "无法获取有关用户“%s”的信息：%s\n"
 
-#: src/block/block.c:105
-#, fuzzy, c-format
-msgid "Loading block plugin `%s'\n"
-msgstr "打开日志文件“%s”失败：%s\n"
-
-#: src/consensus/gnunet-consensus-profiler.c:393
+#: src/consensus/gnunet-consensus-profiler.c:394
 #, fuzzy
 msgid "number of peers in consensus"
 msgstr "迭代次数"
 
-#: src/consensus/gnunet-consensus-profiler.c:396
+#: src/consensus/gnunet-consensus-profiler.c:397
 msgid "how many peers receive one value?"
 msgstr ""
 
-#: src/consensus/gnunet-consensus-profiler.c:399
-#: src/set/gnunet-set-profiler.c:287 src/set/gnunet-set-profiler.c:290
-#: src/set/gnunet-set-profiler.c:293
+#: src/consensus/gnunet-consensus-profiler.c:400
+#: src/set/gnunet-set-profiler.c:286 src/set/gnunet-set-profiler.c:289
+#: src/set/gnunet-set-profiler.c:292
 #, fuzzy
 msgid "number of values"
 msgstr "迭代次数"
 
-#: src/consensus/gnunet-consensus-profiler.c:402
+#: src/consensus/gnunet-consensus-profiler.c:403
 msgid "consensus timeout"
 msgstr ""
 
-#: src/consensus/gnunet-consensus-profiler.c:405
+#: src/consensus/gnunet-consensus-profiler.c:406
 msgid "be more verbose (print received values)"
 msgstr ""
 
-#: src/core/core_api.c:752
+#: src/conversation/conversation_api.c:333
+#: src/conversation/conversation_api.c:959
+#, fuzzy, c-format
+msgid "Internal error %d\n"
+msgstr "未知错误。\n"
+
+#: src/conversation/gnunet-conversation.c:186
+#, c-format
+msgid ""
+"Incoming call from `%s'.\n"
+"Please /accept or /cancel the call.\n"
+msgstr ""
+
+#: src/conversation/gnunet-conversation.c:206
+#: src/conversation/gnunet-conversation.c:315
+#, c-format
+msgid "Call terminated: %s\n"
+msgstr ""
+
+#: src/conversation/gnunet-conversation.c:226
+#, c-format
+msgid "Ego `%s' no longer available, phone is now down.\n"
+msgstr ""
+
+#: src/conversation/gnunet-conversation.c:239
+#, fuzzy
+msgid "Failed to setup phone (internal error)\n"
+msgstr "发送消息失败。\n"
+
+#: src/conversation/gnunet-conversation.c:252
+#, c-format
+msgid "Phone active on line %u\n"
+msgstr ""
+
+#: src/conversation/gnunet-conversation.c:284
+msgid "Resolved address. Now ringing other party.\n"
+msgstr ""
+
+#: src/conversation/gnunet-conversation.c:290
+#, fuzzy, c-format
+msgid "Connection established to `%s': %s\n"
+msgstr "找不到接口“%s”的一个 IP 地址。\n"
+
+#: src/conversation/gnunet-conversation.c:298
+#, fuzzy, c-format
+msgid "Failed to resolve `%s'\n"
+msgstr "打开日志文件“%s”失败：%s\n"
+
+#: src/conversation/gnunet-conversation.c:307
+msgid "Line busy\n"
+msgstr ""
+
+#: src/conversation/gnunet-conversation.c:385
+#, fuzzy, c-format
+msgid "Unknown command `%s'\n"
+msgstr "未知的命令“%s”。\n"
+
+#: src/conversation/gnunet-conversation.c:401
+#: src/conversation/gnunet-conversation.c:409
+#, c-format
+msgid "Ego `%s' not available\n"
+msgstr ""
+
+#: src/conversation/gnunet-conversation.c:417
+#, c-format
+msgid "Hanging up on incoming phone call from `%s' to call `%s'.\n"
+msgstr ""
+
+#: src/conversation/gnunet-conversation.c:424
+#: src/conversation/gnunet-conversation.c:438
+#, c-format
+msgid "You are already in a conversation with `%s', refusing to call `%s'.\n"
+msgstr ""
+
+#: src/conversation/gnunet-conversation.c:431
+#, fuzzy, c-format
+msgid "Aborting call to `%s'\n"
+msgstr "创建用户出错"
+
+#: src/conversation/gnunet-conversation.c:478
+msgid "There is no incoming call to be accepted!\n"
+msgstr ""
+
+#: src/conversation/gnunet-conversation.c:485
+#: src/conversation/gnunet-conversation.c:496
+#, fuzzy, c-format
+msgid "You are already in a conversation with `%s'.\n"
+msgstr "找不到接口“%s”的一个 IP 地址。\n"
+
+#: src/conversation/gnunet-conversation.c:491
+#, c-format
+msgid "You are trying to call `%s', cannot accept incoming calls right now.\n"
+msgstr ""
+
+#: src/conversation/gnunet-conversation.c:521
+msgid "We currently do not have an address.\n"
+msgstr ""
+
+#: src/conversation/gnunet-conversation.c:542
+#, c-format
+msgid "We are currently trying to locate the private key for the ego `%s'.\n"
+msgstr ""
+
+#: src/conversation/gnunet-conversation.c:547
+#, c-format
+msgid "We are listening for incoming calls for ego `%s' on line %u.\n"
+msgstr ""
+
+#: src/conversation/gnunet-conversation.c:553
+#, c-format
+msgid "The phone is rining. `%s' is trying to call us.\n"
+msgstr ""
+
+#: src/conversation/gnunet-conversation.c:559
+#, c-format
+msgid "You are having a conversation with `%s'.\n"
+msgstr ""
+
+#: src/conversation/gnunet-conversation.c:564
+#, fuzzy, c-format
+msgid "We are trying to find the network address to call `%s'.\n"
+msgstr "GNUnet 现在使用 IP 地址 %s。\n"
+
+#: src/conversation/gnunet-conversation.c:569
+#, c-format
+msgid "We are calling `%s', his phone should be ringing.\n"
+msgstr ""
+
+#: src/conversation/gnunet-conversation.c:574
+msgid ""
+"We had an internal error setting up our phone line. You can still make "
+"calls.\n"
+msgstr ""
+
+#: src/conversation/gnunet-conversation.c:595
+msgid "There is no call that could be cancelled right now.\n"
+msgstr ""
+
+#: src/conversation/gnunet-conversation.c:626
+msgid "Use `/address' to find out which address this phone should have in GNS"
+msgstr ""
+
+#: src/conversation/gnunet-conversation.c:628
+msgid "Use `/call USER.gnu' to call USER"
+msgstr ""
+
+#: src/conversation/gnunet-conversation.c:630
+msgid "Use `/accept MESSAGE' to accept an incoming call"
+msgstr ""
+
+#: src/conversation/gnunet-conversation.c:632
+msgid "Use `/cancel MESSAGE' to reject or terminate a call"
+msgstr ""
+
+#: src/conversation/gnunet-conversation.c:634
+msgid "Use `/status' to print status information"
+msgstr ""
+
+#: src/conversation/gnunet-conversation.c:636
+msgid "Use `/quit' to terminate gnunet-conversation"
+msgstr ""
+
+#: src/conversation/gnunet-conversation.c:638
+msgid "Use `/help command' to get help for a specific command"
+msgstr ""
+
+#: src/conversation/gnunet-conversation.c:793
+#, fuzzy, c-format
+msgid "Name of our ego changed to `%s'\n"
+msgstr "发送消息失败。\n"
+
+#: src/conversation/gnunet-conversation.c:806
+#, c-format
+msgid "Our ego `%s' was deleted!\n"
+msgstr ""
+
+#: src/conversation/gnunet-conversation.c:841
+#, fuzzy
+msgid "You must specify the NAME of an ego to use\n"
+msgstr "您必须指定一个昵称\n"
+
+#: src/conversation/gnunet-conversation.c:867
+msgid "sets the NAME of the ego to use for the phone (and name resolution)"
+msgstr ""
+
+#: src/conversation/gnunet-conversation.c:870
+msgid "sets the LINE to use for the phone"
+msgstr ""
+
+#: src/conversation/gnunet-conversation.c:885
+msgid "Enables having a conversation with other GNUnet users."
+msgstr ""
+
+#: src/conversation/gnunet-conversation-test.c:121
+#, c-format
+msgid ""
+"\n"
+"End of transmission.  Have a GNU day.\n"
+msgstr ""
+
+#: src/conversation/gnunet-conversation-test.c:149
+#, c-format
+msgid ""
+"\n"
+"We are now playing your recording back.  If you can hear it, your audio "
+"settings are working..."
+msgstr ""
+
+#: src/conversation/gnunet-conversation-test.c:215
+#, c-format
+msgid ""
+"We will now be recording you for %s. After that time, the recording will be "
+"played back to you..."
+msgstr ""
+
+#: src/conversation/gnunet-conversation-test.c:248
+#: src/integration-tests/connection_watchdog.c:1114
+#: src/multicast/gnunet-multicast.c:70 src/revocation/gnunet-revocation.c:510
+#: src/template/gnunet-template.c:70
+msgid "help text"
+msgstr ""
+
+#: src/conversation/gnunet-helper-audio-playback.c:137
+#, fuzzy, c-format
+msgid "pa_stream_write() failed: %s\n"
+msgstr "“%s”说：%s\n"
+
+#: src/conversation/gnunet-helper-audio-playback.c:186
+msgid "gnunet-helper-audio-playback - Got signal, exiting\n"
+msgstr ""
+
+#: src/conversation/gnunet-helper-audio-playback.c:211
+#: src/conversation/gnunet-helper-audio-record.c:363
+msgid "Connection established.\n"
+msgstr ""
+
+#: src/conversation/gnunet-helper-audio-playback.c:216
+#: src/conversation/gnunet-helper-audio-record.c:368
+#, fuzzy, c-format
+msgid "pa_stream_new() failed: %s\n"
+msgstr "“%s”说：%s\n"
+
+#: src/conversation/gnunet-helper-audio-playback.c:230
+#, c-format
+msgid "pa_stream_connect_playback() failed: %s\n"
+msgstr ""
+
+#: src/conversation/gnunet-helper-audio-playback.c:243
+#: src/conversation/gnunet-helper-audio-record.c:394
+#, fuzzy, c-format
+msgid "Connection failure: %s\n"
+msgstr "“%s”已连接到“%s”。\n"
+
+#: src/conversation/gnunet-helper-audio-playback.c:264
+#: src/conversation/gnunet-helper-audio-record.c:417
+msgid "Wrong Spec\n"
+msgstr ""
+
+#: src/conversation/gnunet-helper-audio-playback.c:270
+#: src/conversation/gnunet-helper-audio-record.c:423
+msgid "pa_mainloop_new() failed.\n"
+msgstr ""
+
+#: src/conversation/gnunet-helper-audio-playback.c:284
+#: src/conversation/gnunet-helper-audio-record.c:438
+msgid "pa_context_new() failed.\n"
+msgstr ""
+
+#: src/conversation/gnunet-helper-audio-playback.c:291
+#: src/conversation/gnunet-helper-audio-record.c:444
+#, fuzzy, c-format
+msgid "pa_context_connect() failed: %s\n"
+msgstr "“%s”说：%s\n"
+
+#: src/conversation/gnunet-helper-audio-playback.c:297
+#: src/conversation/gnunet-helper-audio-record.c:450
+msgid "pa_mainloop_run() failed.\n"
+msgstr ""
+
+#: src/conversation/gnunet-helper-audio-playback.c:366
+#, c-format
+msgid "Read error from STDIN: %s\n"
+msgstr ""
+
+#: src/conversation/gnunet-helper-audio-record.c:237
+#, fuzzy, c-format
+msgid "pa_stream_peek() failed: %s\n"
+msgstr "“%s”说：%s\n"
+
+#: src/conversation/gnunet-helper-audio-record.c:275
+msgid "Got signal, exiting.\n"
+msgstr ""
+
+#: src/conversation/gnunet-helper-audio-record.c:301
+#, fuzzy
+msgid "Stream successfully created.\n"
+msgstr "“%s”已连接到“%s”。\n"
+
+#: src/conversation/gnunet-helper-audio-record.c:306
+#, fuzzy, c-format
+msgid "pa_stream_get_buffer_attr() failed: %s\n"
+msgstr "“%s”说：%s\n"
+
+#: src/conversation/gnunet-helper-audio-record.c:314
+#, c-format
+msgid "Buffer metrics: maxlength=%u, fragsize=%u\n"
+msgstr ""
+
+#: src/conversation/gnunet-helper-audio-record.c:318
+#, c-format
+msgid "Using sample spec '%s', channel map '%s'.\n"
+msgstr ""
+
+#: src/conversation/gnunet-helper-audio-record.c:325
+#, fuzzy, c-format
+msgid "Connected to device %s (%u, %ssuspended).\n"
+msgstr "“%s”已连接到“%s”。\n"
+
+#: src/conversation/gnunet-helper-audio-record.c:334
+#, c-format
+msgid "Stream error: %s\n"
+msgstr ""
+
+#: src/conversation/gnunet-helper-audio-record.c:381
+#, fuzzy, c-format
+msgid "pa_stream_connect_record() failed: %s\n"
+msgstr "“%s”说：%s\n"
+
+#: src/conversation/gnunet-service-conversation.c:612
+msgid "Mesh audio channel not ready; audio data dropped\n"
+msgstr ""
+
+#: src/conversation/gnunet-service-conversation.c:700
+#, c-format
+msgid "No available phone for incoming call on line %u, sending BUSY signal\n"
+msgstr ""
+
+#: src/conversation/gnunet-service-conversation.c:1054
+#, c-format
+msgid "Received incoming tunnel on port %u\n"
+msgstr ""
+
+#: src/conversation/microphone.c:121
+#, fuzzy
+msgid "Could not start record audio helper\n"
+msgstr "找不到主机“%s”的 IP：%s\n"
+
+#: src/conversation/plugin_gnsrecord_conversation.c:116
+#, fuzzy, c-format
+msgid "Unable to parse PHONE record `%s'\n"
+msgstr "解析配置文件“%s”失败\n"
+
+#: src/conversation/speaker.c:75
+msgid "Could not start playback audio helper.\n"
+msgstr ""
+
+#: src/core/core_api.c:761
 msgid "Client was disconnected from core service, trying to reconnect.\n"
 msgstr ""
 
-#: src/core/gnunet-core.c:83
+#: src/core/gnunet-core.c:80
 #, c-format
 msgid "Peer `%s'\n"
 msgstr ""
 
-#: src/core/gnunet-core.c:112 src/core/gnunet-core.c:140
-#: src/transport/gnunet-transport.c:606 src/transport/gnunet-transport.c:630
+#: src/core/gnunet-core.c:110 src/core/gnunet-core.c:138
+#: src/transport/gnunet-transport.c:601 src/transport/gnunet-transport.c:625
 #, c-format
 msgid "%24s: %-17s %4s   (%u connections in total)\n"
 msgstr ""
 
-#: src/core/gnunet-core.c:114 src/transport/gnunet-transport.c:608
+#: src/core/gnunet-core.c:112 src/transport/gnunet-transport.c:603
 #, fuzzy
 msgid "Connected to"
 msgstr "“%s”已连接到“%s”。\n"
 
-#: src/core/gnunet-core.c:142 src/transport/gnunet-transport.c:632
+#: src/core/gnunet-core.c:140 src/transport/gnunet-transport.c:627
 #, fuzzy
 msgid "Disconnected from"
 msgstr "“%s”已连接到“%s”。\n"
 
-#: src/core/gnunet-core.c:166 src/mesh/gnunet-mesh.c:170
-#: src/peerinfo-tool/gnunet-peerinfo.c:653
+#: src/core/gnunet-core.c:164 src/mesh/gnunet-mesh.c:174
+#: src/peerinfo-tool/gnunet-peerinfo.c:645
 #, fuzzy, c-format
 msgid "Invalid command line argument `%s'\n"
 msgstr "“%s”的参数无效。\n"
 
-#: src/core/gnunet-core.c:203 src/transport/gnunet-transport.c:1004
+#: src/core/gnunet-core.c:201 src/transport/gnunet-transport.c:999
 msgid "provide information about all current connections (continuously)"
 msgstr ""
 
-#: src/core/gnunet-core.c:214
+#: src/core/gnunet-core.c:212
 msgid "Print information about connected peers."
 msgstr ""
 
@@ -643,130 +1004,130 @@ msgstr ""
 msgid "# bytes of messages of type %u received"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:532
+#: src/core/gnunet-service-core_kx.c:531
 msgid "# bytes encrypted"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:583
+#: src/core/gnunet-service-core_kx.c:582
 msgid "# bytes decrypted"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:667
+#: src/core/gnunet-service-core_kx.c:668
 msgid "# key exchanges initiated"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:697
+#: src/core/gnunet-service-core_kx.c:701
 msgid "# key exchanges stopped"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:761
+#: src/core/gnunet-service-core_kx.c:764
 msgid "# old ephemeral keys ignored"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:767
+#: src/core/gnunet-service-core_kx.c:770
 msgid "# ephemeral keys received"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:803
+#: src/core/gnunet-service-core_kx.c:804
 #, c-format
 msgid ""
 "Ephemeral key message from peer `%s' rejected as its validity range does not "
 "match our system time (%llu not in [%llu,%llu]).\n"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:819
+#: src/core/gnunet-service-core_kx.c:820
 msgid "# EPHEMERAL_KEY messages decrypted"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:922
-#: src/transport/gnunet-service-transport_validation.c:933
+#: src/core/gnunet-service-core_kx.c:923
+#: src/transport/gnunet-service-transport_validation.c:938
 msgid "# PING messages received"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:930
+#: src/core/gnunet-service-core_kx.c:931
 msgid "# PING messages dropped (out of order)"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:957
+#: src/core/gnunet-service-core_kx.c:958
 #, c-format
 msgid ""
 "Received PING from `%s' for different identity: I am `%s', PONG identity: `"
 "%s'\n"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:974
+#: src/core/gnunet-service-core_kx.c:975
 msgid "# PONG messages created"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1000
+#: src/core/gnunet-service-core_kx.c:1001
 msgid "# sessions terminated by timeout"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1010
+#: src/core/gnunet-service-core_kx.c:1011
 msgid "# keepalive messages sent"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1067
-#: src/transport/gnunet-service-transport_validation.c:1224
+#: src/core/gnunet-service-core_kx.c:1068
+#: src/transport/gnunet-service-transport_validation.c:1233
 msgid "# PONG messages received"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1073
+#: src/core/gnunet-service-core_kx.c:1074
 msgid "# PONG messages dropped (connection down)"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1078
+#: src/core/gnunet-service-core_kx.c:1079
 msgid "# PONG messages dropped (out of order)"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1108
+#: src/core/gnunet-service-core_kx.c:1109
 msgid "# PONG messages decrypted"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1142
+#: src/core/gnunet-service-core_kx.c:1143
 msgid "# session keys confirmed via PONG"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1152
+#: src/core/gnunet-service-core_kx.c:1153
 msgid "# timeouts prevented via PONG"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1159
+#: src/core/gnunet-service-core_kx.c:1160
 msgid "# rekey operations confirmed via PONG"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1299
+#: src/core/gnunet-service-core_kx.c:1300
 msgid "# DATA message dropped (out of order)"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1306
+#: src/core/gnunet-service-core_kx.c:1307
 #, c-format
 msgid ""
 "Session to peer `%s' went down due to key expiration (should not happen)\n"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1309
+#: src/core/gnunet-service-core_kx.c:1310
 msgid "# sessions terminated by key expiration"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1352
-#: src/core/gnunet-service-core_kx.c:1377
+#: src/core/gnunet-service-core_kx.c:1353
+#: src/core/gnunet-service-core_kx.c:1378
 msgid "# bytes dropped (duplicates)"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1364
+#: src/core/gnunet-service-core_kx.c:1365
 msgid "# bytes dropped (out of sequence)"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1405
+#: src/core/gnunet-service-core_kx.c:1406
 msgid "# bytes dropped (ancient message)"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1413
+#: src/core/gnunet-service-core_kx.c:1414
 msgid "# bytes of payload decrypted"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1444
+#: src/core/gnunet-service-core_kx.c:1445
 msgid "# PAYLOAD dropped (out of order)"
 msgstr ""
 
@@ -788,26 +1149,26 @@ msgstr ""
 msgid "Unsupported message of type %u (%u bytes) received from peer `%s'\n"
 msgstr ""
 
-#: src/core/gnunet-service-core_sessions.c:209
-#: src/core/gnunet-service-core_sessions.c:279
-#: src/dht/gnunet-service-dht_neighbours.c:641
-#: src/dht/gnunet-service-dht_neighbours.c:700
-#: src/fs/gnunet-service-fs_cp.c:601 src/fs/gnunet-service-fs_cp.c:1495
-#: src/topology/gnunet-daemon-topology.c:700
-#: src/topology/gnunet-daemon-topology.c:801
-#: src/transport/gnunet-service-transport_neighbours.c:1041
-#: src/transport/gnunet-service-transport_neighbours.c:1265
-#: src/transport/gnunet-service-transport_neighbours.c:1274
+#: src/core/gnunet-service-core_sessions.c:208
+#: src/core/gnunet-service-core_sessions.c:278
+#: src/dht/gnunet-service-dht_neighbours.c:662
+#: src/dht/gnunet-service-dht_neighbours.c:727
+#: src/fs/gnunet-service-fs_cp.c:604 src/fs/gnunet-service-fs_cp.c:1499
+#: src/topology/gnunet-daemon-topology.c:706
+#: src/topology/gnunet-daemon-topology.c:807
+#: src/transport/gnunet-service-transport_neighbours.c:904
+#: src/transport/gnunet-service-transport_neighbours.c:1129
+#: src/transport/gnunet-service-transport_neighbours.c:1138
 #: src/transport/gnunet-service-transport_neighbours.c:2799
-#: src/transport/gnunet-service-transport_neighbours.c:3053
+#: src/transport/gnunet-service-transport_neighbours.c:3052
 msgid "# peers connected"
 msgstr ""
 
-#: src/core/gnunet-service-core_sessions.c:247
+#: src/core/gnunet-service-core_sessions.c:246
 msgid "# type map refreshes sent"
 msgstr ""
 
-#: src/core/gnunet-service-core_sessions.c:416
+#: src/core/gnunet-service-core_sessions.c:415
 msgid "# messages discarded (expired prior to transmission)"
 msgstr ""
 
@@ -870,11 +1231,13 @@ msgstr ""
 #: src/datastore/plugin_datastore_sqlite.c:57 src/mysql/mysql.c:41
 #: src/mysql/mysql.c:48 src/mysql/mysql.c:522 src/mysql/mysql.c:531
 #: src/mysql/mysql.c:591 src/mysql/mysql.c:607
+#: src/namecache/plugin_namecache_postgres.c:52
+#: src/namecache/plugin_namecache_sqlite.c:52
 #: src/namestore/plugin_namestore_postgres.c:52
-#: src/namestore/plugin_namestore_sqlite.c:51
-#: src/testbed/testbed_api_hosts.c:69 src/util/crypto_ecc.c:54
-#: src/include/gnunet_common.h:654 src/include/gnunet_common.h:663
-#: src/scalarproduct/scalarproduct.h:56
+#: src/namestore/plugin_namestore_sqlite.c:52
+#: src/testbed/testbed_api_hosts.c:69 src/util/crypto_ecc.c:53
+#: src/include/gnunet_common.h:602 src/include/gnunet_common.h:611
+#: src/scalarproduct/scalarproduct.h:61
 #, fuzzy, c-format
 msgid "`%s' failed at %s:%d with error: %s\n"
 msgstr "“%s”于 %s:%d 处失败，错误为：%s\n"
@@ -885,7 +1248,8 @@ msgstr ""
 
 #: src/datacache/plugin_datacache_sqlite.c:484
 #: src/datastore/plugin_datastore_sqlite.c:401
-#: src/namestore/plugin_namestore_sqlite.c:374
+#: src/namecache/plugin_namecache_sqlite.c:295
+#: src/namestore/plugin_namestore_sqlite.c:327
 msgid "Tried to close sqlite without finalizing all prepared statements.\n"
 msgstr ""
 
@@ -922,7 +1286,7 @@ msgstr ""
 msgid "# datastore connections (re)created"
 msgstr ""
 
-#: src/datastore/datastore_api.c:608 src/scalarproduct/scalarproduct_api.c:276
+#: src/datastore/datastore_api.c:608 src/scalarproduct/scalarproduct_api.c:279
 msgid "# transmission request failures"
 msgstr ""
 
@@ -1182,7 +1546,8 @@ msgid "Failed to drop table from database.\n"
 msgstr "发送消息失败。\n"
 
 #: src/datastore/plugin_datastore_postgres.c:860
-#: src/namestore/plugin_namestore_postgres.c:735
+#: src/namecache/plugin_namecache_postgres.c:414
+#: src/namestore/plugin_namestore_postgres.c:564
 msgid "Postgres database running\n"
 msgstr ""
 
@@ -1192,7 +1557,8 @@ msgid "`%s' failed at %s:%u with error: %s"
 msgstr "“%s”于 %s:%d 处失败，错误为：%s\n"
 
 #: src/datastore/plugin_datastore_sqlite.c:253
-#: src/namestore/plugin_namestore_sqlite.c:220
+#: src/namecache/plugin_namecache_sqlite.c:193
+#: src/namestore/plugin_namestore_sqlite.c:204
 #: src/psycstore/plugin_psycstore_sqlite.c:319
 #, c-format
 msgid "Unable to initialize SQLite: %s.\n"
@@ -1215,7 +1581,8 @@ msgid ""
 msgstr ""
 
 #: src/datastore/plugin_datastore_sqlite.c:1194
-#: src/namestore/plugin_namestore_sqlite.c:893
+#: src/namecache/plugin_namecache_sqlite.c:583
+#: src/namestore/plugin_namestore_sqlite.c:719
 #, fuzzy
 msgid "Sqlite database running\n"
 msgstr "sqlite 数据仓库"
@@ -1224,7 +1591,7 @@ msgstr "sqlite 数据仓库"
 msgid "Template database running\n"
 msgstr ""
 
-#: src/dht/dht_api.c:375
+#: src/dht/dht_api.c:376
 #, fuzzy
 msgid "Failed to connect to the DHT service!\n"
 msgstr "初始化“%s”服务失败。\n"
@@ -1272,9 +1639,9 @@ msgstr ""
 
 #: src/dht/gnunet-dht-get.c:201 src/dht/gnunet-dht-monitor.c:271
 #: src/dht/gnunet-dht-put.c:213 src/fs/gnunet-auto-share.c:753
-#: src/fs/gnunet-download.c:328 src/fs/gnunet-publish.c:864
+#: src/fs/gnunet-download.c:328 src/fs/gnunet-publish.c:877
 #: src/fs/gnunet-search.c:294 src/fs/gnunet-unindex.c:168
-#: src/nse/gnunet-nse-profiler.c:904
+#: src/nse/gnunet-nse-profiler.c:873
 msgid "be verbose (print progress information)"
 msgstr ""
 
@@ -1341,45 +1708,45 @@ msgstr ""
 msgid "Failed to connect to transport service!\n"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/dht/gnunet-service-dht_clients.c:414
+#: src/dht/gnunet-service-dht_clients.c:417
 msgid "# GET requests from clients injected"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_clients.c:508
+#: src/dht/gnunet-service-dht_clients.c:511
 msgid "# PUT requests received from clients"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_clients.c:592
+#: src/dht/gnunet-service-dht_clients.c:595
 msgid "# GET requests received from clients"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_clients.c:793
+#: src/dht/gnunet-service-dht_clients.c:796
 msgid "# GET STOP requests received from clients"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_clients.c:1033
+#: src/dht/gnunet-service-dht_clients.c:1037
 msgid "# Key match, type mismatches in REPLY to CLIENT"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_clients.c:1046
+#: src/dht/gnunet-service-dht_clients.c:1050
 msgid "# Duplicate REPLIES to CLIENT request dropped"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_clients.c:1083
+#: src/dht/gnunet-service-dht_clients.c:1087
 #, c-format
 msgid "Unsupported block type (%u) in request!\n"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_clients.c:1106
+#: src/dht/gnunet-service-dht_clients.c:1110
 msgid "# RESULTS queued for clients"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_clients.c:1157
-#: src/dht/gnunet-service-dht_clients.c:1199
+#: src/dht/gnunet-service-dht_clients.c:1164
+#: src/dht/gnunet-service-dht_clients.c:1206
 msgid "# REPLIES ignored for CLIENTS (no match)"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_clients.c:1167
+#: src/dht/gnunet-service-dht_clients.c:1174
 msgid "Could not pass reply to client, message too big!\n"
 msgstr ""
 
@@ -1425,103 +1792,103 @@ msgstr ""
 msgid "# HELLOs obtained from peerinfo"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:501
+#: src/dht/gnunet-service-dht_neighbours.c:516
 msgid "# Preference updates given to core"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:591
+#: src/dht/gnunet-service-dht_neighbours.c:610
 msgid "# FIND PEER messages initiated"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:734
+#: src/dht/gnunet-service-dht_neighbours.c:764
 msgid "# Queued messages discarded (peer disconnected)"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:789
+#: src/dht/gnunet-service-dht_neighbours.c:819
 msgid "# Bytes transmitted to other peers"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:827
+#: src/dht/gnunet-service-dht_neighbours.c:857
 msgid "# Bytes of bandwidth requested from core"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:859
+#: src/dht/gnunet-service-dht_neighbours.c:889
 msgid "# requests TTL-dropped"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1052
-#: src/dht/gnunet-service-dht_neighbours.c:1086
+#: src/dht/gnunet-service-dht_neighbours.c:1093
+#: src/dht/gnunet-service-dht_neighbours.c:1130
 msgid "# Peers excluded from routing due to Bloomfilter"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1067
-#: src/dht/gnunet-service-dht_neighbours.c:1101
+#: src/dht/gnunet-service-dht_neighbours.c:1108
+#: src/dht/gnunet-service-dht_neighbours.c:1145
 msgid "# Peer selection failed"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1235
+#: src/dht/gnunet-service-dht_neighbours.c:1287
 msgid "# PUT requests routed"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1264
+#: src/dht/gnunet-service-dht_neighbours.c:1316
 msgid "# PUT messages queued for transmission"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1271
-#: src/dht/gnunet-service-dht_neighbours.c:1384
-#: src/dht/gnunet-service-dht_neighbours.c:1484
+#: src/dht/gnunet-service-dht_neighbours.c:1323
+#: src/dht/gnunet-service-dht_neighbours.c:1440
+#: src/dht/gnunet-service-dht_neighbours.c:1543
 msgid "# P2P messages dropped due to full queue"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1349
+#: src/dht/gnunet-service-dht_neighbours.c:1405
 msgid "# GET requests routed"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1376
+#: src/dht/gnunet-service-dht_neighbours.c:1432
 msgid "# GET messages queued for transmission"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1491
+#: src/dht/gnunet-service-dht_neighbours.c:1550
 msgid "# RESULT messages queued for transmission"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1573
+#: src/dht/gnunet-service-dht_neighbours.c:1637
 msgid "# P2P PUT requests received"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1576
+#: src/dht/gnunet-service-dht_neighbours.c:1640
 msgid "# P2P PUT bytes received"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1731
+#: src/dht/gnunet-service-dht_neighbours.c:1803
 msgid "# FIND PEER requests ignored due to Bloomfilter"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1739
+#: src/dht/gnunet-service-dht_neighbours.c:1811
 msgid "# FIND PEER requests ignored due to lack of HELLO"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1830
+#: src/dht/gnunet-service-dht_neighbours.c:1904
 msgid "# P2P GET requests received"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1833
+#: src/dht/gnunet-service-dht_neighbours.c:1907
 msgid "# P2P GET bytes received"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1886
+#: src/dht/gnunet-service-dht_neighbours.c:1961
 msgid "# P2P FIND PEER requests processed"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1900
+#: src/dht/gnunet-service-dht_neighbours.c:1975
 msgid "# P2P GET requests ONLY routed"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1977
+#: src/dht/gnunet-service-dht_neighbours.c:2052
 msgid "# P2P RESULTS received"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1980
+#: src/dht/gnunet-service-dht_neighbours.c:2055
 msgid "# P2P RESULT bytes received"
 msgstr ""
 
@@ -1561,51 +1928,51 @@ msgstr ""
 msgid "# DHT requests combined"
 msgstr ""
 
-#: src/dht/plugin_block_dht.c:136
+#: src/dht/plugin_block_dht.c:138
 #, c-format
 msgid "Block not of type %u\n"
 msgstr ""
 
-#: src/dht/plugin_block_dht.c:143
+#: src/dht/plugin_block_dht.c:145
 msgid "Size mismatch for block\n"
 msgstr ""
 
-#: src/dht/plugin_block_dht.c:152
+#: src/dht/plugin_block_dht.c:154
 #, c-format
 msgid "Block of type %u is malformed\n"
 msgstr ""
 
-#: src/dns/dnsparser.c:233
+#: src/dns/dnsparser.c:239
 #, fuzzy, c-format
 msgid "Failed to convert DNS IDNA name `%s' to UTF-8: %s\n"
 msgstr "打开日志文件“%s”失败：%s\n"
 
-#: src/dns/dnsparser.c:751
+#: src/dns/dnsparser.c:800
 #, fuzzy, c-format
 msgid "Failed to convert UTF-8 name `%s' to DNS IDNA format: %s\n"
 msgstr "打开日志文件“%s”失败：%s\n"
 
-#: src/dns/dnsstub.c:176
+#: src/dns/dnsstub.c:175
 #, fuzzy, c-format
 msgid "Could not bind to any port: %s\n"
 msgstr "找不到主机“%s”的 IP：%s\n"
 
-#: src/dns/dnsstub.c:296 src/dns/dnsstub.c:384
+#: src/dns/dnsstub.c:295 src/dns/dnsstub.c:383
 #, fuzzy, c-format
 msgid "Failed to send DNS request to %s\n"
 msgstr "打开日志文件“%s”失败：%s\n"
 
-#: src/dns/dnsstub.c:300
+#: src/dns/dnsstub.c:299
 #, fuzzy, c-format
 msgid "Sent DNS request to %s\n"
 msgstr "打开日志文件“%s”失败：%s\n"
 
-#: src/dns/dnsstub.c:369
+#: src/dns/dnsstub.c:368
 #, c-format
 msgid "Configured DNS exit `%s' is not working / valid.\n"
 msgstr ""
 
-#: src/dns/dnsstub.c:441
+#: src/dns/dnsstub.c:440
 #, c-format
 msgid "Received DNS response that is too small (%u bytes)"
 msgstr ""
@@ -1671,12 +2038,12 @@ msgstr ""
 msgid "# DNS requests received via TUN interface"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:1049 src/exit/gnunet-daemon-exit.c:3359
+#: src/dns/gnunet-service-dns.c:1049 src/exit/gnunet-daemon-exit.c:3498
 #, c-format
 msgid "`%s' must be installed SUID, refusing to run\n"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:1069 src/exit/gnunet-daemon-exit.c:3415
+#: src/dns/gnunet-service-dns.c:1069 src/exit/gnunet-daemon-exit.c:3555
 #, fuzzy
 msgid "need a valid IPv4 or IPv6 address\n"
 msgstr "无效的进程优先级“%s”\n"
@@ -1690,337 +2057,326 @@ msgstr ""
 msgid "Print information about DV state"
 msgstr "无法获取有关用户“%s”的信息：%s\n"
 
-#: src/exit/gnunet-daemon-exit.c:756
+#: src/exit/gnunet-daemon-exit.c:802
 #, c-format
 msgid "Got duplicate service records for `%s:%u'\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:807
+#: src/exit/gnunet-daemon-exit.c:853
 msgid "# Bytes transmitted via mesh tunnels"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:924 src/exit/gnunet-daemon-exit.c:2349
-#: src/exit/gnunet-daemon-exit.c:2606 src/vpn/gnunet-service-vpn.c:1451
-#: src/vpn/gnunet-service-vpn.c:1850 src/vpn/gnunet-service-vpn.c:2013
+#: src/exit/gnunet-daemon-exit.c:970 src/exit/gnunet-daemon-exit.c:2394
+#: src/exit/gnunet-daemon-exit.c:2651 src/vpn/gnunet-service-vpn.c:1409
+#: src/vpn/gnunet-service-vpn.c:1799 src/vpn/gnunet-service-vpn.c:1962
 msgid "# ICMPv4 packets dropped (type not allowed)"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:961 src/exit/gnunet-daemon-exit.c:2408
-#: src/exit/gnunet-daemon-exit.c:2665 src/vpn/gnunet-service-vpn.c:1507
-#: src/vpn/gnunet-service-vpn.c:1909 src/vpn/gnunet-service-vpn.c:2046
+#: src/exit/gnunet-daemon-exit.c:1007 src/exit/gnunet-daemon-exit.c:2453
+#: src/exit/gnunet-daemon-exit.c:2710 src/vpn/gnunet-service-vpn.c:1465
+#: src/vpn/gnunet-service-vpn.c:1858 src/vpn/gnunet-service-vpn.c:1995
 msgid "# ICMPv6 packets dropped (type not allowed)"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:1001
+#: src/exit/gnunet-daemon-exit.c:1047
 msgid "# ICMP packets dropped (not allowed)"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:1008
+#: src/exit/gnunet-daemon-exit.c:1054
 msgid "ICMP Packet dropped, have no matching connection information\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:1084
+#: src/exit/gnunet-daemon-exit.c:1130
 msgid "UDP Packet dropped, have no matching connection information\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:1158
+#: src/exit/gnunet-daemon-exit.c:1204
 msgid "TCP Packet dropped, have no matching connection information\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:1210
+#: src/exit/gnunet-daemon-exit.c:1256
 msgid "# Packets received from TUN"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:1224
+#: src/exit/gnunet-daemon-exit.c:1270
 msgid "# Bytes received from TUN"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:1250
+#: src/exit/gnunet-daemon-exit.c:1296
 msgid "IPv4 packet options received.  Ignored.\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:1277
+#: src/exit/gnunet-daemon-exit.c:1323
 #, c-format
 msgid "IPv4 packet with unsupported next header %u received.  Ignored.\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:1323
+#: src/exit/gnunet-daemon-exit.c:1369
 #, c-format
 msgid "IPv6 packet with unsupported next header %d received.  Ignored.\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:1331
+#: src/exit/gnunet-daemon-exit.c:1377
 #, c-format
 msgid "Packet from unknown protocol %u received.  Ignored.\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:1713
+#: src/exit/gnunet-daemon-exit.c:1759
 msgid "# TCP packets sent via TUN"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:1826
+#: src/exit/gnunet-daemon-exit.c:1872
 msgid "# TCP service creation requests received via mesh"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:1829 src/exit/gnunet-daemon-exit.c:1919
-#: src/exit/gnunet-daemon-exit.c:2035 src/exit/gnunet-daemon-exit.c:2273
-#: src/exit/gnunet-daemon-exit.c:2522 src/exit/gnunet-daemon-exit.c:2811
-#: src/exit/gnunet-daemon-exit.c:2918
+#: src/exit/gnunet-daemon-exit.c:1875 src/exit/gnunet-daemon-exit.c:1965
+#: src/exit/gnunet-daemon-exit.c:2070 src/exit/gnunet-daemon-exit.c:2318
+#: src/exit/gnunet-daemon-exit.c:2567 src/exit/gnunet-daemon-exit.c:2856
+#: src/exit/gnunet-daemon-exit.c:2963
 msgid "# Bytes received from MESH"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:1861 src/exit/gnunet-daemon-exit.c:2940
+#: src/exit/gnunet-daemon-exit.c:1907 src/exit/gnunet-daemon-exit.c:2985
 #, c-format
 msgid "No service found for %s on port %d!\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:1865
+#: src/exit/gnunet-daemon-exit.c:1911
 msgid "# TCP requests dropped (no such service)"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:1922
+#: src/exit/gnunet-daemon-exit.c:1968
 msgid "# TCP IP-exit creation requests received via mesh"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:2038
+#: src/exit/gnunet-daemon-exit.c:2073
 msgid "# TCP data requests received via mesh"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:2052
+#: src/exit/gnunet-daemon-exit.c:2087
 msgid "# TCP DATA requests dropped (no session)"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:2102
+#: src/exit/gnunet-daemon-exit.c:2147
 msgid "# ICMP packets sent via TUN"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:2276
+#: src/exit/gnunet-daemon-exit.c:2321
 msgid "# ICMP IP-exit requests received via mesh"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:2525
+#: src/exit/gnunet-daemon-exit.c:2570
 msgid "# ICMP service requests received via mesh"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:2591 src/vpn/gnunet-service-vpn.c:1441
-#: src/vpn/gnunet-service-vpn.c:2007
+#: src/exit/gnunet-daemon-exit.c:2636 src/vpn/gnunet-service-vpn.c:1399
+#: src/vpn/gnunet-service-vpn.c:1956
 msgid "# ICMPv4 packets dropped (impossible PT to v6)"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:2650 src/vpn/gnunet-service-vpn.c:1477
-#: src/vpn/gnunet-service-vpn.c:1489 src/vpn/gnunet-service-vpn.c:1897
+#: src/exit/gnunet-daemon-exit.c:2695 src/vpn/gnunet-service-vpn.c:1435
+#: src/vpn/gnunet-service-vpn.c:1447 src/vpn/gnunet-service-vpn.c:1846
 msgid "# ICMPv6 packets dropped (impossible PT to v4)"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:2700
+#: src/exit/gnunet-daemon-exit.c:2745
 msgid "# UDP packets sent via TUN"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:2814
+#: src/exit/gnunet-daemon-exit.c:2859
 msgid "# UDP IP-exit requests received via mesh"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:2921
+#: src/exit/gnunet-daemon-exit.c:2966
 msgid "# UDP service requests received via mesh"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:2944
+#: src/exit/gnunet-daemon-exit.c:2989
 msgid "# UDP requests dropped (no such service)"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:2977
+#: src/exit/gnunet-daemon-exit.c:3024
 msgid "# Inbound MESH tunnels created"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3216
+#: src/exit/gnunet-daemon-exit.c:3285
 #, c-format
 msgid "No addresses found for hostname `%s' of service `%s'!\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3230 src/exit/gnunet-daemon-exit.c:3242
+#: src/exit/gnunet-daemon-exit.c:3299 src/exit/gnunet-daemon-exit.c:3311
 #, c-format
 msgid "Service `%s' configured for IPv4, but IPv4 is disabled!\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3253
+#: src/exit/gnunet-daemon-exit.c:3322
 #, c-format
 msgid "No IP addresses found for hostname `%s' of service `%s'!\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3372
+#: src/exit/gnunet-daemon-exit.c:3511
 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:3380
+#: src/exit/gnunet-daemon-exit.c:3519
 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:3387
+#: src/exit/gnunet-daemon-exit.c:3526
 msgid ""
 "Cannot enable IPv4 exit but disable IPv4 on TUN interface, will use "
 "ENABLE_IPv4=YES\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3393
+#: src/exit/gnunet-daemon-exit.c:3532
 msgid ""
 "Cannot enable IPv6 exit but disable IPv6 on TUN interface, will use "
 "ENABLE_IPv6=YES\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3399 src/pt/gnunet-daemon-pt.c:887
+#: src/exit/gnunet-daemon-exit.c:3538 src/pt/gnunet-daemon-pt.c:1248
 msgid "No useful service enabled.  Exiting.\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3647
+#: src/exit/gnunet-daemon-exit.c:3654
+msgid "Must be a number"
+msgstr ""
+
+#: src/exit/gnunet-daemon-exit.c:3796
 msgid "Daemon to run to provide an IP exit node for the VPN"
 msgstr ""
 
-#: src/experimentation/gnunet-daemon-experimentation.c:56
+#: src/experimentation/gnunet-daemon-experimentation.c:55
 msgid "Experimentation daemon shutting down ...\n"
 msgstr ""
 
-#: src/experimentation/gnunet-daemon-experimentation.c:78
+#: src/experimentation/gnunet-daemon-experimentation.c:77
 msgid "Experimentation daemon starting ...\n"
 msgstr ""
 
-#: src/experimentation/gnunet-daemon-experimentation.c:84
+#: src/experimentation/gnunet-daemon-experimentation.c:83
 #, fuzzy
 msgid "Failed to create statistics!\n"
 msgstr "发送消息失败。\n"
 
-#: src/experimentation/gnunet-daemon-experimentation.c:121
+#: src/experimentation/gnunet-daemon-experimentation.c:120
 msgid "GNUnet experimentation daemon"
 msgstr ""
 
-#: src/experimentation/gnunet-daemon-experimentation_experiments.c:264
+#: src/experimentation/gnunet-daemon-experimentation_experiments.c:241
 #, c-format
 msgid "Experiment `%s': Experiment signature is invalid\n"
 msgstr ""
 
-#: src/experimentation/gnunet-daemon-experimentation_experiments.c:271
+#: src/experimentation/gnunet-daemon-experimentation_experiments.c:250
 #, c-format
 msgid ""
 "Adding experiment `%s' running from `%s' to `%s' every %llu sec. for %llu "
 "sec. \n"
 msgstr ""
 
-#: src/experimentation/gnunet-daemon-experimentation_experiments.c:316
+#: src/experimentation/gnunet-daemon-experimentation_experiments.c:303
 #, c-format
 msgid "Experiment `%s': Issuer missing\n"
 msgstr ""
 
-#: src/experimentation/gnunet-daemon-experimentation_experiments.c:321
+#: src/experimentation/gnunet-daemon-experimentation_experiments.c:312
 #, c-format
 msgid "Experiment `%s': Issuer invalid\n"
 msgstr ""
 
-#: src/experimentation/gnunet-daemon-experimentation_experiments.c:327
+#: src/experimentation/gnunet-daemon-experimentation_experiments.c:320
 #, c-format
 msgid "Experiment `%s': Issuer not accepted!\n"
 msgstr ""
 
-#: src/experimentation/gnunet-daemon-experimentation_experiments.c:336
+#: src/experimentation/gnunet-daemon-experimentation_experiments.c:330
 #, c-format
 msgid "Experiment `%s': Version missing or invalid \n"
 msgstr ""
 
-#: src/experimentation/gnunet-daemon-experimentation_experiments.c:344
+#: src/experimentation/gnunet-daemon-experimentation_experiments.c:339
 #, c-format
 msgid "Experiment `%s': Required capabilities missing \n"
 msgstr ""
 
-#: src/experimentation/gnunet-daemon-experimentation_experiments.c:349
+#: src/experimentation/gnunet-daemon-experimentation_experiments.c:345
 #, c-format
 msgid "Experiment `%s': Required capabilities invalid \n"
 msgstr ""
 
-#: src/experimentation/gnunet-daemon-experimentation_experiments.c:392
+#: src/experimentation/gnunet-daemon-experimentation_experiments.c:390
 #, fuzzy, c-format
 msgid "Failed to parse file `%s'\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/experimentation/gnunet-daemon-experimentation_experiments.c:418
-#: src/experimentation/gnunet-daemon-experimentation_experiments.c:443
+#: src/experimentation/gnunet-daemon-experimentation_experiments.c:420
+#: src/experimentation/gnunet-daemon-experimentation_experiments.c:452
 msgid ""
-"No valid experiment issuers configured! Set value to peer id of issuer! "
-"Exit...\n"
+"No valid experiment issuers configured! Set value to public keys of issuers! "
+"Exiting.\n"
 msgstr ""
 
-#: src/experimentation/gnunet-daemon-experimentation_experiments.c:428
-#, fuzzy, c-format
-msgid "Invalid value `%s'\n"
-msgstr "“%s”的参数无效。\n"
-
-#: src/experimentation/gnunet-daemon-experimentation_experiments.c:452
-#, fuzzy, c-format
-msgid "Invalid public key `%s'\n"
+#: src/experimentation/gnunet-daemon-experimentation_experiments.c:435
+#, fuzzy
+msgid "Invalid value for public key\n"
 msgstr "“%s”的参数无效。\n"
 
-#: src/experimentation/gnunet-daemon-experimentation_experiments.c:459
-#, fuzzy, c-format
-msgid "Found issuer for public key `%s'\n"
-msgstr "解析配置文件“%s”失败\n"
-
-#: src/experimentation/gnunet-daemon-experimentation_experiments.c:462
-#, fuzzy, c-format
-msgid "No issuer for public key `%s'\n"
-msgstr "运行 %s失败：%s %d\n"
-
-#: src/experimentation/gnunet-daemon-experimentation_experiments.c:479
+#: src/experimentation/gnunet-daemon-experimentation_experiments.c:473
 #, fuzzy, c-format
 msgid "Cannot read experiments file `%s'\n"
 msgstr "无法解析“%s”(%s)：%s\n"
 
-#: src/experimentation/gnunet-daemon-experimentation_nodes.c:221
+#: src/experimentation/gnunet-daemon-experimentation_nodes.c:219
 #, c-format
 msgid "Cannot send message to peer `%s' for experiment `%s'\n"
 msgstr ""
 
-#: src/experimentation/gnunet-daemon-experimentation_nodes.c:291
+#: src/experimentation/gnunet-daemon-experimentation_nodes.c:307
 #, c-format
 msgid "Sending experimentation request to peer %s\n"
 msgstr ""
 
-#: src/experimentation/gnunet-daemon-experimentation_nodes.c:422
+#: src/experimentation/gnunet-daemon-experimentation_nodes.c:451
 #, c-format
 msgid "Added peer `%s' as active node\n"
 msgstr ""
 
-#: src/experimentation/gnunet-daemon-experimentation_nodes.c:849
+#: src/experimentation/gnunet-daemon-experimentation_nodes.c:889
 #, fuzzy, c-format
 msgid "Connected to peer %s\n"
 msgstr "“%s”已连接到“%s”。\n"
 
-#: src/experimentation/gnunet-daemon-experimentation_nodes.c:878
+#: src/experimentation/gnunet-daemon-experimentation_nodes.c:919
 #, fuzzy, c-format
 msgid "Disconnected from peer %s\n"
 msgstr "“%s”已连接到“%s”。\n"
 
-#: src/experimentation/gnunet-daemon-experimentation_nodes.c:1058
+#: src/experimentation/gnunet-daemon-experimentation_nodes.c:1102
 #, fuzzy
 msgid "Failed to connect to CORE service!\n"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/experimentation/gnunet-daemon-experimentation_scheduler.c:109
+#: src/experimentation/gnunet-daemon-experimentation_scheduler.c:108
 #, c-format
 msgid "Peer `%s' did not respond to request for experiment `%s'\n"
 msgstr ""
 
-#: src/experimentation/gnunet-daemon-experimentation_scheduler.c:144
+#: src/experimentation/gnunet-daemon-experimentation_scheduler.c:143
 #, c-format
 msgid "Starting inbound experiment `%s' with peer `%s'\n"
 msgstr ""
 
-#: src/experimentation/gnunet-daemon-experimentation_scheduler.c:278
+#: src/experimentation/gnunet-daemon-experimentation_scheduler.c:276
 #, c-format
 msgid "Starting outbound experiment `%s' with peer `%s'\n"
 msgstr ""
 
-#: src/experimentation/gnunet-daemon-experimentation_scheduler.c:296
+#: src/experimentation/gnunet-daemon-experimentation_scheduler.c:294
 #, c-format
 msgid "Received %s message from peer %s for experiment `%s'\n"
 msgstr ""
@@ -2088,56 +2444,56 @@ msgstr "无法解析“%s”(%s)：%s\n"
 msgid "Short read reading from file `%s'!"
 msgstr ""
 
-#: src/fs/fs_api.c:1062
+#: src/fs/fs_api.c:1064
 #, fuzzy, c-format
 msgid "Failed to resume publishing information `%s': %s\n"
 msgstr "打开日志文件“%s”失败：%s\n"
 
-#: src/fs/fs_api.c:1565
+#: src/fs/fs_api.c:1569
 #, c-format
 msgid "Failure while resuming publishing operation `%s': %s\n"
 msgstr ""
 
-#: src/fs/fs_api.c:1579
+#: src/fs/fs_api.c:1583
 #, fuzzy, c-format
 msgid "Failed to resume publishing operation `%s': %s\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/fs/fs_api.c:2236
+#: src/fs/fs_api.c:2240
 #, c-format
 msgid "Failure while resuming unindexing operation `%s': %s\n"
 msgstr ""
 
-#: src/fs/fs_api.c:2246
+#: src/fs/fs_api.c:2250
 #, fuzzy, c-format
 msgid "Failed to resume unindexing operation `%s': %s\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/fs/fs_api.c:2372 src/fs/fs_api.c:2612
+#: src/fs/fs_api.c:2376 src/fs/fs_api.c:2616
 #, fuzzy, c-format
 msgid "Failed to resume sub-download `%s': %s\n"
 msgstr "打开日志文件“%s”失败：%s\n"
 
-#: src/fs/fs_api.c:2389
+#: src/fs/fs_api.c:2393
 #, fuzzy, c-format
 msgid "Failed to resume sub-search `%s': %s\n"
 msgstr "打开日志文件“%s”失败：%s\n"
 
-#: src/fs/fs_api.c:2402 src/fs/fs_api.c:2421 src/fs/fs_api.c:2904
+#: src/fs/fs_api.c:2406 src/fs/fs_api.c:2425 src/fs/fs_api.c:2908
 #, c-format
 msgid "Failure while resuming search operation `%s': %s\n"
 msgstr ""
 
-#: src/fs/fs_api.c:2603
+#: src/fs/fs_api.c:2607
 #, fuzzy, c-format
 msgid "Failed to resume sub-download `%s': could not open file `%s'\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/fs/fs_api.c:2848
+#: src/fs/fs_api.c:2852
 msgid "Could not resume running search, will resume as paused search\n"
 msgstr ""
 
-#: src/fs/fs_api.c:2942
+#: src/fs/fs_api.c:2946
 #, c-format
 msgid "Failure while resuming download operation `%s': %s\n"
 msgstr ""
@@ -2248,63 +2604,63 @@ msgstr "运行 %s失败：%s %d\n"
 msgid "Failed to connect to datastore."
 msgstr ""
 
-#: src/fs/fs_publish.c:125 src/fs/fs_publish.c:414
+#: src/fs/fs_publish.c:125 src/fs/fs_publish.c:415
 #, c-format
 msgid "Publishing failed: %s"
 msgstr ""
 
-#: src/fs/fs_publish.c:642 src/fs/fs_publish.c:659 src/fs/fs_publish.c:698
-#: src/fs/fs_publish.c:719 src/fs/fs_publish.c:743 src/fs/fs_publish.c:889
+#: src/fs/fs_publish.c:667 src/fs/fs_publish.c:684 src/fs/fs_publish.c:723
+#: src/fs/fs_publish.c:744 src/fs/fs_publish.c:768 src/fs/fs_publish.c:914
 #, c-format
 msgid "Can not index file `%s': %s.  Will try to insert instead.\n"
 msgstr ""
 
-#: src/fs/fs_publish.c:644
+#: src/fs/fs_publish.c:669
 msgid "timeout on index-start request to `fs' service"
 msgstr ""
 
-#: src/fs/fs_publish.c:656
+#: src/fs/fs_publish.c:681
 #, fuzzy
 msgid "unknown error"
 msgstr "未知错误"
 
-#: src/fs/fs_publish.c:700
+#: src/fs/fs_publish.c:725
 msgid "failed to compute hash"
 msgstr ""
 
-#: src/fs/fs_publish.c:720
+#: src/fs/fs_publish.c:745
 msgid "filename too long"
 msgstr ""
 
-#: src/fs/fs_publish.c:745
+#: src/fs/fs_publish.c:770
 msgid "could not connect to `fs' service"
 msgstr ""
 
-#: src/fs/fs_publish.c:768
+#: src/fs/fs_publish.c:793
 #, fuzzy, c-format
 msgid "Failed to get file identifiers for `%s'\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/fs/fs_publish.c:837
+#: src/fs/fs_publish.c:862
 #, c-format
 msgid "Recursive upload failed at `%s': %s"
 msgstr ""
 
-#: src/fs/fs_publish.c:843
+#: src/fs/fs_publish.c:868
 #, c-format
 msgid "Recursive upload failed: %s"
 msgstr ""
 
-#: src/fs/fs_publish.c:890
+#: src/fs/fs_publish.c:915
 msgid "needs to be an actual file"
 msgstr ""
 
-#: src/fs/fs_publish.c:1126
+#: src/fs/fs_publish.c:1151
 #, c-format
 msgid "Insufficient space for publishing: %s"
 msgstr ""
 
-#: src/fs/fs_publish.c:1198
+#: src/fs/fs_publish.c:1243
 #, c-format
 msgid "Reserving space for %u entries and %llu bytes for publication\n"
 msgstr ""
@@ -2318,12 +2674,12 @@ msgstr ""
 msgid "Internal error."
 msgstr "未知错误。\n"
 
-#: src/fs/fs_search.c:815
+#: src/fs/fs_search.c:819
 #, fuzzy, c-format
 msgid "Failed to parse URI `%s': %s\n"
 msgstr "运行 %s失败：%s %d\n"
 
-#: src/fs/fs_search.c:874
+#: src/fs/fs_search.c:878
 #, c-format
 msgid "Got result with unknown block type `%d', ignoring"
 msgstr ""
@@ -2440,21 +2796,21 @@ msgstr ""
 msgid "Unrecognized URI type"
 msgstr ""
 
-#: src/fs/fs_uri.c:912
+#: src/fs/fs_uri.c:910
 #, fuzzy
 msgid "Lacking key configuration settings.\n"
 msgstr "立即保存配置？"
 
-#: src/fs/fs_uri.c:918
+#: src/fs/fs_uri.c:916
 #, fuzzy, c-format
 msgid "Could not access hostkey file `%s'.\n"
 msgstr "找不到接口“%s”的一个 IP 地址。\n"
 
-#: src/fs/fs_uri.c:1102 src/fs/fs_uri.c:1129
+#: src/fs/fs_uri.c:1100 src/fs/fs_uri.c:1127
 msgid "No keywords specified!\n"
 msgstr ""
 
-#: src/fs/fs_uri.c:1135
+#: src/fs/fs_uri.c:1133
 msgid "Number of double-quotes not balanced!\n"
 msgstr ""
 
@@ -2490,23 +2846,23 @@ msgid ""
 "You must specify one and only one directory name for automatic publication.\n"
 msgstr ""
 
-#: src/fs/gnunet-auto-share.c:737 src/fs/gnunet-publish.c:811
+#: src/fs/gnunet-auto-share.c:737 src/fs/gnunet-publish.c:824
 msgid "set the desired LEVEL of sender-anonymity"
 msgstr ""
 
-#: src/fs/gnunet-auto-share.c:741 src/fs/gnunet-publish.c:815
+#: src/fs/gnunet-auto-share.c:741 src/fs/gnunet-publish.c:828
 msgid "disable adding the creation time to the metadata of the uploaded file"
 msgstr ""
 
-#: src/fs/gnunet-auto-share.c:744 src/fs/gnunet-publish.c:818
+#: src/fs/gnunet-auto-share.c:744 src/fs/gnunet-publish.c:831
 msgid "do not use libextractor to add keywords or metadata"
 msgstr ""
 
-#: src/fs/gnunet-auto-share.c:747 src/fs/gnunet-publish.c:842
+#: src/fs/gnunet-auto-share.c:747 src/fs/gnunet-publish.c:855
 msgid "specify the priority of the content"
 msgstr ""
 
-#: src/fs/gnunet-auto-share.c:750 src/fs/gnunet-publish.c:849
+#: src/fs/gnunet-auto-share.c:750 src/fs/gnunet-publish.c:862
 msgid "set the desired replication LEVEL"
 msgstr ""
 
@@ -2514,7 +2870,7 @@ msgstr ""
 msgid "Automatically publish files from a directory on GNUnet"
 msgstr ""
 
-#: src/fs/gnunet-daemon-fsprofiler.c:657
+#: src/fs/gnunet-daemon-fsprofiler.c:660
 msgid "Daemon to use file-sharing to measure its performance."
 msgstr ""
 
@@ -2580,7 +2936,7 @@ msgstr ""
 msgid "Downloading `%s' done (%s/s).\n"
 msgstr ""
 
-#: src/fs/gnunet-download.c:209 src/fs/gnunet-publish.c:273
+#: src/fs/gnunet-download.c:209 src/fs/gnunet-publish.c:286
 #: src/fs/gnunet-search.c:193 src/fs/gnunet-unindex.c:108
 #, c-format
 msgid "Unexpected status: %d\n"
@@ -2591,7 +2947,7 @@ msgstr ""
 msgid "You need to specify a URI argument.\n"
 msgstr "您必须指定一个昵称\n"
 
-#: src/fs/gnunet-download.c:240 src/fs/gnunet-publish.c:652
+#: src/fs/gnunet-download.c:240 src/fs/gnunet-publish.c:665
 #, fuzzy, c-format
 msgid "Failed to parse URI: %s\n"
 msgstr "运行 %s失败：%s %d\n"
@@ -2604,7 +2960,7 @@ msgstr ""
 msgid "Target filename must be specified.\n"
 msgstr ""
 
-#: src/fs/gnunet-download.c:268 src/fs/gnunet-publish.c:784
+#: src/fs/gnunet-download.c:268 src/fs/gnunet-publish.c:797
 #: src/fs/gnunet-search.c:243 src/fs/gnunet-unindex.c:140
 #, fuzzy, c-format
 msgid "Could not initialize `%s' subsystem.\n"
@@ -2668,174 +3024,174 @@ msgstr ""
 msgid "run a testbed to measure file-sharing performance"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:230
+#: src/fs/gnunet-publish.c:231 src/fs/gnunet-publish.c:243
 #, c-format
 msgid "Publishing `%s' at %llu/%llu (%s remaining)\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:237
+#: src/fs/gnunet-publish.c:250
 #, c-format
 msgid "Error publishing: %s.\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:247
+#: src/fs/gnunet-publish.c:260
 #, c-format
 msgid "Publishing `%s' done.\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:251
+#: src/fs/gnunet-publish.c:264
 #, c-format
 msgid "URI is `%s'.\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:270
+#: src/fs/gnunet-publish.c:283
 msgid "Cleanup after abort complete.\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:388
+#: src/fs/gnunet-publish.c:401
 #, fuzzy, c-format
 msgid "Meta data for file `%s' (%s)\n"
 msgstr "打开日志文件“%s”失败：%s\n"
 
-#: src/fs/gnunet-publish.c:390
+#: src/fs/gnunet-publish.c:403
 #, fuzzy, c-format
 msgid "Keywords for file `%s' (%s)\n"
 msgstr "无法解析“%s”(%s)：%s\n"
 
-#: src/fs/gnunet-publish.c:529
+#: src/fs/gnunet-publish.c:542
 #, fuzzy
 msgid "Could not publish\n"
 msgstr "无法解析“%s”(%s)：%s\n"
 
-#: src/fs/gnunet-publish.c:552
+#: src/fs/gnunet-publish.c:565
 msgid "Could not start publishing.\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:585
+#: src/fs/gnunet-publish.c:598
 #, fuzzy, c-format
 msgid "Scanning directory `%s'.\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/fs/gnunet-publish.c:587
+#: src/fs/gnunet-publish.c:600
 #, fuzzy, c-format
 msgid "Scanning file `%s'.\n"
 msgstr "未知的命令“%s”。\n"
 
-#: src/fs/gnunet-publish.c:592
+#: src/fs/gnunet-publish.c:605
 #, c-format
 msgid "There was trouble processing file `%s', skipping it.\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:597
+#: src/fs/gnunet-publish.c:610
 msgid "Preprocessing complete.\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:601
+#: src/fs/gnunet-publish.c:614
 #, fuzzy, c-format
 msgid "Extracting meta data from file `%s' complete.\n"
 msgstr "打开日志文件“%s”失败：%s\n"
 
-#: src/fs/gnunet-publish.c:605
+#: src/fs/gnunet-publish.c:618
 msgid "Meta data extraction has finished.\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:612
+#: src/fs/gnunet-publish.c:625
 #, fuzzy
 msgid "Internal error scanning directory.\n"
 msgstr "未知错误。\n"
 
-#: src/fs/gnunet-publish.c:643
+#: src/fs/gnunet-publish.c:656
 #, c-format
 msgid "Selected pseudonym `%s' unknown\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:669
+#: src/fs/gnunet-publish.c:682
 #, fuzzy, c-format
 msgid "Failed to access `%s': %s\n"
 msgstr "打开日志文件“%s”失败：%s\n"
 
-#: src/fs/gnunet-publish.c:682
+#: src/fs/gnunet-publish.c:695
 msgid ""
 "Failed to start meta directory scanner.  Is gnunet-helper-publish-fs "
 "installed?\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:734
+#: src/fs/gnunet-publish.c:747
 #, c-format
 msgid "Cannot extract metadata from a URI!\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:741
+#: src/fs/gnunet-publish.c:754
 #, c-format
 msgid "You must specify one and only one filename for insertion.\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:747
+#: src/fs/gnunet-publish.c:760
 #, c-format
 msgid "You must NOT specify an URI and a filename.\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:755 src/vpn/gnunet-vpn.c:213
+#: src/fs/gnunet-publish.c:768 src/vpn/gnunet-vpn.c:208
 #, c-format
 msgid "Option `%s' is required when using option `%s'.\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:765 src/fs/gnunet-publish.c:772
-#: src/transport/gnunet-transport.c:843 src/transport/gnunet-transport.c:873
+#: src/fs/gnunet-publish.c:778 src/fs/gnunet-publish.c:785
+#: src/transport/gnunet-transport.c:840 src/transport/gnunet-transport.c:870
 #, c-format
 msgid "Option `%s' makes no sense without option `%s'.\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:822
+#: src/fs/gnunet-publish.c:835
 msgid ""
 "print list of extracted keywords that would be used, but do not perform "
 "upload"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:826
+#: src/fs/gnunet-publish.c:839
 msgid ""
 "add an additional keyword for the top-level file or directory (this option "
 "can be specified multiple times)"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:830
+#: src/fs/gnunet-publish.c:843
 msgid "set the meta-data for the given TYPE to the given VALUE"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:833
+#: src/fs/gnunet-publish.c:846
 msgid ""
 "do not index, perform full insertion (stores entire file in encrypted form "
 "in GNUnet database)"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:838
+#: src/fs/gnunet-publish.c:851
 msgid ""
 "specify ID of an updated version to be published in the future (for "
 "namespace insertions only)"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:846
+#: src/fs/gnunet-publish.c:859
 msgid "publish the files under the pseudonym NAME (place file into namespace)"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:852
+#: src/fs/gnunet-publish.c:865
 msgid ""
 "only simulate the process but do not do any actual publishing (useful to "
 "compute URIs)"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:856
+#: src/fs/gnunet-publish.c:869
 msgid ""
 "set the ID of this version of the publication (for namespace insertions only)"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:860
+#: src/fs/gnunet-publish.c:873
 msgid ""
 "URI to be published (can be used instead of passing a file to add keywords "
 "to the file with the respective URI)"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:876
+#: src/fs/gnunet-publish.c:889
 msgid "Publish a file or directory on GNUnet"
 msgstr ""
 
@@ -2882,90 +3238,90 @@ msgid "# Loopback routes suppressed"
 msgstr ""
 
 #: src/fs/gnunet-service-fs.c:639 src/hostlist/gnunet-daemon-hostlist.c:293
-#: src/topology/gnunet-daemon-topology.c:1315
-#: src/topology/gnunet-daemon-topology.c:1322
+#: src/topology/gnunet-daemon-topology.c:1253
+#: src/topology/gnunet-daemon-topology.c:1260
 #, fuzzy, c-format
 msgid "Failed to connect to `%s' service.\n"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/fs/gnunet-service-fs_cp.c:677
+#: src/fs/gnunet-service-fs_cp.c:680
 msgid "# migration stop messages received"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:681
+#: src/fs/gnunet-service-fs_cp.c:684
 #, c-format
 msgid "Migration of content to peer `%s' blocked for %s\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:716
+#: src/fs/gnunet-service-fs_cp.c:719
 msgid "# replies transmitted to other peers"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:722
+#: src/fs/gnunet-service-fs_cp.c:725
 msgid "# replies dropped"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:747 src/fs/gnunet-service-fs_cp.c:1296
+#: src/fs/gnunet-service-fs_cp.c:750 src/fs/gnunet-service-fs_cp.c:1299
 msgid "# P2P searches active"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:840
+#: src/fs/gnunet-service-fs_cp.c:843
 msgid "# artificial delays introduced (ms)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:893
+#: src/fs/gnunet-service-fs_cp.c:896
 msgid "# replies dropped due to type mismatch"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:901
+#: src/fs/gnunet-service-fs_cp.c:904
 msgid "# replies received for other peers"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:915
+#: src/fs/gnunet-service-fs_cp.c:918
 msgid "# replies dropped due to insufficient cover traffic"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:953
+#: src/fs/gnunet-service-fs_cp.c:956
 msgid "# P2P searches destroyed due to ultimate reply"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1021
+#: src/fs/gnunet-service-fs_cp.c:1024
 msgid "# requests done for free (low load)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1046
+#: src/fs/gnunet-service-fs_cp.c:1049
 msgid "# request dropped, priority insufficient"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1056
+#: src/fs/gnunet-service-fs_cp.c:1059
 msgid "# requests done for a price (normal load)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1134
+#: src/fs/gnunet-service-fs_cp.c:1137
 msgid "# GET requests received (from other peers)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1168
+#: src/fs/gnunet-service-fs_cp.c:1171
 msgid "# requests dropped due to initiator not being connected"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1191
+#: src/fs/gnunet-service-fs_cp.c:1194
 msgid "# requests dropped due to missing reverse route"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1241
+#: src/fs/gnunet-service-fs_cp.c:1244
 msgid "# requests dropped due TTL underflow"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1265
+#: src/fs/gnunet-service-fs_cp.c:1268
 msgid "# requests dropped due to higher-TTL request"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1294
+#: src/fs/gnunet-service-fs_cp.c:1297
 msgid "# P2P query messages received and processed"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1664
+#: src/fs/gnunet-service-fs_cp.c:1668
 msgid "# migration stop messages sent"
 msgstr ""
 
@@ -3095,111 +3451,111 @@ msgstr ""
 msgid "# query plan entries"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:310
+#: src/fs/gnunet-service-fs_pr.c:311
 msgid "# Pending requests created"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:393 src/fs/gnunet-service-fs_pr.c:644
+#: src/fs/gnunet-service-fs_pr.c:394 src/fs/gnunet-service-fs_pr.c:645
 msgid "# Pending requests active"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:812
+#: src/fs/gnunet-service-fs_pr.c:813
 msgid "# replies received and matched"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:842
+#: src/fs/gnunet-service-fs_pr.c:843
 msgid "# duplicate replies discarded (bloomfilter)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:851
+#: src/fs/gnunet-service-fs_pr.c:852
 msgid "# irrelevant replies discarded"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:865
+#: src/fs/gnunet-service-fs_pr.c:866
 #, c-format
 msgid "Unsupported block type %u\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:878
+#: src/fs/gnunet-service-fs_pr.c:879
 msgid "# results found locally"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:999
+#: src/fs/gnunet-service-fs_pr.c:1000
 msgid "# Datastore `PUT' failures"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1026
+#: src/fs/gnunet-service-fs_pr.c:1027
 msgid "# storage requests dropped due to high load"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1061
+#: src/fs/gnunet-service-fs_pr.c:1062
 msgid "# Replies received from DHT"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1189
+#: src/fs/gnunet-service-fs_pr.c:1190
 msgid "# Replies received from MESH"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1241
+#: src/fs/gnunet-service-fs_pr.c:1242
 #, c-format
 msgid "Datastore lookup already took %s!\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1261
+#: src/fs/gnunet-service-fs_pr.c:1262
 #, c-format
 msgid "On-demand lookup already took %s!\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1308
+#: src/fs/gnunet-service-fs_pr.c:1309
 msgid "# Datastore lookups concluded (no results)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1323
+#: src/fs/gnunet-service-fs_pr.c:1324
 msgid "# Datastore lookups concluded (seen all)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1332
+#: src/fs/gnunet-service-fs_pr.c:1333
 msgid "# Datastore lookups aborted (more than MAX_RESULTS)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1347
+#: src/fs/gnunet-service-fs_pr.c:1348
 msgid "# requested DBLOCK or IBLOCK not found"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1361
+#: src/fs/gnunet-service-fs_pr.c:1362
 msgid "# on-demand blocks matched requests"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1374
+#: src/fs/gnunet-service-fs_pr.c:1375
 msgid "# on-demand lookups performed successfully"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1379
+#: src/fs/gnunet-service-fs_pr.c:1380
 msgid "# on-demand lookups failed"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1406 src/fs/gnunet-service-fs_pr.c:1446
-#: src/fs/gnunet-service-fs_pr.c:1587
+#: src/fs/gnunet-service-fs_pr.c:1407 src/fs/gnunet-service-fs_pr.c:1447
+#: src/fs/gnunet-service-fs_pr.c:1588
 msgid "# Datastore lookups concluded (error queueing)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1464
+#: src/fs/gnunet-service-fs_pr.c:1465
 msgid "# Datastore lookups concluded (found last result)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1475
+#: src/fs/gnunet-service-fs_pr.c:1476
 msgid "# Datastore lookups concluded (load too high)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1563
+#: src/fs/gnunet-service-fs_pr.c:1564
 msgid "# Datastore lookups initiated"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1648
+#: src/fs/gnunet-service-fs_pr.c:1649
 msgid "# GAP PUT messages received"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_push.c:629
+#: src/fs/gnunet-service-fs_push.c:631
 msgid "time required, content pushing disabled"
 msgstr ""
 
@@ -3230,7 +3586,7 @@ msgstr ""
 msgid "Unindex a file that was previously indexed with gnunet-publish."
 msgstr ""
 
-#: src/gns/gns_api.c:385
+#: src/gns/gns_api.c:387
 #, fuzzy
 msgid "Failed to serialize lookup reply from GNS service!\n"
 msgstr "初始化“%s”服务失败。\n"
@@ -3255,198 +3611,339 @@ msgstr ""
 msgid "Received unsupported DNS request from %s\n"
 msgstr ""
 
-#: src/gns/gnunet-dns2gns.c:703
+#: src/gns/gnunet-dns2gns.c:701
 msgid "No ego configured for `dns2gns` subsystem\n"
 msgstr ""
 
-#: src/gns/gnunet-dns2gns.c:729
+#: src/gns/gnunet-dns2gns.c:727
 msgid "No DNS server specified!\n"
 msgstr ""
 
-#: src/gns/gnunet-dns2gns.c:751
+#: src/gns/gnunet-dns2gns.c:749
 msgid "No valid GNS zone specified!\n"
 msgstr ""
 
-#: src/gns/gnunet-dns2gns.c:772
+#: src/gns/gnunet-dns2gns.c:770
 msgid "IP of recursive DNS resolver to use (required)"
 msgstr ""
 
-#: src/gns/gnunet-dns2gns.c:775
+#: src/gns/gnunet-dns2gns.c:773
 msgid "Authoritative FCFS suffix to use (optional); default: fcfs.zkey.eu"
 msgstr ""
 
-#: src/gns/gnunet-dns2gns.c:778
+#: src/gns/gnunet-dns2gns.c:776
 msgid "Authoritative DNS suffix to use (optional); default: zkey.eu"
 msgstr ""
 
-#: src/gns/gnunet-dns2gns.c:781
+#: src/gns/gnunet-dns2gns.c:779
 msgid "UDP port to listen on for inbound DNS requests; default: 53"
 msgstr ""
 
-#: src/gns/gnunet-dns2gns.c:784
+#: src/gns/gnunet-dns2gns.c:782
 msgid "Public key of the GNS zone to use (overrides default)"
 msgstr ""
 
-#: src/gns/gnunet-dns2gns.c:797
+#: src/gns/gnunet-dns2gns.c:795
 msgid "GNUnet DNS-to-GNS proxy (a DNS server)"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:205
+#: src/gns/gnunet-gns.c:217
 #, c-format
 msgid "Please specify name to lookup!\n"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:285
+#: src/gns/gnunet-gns.c:297
 #, c-format
 msgid "Ego for `%s' not found, cannot perform lookup.\n"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:323
+#: src/gns/gnunet-gns.c:335
 #, c-format
 msgid ""
 "Ego for `master-zone' not found, cannot perform lookup.  Did you run gnunet-"
 "gns-import.sh?\n"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:352
+#: src/gns/gnunet-gns.c:364
 #, fuzzy, c-format
 msgid "Failed to connect to GNS\n"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/gns/gnunet-gns.c:365
+#: src/gns/gnunet-gns.c:377
 #, c-format
 msgid "Public key `%s' is not well-formed\n"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:414
+#: src/gns/gnunet-gns.c:426
 msgid "Lookup a record for the given name"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:417
+#: src/gns/gnunet-gns.c:429
 msgid "Specify the type of the record to lookup"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:420
+#: src/gns/gnunet-gns.c:432
 msgid "No unneeded output"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:423
+#: src/gns/gnunet-gns.c:435
 msgid "Specify the public key of the zone to lookup the record in"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:426
+#: src/gns/gnunet-gns.c:438
 msgid "Specify the name of the ego of the zone to lookup the record in"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:439
+#: src/gns/gnunet-gns.c:451
 #, fuzzy
 msgid "GNUnet GNS resolver tool"
 msgstr "GNUnet 错误日志"
 
-#: src/gns/gnunet-gns-proxy.c:60 src/hostlist/hostlist-client.c:469
+#: src/gns/gnunet-gns-proxy.c:105 src/hostlist/hostlist-client.c:469
 #: src/hostlist/hostlist-client.c:680 src/hostlist/hostlist-client.c:686
 #: src/hostlist/hostlist-client.c:738 src/hostlist/hostlist-client.c:747
 #: src/hostlist/hostlist-client.c:868 src/hostlist/hostlist-client.c:960
 #: src/hostlist/hostlist-client.c:965
-#: src/transport/plugin_transport_http_client.c:1068
-#: src/transport/plugin_transport_http_client.c:1083
+#: src/transport/plugin_transport_http_client.c:1067
+#: src/transport/plugin_transport_http_client.c:1082
 #, c-format
 msgid "%s failed at %s:%d: `%s'\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:2344
+#: src/gns/gnunet-gns-proxy.c:839
+#, fuzzy, c-format
+msgid "Unsupported CURL SSL backend %d\n"
+msgstr "未知的命令“%s”。\n"
+
+#: src/gns/gnunet-gns-proxy.c:862
+#, fuzzy, c-format
+msgid "Failed to fetch CN from cert: %s\n"
+msgstr "打开日志文件“%s”失败：%s\n"
+
+#: src/gns/gnunet-gns-proxy.c:885
+#, fuzzy, c-format
+msgid "Failed to initialize DANE: %s\n"
+msgstr "无法初始化 SQLite：%s。\n"
+
+#: src/gns/gnunet-gns-proxy.c:898
+#, fuzzy, c-format
+msgid "Failed to parse DANE record: %s\n"
+msgstr "打开日志文件“%s”失败：%s\n"
+
+#: src/gns/gnunet-gns-proxy.c:913
+#, fuzzy, c-format
+msgid "Failed to verify TLS connection using DANE: %s\n"
+msgstr "解析配置文件“%s”失败\n"
+
+#: src/gns/gnunet-gns-proxy.c:923
+#, c-format
+msgid "Failed DANE verification failed with GnuTLS verify status code: %u\n"
+msgstr ""
+
+#: src/gns/gnunet-gns-proxy.c:947
+#, c-format
+msgid "SSL certificate subject name (%s) does not match `%s'\n"
+msgstr ""
+
+#: src/gns/gnunet-gns-proxy.c:1092
+#, c-format
+msgid "Cookie domain `%s' supplied by server is invalid\n"
+msgstr ""
+
+#: src/gns/gnunet-gns-proxy.c:1609
+#, fuzzy, c-format
+msgid "Unsupported HTTP method `%s'\n"
+msgstr "未知的命令“%s”。\n"
+
+#: src/gns/gnunet-gns-proxy.c:1979
 #, fuzzy, c-format
 msgid "Unable to import private key from file `%s'\n"
 msgstr "无法创建用户账户："
 
-#: src/gns/gnunet-gns-proxy.c:2372
+#: src/gns/gnunet-gns-proxy.c:2009
 #, fuzzy, c-format
 msgid "Unable to import certificate %s\n"
 msgstr "无法保存配置文件“%s”："
 
-#: src/gns/gnunet-gns-proxy.c:2637 src/namestore/gnunet-namestore-fcfsd.c:958
+#: src/gns/gnunet-gns-proxy.c:2178
+#, fuzzy, c-format
+msgid "Failed to start HTTPS server for `%s'\n"
+msgstr "初始化“%s”服务失败。\n"
+
+#: src/gns/gnunet-gns-proxy.c:2197
 #, fuzzy
-msgid "Failed to start HTTP server\n"
+msgid "Failed to pass client to MHD\n"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/gns/gnunet-gns-proxy.c:3020
+#: src/gns/gnunet-gns-proxy.c:2505
+#, fuzzy, c-format
+msgid "Unsupported socks version %d\n"
+msgstr "未知的命令“%s”。\n"
+
+#: src/gns/gnunet-gns-proxy.c:2534
+#, fuzzy, c-format
+msgid "Unsupported socks command %d\n"
+msgstr "未知的命令“%s”。\n"
+
+#: src/gns/gnunet-gns-proxy.c:2616
+#, fuzzy, c-format
+msgid "Unsupported socks address type %d\n"
+msgstr "未知的命令“%s”。\n"
+
+#: src/gns/gnunet-gns-proxy.c:2955
 msgid "No ego configured for `shorten-zone`\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:3060
-msgid "No ego configured for `master-zone`\n"
+#: src/gns/gnunet-gns-proxy.c:2995
+#, c-format
+msgid "No ego configured for `%s`\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:3120
+#: src/gns/gnunet-gns-proxy.c:3057
 #, fuzzy, c-format
 msgid "Failed to load SSL/TLS key and certificate from `%s'\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/gns/gnunet-gns-proxy.c:3156
+#: src/gns/gnunet-gns-proxy.c:3098
 msgid "listen on specified port (default: 7777)"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:3159
+#: src/gns/gnunet-gns-proxy.c:3101
 msgid "pem file to use as CA"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:3178
+#: src/gns/gnunet-gns-proxy.c:3120
 msgid "GNUnet GNS proxy"
 msgstr ""
 
-#: src/gns/gnunet-service-gns.c:649
+#: src/gns/gnunet-service-gns.c:860
 #, fuzzy
 msgid "Failed to connect to the namestore!\n"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/gns/gnunet-service-gns.c:692
+#: src/gns/gnunet-service-gns.c:868
+#, fuzzy
+msgid "Failed to connect to the namecache!\n"
+msgstr "初始化“%s”服务失败。\n"
+
+#: src/gns/gnunet-service-gns.c:901
 #, fuzzy
 msgid "Could not connect to DHT!\n"
 msgstr "无法连接到 %s:%u：%s\n"
 
-#: src/gns/gnunet-service-gns.c:708
+#: src/gns/gnunet-service-gns.c:917
 #, fuzzy
 msgid "valid public key required"
 msgstr "“%s”的参数无效。\n"
 
-#: src/gns/gnunet-service-gns_interceptor.c:201
+#: src/gns/gnunet-service-gns_interceptor.c:263
 msgid "Error converting GNS response to DNS response!\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns_interceptor.c:307
+#: src/gns/gnunet-service-gns_interceptor.c:369
 #, fuzzy
 msgid "Failed to connect to the DNS service!\n"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/gns/gnunet-service-gns_resolver.c:717
+#: src/gns/gnunet-service-gns_resolver.c:771
 #, fuzzy
 msgid "Failed to parse DNS response\n"
 msgstr "打开日志文件“%s”失败：%s\n"
 
-#: src/gns/gnunet-service-gns_resolver.c:843
+#: src/gns/gnunet-service-gns_resolver.c:913
 #, c-format
 msgid "Skipping record of unsupported type %d\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns_resolver.c:1475
+#: src/gns/gnunet-service-gns_resolver.c:1646
 #, c-format
 msgid "GNS lookup resulted in DNS name that is too long (`%s')\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns_resolver.c:1499
+#: src/gns/gnunet-service-gns_resolver.c:1686
 msgid "GNS lookup recursion failed (no delegation record found)\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns_resolver.c:1523
+#: src/gns/gnunet-service-gns_resolver.c:1710
 #, fuzzy, c-format
 msgid "Failed to cache GNS resolution: %s\n"
 msgstr "打开日志文件“%s”失败：%s\n"
 
-#: src/gns/gnunet-service-gns_resolver.c:1782
+#: src/gns/gnunet-service-gns_resolver.c:1932
+#, c-format
+msgid "Zone %s was revoked, resolution fails\n"
+msgstr ""
+
+#: src/gns/gnunet-service-gns_resolver.c:2054
 #, c-format
 msgid "Hostname `%s' is not well-formed, resolution fails\n"
 msgstr ""
 
+#: src/gns/plugin_gnsrecord_gns.c:142
+#, fuzzy, c-format
+msgid "Unable to parse PKEY record `%s'\n"
+msgstr "解析配置文件“%s”失败\n"
+
+#: src/gns/plugin_gnsrecord_gns.c:172
+#, fuzzy, c-format
+msgid "Failed to serialize GNS2DNS record with value `%s'\n"
+msgstr "解析配置文件“%s”失败\n"
+
+#: src/gns/plugin_gnsrecord_gns.c:186
+#, fuzzy, c-format
+msgid "Unable to parse VPN record string `%s'\n"
+msgstr "解析配置文件“%s”失败\n"
+
+#: src/gnsrecord/plugin_gnsrecord_dns.c:261
+#, fuzzy, c-format
+msgid "Unable to parse IPv4 address `%s'\n"
+msgstr "无效的进程优先级“%s”\n"
+
+#: src/gnsrecord/plugin_gnsrecord_dns.c:282
+#, fuzzy, c-format
+msgid "Failed to serialize NS record with value `%s'\n"
+msgstr "解析配置文件“%s”失败\n"
+
+#: src/gnsrecord/plugin_gnsrecord_dns.c:304
+#, fuzzy, c-format
+msgid "Failed to serialize CNAME record with value `%s'\n"
+msgstr "解析配置文件“%s”失败\n"
+
+#: src/gnsrecord/plugin_gnsrecord_dns.c:332
+#, fuzzy, c-format
+msgid "Unable to parse SOA record `%s'\n"
+msgstr "解析配置文件“%s”失败\n"
+
+#: src/gnsrecord/plugin_gnsrecord_dns.c:351
+#, fuzzy, c-format
+msgid "Failed to serialize SOA record with mname `%s' and rname `%s'\n"
+msgstr "解析配置文件“%s”失败\n"
+
+#: src/gnsrecord/plugin_gnsrecord_dns.c:374
+#, fuzzy, c-format
+msgid "Failed to serialize PTR record with value `%s'\n"
+msgstr "解析配置文件“%s”失败\n"
+
+#: src/gnsrecord/plugin_gnsrecord_dns.c:394
+#, fuzzy, c-format
+msgid "Unable to parse MX record `%s'\n"
+msgstr "解析配置文件“%s”失败\n"
+
+#: src/gnsrecord/plugin_gnsrecord_dns.c:409
+#, fuzzy, c-format
+msgid "Failed to serialize MX record with hostname `%s'\n"
+msgstr "解析配置文件“%s”失败\n"
+
+#: src/gnsrecord/plugin_gnsrecord_dns.c:429
+#, fuzzy, c-format
+msgid "Unable to parse IPv6 address `%s'\n"
+msgstr "无效的进程优先级“%s”\n"
+
+#: src/gnsrecord/plugin_gnsrecord_dns.c:447
+#, fuzzy, c-format
+msgid "Unable to parse TLSA record string `%s'\n"
+msgstr "解析配置文件“%s”失败\n"
+
 #: src/hello/gnunet-hello.c:123
 msgid "Call with name of HELLO file to modify.\n"
 msgstr ""
@@ -3486,36 +3983,36 @@ msgstr "创建用户出错"
 msgid "Modified %u addresses \n"
 msgstr ""
 
-#: src/hello/hello.c:947
+#: src/hello/hello.c:943
 #, fuzzy
 msgid "Failed to parse HELLO message: missing expiration time\n"
 msgstr "保存配置失败。"
 
-#: src/hello/hello.c:956
+#: src/hello/hello.c:952
 #, fuzzy
 msgid "Failed to parse HELLO message: invalid expiration time\n"
 msgstr "保存配置失败。"
 
-#: src/hello/hello.c:966
+#: src/hello/hello.c:962
 #, fuzzy
 msgid "Failed to parse HELLO message: malformed\n"
 msgstr "打开日志文件“%s”失败：%s\n"
 
-#: src/hello/hello.c:976
+#: src/hello/hello.c:972
 msgid "Failed to parse HELLO message: missing transport plugin\n"
 msgstr ""
 
-#: src/hello/hello.c:993
+#: src/hello/hello.c:989
 #, c-format
 msgid "Plugin `%s' not found\n"
 msgstr ""
 
-#: src/hello/hello.c:1002
+#: src/hello/hello.c:998
 #, c-format
 msgid "Plugin `%s' does not support URIs yet\n"
 msgstr ""
 
-#: src/hello/hello.c:1021
+#: src/hello/hello.c:1017
 #, fuzzy, c-format
 msgid "Failed to parse `%s' as an address for plugin `%s'\n"
 msgstr "找不到接口“%s”的一个 IP 地址。\n"
@@ -3699,10 +4196,10 @@ msgid "expired addresses encountered"
 msgstr ""
 
 #: src/hostlist/hostlist-server.c:189 src/hostlist/hostlist-server.c:424
-#: src/peerinfo-tool/gnunet-peerinfo.c:358
-#: src/peerinfo-tool/gnunet-peerinfo.c:428
-#: src/peerinfo-tool/gnunet-peerinfo.c:499
-#: src/topology/gnunet-daemon-topology.c:918
+#: src/peerinfo-tool/gnunet-peerinfo.c:350
+#: src/peerinfo-tool/gnunet-peerinfo.c:419
+#: src/peerinfo-tool/gnunet-peerinfo.c:490
+#: src/topology/gnunet-daemon-topology.c:924
 #, c-format
 msgid "Error in communication with PEERINFO service: %s\n"
 msgstr ""
@@ -3757,8 +4254,8 @@ msgstr ""
 msgid "Advertisement message could not be queued by core\n"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:560 src/peerinfo-tool/gnunet-peerinfo.c:659
-#: src/transport/gnunet-service-transport.c:806
+#: src/hostlist/hostlist-server.c:560 src/peerinfo-tool/gnunet-peerinfo.c:651
+#: src/transport/gnunet-service-transport.c:790
 msgid "Could not access PEERINFO service.  Exiting.\n"
 msgstr ""
 
@@ -3874,55 +4371,54 @@ msgstr "解析配置文件“%s”失败\n"
 msgid "Failed to create directory `%s' for storing egos\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/integration-tests/connection_watchdog.c:998
+#: src/integration-tests/connection_watchdog.c:1012
 #, c-format
 msgid "Transport plugin: `%s' port %llu\n"
 msgstr ""
 
-#: src/integration-tests/connection_watchdog.c:1031
+#: src/integration-tests/connection_watchdog.c:1045
 #, fuzzy, c-format
 msgid "Found %u transport plugins: `%s'\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/integration-tests/connection_watchdog.c:1091
+#: src/integration-tests/connection_watchdog.c:1105
 msgid "Send ping messages to test connectivity (default == NO)"
 msgstr ""
 
-#: src/integration-tests/connection_watchdog.c:1100
-#: src/multicast/gnunet-multicast.c:70 src/template/gnunet-template.c:70
-msgid "help text"
-msgstr ""
+#: src/mesh/gnunet-mesh.c:146
+#, fuzzy, c-format
+msgid "Invalid tunnel owner `%s'\n"
+msgstr "IP 格式无效：“%s”\n"
 
-#: src/mesh/gnunet-mesh.c:205
+#: src/mesh/gnunet-mesh.c:209
 msgid "provide information about all tunnels (continuously) NOT IMPLEMENTED"
 msgstr ""
 
-#: src/mesh/gnunet-mesh.c:208
+#: src/mesh/gnunet-mesh.c:212
 #, fuzzy
 msgid "provide information about a particular tunnel"
 msgstr "无法获取有关用户“%s”的信息：%s\n"
 
-#: src/mesh/gnunet-mesh.c:218
+#: src/mesh/gnunet-mesh.c:222
 #, fuzzy
 msgid "Print information about mesh tunnels and peers."
 msgstr "无法获取有关用户“%s”的信息：%s\n"
 
-#: src/mesh/gnunet-service-mesh.c:5634 src/mesh/gnunet-service-mesh-enc.c:7060
+#: src/mesh/gnunet-service-mesh.c:5633 src/mesh/gnunet-service-mesh_peer.c:350
 msgid "Wrong CORE service\n"
 msgstr ""
 
-#: src/mesh/gnunet-service-mesh.c:5774 src/mesh/gnunet-service-mesh.c:5786
-#: src/mesh/gnunet-service-mesh.c:5798 src/mesh/gnunet-service-mesh.c:5810
-#: src/mesh/gnunet-service-mesh.c:5822 src/mesh/gnunet-service-mesh.c:5834
-#: src/nse/gnunet-service-nse.c:1440 src/nse/gnunet-service-nse.c:1458
+#: src/mesh/gnunet-service-mesh.c:5773 src/mesh/gnunet-service-mesh.c:5785
+#: src/mesh/gnunet-service-mesh.c:5797 src/mesh/gnunet-service-mesh.c:5809
+#: src/mesh/gnunet-service-mesh.c:5821 src/mesh/gnunet-service-mesh.c:5833
 #: src/regex/gnunet-daemon-regexprofiler.c:270
 #: src/regex/gnunet-regex-simulation-profiler.c:659
 #, fuzzy, c-format
 msgid "%s service is lacking key configuration settings (%s).  Exiting.\n"
 msgstr "立即保存配置？"
 
-#: src/mesh/gnunet-service-mesh.c:5846 src/mesh/gnunet-service-mesh.c:5856
-#: src/mesh/gnunet-service-mesh.c:5881
+#: src/mesh/gnunet-service-mesh.c:5845 src/mesh/gnunet-service-mesh.c:5855
+#: src/mesh/gnunet-service-mesh.c:5880
 #, fuzzy, c-format
 msgid ""
 "%s service is lacking key configuration settings (%s). Using default (%u).\n"
@@ -3938,240 +4434,230 @@ msgstr ""
 msgid "Could not access file `%s': %s\n"
 msgstr "无法解析“%s”(%s)：%s\n"
 
-#: src/namestore/gnunet-namestore.c:258
+#: src/namecache/gnunet-namecache.c:109
+#, fuzzy, c-format
+msgid "No records found for `%s'"
+msgstr "运行 %s失败：%s %d\n"
+
+#: src/namecache/gnunet-namecache.c:124 src/namestore/gnunet-namestore.c:367
+#, c-format
+msgid "\tCorrupt or unsupported record of type %u\n"
+msgstr ""
+
+#: src/namecache/gnunet-namecache.c:185 src/namestore/gnunet-namestore.c:777
+#, fuzzy, c-format
+msgid "You must specify which zone should be accessed\n"
+msgstr "您必须指定一个昵称\n"
+
+#: src/namecache/gnunet-namecache.c:195 src/namestore/gnunet-namestore.c:665
+#, fuzzy, c-format
+msgid "Invalid public key for reverse lookup `%s'\n"
+msgstr "“%s”的参数无效。\n"
+
+#: src/namecache/gnunet-namecache.c:226 src/namestore/gnunet-namestore.c:821
+msgid "name of the record to add/delete/display"
+msgstr ""
+
+#: src/namecache/gnunet-namecache.c:229
+msgid "spezifies the public key of the zone to look in"
+msgstr ""
+
+#: src/namecache/gnunet-namecache.c:240 src/namestore/gnunet-namestore.c:853
+#, fuzzy
+msgid "GNUnet zone manipulation tool"
+msgstr "GNUnet 配置"
+
+#: src/namecache/namecache_api.c:276
+msgid "Namecache failed to cache block"
+msgstr ""
+
+#: src/namecache/plugin_namecache_postgres.c:89
+#: src/namestore/plugin_namestore_postgres.c:93
+#, fuzzy
+msgid "Failed to create indices\n"
+msgstr "发送消息失败。\n"
+
+#: src/namestore/gnunet-namestore.c:278
 #, c-format
 msgid "Adding record failed: %s\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:289
+#: src/namestore/gnunet-namestore.c:306
 #, c-format
-msgid "Deleting record failed: %s\n"
+msgid "Deleting record failed, record does not exist%s%s\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:338
+#: src/namestore/gnunet-namestore.c:313
 #, c-format
-msgid "\tCorrupt or unsupported record of type %u\n"
+msgid "Deleting record failed%s%s\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:446
+#: src/namestore/gnunet-namestore.c:528
 #, c-format
 msgid "No options given\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:456
-#: src/namestore/gnunet-namestore-fcfsd.c:992
+#: src/namestore/gnunet-namestore.c:539
+#: src/namestore/gnunet-namestore-fcfsd.c:964
 #, fuzzy
 msgid "Failed to connect to namestore\n"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/namestore/gnunet-namestore.c:464 src/namestore/gnunet-namestore.c:473
-#: src/namestore/gnunet-namestore.c:490 src/namestore/gnunet-namestore.c:512
-#: src/namestore/gnunet-namestore.c:554
+#: src/namestore/gnunet-namestore.c:547 src/namestore/gnunet-namestore.c:556
+#: src/namestore/gnunet-namestore.c:573 src/namestore/gnunet-namestore.c:595
+#: src/namestore/gnunet-namestore.c:635
 #, fuzzy, c-format
 msgid "Missing option `%s' for operation `%s'\n"
 msgstr "配置文件“%s”已写入。\n"
 
-#: src/namestore/gnunet-namestore.c:465 src/namestore/gnunet-namestore.c:474
-#: src/namestore/gnunet-namestore.c:491 src/namestore/gnunet-namestore.c:513
+#: src/namestore/gnunet-namestore.c:548 src/namestore/gnunet-namestore.c:557
+#: src/namestore/gnunet-namestore.c:574 src/namestore/gnunet-namestore.c:596
 msgid "add"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:482
+#: src/namestore/gnunet-namestore.c:565
 #, fuzzy, c-format
 msgid "Unsupported type `%s'\n"
 msgstr "未知的命令“%s”。\n"
 
-#: src/namestore/gnunet-namestore.c:502
+#: src/namestore/gnunet-namestore.c:585
 #, c-format
 msgid "Value `%s' invalid for record type `%s'\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:538
+#: src/namestore/gnunet-namestore.c:621
 #, fuzzy, c-format
 msgid "Invalid time format `%s'\n"
 msgstr "IP 格式无效：“%s”\n"
 
-#: src/namestore/gnunet-namestore.c:555
+#: src/namestore/gnunet-namestore.c:636
 msgid "del"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:588
-#: src/peerinfo-tool/gnunet-peerinfo.c:711
+#: src/namestore/gnunet-namestore.c:689
+#: src/peerinfo-tool/gnunet-peerinfo.c:703
 #, fuzzy, c-format
 msgid "Invalid URI `%s'\n"
 msgstr "无效条目。\n"
 
-#: src/namestore/gnunet-namestore.c:645
+#: src/namestore/gnunet-namestore.c:747
 #, c-format
 msgid "Ego `%s' not known to identity service\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:674
-#, fuzzy, c-format
-msgid "You must specify which zone should be accessed\n"
-msgstr "您必须指定一个昵称\n"
-
-#: src/namestore/gnunet-namestore.c:702
+#: src/namestore/gnunet-namestore.c:806
 msgid "add record"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:705
+#: src/namestore/gnunet-namestore.c:809
 msgid "delete record"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:708
+#: src/namestore/gnunet-namestore.c:812
 msgid "display records"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:711
+#: src/namestore/gnunet-namestore.c:815
 msgid ""
 "expiration time for record to use (for adding only), \"never\" is possible"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:714
+#: src/namestore/gnunet-namestore.c:818
 #, fuzzy
 msgid "monitor changes in the namestore"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/namestore/gnunet-namestore.c:717
-msgid "name of the record to add/delete/display"
-msgstr ""
+#: src/namestore/gnunet-namestore.c:824
+#, fuzzy
+msgid "determine our name for the given PKEY"
+msgstr "无法获取有关用户“%s”的信息：%s\n"
 
-#: src/namestore/gnunet-namestore.c:720
+#: src/namestore/gnunet-namestore.c:827
 msgid "type of the record to add/delete/display"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:723
+#: src/namestore/gnunet-namestore.c:830
 msgid "URI to import into our zone"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:726
+#: src/namestore/gnunet-namestore.c:833
 msgid "value of the record to add/delete"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:729
+#: src/namestore/gnunet-namestore.c:836
 msgid "create or list public record"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:732
+#: src/namestore/gnunet-namestore.c:839
 msgid ""
 "create shadow record (only valid if all other records of the same type have "
 "expired"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:735
+#: src/namestore/gnunet-namestore.c:842
 msgid "name of the ego controlling the zone"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:746
-#, fuzzy
-msgid "GNUnet zone manipulation tool"
-msgstr "GNUnet 配置"
-
-#: src/namestore/gnunet-namestore-fcfsd.c:456
+#: src/namestore/gnunet-namestore-fcfsd.c:462
 #, fuzzy, c-format
 msgid "Unsupported form value `%s'\n"
 msgstr "未知的命令“%s”。\n"
 
-#: src/namestore/gnunet-namestore-fcfsd.c:485
+#: src/namestore/gnunet-namestore-fcfsd.c:489
 #, fuzzy, c-format
 msgid "Failed to create record for domain `%s': %s\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/namestore/gnunet-namestore-fcfsd.c:520
+#: src/namestore/gnunet-namestore-fcfsd.c:524
 #, c-format
 msgid "Found existing name `%s' for the given key\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:560
+#: src/namestore/gnunet-namestore-fcfsd.c:590
 #, c-format
 msgid "Found %u existing records for domain `%s'\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:670
+#: src/namestore/gnunet-namestore-fcfsd.c:646
 #, fuzzy, c-format
 msgid "Failed to create page for `%s'\n"
 msgstr "发送消息失败。\n"
 
-#: src/namestore/gnunet-namestore-fcfsd.c:686
+#: src/namestore/gnunet-namestore-fcfsd.c:662
 #, fuzzy, c-format
 msgid "Failed to setup post processor for `%s'\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/namestore/gnunet-namestore-fcfsd.c:722
+#: src/namestore/gnunet-namestore-fcfsd.c:698
 msgid "Domain name must not contain `.'\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:730
+#: src/namestore/gnunet-namestore-fcfsd.c:706
 msgid "Domain name must not contain `+'\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:932
+#: src/namestore/gnunet-namestore-fcfsd.c:904
 msgid "No ego configured for `fcfsd` subsystem\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:1027
-msgid "GNU Name System First Come First Serve name registration service"
-msgstr ""
+#: src/namestore/gnunet-namestore-fcfsd.c:930
+#, fuzzy
+msgid "Failed to start HTTP server\n"
+msgstr "初始化“%s”服务失败。\n"
 
-#: src/namestore/gnunet-service-namestore.c:674
-msgid "Failed to cache encrypted block of my own zone!\n"
+#: src/namestore/gnunet-namestore-fcfsd.c:999
+msgid "GNU Name System First Come First Serve name registration service"
 msgstr ""
 
-#: src/namestore/namestore_api.c:319
-msgid "Namestore failed to cache block"
-msgstr ""
+#: src/namestore/gnunet-service-namestore.c:494
+#, fuzzy, c-format
+msgid "Failed to replicate block in namecache: %s\n"
+msgstr "发送消息失败。\n"
 
-#: src/namestore/namestore_api.c:345
+#: src/namestore/namestore_api.c:273
 msgid "Namestore failed to store record\n"
 msgstr ""
 
-#: src/namestore/namestore_api_common.c:691
-#: src/namestore/namestore_api_common.c:831
-#, fuzzy, c-format
-msgid "Unsupported record type %d\n"
-msgstr "未知的命令“%s”。\n"
-
-#: src/namestore/namestore_api_common.c:698
-#, fuzzy, c-format
-msgid "Unable to parse IPv4 address `%s'\n"
-msgstr "无效的进程优先级“%s”\n"
-
-#: src/namestore/namestore_api_common.c:721
-#, fuzzy, c-format
-msgid "Unable to parse SOA record `%s'\n"
-msgstr "解析配置文件“%s”失败\n"
-
-#: src/namestore/namestore_api_common.c:744
-#, fuzzy, c-format
-msgid "Unable to parse MX record `%s'\n"
-msgstr "解析配置文件“%s”失败\n"
-
-#: src/namestore/namestore_api_common.c:762
-#, fuzzy, c-format
-msgid "Unable to parse IPv6 address `%s'\n"
-msgstr "无效的进程优先级“%s”\n"
-
-#: src/namestore/namestore_api_common.c:775
-#, fuzzy, c-format
-msgid "Unable to parse PKEY record `%s'\n"
-msgstr "解析配置文件“%s”失败\n"
-
-#: src/namestore/namestore_api_common.c:796
-#, fuzzy, c-format
-msgid "Unable to parse VPN record string `%s'\n"
-msgstr "解析配置文件“%s”失败\n"
-
-#: src/namestore/namestore_api_common.c:822
-#, fuzzy, c-format
-msgid "Unable to parse TLSA record string `%s'\n"
-msgstr "解析配置文件“%s”失败\n"
-
-#: src/namestore/plugin_namestore_postgres.c:95
-#, fuzzy
-msgid "Failed to create indices\n"
-msgstr "发送消息失败。\n"
-
 #: src/nat/gnunet-nat-server.c:279
 #, c-format
 msgid "Please pass valid port number as the first argument! (got `%s')\n"
@@ -4282,38 +4768,40 @@ msgstr ""
 msgid "Failed to create listen socket bound to `%s' for NAT test: %s\n"
 msgstr ""
 
-#: src/nse/gnunet-nse-profiler.c:889
+#: src/nse/gnunet-nse-profiler.c:858
 msgid "limit to the number of connections to NSE services, 0 for none"
 msgstr ""
 
-#: src/nse/gnunet-nse-profiler.c:892
+#: src/nse/gnunet-nse-profiler.c:861
 msgid "name of the file for writing connection information and statistics"
 msgstr ""
 
-#: src/nse/gnunet-nse-profiler.c:895 src/testbed/gnunet-testbed-profiler.c:287
+#: src/nse/gnunet-nse-profiler.c:864 src/testbed/gnunet-testbed-profiler.c:306
 msgid "name of the file with the login information for the testbed"
 msgstr ""
 
-#: src/nse/gnunet-nse-profiler.c:898
+#: src/nse/gnunet-nse-profiler.c:867
 msgid "name of the file for writing the main results"
 msgstr ""
 
-#: src/nse/gnunet-nse-profiler.c:901
+#: src/nse/gnunet-nse-profiler.c:870
 msgid "Number of peers to run in each round, separated by commas"
 msgstr ""
 
-#: src/nse/gnunet-nse-profiler.c:907
+#: src/nse/gnunet-nse-profiler.c:876
 msgid "delay between rounds"
 msgstr ""
 
-#: src/nse/gnunet-nse-profiler.c:916
+#: src/nse/gnunet-nse-profiler.c:885
 #, fuzzy
 msgid "Measure quality and performance of the NSE service."
 msgstr "无法访问该服务"
 
-#: src/nse/gnunet-service-nse.c:1448
-msgid "Invalid work requirement for NSE service. Exiting.\n"
-msgstr ""
+#: src/nse/gnunet-service-nse.c:1460
+#: src/revocation/gnunet-service-revocation.c:580
+#, fuzzy
+msgid "Value is too large.\n"
+msgstr "值不在合法范围内。"
 
 #: src/nse/gnunet-service-nse.c:1487
 msgid "NSE service is lacking key configuration settings.  Exiting.\n"
@@ -4324,160 +4812,160 @@ msgstr ""
 msgid "Removing expired address of transport `%s'\n"
 msgstr ""
 
-#: src/peerinfo/gnunet-service-peerinfo.c:353
+#: src/peerinfo/gnunet-service-peerinfo.c:352
 #, fuzzy, c-format
 msgid "Failed to parse HELLO in file `%s': %s\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/peerinfo/gnunet-service-peerinfo.c:370
+#: src/peerinfo/gnunet-service-peerinfo.c:369
 #, fuzzy, c-format
 msgid "Failed to parse HELLO in file `%s': %s %u \n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/peerinfo/gnunet-service-peerinfo.c:448
+#: src/peerinfo/gnunet-service-peerinfo.c:447
 msgid "# peers known"
 msgstr ""
 
-#: src/peerinfo/gnunet-service-peerinfo.c:484
+#: src/peerinfo/gnunet-service-peerinfo.c:483
 #, c-format
 msgid ""
 "File `%s' in directory `%s' does not match naming convention. Removed.\n"
 msgstr ""
 
-#: src/peerinfo/gnunet-service-peerinfo.c:637
+#: src/peerinfo/gnunet-service-peerinfo.c:638
 #, fuzzy, c-format
 msgid "Scanning directory `%s'\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/peerinfo/gnunet-service-peerinfo.c:642
+#: src/peerinfo/gnunet-service-peerinfo.c:643
 #, c-format
 msgid "Still no peers found in `%s'!\n"
 msgstr ""
 
-#: src/peerinfo/gnunet-service-peerinfo.c:975
+#: src/peerinfo/gnunet-service-peerinfo.c:979
 #, fuzzy, c-format
 msgid "Cleaning up directory `%s'\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/peerinfo/gnunet-service-peerinfo.c:1265
+#: src/peerinfo/gnunet-service-peerinfo.c:1269
 #, c-format
 msgid "Importing HELLOs from `%s'\n"
 msgstr ""
 
-#: src/peerinfo/peerinfo_api.c:239
+#: src/peerinfo/peerinfo_api.c:236
 msgid "aborted due to explicit disconnect request"
 msgstr ""
 
-#: src/peerinfo/peerinfo_api.c:359
+#: src/peerinfo/peerinfo_api.c:356
 #, fuzzy
 msgid "failed to transmit request (service down?)"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/peerinfo/peerinfo_api.c:509
+#: src/peerinfo/peerinfo_api.c:506
 msgid "Failed to receive response from `PEERINFO' service."
 msgstr ""
 
-#: src/peerinfo/peerinfo_api.c:550 src/peerinfo/peerinfo_api.c:569
-#: src/peerinfo/peerinfo_api.c:584 src/peerinfo/peerinfo_api.c:595
-#: src/peerinfo/peerinfo_api.c:606
+#: src/peerinfo/peerinfo_api.c:547 src/peerinfo/peerinfo_api.c:566
+#: src/peerinfo/peerinfo_api.c:581 src/peerinfo/peerinfo_api.c:592
+#: src/peerinfo/peerinfo_api.c:603
 #, fuzzy
 msgid "Received invalid message from `PEERINFO' service."
 msgstr "“%s”的参数无效。\n"
 
-#: src/peerinfo/peerinfo_api.c:681
+#: src/peerinfo/peerinfo_api.c:678
 #, fuzzy
 msgid "Timeout transmitting iteration request to `PEERINFO' service."
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/peerinfo/peerinfo_api_notify.c:269
+#: src/peerinfo/peerinfo_api_notify.c:268
 #, fuzzy, c-format
 msgid "Could not connect to `%s' service.\n"
 msgstr "无法连接到 %s:%u：%s\n"
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:239
+#: src/peerinfo-tool/gnunet-peerinfo.c:232
 #, fuzzy, c-format
 msgid "%sPeer `%s'\n"
 msgstr "运行 %s失败：%s %d\n"
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:246
+#: src/peerinfo-tool/gnunet-peerinfo.c:239
 #, c-format
 msgid "\tExpires: %s \t %s\n"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:437
+#: src/peerinfo-tool/gnunet-peerinfo.c:428
 #, fuzzy, c-format
 msgid "Failure: Did not receive %s\n"
 msgstr "打开日志文件“%s”失败：%s\n"
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:445
+#: src/peerinfo-tool/gnunet-peerinfo.c:436
 #, c-format
 msgid "Failure: Received invalid %s\n"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:454
+#: src/peerinfo-tool/gnunet-peerinfo.c:445
 #, fuzzy, c-format
 msgid "Failed to write HELLO with %u bytes to file `%s'\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:467
+#: src/peerinfo-tool/gnunet-peerinfo.c:458
 #, c-format
 msgid "Wrote %s HELLO containing %u addresses with %u bytes to file `%s'\n"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:531
+#: src/peerinfo-tool/gnunet-peerinfo.c:522
 #, c-format
 msgid "Failure adding HELLO: %s\n"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:669
+#: src/peerinfo-tool/gnunet-peerinfo.c:661
 #, fuzzy, c-format
 msgid "Could not find option `%s:%s' in configuration.\n"
 msgstr "找不到主机“%s”的 IP：%s\n"
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:675
+#: src/peerinfo-tool/gnunet-peerinfo.c:667
 #, c-format
 msgid "Loading hostkey from `%s' failed.\n"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:734
+#: src/peerinfo-tool/gnunet-peerinfo.c:725
 #, c-format
 msgid "I am peer `%s'.\n"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:777
+#: src/peerinfo-tool/gnunet-peerinfo.c:769
 msgid "don't resolve host names"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:780
+#: src/peerinfo-tool/gnunet-peerinfo.c:772
 msgid "output only the identity strings"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:783
+#: src/peerinfo-tool/gnunet-peerinfo.c:775
 msgid "include friend-only information"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:786
+#: src/peerinfo-tool/gnunet-peerinfo.c:778
 msgid "output our own identity only"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:789
+#: src/peerinfo-tool/gnunet-peerinfo.c:781
 #, fuzzy
 msgid "list all known peers"
 msgstr "列出所有网络适配器"
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:792
+#: src/peerinfo-tool/gnunet-peerinfo.c:784
 msgid "dump hello to file"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:795
+#: src/peerinfo-tool/gnunet-peerinfo.c:787
 msgid "also output HELLO uri(s)"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:798
+#: src/peerinfo-tool/gnunet-peerinfo.c:790
 msgid "add given HELLO uri to the database"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:809
+#: src/peerinfo-tool/gnunet-peerinfo.c:801
 #, fuzzy
 msgid "Print information about peers."
 msgstr "无法获取有关用户“%s”的信息：%s\n"
@@ -4510,89 +4998,84 @@ msgstr "“%s”于 %s:%d 处失败，错误为：%s\n"
 msgid "Unable to initialize Postgres: %s"
 msgstr "无法初始化 SQLite：%s。\n"
 
-#: src/psycstore/gnunet-service-psycstore.c:203
+#: src/psycstore/gnunet-service-psycstore.c:200
 #, fuzzy
 msgid "Failed to store membership information!\n"
 msgstr "打开日志文件“%s”失败：%s\n"
 
-#: src/psycstore/gnunet-service-psycstore.c:227
+#: src/psycstore/gnunet-service-psycstore.c:224
 #, fuzzy
 msgid "Failed to test membership!\n"
 msgstr "发送消息失败。\n"
 
-#: src/psycstore/gnunet-service-psycstore.c:249
+#: src/psycstore/gnunet-service-psycstore.c:246
 #, fuzzy
 msgid "Failed to store fragment!\n"
 msgstr "运行 %s失败：%s %d\n"
 
-#: src/psycstore/gnunet-service-psycstore.c:275
+#: src/psycstore/gnunet-service-psycstore.c:272
 #, fuzzy
 msgid "Failed to get fragment!\n"
 msgstr "发送消息失败。\n"
 
-#: src/psycstore/gnunet-service-psycstore.c:302
+#: src/psycstore/gnunet-service-psycstore.c:299
 #, fuzzy
 msgid "Failed to get message!\n"
 msgstr "发送消息失败。\n"
 
-#: src/psycstore/gnunet-service-psycstore.c:331
+#: src/psycstore/gnunet-service-psycstore.c:328
 #, fuzzy
 msgid "Failed to get message fragment!\n"
 msgstr "打开日志文件“%s”失败：%s\n"
 
-#: src/psycstore/gnunet-service-psycstore.c:357
+#: src/psycstore/gnunet-service-psycstore.c:356
 #, fuzzy
 msgid "Failed to get master counters!\n"
 msgstr "发送消息失败。\n"
 
-#: src/psycstore/gnunet-service-psycstore.c:395
-#, fuzzy
-msgid "Failed to get slave counters!\n"
-msgstr "发送消息失败。\n"
-
-#: src/psycstore/gnunet-service-psycstore.c:429
-#: src/psycstore/gnunet-service-psycstore.c:502
+#: src/psycstore/gnunet-service-psycstore.c:392
+#: src/psycstore/gnunet-service-psycstore.c:465
 msgid "Tried to set invalid state variable name!\n"
 msgstr ""
 
-#: src/psycstore/gnunet-service-psycstore.c:445
+#: src/psycstore/gnunet-service-psycstore.c:408
 #, fuzzy
 msgid "Failed to begin modifying state!\n"
 msgstr "运行 %s失败：%s %d\n"
 
-#: src/psycstore/gnunet-service-psycstore.c:468
+#: src/psycstore/gnunet-service-psycstore.c:431
 #, fuzzy, c-format
 msgid "Unknown operator: %c\n"
 msgstr "未知错误"
 
-#: src/psycstore/gnunet-service-psycstore.c:478
+#: src/psycstore/gnunet-service-psycstore.c:441
 #, fuzzy
 msgid "Failed to end modifying state!\n"
 msgstr "运行 %s失败：%s %d\n"
 
-#: src/psycstore/gnunet-service-psycstore.c:516
+#: src/psycstore/gnunet-service-psycstore.c:479
 #, fuzzy
 msgid "Failed to begin synchronizing state!\n"
 msgstr "发送消息失败。\n"
 
-#: src/psycstore/gnunet-service-psycstore.c:532
+#: src/psycstore/gnunet-service-psycstore.c:495
 #, fuzzy
 msgid "Failed to end synchronizing state!\n"
 msgstr "发送消息失败。\n"
 
-#: src/psycstore/gnunet-service-psycstore.c:552
-#: src/psycstore/gnunet-service-psycstore.c:571
+#: src/psycstore/gnunet-service-psycstore.c:515
+#: src/psycstore/gnunet-service-psycstore.c:534
 #, fuzzy
 msgid "Failed to reset state!\n"
 msgstr "发送消息失败。\n"
 
-#: src/psycstore/gnunet-service-psycstore.c:594
-#: src/psycstore/gnunet-service-psycstore.c:645
+#: src/psycstore/gnunet-service-psycstore.c:557
+#: src/psycstore/gnunet-service-psycstore.c:608
 msgid "Tried to get invalid state variable name!\n"
 msgstr ""
 
-#: src/psycstore/gnunet-service-psycstore.c:621
-#: src/psycstore/gnunet-service-psycstore.c:660
+#: src/psycstore/gnunet-service-psycstore.c:584
+#: src/psycstore/gnunet-service-psycstore.c:623
 #, fuzzy
 msgid "Failed to get state variable!\n"
 msgstr "发送消息失败。\n"
@@ -4621,61 +5104,58 @@ msgstr "创建用户出错"
 msgid "SQLite database running\n"
 msgstr "sqlite 数据仓库"
 
-#: src/pt/gnunet-daemon-pt.c:266
+#: src/pt/gnunet-daemon-pt.c:483
 msgid "Failed to pack DNS request.  Dropping.\n"
 msgstr ""
 
-#: src/pt/gnunet-daemon-pt.c:272
+#: src/pt/gnunet-daemon-pt.c:489
 msgid "# DNS requests mapped to VPN"
 msgstr ""
 
-#: src/pt/gnunet-daemon-pt.c:325
+#: src/pt/gnunet-daemon-pt.c:542
 msgid "# DNS records modified"
 msgstr ""
 
-#: src/pt/gnunet-daemon-pt.c:502
+#: src/pt/gnunet-daemon-pt.c:718
 msgid "# DNS replies intercepted"
 msgstr ""
 
-#: src/pt/gnunet-daemon-pt.c:508
+#: src/pt/gnunet-daemon-pt.c:724
 msgid "Failed to parse DNS request.  Dropping.\n"
 msgstr ""
 
-#: src/pt/gnunet-daemon-pt.c:604
+#: src/pt/gnunet-daemon-pt.c:827
 msgid "# DNS requests dropped (timeout)"
 msgstr ""
 
-#: src/pt/gnunet-daemon-pt.c:634
+#: src/pt/gnunet-daemon-pt.c:884
 msgid "# DNS requests intercepted"
 msgstr ""
 
-#: src/pt/gnunet-daemon-pt.c:639
+#: src/pt/gnunet-daemon-pt.c:889
 msgid "# DNS requests dropped (DNS mesh tunnel down)"
 msgstr ""
 
-#: src/pt/gnunet-daemon-pt.c:647
+#: src/pt/gnunet-daemon-pt.c:897
 msgid "# DNS requests dropped (malformed)"
 msgstr ""
 
-#: src/pt/gnunet-daemon-pt.c:715
+#: src/pt/gnunet-daemon-pt.c:970
 msgid "# DNS replies received"
 msgstr ""
 
-#: src/pt/gnunet-daemon-pt.c:729
+#: src/pt/gnunet-daemon-pt.c:986
 msgid "# DNS replies dropped (too late?)"
 msgstr ""
 
-#: src/pt/gnunet-daemon-pt.c:747 src/pt/gnunet-daemon-pt.c:759
-msgid "# DNS requests aborted (tunnel down)"
-msgstr ""
-
-#: src/pt/gnunet-daemon-pt.c:901 src/pt/gnunet-daemon-pt.c:910
-#: src/pt/gnunet-daemon-pt.c:930 src/pt/gnunet-daemon-pt.c:940
+#: src/pt/gnunet-daemon-pt.c:1262 src/pt/gnunet-daemon-pt.c:1271
+#: src/pt/gnunet-daemon-pt.c:1291 src/pt/gnunet-daemon-pt.c:1302
+#: src/pt/gnunet-daemon-pt.c:1311
 #, fuzzy, c-format
 msgid "Failed to connect to %s service.  Exiting.\n"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/pt/gnunet-daemon-pt.c:977
+#: src/pt/gnunet-daemon-pt.c:1348
 msgid "Daemon to run to perform IP protocol translation to GNUnet"
 msgstr ""
 
@@ -4683,65 +5163,65 @@ msgstr ""
 msgid "Daemon to announce regular expressions for the peer using mesh."
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1281
+#: src/regex/gnunet-regex-profiler.c:1288
 msgid "No configuration file given. Exiting\n"
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1292
+#: src/regex/gnunet-regex-profiler.c:1299
 #, fuzzy
 msgid "Configuration option \"regex_prefix\" missing. Exiting\n"
 msgstr "配置文件“%s”已写入。\n"
 
-#: src/regex/gnunet-regex-profiler.c:1321
+#: src/regex/gnunet-regex-profiler.c:1328
 #: src/regex/gnunet-regex-simulation-profiler.c:622
 #, c-format
 msgid "No policy directory specified on command line. Exiting.\n"
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1327
+#: src/regex/gnunet-regex-profiler.c:1334
 #: src/regex/gnunet-regex-simulation-profiler.c:629
 #, c-format
 msgid "Specified policies directory does not exist. Exiting.\n"
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1334
+#: src/regex/gnunet-regex-profiler.c:1341
 #, fuzzy, c-format
 msgid "No files found in `%s'\n"
 msgstr "运行 %s失败：%s %d\n"
 
-#: src/regex/gnunet-regex-profiler.c:1343
+#: src/regex/gnunet-regex-profiler.c:1350
 msgid "No search strings file given. Exiting.\n"
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1363
+#: src/regex/gnunet-regex-profiler.c:1370
 #, fuzzy
 msgid "Error loading search strings. Exiting.\n"
 msgstr "创建用户出错"
 
-#: src/regex/gnunet-regex-profiler.c:1445
+#: src/regex/gnunet-regex-profiler.c:1455
 #, fuzzy
 msgid "name of the file for writing statistics"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/regex/gnunet-regex-profiler.c:1448
+#: src/regex/gnunet-regex-profiler.c:1458
 msgid "wait TIMEOUT before ending the experiment"
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1451
+#: src/regex/gnunet-regex-profiler.c:1461
 msgid "directory with policy files"
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1454
+#: src/regex/gnunet-regex-profiler.c:1464
 #, fuzzy
 msgid "name of file with input strings"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/regex/gnunet-regex-profiler.c:1457
+#: src/regex/gnunet-regex-profiler.c:1467
 #, fuzzy
 msgid "name of file with hosts' names"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/regex/gnunet-regex-profiler.c:1469
+#: src/regex/gnunet-regex-profiler.c:1479
 msgid "Profiler for regex"
 msgstr ""
 
@@ -4757,385 +5237,487 @@ msgstr ""
 msgid "Profiler for regex library"
 msgstr ""
 
-#: src/scalarproduct/gnunet-scalarproduct.c:195
+#: src/revocation/gnunet-revocation.c:121
+#, c-format
+msgid "Key `%s' is valid\n"
+msgstr ""
+
+#: src/revocation/gnunet-revocation.c:126
+#, fuzzy, c-format
+msgid "Key `%s' has been revoked\n"
+msgstr "服务已删除。\n"
+
+#: src/revocation/gnunet-revocation.c:132
+#, fuzzy
+msgid "Internal error\n"
+msgstr "未知错误。\n"
+
+#: src/revocation/gnunet-revocation.c:158
+#, c-format
+msgid "Key for ego `%s' is still valid, revocation failed (!)\n"
+msgstr ""
+
+#: src/revocation/gnunet-revocation.c:163
+msgid "Revocation failed (!)\n"
+msgstr ""
+
+#: src/revocation/gnunet-revocation.c:168
+#, c-format
+msgid "Key for ego `%s' has been successfully revoked\n"
+msgstr ""
+
+#: src/revocation/gnunet-revocation.c:173
+msgid "Revocation successful.\n"
+msgstr ""
+
+#: src/revocation/gnunet-revocation.c:178
+msgid "Internal error, key revocation might have failed\n"
+msgstr ""
+
+#: src/revocation/gnunet-revocation.c:289
+#, c-format
+msgid "Revocation certificate for `%s' stored in `%s'\n"
+msgstr ""
+
+#: src/revocation/gnunet-revocation.c:319
+#, c-format
+msgid "Ego `%s' not found.\n"
+msgstr ""
+
+#: src/revocation/gnunet-revocation.c:340
+#, c-format
+msgid "Error: revocation certificate in `%s' is not for `%s'\n"
+msgstr ""
+
+#: src/revocation/gnunet-revocation.c:360
+msgid "Revocation certificate ready\n"
+msgstr ""
+
+#: src/revocation/gnunet-revocation.c:370
+msgid "Revocation certificate not ready, calculating proof of work\n"
+msgstr ""
+
+#: src/revocation/gnunet-revocation.c:402
+#, fuzzy, c-format
+msgid "Public key `%s' malformed\n"
+msgstr "“%s”的参数无效。\n"
+
+#: src/revocation/gnunet-revocation.c:416
+msgid ""
+"Testing and revoking at the same time is not allowed, only executing test.\n"
+msgstr ""
+
+#: src/revocation/gnunet-revocation.c:451
+#, fuzzy, c-format
+msgid "Failed to read revocation certificate from `%s'\n"
+msgstr "解析配置文件“%s”失败\n"
+
+#: src/revocation/gnunet-revocation.c:476
+#, fuzzy
+msgid "No action specified. Nothing to do.\n"
+msgstr "没有指定接口，将使用默认。\n"
+
+#: src/revocation/gnunet-revocation.c:492
+msgid "use NAME for the name of the revocation file"
+msgstr ""
+
+#: src/revocation/gnunet-revocation.c:495
+msgid "revoke the private key associated with the ego NAME "
+msgstr ""
+
+#: src/revocation/gnunet-revocation.c:498
+msgid ""
+"actually perform the revocation revocation file, otherwise we just do the "
+"precomputation"
+msgstr ""
+
+#: src/revocation/gnunet-revocation.c:501
+msgid "test if the public key KEY has been revoked"
+msgstr ""
+
+#: src/revocation/gnunet-service-revocation.c:250
+msgid "Duplicate revocation received from peer. Ignored.\n"
+msgstr ""
+
+#: src/revocation/gnunet-service-revocation.c:599
+#, fuzzy
+msgid "Could not open revocation database file!"
+msgstr "无法连接到 %s:%u：%s\n"
+
+#: src/scalarproduct/gnunet-scalarproduct.c:194
 #, fuzzy
 msgid "You must specify at least one message ID to check!\n"
 msgstr "您必须指定一个昵称\n"
 
-#: src/scalarproduct/gnunet-scalarproduct.c:201
+#: src/scalarproduct/gnunet-scalarproduct.c:200
 msgid "This program needs a session identifier for comparing vectors.\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-scalarproduct.c:207
+#: src/scalarproduct/gnunet-scalarproduct.c:206
 msgid "Please give a session key for --input_key!\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-scalarproduct.c:216
+#: src/scalarproduct/gnunet-scalarproduct.c:215
 #, c-format
 msgid ""
 "Tried to set initiator mode, as peer ID was given. However, `%s' is not a "
 "valid peer identifier.\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-scalarproduct.c:240
-#: src/scalarproduct/gnunet-scalarproduct.c:298
+#: src/scalarproduct/gnunet-scalarproduct.c:239
+#: src/scalarproduct/gnunet-scalarproduct.c:297
 #, fuzzy, c-format
 msgid "Could not convert `%s' to int32_t.\n"
 msgstr "无法连接到 %s:%u：%s\n"
 
-#: src/scalarproduct/gnunet-scalarproduct.c:247
+#: src/scalarproduct/gnunet-scalarproduct.c:246
 msgid "Need elements to compute the vectorproduct, got none.\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-scalarproduct.c:348
+#: src/scalarproduct/gnunet-scalarproduct.c:347
 msgid ""
 "A comma separated list of elements to compare as vector with our remote peer."
 msgstr ""
 
-#: src/scalarproduct/gnunet-scalarproduct.c:351
+#: src/scalarproduct/gnunet-scalarproduct.c:350
 msgid ""
 "A comma separated mask to select which elements should actually be compared."
 msgstr ""
 
-#: src/scalarproduct/gnunet-scalarproduct.c:354
+#: src/scalarproduct/gnunet-scalarproduct.c:353
 msgid ""
 "[Optional] peer to calculate our scalarproduct with. If this parameter is "
 "not given, the service will wait for a remote peer to compute the request."
 msgstr ""
 
-#: src/scalarproduct/gnunet-scalarproduct.c:357
+#: src/scalarproduct/gnunet-scalarproduct.c:356
 msgid "Transaction ID shared with peer."
 msgstr ""
 
-#: src/scalarproduct/gnunet-scalarproduct.c:366
+#: src/scalarproduct/gnunet-scalarproduct.c:365
 msgid "Calculate the Vectorproduct with a GNUnet peer."
 msgstr ""
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:381
+#: src/scalarproduct/gnunet-service-scalarproduct.c:450
 #, c-format
 msgid "Generated key set with key length %d bits.\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:691
+#: src/scalarproduct/gnunet-service-scalarproduct.c:775
 #, fuzzy, c-format
 msgid "Client (%p) disconnected from us.\n"
 msgstr "“%s”已连接到“%s”。\n"
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:762
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1696
+#: src/scalarproduct/gnunet-service-scalarproduct.c:847
+#: src/scalarproduct/gnunet-service-scalarproduct.c:936
 #, fuzzy, c-format
 msgid "Could not send message to client (%p)!\n"
 msgstr "找不到接口“%s”的一个 IP 地址。\n"
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:768
+#: src/scalarproduct/gnunet-service-scalarproduct.c:853
 #, c-format
 msgid "Sending session-end notification to client (%p) for session %s\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:891
-msgid "Message too large, fragmentation is currently not supported!)\n"
+#: src/scalarproduct/gnunet-service-scalarproduct.c:946
+#, c-format
+msgid "Sent result to client (%p), this session (%s) has ended!\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:896
+#: src/scalarproduct/gnunet-service-scalarproduct.c:1025
+#: src/scalarproduct/gnunet-service-scalarproduct.c:1163
 msgid "Could not send service-response message via mesh!)\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1092
+#: src/scalarproduct/gnunet-service-scalarproduct.c:1376
 #, c-format
 msgid "Failed to communicate with `%s', scalar product calculation aborted.\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1145
+#: src/scalarproduct/gnunet-service-scalarproduct.c:1476
+#: src/scalarproduct/gnunet-service-scalarproduct.c:1603
+msgid "Transmitting service request.\n"
+msgstr ""
+
+#: src/scalarproduct/gnunet-service-scalarproduct.c:1485
+#, fuzzy
+msgid "Could not send service-request multipart message to tunnel!\n"
+msgstr "找不到接口“%s”的一个 IP 地址。\n"
+
+#: src/scalarproduct/gnunet-service-scalarproduct.c:1525
 #, fuzzy, c-format
 msgid "Successfully created new tunnel to peer (%s)!\n"
 msgstr "“%s”已连接到“%s”。\n"
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1157
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1873
-msgid "Message too large, fragmentation is currently not supported!\n"
-msgstr ""
-
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1223
-msgid "Transmitting service request.\n"
-msgstr ""
-
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1233
+#: src/scalarproduct/gnunet-service-scalarproduct.c:1612
 #, fuzzy
-msgid "Could not send mutlicast message to tunnel!\n"
+msgid "Could not send message to tunnel!\n"
 msgstr "找不到接口“%s”的一个 IP 地址。\n"
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1283
+#: src/scalarproduct/gnunet-service-scalarproduct.c:1669
 msgid "Too short message received from client!\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1297
+#: src/scalarproduct/gnunet-service-scalarproduct.c:1682
 msgid "Invalid message received from client, session information incorrect!\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1309
+#: src/scalarproduct/gnunet-service-scalarproduct.c:1693
 #, c-format
 msgid ""
 "Duplicate session information received, cannot create new session with key `"
 "%s'\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1330
+#: src/scalarproduct/gnunet-service-scalarproduct.c:1713
 #, c-format
 msgid ""
 "Got client-request-session with key %s, preparing tunnel to remote service.\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1369
+#: src/scalarproduct/gnunet-service-scalarproduct.c:1749
 #, c-format
-msgid "Creating new tunnel to for session with key %s.\n"
+msgid "Creating new tunnel for session with key %s.\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1417
+#: src/scalarproduct/gnunet-service-scalarproduct.c:1794
 #, c-format
 msgid ""
 "Got client-responder-session with key %s and a matching service-request-"
 "session set, processing.\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1425
+#: src/scalarproduct/gnunet-service-scalarproduct.c:1802
 #, c-format
 msgid ""
 "Got client-responder-session with key %s but NO matching service-request-"
 "session set, queuing element for later use.\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1481
-#, c-format
-msgid "Peer disconnected, terminating session %s with peer (%s)\n"
-msgstr ""
+#: src/scalarproduct/gnunet-service-scalarproduct.c:1828
+#, fuzzy, c-format
+msgid "New incoming tunnel from peer %s.\n"
+msgstr "“%s”已连接到“%s”。\n"
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1706
+#: src/scalarproduct/gnunet-service-scalarproduct.c:1859
 #, c-format
-msgid "Sent result to client (%p), this session (%s) has ended!\n"
+msgid "Peer disconnected, terminating session %s with peer (%s)\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1790
+#: src/scalarproduct/gnunet-service-scalarproduct.c:2047
+#: src/scalarproduct/gnunet-service-scalarproduct.c:2196
 #, c-format
-msgid ""
-"Got message with duplicate session key (`%s'), ignoring service request.\n"
-msgstr ""
-
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1813
-msgid "Could not translate remote public key to sexpression!\n"
+msgid "Got session with key %s and a matching element set, processing.\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1849
-#, fuzzy, c-format
-msgid ""
-"Could not translate E[a%d] to MPI!\n"
-"%s/%s\n"
-msgstr "无法利用“%2$s”获取接口“%1$s”的 IP。\n"
-
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1857
+#: src/scalarproduct/gnunet-service-scalarproduct.c:2054
+#: src/scalarproduct/gnunet-service-scalarproduct.c:2203
 #, c-format
-msgid "Got session with key %s and a matching element set, processing.\n"
+msgid "Got session with key %s without a matching element set, queueing.\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1866
+#: src/scalarproduct/gnunet-service-scalarproduct.c:2142
 #, c-format
-msgid "Got session with key %s without a matching element set, queueing.\n"
+msgid ""
+"Got message with duplicate session key (`%s'), ignoring service request.\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:2039
+#: src/scalarproduct/gnunet-service-scalarproduct.c:2425
 msgid "Shutting down, initiating cleanup.\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:2100
+#: src/scalarproduct/gnunet-service-scalarproduct.c:2490
 msgid "Generating Paillier-Keyset.\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:2116
+#: src/scalarproduct/gnunet-service-scalarproduct.c:2505
 #, fuzzy
 msgid "Connect to MESH failed\n"
 msgstr "“%s”已连接到“%s”。\n"
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:2120
+#: src/scalarproduct/gnunet-service-scalarproduct.c:2509
 msgid "Mesh initialized\n"
 msgstr ""
 
-#: src/scalarproduct/scalarproduct_api.c:243
+#: src/scalarproduct/scalarproduct_api.c:246
 msgid "# SUC responder result messages received"
 msgstr ""
 
-#: src/scalarproduct/scalarproduct_api.c:297
+#: src/scalarproduct/scalarproduct_api.c:300
 msgid "# bytes sent to scalarproduct"
 msgstr ""
 
-#: src/scalarproduct/scalarproduct_api.c:340
-#: src/scalarproduct/scalarproduct_api.c:433
+#: src/scalarproduct/scalarproduct_api.c:345
+#: src/scalarproduct/scalarproduct_api.c:440
 #, fuzzy
 msgid "Failed to connect to the scalarproduct service\n"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/scalarproduct/scalarproduct_api.c:348
-#: src/scalarproduct/scalarproduct_api.c:441
+#: src/scalarproduct/scalarproduct_api.c:353
+#: src/scalarproduct/scalarproduct_api.c:448
 #, fuzzy
 msgid "Failed to send a message to the statistics service\n"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/scalarproduct/scalarproduct_api.c:382
-#: src/scalarproduct/scalarproduct_api.c:478
+#: src/scalarproduct/scalarproduct_api.c:387
+#: src/scalarproduct/scalarproduct_api.c:485
 #, fuzzy
 msgid "Failed to send a message to the scalarproduct service\n"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/set/gnunet-set-ibf-profiler.c:224
+#: src/set/gnunet-set-ibf-profiler.c:221
 #, fuzzy
 msgid "number of element in set A-B"
 msgstr "迭代次数"
 
-#: src/set/gnunet-set-ibf-profiler.c:227
+#: src/set/gnunet-set-ibf-profiler.c:224
 #, fuzzy
 msgid "number of element in set B-A"
 msgstr "迭代次数"
 
-#: src/set/gnunet-set-ibf-profiler.c:230
+#: src/set/gnunet-set-ibf-profiler.c:227
 msgid "number of common elements in A and B"
 msgstr ""
 
-#: src/set/gnunet-set-ibf-profiler.c:233
+#: src/set/gnunet-set-ibf-profiler.c:230
 msgid "hash num"
 msgstr ""
 
-#: src/set/gnunet-set-ibf-profiler.c:236
+#: src/set/gnunet-set-ibf-profiler.c:233
 msgid "ibf size"
 msgstr ""
 
-#: src/set/gnunet-set-profiler.c:296
+#: src/set/gnunet-set-profiler.c:295
 msgid "oeration to execute"
 msgstr ""
 
-#: src/statistics/gnunet-service-statistics.c:271
+#: src/statistics/gnunet-service-statistics.c:280
 #, c-format
 msgid "Loading %llu bytes of statistics from `%s'\n"
 msgstr ""
 
-#: src/statistics/gnunet-service-statistics.c:330
+#: src/statistics/gnunet-service-statistics.c:346
 #, c-format
 msgid "Wrote %llu bytes of statistics to `%s'\n"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:142
+#: src/statistics/gnunet-statistics.c:140
 #, fuzzy
 msgid "Failed to obtain statistics.\n"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/statistics/gnunet-statistics.c:144
+#: src/statistics/gnunet-statistics.c:142
 #, fuzzy, c-format
 msgid "Failed to obtain statistics from host `%s:%llu'\n"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/statistics/gnunet-statistics.c:191
+#: src/statistics/gnunet-statistics.c:189
 msgid "Missing argument: subsystem \n"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:197
+#: src/statistics/gnunet-statistics.c:195
 msgid "Missing argument: name\n"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:228
+#: src/statistics/gnunet-statistics.c:226
 #, c-format
 msgid "No subsystem or name given\n"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:236
+#: src/statistics/gnunet-statistics.c:234
 #, fuzzy, c-format
 msgid "Failed to initialize watch routine\n"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/statistics/gnunet-statistics.c:263
+#: src/statistics/gnunet-statistics.c:261
 #, fuzzy, c-format
 msgid "Trying to connect to remote host, but service `%s' is not running\n"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/statistics/gnunet-statistics.c:271
+#: src/statistics/gnunet-statistics.c:269
 #, fuzzy, c-format
 msgid "A port is required to connect to host `%s'\n"
 msgstr "无法连接到 %s:%u：%s\n"
 
-#: src/statistics/gnunet-statistics.c:278
+#: src/statistics/gnunet-statistics.c:276
 #, c-format
 msgid "A port has to be between 1 and 65535 to connect to host `%s'\n"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:310
+#: src/statistics/gnunet-statistics.c:308
 #, fuzzy, c-format
 msgid "Invalid argument `%s'\n"
 msgstr "“%s”的参数无效。\n"
 
-#: src/statistics/gnunet-statistics.c:336
+#: src/statistics/gnunet-statistics.c:334
 msgid "limit output to statistics for the given NAME"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:339
+#: src/statistics/gnunet-statistics.c:337
 msgid "make the value being set persistent"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:342
+#: src/statistics/gnunet-statistics.c:340
 msgid "limit output to the given SUBSYSTEM"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:345
+#: src/statistics/gnunet-statistics.c:343
 msgid "just print the statistics value"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:348
+#: src/statistics/gnunet-statistics.c:346
 msgid "watch value continuously"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:351
+#: src/statistics/gnunet-statistics.c:349
 msgid "connect to remote host"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:354
+#: src/statistics/gnunet-statistics.c:352
 msgid "port for remote host"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:366
+#: src/statistics/gnunet-statistics.c:364
 msgid "Print statistics about GNUnet operations."
 msgstr ""
 
-#: src/statistics/statistics_api.c:512
+#: src/statistics/statistics_api.c:509
 #, fuzzy
 msgid "Could not save some persistent statistics\n"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/statistics/statistics_api.c:1057
+#: src/statistics/statistics_api.c:1054
 msgid ""
 "Failed to receive acknowledgement from statistics service, some statistics "
 "might have been lost!\n"
 msgstr ""
 
+#: src/testbed/gnunet-daemon-testbed-blacklist.c:264
+msgid ""
+"Daemon to restrict incoming transport layer connections during testbed "
+"deployments"
+msgstr ""
+
 #: src/testbed/gnunet-service-testbed_cpustatus.c:727
 #, c-format
 msgid ""
 "Cannot open %s for writing load statistics.  Not logging load statistics\n"
 msgstr ""
 
-#: src/testbed/gnunet-service-testbed_peers.c:973
+#: src/testbed/gnunet-service-testbed_peers.c:1012
 #, fuzzy
 msgid "Misconfiguration (can't connect to the ARM service)"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/testbed/gnunet-service-testbed_peers.c:979
+#: src/testbed/gnunet-service-testbed_peers.c:1018
 msgid "Request doesn't fit into a message"
 msgstr ""
 
-#: src/testbed/gnunet-service-testbed_peers.c:1017
+#: src/testbed/gnunet-service-testbed_peers.c:1056
 #, c-format
 msgid "%s service can't be started because ARM is shutting down"
 msgstr ""
 
-#: src/testbed/gnunet_testbed_ll_master.c:57
-#, c-format
-msgid "Job command file not given. Exiting\n"
-msgstr ""
-
 #: src/testbed/gnunet_testbed_mpi_spawn.c:125
 msgid "Waiting for child to exit.\n"
 msgstr ""
@@ -5145,19 +5727,26 @@ msgstr ""
 msgid "Spawning process `%s'\n"
 msgstr "卸载 GNUnet 服务"
 
-#: src/testbed/gnunet-testbed-profiler.c:254
+#: src/testbed/gnunet-testbed-profiler.c:267
 #, fuzzy, c-format
 msgid "Exiting as the number of peers is %u\n"
 msgstr "增加 TCP/IP 的最大连接数"
 
-#: src/testbed/gnunet-testbed-profiler.c:280
+#: src/testbed/gnunet-testbed-profiler.c:293
 msgid "create COUNT number of peers"
 msgstr ""
 
-#: src/testbed/gnunet-testbed-profiler.c:283
+#: src/testbed/gnunet-testbed-profiler.c:296
 msgid "tolerate COUNT number of continious timeout failures"
 msgstr ""
 
+#: src/testbed/gnunet-testbed-profiler.c:299
+msgid ""
+"run profiler in non-interactive mode where upon testbed setup the profiler "
+"does not wait for a keystroke but continues to run until a termination "
+"signal is received"
+msgstr ""
+
 #: src/testbed/testbed_api_hosts.c:415
 #, c-format
 msgid "Hosts file %s not found\n"
@@ -5178,7 +5767,7 @@ msgstr ""
 msgid "The function %s is only available when compiled with (--with-ll)\n"
 msgstr ""
 
-#: src/testbed/testbed_api_hosts.c:1572
+#: src/testbed/testbed_api_hosts.c:1586
 #, fuzzy, c-format
 msgid "Adding host %u failed with error: %s\n"
 msgstr "“%s”以错误码 %d 失败：%s\n"
@@ -5320,160 +5909,132 @@ msgstr ""
 msgid "Command line tool to access the testing library"
 msgstr ""
 
-#: src/testing/testing.c:276
+#: src/testing/testing.c:277
 #, c-format
 msgid "Hostkeys file not found: %s\n"
 msgstr ""
 
-#: src/testing/testing.c:292
+#: src/testing/testing.c:293
 #, c-format
 msgid "Incorrect hostkey file format: %s\n"
 msgstr ""
 
-#: src/testing/testing.c:711
+#: src/testing/testing.c:716
 #, c-format
 msgid "Key number %u does not exist\n"
 msgstr ""
 
-#: src/testing/testing.c:722
-#, fuzzy, c-format
-msgid "Error while decoding key %u\n"
-msgstr "解析 dscl 输出时出错。\n"
-
-#: src/testing/testing.c:1158
+#: src/testing/testing.c:1155
 #, c-format
 msgid ""
 "You attempted to create a testbed with more than %u hosts.  Please "
 "precompute more hostkeys first.\n"
 msgstr ""
 
-#: src/testing/testing.c:1167
+#: src/testing/testing.c:1164
 #, fuzzy, c-format
 msgid "Failed to initialize hostkey for peer %u\n"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/testing/testing.c:1177
+#: src/testing/testing.c:1174
 msgid "PRIVATE_KEY option in PEER section missing in configuration\n"
 msgstr ""
 
-#: src/testing/testing.c:1190
+#: src/testing/testing.c:1187
 #, fuzzy
 msgid "Failed to create configuration for peer (not enough free ports?)\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/testing/testing.c:1204
+#: src/testing/testing.c:1201
 #, fuzzy, c-format
 msgid "Cannot open hostkey file `%s': %s\n"
 msgstr "找不到接口“%s”的一个 IP 地址。\n"
 
-#: src/testing/testing.c:1216
+#: src/testing/testing.c:1213
 #, fuzzy, c-format
 msgid "Failed to write hostkey file for peer %u: %s\n"
 msgstr "发送消息失败。\n"
 
-#: src/testing/testing.c:1238
+#: src/testing/testing.c:1235
 #, fuzzy, c-format
 msgid "Failed to write configuration file `%s' for peer %u: %s\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/testing/testing.c:1338
+#: src/testing/testing.c:1335
 #, fuzzy, c-format
 msgid "Failed to start `%s': %s\n"
 msgstr "运行 %s失败：%s %d\n"
 
-#: src/testing/testing.c:1702
+#: src/testing/testing.c:1699
 #, fuzzy, c-format
 msgid "Failed to load configuration from %s\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/topology/gnunet-daemon-topology.c:254
+#: src/topology/friends.c:100
+#, fuzzy, c-format
+msgid "Syntax error in FRIENDS file at offset %llu, skipping bytes `%.*s'.\n"
+msgstr "配置文件“%s”第 %d 行有语法错误。\n"
+
+#: src/topology/gnunet-daemon-topology.c:255
 msgid "# peers blacklisted"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:387
+#: src/topology/gnunet-daemon-topology.c:388
 msgid "# connect requests issued to transport"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:721
-#: src/topology/gnunet-daemon-topology.c:806
+#: src/topology/gnunet-daemon-topology.c:727
+#: src/topology/gnunet-daemon-topology.c:812
 msgid "# friends connected"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:986
+#: src/topology/gnunet-daemon-topology.c:992
 msgid "Failed to connect to core service, can not manage topology!\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:1031
-#, c-format
-msgid "Could not read friends list `%s'\n"
-msgstr ""
-
-#: src/topology/gnunet-daemon-topology.c:1037
-#, c-format
-msgid "Friends file `%s' is empty.\n"
-msgstr ""
-
-#: src/topology/gnunet-daemon-topology.c:1046
-#, c-format
-msgid "Failed to read friends list from `%s': out of memory\n"
-msgstr ""
-
-#: src/topology/gnunet-daemon-topology.c:1054
-#, c-format
-msgid "Failed to read friends list from `%s'\n"
-msgstr ""
-
-#: src/topology/gnunet-daemon-topology.c:1074
-#, c-format
-msgid ""
-"Syntax error in topology specification at offset %llu, skipping bytes.\n"
-msgstr ""
-
-#: src/topology/gnunet-daemon-topology.c:1087
+#: src/topology/gnunet-daemon-topology.c:1021
 #, c-format
-msgid ""
-"Syntax error in topology specification at offset %llu, skipping bytes `%s'.\n"
+msgid "Found myself `%s' in friend list (useless, ignored)\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:1097
+#: src/topology/gnunet-daemon-topology.c:1028
 #, fuzzy, c-format
 msgid "Found friend `%s' in configuration\n"
 msgstr ""
 "\n"
 "结束配置。\n"
 
-#: src/topology/gnunet-daemon-topology.c:1103
-#, c-format
-msgid "Found myself `%s' in friend list (useless, ignored)\n"
+#: src/topology/gnunet-daemon-topology.c:1049
+msgid "Encountered errors parsing friends list!\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:1113
+#: src/topology/gnunet-daemon-topology.c:1051
 #, fuzzy
 msgid "# friends in configuration"
 msgstr ""
 "\n"
 "结束配置。\n"
 
-#: src/topology/gnunet-daemon-topology.c:1119
+#: src/topology/gnunet-daemon-topology.c:1056
 msgid ""
 "Fewer friends specified than required by minimum friend count. Will only "
 "connect to friends.\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:1126
+#: src/topology/gnunet-daemon-topology.c:1062
 msgid ""
 "More friendly connections required than target total number of connections.\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:1157
+#: src/topology/gnunet-daemon-topology.c:1093
 msgid "# HELLO messages received"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:1212
+#: src/topology/gnunet-daemon-topology.c:1150
 msgid "# HELLO messages gossipped"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:1351
+#: src/topology/gnunet-daemon-topology.c:1289
 msgid "GNUnet topology control (maintaining P2P mesh and F2F constraints)"
 msgstr ""
 
@@ -5487,36 +6048,36 @@ msgstr "卸载 GNUnet 服务"
 msgid "Adding blacklisting entry for peer `%s':`%s'\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_blacklist.c:453
-#: src/transport/gnunet-service-transport_blacklist.c:717
+#: src/transport/gnunet-service-transport_blacklist.c:455
+#: src/transport/gnunet-service-transport_blacklist.c:722
 msgid "# disconnects due to blacklist"
 msgstr ""
 
-#: src/transport/gnunet-service-transport.c:168
+#: src/transport/gnunet-service-transport.c:163
 msgid "# bytes payload discarded due to not connected peer "
 msgstr ""
 
-#: src/transport/gnunet-service-transport.c:234
+#: src/transport/gnunet-service-transport.c:229
 msgid "# bytes total received"
 msgstr ""
 
-#: src/transport/gnunet-service-transport.c:281
+#: src/transport/gnunet-service-transport.c:277
 msgid "# bytes payload received"
 msgstr ""
 
-#: src/transport/gnunet-service-transport.c:432
+#: src/transport/gnunet-service-transport.c:429
 #, fuzzy, c-format
 msgid "Could not obtain a valid network for `%s' %s\n"
 msgstr "无法利用“%2$s”获取接口“%1$s”的 IP。\n"
 
-#: src/transport/gnunet-service-transport.c:480
+#: src/transport/gnunet-service-transport.c:479
 #, c-format
 msgid ""
 "Address or session unknown: failed to update properties for peer `%s' plugin "
 "`%s' address `%s' session %p\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport.c:775
+#: src/transport/gnunet-service-transport.c:760
 msgid "Transport service is lacking key configuration settings.  Exiting.\n"
 msgstr ""
 
@@ -5534,68 +6095,68 @@ msgstr ""
 msgid "Rejecting control connection from peer `%s', which is not me!\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_clients.c:677
+#: src/transport/gnunet-service-transport_clients.c:672
 msgid "# bytes payload dropped (other peer was not connected)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_clients.c:733
+#: src/transport/gnunet-service-transport_clients.c:728
 msgid "# REQUEST CONNECT messages received"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_hello.c:179
+#: src/transport/gnunet-service-transport_hello.c:181
 msgid "# refreshed my HELLO"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1216
+#: src/transport/gnunet-service-transport_neighbours.c:1080
 msgid "# DISCONNECT messages sent"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1346
-#: src/transport/gnunet-service-transport_neighbours.c:1681
+#: src/transport/gnunet-service-transport_neighbours.c:1210
+#: src/transport/gnunet-service-transport_neighbours.c:1545
 msgid "# bytes in message queue for other peers"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1351
+#: src/transport/gnunet-service-transport_neighbours.c:1215
 msgid "# messages transmitted to other peers"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1356
+#: src/transport/gnunet-service-transport_neighbours.c:1220
 msgid "# transmission failures for messages to other peers"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1413
+#: src/transport/gnunet-service-transport_neighbours.c:1277
 msgid "# messages timed out while in transport queue"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1455
+#: src/transport/gnunet-service-transport_neighbours.c:1319
 msgid "# keepalives sent"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1479
+#: src/transport/gnunet-service-transport_neighbours.c:1343
 msgid "# KEEPALIVE messages discarded (peer unknown)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1487
+#: src/transport/gnunet-service-transport_neighbours.c:1351
 msgid "# KEEPALIVE messages discarded (no session)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1520
+#: src/transport/gnunet-service-transport_neighbours.c:1384
 msgid "# KEEPALIVE_RESPONSE messages discarded (not connected)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1529
+#: src/transport/gnunet-service-transport_neighbours.c:1393
 msgid "# KEEPALIVE_RESPONSE messages discarded (not expected)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1586
+#: src/transport/gnunet-service-transport_neighbours.c:1450
 msgid "# messages discarded due to lack of neighbour record"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1620
+#: src/transport/gnunet-service-transport_neighbours.c:1484
 msgid "# bandwidth quota violations by other peers"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1636
+#: src/transport/gnunet-service-transport_neighbours.c:1500
 msgid "# ms throttling suggested"
 msgstr ""
 
@@ -5616,31 +6177,31 @@ msgstr ""
 msgid "# unexpected CONNECT_ACK messages (disconnecting)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3046
+#: src/transport/gnunet-service-transport_neighbours.c:3045
 msgid "# unexpected SESSION ACK messages"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3099
+#: src/transport/gnunet-service-transport_neighbours.c:3098
 msgid "# SET QUOTA messages ignored (no such peer)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3113
+#: src/transport/gnunet-service-transport_neighbours.c:3112
 msgid "# disconnects due to quota of 0"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3144
+#: src/transport/gnunet-service-transport_neighbours.c:3143
 msgid "# disconnect messages ignored (old format)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3155
+#: src/transport/gnunet-service-transport_neighbours.c:3154
 msgid "# disconnect messages ignored (timestamp)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3194
+#: src/transport/gnunet-service-transport_neighbours.c:3193
 msgid "# other peer asked to disconnect from us"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3289
+#: src/transport/gnunet-service-transport_neighbours.c:3288
 msgid "# disconnected from peer upon explicit request"
 msgstr ""
 
@@ -5665,319 +6226,319 @@ msgstr "解析配置文件“%s”失败\n"
 msgid "Did not load plugin `%s' due to missing functions\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:455
+#: src/transport/gnunet-service-transport_validation.c:456
 msgid "# address records discarded"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:518
+#: src/transport/gnunet-service-transport_validation.c:519
 #, c-format
 msgid ""
 "Not transmitting `%s' with `%s', message too big (%u bytes!). This should "
 "not happen.\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:575
+#: src/transport/gnunet-service-transport_validation.c:577
 msgid "# PING without HELLO messages sent"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:660
+#: src/transport/gnunet-service-transport_validation.c:662
 msgid "# address revalidations started"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:928
+#: src/transport/gnunet-service-transport_validation.c:933
 msgid "# PING message for different peer received"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:987
+#: src/transport/gnunet-service-transport_validation.c:992
 msgid "# failed address checks during validation"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:997
+#: src/transport/gnunet-service-transport_validation.c:1002
 msgid "# successful address checks during validation"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1016
+#: src/transport/gnunet-service-transport_validation.c:1021
 #, c-format
 msgid "Received a PING message with validation bug from `%s'\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1070
+#: src/transport/gnunet-service-transport_validation.c:1075
 #, fuzzy, c-format
 msgid "Failed to create PONG signature for peer `%s'\n"
 msgstr "发送消息失败。\n"
 
-#: src/transport/gnunet-service-transport_validation.c:1115
+#: src/transport/gnunet-service-transport_validation.c:1124
 msgid "# PONGs unicast via reliable transport"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1124
+#: src/transport/gnunet-service-transport_validation.c:1133
 msgid "# PONGs multicast to all available addresses"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1251
+#: src/transport/gnunet-service-transport_validation.c:1260
 msgid "# PONGs dropped, no matching pending validation"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1266
+#: src/transport/gnunet-service-transport_validation.c:1275
 msgid "# PONGs dropped, signature expired"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1372
+#: src/transport/gnunet-service-transport_validation.c:1381
 #, c-format
 msgid "Adding `%s' without addresses for peer `%s'\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:266
+#: src/transport/gnunet-transport.c:259
 #, c-format
 msgid "Transmitted %llu bytes/s (%llu bytes in %s)\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:273
+#: src/transport/gnunet-transport.c:266
 #, c-format
 msgid "Received %llu bytes/s (%llu bytes in %s)\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:303
+#: src/transport/gnunet-transport.c:296
 #, fuzzy, c-format
 msgid "Failed to connect to `%s'\n"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/transport/gnunet-transport.c:316
+#: src/transport/gnunet-transport.c:309
 #, fuzzy, c-format
 msgid "Failed to resolve address for peer `%s'\n"
 msgstr "找不到接口“%s”的一个 IP 地址。\n"
 
-#: src/transport/gnunet-transport.c:325
+#: src/transport/gnunet-transport.c:318
 #, fuzzy
 msgid "Failed to list connections, timeout occured\n"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/transport/gnunet-transport.c:429
+#: src/transport/gnunet-transport.c:422
 msgid "No transport plugins configured, peer will never communicate\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:442
+#: src/transport/gnunet-transport.c:435
 #, c-format
 msgid "No port configured for plugin `%s', cannot test it\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:506
+#: src/transport/gnunet-transport.c:499
 #, c-format
 msgid "Transmitting %u bytes to %s\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:528
+#: src/transport/gnunet-transport.c:522
 #, fuzzy, c-format
 msgid "Successfully connected to `%s'\n"
 msgstr "“%s”已连接到“%s”。\n"
 
-#: src/transport/gnunet-transport.c:550
+#: src/transport/gnunet-transport.c:545
 #, c-format
 msgid ""
 "Successfully connected to `%s', starting to send benchmark data in %u Kb "
 "blocks\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:585
+#: src/transport/gnunet-transport.c:580
 #, fuzzy, c-format
 msgid "Disconnected from peer `%s' while benchmarking\n"
 msgstr "“%s”已连接到“%s”。\n"
 
-#: src/transport/gnunet-transport.c:655
+#: src/transport/gnunet-transport.c:650
 #, c-format
 msgid "Received %u bytes from %s\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:678
+#: src/transport/gnunet-transport.c:673
 #, fuzzy, c-format
 msgid "Peer `%s': %s %s\n"
 msgstr "运行 %s失败：%s %d\n"
 
-#: src/transport/gnunet-transport.c:693
+#: src/transport/gnunet-transport.c:688
 #, c-format
 msgid "Peer `%s': %s <unable to resolve address>\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:757
+#: src/transport/gnunet-transport.c:752
 #, fuzzy, c-format
 msgid "Peer `%s' disconnected\n"
 msgstr ""
 "\n"
 "按任意键继续\n"
 
-#: src/transport/gnunet-transport.c:785
+#: src/transport/gnunet-transport.c:780
 #, fuzzy
 msgid "Failed to send connect request to transport service\n"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/transport/gnunet-transport.c:828
+#: src/transport/gnunet-transport.c:825
 #, c-format
 msgid ""
 "Multiple operations given. Please choose only one operation: %s, %s, %s, %s, "
 "%s, %s\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:834
+#: src/transport/gnunet-transport.c:831
 #, c-format
 msgid ""
 "No operation given. Please choose one operation: %s, %s, %s, %s, %s, %s\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:854 src/transport/gnunet-transport.c:884
-#: src/transport/gnunet-transport.c:906 src/transport/gnunet-transport.c:945
+#: src/transport/gnunet-transport.c:851 src/transport/gnunet-transport.c:881
+#: src/transport/gnunet-transport.c:903 src/transport/gnunet-transport.c:940
 #, fuzzy
 msgid "Failed to connect to transport service\n"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/transport/gnunet-transport.c:861 src/transport/gnunet-transport.c:891
+#: src/transport/gnunet-transport.c:858 src/transport/gnunet-transport.c:888
 #, fuzzy
 msgid "Failed to send request to transport service\n"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/transport/gnunet-transport.c:911
+#: src/transport/gnunet-transport.c:908
 msgid "Starting to receive benchmark data\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:995
+#: src/transport/gnunet-transport.c:990
 msgid "measure how fast we are receiving data from all peers (until CTRL-C)"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:998
+#: src/transport/gnunet-transport.c:993
 #, fuzzy
 msgid "connect to a peer"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/transport/gnunet-transport.c:1001
+#: src/transport/gnunet-transport.c:996
 msgid "provide information about all current connections (once)"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1007
+#: src/transport/gnunet-transport.c:1002
 msgid ""
 "provide information about all connects and disconnect events (continuously)"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1010
+#: src/transport/gnunet-transport.c:1005
 msgid "do not resolve hostnames"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1013
+#: src/transport/gnunet-transport.c:1008
 msgid "peer identity"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1017
+#: src/transport/gnunet-transport.c:1012
 msgid "send data for benchmarking to the other peer (until CTRL-C)"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1020
+#: src/transport/gnunet-transport.c:1015
 msgid "test transport configuration (involves external server)"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1031
+#: src/transport/gnunet-transport.c:1026
 #, fuzzy
 msgid "Direct access to transport service."
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/transport/plugin_transport_bluetooth.c:612
+#: src/transport/plugin_transport_bluetooth.c:616
 msgid "# Bluetooth ACKs sent"
 msgstr ""
 
-#: src/transport/plugin_transport_bluetooth.c:631
+#: src/transport/plugin_transport_bluetooth.c:635
 msgid "# Bluetooth messages defragmented"
 msgstr ""
 
-#: src/transport/plugin_transport_bluetooth.c:677
-#: src/transport/plugin_transport_bluetooth.c:727
-#: src/transport/plugin_transport_bluetooth.c:1833
+#: src/transport/plugin_transport_bluetooth.c:681
+#: src/transport/plugin_transport_bluetooth.c:731
+#: src/transport/plugin_transport_bluetooth.c:1837
 msgid "# Bluetooth sessions allocated"
 msgstr ""
 
-#: src/transport/plugin_transport_bluetooth.c:802
+#: src/transport/plugin_transport_bluetooth.c:806
 msgid "# Bluetooth message fragments sent"
 msgstr ""
 
-#: src/transport/plugin_transport_bluetooth.c:826
+#: src/transport/plugin_transport_bluetooth.c:830
 msgid "# Bluetooth messages pending (with fragmentation)"
 msgstr ""
 
-#: src/transport/plugin_transport_bluetooth.c:934
-#: src/transport/plugin_transport_bluetooth.c:1019
-#: src/transport/plugin_transport_bluetooth.c:1835
+#: src/transport/plugin_transport_bluetooth.c:938
+#: src/transport/plugin_transport_bluetooth.c:1023
+#: src/transport/plugin_transport_bluetooth.c:1839
 msgid "# Bluetooth MAC endpoints allocated"
 msgstr ""
 
-#: src/transport/plugin_transport_bluetooth.c:1214
+#: src/transport/plugin_transport_bluetooth.c:1218
 msgid "# HELLO messages received via Bluetooth"
 msgstr ""
 
-#: src/transport/plugin_transport_bluetooth.c:1240
+#: src/transport/plugin_transport_bluetooth.c:1244
 msgid "# fragments received via Bluetooth"
 msgstr ""
 
-#: src/transport/plugin_transport_bluetooth.c:1250
+#: src/transport/plugin_transport_bluetooth.c:1254
 msgid "# ACKs received via Bluetooth"
 msgstr ""
 
-#: src/transport/plugin_transport_bluetooth.c:1307
+#: src/transport/plugin_transport_bluetooth.c:1311
 msgid "# Bluetooth DATA messages discarded due to CRC32 error"
 msgstr ""
 
-#: src/transport/plugin_transport_bluetooth.c:1419
+#: src/transport/plugin_transport_bluetooth.c:1423
 msgid "# DATA messages received via Bluetooth"
 msgstr ""
 
-#: src/transport/plugin_transport_bluetooth.c:1454
+#: src/transport/plugin_transport_bluetooth.c:1458
 msgid "# Bluetooth DATA messages processed"
 msgstr ""
 
-#: src/transport/plugin_transport_bluetooth.c:1517
+#: src/transport/plugin_transport_bluetooth.c:1521
 msgid "# HELLO beacons sent via Bluetooth"
 msgstr ""
 
-#: src/transport/plugin_transport_bluetooth.c:1630
+#: src/transport/plugin_transport_bluetooth.c:1634
 msgid "Bluetooth address with invalid size encountered\n"
 msgstr ""
 
-#: src/transport/plugin_transport_bluetooth.c:1814
+#: src/transport/plugin_transport_bluetooth.c:1818
 #, c-format
 msgid "Helper binary `%s' not SUID, cannot run bluetooth transport\n"
 msgstr ""
 
 #: src/transport/plugin_transport_http.c:815
-#: src/transport/plugin_transport_http_server.c:2614
+#: src/transport/plugin_transport_http_server.c:2602
 msgid "Disabling IPv6 since it is not supported on this system!\n"
 msgstr ""
 
 #: src/transport/plugin_transport_http.c:864
-#: src/transport/plugin_transport_http_server.c:2382
+#: src/transport/plugin_transport_http_server.c:2370
 #, fuzzy
 msgid "Require valid port number for service in configuration!\n"
 msgstr "保存配置失败。"
 
 #: src/transport/plugin_transport_http.c:896
-#: src/transport/plugin_transport_http_server.c:2414 src/util/service.c:1062
+#: src/transport/plugin_transport_http_server.c:2402 src/util/service.c:696
 #, fuzzy, c-format
 msgid "Failed to resolve `%s': %s\n"
 msgstr "打开日志文件“%s”失败：%s\n"
 
 #: src/transport/plugin_transport_http.c:913
-#: src/transport/plugin_transport_http_server.c:2431 src/util/service.c:1079
+#: src/transport/plugin_transport_http_server.c:2419 src/util/service.c:713
 #, fuzzy, c-format
 msgid "Failed to find %saddress for `%s'.\n"
 msgstr "找不到接口“%s”的一个 IP 地址。\n"
 
 #: src/transport/plugin_transport_http.c:1018
-#: src/transport/plugin_transport_http_server.c:2542
+#: src/transport/plugin_transport_http_server.c:2530
 #, c-format
 msgid "Found %u addresses to report to NAT service\n"
 msgstr ""
 
 #: src/transport/plugin_transport_http.c:1131
-#: src/transport/plugin_transport_http_server.c:2722
+#: src/transport/plugin_transport_http_server.c:2710
 msgid "Neither IPv4 nor IPv6 are enabled! Fix in configuration\n"
 msgstr ""
 
 #: src/transport/plugin_transport_http.c:1144
-#: src/transport/plugin_transport_http_server.c:2733
+#: src/transport/plugin_transport_http_server.c:2721
 #, fuzzy
 msgid "Port is required! Fix in configuration\n"
 msgstr ""
@@ -6003,7 +6564,7 @@ msgid ""
 msgstr ""
 
 #: src/transport/plugin_transport_http.c:1221
-#: src/transport/plugin_transport_http_server.c:2848
+#: src/transport/plugin_transport_http_server.c:2836
 #, fuzzy, c-format
 msgid "Using external hostname `%s'\n"
 msgstr "卸载 GNUnet 服务"
@@ -6012,93 +6573,94 @@ msgstr "卸载 GNUnet 服务"
 msgid "No external hostname configured\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_client.c:1587
+#: src/transport/plugin_transport_http_client.c:1586
 #, c-format
 msgid "Could not initialize curl multi handle, failed to start %s plugin!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_client.c:1724
-#: src/transport/plugin_transport_http_server.c:2978
+#: src/transport/plugin_transport_http_client.c:1723
+#: src/transport/plugin_transport_http_server.c:2966
 #, fuzzy, c-format
 msgid "Shutting down plugin `%s'\n"
 msgstr "未知的命令“%s”。\n"
 
-#: src/transport/plugin_transport_http_client.c:1749
-#: src/transport/plugin_transport_http_server.c:3038
+#: src/transport/plugin_transport_http_client.c:1748
+#: src/transport/plugin_transport_http_server.c:3026
 #, c-format
 msgid "Shutdown for plugin `%s' complete\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_client.c:1777
-#: src/transport/plugin_transport_http_server.c:2878
+#: src/transport/plugin_transport_http_client.c:1776
+#: src/transport/plugin_transport_http_server.c:2866
 #, fuzzy, c-format
 msgid "Maximum number of connections is %u\n"
 msgstr "增加 TCP/IP 的最大连接数"
 
-#: src/transport/plugin_transport_http_server.c:1379
+#: src/transport/plugin_transport_http_server.c:1381
 #, c-format
 msgid ""
 "Access from connection %p (%u of %u) for `%s' `%s' url `%s' with upload data "
 "size %u\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:1644
+#: src/transport/plugin_transport_http_server.c:1646
 #, c-format
 msgid "Accepting connection (%u of %u) from `%s'\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:1652
+#: src/transport/plugin_transport_http_server.c:1654
 #, c-format
 msgid ""
 "Server reached maximum number connections (%u), rejecting new connection\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:1953
+#: src/transport/plugin_transport_http_server.c:1941
 msgid ""
 "Could not create a new TLS certificate, program `gnunet-transport-"
 "certificate-creation' could not be started!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:1977
-msgid "No usable TLS certificate found and creating one failed!\n"
+#: src/transport/plugin_transport_http_server.c:1965
+#, c-format
+msgid "No usable TLS certificate found and creating one at `%s/%s' failed!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:2701
+#: src/transport/plugin_transport_http_server.c:2689
 #, c-format
 msgid "IPv4 support is %s\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:2715
+#: src/transport/plugin_transport_http_server.c:2703
 #, c-format
 msgid "IPv6 support is %s\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:2740
+#: src/transport/plugin_transport_http_server.c:2728
 #, c-format
 msgid "Using port %u\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:2755
+#: src/transport/plugin_transport_http_server.c:2743
 #, c-format
 msgid "Specific IPv4 address `%s' in configuration file is invalid!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:2765
+#: src/transport/plugin_transport_http_server.c:2753
 #, fuzzy, c-format
 msgid "Binding to IPv4 address %s\n"
 msgstr "无效的进程优先级“%s”\n"
 
-#: src/transport/plugin_transport_http_server.c:2786
+#: src/transport/plugin_transport_http_server.c:2774
 #, c-format
 msgid "Specific IPv6 address `%s' in configuration file is invalid!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:2796
+#: src/transport/plugin_transport_http_server.c:2784
 #, fuzzy, c-format
 msgid "Binding to IPv6 address %s\n"
 msgstr "无效的进程优先级“%s”\n"
 
-#: src/transport/plugin_transport_http_server.c:2864
+#: src/transport/plugin_transport_http_server.c:2852
 #, c-format
 msgid "Notifying transport only about hostname `%s'\n"
 msgstr ""
@@ -6154,15 +6716,15 @@ msgstr ""
 #: src/transport/plugin_transport_tcp.c:923
 #: src/transport/plugin_transport_tcp.c:973
 #: src/transport/plugin_transport_tcp.c:1059
-#: src/transport/plugin_transport_tcp.c:1202
-#: src/transport/plugin_transport_tcp.c:1219
+#: src/transport/plugin_transport_tcp.c:1206
+#: src/transport/plugin_transport_tcp.c:1223
 msgid "# bytes currently in TCP buffers"
 msgstr ""
 
 #: src/transport/plugin_transport_tcp.c:841
 #: src/transport/plugin_transport_tcp.c:1030
-#: src/transport/plugin_transport_tcp.c:2009
-#: src/transport/plugin_transport_tcp.c:2690
+#: src/transport/plugin_transport_tcp.c:2015
+#: src/transport/plugin_transport_tcp.c:2696
 msgid "# TCP sessions active"
 msgstr ""
 
@@ -6178,53 +6740,53 @@ msgstr ""
 msgid "# bytes discarded by TCP (disconnect)"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:1176
+#: src/transport/plugin_transport_tcp.c:1180
 #, c-format
 msgid "Trying to send with invalid session %p\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:1413
-#: src/transport/plugin_transport_udp.c:1449
+#: src/transport/plugin_transport_tcp.c:1417
+#: src/transport/plugin_transport_udp.c:1440
 msgid "# requests to create session with invalid address"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:1530
+#: src/transport/plugin_transport_tcp.c:1534
 msgid "# transport-service disconnect requests for TCP"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2059
+#: src/transport/plugin_transport_tcp.c:2065
 msgid "# TCP WELCOME messages received"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2242
+#: src/transport/plugin_transport_tcp.c:2248
 msgid "# bytes received via TCP"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2322
+#: src/transport/plugin_transport_tcp.c:2328
 msgid "# network-level TCP disconnect events"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2570 src/util/service.c:957
-#: src/util/service.c:963
+#: src/transport/plugin_transport_tcp.c:2576 src/util/service.c:589
+#: src/util/service.c:595
 #, c-format
 msgid "Require valid port number for service `%s' in configuration!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2584
+#: src/transport/plugin_transport_tcp.c:2590
 #, fuzzy
 msgid "Failed to start service.\n"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/transport/plugin_transport_tcp.c:2677
+#: src/transport/plugin_transport_tcp.c:2683
 #, c-format
 msgid "TCP transport listening on port %llu\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2681
+#: src/transport/plugin_transport_tcp.c:2687
 msgid "TCP transport not listening on any port (client only)\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2685
+#: src/transport/plugin_transport_tcp.c:2691
 #, c-format
 msgid "TCP transport advertises itself as being on port %llu\n"
 msgstr ""
@@ -6247,21 +6809,21 @@ msgstr ""
 msgid "Failed to set IPv4 broadcast option for broadcast socket on port %d\n"
 msgstr ""
 
-#: src/transport/plugin_transport_udp.c:1555
+#: src/transport/plugin_transport_udp.c:1550
 #, c-format
 msgid ""
 "Trying to create session for address of unexpected length %u (should be %u "
 "or %u)\n"
 msgstr ""
 
-#: src/transport/plugin_transport_udp.c:2590
+#: src/transport/plugin_transport_udp.c:2602
 #, c-format
 msgid ""
 "UDP could not transmit message to `%s': Network seems down, please check "
 "your network configuration\n"
 msgstr ""
 
-#: src/transport/plugin_transport_udp.c:2604
+#: src/transport/plugin_transport_udp.c:2616
 #, c-format
 msgid ""
 "UDP could not transmit message to `%s': Please check your network "
@@ -6269,27 +6831,27 @@ msgid ""
 "IPv6 address\n"
 msgstr ""
 
-#: src/transport/plugin_transport_udp.c:2905
+#: src/transport/plugin_transport_udp.c:2917
 #, fuzzy
 msgid "Failed to open UDP sockets\n"
 msgstr "打开日志文件“%s”失败：%s\n"
 
-#: src/transport/plugin_transport_udp.c:3003
+#: src/transport/plugin_transport_udp.c:3015
 #, c-format
 msgid "Given `%s' option is out of range: %llu > %u\n"
 msgstr ""
 
-#: src/transport/plugin_transport_udp.c:3046
+#: src/transport/plugin_transport_udp.c:3058
 #, fuzzy, c-format
 msgid "Invalid IPv6 address: `%s'\n"
 msgstr "无效的进程优先级“%s”\n"
 
-#: src/transport/plugin_transport_udp.c:3105
+#: src/transport/plugin_transport_udp.c:3117
 #, fuzzy
 msgid "Failed to create network sockets, plugin failed\n"
 msgstr "发送消息失败。\n"
 
-#: src/transport/plugin_transport_unix.c:1640
+#: src/transport/plugin_transport_unix.c:1627
 #, fuzzy
 msgid "Failed to open UNIX listen socket\n"
 msgstr "打开日志文件“%s”失败：%s\n"
@@ -6303,158 +6865,163 @@ msgid "# WLAN messages defragmented"
 msgstr ""
 
 #: src/transport/plugin_transport_wlan.c:688
-#: src/transport/plugin_transport_wlan.c:756
-#: src/transport/plugin_transport_wlan.c:1899
+#: src/transport/plugin_transport_wlan.c:758
+#: src/transport/plugin_transport_wlan.c:1903
 msgid "# WLAN sessions allocated"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:860
+#: src/transport/plugin_transport_wlan.c:863
 msgid "# WLAN message fragments sent"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:884
+#: src/transport/plugin_transport_wlan.c:887
 msgid "# WLAN messages pending (with fragmentation)"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:992
-#: src/transport/plugin_transport_wlan.c:1077
-#: src/transport/plugin_transport_wlan.c:1901
+#: src/transport/plugin_transport_wlan.c:995
+#: src/transport/plugin_transport_wlan.c:1080
+#: src/transport/plugin_transport_wlan.c:1905
 msgid "# WLAN MAC endpoints allocated"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:1272
+#: src/transport/plugin_transport_wlan.c:1275
 msgid "# HELLO messages received via WLAN"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:1298
+#: src/transport/plugin_transport_wlan.c:1301
 msgid "# fragments received via WLAN"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:1308
+#: src/transport/plugin_transport_wlan.c:1311
 msgid "# ACKs received via WLAN"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:1365
+#: src/transport/plugin_transport_wlan.c:1368
 msgid "# WLAN DATA messages discarded due to CRC32 error"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:1485
+#: src/transport/plugin_transport_wlan.c:1489
 msgid "# DATA messages received via WLAN"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:1520
+#: src/transport/plugin_transport_wlan.c:1524
 msgid "# WLAN DATA messages processed"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:1583
+#: src/transport/plugin_transport_wlan.c:1587
 msgid "# HELLO beacons sent via WLAN"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:1696
+#: src/transport/plugin_transport_wlan.c:1700
 msgid "WLAN address with invalid size encountered\n"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:1880
+#: src/transport/plugin_transport_wlan.c:1884
 #, c-format
 msgid "Helper binary `%s' not SUID, cannot run WLAN transport\n"
 msgstr ""
 
-#: src/transport/transport_api.c:651
+#: src/transport/transport_api.c:647
 #, c-format
 msgid "Received unexpected message of type %u in %s:%u\n"
 msgstr ""
 
-#: src/transport/transport-testing.c:585
+#: src/transport/transport-testing.c:584
 #, fuzzy
 msgid "Failed to initialize testing library!\n"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/util/bio.c:137 src/util/bio.c:145
+#: src/tun/regex.c:129
+#, c-format
+msgid "Bad mask: %d\n"
+msgstr ""
+
+#: src/util/bio.c:170 src/util/bio.c:178
 #, fuzzy, c-format
 msgid "Error reading `%s': %s"
 msgstr "创建用户出错"
 
-#: src/util/bio.c:147
+#: src/util/bio.c:180
 msgid "End of file"
 msgstr ""
 
-#: src/util/bio.c:199
+#: src/util/bio.c:237
 #, c-format
 msgid "Error reading length of string `%s'"
 msgstr ""
 
-#: src/util/bio.c:209
+#: src/util/bio.c:247
 #, c-format
 msgid "String `%s' longer than allowed (%u > %u)"
 msgstr ""
 
-#: src/util/bio.c:254
+#: src/util/bio.c:293
 #, c-format
 msgid "Serialized metadata `%s' larger than allowed (%u>%u)"
 msgstr ""
 
-#: src/util/bio.c:268
+#: src/util/bio.c:307
 #, c-format
 msgid "Metadata `%s' failed to deserialize"
 msgstr ""
 
-#: src/util/client.c:261 src/util/client.c:839 src/util/service.c:993
+#: src/util/client.c:261 src/util/client.c:851 src/util/service.c:625
 #, c-format
 msgid "UNIXPATH `%s' too long, maximum length is %llu\n"
 msgstr ""
 
-#: src/util/client.c:265 src/util/client.c:843 src/util/service.c:997
+#: src/util/client.c:265 src/util/client.c:856 src/util/service.c:629
 #, fuzzy, c-format
 msgid "Using `%s' instead\n"
 msgstr "%s：选项“%s”有歧义\n"
 
-#: src/util/client.c:357
+#: src/util/client.c:360
 #, c-format
 msgid ""
 "Could not determine valid hostname and port for service `%s' from "
 "configuration.\n"
 msgstr ""
 
-#: src/util/client.c:365
+#: src/util/client.c:368
 #, c-format
 msgid "Need a non-empty hostname for service `%s'.\n"
 msgstr ""
 
-#: src/util/client.c:981
+#: src/util/client.c:991
 #, fuzzy, c-format
 msgid "Could not connect to service `%s', configuration broken.\n"
 msgstr "无法连接到 %s:%u：%s\n"
 
-#: src/util/client.c:993
+#: src/util/client.c:1003
 #, c-format
 msgid "Failure to transmit request to service `%s'\n"
 msgstr ""
 
-#: src/util/client.c:1259
+#: src/util/client.c:1274
 msgid "Could not submit request, not expecting to receive a response.\n"
 msgstr ""
 
-#: src/util/common_logging.c:256 src/util/common_logging.c:1033
+#: src/util/common_logging.c:254 src/util/common_logging.c:1039
 msgid "DEBUG"
 msgstr "调试"
 
-#: src/util/common_logging.c:258 src/util/common_logging.c:1031
+#: src/util/common_logging.c:256 src/util/common_logging.c:1037
 msgid "INFO"
 msgstr "信息"
 
-#: src/util/common_logging.c:260 src/util/common_logging.c:1029
+#: src/util/common_logging.c:258 src/util/common_logging.c:1035
 msgid "WARNING"
 msgstr "警告"
 
-#: src/util/common_logging.c:262 src/util/common_logging.c:1027
+#: src/util/common_logging.c:260 src/util/common_logging.c:1033
 msgid "ERROR"
 msgstr "错误"
 
-#: src/util/common_logging.c:264 src/util/common_logging.c:1035
+#: src/util/common_logging.c:262 src/util/common_logging.c:1041
 msgid "NONE"
 msgstr ""
 
-#: src/util/common_logging.c:393
+#: src/util/common_logging.c:391
 #, fuzzy, c-format
 msgid "Failed to create or access directory for log file `%s'\n"
 msgstr "解析配置文件“%s”失败\n"
@@ -6464,210 +7031,233 @@ msgstr "解析配置文件“%s”失败\n"
 msgid "Message `%.*s' repeated %u times in the last %s\n"
 msgstr "消息“%.*s”重复了 %u 次，在最近 %llu 秒内\n"
 
-#: src/util/common_logging.c:1036
+#: src/util/common_logging.c:1042
 msgid "INVALID"
 msgstr ""
 
-#: src/util/common_logging.c:1138
+#: src/util/common_logging.c:1150
 msgid "unknown address"
 msgstr ""
 
-#: src/util/common_logging.c:1177
+#: src/util/common_logging.c:1189
 msgid "invalid address"
 msgstr ""
 
-#: src/util/common_logging.c:1195
+#: src/util/common_logging.c:1207
 #, fuzzy, c-format
 msgid "Configuration fails to specify option `%s' in section `%s'!\n"
 msgstr "配置不满足配置规范文件“%s”的约束！\n"
 
-#: src/util/common_logging.c:1216
+#: src/util/common_logging.c:1228
 #, fuzzy, c-format
 msgid ""
 "Configuration specifies invalid value for option `%s' in section `%s': %s\n"
 msgstr "配置不满足配置规范文件“%s”的约束！\n"
 
-#: src/util/configuration.c:291
+#: src/util/configuration.c:288
 #, fuzzy, c-format
 msgid "Syntax error while deserializing in line %u\n"
 msgstr "配置文件“%s”第 %d 行有语法错误。\n"
 
-#: src/util/configuration.c:984
+#: src/util/configuration.c:996
 #, c-format
 msgid ""
 "Configuration value '%s' for '%s' in section '%s' is not in set of legal "
 "choices\n"
 msgstr ""
 
-#: src/util/connection.c:424
+#: src/util/configuration.c:1065
+#, c-format
+msgid "Recursive expansion suspected, aborting $-expansion for term `%s'\n"
+msgstr ""
+
+#: src/util/configuration.c:1097
+#, fuzzy, c-format
+msgid "Missing closing `%s' in option `%s'\n"
+msgstr "配置文件“%s”已写入。\n"
+
+#: src/util/configuration.c:1170
+#, c-format
+msgid ""
+"Failed to expand `%s' in `%s' as it is neither found in [PATHS] nor defined "
+"as an environmental variable\n"
+msgstr ""
+
+#: src/util/connection.c:423
 #, fuzzy, c-format
 msgid "Access denied to `%s'\n"
 msgstr "“%s”已连接到“%s”。\n"
 
-#: src/util/connection.c:439
+#: src/util/connection.c:438
 #, c-format
 msgid "Accepting connection from `%s': %p\n"
 msgstr ""
 
-#: src/util/connection.c:554
+#: src/util/connection.c:553
 #, c-format
 msgid ""
 "Failed to establish TCP connection to `%s:%u', no further addresses to try.\n"
 msgstr ""
 
-#: src/util/connection.c:752 src/util/connection.c:919
+#: src/util/connection.c:751 src/util/connection.c:909
 #, fuzzy, c-format
 msgid "Trying to connect to `%s' (%p)\n"
 msgstr "无法连接到 %s:%u：%s\n"
 
-#: src/util/connection.c:910
+#: src/util/connection.c:900
 #, c-format
 msgid "Attempt to connect to `%s' failed\n"
 msgstr ""
 
-#: src/util/container_bloomfilter.c:518
+#: src/util/container_bloomfilter.c:516
 #, c-format
 msgid ""
 "Size of file on disk is incorrect for this Bloom filter (want %llu, have "
 "%llu)\n"
 msgstr ""
 
-#: src/util/crypto_ecc.c:580 src/util/crypto_ecc.c:618
+#: src/util/crypto_ecc.c:940 src/util/crypto_ecc.c:978
+#: src/util/crypto_ecc.c:1096 src/util/crypto_ecc.c:1134
 #, fuzzy, c-format
 msgid "Could not acquire lock on file `%s': %s...\n"
 msgstr "无法解析“%s”(%s)：%s\n"
 
-#: src/util/crypto_ecc.c:585
+#: src/util/crypto_ecc.c:945 src/util/crypto_ecc.c:1101
 #, fuzzy
 msgid "Creating a new private key.  This may take a while.\n"
 msgstr "正在启动数据仓库转换(可能需要一段时间)。\n"
 
-#: src/util/crypto_ecc.c:622
+#: src/util/crypto_ecc.c:982 src/util/crypto_ecc.c:1138
 msgid "This may be ok if someone is currently generating a private key.\n"
 msgstr ""
 
-#: src/util/crypto_ecc.c:653
+#: src/util/crypto_ecc.c:1012 src/util/crypto_ecc.c:1168
 #, c-format
 msgid ""
 "When trying to read key file `%s' I found %u bytes but I need at least %u.\n"
 msgstr ""
 
-#: src/util/crypto_ecc.c:658
+#: src/util/crypto_ecc.c:1016 src/util/crypto_ecc.c:1172
 msgid "This may be ok if someone is currently generating a key.\n"
 msgstr ""
 
-#: src/util/crypto_ecc.c:741
+#: src/util/crypto_ecc.c:1254
 #, fuzzy
 msgid "Could not load peer's private key\n"
 msgstr "找不到接口“%s”的一个 IP 地址。\n"
 
-#: src/util/crypto_ecc.c:803
+#: src/util/crypto_ecc.c:1343
 #, 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:883
-#, c-format
-msgid "ECC signature verification failed at %s:%d: %s\n"
-msgstr ""
+#: src/util/crypto_ecc.c:1393
+#, 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:1472
+#, fuzzy, c-format
+msgid "ECDSA signature verification failed at %s:%d: %s\n"
+msgstr "对驱动器“%2$s”的“%1$s”操作失败：%3$u\n"
 
-#: src/util/crypto_random.c:281
+#: src/util/crypto_ecc.c:1534
+#, fuzzy, c-format
+msgid "EdDSA signature verification failed at %s:%d: %s\n"
+msgstr "对驱动器“%2$s”的“%1$s”操作失败：%3$u\n"
+
+#: src/util/crypto_random.c:320
 #, c-format
 msgid "Starting `%s' process to generate entropy\n"
 msgstr ""
 
-#: src/util/crypto_random.c:312
+#: src/util/crypto_random.c:351
 #, c-format
 msgid "libgcrypt has not the expected version (version %s is required).\n"
 msgstr "libgcrypt 的版本不符合预期(要求版本 %s)。\n"
 
-#: src/util/disk.c:1150
+#: src/util/disk.c:1185
 #, c-format
 msgid "Expected `%s' to be a directory!\n"
 msgstr "“%s”应为目录！\n"
 
-#: src/util/disk.c:1507 src/util/service.c:1674
+#: src/util/disk.c:1543 src/util/service.c:1315
 #, c-format
 msgid "Cannot obtain information about user `%s': %s\n"
 msgstr "无法获取有关用户“%s”的信息：%s\n"
 
-#: src/util/disk.c:1954
-#, c-format
-msgid "No `%s' specified for service `%s' in configuration.\n"
-msgstr ""
-
-#: src/util/getopt.c:570
+#: src/util/getopt.c:568
 #, c-format
 msgid "%s: option `%s' is ambiguous\n"
 msgstr "%s：选项“%s”有歧义\n"
 
-#: src/util/getopt.c:594
+#: src/util/getopt.c:592
 #, c-format
 msgid "%s: option `--%s' does not allow an argument\n"
 msgstr "%s：选项“--%s”不允许有参数\n"
 
-#: src/util/getopt.c:599
+#: src/util/getopt.c:597
 #, c-format
 msgid "%s: option `%c%s' does not allow an argument\n"
 msgstr "%s：选项“%c%s”不允许有参数\n"
 
-#: src/util/getopt.c:616 src/util/getopt.c:783
+#: src/util/getopt.c:614 src/util/getopt.c:781
 #, c-format
 msgid "%s: option `%s' requires an argument\n"
 msgstr "%s：选项“%s”要求有一个参数\n"
 
-#: src/util/getopt.c:645
+#: src/util/getopt.c:643
 #, c-format
 msgid "%s: unrecognized option `--%s'\n"
 msgstr "%s：无法识别的选项“--%s”\n"
 
-#: src/util/getopt.c:649
+#: src/util/getopt.c:647
 #, c-format
 msgid "%s: unrecognized option `%c%s'\n"
 msgstr "%s：无法识别的选项“%c%s”\n"
 
-#: src/util/getopt.c:674
+#: src/util/getopt.c:672
 #, c-format
 msgid "%s: illegal option -- %c\n"
 msgstr "%s：非法选项 -- %c\n"
 
-#: src/util/getopt.c:676
+#: src/util/getopt.c:674
 #, c-format
 msgid "%s: invalid option -- %c\n"
 msgstr "%s：无效选项 -- %c\n"
 
-#: src/util/getopt.c:704 src/util/getopt.c:831
+#: src/util/getopt.c:702 src/util/getopt.c:829
 #, c-format
 msgid "%s: option requires an argument -- %c\n"
 msgstr "%s：选项要求有一个参数 -- %c\n"
 
-#: src/util/getopt.c:752
+#: src/util/getopt.c:750
 #, c-format
 msgid "%s: option `-W %s' is ambiguous\n"
 msgstr "%s：选项“-W %s”有歧义\n"
 
-#: src/util/getopt.c:770
+#: src/util/getopt.c:768
 #, c-format
 msgid "%s: option `-W %s' does not allow an argument\n"
 msgstr "%s：选项“-W %s” 不允许有参数\n"
 
-#: src/util/getopt.c:935
+#: src/util/getopt.c:933
 #, fuzzy, c-format
 msgid "Use %s to get a list of options.\n"
 msgstr "请使用 --help 获取选项列表。\n"
 
-#: src/util/getopt_helpers.c:86
+#: src/util/getopt_helpers.c:84
 #, c-format
 msgid ""
 "Arguments mandatory for long options are also mandatory for short options.\n"
 msgstr "长选项的必选参数对短选项也是必选的。\n"
 
-#: src/util/getopt_helpers.c:270 src/util/getopt_helpers.c:328
+#: src/util/getopt_helpers.c:268 src/util/getopt_helpers.c:326
 #, c-format
 msgid "You must pass a number to the `%s' option.\n"
 msgstr "您必须向“%s”选项传递一个数字。\n"
 
-#: src/util/getopt_helpers.c:300
+#: src/util/getopt_helpers.c:298
 #, fuzzy, c-format
 msgid "You must pass relative time to the `%s' option.\n"
 msgstr "您必须向“%s”选项传递一个数字。\n"
@@ -6734,24 +7324,23 @@ msgid ""
 "Error, %u keys not generated\n"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:118
-#, c-format
+#: src/util/gnunet-ecc.c:119
 msgid "No hostkey file specified on command line\n"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:163
+#: src/util/gnunet-ecc.c:168
 msgid "create COUNT public-private key pairs (for testing)"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:166
+#: src/util/gnunet-ecc.c:171
 msgid "print the public key in ASCII format"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:169
+#: src/util/gnunet-ecc.c:174
 msgid "print the hash of the public key in ASCII format"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:180
+#: src/util/gnunet-ecc.c:185
 #, fuzzy
 msgid "Manipulate GNUnet private ECC key files"
 msgstr "更改配置文件中的一个值"
@@ -6799,75 +7388,75 @@ msgstr ""
 msgid "Perform default-actions for GNUnet URIs"
 msgstr ""
 
-#: src/util/helper.c:330
+#: src/util/helper.c:338
 #, fuzzy, c-format
 msgid "Error reading from `%s': %s\n"
 msgstr "创建用户出错"
 
-#: src/util/helper.c:375
+#: src/util/helper.c:383
 #, fuzzy, c-format
 msgid "Failed to parse inbound message from helper `%s'\n"
 msgstr "打开日志文件“%s”失败：%s\n"
 
-#: src/util/helper.c:572
+#: src/util/helper.c:609
 #, fuzzy, c-format
 msgid "Error writing to `%s': %s\n"
 msgstr "创建用户出错"
 
-#: src/util/network.c:132
+#: src/util/network.c:134
 #, c-format
 msgid "Unable to shorten unix path `%s' while keeping name unique\n"
 msgstr ""
 
-#: src/util/network.c:1370
+#: src/util/network.c:1397
 #, c-format
 msgid ""
 "Fatal internal logic error, process hangs in `%s' (abort with CTRL-C)!\n"
 msgstr ""
 
-#: src/util/os_installation.c:423
+#: src/util/os_installation.c:421
 #, fuzzy, c-format
 msgid ""
 "Could not determine installation path for %s.  Set `%s' environment "
 "variable.\n"
 msgstr "无法确定安装路径。请尝试设置“%s”\n"
 
-#: src/util/os_installation.c:709
+#: src/util/os_installation.c:710
 #, fuzzy, c-format
 msgid "Could not find binary `%s' in PATH!\n"
 msgstr "找不到主机“%s”的 IP：%s\n"
 
-#: src/util/os_installation.c:769
+#: src/util/os_installation.c:770
 #, fuzzy, c-format
 msgid "CreateProcess failed for binary %s (%d).\n"
 msgstr "对驱动器“%2$s”的“%1$s”操作失败：%3$u\n"
 
-#: src/util/os_installation.c:779
+#: src/util/os_installation.c:780
 #, c-format
 msgid "GetExitCodeProcess failed for binary %s (%d).\n"
 msgstr ""
 
-#: src/util/plugin.c:89
+#: src/util/plugin.c:87
 #, c-format
 msgid "Initialization of plugin mechanism failed: %s!\n"
 msgstr "插件机构初始化失败：%s！\n"
 
-#: src/util/plugin.c:146
+#: src/util/plugin.c:144
 #, c-format
 msgid "`%s' failed to resolve method '%s' with error: %s\n"
 msgstr ""
 
-#: src/util/plugin.c:219
+#: src/util/plugin.c:217
 #, c-format
 msgid "`%s' failed for library `%s' with error: %s\n"
 msgstr ""
 
-#: src/util/plugin.c:349
+#: src/util/plugin.c:347
 #, fuzzy
 msgid "Could not determine plugin installation path.\n"
 msgstr "无法确定用户界面定义文件。"
 
-#: src/util/program.c:254 src/util/service.c:1796
+#: src/util/program.c:262 src/util/service.c:1452
 #, fuzzy, c-format
 msgid "Could not access configuration file `%s'\n"
 msgstr "找不到接口“%s”的一个 IP 地址。\n"
@@ -6877,7 +7466,7 @@ msgstr "找不到接口“%s”的一个 IP 地址。\n"
 msgid "Must specify `%s' for `%s' in configuration!\n"
 msgstr ""
 
-#: src/util/resolver_api.c:217
+#: src/util/resolver_api.c:216
 #, c-format
 msgid ""
 "Must specify `%s' or numeric IP address for `%s' of `%s' in configuration!\n"
@@ -6893,441 +7482,475 @@ msgstr "GNUnet 现在使用 IP 地址 %s。\n"
 msgid "Timeout trying to resolve hostname `%s'.\n"
 msgstr ""
 
-#: src/util/resolver_api.c:886
+#: src/util/resolver_api.c:891
 #, fuzzy, c-format
 msgid "Could not resolve our FQDN : %s\n"
 msgstr "无法解析“%s”(%s)：%s\n"
 
-#: src/util/scheduler.c:802
+#: src/util/scheduler.c:804
 msgid "Looks like we're busy waiting...\n"
 msgstr ""
 
-#: src/util/scheduler.c:933
+#: src/util/scheduler.c:938
 #, c-format
 msgid "Attempt to cancel dead task %llu!\n"
 msgstr ""
 
-#: src/util/server.c:482
+#: src/util/server.c:484
 #, fuzzy, c-format
 msgid "`%s' failed for port %d (%s).\n"
 msgstr "对驱动器“%2$s”的“%1$s”操作失败：%3$u\n"
 
-#: src/util/server.c:491
+#: src/util/server.c:493
 #, c-format
 msgid "`%s' failed for port %d (%s): address already in use\n"
 msgstr ""
 
-#: src/util/server.c:502
+#: src/util/server.c:499
 #, fuzzy, c-format
-msgid "`%s' failed for `%.*s': address already in use\n"
+msgid "`%s' failed for `%s': address already in use\n"
 msgstr "对驱动器“%2$s”的“%1$s”操作失败：%3$u\n"
 
-#: src/util/server.c:894
+#: src/util/server.c:892
 #, c-format
 msgid ""
 "Processing code for message of type %u did not call "
 "`GNUNET_SERVER_receive_done' after %s\n"
 msgstr ""
 
-#: src/util/service.c:151 src/util/service.c:177 src/util/service.c:220
-#: src/util/service.c:241 src/util/service.c:248
-#, c-format
-msgid "Invalid format for IP: `%s'\n"
-msgstr "IP 格式无效：“%s”\n"
-
-#: src/util/service.c:204
-#, c-format
-msgid "Invalid network notation ('/%d' is not legal in IPv4 CIDR)."
-msgstr "网络表示法无效(“/%d” 在 IPv4 CIDR 中是非法的)。"
-
-#: src/util/service.c:297
-#, c-format
-msgid "Invalid network notation (does not end with ';': `%s')\n"
-msgstr "无效的网络表示法(没有以“;”结尾：“%s”)\n"
-
-#: src/util/service.c:329
-#, c-format
-msgid "Wrong format `%s' for netmask\n"
-msgstr "网络掩码的格式“%s”错误\n"
-
-#: src/util/service.c:359
-#, c-format
-msgid "Wrong format `%s' for network\n"
-msgstr "网络的格式“%s”错误\n"
-
-#: src/util/service.c:716
-#, c-format
-msgid "Access denied to UID %d / GID %d\n"
-msgstr ""
-
-#: src/util/service.c:721
+#: src/util/service.c:362
 #, c-format
 msgid "Unknown address family %d\n"
 msgstr ""
 
-#: src/util/service.c:728
+#: src/util/service.c:369
 #, c-format
 msgid "Access from `%s' denied to service `%s'\n"
 msgstr ""
 
-#: src/util/service.c:783
+#: src/util/service.c:424
 #, c-format
 msgid "Could not parse IPv4 network specification `%s' for `%s:%s'\n"
 msgstr ""
 
-#: src/util/service.c:820
+#: src/util/service.c:461
 #, c-format
 msgid "Could not parse IPv6 network specification `%s' for `%s:%s'\n"
 msgstr ""
 
-#: src/util/service.c:938
+#: src/util/service.c:570
 #, c-format
 msgid ""
 "Disabling IPv6 support for service `%s', failed to create IPv6 socket: %s\n"
 msgstr ""
 
-#: src/util/service.c:1016
+#: src/util/service.c:651
 #, c-format
 msgid ""
 "Disabling UNIX domain socket support for service `%s', failed to create UNIX "
 "domain socket: %s\n"
 msgstr ""
 
-#: src/util/service.c:1033
+#: src/util/service.c:667
 #, c-format
 msgid "Have neither PORT nor UNIXPATH for service `%s', but one is required\n"
 msgstr ""
 
-#: src/util/service.c:1267
+#: src/util/service.c:901
 msgid "Could not access a pre-bound socket, will try to bind myself\n"
 msgstr ""
 
-#: src/util/service.c:1316 src/util/service.c:1334
+#: src/util/service.c:950 src/util/service.c:968
 #, c-format
 msgid "Specified value for `%s' of service `%s' is invalid\n"
 msgstr ""
 
-#: src/util/service.c:1359
+#: src/util/service.c:993
 #, c-format
 msgid "Could not access pre-bound socket %u, will try to bind myself\n"
 msgstr ""
 
-#: src/util/service.c:1530
+#: src/util/service.c:1163
 #, fuzzy, c-format
 msgid "Failed to start `%s' at `%s'\n"
 msgstr "运行 %s失败：%s %d\n"
 
-#: src/util/service.c:1563
+#: src/util/service.c:1204
 #, c-format
 msgid "Service `%s' runs at %s\n"
 msgstr ""
 
-#: src/util/service.c:1612
+#: src/util/service.c:1253
 msgid "Service process failed to initialize\n"
 msgstr ""
 
-#: src/util/service.c:1616
+#: src/util/service.c:1257
 msgid "Service process could not initialize server function\n"
 msgstr ""
 
-#: src/util/service.c:1620
+#: src/util/service.c:1261
 msgid "Service process failed to report status\n"
 msgstr ""
 
-#: src/util/service.c:1675
+#: src/util/service.c:1316
 msgid "No such user"
 msgstr "无此用户"
 
-#: src/util/service.c:1688
+#: src/util/service.c:1329
 #, c-format
 msgid "Cannot change user/group to `%s': %s\n"
 msgstr "无法更改用户/组为“%s”：%s\n"
 
-#: src/util/service.c:1754
+#: src/util/service.c:1399
 msgid "do daemonize (detach from terminal)"
 msgstr ""
 
-#: src/util/signal.c:80
+#: src/util/signal.c:79
 #, c-format
 msgid "signal (%d, %p) returned %d.\n"
 msgstr ""
 
-#: src/util/strings.c:146
+#: src/util/strings.c:145
 msgid "b"
 msgstr "b"
 
-#: src/util/strings.c:429
+#: src/util/strings.c:444
 #, c-format
 msgid "Character sets requested were `%s'->`%s'\n"
 msgstr ""
 
-#: src/util/strings.c:544
+#: src/util/strings.c:572
 msgid "Failed to expand `$HOME': environment variable `HOME' not set"
 msgstr "扩展“$HOME”失败：没有设置环境变量“HOME”"
 
-#: src/util/strings.c:641
+#: src/util/strings.c:669
 msgid "µs"
 msgstr ""
 
-#: src/util/strings.c:645
+#: src/util/strings.c:673
 msgid "forever"
 msgstr ""
 
-#: src/util/strings.c:647
+#: src/util/strings.c:675
 msgid "0 ms"
 msgstr ""
 
-#: src/util/strings.c:653
+#: src/util/strings.c:681
 msgid "ms"
 msgstr "毫秒"
 
-#: src/util/strings.c:659
+#: src/util/strings.c:687
 msgid "s"
 msgstr "秒"
 
-#: src/util/strings.c:665
+#: src/util/strings.c:693
 msgid "m"
 msgstr "分"
 
-#: src/util/strings.c:671
+#: src/util/strings.c:699
 msgid "h"
 msgstr "时"
 
-#: src/util/strings.c:678
+#: src/util/strings.c:706
 #, fuzzy
 msgid "day"
 msgstr " 天"
 
-#: src/util/strings.c:680
+#: src/util/strings.c:708
 #, fuzzy
 msgid "days"
 msgstr " 天"
 
-#: src/util/strings.c:708
+#: src/util/strings.c:737
 msgid "end of time"
 msgstr ""
 
-#: src/util/strings.c:1109
+#: src/util/strings.c:1141
 msgid "IPv6 address did not start with `['\n"
 msgstr ""
 
-#: src/util/strings.c:1117
+#: src/util/strings.c:1149
 msgid "IPv6 address did contain ':' to separate port number\n"
 msgstr ""
 
-#: src/util/strings.c:1123
+#: src/util/strings.c:1155
 msgid "IPv6 address did contain ']' before ':' to separate port number\n"
 msgstr ""
 
-#: src/util/strings.c:1130
+#: src/util/strings.c:1162
 msgid "IPv6 address did contain a valid port number after the last ':'\n"
 msgstr ""
 
-#: src/util/strings.c:1139
+#: src/util/strings.c:1171
 #, fuzzy, c-format
 msgid "Invalid IPv6 address `%s': %s\n"
 msgstr "无效的进程优先级“%s”\n"
 
-#: src/vpn/gnunet-service-vpn.c:523 src/vpn/gnunet-service-vpn.c:1128
-msgid "# Active tunnels"
+#: src/util/strings.c:1377 src/util/strings.c:1393
+msgid "Port not in range\n"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:622 src/vpn/gnunet-service-vpn.c:661
-#, fuzzy
-msgid "# peers connected to mesh tunnels"
+#: src/util/strings.c:1402
+#, fuzzy, c-format
+msgid "Malformed port policy `%s'\n"
+msgstr "解析配置文件“%s”失败\n"
+
+#: src/util/strings.c:1486 src/util/strings.c:1517 src/util/strings.c:1565
+#: src/util/strings.c:1586
+#, c-format
+msgid "Invalid format for IP: `%s'\n"
+msgstr "IP 格式无效：“%s”\n"
+
+#: src/util/strings.c:1543
+#, c-format
+msgid "Invalid network notation ('/%d' is not legal in IPv4 CIDR)."
+msgstr "网络表示法无效(“/%d” 在 IPv4 CIDR 中是非法的)。"
+
+#: src/util/strings.c:1595
+#, fuzzy, c-format
+msgid "Invalid format: `%s'\n"
+msgstr "IP 格式无效：“%s”\n"
+
+#: src/util/strings.c:1647
+#, c-format
+msgid "Invalid network notation (does not end with ';': `%s')\n"
+msgstr "无效的网络表示法(没有以“;”结尾：“%s”)\n"
+
+#: src/util/strings.c:1697
+#, c-format
+msgid "Wrong format `%s' for netmask\n"
+msgstr "网络掩码的格式“%s”错误\n"
+
+#: src/util/strings.c:1728
+#, c-format
+msgid "Wrong format `%s' for network\n"
+msgstr "网络的格式“%s”错误\n"
+
+#: src/vpn/gnunet-service-vpn.c:550 src/vpn/gnunet-service-vpn.c:1088
+msgid "# Active tunnels"
 msgstr ""
-"\n"
-"按任意键继续\n"
 
-#: src/vpn/gnunet-service-vpn.c:712
+#: src/vpn/gnunet-service-vpn.c:642
 msgid "# Bytes given to mesh for transmission"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:750
+#: src/vpn/gnunet-service-vpn.c:680
 msgid "# Bytes dropped in mesh queue (overflow)"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:814
+#: src/vpn/gnunet-service-vpn.c:754
 msgid "# Mesh tunnels created"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:839
+#: src/vpn/gnunet-service-vpn.c:786
 #, fuzzy
 msgid "Failed to setup mesh tunnel!\n"
 msgstr "发送消息失败。\n"
 
-#: src/vpn/gnunet-service-vpn.c:1032
+#: src/vpn/gnunet-service-vpn.c:980
 #, c-format
 msgid "Protocol %u not supported, dropping\n"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:1348
+#: src/vpn/gnunet-service-vpn.c:1307
 msgid "# ICMPv4 packets dropped (not allowed)"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:1369
+#: src/vpn/gnunet-service-vpn.c:1328
 msgid "# ICMPv6 packets dropped (not allowed)"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:1574
+#: src/vpn/gnunet-service-vpn.c:1533
 msgid "# Packets received from TUN interface"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:1612 src/vpn/gnunet-service-vpn.c:1653
+#: src/vpn/gnunet-service-vpn.c:1566 src/vpn/gnunet-service-vpn.c:1602
 #, c-format
 msgid "Packet received for unmapped destination `%s' (dropping it)\n"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:1663
+#: src/vpn/gnunet-service-vpn.c:1612
 msgid "Received IPv4 packet with options (dropping it)\n"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:1677
+#: src/vpn/gnunet-service-vpn.c:1626
 #, c-format
 msgid "Received packet of unknown protocol %d from TUN (dropping it)\n"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:1759
+#: src/vpn/gnunet-service-vpn.c:1708
 msgid "# ICMP packets received from mesh"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:2098
+#: src/vpn/gnunet-service-vpn.c:2047
 msgid "# UDP packets received from mesh"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:2253
+#: src/vpn/gnunet-service-vpn.c:2202
 msgid "# TCP packets received from mesh"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:2404
+#: src/vpn/gnunet-service-vpn.c:2353
 msgid "Failed to find unallocated IPv4 address in VPN's range\n"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:2459
+#: src/vpn/gnunet-service-vpn.c:2408
 msgid "Failed to find unallocated IPv6 address in VPN's range\n"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:2498 src/vpn/gnunet-service-vpn.c:2711
+#: src/vpn/gnunet-service-vpn.c:2449 src/vpn/gnunet-service-vpn.c:2665
 msgid "# Active destinations"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:2784
+#: src/vpn/gnunet-service-vpn.c:2717
 msgid "Failed to allocate IP address for new destination\n"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:3112
+#: src/vpn/gnunet-service-vpn.c:2984
 #, fuzzy
 msgid "Must specify valid IPv6 address"
 msgstr "“%s”不可用。\n"
 
-#: src/vpn/gnunet-service-vpn.c:3133
+#: src/vpn/gnunet-service-vpn.c:3008
 msgid "Must specify valid IPv6 mask"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:3141
+#: src/vpn/gnunet-service-vpn.c:3016
 msgid "IPv6 support disabled as this system does not support IPv6\n"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:3153
+#: src/vpn/gnunet-service-vpn.c:3029
 #, fuzzy
 msgid "Must specify valid IPv4 address"
 msgstr "“%s”不可用。\n"
 
-#: src/vpn/gnunet-service-vpn.c:3164
+#: src/vpn/gnunet-service-vpn.c:3042
 msgid "Must specify valid IPv4 mask"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:3173
+#: src/vpn/gnunet-service-vpn.c:3052
 msgid "IPv4 support disabled as this system does not support IPv4\n"
 msgstr ""
 
-#: src/vpn/gnunet-vpn.c:151
+#: src/vpn/gnunet-vpn.c:146
 #, fuzzy
 msgid "Error creating tunnel\n"
 msgstr "创建用户出错"
 
-#: src/vpn/gnunet-vpn.c:194 src/vpn/gnunet-vpn.c:225
+#: src/vpn/gnunet-vpn.c:189 src/vpn/gnunet-vpn.c:220
 #, c-format
 msgid "Option `%s' makes no sense with option `%s'.\n"
 msgstr ""
 
-#: src/vpn/gnunet-vpn.c:207
+#: src/vpn/gnunet-vpn.c:202
 #, fuzzy, c-format
 msgid "Option `%s' or `%s' is required.\n"
 msgstr "%s：选项“%s”有歧义\n"
 
-#: src/vpn/gnunet-vpn.c:219
+#: src/vpn/gnunet-vpn.c:214
 #, c-format
 msgid "Option `%s' or `%s' is required when using option `%s'.\n"
 msgstr ""
 
-#: src/vpn/gnunet-vpn.c:237
+#: src/vpn/gnunet-vpn.c:233
 #, fuzzy, c-format
 msgid "`%s' is not a valid peer identifier.\n"
 msgstr "“%s”不可用。\n"
 
-#: src/vpn/gnunet-vpn.c:259
+#: src/vpn/gnunet-vpn.c:254
 #, fuzzy, c-format
 msgid "`%s' is not a valid IP address.\n"
 msgstr "“%s”不可用。\n"
 
-#: src/vpn/gnunet-vpn.c:295
+#: src/vpn/gnunet-vpn.c:289
 msgid "request that result should be an IPv4 address"
 msgstr ""
 
-#: src/vpn/gnunet-vpn.c:298
+#: src/vpn/gnunet-vpn.c:292
 msgid "request that result should be an IPv6 address"
 msgstr ""
 
-#: src/vpn/gnunet-vpn.c:301
-msgid "print IP address only after mesh tunnel has been created"
-msgstr ""
-
-#: src/vpn/gnunet-vpn.c:304
+#: src/vpn/gnunet-vpn.c:295
 msgid "how long should the mapping be valid for new tunnels?"
 msgstr ""
 
-#: src/vpn/gnunet-vpn.c:307
+#: src/vpn/gnunet-vpn.c:298
 msgid "destination IP for the tunnel"
 msgstr ""
 
-#: src/vpn/gnunet-vpn.c:310
+#: src/vpn/gnunet-vpn.c:301
 msgid "peer offering the service we would like to access"
 msgstr ""
 
-#: src/vpn/gnunet-vpn.c:313
+#: src/vpn/gnunet-vpn.c:304
 msgid "name of the service we would like to access"
 msgstr ""
 
-#: src/vpn/gnunet-vpn.c:316
+#: src/vpn/gnunet-vpn.c:307
 msgid "service is offered via TCP"
 msgstr ""
 
-#: src/vpn/gnunet-vpn.c:319
+#: src/vpn/gnunet-vpn.c:310
 msgid "service is offered via UDP"
 msgstr ""
 
-#: src/vpn/gnunet-vpn.c:331
+#: src/vpn/gnunet-vpn.c:322
 msgid "Setup tunnels via VPN."
 msgstr ""
 
-#: src/include/gnunet_common.h:618 src/include/gnunet_common.h:625
-#: src/include/gnunet_common.h:633
+#: src/include/gnunet_common.h:566 src/include/gnunet_common.h:573
+#: src/include/gnunet_common.h:581
 #, c-format
 msgid "Assertion failed at %s:%d.\n"
 msgstr ""
 
-#: src/include/gnunet_common.h:645
+#: src/include/gnunet_common.h:593
 #, c-format
 msgid "External protocol violation detected at %s:%d.\n"
 msgstr ""
 
-#: src/include/gnunet_common.h:672 src/include/gnunet_common.h:681
+#: src/include/gnunet_common.h:620 src/include/gnunet_common.h:629
 #, c-format
 msgid "`%s' failed on file `%s' at %s:%d with error: %s\n"
 msgstr ""
 
 #, fuzzy
+#~ msgid "Loading block plugin `%s'\n"
+#~ msgstr "打开日志文件“%s”失败：%s\n"
+
+#, fuzzy
+#~ msgid "Invalid value `%s'\n"
+#~ msgstr "“%s”的参数无效。\n"
+
+#, fuzzy
+#~ msgid "Found issuer for public key `%s'\n"
+#~ msgstr "解析配置文件“%s”失败\n"
+
+#, fuzzy
+#~ msgid "No issuer for public key `%s'\n"
+#~ msgstr "运行 %s失败：%s %d\n"
+
+#, fuzzy
+#~ msgid "Failed to get slave counters!\n"
+#~ msgstr "发送消息失败。\n"
+
+#, fuzzy
+#~ msgid ""
+#~ "Could not translate E[a%d] to MPI!\n"
+#~ "%s/%s\n"
+#~ msgstr "无法利用“%2$s”获取接口“%1$s”的 IP。\n"
+
+#, fuzzy
+#~ msgid "Error while decoding key %u\n"
+#~ msgstr "解析 dscl 输出时出错。\n"
+
+#, fuzzy
+#~ msgid "# peers connected to mesh tunnels"
+#~ msgstr ""
+#~ "\n"
+#~ "按任意键继续\n"
+
+#, fuzzy
 #~ msgid "Failed to parse metadata about pseudonym from file `%s': %s\n"
 #~ msgstr "打开日志文件“%s”失败：%s\n"
 
@@ -7375,14 +7998,6 @@ msgstr ""
 #~ msgstr "找不到接口“%s”的一个 IP 地址。\n"
 
 #, fuzzy
-#~ msgid "Failed to read private key for namespace `%s'\n"
-#~ msgstr "发送消息失败。\n"
-
-#, fuzzy
-#~ msgid "ECDSA signature verification failed at %s:%d: %s\n"
-#~ msgstr "对驱动器“%2$s”的“%1$s”操作失败：%3$u\n"
-
-#, fuzzy
 #~ msgid "Failed to create namespace `%s' (illegal filename?)\n"
 #~ msgstr "发送消息失败。\n"
 
@@ -7437,10 +8052,6 @@ msgstr ""
 #~ msgstr "对驱动器“%2$s”的“%1$s”操作失败：%3$u\n"
 
 #, fuzzy
-#~ msgid "Service `%s' has been stopped.\n"
-#~ msgstr "服务已删除。\n"
-
-#, fuzzy
 #~ msgid "Service `%s' was already running.\n"
 #~ msgstr "服务已删除。\n"
 
@@ -7473,11 +8084,6 @@ msgstr ""
 #~ msgstr "配置文件“%s”第 %d 行有语法错误。\n"
 
 #, fuzzy
-#~ msgid ""
-#~ "Syntax error in blacklist file at offset %llu, skipping bytes `%s'.\n"
-#~ msgstr "配置文件“%s”第 %d 行有语法错误。\n"
-
-#, fuzzy
 #~ msgid "Failed to read hostkey: %s\n"
 #~ msgstr "运行 %s失败：%s %d\n"
 
@@ -7587,10 +8193,6 @@ msgstr ""
 #~ msgid "User `%s' is currently not in the room!\n"
 #~ msgstr "用户“%s”当前不在房间里！\n"
 
-#, fuzzy
-#~ msgid "Unknown command `%s'\n"
-#~ msgstr "未知的命令“%s”。\n"
-
 #~ msgid "set the chat room to join"
 #~ msgstr "设置要加入的聊天室"
 
@@ -7671,10 +8273,6 @@ msgstr ""
 #~ msgstr "保存配置失败。"
 
 #, fuzzy
-#~ msgid "Could not start `%s' process to copy configuration file.\n"
-#~ msgstr "找不到主机“%s”的 IP：%s\n"
-
-#, fuzzy
 #~ msgid "Failed to copy new configuration to remote machine."
 #~ msgstr "保存配置失败。"
 
@@ -7733,10 +8331,6 @@ msgstr ""
 #~ msgstr "“%s”说：%s\n"
 
 #, fuzzy
-#~ msgid "stat (%s) failed: %s\n"
-#~ msgstr "“%s”说：%s\n"
-
-#, fuzzy
 #~ msgid "# Peers connected"
 #~ msgstr ""
 #~ "\n"
@@ -8046,9 +8640,6 @@ msgstr ""
 #~ msgid "Invalid input, expecting integer."
 #~ msgstr "无效输入，应为整数。"
 
-#~ msgid "Value is not in legal range."
-#~ msgstr "值不在合法范围内。"
-
 #~ msgid "Configuration unchanged, no need to save.\n"
 #~ msgstr "配置未更改，无须保存。\n"
 
@@ -8129,9 +8720,6 @@ msgstr ""
 #~ msgid "Too many arguments.\n"
 #~ msgstr "参数过多。\n"
 
-#~ msgid "No interface specified, using default.\n"
-#~ msgstr "没有指定接口，将使用默认。\n"
-
 #~ msgid "Configuration file `%s' must be a filename (but is a directory).\n"
 #~ msgstr "配置文件“%s”必须是一个文件名(但是一个目录)。\n"
 
diff --git a/src/Makefile.am b/src/Makefile.am
index 0d47cb2b4..e95fdb222 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -6,6 +6,7 @@ if HAVE_TESTING
  TESTING = testing
  TESTBED = testbed
  CONSENSUS = consensus
+ SECRETSHARING = secretsharing
  EXPERIMENTATION = experimentation
 endif
 
@@ -15,6 +16,7 @@ if HAVE_EXPERIMENTAL
   env \
   psyc \
   $(CONSENSUS) \
+  $(SECRETSHARING) \
   $(EXPERIMENTATION)
 endif
 
diff --git a/src/secretsharing/Makefile.am b/src/secretsharing/Makefile.am
new file mode 100644
index 000000000..7a925dd0e
--- /dev/null
+++ b/src/secretsharing/Makefile.am
@@ -0,0 +1,59 @@
+AM_CPPFLAGS = -I$(top_srcdir)/src/include
+
+pkgcfgdir= $(pkgdatadir)/config.d/
+
+libexecdir= $(pkglibdir)/libexec/
+
+pkgcfg_DATA = \
+  secretsharing.conf
+
+if MINGW
+ WINFLAGS = -Wl,--no-undefined -Wl,--export-all-symbols 
+endif
+
+if USE_COVERAGE
+  AM_CFLAGS = -fprofile-arcs -ftest-coverage
+endif
+
+libexec_PROGRAMS = \
+ gnunet-service-secretsharing
+
+lib_LTLIBRARIES = \
+  libgnunetsecretsharing.la
+
+gnunet_service_secretsharing_SOURCES = \
+ gnunet-service-secretsharing.c
+gnunet_service_secretsharing_LDADD = \
+  $(top_builddir)/src/util/libgnunetutil.la \
+  $(top_builddir)/src/core/libgnunetcore.la \
+  $(top_builddir)/src/mesh/libgnunetmesh.la \
+  $(top_builddir)/src/set/libgnunetset.la \
+  $(GN_LIBINTL)
+gnunet_service_secretsharing_DEPENDENCIES = \
+  $(top_builddir)/src/set/libgnunetset.la
+
+libgnunetsecretsharing_la_SOURCES = \
+  secretsharing_api.c
+libgnunetsecretsharing_la_LIBADD = \
+  $(top_builddir)/src/util/libgnunetutil.la \
+  $(LTLIBINTL)
+libgnunetsecretsharing_la_LDFLAGS = \
+  $(GN_LIB_LDFLAGS)
+
+check_PROGRAMS = \
+ test_secretsharing_api
+
+if ENABLE_TEST_RUN
+TESTS = $(check_PROGRAMS)
+endif
+
+test_secretsharing_api_SOURCES = \
+ test_secretsharing_api.c
+test_secretsharing_api_LDADD = \
+  $(top_builddir)/src/util/libgnunetutil.la \
+  $(top_builddir)/src/testing/libgnunettesting.la \
+  $(top_builddir)/src/secretsharing/libgnunetsecretsharing.la
+
+EXTRA_DIST = \
+  test_secretsharing.conf
+
diff --git a/src/secretsharing/gnunet-service-secretsharing.c b/src/secretsharing/gnunet-service-secretsharing.c
new file mode 100644
index 000000000..a16f88079
--- /dev/null
+++ b/src/secretsharing/gnunet-service-secretsharing.c
@@ -0,0 +1,80 @@
+/*
+     This file is part of GNUnet.
+     (C) 2013 Christian Grothoff (and other contributing authors)
+
+     GNUnet is free software; you can redistribute it and/or modify
+     it under the terms of the GNU General Public License as published
+     by the Free Software Foundation; either version 3, or (at your
+     option) any later version.
+
+     GNUnet is distributed in the hope that it will be useful, but
+     WITHOUT ANY WARRANTY; without even the implied warranty of
+     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+     General Public License for more details.
+
+     You should have received a copy of the GNU General Public License
+     along with GNUnet; see the file COPYING.  If not, write to the
+     Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+     Boston, MA 02111-1307, USA.
+*/
+
+/**
+ * @file secretsharing/gnunet-service-secretsharing.c
+ * @brief secret sharing service
+ * @author Florian Dold
+ */
+#include "platform.h"
+#include "gnunet_util_lib.h"
+
+
+/**
+ * Task run during shutdown.
+ *
+ * @param cls unused
+ * @param tc unused
+ */
+static void
+cleanup_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
+{
+  /* FIXME: do clean up here */
+}
+
+
+/**
+ * Process template requests.
+ *
+ * @param cls closure
+ * @param server the initialized server
+ * @param cfg configuration to use
+ */
+static void
+run (void *cls, struct GNUNET_SERVER_Handle *server,
+     const struct GNUNET_CONFIGURATION_Handle *cfg)
+{
+  static const struct GNUNET_SERVER_MessageHandler handlers[] = {
+    /* FIXME: add handlers here! */
+    {NULL, NULL, 0, 0}
+  };
+  /* FIXME: do setup here */
+  GNUNET_SERVER_add_handlers (server, handlers);
+  GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_FOREVER_REL, &cleanup_task,
+                                NULL);
+}
+
+
+/**
+ * The main function for the template service.
+ *
+ * @param argc number of arguments from the command line
+ * @param argv command line arguments
+ * @return 0 ok, 1 on error
+ */
+int
+main (int argc, char *const *argv)
+{
+  return (GNUNET_OK ==
+          GNUNET_SERVICE_run (argc, argv, "template",
+                              GNUNET_SERVICE_OPTION_NONE, &run, NULL)) ? 0 : 1;
+}
+
+/* end of gnunet-service-template.c */
diff --git a/src/secretsharing/secretsharing.conf.in b/src/secretsharing/secretsharing.conf.in
new file mode 100644
index 000000000..0834235d4
--- /dev/null
+++ b/src/secretsharing/secretsharing.conf.in
@@ -0,0 +1,19 @@
+[secretsharing]
+AUTOSTART = NO
+@JAVAPORT@PORT = 2114
+HOSTNAME = localhost
+BINARY = gnunet-service-secretsharing
+ACCEPT_FROM = 127.0.0.1;
+ACCEPT_FROM6 = ::1;
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-service-secretsharing.sock
+UNIX_MATCH_UID = YES
+UNIX_MATCH_GID = YES
+# DISABLE_SOCKET_FORWARDING = NO
+# USERNAME = 
+# MAXBUF =
+# TIMEOUT =
+# DISABLEV6 =
+# BINDTO =
+# REJECT_FROM =
+# REJECT_FROM6 =
+# PREFIX =
diff --git a/src/secretsharing/secretsharing_api.c b/src/secretsharing/secretsharing_api.c
new file mode 100644
index 000000000..325e07f51
--- /dev/null
+++ b/src/secretsharing/secretsharing_api.c
@@ -0,0 +1,32 @@
+/*
+     This file is part of GNUnet.
+     (C) 2012 Christian Grothoff (and other contributing authors)
+
+     GNUnet is free software; you can redistribute it and/or modify
+     it under the terms of the GNU General Public License as published
+     by the Free Software Foundation; either version 3, or (at your
+     option) any later version.
+
+     GNUnet is distributed in the hope that it will be useful, but
+     WITHOUT ANY WARRANTY; without even the implied warranty of
+     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+     General Public License for more details.
+
+     You should have received a copy of the GNU General Public License
+     along with GNUnet; see the file COPYING.  If not, write to the
+     Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+     Boston, MA 02111-1307, USA.
+*/
+
+/**
+ * @file secretsharing/secretsharing_api.c
+ * @brief
+ * @author Florian Dold
+ */
+#include "platform.h"
+#include "gnunet_util_lib.h"
+
+
+#define LOG(kind,...) GNUNET_log_from (kind, "secretsharing-api",__VA_ARGS__)
+
+
diff --git a/src/secretsharing/test_secretsharing.conf b/src/secretsharing/test_secretsharing.conf
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/src/secretsharing/test_secretsharing.conf
diff --git a/src/secretsharing/test_secretsharing_api.c b/src/secretsharing/test_secretsharing_api.c
new file mode 100644
index 000000000..a6f3cb127
--- /dev/null
+++ b/src/secretsharing/test_secretsharing_api.c
@@ -0,0 +1,33 @@
+/*
+     This file is part of GNUnet.
+     (C) 2013 Christian Grothoff (and other contributing authors)
+
+     GNUnet is free software; you can redistribute it and/or modify
+     it under the terms of the GNU General Public License as published
+     by the Free Software Foundation; either version 3, or (at your
+     option) any later version.
+
+     GNUnet is distributed in the hope that it will be useful, but
+     WITHOUT ANY WARRANTY; without even the implied warranty of
+     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+     General Public License for more details.
+
+     You should have received a copy of the GNU General Public License
+     along with GNUnet; see the file COPYING.  If not, write to the
+     Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+     Boston, MA 02111-1307, USA.
+*/
+
+/**
+ * @file secretsharing/test_secretsharing_api.c
+ * @brief testcase for the secretsharing api
+ */
+#include "platform.h"
+#include "gnunet_util_lib.h"
+
+int
+main (int argc, char **argv)
+{
+  return 0;
+}
+