gnunet-svn
[Top][All Lists]
Advanced

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

[GNUnet-SVN] r31343 - in gnunet: po src/arm src/gns src/namecache src/na


From: gnunet
Subject: [GNUnet-SVN] r31343 - in gnunet: po src/arm src/gns src/namecache src/namestore
Date: Thu, 12 Dec 2013 22:43:39 +0100

Author: grothoff
Date: 2013-12-12 22:43:39 +0100 (Thu, 12 Dec 2013)
New Revision: 31343

Modified:
   gnunet/po/de.po
   gnunet/po/es.po
   gnunet/po/sv.po
   gnunet/po/vi.po
   gnunet/po/zh_CN.po
   gnunet/src/arm/Makefile.am
   gnunet/src/gns/Makefile.am
   gnunet/src/namecache/Makefile.am
   gnunet/src/namestore/Makefile.am
Log:
-fixing 'make dist' issues

Modified: gnunet/po/de.po
===================================================================
--- gnunet/po/de.po     2013-12-12 21:38:43 UTC (rev 31342)
+++ gnunet/po/de.po     2013-12-12 21:43:39 UTC (rev 31343)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: GNUnet 0.7.0b\n"
 "Report-Msgid-Bugs-To: address@hidden"
-"POT-Creation-Date: 2013-11-05 02:07+0100\n"
+"POT-Creation-Date: 2013-12-12 22:41+0100\n"
 "PO-Revision-Date: 2006-03-17 21:37+0100\n"
 "Last-Translator: Nils Durner <address@hidden>\n"
 "Language-Team: German <address@hidden>\n"
@@ -36,7 +36,7 @@
 msgid "Failed to remove servicehome directory %s\n"
 msgstr "Dateiformat fehlerhaft (kein GNUnet Verzeichnis?)\n"
 
-#: src/arm/gnunet-arm.c:216 src/testbed/gnunet-service-testbed_peers.c:1010
+#: src/arm/gnunet-arm.c:216 src/testbed/gnunet-service-testbed_peers.c:1013
 msgid "Message was sent successfully"
 msgstr ""
 
@@ -45,12 +45,12 @@
 msgid "Misconfiguration (can not connect to the ARM service)"
 msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
 
-#: src/arm/gnunet-arm.c:220 src/testbed/gnunet-service-testbed_peers.c:1014
+#: src/arm/gnunet-arm.c:220 src/testbed/gnunet-service-testbed_peers.c:1017
 #, fuzzy
 msgid "We disconnected from ARM before we could send a request"
 msgstr "# gap Anfragen verworfen: Kollision in RT"
 
-#: src/arm/gnunet-arm.c:222 src/testbed/gnunet-service-testbed_peers.c:1016
+#: src/arm/gnunet-arm.c:222 src/testbed/gnunet-service-testbed_peers.c:1019
 msgid "ARM API is busy"
 msgstr ""
 
@@ -58,57 +58,57 @@
 msgid "Request does not fit into a message"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:226 src/testbed/gnunet-service-testbed_peers.c:1020
+#: src/arm/gnunet-arm.c:226 src/testbed/gnunet-service-testbed_peers.c:1023
 #, fuzzy
 msgid "Request timed out"
 msgstr "# Sitzungsschlüssel akzeptiert"
 
-#: src/arm/gnunet-arm.c:228 src/testbed/gnunet-service-testbed_peers.c:1022
+#: src/arm/gnunet-arm.c:228 src/testbed/gnunet-service-testbed_peers.c:1025
 #, fuzzy
 msgid "Unknown request status"
 msgstr "Unbekannte Operation `%s'\n"
 
-#: src/arm/gnunet-arm.c:244 src/testbed/gnunet-service-testbed_peers.c:1038
+#: src/arm/gnunet-arm.c:244 src/testbed/gnunet-service-testbed_peers.c:1041
 #, fuzzy, c-format
 msgid "%s is stopped"
 msgstr "# bytes in der Datenbank"
 
-#: src/arm/gnunet-arm.c:246 src/testbed/gnunet-service-testbed_peers.c:1040
+#: src/arm/gnunet-arm.c:246 src/testbed/gnunet-service-testbed_peers.c:1043
 #, fuzzy, c-format
 msgid "%s is starting"
 msgstr "`%s' startet\n"
 
-#: src/arm/gnunet-arm.c:248 src/testbed/gnunet-service-testbed_peers.c:1042
+#: src/arm/gnunet-arm.c:248 src/testbed/gnunet-service-testbed_peers.c:1045
 #, c-format
 msgid "%s is stopping"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:250 src/testbed/gnunet-service-testbed_peers.c:1044
+#: src/arm/gnunet-arm.c:250 src/testbed/gnunet-service-testbed_peers.c:1047
 #, fuzzy, c-format
 msgid "%s is starting already"
 msgstr "`%s' startet\n"
 
-#: src/arm/gnunet-arm.c:252 src/testbed/gnunet-service-testbed_peers.c:1046
+#: src/arm/gnunet-arm.c:252 src/testbed/gnunet-service-testbed_peers.c:1049
 #, c-format
 msgid "%s is stopping already"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:254 src/testbed/gnunet-service-testbed_peers.c:1048
+#: src/arm/gnunet-arm.c:254 src/testbed/gnunet-service-testbed_peers.c:1051
 #, c-format
 msgid "%s is started already"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:256 src/testbed/gnunet-service-testbed_peers.c:1050
+#: src/arm/gnunet-arm.c:256 src/testbed/gnunet-service-testbed_peers.c:1053
 #, c-format
 msgid "%s is stopped already"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:258 src/testbed/gnunet-service-testbed_peers.c:1052
+#: src/arm/gnunet-arm.c:258 src/testbed/gnunet-service-testbed_peers.c:1055
 #, fuzzy, c-format
 msgid "%s service is not known to ARM"
 msgstr "Namespace `%s' hat das Rating %d.\n"
 
-#: src/arm/gnunet-arm.c:260 src/testbed/gnunet-service-testbed_peers.c:1054
+#: src/arm/gnunet-arm.c:260 src/testbed/gnunet-service-testbed_peers.c:1057
 #, fuzzy, c-format
 msgid "%s service failed to start"
 msgstr "Fehler beim Starten der Collection.\n"
@@ -118,7 +118,7 @@
 msgid "%s service cannot be started because ARM is shutting down"
 msgstr "`%s' fährt herunter.\n"
 
-#: src/arm/gnunet-arm.c:264 src/testbed/gnunet-service-testbed_peers.c:1058
+#: src/arm/gnunet-arm.c:264 src/testbed/gnunet-service-testbed_peers.c:1061
 #, c-format
 msgid "%.s Unknown result code."
 msgstr ""
@@ -142,204 +142,204 @@
 msgid "Failed to stop the ARM service: %s\n"
 msgstr "Fehler beim Binden an UDP Port %d.\n"
 
-#: src/arm/gnunet-arm.c:420
+#: src/arm/gnunet-arm.c:421
 #, 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:429
+#: src/arm/gnunet-arm.c:431
 #, 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:465
+#: src/arm/gnunet-arm.c:468
 #, 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:476
+#: src/arm/gnunet-arm.c:479
 #, 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:512
+#: src/arm/gnunet-arm.c:517
 #, 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:519
+#: src/arm/gnunet-arm.c:525
 #, fuzzy
 msgid "Error communicating with ARM. ARM not running?\n"
 msgstr "Informationen über andere GNUnet Knoten ausgeben."
 
-#: src/arm/gnunet-arm.c:523
+#: src/arm/gnunet-arm.c:530
 #, fuzzy
 msgid "Running services:\n"
 msgstr "Collection `%s' begonnen.\n"
 
-#: src/arm/gnunet-arm.c:605
+#: src/arm/gnunet-arm.c:612
 #, c-format
 msgid "Now only monitoring, press CTRL-C to stop.\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:636
+#: src/arm/gnunet-arm.c:643
 #, c-format
 msgid "Stopped %s.\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:639
+#: src/arm/gnunet-arm.c:646
 #, fuzzy, c-format
 msgid "Starting %s...\n"
 msgstr "Collection `%s' begonnen.\n"
 
-#: src/arm/gnunet-arm.c:642
+#: src/arm/gnunet-arm.c:649
 #, c-format
 msgid "Stopping %s...\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:653
+#: src/arm/gnunet-arm.c:660
 #, fuzzy, c-format
 msgid "Unknown status %u for service %s.\n"
 msgstr "Unbekannte Operation `%s'\n"
 
-#: src/arm/gnunet-arm.c:717
+#: src/arm/gnunet-arm.c:724
 msgid "stop all GNUnet services"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:719
+#: src/arm/gnunet-arm.c:726
 msgid "start a particular service"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:721
+#: src/arm/gnunet-arm.c:728
 msgid "stop a particular service"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:723
+#: src/arm/gnunet-arm.c:730
 msgid "start all GNUnet default services"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:726
+#: src/arm/gnunet-arm.c:733
 msgid "stop and start all GNUnet default services"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:729
+#: src/arm/gnunet-arm.c:736
 msgid "delete config file and directory on exit"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:732
+#: src/arm/gnunet-arm.c:739
 msgid "monitor ARM activities"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:734
+#: src/arm/gnunet-arm.c:741
 msgid "don't print status messages"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:737
+#: src/arm/gnunet-arm.c:744
 #, 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:739
+#: src/arm/gnunet-arm.c:746
 #, fuzzy
 msgid "list currently running services"
 msgstr "Collection `%s' begonnen.\n"
 
-#: src/arm/gnunet-arm.c:741
+#: src/arm/gnunet-arm.c:748
 msgid "don't let gnunet-service-arm inherit standard output"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:743
+#: src/arm/gnunet-arm.c:750
 msgid "don't let gnunet-service-arm inherit standard error"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:754
+#: src/arm/gnunet-arm.c:761
 msgid "Control services and the Automated Restart Manager (ARM)"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:268
+#: src/arm/gnunet-service-arm.c:266
 #, 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:304
+#: src/arm/gnunet-service-arm.c:302
 #, 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:519
+#: src/arm/gnunet-service-arm.c:528
 #, 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:526
+#: src/arm/gnunet-service-arm.c:535
 #, fuzzy, c-format
 msgid "Starting service `%s'\n"
 msgstr "Collection `%s' begonnen.\n"
 
-#: src/arm/gnunet-service-arm.c:625
+#: src/arm/gnunet-service-arm.c:634
 #, 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:647
+#: src/arm/gnunet-service-arm.c:656
 #, c-format
 msgid "Unable to bind listening socket for service `%s' to address `%s': %s\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:676
+#: src/arm/gnunet-service-arm.c:685
 #, c-format
 msgid "ARM now monitors connections to service `%s' at `%s'\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:809
+#: src/arm/gnunet-service-arm.c:821
 #, fuzzy, c-format
 msgid "Preparing to stop `%s'\n"
 msgstr "Collection `%s' begonnen.\n"
 
-#: src/arm/gnunet-service-arm.c:1070
+#: src/arm/gnunet-service-arm.c:1085
 #, fuzzy, c-format
 msgid "Restarting service `%s'.\n"
 msgstr "Collection `%s' begonnen.\n"
 
-#: src/arm/gnunet-service-arm.c:1163
+#: src/arm/gnunet-service-arm.c:1178
 msgid "exit"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:1168
+#: src/arm/gnunet-service-arm.c:1183
 msgid "signal"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:1173
+#: src/arm/gnunet-service-arm.c:1188
 #, fuzzy
 msgid "unknown"
 msgstr "Unbekannter Fehler"
 
-#: src/arm/gnunet-service-arm.c:1179
+#: src/arm/gnunet-service-arm.c:1194
 #, fuzzy, c-format
 msgid "Service `%s' took %s to terminate\n"
 msgstr "Dienst gelöscht.\n"
 
-#: src/arm/gnunet-service-arm.c:1201
+#: src/arm/gnunet-service-arm.c:1216
 #, c-format
 msgid "Service `%s' terminated normally, will restart at any time\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:1216
+#: src/arm/gnunet-service-arm.c:1231
 #, c-format
 msgid "Service `%s' terminated with status %s/%d, will restart in %s\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:1463
+#: src/arm/gnunet-service-arm.c:1484
 #, fuzzy, c-format
 msgid "Starting default services `%s'\n"
 msgstr "Collection `%s' begonnen.\n"
 
-#: src/arm/gnunet-service-arm.c:1474
+#: src/arm/gnunet-service-arm.c:1495
 #, c-format
 msgid "Default service `%s' not configured correctly!\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:1488
+#: src/arm/gnunet-service-arm.c:1509
 msgid ""
 "No default services configured, GNUnet will not really start right now.\n"
 msgstr ""
@@ -358,99 +358,99 @@
 msgid "Received last message for %s \n"
 msgstr "GAP hat ungültige Inhalte von `%s' empfangen.\n"
 
-#: src/ats/gnunet-service-ats_addresses.c:1475
-#: src/ats/gnunet-service-ats_addresses.c:1519
+#: src/ats/gnunet-service-ats_addresses.c:1946
+#: src/ats/gnunet-service-ats_addresses.c:1990
 #, c-format
 msgid ""
 "Could not load quota for network `%s':  `%s', assigning default bandwidth "
 "%llu\n"
 msgstr ""
 
-#: src/ats/gnunet-service-ats_addresses.c:1482
+#: src/ats/gnunet-service-ats_addresses.c:1953
 #, c-format
 msgid "Outbound quota configure for network `%s' is %llu\n"
 msgstr ""
 
-#: src/ats/gnunet-service-ats_addresses.c:1490
+#: src/ats/gnunet-service-ats_addresses.c:1961
 #, c-format
 msgid ""
 "No outbound quota configured for network `%s', assigning default bandwidth "
 "%llu\n"
 msgstr ""
 
-#: src/ats/gnunet-service-ats_addresses.c:1526
+#: src/ats/gnunet-service-ats_addresses.c:1997
 #, c-format
 msgid "Inbound quota configured for network `%s' is %llu\n"
 msgstr ""
 
-#: src/ats/gnunet-service-ats_addresses.c:1534
+#: src/ats/gnunet-service-ats_addresses.c:2005
 #, c-format
 msgid ""
 "No outbound quota configure for network `%s', assigning default bandwidth "
 "%llu\n"
 msgstr ""
 
-#: src/ats/gnunet-service-ats_addresses.c:1700
+#: src/ats/gnunet-service-ats_addresses.c:2175
 #, c-format
 msgid "Initializing solver `%s '`%s'\n"
 msgstr ""
 
-#: src/ats/gnunet-service-ats_addresses.c:1703
+#: src/ats/gnunet-service-ats_addresses.c:2178
 #, 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
+#: src/ats/gnunet-service-ats_addresses.c:2201
 #, fuzzy
 msgid "Failed to initialize solver!\n"
 msgstr "SQLite Datenbank konnte nicht initialisiert werden: %s.\n"
 
-#: src/ats/libgnunet_plugin_ats_mlp.c:868
+#: src/ats/plugin_ats_mlp.c:868
 msgid "Problem size too large, cannot allocate memory!\n"
 msgstr ""
 
-#: src/ats/libgnunet_plugin_ats_mlp.c:1239
+#: src/ats/plugin_ats_mlp.c:1281
 #, fuzzy, c-format
 msgid "Adding address for peer `%s' multiple times\n"
 msgstr "Adresse des Knotens `%s' konnte nicht ermittelt werden.\n"
 
-#: src/ats/libgnunet_plugin_ats_mlp.c:1286
+#: src/ats/plugin_ats_mlp.c:1328
 #, c-format
 msgid "Updating address property `%s' for peer `%s' %p not added before\n"
 msgstr ""
 
-#: src/ats/libgnunet_plugin_ats_mlp.c:2010
+#: src/ats/plugin_ats_mlp.c:2059
 #, c-format
 msgid ""
 "Adjusting inconsistent outbound quota configuration for network `%s', is "
 "%llu must be at least %llu\n"
 msgstr ""
 
-#: src/ats/libgnunet_plugin_ats_mlp.c:2018
+#: src/ats/plugin_ats_mlp.c:2067
 #, c-format
 msgid ""
 "Adjusting inconsistent inbound quota configuration for network `%s', is %llu "
 "must be at least %llu\n"
 msgstr ""
 
-#: src/ats/libgnunet_plugin_ats_mlp.c:2028
+#: src/ats/plugin_ats_mlp.c:2077
 #, c-format
 msgid ""
 "Adjusting outbound quota configuration for network `%s'from %llu to %.0f\n"
 msgstr ""
 
-#: src/ats/libgnunet_plugin_ats_mlp.c:2036
+#: src/ats/plugin_ats_mlp.c:2085
 #, c-format
 msgid ""
 "Adjusting inbound quota configuration for network `%s' from %llu to %.0f\n"
 msgstr ""
 
-#: src/ats/libgnunet_plugin_ats_mlp.c:2047
+#: src/ats/plugin_ats_mlp.c:2096
 #, c-format
 msgid "Using default quota configuration for network `%s' (in/out) %llu/%llu\n"
 msgstr ""
 
-#: src/ats/libgnunet_plugin_ats_proportional.c:1438
+#: src/ats/plugin_ats_proportional.c:1514
 #, fuzzy, c-format
 msgid "Invalid network type `%u' `%s': Disconnect!\n"
 msgstr "IP des Hosts `%s' konnte nicht ermittelt werden: %s\n"
@@ -477,13 +477,13 @@
 msgid "Quota for network `%11s' (in/out): %10s / %10s\n"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:347 src/namestore/gnunet-namestore.c:520
-#: src/transport/gnunet-transport.c:807
+#: src/ats-tool/gnunet-ats.c:347 src/namestore/gnunet-namestore.c:547
+#: src/transport/gnunet-transport.c:829
 #, fuzzy, c-format
 msgid "Service `%s' is not running\n"
 msgstr "`%s' ist keine Datei.\n"
 
-#: src/ats-tool/gnunet-ats.c:359 src/transport/gnunet-transport.c:816
+#: src/ats-tool/gnunet-ats.c:359 src/transport/gnunet-transport.c:838
 #, fuzzy, c-format
 msgid "Failed to parse peer identity `%s'\n"
 msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
@@ -565,222 +565,276 @@
 msgid "Print information about ATS state"
 msgstr "Informationen über andere GNUnet Knoten ausgeben."
 
-#: src/consensus/gnunet-consensus-profiler.c:394
+#: src/consensus/gnunet-consensus-profiler.c:420
 #, fuzzy
 msgid "number of peers in consensus"
 msgstr "Anzahl an Durchläufen"
 
-#: src/consensus/gnunet-consensus-profiler.c:397
+#: src/consensus/gnunet-consensus-profiler.c:423
 msgid "how many peers receive one value?"
 msgstr ""
 
-#: src/consensus/gnunet-consensus-profiler.c:400
+#: src/consensus/gnunet-consensus-profiler.c:426
 #: 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:403
+#: src/consensus/gnunet-consensus-profiler.c:429
 #, fuzzy
 msgid "consensus timeout"
 msgstr "# Sitzungsschlüssel akzeptiert"
 
-#: src/consensus/gnunet-consensus-profiler.c:406
+#: src/consensus/gnunet-consensus-profiler.c:432
 msgid "be more verbose (print received values)"
 msgstr ""
 
-#: 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/conversation_api.c:557
+#: src/conversation/conversation_api_call.c:468
+msgid "Connection to conversation service lost, trying to reconnect\n"
+msgstr ""
 
-#: src/conversation/gnunet-conversation.c:186
+#: src/conversation/gnunet-conversation.c:252
 #, c-format
-msgid ""
-"Incoming call from `%s'.\n"
-"Please /accept or /cancel the call.\n"
+msgid "Incoming call from `%s'. Please /accept #%u or /cancel %u the call.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:206
-#: src/conversation/gnunet-conversation.c:315
+#: src/conversation/gnunet-conversation.c:274
 #, c-format
-msgid "Call terminated: %s\n"
+msgid "Call from `%s' terminated\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:226
+#: src/conversation/gnunet-conversation.c:307
 #, c-format
+msgid "Call from `%s' suspended by other user\n"
+msgstr ""
+
+#: src/conversation/gnunet-conversation.c:312
+#, c-format
+msgid "Call from `%s' resumed by other user\n"
+msgstr ""
+
+#: src/conversation/gnunet-conversation.c:330
+#, c-format
 msgid "Ego `%s' no longer available, phone is now down.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:239
+#: src/conversation/gnunet-conversation.c:344
 #, 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
+#: src/conversation/gnunet-conversation.c:357
 #, c-format
 msgid "Phone active on line %u\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:284
-msgid "Resolved address. Now ringing other party.\n"
+#: src/conversation/gnunet-conversation.c:379
+#, c-format
+msgid "Resolved address of `%s'. Now ringing other party.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:290
+#: src/conversation/gnunet-conversation.c:386
 #, fuzzy, c-format
-msgid "Connection established to `%s': %s\n"
+msgid "Connection established to `%s'\n"
 msgstr "`%s' schlug fehl bei %s:%d mit dem Fehler: `%s'.\n"
 
-#: src/conversation/gnunet-conversation.c:298
+#: src/conversation/gnunet-conversation.c:393
 #, 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"
+#: src/conversation/gnunet-conversation.c:400
+msgid "Call terminated\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:385
+#: src/conversation/gnunet-conversation.c:406
+#, c-format
+msgid "Connection to `%s' suspended (by other user)\n"
+msgstr ""
+
+#: src/conversation/gnunet-conversation.c:412
+#, c-format
+msgid "Connection to `%s' resumed (by other user)\n"
+msgstr ""
+
+#: src/conversation/gnunet-conversation.c:479
 #, 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
+#: src/conversation/gnunet-conversation.c:495
+#: src/conversation/gnunet-conversation.c:509
 #, 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"
+#: src/conversation/gnunet-conversation.c:502
+#: src/conversation/gnunet-conversation.c:552
+msgid "You are calling someone else already, hang up first!\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:424
-#: src/conversation/gnunet-conversation.c:438
+#: src/conversation/gnunet-conversation.c:517
+#: src/conversation/gnunet-conversation.c:565
 #, c-format
-msgid "You are already in a conversation with `%s', refusing to call `%s'.\n"
+msgid "You are answering call from `%s', hang up or suspend that call first!\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"
+#: src/conversation/gnunet-conversation.c:576
+msgid "There is no incoming call to accept here!\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
+#: src/conversation/gnunet-conversation.c:593
 #, c-format
-msgid "You are trying to call `%s', cannot accept incoming calls right now.\n"
+msgid "There is no incoming call `%s' to accept right now!\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:521
+#: src/conversation/gnunet-conversation.c:621
 msgid "We currently do not have an address.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:542
+#: src/conversation/gnunet-conversation.c:644
 #, c-format
 msgid "We are currently trying to locate the private key for the ego `%s'.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:547
+#: src/conversation/gnunet-conversation.c:649
 #, c-format
 msgid "We are listening for incoming calls for ego `%s' on line %u.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:553
+#: src/conversation/gnunet-conversation.c:655
+#: src/conversation/gnunet-conversation.c:679
 #, c-format
-msgid "The phone is rining. `%s' is trying to call us.\n"
+msgid "You are having a conversation with `%s'.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:559
-#, c-format
-msgid "You are having a conversation with `%s'.\n"
+#: src/conversation/gnunet-conversation.c:660
+msgid ""
+"We had an internal error setting up our phone line. You can still make "
+"calls.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:564
+#: src/conversation/gnunet-conversation.c:669
 #, 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
+#: src/conversation/gnunet-conversation.c:674
 #, 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"
+#: src/conversation/gnunet-conversation.c:693
+msgid "Calls waiting:\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:595
+#: src/conversation/gnunet-conversation.c:699
+#, fuzzy, c-format
+msgid "#%u: `%s'\n"
+msgstr "Ich bin Peer `%s'.\n"
+
+#: src/conversation/gnunet-conversation.c:727
+#: src/conversation/gnunet-conversation.c:742
+msgid "There is no call that could be suspended right now.\n"
+msgstr ""
+
+#: src/conversation/gnunet-conversation.c:775
+#: src/conversation/gnunet-conversation.c:791
+msgid "There is no call that could be resumed right now.\n"
+msgstr ""
+
+#: src/conversation/gnunet-conversation.c:798
+#, c-format
+msgid "Already talking with `%s', cannot resume a call right now.\n"
+msgstr ""
+
+#: src/conversation/gnunet-conversation.c:807
+msgid "There is no incoming call to resume here!\n"
+msgstr ""
+
+#: src/conversation/gnunet-conversation.c:824
+#, c-format
+msgid "There is no incoming call `%s' to resume right now!\n"
+msgstr ""
+
+#: src/conversation/gnunet-conversation.c:859
 msgid "There is no call that could be cancelled right now.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:626
+#: src/conversation/gnunet-conversation.c:867
+msgid "There is no incoming call to refuse here!\n"
+msgstr ""
+
+#: src/conversation/gnunet-conversation.c:884
+#, c-format
+msgid "There is no incoming call `%s' to refuse right now!\n"
+msgstr ""
+
+#: src/conversation/gnunet-conversation.c:911
 msgid "Use `/address' to find out which address this phone should have in GNS"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:628
+#: src/conversation/gnunet-conversation.c:913
 msgid "Use `/call USER.gnu' to call USER"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:630
-msgid "Use `/accept MESSAGE' to accept an incoming call"
+#: src/conversation/gnunet-conversation.c:915
+msgid "Use `/accept #NUM' to accept incoming call #NUM"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:632
-msgid "Use `/cancel MESSAGE' to reject or terminate a call"
+#: src/conversation/gnunet-conversation.c:917
+msgid "Use `/suspend' to suspend the active call"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:634
+#: src/conversation/gnunet-conversation.c:919
+msgid ""
+"Use `/resume [#NUM]' to resume a call, #NUM is needed to resume incoming "
+"calls, no argument is needed to resume the current outgoing call."
+msgstr ""
+
+#: src/conversation/gnunet-conversation.c:921
+msgid "Use `/cancel' to reject or terminate a call"
+msgstr ""
+
+#: src/conversation/gnunet-conversation.c:923
 msgid "Use `/status' to print status information"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:636
+#: src/conversation/gnunet-conversation.c:925
 #, fuzzy
 msgid "Use `/quit' to terminate gnunet-conversation"
 msgstr "Erlaubt es Clients die Konfiguration von gnunetd abzufragen"
 
-#: src/conversation/gnunet-conversation.c:638
+#: src/conversation/gnunet-conversation.c:927
 msgid "Use `/help command' to get help for a specific command"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:793
+#: src/conversation/gnunet-conversation.c:1082
 #, 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
+#: src/conversation/gnunet-conversation.c:1095
 #, fuzzy, c-format
 msgid "Our ego `%s' was deleted!\n"
 msgstr "Pseudonym `%s' wurde gelöscht.\n"
 
-#: src/conversation/gnunet-conversation.c:841
+#: src/conversation/gnunet-conversation.c:1130
 #, 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
+#: src/conversation/gnunet-conversation.c:1156
 msgid "sets the NAME of the ego to use for the phone (and name resolution)"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:870
+#: src/conversation/gnunet-conversation.c:1159
 msgid "sets the LINE to use for the phone"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:885
+#: src/conversation/gnunet-conversation.c:1174
 msgid "Enables having a conversation with other GNUnet users."
 msgstr ""
 
@@ -808,7 +862,7 @@
 
 #: 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/multicast/gnunet-multicast.c:70 src/revocation/gnunet-revocation.c:517
 #: src/template/gnunet-template.c:70
 #, fuzzy
 msgid "help text"
@@ -824,13 +878,13 @@
 msgstr ""
 
 #: src/conversation/gnunet-helper-audio-playback.c:211
-#: src/conversation/gnunet-helper-audio-record.c:363
+#: src/conversation/gnunet-helper-audio-record.c:362
 #, 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
+#: src/conversation/gnunet-helper-audio-record.c:367
 #, fuzzy, c-format
 msgid "pa_stream_new() failed: %s\n"
 msgstr "`%s' schlug fehl: %s\n"
@@ -841,36 +895,36 @@
 msgstr ""
 
 #: src/conversation/gnunet-helper-audio-playback.c:243
-#: src/conversation/gnunet-helper-audio-record.c:394
+#: src/conversation/gnunet-helper-audio-record.c:393
 #, 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
+#: src/conversation/gnunet-helper-audio-record.c:416
 msgid "Wrong Spec\n"
 msgstr ""
 
 #: src/conversation/gnunet-helper-audio-playback.c:270
-#: src/conversation/gnunet-helper-audio-record.c:423
+#: src/conversation/gnunet-helper-audio-record.c:422
 #, 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
+#: src/conversation/gnunet-helper-audio-record.c:437
 #, 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
+#: src/conversation/gnunet-helper-audio-record.c:443
 #, 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
+#: src/conversation/gnunet-helper-audio-record.c:449
 #, fuzzy
 msgid "pa_mainloop_run() failed.\n"
 msgstr "Absicherung fehlgeschlagen bei %s:%d.\n"
@@ -889,56 +943,57 @@
 msgid "Got signal, exiting.\n"
 msgstr ""
 
-#: src/conversation/gnunet-helper-audio-record.c:301
+#: src/conversation/gnunet-helper-audio-record.c:300
 #, fuzzy
 msgid "Stream successfully created.\n"
 msgstr "Zugriff verweigert für `%s' bei %s:%d.\n"
 
-#: src/conversation/gnunet-helper-audio-record.c:306
+#: src/conversation/gnunet-helper-audio-record.c:305
 #, 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
+#: src/conversation/gnunet-helper-audio-record.c:313
 #, c-format
 msgid "Buffer metrics: maxlength=%u, fragsize=%u\n"
 msgstr ""
 
-#: src/conversation/gnunet-helper-audio-record.c:318
+#: src/conversation/gnunet-helper-audio-record.c:317
 #, c-format
 msgid "Using sample spec '%s', channel map '%s'.\n"
 msgstr ""
 
-#: src/conversation/gnunet-helper-audio-record.c:325
+#: src/conversation/gnunet-helper-audio-record.c:324
 #, 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
+#: src/conversation/gnunet-helper-audio-record.c:333
 #, c-format
 msgid "Stream error: %s\n"
 msgstr ""
 
-#: src/conversation/gnunet-helper-audio-record.c:381
+#: src/conversation/gnunet-helper-audio-record.c:380
 #, 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
+#: src/conversation/gnunet-service-conversation.c:825
 msgid "Mesh audio channel not ready; audio data dropped\n"
 msgstr ""
 
-#: src/conversation/gnunet-service-conversation.c:700
+#: src/conversation/gnunet-service-conversation.c:915
 #, c-format
-msgid "No available phone for incoming call on line %u, sending BUSY signal\n"
+msgid ""
+"No available phone for incoming call on line %u, sending HANG_UP signal\n"
 msgstr ""
 
-#: src/conversation/gnunet-service-conversation.c:1054
-#, c-format
-msgid "Received incoming tunnel on port %u\n"
-msgstr ""
+#: src/conversation/gnunet-service-conversation.c:1302
+#, fuzzy, c-format
+msgid "Received incoming channel on port %u\n"
+msgstr "`%s' hat sich mit `%s' verbunden.\n"
 
 #: src/conversation/microphone.c:121
 #, fuzzy
@@ -955,7 +1010,7 @@
 msgid "Could not start playback audio helper.\n"
 msgstr "Anwendung `%s' konnte nicht initialisiert werden.\n"
 
-#: src/core/core_api.c:761
+#: src/core/core_api.c:765
 msgid "Client was disconnected from core service, trying to reconnect.\n"
 msgstr ""
 
@@ -965,28 +1020,27 @@
 msgstr "Ich bin Peer `%s'.\n"
 
 #: src/core/gnunet-core.c:110 src/core/gnunet-core.c:138
-#: src/transport/gnunet-transport.c:601 src/transport/gnunet-transport.c:625
+#: src/transport/gnunet-transport.c:609 src/transport/gnunet-transport.c:634
 #, c-format
 msgid "%24s: %-17s %4s   (%u connections in total)\n"
 msgstr ""
 
-#: src/core/gnunet-core.c:112 src/transport/gnunet-transport.c:603
+#: src/core/gnunet-core.c:112 src/transport/gnunet-transport.c:611
 #, fuzzy
 msgid "Connected to"
 msgstr "`%s' hat sich mit `%s' verbunden.\n"
 
-#: src/core/gnunet-core.c:140 src/transport/gnunet-transport.c:627
+#: src/core/gnunet-core.c:140 src/transport/gnunet-transport.c:636
 #, fuzzy
 msgid "Disconnected from"
 msgstr "`%s' hat sich mit `%s' verbunden.\n"
 
-#: src/core/gnunet-core.c:164 src/mesh/gnunet-mesh.c:174
-#: src/peerinfo-tool/gnunet-peerinfo.c:645
+#: src/core/gnunet-core.c:164 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:201 src/transport/gnunet-transport.c:999
+#: src/core/gnunet-core.c:201 src/transport/gnunet-transport.c:1028
 #, fuzzy
 msgid "provide information about all current connections (continuously)"
 msgstr "Informationen über andere GNUnet Knoten ausgeben."
@@ -1033,138 +1087,138 @@
 msgid "# key exchanges initiated"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:701
+#: src/core/gnunet-service-core_kx.c:708
 msgid "# key exchanges stopped"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:764
+#: src/core/gnunet-service-core_kx.c:771
 msgid "# old ephemeral keys ignored"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:770
+#: src/core/gnunet-service-core_kx.c:777
 #, fuzzy
 msgid "# ephemeral keys received"
 msgstr "# verschlüsselter PING Nachrichten empfangen"
 
-#: src/core/gnunet-service-core_kx.c:804
+#: src/core/gnunet-service-core_kx.c:811
 #, 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:820
+#: src/core/gnunet-service-core_kx.c:827
 #, fuzzy
 msgid "# EPHEMERAL_KEY messages decrypted"
 msgstr "# defragmentierter Nachrichten"
 
-#: src/core/gnunet-service-core_kx.c:923
-#: src/transport/gnunet-service-transport_validation.c:938
+#: src/core/gnunet-service-core_kx.c:930
+#: src/transport/gnunet-service-transport_validation.c:974
 #, fuzzy
 msgid "# PING messages received"
 msgstr "# PING Nachrichten erstellt"
 
-#: src/core/gnunet-service-core_kx.c:931
+#: src/core/gnunet-service-core_kx.c:938
 #, fuzzy
 msgid "# PING messages dropped (out of order)"
 msgstr "# gap Anfragen verworfen: Kollision in RT"
 
-#: src/core/gnunet-service-core_kx.c:958
+#: src/core/gnunet-service-core_kx.c:965
 #, 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:975
+#: src/core/gnunet-service-core_kx.c:982
 #, fuzzy
 msgid "# PONG messages created"
 msgstr "# PING Nachrichten erstellt"
 
-#: src/core/gnunet-service-core_kx.c:1001
+#: src/core/gnunet-service-core_kx.c:1008
 #, fuzzy
 msgid "# sessions terminated by timeout"
 msgstr "# Bytes verworfen von TCP (ausgehend)"
 
-#: src/core/gnunet-service-core_kx.c:1011
+#: src/core/gnunet-service-core_kx.c:1018
 #, fuzzy
 msgid "# keepalive messages sent"
 msgstr "# Klartext PING Nachrichten gesendet"
 
-#: src/core/gnunet-service-core_kx.c:1068
-#: src/transport/gnunet-service-transport_validation.c:1233
+#: src/core/gnunet-service-core_kx.c:1075
+#: src/transport/gnunet-service-transport_validation.c:1285
 #, fuzzy
 msgid "# PONG messages received"
 msgstr "# verschlüsselter PONG Nachrichten empfangen"
 
-#: src/core/gnunet-service-core_kx.c:1074
+#: src/core/gnunet-service-core_kx.c:1081
 #, fuzzy
 msgid "# PONG messages dropped (connection down)"
 msgstr "# verschlüsselter PONG Nachrichten empfangen"
 
-#: src/core/gnunet-service-core_kx.c:1079
+#: src/core/gnunet-service-core_kx.c:1086
 #, fuzzy
 msgid "# PONG messages dropped (out of order)"
 msgstr "# gap Anfragen verworfen: Kollision in RT"
 
-#: src/core/gnunet-service-core_kx.c:1109
+#: src/core/gnunet-service-core_kx.c:1116
 #, fuzzy
 msgid "# PONG messages decrypted"
 msgstr "# PING Nachrichten erstellt"
 
-#: src/core/gnunet-service-core_kx.c:1143
+#: src/core/gnunet-service-core_kx.c:1150
 #, fuzzy
 msgid "# session keys confirmed via PONG"
 msgstr "# Knotenankündigungen empfangen"
 
-#: src/core/gnunet-service-core_kx.c:1153
+#: src/core/gnunet-service-core_kx.c:1160
 #, fuzzy
 msgid "# timeouts prevented via PONG"
 msgstr "# Bytes empfangen über TCP"
 
-#: src/core/gnunet-service-core_kx.c:1160
+#: src/core/gnunet-service-core_kx.c:1167
 #, fuzzy
 msgid "# rekey operations confirmed via PONG"
 msgstr "# Knotenankündigungen empfangen"
 
-#: src/core/gnunet-service-core_kx.c:1300
+#: src/core/gnunet-service-core_kx.c:1307
 #, fuzzy
 msgid "# DATA message dropped (out of order)"
 msgstr "# Bytes verworfen von UDP (outgoing)"
 
-#: src/core/gnunet-service-core_kx.c:1307
+#: src/core/gnunet-service-core_kx.c:1314
 #, 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:1310
+#: src/core/gnunet-service-core_kx.c:1317
 #, fuzzy
 msgid "# sessions terminated by key expiration"
 msgstr "# Bytes verworfen von TCP (ausgehend)"
 
-#: src/core/gnunet-service-core_kx.c:1353
-#: src/core/gnunet-service-core_kx.c:1378
+#: src/core/gnunet-service-core_kx.c:1360
+#: src/core/gnunet-service-core_kx.c:1385
 #, fuzzy
 msgid "# bytes dropped (duplicates)"
 msgstr "# Bytes verworfen von UDP (outgoing)"
 
-#: src/core/gnunet-service-core_kx.c:1365
+#: src/core/gnunet-service-core_kx.c:1372
 #, fuzzy
 msgid "# bytes dropped (out of sequence)"
 msgstr "# Bytes verworfen von UDP (outgoing)"
 
-#: src/core/gnunet-service-core_kx.c:1406
+#: src/core/gnunet-service-core_kx.c:1413
 #, fuzzy
 msgid "# bytes dropped (ancient message)"
 msgstr "# Bytes verworfen von UDP (outgoing)"
 
-#: src/core/gnunet-service-core_kx.c:1414
+#: src/core/gnunet-service-core_kx.c:1421
 #, fuzzy
 msgid "# bytes of payload decrypted"
 msgstr "# Bytes entschlüsselt"
 
-#: src/core/gnunet-service-core_kx.c:1445
+#: src/core/gnunet-service-core_kx.c:1452
 #, fuzzy
 msgid "# PAYLOAD dropped (out of order)"
 msgstr "# Bytes verworfen von UDP (outgoing)"
@@ -1192,14 +1246,16 @@
 #: 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/dht/gnunet-service-xdht_neighbours.c:662
+#: src/dht/gnunet-service-xdht_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:3052
+#: src/transport/gnunet-service-transport_neighbours.c:1123
+#: src/transport/gnunet-service-transport_neighbours.c:1132
+#: src/transport/gnunet-service-transport_neighbours.c:2860
+#: src/transport/gnunet-service-transport_neighbours.c:3129
 #, fuzzy
 msgid "# peers connected"
 msgstr "# verbundener Knoten"
@@ -1280,7 +1336,7 @@
 #: src/namecache/plugin_namecache_sqlite.c:52
 #: src/namestore/plugin_namestore_postgres.c:52
 #: src/namestore/plugin_namestore_sqlite.c:52
-#: src/testbed/testbed_api_hosts.c:69 src/util/crypto_ecc.c:53
+#: src/testbed/testbed_api_hosts.c:69 src/util/crypto_ecc.c:51
 #: src/include/gnunet_common.h:602 src/include/gnunet_common.h:611
 #: src/scalarproduct/scalarproduct.h:61
 #, c-format
@@ -1312,104 +1368,104 @@
 msgid "Failed to transmit request to drop database.\n"
 msgstr "Fehler beim Senden einer `%s' Anfrage an den SMTP Server.\n"
 
-#: src/datastore/datastore_api.c:393
+#: src/datastore/datastore_api.c:394
 msgid "# queue entry timeouts"
 msgstr ""
 
-#: src/datastore/datastore_api.c:437
+#: src/datastore/datastore_api.c:443
 msgid "# queue overflows"
 msgstr ""
 
-#: src/datastore/datastore_api.c:465
+#: src/datastore/datastore_api.c:471
 #, fuzzy
 msgid "# queue entries created"
 msgstr "# dht Anfragen weitergeleitet"
 
-#: src/datastore/datastore_api.c:483
+#: src/datastore/datastore_api.c:491
 #, fuzzy
 msgid "# Requests dropped from datastore queue"
 msgstr "# gap Anfragen verworfen: Kollision in RT"
 
-#: src/datastore/datastore_api.c:525
+#: src/datastore/datastore_api.c:533
 msgid "# datastore connections (re)created"
 msgstr ""
 
-#: src/datastore/datastore_api.c:608 src/scalarproduct/scalarproduct_api.c:279
+#: src/datastore/datastore_api.c:616 src/scalarproduct/scalarproduct_api.c:279
 #, fuzzy
 msgid "# transmission request failures"
 msgstr "# Klartext PONG Nachrichten empfangen"
 
-#: src/datastore/datastore_api.c:630
+#: src/datastore/datastore_api.c:638
 #, fuzzy
 msgid "# bytes sent to datastore"
 msgstr "# bytes in der Datenbank"
 
-#: src/datastore/datastore_api.c:762
+#: src/datastore/datastore_api.c:770
 #, fuzzy
 msgid "Failed to receive status response from database."
 msgstr ""
 "\n"
 "Fehler beim Empfangen der Antwort von gnunetd.\n"
 
-#: src/datastore/datastore_api.c:776
+#: src/datastore/datastore_api.c:784
 msgid "Error reading response from datastore service"
 msgstr ""
 
-#: src/datastore/datastore_api.c:788 src/datastore/datastore_api.c:794
+#: src/datastore/datastore_api.c:796 src/datastore/datastore_api.c:802
 #, fuzzy
 msgid "Invalid error message received from datastore service"
 msgstr "Ungültige `%s' Nachricht von Knoten `%s' empfangen.\n"
 
-#: src/datastore/datastore_api.c:798
+#: src/datastore/datastore_api.c:806
 #, fuzzy
 msgid "# status messages received"
 msgstr "# verschlüsselter PING Nachrichten empfangen"
 
-#: src/datastore/datastore_api.c:868
+#: src/datastore/datastore_api.c:876
 #, fuzzy
 msgid "# PUT requests executed"
 msgstr "# dht Anfragen weitergeleitet"
 
-#: src/datastore/datastore_api.c:935
+#: src/datastore/datastore_api.c:944
 #, fuzzy
 msgid "# RESERVE requests executed"
 msgstr "# dht Anfragen weitergeleitet"
 
-#: src/datastore/datastore_api.c:996
+#: src/datastore/datastore_api.c:1005
 msgid "# RELEASE RESERVE requests executed"
 msgstr ""
 
-#: src/datastore/datastore_api.c:1055
+#: src/datastore/datastore_api.c:1065
 #, fuzzy
 msgid "# UPDATE requests executed"
 msgstr "# dht Anfragen weitergeleitet"
 
-#: src/datastore/datastore_api.c:1119
+#: src/datastore/datastore_api.c:1129
 #, fuzzy
 msgid "# REMOVE requests executed"
 msgstr "# dht Anfragen weitergeleitet"
 
-#: src/datastore/datastore_api.c:1164
+#: src/datastore/datastore_api.c:1174
 #, fuzzy
 msgid "Failed to receive response from database.\n"
 msgstr ""
 "\n"
 "Fehler beim Empfangen der Antwort von gnunetd.\n"
 
-#: src/datastore/datastore_api.c:1223
+#: src/datastore/datastore_api.c:1233
 #, fuzzy
 msgid "# Results received"
 msgstr "# Bytes empfangen über TCP"
 
-#: src/datastore/datastore_api.c:1290
+#: src/datastore/datastore_api.c:1300
 msgid "# GET REPLICATION requests executed"
 msgstr ""
 
-#: src/datastore/datastore_api.c:1353
+#: src/datastore/datastore_api.c:1363
 msgid "# GET ZERO ANONYMITY requests executed"
 msgstr ""
 
-#: src/datastore/datastore_api.c:1414
+#: src/datastore/datastore_api.c:1424
 #, fuzzy
 msgid "# GET requests executed"
 msgstr "# dht Anfragen weitergeleitet"
@@ -1446,12 +1502,12 @@
 msgstr ""
 
 #: src/datastore/gnunet-service-datastore.c:483
-#: src/gns/gnunet-gns-helper-service-w32.c:155
+#: src/gns/gnunet-gns-helper-service-w32.c:187
 msgid "Transmission to client failed!\n"
 msgstr ""
 
 #: src/datastore/gnunet-service-datastore.c:514
-#: src/gns/gnunet-gns-helper-service-w32.c:183
+#: src/gns/gnunet-gns-helper-service-w32.c:215
 msgid "Shutdown in progress, aborting transmission.\n"
 msgstr ""
 
@@ -1779,149 +1835,182 @@
 msgid "Issue a PUT request to the GNUnet DHT insert DATA under KEY."
 msgstr ""
 
-#: src/dht/gnunet-service-dht.c:172
+#: src/dht/gnunet-service-dht.c:172 src/dht/gnunet-service-xdht.c:172
 #, fuzzy
 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:417
+#: src/dht/gnunet-service-xdht_clients.c:417
 #, fuzzy
 msgid "# GET requests from clients injected"
 msgstr "# Client Trace-Anfragen empfangen"
 
 #: src/dht/gnunet-service-dht_clients.c:511
+#: src/dht/gnunet-service-xdht_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:595
+#: src/dht/gnunet-service-xdht_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:796
+#: src/dht/gnunet-service-xdht_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:1037
+#: src/dht/gnunet-service-xdht_clients.c:1037
 msgid "# Key match, type mismatches in REPLY to CLIENT"
 msgstr ""
 
 #: src/dht/gnunet-service-dht_clients.c:1050
+#: src/dht/gnunet-service-xdht_clients.c:1050
 msgid "# Duplicate REPLIES to CLIENT request dropped"
 msgstr ""
 
 #: src/dht/gnunet-service-dht_clients.c:1087
+#: src/dht/gnunet-service-xdht_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:1110
+#: src/dht/gnunet-service-xdht_clients.c:1110
 #, fuzzy
 msgid "# RESULTS queued for clients"
 msgstr "Empfangene Client-Nachricht ist ungültig.\n"
 
 #: src/dht/gnunet-service-dht_clients.c:1164
 #: src/dht/gnunet-service-dht_clients.c:1206
+#: src/dht/gnunet-service-xdht_clients.c:1164
+#: src/dht/gnunet-service-xdht_clients.c:1206
 msgid "# REPLIES ignored for CLIENTS (no match)"
 msgstr ""
 
 #: src/dht/gnunet-service-dht_clients.c:1174
+#: src/dht/gnunet-service-xdht_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"
 
 #: src/dht/gnunet-service-dht_datacache.c:68
+#: src/dht/gnunet-service-xdht_datacache.c:68
 #, fuzzy, c-format
 msgid "%s request received, but have no datacache!\n"
 msgstr "# Bytes empfangen über TCP"
 
 #: src/dht/gnunet-service-dht_datacache.c:78
+#: src/dht/gnunet-service-xdht_datacache.c:78
 msgid "# ITEMS stored in datacache"
 msgstr ""
 
 #: src/dht/gnunet-service-dht_datacache.c:165
+#: src/dht/gnunet-service-xdht_datacache.c:165
 msgid "# Good RESULTS found in datacache"
 msgstr ""
 
 #: src/dht/gnunet-service-dht_datacache.c:176
+#: src/dht/gnunet-service-xdht_datacache.c:176
 msgid "# Duplicate RESULTS found in datacache"
 msgstr ""
 
 #: src/dht/gnunet-service-dht_datacache.c:182
+#: src/dht/gnunet-service-xdht_datacache.c:182
 msgid "# Invalid RESULTS found in datacache"
 msgstr ""
 
 #: src/dht/gnunet-service-dht_datacache.c:188
+#: src/dht/gnunet-service-xdht_datacache.c:188
 msgid "# Irrelevant RESULTS found in datacache"
 msgstr ""
 
 #: src/dht/gnunet-service-dht_datacache.c:200
+#: src/dht/gnunet-service-xdht_datacache.c:200
 msgid "# Unsupported RESULTS found in datacache"
 msgstr ""
 
 #: src/dht/gnunet-service-dht_datacache.c:203
+#: src/dht/gnunet-service-xdht_datacache.c:203
 #, c-format
 msgid "Unsupported block type (%u) in local response!\n"
 msgstr ""
 
 #: src/dht/gnunet-service-dht_datacache.c:234
+#: src/dht/gnunet-service-xdht_datacache.c:234
 #, fuzzy
 msgid "# GET requests given to datacache"
 msgstr "# Client Trace-Anfragen empfangen"
 
 #: src/dht/gnunet-service-dht_hello.c:82
+#: src/dht/gnunet-service-xdht_hello.c:82
 #, fuzzy
 msgid "# HELLOs obtained from peerinfo"
 msgstr "Empfangene Client-Nachricht ist ungültig.\n"
 
 #: src/dht/gnunet-service-dht_neighbours.c:516
+#: src/dht/gnunet-service-xdht_neighbours.c:516
 msgid "# Preference updates given to core"
 msgstr ""
 
 #: src/dht/gnunet-service-dht_neighbours.c:610
+#: src/dht/gnunet-service-xdht_neighbours.c:610
 #, fuzzy
 msgid "# FIND PEER messages initiated"
 msgstr "# PING Nachrichten erstellt"
 
 #: src/dht/gnunet-service-dht_neighbours.c:764
+#: src/dht/gnunet-service-xdht_neighbours.c:764
 #, fuzzy
 msgid "# Queued messages discarded (peer disconnected)"
 msgstr "# defragmentierter Nachrichten"
 
 #: src/dht/gnunet-service-dht_neighbours.c:819
+#: src/dht/gnunet-service-xdht_neighbours.c:819
 #, fuzzy
 msgid "# Bytes transmitted to other peers"
 msgstr "# Bytes des Typs %d übertragen"
 
 #: src/dht/gnunet-service-dht_neighbours.c:857
+#: src/dht/gnunet-service-xdht_neighbours.c:857
 #, fuzzy
 msgid "# Bytes of bandwidth requested from core"
 msgstr "# Client Trace-Anfragen empfangen"
 
 #: src/dht/gnunet-service-dht_neighbours.c:889
+#: src/dht/gnunet-service-xdht_neighbours.c:889
 #, fuzzy
 msgid "# requests TTL-dropped"
 msgstr "# Client Trace-Anfragen empfangen"
 
 #: src/dht/gnunet-service-dht_neighbours.c:1093
 #: src/dht/gnunet-service-dht_neighbours.c:1130
+#: src/dht/gnunet-service-xdht_neighbours.c:1093
+#: src/dht/gnunet-service-xdht_neighbours.c:1130
 msgid "# Peers excluded from routing due to Bloomfilter"
 msgstr ""
 
 #: src/dht/gnunet-service-dht_neighbours.c:1108
 #: src/dht/gnunet-service-dht_neighbours.c:1145
+#: src/dht/gnunet-service-xdht_neighbours.c:1108
+#: src/dht/gnunet-service-xdht_neighbours.c:1145
 #, fuzzy
 msgid "# Peer selection failed"
 msgstr " Verbindung fehlgeschlagen\n"
 
 #: src/dht/gnunet-service-dht_neighbours.c:1287
+#: src/dht/gnunet-service-xdht_neighbours.c:1287
 #, fuzzy
 msgid "# PUT requests routed"
 msgstr "# dht Anfragen weitergeleitet"
 
 #: src/dht/gnunet-service-dht_neighbours.c:1316
+#: src/dht/gnunet-service-xdht_neighbours.c:1316
 #, fuzzy
 msgid "# PUT messages queued for transmission"
 msgstr "# PING Nachrichten erstellt"
@@ -1929,107 +2018,131 @@
 #: src/dht/gnunet-service-dht_neighbours.c:1323
 #: src/dht/gnunet-service-dht_neighbours.c:1440
 #: src/dht/gnunet-service-dht_neighbours.c:1543
+#: src/dht/gnunet-service-xdht_neighbours.c:1323
+#: src/dht/gnunet-service-xdht_neighbours.c:1440
+#: src/dht/gnunet-service-xdht_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:1405
+#: src/dht/gnunet-service-xdht_neighbours.c:1405
 #, fuzzy
 msgid "# GET requests routed"
 msgstr "# dht Anfragen weitergeleitet"
 
 #: src/dht/gnunet-service-dht_neighbours.c:1432
+#: src/dht/gnunet-service-xdht_neighbours.c:1432
 #, fuzzy
 msgid "# GET messages queued for transmission"
 msgstr "# PING Nachrichten erstellt"
 
 #: src/dht/gnunet-service-dht_neighbours.c:1550
+#: src/dht/gnunet-service-xdht_neighbours.c:1550
 #, fuzzy
 msgid "# RESULT messages queued for transmission"
 msgstr "# PING Nachrichten erstellt"
 
 #: src/dht/gnunet-service-dht_neighbours.c:1637
+#: src/dht/gnunet-service-xdht_neighbours.c:1637
 #, fuzzy
 msgid "# P2P PUT requests received"
 msgstr "# Client Trace-Anfragen empfangen"
 
 #: src/dht/gnunet-service-dht_neighbours.c:1640
+#: src/dht/gnunet-service-xdht_neighbours.c:1640
 #, fuzzy
 msgid "# P2P PUT bytes received"
 msgstr "# Client Trace-Anfragen empfangen"
 
 #: src/dht/gnunet-service-dht_neighbours.c:1803
+#: src/dht/gnunet-service-xdht_neighbours.c:1803
 msgid "# FIND PEER requests ignored due to Bloomfilter"
 msgstr ""
 
 #: src/dht/gnunet-service-dht_neighbours.c:1811
+#: src/dht/gnunet-service-xdht_neighbours.c:1811
 msgid "# FIND PEER requests ignored due to lack of HELLO"
 msgstr ""
 
 #: src/dht/gnunet-service-dht_neighbours.c:1904
+#: src/dht/gnunet-service-xdht_neighbours.c:1904
 #, fuzzy
 msgid "# P2P GET requests received"
 msgstr "# Client Trace-Anfragen empfangen"
 
 #: src/dht/gnunet-service-dht_neighbours.c:1907
+#: src/dht/gnunet-service-xdht_neighbours.c:1907
 #, fuzzy
 msgid "# P2P GET bytes received"
 msgstr "# Client Trace-Anfragen empfangen"
 
 #: src/dht/gnunet-service-dht_neighbours.c:1961
+#: src/dht/gnunet-service-xdht_neighbours.c:1961
 #, fuzzy
 msgid "# P2P FIND PEER requests processed"
 msgstr "# Client Trace-Anfragen empfangen"
 
 #: src/dht/gnunet-service-dht_neighbours.c:1975
+#: src/dht/gnunet-service-xdht_neighbours.c:1975
 #, fuzzy
 msgid "# P2P GET requests ONLY routed"
 msgstr "# dht Anfragen weitergeleitet"
 
 #: src/dht/gnunet-service-dht_neighbours.c:2052
+#: src/dht/gnunet-service-xdht_neighbours.c:2052
 #, fuzzy
 msgid "# P2P RESULTS received"
 msgstr "# Bytes empfangen über TCP"
 
 #: src/dht/gnunet-service-dht_neighbours.c:2055
+#: src/dht/gnunet-service-xdht_neighbours.c:2055
 #, fuzzy
 msgid "# P2P RESULT bytes received"
 msgstr "# Bytes empfangen über TCP"
 
-#: src/dht/gnunet-service-dht_nse.c:59
+#: src/dht/gnunet-service-dht_nse.c:59 src/dht/gnunet-service-xdht_nse.c:59
 #, fuzzy
 msgid "# Network size estimates received"
 msgstr "# Client Trace-Anfragen empfangen"
 
 #: src/dht/gnunet-service-dht_routing.c:211
+#: src/dht/gnunet-service-xdht_routing.c:211
 msgid "# Good REPLIES matched against routing table"
 msgstr ""
 
 #: src/dht/gnunet-service-dht_routing.c:220
+#: src/dht/gnunet-service-xdht_routing.c:220
 msgid "# Duplicate REPLIES matched against routing table"
 msgstr ""
 
 #: src/dht/gnunet-service-dht_routing.c:226
+#: src/dht/gnunet-service-xdht_routing.c:226
 msgid "# Invalid REPLIES matched against routing table"
 msgstr ""
 
 #: src/dht/gnunet-service-dht_routing.c:232
+#: src/dht/gnunet-service-xdht_routing.c:232
 msgid "# Irrelevant REPLIES matched against routing table"
 msgstr ""
 
 #: src/dht/gnunet-service-dht_routing.c:244
+#: src/dht/gnunet-service-xdht_routing.c:244
 msgid "# Unsupported REPLIES matched against routing table"
 msgstr ""
 
 #: src/dht/gnunet-service-dht_routing.c:317
+#: src/dht/gnunet-service-xdht_routing.c:317
 msgid "# Entries removed from routing table"
 msgstr ""
 
 #: src/dht/gnunet-service-dht_routing.c:399
+#: src/dht/gnunet-service-xdht_routing.c:399
 msgid "# Entries added to routing table"
 msgstr ""
 
 #: src/dht/gnunet-service-dht_routing.c:417
+#: src/dht/gnunet-service-xdht_routing.c:417
 #, fuzzy
 msgid "# DHT requests combined"
 msgstr "# Client Trace-Anfragen empfangen"
@@ -2048,12 +2161,12 @@
 msgid "Block of type %u is malformed\n"
 msgstr ""
 
-#: src/dns/dnsparser.c:239
+#: src/dns/dnsparser.c:257
 #, 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:800
+#: src/dns/dnsparser.c:856
 #, fuzzy, c-format
 msgid "Failed to convert UTF-8 name `%s' to DNS IDNA format: %s\n"
 msgstr "Datei wurde als `%s' gespeichert.\n"
@@ -2145,21 +2258,21 @@
 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:3498
+#: src/dns/gnunet-service-dns.c:1049 src/exit/gnunet-daemon-exit.c:3499
 #, 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:3555
+#: src/dns/gnunet-service-dns.c:1069 src/exit/gnunet-daemon-exit.c:3556
 #, fuzzy
 msgid "need a valid IPv4 or IPv6 address\n"
 msgstr "Ungültiger Parameter: `%s'\n"
 
-#: src/dv/gnunet-dv.c:165
+#: src/dv/gnunet-dv.c:166
 msgid "verbose output"
 msgstr ""
 
-#: src/dv/gnunet-dv.c:174
+#: src/dv/gnunet-dv.c:175
 #, fuzzy
 msgid "Print information about DV state"
 msgstr "Informationen über andere GNUnet Knoten ausgeben."
@@ -2171,18 +2284,18 @@
 
 #: src/exit/gnunet-daemon-exit.c:853
 #, fuzzy
-msgid "# Bytes transmitted via mesh tunnels"
+msgid "# Bytes transmitted via mesh channels"
 msgstr "# Bytes des Typs %d übertragen"
 
 #: 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
+#: src/exit/gnunet-daemon-exit.c:2651 src/vpn/gnunet-service-vpn.c:1407
+#: src/vpn/gnunet-service-vpn.c:1797 src/vpn/gnunet-service-vpn.c:1960
 msgid "# ICMPv4 packets dropped (type not allowed)"
 msgstr ""
 
 #: 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
+#: src/exit/gnunet-daemon-exit.c:2710 src/vpn/gnunet-service-vpn.c:1463
+#: src/vpn/gnunet-service-vpn.c:1856 src/vpn/gnunet-service-vpn.c:1993
 msgid "# ICMPv6 packets dropped (type not allowed)"
 msgstr ""
 
@@ -2289,13 +2402,13 @@
 msgid "# ICMP service requests received via mesh"
 msgstr "Empfangene Client-Nachricht ist ungültig.\n"
 
-#: src/exit/gnunet-daemon-exit.c:2636 src/vpn/gnunet-service-vpn.c:1399
-#: src/vpn/gnunet-service-vpn.c:1956
+#: src/exit/gnunet-daemon-exit.c:2636 src/vpn/gnunet-service-vpn.c:1397
+#: src/vpn/gnunet-service-vpn.c:1954
 msgid "# ICMPv4 packets dropped (impossible PT to v6)"
 msgstr ""
 
-#: 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
+#: src/exit/gnunet-daemon-exit.c:2695 src/vpn/gnunet-service-vpn.c:1433
+#: src/vpn/gnunet-service-vpn.c:1445 src/vpn/gnunet-service-vpn.c:1844
 msgid "# ICMPv6 packets dropped (impossible PT to v4)"
 msgstr ""
 
@@ -2319,58 +2432,59 @@
 msgid "# UDP requests dropped (no such service)"
 msgstr "# gap Anfragen verworfen: Kollision in RT"
 
-#: src/exit/gnunet-daemon-exit.c:3024
-msgid "# Inbound MESH tunnels created"
-msgstr ""
+#: src/exit/gnunet-daemon-exit.c:3025
+#, fuzzy
+msgid "# Inbound MESH channels created"
+msgstr "# dht Anfragen weitergeleitet"
 
-#: src/exit/gnunet-daemon-exit.c:3285
+#: src/exit/gnunet-daemon-exit.c:3286
 #, c-format
 msgid "No addresses found for hostname `%s' of service `%s'!\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3299 src/exit/gnunet-daemon-exit.c:3311
+#: src/exit/gnunet-daemon-exit.c:3300 src/exit/gnunet-daemon-exit.c:3312
 #, c-format
 msgid "Service `%s' configured for IPv4, but IPv4 is disabled!\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3322
+#: src/exit/gnunet-daemon-exit.c:3323
 #, c-format
 msgid "No IP addresses found for hostname `%s' of service `%s'!\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3511
+#: src/exit/gnunet-daemon-exit.c:3512
 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:3519
+#: src/exit/gnunet-daemon-exit.c:3520
 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:3526
+#: src/exit/gnunet-daemon-exit.c:3527
 msgid ""
 "Cannot enable IPv4 exit but disable IPv4 on TUN interface, will use "
 "ENABLE_IPv4=YES\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3532
+#: src/exit/gnunet-daemon-exit.c:3533
 msgid ""
 "Cannot enable IPv6 exit but disable IPv6 on TUN interface, will use "
 "ENABLE_IPv6=YES\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3538 src/pt/gnunet-daemon-pt.c:1248
+#: src/exit/gnunet-daemon-exit.c:3539 src/pt/gnunet-daemon-pt.c:1247
 msgid "No useful service enabled.  Exiting.\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3654
+#: src/exit/gnunet-daemon-exit.c:3655
 msgid "Must be a number"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3796
+#: src/exit/gnunet-daemon-exit.c:3797
 msgid "Daemon to run to provide an IP exit node for the VPN"
 msgstr ""
 
@@ -2600,7 +2714,7 @@
 msgid "Failed to resume unindexing operation `%s': %s\n"
 msgstr "Datei wurde als `%s' gespeichert.\n"
 
-#: src/fs/fs_api.c:2376 src/fs/fs_api.c:2616
+#: src/fs/fs_api.c:2376 src/fs/fs_api.c:2617
 #, fuzzy, c-format
 msgid "Failed to resume sub-download `%s': %s\n"
 msgstr "Datei wurde als `%s' gespeichert.\n"
@@ -2610,21 +2724,21 @@
 msgid "Failed to resume sub-search `%s': %s\n"
 msgstr "Datei wurde als `%s' gespeichert.\n"
 
-#: src/fs/fs_api.c:2406 src/fs/fs_api.c:2425 src/fs/fs_api.c:2908
+#: src/fs/fs_api.c:2407 src/fs/fs_api.c:2426 src/fs/fs_api.c:2909
 #, c-format
 msgid "Failure while resuming search operation `%s': %s\n"
 msgstr ""
 
-#: src/fs/fs_api.c:2607
+#: src/fs/fs_api.c:2608
 #, c-format
 msgid "Failed to resume sub-download `%s': could not open file `%s'\n"
 msgstr ""
 
-#: src/fs/fs_api.c:2852
+#: src/fs/fs_api.c:2853
 msgid "Could not resume running search, will resume as paused search\n"
 msgstr ""
 
-#: src/fs/fs_api.c:2946
+#: src/fs/fs_api.c:2947
 #, c-format
 msgid "Failure while resuming download operation `%s': %s\n"
 msgstr ""
@@ -3287,7 +3401,7 @@
 msgstr "Option `%s' macht keinen Sinn ohne die Option `%s'.\n"
 
 #: src/fs/gnunet-publish.c:778 src/fs/gnunet-publish.c:785
-#: src/transport/gnunet-transport.c:840 src/transport/gnunet-transport.c:870
+#: src/transport/gnunet-transport.c:865 src/transport/gnunet-transport.c:899
 #, c-format
 msgid "Option `%s' makes no sense without option `%s'.\n"
 msgstr "Option `%s' macht keinen Sinn ohne die Option `%s'.\n"
@@ -3404,7 +3518,7 @@
 msgid "# Loopback routes suppressed"
 msgstr "# gap Routing erfolgreich (insgesamt)"
 
-#: src/fs/gnunet-service-fs.c:639 src/hostlist/gnunet-daemon-hostlist.c:293
+#: src/fs/gnunet-service-fs.c:639 src/hostlist/gnunet-daemon-hostlist.c:288
 #: src/topology/gnunet-daemon-topology.c:1253
 #: src/topology/gnunet-daemon-topology.c:1260
 #, fuzzy, c-format
@@ -3479,7 +3593,7 @@
 msgid "# requests dropped due to initiator not being connected"
 msgstr "# gap Anfragen verworfen: Kollision in RT"
 
-#: src/fs/gnunet-service-fs_cp.c:1194
+#: src/fs/gnunet-service-fs_cp.c:1193
 #, fuzzy
 msgid "# requests dropped due to missing reverse route"
 msgstr "# gap Anfragen verworfen: Kollision in RT"
@@ -3551,7 +3665,7 @@
 msgid "Indexed file `%s' changed at offset %llu\n"
 msgstr "Indizierung der Daten schlug an Position %i fehl.\n"
 
-#: src/fs/gnunet-service-fs_lc.c:202 src/fs/gnunet-service-fs_lc.c:369
+#: src/fs/gnunet-service-fs_lc.c:202 src/fs/gnunet-service-fs_lc.c:368
 #, fuzzy
 msgid "# client searches active"
 msgstr "# gap Anfragen insgesamt empfangen"
@@ -3561,42 +3675,47 @@
 msgid "# replies received for local clients"
 msgstr "# gap Anfragen insgesamt empfangen"
 
-#: src/fs/gnunet-service-fs_lc.c:328
+#: src/fs/gnunet-service-fs_lc.c:327
 #, fuzzy
 msgid "# client searches received"
 msgstr "# gap Anfragen insgesamt empfangen"
 
-#: src/fs/gnunet-service-fs_lc.c:363
+#: src/fs/gnunet-service-fs_lc.c:362
 msgid "# client searches updated (merged content seen list)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_mesh_client.c:475
+#: src/fs/gnunet-service-fs_mesh_client.c:484
 #, fuzzy
 msgid "# replies received via mesh"
 msgstr "# Bytes empfangen über TCP"
 
-#: src/fs/gnunet-service-fs_mesh_client.c:489
+#: src/fs/gnunet-service-fs_mesh_client.c:498
 #, fuzzy
 msgid "# replies received via mesh dropped"
 msgstr "# Bytes empfangen über TCP"
 
-#: src/fs/gnunet-service-fs_mesh_server.c:259
+#: src/fs/gnunet-service-fs_mesh_server.c:260
 #, fuzzy
 msgid "# Blocks transferred via mesh"
 msgstr "# Bytes des Typs %d übertragen"
 
-#: src/fs/gnunet-service-fs_mesh_server.c:412
+#: src/fs/gnunet-service-fs_mesh_server.c:352
 #, fuzzy
+msgid "# queries received via mesh not answered"
+msgstr "# Bytes empfangen über TCP"
+
+#: src/fs/gnunet-service-fs_mesh_server.c:432
+#, fuzzy
 msgid "# queries received via mesh"
 msgstr "# Bytes empfangen über TCP"
 
-#: src/fs/gnunet-service-fs_mesh_server.c:455
+#: src/fs/gnunet-service-fs_mesh_server.c:476
 #, fuzzy
 msgid "# mesh client connections rejected"
 msgstr "GNUnet Konfiguration"
 
-#: src/fs/gnunet-service-fs_mesh_server.c:461
-#: src/fs/gnunet-service-fs_mesh_server.c:501
+#: src/fs/gnunet-service-fs_mesh_server.c:482
+#: src/fs/gnunet-service-fs_mesh_server.c:522
 #, fuzzy
 msgid "# mesh connections active"
 msgstr "# verbundener Knoten"
@@ -3634,8 +3753,8 @@
 msgid "# requests refreshed"
 msgstr "# Client Trace-Anfragen empfangen"
 
-#: src/fs/gnunet-service-fs_pe.c:614 src/fs/gnunet-service-fs_pe.c:698
-#: src/fs/gnunet-service-fs_pe.c:769
+#: src/fs/gnunet-service-fs_pe.c:616 src/fs/gnunet-service-fs_pe.c:700
+#: src/fs/gnunet-service-fs_pe.c:771
 msgid "# query plan entries"
 msgstr ""
 
@@ -3649,103 +3768,103 @@
 msgid "# Pending requests active"
 msgstr "# Client Trace-Anfragen empfangen"
 
-#: src/fs/gnunet-service-fs_pr.c:813
+#: src/fs/gnunet-service-fs_pr.c:814
 #, fuzzy
 msgid "# replies received and matched"
 msgstr "# Bytes empfangen über TCP"
 
-#: src/fs/gnunet-service-fs_pr.c:843
+#: src/fs/gnunet-service-fs_pr.c:844
 msgid "# duplicate replies discarded (bloomfilter)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:852
+#: src/fs/gnunet-service-fs_pr.c:853
 msgid "# irrelevant replies discarded"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:866
+#: src/fs/gnunet-service-fs_pr.c:867
 #, c-format
 msgid "Unsupported block type %u\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:879
+#: src/fs/gnunet-service-fs_pr.c:880
 msgid "# results found locally"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1000
+#: src/fs/gnunet-service-fs_pr.c:1001
 msgid "# Datastore `PUT' failures"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1027
+#: src/fs/gnunet-service-fs_pr.c:1029
 #, fuzzy
 msgid "# storage requests dropped due to high load"
 msgstr "# gap Anfragen verworfen: Kollision in RT"
 
-#: src/fs/gnunet-service-fs_pr.c:1062
+#: src/fs/gnunet-service-fs_pr.c:1064
 #, fuzzy
 msgid "# Replies received from DHT"
 msgstr "# Bytes empfangen über HTTP"
 
-#: src/fs/gnunet-service-fs_pr.c:1190
+#: src/fs/gnunet-service-fs_pr.c:1192
 #, fuzzy
 msgid "# Replies received from MESH"
 msgstr "# Bytes empfangen über HTTP"
 
-#: src/fs/gnunet-service-fs_pr.c:1242
+#: src/fs/gnunet-service-fs_pr.c:1244
 #, c-format
 msgid "Datastore lookup already took %s!\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1262
+#: src/fs/gnunet-service-fs_pr.c:1264
 #, c-format
 msgid "On-demand lookup already took %s!\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1309
+#: src/fs/gnunet-service-fs_pr.c:1311
 msgid "# Datastore lookups concluded (no results)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1324
+#: src/fs/gnunet-service-fs_pr.c:1326
 msgid "# Datastore lookups concluded (seen all)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1333
+#: src/fs/gnunet-service-fs_pr.c:1335
 msgid "# Datastore lookups aborted (more than MAX_RESULTS)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1348
+#: src/fs/gnunet-service-fs_pr.c:1350
 msgid "# requested DBLOCK or IBLOCK not found"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1362
+#: src/fs/gnunet-service-fs_pr.c:1364
 msgid "# on-demand blocks matched requests"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1375
+#: src/fs/gnunet-service-fs_pr.c:1377
 msgid "# on-demand lookups performed successfully"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1380
+#: src/fs/gnunet-service-fs_pr.c:1382
 msgid "# on-demand lookups failed"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1407 src/fs/gnunet-service-fs_pr.c:1447
-#: src/fs/gnunet-service-fs_pr.c:1588
+#: src/fs/gnunet-service-fs_pr.c:1409 src/fs/gnunet-service-fs_pr.c:1449
+#: src/fs/gnunet-service-fs_pr.c:1590
 msgid "# Datastore lookups concluded (error queueing)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1465
+#: src/fs/gnunet-service-fs_pr.c:1467
 msgid "# Datastore lookups concluded (found last result)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1476
+#: src/fs/gnunet-service-fs_pr.c:1478
 msgid "# Datastore lookups concluded (load too high)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1564
+#: src/fs/gnunet-service-fs_pr.c:1566
 msgid "# Datastore lookups initiated"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1649
+#: src/fs/gnunet-service-fs_pr.c:1651
 #, fuzzy
 msgid "# GAP PUT messages received"
 msgstr "# verschlüsselter PONG Nachrichten empfangen"
@@ -3790,6 +3909,34 @@
 msgid "Failed to serialize lookup reply from GNS service!\n"
 msgstr "Fehler beim Empfangen der Antwort von gnunetd auf die `%s' Nachricht\n"
 
+#: src/gns/gnunet-bcd.c:123
+#, fuzzy, c-format
+msgid "Refusing `%s' request to HTTP server\n"
+msgstr "Fehler beim Senden einer `%s' Anfrage an den SMTP Server.\n"
+
+#: src/gns/gnunet-bcd.c:355 src/hostlist/hostlist-server.c:566
+#, fuzzy, c-format
+msgid "Invalid port number %llu.  Exiting.\n"
+msgstr "Ungültige Parameter. Abbruch.\n"
+
+#: src/gns/gnunet-bcd.c:360
+#, c-format
+msgid "Businesscard HTTP server starts on %llu\n"
+msgstr ""
+
+#: src/gns/gnunet-bcd.c:374
+#, fuzzy, c-format
+msgid "Could not start businesscard HTTP server on port %u\n"
+msgstr "Der Transportdienst auf Port %d konnte nicht gestartet werden.\n"
+
+#: src/gns/gnunet-bcd.c:519
+msgid "Run HTTP serve on port PORT (default is 8888)"
+msgstr ""
+
+#: src/gns/gnunet-bcd.c:531
+msgid "GNUnet HTTP server to create business cards"
+msgstr ""
+
 #: src/gns/gnunet-dns2gns.c:228
 #, fuzzy
 msgid "Failed to pack DNS response into UDP packet!\n"
@@ -3853,189 +4000,206 @@
 msgid "Please specify name to lookup!\n"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:297
+#: src/gns/gnunet-gns.c:298
 #, c-format
 msgid "Ego for `%s' not found, cannot perform lookup.\n"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:335
+#: src/gns/gnunet-gns.c:336 src/gns/gnunet-gns-helper-service-w32.c:753
 #, c-format
 msgid ""
-"Ego for `master-zone' not found, cannot perform lookup.  Did you run gnunet-"
+"Ego for `gns-master' not found, cannot perform lookup.  Did you run gnunet-"
 "gns-import.sh?\n"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:364
+#: src/gns/gnunet-gns.c:365 src/gns/gnunet-gns-helper-service-w32.c:783
 #, 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:377
+#: src/gns/gnunet-gns.c:378
 #, c-format
 msgid "Public key `%s' is not well-formed\n"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:426
+#: src/gns/gnunet-gns.c:428
 msgid "Lookup a record for the given name"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:429
+#: src/gns/gnunet-gns.c:431
 #, fuzzy
 msgid "Specify the type of the record to lookup"
 msgstr "Die Priorität des Inhalts angeben"
 
-#: src/gns/gnunet-gns.c:432
+#: src/gns/gnunet-gns.c:434
 msgid "No unneeded output"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:435
+#: src/gns/gnunet-gns.c:437
 #, 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:438
+#: src/gns/gnunet-gns.c:440
 #, 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:451
+#: src/gns/gnunet-gns.c:453
 #, fuzzy
 msgid "GNUnet GNS resolver tool"
 msgstr "GNUnet Netzwerk Topologie tracen."
 
+#: src/gns/gnunet-gns-helper-service-w32.c:723
+#, c-format
+msgid ""
+"Ego for `gns-short' not found. This is not really fatal, but i'll pretend "
+"that it is and refuse to perform a lookup.  Did you run gnunet-gns-import."
+"sh?\n"
+msgstr ""
+
+#: src/gns/gnunet-gns-helper-service-w32.c:793
+#, fuzzy, c-format
+msgid "Failed to connect to identity service\n"
+msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
+
 #: src/gns/gnunet-gns-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:1067
-#: src/transport/plugin_transport_http_client.c:1082
+#: src/hostlist/hostlist-client.c:683 src/hostlist/hostlist-client.c:689
+#: src/hostlist/hostlist-client.c:741 src/hostlist/hostlist-client.c:750
+#: src/hostlist/hostlist-client.c:871 src/hostlist/hostlist-client.c:963
+#: src/hostlist/hostlist-client.c:968
+#: src/transport/plugin_transport_http_client.c:1071
+#: src/transport/plugin_transport_http_client.c:1086
 #, 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:839
+#: src/gns/gnunet-gns-proxy.c:833
 #, 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
+#: src/gns/gnunet-gns-proxy.c:856
 #, 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
+#: src/gns/gnunet-gns-proxy.c:879
 #, 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
+#: src/gns/gnunet-gns-proxy.c:892
 #, 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
+#: src/gns/gnunet-gns-proxy.c:907
 #, 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
+#: src/gns/gnunet-gns-proxy.c:917
 #, c-format
 msgid "Failed DANE verification failed with GnuTLS verify status code: %u\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:947
+#: src/gns/gnunet-gns-proxy.c:941
 #, c-format
 msgid "SSL certificate subject name (%s) does not match `%s'\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:1092
+#: src/gns/gnunet-gns-proxy.c:1086
 #, c-format
 msgid "Cookie domain `%s' supplied by server is invalid\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:1609
+#: src/gns/gnunet-gns-proxy.c:1602
 #, 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
+#: src/gns/gnunet-gns-proxy.c:1973
 #, 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:2009
+#: src/gns/gnunet-gns-proxy.c:2003
 #, fuzzy, c-format
 msgid "Unable to import certificate %s\n"
 msgstr "Fehler beim Speichern der Konfigurationsdatei `%s':"
 
-#: src/gns/gnunet-gns-proxy.c:2178
+#: src/gns/gnunet-gns-proxy.c:2177
 #, 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:2197
+#: src/gns/gnunet-gns-proxy.c:2196
 #, 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
+#: src/gns/gnunet-gns-proxy.c:2504
 #, 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
+#: src/gns/gnunet-gns-proxy.c:2533
 #, 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
+#: src/gns/gnunet-gns-proxy.c:2551 src/gns/gnunet-gns-proxy.c:2580
+msgid "SSL connection to plain IPv4 address requested\n"
+msgstr ""
+
+#: src/gns/gnunet-gns-proxy.c:2631
 #, 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
+#: src/gns/gnunet-gns-proxy.c:2970
 msgid "No ego configured for `shorten-zone`\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:2995
+#: src/gns/gnunet-gns-proxy.c:3010
 #, c-format
 msgid "No ego configured for `%s`\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:3057
+#: src/gns/gnunet-gns-proxy.c:3072
 #, 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:3098
+#: src/gns/gnunet-gns-proxy.c:3113
 msgid "listen on specified port (default: 7777)"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:3101
+#: src/gns/gnunet-gns-proxy.c:3116
 msgid "pem file to use as CA"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:3120
+#: src/gns/gnunet-gns-proxy.c:3135
 msgid "GNUnet GNS proxy"
 msgstr ""
 
-#: src/gns/gnunet-service-gns.c:860
+#: src/gns/gnunet-service-gns.c:862
 #, fuzzy
 msgid "Failed to connect to the namestore!\n"
 msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden."
 
-#: src/gns/gnunet-service-gns.c:868
+#: src/gns/gnunet-service-gns.c:870
 #, 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
+#: src/gns/gnunet-service-gns.c:903
 #, fuzzy
 msgid "Could not connect to DHT!\n"
 msgstr "Verbindung zu gnunetd konnte nicht hergestellt werden.\n"
 
-#: src/gns/gnunet-service-gns.c:917
+#: src/gns/gnunet-service-gns.c:919
 #, fuzzy
 msgid "valid public key required"
 msgstr "Ungültiger Parameter: `%s'\n"
@@ -4050,101 +4214,111 @@
 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:771
+#: src/gns/gnunet-service-gns_resolver.c:815
 #, 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:913
+#: src/gns/gnunet-service-gns_resolver.c:957
 #, c-format
 msgid "Skipping record of unsupported type %d\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns_resolver.c:1646
+#: src/gns/gnunet-service-gns_resolver.c:1316
 #, c-format
 msgid "GNS lookup resulted in DNS name that is too long (`%s')\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns_resolver.c:1686
+#: src/gns/gnunet-service-gns_resolver.c:1809
 msgid "GNS lookup recursion failed (no delegation record found)\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns_resolver.c:1710
+#: src/gns/gnunet-service-gns_resolver.c:1833
 #, 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:1932
+#: src/gns/gnunet-service-gns_resolver.c:2071
 #, c-format
 msgid "Zone %s was revoked, resolution fails\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns_resolver.c:2054
+#: src/gns/gnunet-service-gns_resolver.c:2220
 #, c-format
 msgid "Hostname `%s' is not well-formed, resolution fails\n"
 msgstr ""
 
-#: src/gns/plugin_gnsrecord_gns.c:142
+#: src/gns/plugin_gnsrecord_gns.c:151
 #, 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
+#: src/gns/plugin_gnsrecord_gns.c:180
 #, fuzzy, c-format
+msgid "Unable to parse GNS2DNS record `%s'\n"
+msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
+
+#: src/gns/plugin_gnsrecord_gns.c:201
+#, 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
+#: src/gns/plugin_gnsrecord_gns.c:217
 #, 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
+#: src/gnsrecord/plugin_gnsrecord_dns.c:293
 #, fuzzy, c-format
 msgid "Unable to parse IPv4 address `%s'\n"
 msgstr "Ungültiger Parameter: `%s'\n"
 
-#: src/gnsrecord/plugin_gnsrecord_dns.c:282
+#: src/gnsrecord/plugin_gnsrecord_dns.c:314
 #, 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
+#: src/gnsrecord/plugin_gnsrecord_dns.c:336
 #, 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
+#: src/gnsrecord/plugin_gnsrecord_dns.c:420
 #, fuzzy, c-format
+msgid "Failed to serialize CERT record with %u bytes\n"
+msgstr "Konfigurationsdatei `%s' konnte nicht geparst werden.\n"
+
+#: src/gnsrecord/plugin_gnsrecord_dns.c:452
+#, 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
+#: src/gnsrecord/plugin_gnsrecord_dns.c:471
 #, 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
+#: src/gnsrecord/plugin_gnsrecord_dns.c:494
 #, 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
+#: src/gnsrecord/plugin_gnsrecord_dns.c:514
 #, 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
+#: src/gnsrecord/plugin_gnsrecord_dns.c:529
 #, 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
+#: src/gnsrecord/plugin_gnsrecord_dns.c:549
 #, fuzzy, c-format
 msgid "Unable to parse IPv6 address `%s'\n"
 msgstr "Ungültiger Parameter: `%s'\n"
 
-#: src/gnsrecord/plugin_gnsrecord_dns.c:447
+#: src/gnsrecord/plugin_gnsrecord_dns.c:567
 #, fuzzy, c-format
 msgid "Unable to parse TLSA record string `%s'\n"
 msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
@@ -4223,179 +4397,179 @@
 msgid "Failed to parse `%s' as an address for plugin `%s'\n"
 msgstr "Fehler beim Binden an UDP Port %d.\n"
 
-#: src/hostlist/gnunet-daemon-hostlist.c:260
+#: src/hostlist/gnunet-daemon-hostlist.c:259
 msgid ""
 "None of the functions for the hostlist daemon were enabled.  I have no "
 "reason to run!\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist.c:313
+#: src/hostlist/gnunet-daemon-hostlist.c:308
 msgid "advertise our hostlist to other peers"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist.c:318
+#: src/hostlist/gnunet-daemon-hostlist.c:313
 msgid ""
 "bootstrap using hostlists (it is highly recommended that you always use this "
 "option)"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist.c:321
+#: src/hostlist/gnunet-daemon-hostlist.c:316
 msgid "enable learning about hostlist servers from other peers"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist.c:325
+#: src/hostlist/gnunet-daemon-hostlist.c:320
 msgid "provide a hostlist server"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist.c:340
+#: src/hostlist/gnunet-daemon-hostlist.c:335
 msgid "GNUnet hostlist server and client"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:289
+#: src/hostlist/hostlist-client.c:288
 msgid "# bytes downloaded from hostlist servers"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:310 src/hostlist/hostlist-client.c:340
+#: src/hostlist/hostlist-client.c:309 src/hostlist/hostlist-client.c:339
 #, fuzzy
 msgid "# invalid HELLOs downloaded from hostlist servers"
 msgstr "# Hellos per HTTP heruntergeladen"
 
-#: src/hostlist/hostlist-client.c:313 src/hostlist/hostlist-client.c:343
+#: src/hostlist/hostlist-client.c:312 src/hostlist/hostlist-client.c:342
 #, fuzzy, c-format
 msgid "Invalid `%s' message received from hostlist at `%s'\n"
 msgstr "Ungültige `%s' Nachricht von Knoten `%s' empfangen.\n"
 
-#: src/hostlist/hostlist-client.c:331
+#: src/hostlist/hostlist-client.c:330
 #, fuzzy
 msgid "# valid HELLOs downloaded from hostlist servers"
 msgstr "# Hellos per HTTP heruntergeladen"
 
-#: src/hostlist/hostlist-client.c:589 src/hostlist/hostlist-client.c:1330
+#: src/hostlist/hostlist-client.c:592 src/hostlist/hostlist-client.c:1333
 msgid "# advertised hostlist URIs"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:619
+#: src/hostlist/hostlist-client.c:622
 #, c-format
 msgid "# advertised URI `%s' downloaded"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:661
+#: src/hostlist/hostlist-client.c:664
 #, c-format
 msgid ""
 "Advertised hostlist with URI `%s' could not be downloaded. Advertised URI "
 "gets dismissed.\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:799
+#: src/hostlist/hostlist-client.c:802
 #, fuzzy, c-format
 msgid "Timeout trying to download hostlist from `%s'\n"
 msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
 
-#: src/hostlist/hostlist-client.c:813
+#: src/hostlist/hostlist-client.c:816
 #, c-format
 msgid "Download limit of %u bytes exceeded, stopping download\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:833
+#: src/hostlist/hostlist-client.c:836
 #, fuzzy, c-format
 msgid "Download of hostlist from `%s' failed: `%s'\n"
 msgstr ""
 "Upload von `%s' komplett, derzeitige durchschnittliche Geschwindigkeit "
 "beträgt %8.3f KB/s.\n"
 
-#: src/hostlist/hostlist-client.c:839
+#: src/hostlist/hostlist-client.c:842
 #, fuzzy, c-format
 msgid "Download of hostlist `%s' completed.\n"
 msgstr ""
 "Upload von `%s' komplett, derzeitige durchschnittliche Geschwindigkeit "
 "beträgt %8.3f KB/s.\n"
 
-#: src/hostlist/hostlist-client.c:847
+#: src/hostlist/hostlist-client.c:850
 #, c-format
 msgid "Adding successfully tested hostlist `%s' datastore.\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:900
+#: src/hostlist/hostlist-client.c:903
 #, c-format
 msgid "Bootstrapping using hostlist at `%s'.\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:908
+#: src/hostlist/hostlist-client.c:911
 msgid "# hostlist downloads initiated"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1037 src/hostlist/hostlist-client.c:1503
+#: src/hostlist/hostlist-client.c:1040 src/hostlist/hostlist-client.c:1506
 msgid "# milliseconds between hostlist downloads"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1046
+#: src/hostlist/hostlist-client.c:1049
 #, c-format
 msgid "Have %u/%u connections.  Will consider downloading hostlist in %s\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1106 src/hostlist/hostlist-client.c:1122
+#: src/hostlist/hostlist-client.c:1109 src/hostlist/hostlist-client.c:1125
 #, fuzzy
 msgid "# active connections"
 msgstr "GNUnet Konfiguration"
 
-#: src/hostlist/hostlist-client.c:1278
+#: src/hostlist/hostlist-client.c:1280
 #, fuzzy, c-format
 msgid "Loading saved hostlist entries from file `%s' \n"
 msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
 
-#: src/hostlist/hostlist-client.c:1282
+#: src/hostlist/hostlist-client.c:1285
 #, fuzzy, c-format
 msgid "Hostlist file `%s' does not exist\n"
 msgstr "Sitzungsschlüssel von Knoten `%s' konnte nicht überprüft werden.\n"
 
-#: src/hostlist/hostlist-client.c:1293
+#: src/hostlist/hostlist-client.c:1296
 #, fuzzy, c-format
 msgid "Could not open file `%s' for reading to load hostlists: %s\n"
 msgstr "Datei wurde als `%s' gespeichert.\n"
 
-#: src/hostlist/hostlist-client.c:1326
+#: src/hostlist/hostlist-client.c:1329
 #, c-format
 msgid "%u hostlist URIs loaded from file\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1328
+#: src/hostlist/hostlist-client.c:1331
 msgid "# hostlist URIs read from file"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1373
+#: src/hostlist/hostlist-client.c:1376
 #, fuzzy, c-format
 msgid "Could not open file `%s' for writing to save hostlists: %s\n"
 msgstr "Datei wurde als `%s' gespeichert.\n"
 
-#: src/hostlist/hostlist-client.c:1378
+#: src/hostlist/hostlist-client.c:1381
 #, fuzzy, c-format
 msgid "Writing %u hostlist URIs to `%s'\n"
 msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
 
-#: src/hostlist/hostlist-client.c:1402 src/hostlist/hostlist-client.c:1419
+#: src/hostlist/hostlist-client.c:1405 src/hostlist/hostlist-client.c:1422
 #, c-format
 msgid "Error writing hostlist URIs to file `%s'\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1414
+#: src/hostlist/hostlist-client.c:1417
 msgid "# hostlist URIs written to file"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1468
+#: src/hostlist/hostlist-client.c:1471
 msgid "Learning is enabled on this peer\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1480
+#: src/hostlist/hostlist-client.c:1483
 msgid "Learning is not enabled on this peer\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1492
+#: src/hostlist/hostlist-client.c:1495
 #, c-format
 msgid ""
 "Since learning is not enabled on this peer, hostlist file `%s' was removed\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1496
+#: src/hostlist/hostlist-client.c:1499
 #, fuzzy, c-format
 msgid "Hostlist file `%s' could not be removed\n"
 msgstr "Sitzungsschlüssel von Knoten `%s' konnte nicht überprüft werden.\n"
@@ -4473,33 +4647,28 @@
 msgid "Advertisement message could not be queued by core\n"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:560 src/peerinfo-tool/gnunet-peerinfo.c:651
-#: src/transport/gnunet-service-transport.c:790
+#: src/hostlist/hostlist-server.c:556 src/peerinfo-tool/gnunet-peerinfo.c:651
+#: src/transport/gnunet-service-transport.c:850
 #, fuzzy
 msgid "Could not access PEERINFO service.  Exiting.\n"
 msgstr "Auf die Namespace Informationen konnte nicht zugegriffen werden.\n"
 
-#: src/hostlist/hostlist-server.c:570
-#, fuzzy, c-format
-msgid "Invalid port number %llu.  Exiting.\n"
-msgstr "Ungültige Parameter. Abbruch.\n"
-
-#: src/hostlist/hostlist-server.c:579
+#: src/hostlist/hostlist-server.c:575
 #, c-format
 msgid "Hostlist service starts on %s:%llu\n"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:593
+#: src/hostlist/hostlist-server.c:589
 #, fuzzy, c-format
 msgid "Address to obtain hostlist: `%s'\n"
 msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
 
-#: src/hostlist/hostlist-server.c:633
+#: src/hostlist/hostlist-server.c:629
 #, fuzzy, c-format
 msgid "`%s' is not a valid IP address! Ignoring BINDTOIP.\n"
 msgstr "`%s' ist nicht verfügbar."
 
-#: src/hostlist/hostlist-server.c:676
+#: src/hostlist/hostlist-server.c:672
 #, fuzzy, c-format
 msgid "Could not start hostlist HTTP server on port %u\n"
 msgstr "Der Transportdienst auf Port %d konnte nicht gestartet werden.\n"
@@ -4544,49 +4713,49 @@
 msgid "Maintain egos"
 msgstr ""
 
-#: src/identity/gnunet-service-identity.c:337
+#: src/identity/gnunet-service-identity.c:338
 msgid "no default known"
 msgstr ""
 
-#: src/identity/gnunet-service-identity.c:360
+#: src/identity/gnunet-service-identity.c:362
 msgid "default configured, but ego unknown (internal error)"
 msgstr ""
 
-#: src/identity/gnunet-service-identity.c:437
-#: src/identity/gnunet-service-identity.c:668
-#: src/identity/gnunet-service-identity.c:776
+#: src/identity/gnunet-service-identity.c:439
+#: src/identity/gnunet-service-identity.c:670
+#: src/identity/gnunet-service-identity.c:778
 #, fuzzy, c-format
 msgid "Failed to write subsystem default identifier map to `%s'.\n"
 msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
 
-#: src/identity/gnunet-service-identity.c:444
+#: src/identity/gnunet-service-identity.c:446
 msgid "Unknown ego specified for service (internal error)"
 msgstr ""
 
-#: src/identity/gnunet-service-identity.c:514
+#: src/identity/gnunet-service-identity.c:516
 msgid "identifier already in use for another ego"
 msgstr ""
 
-#: src/identity/gnunet-service-identity.c:645
+#: src/identity/gnunet-service-identity.c:647
 msgid "target name already exists"
 msgstr ""
 
-#: src/identity/gnunet-service-identity.c:684
-#: src/identity/gnunet-service-identity.c:793
+#: src/identity/gnunet-service-identity.c:686
+#: src/identity/gnunet-service-identity.c:795
 msgid "no matching ego found"
 msgstr ""
 
-#: src/identity/gnunet-service-identity.c:827
+#: src/identity/gnunet-service-identity.c:829
 #, fuzzy, c-format
 msgid "Failed to parse ego information in `%s'\n"
 msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
 
-#: src/identity/gnunet-service-identity.c:900
+#: src/identity/gnunet-service-identity.c:902
 #, fuzzy, c-format
 msgid "Failed to parse subsystem identity configuration file `%s'\n"
 msgstr "Fehler beim Speichern der Konfigurationsdatei `%s':"
 
-#: src/identity/gnunet-service-identity.c:912
+#: src/identity/gnunet-service-identity.c:914
 #, fuzzy, c-format
 msgid "Failed to create directory `%s' for storing egos\n"
 msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
@@ -4605,45 +4774,52 @@
 msgid "Send ping messages to test connectivity (default == NO)"
 msgstr ""
 
-#: src/mesh/gnunet-mesh.c:146
+#: src/mesh/gnunet-mesh.c:299
 #, fuzzy, c-format
+msgid "Invalid target `%s'\n"
+msgstr "Ungültiger Parameter: `%s'\n"
+
+#: src/mesh/gnunet-mesh.c:417
+#, fuzzy, c-format
 msgid "Invalid tunnel owner `%s'\n"
 msgstr "Ungültiger Parameter: `%s'\n"
 
-#: src/mesh/gnunet-mesh.c:209
+#: src/mesh/gnunet-mesh.c:482
+msgid "You must NOT give a TARGET when using options\n"
+msgstr ""
+
+#: src/mesh/gnunet-mesh.c:559
 #, fuzzy
-msgid "provide information about all tunnels (continuously) NOT IMPLEMENTED"
+msgid "provide information about a particular channel"
 msgstr "Informationen über andere GNUnet Knoten ausgeben."
 
-#: src/mesh/gnunet-mesh.c:212
+#: src/mesh/gnunet-mesh.c:562
 #, fuzzy
-msgid "provide information about a particular tunnel"
+msgid "provide information about a particular connection"
 msgstr "Informationen über andere GNUnet Knoten ausgeben."
 
-#: src/mesh/gnunet-mesh.c:222
+#: src/mesh/gnunet-mesh.c:565
 #, fuzzy
-msgid "Print information about mesh tunnels and peers."
+msgid "provide information about all tunnels"
 msgstr "Informationen über andere GNUnet Knoten ausgeben."
 
-#: src/mesh/gnunet-service-mesh.c:5633 src/mesh/gnunet-service-mesh_peer.c:350
-msgid "Wrong CORE service\n"
+#: src/mesh/gnunet-mesh.c:568
+#, fuzzy
+msgid "provide information about all tunnels (continuously) NOT IMPLEMENTED"
+msgstr "Informationen über andere GNUnet Knoten ausgeben."
+
+#: src/mesh/gnunet-mesh.c:571
+msgid "port to listen to (default; 0)"
 msgstr ""
 
-#: 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-mesh.c:574
+#, fuzzy
+msgid "provide information about a particular tunnel"
+msgstr "Informationen über andere GNUnet Knoten ausgeben."
 
-#: 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"
-msgstr "GNUnet Konfiguration"
+#: src/mesh/gnunet-service-mesh_peer.c:349
+msgid "Wrong CORE service\n"
+msgstr ""
 
 #: src/mysql/mysql.c:174
 #, c-format
@@ -4660,31 +4836,36 @@
 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
+#: src/namecache/gnunet-namecache.c:124 src/namestore/gnunet-namestore.c:394
 #, c-format
 msgid "\tCorrupt or unsupported record of type %u\n"
 msgstr ""
 
-#: src/namecache/gnunet-namecache.c:185 src/namestore/gnunet-namestore.c:777
+#: src/namecache/gnunet-namecache.c:185
 #, 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
+#: src/namecache/gnunet-namecache.c:195 src/namestore/gnunet-namestore.c:692
 #, 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
+#: src/namecache/gnunet-namecache.c:203
+#, fuzzy, c-format
+msgid "You must specify a name\n"
+msgstr "Sie müssen einen Empfänger angeben!\n"
+
+#: src/namecache/gnunet-namecache.c:234 src/namestore/gnunet-namestore.c:925
 msgid "name of the record to add/delete/display"
 msgstr ""
 
-#: src/namecache/gnunet-namecache.c:229
+#: src/namecache/gnunet-namecache.c:237
 #, 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
+#: src/namecache/gnunet-namecache.c:248 src/namestore/gnunet-namestore.c:957
 #, fuzzy
 msgid "GNUnet zone manipulation tool"
 msgstr "GNUnet Konfiguration"
@@ -4699,70 +4880,70 @@
 msgid "Failed to create indices\n"
 msgstr "Namespace `%s' konnte nicht erstellt werden (existiert bereits?).\n"
 
-#: src/namestore/gnunet-namestore.c:278
+#: src/namestore/gnunet-namestore.c:304
 #, fuzzy, c-format
 msgid "Adding record failed: %s\n"
 msgstr ""
 "\n"
 "Fehler beim Uploaden der Datei: %s\n"
 
-#: src/namestore/gnunet-namestore.c:306
+#: src/namestore/gnunet-namestore.c:333
 #, fuzzy, c-format
 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:313
+#: src/namestore/gnunet-namestore.c:340
 #, fuzzy, c-format
 msgid "Deleting record failed%s%s\n"
 msgstr ""
 "\n"
 "Fehler beim Uploaden der Datei: %s\n"
 
-#: src/namestore/gnunet-namestore.c:528
+#: src/namestore/gnunet-namestore.c:555
 #, c-format
 msgid "No options given\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:539
-#: src/namestore/gnunet-namestore-fcfsd.c:964
+#: src/namestore/gnunet-namestore.c:566
+#: src/namestore/gnunet-namestore-fcfsd.c:970
 #, fuzzy
 msgid "Failed to connect to namestore\n"
 msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden."
 
-#: 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
+#: src/namestore/gnunet-namestore.c:574 src/namestore/gnunet-namestore.c:583
+#: src/namestore/gnunet-namestore.c:600 src/namestore/gnunet-namestore.c:622
+#: src/namestore/gnunet-namestore.c:662
 #, fuzzy, c-format
 msgid "Missing option `%s' for operation `%s'\n"
 msgstr "Konfigurationsdatei `%s' wurde erzeugt.\n"
 
-#: src/namestore/gnunet-namestore.c:548 src/namestore/gnunet-namestore.c:557
-#: src/namestore/gnunet-namestore.c:574 src/namestore/gnunet-namestore.c:596
+#: src/namestore/gnunet-namestore.c:575 src/namestore/gnunet-namestore.c:584
+#: src/namestore/gnunet-namestore.c:601 src/namestore/gnunet-namestore.c:623
 msgid "add"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:565
+#: src/namestore/gnunet-namestore.c:592
 #, 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:585
+#: src/namestore/gnunet-namestore.c:612
 #, 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:621
+#: src/namestore/gnunet-namestore.c:648
 #, fuzzy, c-format
 msgid "Invalid time format `%s'\n"
 msgstr "Ungültiger Parameter: `%s'\n"
 
-#: src/namestore/gnunet-namestore.c:636
+#: src/namestore/gnunet-namestore.c:663
 msgid "del"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:689
+#: src/namestore/gnunet-namestore.c:712
 #: src/peerinfo-tool/gnunet-peerinfo.c:703
 #, fuzzy, c-format
 msgid "Invalid URI `%s'\n"
@@ -4770,119 +4951,153 @@
 
 #: src/namestore/gnunet-namestore.c:747
 #, fuzzy, c-format
+msgid "Invalid nick `%s'\n"
+msgstr "Ungültiger Parameter: `%s'\n"
+
+#: src/namestore/gnunet-namestore.c:787
+#, fuzzy, c-format
 msgid "Ego `%s' not known to identity service\n"
 msgstr "`%s': unbekannter Dienst: %s\n"
 
-#: src/namestore/gnunet-namestore.c:806
+#: src/namestore/gnunet-namestore.c:814
+#, fuzzy, c-format
+msgid "No default ego configured in identity service\n"
+msgstr "`%s': unbekannter Dienst: %s\n"
+
+#: src/namestore/gnunet-namestore.c:847
+#, fuzzy, c-format
+msgid "Identity service is not running\n"
+msgstr "`%s' ist keine Datei.\n"
+
+#: src/namestore/gnunet-namestore.c:859
+#, fuzzy, c-format
+msgid "Cannot connect to identity service\n"
+msgstr "Verbindung zu gnunetd konnte nicht hergestellt werden.\n"
+
+#: src/namestore/gnunet-namestore.c:907
 msgid "add record"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:809
+#: src/namestore/gnunet-namestore.c:910
 msgid "delete record"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:812
+#: src/namestore/gnunet-namestore.c:913
 msgid "display records"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:815
+#: src/namestore/gnunet-namestore.c:916
 msgid ""
 "expiration time for record to use (for adding only), \"never\" is possible"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:818
+#: src/namestore/gnunet-namestore.c:919
 #, fuzzy
+msgid "set the desired nick name for the zone"
+msgstr "Informationen über andere GNUnet Knoten ausgeben."
+
+#: src/namestore/gnunet-namestore.c:922
+#, fuzzy
 msgid "monitor changes in the namestore"
 msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden."
 
-#: src/namestore/gnunet-namestore.c:824
+#: src/namestore/gnunet-namestore.c:928
 #, fuzzy
 msgid "determine our name for the given PKEY"
 msgstr "Informationen über andere GNUnet Knoten ausgeben."
 
-#: src/namestore/gnunet-namestore.c:827
+#: src/namestore/gnunet-namestore.c:931
 msgid "type of the record to add/delete/display"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:830
+#: src/namestore/gnunet-namestore.c:934
 msgid "URI to import into our zone"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:833
+#: src/namestore/gnunet-namestore.c:937
 msgid "value of the record to add/delete"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:836
+#: src/namestore/gnunet-namestore.c:940
 msgid "create or list public record"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:839
+#: src/namestore/gnunet-namestore.c:943
 msgid ""
 "create shadow record (only valid if all other records of the same type have "
 "expired"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:842
+#: src/namestore/gnunet-namestore.c:946
 msgid "name of the ego controlling the zone"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:462
+#: src/namestore/gnunet-namestore-fcfsd.c:464
 #, 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:489
+#: src/namestore/gnunet-namestore-fcfsd.c:491
 #, 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:524
+#: src/namestore/gnunet-namestore-fcfsd.c:525
 #, c-format
 msgid "Found existing name `%s' for the given key\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:590
+#: src/namestore/gnunet-namestore-fcfsd.c:534
+msgid "Error when mapping zone to name\n"
+msgstr ""
+
+#: src/namestore/gnunet-namestore-fcfsd.c:596
 #, c-format
 msgid "Found %u existing records for domain `%s'\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:646
+#: src/namestore/gnunet-namestore-fcfsd.c:652
 #, 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:662
+#: src/namestore/gnunet-namestore-fcfsd.c:668
 #, 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:698
+#: src/namestore/gnunet-namestore-fcfsd.c:704
 msgid "Domain name must not contain `.'\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:706
+#: src/namestore/gnunet-namestore-fcfsd.c:712
 msgid "Domain name must not contain `+'\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:904
+#: src/namestore/gnunet-namestore-fcfsd.c:910
 msgid "No ego configured for `fcfsd` subsystem\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:930
+#: src/namestore/gnunet-namestore-fcfsd.c:936
 #, fuzzy
 msgid "Failed to start HTTP server\n"
 msgstr "Fehler beim Starten der Collection.\n"
 
-#: src/namestore/gnunet-namestore-fcfsd.c:999
+#: src/namestore/gnunet-namestore-fcfsd.c:978
+#, fuzzy
+msgid "Failed to connect to identity\n"
+msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
+
+#: src/namestore/gnunet-namestore-fcfsd.c:1011
 msgid "GNU Name System First Come First Serve name registration service"
 msgstr ""
 
-#: src/namestore/gnunet-service-namestore.c:494
+#: src/namestore/gnunet-service-namestore.c:634
 #, 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:273
+#: src/namestore/namestore_api.c:275
 msgid "Namestore failed to store record\n"
 msgstr ""
 
@@ -4989,12 +5204,12 @@
 msgid "`upnpc' command not found\n"
 msgstr ""
 
-#: src/nat/nat_test.c:341
+#: src/nat/nat_test.c:345
 #, fuzzy
 msgid "Failed to connect to `gnunet-nat-server'\n"
 msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
 
-#: src/nat/nat_test.c:411
+#: src/nat/nat_test.c:414
 #, c-format
 msgid "Failed to create listen socket bound to `%s' for NAT test: %s\n"
 msgstr ""
@@ -5029,12 +5244,12 @@
 msgid "Measure quality and performance of the NSE service."
 msgstr "Auf den Dienst konnte nicht zugegriffen werden"
 
-#: src/nse/gnunet-service-nse.c:1460
-#: src/revocation/gnunet-service-revocation.c:580
+#: src/nse/gnunet-service-nse.c:1461
+#: src/revocation/gnunet-service-revocation.c:789
 msgid "Value is too large.\n"
 msgstr ""
 
-#: src/nse/gnunet-service-nse.c:1487
+#: src/nse/gnunet-service-nse.c:1488
 msgid "NSE service is lacking key configuration settings.  Exiting.\n"
 msgstr ""
 
@@ -5043,21 +5258,21 @@
 msgid "Removing expired address of transport `%s'\n"
 msgstr "Verfügbare(r) Transport(e): %s\n"
 
-#: src/peerinfo/gnunet-service-peerinfo.c:352
+#: src/peerinfo/gnunet-service-peerinfo.c:354
 #, 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:369
+#: src/peerinfo/gnunet-service-peerinfo.c:373
 #, 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:447
+#: src/peerinfo/gnunet-service-peerinfo.c:457
 msgid "# peers known"
 msgstr ""
 
-#: src/peerinfo/gnunet-service-peerinfo.c:483
+#: src/peerinfo/gnunet-service-peerinfo.c:494
 #, c-format
 msgid ""
 "File `%s' in directory `%s' does not match naming convention. Removed.\n"
@@ -5065,22 +5280,22 @@
 "Die Datei `%s' im Verzeichnis `%s' entspricht nicht der Namenskonvention. "
 "Datei wurde entfernt.\n"
 
-#: src/peerinfo/gnunet-service-peerinfo.c:638
+#: src/peerinfo/gnunet-service-peerinfo.c:644
 #, fuzzy, c-format
 msgid "Scanning directory `%s'\n"
 msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
 
-#: src/peerinfo/gnunet-service-peerinfo.c:643
+#: src/peerinfo/gnunet-service-peerinfo.c:649
 #, 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:979
+#: src/peerinfo/gnunet-service-peerinfo.c:985
 #, 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:1269
+#: src/peerinfo/gnunet-service-peerinfo.c:1275
 #, c-format
 msgid "Importing HELLOs from `%s'\n"
 msgstr ""
@@ -5337,70 +5552,76 @@
 msgid "SQLite database running\n"
 msgstr "sqlite Datenspeicher"
 
-#: src/pt/gnunet-daemon-pt.c:483
+#: src/pt/gnunet-daemon-pt.c:482
 #, 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:489
+#: src/pt/gnunet-daemon-pt.c:488
 #, fuzzy
 msgid "# DNS requests mapped to VPN"
 msgstr "# Client Trace-Anfragen empfangen"
 
-#: src/pt/gnunet-daemon-pt.c:542
+#: src/pt/gnunet-daemon-pt.c:541
 msgid "# DNS records modified"
 msgstr ""
 
-#: src/pt/gnunet-daemon-pt.c:718
+#: src/pt/gnunet-daemon-pt.c:717
 msgid "# DNS replies intercepted"
 msgstr ""
 
-#: src/pt/gnunet-daemon-pt.c:724
+#: src/pt/gnunet-daemon-pt.c:723
 #, 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:827
+#: src/pt/gnunet-daemon-pt.c:826
 #, fuzzy
 msgid "# DNS requests dropped (timeout)"
 msgstr "# gap Anfragen verworfen: Kollision in RT"
 
-#: src/pt/gnunet-daemon-pt.c:884
+#: src/pt/gnunet-daemon-pt.c:883
 #, fuzzy
 msgid "# DNS requests intercepted"
 msgstr "# Client Trace-Anfragen empfangen"
 
-#: src/pt/gnunet-daemon-pt.c:889
+#: src/pt/gnunet-daemon-pt.c:888
 #, fuzzy
-msgid "# DNS requests dropped (DNS mesh tunnel down)"
+msgid "# DNS requests dropped (DNS mesh channel down)"
 msgstr "# gap Anfragen verworfen: Kollision in RT"
 
-#: src/pt/gnunet-daemon-pt.c:897
+#: src/pt/gnunet-daemon-pt.c:896
 #, fuzzy
 msgid "# DNS requests dropped (malformed)"
 msgstr "# gap Anfragen verworfen: Kollision in RT"
 
-#: src/pt/gnunet-daemon-pt.c:970
+#: src/pt/gnunet-daemon-pt.c:969
 #, fuzzy
 msgid "# DNS replies received"
 msgstr "# Client Trace-Anfragen empfangen"
 
-#: src/pt/gnunet-daemon-pt.c:986
+#: src/pt/gnunet-daemon-pt.c:985
 #, fuzzy
 msgid "# DNS replies dropped (too late?)"
 msgstr "# gap Anfragen verworfen: Kollision in RT"
 
-#: 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
+#: src/pt/gnunet-daemon-pt.c:1261 src/pt/gnunet-daemon-pt.c:1270
+#: src/pt/gnunet-daemon-pt.c:1290 src/pt/gnunet-daemon-pt.c:1301
+#: src/pt/gnunet-daemon-pt.c:1310
 #, 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:1348
+#: src/pt/gnunet-daemon-pt.c:1347
 msgid "Daemon to run to perform IP protocol translation to GNUnet"
 msgstr ""
 
+#: src/regex/gnunet-daemon-regexprofiler.c:270
+#: src/regex/gnunet-regex-simulation-profiler.c:659
+#, fuzzy, c-format
+msgid "%s service is lacking key configuration settings (%s).  Exiting.\n"
+msgstr "GNUnet Konfiguration"
+
 #: src/regex/gnunet-daemon-regexprofiler.c:380
 msgid "Daemon to announce regular expressions for the peer using mesh."
 msgstr ""
@@ -5551,94 +5772,112 @@
 "Testing and revoking at the same time is not allowed, only executing test.\n"
 msgstr ""
 
-#: src/revocation/gnunet-revocation.c:451
+#: src/revocation/gnunet-revocation.c:436
+#, fuzzy
+msgid "No filename to store revocation certificate given.\n"
+msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
+
+#: src/revocation/gnunet-revocation.c:458
 #, 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
+#: src/revocation/gnunet-revocation.c:483
 #, fuzzy
 msgid "No action specified. Nothing to do.\n"
 msgstr "Keine Oberfläche angegeben, verwende Standard\n"
 
-#: src/revocation/gnunet-revocation.c:492
+#: src/revocation/gnunet-revocation.c:499
 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 "
+#: src/revocation/gnunet-revocation.c:502
+msgid ""
+"revoke the private key associated for the 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"
+#: src/revocation/gnunet-revocation.c:505
+msgid "actually perform revocation, otherwise we just do the precomputation"
 msgstr ""
 
-#: src/revocation/gnunet-revocation.c:501
+#: src/revocation/gnunet-revocation.c:508
 msgid "test if the public key KEY has been revoked"
 msgstr ""
 
-#: src/revocation/gnunet-service-revocation.c:250
+#: src/revocation/gnunet-service-revocation.c:272
 msgid "Duplicate revocation received from peer. Ignored.\n"
 msgstr ""
 
-#: src/revocation/gnunet-service-revocation.c:599
+#: src/revocation/gnunet-service-revocation.c:434
+#, c-format
+msgid "Error computing revocation set union with %s\n"
+msgstr ""
+
+#: src/revocation/gnunet-service-revocation.c:486
+msgid "SET service crashed, terminating revocation service\n"
+msgstr ""
+
+#: src/revocation/gnunet-service-revocation.c:812
 #, fuzzy
 msgid "Could not open revocation database file!"
 msgstr "Verbindung zu gnunetd konnte nicht hergestellt werden.\n"
 
-#: src/scalarproduct/gnunet-scalarproduct.c:194
+#: src/scalarproduct/gnunet-scalarproduct.c:225
 #, 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:200
+#: src/scalarproduct/gnunet-scalarproduct.c:232
 msgid "This program needs a session identifier for comparing vectors.\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-scalarproduct.c:206
+#: src/scalarproduct/gnunet-scalarproduct.c:239
 msgid "Please give a session key for --input_key!\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-scalarproduct.c:215
+#: src/scalarproduct/gnunet-scalarproduct.c:251
 #, 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:239
-#: src/scalarproduct/gnunet-scalarproduct.c:297
+#: src/scalarproduct/gnunet-scalarproduct.c:276
 #, 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:246
+#: src/scalarproduct/gnunet-scalarproduct.c:284
 msgid "Need elements to compute the vectorproduct, got none.\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-scalarproduct.c:347
+#: src/scalarproduct/gnunet-scalarproduct.c:336
+#, fuzzy, c-format
+msgid "Could not convert `%s' to integer.\n"
+msgstr "Verbindung zu gnunetd konnte nicht hergestellt werden.\n"
+
+#: src/scalarproduct/gnunet-scalarproduct.c:397
 msgid ""
 "A comma separated list of elements to compare as vector with our remote peer."
 msgstr ""
 
-#: src/scalarproduct/gnunet-scalarproduct.c:350
+#: src/scalarproduct/gnunet-scalarproduct.c:400
 msgid ""
 "A comma separated mask to select which elements should actually be compared."
 msgstr ""
 
-#: src/scalarproduct/gnunet-scalarproduct.c:353
+#: src/scalarproduct/gnunet-scalarproduct.c:403
 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:356
+#: src/scalarproduct/gnunet-scalarproduct.c:406
 msgid "Transaction ID shared with peer."
 msgstr ""
 
-#: src/scalarproduct/gnunet-scalarproduct.c:365
+#: src/scalarproduct/gnunet-scalarproduct.c:415
 msgid "Calculate the Vectorproduct with a GNUnet peer."
 msgstr ""
 
@@ -5647,143 +5886,144 @@
 msgid "Generated key set with key length %d bits.\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:775
+#: src/scalarproduct/gnunet-service-scalarproduct.c:776
 #, fuzzy, c-format
 msgid "Client (%p) disconnected from us.\n"
 msgstr "`%s' hat sich mit `%s' verbunden.\n"
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:847
-#: src/scalarproduct/gnunet-service-scalarproduct.c:936
+#: src/scalarproduct/gnunet-service-scalarproduct.c:848
+#: src/scalarproduct/gnunet-service-scalarproduct.c:938
 #, 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:853
+#: src/scalarproduct/gnunet-service-scalarproduct.c:854
 #, c-format
 msgid "Sending session-end notification to client (%p) for session %s\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:946
+#: src/scalarproduct/gnunet-service-scalarproduct.c:948
 #, c-format
 msgid "Sent result to client (%p), this session (%s) has ended!\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1025
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1163
+#: src/scalarproduct/gnunet-service-scalarproduct.c:1027
+#: src/scalarproduct/gnunet-service-scalarproduct.c:1165
 #, 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:1376
+#: src/scalarproduct/gnunet-service-scalarproduct.c:1391
 #, c-format
 msgid "Failed to communicate with `%s', scalar product calculation aborted.\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1476
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1603
+#: src/scalarproduct/gnunet-service-scalarproduct.c:1495
+#: src/scalarproduct/gnunet-service-scalarproduct.c:1622
 #, fuzzy
 msgid "Transmitting service request.\n"
 msgstr "Collection `%s' begonnen.\n"
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1485
+#: src/scalarproduct/gnunet-service-scalarproduct.c:1504
 #, fuzzy
-msgid "Could not send service-request multipart message to tunnel!\n"
+msgid "Could not send service-request multipart message to channel!\n"
 msgstr "Nachricht konnte nicht an gnunetd gesendet werden.\n"
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1525
+#: src/scalarproduct/gnunet-service-scalarproduct.c:1544
 #, fuzzy, c-format
-msgid "Successfully created new tunnel to peer (%s)!\n"
+msgid "Successfully created new channel to peer (%s)!\n"
 msgstr "Zugriff verweigert für `%s' bei %s:%d.\n"
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1612
+#: src/scalarproduct/gnunet-service-scalarproduct.c:1631
 #, fuzzy
-msgid "Could not send message to tunnel!\n"
+msgid "Could not send message to channel!\n"
 msgstr "Nachricht konnte nicht an gnunetd gesendet werden.\n"
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1669
+#: src/scalarproduct/gnunet-service-scalarproduct.c:1688
 #, fuzzy
 msgid "Too short message received from client!\n"
 msgstr "Empfangene Client-Nachricht ist ungültig.\n"
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1682
+#: src/scalarproduct/gnunet-service-scalarproduct.c:1701
 #, 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:1693
+#: src/scalarproduct/gnunet-service-scalarproduct.c:1712
 #, c-format
 msgid ""
 "Duplicate session information received, cannot create new session with key `"
 "%s'\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1713
+#: src/scalarproduct/gnunet-service-scalarproduct.c:1733
 #, c-format
 msgid ""
-"Got client-request-session with key %s, preparing tunnel to remote service.\n"
+"Got client-request-session with key %s, preparing channel to remote "
+"service.\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1749
+#: src/scalarproduct/gnunet-service-scalarproduct.c:1772
 #, c-format
-msgid "Creating new tunnel for session with key %s.\n"
+msgid "Creating new channel for session with key %s.\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1794
+#: src/scalarproduct/gnunet-service-scalarproduct.c:1819
 #, 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:1802
+#: src/scalarproduct/gnunet-service-scalarproduct.c:1830
 #, 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:1828
+#: src/scalarproduct/gnunet-service-scalarproduct.c:1860
 #, fuzzy, c-format
-msgid "New incoming tunnel from peer %s.\n"
+msgid "New incoming channel from peer %s.\n"
 msgstr "`%s' hat sich mit `%s' verbunden.\n"
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1859
+#: src/scalarproduct/gnunet-service-scalarproduct.c:1892
 #, c-format
 msgid "Peer disconnected, terminating session %s with peer (%s)\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:2047
-#: src/scalarproduct/gnunet-service-scalarproduct.c:2196
+#: src/scalarproduct/gnunet-service-scalarproduct.c:2083
+#: src/scalarproduct/gnunet-service-scalarproduct.c:2242
 #, c-format
 msgid "Got session with key %s and a matching element set, processing.\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:2054
-#: src/scalarproduct/gnunet-service-scalarproduct.c:2203
+#: src/scalarproduct/gnunet-service-scalarproduct.c:2092
+#: src/scalarproduct/gnunet-service-scalarproduct.c:2249
 #, c-format
 msgid "Got session with key %s without a matching element set, queueing.\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:2142
+#: src/scalarproduct/gnunet-service-scalarproduct.c:2187
 #, c-format
 msgid ""
 "Got message with duplicate session key (`%s'), ignoring service request.\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:2425
+#: src/scalarproduct/gnunet-service-scalarproduct.c:2471
 msgid "Shutting down, initiating cleanup.\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:2490
+#: src/scalarproduct/gnunet-service-scalarproduct.c:2536
 msgid "Generating Paillier-Keyset.\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:2505
+#: src/scalarproduct/gnunet-service-scalarproduct.c:2551
 #, fuzzy
 msgid "Connect to MESH failed\n"
 msgstr " Verbindung fehlgeschlagen (Bug?)\n"
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:2509
+#: src/scalarproduct/gnunet-service-scalarproduct.c:2555
 #, fuzzy
 msgid "Mesh initialized\n"
 msgstr " Verbindung fehlgeschlagen\n"
@@ -5816,6 +6056,11 @@
 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-service-set.c:1399
+#, fuzzy
+msgid "Could not connect to mesh service\n"
+msgstr "Verbindung zu gnunetd konnte nicht hergestellt werden.\n"
+
 #: src/set/gnunet-set-ibf-profiler.c:221
 #, fuzzy
 msgid "number of element in set A-B"
@@ -5957,16 +6202,16 @@
 "Cannot open %s for writing load statistics.  Not logging load statistics\n"
 msgstr ""
 
-#: src/testbed/gnunet-service-testbed_peers.c:1012
+#: src/testbed/gnunet-service-testbed_peers.c:1015
 #, 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:1018
+#: src/testbed/gnunet-service-testbed_peers.c:1021
 msgid "Request doesn't fit into a message"
 msgstr ""
 
-#: src/testbed/gnunet-service-testbed_peers.c:1056
+#: src/testbed/gnunet-service-testbed_peers.c:1059
 #, fuzzy, c-format
 msgid "%s service can't be started because ARM is shutting down"
 msgstr "`%s' fährt herunter.\n"
@@ -6085,44 +6330,44 @@
 "free topology cannot be more than %u.  Given `%s = %llu'"
 msgstr ""
 
-#: src/testbed/testbed_api_topology.c:716
+#: src/testbed/testbed_api_topology.c:715
 #, fuzzy, c-format
 msgid "Topology file %s not found\n"
 msgstr "`%s' fehlgeschlagen: Tabelle nicht gefunden!\n"
 
-#: src/testbed/testbed_api_topology.c:722
+#: src/testbed/testbed_api_topology.c:721
 #, fuzzy, c-format
 msgid "Topology file %s has no data\n"
 msgstr "Sitzungsschlüssel von Knoten `%s' konnte nicht überprüft werden.\n"
 
-#: src/testbed/testbed_api_topology.c:729
+#: src/testbed/testbed_api_topology.c:728
 #, fuzzy, c-format
 msgid "Topology file %s cannot be read\n"
 msgstr "Sitzungsschlüssel von Knoten `%s' konnte nicht überprüft werden.\n"
 
-#: src/testbed/testbed_api_topology.c:751
+#: src/testbed/testbed_api_topology.c:750
 #, fuzzy, c-format
 msgid "Failed to read peer index from toology file: %s"
 msgstr "Konfigurationsdatei `%s' konnte nicht geparst werden.\n"
 
-#: src/testbed/testbed_api_topology.c:760
-#: src/testbed/testbed_api_topology.c:784
+#: src/testbed/testbed_api_topology.c:759
+#: src/testbed/testbed_api_topology.c:783
 #, c-format
 msgid "Value in given topology file: %s out of range\n"
 msgstr ""
 
-#: src/testbed/testbed_api_topology.c:766
-#: src/testbed/testbed_api_topology.c:790
+#: src/testbed/testbed_api_topology.c:765
+#: src/testbed/testbed_api_topology.c:789
 #, fuzzy, c-format
 msgid "Failed to read peer index from topology file: %s"
 msgstr "Konfigurationsdatei `%s' konnte nicht geparst werden.\n"
 
-#: src/testbed/testbed_api_topology.c:772
-#: src/testbed/testbed_api_topology.c:796
+#: src/testbed/testbed_api_topology.c:771
+#: src/testbed/testbed_api_topology.c:795
 msgid "Topology file needs more peers than given ones\n"
 msgstr ""
 
-#: src/testbed/testbed_api_topology.c:811
+#: src/testbed/testbed_api_topology.c:810
 #, fuzzy, c-format
 msgid "Ignoring to connect peer %u to peer %u\n"
 msgstr "Verbindung zu %u.%u.%u.%u:%u fehlgeschlagen: %s\n"
@@ -6173,7 +6418,7 @@
 msgid "Hostkeys file not found: %s\n"
 msgstr ""
 
-#: src/testing/testing.c:293
+#: src/testing/testing.c:293 src/util/gnunet-ecc.c:217
 #, c-format
 msgid "Incorrect hostkey file format: %s\n"
 msgstr ""
@@ -6215,17 +6460,17 @@
 msgid "Failed to write hostkey file for peer %u: %s\n"
 msgstr "Dateiformat fehlerhaft (kein GNUnet Verzeichnis?)\n"
 
-#: src/testing/testing.c:1235
+#: src/testing/testing.c:1238
 #, 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:1335
+#: src/testing/testing.c:1340
 #, fuzzy, c-format
 msgid "Failed to start `%s': %s\n"
 msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
 
-#: src/testing/testing.c:1699
+#: src/testing/testing.c:1704
 #, fuzzy, c-format
 msgid "Failed to load configuration from %s\n"
 msgstr "Fehler beim Speichern der Konfigurationsdatei `%s':"
@@ -6313,59 +6558,60 @@
 msgid "# disconnects due to blacklist"
 msgstr ""
 
-#: src/transport/gnunet-service-transport.c:163
+#: src/transport/gnunet-service-transport.c:160
 #, fuzzy
-msgid "# bytes payload discarded due to not connected peer "
+msgid "# bytes payload discarded due to not connected peer"
 msgstr "# Knotenankündigungen empfangen"
 
-#: src/transport/gnunet-service-transport.c:229
+#: src/transport/gnunet-service-transport.c:250
 #, fuzzy
 msgid "# bytes total received"
 msgstr "# gap Anfragen insgesamt empfangen"
 
-#: src/transport/gnunet-service-transport.c:277
+#: src/transport/gnunet-service-transport.c:325
 #, fuzzy
 msgid "# bytes payload received"
 msgstr "# Bytes entschlüsselt"
 
-#: src/transport/gnunet-service-transport.c:429
+#: src/transport/gnunet-service-transport.c:479
 #, 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:479
+#: src/transport/gnunet-service-transport.c:529
 #, 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:760
-msgid "Transport service is lacking key configuration settings.  Exiting.\n"
-msgstr ""
+#: src/transport/gnunet-service-transport.c:820
+#, fuzzy
+msgid "Transport service is lacking key configuration settings. Exiting.\n"
+msgstr "GNUnet Konfiguration"
 
-#: src/transport/gnunet-service-transport_clients.c:389
+#: src/transport/gnunet-service-transport_clients.c:384
 #, c-format
 msgid "Dropping message of type %u and size %u, have %u/%u messages pending\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_clients.c:394
+#: src/transport/gnunet-service-transport_clients.c:391
 #, fuzzy
 msgid "# messages dropped due to slow client"
 msgstr "# gap Anfragen verworfen: Kollision in RT"
 
-#: src/transport/gnunet-service-transport_clients.c:536
+#: src/transport/gnunet-service-transport_clients.c:533
 #, c-format
 msgid "Rejecting control connection from peer `%s', which is not me!\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_clients.c:672
+#: src/transport/gnunet-service-transport_clients.c:674
 msgid "# bytes payload dropped (other peer was not connected)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_clients.c:728
+#: src/transport/gnunet-service-transport_clients.c:731
 #, fuzzy
 msgid "# REQUEST CONNECT messages received"
 msgstr "# verschlüsselter PONG Nachrichten empfangen"
@@ -6374,117 +6620,157 @@
 msgid "# refreshed my HELLO"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1080
+#: src/transport/gnunet-service-transport_neighbours.c:1074
 #, fuzzy
 msgid "# DISCONNECT messages sent"
 msgstr "# verschlüsselter PONG Nachrichten empfangen"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1210
-#: src/transport/gnunet-service-transport_neighbours.c:1545
+#: src/transport/gnunet-service-transport_neighbours.c:1206
+#: src/transport/gnunet-service-transport_neighbours.c:1541
 #, fuzzy
 msgid "# bytes in message queue for other peers"
 msgstr "# Bytes ausgehender Nachrichten verworfen"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1215
+#: src/transport/gnunet-service-transport_neighbours.c:1211
 #, fuzzy
 msgid "# messages transmitted to other peers"
 msgstr "# Bytes des Typs %d übertragen"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1220
+#: src/transport/gnunet-service-transport_neighbours.c:1216
 #, fuzzy
 msgid "# transmission failures for messages to other peers"
 msgstr "# Bytes ausgehender Nachrichten verworfen"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1277
+#: src/transport/gnunet-service-transport_neighbours.c:1273
 msgid "# messages timed out while in transport queue"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1319
+#: src/transport/gnunet-service-transport_neighbours.c:1315
 #, fuzzy
 msgid "# keepalives sent"
 msgstr "# p2p Trace-Antworten gesendet"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1343
+#: src/transport/gnunet-service-transport_neighbours.c:1339
 #, fuzzy
 msgid "# KEEPALIVE messages discarded (peer unknown)"
 msgstr "# defragmentierter Nachrichten"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1351
+#: src/transport/gnunet-service-transport_neighbours.c:1347
 #, fuzzy
 msgid "# KEEPALIVE messages discarded (no session)"
 msgstr "# defragmentierter Nachrichten"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1384
+#: src/transport/gnunet-service-transport_neighbours.c:1380
 #, fuzzy
 msgid "# KEEPALIVE_RESPONSE messages discarded (not connected)"
 msgstr "# defragmentierter Nachrichten"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1393
+#: src/transport/gnunet-service-transport_neighbours.c:1389
 #, fuzzy
 msgid "# KEEPALIVE_RESPONSE messages discarded (not expected)"
 msgstr "# defragmentierter Nachrichten"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1450
+#: src/transport/gnunet-service-transport_neighbours.c:1446
 #, fuzzy
 msgid "# messages discarded due to lack of neighbour record"
 msgstr "# defragmentierter Nachrichten"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1484
+#: src/transport/gnunet-service-transport_neighbours.c:1480
 #, fuzzy
 msgid "# bandwidth quota violations by other peers"
 msgstr "Verfolgt die Bandbreitennutzung von gnunetd"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1500
+#: src/transport/gnunet-service-transport_neighbours.c:1496
 msgid "# ms throttling suggested"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:2775
+#: src/transport/gnunet-service-transport_neighbours.c:1585
 #, fuzzy
+msgid "# SESSION_CONNECT messages sent"
+msgstr "# verschlüsselter PONG Nachrichten empfangen"
+
+#: src/transport/gnunet-service-transport_neighbours.c:1601
+#, fuzzy, c-format
+msgid "Failed to transmit CONNECT message via plugin to %s\n"
+msgstr "`%s' Dienst konnte nicht initialisiert werden.\n"
+
+#: src/transport/gnunet-service-transport_neighbours.c:1641
+#, fuzzy
+msgid "# CONNECT_ACK messages sent"
+msgstr "# verschlüsselter PONG Nachrichten empfangen"
+
+#: src/transport/gnunet-service-transport_neighbours.c:2106
+#, fuzzy
+msgid "# CONNECT messages received"
+msgstr "# verschlüsselter PONG Nachrichten empfangen"
+
+#: src/transport/gnunet-service-transport_neighbours.c:2111
+#, c-format
+msgid "CONNECT request from peer `%s' ignored due impending shutdown\n"
+msgstr ""
+
+#: src/transport/gnunet-service-transport_neighbours.c:2824
+#, fuzzy
+msgid "# CONNECT_ACK messages received"
+msgstr "# verschlüsselter PONG Nachrichten empfangen"
+
+#: src/transport/gnunet-service-transport_neighbours.c:2832
+#, fuzzy
 msgid "# unexpected CONNECT_ACK messages (no peer)"
 msgstr "COUNT Nachrichten versenden"
 
-#: src/transport/gnunet-service-transport_neighbours.c:2790
-#: src/transport/gnunet-service-transport_neighbours.c:2821
+#: src/transport/gnunet-service-transport_neighbours.c:2847
+#: src/transport/gnunet-service-transport_neighbours.c:2882
 #, fuzzy
 msgid "# unexpected CONNECT_ACK messages (not ready)"
 msgstr "COUNT Nachrichten versenden"
 
-#: src/transport/gnunet-service-transport_neighbours.c:2834
+#: src/transport/gnunet-service-transport_neighbours.c:2895
 #, fuzzy
 msgid "# unexpected CONNECT_ACK messages (waiting on ATS)"
 msgstr "COUNT Nachrichten versenden"
 
-#: src/transport/gnunet-service-transport_neighbours.c:2865
+#: src/transport/gnunet-service-transport_neighbours.c:2926
 #, fuzzy
 msgid "# unexpected CONNECT_ACK messages (disconnecting)"
 msgstr "COUNT Nachrichten versenden"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3045
+#: src/transport/gnunet-service-transport_neighbours.c:3106
 #, fuzzy
-msgid "# unexpected SESSION ACK messages"
+msgid "# SESSION_ACK messages received"
+msgstr "# verschlüsselter PONG Nachrichten empfangen"
+
+#: src/transport/gnunet-service-transport_neighbours.c:3122
+#, fuzzy
+msgid "# unexpected SESSION_ACK messages"
 msgstr "# verschlüsselter PONG Nachrichten gesendet"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3098
+#: src/transport/gnunet-service-transport_neighbours.c:3176
 msgid "# SET QUOTA messages ignored (no such peer)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3112
+#: src/transport/gnunet-service-transport_neighbours.c:3190
 msgid "# disconnects due to quota of 0"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3143
+#: src/transport/gnunet-service-transport_neighbours.c:3220
 msgid "# disconnect messages ignored (old format)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3154
+#: src/transport/gnunet-service-transport_neighbours.c:3226
+#, fuzzy
+msgid "# DISCONNECT messages received"
+msgstr "# verschlüsselter PONG Nachrichten empfangen"
+
+#: src/transport/gnunet-service-transport_neighbours.c:3235
 msgid "# disconnect messages ignored (timestamp)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3193
+#: src/transport/gnunet-service-transport_neighbours.c:3271
 msgid "# other peer asked to disconnect from us"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3288
+#: src/transport/gnunet-service-transport_neighbours.c:3366
 #, fuzzy
 msgid "# disconnected from peer upon explicit request"
 msgstr "# gap Anfragen verworfen: Kollision in RT"
@@ -6501,11 +6787,12 @@
 #: src/transport/gnunet-service-transport_plugins.c:210
 #: src/transport/gnunet-service-transport_plugins.c:218
 #: src/transport/gnunet-service-transport_plugins.c:226
+#: src/transport/gnunet-service-transport_plugins.c:234
 #, fuzzy, c-format
 msgid "Missing function `%s' in transport plugin for `%s'\n"
 msgstr "Anwendung `%s' konnte nicht initialisiert werden.\n"
 
-#: src/transport/gnunet-service-transport_plugins.c:233
+#: src/transport/gnunet-service-transport_plugins.c:241
 #, fuzzy, c-format
 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"
@@ -6514,72 +6801,89 @@
 msgid "# address records discarded"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:519
+#: src/transport/gnunet-service-transport_validation.c:526
 #, 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:577
+#: src/transport/gnunet-service-transport_validation.c:584
 #, fuzzy
 msgid "# PING without HELLO messages sent"
 msgstr "# Klartext PING Nachrichten gesendet"
 
-#: src/transport/gnunet-service-transport_validation.c:662
+#: src/transport/gnunet-service-transport_validation.c:685
 msgid "# address revalidations started"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:933
+#: src/transport/gnunet-service-transport_validation.c:969
 #, fuzzy
 msgid "# PING message for different peer received"
 msgstr "# PING Nachrichten erstellt"
 
-#: src/transport/gnunet-service-transport_validation.c:992
+#: src/transport/gnunet-service-transport_validation.c:1019
+#, c-format
+msgid "Plugin `%s' not available, cannot confirm having this address\n"
+msgstr ""
+
+#: src/transport/gnunet-service-transport_validation.c:1029
 msgid "# failed address checks during validation"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1002
+#: src/transport/gnunet-service-transport_validation.c:1032
+#, c-format
+msgid "Address `%s' is not one of my addresses, not confirming PING\n"
+msgstr ""
+
+#: src/transport/gnunet-service-transport_validation.c:1040
 msgid "# successful address checks during validation"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1021
+#: src/transport/gnunet-service-transport_validation.c:1052
 #, c-format
+msgid ""
+"Not confirming PING from peer `%s' with address `%s' since I cannot confirm "
+"having this address.\n"
+msgstr ""
+
+#: src/transport/gnunet-service-transport_validation.c:1060
+#, c-format
 msgid "Received a PING message with validation bug from `%s'\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1075
+#: src/transport/gnunet-service-transport_validation.c:1114
 #, 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:1124
+#: src/transport/gnunet-service-transport_validation.c:1163
 msgid "# PONGs unicast via reliable transport"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1133
+#: src/transport/gnunet-service-transport_validation.c:1172
 msgid "# PONGs multicast to all available addresses"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1260
+#: src/transport/gnunet-service-transport_validation.c:1312
 msgid "# PONGs dropped, no matching pending validation"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1275
+#: src/transport/gnunet-service-transport_validation.c:1327
 msgid "# PONGs dropped, signature expired"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1381
+#: src/transport/gnunet-service-transport_validation.c:1448
 #, 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:259
+#: src/transport/gnunet-transport.c:258
 #, 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:266
+#: src/transport/gnunet-transport.c:265
 #, fuzzy, c-format
 msgid "Received %llu bytes/s (%llu bytes in %s)\n"
 msgstr "GAP hat ungültige Inhalte von `%s' empfangen.\n"
@@ -6599,128 +6903,128 @@
 msgid "Failed to list connections, timeout occured\n"
 msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden."
 
-#: src/transport/gnunet-transport.c:422
+#: src/transport/gnunet-transport.c:423
 msgid "No transport plugins configured, peer will never communicate\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:435
+#: src/transport/gnunet-transport.c:436
 #, c-format
 msgid "No port configured for plugin `%s', cannot test it\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:499
+#: src/transport/gnunet-transport.c:506
 #, 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:522
+#: src/transport/gnunet-transport.c:529
 #, fuzzy, c-format
 msgid "Successfully connected to `%s'\n"
 msgstr "Zugriff verweigert für `%s' bei %s:%d.\n"
 
-#: src/transport/gnunet-transport.c:545
+#: src/transport/gnunet-transport.c:552
 #, c-format
 msgid ""
 "Successfully connected to `%s', starting to send benchmark data in %u Kb "
 "blocks\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:580
+#: src/transport/gnunet-transport.c:587
 #, fuzzy, c-format
 msgid "Disconnected from peer `%s' while benchmarking\n"
 msgstr "`%s' hat sich mit `%s' verbunden.\n"
 
-#: src/transport/gnunet-transport.c:650
+#: src/transport/gnunet-transport.c:660
 #, 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:673
+#: src/transport/gnunet-transport.c:685
 #, fuzzy, c-format
 msgid "Peer `%s': %s %s\n"
 msgstr "Ich bin Peer `%s'.\n"
 
-#: src/transport/gnunet-transport.c:688
+#: src/transport/gnunet-transport.c:704
 #, c-format
 msgid "Peer `%s': %s <unable to resolve address>\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:752
+#: src/transport/gnunet-transport.c:772
 #, fuzzy, c-format
 msgid "Peer `%s' disconnected\n"
 msgstr "# verbundener Knoten"
 
-#: src/transport/gnunet-transport.c:780
+#: src/transport/gnunet-transport.c:802
 #, 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:825
+#: src/transport/gnunet-transport.c:848
 #, c-format
 msgid ""
 "Multiple operations given. Please choose only one operation: %s, %s, %s, %s, "
 "%s, %s\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:831
+#: src/transport/gnunet-transport.c:855
 #, c-format
 msgid ""
 "No operation given. Please choose one operation: %s, %s, %s, %s, %s, %s\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:851 src/transport/gnunet-transport.c:881
-#: src/transport/gnunet-transport.c:903 src/transport/gnunet-transport.c:940
+#: src/transport/gnunet-transport.c:878 src/transport/gnunet-transport.c:910
+#: src/transport/gnunet-transport.c:932 src/transport/gnunet-transport.c:969
 #, 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:858 src/transport/gnunet-transport.c:888
+#: src/transport/gnunet-transport.c:887 src/transport/gnunet-transport.c:917
 #, 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:908
+#: src/transport/gnunet-transport.c:937
 msgid "Starting to receive benchmark data\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:990
+#: src/transport/gnunet-transport.c:1019
 msgid "measure how fast we are receiving data from all peers (until CTRL-C)"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:993
+#: src/transport/gnunet-transport.c:1022
 #, fuzzy
 msgid "connect to a peer"
 msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
 
-#: src/transport/gnunet-transport.c:996
+#: src/transport/gnunet-transport.c:1025
 #, fuzzy
 msgid "provide information about all current connections (once)"
 msgstr "Informationen über andere GNUnet Knoten ausgeben."
 
-#: src/transport/gnunet-transport.c:1002
+#: src/transport/gnunet-transport.c:1031
 #, fuzzy
 msgid ""
 "provide information about all connects and disconnect events (continuously)"
 msgstr "Informationen über andere GNUnet Knoten ausgeben."
 
-#: src/transport/gnunet-transport.c:1005
+#: src/transport/gnunet-transport.c:1034
 #, fuzzy
 msgid "do not resolve hostnames"
 msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
 
-#: src/transport/gnunet-transport.c:1008
+#: src/transport/gnunet-transport.c:1037
 msgid "peer identity"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1012
+#: src/transport/gnunet-transport.c:1041
 msgid "send data for benchmarking to the other peer (until CTRL-C)"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1015
+#: src/transport/gnunet-transport.c:1044
 msgid "test transport configuration (involves external server)"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1026
+#: src/transport/gnunet-transport.c:1055
 #, fuzzy
 msgid "Direct access to transport service."
 msgstr "Der Transportdienst auf Port %d konnte nicht gestartet werden.\n"
@@ -6736,7 +7040,7 @@
 
 #: src/transport/plugin_transport_bluetooth.c:681
 #: src/transport/plugin_transport_bluetooth.c:731
-#: src/transport/plugin_transport_bluetooth.c:1837
+#: src/transport/plugin_transport_bluetooth.c:1854
 #, fuzzy
 msgid "# Bluetooth sessions allocated"
 msgstr "# Sitzungsschlüssel akzeptiert"
@@ -6752,425 +7056,393 @@
 
 #: src/transport/plugin_transport_bluetooth.c:938
 #: src/transport/plugin_transport_bluetooth.c:1023
-#: src/transport/plugin_transport_bluetooth.c:1839
+#: src/transport/plugin_transport_bluetooth.c:1856
 #, fuzzy
 msgid "# Bluetooth MAC endpoints allocated"
 msgstr "# Client Trace-Anfragen empfangen"
 
-#: src/transport/plugin_transport_bluetooth.c:1218
+#: src/transport/plugin_transport_bluetooth.c:1235
 #, fuzzy
 msgid "# HELLO messages received via Bluetooth"
 msgstr "# verschlüsselter PONG Nachrichten empfangen"
 
-#: src/transport/plugin_transport_bluetooth.c:1244
+#: src/transport/plugin_transport_bluetooth.c:1261
 #, fuzzy
 msgid "# fragments received via Bluetooth"
 msgstr "# verworfener Nachrichten"
 
-#: src/transport/plugin_transport_bluetooth.c:1254
+#: src/transport/plugin_transport_bluetooth.c:1271
 #, fuzzy
 msgid "# ACKs received via Bluetooth"
 msgstr "# Bytes empfangen über TCP"
 
-#: src/transport/plugin_transport_bluetooth.c:1311
+#: src/transport/plugin_transport_bluetooth.c:1328
 #, fuzzy
 msgid "# Bluetooth DATA messages discarded due to CRC32 error"
 msgstr "# defragmentierter Nachrichten"
 
-#: src/transport/plugin_transport_bluetooth.c:1423
+#: src/transport/plugin_transport_bluetooth.c:1440
 #, fuzzy
 msgid "# DATA messages received via Bluetooth"
 msgstr "# verschlüsselter PONG Nachrichten empfangen"
 
-#: src/transport/plugin_transport_bluetooth.c:1458
+#: src/transport/plugin_transport_bluetooth.c:1475
 #, fuzzy
 msgid "# Bluetooth DATA messages processed"
 msgstr "# verschlüsselter PONG Nachrichten empfangen"
 
-#: src/transport/plugin_transport_bluetooth.c:1521
+#: src/transport/plugin_transport_bluetooth.c:1538
 #, fuzzy
 msgid "# HELLO beacons sent via Bluetooth"
 msgstr "# Bytes gesendet über UDP"
 
-#: src/transport/plugin_transport_bluetooth.c:1634
+#: src/transport/plugin_transport_bluetooth.c:1651
 msgid "Bluetooth address with invalid size encountered\n"
 msgstr ""
 
-#: src/transport/plugin_transport_bluetooth.c:1818
+#: src/transport/plugin_transport_bluetooth.c:1835
 #, 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: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: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: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: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:2530
+#: src/transport/plugin_transport_http_client.c:1590
 #, 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: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:2721
-#, fuzzy
-msgid "Port is required! Fix in configuration\n"
-msgstr " gconfig\tGTK Konfiguration\n"
-
-#: src/transport/plugin_transport_http.c:1155
-msgid "Port 0, client only mode\n"
-msgstr ""
-
-#: src/transport/plugin_transport_http.c:1175
-#, c-format
-msgid ""
-"Specific IPv4 address `%s' for plugin %s in configuration file is invalid! "
-"Binding to all addresses!\n"
-msgstr ""
-
-#: src/transport/plugin_transport_http.c:1204
-#, c-format
-msgid ""
-"Specific IPv6 address `%s' for plugin %s in configuration file is invalid! "
-"Binding to all addresses!\n"
-msgstr ""
-
-#: src/transport/plugin_transport_http.c:1221
-#: src/transport/plugin_transport_http_server.c:2836
-#, fuzzy, c-format
-msgid "Using external hostname `%s'\n"
-msgstr "Collection `%s' begonnen.\n"
-
-#: src/transport/plugin_transport_http.c:1226
-msgid "No external hostname configured\n"
-msgstr ""
-
-#: 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:1723
-#: src/transport/plugin_transport_http_server.c:2966
+#: src/transport/plugin_transport_http_client.c:1727
+#: src/transport/plugin_transport_http_server.c:2974
 #, fuzzy, c-format
 msgid "Shutting down plugin `%s'\n"
 msgstr "Teste Transport(e) %s\n"
 
-#: src/transport/plugin_transport_http_client.c:1748
-#: src/transport/plugin_transport_http_server.c:3026
+#: src/transport/plugin_transport_http_client.c:1752
+#: src/transport/plugin_transport_http_server.c:3032
 #, 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:1776
-#: src/transport/plugin_transport_http_server.c:2866
+#: src/transport/plugin_transport_http_client.c:1780
+#: src/transport/plugin_transport_http_server.c:2874
 #, 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:1381
+#: src/transport/plugin_transport_http_server.c:1389
 #, 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:1646
+#: src/transport/plugin_transport_http_server.c:1653
 #, c-format
 msgid "Accepting connection (%u of %u) from `%s'\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:1654
+#: src/transport/plugin_transport_http_server.c:1661
 #, c-format
 msgid ""
 "Server reached maximum number connections (%u), rejecting new connection\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:1941
+#: src/transport/plugin_transport_http_server.c:1947
 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:1965
+#: src/transport/plugin_transport_http_server.c:1971
 #, c-format
 msgid "No usable TLS certificate found and creating one at `%s/%s' failed!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:2689
+#: src/transport/plugin_transport_http_server.c:2378
+#, 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_server.c:2410 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_server.c:2427 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_server.c:2538
 #, c-format
+msgid "Found %u addresses to report to NAT service\n"
+msgstr ""
+
+#: src/transport/plugin_transport_http_server.c:2610
+msgid "Disabling IPv6 since it is not supported on this system!\n"
+msgstr ""
+
+#: src/transport/plugin_transport_http_server.c:2697
+#, c-format
 msgid "IPv4 support is %s\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:2703
+#: src/transport/plugin_transport_http_server.c:2711
 #, c-format
 msgid "IPv6 support is %s\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:2728
+#: src/transport/plugin_transport_http_server.c:2718
+#, fuzzy
+msgid "Neither IPv4 nor IPv6 are enabled! Fix in configuration\n"
+msgstr "Netzwerkbekanntmachungen wurden per Konfiguration deaktiviert!\n"
+
+#: src/transport/plugin_transport_http_server.c:2729
+#, fuzzy
+msgid "Port is required! Fix in configuration\n"
+msgstr " gconfig\tGTK Konfiguration\n"
+
+#: src/transport/plugin_transport_http_server.c:2736
 #, fuzzy, c-format
 msgid "Using port %u\n"
 msgstr "Teste Transport(e) %s\n"
 
-#: src/transport/plugin_transport_http_server.c:2743
+#: src/transport/plugin_transport_http_server.c:2751
 #, 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:2753
+#: src/transport/plugin_transport_http_server.c:2761
 #, fuzzy, c-format
 msgid "Binding to IPv4 address %s\n"
 msgstr "Ungültiger Parameter: `%s'\n"
 
-#: src/transport/plugin_transport_http_server.c:2774
+#: src/transport/plugin_transport_http_server.c:2782
 #, 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:2784
+#: src/transport/plugin_transport_http_server.c:2792
 #, fuzzy, c-format
 msgid "Binding to IPv6 address %s\n"
 msgstr "Ungültiger Parameter: `%s'\n"
 
-#: src/transport/plugin_transport_http_server.c:2852
+#: src/transport/plugin_transport_http_server.c:2844
 #, fuzzy, c-format
+msgid "Using external hostname `%s'\n"
+msgstr "Collection `%s' begonnen.\n"
+
+#: src/transport/plugin_transport_http_server.c:2860
+#, fuzzy, c-format
 msgid "Notifying transport only about hostname `%s'\n"
 msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
 
-#: src/transport/plugin_transport_smtp.c:370
+#: src/transport/plugin_transport_smtp.c:223
 #, fuzzy, c-format
 msgid "Received malformed message via %s. Ignored.\n"
 msgstr ""
 "Es wurde eine ungültige Nachricht per SMTP empfangen (ungültige Größe).\n"
 
-#: src/transport/plugin_transport_smtp.c:457
+#: src/transport/plugin_transport_smtp.c:310
 #, fuzzy
 msgid "SMTP filter string to invalid, lacks ': '\n"
 msgstr "SMTP Filterstring zu lang, wurde auf `%s' abgeschnitten\n"
 
-#: src/transport/plugin_transport_smtp.c:466
+#: src/transport/plugin_transport_smtp.c:319
 #, c-format
 msgid "SMTP filter string to long, capped to `%s'\n"
 msgstr "SMTP Filterstring zu lang, wurde auf `%s' abgeschnitten\n"
 
-#: src/transport/plugin_transport_smtp.c:561
-#: src/transport/plugin_transport_smtp.c:571
-#: src/transport/plugin_transport_smtp.c:584
-#: src/transport/plugin_transport_smtp.c:603
-#: src/transport/plugin_transport_smtp.c:626
-#: src/transport/plugin_transport_smtp.c:634
-#: src/transport/plugin_transport_smtp.c:647
-#: src/transport/plugin_transport_smtp.c:658
+#: src/transport/plugin_transport_smtp.c:414
+#: src/transport/plugin_transport_smtp.c:424
+#: src/transport/plugin_transport_smtp.c:437
+#: src/transport/plugin_transport_smtp.c:456
+#: src/transport/plugin_transport_smtp.c:479
+#: src/transport/plugin_transport_smtp.c:487
+#: src/transport/plugin_transport_smtp.c:500
+#: src/transport/plugin_transport_smtp.c:511
 #, fuzzy, c-format
 msgid "SMTP: `%s' failed: %s.\n"
 msgstr "`%s' schlug fehl: %s\n"
 
-#: src/transport/plugin_transport_smtp.c:799
+#: src/transport/plugin_transport_smtp.c:652
 #, fuzzy
 msgid "No email-address specified, can not start SMTP transport.\n"
 msgstr ""
 "Kein Filter für E-Mail angegeben, es kann keine Bekanntmachung erstellt "
 "werden.\n"
 
-#: src/transport/plugin_transport_smtp.c:811
+#: src/transport/plugin_transport_smtp.c:664
 #, fuzzy
 msgid "# bytes received via SMTP"
 msgstr "# Bytes empfangen über TCP"
 
-#: src/transport/plugin_transport_smtp.c:812
+#: src/transport/plugin_transport_smtp.c:665
 #, fuzzy
 msgid "# bytes sent via SMTP"
 msgstr "# Bytes gesendet über TCP"
 
-#: src/transport/plugin_transport_smtp.c:814
+#: src/transport/plugin_transport_smtp.c:667
 #, fuzzy
 msgid "# bytes dropped by SMTP (outgoing)"
 msgstr "# Bytes verworfen von TCP (ausgehend)"
 
-#: src/transport/plugin_transport_tcp.c:626
+#: src/transport/plugin_transport_tcp.c:632
 #, c-format
 msgid "Unexpected address length: %u bytes\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:834
-#: 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:1206
-#: src/transport/plugin_transport_tcp.c:1223
+#: src/transport/plugin_transport_tcp.c:842
+#: src/transport/plugin_transport_tcp.c:931
+#: src/transport/plugin_transport_tcp.c:981
+#: src/transport/plugin_transport_tcp.c:1077
+#: src/transport/plugin_transport_tcp.c:1225
+#: src/transport/plugin_transport_tcp.c:1242
 #, 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:2015
-#: src/transport/plugin_transport_tcp.c:2696
+#: src/transport/plugin_transport_tcp.c:849
+#: src/transport/plugin_transport_tcp.c:1043
+#: src/transport/plugin_transport_tcp.c:2041
+#: src/transport/plugin_transport_tcp.c:2721
 #, fuzzy
 msgid "# TCP sessions active"
 msgstr "# Sitzungsschlüssel akzeptiert"
 
-#: src/transport/plugin_transport_tcp.c:927
+#: src/transport/plugin_transport_tcp.c:935
 #, fuzzy
 msgid "# bytes discarded by TCP (timeout)"
 msgstr "# Bytes verworfen von TCP (ausgehend)"
 
-#: src/transport/plugin_transport_tcp.c:976
+#: src/transport/plugin_transport_tcp.c:984
 #, fuzzy
 msgid "# bytes transmitted via TCP"
 msgstr "# Bytes des Typs %d übertragen"
 
-#: src/transport/plugin_transport_tcp.c:1063
+#: src/transport/plugin_transport_tcp.c:1081
 #, fuzzy
 msgid "# bytes discarded by TCP (disconnect)"
 msgstr "# Bytes verworfen von TCP (ausgehend)"
 
-#: src/transport/plugin_transport_tcp.c:1180
+#: src/transport/plugin_transport_tcp.c:1199
 #, c-format
 msgid "Trying to send with invalid session %p\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:1417
-#: src/transport/plugin_transport_udp.c:1440
+#: src/transport/plugin_transport_tcp.c:1440
+#: src/transport/plugin_transport_udp.c:1471
 msgid "# requests to create session with invalid address"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:1534
+#: src/transport/plugin_transport_tcp.c:1558
 msgid "# transport-service disconnect requests for TCP"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2065
+#: src/transport/plugin_transport_tcp.c:2091
 #, fuzzy
 msgid "# TCP WELCOME messages received"
 msgstr "# verschlüsselter PONG Nachrichten empfangen"
 
-#: src/transport/plugin_transport_tcp.c:2248
+#: src/transport/plugin_transport_tcp.c:2274
 msgid "# bytes received via TCP"
 msgstr "# Bytes empfangen über TCP"
 
-#: src/transport/plugin_transport_tcp.c:2328
+#: src/transport/plugin_transport_tcp.c:2354
 msgid "# network-level TCP disconnect events"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2576 src/util/service.c:589
+#: src/transport/plugin_transport_tcp.c:2602 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:2590
+#: src/transport/plugin_transport_tcp.c:2616
 #, fuzzy
 msgid "Failed to start service.\n"
 msgstr "Fehler beim Starten der Collection.\n"
 
-#: src/transport/plugin_transport_tcp.c:2683
+#: src/transport/plugin_transport_tcp.c:2710
 #, 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:2687
+#: src/transport/plugin_transport_tcp.c:2713
 msgid "TCP transport not listening on any port (client only)\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2691
+#: src/transport/plugin_transport_tcp.c:2716
 #, c-format
 msgid "TCP transport advertises itself as being on port %llu\n"
 msgstr ""
 
-#: src/transport/plugin_transport_udp_broadcasting.c:134
+#: src/transport/plugin_transport_udp_broadcasting.c:173
 #, fuzzy
 msgid "# IPv6 multicast HELLO beacons received via udp"
 msgstr "# verschlüsselter PONG Nachrichten empfangen"
 
-#: src/transport/plugin_transport_udp_broadcasting.c:184
+#: src/transport/plugin_transport_udp_broadcasting.c:222
 #, fuzzy
 msgid "# IPv4 broadcast HELLO beacons received via udp"
 msgstr "# verschlüsselter PONG Nachrichten empfangen"
 
-#: src/transport/plugin_transport_udp_broadcasting.c:402
+#: src/transport/plugin_transport_udp_broadcasting.c:605
 msgid ""
 "Disabling HELLO broadcasting due to friend-to-friend only configuration!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_udp_broadcasting.c:419
+#: src/transport/plugin_transport_udp_broadcasting.c:619
 #, c-format
 msgid "Failed to set IPv4 broadcast option for broadcast socket on port %d\n"
 msgstr ""
 
-#: src/transport/plugin_transport_udp.c:1550
+#: src/transport/plugin_transport_udp.c:1581
 #, 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:2602
+#: src/transport/plugin_transport_udp.c:2635
 #, 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:2616
-#, c-format
+#: src/transport/plugin_transport_udp.c:2649
 msgid ""
-"UDP could not transmit message to `%s': Please check your network "
-"configuration and disable IPv6 if your connection does not have a global "
-"IPv6 address\n"
+"UDP could not transmit IPv6 message! Please check your network configuration "
+"and disable IPv6 if your connection does not have a global IPv6 address\n"
 msgstr ""
 
-#: src/transport/plugin_transport_udp.c:2917
+#: src/transport/plugin_transport_udp.c:2949
 #, fuzzy
 msgid "Failed to open UDP sockets\n"
 msgstr "Fehler beim Binden an UDP6 Port %d.\n"
 
-#: src/transport/plugin_transport_udp.c:3015
+#: src/transport/plugin_transport_udp.c:3046
 #, c-format
 msgid "Given `%s' option is out of range: %llu > %u\n"
 msgstr ""
 
-#: src/transport/plugin_transport_udp.c:3058
+#: src/transport/plugin_transport_udp.c:3089
 #, fuzzy, c-format
 msgid "Invalid IPv6 address: `%s'\n"
 msgstr "Ungültiger Parameter: `%s'\n"
 
-#: src/transport/plugin_transport_udp.c:3117
+#: src/transport/plugin_transport_udp.c:3148
 #, 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:1627
+#: src/transport/plugin_transport_unix.c:1625
 #, fuzzy
 msgid "Failed to open UNIX listen socket\n"
 msgstr "Datei wurde als `%s' gespeichert.\n"
@@ -7184,74 +7456,74 @@
 msgid "# WLAN messages defragmented"
 msgstr "# defragmentierter Nachrichten"
 
-#: src/transport/plugin_transport_wlan.c:688
-#: src/transport/plugin_transport_wlan.c:758
-#: src/transport/plugin_transport_wlan.c:1903
+#: src/transport/plugin_transport_wlan.c:691
+#: src/transport/plugin_transport_wlan.c:763
+#: src/transport/plugin_transport_wlan.c:1910
 #, fuzzy
 msgid "# WLAN sessions allocated"
 msgstr "# Sitzungsschlüssel akzeptiert"
 
-#: src/transport/plugin_transport_wlan.c:863
+#: src/transport/plugin_transport_wlan.c:868
 #, fuzzy
 msgid "# WLAN message fragments sent"
 msgstr "# fragmentierter Nachrichten"
 
-#: src/transport/plugin_transport_wlan.c:887
+#: src/transport/plugin_transport_wlan.c:892
 msgid "# WLAN messages pending (with fragmentation)"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:995
-#: src/transport/plugin_transport_wlan.c:1080
-#: src/transport/plugin_transport_wlan.c:1905
+#: src/transport/plugin_transport_wlan.c:1000
+#: src/transport/plugin_transport_wlan.c:1086
+#: src/transport/plugin_transport_wlan.c:1912
 #, fuzzy
 msgid "# WLAN MAC endpoints allocated"
 msgstr "# Client Trace-Anfragen empfangen"
 
-#: src/transport/plugin_transport_wlan.c:1275
+#: src/transport/plugin_transport_wlan.c:1282
 #, fuzzy
 msgid "# HELLO messages received via WLAN"
 msgstr "# verschlüsselter PONG Nachrichten empfangen"
 
-#: src/transport/plugin_transport_wlan.c:1301
+#: src/transport/plugin_transport_wlan.c:1308
 #, fuzzy
 msgid "# fragments received via WLAN"
 msgstr "# verworfener Nachrichten"
 
-#: src/transport/plugin_transport_wlan.c:1311
+#: src/transport/plugin_transport_wlan.c:1318
 #, fuzzy
 msgid "# ACKs received via WLAN"
 msgstr "# Bytes empfangen über TCP"
 
-#: src/transport/plugin_transport_wlan.c:1368
+#: src/transport/plugin_transport_wlan.c:1375
 #, fuzzy
 msgid "# WLAN DATA messages discarded due to CRC32 error"
 msgstr "# defragmentierter Nachrichten"
 
-#: src/transport/plugin_transport_wlan.c:1489
+#: src/transport/plugin_transport_wlan.c:1496
 #, fuzzy
 msgid "# DATA messages received via WLAN"
 msgstr "# verschlüsselter PONG Nachrichten empfangen"
 
-#: src/transport/plugin_transport_wlan.c:1524
+#: src/transport/plugin_transport_wlan.c:1531
 #, fuzzy
 msgid "# WLAN DATA messages processed"
 msgstr "# verschlüsselter PONG Nachrichten empfangen"
 
-#: src/transport/plugin_transport_wlan.c:1587
+#: src/transport/plugin_transport_wlan.c:1594
 #, fuzzy
 msgid "# HELLO beacons sent via WLAN"
 msgstr "# Bytes gesendet über UDP"
 
-#: src/transport/plugin_transport_wlan.c:1700
+#: src/transport/plugin_transport_wlan.c:1707
 msgid "WLAN address with invalid size encountered\n"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:1884
+#: src/transport/plugin_transport_wlan.c:1891
 #, c-format
 msgid "Helper binary `%s' not SUID, cannot run WLAN transport\n"
 msgstr ""
 
-#: src/transport/transport_api.c:647
+#: src/transport/transport_api.c:682
 #, 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"
@@ -7318,17 +7590,17 @@
 msgid "Need a non-empty hostname for service `%s'.\n"
 msgstr ""
 
-#: src/util/client.c:991
+#: src/util/client.c:989
 #, 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:1003
+#: src/util/client.c:1001
 #, 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:1274
+#: src/util/client.c:1284
 msgid "Could not submit request, not expecting to receive a response.\n"
 msgstr ""
 
@@ -7403,17 +7675,17 @@
 "choices\n"
 msgstr ""
 
-#: src/util/configuration.c:1065
+#: src/util/configuration.c:1066
 #, c-format
 msgid "Recursive expansion suspected, aborting $-expansion for term `%s'\n"
 msgstr ""
 
-#: src/util/configuration.c:1097
+#: src/util/configuration.c:1098
 #, fuzzy, c-format
 msgid "Missing closing `%s' in option `%s'\n"
 msgstr "Konfigurationsdatei `%s' wurde erzeugt.\n"
 
-#: src/util/configuration.c:1170
+#: src/util/configuration.c:1172
 #, c-format
 msgid ""
 "Failed to expand `%s' in `%s' as it is neither found in [PATHS] nor defined "
@@ -7453,73 +7725,68 @@
 "%llu)\n"
 msgstr ""
 
-#: src/util/crypto_ecc.c:940 src/util/crypto_ecc.c:978
-#: src/util/crypto_ecc.c:1096 src/util/crypto_ecc.c:1134
+#: src/util/crypto_ecc.c:789 src/util/crypto_ecc.c:827
+#: src/util/crypto_ecc.c:945 src/util/crypto_ecc.c:983
 #, 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:945 src/util/crypto_ecc.c:1101
+#: src/util/crypto_ecc.c:794 src/util/crypto_ecc.c:950
 #, 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:982 src/util/crypto_ecc.c:1138
+#: src/util/crypto_ecc.c:831 src/util/crypto_ecc.c:987
 msgid "This may be ok if someone is currently generating a private key.\n"
 msgstr ""
 
-#: src/util/crypto_ecc.c:1012 src/util/crypto_ecc.c:1168
+#: src/util/crypto_ecc.c:861 src/util/crypto_ecc.c:1017
 #, 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:1016 src/util/crypto_ecc.c:1172
+#: src/util/crypto_ecc.c:865 src/util/crypto_ecc.c:1021
 msgid "This may be ok if someone is currently generating a key.\n"
 msgstr ""
 
-#: src/util/crypto_ecc.c:1254
+#: src/util/crypto_ecc.c:1103
 #, fuzzy
 msgid "Could not load peer's private key\n"
 msgstr "Konfigurationsdatei `%s' konnte nicht geparst werden.\n"
 
-#: src/util/crypto_ecc.c:1343
+#: src/util/crypto_ecc.c:1207
 #, 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:1393
+#: src/util/crypto_ecc.c:1257
 #, 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
+#: src/util/crypto_ecc.c:1331
 #, 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
+#: src/util/crypto_ecc.c:1388
 #, fuzzy, c-format
 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:320
+#: src/util/crypto_random.c:280
 #, c-format
-msgid "Starting `%s' process to generate entropy\n"
-msgstr ""
-
-#: 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:1185
+#: src/util/disk.c:1184
 #, fuzzy, c-format
 msgid "Expected `%s' to be a directory!\n"
 msgstr "`%s' erwartet, dass `%s' ein Verzeichnis ist!\n"
 
-#: src/util/disk.c:1543 src/util/service.c:1315
+#: src/util/disk.c:1546 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"
@@ -7634,54 +7901,81 @@
 msgstr ""
 "Einen Wert aus der Konfigurationsdatei auf der Standardausgabe ausgeben"
 
-#: src/util/gnunet-ecc.c:60
+#: src/util/gnunet-ecc.c:75
 #, fuzzy, c-format
 msgid "Failed to open `%s': %s\n"
 msgstr "Datei wurde als `%s' gespeichert.\n"
 
-#: src/util/gnunet-ecc.c:66
+#: src/util/gnunet-ecc.c:81
 #, c-format
 msgid "Generating %u keys, please wait"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:82
+#: src/util/gnunet-ecc.c:97
 #, fuzzy, c-format
 msgid ""
 "\n"
 "Failed to write to `%s': %s\n"
 msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
 
-#: src/util/gnunet-ecc.c:92
+#: src/util/gnunet-ecc.c:107
 #, fuzzy, c-format
 msgid ""
 "\n"
 "Finished!\n"
 msgstr "Fertigstellen"
 
-#: src/util/gnunet-ecc.c:95
+#: src/util/gnunet-ecc.c:110
 #, c-format
 msgid ""
 "\n"
 "Error, %u keys not generated\n"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:119
+#: src/util/gnunet-ecc.c:199
+#, fuzzy, c-format
+msgid "Hostkeys file `%s' not found\n"
+msgstr "`%s' fehlgeschlagen: Tabelle nicht gefunden!\n"
+
+#: src/util/gnunet-ecc.c:210
+#, fuzzy, c-format
+msgid "Hostkeys file `%s' is empty\n"
+msgstr "Sitzungsschlüssel von Knoten `%s' konnte nicht überprüft werden.\n"
+
+#: src/util/gnunet-ecc.c:232
+#, fuzzy, c-format
+msgid "Could not read hostkey file: %s\n"
+msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
+
+#: src/util/gnunet-ecc.c:286
 msgid "No hostkey file specified on command line\n"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:168
+#: src/util/gnunet-ecc.c:341
+msgid "list keys included in a file (for testing)"
+msgstr ""
+
+#: src/util/gnunet-ecc.c:344
+msgid "number of keys to list included in a file (for testing)"
+msgstr ""
+
+#: src/util/gnunet-ecc.c:347
 msgid "create COUNT public-private key pairs (for testing)"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:171
+#: src/util/gnunet-ecc.c:350
 msgid "print the public key in ASCII format"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:174
+#: src/util/gnunet-ecc.c:353
 msgid "print the hash of the public key in ASCII format"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:185
+#: src/util/gnunet-ecc.c:356
+msgid "print examples of ECC operations (used for compatibility testing)"
+msgstr ""
+
+#: src/util/gnunet-ecc.c:367
 msgid "Manipulate GNUnet private ECC key files"
 msgstr ""
 
@@ -7704,27 +7998,27 @@
 msgid "Could not find IP of host `%s': %s\n"
 msgstr "IP des Hosts `%s' konnte nicht ermittelt werden: %s\n"
 
-#: src/util/gnunet-uri.c:90
+#: src/util/gnunet-uri.c:84
 #, c-format
 msgid "No URI specified on command line\n"
 msgstr ""
 
-#: src/util/gnunet-uri.c:95
+#: src/util/gnunet-uri.c:89
 #, fuzzy, c-format
 msgid "Invalid URI: does not start with `%s'\n"
 msgstr "Ungültige Antwort auf `%s'.\n"
 
-#: src/util/gnunet-uri.c:102
+#: src/util/gnunet-uri.c:96
 #, c-format
 msgid "Invalid URI: fails to specify subsystem\n"
 msgstr ""
 
-#: src/util/gnunet-uri.c:112
+#: src/util/gnunet-uri.c:106
 #, c-format
 msgid "No handler known for subsystem `%s'\n"
 msgstr ""
 
-#: src/util/gnunet-uri.c:174
+#: src/util/gnunet-uri.c:168
 msgid "Perform default-actions for GNUnet URIs"
 msgstr ""
 
@@ -7761,17 +8055,17 @@
 "variable.\n"
 msgstr ""
 
-#: src/util/os_installation.c:710
+#: src/util/os_installation.c:713
 #, 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:770
+#: src/util/os_installation.c:773
 #, 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:780
+#: src/util/os_installation.c:783
 #, c-format
 msgid "GetExitCodeProcess failed for binary %s (%d).\n"
 msgstr ""
@@ -7781,27 +8075,37 @@
 msgid "Initialization of plugin mechanism failed: %s!\n"
 msgstr "Initialisierung des Plugin Mechanismuses fehlgeschlagen: %s!\n"
 
-#: src/util/plugin.c:144
+#: src/util/plugin.c:148
 #, 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:217
+#: src/util/plugin.c:223
 #, 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:347
+#: src/util/plugin.c:382
 #, fuzzy
 msgid "Could not determine plugin installation path.\n"
 msgstr "Öffentliche IP-Adresse konnte nicht ermittelt werden.\n"
 
-#: src/util/program.c:262 src/util/service.c:1452
+#: src/util/program.c:260 src/util/service.c:1449
 #, fuzzy, c-format
+msgid "Malformed configuration file `%s', exit ...\n"
+msgstr "Fehler beim Speichern der Konfigurationsdatei `%s':"
+
+#: src/util/program.c:270 src/util/service.c:1464
+#, fuzzy, c-format
 msgid "Could not access configuration file `%s'\n"
 msgstr "Konfigurationsdatei `%s' konnte nicht geparst werden.\n"
 
+#: src/util/program.c:275 src/util/service.c:1459
+#, fuzzy
+msgid "Malformed configuration, exit ...\n"
+msgstr "Fehler beim Speichern der Konfigurationsdatei `%s':"
+
 #: src/util/resolver_api.c:198
 #, fuzzy, c-format
 msgid "Must specify `%s' for `%s' in configuration!\n"
@@ -7830,11 +8134,11 @@
 msgid "Could not resolve our FQDN : %s\n"
 msgstr "`%s' konnte nicht aufgelöst werden: %s\n"
 
-#: src/util/scheduler.c:804
+#: src/util/scheduler.c:813
 msgid "Looks like we're busy waiting...\n"
 msgstr ""
 
-#: src/util/scheduler.c:938
+#: src/util/scheduler.c:948
 #, c-format
 msgid "Attempt to cancel dead task %llu!\n"
 msgstr ""
@@ -7948,7 +8252,7 @@
 msgid "do daemonize (detach from terminal)"
 msgstr ""
 
-#: src/util/signal.c:79
+#: src/util/signal.c:89
 #, fuzzy, c-format
 msgid "signal (%d, %p) returned %d.\n"
 msgstr "Aufruf von `%s' gibt %d zurück.\n"
@@ -7957,121 +8261,121 @@
 msgid "b"
 msgstr "b"
 
-#: src/util/strings.c:444
+#: src/util/strings.c:450
 #, c-format
 msgid "Character sets requested were `%s'->`%s'\n"
 msgstr ""
 
-#: src/util/strings.c:572
+#: src/util/strings.c:578
 msgid "Failed to expand `$HOME': environment variable `HOME' not set"
 msgstr ""
 
-#: src/util/strings.c:669
+#: src/util/strings.c:675
 msgid "µs"
 msgstr ""
 
-#: src/util/strings.c:673
+#: src/util/strings.c:679
 msgid "forever"
 msgstr ""
 
-#: src/util/strings.c:675
+#: src/util/strings.c:681
 msgid "0 ms"
 msgstr ""
 
-#: src/util/strings.c:681
+#: src/util/strings.c:687
 msgid "ms"
 msgstr "ms"
 
-#: src/util/strings.c:687
+#: src/util/strings.c:693
 msgid "s"
 msgstr "s"
 
-#: src/util/strings.c:693
+#: src/util/strings.c:699
 msgid "m"
 msgstr "m"
 
-#: src/util/strings.c:699
+#: src/util/strings.c:705
 msgid "h"
 msgstr "h"
 
-#: src/util/strings.c:706
+#: src/util/strings.c:712
 #, fuzzy
 msgid "day"
 msgstr " Tage"
 
-#: src/util/strings.c:708
+#: src/util/strings.c:714
 #, fuzzy
 msgid "days"
 msgstr " Tage"
 
-#: src/util/strings.c:737
+#: src/util/strings.c:743
 msgid "end of time"
 msgstr ""
 
-#: src/util/strings.c:1141
+#: src/util/strings.c:1149
 msgid "IPv6 address did not start with `['\n"
 msgstr ""
 
-#: src/util/strings.c:1149
+#: src/util/strings.c:1157
 msgid "IPv6 address did contain ':' to separate port number\n"
 msgstr ""
 
-#: src/util/strings.c:1155
+#: src/util/strings.c:1163
 msgid "IPv6 address did contain ']' before ':' to separate port number\n"
 msgstr ""
 
-#: src/util/strings.c:1162
+#: src/util/strings.c:1170
 msgid "IPv6 address did contain a valid port number after the last ':'\n"
 msgstr ""
 
-#: src/util/strings.c:1171
+#: src/util/strings.c:1179
 #, fuzzy, c-format
 msgid "Invalid IPv6 address `%s': %s\n"
 msgstr "Ungültiger Parameter: `%s'\n"
 
-#: src/util/strings.c:1377 src/util/strings.c:1393
+#: src/util/strings.c:1385 src/util/strings.c:1401
 msgid "Port not in range\n"
 msgstr ""
 
-#: src/util/strings.c:1402
+#: src/util/strings.c:1410
 #, 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
+#: src/util/strings.c:1493 src/util/strings.c:1524 src/util/strings.c:1572
+#: src/util/strings.c:1593
 #, c-format
 msgid "Invalid format for IP: `%s'\n"
 msgstr "Ungültiges Format für IP: `%s'\n"
 
-#: src/util/strings.c:1543
+#: src/util/strings.c:1550
 #, 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
+#: src/util/strings.c:1602
 #, fuzzy, c-format
 msgid "Invalid format: `%s'\n"
 msgstr "Ungültiger Parameter: `%s'\n"
 
-#: src/util/strings.c:1647
+#: src/util/strings.c:1654
 #, 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
+#: src/util/strings.c:1704
 #, fuzzy, c-format
 msgid "Wrong format `%s' for netmask\n"
 msgstr "Falsches Format `%s' für Netzmaske: %s\n"
 
-#: src/util/strings.c:1728
+#: src/util/strings.c:1735
 #, 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
+#: src/vpn/gnunet-service-vpn.c:550 src/vpn/gnunet-service-vpn.c:1086
 #, fuzzy
-msgid "# Active tunnels"
+msgid "# Active channels"
 msgstr "GNUnet Konfiguration"
 
 #: src/vpn/gnunet-service-vpn.c:642
@@ -8084,104 +8388,104 @@
 msgid "# Bytes dropped in mesh queue (overflow)"
 msgstr "# Bytes verworfen von UDP (outgoing)"
 
-#: src/vpn/gnunet-service-vpn.c:754
+#: src/vpn/gnunet-service-vpn.c:753
 #, fuzzy
-msgid "# Mesh tunnels created"
+msgid "# Mesh channels created"
 msgstr "# dht Anfragen weitergeleitet"
 
-#: src/vpn/gnunet-service-vpn.c:786
+#: src/vpn/gnunet-service-vpn.c:784
 #, fuzzy
-msgid "Failed to setup mesh tunnel!\n"
+msgid "Failed to setup mesh channel!\n"
 msgstr "Statistiken über den Netzwerkverkehr konnten nicht ermittelt werden.\n"
 
-#: src/vpn/gnunet-service-vpn.c:980
+#: src/vpn/gnunet-service-vpn.c:978
 #, c-format
 msgid "Protocol %u not supported, dropping\n"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:1307
+#: src/vpn/gnunet-service-vpn.c:1305
 msgid "# ICMPv4 packets dropped (not allowed)"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:1328
+#: src/vpn/gnunet-service-vpn.c:1326
 msgid "# ICMPv6 packets dropped (not allowed)"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:1533
+#: src/vpn/gnunet-service-vpn.c:1531
 #, fuzzy
 msgid "# Packets received from TUN interface"
 msgstr "Empfangene Client-Nachricht ist ungültig.\n"
 
-#: src/vpn/gnunet-service-vpn.c:1566 src/vpn/gnunet-service-vpn.c:1602
+#: src/vpn/gnunet-service-vpn.c:1564 src/vpn/gnunet-service-vpn.c:1600
 #, c-format
 msgid "Packet received for unmapped destination `%s' (dropping it)\n"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:1612
+#: src/vpn/gnunet-service-vpn.c:1610
 msgid "Received IPv4 packet with options (dropping it)\n"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:1626
+#: src/vpn/gnunet-service-vpn.c:1624
 #, c-format
 msgid "Received packet of unknown protocol %d from TUN (dropping it)\n"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:1708
+#: src/vpn/gnunet-service-vpn.c:1706
 #, fuzzy
 msgid "# ICMP packets received from mesh"
 msgstr "Empfangene Client-Nachricht ist ungültig.\n"
 
-#: src/vpn/gnunet-service-vpn.c:2047
+#: src/vpn/gnunet-service-vpn.c:2045
 #, fuzzy
 msgid "# UDP packets received from mesh"
 msgstr "Empfangene Client-Nachricht ist ungültig.\n"
 
-#: src/vpn/gnunet-service-vpn.c:2202
+#: src/vpn/gnunet-service-vpn.c:2200
 #, fuzzy
 msgid "# TCP packets received from mesh"
 msgstr "Empfangene Client-Nachricht ist ungültig.\n"
 
-#: src/vpn/gnunet-service-vpn.c:2353
+#: src/vpn/gnunet-service-vpn.c:2351
 msgid "Failed to find unallocated IPv4 address in VPN's range\n"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:2408
+#: src/vpn/gnunet-service-vpn.c:2406
 #, 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:2449 src/vpn/gnunet-service-vpn.c:2665
+#: src/vpn/gnunet-service-vpn.c:2447 src/vpn/gnunet-service-vpn.c:2663
 #, fuzzy
 msgid "# Active destinations"
 msgstr "GNUnet Konfiguration"
 
-#: src/vpn/gnunet-service-vpn.c:2717
+#: src/vpn/gnunet-service-vpn.c:2715
 msgid "Failed to allocate IP address for new destination\n"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:2984
+#: src/vpn/gnunet-service-vpn.c:2982
 #, fuzzy
 msgid "Must specify valid IPv6 address"
 msgstr "`%s' ist nicht verfügbar."
 
-#: src/vpn/gnunet-service-vpn.c:3008
+#: src/vpn/gnunet-service-vpn.c:3006
 msgid "Must specify valid IPv6 mask"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:3016
+#: src/vpn/gnunet-service-vpn.c:3014
 msgid "IPv6 support disabled as this system does not support IPv6\n"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:3029
+#: src/vpn/gnunet-service-vpn.c:3027
 #, fuzzy
 msgid "Must specify valid IPv4 address"
 msgstr "`%s' ist nicht verfügbar."
 
-#: src/vpn/gnunet-service-vpn.c:3042
+#: src/vpn/gnunet-service-vpn.c:3040
 msgid "Must specify valid IPv4 mask"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:3052
+#: src/vpn/gnunet-service-vpn.c:3050
 msgid "IPv4 support disabled as this system does not support IPv4\n"
 msgstr ""
 
@@ -8270,6 +8574,28 @@
 msgstr "`%s' schlug bei Datei `%s' fehl. Ort: %s:%d. Fehler: %s\n"
 
 #, fuzzy
+#~ msgid "Internal error %d\n"
+#~ msgstr "Unbekannter Fehler.\n"
+
+#, fuzzy
+#~ msgid "Aborting call to `%s'\n"
+#~ msgstr "Fehler beim Anlegen des Benutzers"
+
+#, fuzzy
+#~ msgid "You are already in a conversation with `%s'.\n"
+#~ msgstr "Konfigurationsdatei `%s' konnte nicht geparst werden.\n"
+
+#, fuzzy
+#~ msgid "Print information about mesh tunnels and peers."
+#~ msgstr "Informationen über andere GNUnet Knoten ausgeben."
+
+#, fuzzy
+#~ msgid ""
+#~ "%s service is lacking key configuration settings (%s). Using default "
+#~ "(%u).\n"
+#~ msgstr "GNUnet Konfiguration"
+
+#, fuzzy
 #~ msgid "Loading block plugin `%s'\n"
 #~ msgstr "Teste Transport(e) %s\n"
 
@@ -8763,10 +9089,6 @@
 #~ msgstr "Benutzer/Gruppe kann nicht zu `%s' gewechselt werden: %s\n"
 
 #, fuzzy
-#~ msgid "You must specify a nickname\n"
-#~ msgstr "Sie müssen einen Empfänger angeben!\n"
-
-#, fuzzy
 #~ msgid "Failed to join room `%s'\n"
 #~ msgstr "Fehler beim Binden an UDP Port %d.\n"
 
@@ -8921,10 +9243,6 @@
 #~ msgstr "Syntaxfehler in Topolgieangabe, Bytes werden übersprungen.\n"
 
 #, fuzzy
-#~ msgid "Could not read hostkeys file `%s'!\n"
-#~ msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
-
-#, fuzzy
 #~ msgid "Could not create configuration for peer number %u on `%s'!\n"
 #~ msgstr "Auf die Namespace Informationen konnte nicht zugegriffen werden.\n"
 
@@ -8989,10 +9307,6 @@
 #~ msgstr "Fehler beim Speichern der Konfigurationsdatei `%s':"
 
 #, fuzzy
-#~ msgid "Failed to transmit message to `%s' service.\n"
-#~ msgstr "`%s' Dienst konnte nicht initialisiert werden.\n"
-
-#, fuzzy
 #~ msgid "Target is %d connections per peer."
 #~ msgstr "Fehler beim Aufbauen einer Verbindung mit gnunetd.\n"
 
@@ -9152,10 +9466,6 @@
 #~ msgstr "Teste Transport(e) %s\n"
 
 #, fuzzy
-#~ msgid "# SET QUOTA messages received"
-#~ msgstr "# verschlüsselter PONG Nachrichten empfangen"
-
-#, fuzzy
 #~ msgid "curl failed for `%s' at %s:%d: `%s'\n"
 #~ msgstr "`%s' schlug fehl bei %s:%d mit dem Fehler: `%s'.\n"
 
@@ -9210,10 +9520,6 @@
 #~ msgstr "# PING Nachrichten erstellt"
 
 #, fuzzy
-#~ msgid "Failed to connect to core service\n"
-#~ msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
-
-#, fuzzy
 #~ msgid "# bytes successfully transmitted by plugins"
 #~ msgstr "# Bytes des Typs %d übertragen"
 

Modified: gnunet/po/es.po
===================================================================
--- gnunet/po/es.po     2013-12-12 21:38:43 UTC (rev 31342)
+++ gnunet/po/es.po     2013-12-12 21:43:39 UTC (rev 31343)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: gnunet 0.9.5a\n"
 "Report-Msgid-Bugs-To: address@hidden"
-"POT-Creation-Date: 2013-11-05 02:07+0100\n"
+"POT-Creation-Date: 2013-12-12 22:41+0100\n"
 "PO-Revision-Date: 2013-02-23 17:50+0100\n"
 "Last-Translator: Miguel Ángel Arruga Vivas <address@hidden>\n"
 "Language-Team: Spanish <address@hidden>\n"
@@ -40,7 +40,7 @@
 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:216 src/testbed/gnunet-service-testbed_peers.c:1010
+#: src/arm/gnunet-arm.c:216 src/testbed/gnunet-service-testbed_peers.c:1013
 #, fuzzy
 msgid "Message was sent successfully"
 msgstr "El almacén de nombres añadió el registro satisfactoriamente"
@@ -50,12 +50,12 @@
 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:220 src/testbed/gnunet-service-testbed_peers.c:1014
+#: src/arm/gnunet-arm.c:220 src/testbed/gnunet-service-testbed_peers.c:1017
 #, fuzzy
 msgid "We disconnected from ARM before we could send a request"
 msgstr "# desconexiones del par debido a una petición explícita"
 
-#: src/arm/gnunet-arm.c:222 src/testbed/gnunet-service-testbed_peers.c:1016
+#: src/arm/gnunet-arm.c:222 src/testbed/gnunet-service-testbed_peers.c:1019
 msgid "ARM API is busy"
 msgstr ""
 
@@ -66,47 +66,47 @@
 
 # Miguel: "timeout" lo he traducido como plazo, pero no se
 # si hay alguna palabra que lo describa mejor.
-#: src/arm/gnunet-arm.c:226 src/testbed/gnunet-service-testbed_peers.c:1020
+#: src/arm/gnunet-arm.c:226 src/testbed/gnunet-service-testbed_peers.c:1023
 #, fuzzy
 msgid "Request timed out"
 msgstr "plazo de consenso"
 
-#: src/arm/gnunet-arm.c:228 src/testbed/gnunet-service-testbed_peers.c:1022
+#: src/arm/gnunet-arm.c:228 src/testbed/gnunet-service-testbed_peers.c:1025
 #, fuzzy
 msgid "Unknown request status"
 msgstr "Usuario desconocido «%s»\n"
 
-#: src/arm/gnunet-arm.c:244 src/testbed/gnunet-service-testbed_peers.c:1038
+#: src/arm/gnunet-arm.c:244 src/testbed/gnunet-service-testbed_peers.c:1041
 #, fuzzy, c-format
 msgid "%s is stopped"
 msgstr "# elementos almacenados"
 
-#: src/arm/gnunet-arm.c:246 src/testbed/gnunet-service-testbed_peers.c:1040
+#: src/arm/gnunet-arm.c:246 src/testbed/gnunet-service-testbed_peers.c:1043
 #, fuzzy, c-format
 msgid "%s is starting"
 msgstr "'%s' comenzando\n"
 
-#: src/arm/gnunet-arm.c:248 src/testbed/gnunet-service-testbed_peers.c:1042
+#: src/arm/gnunet-arm.c:248 src/testbed/gnunet-service-testbed_peers.c:1045
 #, c-format
 msgid "%s is stopping"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:250 src/testbed/gnunet-service-testbed_peers.c:1044
+#: src/arm/gnunet-arm.c:250 src/testbed/gnunet-service-testbed_peers.c:1047
 #, fuzzy, c-format
 msgid "%s is starting already"
 msgstr "'%s' comenzando\n"
 
-#: src/arm/gnunet-arm.c:252 src/testbed/gnunet-service-testbed_peers.c:1046
+#: src/arm/gnunet-arm.c:252 src/testbed/gnunet-service-testbed_peers.c:1049
 #, c-format
 msgid "%s is stopping already"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:254 src/testbed/gnunet-service-testbed_peers.c:1048
+#: src/arm/gnunet-arm.c:254 src/testbed/gnunet-service-testbed_peers.c:1051
 #, c-format
 msgid "%s is started already"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:256 src/testbed/gnunet-service-testbed_peers.c:1050
+#: src/arm/gnunet-arm.c:256 src/testbed/gnunet-service-testbed_peers.c:1053
 #, c-format
 msgid "%s is stopped already"
 msgstr ""
@@ -114,12 +114,12 @@
 # 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:258 src/testbed/gnunet-service-testbed_peers.c:1052
+#: src/arm/gnunet-arm.c:258 src/testbed/gnunet-service-testbed_peers.c:1055
 #, fuzzy, c-format
 msgid "%s service is not known to ARM"
 msgstr "El servicio «%s» es desconocido para el ARM.\n"
 
-#: src/arm/gnunet-arm.c:260 src/testbed/gnunet-service-testbed_peers.c:1054
+#: src/arm/gnunet-arm.c:260 src/testbed/gnunet-service-testbed_peers.c:1057
 #, fuzzy, c-format
 msgid "%s service failed to start"
 msgstr "El proceso del servicio no devolvió un estado\n"
@@ -130,7 +130,7 @@
 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:264 src/testbed/gnunet-service-testbed_peers.c:1058
+#: src/arm/gnunet-arm.c:264 src/testbed/gnunet-service-testbed_peers.c:1061
 #, fuzzy, c-format
 msgid "%.s Unknown result code."
 msgstr "Código de respuesta del ARM desconocido.\n"
@@ -154,147 +154,147 @@
 msgid "Failed to stop the ARM service: %s\n"
 msgstr "Fichero almacenado en '%s'.\n"
 
-#: src/arm/gnunet-arm.c:420
+#: src/arm/gnunet-arm.c:421
 #, fuzzy, c-format
 msgid "Failed to send a request to start the `%s' service: %%s\n"
 msgstr "Se produjo un fallo al enviar una petición al servicio de transporte\n"
 
-#: src/arm/gnunet-arm.c:429
+#: src/arm/gnunet-arm.c:431
 #, 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:465
+#: src/arm/gnunet-arm.c:468
 #, 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:476
+#: src/arm/gnunet-arm.c:479
 #, 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:512
+#: src/arm/gnunet-arm.c:517
 #, 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:519
+#: src/arm/gnunet-arm.c:525
 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:523
+#: src/arm/gnunet-arm.c:530
 msgid "Running services:\n"
 msgstr "Servicios en ejecución:\n"
 
-#: src/arm/gnunet-arm.c:605
+#: src/arm/gnunet-arm.c:612
 #, c-format
 msgid "Now only monitoring, press CTRL-C to stop.\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:636
+#: src/arm/gnunet-arm.c:643
 #, c-format
 msgid "Stopped %s.\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:639
+#: src/arm/gnunet-arm.c:646
 #, fuzzy, c-format
 msgid "Starting %s...\n"
 msgstr "Iniciando descarga «%s».\n"
 
-#: src/arm/gnunet-arm.c:642
+#: src/arm/gnunet-arm.c:649
 #, c-format
 msgid "Stopping %s...\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:653
+#: src/arm/gnunet-arm.c:660
 #, fuzzy, c-format
 msgid "Unknown status %u for service %s.\n"
 msgstr "Solicitando incio del servicio «%s».\n"
 
-#: src/arm/gnunet-arm.c:717
+#: src/arm/gnunet-arm.c:724
 msgid "stop all GNUnet services"
 msgstr "detiene todos los servicios de GNUnet"
 
-#: src/arm/gnunet-arm.c:719
+#: src/arm/gnunet-arm.c:726
 msgid "start a particular service"
 msgstr "inicia un servicio particular"
 
-#: src/arm/gnunet-arm.c:721
+#: src/arm/gnunet-arm.c:728
 msgid "stop a particular service"
 msgstr "detiene un servicio particular"
 
-#: src/arm/gnunet-arm.c:723
+#: src/arm/gnunet-arm.c:730
 msgid "start all GNUnet default services"
 msgstr "inicia todos los servicios predeterminados de GNUnet"
 
-#: src/arm/gnunet-arm.c:726
+#: src/arm/gnunet-arm.c:733
 msgid "stop and start all GNUnet default services"
 msgstr "detiene e inicia todos los servicios predeterminados de GNUnet"
 
-#: src/arm/gnunet-arm.c:729
+#: src/arm/gnunet-arm.c:736
 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:732
+#: src/arm/gnunet-arm.c:739
 msgid "monitor ARM activities"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:734
+#: src/arm/gnunet-arm.c:741
 msgid "don't print status messages"
 msgstr "no imprime mensajes de estado"
 
-#: src/arm/gnunet-arm.c:737
+#: src/arm/gnunet-arm.c:744
 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:739
+#: src/arm/gnunet-arm.c:746
 msgid "list currently running services"
 msgstr "lista de servicios actualmente en ejecución"
 
-#: src/arm/gnunet-arm.c:741
+#: src/arm/gnunet-arm.c:748
 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:743
+#: src/arm/gnunet-arm.c:750
 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:754
+#: src/arm/gnunet-arm.c:761
 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:268
+#: src/arm/gnunet-service-arm.c:266
 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:304
+#: src/arm/gnunet-service-arm.c:302
 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:519
+#: src/arm/gnunet-service-arm.c:528
 #, 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:526
+#: src/arm/gnunet-service-arm.c:535
 #, c-format
 msgid "Starting service `%s'\n"
 msgstr "Iniciando el servicio «%s»\n"
 
 # Miguel: ¿Alguna idea para "socket"?
-#: src/arm/gnunet-service-arm.c:625
+#: src/arm/gnunet-service-arm.c:634
 #, 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:647
+#: src/arm/gnunet-service-arm.c:656
 #, c-format
 msgid "Unable to bind listening socket for service `%s' to address `%s': %s\n"
 msgstr ""
@@ -305,49 +305,49 @@
 # no es exactamente lo mismo que el texto en inglés, pero
 # es fiel a la realidad puesto que el ARM reinicia
 # las conexiones cuando se caen.
-#: src/arm/gnunet-service-arm.c:676
+#: src/arm/gnunet-service-arm.c:685
 #, 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:809
+#: src/arm/gnunet-service-arm.c:821
 #, c-format
 msgid "Preparing to stop `%s'\n"
 msgstr "Preparando para parar «%s»\n"
 
-#: src/arm/gnunet-service-arm.c:1070
+#: src/arm/gnunet-service-arm.c:1085
 #, c-format
 msgid "Restarting service `%s'.\n"
 msgstr "Reiniciando el servicio «%s»\n"
 
-#: src/arm/gnunet-service-arm.c:1163
+#: src/arm/gnunet-service-arm.c:1178
 msgid "exit"
 msgstr "salida"
 
-#: src/arm/gnunet-service-arm.c:1168
+#: src/arm/gnunet-service-arm.c:1183
 msgid "signal"
 msgstr "señal"
 
-#: src/arm/gnunet-service-arm.c:1173
+#: src/arm/gnunet-service-arm.c:1188
 msgid "unknown"
 msgstr "desconocido"
 
-#: src/arm/gnunet-service-arm.c:1179
+#: src/arm/gnunet-service-arm.c:1194
 #, 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:1201
+#: src/arm/gnunet-service-arm.c:1216
 #, 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:1216
+#: src/arm/gnunet-service-arm.c:1231
 #, 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:1463
+#: src/arm/gnunet-service-arm.c:1484
 #, c-format
 msgid "Starting default services `%s'\n"
 msgstr "Iniciando servicios predeterminados «%s»\n"
@@ -355,13 +355,13 @@
 # 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:1474
+#: src/arm/gnunet-service-arm.c:1495
 #, 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:1488
+#: src/arm/gnunet-service-arm.c:1509
 msgid ""
 "No default services configured, GNUnet will not really start right now.\n"
 msgstr ""
@@ -382,8 +382,8 @@
 msgid "Received last message for %s \n"
 msgstr "Recibido último mensaje para %s\n"
 
-#: src/ats/gnunet-service-ats_addresses.c:1475
-#: src/ats/gnunet-service-ats_addresses.c:1519
+#: src/ats/gnunet-service-ats_addresses.c:1946
+#: src/ats/gnunet-service-ats_addresses.c:1990
 #, c-format
 msgid ""
 "Could not load quota for network `%s':  `%s', assigning default bandwidth "
@@ -393,12 +393,12 @@
 "de banda predeterminado %llu\n"
 
 # Miguel: "Outbound" lo he traducido como salida en todo el texto.
-#: src/ats/gnunet-service-ats_addresses.c:1482
+#: src/ats/gnunet-service-ats_addresses.c:1953
 #, 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:1490
+#: src/ats/gnunet-service-ats_addresses.c:1961
 #, c-format
 msgid ""
 "No outbound quota configured for network `%s', assigning default bandwidth "
@@ -408,12 +408,12 @@
 "de banda predeterminado %llu\n"
 
 # Miguel: "Inbound" lo he traducido como entrada en todo el texto.
-#: src/ats/gnunet-service-ats_addresses.c:1526
+#: src/ats/gnunet-service-ats_addresses.c:1997
 #, 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:1534
+#: src/ats/gnunet-service-ats_addresses.c:2005
 #, c-format
 msgid ""
 "No outbound quota configure for network `%s', assigning default bandwidth "
@@ -422,36 +422,36 @@
 "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:1700
+#: src/ats/gnunet-service-ats_addresses.c:2175
 #, c-format
 msgid "Initializing solver `%s '`%s'\n"
 msgstr ""
 
-#: src/ats/gnunet-service-ats_addresses.c:1703
+#: src/ats/gnunet-service-ats_addresses.c:2178
 #, 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
+#: src/ats/gnunet-service-ats_addresses.c:2201
 #, fuzzy
 msgid "Failed to initialize solver!\n"
 msgstr "¡No se puede inicializar el resolvedor!\n"
 
-#: src/ats/libgnunet_plugin_ats_mlp.c:868
+#: src/ats/plugin_ats_mlp.c:868
 msgid "Problem size too large, cannot allocate memory!\n"
 msgstr ""
 
-#: src/ats/libgnunet_plugin_ats_mlp.c:1239
+#: src/ats/plugin_ats_mlp.c:1281
 #, 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/libgnunet_plugin_ats_mlp.c:1286
+#: src/ats/plugin_ats_mlp.c:1328
 #, c-format
 msgid "Updating address property `%s' for peer `%s' %p not added before\n"
 msgstr ""
 
-#: src/ats/libgnunet_plugin_ats_mlp.c:2010
+#: src/ats/plugin_ats_mlp.c:2059
 #, fuzzy, c-format
 msgid ""
 "Adjusting inconsistent outbound quota configuration for network `%s', is "
@@ -460,7 +460,7 @@
 "No hay configurada una cuota de salida para la red «%s», asignando el ancho "
 "de banda predeterminado %llu\n"
 
-#: src/ats/libgnunet_plugin_ats_mlp.c:2018
+#: src/ats/plugin_ats_mlp.c:2067
 #, fuzzy, c-format
 msgid ""
 "Adjusting inconsistent inbound quota configuration for network `%s', is %llu "
@@ -470,26 +470,26 @@
 "ancho de banda predeterminado (%llu)\n"
 
 # Miguel: "Outbound" lo he traducido como salida en todo el texto.
-#: src/ats/libgnunet_plugin_ats_mlp.c:2028
+#: src/ats/plugin_ats_mlp.c:2077
 #, 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/libgnunet_plugin_ats_mlp.c:2036
+#: src/ats/plugin_ats_mlp.c:2085
 #, 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/libgnunet_plugin_ats_mlp.c:2047
+#: src/ats/plugin_ats_mlp.c:2096
 #, 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/libgnunet_plugin_ats_proportional.c:1438
+#: src/ats/plugin_ats_proportional.c:1514
 #, fuzzy, c-format
 msgid "Invalid network type `%u' `%s': Disconnect!\n"
 msgstr "No se encontró la IP del host «%s»: %s\n"
@@ -524,13 +524,13 @@
 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:520
-#: src/transport/gnunet-transport.c:807
+#: src/ats-tool/gnunet-ats.c:347 src/namestore/gnunet-namestore.c:547
+#: src/transport/gnunet-transport.c:829
 #, c-format
 msgid "Service `%s' is not running\n"
 msgstr "El servicio «%s» no está ejecutandose\n"
 
-#: src/ats-tool/gnunet-ats.c:359 src/transport/gnunet-transport.c:816
+#: src/ats-tool/gnunet-ats.c:359 src/transport/gnunet-transport.c:838
 #, c-format
 msgid "Failed to parse peer identity `%s'\n"
 msgstr "Se produjo un fallo al procesar la identidad del par «%s»\n"
@@ -618,15 +618,15 @@
 msgid "Print information about ATS state"
 msgstr "Imprime información acerca del estado del ATS"
 
-#: src/consensus/gnunet-consensus-profiler.c:394
+#: src/consensus/gnunet-consensus-profiler.c:420
 msgid "number of peers in consensus"
 msgstr "número de pares en consenso"
 
-#: src/consensus/gnunet-consensus-profiler.c:397
+#: src/consensus/gnunet-consensus-profiler.c:423
 msgid "how many peers receive one value?"
 msgstr "¿cuántos pares reciben un valor?"
 
-#: src/consensus/gnunet-consensus-profiler.c:400
+#: src/consensus/gnunet-consensus-profiler.c:426
 #: 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"
@@ -634,206 +634,262 @@
 
 # Miguel: "timeout" lo he traducido como plazo, pero no se
 # si hay alguna palabra que lo describa mejor.
-#: src/consensus/gnunet-consensus-profiler.c:403
+#: src/consensus/gnunet-consensus-profiler.c:429
 msgid "consensus timeout"
 msgstr "plazo de consenso"
 
-#: src/consensus/gnunet-consensus-profiler.c:406
+#: src/consensus/gnunet-consensus-profiler.c:432
 msgid "be more verbose (print received values)"
 msgstr ""
 
-#: 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/conversation_api.c:557
+#: src/conversation/conversation_api_call.c:468
+#, fuzzy
+msgid "Connection to conversation service lost, trying to reconnect\n"
+msgstr ""
+"El cliente se desconectó del servicio principal, tratando de reconectar.\n"
 
-#: src/conversation/gnunet-conversation.c:186
+#: src/conversation/gnunet-conversation.c:252
 #, c-format
-msgid ""
-"Incoming call from `%s'.\n"
-"Please /accept or /cancel the call.\n"
+msgid "Incoming call from `%s'. Please /accept #%u or /cancel %u the call.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:206
-#: src/conversation/gnunet-conversation.c:315
+#: src/conversation/gnunet-conversation.c:274
 #, c-format
-msgid "Call terminated: %s\n"
+msgid "Call from `%s' terminated\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:226
+#: src/conversation/gnunet-conversation.c:307
 #, c-format
+msgid "Call from `%s' suspended by other user\n"
+msgstr ""
+
+#: src/conversation/gnunet-conversation.c:312
+#, c-format
+msgid "Call from `%s' resumed by other user\n"
+msgstr ""
+
+#: src/conversation/gnunet-conversation.c:330
+#, c-format
 msgid "Ego `%s' no longer available, phone is now down.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:239
+#: src/conversation/gnunet-conversation.c:344
 #, 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
+#: src/conversation/gnunet-conversation.c:357
 #, c-format
 msgid "Phone active on line %u\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:284
-msgid "Resolved address. Now ringing other party.\n"
+#: src/conversation/gnunet-conversation.c:379
+#, c-format
+msgid "Resolved address of `%s'. Now ringing other party.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:290
+#: src/conversation/gnunet-conversation.c:386
 #, fuzzy, c-format
-msgid "Connection established to `%s': %s\n"
+msgid "Connection established to `%s'\n"
 msgstr "'%s' falló en %s: %d con error: '%s'.\n"
 
-#: src/conversation/gnunet-conversation.c:298
+#: src/conversation/gnunet-conversation.c:393
 #, 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"
+#: src/conversation/gnunet-conversation.c:400
+msgid "Call terminated\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:385
+#: src/conversation/gnunet-conversation.c:406
 #, c-format
+msgid "Connection to `%s' suspended (by other user)\n"
+msgstr ""
+
+#: src/conversation/gnunet-conversation.c:412
+#, c-format
+msgid "Connection to `%s' resumed (by other user)\n"
+msgstr ""
+
+#: src/conversation/gnunet-conversation.c:479
+#, c-format
 msgid "Unknown command `%s'\n"
 msgstr "Comando desconocido «%s»\n"
 
-#: src/conversation/gnunet-conversation.c:401
-#: src/conversation/gnunet-conversation.c:409
+#: src/conversation/gnunet-conversation.c:495
+#: src/conversation/gnunet-conversation.c:509
 #, 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"
+#: src/conversation/gnunet-conversation.c:502
+#: src/conversation/gnunet-conversation.c:552
+msgid "You are calling someone else already, hang up first!\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:424
-#: src/conversation/gnunet-conversation.c:438
+#: src/conversation/gnunet-conversation.c:517
+#: src/conversation/gnunet-conversation.c:565
 #, c-format
-msgid "You are already in a conversation with `%s', refusing to call `%s'.\n"
+msgid "You are answering call from `%s', hang up or suspend that call first!\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"
+#: src/conversation/gnunet-conversation.c:576
+msgid "There is no incoming call to accept here!\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
+#: src/conversation/gnunet-conversation.c:593
 #, c-format
-msgid "You are trying to call `%s', cannot accept incoming calls right now.\n"
+msgid "There is no incoming call `%s' to accept right now!\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:521
+#: src/conversation/gnunet-conversation.c:621
 msgid "We currently do not have an address.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:542
+#: src/conversation/gnunet-conversation.c:644
 #, c-format
 msgid "We are currently trying to locate the private key for the ego `%s'.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:547
+#: src/conversation/gnunet-conversation.c:649
 #, c-format
 msgid "We are listening for incoming calls for ego `%s' on line %u.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:553
+#: src/conversation/gnunet-conversation.c:655
+#: src/conversation/gnunet-conversation.c:679
 #, c-format
-msgid "The phone is rining. `%s' is trying to call us.\n"
+msgid "You are having a conversation with `%s'.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:559
-#, c-format
-msgid "You are having a conversation with `%s'.\n"
+#: src/conversation/gnunet-conversation.c:660
+msgid ""
+"We had an internal error setting up our phone line. You can still make "
+"calls.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:564
+#: src/conversation/gnunet-conversation.c:669
 #, 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
+#: src/conversation/gnunet-conversation.c:674
 #, 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"
+#: src/conversation/gnunet-conversation.c:693
+msgid "Calls waiting:\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:595
+#: src/conversation/gnunet-conversation.c:699
+#, fuzzy, c-format
+msgid "#%u: `%s'\n"
+msgstr "Par «%s»\n"
+
+#: src/conversation/gnunet-conversation.c:727
+#: src/conversation/gnunet-conversation.c:742
+msgid "There is no call that could be suspended right now.\n"
+msgstr ""
+
+#: src/conversation/gnunet-conversation.c:775
+#: src/conversation/gnunet-conversation.c:791
+msgid "There is no call that could be resumed right now.\n"
+msgstr ""
+
+#: src/conversation/gnunet-conversation.c:798
+#, c-format
+msgid "Already talking with `%s', cannot resume a call right now.\n"
+msgstr ""
+
+#: src/conversation/gnunet-conversation.c:807
+msgid "There is no incoming call to resume here!\n"
+msgstr ""
+
+#: src/conversation/gnunet-conversation.c:824
+#, c-format
+msgid "There is no incoming call `%s' to resume right now!\n"
+msgstr ""
+
+#: src/conversation/gnunet-conversation.c:859
 msgid "There is no call that could be cancelled right now.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:626
+#: src/conversation/gnunet-conversation.c:867
+msgid "There is no incoming call to refuse here!\n"
+msgstr ""
+
+#: src/conversation/gnunet-conversation.c:884
+#, c-format
+msgid "There is no incoming call `%s' to refuse right now!\n"
+msgstr ""
+
+#: src/conversation/gnunet-conversation.c:911
 msgid "Use `/address' to find out which address this phone should have in GNS"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:628
+#: src/conversation/gnunet-conversation.c:913
 msgid "Use `/call USER.gnu' to call USER"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:630
-msgid "Use `/accept MESSAGE' to accept an incoming call"
+#: src/conversation/gnunet-conversation.c:915
+msgid "Use `/accept #NUM' to accept incoming call #NUM"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:632
-msgid "Use `/cancel MESSAGE' to reject or terminate a call"
+#: src/conversation/gnunet-conversation.c:917
+msgid "Use `/suspend' to suspend the active call"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:634
+#: src/conversation/gnunet-conversation.c:919
+msgid ""
+"Use `/resume [#NUM]' to resume a call, #NUM is needed to resume incoming "
+"calls, no argument is needed to resume the current outgoing call."
+msgstr ""
+
+#: src/conversation/gnunet-conversation.c:921
+msgid "Use `/cancel' to reject or terminate a call"
+msgstr ""
+
+#: src/conversation/gnunet-conversation.c:923
 #, fuzzy
 msgid "Use `/status' to print status information"
 msgstr "ser prolijo (imprime información de progreso)"
 
-#: src/conversation/gnunet-conversation.c:636
+#: src/conversation/gnunet-conversation.c:925
 #, fuzzy
 msgid "Use `/quit' to terminate gnunet-conversation"
 msgstr "Use «/quit» para finalizar «gnunet-chat»"
 
-#: src/conversation/gnunet-conversation.c:638
+#: src/conversation/gnunet-conversation.c:927
 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
+#: src/conversation/gnunet-conversation.c:1082
 #, 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
+#: src/conversation/gnunet-conversation.c:1095
 #, fuzzy, c-format
 msgid "Our ego `%s' was deleted!\n"
 msgstr "El pseudónimo '%s' fue borrado.\n"
 
-#: src/conversation/gnunet-conversation.c:841
+#: src/conversation/gnunet-conversation.c:1130
 #, 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
+#: src/conversation/gnunet-conversation.c:1156
 msgid "sets the NAME of the ego to use for the phone (and name resolution)"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:870
+#: src/conversation/gnunet-conversation.c:1159
 msgid "sets the LINE to use for the phone"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:885
+#: src/conversation/gnunet-conversation.c:1174
 msgid "Enables having a conversation with other GNUnet users."
 msgstr ""
 
@@ -861,7 +917,7 @@
 
 #: 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/multicast/gnunet-multicast.c:70 src/revocation/gnunet-revocation.c:517
 #: src/template/gnunet-template.c:70
 msgid "help text"
 msgstr "texto de ayuda"
@@ -876,13 +932,13 @@
 msgstr ""
 
 #: src/conversation/gnunet-helper-audio-playback.c:211
-#: src/conversation/gnunet-helper-audio-record.c:363
+#: src/conversation/gnunet-helper-audio-record.c:362
 #, 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
+#: src/conversation/gnunet-helper-audio-record.c:367
 #, fuzzy, c-format
 msgid "pa_stream_new() failed: %s\n"
 msgstr "stadísticas (%s) falló: %s\n"
@@ -893,37 +949,37 @@
 msgstr ""
 
 #: src/conversation/gnunet-helper-audio-playback.c:243
-#: src/conversation/gnunet-helper-audio-record.c:394
+#: src/conversation/gnunet-helper-audio-record.c:393
 #, 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
+#: src/conversation/gnunet-helper-audio-record.c:416
 #, 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
+#: src/conversation/gnunet-helper-audio-record.c:422
 #, 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
+#: src/conversation/gnunet-helper-audio-record.c:437
 #, 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
+#: src/conversation/gnunet-helper-audio-record.c:443
 #, 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
+#: src/conversation/gnunet-helper-audio-record.c:449
 #, fuzzy
 msgid "pa_mainloop_run() failed.\n"
 msgstr "La operación ha fallado.\n"
@@ -942,54 +998,55 @@
 msgid "Got signal, exiting.\n"
 msgstr ""
 
-#: src/conversation/gnunet-helper-audio-record.c:301
+#: src/conversation/gnunet-helper-audio-record.c:300
 #, fuzzy
 msgid "Stream successfully created.\n"
 msgstr "Conectado satisfactoriamente a «%s»\n"
 
-#: src/conversation/gnunet-helper-audio-record.c:306
+#: src/conversation/gnunet-helper-audio-record.c:305
 #, 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
+#: src/conversation/gnunet-helper-audio-record.c:313
 #, c-format
 msgid "Buffer metrics: maxlength=%u, fragsize=%u\n"
 msgstr ""
 
-#: src/conversation/gnunet-helper-audio-record.c:318
+#: src/conversation/gnunet-helper-audio-record.c:317
 #, c-format
 msgid "Using sample spec '%s', channel map '%s'.\n"
 msgstr ""
 
-#: src/conversation/gnunet-helper-audio-record.c:325
+#: src/conversation/gnunet-helper-audio-record.c:324
 #, fuzzy, c-format
 msgid "Connected to device %s (%u, %ssuspended).\n"
 msgstr "Conectado a %s.\n"
 
-#: src/conversation/gnunet-helper-audio-record.c:334
+#: src/conversation/gnunet-helper-audio-record.c:333
 #, c-format
 msgid "Stream error: %s\n"
 msgstr ""
 
-#: src/conversation/gnunet-helper-audio-record.c:381
+#: src/conversation/gnunet-helper-audio-record.c:380
 #, 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
+#: src/conversation/gnunet-service-conversation.c:825
 msgid "Mesh audio channel not ready; audio data dropped\n"
 msgstr ""
 
-#: src/conversation/gnunet-service-conversation.c:700
+#: src/conversation/gnunet-service-conversation.c:915
 #, c-format
-msgid "No available phone for incoming call on line %u, sending BUSY signal\n"
+msgid ""
+"No available phone for incoming call on line %u, sending HANG_UP signal\n"
 msgstr ""
 
-#: src/conversation/gnunet-service-conversation.c:1054
-#, c-format
-msgid "Received incoming tunnel on port %u\n"
-msgstr ""
+#: src/conversation/gnunet-service-conversation.c:1302
+#, fuzzy, c-format
+msgid "Received incoming channel on port %u\n"
+msgstr "Desconectado de %s\n"
 
 #: src/conversation/microphone.c:121
 #, fuzzy
@@ -1006,7 +1063,7 @@
 msgid "Could not start playback audio helper.\n"
 msgstr "No se pudo empezar a publicar.\n"
 
-#: src/core/core_api.c:761
+#: src/core/core_api.c:765
 msgid "Client was disconnected from core service, trying to reconnect.\n"
 msgstr ""
 "El cliente se desconectó del servicio principal, tratando de reconectar.\n"
@@ -1017,27 +1074,26 @@
 msgstr "Par «%s»\n"
 
 #: src/core/gnunet-core.c:110 src/core/gnunet-core.c:138
-#: src/transport/gnunet-transport.c:601 src/transport/gnunet-transport.c:625
+#: src/transport/gnunet-transport.c:609 src/transport/gnunet-transport.c:634
 #, 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:112 src/transport/gnunet-transport.c:603
+#: src/core/gnunet-core.c:112 src/transport/gnunet-transport.c:611
 msgid "Connected to"
 msgstr "Conectado a"
 
-#: src/core/gnunet-core.c:140 src/transport/gnunet-transport.c:627
+#: src/core/gnunet-core.c:140 src/transport/gnunet-transport.c:636
 msgid "Disconnected from"
 msgstr "Desconectado de"
 
-#: src/core/gnunet-core.c:164 src/mesh/gnunet-mesh.c:174
-#: src/peerinfo-tool/gnunet-peerinfo.c:645
+#: src/core/gnunet-core.c:164 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:201 src/transport/gnunet-transport.c:999
+#: src/core/gnunet-core.c:201 src/transport/gnunet-transport.c:1028
 msgid "provide information about all current connections (continuously)"
 msgstr ""
 "provee información sobre todas las conexiones actuales (de forma continua)"
@@ -1082,42 +1138,42 @@
 msgid "# key exchanges initiated"
 msgstr "# intercambio de claves iniciados"
 
-#: src/core/gnunet-service-core_kx.c:701
+#: src/core/gnunet-service-core_kx.c:708
 msgid "# key exchanges stopped"
 msgstr "# intercambio de claves parados"
 
-#: src/core/gnunet-service-core_kx.c:764
+#: src/core/gnunet-service-core_kx.c:771
 msgid "# old ephemeral keys ignored"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:770
+#: src/core/gnunet-service-core_kx.c:777
 #, fuzzy
 msgid "# ephemeral keys received"
 msgstr "# mapas de tipos recibidos"
 
-#: src/core/gnunet-service-core_kx.c:804
+#: src/core/gnunet-service-core_kx.c:811
 #, 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:820
+#: src/core/gnunet-service-core_kx.c:827
 #, fuzzy
 msgid "# EPHEMERAL_KEY messages decrypted"
 msgstr "# mensajes «SET_KEY» descifrados"
 
-#: src/core/gnunet-service-core_kx.c:923
-#: src/transport/gnunet-service-transport_validation.c:938
+#: src/core/gnunet-service-core_kx.c:930
+#: src/transport/gnunet-service-transport_validation.c:974
 msgid "# PING messages received"
 msgstr "# mensajes PING recibidos"
 
-#: src/core/gnunet-service-core_kx.c:931
+#: src/core/gnunet-service-core_kx.c:938
 #, 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:958
+#: src/core/gnunet-service-core_kx.c:965
 #, c-format
 msgid ""
 "Received PING from `%s' for different identity: I am `%s', PONG identity: `"
@@ -1126,84 +1182,84 @@
 "Recibido PING de «%s» para una identidad diferente: Yo soy «%s», identidad "
 "del PONG: «%s»\n"
 
-#: src/core/gnunet-service-core_kx.c:975
+#: src/core/gnunet-service-core_kx.c:982
 msgid "# PONG messages created"
 msgstr "# mensajes PONG creados"
 
-#: src/core/gnunet-service-core_kx.c:1001
+#: src/core/gnunet-service-core_kx.c:1008
 msgid "# sessions terminated by timeout"
 msgstr "# sesiones terminadas por plazo de expiración"
 
-#: src/core/gnunet-service-core_kx.c:1011
+#: src/core/gnunet-service-core_kx.c:1018
 msgid "# keepalive messages sent"
 msgstr "# mensajes «keepalive» enviados"
 
-#: src/core/gnunet-service-core_kx.c:1068
-#: src/transport/gnunet-service-transport_validation.c:1233
+#: src/core/gnunet-service-core_kx.c:1075
+#: src/transport/gnunet-service-transport_validation.c:1285
 msgid "# PONG messages received"
 msgstr "# mensajes PONG recibidos"
 
-#: src/core/gnunet-service-core_kx.c:1074
+#: src/core/gnunet-service-core_kx.c:1081
 #, fuzzy
 msgid "# PONG messages dropped (connection down)"
 msgstr "# mensajes PONG recibidos"
 
-#: src/core/gnunet-service-core_kx.c:1079
+#: src/core/gnunet-service-core_kx.c:1086
 #, 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:1109
+#: src/core/gnunet-service-core_kx.c:1116
 msgid "# PONG messages decrypted"
 msgstr "# mensajes PONG descifrados"
 
-#: src/core/gnunet-service-core_kx.c:1143
+#: src/core/gnunet-service-core_kx.c:1150
 msgid "# session keys confirmed via PONG"
 msgstr "# claves de sesión confirmadas vía PONG"
 
-#: src/core/gnunet-service-core_kx.c:1153
+#: src/core/gnunet-service-core_kx.c:1160
 #, fuzzy
 msgid "# timeouts prevented via PONG"
 msgstr "# bytes recibidos vía TCP"
 
-#: src/core/gnunet-service-core_kx.c:1160
+#: src/core/gnunet-service-core_kx.c:1167
 msgid "# rekey operations confirmed via PONG"
 msgstr "# operaciones de cambio de clave confirmadas vía PONG"
 
-#: src/core/gnunet-service-core_kx.c:1300
+#: src/core/gnunet-service-core_kx.c:1307
 #, fuzzy
 msgid "# DATA message dropped (out of order)"
 msgstr "# bytes omitidos (fuera de secuencia)"
 
-#: src/core/gnunet-service-core_kx.c:1307
+#: src/core/gnunet-service-core_kx.c:1314
 #, 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:1310
+#: src/core/gnunet-service-core_kx.c:1317
 #, fuzzy
 msgid "# sessions terminated by key expiration"
 msgstr "# sesiones terminadas por plazo de expiración"
 
-#: src/core/gnunet-service-core_kx.c:1353
-#: src/core/gnunet-service-core_kx.c:1378
+#: src/core/gnunet-service-core_kx.c:1360
+#: src/core/gnunet-service-core_kx.c:1385
 msgid "# bytes dropped (duplicates)"
 msgstr "# bytes omitidos (duplicados)"
 
-#: src/core/gnunet-service-core_kx.c:1365
+#: src/core/gnunet-service-core_kx.c:1372
 msgid "# bytes dropped (out of sequence)"
 msgstr "# bytes omitidos (fuera de secuencia)"
 
-#: src/core/gnunet-service-core_kx.c:1406
+#: src/core/gnunet-service-core_kx.c:1413
 msgid "# bytes dropped (ancient message)"
 msgstr "# bytes omitidos (mensaje antiguo)"
 
-#: src/core/gnunet-service-core_kx.c:1414
+#: src/core/gnunet-service-core_kx.c:1421
 msgid "# bytes of payload decrypted"
 msgstr "# bytes de «payload» descifrados"
 
-#: src/core/gnunet-service-core_kx.c:1445
+#: src/core/gnunet-service-core_kx.c:1452
 #, fuzzy
 msgid "# PAYLOAD dropped (out of order)"
 msgstr "# bytes omitidos (fuera de secuencia)"
@@ -1230,14 +1286,16 @@
 #: 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/dht/gnunet-service-xdht_neighbours.c:662
+#: src/dht/gnunet-service-xdht_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:3052
+#: src/transport/gnunet-service-transport_neighbours.c:1123
+#: src/transport/gnunet-service-transport_neighbours.c:1132
+#: src/transport/gnunet-service-transport_neighbours.c:2860
+#: src/transport/gnunet-service-transport_neighbours.c:3129
 msgid "# peers connected"
 msgstr "# pares conectados"
 
@@ -1312,7 +1370,7 @@
 #: src/namecache/plugin_namecache_sqlite.c:52
 #: src/namestore/plugin_namestore_postgres.c:52
 #: src/namestore/plugin_namestore_sqlite.c:52
-#: src/testbed/testbed_api_hosts.c:69 src/util/crypto_ecc.c:53
+#: src/testbed/testbed_api_hosts.c:69 src/util/crypto_ecc.c:51
 #: src/include/gnunet_common.h:602 src/include/gnunet_common.h:611
 #: src/scalarproduct/scalarproduct.h:61
 #, c-format
@@ -1348,89 +1406,89 @@
 "Se produjo un fallo al transmitir la petición de eliminación a la base de "
 "datos.\n"
 
-#: src/datastore/datastore_api.c:393
+#: src/datastore/datastore_api.c:394
 msgid "# queue entry timeouts"
 msgstr "# expiraciones de plazo en la cola de entradas"
 
-#: src/datastore/datastore_api.c:437
+#: src/datastore/datastore_api.c:443
 msgid "# queue overflows"
 msgstr "# desbordamientos de la cola"
 
-#: src/datastore/datastore_api.c:465
+#: src/datastore/datastore_api.c:471
 msgid "# queue entries created"
 msgstr "# entradas creadas en la cola"
 
-#: src/datastore/datastore_api.c:483
+#: src/datastore/datastore_api.c:491
 msgid "# Requests dropped from datastore queue"
 msgstr "# Peticiones omitidas de la cola del almacén de datos"
 
-#: src/datastore/datastore_api.c:525
+#: src/datastore/datastore_api.c:533
 msgid "# datastore connections (re)created"
 msgstr "# conexiones a almacenes de datos (re)creadas"
 
-#: src/datastore/datastore_api.c:608 src/scalarproduct/scalarproduct_api.c:279
+#: src/datastore/datastore_api.c:616 src/scalarproduct/scalarproduct_api.c:279
 msgid "# transmission request failures"
 msgstr "# fallos en peticiones de transmisión"
 
-#: src/datastore/datastore_api.c:630
+#: src/datastore/datastore_api.c:638
 msgid "# bytes sent to datastore"
 msgstr "# bytes mandados al almacén de datos"
 
-#: src/datastore/datastore_api.c:762
+#: src/datastore/datastore_api.c:770
 msgid "Failed to receive status response from database."
 msgstr ""
 "Se produjo un fallo al recibir el estado de respuesta de la base de datos."
 
-#: src/datastore/datastore_api.c:776
+#: src/datastore/datastore_api.c:784
 msgid "Error reading response from datastore service"
 msgstr "Error leyendo respuesta del servicio de almacenamiento de datos"
 
-#: src/datastore/datastore_api.c:788 src/datastore/datastore_api.c:794
+#: src/datastore/datastore_api.c:796 src/datastore/datastore_api.c:802
 msgid "Invalid error message received from datastore service"
 msgstr ""
 "Mensaje de error no válido recibido del servicio de almacenamiento de datos"
 
-#: src/datastore/datastore_api.c:798
+#: src/datastore/datastore_api.c:806
 msgid "# status messages received"
 msgstr "# mensajes de estado recibidos"
 
-#: src/datastore/datastore_api.c:868
+#: src/datastore/datastore_api.c:876
 msgid "# PUT requests executed"
 msgstr "# peticiones «PUT» ejecutadas"
 
-#: src/datastore/datastore_api.c:935
+#: src/datastore/datastore_api.c:944
 msgid "# RESERVE requests executed"
 msgstr "# peticiones «RESERVE» ejecutadas"
 
-#: src/datastore/datastore_api.c:996
+#: src/datastore/datastore_api.c:1005
 msgid "# RELEASE RESERVE requests executed"
 msgstr "# Peticiones «RELEASE RESERVE» ejecutadas"
 
-#: src/datastore/datastore_api.c:1055
+#: src/datastore/datastore_api.c:1065
 msgid "# UPDATE requests executed"
 msgstr "# peticiones «UPDATE» ejecutadas"
 
-#: src/datastore/datastore_api.c:1119
+#: src/datastore/datastore_api.c:1129
 msgid "# REMOVE requests executed"
 msgstr "# peticiones «REMOVE» ejecutadas"
 
-#: src/datastore/datastore_api.c:1164
+#: src/datastore/datastore_api.c:1174
 msgid "Failed to receive response from database.\n"
 msgstr "Se produjo un fallo al recibir la respuesta de la base de datos.\n"
 
-#: src/datastore/datastore_api.c:1223
+#: src/datastore/datastore_api.c:1233
 msgid "# Results received"
 msgstr "# Resultados recibidos"
 
-#: src/datastore/datastore_api.c:1290
+#: src/datastore/datastore_api.c:1300
 msgid "# GET REPLICATION requests executed"
 msgstr "# peticiones «GET REPLICATION» ejecutadas"
 
-#: src/datastore/datastore_api.c:1353
+#: src/datastore/datastore_api.c:1363
 msgid "# GET ZERO ANONYMITY requests executed"
 msgstr "# peticiones «GET ZERO ANONYMITY» ejecutadas"
 
-#: src/datastore/datastore_api.c:1414
+#: src/datastore/datastore_api.c:1424
 msgid "# GET requests executed"
 msgstr "# peticiones «GET» ejecutadas"
 
@@ -1464,12 +1522,12 @@
 msgstr "# bytes purgados (baja prioridad)"
 
 #: src/datastore/gnunet-service-datastore.c:483
-#: src/gns/gnunet-gns-helper-service-w32.c:155
+#: src/gns/gnunet-gns-helper-service-w32.c:187
 msgid "Transmission to client failed!\n"
 msgstr "¡La transmisión con el cliente ha fallado!\n"
 
 #: src/datastore/gnunet-service-datastore.c:514
-#: src/gns/gnunet-gns-helper-service-w32.c:183
+#: src/gns/gnunet-gns-helper-service-w32.c:215
 msgid "Shutdown in progress, aborting transmission.\n"
 msgstr "Apagado en proceso, abortando transmisión.\n"
 
@@ -1805,242 +1863,299 @@
 "Inicianco una petición «PUT» a la DHT de GNUnet para insertar «DATA» bajo "
 "«KEY»."
 
-#: src/dht/gnunet-service-dht.c:172
+#: src/dht/gnunet-service-dht.c:172 src/dht/gnunet-service-xdht.c:172
 msgid "Failed to connect to transport service!\n"
 msgstr "¡Se produjo un fallo al conectar con el servicio de transporte!\n"
 
 #: src/dht/gnunet-service-dht_clients.c:417
+#: src/dht/gnunet-service-xdht_clients.c:417
 msgid "# GET requests from clients injected"
 msgstr "# peticiones «GET» inyectadas de clientes"
 
 #: src/dht/gnunet-service-dht_clients.c:511
+#: src/dht/gnunet-service-xdht_clients.c:511
 msgid "# PUT requests received from clients"
 msgstr "# peticiones «PUT» recibidas de clientes"
 
 #: src/dht/gnunet-service-dht_clients.c:595
+#: src/dht/gnunet-service-xdht_clients.c:595
 msgid "# GET requests received from clients"
 msgstr "# peticiones «GET» recibidas de clientes"
 
 #: src/dht/gnunet-service-dht_clients.c:796
+#: src/dht/gnunet-service-xdht_clients.c:796
 msgid "# GET STOP requests received from clients"
 msgstr "# peticiones «GET STOP» recibidas de clientes"
 
 #: src/dht/gnunet-service-dht_clients.c:1037
+#: src/dht/gnunet-service-xdht_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:1050
+#: src/dht/gnunet-service-xdht_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:1087
+#: src/dht/gnunet-service-xdht_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:1110
+#: src/dht/gnunet-service-xdht_clients.c:1110
 msgid "# RESULTS queued for clients"
 msgstr "# Resultados (RESULTS) encolados para clientes"
 
 #: src/dht/gnunet-service-dht_clients.c:1164
 #: src/dht/gnunet-service-dht_clients.c:1206
+#: src/dht/gnunet-service-xdht_clients.c:1164
+#: src/dht/gnunet-service-xdht_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:1174
+#: src/dht/gnunet-service-xdht_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"
 
 #: src/dht/gnunet-service-dht_datacache.c:68
+#: src/dht/gnunet-service-xdht_datacache.c:68
 #, c-format
 msgid "%s request received, but have no datacache!\n"
 msgstr "¡Petición %s recibida, pero no tiene caché de datos!\n"
 
 #: src/dht/gnunet-service-dht_datacache.c:78
+#: src/dht/gnunet-service-xdht_datacache.c:78
 msgid "# ITEMS stored in datacache"
 msgstr "# Elementos (ITEMS) almacenados en la caché de datos"
 
 #: src/dht/gnunet-service-dht_datacache.c:165
+#: src/dht/gnunet-service-xdht_datacache.c:165
 msgid "# Good RESULTS found in datacache"
 msgstr "# Buenos resultados (RESULTS) encontrados en la caché de datos"
 
 #: src/dht/gnunet-service-dht_datacache.c:176
+#: src/dht/gnunet-service-xdht_datacache.c:176
 msgid "# Duplicate RESULTS found in datacache"
 msgstr "# Resultados (RESULTS) duplicados encontrados en la caché de datos"
 
 #: src/dht/gnunet-service-dht_datacache.c:182
+#: src/dht/gnunet-service-xdht_datacache.c:182
 msgid "# Invalid RESULTS found in datacache"
 msgstr "# Resultados (RESULTS) no válidos encontrados en la caché de datos"
 
 #: src/dht/gnunet-service-dht_datacache.c:188
+#: src/dht/gnunet-service-xdht_datacache.c:188
 msgid "# Irrelevant RESULTS found in datacache"
 msgstr "# Resultados (RESULTS) irrelevantes encontrados en la caché de datos"
 
 #: src/dht/gnunet-service-dht_datacache.c:200
+#: src/dht/gnunet-service-xdht_datacache.c:200
 msgid "# Unsupported RESULTS found in datacache"
 msgstr "# Resultados (RESULTS) no soportados encontrados en la caché de datos"
 
 #: src/dht/gnunet-service-dht_datacache.c:203
+#: src/dht/gnunet-service-xdht_datacache.c:203
 #, c-format
 msgid "Unsupported block type (%u) in local response!\n"
 msgstr "¡Tipo de bloque no soportado (%u) en respuesta local!\n"
 
 #: src/dht/gnunet-service-dht_datacache.c:234
+#: src/dht/gnunet-service-xdht_datacache.c:234
 msgid "# GET requests given to datacache"
 msgstr "# Peticiones «GET» realizadas a la caché de datos"
 
 #: src/dht/gnunet-service-dht_hello.c:82
+#: src/dht/gnunet-service-xdht_hello.c:82
 msgid "# HELLOs obtained from peerinfo"
 msgstr "# «HELLO» obtenidos de «peerinfo»"
 
 #: src/dht/gnunet-service-dht_neighbours.c:516
+#: src/dht/gnunet-service-xdht_neighbours.c:516
 msgid "# Preference updates given to core"
 msgstr "# Actualizaciones de preferencias dadas al servicio principal"
 
 #: src/dht/gnunet-service-dht_neighbours.c:610
+#: src/dht/gnunet-service-xdht_neighbours.c:610
 msgid "# FIND PEER messages initiated"
 msgstr "# mensajes «FIND PEER» iniciados"
 
 #: src/dht/gnunet-service-dht_neighbours.c:764
+#: src/dht/gnunet-service-xdht_neighbours.c:764
 msgid "# Queued messages discarded (peer disconnected)"
 msgstr "# Mensajes encolados descartados (par desconectado)"
 
 #: src/dht/gnunet-service-dht_neighbours.c:819
+#: src/dht/gnunet-service-xdht_neighbours.c:819
 msgid "# Bytes transmitted to other peers"
 msgstr "# Bytes transmitidos a otros pares"
 
 #: src/dht/gnunet-service-dht_neighbours.c:857
+#: src/dht/gnunet-service-xdht_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:889
+#: src/dht/gnunet-service-xdht_neighbours.c:889
 #, fuzzy
 msgid "# requests TTL-dropped"
 msgstr "# peticiones unidas"
 
 #: src/dht/gnunet-service-dht_neighbours.c:1093
 #: src/dht/gnunet-service-dht_neighbours.c:1130
+#: src/dht/gnunet-service-xdht_neighbours.c:1093
+#: src/dht/gnunet-service-xdht_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:1108
 #: src/dht/gnunet-service-dht_neighbours.c:1145
+#: src/dht/gnunet-service-xdht_neighbours.c:1108
+#: src/dht/gnunet-service-xdht_neighbours.c:1145
 msgid "# Peer selection failed"
 msgstr "# Selecciones de pares fallidas"
 
 #: src/dht/gnunet-service-dht_neighbours.c:1287
+#: src/dht/gnunet-service-xdht_neighbours.c:1287
 msgid "# PUT requests routed"
 msgstr "# Peticiones «PUT» encaminadas"
 
 #: src/dht/gnunet-service-dht_neighbours.c:1316
+#: src/dht/gnunet-service-xdht_neighbours.c:1316
 msgid "# PUT messages queued for transmission"
 msgstr "# mensajes «PUT» encolados para transmisión"
 
 #: src/dht/gnunet-service-dht_neighbours.c:1323
 #: src/dht/gnunet-service-dht_neighbours.c:1440
 #: src/dht/gnunet-service-dht_neighbours.c:1543
+#: src/dht/gnunet-service-xdht_neighbours.c:1323
+#: src/dht/gnunet-service-xdht_neighbours.c:1440
+#: src/dht/gnunet-service-xdht_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:1405
+#: src/dht/gnunet-service-xdht_neighbours.c:1405
 msgid "# GET requests routed"
 msgstr "# Peticiones «GET» encaminadas"
 
 #: src/dht/gnunet-service-dht_neighbours.c:1432
+#: src/dht/gnunet-service-xdht_neighbours.c:1432
 msgid "# GET messages queued for transmission"
 msgstr "# Mensajes «GET» encolados para transmisión"
 
 #: src/dht/gnunet-service-dht_neighbours.c:1550
+#: src/dht/gnunet-service-xdht_neighbours.c:1550
 msgid "# RESULT messages queued for transmission"
 msgstr "# Mensajes «RESULT» encolados para transmisión"
 
 #: src/dht/gnunet-service-dht_neighbours.c:1637
+#: src/dht/gnunet-service-xdht_neighbours.c:1637
 msgid "# P2P PUT requests received"
 msgstr "# Peticiones «PUT» P2P recibidas"
 
 #: src/dht/gnunet-service-dht_neighbours.c:1640
+#: src/dht/gnunet-service-xdht_neighbours.c:1640
 #, fuzzy
 msgid "# P2P PUT bytes received"
 msgstr "# Peticiones «PUT» P2P recibidas"
 
 #: src/dht/gnunet-service-dht_neighbours.c:1803
+#: src/dht/gnunet-service-xdht_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:1811
+#: src/dht/gnunet-service-xdht_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:1904
+#: src/dht/gnunet-service-xdht_neighbours.c:1904
 msgid "# P2P GET requests received"
 msgstr "# Peticiones «GET» P2P recibidas"
 
 #: src/dht/gnunet-service-dht_neighbours.c:1907
+#: src/dht/gnunet-service-xdht_neighbours.c:1907
 #, fuzzy
 msgid "# P2P GET bytes received"
 msgstr "# Peticiones «GET» P2P recibidas"
 
 #: src/dht/gnunet-service-dht_neighbours.c:1961
+#: src/dht/gnunet-service-xdht_neighbours.c:1961
 msgid "# P2P FIND PEER requests processed"
 msgstr "# Peticiones «FIND PEER» P2P procesadas"
 
 #: src/dht/gnunet-service-dht_neighbours.c:1975
+#: src/dht/gnunet-service-xdht_neighbours.c:1975
 msgid "# P2P GET requests ONLY routed"
 msgstr "# Peticiones «GET» P2P SOLAMENTE encaminadas"
 
 #: src/dht/gnunet-service-dht_neighbours.c:2052
+#: src/dht/gnunet-service-xdht_neighbours.c:2052
 msgid "# P2P RESULTS received"
 msgstr "# Resultados (RESULTS) P2P recibidos"
 
 #: src/dht/gnunet-service-dht_neighbours.c:2055
+#: src/dht/gnunet-service-xdht_neighbours.c:2055
 #, fuzzy
 msgid "# P2P RESULT bytes received"
 msgstr "# Resultados (RESULTS) P2P recibidos"
 
-#: src/dht/gnunet-service-dht_nse.c:59
+#: src/dht/gnunet-service-dht_nse.c:59 src/dht/gnunet-service-xdht_nse.c:59
 msgid "# Network size estimates received"
 msgstr "# Estimaciones del tamaño de red recibidas"
 
 #: src/dht/gnunet-service-dht_routing.c:211
+#: src/dht/gnunet-service-xdht_routing.c:211
 msgid "# Good REPLIES matched against routing table"
 msgstr ""
 "# Buenas respuestas (REPLIES) encontradas en la tabla de encaminamiento"
 
 #: src/dht/gnunet-service-dht_routing.c:220
+#: src/dht/gnunet-service-xdht_routing.c:220
 msgid "# Duplicate REPLIES matched against routing table"
 msgstr ""
 "# Respuestas (REPLIES) duplicadas encontradas en la tabla de encaminamiento"
 
 #: src/dht/gnunet-service-dht_routing.c:226
+#: src/dht/gnunet-service-xdht_routing.c:226
 msgid "# Invalid REPLIES matched against routing table"
 msgstr ""
 "# Respuestas (REPLIES) no válidas encontradas en la tabla de encaminamiento"
 
 #: src/dht/gnunet-service-dht_routing.c:232
+#: src/dht/gnunet-service-xdht_routing.c:232
 msgid "# Irrelevant REPLIES matched against routing table"
 msgstr ""
 "# Respuestas (REPLIES) irrelevantes encontradas en la tabla de encaminamiento"
 
 #: src/dht/gnunet-service-dht_routing.c:244
+#: src/dht/gnunet-service-xdht_routing.c:244
 msgid "# Unsupported REPLIES matched against routing table"
 msgstr ""
 "# Respuestas (REPLIES) no soportadas encontradas en la tabla de "
 "encaminamiento"
 
 #: src/dht/gnunet-service-dht_routing.c:317
+#: src/dht/gnunet-service-xdht_routing.c:317
 msgid "# Entries removed from routing table"
 msgstr "# Entradas eliminadas de la tabla de encaminamiento"
 
 #: src/dht/gnunet-service-dht_routing.c:399
+#: src/dht/gnunet-service-xdht_routing.c:399
 msgid "# Entries added to routing table"
 msgstr "# Entradas añadidas a la tabla de encaminamiento"
 
 #: src/dht/gnunet-service-dht_routing.c:417
+#: src/dht/gnunet-service-xdht_routing.c:417
 msgid "# DHT requests combined"
 msgstr "# Peticiones a la DHT combinadas"
 
@@ -2058,14 +2173,14 @@
 msgid "Block of type %u is malformed\n"
 msgstr "El bloque del tipo %u está mal formado\n"
 
-#: src/dns/dnsparser.c:239
+#: src/dns/dnsparser.c:257
 #, 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:800
+#: src/dns/dnsparser.c:856
 #, c-format
 msgid "Failed to convert UTF-8 name `%s' to DNS IDNA format: %s\n"
 msgstr ""
@@ -2158,20 +2273,20 @@
 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:3498
+#: src/dns/gnunet-service-dns.c:1049 src/exit/gnunet-daemon-exit.c:3499
 #, 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:3555
+#: src/dns/gnunet-service-dns.c:1069 src/exit/gnunet-daemon-exit.c:3556
 msgid "need a valid IPv4 or IPv6 address\n"
 msgstr "se necesita una dirección IPv4 o IPv6 válida\n"
 
-#: src/dv/gnunet-dv.c:165
+#: src/dv/gnunet-dv.c:166
 msgid "verbose output"
 msgstr ""
 
-#: src/dv/gnunet-dv.c:174
+#: src/dv/gnunet-dv.c:175
 #, fuzzy
 msgid "Print information about DV state"
 msgstr "Imprime información acerca del estado del ATS"
@@ -2182,18 +2297,19 @@
 msgstr "Hay registros de servicios duplicados para «%s:%u»\n"
 
 #: src/exit/gnunet-daemon-exit.c:853
-msgid "# Bytes transmitted via mesh tunnels"
+#, fuzzy
+msgid "# Bytes transmitted via mesh channels"
 msgstr "# Bytes transmitidos vía túneles MESH"
 
 #: 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
+#: src/exit/gnunet-daemon-exit.c:2651 src/vpn/gnunet-service-vpn.c:1407
+#: src/vpn/gnunet-service-vpn.c:1797 src/vpn/gnunet-service-vpn.c:1960
 msgid "# ICMPv4 packets dropped (type not allowed)"
 msgstr "# Paquetes ICMPv4 omitidos (tipo no permitido)"
 
 #: 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
+#: src/exit/gnunet-daemon-exit.c:2710 src/vpn/gnunet-service-vpn.c:1463
+#: src/vpn/gnunet-service-vpn.c:1856 src/vpn/gnunet-service-vpn.c:1993
 msgid "# ICMPv6 packets dropped (type not allowed)"
 msgstr "# Paquetes ICMPv6 omitidos (tipo no permitido)"
 
@@ -2290,13 +2406,13 @@
 msgid "# ICMP service requests received via mesh"
 msgstr "# Peticiones de servicio ICMP recibidas vía mesh"
 
-#: src/exit/gnunet-daemon-exit.c:2636 src/vpn/gnunet-service-vpn.c:1399
-#: src/vpn/gnunet-service-vpn.c:1956
+#: src/exit/gnunet-daemon-exit.c:2636 src/vpn/gnunet-service-vpn.c:1397
+#: src/vpn/gnunet-service-vpn.c:1954
 msgid "# ICMPv4 packets dropped (impossible PT to v6)"
 msgstr "# Paquetes ICMPv4 omitidos (imposible atravesar v6)"
 
-#: 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
+#: src/exit/gnunet-daemon-exit.c:2695 src/vpn/gnunet-service-vpn.c:1433
+#: src/vpn/gnunet-service-vpn.c:1445 src/vpn/gnunet-service-vpn.c:1844
 msgid "# ICMPv6 packets dropped (impossible PT to v4)"
 msgstr "# Paquetes ICMPv6 omitidos (imposible atravesar v4)"
 
@@ -2316,30 +2432,31 @@
 msgid "# UDP requests dropped (no such service)"
 msgstr "# Peticiones UDP omitidas (no existe tal servicio)"
 
-#: src/exit/gnunet-daemon-exit.c:3024
-msgid "# Inbound MESH tunnels created"
+#: src/exit/gnunet-daemon-exit.c:3025
+#, fuzzy
+msgid "# Inbound MESH channels created"
 msgstr "# Túneles interiores MESH creados"
 
-#: src/exit/gnunet-daemon-exit.c:3285
+#: src/exit/gnunet-daemon-exit.c:3286
 #, 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:3299 src/exit/gnunet-daemon-exit.c:3311
+#: src/exit/gnunet-daemon-exit.c:3300 src/exit/gnunet-daemon-exit.c:3312
 #, 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:3322
+#: src/exit/gnunet-daemon-exit.c:3323
 #, 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:3511
+#: src/exit/gnunet-daemon-exit.c:3512
 msgid ""
 "This system does not support IPv4, will disable IPv4 functions despite them "
 "being enabled in the configuration\n"
@@ -2347,7 +2464,7 @@
 "Este sistema no soporta IPv4, se deshabilitarán las funciones IPv4 aunque "
 "estén habilitadas en la configuración\n"
 
-#: src/exit/gnunet-daemon-exit.c:3519
+#: src/exit/gnunet-daemon-exit.c:3520
 msgid ""
 "This system does not support IPv6, will disable IPv6 functions despite them "
 "being enabled in the configuration\n"
@@ -2355,7 +2472,7 @@
 "Este sistema no soporta IPv6, se deshabilitarán las funciones IPv6 aunque "
 "estén habilitadas en la configuración\n"
 
-#: src/exit/gnunet-daemon-exit.c:3526
+#: src/exit/gnunet-daemon-exit.c:3527
 msgid ""
 "Cannot enable IPv4 exit but disable IPv4 on TUN interface, will use "
 "ENABLE_IPv4=YES\n"
@@ -2363,7 +2480,7 @@
 "No se puede habilitar salida IPv4 pero se deshabilita IPv4 sobre interfaz "
 "TUN, se usará ENABLE_IPv4=YES\n"
 
-#: src/exit/gnunet-daemon-exit.c:3532
+#: src/exit/gnunet-daemon-exit.c:3533
 msgid ""
 "Cannot enable IPv6 exit but disable IPv6 on TUN interface, will use "
 "ENABLE_IPv6=YES\n"
@@ -2371,15 +2488,15 @@
 "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:3538 src/pt/gnunet-daemon-pt.c:1248
+#: src/exit/gnunet-daemon-exit.c:3539 src/pt/gnunet-daemon-pt.c:1247
 msgid "No useful service enabled.  Exiting.\n"
 msgstr "Ningún servicio útil habilitado.  Saliendo.\n"
 
-#: src/exit/gnunet-daemon-exit.c:3654
+#: src/exit/gnunet-daemon-exit.c:3655
 msgid "Must be a number"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3796
+#: src/exit/gnunet-daemon-exit.c:3797
 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"
 
@@ -2605,7 +2722,7 @@
 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:2376 src/fs/fs_api.c:2616
+#: src/fs/fs_api.c:2376 src/fs/fs_api.c:2617
 #, c-format
 msgid "Failed to resume sub-download `%s': %s\n"
 msgstr "Se produjo un fallo al retomar la sub-descarga «%s»: %s\n"
@@ -2615,26 +2732,26 @@
 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:2406 src/fs/fs_api.c:2425 src/fs/fs_api.c:2908
+#: src/fs/fs_api.c:2407 src/fs/fs_api.c:2426 src/fs/fs_api.c:2909
 #, 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:2607
+#: src/fs/fs_api.c:2608
 #, 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:2852
+#: src/fs/fs_api.c:2853
 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:2946
+#: src/fs/fs_api.c:2947
 #, c-format
 msgid "Failure while resuming download operation `%s': %s\n"
 msgstr ""
@@ -3306,7 +3423,7 @@
 msgstr "La opción «%s» es obligatoria cuando se usa la opción «%s».\n"
 
 #: src/fs/gnunet-publish.c:778 src/fs/gnunet-publish.c:785
-#: src/transport/gnunet-transport.c:840 src/transport/gnunet-transport.c:870
+#: src/transport/gnunet-transport.c:865 src/transport/gnunet-transport.c:899
 #, 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"
@@ -3424,7 +3541,7 @@
 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/fs/gnunet-service-fs.c:639 src/hostlist/gnunet-daemon-hostlist.c:288
 #: src/topology/gnunet-daemon-topology.c:1253
 #: src/topology/gnunet-daemon-topology.c:1260
 #, c-format
@@ -3492,7 +3609,7 @@
 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:1194
+#: src/fs/gnunet-service-fs_cp.c:1193
 msgid "# requests dropped due to missing reverse route"
 msgstr "# peticiones omitidas debido a falta de ruta inversa"
 
@@ -3563,7 +3680,7 @@
 msgid "Indexed file `%s' changed at offset %llu\n"
 msgstr "El fichero indexado «%s» ha cambiado en el desplazamiento %llu\n"
 
-#: src/fs/gnunet-service-fs_lc.c:202 src/fs/gnunet-service-fs_lc.c:369
+#: src/fs/gnunet-service-fs_lc.c:202 src/fs/gnunet-service-fs_lc.c:368
 msgid "# client searches active"
 msgstr "# búsquedas de clientes activas"
 
@@ -3571,42 +3688,47 @@
 msgid "# replies received for local clients"
 msgstr "# respuestas recibidas de clientes locales"
 
-#: src/fs/gnunet-service-fs_lc.c:328
+#: src/fs/gnunet-service-fs_lc.c:327
 msgid "# client searches received"
 msgstr "# búsquedas de clientes recibidas"
 
-#: src/fs/gnunet-service-fs_lc.c:363
+#: src/fs/gnunet-service-fs_lc.c:362
 msgid "# client searches updated (merged content seen list)"
 msgstr ""
 "# búsquedas de clientes actualizadas (contenido unido visto en la lista)"
 
-#: src/fs/gnunet-service-fs_mesh_client.c:475
+#: src/fs/gnunet-service-fs_mesh_client.c:484
 #, fuzzy
 msgid "# replies received via mesh"
 msgstr "# respuestas recibidas vía «stream»"
 
-#: src/fs/gnunet-service-fs_mesh_client.c:489
+#: src/fs/gnunet-service-fs_mesh_client.c:498
 #, fuzzy
 msgid "# replies received via mesh dropped"
 msgstr "# respuestas recibidas omitidas vía «stream»"
 
-#: src/fs/gnunet-service-fs_mesh_server.c:259
+#: src/fs/gnunet-service-fs_mesh_server.c:260
 #, fuzzy
 msgid "# Blocks transferred via mesh"
 msgstr "# Bloques transferidos vía «stream»"
 
-#: src/fs/gnunet-service-fs_mesh_server.c:412
+#: src/fs/gnunet-service-fs_mesh_server.c:352
 #, fuzzy
+msgid "# queries received via mesh not answered"
+msgstr "# consultas recibidas vía «stream»"
+
+#: src/fs/gnunet-service-fs_mesh_server.c:432
+#, fuzzy
 msgid "# queries received via mesh"
 msgstr "# consultas recibidas vía «stream»"
 
-#: src/fs/gnunet-service-fs_mesh_server.c:455
+#: src/fs/gnunet-service-fs_mesh_server.c:476
 #, fuzzy
 msgid "# mesh client connections rejected"
 msgstr "# conexiones de clientes «stream» rechazadas"
 
-#: src/fs/gnunet-service-fs_mesh_server.c:461
-#: src/fs/gnunet-service-fs_mesh_server.c:501
+#: src/fs/gnunet-service-fs_mesh_server.c:482
+#: src/fs/gnunet-service-fs_mesh_server.c:522
 #, fuzzy
 msgid "# mesh connections active"
 msgstr "# conexiones «stream» activas"
@@ -3641,8 +3763,8 @@
 msgid "# requests refreshed"
 msgstr "# peticiones refrescadas"
 
-#: src/fs/gnunet-service-fs_pe.c:614 src/fs/gnunet-service-fs_pe.c:698
-#: src/fs/gnunet-service-fs_pe.c:769
+#: src/fs/gnunet-service-fs_pe.c:616 src/fs/gnunet-service-fs_pe.c:700
+#: src/fs/gnunet-service-fs_pe.c:771
 msgid "# query plan entries"
 msgstr "# entradas de planes de búsqueda"
 
@@ -3654,101 +3776,101 @@
 msgid "# Pending requests active"
 msgstr "# Peticiones pendientes activas"
 
-#: src/fs/gnunet-service-fs_pr.c:813
+#: src/fs/gnunet-service-fs_pr.c:814
 msgid "# replies received and matched"
 msgstr "# respuestas recibidas y asociadas"
 
-#: src/fs/gnunet-service-fs_pr.c:843
+#: src/fs/gnunet-service-fs_pr.c:844
 msgid "# duplicate replies discarded (bloomfilter)"
 msgstr "# respuestas duplicadas descartadas (bloomfilter)"
 
-#: src/fs/gnunet-service-fs_pr.c:852
+#: src/fs/gnunet-service-fs_pr.c:853
 msgid "# irrelevant replies discarded"
 msgstr "# respuestas irrelevantes descartadas"
 
-#: src/fs/gnunet-service-fs_pr.c:866
+#: src/fs/gnunet-service-fs_pr.c:867
 #, c-format
 msgid "Unsupported block type %u\n"
 msgstr "Tipo de bloque %u no soportado\n"
 
-#: src/fs/gnunet-service-fs_pr.c:879
+#: src/fs/gnunet-service-fs_pr.c:880
 msgid "# results found locally"
 msgstr "# resultados hallados localmente"
 
-#: src/fs/gnunet-service-fs_pr.c:1000
+#: src/fs/gnunet-service-fs_pr.c:1001
 msgid "# Datastore `PUT' failures"
 msgstr "# «PUT» en el almacén de datos fallidos"
 
-#: src/fs/gnunet-service-fs_pr.c:1027
+#: src/fs/gnunet-service-fs_pr.c:1029
 msgid "# storage requests dropped due to high load"
 msgstr "# peticiones de almacenamiento omitidas debido a alta carga"
 
-#: src/fs/gnunet-service-fs_pr.c:1062
+#: src/fs/gnunet-service-fs_pr.c:1064
 msgid "# Replies received from DHT"
 msgstr "# Respuestas recibidas de la DHT"
 
-#: src/fs/gnunet-service-fs_pr.c:1190
+#: src/fs/gnunet-service-fs_pr.c:1192
 #, fuzzy
 msgid "# Replies received from MESH"
 msgstr "# Respuestas recibidas de la DHT"
 
-#: src/fs/gnunet-service-fs_pr.c:1242
+#: src/fs/gnunet-service-fs_pr.c:1244
 #, 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:1262
+#: src/fs/gnunet-service-fs_pr.c:1264
 #, 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:1309
+#: src/fs/gnunet-service-fs_pr.c:1311
 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:1324
+#: src/fs/gnunet-service-fs_pr.c:1326
 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:1333
+#: src/fs/gnunet-service-fs_pr.c:1335
 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:1348
+#: src/fs/gnunet-service-fs_pr.c:1350
 msgid "# requested DBLOCK or IBLOCK not found"
 msgstr "# «DBLOCK» o «IBLOCK» pedido no encontrado"
 
-#: src/fs/gnunet-service-fs_pr.c:1362
+#: src/fs/gnunet-service-fs_pr.c:1364
 msgid "# on-demand blocks matched requests"
 msgstr "# peticiones asociadas de bloques bajo demanda"
 
-#: src/fs/gnunet-service-fs_pr.c:1375
+#: src/fs/gnunet-service-fs_pr.c:1377
 msgid "# on-demand lookups performed successfully"
 msgstr "# búsquedas satisfactorias de bloques bajo demanda"
 
-#: src/fs/gnunet-service-fs_pr.c:1380
+#: src/fs/gnunet-service-fs_pr.c:1382
 msgid "# on-demand lookups failed"
 msgstr "# búsquedas fallidas de bloques bajo demanda"
 
-#: src/fs/gnunet-service-fs_pr.c:1407 src/fs/gnunet-service-fs_pr.c:1447
-#: src/fs/gnunet-service-fs_pr.c:1588
+#: src/fs/gnunet-service-fs_pr.c:1409 src/fs/gnunet-service-fs_pr.c:1449
+#: src/fs/gnunet-service-fs_pr.c:1590
 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:1465
+#: src/fs/gnunet-service-fs_pr.c:1467
 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:1476
+#: src/fs/gnunet-service-fs_pr.c:1478
 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:1564
+#: src/fs/gnunet-service-fs_pr.c:1566
 msgid "# Datastore lookups initiated"
 msgstr "# Búsquedas en el almacén de datos iniciadas"
 
-#: src/fs/gnunet-service-fs_pr.c:1649
+#: src/fs/gnunet-service-fs_pr.c:1651
 msgid "# GAP PUT messages received"
 msgstr "# Mensajes «GAP PUT» recibidos"
 
@@ -3789,6 +3911,35 @@
 "¡Se produjo un fallo al serializar la respuesta de la búsqueda desde el "
 "servicio GNS!\n"
 
+#: src/gns/gnunet-bcd.c:123
+#, fuzzy, c-format
+msgid "Refusing `%s' request to HTTP server\n"
+msgstr "Rechazando petición «%s» al servidor de listas de máquinas\n"
+
+#: src/gns/gnunet-bcd.c:355 src/hostlist/hostlist-server.c:566
+#, c-format
+msgid "Invalid port number %llu.  Exiting.\n"
+msgstr "Número de puerto %llu no válido.  Saliendo.\n"
+
+#: src/gns/gnunet-bcd.c:360
+#, fuzzy, c-format
+msgid "Businesscard HTTP server starts on %llu\n"
+msgstr "Servicio de listas de máquinas arranca en %s:%llu\n"
+
+#: src/gns/gnunet-bcd.c:374
+#, fuzzy, c-format
+msgid "Could not start businesscard HTTP server on port %u\n"
+msgstr ""
+"No se pudo arrancar un servidor de listas de máquinas HTTP en el puerto %u\n"
+
+#: src/gns/gnunet-bcd.c:519
+msgid "Run HTTP serve on port PORT (default is 8888)"
+msgstr ""
+
+#: src/gns/gnunet-bcd.c:531
+msgid "GNUnet HTTP server to create business cards"
+msgstr ""
+
 #: src/gns/gnunet-dns2gns.c:228
 msgid "Failed to pack DNS response into UDP packet!\n"
 msgstr ""
@@ -3855,187 +4006,204 @@
 msgid "Please specify name to lookup!\n"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:297
+#: src/gns/gnunet-gns.c:298
 #, c-format
 msgid "Ego for `%s' not found, cannot perform lookup.\n"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:335
+#: src/gns/gnunet-gns.c:336 src/gns/gnunet-gns-helper-service-w32.c:753
 #, c-format
 msgid ""
-"Ego for `master-zone' not found, cannot perform lookup.  Did you run gnunet-"
+"Ego for `gns-master' not found, cannot perform lookup.  Did you run gnunet-"
 "gns-import.sh?\n"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:364
+#: src/gns/gnunet-gns.c:365 src/gns/gnunet-gns-helper-service-w32.c:783
 #, c-format
 msgid "Failed to connect to GNS\n"
 msgstr "Se produjo un fallo al conectar con GNS\n"
 
-#: src/gns/gnunet-gns.c:377
+#: src/gns/gnunet-gns.c:378
 #, c-format
 msgid "Public key `%s' is not well-formed\n"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:426
+#: src/gns/gnunet-gns.c:428
 msgid "Lookup a record for the given name"
 msgstr "Buscar el registro para el nombre dado"
 
-#: src/gns/gnunet-gns.c:429
+#: src/gns/gnunet-gns.c:431
 msgid "Specify the type of the record to lookup"
 msgstr "Especificar el tipo del registro a buscar"
 
-#: src/gns/gnunet-gns.c:432
+#: src/gns/gnunet-gns.c:434
 msgid "No unneeded output"
 msgstr "Sin salida innecesaria"
 
-#: src/gns/gnunet-gns.c:435
+#: src/gns/gnunet-gns.c:437
 #, 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:438
+#: src/gns/gnunet-gns.c:440
 #, 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:451
+#: src/gns/gnunet-gns.c:453
 #, fuzzy
 msgid "GNUnet GNS resolver tool"
 msgstr "Herramienta de acceso GNUnet GNS"
 
+#: src/gns/gnunet-gns-helper-service-w32.c:723
+#, c-format
+msgid ""
+"Ego for `gns-short' not found. This is not really fatal, but i'll pretend "
+"that it is and refuse to perform a lookup.  Did you run gnunet-gns-import."
+"sh?\n"
+msgstr ""
+
+#: src/gns/gnunet-gns-helper-service-w32.c:793
+#, fuzzy, c-format
+msgid "Failed to connect to identity service\n"
+msgstr "Fallo al conectar a gnunetd.\n"
+
 #: 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:1067
-#: src/transport/plugin_transport_http_client.c:1082
+#: src/hostlist/hostlist-client.c:683 src/hostlist/hostlist-client.c:689
+#: src/hostlist/hostlist-client.c:741 src/hostlist/hostlist-client.c:750
+#: src/hostlist/hostlist-client.c:871 src/hostlist/hostlist-client.c:963
+#: src/hostlist/hostlist-client.c:968
+#: src/transport/plugin_transport_http_client.c:1071
+#: src/transport/plugin_transport_http_client.c:1086
 #, c-format
 msgid "%s failed at %s:%d: `%s'\n"
 msgstr "%s falló en %s:%d: «%s».\n"
 
-#: src/gns/gnunet-gns-proxy.c:839
+#: src/gns/gnunet-gns-proxy.c:833
 #, 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
+#: src/gns/gnunet-gns-proxy.c:856
 #, 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
+#: src/gns/gnunet-gns-proxy.c:879
 #, 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
+#: src/gns/gnunet-gns-proxy.c:892
 #, 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
+#: src/gns/gnunet-gns-proxy.c:907
 #, 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
+#: src/gns/gnunet-gns-proxy.c:917
 #, c-format
 msgid "Failed DANE verification failed with GnuTLS verify status code: %u\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:947
+#: src/gns/gnunet-gns-proxy.c:941
 #, c-format
 msgid "SSL certificate subject name (%s) does not match `%s'\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:1092
+#: src/gns/gnunet-gns-proxy.c:1086
 #, c-format
 msgid "Cookie domain `%s' supplied by server is invalid\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:1609
+#: src/gns/gnunet-gns-proxy.c:1602
 #, fuzzy, c-format
 msgid "Unsupported HTTP method `%s'\n"
 msgstr "Tipo no soportado «%s»\n"
 
-#: src/gns/gnunet-gns-proxy.c:1979
+#: src/gns/gnunet-gns-proxy.c:1973
 #, 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:2009
+#: src/gns/gnunet-gns-proxy.c:2003
 #, c-format
 msgid "Unable to import certificate %s\n"
 msgstr "No se pudo importar el certificado %s\n"
 
-#: src/gns/gnunet-gns-proxy.c:2178
+#: src/gns/gnunet-gns-proxy.c:2177
 #, 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:2197
+#: src/gns/gnunet-gns-proxy.c:2196
 #, 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
+#: src/gns/gnunet-gns-proxy.c:2504
 #, fuzzy, c-format
 msgid "Unsupported socks version %d\n"
 msgstr "Tipo de bloque %u no soportado\n"
 
-#: src/gns/gnunet-gns-proxy.c:2534
+#: src/gns/gnunet-gns-proxy.c:2533
 #, fuzzy, c-format
 msgid "Unsupported socks command %d\n"
 msgstr "Tipo de bloque %u no soportado\n"
 
-#: src/gns/gnunet-gns-proxy.c:2616
+#: src/gns/gnunet-gns-proxy.c:2551 src/gns/gnunet-gns-proxy.c:2580
+msgid "SSL connection to plain IPv4 address requested\n"
+msgstr ""
+
+#: src/gns/gnunet-gns-proxy.c:2631
 #, 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
+#: src/gns/gnunet-gns-proxy.c:2970
 msgid "No ego configured for `shorten-zone`\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:2995
+#: src/gns/gnunet-gns-proxy.c:3010
 #, 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:3057
+#: src/gns/gnunet-gns-proxy.c:3072
 #, 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:3098
+#: src/gns/gnunet-gns-proxy.c:3113
 msgid "listen on specified port (default: 7777)"
 msgstr "escuchar en el puerto especificado (predeterminado: 7777)"
 
-#: src/gns/gnunet-gns-proxy.c:3101
+#: src/gns/gnunet-gns-proxy.c:3116
 msgid "pem file to use as CA"
 msgstr "fichero pem para usar como autoridad de certificación (CA)"
 
-#: src/gns/gnunet-gns-proxy.c:3120
+#: src/gns/gnunet-gns-proxy.c:3135
 msgid "GNUnet GNS proxy"
 msgstr "Proxy GNUnet GNS"
 
-#: src/gns/gnunet-service-gns.c:860
+#: src/gns/gnunet-service-gns.c:862
 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:868
+#: src/gns/gnunet-service-gns.c:870
 #, 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
+#: src/gns/gnunet-service-gns.c:903
 msgid "Could not connect to DHT!\n"
 msgstr "¡No se pudo conectar a la DHT!\n"
 
-#: src/gns/gnunet-service-gns.c:917
+#: src/gns/gnunet-service-gns.c:919
 #, fuzzy
 msgid "valid public key required"
 msgstr "Tipo requerido\n"
@@ -4050,111 +4218,123 @@
 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:771
+#: src/gns/gnunet-service-gns_resolver.c:815
 #, 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:913
+#: src/gns/gnunet-service-gns_resolver.c:957
 #, c-format
 msgid "Skipping record of unsupported type %d\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns_resolver.c:1646
+#: src/gns/gnunet-service-gns_resolver.c:1316
 #, c-format
 msgid "GNS lookup resulted in DNS name that is too long (`%s')\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns_resolver.c:1686
+#: src/gns/gnunet-service-gns_resolver.c:1809
 msgid "GNS lookup recursion failed (no delegation record found)\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns_resolver.c:1710
+#: src/gns/gnunet-service-gns_resolver.c:1833
 #, 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:1932
+#: src/gns/gnunet-service-gns_resolver.c:2071
 #, c-format
 msgid "Zone %s was revoked, resolution fails\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns_resolver.c:2054
+#: src/gns/gnunet-service-gns_resolver.c:2220
 #, c-format
 msgid "Hostname `%s' is not well-formed, resolution fails\n"
 msgstr ""
 
-#: src/gns/plugin_gnsrecord_gns.c:142
+#: src/gns/plugin_gnsrecord_gns.c:151
 #, 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
+#: src/gns/plugin_gnsrecord_gns.c:180
 #, fuzzy, c-format
+msgid "Unable to parse GNS2DNS record `%s'\n"
+msgstr "No se pudo procesar el registro SOA «%s»\n"
+
+#: src/gns/plugin_gnsrecord_gns.c:201
+#, 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
+#: src/gns/plugin_gnsrecord_gns.c:217
 #, 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
+#: src/gnsrecord/plugin_gnsrecord_dns.c:293
 #, 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
+#: src/gnsrecord/plugin_gnsrecord_dns.c:314
 #, 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
+#: src/gnsrecord/plugin_gnsrecord_dns.c:336
 #, 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
+#: src/gnsrecord/plugin_gnsrecord_dns.c:420
+#, fuzzy, c-format
+msgid "Failed to serialize CERT record with %u bytes\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:452
 #, 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
+#: src/gnsrecord/plugin_gnsrecord_dns.c:471
 #, 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
+#: src/gnsrecord/plugin_gnsrecord_dns.c:494
 #, 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
+#: src/gnsrecord/plugin_gnsrecord_dns.c:514
 #, 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
+#: src/gnsrecord/plugin_gnsrecord_dns.c:529
 #, 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
+#: src/gnsrecord/plugin_gnsrecord_dns.c:549
 #, 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
+#: src/gnsrecord/plugin_gnsrecord_dns.c:567
 #, c-format
 msgid "Unable to parse TLSA record string `%s'\n"
 msgstr "No se pudo procesar la cadena de registro TLSA «%s»\n"
@@ -4236,7 +4416,7 @@
 msgstr ""
 "Se produjo un fallo al procesar «%s» como una dirección para el módulo «%s»\n"
 
-#: src/hostlist/gnunet-daemon-hostlist.c:260
+#: src/hostlist/gnunet-daemon-hostlist.c:259
 msgid ""
 "None of the functions for the hostlist daemon were enabled.  I have no "
 "reason to run!\n"
@@ -4244,11 +4424,11 @@
 "Ninguna de las funciones para el demonio de listas de máquinas fue "
 "activada.  ¡No tengo razón para ejecutarme!\n"
 
-#: src/hostlist/gnunet-daemon-hostlist.c:313
+#: src/hostlist/gnunet-daemon-hostlist.c:308
 msgid "advertise our hostlist to other peers"
 msgstr "anuncia nuestra lista de máquinas a otros pares"
 
-#: src/hostlist/gnunet-daemon-hostlist.c:318
+#: src/hostlist/gnunet-daemon-hostlist.c:313
 msgid ""
 "bootstrap using hostlists (it is highly recommended that you always use this "
 "option)"
@@ -4256,46 +4436,46 @@
 "realizar inicialización usando listas de máquinas (es altamente recomendable "
 "que siempre se use esta opción)"
 
-#: src/hostlist/gnunet-daemon-hostlist.c:321
+#: src/hostlist/gnunet-daemon-hostlist.c:316
 msgid "enable learning about hostlist servers from other peers"
 msgstr ""
 "habilitar aprendizaje de servidores de listas de máquinas de otros pares"
 
-#: src/hostlist/gnunet-daemon-hostlist.c:325
+#: src/hostlist/gnunet-daemon-hostlist.c:320
 msgid "provide a hostlist server"
 msgstr "proveer un servidor de listas de máquinas"
 
-#: src/hostlist/gnunet-daemon-hostlist.c:340
+#: src/hostlist/gnunet-daemon-hostlist.c:335
 msgid "GNUnet hostlist server and client"
 msgstr "Servidor y cliente GNUnet de listas de máquinas"
 
-#: src/hostlist/hostlist-client.c:289
+#: src/hostlist/hostlist-client.c:288
 msgid "# bytes downloaded from hostlist servers"
 msgstr "# bytes descargados de servidores de listas de máquinas"
 
-#: src/hostlist/hostlist-client.c:310 src/hostlist/hostlist-client.c:340
+#: src/hostlist/hostlist-client.c:309 src/hostlist/hostlist-client.c:339
 msgid "# invalid HELLOs downloaded from hostlist servers"
 msgstr "# «HELLO» no válidos descargados de servidores de listas de máquinas"
 
-#: src/hostlist/hostlist-client.c:313 src/hostlist/hostlist-client.c:343
+#: src/hostlist/hostlist-client.c:312 src/hostlist/hostlist-client.c:342
 #, c-format
 msgid "Invalid `%s' message received from hostlist at `%s'\n"
 msgstr "Mensaje «%s» no válido recibido de la lista de máquinas en «%s»\n"
 
-#: src/hostlist/hostlist-client.c:331
+#: src/hostlist/hostlist-client.c:330
 msgid "# valid HELLOs downloaded from hostlist servers"
 msgstr "# «HELLO» válidos descargados de servidores de listas de máquinas"
 
-#: src/hostlist/hostlist-client.c:589 src/hostlist/hostlist-client.c:1330
+#: src/hostlist/hostlist-client.c:592 src/hostlist/hostlist-client.c:1333
 msgid "# advertised hostlist URIs"
 msgstr "# URI de listas de máquinas anunciadas"
 
-#: src/hostlist/hostlist-client.c:619
+#: src/hostlist/hostlist-client.c:622
 #, c-format
 msgid "# advertised URI `%s' downloaded"
 msgstr "# URI anunciadas «%s» descargadas"
 
-#: src/hostlist/hostlist-client.c:661
+#: src/hostlist/hostlist-client.c:664
 #, c-format
 msgid ""
 "Advertised hostlist with URI `%s' could not be downloaded. Advertised URI "
@@ -4304,111 +4484,111 @@
 "Lista de máquinas anunciada con la URI «%s» no pudo ser descargada. La URI "
 "anunciada es descartada.\n"
 
-#: src/hostlist/hostlist-client.c:799
+#: src/hostlist/hostlist-client.c:802
 #, c-format
 msgid "Timeout trying to download hostlist from `%s'\n"
 msgstr ""
 "Finalizado el plazo mientras se intentaba bajar lista de máquinas de «%s»\n"
 
-#: src/hostlist/hostlist-client.c:813
+#: src/hostlist/hostlist-client.c:816
 #, c-format
 msgid "Download limit of %u bytes exceeded, stopping download\n"
 msgstr "Límite de descarga de %u bytes superado, parando descarga\n"
 
-#: src/hostlist/hostlist-client.c:833
+#: src/hostlist/hostlist-client.c:836
 #, c-format
 msgid "Download of hostlist from `%s' failed: `%s'\n"
 msgstr "Descarga de lista de máquinas de «%s» fallida: «%s»\n"
 
-#: src/hostlist/hostlist-client.c:839
+#: src/hostlist/hostlist-client.c:842
 #, c-format
 msgid "Download of hostlist `%s' completed.\n"
 msgstr "Descarga de lista de máquinas «%s» completada.\n"
 
-#: src/hostlist/hostlist-client.c:847
+#: src/hostlist/hostlist-client.c:850
 #, c-format
 msgid "Adding successfully tested hostlist `%s' datastore.\n"
 msgstr "Añadiendo el almacén de datos de la lista de máquinas probada «%s».\n"
 
-#: src/hostlist/hostlist-client.c:900
+#: src/hostlist/hostlist-client.c:903
 #, c-format
 msgid "Bootstrapping using hostlist at `%s'.\n"
 msgstr "Inicializando usando lista de máquinas en «%s».\n"
 
-#: src/hostlist/hostlist-client.c:908
+#: src/hostlist/hostlist-client.c:911
 msgid "# hostlist downloads initiated"
 msgstr "# descargas de listas de máquinas iniciadas"
 
-#: src/hostlist/hostlist-client.c:1037 src/hostlist/hostlist-client.c:1503
+#: src/hostlist/hostlist-client.c:1040 src/hostlist/hostlist-client.c:1506
 msgid "# milliseconds between hostlist downloads"
 msgstr "# milisegundos entre descargas de listas de máquinas"
 
-#: src/hostlist/hostlist-client.c:1046
+#: src/hostlist/hostlist-client.c:1049
 #, c-format
 msgid "Have %u/%u connections.  Will consider downloading hostlist in %s\n"
 msgstr ""
 "Hay %u/%u conexiones.  Se considerará descargar una lista de máquinas en %s\n"
 
-#: src/hostlist/hostlist-client.c:1106 src/hostlist/hostlist-client.c:1122
+#: src/hostlist/hostlist-client.c:1109 src/hostlist/hostlist-client.c:1125
 msgid "# active connections"
 msgstr "# conexiones activas"
 
-#: src/hostlist/hostlist-client.c:1278
+#: src/hostlist/hostlist-client.c:1280
 #, c-format
 msgid "Loading saved hostlist entries from file `%s' \n"
 msgstr "Cargando entradas guardadas de listas de máquinas del fichero «%s»\n"
 
-#: src/hostlist/hostlist-client.c:1282
+#: src/hostlist/hostlist-client.c:1285
 #, c-format
 msgid "Hostlist file `%s' does not exist\n"
 msgstr "El fichero de listas de máquinas «%s» no existe\n"
 
-#: src/hostlist/hostlist-client.c:1293
+#: src/hostlist/hostlist-client.c:1296
 #, c-format
 msgid "Could not open file `%s' for reading to load hostlists: %s\n"
 msgstr ""
 "No se pudo abrir el fichero «%s» en modo lectura para cargar las listas de "
 "máquinas: %s\n"
 
-#: src/hostlist/hostlist-client.c:1326
+#: src/hostlist/hostlist-client.c:1329
 #, c-format
 msgid "%u hostlist URIs loaded from file\n"
 msgstr "%u URI de listas de máquinas cargadas del fichero\n"
 
-#: src/hostlist/hostlist-client.c:1328
+#: src/hostlist/hostlist-client.c:1331
 msgid "# hostlist URIs read from file"
 msgstr "# URI de listas de máquinas leídas de fichero"
 
-#: src/hostlist/hostlist-client.c:1373
+#: src/hostlist/hostlist-client.c:1376
 #, c-format
 msgid "Could not open file `%s' for writing to save hostlists: %s\n"
 msgstr ""
 "No se pudo abrir el fichero «%s» en modo escritura para almacenar las listas "
 "de máquinas: %s\n"
 
-#: src/hostlist/hostlist-client.c:1378
+#: src/hostlist/hostlist-client.c:1381
 #, c-format
 msgid "Writing %u hostlist URIs to `%s'\n"
 msgstr "Escribiendo %u URI de listas de máquinas a «%s»\n"
 
-#: src/hostlist/hostlist-client.c:1402 src/hostlist/hostlist-client.c:1419
+#: src/hostlist/hostlist-client.c:1405 src/hostlist/hostlist-client.c:1422
 #, c-format
 msgid "Error writing hostlist URIs to file `%s'\n"
 msgstr "Error escribiendo URI de listas de máquinas al fichero «%s»\n"
 
-#: src/hostlist/hostlist-client.c:1414
+#: src/hostlist/hostlist-client.c:1417
 msgid "# hostlist URIs written to file"
 msgstr "# URI de listas de máquinas escritas a fichero"
 
-#: src/hostlist/hostlist-client.c:1468
+#: src/hostlist/hostlist-client.c:1471
 msgid "Learning is enabled on this peer\n"
 msgstr "El aprendizaje está habilitado en este par\n"
 
-#: src/hostlist/hostlist-client.c:1480
+#: src/hostlist/hostlist-client.c:1483
 msgid "Learning is not enabled on this peer\n"
 msgstr "El aprendizaje no está habilitado en este par\n"
 
-#: src/hostlist/hostlist-client.c:1492
+#: src/hostlist/hostlist-client.c:1495
 #, c-format
 msgid ""
 "Since learning is not enabled on this peer, hostlist file `%s' was removed\n"
@@ -4416,7 +4596,7 @@
 "La lista de máquinas «%s» fue eliminada puesto que el aprendizaje no está "
 "habilitado en este par\n"
 
-#: src/hostlist/hostlist-client.c:1496
+#: src/hostlist/hostlist-client.c:1499
 #, c-format
 msgid "Hostlist file `%s' could not be removed\n"
 msgstr "El fichero de listas de máquinas «%s» no pudo ser eliminado\n"
@@ -4493,34 +4673,29 @@
 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:651
-#: src/transport/gnunet-service-transport.c:790
+#: src/hostlist/hostlist-server.c:556 src/peerinfo-tool/gnunet-peerinfo.c:651
+#: src/transport/gnunet-service-transport.c:850
 msgid "Could not access PEERINFO service.  Exiting.\n"
 msgstr ""
 "No se pudo acceder al servicio de información de pares (PEERINFO).  "
 "Saliendo.\n"
 
-#: src/hostlist/hostlist-server.c:570
+#: src/hostlist/hostlist-server.c:575
 #, c-format
-msgid "Invalid port number %llu.  Exiting.\n"
-msgstr "Número de puerto %llu no válido.  Saliendo.\n"
-
-#: src/hostlist/hostlist-server.c:579
-#, c-format
 msgid "Hostlist service starts on %s:%llu\n"
 msgstr "Servicio de listas de máquinas arranca en %s:%llu\n"
 
-#: src/hostlist/hostlist-server.c:593
+#: src/hostlist/hostlist-server.c:589
 #, c-format
 msgid "Address to obtain hostlist: `%s'\n"
 msgstr "Dirección para obtener la lista de máquinas: «%s»\n"
 
-#: src/hostlist/hostlist-server.c:633
+#: src/hostlist/hostlist-server.c:629
 #, c-format
 msgid "`%s' is not a valid IP address! Ignoring BINDTOIP.\n"
 msgstr "¡«%s» no es una dirección IP válida! Ignorando «BINDTOIP».\n"
 
-#: src/hostlist/hostlist-server.c:676
+#: src/hostlist/hostlist-server.c:672
 #, c-format
 msgid "Could not start hostlist HTTP server on port %u\n"
 msgstr ""
@@ -4571,51 +4746,51 @@
 msgid "Maintain egos"
 msgstr ""
 
-#: src/identity/gnunet-service-identity.c:337
+#: src/identity/gnunet-service-identity.c:338
 msgid "no default known"
 msgstr ""
 
-#: src/identity/gnunet-service-identity.c:360
+#: src/identity/gnunet-service-identity.c:362
 msgid "default configured, but ego unknown (internal error)"
 msgstr ""
 
-#: src/identity/gnunet-service-identity.c:437
-#: src/identity/gnunet-service-identity.c:668
-#: src/identity/gnunet-service-identity.c:776
+#: src/identity/gnunet-service-identity.c:439
+#: src/identity/gnunet-service-identity.c:670
+#: src/identity/gnunet-service-identity.c:778
 #, fuzzy, c-format
 msgid "Failed to write subsystem default identifier map to `%s'.\n"
 msgstr ""
 "Se produjo un fallo al obtener los identificadores de fichero para «%s»\n"
 
-#: src/identity/gnunet-service-identity.c:444
+#: src/identity/gnunet-service-identity.c:446
 msgid "Unknown ego specified for service (internal error)"
 msgstr ""
 
-#: src/identity/gnunet-service-identity.c:514
+#: src/identity/gnunet-service-identity.c:516
 msgid "identifier already in use for another ego"
 msgstr ""
 
-#: src/identity/gnunet-service-identity.c:645
+#: src/identity/gnunet-service-identity.c:647
 #, fuzzy
 msgid "target name already exists"
 msgstr "El registro ya existía en el almacén de nombres"
 
-#: src/identity/gnunet-service-identity.c:684
-#: src/identity/gnunet-service-identity.c:793
+#: src/identity/gnunet-service-identity.c:686
+#: src/identity/gnunet-service-identity.c:795
 msgid "no matching ego found"
 msgstr ""
 
-#: src/identity/gnunet-service-identity.c:827
+#: src/identity/gnunet-service-identity.c:829
 #, fuzzy, c-format
 msgid "Failed to parse ego information in `%s'\n"
 msgstr "Se produjo un fallo al procesar la identidad del par «%s»\n"
 
-#: src/identity/gnunet-service-identity.c:900
+#: src/identity/gnunet-service-identity.c:902
 #, fuzzy, c-format
 msgid "Failed to parse subsystem identity configuration file `%s'\n"
 msgstr "Se produjo un fallo al borrar el fichero de configuración %s\n"
 
-#: src/identity/gnunet-service-identity.c:912
+#: src/identity/gnunet-service-identity.c:914
 #, fuzzy, c-format
 msgid "Failed to create directory `%s' for storing egos\n"
 msgstr "Se produjo un fallo al leer el directorio «%s»\n"
@@ -4635,49 +4810,53 @@
 msgstr ""
 "Enviar mensajes «ping» para probar la conectividad (predeterminado: NO)"
 
-#: src/mesh/gnunet-mesh.c:146
+#: src/mesh/gnunet-mesh.c:299
 #, fuzzy, c-format
+msgid "Invalid target `%s'\n"
+msgstr "Parámetro no válido «%s»\n"
+
+#: src/mesh/gnunet-mesh.c:417
+#, fuzzy, c-format
 msgid "Invalid tunnel owner `%s'\n"
 msgstr "Formato de tiempo no válido «%s»\n"
 
-#: src/mesh/gnunet-mesh.c:209
+#: src/mesh/gnunet-mesh.c:482
+msgid "You must NOT give a TARGET when using options\n"
+msgstr ""
+
+#: src/mesh/gnunet-mesh.c:559
+#, fuzzy
+msgid "provide information about a particular channel"
+msgstr "proveer información acerca de un túnel en particular"
+
+#: src/mesh/gnunet-mesh.c:562
+#, fuzzy
+msgid "provide information about a particular connection"
+msgstr "proveer información acerca de un túnel en particular"
+
+#: src/mesh/gnunet-mesh.c:565
+#, fuzzy
+msgid "provide information about all tunnels"
+msgstr "proveer información acerca de un túnel en particular"
+
+#: src/mesh/gnunet-mesh.c:568
 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:212
+#: src/mesh/gnunet-mesh.c:571
+msgid "port to listen to (default; 0)"
+msgstr ""
+
+#: src/mesh/gnunet-mesh.c:574
 msgid "provide information about a particular tunnel"
 msgstr "proveer información acerca de un túnel en particular"
 
-#: 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:5633 src/mesh/gnunet-service-mesh_peer.c:350
+#: src/mesh/gnunet-service-mesh_peer.c:349
 msgid "Wrong CORE service\n"
 msgstr "Servicio principal (CORE) erróneo\n"
 
-#: 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
-msgid "%s service is lacking key configuration settings (%s).  Exiting.\n"
-msgstr ""
-"El servicio %s carece de opciones de configuración de clave (%s).  "
-"Saliendo.\n"
-
-#: 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"
-msgstr ""
-"El servicio %s carece de opciones de configuración de clave (%s). Usando "
-"predeterminada (%u).\n"
-
 #: src/mysql/mysql.c:174
 #, c-format
 msgid "Trying to use file `%s' for MySQL configuration.\n"
@@ -4693,31 +4872,36 @@
 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
+#: src/namecache/gnunet-namecache.c:124 src/namestore/gnunet-namestore.c:394
 #, 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
+#: src/namecache/gnunet-namecache.c:185
 #, 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
+#: src/namecache/gnunet-namecache.c:195 src/namestore/gnunet-namestore.c:692
 #, 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
+#: src/namecache/gnunet-namecache.c:203
+#, fuzzy, c-format
+msgid "You must specify a name\n"
+msgstr "¡Debes especificar un receptor!\n"
+
+#: src/namecache/gnunet-namecache.c:234 src/namestore/gnunet-namestore.c:925
 msgid "name of the record to add/delete/display"
 msgstr "nombre del registro a añadir/borrar/mostrar"
 
-#: src/namecache/gnunet-namecache.c:229
+#: src/namecache/gnunet-namecache.c:237
 #, 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
+#: src/namecache/gnunet-namecache.c:248 src/namestore/gnunet-namestore.c:957
 msgid "GNUnet zone manipulation tool"
 msgstr "Herramienta de manipulación de zona de GNUnet"
 
@@ -4731,63 +4915,63 @@
 msgid "Failed to create indices\n"
 msgstr "Se produjo un fallo al crear los índices\n"
 
-#: src/namestore/gnunet-namestore.c:278
+#: src/namestore/gnunet-namestore.c:304
 #, c-format
 msgid "Adding record failed: %s\n"
 msgstr "No se pudo añadir el registro: %s\n"
 
-#: src/namestore/gnunet-namestore.c:306
+#: src/namestore/gnunet-namestore.c:333
 #, 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:313
+#: src/namestore/gnunet-namestore.c:340
 #, fuzzy, c-format
 msgid "Deleting record failed%s%s\n"
 msgstr "No se pudo borrar el registro: %s\n"
 
-#: src/namestore/gnunet-namestore.c:528
+#: src/namestore/gnunet-namestore.c:555
 #, c-format
 msgid "No options given\n"
 msgstr "No se han proporcionado opciones\n"
 
-#: src/namestore/gnunet-namestore.c:539
-#: src/namestore/gnunet-namestore-fcfsd.c:964
+#: src/namestore/gnunet-namestore.c:566
+#: src/namestore/gnunet-namestore-fcfsd.c:970
 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: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
+#: src/namestore/gnunet-namestore.c:574 src/namestore/gnunet-namestore.c:583
+#: src/namestore/gnunet-namestore.c:600 src/namestore/gnunet-namestore.c:622
+#: src/namestore/gnunet-namestore.c:662
 #, 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:548 src/namestore/gnunet-namestore.c:557
-#: src/namestore/gnunet-namestore.c:574 src/namestore/gnunet-namestore.c:596
+#: src/namestore/gnunet-namestore.c:575 src/namestore/gnunet-namestore.c:584
+#: src/namestore/gnunet-namestore.c:601 src/namestore/gnunet-namestore.c:623
 msgid "add"
 msgstr "añadir"
 
-#: src/namestore/gnunet-namestore.c:565
+#: src/namestore/gnunet-namestore.c:592
 #, c-format
 msgid "Unsupported type `%s'\n"
 msgstr "Tipo no soportado «%s»\n"
 
-#: src/namestore/gnunet-namestore.c:585
+#: src/namestore/gnunet-namestore.c:612
 #, 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:621
+#: src/namestore/gnunet-namestore.c:648
 #, c-format
 msgid "Invalid time format `%s'\n"
 msgstr "Formato de tiempo no válido «%s»\n"
 
-#: src/namestore/gnunet-namestore.c:636
+#: src/namestore/gnunet-namestore.c:663
 msgid "del"
 msgstr "borrar"
 
-#: src/namestore/gnunet-namestore.c:689
+#: src/namestore/gnunet-namestore.c:712
 #: src/peerinfo-tool/gnunet-peerinfo.c:703
 #, c-format
 msgid "Invalid URI `%s'\n"
@@ -4795,123 +4979,157 @@
 
 #: src/namestore/gnunet-namestore.c:747
 #, fuzzy, c-format
+msgid "Invalid nick `%s'\n"
+msgstr "URI no válida: «%s»\n"
+
+#: src/namestore/gnunet-namestore.c:787
+#, fuzzy, c-format
 msgid "Ego `%s' not known to identity service\n"
 msgstr "'%s': servicio desconocido: %s\n"
 
-#: src/namestore/gnunet-namestore.c:806
+#: src/namestore/gnunet-namestore.c:814
+#, fuzzy, c-format
+msgid "No default ego configured in identity service\n"
+msgstr "'%s': servicio desconocido: %s\n"
+
+#: src/namestore/gnunet-namestore.c:847
+#, fuzzy, c-format
+msgid "Identity service is not running\n"
+msgstr "El servicio «%s» no está ejecutandose\n"
+
+#: src/namestore/gnunet-namestore.c:859
+#, fuzzy, c-format
+msgid "Cannot connect to identity service\n"
+msgstr "¡No se pudo conectar al servicio %s!\n"
+
+#: src/namestore/gnunet-namestore.c:907
 msgid "add record"
 msgstr "añadir registro"
 
-#: src/namestore/gnunet-namestore.c:809
+#: src/namestore/gnunet-namestore.c:910
 msgid "delete record"
 msgstr "borrar registro"
 
-#: src/namestore/gnunet-namestore.c:812
+#: src/namestore/gnunet-namestore.c:913
 msgid "display records"
 msgstr "mostrar registros"
 
-#: src/namestore/gnunet-namestore.c:815
+#: src/namestore/gnunet-namestore.c:916
 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:818
+#: src/namestore/gnunet-namestore.c:919
 #, fuzzy
+msgid "set the desired nick name for the zone"
+msgstr "establece el nivel LEVEL deseado de replicación"
+
+#: src/namestore/gnunet-namestore.c:922
+#, 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:824
+#: src/namestore/gnunet-namestore.c:928
 #, fuzzy
 msgid "determine our name for the given PKEY"
 msgstr "establece las preferencias para el par dado"
 
-#: src/namestore/gnunet-namestore.c:827
+#: src/namestore/gnunet-namestore.c:931
 msgid "type of the record to add/delete/display"
 msgstr "tipo del registro a añadir/borrar/mostrar"
 
-#: src/namestore/gnunet-namestore.c:830
+#: src/namestore/gnunet-namestore.c:934
 msgid "URI to import into our zone"
 msgstr "URI a importar a nuestra zona"
 
-#: src/namestore/gnunet-namestore.c:833
+#: src/namestore/gnunet-namestore.c:937
 msgid "value of the record to add/delete"
 msgstr "valor del registro a añadir/borrar"
 
-#: src/namestore/gnunet-namestore.c:836
+#: src/namestore/gnunet-namestore.c:940
 msgid "create or list public record"
 msgstr "crear o listar registros públicos"
 
-#: src/namestore/gnunet-namestore.c:839
+#: src/namestore/gnunet-namestore.c:943
 msgid ""
 "create shadow record (only valid if all other records of the same type have "
 "expired"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:842
+#: src/namestore/gnunet-namestore.c:946
 #, fuzzy
 msgid "name of the ego controlling the zone"
 msgstr "nombre de la sección a la que acceder"
 
 # form??
-#: src/namestore/gnunet-namestore-fcfsd.c:462
+#: src/namestore/gnunet-namestore-fcfsd.c:464
 #, c-format
 msgid "Unsupported form value `%s'\n"
 msgstr "Forma de valor no soportada «%s»\n"
 
-#: src/namestore/gnunet-namestore-fcfsd.c:489
+#: src/namestore/gnunet-namestore-fcfsd.c:491
 #, 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:524
+#: src/namestore/gnunet-namestore-fcfsd.c:525
 #, 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:590
+#: src/namestore/gnunet-namestore-fcfsd.c:534
+msgid "Error when mapping zone to name\n"
+msgstr ""
+
+#: src/namestore/gnunet-namestore-fcfsd.c:596
 #, 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:646
+#: src/namestore/gnunet-namestore-fcfsd.c:652
 #, 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:662
+#: src/namestore/gnunet-namestore-fcfsd.c:668
 #, 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:698
+#: src/namestore/gnunet-namestore-fcfsd.c:704
 msgid "Domain name must not contain `.'\n"
 msgstr "El nombre de dominio no puede contener «.»\n"
 
-#: src/namestore/gnunet-namestore-fcfsd.c:706
+#: src/namestore/gnunet-namestore-fcfsd.c:712
 msgid "Domain name must not contain `+'\n"
 msgstr "El nombre de dominio no puede contener «+»\n"
 
-#: src/namestore/gnunet-namestore-fcfsd.c:904
+#: src/namestore/gnunet-namestore-fcfsd.c:910
 msgid "No ego configured for `fcfsd` subsystem\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:930
+#: src/namestore/gnunet-namestore-fcfsd.c:936
 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
+#: src/namestore/gnunet-namestore-fcfsd.c:978
 #, fuzzy
+msgid "Failed to connect to identity\n"
+msgstr "Se produjo un fallo al conectar con GNS\n"
+
+#: src/namestore/gnunet-namestore-fcfsd.c:1011
+#, 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:494
+#: src/namestore/gnunet-service-namestore.c:634
 #, 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:273
+#: src/namestore/namestore_api.c:275
 #, fuzzy
 msgid "Namestore failed to store record\n"
 msgstr "El almacén de nombres no pudo añadir el registro\n"
@@ -5026,11 +5244,11 @@
 msgid "`upnpc' command not found\n"
 msgstr "comando «upnpc» no encontrado\n"
 
-#: src/nat/nat_test.c:341
+#: src/nat/nat_test.c:345
 msgid "Failed to connect to `gnunet-nat-server'\n"
 msgstr "Se produjo un fallo al conectar con «gnunet-nat-server»\n"
 
-#: src/nat/nat_test.c:411
+#: src/nat/nat_test.c:414
 #, c-format
 msgid "Failed to create listen socket bound to `%s' for NAT test: %s\n"
 msgstr ""
@@ -5068,12 +5286,12 @@
 msgid "Measure quality and performance of the NSE service."
 msgstr "Medir la calidad y rendimiento del servicio NSE."
 
-#: src/nse/gnunet-service-nse.c:1460
-#: src/revocation/gnunet-service-revocation.c:580
+#: src/nse/gnunet-service-nse.c:1461
+#: src/revocation/gnunet-service-revocation.c:789
 msgid "Value is too large.\n"
 msgstr ""
 
-#: src/nse/gnunet-service-nse.c:1487
+#: src/nse/gnunet-service-nse.c:1488
 msgid "NSE service is lacking key configuration settings.  Exiting.\n"
 msgstr ""
 "El servicio NSE carece de opciones de configuración de clave.  Saliendo.\n"
@@ -5083,21 +5301,21 @@
 msgid "Removing expired address of transport `%s'\n"
 msgstr "Eliminando dirección de transporte «%s»\n"
 
-#: src/peerinfo/gnunet-service-peerinfo.c:352
+#: src/peerinfo/gnunet-service-peerinfo.c:354
 #, 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:369
+#: src/peerinfo/gnunet-service-peerinfo.c:373
 #, 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:447
+#: src/peerinfo/gnunet-service-peerinfo.c:457
 msgid "# peers known"
 msgstr "# pares conocidos"
 
-#: src/peerinfo/gnunet-service-peerinfo.c:483
+#: src/peerinfo/gnunet-service-peerinfo.c:494
 #, c-format
 msgid ""
 "File `%s' in directory `%s' does not match naming convention. Removed.\n"
@@ -5105,22 +5323,22 @@
 "El fichero «%s» en el directorio «%s» no sigue la convención de nombres. "
 "Eliminado.\n"
 
-#: src/peerinfo/gnunet-service-peerinfo.c:638
+#: src/peerinfo/gnunet-service-peerinfo.c:644
 #, fuzzy, c-format
 msgid "Scanning directory `%s'\n"
 msgstr "Escaneando directorio «%s».\n"
 
-#: src/peerinfo/gnunet-service-peerinfo.c:643
+#: src/peerinfo/gnunet-service-peerinfo.c:649
 #, 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:979
+#: src/peerinfo/gnunet-service-peerinfo.c:985
 #, fuzzy, c-format
 msgid "Cleaning up directory `%s'\n"
 msgstr "Escaneando directorio «%s».\n"
 
-#: src/peerinfo/gnunet-service-peerinfo.c:1269
+#: src/peerinfo/gnunet-service-peerinfo.c:1275
 #, c-format
 msgid "Importing HELLOs from `%s'\n"
 msgstr "Importando HELLO de «%s»\n"
@@ -5379,62 +5597,71 @@
 msgid "SQLite database running\n"
 msgstr "Base de datos sqlite ejecutándose\n"
 
-#: src/pt/gnunet-daemon-pt.c:483
+#: src/pt/gnunet-daemon-pt.c:482
 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:489
+#: src/pt/gnunet-daemon-pt.c:488
 msgid "# DNS requests mapped to VPN"
 msgstr "# Peticiones DNS asociadas a la VPN"
 
-#: src/pt/gnunet-daemon-pt.c:542
+#: src/pt/gnunet-daemon-pt.c:541
 msgid "# DNS records modified"
 msgstr "# Registros DNS modificados"
 
-#: src/pt/gnunet-daemon-pt.c:718
+#: src/pt/gnunet-daemon-pt.c:717
 msgid "# DNS replies intercepted"
 msgstr "# Respuestas DNS interceptadas"
 
-#: src/pt/gnunet-daemon-pt.c:724
+#: src/pt/gnunet-daemon-pt.c:723
 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:827
+#: src/pt/gnunet-daemon-pt.c:826
 msgid "# DNS requests dropped (timeout)"
 msgstr "# Peticiones DNS omitidas (expiradas)"
 
-#: src/pt/gnunet-daemon-pt.c:884
+#: src/pt/gnunet-daemon-pt.c:883
 msgid "# DNS requests intercepted"
 msgstr "# Peticiones DNS interceptadas"
 
-#: src/pt/gnunet-daemon-pt.c:889
-msgid "# DNS requests dropped (DNS mesh tunnel down)"
+#: src/pt/gnunet-daemon-pt.c:888
+#, fuzzy
+msgid "# DNS requests dropped (DNS mesh channel down)"
 msgstr "# Peticiones DNS omitidas (túnel mesh DNS caído)"
 
-#: src/pt/gnunet-daemon-pt.c:897
+#: src/pt/gnunet-daemon-pt.c:896
 msgid "# DNS requests dropped (malformed)"
 msgstr "# Peticiones DNS omitidas (mal formadas)"
 
-#: src/pt/gnunet-daemon-pt.c:970
+#: src/pt/gnunet-daemon-pt.c:969
 msgid "# DNS replies received"
 msgstr "# Respuestas DNS recibidas"
 
-#: src/pt/gnunet-daemon-pt.c:986
+#: src/pt/gnunet-daemon-pt.c:985
 msgid "# DNS replies dropped (too late?)"
 msgstr "# Respuestas DNS (¿demasiado tarde?)"
 
-#: 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
+#: src/pt/gnunet-daemon-pt.c:1261 src/pt/gnunet-daemon-pt.c:1270
+#: src/pt/gnunet-daemon-pt.c:1290 src/pt/gnunet-daemon-pt.c:1301
+#: src/pt/gnunet-daemon-pt.c:1310
 #, 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:1348
+#: src/pt/gnunet-daemon-pt.c:1347
 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"
 
+#: src/regex/gnunet-daemon-regexprofiler.c:270
+#: src/regex/gnunet-regex-simulation-profiler.c:659
+#, c-format
+msgid "%s service is lacking key configuration settings (%s).  Exiting.\n"
+msgstr ""
+"El servicio %s carece de opciones de configuración de clave (%s).  "
+"Saliendo.\n"
+
 #: src/regex/gnunet-daemon-regexprofiler.c:380
 msgid "Daemon to announce regular expressions for the peer using mesh."
 msgstr "Demonio para anunciar expresiones regulares para el par usando mesh."
@@ -5590,95 +5817,113 @@
 "Testing and revoking at the same time is not allowed, only executing test.\n"
 msgstr ""
 
-#: src/revocation/gnunet-revocation.c:451
+#: src/revocation/gnunet-revocation.c:436
+#, fuzzy
+msgid "No filename to store revocation certificate given.\n"
+msgstr "Se produjo un fallo al leer la lista de amigos de «%s»\n"
+
+#: src/revocation/gnunet-revocation.c:458
 #, 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
+#: src/revocation/gnunet-revocation.c:483
 #, 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
+#: src/revocation/gnunet-revocation.c:499
 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 "
+#: src/revocation/gnunet-revocation.c:502
+msgid ""
+"revoke the private key associated for the 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"
+#: src/revocation/gnunet-revocation.c:505
+msgid "actually perform revocation, otherwise we just do the precomputation"
 msgstr ""
 
-#: src/revocation/gnunet-revocation.c:501
+#: src/revocation/gnunet-revocation.c:508
 msgid "test if the public key KEY has been revoked"
 msgstr ""
 
-#: src/revocation/gnunet-service-revocation.c:250
+#: src/revocation/gnunet-service-revocation.c:272
 #, fuzzy
 msgid "Duplicate revocation received from peer. Ignored.\n"
 msgstr "Opciones de paquete IPv4 recibidas.  Ignoradas.\n"
 
-#: src/revocation/gnunet-service-revocation.c:599
+#: src/revocation/gnunet-service-revocation.c:434
+#, c-format
+msgid "Error computing revocation set union with %s\n"
+msgstr ""
+
+#: src/revocation/gnunet-service-revocation.c:486
+msgid "SET service crashed, terminating revocation service\n"
+msgstr ""
+
+#: src/revocation/gnunet-service-revocation.c:812
 #, 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
+#: src/scalarproduct/gnunet-scalarproduct.c:225
 #, 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:200
+#: src/scalarproduct/gnunet-scalarproduct.c:232
 msgid "This program needs a session identifier for comparing vectors.\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-scalarproduct.c:206
+#: src/scalarproduct/gnunet-scalarproduct.c:239
 msgid "Please give a session key for --input_key!\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-scalarproduct.c:215
+#: src/scalarproduct/gnunet-scalarproduct.c:251
 #, 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:239
-#: src/scalarproduct/gnunet-scalarproduct.c:297
+#: src/scalarproduct/gnunet-scalarproduct.c:276
 #, 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:246
+#: src/scalarproduct/gnunet-scalarproduct.c:284
 msgid "Need elements to compute the vectorproduct, got none.\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-scalarproduct.c:347
+#: src/scalarproduct/gnunet-scalarproduct.c:336
+#, fuzzy, c-format
+msgid "Could not convert `%s' to integer.\n"
+msgstr "No se pudo conectar al servicio %s.\n"
+
+#: src/scalarproduct/gnunet-scalarproduct.c:397
 msgid ""
 "A comma separated list of elements to compare as vector with our remote peer."
 msgstr ""
 
-#: src/scalarproduct/gnunet-scalarproduct.c:350
+#: src/scalarproduct/gnunet-scalarproduct.c:400
 msgid ""
 "A comma separated mask to select which elements should actually be compared."
 msgstr ""
 
-#: src/scalarproduct/gnunet-scalarproduct.c:353
+#: src/scalarproduct/gnunet-scalarproduct.c:403
 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:356
+#: src/scalarproduct/gnunet-scalarproduct.c:406
 msgid "Transaction ID shared with peer."
 msgstr ""
 
-#: src/scalarproduct/gnunet-scalarproduct.c:365
+#: src/scalarproduct/gnunet-scalarproduct.c:415
 msgid "Calculate the Vectorproduct with a GNUnet peer."
 msgstr ""
 
@@ -5687,148 +5932,149 @@
 msgid "Generated key set with key length %d bits.\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:775
+#: src/scalarproduct/gnunet-service-scalarproduct.c:776
 #, 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:847
-#: src/scalarproduct/gnunet-service-scalarproduct.c:936
+#: src/scalarproduct/gnunet-service-scalarproduct.c:848
+#: src/scalarproduct/gnunet-service-scalarproduct.c:938
 #, 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:853
+#: src/scalarproduct/gnunet-service-scalarproduct.c:854
 #, c-format
 msgid "Sending session-end notification to client (%p) for session %s\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:946
+#: src/scalarproduct/gnunet-service-scalarproduct.c:948
 #, c-format
 msgid "Sent result to client (%p), this session (%s) has ended!\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1025
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1163
+#: src/scalarproduct/gnunet-service-scalarproduct.c:1027
+#: src/scalarproduct/gnunet-service-scalarproduct.c:1165
 msgid "Could not send service-response message via mesh!)\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1376
+#: src/scalarproduct/gnunet-service-scalarproduct.c:1391
 #, c-format
 msgid "Failed to communicate with `%s', scalar product calculation aborted.\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1476
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1603
+#: src/scalarproduct/gnunet-service-scalarproduct.c:1495
+#: src/scalarproduct/gnunet-service-scalarproduct.c:1622
 #, 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:1485
+#: src/scalarproduct/gnunet-service-scalarproduct.c:1504
 #, fuzzy
-msgid "Could not send service-request multipart message to tunnel!\n"
+msgid "Could not send service-request multipart message to channel!\n"
 msgstr "No se pudo mandar el resultado (lista) al cliente\n"
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1525
+#: src/scalarproduct/gnunet-service-scalarproduct.c:1544
 #, fuzzy, c-format
-msgid "Successfully created new tunnel to peer (%s)!\n"
+msgid "Successfully created new channel 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
+#: src/scalarproduct/gnunet-service-scalarproduct.c:1631
 #, fuzzy
-msgid "Could not send message to tunnel!\n"
+msgid "Could not send message to channel!\n"
 msgstr "No se pudo mandar el resultado (lista) al cliente\n"
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1669
+#: src/scalarproduct/gnunet-service-scalarproduct.c:1688
 #, fuzzy
 msgid "Too short message received from client!\n"
 msgstr "# peticiones «PUT» recibidas de clientes"
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1682
+#: src/scalarproduct/gnunet-service-scalarproduct.c:1701
 #, 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:1693
+#: src/scalarproduct/gnunet-service-scalarproduct.c:1712
 #, c-format
 msgid ""
 "Duplicate session information received, cannot create new session with key `"
 "%s'\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1713
+#: src/scalarproduct/gnunet-service-scalarproduct.c:1733
 #, c-format
 msgid ""
-"Got client-request-session with key %s, preparing tunnel to remote service.\n"
+"Got client-request-session with key %s, preparing channel to remote "
+"service.\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1749
+#: src/scalarproduct/gnunet-service-scalarproduct.c:1772
 #, c-format
-msgid "Creating new tunnel for session with key %s.\n"
+msgid "Creating new channel for session with key %s.\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1794
+#: src/scalarproduct/gnunet-service-scalarproduct.c:1819
 #, 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:1802
+#: src/scalarproduct/gnunet-service-scalarproduct.c:1830
 #, 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:1828
+#: src/scalarproduct/gnunet-service-scalarproduct.c:1860
 #, fuzzy, c-format
-msgid "New incoming tunnel from peer %s.\n"
+msgid "New incoming channel from peer %s.\n"
 msgstr "Desconectado de %s\n"
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1859
+#: src/scalarproduct/gnunet-service-scalarproduct.c:1892
 #, c-format
 msgid "Peer disconnected, terminating session %s with peer (%s)\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:2047
-#: src/scalarproduct/gnunet-service-scalarproduct.c:2196
+#: src/scalarproduct/gnunet-service-scalarproduct.c:2083
+#: src/scalarproduct/gnunet-service-scalarproduct.c:2242
 #, c-format
 msgid "Got session with key %s and a matching element set, processing.\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:2054
-#: src/scalarproduct/gnunet-service-scalarproduct.c:2203
+#: src/scalarproduct/gnunet-service-scalarproduct.c:2092
+#: src/scalarproduct/gnunet-service-scalarproduct.c:2249
 #, c-format
 msgid "Got session with key %s without a matching element set, queueing.\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:2142
+#: src/scalarproduct/gnunet-service-scalarproduct.c:2187
 #, c-format
 msgid ""
 "Got message with duplicate session key (`%s'), ignoring service request.\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:2425
+#: src/scalarproduct/gnunet-service-scalarproduct.c:2471
 msgid "Shutting down, initiating cleanup.\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:2490
+#: src/scalarproduct/gnunet-service-scalarproduct.c:2536
 msgid "Generating Paillier-Keyset.\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:2505
+#: src/scalarproduct/gnunet-service-scalarproduct.c:2551
 #, fuzzy
 msgid "Connect to MESH failed\n"
 msgstr "Conexión fallida (¿bug?)\n"
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:2509
+#: src/scalarproduct/gnunet-service-scalarproduct.c:2555
 #, fuzzy
 msgid "Mesh initialized\n"
 msgstr "Conexión fallida\n"
@@ -5861,6 +6107,11 @@
 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"
 
+#: src/set/gnunet-service-set.c:1399
+#, fuzzy
+msgid "Could not connect to mesh service\n"
+msgstr "¡No se pudo conectar al servicio %s!\n"
+
 # Miguel: Conjunto resta.
 #: src/set/gnunet-set-ibf-profiler.c:221
 msgid "number of element in set A-B"
@@ -6004,18 +6255,18 @@
 "Cannot open %s for writing load statistics.  Not logging load statistics\n"
 msgstr ""
 
-#: src/testbed/gnunet-service-testbed_peers.c:1012
+#: src/testbed/gnunet-service-testbed_peers.c:1015
 #, fuzzy
 msgid "Misconfiguration (can't connect to the ARM service)"
 msgstr "¡Se produjo un fallo al conectar con el servicio dv!\n"
 
-#: src/testbed/gnunet-service-testbed_peers.c:1018
+#: src/testbed/gnunet-service-testbed_peers.c:1021
 #, fuzzy
 msgid "Request doesn't fit into a message"
 msgstr "no imprime mensajes de estado"
 
 # Miguel: ¿Es mejor «ya que» que «porque» o «debido al apagado»?
-#: src/testbed/gnunet-service-testbed_peers.c:1056
+#: src/testbed/gnunet-service-testbed_peers.c:1059
 #, fuzzy, c-format
 msgid "%s service can't be started because ARM is shutting down"
 msgstr "Petición ignorada porque el ARM se está apagando.\n"
@@ -6133,46 +6384,46 @@
 "free topology cannot be more than %u.  Given `%s = %llu'"
 msgstr ""
 
-#: src/testbed/testbed_api_topology.c:716
+#: src/testbed/testbed_api_topology.c:715
 #, c-format
 msgid "Topology file %s not found\n"
 msgstr "El fichero de topología %s no fue encontrado\n"
 
-#: src/testbed/testbed_api_topology.c:722
+#: src/testbed/testbed_api_topology.c:721
 #, c-format
 msgid "Topology file %s has no data\n"
 msgstr "El fichero de topología %s no tiene datos\n"
 
-#: src/testbed/testbed_api_topology.c:729
+#: src/testbed/testbed_api_topology.c:728
 #, c-format
 msgid "Topology file %s cannot be read\n"
 msgstr "El fichero de topología %s no puede ser leido\n"
 
-#: src/testbed/testbed_api_topology.c:751
+#: src/testbed/testbed_api_topology.c:750
 #, c-format
 msgid "Failed to read peer index from toology file: %s"
 msgstr ""
 "Se produjo un fallo al leer el índice de pares del archivo de topología: %s"
 
-#: src/testbed/testbed_api_topology.c:760
-#: src/testbed/testbed_api_topology.c:784
+#: src/testbed/testbed_api_topology.c:759
+#: src/testbed/testbed_api_topology.c:783
 #, c-format
 msgid "Value in given topology file: %s out of range\n"
 msgstr "Valor en el fichero de topología dato: %s está fuera de rango\n"
 
-#: src/testbed/testbed_api_topology.c:766
-#: src/testbed/testbed_api_topology.c:790
+#: src/testbed/testbed_api_topology.c:765
+#: src/testbed/testbed_api_topology.c:789
 #, c-format
 msgid "Failed to read peer index from topology file: %s"
 msgstr ""
 "Se produjo un fallo al leer índice de pares del fichero de topología: %s"
 
-#: src/testbed/testbed_api_topology.c:772
-#: src/testbed/testbed_api_topology.c:796
+#: src/testbed/testbed_api_topology.c:771
+#: src/testbed/testbed_api_topology.c:795
 msgid "Topology file needs more peers than given ones\n"
 msgstr "El fichero de topología necesita más pares que los dados\n"
 
-#: src/testbed/testbed_api_topology.c:811
+#: src/testbed/testbed_api_topology.c:810
 #, c-format
 msgid "Ignoring to connect peer %u to peer %u\n"
 msgstr "Ignorando conexión del par %u al par %u\n"
@@ -6225,7 +6476,7 @@
 msgid "Hostkeys file not found: %s\n"
 msgstr "El fichero de máquinas no fue encontrado: %s\n"
 
-#: src/testing/testing.c:293
+#: src/testing/testing.c:293 src/util/gnunet-ecc.c:217
 #, c-format
 msgid "Incorrect hostkey file format: %s\n"
 msgstr "El fichero de máquinas no tiene el formato correcto: %s\n"
@@ -6274,19 +6525,19 @@
 msgstr ""
 "Se produjo un fallo al escribir la clave de la máquina para el par %u: %s\n"
 
-#: src/testing/testing.c:1235
+#: src/testing/testing.c:1238
 #, 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:1335
+#: src/testing/testing.c:1340
 #, c-format
 msgid "Failed to start `%s': %s\n"
 msgstr "Se produjo un fallo al arrancar «%s»: %s\n"
 
-#: src/testing/testing.c:1699
+#: src/testing/testing.c:1704
 #, c-format
 msgid "Failed to load configuration from %s\n"
 msgstr "Se produjo un fallo al cargar la configuración de %s\n"
@@ -6380,56 +6631,58 @@
 msgid "# disconnects due to blacklist"
 msgstr "# desconexiones debido a la lista negra"
 
-#: src/transport/gnunet-service-transport.c:163
-msgid "# bytes payload discarded due to not connected peer "
+#: src/transport/gnunet-service-transport.c:160
+#, fuzzy
+msgid "# bytes payload discarded due to not connected peer"
 msgstr "# bytes de «payload» descartados debido a par no conectado"
 
-#: src/transport/gnunet-service-transport.c:229
+#: src/transport/gnunet-service-transport.c:250
 msgid "# bytes total received"
 msgstr "# total de bytes recibidos"
 
-#: src/transport/gnunet-service-transport.c:277
+#: src/transport/gnunet-service-transport.c:325
 msgid "# bytes payload received"
 msgstr "# bytes de «payload» recibidos"
 
-#: src/transport/gnunet-service-transport.c:429
+#: src/transport/gnunet-service-transport.c:479
 #, 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:479
+#: src/transport/gnunet-service-transport.c:529
 #, 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:760
-msgid "Transport service is lacking key configuration settings.  Exiting.\n"
+#: src/transport/gnunet-service-transport.c:820
+#, fuzzy
+msgid "Transport service is lacking key configuration settings. Exiting.\n"
 msgstr ""
 "El servicio de transporte carece de opciones de configuración de clave.  "
 "Saliendo.\n"
 
-#: src/transport/gnunet-service-transport_clients.c:389
+#: src/transport/gnunet-service-transport_clients.c:384
 #, c-format
 msgid "Dropping message of type %u and size %u, have %u/%u messages pending\n"
 msgstr ""
 "Mensaje omitido de tipo %u y tamaño %u, hay %u/%u mensajes pendientes\n"
 
-#: src/transport/gnunet-service-transport_clients.c:394
+#: src/transport/gnunet-service-transport_clients.c:391
 msgid "# messages dropped due to slow client"
 msgstr "# mensajes omitidos debido a un cliente lento"
 
-#: src/transport/gnunet-service-transport_clients.c:536
+#: src/transport/gnunet-service-transport_clients.c:533
 #, c-format
 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:672
+#: src/transport/gnunet-service-transport_clients.c:674
 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:728
+#: src/transport/gnunet-service-transport_clients.c:731
 msgid "# REQUEST CONNECT messages received"
 msgstr "# mensajes «REQUEST CONNECT» recibidos"
 
@@ -6437,102 +6690,143 @@
 msgid "# refreshed my HELLO"
 msgstr "# refrescos de mi «HELLO»"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1080
+#: src/transport/gnunet-service-transport_neighbours.c:1074
 msgid "# DISCONNECT messages sent"
 msgstr "# Mensajes «DISCONNECT» enviados"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1210
-#: src/transport/gnunet-service-transport_neighbours.c:1545
+#: src/transport/gnunet-service-transport_neighbours.c:1206
+#: src/transport/gnunet-service-transport_neighbours.c:1541
 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:1215
+#: src/transport/gnunet-service-transport_neighbours.c:1211
 msgid "# messages transmitted to other peers"
 msgstr "# mensajes transmitidos a otros pares"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1220
+#: src/transport/gnunet-service-transport_neighbours.c:1216
 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:1277
+#: src/transport/gnunet-service-transport_neighbours.c:1273
 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:1319
+#: src/transport/gnunet-service-transport_neighbours.c:1315
 msgid "# keepalives sent"
 msgstr "# «keepalives» enviados"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1343
+#: src/transport/gnunet-service-transport_neighbours.c:1339
 msgid "# KEEPALIVE messages discarded (peer unknown)"
 msgstr "# Mensajes «KEEPALIVE» descartados (par desconocido)"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1351
+#: src/transport/gnunet-service-transport_neighbours.c:1347
 msgid "# KEEPALIVE messages discarded (no session)"
 msgstr "# mensajes «KEEPALIVE» descartados (no hay sesión)"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1384
+#: src/transport/gnunet-service-transport_neighbours.c:1380
 msgid "# KEEPALIVE_RESPONSE messages discarded (not connected)"
 msgstr "# mensajes «KEEPALIVE_RESPONSE» descartados (no conectado)"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1393
+#: src/transport/gnunet-service-transport_neighbours.c:1389
 msgid "# KEEPALIVE_RESPONSE messages discarded (not expected)"
 msgstr "# Mensajes «KEEPALIVE_RESPONSE» descartados (no esperado)"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1450
+#: src/transport/gnunet-service-transport_neighbours.c:1446
 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:1484
+#: src/transport/gnunet-service-transport_neighbours.c:1480
 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:1500
+#: src/transport/gnunet-service-transport_neighbours.c:1496
 msgid "# ms throttling suggested"
 msgstr "# ms de impulso sugeridos"
 
-#: src/transport/gnunet-service-transport_neighbours.c:2775
+#: src/transport/gnunet-service-transport_neighbours.c:1585
+#, fuzzy
+msgid "# SESSION_CONNECT messages sent"
+msgstr "# Mensajes «DISCONNECT» enviados"
+
+#: src/transport/gnunet-service-transport_neighbours.c:1601
+#, fuzzy, c-format
+msgid "Failed to transmit CONNECT message via plugin to %s\n"
+msgstr "Se produjo un fallo al transmitir un mensaje al servicio «%s».\n"
+
+#: src/transport/gnunet-service-transport_neighbours.c:1641
+#, fuzzy
+msgid "# CONNECT_ACK messages sent"
+msgstr "# Mensajes «DISCONNECT» enviados"
+
+#: src/transport/gnunet-service-transport_neighbours.c:2106
+#, fuzzy
+msgid "# CONNECT messages received"
+msgstr "# mensajes «REQUEST CONNECT» recibidos"
+
+#: src/transport/gnunet-service-transport_neighbours.c:2111
+#, c-format
+msgid "CONNECT request from peer `%s' ignored due impending shutdown\n"
+msgstr ""
+
+#: src/transport/gnunet-service-transport_neighbours.c:2824
+#, fuzzy
+msgid "# CONNECT_ACK messages received"
+msgstr "# mensajes «REQUEST CONNECT» recibidos"
+
+#: src/transport/gnunet-service-transport_neighbours.c:2832
 msgid "# unexpected CONNECT_ACK messages (no peer)"
 msgstr "# Mensajes «CONNECT_ACK» inesperados (sin par)"
 
-#: src/transport/gnunet-service-transport_neighbours.c:2790
-#: src/transport/gnunet-service-transport_neighbours.c:2821
+#: src/transport/gnunet-service-transport_neighbours.c:2847
+#: src/transport/gnunet-service-transport_neighbours.c:2882
 msgid "# unexpected CONNECT_ACK messages (not ready)"
 msgstr "# Mensajes «CONNECT_ACK» inesperados (no estaba preparado)"
 
-#: src/transport/gnunet-service-transport_neighbours.c:2834
+#: src/transport/gnunet-service-transport_neighbours.c:2895
 msgid "# unexpected CONNECT_ACK messages (waiting on ATS)"
 msgstr "# Mensajes «CONNECT_ACK» inesperados (esperando en el ATS)"
 
-#: src/transport/gnunet-service-transport_neighbours.c:2865
+#: src/transport/gnunet-service-transport_neighbours.c:2926
 msgid "# unexpected CONNECT_ACK messages (disconnecting)"
 msgstr "# Mensajes «CONNECT_ACK» inesperados (desconectando)"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3045
-msgid "# unexpected SESSION ACK messages"
+#: src/transport/gnunet-service-transport_neighbours.c:3106
+#, fuzzy
+msgid "# SESSION_ACK messages received"
+msgstr "# mensajes SET QUOTA recibidos"
+
+#: src/transport/gnunet-service-transport_neighbours.c:3122
+#, fuzzy
+msgid "# unexpected SESSION_ACK messages"
 msgstr "# Mensajes «SESSION ACK» inesperados"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3098
+#: src/transport/gnunet-service-transport_neighbours.c:3176
 msgid "# SET QUOTA messages ignored (no such peer)"
 msgstr "# Mensajes «SET QUOTA» ignorados (no existe tal par)"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3112
+#: src/transport/gnunet-service-transport_neighbours.c:3190
 msgid "# disconnects due to quota of 0"
 msgstr "# desconexiones debido a una cuota de 0"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3143
+#: src/transport/gnunet-service-transport_neighbours.c:3220
 msgid "# disconnect messages ignored (old format)"
 msgstr "# mensajes de desconexión ignorados (formato antiguo)"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3154
+#: src/transport/gnunet-service-transport_neighbours.c:3226
+#, fuzzy
+msgid "# DISCONNECT messages received"
+msgstr "# mensajes «REQUEST CONNECT» recibidos"
+
+#: src/transport/gnunet-service-transport_neighbours.c:3235
 msgid "# disconnect messages ignored (timestamp)"
 msgstr "# mensajes de desconexión ignorados (marca temporal)"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3193
+#: src/transport/gnunet-service-transport_neighbours.c:3271
 msgid "# other peer asked to disconnect from us"
 msgstr "# peticiones de otro par para desconectarse de nosotros"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3288
+#: src/transport/gnunet-service-transport_neighbours.c:3366
 msgid "# disconnected from peer upon explicit request"
 msgstr "# desconexiones del par debido a una petición explícita"
 
@@ -6548,11 +6842,12 @@
 #: src/transport/gnunet-service-transport_plugins.c:210
 #: src/transport/gnunet-service-transport_plugins.c:218
 #: src/transport/gnunet-service-transport_plugins.c:226
+#: src/transport/gnunet-service-transport_plugins.c:234
 #, fuzzy, c-format
 msgid "Missing function `%s' in transport plugin for `%s'\n"
 msgstr "Se produjo un fallo al cargar el módulo del transporte para «%s»\n"
 
-#: src/transport/gnunet-service-transport_plugins.c:233
+#: src/transport/gnunet-service-transport_plugins.c:241
 #, fuzzy, c-format
 msgid "Did not load plugin `%s' due to missing functions\n"
 msgstr "Falló al cargar el plugin '%s' en %s:%d. Descargando plugin.\n"
@@ -6561,7 +6856,7 @@
 msgid "# address records discarded"
 msgstr "# registros de direcciones descartados"
 
-#: src/transport/gnunet-service-transport_validation.c:519
+#: src/transport/gnunet-service-transport_validation.c:526
 #, c-format
 msgid ""
 "Not transmitting `%s' with `%s', message too big (%u bytes!). This should "
@@ -6570,63 +6865,84 @@
 "No transmitiendo «%s» con «%s», mensaje demasiado grande (¡%u bytes!). Esto "
 "no debería suceder.\n"
 
-#: src/transport/gnunet-service-transport_validation.c:577
+#: src/transport/gnunet-service-transport_validation.c:584
 msgid "# PING without HELLO messages sent"
 msgstr "# Mensajes PING sin HELLO mandados"
 
-#: src/transport/gnunet-service-transport_validation.c:662
+#: src/transport/gnunet-service-transport_validation.c:685
 msgid "# address revalidations started"
 msgstr "# revalidaciones de direcciones iniciadas"
 
-#: src/transport/gnunet-service-transport_validation.c:933
+#: src/transport/gnunet-service-transport_validation.c:969
 msgid "# PING message for different peer received"
 msgstr "# Mensajes PING recibidos para un par diferente"
 
-#: src/transport/gnunet-service-transport_validation.c:992
+#: src/transport/gnunet-service-transport_validation.c:1019
+#, fuzzy, c-format
+msgid "Plugin `%s' not available, cannot confirm having this address\n"
+msgstr ""
+"No confirmando el PING con dirección «%s» ya que no puedo confirmar tener "
+"esa dirección.\n"
+
+#: src/transport/gnunet-service-transport_validation.c:1029
 msgid "# failed address checks during validation"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1002
+#: src/transport/gnunet-service-transport_validation.c:1032
+#, c-format
+msgid "Address `%s' is not one of my addresses, not confirming PING\n"
+msgstr ""
+
+#: src/transport/gnunet-service-transport_validation.c:1040
 msgid "# successful address checks during validation"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1021
+#: src/transport/gnunet-service-transport_validation.c:1052
+#, fuzzy, c-format
+msgid ""
+"Not confirming PING from peer `%s' with address `%s' since I cannot confirm "
+"having this address.\n"
+msgstr ""
+"No confirmando el PING con dirección «%s» ya que no puedo confirmar tener "
+"esa dirección.\n"
+
+#: src/transport/gnunet-service-transport_validation.c:1060
 #, 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:1075
+#: src/transport/gnunet-service-transport_validation.c:1114
 #, 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:1124
+#: src/transport/gnunet-service-transport_validation.c:1163
 msgid "# PONGs unicast via reliable transport"
 msgstr "# unicast de PONG vía transporte confiable"
 
-#: src/transport/gnunet-service-transport_validation.c:1133
+#: src/transport/gnunet-service-transport_validation.c:1172
 msgid "# PONGs multicast to all available addresses"
 msgstr "# multicast de PONG a todas las direcciones disponibles"
 
-#: src/transport/gnunet-service-transport_validation.c:1260
+#: src/transport/gnunet-service-transport_validation.c:1312
 msgid "# PONGs dropped, no matching pending validation"
 msgstr "# PONG omitidos, no hay una validación pendiente coincidente"
 
-#: src/transport/gnunet-service-transport_validation.c:1275
+#: src/transport/gnunet-service-transport_validation.c:1327
 msgid "# PONGs dropped, signature expired"
 msgstr "# Mensajes PONG omitidos, firma expirada"
 
-#: src/transport/gnunet-service-transport_validation.c:1381
+#: src/transport/gnunet-service-transport_validation.c:1448
 #, 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:259
+#: src/transport/gnunet-transport.c:258
 #, 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:266
+#: src/transport/gnunet-transport.c:265
 #, c-format
 msgid "Received %llu bytes/s (%llu bytes in %s)\n"
 msgstr "Recibidos %llu bytes/s (%llu bytes en %s)\n"
@@ -6647,28 +6963,28 @@
 msgid "Failed to list connections, timeout occured\n"
 msgstr "No se pudieron listar las conexiones, expiró el plazo\n"
 
-#: src/transport/gnunet-transport.c:422
+#: src/transport/gnunet-transport.c:423
 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:435
+#: src/transport/gnunet-transport.c:436
 #, 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:499
+#: src/transport/gnunet-transport.c:506
 #, c-format
 msgid "Transmitting %u bytes to %s\n"
 msgstr "Transmitiendo %u bytes a %s\n"
 
-#: src/transport/gnunet-transport.c:522
+#: src/transport/gnunet-transport.c:529
 #, c-format
 msgid "Successfully connected to `%s'\n"
 msgstr "Conectado satisfactoriamente a «%s»\n"
 
-#: src/transport/gnunet-transport.c:545
+#: src/transport/gnunet-transport.c:552
 #, c-format
 msgid ""
 "Successfully connected to `%s', starting to send benchmark data in %u Kb "
@@ -6677,38 +6993,38 @@
 "Conectado satisfactoriamente a «%s», empezando a mandar datos de prueba en "
 "bloques de %u Kb\n"
 
-#: src/transport/gnunet-transport.c:580
+#: src/transport/gnunet-transport.c:587
 #, c-format
 msgid "Disconnected from peer `%s' while benchmarking\n"
 msgstr "Desconectado del par «%s» mientras probaba\n"
 
-#: src/transport/gnunet-transport.c:650
+#: src/transport/gnunet-transport.c:660
 #, c-format
 msgid "Received %u bytes from %s\n"
 msgstr "Recibidos %u bytes de %s\n"
 
-#: src/transport/gnunet-transport.c:673
+#: src/transport/gnunet-transport.c:685
 #, c-format
 msgid "Peer `%s': %s %s\n"
 msgstr "Par «%s»: %s %s\n"
 
-#: src/transport/gnunet-transport.c:688
+#: src/transport/gnunet-transport.c:704
 #, 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:752
+#: src/transport/gnunet-transport.c:772
 #, c-format
 msgid "Peer `%s' disconnected\n"
 msgstr "Par «%s» desconectado\n"
 
-#: src/transport/gnunet-transport.c:780
+#: src/transport/gnunet-transport.c:802
 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:825
+#: src/transport/gnunet-transport.c:848
 #, c-format
 msgid ""
 "Multiple operations given. Please choose only one operation: %s, %s, %s, %s, "
@@ -6717,7 +7033,7 @@
 "Múltiples operaciones introducidas. Por favor, seleccione únicamente una "
 "operación: %s, %s, %s, %s, %s, %s\n"
 
-#: src/transport/gnunet-transport.c:831
+#: src/transport/gnunet-transport.c:855
 #, c-format
 msgid ""
 "No operation given. Please choose one operation: %s, %s, %s, %s, %s, %s\n"
@@ -6725,55 +7041,55 @@
 "Ninguna operación introducida. Por favor, seleccione alguna operación: %s, "
 "%s, %s, %s, %s, %s\n"
 
-#: src/transport/gnunet-transport.c:851 src/transport/gnunet-transport.c:881
-#: src/transport/gnunet-transport.c:903 src/transport/gnunet-transport.c:940
+#: src/transport/gnunet-transport.c:878 src/transport/gnunet-transport.c:910
+#: src/transport/gnunet-transport.c:932 src/transport/gnunet-transport.c:969
 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:858 src/transport/gnunet-transport.c:888
+#: src/transport/gnunet-transport.c:887 src/transport/gnunet-transport.c:917
 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:908
+#: src/transport/gnunet-transport.c:937
 msgid "Starting to receive benchmark data\n"
 msgstr "Empezando a recibir datos de prueba\n"
 
-#: src/transport/gnunet-transport.c:990
+#: src/transport/gnunet-transport.c:1019
 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:993
+#: src/transport/gnunet-transport.c:1022
 msgid "connect to a peer"
 msgstr "conectar a un par"
 
-#: src/transport/gnunet-transport.c:996
+#: src/transport/gnunet-transport.c:1025
 msgid "provide information about all current connections (once)"
 msgstr "provee información sobre todas las conexiones actuales (una vez)"
 
-#: src/transport/gnunet-transport.c:1002
+#: src/transport/gnunet-transport.c:1031
 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:1005
+#: src/transport/gnunet-transport.c:1034
 msgid "do not resolve hostnames"
 msgstr "no resolver nombres de máquinas"
 
-#: src/transport/gnunet-transport.c:1008
+#: src/transport/gnunet-transport.c:1037
 msgid "peer identity"
 msgstr "identidad del par"
 
-#: src/transport/gnunet-transport.c:1012
+#: src/transport/gnunet-transport.c:1041
 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:1015
+#: src/transport/gnunet-transport.c:1044
 msgid "test transport configuration (involves external server)"
 msgstr "probar configuración de transporte (requiere un servidor externo)"
 
-#: src/transport/gnunet-transport.c:1026
+#: src/transport/gnunet-transport.c:1055
 msgid "Direct access to transport service."
 msgstr "Acceso directo al servicio de transporte."
 
@@ -6789,7 +7105,7 @@
 
 #: src/transport/plugin_transport_bluetooth.c:681
 #: src/transport/plugin_transport_bluetooth.c:731
-#: src/transport/plugin_transport_bluetooth.c:1837
+#: src/transport/plugin_transport_bluetooth.c:1854
 #, fuzzy
 msgid "# Bluetooth sessions allocated"
 msgstr "# sesiones WLAN alojadas"
@@ -6806,154 +7122,84 @@
 
 #: src/transport/plugin_transport_bluetooth.c:938
 #: src/transport/plugin_transport_bluetooth.c:1023
-#: src/transport/plugin_transport_bluetooth.c:1839
+#: src/transport/plugin_transport_bluetooth.c:1856
 #, fuzzy
 msgid "# Bluetooth MAC endpoints allocated"
 msgstr "# MAC de destino WLAN alojadas"
 
-#: src/transport/plugin_transport_bluetooth.c:1218
+#: src/transport/plugin_transport_bluetooth.c:1235
 #, fuzzy
 msgid "# HELLO messages received via Bluetooth"
 msgstr "# mensajes HELLO recibidos vía WLAN"
 
-#: src/transport/plugin_transport_bluetooth.c:1244
+#: src/transport/plugin_transport_bluetooth.c:1261
 #, fuzzy
 msgid "# fragments received via Bluetooth"
 msgstr "# fragmentos recibidos vía WLAN"
 
-#: src/transport/plugin_transport_bluetooth.c:1254
+#: src/transport/plugin_transport_bluetooth.c:1271
 #, fuzzy
 msgid "# ACKs received via Bluetooth"
 msgstr "# ACK recibidos vía WLAN"
 
-#: src/transport/plugin_transport_bluetooth.c:1311
+#: src/transport/plugin_transport_bluetooth.c:1328
 #, 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:1423
+#: src/transport/plugin_transport_bluetooth.c:1440
 #, fuzzy
 msgid "# DATA messages received via Bluetooth"
 msgstr "# mensajes «DATA» recibidos vía WLAN"
 
-#: src/transport/plugin_transport_bluetooth.c:1458
+#: src/transport/plugin_transport_bluetooth.c:1475
 #, fuzzy
 msgid "# Bluetooth DATA messages processed"
 msgstr "# mensajes «DATA» WLAN procesados"
 
-#: src/transport/plugin_transport_bluetooth.c:1521
+#: src/transport/plugin_transport_bluetooth.c:1538
 #, fuzzy
 msgid "# HELLO beacons sent via Bluetooth"
 msgstr "# «beacons HELLO» enviados vía WLAN"
 
-#: src/transport/plugin_transport_bluetooth.c:1634
+#: src/transport/plugin_transport_bluetooth.c:1651
 #, 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:1818
+#: src/transport/plugin_transport_bluetooth.c:1835
 #, fuzzy, c-format
 msgid "Helper binary `%s' not SUID, cannot run bluetooth transport\n"
 msgstr ""
 "El ejecutable auxiliar «%s» no tiene activado el bit SUID, no se puede "
 "ejecutar el transporte WLAN\n"
 
-#: src/transport/plugin_transport_http.c:815
-#: 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: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:2402 src/util/service.c:696
+#: src/transport/plugin_transport_http_client.c:1590
 #, 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: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: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: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:2721
-msgid "Port is required! Fix in configuration\n"
-msgstr "¡El puerto es necesario! Corrija la configuración\n"
-
-#: src/transport/plugin_transport_http.c:1155
-msgid "Port 0, client only mode\n"
-msgstr "Puerto 0, modo únicamente cliente\n"
-
-#: src/transport/plugin_transport_http.c:1175
-#, c-format
-msgid ""
-"Specific IPv4 address `%s' for plugin %s in configuration file is invalid! "
-"Binding to all addresses!\n"
-msgstr ""
-"¡La dirección IPV4 «%s» especificada para el módulo %s en el fichero de "
-"configuración no es válida! ¡Asociándose a todas las direcciones!\n"
-
-#: src/transport/plugin_transport_http.c:1204
-#, c-format
-msgid ""
-"Specific IPv6 address `%s' for plugin %s in configuration file is invalid! "
-"Binding to all addresses!\n"
-msgstr ""
-"¡La dirección IPv6 «%s» especificada para el módulo %s en el fichero de "
-"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:2836
-#, c-format
-msgid "Using external hostname `%s'\n"
-msgstr "Usando nombre de máquina externo «%s»\n"
-
-#: src/transport/plugin_transport_http.c:1226
-msgid "No external hostname configured\n"
-msgstr "No hay nombre de máquina externo configurado\n"
-
-#: 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:1723
-#: src/transport/plugin_transport_http_server.c:2966
+#: src/transport/plugin_transport_http_client.c:1727
+#: src/transport/plugin_transport_http_server.c:2974
 #, c-format
 msgid "Shutting down plugin `%s'\n"
 msgstr "Finalizando el módulo «%s»\n"
 
-#: src/transport/plugin_transport_http_client.c:1748
-#: src/transport/plugin_transport_http_server.c:3026
+#: src/transport/plugin_transport_http_client.c:1752
+#: src/transport/plugin_transport_http_server.c:3032
 #, 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:1776
-#: src/transport/plugin_transport_http_server.c:2866
+#: src/transport/plugin_transport_http_client.c:1780
+#: src/transport/plugin_transport_http_server.c:2874
 #, 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:1381
+#: src/transport/plugin_transport_http_server.c:1389
 #, c-format
 msgid ""
 "Access from connection %p (%u of %u) for `%s' `%s' url `%s' with upload data "
@@ -6962,12 +7208,12 @@
 "Acceso desde la conexión %p (%u de %u) para «%s» «%s» URL «%s» con tamaño de "
 "los datos de subida %u\n"
 
-#: src/transport/plugin_transport_http_server.c:1646
+#: src/transport/plugin_transport_http_server.c:1653
 #, 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:1654
+#: src/transport/plugin_transport_http_server.c:1661
 #, c-format
 msgid ""
 "Server reached maximum number connections (%u), rejecting new connection\n"
@@ -6975,7 +7221,7 @@
 "El servidor ha alcanzado el número máximo de conexiones (%u), rechazando "
 "nueva conexión\n"
 
-#: src/transport/plugin_transport_http_server.c:1941
+#: src/transport/plugin_transport_http_server.c:1947
 msgid ""
 "Could not create a new TLS certificate, program `gnunet-transport-"
 "certificate-creation' could not be started!\n"
@@ -6983,162 +7229,198 @@
 "¡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:1965
+#: src/transport/plugin_transport_http_server.c:1971
 #, 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:2689
+#: src/transport/plugin_transport_http_server.c:2378
+msgid "Require valid port number for service in configuration!\n"
+msgstr "¡Se necesita un puerto válido para el servicio en la configuración!\n"
+
+#: src/transport/plugin_transport_http_server.c:2410 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_server.c:2427 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_server.c:2538
+#, c-format
+msgid "Found %u addresses to report to NAT service\n"
+msgstr "Encontradas %u direcciones para comunicar al servicio NAT\n"
+
+#: src/transport/plugin_transport_http_server.c:2610
+msgid "Disabling IPv6 since it is not supported on this system!\n"
+msgstr "¡Deshabilitando IPv6 ya que no está soportado en este sistema!\n"
+
+#: src/transport/plugin_transport_http_server.c:2697
+#, c-format
 msgid "IPv4 support is %s\n"
 msgstr "El soporte IPv4 es %s\n"
 
-#: src/transport/plugin_transport_http_server.c:2703
+#: src/transport/plugin_transport_http_server.c:2711
 #, c-format
 msgid "IPv6 support is %s\n"
 msgstr "El soporte IPv6 es %s\n"
 
-#: src/transport/plugin_transport_http_server.c:2728
+#: src/transport/plugin_transport_http_server.c:2718
+msgid "Neither IPv4 nor IPv6 are enabled! Fix in configuration\n"
+msgstr "¡Ni IPv4 ni IPv6 están habilitadas! Corrija la configuración\n"
+
+#: src/transport/plugin_transport_http_server.c:2729
+msgid "Port is required! Fix in configuration\n"
+msgstr "¡El puerto es necesario! Corrija la configuración\n"
+
+#: src/transport/plugin_transport_http_server.c:2736
 #, c-format
 msgid "Using port %u\n"
 msgstr "Usando puerto %u\n"
 
-#: src/transport/plugin_transport_http_server.c:2743
+#: src/transport/plugin_transport_http_server.c:2751
 #, 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:2753
+#: src/transport/plugin_transport_http_server.c:2761
 #, 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:2774
+#: src/transport/plugin_transport_http_server.c:2782
 #, 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:2784
+#: src/transport/plugin_transport_http_server.c:2792
 #, 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:2852
+#: src/transport/plugin_transport_http_server.c:2844
 #, c-format
+msgid "Using external hostname `%s'\n"
+msgstr "Usando nombre de máquina externo «%s»\n"
+
+#: src/transport/plugin_transport_http_server.c:2860
+#, c-format
 msgid "Notifying transport only about hostname `%s'\n"
 msgstr "Notificando al transporte sólo el nombre de máquina «%s»\n"
 
-#: src/transport/plugin_transport_smtp.c:370
+#: src/transport/plugin_transport_smtp.c:223
 #, c-format
 msgid "Received malformed message via %s. Ignored.\n"
 msgstr "Mensaje mal formado recibido vía %s. Ignorado.\n"
 
-#: src/transport/plugin_transport_smtp.c:457
+#: src/transport/plugin_transport_smtp.c:310
 msgid "SMTP filter string to invalid, lacks ': '\n"
 msgstr "La cadena de filtrado SMTP no es válida, carece de «: »\n"
 
 # to should be too
-#: src/transport/plugin_transport_smtp.c:466
+#: src/transport/plugin_transport_smtp.c:319
 #, c-format
 msgid "SMTP filter string to long, capped to `%s'\n"
 msgstr "La cadena de filtrado SMTP es demasiado larga, recortada a «%s»\n"
 
-#: src/transport/plugin_transport_smtp.c:561
-#: src/transport/plugin_transport_smtp.c:571
-#: src/transport/plugin_transport_smtp.c:584
-#: src/transport/plugin_transport_smtp.c:603
-#: src/transport/plugin_transport_smtp.c:626
-#: src/transport/plugin_transport_smtp.c:634
-#: src/transport/plugin_transport_smtp.c:647
-#: src/transport/plugin_transport_smtp.c:658
+#: src/transport/plugin_transport_smtp.c:414
+#: src/transport/plugin_transport_smtp.c:424
+#: src/transport/plugin_transport_smtp.c:437
+#: src/transport/plugin_transport_smtp.c:456
+#: src/transport/plugin_transport_smtp.c:479
+#: src/transport/plugin_transport_smtp.c:487
+#: src/transport/plugin_transport_smtp.c:500
+#: src/transport/plugin_transport_smtp.c:511
 #, c-format
 msgid "SMTP: `%s' failed: %s.\n"
 msgstr "SMTP: «%s» falló: %s.\n"
 
-#: src/transport/plugin_transport_smtp.c:799
+#: src/transport/plugin_transport_smtp.c:652
 msgid "No email-address specified, can not start SMTP transport.\n"
 msgstr ""
 "No se ha especificado una dirección de correo, no se puede iniciar el "
 "transporte SMTP.\n"
 
-#: src/transport/plugin_transport_smtp.c:811
+#: src/transport/plugin_transport_smtp.c:664
 msgid "# bytes received via SMTP"
 msgstr "# bytes recibidos vía SMTP"
 
-#: src/transport/plugin_transport_smtp.c:812
+#: src/transport/plugin_transport_smtp.c:665
 msgid "# bytes sent via SMTP"
 msgstr "# bytes enviados vía SMTP"
 
-#: src/transport/plugin_transport_smtp.c:814
+#: src/transport/plugin_transport_smtp.c:667
 msgid "# bytes dropped by SMTP (outgoing)"
 msgstr "# bytes omitidos por SMTP (salientes)"
 
-#: src/transport/plugin_transport_tcp.c:626
+#: src/transport/plugin_transport_tcp.c:632
 #, c-format
 msgid "Unexpected address length: %u bytes\n"
 msgstr "Longitud de dirección inesperada: %u bytes\n"
 
-#: src/transport/plugin_transport_tcp.c:834
-#: 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:1206
-#: src/transport/plugin_transport_tcp.c:1223
+#: src/transport/plugin_transport_tcp.c:842
+#: src/transport/plugin_transport_tcp.c:931
+#: src/transport/plugin_transport_tcp.c:981
+#: src/transport/plugin_transport_tcp.c:1077
+#: src/transport/plugin_transport_tcp.c:1225
+#: src/transport/plugin_transport_tcp.c:1242
 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:2015
-#: src/transport/plugin_transport_tcp.c:2696
+#: src/transport/plugin_transport_tcp.c:849
+#: src/transport/plugin_transport_tcp.c:1043
+#: src/transport/plugin_transport_tcp.c:2041
+#: src/transport/plugin_transport_tcp.c:2721
 msgid "# TCP sessions active"
 msgstr "# Sesiones TCP activas"
 
-#: src/transport/plugin_transport_tcp.c:927
+#: src/transport/plugin_transport_tcp.c:935
 msgid "# bytes discarded by TCP (timeout)"
 msgstr "# bytes omitidos por TCP (expirados)"
 
-#: src/transport/plugin_transport_tcp.c:976
+#: src/transport/plugin_transport_tcp.c:984
 msgid "# bytes transmitted via TCP"
 msgstr "# bytes recibidos vía TCP"
 
-#: src/transport/plugin_transport_tcp.c:1063
+#: src/transport/plugin_transport_tcp.c:1081
 msgid "# bytes discarded by TCP (disconnect)"
 msgstr "# bytes descartados por TCP (desconectado)"
 
-#: src/transport/plugin_transport_tcp.c:1180
+#: src/transport/plugin_transport_tcp.c:1199
 #, 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:1417
-#: src/transport/plugin_transport_udp.c:1440
+#: src/transport/plugin_transport_tcp.c:1440
+#: src/transport/plugin_transport_udp.c:1471
 msgid "# requests to create session with invalid address"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:1534
+#: src/transport/plugin_transport_tcp.c:1558
 msgid "# transport-service disconnect requests for TCP"
 msgstr "# peticiones de desconexión del servicio de transporte por TCP"
 
-#: src/transport/plugin_transport_tcp.c:2065
+#: src/transport/plugin_transport_tcp.c:2091
 msgid "# TCP WELCOME messages received"
 msgstr "# Mensajes «WELCOME» TCP recibidos"
 
-#: src/transport/plugin_transport_tcp.c:2248
+#: src/transport/plugin_transport_tcp.c:2274
 msgid "# bytes received via TCP"
 msgstr "# bytes recibidos vía TCP"
 
-#: src/transport/plugin_transport_tcp.c:2328
+#: src/transport/plugin_transport_tcp.c:2354
 msgid "# network-level TCP disconnect events"
 msgstr "# eventos de desconexión TCP a nivel de red"
 
-#: src/transport/plugin_transport_tcp.c:2576 src/util/service.c:589
+#: src/transport/plugin_transport_tcp.c:2602 src/util/service.c:589
 #: src/util/service.c:595
 #, c-format
 msgid "Require valid port number for service `%s' in configuration!\n"
@@ -7146,52 +7428,52 @@
 "¡Se requiere un número de puerto válido para el servicio «%s» en la "
 "configuración!\n"
 
-#: src/transport/plugin_transport_tcp.c:2590
+#: src/transport/plugin_transport_tcp.c:2616
 msgid "Failed to start service.\n"
 msgstr "Se produjo un fallo al iniciar el servicio.\n"
 
-#: src/transport/plugin_transport_tcp.c:2683
+#: src/transport/plugin_transport_tcp.c:2710
 #, 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:2687
+#: src/transport/plugin_transport_tcp.c:2713
 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:2691
+#: src/transport/plugin_transport_tcp.c:2716
 #, c-format
 msgid "TCP transport advertises itself as being on port %llu\n"
 msgstr "El transporte TCP anuncia que está en el puerto %llu\n"
 
-#: src/transport/plugin_transport_udp_broadcasting.c:134
+#: src/transport/plugin_transport_udp_broadcasting.c:173
 msgid "# IPv6 multicast HELLO beacons received via udp"
 msgstr "# beacons HELLO multicast IPv6 recibidos vía UDP"
 
-#: src/transport/plugin_transport_udp_broadcasting.c:184
+#: src/transport/plugin_transport_udp_broadcasting.c:222
 msgid "# IPv4 broadcast HELLO beacons received via udp"
 msgstr "# beacons HELLO broadcast IPv4 recibidos vía UDP"
 
-#: src/transport/plugin_transport_udp_broadcasting.c:402
+#: src/transport/plugin_transport_udp_broadcasting.c:605
 msgid ""
 "Disabling HELLO broadcasting due to friend-to-friend only configuration!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_udp_broadcasting.c:419
+#: src/transport/plugin_transport_udp_broadcasting.c:619
 #, c-format
 msgid "Failed to set IPv4 broadcast option for broadcast socket on port %d\n"
 msgstr ""
 "Se produjo un fallo al establecer la opción de «broadcast» IPv4 para el "
 "«socket» en el puerto %d\n"
 
-#: src/transport/plugin_transport_udp.c:1550
+#: src/transport/plugin_transport_udp.c:1581
 #, 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:2602
+#: src/transport/plugin_transport_udp.c:2635
 #, c-format
 msgid ""
 "UDP could not transmit message to `%s': Network seems down, please check "
@@ -7200,37 +7482,36 @@
 "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:2616
-#, c-format
+#: src/transport/plugin_transport_udp.c:2649
+#, fuzzy
 msgid ""
-"UDP could not transmit message to `%s': Please check your network "
-"configuration and disable IPv6 if your connection does not have a global "
-"IPv6 address\n"
+"UDP could not transmit IPv6 message! Please check your network configuration "
+"and disable IPv6 if your connection does not have a global IPv6 address\n"
 msgstr ""
 "UDP no pudo transmitir el mensaje a «%s». Por favor, compruebe su "
 "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:2917
+#: src/transport/plugin_transport_udp.c:2949
 msgid "Failed to open UDP sockets\n"
 msgstr "Se produjo un fallo al abrir los «sockets» UDP\n"
 
-#: src/transport/plugin_transport_udp.c:3015
+#: src/transport/plugin_transport_udp.c:3046
 #, 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:3058
+#: src/transport/plugin_transport_udp.c:3089
 #, c-format
 msgid "Invalid IPv6 address: `%s'\n"
 msgstr "Dirección IPv6 no válida: «%s»\n"
 
-#: src/transport/plugin_transport_udp.c:3117
+#: src/transport/plugin_transport_udp.c:3148
 #, 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:1627
+#: src/transport/plugin_transport_unix.c:1625
 #, fuzzy
 msgid "Failed to open UNIX listen socket\n"
 msgstr "Se produjo un fallo al abrir los «sockets» UNIX\n"
@@ -7243,66 +7524,66 @@
 msgid "# WLAN messages defragmented"
 msgstr "# mensajes WLAN defragmentados"
 
-#: src/transport/plugin_transport_wlan.c:688
-#: src/transport/plugin_transport_wlan.c:758
-#: src/transport/plugin_transport_wlan.c:1903
+#: src/transport/plugin_transport_wlan.c:691
+#: src/transport/plugin_transport_wlan.c:763
+#: src/transport/plugin_transport_wlan.c:1910
 msgid "# WLAN sessions allocated"
 msgstr "# sesiones WLAN alojadas"
 
-#: src/transport/plugin_transport_wlan.c:863
+#: src/transport/plugin_transport_wlan.c:868
 msgid "# WLAN message fragments sent"
 msgstr "# fragmentos de mensaje WLAN enviados"
 
-#: src/transport/plugin_transport_wlan.c:887
+#: src/transport/plugin_transport_wlan.c:892
 msgid "# WLAN messages pending (with fragmentation)"
 msgstr "# mensajes WLAN pendientes (con fragmentación)"
 
-#: src/transport/plugin_transport_wlan.c:995
-#: src/transport/plugin_transport_wlan.c:1080
-#: src/transport/plugin_transport_wlan.c:1905
+#: src/transport/plugin_transport_wlan.c:1000
+#: src/transport/plugin_transport_wlan.c:1086
+#: src/transport/plugin_transport_wlan.c:1912
 msgid "# WLAN MAC endpoints allocated"
 msgstr "# MAC de destino WLAN alojadas"
 
-#: src/transport/plugin_transport_wlan.c:1275
+#: src/transport/plugin_transport_wlan.c:1282
 msgid "# HELLO messages received via WLAN"
 msgstr "# mensajes HELLO recibidos vía WLAN"
 
-#: src/transport/plugin_transport_wlan.c:1301
+#: src/transport/plugin_transport_wlan.c:1308
 msgid "# fragments received via WLAN"
 msgstr "# fragmentos recibidos vía WLAN"
 
-#: src/transport/plugin_transport_wlan.c:1311
+#: src/transport/plugin_transport_wlan.c:1318
 msgid "# ACKs received via WLAN"
 msgstr "# ACK recibidos vía WLAN"
 
-#: src/transport/plugin_transport_wlan.c:1368
+#: src/transport/plugin_transport_wlan.c:1375
 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:1489
+#: src/transport/plugin_transport_wlan.c:1496
 msgid "# DATA messages received via WLAN"
 msgstr "# mensajes «DATA» recibidos vía WLAN"
 
-#: src/transport/plugin_transport_wlan.c:1524
+#: src/transport/plugin_transport_wlan.c:1531
 msgid "# WLAN DATA messages processed"
 msgstr "# mensajes «DATA» WLAN procesados"
 
-#: src/transport/plugin_transport_wlan.c:1587
+#: src/transport/plugin_transport_wlan.c:1594
 msgid "# HELLO beacons sent via WLAN"
 msgstr "# «beacons HELLO» enviados vía WLAN"
 
-#: src/transport/plugin_transport_wlan.c:1700
+#: src/transport/plugin_transport_wlan.c:1707
 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:1884
+#: src/transport/plugin_transport_wlan.c:1891
 #, 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:647
+#: src/transport/transport_api.c:682
 #, c-format
 msgid "Received unexpected message of type %u in %s:%u\n"
 msgstr "Recibido mensaje inesperado del tipo %u en %s:%u\n"
@@ -7370,17 +7651,17 @@
 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:991
+#: src/util/client.c:989
 #, 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:1003
+#: src/util/client.c:1001
 #, 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:1274
+#: src/util/client.c:1284
 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 "
@@ -7457,17 +7738,17 @@
 "El valor de configuración «%s» para «%s» de la sección «%s» no está dentro "
 "de las opciones legales\n"
 
-#: src/util/configuration.c:1065
+#: src/util/configuration.c:1066
 #, c-format
 msgid "Recursive expansion suspected, aborting $-expansion for term `%s'\n"
 msgstr ""
 
-#: src/util/configuration.c:1097
+#: src/util/configuration.c:1098
 #, 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
+#: src/util/configuration.c:1172
 #, c-format
 msgid ""
 "Failed to expand `%s' in `%s' as it is neither found in [PATHS] nor defined "
@@ -7511,23 +7792,23 @@
 "El tamaño del fichero en disco es incorrecto para este «Bloom "
 "filter» (esperado %llu, tiene %llu)\n"
 
-#: src/util/crypto_ecc.c:940 src/util/crypto_ecc.c:978
-#: src/util/crypto_ecc.c:1096 src/util/crypto_ecc.c:1134
+#: src/util/crypto_ecc.c:789 src/util/crypto_ecc.c:827
+#: src/util/crypto_ecc.c:945 src/util/crypto_ecc.c:983
 #, 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:945 src/util/crypto_ecc.c:1101
+#: src/util/crypto_ecc.c:794 src/util/crypto_ecc.c:950
 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:982 src/util/crypto_ecc.c:1138
+#: src/util/crypto_ecc.c:831 src/util/crypto_ecc.c:987
 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:1012 src/util/crypto_ecc.c:1168
+#: src/util/crypto_ecc.c:861 src/util/crypto_ecc.c:1017
 #, c-format
 msgid ""
 "When trying to read key file `%s' I found %u bytes but I need at least %u.\n"
@@ -7535,53 +7816,48 @@
 "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:1016 src/util/crypto_ecc.c:1172
+#: src/util/crypto_ecc.c:865 src/util/crypto_ecc.c:1021
 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:1254
+#: src/util/crypto_ecc.c:1103
 #, 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:1343
+#: src/util/crypto_ecc.c:1207
 #, 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:1393
+#: src/util/crypto_ecc.c:1257
 #, 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
+#: src/util/crypto_ecc.c:1331
 #, 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
+#: src/util/crypto_ecc.c:1388
 #, 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:320
+#: src/util/crypto_random.c:280
 #, 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: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:1185
+#: src/util/disk.c:1184
 #, c-format
 msgid "Expected `%s' to be a directory!\n"
 msgstr "¡Se esperaba que «%s» fuera un directorio!\n"
 
-#: src/util/disk.c:1543 src/util/service.c:1315
+#: src/util/disk.c:1546 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"
@@ -7695,17 +7971,17 @@
 msgid "Manipulate GNUnet configuration files"
 msgstr "Manipular ficheros de configuración de GNUnet"
 
-#: src/util/gnunet-ecc.c:60
+#: src/util/gnunet-ecc.c:75
 #, c-format
 msgid "Failed to open `%s': %s\n"
 msgstr "Se produjo un fallo al abrir «%s»: %s\n"
 
-#: src/util/gnunet-ecc.c:66
+#: src/util/gnunet-ecc.c:81
 #, c-format
 msgid "Generating %u keys, please wait"
 msgstr "Generando %u claves, por favor, espere"
 
-#: src/util/gnunet-ecc.c:82
+#: src/util/gnunet-ecc.c:97
 #, c-format
 msgid ""
 "\n"
@@ -7714,37 +7990,64 @@
 "\n"
 "Se produjo un fallo al escribir en «%s»: %s\n"
 
-#: src/util/gnunet-ecc.c:92
+#: src/util/gnunet-ecc.c:107
 #, fuzzy, c-format
 msgid ""
 "\n"
 "Finished!\n"
 msgstr "¡Finalizado!\n"
 
-#: src/util/gnunet-ecc.c:95
+#: src/util/gnunet-ecc.c:110
 #, c-format
 msgid ""
 "\n"
 "Error, %u keys not generated\n"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:119
+#: src/util/gnunet-ecc.c:199
+#, fuzzy, c-format
+msgid "Hostkeys file `%s' not found\n"
+msgstr "El fichero de máquinas %s no fue encontrado\n"
+
+#: src/util/gnunet-ecc.c:210
+#, fuzzy, c-format
+msgid "Hostkeys file `%s' is empty\n"
+msgstr "El archivo de amigos «%s» está vacío.\n"
+
+#: src/util/gnunet-ecc.c:232
+#, fuzzy, c-format
+msgid "Could not read hostkey file: %s\n"
+msgstr "¡No se puede leer el fichero de claves de máquina!\n"
+
+#: src/util/gnunet-ecc.c:286
 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:168
+#: src/util/gnunet-ecc.c:341
+msgid "list keys included in a file (for testing)"
+msgstr ""
+
+#: src/util/gnunet-ecc.c:344
+msgid "number of keys to list included in a file (for testing)"
+msgstr ""
+
+#: src/util/gnunet-ecc.c:347
 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:171
+#: src/util/gnunet-ecc.c:350
 msgid "print the public key in ASCII format"
 msgstr "imprime la clave pública en formato ASCII"
 
-#: src/util/gnunet-ecc.c:174
+#: src/util/gnunet-ecc.c:353
 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:185
+#: src/util/gnunet-ecc.c:356
+msgid "print examples of ECC operations (used for compatibility testing)"
+msgstr ""
+
+#: src/util/gnunet-ecc.c:367
 msgid "Manipulate GNUnet private ECC key files"
 msgstr "Manipular los ficheros de clave privada ECC de GNUnet"
 
@@ -7767,27 +8070,27 @@
 msgid "Could not find IP of host `%s': %s\n"
 msgstr "No se encontró la IP del host «%s»: %s\n"
 
-#: src/util/gnunet-uri.c:90
+#: src/util/gnunet-uri.c:84
 #, c-format
 msgid "No URI specified on command line\n"
 msgstr "No se ha especificado una URI en la línea de comandos. Saliendo.\n"
 
-#: src/util/gnunet-uri.c:95
+#: src/util/gnunet-uri.c:89
 #, c-format
 msgid "Invalid URI: does not start with `%s'\n"
 msgstr "URI no válida: no comienza con «%s»\n"
 
-#: src/util/gnunet-uri.c:102
+#: src/util/gnunet-uri.c:96
 #, c-format
 msgid "Invalid URI: fails to specify subsystem\n"
 msgstr "URI no válida: falla al especificar el subsistema\n"
 
-#: src/util/gnunet-uri.c:112
+#: src/util/gnunet-uri.c:106
 #, c-format
 msgid "No handler known for subsystem `%s'\n"
 msgstr "No hay un manejador conocido para el subsistema «%s»\n"
 
-#: src/util/gnunet-uri.c:174
+#: src/util/gnunet-uri.c:168
 msgid "Perform default-actions for GNUnet URIs"
 msgstr "Realizar las acciones predeterminadas para URI de GNUnet"
 
@@ -7830,17 +8133,17 @@
 "No se pudo determinar la ruta de instalación de %s.  Establezca la variable "
 "de entorno «%s».\n"
 
-#: src/util/os_installation.c:710
+#: src/util/os_installation.c:713
 #, 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:770
+#: src/util/os_installation.c:773
 #, 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:780
+#: src/util/os_installation.c:783
 #, c-format
 msgid "GetExitCodeProcess failed for binary %s (%d).\n"
 msgstr ""
@@ -7850,25 +8153,35 @@
 msgid "Initialization of plugin mechanism failed: %s!\n"
 msgstr "¡La inicialización del mecanismo de módulos falló: %s!\n"
 
-#: src/util/plugin.c:144
+#: src/util/plugin.c:148
 #, 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:217
+#: src/util/plugin.c:223
 #, 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:347
+#: src/util/plugin.c:382
 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:262 src/util/service.c:1452
+#: src/util/program.c:260 src/util/service.c:1449
+#, fuzzy, c-format
+msgid "Malformed configuration file `%s', exit ...\n"
+msgstr "Se produjo un fallo al borrar el fichero de configuración %s\n"
+
+#: src/util/program.c:270 src/util/service.c:1464
 #, c-format
 msgid "Could not access configuration file `%s'\n"
 msgstr "No se pudo acceder al fichero de configuración «%s»\n"
 
+#: src/util/program.c:275 src/util/service.c:1459
+#, fuzzy
+msgid "Malformed configuration, exit ...\n"
+msgstr "Se produjo un fallo al borrar el fichero de configuración %s\n"
+
 #: src/util/resolver_api.c:198
 #, c-format
 msgid "Must specify `%s' for `%s' in configuration!\n"
@@ -7898,11 +8211,11 @@
 msgstr ""
 "No se pudo resolver nuestro nombre de dominio cualificado (FQDN) : %s\n"
 
-#: src/util/scheduler.c:804
+#: src/util/scheduler.c:813
 msgid "Looks like we're busy waiting...\n"
 msgstr "Parece que estamos en espera ocupada...\n"
 
-#: src/util/scheduler.c:938
+#: src/util/scheduler.c:948
 #, c-format
 msgid "Attempt to cancel dead task %llu!\n"
 msgstr "¡Intento de cancelar la tarea muerta %llu!\n"
@@ -8029,7 +8342,7 @@
 msgid "do daemonize (detach from terminal)"
 msgstr "demonizar (desasociar del terminal)"
 
-#: src/util/signal.c:79
+#: src/util/signal.c:89
 #, c-format
 msgid "signal (%d, %p) returned %d.\n"
 msgstr "señal (%d, %p) devolvió %d.\n"
@@ -8038,124 +8351,125 @@
 msgid "b"
 msgstr "b"
 
-#: src/util/strings.c:444
+#: src/util/strings.c:450
 #, c-format
 msgid "Character sets requested were `%s'->`%s'\n"
 msgstr "Los conjuntos de caracteres pedidos fueron «%s»->«%s»\n"
 
-#: src/util/strings.c:572
+#: src/util/strings.c:578
 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:669
+#: src/util/strings.c:675
 msgid "µs"
 msgstr ""
 
-#: src/util/strings.c:673
+#: src/util/strings.c:679
 msgid "forever"
 msgstr "para siempre"
 
-#: src/util/strings.c:675
+#: src/util/strings.c:681
 msgid "0 ms"
 msgstr "0 ms"
 
-#: src/util/strings.c:681
+#: src/util/strings.c:687
 msgid "ms"
 msgstr "ms"
 
-#: src/util/strings.c:687
+#: src/util/strings.c:693
 msgid "s"
 msgstr "s"
 
-#: src/util/strings.c:693
+#: src/util/strings.c:699
 msgid "m"
 msgstr "m"
 
-#: src/util/strings.c:699
+#: src/util/strings.c:705
 msgid "h"
 msgstr "h"
 
-#: src/util/strings.c:706
+#: src/util/strings.c:712
 msgid "day"
 msgstr "día"
 
-#: src/util/strings.c:708
+#: src/util/strings.c:714
 msgid "days"
 msgstr "días"
 
-#: src/util/strings.c:737
+#: src/util/strings.c:743
 msgid "end of time"
 msgstr "fin del plazo"
 
-#: src/util/strings.c:1141
+#: src/util/strings.c:1149
 msgid "IPv6 address did not start with `['\n"
 msgstr "La dirección IPv6 no empezaba con «[»\n"
 
-#: src/util/strings.c:1149
+#: src/util/strings.c:1157
 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:1155
+#: src/util/strings.c:1163
 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:1162
+#: src/util/strings.c:1170
 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:1171
+#: src/util/strings.c:1179
 #, c-format
 msgid "Invalid IPv6 address `%s': %s\n"
 msgstr "Dirección IPv6 «%s» no válida: %s\n"
 
-#: src/util/strings.c:1377 src/util/strings.c:1393
+#: src/util/strings.c:1385 src/util/strings.c:1401
 msgid "Port not in range\n"
 msgstr ""
 
-#: src/util/strings.c:1402
+#: src/util/strings.c:1410
 #, 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
+#: src/util/strings.c:1493 src/util/strings.c:1524 src/util/strings.c:1572
+#: src/util/strings.c:1593
 #, c-format
 msgid "Invalid format for IP: `%s'\n"
 msgstr "Formato no válido para la IP: «%s»\n"
 
-#: src/util/strings.c:1543
+#: src/util/strings.c:1550
 #, 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
+#: src/util/strings.c:1602
 #, fuzzy, c-format
 msgid "Invalid format: `%s'\n"
 msgstr "Formato de tiempo no válido «%s»\n"
 
-#: src/util/strings.c:1647
+#: src/util/strings.c:1654
 #, 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
+#: src/util/strings.c:1704
 #, c-format
 msgid "Wrong format `%s' for netmask\n"
 msgstr "Formato «%s» erroneo para máscara de red\n"
 
-#: src/util/strings.c:1728
+#: src/util/strings.c:1735
 #, 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"
+#: src/vpn/gnunet-service-vpn.c:550 src/vpn/gnunet-service-vpn.c:1086
+#, fuzzy
+msgid "# Active channels"
 msgstr "# Túneles activos"
 
 #: src/vpn/gnunet-service-vpn.c:642
@@ -8166,98 +8480,100 @@
 msgid "# Bytes dropped in mesh queue (overflow)"
 msgstr "# Bytes omitidos en la cola mesh (desbordamiento)"
 
-#: src/vpn/gnunet-service-vpn.c:754
-msgid "# Mesh tunnels created"
+#: src/vpn/gnunet-service-vpn.c:753
+#, fuzzy
+msgid "# Mesh channels created"
 msgstr "# Túneles mesh creados"
 
-#: src/vpn/gnunet-service-vpn.c:786
-msgid "Failed to setup mesh tunnel!\n"
+#: src/vpn/gnunet-service-vpn.c:784
+#, fuzzy
+msgid "Failed to setup mesh channel!\n"
 msgstr "¡Se produjo un fallo al configurar el túnel mesh!\n"
 
-#: src/vpn/gnunet-service-vpn.c:980
+#: src/vpn/gnunet-service-vpn.c:978
 #, c-format
 msgid "Protocol %u not supported, dropping\n"
 msgstr "Protocolo %u no soportado, omitiendo\n"
 
-#: src/vpn/gnunet-service-vpn.c:1307
+#: src/vpn/gnunet-service-vpn.c:1305
 msgid "# ICMPv4 packets dropped (not allowed)"
 msgstr "# Paquetes ICMPv4 omitidos (no permitido)"
 
-#: src/vpn/gnunet-service-vpn.c:1328
+#: src/vpn/gnunet-service-vpn.c:1326
 msgid "# ICMPv6 packets dropped (not allowed)"
 msgstr "# Paquetes ICMPv6 omitidos (no permitido)"
 
-#: src/vpn/gnunet-service-vpn.c:1533
+#: src/vpn/gnunet-service-vpn.c:1531
 msgid "# Packets received from TUN interface"
 msgstr "# Paquetes recibidos de la interfaz TUN"
 
-#: src/vpn/gnunet-service-vpn.c:1566 src/vpn/gnunet-service-vpn.c:1602
+#: src/vpn/gnunet-service-vpn.c:1564 src/vpn/gnunet-service-vpn.c:1600
 #, 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:1612
+#: src/vpn/gnunet-service-vpn.c:1610
 msgid "Received IPv4 packet with options (dropping it)\n"
 msgstr "Recibido paquete IPv4 con opciones (omitiéndolo)\n"
 
-#: src/vpn/gnunet-service-vpn.c:1626
+#: src/vpn/gnunet-service-vpn.c:1624
 #, 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:1708
+#: src/vpn/gnunet-service-vpn.c:1706
 msgid "# ICMP packets received from mesh"
 msgstr "# Paquetes ICMP recibidos de mesh"
 
-#: src/vpn/gnunet-service-vpn.c:2047
+#: src/vpn/gnunet-service-vpn.c:2045
 msgid "# UDP packets received from mesh"
 msgstr "# Paquetes UDP recibidos de mesh"
 
-#: src/vpn/gnunet-service-vpn.c:2202
+#: src/vpn/gnunet-service-vpn.c:2200
 msgid "# TCP packets received from mesh"
 msgstr "# Paquetes TCP recibidos de mesh"
 
-#: src/vpn/gnunet-service-vpn.c:2353
+#: src/vpn/gnunet-service-vpn.c:2351
 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:2408
+#: src/vpn/gnunet-service-vpn.c:2406
 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:2449 src/vpn/gnunet-service-vpn.c:2665
+#: src/vpn/gnunet-service-vpn.c:2447 src/vpn/gnunet-service-vpn.c:2663
 msgid "# Active destinations"
 msgstr "# Destinos activos"
 
-#: src/vpn/gnunet-service-vpn.c:2717
+#: src/vpn/gnunet-service-vpn.c:2715
 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:2984
+#: src/vpn/gnunet-service-vpn.c:2982
 #, fuzzy
 msgid "Must specify valid IPv6 address"
 msgstr "«%s» no es una dirección IP válida.\n"
 
-#: src/vpn/gnunet-service-vpn.c:3008
+#: src/vpn/gnunet-service-vpn.c:3006
 msgid "Must specify valid IPv6 mask"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:3016
+#: src/vpn/gnunet-service-vpn.c:3014
 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:3029
+#: src/vpn/gnunet-service-vpn.c:3027
 #, fuzzy
 msgid "Must specify valid IPv4 address"
 msgstr "«%s» no es una dirección IP válida.\n"
 
-#: src/vpn/gnunet-service-vpn.c:3042
+#: src/vpn/gnunet-service-vpn.c:3040
 msgid "Must specify valid IPv4 mask"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:3052
+#: src/vpn/gnunet-service-vpn.c:3050
 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"
@@ -8343,6 +8659,51 @@
 msgid "`%s' failed on file `%s' at %s:%d with error: %s\n"
 msgstr "«%s» falló en el fichero «%s» en %s:%d con el error: %s\n"
 
+#, fuzzy
+#~ msgid "Internal error %d\n"
+#~ msgstr "Error interno."
+
+#, fuzzy
+#~ msgid "Aborting call to `%s'\n"
+#~ msgstr "Error escribiendo a «%s»: %s\n"
+
+#, fuzzy
+#~ msgid "You are already in a conversation with `%s'.\n"
+#~ msgstr "No se pudo acceder al fichero de configuración «%s»\n"
+
+#~ msgid "Print information about mesh tunnels and peers."
+#~ msgstr "Imprimir información acerca de tuneles mesh y pares."
+
+#~ msgid ""
+#~ "%s service is lacking key configuration settings (%s). Using default "
+#~ "(%u).\n"
+#~ msgstr ""
+#~ "El servicio %s carece de opciones de configuración de clave (%s). Usando "
+#~ "predeterminada (%u).\n"
+
+#~ msgid "Port 0, client only mode\n"
+#~ msgstr "Puerto 0, modo únicamente cliente\n"
+
+#~ msgid ""
+#~ "Specific IPv4 address `%s' for plugin %s in configuration file is "
+#~ "invalid! Binding to all addresses!\n"
+#~ msgstr ""
+#~ "¡La dirección IPV4 «%s» especificada para el módulo %s en el fichero de "
+#~ "configuración no es válida! ¡Asociándose a todas las direcciones!\n"
+
+#~ msgid ""
+#~ "Specific IPv6 address `%s' for plugin %s in configuration file is "
+#~ "invalid! Binding to all addresses!\n"
+#~ msgstr ""
+#~ "¡La dirección IPv6 «%s» especificada para el módulo %s en el fichero de "
+#~ "configuración no es válida! ¡Asociándose a todas las direcciones!\n"
+
+#~ msgid "No external hostname configured\n"
+#~ msgstr "No hay nombre de máquina externo configurado\n"
+
+#~ msgid "Starting `%s' process to generate entropy\n"
+#~ msgstr "Iniciando el proceso «%s» para generar entropía\n"
+
 #~ msgid "Loading block plugin `%s'\n"
 #~ msgstr "Cargando el módulo de bloques «%s»\n"
 
@@ -8386,9 +8747,6 @@
 #~ 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 "
@@ -9265,9 +9623,6 @@
 #~ msgstr ""
 #~ "El servicio NSE no puede acceder a la clave de la máquina. Saliendo.\n"
 
-#~ msgid "Failed to transmit message to `%s' service.\n"
-#~ msgstr "Se produjo un fallo al transmitir un mensaje al servicio «%s».\n"
-
 #~ msgid "Failed to transmit iteration request to `PEERINFO' service\n"
 #~ msgstr ""
 #~ "Petición de transmisión de iteración de expiración al servicio de "
@@ -9609,9 +9964,6 @@
 #~ msgstr ""
 #~ "Encontrando %u pares adicionales mas cercanos cada uno (si es posible)\n"
 
-#~ msgid "Could not read hostkeys file!\n"
-#~ msgstr "¡No se puede leer el fichero de claves de máquina!\n"
-
 #~ msgid "Could not create configuration for peer number %u on `%s'!\n"
 #~ msgstr ""
 #~ "¡No se puede crear la configuración para el par número %u en «%s»!\n"
@@ -9643,13 +9995,6 @@
 #~ msgid "# unexpected CONNECT_ACK messages"
 #~ msgstr "# mensajes «CONNECT_ACK» inesperados"
 
-#~ msgid ""
-#~ "Not confirming PING with address `%s' since I cannot confirm having this "
-#~ "address.\n"
-#~ msgstr ""
-#~ "No confirmando el PING con dirección «%s» ya que no puedo confirmar tener "
-#~ "esa dirección.\n"
-
 #~ msgid "FREEING %s\n"
 #~ msgstr "LIBERANDO %s\n"
 
@@ -9930,10 +10275,6 @@
 #~ msgstr "Probando transporte(s) %s\n"
 
 #, fuzzy
-#~ msgid "# SET QUOTA messages received"
-#~ msgstr "# mensajes SET QUOTA recibidos"
-
-#, fuzzy
 #~ msgid "curl failed for `%s' at %s:%d: `%s'\n"
 #~ msgstr "'%s' falló en %s: %d con error: '%s'.\n"
 
@@ -9978,10 +10319,6 @@
 #~ msgstr "# mensajes defragmentados"
 
 #, fuzzy
-#~ msgid "Failed to connect to core service\n"
-#~ msgstr "Fallo al conectar a gnunetd.\n"
-
-#, fuzzy
 #~ msgid "# bytes successfully transmitted by plugins"
 #~ msgstr "# bytes transmitidos satisfactoriamente por los módulos"
 
@@ -10511,9 +10848,6 @@
 #~ msgid "Error establishing connection with gnunetd.\n"
 #~ msgstr "Se produjo un error estableciendo conexión con gnunetd.\n"
 
-#~ msgid "You must specify a receiver!\n"
-#~ msgstr "¡Debes especificar un receptor!\n"
-
 #~ msgid "Invalid receiver peer ID specified (`%s' is not valid name).\n"
 #~ msgstr ""
 #~ "ID del par receptor especificada no válida ('%s' no es un nombre "

Modified: gnunet/po/sv.po
===================================================================
--- gnunet/po/sv.po     2013-12-12 21:38:43 UTC (rev 31342)
+++ gnunet/po/sv.po     2013-12-12 21:43:39 UTC (rev 31343)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: GNUnet 0.7.0b\n"
 "Report-Msgid-Bugs-To: address@hidden"
-"POT-Creation-Date: 2013-11-05 02:07+0100\n"
+"POT-Creation-Date: 2013-12-12 22:41+0100\n"
 "PO-Revision-Date: 2006-01-21 17:16+0100\n"
 "Last-Translator: Daniel Nylander <address@hidden>\n"
 "Language-Team: Swedish <address@hidden>\n"
@@ -35,7 +35,7 @@
 msgid "Failed to remove servicehome directory %s\n"
 msgstr "Filformatsfel (inte en GNUnet-katalog?)\n"
 
-#: src/arm/gnunet-arm.c:216 src/testbed/gnunet-service-testbed_peers.c:1010
+#: src/arm/gnunet-arm.c:216 src/testbed/gnunet-service-testbed_peers.c:1013
 msgid "Message was sent successfully"
 msgstr ""
 
@@ -44,12 +44,12 @@
 msgid "Misconfiguration (can not connect to the ARM service)"
 msgstr "Misslyckades att ansluta till gnunetd.\n"
 
-#: src/arm/gnunet-arm.c:220 src/testbed/gnunet-service-testbed_peers.c:1014
+#: src/arm/gnunet-arm.c:220 src/testbed/gnunet-service-testbed_peers.c:1017
 #, fuzzy
 msgid "We disconnected from ARM before we could send a request"
 msgstr "# av anslutna parter"
 
-#: src/arm/gnunet-arm.c:222 src/testbed/gnunet-service-testbed_peers.c:1016
+#: src/arm/gnunet-arm.c:222 src/testbed/gnunet-service-testbed_peers.c:1019
 msgid "ARM API is busy"
 msgstr ""
 
@@ -57,57 +57,57 @@
 msgid "Request does not fit into a message"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:226 src/testbed/gnunet-service-testbed_peers.c:1020
+#: src/arm/gnunet-arm.c:226 src/testbed/gnunet-service-testbed_peers.c:1023
 #, fuzzy
 msgid "Request timed out"
 msgstr "# sessionsnycklar accepterade"
 
-#: src/arm/gnunet-arm.c:228 src/testbed/gnunet-service-testbed_peers.c:1022
+#: src/arm/gnunet-arm.c:228 src/testbed/gnunet-service-testbed_peers.c:1025
 #, fuzzy
 msgid "Unknown request status"
 msgstr "Okänd operation \"%s\"\n"
 
-#: src/arm/gnunet-arm.c:244 src/testbed/gnunet-service-testbed_peers.c:1038
+#: src/arm/gnunet-arm.c:244 src/testbed/gnunet-service-testbed_peers.c:1041
 #, fuzzy, c-format
 msgid "%s is stopped"
 msgstr "# byte krypterade"
 
-#: src/arm/gnunet-arm.c:246 src/testbed/gnunet-service-testbed_peers.c:1040
+#: src/arm/gnunet-arm.c:246 src/testbed/gnunet-service-testbed_peers.c:1043
 #, fuzzy, c-format
 msgid "%s is starting"
 msgstr "\"%s\" startar\n"
 
-#: src/arm/gnunet-arm.c:248 src/testbed/gnunet-service-testbed_peers.c:1042
+#: src/arm/gnunet-arm.c:248 src/testbed/gnunet-service-testbed_peers.c:1045
 #, c-format
 msgid "%s is stopping"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:250 src/testbed/gnunet-service-testbed_peers.c:1044
+#: src/arm/gnunet-arm.c:250 src/testbed/gnunet-service-testbed_peers.c:1047
 #, fuzzy, c-format
 msgid "%s is starting already"
 msgstr "\"%s\" startar\n"
 
-#: src/arm/gnunet-arm.c:252 src/testbed/gnunet-service-testbed_peers.c:1046
+#: src/arm/gnunet-arm.c:252 src/testbed/gnunet-service-testbed_peers.c:1049
 #, c-format
 msgid "%s is stopping already"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:254 src/testbed/gnunet-service-testbed_peers.c:1048
+#: src/arm/gnunet-arm.c:254 src/testbed/gnunet-service-testbed_peers.c:1051
 #, c-format
 msgid "%s is started already"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:256 src/testbed/gnunet-service-testbed_peers.c:1050
+#: src/arm/gnunet-arm.c:256 src/testbed/gnunet-service-testbed_peers.c:1053
 #, c-format
 msgid "%s is stopped already"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:258 src/testbed/gnunet-service-testbed_peers.c:1052
+#: src/arm/gnunet-arm.c:258 src/testbed/gnunet-service-testbed_peers.c:1055
 #, fuzzy, c-format
 msgid "%s service is not known to ARM"
 msgstr "\"%s\" är inte en fil.\n"
 
-#: src/arm/gnunet-arm.c:260 src/testbed/gnunet-service-testbed_peers.c:1054
+#: src/arm/gnunet-arm.c:260 src/testbed/gnunet-service-testbed_peers.c:1057
 #, fuzzy, c-format
 msgid "%s service failed to start"
 msgstr "Misslyckades att starta samling.\n"
@@ -117,7 +117,7 @@
 msgid "%s service cannot be started because ARM is shutting down"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:264 src/testbed/gnunet-service-testbed_peers.c:1058
+#: src/arm/gnunet-arm.c:264 src/testbed/gnunet-service-testbed_peers.c:1061
 #, c-format
 msgid "%.s Unknown result code."
 msgstr ""
@@ -141,203 +141,203 @@
 msgid "Failed to stop the ARM service: %s\n"
 msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 
-#: src/arm/gnunet-arm.c:420
+#: src/arm/gnunet-arm.c:421
 #, fuzzy, c-format
 msgid "Failed to send a request to start the `%s' service: %%s\n"
 msgstr "Misslyckades att ansluta till gnunetd.\n"
 
-#: src/arm/gnunet-arm.c:429
+#: src/arm/gnunet-arm.c:431
 #, fuzzy, c-format
 msgid "Failed to start the `%s' service: %s\n"
 msgstr "Misslyckades att starta samling.\n"
 
-#: src/arm/gnunet-arm.c:465
+#: src/arm/gnunet-arm.c:468
 #, 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:476
+#: src/arm/gnunet-arm.c:479
 #, fuzzy, c-format
 msgid "Failed to kill the `%s' service: %s\n"
 msgstr "Fel vid %s:%d.\n"
 
-#: src/arm/gnunet-arm.c:512
+#: src/arm/gnunet-arm.c:517
 #, fuzzy, c-format
 msgid "Failed to request a list of services: %s\n"
 msgstr "Misslyckades att starta samling.\n"
 
-#: src/arm/gnunet-arm.c:519
+#: src/arm/gnunet-arm.c:525
 #, fuzzy
 msgid "Error communicating with ARM. ARM not running?\n"
 msgstr "Skriv ut information om GNUnets motparter."
 
-#: src/arm/gnunet-arm.c:523
+#: src/arm/gnunet-arm.c:530
 #, fuzzy
 msgid "Running services:\n"
 msgstr "Startade samling \"%s\".\n"
 
-#: src/arm/gnunet-arm.c:605
+#: src/arm/gnunet-arm.c:612
 #, c-format
 msgid "Now only monitoring, press CTRL-C to stop.\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:636
+#: src/arm/gnunet-arm.c:643
 #, c-format
 msgid "Stopped %s.\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:639
+#: src/arm/gnunet-arm.c:646
 #, fuzzy, c-format
 msgid "Starting %s...\n"
 msgstr "Startade samling \"%s\".\n"
 
-#: src/arm/gnunet-arm.c:642
+#: src/arm/gnunet-arm.c:649
 #, c-format
 msgid "Stopping %s...\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:653
+#: src/arm/gnunet-arm.c:660
 #, fuzzy, c-format
 msgid "Unknown status %u for service %s.\n"
 msgstr "Okänd operation \"%s\"\n"
 
-#: src/arm/gnunet-arm.c:717
+#: src/arm/gnunet-arm.c:724
 msgid "stop all GNUnet services"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:719
+#: src/arm/gnunet-arm.c:726
 msgid "start a particular service"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:721
+#: src/arm/gnunet-arm.c:728
 msgid "stop a particular service"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:723
+#: src/arm/gnunet-arm.c:730
 msgid "start all GNUnet default services"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:726
+#: src/arm/gnunet-arm.c:733
 msgid "stop and start all GNUnet default services"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:729
+#: src/arm/gnunet-arm.c:736
 msgid "delete config file and directory on exit"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:732
+#: src/arm/gnunet-arm.c:739
 msgid "monitor ARM activities"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:734
+#: src/arm/gnunet-arm.c:741
 msgid "don't print status messages"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:737
+#: src/arm/gnunet-arm.c:744
 msgid "timeout in MSECS milliseconds for completing current operation"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:739
+#: src/arm/gnunet-arm.c:746
 #, fuzzy
 msgid "list currently running services"
 msgstr "Startade samling \"%s\".\n"
 
-#: src/arm/gnunet-arm.c:741
+#: src/arm/gnunet-arm.c:748
 msgid "don't let gnunet-service-arm inherit standard output"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:743
+#: src/arm/gnunet-arm.c:750
 msgid "don't let gnunet-service-arm inherit standard error"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:754
+#: src/arm/gnunet-arm.c:761
 msgid "Control services and the Automated Restart Manager (ARM)"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:268
+#: src/arm/gnunet-service-arm.c:266
 #, 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:304
+#: src/arm/gnunet-service-arm.c:302
 #, 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:519
+#: src/arm/gnunet-service-arm.c:528
 #, fuzzy, c-format
 msgid "Failed to start service `%s'\n"
 msgstr "Misslyckades att starta samling.\n"
 
-#: src/arm/gnunet-service-arm.c:526
+#: src/arm/gnunet-service-arm.c:535
 #, fuzzy, c-format
 msgid "Starting service `%s'\n"
 msgstr "Startade samling \"%s\".\n"
 
-#: src/arm/gnunet-service-arm.c:625
+#: src/arm/gnunet-service-arm.c:634
 #, 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:647
+#: src/arm/gnunet-service-arm.c:656
 #, c-format
 msgid "Unable to bind listening socket for service `%s' to address `%s': %s\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:676
+#: src/arm/gnunet-service-arm.c:685
 #, c-format
 msgid "ARM now monitors connections to service `%s' at `%s'\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:809
+#: src/arm/gnunet-service-arm.c:821
 #, fuzzy, c-format
 msgid "Preparing to stop `%s'\n"
 msgstr "Startade samling \"%s\".\n"
 
-#: src/arm/gnunet-service-arm.c:1070
+#: src/arm/gnunet-service-arm.c:1085
 #, fuzzy, c-format
 msgid "Restarting service `%s'.\n"
 msgstr "Startade samling \"%s\".\n"
 
-#: src/arm/gnunet-service-arm.c:1163
+#: src/arm/gnunet-service-arm.c:1178
 msgid "exit"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:1168
+#: src/arm/gnunet-service-arm.c:1183
 msgid "signal"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:1173
+#: src/arm/gnunet-service-arm.c:1188
 #, fuzzy
 msgid "unknown"
 msgstr "Okänt fel"
 
-#: src/arm/gnunet-service-arm.c:1179
+#: src/arm/gnunet-service-arm.c:1194
 #, fuzzy, c-format
 msgid "Service `%s' took %s to terminate\n"
 msgstr "Tjänst borttagen.\n"
 
-#: src/arm/gnunet-service-arm.c:1201
+#: src/arm/gnunet-service-arm.c:1216
 #, c-format
 msgid "Service `%s' terminated normally, will restart at any time\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:1216
+#: src/arm/gnunet-service-arm.c:1231
 #, c-format
 msgid "Service `%s' terminated with status %s/%d, will restart in %s\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:1463
+#: src/arm/gnunet-service-arm.c:1484
 #, fuzzy, c-format
 msgid "Starting default services `%s'\n"
 msgstr "Startade samling \"%s\".\n"
 
-#: src/arm/gnunet-service-arm.c:1474
+#: src/arm/gnunet-service-arm.c:1495
 #, c-format
 msgid "Default service `%s' not configured correctly!\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:1488
+#: src/arm/gnunet-service-arm.c:1509
 msgid ""
 "No default services configured, GNUnet will not really start right now.\n"
 msgstr ""
@@ -356,99 +356,99 @@
 msgid "Received last message for %s \n"
 msgstr "Mottog ogiltigt \"%s\" meddelande från \"%s\".\n"
 
-#: src/ats/gnunet-service-ats_addresses.c:1475
-#: src/ats/gnunet-service-ats_addresses.c:1519
+#: src/ats/gnunet-service-ats_addresses.c:1946
+#: src/ats/gnunet-service-ats_addresses.c:1990
 #, c-format
 msgid ""
 "Could not load quota for network `%s':  `%s', assigning default bandwidth "
 "%llu\n"
 msgstr ""
 
-#: src/ats/gnunet-service-ats_addresses.c:1482
+#: src/ats/gnunet-service-ats_addresses.c:1953
 #, c-format
 msgid "Outbound quota configure for network `%s' is %llu\n"
 msgstr ""
 
-#: src/ats/gnunet-service-ats_addresses.c:1490
+#: src/ats/gnunet-service-ats_addresses.c:1961
 #, c-format
 msgid ""
 "No outbound quota configured for network `%s', assigning default bandwidth "
 "%llu\n"
 msgstr ""
 
-#: src/ats/gnunet-service-ats_addresses.c:1526
+#: src/ats/gnunet-service-ats_addresses.c:1997
 #, c-format
 msgid "Inbound quota configured for network `%s' is %llu\n"
 msgstr ""
 
-#: src/ats/gnunet-service-ats_addresses.c:1534
+#: src/ats/gnunet-service-ats_addresses.c:2005
 #, c-format
 msgid ""
 "No outbound quota configure for network `%s', assigning default bandwidth "
 "%llu\n"
 msgstr ""
 
-#: src/ats/gnunet-service-ats_addresses.c:1700
+#: src/ats/gnunet-service-ats_addresses.c:2175
 #, c-format
 msgid "Initializing solver `%s '`%s'\n"
 msgstr ""
 
-#: src/ats/gnunet-service-ats_addresses.c:1703
+#: src/ats/gnunet-service-ats_addresses.c:2178
 #, fuzzy, c-format
 msgid "Failed to initialize solver `%s'!\n"
 msgstr "Kunde inte initiera SQLite.\n"
 
-#: src/ats/gnunet-service-ats_addresses.c:1726
+#: src/ats/gnunet-service-ats_addresses.c:2201
 #, fuzzy
 msgid "Failed to initialize solver!\n"
 msgstr "Kunde inte initiera SQLite.\n"
 
-#: src/ats/libgnunet_plugin_ats_mlp.c:868
+#: src/ats/plugin_ats_mlp.c:868
 msgid "Problem size too large, cannot allocate memory!\n"
 msgstr ""
 
-#: src/ats/libgnunet_plugin_ats_mlp.c:1239
+#: src/ats/plugin_ats_mlp.c:1281
 #, 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/libgnunet_plugin_ats_mlp.c:1286
+#: src/ats/plugin_ats_mlp.c:1328
 #, c-format
 msgid "Updating address property `%s' for peer `%s' %p not added before\n"
 msgstr ""
 
-#: src/ats/libgnunet_plugin_ats_mlp.c:2010
+#: src/ats/plugin_ats_mlp.c:2059
 #, c-format
 msgid ""
 "Adjusting inconsistent outbound quota configuration for network `%s', is "
 "%llu must be at least %llu\n"
 msgstr ""
 
-#: src/ats/libgnunet_plugin_ats_mlp.c:2018
+#: src/ats/plugin_ats_mlp.c:2067
 #, c-format
 msgid ""
 "Adjusting inconsistent inbound quota configuration for network `%s', is %llu "
 "must be at least %llu\n"
 msgstr ""
 
-#: src/ats/libgnunet_plugin_ats_mlp.c:2028
+#: src/ats/plugin_ats_mlp.c:2077
 #, c-format
 msgid ""
 "Adjusting outbound quota configuration for network `%s'from %llu to %.0f\n"
 msgstr ""
 
-#: src/ats/libgnunet_plugin_ats_mlp.c:2036
+#: src/ats/plugin_ats_mlp.c:2085
 #, c-format
 msgid ""
 "Adjusting inbound quota configuration for network `%s' from %llu to %.0f\n"
 msgstr ""
 
-#: src/ats/libgnunet_plugin_ats_mlp.c:2047
+#: src/ats/plugin_ats_mlp.c:2096
 #, c-format
 msgid "Using default quota configuration for network `%s' (in/out) %llu/%llu\n"
 msgstr ""
 
-#: src/ats/libgnunet_plugin_ats_proportional.c:1438
+#: src/ats/plugin_ats_proportional.c:1514
 #, fuzzy, c-format
 msgid "Invalid network type `%u' `%s': Disconnect!\n"
 msgstr "Kan inte öppna konfigurationsfil \"%s\".\n"
@@ -475,13 +475,13 @@
 msgid "Quota for network `%11s' (in/out): %10s / %10s\n"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:347 src/namestore/gnunet-namestore.c:520
-#: src/transport/gnunet-transport.c:807
+#: src/ats-tool/gnunet-ats.c:347 src/namestore/gnunet-namestore.c:547
+#: src/transport/gnunet-transport.c:829
 #, fuzzy, c-format
 msgid "Service `%s' is not running\n"
 msgstr "\"%s\" är inte en fil.\n"
 
-#: src/ats-tool/gnunet-ats.c:359 src/transport/gnunet-transport.c:816
+#: src/ats-tool/gnunet-ats.c:359 src/transport/gnunet-transport.c:838
 #, fuzzy, c-format
 msgid "Failed to parse peer identity `%s'\n"
 msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
@@ -563,222 +563,276 @@
 msgid "Print information about ATS state"
 msgstr "Skriv ut information om GNUnets motparter."
 
-#: src/consensus/gnunet-consensus-profiler.c:394
+#: src/consensus/gnunet-consensus-profiler.c:420
 #, fuzzy
 msgid "number of peers in consensus"
 msgstr "antal iterationer"
 
-#: src/consensus/gnunet-consensus-profiler.c:397
+#: src/consensus/gnunet-consensus-profiler.c:423
 msgid "how many peers receive one value?"
 msgstr ""
 
-#: src/consensus/gnunet-consensus-profiler.c:400
+#: src/consensus/gnunet-consensus-profiler.c:426
 #: 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:403
+#: src/consensus/gnunet-consensus-profiler.c:429
 #, fuzzy
 msgid "consensus timeout"
 msgstr "# sessionsnycklar accepterade"
 
-#: src/consensus/gnunet-consensus-profiler.c:406
+#: src/consensus/gnunet-consensus-profiler.c:432
 msgid "be more verbose (print received values)"
 msgstr ""
 
-#: 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/conversation_api.c:557
+#: src/conversation/conversation_api_call.c:468
+msgid "Connection to conversation service lost, trying to reconnect\n"
+msgstr ""
 
-#: src/conversation/gnunet-conversation.c:186
+#: src/conversation/gnunet-conversation.c:252
 #, c-format
-msgid ""
-"Incoming call from `%s'.\n"
-"Please /accept or /cancel the call.\n"
+msgid "Incoming call from `%s'. Please /accept #%u or /cancel %u the call.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:206
-#: src/conversation/gnunet-conversation.c:315
+#: src/conversation/gnunet-conversation.c:274
 #, c-format
-msgid "Call terminated: %s\n"
+msgid "Call from `%s' terminated\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:226
+#: src/conversation/gnunet-conversation.c:307
 #, c-format
+msgid "Call from `%s' suspended by other user\n"
+msgstr ""
+
+#: src/conversation/gnunet-conversation.c:312
+#, c-format
+msgid "Call from `%s' resumed by other user\n"
+msgstr ""
+
+#: src/conversation/gnunet-conversation.c:330
+#, c-format
 msgid "Ego `%s' no longer available, phone is now down.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:239
+#: src/conversation/gnunet-conversation.c:344
 #, fuzzy
 msgid "Failed to setup phone (internal error)\n"
 msgstr "Kunde inte skapa värdnyckel!\n"
 
-#: src/conversation/gnunet-conversation.c:252
+#: src/conversation/gnunet-conversation.c:357
 #, c-format
 msgid "Phone active on line %u\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:284
-msgid "Resolved address. Now ringing other party.\n"
+#: src/conversation/gnunet-conversation.c:379
+#, c-format
+msgid "Resolved address of `%s'. Now ringing other party.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:290
+#: src/conversation/gnunet-conversation.c:386
 #, fuzzy, c-format
-msgid "Connection established to `%s': %s\n"
+msgid "Connection established to `%s'\n"
 msgstr "Misslyckades att leverera \"%s\" meddelande.\n"
 
-#: src/conversation/gnunet-conversation.c:298
+#: src/conversation/gnunet-conversation.c:393
 #, 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"
+#: src/conversation/gnunet-conversation.c:400
+msgid "Call terminated\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:385
+#: src/conversation/gnunet-conversation.c:406
+#, c-format
+msgid "Connection to `%s' suspended (by other user)\n"
+msgstr ""
+
+#: src/conversation/gnunet-conversation.c:412
+#, c-format
+msgid "Connection to `%s' resumed (by other user)\n"
+msgstr ""
+
+#: src/conversation/gnunet-conversation.c:479
 #, 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
+#: src/conversation/gnunet-conversation.c:495
+#: src/conversation/gnunet-conversation.c:509
 #, 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"
+#: src/conversation/gnunet-conversation.c:502
+#: src/conversation/gnunet-conversation.c:552
+msgid "You are calling someone else already, hang up first!\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:424
-#: src/conversation/gnunet-conversation.c:438
+#: src/conversation/gnunet-conversation.c:517
+#: src/conversation/gnunet-conversation.c:565
 #, c-format
-msgid "You are already in a conversation with `%s', refusing to call `%s'.\n"
+msgid "You are answering call from `%s', hang up or suspend that call first!\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"
+#: src/conversation/gnunet-conversation.c:576
+msgid "There is no incoming call to accept here!\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
+#: src/conversation/gnunet-conversation.c:593
 #, c-format
-msgid "You are trying to call `%s', cannot accept incoming calls right now.\n"
+msgid "There is no incoming call `%s' to accept right now!\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:521
+#: src/conversation/gnunet-conversation.c:621
 msgid "We currently do not have an address.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:542
+#: src/conversation/gnunet-conversation.c:644
 #, c-format
 msgid "We are currently trying to locate the private key for the ego `%s'.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:547
+#: src/conversation/gnunet-conversation.c:649
 #, c-format
 msgid "We are listening for incoming calls for ego `%s' on line %u.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:553
+#: src/conversation/gnunet-conversation.c:655
+#: src/conversation/gnunet-conversation.c:679
 #, c-format
-msgid "The phone is rining. `%s' is trying to call us.\n"
+msgid "You are having a conversation with `%s'.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:559
-#, c-format
-msgid "You are having a conversation with `%s'.\n"
+#: src/conversation/gnunet-conversation.c:660
+msgid ""
+"We had an internal error setting up our phone line. You can still make "
+"calls.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:564
+#: src/conversation/gnunet-conversation.c:669
 #, c-format
 msgid "We are trying to find the network address to call `%s'.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:569
+#: src/conversation/gnunet-conversation.c:674
 #, 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"
+#: src/conversation/gnunet-conversation.c:693
+msgid "Calls waiting:\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:595
+#: src/conversation/gnunet-conversation.c:699
+#, fuzzy, c-format
+msgid "#%u: `%s'\n"
+msgstr "Jag är ändpunkt \"%s\".\n"
+
+#: src/conversation/gnunet-conversation.c:727
+#: src/conversation/gnunet-conversation.c:742
+msgid "There is no call that could be suspended right now.\n"
+msgstr ""
+
+#: src/conversation/gnunet-conversation.c:775
+#: src/conversation/gnunet-conversation.c:791
+msgid "There is no call that could be resumed right now.\n"
+msgstr ""
+
+#: src/conversation/gnunet-conversation.c:798
+#, c-format
+msgid "Already talking with `%s', cannot resume a call right now.\n"
+msgstr ""
+
+#: src/conversation/gnunet-conversation.c:807
+msgid "There is no incoming call to resume here!\n"
+msgstr ""
+
+#: src/conversation/gnunet-conversation.c:824
+#, c-format
+msgid "There is no incoming call `%s' to resume right now!\n"
+msgstr ""
+
+#: src/conversation/gnunet-conversation.c:859
 msgid "There is no call that could be cancelled right now.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:626
+#: src/conversation/gnunet-conversation.c:867
+msgid "There is no incoming call to refuse here!\n"
+msgstr ""
+
+#: src/conversation/gnunet-conversation.c:884
+#, c-format
+msgid "There is no incoming call `%s' to refuse right now!\n"
+msgstr ""
+
+#: src/conversation/gnunet-conversation.c:911
 msgid "Use `/address' to find out which address this phone should have in GNS"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:628
+#: src/conversation/gnunet-conversation.c:913
 msgid "Use `/call USER.gnu' to call USER"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:630
-msgid "Use `/accept MESSAGE' to accept an incoming call"
+#: src/conversation/gnunet-conversation.c:915
+msgid "Use `/accept #NUM' to accept incoming call #NUM"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:632
-msgid "Use `/cancel MESSAGE' to reject or terminate a call"
+#: src/conversation/gnunet-conversation.c:917
+msgid "Use `/suspend' to suspend the active call"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:634
+#: src/conversation/gnunet-conversation.c:919
+msgid ""
+"Use `/resume [#NUM]' to resume a call, #NUM is needed to resume incoming "
+"calls, no argument is needed to resume the current outgoing call."
+msgstr ""
+
+#: src/conversation/gnunet-conversation.c:921
+msgid "Use `/cancel' to reject or terminate a call"
+msgstr ""
+
+#: src/conversation/gnunet-conversation.c:923
 msgid "Use `/status' to print status information"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:636
+#: src/conversation/gnunet-conversation.c:925
 #, fuzzy
 msgid "Use `/quit' to terminate gnunet-conversation"
 msgstr "tillåter klienter att fastställa gnunetds konfiguration"
 
-#: src/conversation/gnunet-conversation.c:638
+#: src/conversation/gnunet-conversation.c:927
 msgid "Use `/help command' to get help for a specific command"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:793
+#: src/conversation/gnunet-conversation.c:1082
 #, 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
+#: src/conversation/gnunet-conversation.c:1095
 #, fuzzy, c-format
 msgid "Our ego `%s' was deleted!\n"
 msgstr "Pseudonym \"%s\" togs bort.\n"
 
-#: src/conversation/gnunet-conversation.c:841
+#: src/conversation/gnunet-conversation.c:1130
 #, 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
+#: src/conversation/gnunet-conversation.c:1156
 msgid "sets the NAME of the ego to use for the phone (and name resolution)"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:870
+#: src/conversation/gnunet-conversation.c:1159
 msgid "sets the LINE to use for the phone"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:885
+#: src/conversation/gnunet-conversation.c:1174
 msgid "Enables having a conversation with other GNUnet users."
 msgstr ""
 
@@ -806,7 +860,7 @@
 
 #: 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/multicast/gnunet-multicast.c:70 src/revocation/gnunet-revocation.c:517
 #: src/template/gnunet-template.c:70
 #, fuzzy
 msgid "help text"
@@ -822,13 +876,13 @@
 msgstr ""
 
 #: src/conversation/gnunet-helper-audio-playback.c:211
-#: src/conversation/gnunet-helper-audio-record.c:363
+#: src/conversation/gnunet-helper-audio-record.c:362
 #, 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
+#: src/conversation/gnunet-helper-audio-record.c:367
 #, fuzzy, c-format
 msgid "pa_stream_new() failed: %s\n"
 msgstr "\"%s\" %s misslyckades: %s\n"
@@ -839,36 +893,36 @@
 msgstr ""
 
 #: src/conversation/gnunet-helper-audio-playback.c:243
-#: src/conversation/gnunet-helper-audio-record.c:394
+#: src/conversation/gnunet-helper-audio-record.c:393
 #, 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
+#: src/conversation/gnunet-helper-audio-record.c:416
 msgid "Wrong Spec\n"
 msgstr ""
 
 #: src/conversation/gnunet-helper-audio-playback.c:270
-#: src/conversation/gnunet-helper-audio-record.c:423
+#: src/conversation/gnunet-helper-audio-record.c:422
 #, 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
+#: src/conversation/gnunet-helper-audio-record.c:437
 #, 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
+#: src/conversation/gnunet-helper-audio-record.c:443
 #, 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
+#: src/conversation/gnunet-helper-audio-record.c:449
 #, fuzzy
 msgid "pa_mainloop_run() failed.\n"
 msgstr "\"%s\" misslyckades vid %s:%d med fel: \"%s\".\n"
@@ -887,56 +941,57 @@
 msgid "Got signal, exiting.\n"
 msgstr ""
 
-#: src/conversation/gnunet-helper-audio-record.c:301
+#: src/conversation/gnunet-helper-audio-record.c:300
 #, fuzzy
 msgid "Stream successfully created.\n"
 msgstr "Åtkomst nekad för \"%s\" vid %s:%d.\n"
 
-#: src/conversation/gnunet-helper-audio-record.c:306
+#: src/conversation/gnunet-helper-audio-record.c:305
 #, 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
+#: src/conversation/gnunet-helper-audio-record.c:313
 #, c-format
 msgid "Buffer metrics: maxlength=%u, fragsize=%u\n"
 msgstr ""
 
-#: src/conversation/gnunet-helper-audio-record.c:318
+#: src/conversation/gnunet-helper-audio-record.c:317
 #, c-format
 msgid "Using sample spec '%s', channel map '%s'.\n"
 msgstr ""
 
-#: src/conversation/gnunet-helper-audio-record.c:325
+#: src/conversation/gnunet-helper-audio-record.c:324
 #, 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
+#: src/conversation/gnunet-helper-audio-record.c:333
 #, c-format
 msgid "Stream error: %s\n"
 msgstr ""
 
-#: src/conversation/gnunet-helper-audio-record.c:381
+#: src/conversation/gnunet-helper-audio-record.c:380
 #, 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
+#: src/conversation/gnunet-service-conversation.c:825
 msgid "Mesh audio channel not ready; audio data dropped\n"
 msgstr ""
 
-#: src/conversation/gnunet-service-conversation.c:700
+#: src/conversation/gnunet-service-conversation.c:915
 #, c-format
-msgid "No available phone for incoming call on line %u, sending BUSY signal\n"
+msgid ""
+"No available phone for incoming call on line %u, sending HANG_UP signal\n"
 msgstr ""
 
-#: src/conversation/gnunet-service-conversation.c:1054
-#, c-format
-msgid "Received incoming tunnel on port %u\n"
-msgstr ""
+#: src/conversation/gnunet-service-conversation.c:1302
+#, fuzzy, c-format
+msgid "Received incoming channel on port %u\n"
+msgstr "\"%s\" ansluten till \"%s\".\n"
 
 #: src/conversation/microphone.c:121
 #, fuzzy
@@ -953,7 +1008,7 @@
 msgid "Could not start playback audio helper.\n"
 msgstr "Kunde inte slå upp \"%s\": %s\n"
 
-#: src/core/core_api.c:761
+#: src/core/core_api.c:765
 msgid "Client was disconnected from core service, trying to reconnect.\n"
 msgstr ""
 
@@ -963,28 +1018,27 @@
 msgstr "Jag är ändpunkt \"%s\".\n"
 
 #: src/core/gnunet-core.c:110 src/core/gnunet-core.c:138
-#: src/transport/gnunet-transport.c:601 src/transport/gnunet-transport.c:625
+#: src/transport/gnunet-transport.c:609 src/transport/gnunet-transport.c:634
 #, c-format
 msgid "%24s: %-17s %4s   (%u connections in total)\n"
 msgstr ""
 
-#: src/core/gnunet-core.c:112 src/transport/gnunet-transport.c:603
+#: src/core/gnunet-core.c:112 src/transport/gnunet-transport.c:611
 #, fuzzy
 msgid "Connected to"
 msgstr "\"%s\" ansluten till \"%s\".\n"
 
-#: src/core/gnunet-core.c:140 src/transport/gnunet-transport.c:627
+#: src/core/gnunet-core.c:140 src/transport/gnunet-transport.c:636
 #, fuzzy
 msgid "Disconnected from"
 msgstr "\"%s\" ansluten till \"%s\".\n"
 
-#: src/core/gnunet-core.c:164 src/mesh/gnunet-mesh.c:174
-#: src/peerinfo-tool/gnunet-peerinfo.c:645
+#: src/core/gnunet-core.c:164 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:201 src/transport/gnunet-transport.c:999
+#: src/core/gnunet-core.c:201 src/transport/gnunet-transport.c:1028
 #, fuzzy
 msgid "provide information about all current connections (continuously)"
 msgstr "Skriv ut information om GNUnets motparter."
@@ -1030,138 +1084,138 @@
 msgid "# key exchanges initiated"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:701
+#: src/core/gnunet-service-core_kx.c:708
 msgid "# key exchanges stopped"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:764
+#: src/core/gnunet-service-core_kx.c:771
 msgid "# old ephemeral keys ignored"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:770
+#: src/core/gnunet-service-core_kx.c:777
 #, fuzzy
 msgid "# ephemeral keys received"
 msgstr "# krypterade PONG-meddelanden mottagna"
 
-#: src/core/gnunet-service-core_kx.c:804
+#: src/core/gnunet-service-core_kx.c:811
 #, 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:820
+#: src/core/gnunet-service-core_kx.c:827
 #, fuzzy
 msgid "# EPHEMERAL_KEY messages decrypted"
 msgstr "# PING-meddelanden skapade"
 
-#: src/core/gnunet-service-core_kx.c:923
-#: src/transport/gnunet-service-transport_validation.c:938
+#: src/core/gnunet-service-core_kx.c:930
+#: src/transport/gnunet-service-transport_validation.c:974
 #, fuzzy
 msgid "# PING messages received"
 msgstr "# PING-meddelanden skapade"
 
-#: src/core/gnunet-service-core_kx.c:931
+#: src/core/gnunet-service-core_kx.c:938
 #, fuzzy
 msgid "# PING messages dropped (out of order)"
 msgstr "Nätverksannonsering avstängd i konfigurationen!\n"
 
-#: src/core/gnunet-service-core_kx.c:958
+#: src/core/gnunet-service-core_kx.c:965
 #, 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:975
+#: src/core/gnunet-service-core_kx.c:982
 #, fuzzy
 msgid "# PONG messages created"
 msgstr "# PING-meddelanden skapade"
 
-#: src/core/gnunet-service-core_kx.c:1001
+#: src/core/gnunet-service-core_kx.c:1008
 #, fuzzy
 msgid "# sessions terminated by timeout"
 msgstr "# byte kastade via TCP (utgående)"
 
-#: src/core/gnunet-service-core_kx.c:1011
+#: src/core/gnunet-service-core_kx.c:1018
 #, fuzzy
 msgid "# keepalive messages sent"
 msgstr "# PING-meddelanden i klartext skickade"
 
-#: src/core/gnunet-service-core_kx.c:1068
-#: src/transport/gnunet-service-transport_validation.c:1233
+#: src/core/gnunet-service-core_kx.c:1075
+#: src/transport/gnunet-service-transport_validation.c:1285
 #, fuzzy
 msgid "# PONG messages received"
 msgstr "# krypterade PONG-meddelanden mottagna"
 
-#: src/core/gnunet-service-core_kx.c:1074
+#: src/core/gnunet-service-core_kx.c:1081
 #, fuzzy
 msgid "# PONG messages dropped (connection down)"
 msgstr "# krypterade PONG-meddelanden mottagna"
 
-#: src/core/gnunet-service-core_kx.c:1079
+#: src/core/gnunet-service-core_kx.c:1086
 #, fuzzy
 msgid "# PONG messages dropped (out of order)"
 msgstr "Nätverksannonsering avstängd i konfigurationen!\n"
 
-#: src/core/gnunet-service-core_kx.c:1109
+#: src/core/gnunet-service-core_kx.c:1116
 #, fuzzy
 msgid "# PONG messages decrypted"
 msgstr "# PING-meddelanden skapade"
 
-#: src/core/gnunet-service-core_kx.c:1143
+#: src/core/gnunet-service-core_kx.c:1150
 #, fuzzy
 msgid "# session keys confirmed via PONG"
 msgstr "# sessionnycklar vägrade"
 
-#: src/core/gnunet-service-core_kx.c:1153
+#: src/core/gnunet-service-core_kx.c:1160
 #, fuzzy
 msgid "# timeouts prevented via PONG"
 msgstr "# byte mottogs via TCP"
 
-#: src/core/gnunet-service-core_kx.c:1160
+#: src/core/gnunet-service-core_kx.c:1167
 #, fuzzy
 msgid "# rekey operations confirmed via PONG"
 msgstr "# sessionnycklar vägrade"
 
-#: src/core/gnunet-service-core_kx.c:1300
+#: src/core/gnunet-service-core_kx.c:1307
 #, fuzzy
 msgid "# DATA message dropped (out of order)"
 msgstr "# byte kastade via UDP (utgående)"
 
-#: src/core/gnunet-service-core_kx.c:1307
+#: src/core/gnunet-service-core_kx.c:1314
 #, 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:1310
+#: src/core/gnunet-service-core_kx.c:1317
 #, fuzzy
 msgid "# sessions terminated by key expiration"
 msgstr "# byte kastade via TCP (utgående)"
 
-#: src/core/gnunet-service-core_kx.c:1353
-#: src/core/gnunet-service-core_kx.c:1378
+#: src/core/gnunet-service-core_kx.c:1360
+#: src/core/gnunet-service-core_kx.c:1385
 #, fuzzy
 msgid "# bytes dropped (duplicates)"
 msgstr "# byte kastade via UDP (utgående)"
 
-#: src/core/gnunet-service-core_kx.c:1365
+#: src/core/gnunet-service-core_kx.c:1372
 #, fuzzy
 msgid "# bytes dropped (out of sequence)"
 msgstr "# byte kastade via UDP (utgående)"
 
-#: src/core/gnunet-service-core_kx.c:1406
+#: src/core/gnunet-service-core_kx.c:1413
 #, fuzzy
 msgid "# bytes dropped (ancient message)"
 msgstr "# byte kastade via UDP (utgående)"
 
-#: src/core/gnunet-service-core_kx.c:1414
+#: src/core/gnunet-service-core_kx.c:1421
 #, fuzzy
 msgid "# bytes of payload decrypted"
 msgstr "# byte dekrypterade"
 
-#: src/core/gnunet-service-core_kx.c:1445
+#: src/core/gnunet-service-core_kx.c:1452
 #, fuzzy
 msgid "# PAYLOAD dropped (out of order)"
 msgstr "# byte kastade via UDP (utgående)"
@@ -1189,14 +1243,16 @@
 #: 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/dht/gnunet-service-xdht_neighbours.c:662
+#: src/dht/gnunet-service-xdht_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:3052
+#: src/transport/gnunet-service-transport_neighbours.c:1123
+#: src/transport/gnunet-service-transport_neighbours.c:1132
+#: src/transport/gnunet-service-transport_neighbours.c:2860
+#: src/transport/gnunet-service-transport_neighbours.c:3129
 #, fuzzy
 msgid "# peers connected"
 msgstr "# av anslutna parter"
@@ -1275,7 +1331,7 @@
 #: src/namecache/plugin_namecache_sqlite.c:52
 #: src/namestore/plugin_namestore_postgres.c:52
 #: src/namestore/plugin_namestore_sqlite.c:52
-#: src/testbed/testbed_api_hosts.c:69 src/util/crypto_ecc.c:53
+#: src/testbed/testbed_api_hosts.c:69 src/util/crypto_ecc.c:51
 #: src/include/gnunet_common.h:602 src/include/gnunet_common.h:611
 #: src/scalarproduct/scalarproduct.h:61
 #, c-format
@@ -1307,96 +1363,96 @@
 msgid "Failed to transmit request to drop database.\n"
 msgstr "Misslyckades att skicka HTTP-begäran till värd \"%s\": %s\n"
 
-#: src/datastore/datastore_api.c:393
+#: src/datastore/datastore_api.c:394
 msgid "# queue entry timeouts"
 msgstr ""
 
-#: src/datastore/datastore_api.c:437
+#: src/datastore/datastore_api.c:443
 msgid "# queue overflows"
 msgstr ""
 
-#: src/datastore/datastore_api.c:465
+#: src/datastore/datastore_api.c:471
 #, fuzzy
 msgid "# queue entries created"
 msgstr "# PING-meddelanden skapade"
 
-#: src/datastore/datastore_api.c:483
+#: src/datastore/datastore_api.c:491
 msgid "# Requests dropped from datastore queue"
 msgstr ""
 
-#: src/datastore/datastore_api.c:525
+#: src/datastore/datastore_api.c:533
 #, fuzzy
 msgid "# datastore connections (re)created"
 msgstr "Nätverksanslutning"
 
-#: src/datastore/datastore_api.c:608 src/scalarproduct/scalarproduct_api.c:279
+#: src/datastore/datastore_api.c:616 src/scalarproduct/scalarproduct_api.c:279
 #, fuzzy
 msgid "# transmission request failures"
 msgstr "# klartext PONG-meddelanden mottagna"
 
-#: src/datastore/datastore_api.c:630
+#: src/datastore/datastore_api.c:638
 #, fuzzy
 msgid "# bytes sent to datastore"
 msgstr "# byte krypterade"
 
-#: src/datastore/datastore_api.c:762
+#: src/datastore/datastore_api.c:770
 #, fuzzy
 msgid "Failed to receive status response from database."
 msgstr "Misslyckades att ta emot svar till \"%s\" meddelande från gnunetd\n"
 
-#: src/datastore/datastore_api.c:776
+#: src/datastore/datastore_api.c:784
 msgid "Error reading response from datastore service"
 msgstr ""
 
-#: src/datastore/datastore_api.c:788 src/datastore/datastore_api.c:794
+#: src/datastore/datastore_api.c:796 src/datastore/datastore_api.c:802
 #, fuzzy
 msgid "Invalid error message received from datastore service"
 msgstr "Ogiltigt meddelande mottogs den %s:%d."
 
-#: src/datastore/datastore_api.c:798
+#: src/datastore/datastore_api.c:806
 #, fuzzy
 msgid "# status messages received"
 msgstr "# krypterade PONG-meddelanden mottagna"
 
-#: src/datastore/datastore_api.c:868
+#: src/datastore/datastore_api.c:876
 msgid "# PUT requests executed"
 msgstr ""
 
-#: src/datastore/datastore_api.c:935
+#: src/datastore/datastore_api.c:944
 msgid "# RESERVE requests executed"
 msgstr ""
 
-#: src/datastore/datastore_api.c:996
+#: src/datastore/datastore_api.c:1005
 msgid "# RELEASE RESERVE requests executed"
 msgstr ""
 
-#: src/datastore/datastore_api.c:1055
+#: src/datastore/datastore_api.c:1065
 msgid "# UPDATE requests executed"
 msgstr ""
 
-#: src/datastore/datastore_api.c:1119
+#: src/datastore/datastore_api.c:1129
 msgid "# REMOVE requests executed"
 msgstr ""
 
-#: src/datastore/datastore_api.c:1164
+#: src/datastore/datastore_api.c:1174
 #, fuzzy
 msgid "Failed to receive response from database.\n"
 msgstr "Misslyckades att ta emot svar till \"%s\" meddelande från gnunetd\n"
 
-#: src/datastore/datastore_api.c:1223
+#: src/datastore/datastore_api.c:1233
 #, fuzzy
 msgid "# Results received"
 msgstr "# byte mottogs via TCP"
 
-#: src/datastore/datastore_api.c:1290
+#: src/datastore/datastore_api.c:1300
 msgid "# GET REPLICATION requests executed"
 msgstr ""
 
-#: src/datastore/datastore_api.c:1353
+#: src/datastore/datastore_api.c:1363
 msgid "# GET ZERO ANONYMITY requests executed"
 msgstr ""
 
-#: src/datastore/datastore_api.c:1414
+#: src/datastore/datastore_api.c:1424
 msgid "# GET requests executed"
 msgstr ""
 
@@ -1431,12 +1487,12 @@
 msgstr ""
 
 #: src/datastore/gnunet-service-datastore.c:483
-#: src/gns/gnunet-gns-helper-service-w32.c:155
+#: src/gns/gnunet-gns-helper-service-w32.c:187
 msgid "Transmission to client failed!\n"
 msgstr ""
 
 #: src/datastore/gnunet-service-datastore.c:514
-#: src/gns/gnunet-gns-helper-service-w32.c:183
+#: src/gns/gnunet-gns-helper-service-w32.c:215
 msgid "Shutdown in progress, aborting transmission.\n"
 msgstr ""
 
@@ -1757,147 +1813,180 @@
 msgid "Issue a PUT request to the GNUnet DHT insert DATA under KEY."
 msgstr ""
 
-#: src/dht/gnunet-service-dht.c:172
+#: src/dht/gnunet-service-dht.c:172 src/dht/gnunet-service-xdht.c:172
 #, fuzzy
 msgid "Failed to connect to transport service!\n"
 msgstr "Misslyckades att ansluta till gnunetd.\n"
 
 #: src/dht/gnunet-service-dht_clients.c:417
+#: src/dht/gnunet-service-xdht_clients.c:417
 #, fuzzy
 msgid "# GET requests from clients injected"
 msgstr "# byte mottogs via TCP"
 
 #: src/dht/gnunet-service-dht_clients.c:511
+#: src/dht/gnunet-service-xdht_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:595
+#: src/dht/gnunet-service-xdht_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:796
+#: src/dht/gnunet-service-xdht_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:1037
+#: src/dht/gnunet-service-xdht_clients.c:1037
 msgid "# Key match, type mismatches in REPLY to CLIENT"
 msgstr ""
 
 #: src/dht/gnunet-service-dht_clients.c:1050
+#: src/dht/gnunet-service-xdht_clients.c:1050
 msgid "# Duplicate REPLIES to CLIENT request dropped"
 msgstr ""
 
 #: src/dht/gnunet-service-dht_clients.c:1087
+#: src/dht/gnunet-service-xdht_clients.c:1087
 #, c-format
 msgid "Unsupported block type (%u) in request!\n"
 msgstr ""
 
 #: src/dht/gnunet-service-dht_clients.c:1110
+#: src/dht/gnunet-service-xdht_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:1164
 #: src/dht/gnunet-service-dht_clients.c:1206
+#: src/dht/gnunet-service-xdht_clients.c:1164
+#: src/dht/gnunet-service-xdht_clients.c:1206
 msgid "# REPLIES ignored for CLIENTS (no match)"
 msgstr ""
 
 #: src/dht/gnunet-service-dht_clients.c:1174
+#: src/dht/gnunet-service-xdht_clients.c:1174
 #, fuzzy
 msgid "Could not pass reply to client, message too big!\n"
 msgstr "Kunde inte skicka meddelande till gnunetd\n"
 
 #: src/dht/gnunet-service-dht_datacache.c:68
+#: src/dht/gnunet-service-xdht_datacache.c:68
 #, fuzzy, c-format
 msgid "%s request received, but have no datacache!\n"
 msgstr "# byte mottagna av typen %d"
 
 #: src/dht/gnunet-service-dht_datacache.c:78
+#: src/dht/gnunet-service-xdht_datacache.c:78
 msgid "# ITEMS stored in datacache"
 msgstr ""
 
 #: src/dht/gnunet-service-dht_datacache.c:165
+#: src/dht/gnunet-service-xdht_datacache.c:165
 msgid "# Good RESULTS found in datacache"
 msgstr ""
 
 #: src/dht/gnunet-service-dht_datacache.c:176
+#: src/dht/gnunet-service-xdht_datacache.c:176
 msgid "# Duplicate RESULTS found in datacache"
 msgstr ""
 
 #: src/dht/gnunet-service-dht_datacache.c:182
+#: src/dht/gnunet-service-xdht_datacache.c:182
 msgid "# Invalid RESULTS found in datacache"
 msgstr ""
 
 #: src/dht/gnunet-service-dht_datacache.c:188
+#: src/dht/gnunet-service-xdht_datacache.c:188
 msgid "# Irrelevant RESULTS found in datacache"
 msgstr ""
 
 #: src/dht/gnunet-service-dht_datacache.c:200
+#: src/dht/gnunet-service-xdht_datacache.c:200
 msgid "# Unsupported RESULTS found in datacache"
 msgstr ""
 
 #: src/dht/gnunet-service-dht_datacache.c:203
+#: src/dht/gnunet-service-xdht_datacache.c:203
 #, c-format
 msgid "Unsupported block type (%u) in local response!\n"
 msgstr ""
 
 #: src/dht/gnunet-service-dht_datacache.c:234
+#: src/dht/gnunet-service-xdht_datacache.c:234
 #, fuzzy
 msgid "# GET requests given to datacache"
 msgstr "# byte mottogs via TCP"
 
 #: src/dht/gnunet-service-dht_hello.c:82
+#: src/dht/gnunet-service-xdht_hello.c:82
 #, fuzzy
 msgid "# HELLOs obtained from peerinfo"
 msgstr "Meddelande mottaget från klient är ogiltig.\n"
 
 #: src/dht/gnunet-service-dht_neighbours.c:516
+#: src/dht/gnunet-service-xdht_neighbours.c:516
 msgid "# Preference updates given to core"
 msgstr ""
 
 #: src/dht/gnunet-service-dht_neighbours.c:610
+#: src/dht/gnunet-service-xdht_neighbours.c:610
 #, fuzzy
 msgid "# FIND PEER messages initiated"
 msgstr "# PING-meddelanden skapade"
 
 #: src/dht/gnunet-service-dht_neighbours.c:764
+#: src/dht/gnunet-service-xdht_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:819
+#: src/dht/gnunet-service-xdht_neighbours.c:819
 #, fuzzy
 msgid "# Bytes transmitted to other peers"
 msgstr "# byte skickade av typen %d"
 
 #: src/dht/gnunet-service-dht_neighbours.c:857
+#: src/dht/gnunet-service-xdht_neighbours.c:857
 msgid "# Bytes of bandwidth requested from core"
 msgstr ""
 
 #: src/dht/gnunet-service-dht_neighbours.c:889
+#: src/dht/gnunet-service-xdht_neighbours.c:889
 #, fuzzy
 msgid "# requests TTL-dropped"
 msgstr "# byte mottogs via TCP"
 
 #: src/dht/gnunet-service-dht_neighbours.c:1093
 #: src/dht/gnunet-service-dht_neighbours.c:1130
+#: src/dht/gnunet-service-xdht_neighbours.c:1093
+#: src/dht/gnunet-service-xdht_neighbours.c:1130
 msgid "# Peers excluded from routing due to Bloomfilter"
 msgstr ""
 
 #: src/dht/gnunet-service-dht_neighbours.c:1108
 #: src/dht/gnunet-service-dht_neighbours.c:1145
+#: src/dht/gnunet-service-xdht_neighbours.c:1108
+#: src/dht/gnunet-service-xdht_neighbours.c:1145
 msgid "# Peer selection failed"
 msgstr ""
 
 #: src/dht/gnunet-service-dht_neighbours.c:1287
+#: src/dht/gnunet-service-xdht_neighbours.c:1287
 #, fuzzy
 msgid "# PUT requests routed"
 msgstr "# byte mottogs via TCP"
 
 #: src/dht/gnunet-service-dht_neighbours.c:1316
+#: src/dht/gnunet-service-xdht_neighbours.c:1316
 #, fuzzy
 msgid "# PUT messages queued for transmission"
 msgstr "# PING-meddelanden skapade"
@@ -1905,107 +1994,131 @@
 #: src/dht/gnunet-service-dht_neighbours.c:1323
 #: src/dht/gnunet-service-dht_neighbours.c:1440
 #: src/dht/gnunet-service-dht_neighbours.c:1543
+#: src/dht/gnunet-service-xdht_neighbours.c:1323
+#: src/dht/gnunet-service-xdht_neighbours.c:1440
+#: src/dht/gnunet-service-xdht_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:1405
+#: src/dht/gnunet-service-xdht_neighbours.c:1405
 #, fuzzy
 msgid "# GET requests routed"
 msgstr "# byte mottogs via TCP"
 
 #: src/dht/gnunet-service-dht_neighbours.c:1432
+#: src/dht/gnunet-service-xdht_neighbours.c:1432
 #, fuzzy
 msgid "# GET messages queued for transmission"
 msgstr "# PING-meddelanden skapade"
 
 #: src/dht/gnunet-service-dht_neighbours.c:1550
+#: src/dht/gnunet-service-xdht_neighbours.c:1550
 #, fuzzy
 msgid "# RESULT messages queued for transmission"
 msgstr "# PING-meddelanden skapade"
 
 #: src/dht/gnunet-service-dht_neighbours.c:1637
+#: src/dht/gnunet-service-xdht_neighbours.c:1637
 #, fuzzy
 msgid "# P2P PUT requests received"
 msgstr "# byte mottogs via TCP"
 
 #: src/dht/gnunet-service-dht_neighbours.c:1640
+#: src/dht/gnunet-service-xdht_neighbours.c:1640
 #, fuzzy
 msgid "# P2P PUT bytes received"
 msgstr "# byte mottogs via TCP"
 
 #: src/dht/gnunet-service-dht_neighbours.c:1803
+#: src/dht/gnunet-service-xdht_neighbours.c:1803
 msgid "# FIND PEER requests ignored due to Bloomfilter"
 msgstr ""
 
 #: src/dht/gnunet-service-dht_neighbours.c:1811
+#: src/dht/gnunet-service-xdht_neighbours.c:1811
 msgid "# FIND PEER requests ignored due to lack of HELLO"
 msgstr ""
 
 #: src/dht/gnunet-service-dht_neighbours.c:1904
+#: src/dht/gnunet-service-xdht_neighbours.c:1904
 #, fuzzy
 msgid "# P2P GET requests received"
 msgstr "# byte mottogs via TCP"
 
 #: src/dht/gnunet-service-dht_neighbours.c:1907
+#: src/dht/gnunet-service-xdht_neighbours.c:1907
 #, fuzzy
 msgid "# P2P GET bytes received"
 msgstr "# byte mottogs via TCP"
 
 #: src/dht/gnunet-service-dht_neighbours.c:1961
+#: src/dht/gnunet-service-xdht_neighbours.c:1961
 #, fuzzy
 msgid "# P2P FIND PEER requests processed"
 msgstr "# byte mottogs via TCP"
 
 #: src/dht/gnunet-service-dht_neighbours.c:1975
+#: src/dht/gnunet-service-xdht_neighbours.c:1975
 #, fuzzy
 msgid "# P2P GET requests ONLY routed"
 msgstr "# byte mottogs via TCP"
 
 #: src/dht/gnunet-service-dht_neighbours.c:2052
+#: src/dht/gnunet-service-xdht_neighbours.c:2052
 #, fuzzy
 msgid "# P2P RESULTS received"
 msgstr "# krypterade PONG-meddelanden mottagna"
 
 #: src/dht/gnunet-service-dht_neighbours.c:2055
+#: src/dht/gnunet-service-xdht_neighbours.c:2055
 #, fuzzy
 msgid "# P2P RESULT bytes received"
 msgstr "# krypterade PONG-meddelanden mottagna"
 
-#: src/dht/gnunet-service-dht_nse.c:59
+#: src/dht/gnunet-service-dht_nse.c:59 src/dht/gnunet-service-xdht_nse.c:59
 #, fuzzy
 msgid "# Network size estimates received"
 msgstr "# byte mottogs via TCP"
 
 #: src/dht/gnunet-service-dht_routing.c:211
+#: src/dht/gnunet-service-xdht_routing.c:211
 msgid "# Good REPLIES matched against routing table"
 msgstr ""
 
 #: src/dht/gnunet-service-dht_routing.c:220
+#: src/dht/gnunet-service-xdht_routing.c:220
 msgid "# Duplicate REPLIES matched against routing table"
 msgstr ""
 
 #: src/dht/gnunet-service-dht_routing.c:226
+#: src/dht/gnunet-service-xdht_routing.c:226
 msgid "# Invalid REPLIES matched against routing table"
 msgstr ""
 
 #: src/dht/gnunet-service-dht_routing.c:232
+#: src/dht/gnunet-service-xdht_routing.c:232
 msgid "# Irrelevant REPLIES matched against routing table"
 msgstr ""
 
 #: src/dht/gnunet-service-dht_routing.c:244
+#: src/dht/gnunet-service-xdht_routing.c:244
 msgid "# Unsupported REPLIES matched against routing table"
 msgstr ""
 
 #: src/dht/gnunet-service-dht_routing.c:317
+#: src/dht/gnunet-service-xdht_routing.c:317
 msgid "# Entries removed from routing table"
 msgstr ""
 
 #: src/dht/gnunet-service-dht_routing.c:399
+#: src/dht/gnunet-service-xdht_routing.c:399
 msgid "# Entries added to routing table"
 msgstr ""
 
 #: src/dht/gnunet-service-dht_routing.c:417
+#: src/dht/gnunet-service-xdht_routing.c:417
 #, fuzzy
 msgid "# DHT requests combined"
 msgstr "# byte mottogs via TCP"
@@ -2024,12 +2137,12 @@
 msgid "Block of type %u is malformed\n"
 msgstr ""
 
-#: src/dns/dnsparser.c:239
+#: src/dns/dnsparser.c:257
 #, 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:800
+#: src/dns/dnsparser.c:856
 #, fuzzy, c-format
 msgid "Failed to convert UTF-8 name `%s' to DNS IDNA format: %s\n"
 msgstr "Misslyckades att leverera \"%s\" meddelande.\n"
@@ -2121,21 +2234,21 @@
 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:3498
+#: src/dns/gnunet-service-dns.c:1049 src/exit/gnunet-daemon-exit.c:3499
 #, 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:3555
+#: src/dns/gnunet-service-dns.c:1069 src/exit/gnunet-daemon-exit.c:3556
 #, fuzzy
 msgid "need a valid IPv4 or IPv6 address\n"
 msgstr "Ogiltigt svar på \"%s\".\n"
 
-#: src/dv/gnunet-dv.c:165
+#: src/dv/gnunet-dv.c:166
 msgid "verbose output"
 msgstr ""
 
-#: src/dv/gnunet-dv.c:174
+#: src/dv/gnunet-dv.c:175
 #, fuzzy
 msgid "Print information about DV state"
 msgstr "Skriv ut information om GNUnets motparter."
@@ -2147,18 +2260,18 @@
 
 #: src/exit/gnunet-daemon-exit.c:853
 #, fuzzy
-msgid "# Bytes transmitted via mesh tunnels"
+msgid "# Bytes transmitted via mesh channels"
 msgstr "# byte skickade av typen %d"
 
 #: 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
+#: src/exit/gnunet-daemon-exit.c:2651 src/vpn/gnunet-service-vpn.c:1407
+#: src/vpn/gnunet-service-vpn.c:1797 src/vpn/gnunet-service-vpn.c:1960
 msgid "# ICMPv4 packets dropped (type not allowed)"
 msgstr ""
 
 #: 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
+#: src/exit/gnunet-daemon-exit.c:2710 src/vpn/gnunet-service-vpn.c:1463
+#: src/vpn/gnunet-service-vpn.c:1856 src/vpn/gnunet-service-vpn.c:1993
 msgid "# ICMPv6 packets dropped (type not allowed)"
 msgstr ""
 
@@ -2264,13 +2377,13 @@
 msgid "# ICMP service requests received via mesh"
 msgstr "Meddelande mottaget från klient är ogiltig.\n"
 
-#: src/exit/gnunet-daemon-exit.c:2636 src/vpn/gnunet-service-vpn.c:1399
-#: src/vpn/gnunet-service-vpn.c:1956
+#: src/exit/gnunet-daemon-exit.c:2636 src/vpn/gnunet-service-vpn.c:1397
+#: src/vpn/gnunet-service-vpn.c:1954
 msgid "# ICMPv4 packets dropped (impossible PT to v6)"
 msgstr ""
 
-#: 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
+#: src/exit/gnunet-daemon-exit.c:2695 src/vpn/gnunet-service-vpn.c:1433
+#: src/vpn/gnunet-service-vpn.c:1445 src/vpn/gnunet-service-vpn.c:1844
 msgid "# ICMPv6 packets dropped (impossible PT to v4)"
 msgstr ""
 
@@ -2294,58 +2407,59 @@
 msgid "# UDP requests dropped (no such service)"
 msgstr "# byte mottogs via TCP"
 
-#: src/exit/gnunet-daemon-exit.c:3024
-msgid "# Inbound MESH tunnels created"
-msgstr ""
+#: src/exit/gnunet-daemon-exit.c:3025
+#, fuzzy
+msgid "# Inbound MESH channels created"
+msgstr "# PING-meddelanden skapade"
 
-#: src/exit/gnunet-daemon-exit.c:3285
+#: src/exit/gnunet-daemon-exit.c:3286
 #, c-format
 msgid "No addresses found for hostname `%s' of service `%s'!\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3299 src/exit/gnunet-daemon-exit.c:3311
+#: src/exit/gnunet-daemon-exit.c:3300 src/exit/gnunet-daemon-exit.c:3312
 #, c-format
 msgid "Service `%s' configured for IPv4, but IPv4 is disabled!\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3322
+#: src/exit/gnunet-daemon-exit.c:3323
 #, c-format
 msgid "No IP addresses found for hostname `%s' of service `%s'!\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3511
+#: src/exit/gnunet-daemon-exit.c:3512
 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:3519
+#: src/exit/gnunet-daemon-exit.c:3520
 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:3526
+#: src/exit/gnunet-daemon-exit.c:3527
 msgid ""
 "Cannot enable IPv4 exit but disable IPv4 on TUN interface, will use "
 "ENABLE_IPv4=YES\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3532
+#: src/exit/gnunet-daemon-exit.c:3533
 msgid ""
 "Cannot enable IPv6 exit but disable IPv6 on TUN interface, will use "
 "ENABLE_IPv6=YES\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3538 src/pt/gnunet-daemon-pt.c:1248
+#: src/exit/gnunet-daemon-exit.c:3539 src/pt/gnunet-daemon-pt.c:1247
 msgid "No useful service enabled.  Exiting.\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3654
+#: src/exit/gnunet-daemon-exit.c:3655
 msgid "Must be a number"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3796
+#: src/exit/gnunet-daemon-exit.c:3797
 msgid "Daemon to run to provide an IP exit node for the VPN"
 msgstr ""
 
@@ -2574,7 +2688,7 @@
 msgid "Failed to resume unindexing operation `%s': %s\n"
 msgstr "Misslyckades att leverera \"%s\" meddelande.\n"
 
-#: src/fs/fs_api.c:2376 src/fs/fs_api.c:2616
+#: src/fs/fs_api.c:2376 src/fs/fs_api.c:2617
 #, fuzzy, c-format
 msgid "Failed to resume sub-download `%s': %s\n"
 msgstr "Misslyckades att leverera \"%s\" meddelande.\n"
@@ -2584,21 +2698,21 @@
 msgid "Failed to resume sub-search `%s': %s\n"
 msgstr "Misslyckades att leverera \"%s\" meddelande.\n"
 
-#: src/fs/fs_api.c:2406 src/fs/fs_api.c:2425 src/fs/fs_api.c:2908
+#: src/fs/fs_api.c:2407 src/fs/fs_api.c:2426 src/fs/fs_api.c:2909
 #, c-format
 msgid "Failure while resuming search operation `%s': %s\n"
 msgstr ""
 
-#: src/fs/fs_api.c:2607
+#: src/fs/fs_api.c:2608
 #, c-format
 msgid "Failed to resume sub-download `%s': could not open file `%s'\n"
 msgstr ""
 
-#: src/fs/fs_api.c:2852
+#: src/fs/fs_api.c:2853
 msgid "Could not resume running search, will resume as paused search\n"
 msgstr ""
 
-#: src/fs/fs_api.c:2946
+#: src/fs/fs_api.c:2947
 #, c-format
 msgid "Failure while resuming download operation `%s': %s\n"
 msgstr ""
@@ -3259,7 +3373,7 @@
 msgstr "Kommando \"%s\" kräver ett argument (\"%s\").\n"
 
 #: src/fs/gnunet-publish.c:778 src/fs/gnunet-publish.c:785
-#: src/transport/gnunet-transport.c:840 src/transport/gnunet-transport.c:870
+#: src/transport/gnunet-transport.c:865 src/transport/gnunet-transport.c:899
 #, c-format
 msgid "Option `%s' makes no sense without option `%s'.\n"
 msgstr ""
@@ -3361,7 +3475,7 @@
 msgid "# Loopback routes suppressed"
 msgstr ""
 
-#: src/fs/gnunet-service-fs.c:639 src/hostlist/gnunet-daemon-hostlist.c:293
+#: src/fs/gnunet-service-fs.c:639 src/hostlist/gnunet-daemon-hostlist.c:288
 #: src/topology/gnunet-daemon-topology.c:1253
 #: src/topology/gnunet-daemon-topology.c:1260
 #, fuzzy, c-format
@@ -3433,7 +3547,7 @@
 msgid "# requests dropped due to initiator not being connected"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1194
+#: src/fs/gnunet-service-fs_cp.c:1193
 msgid "# requests dropped due to missing reverse route"
 msgstr ""
 
@@ -3502,7 +3616,7 @@
 msgid "Indexed file `%s' changed at offset %llu\n"
 msgstr "Indexering av data misslyckades vid position %i.\n"
 
-#: src/fs/gnunet-service-fs_lc.c:202 src/fs/gnunet-service-fs_lc.c:369
+#: src/fs/gnunet-service-fs_lc.c:202 src/fs/gnunet-service-fs_lc.c:368
 #, fuzzy
 msgid "# client searches active"
 msgstr "# klartext PONG-meddelanden mottagna"
@@ -3512,42 +3626,47 @@
 msgid "# replies received for local clients"
 msgstr "Meddelande mottaget från klient är ogiltig.\n"
 
-#: src/fs/gnunet-service-fs_lc.c:328
+#: src/fs/gnunet-service-fs_lc.c:327
 #, fuzzy
 msgid "# client searches received"
 msgstr "# klartext PONG-meddelanden mottagna"
 
-#: src/fs/gnunet-service-fs_lc.c:363
+#: src/fs/gnunet-service-fs_lc.c:362
 msgid "# client searches updated (merged content seen list)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_mesh_client.c:475
+#: src/fs/gnunet-service-fs_mesh_client.c:484
 #, fuzzy
 msgid "# replies received via mesh"
 msgstr "# byte mottagna av typen %d"
 
-#: src/fs/gnunet-service-fs_mesh_client.c:489
+#: src/fs/gnunet-service-fs_mesh_client.c:498
 #, fuzzy
 msgid "# replies received via mesh dropped"
 msgstr "# byte mottagna av typen %d"
 
-#: src/fs/gnunet-service-fs_mesh_server.c:259
+#: src/fs/gnunet-service-fs_mesh_server.c:260
 #, fuzzy
 msgid "# Blocks transferred via mesh"
 msgstr "# byte skickade av typen %d"
 
-#: src/fs/gnunet-service-fs_mesh_server.c:412
+#: src/fs/gnunet-service-fs_mesh_server.c:352
 #, fuzzy
+msgid "# queries received via mesh not answered"
+msgstr "# byte mottogs via TCP"
+
+#: src/fs/gnunet-service-fs_mesh_server.c:432
+#, fuzzy
 msgid "# queries received via mesh"
 msgstr "# byte mottogs via TCP"
 
-#: src/fs/gnunet-service-fs_mesh_server.c:455
+#: src/fs/gnunet-service-fs_mesh_server.c:476
 #, fuzzy
 msgid "# mesh client connections rejected"
 msgstr "Nätverksanslutning"
 
-#: src/fs/gnunet-service-fs_mesh_server.c:461
-#: src/fs/gnunet-service-fs_mesh_server.c:501
+#: src/fs/gnunet-service-fs_mesh_server.c:482
+#: src/fs/gnunet-service-fs_mesh_server.c:522
 #, fuzzy
 msgid "# mesh connections active"
 msgstr "Nätverksanslutning"
@@ -3584,8 +3703,8 @@
 msgid "# requests refreshed"
 msgstr "# byte mottogs via TCP"
 
-#: src/fs/gnunet-service-fs_pe.c:614 src/fs/gnunet-service-fs_pe.c:698
-#: src/fs/gnunet-service-fs_pe.c:769
+#: src/fs/gnunet-service-fs_pe.c:616 src/fs/gnunet-service-fs_pe.c:700
+#: src/fs/gnunet-service-fs_pe.c:771
 msgid "# query plan entries"
 msgstr ""
 
@@ -3598,103 +3717,103 @@
 msgid "# Pending requests active"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:813
+#: src/fs/gnunet-service-fs_pr.c:814
 #, fuzzy
 msgid "# replies received and matched"
 msgstr "# byte mottagna av typen %d"
 
-#: src/fs/gnunet-service-fs_pr.c:843
+#: src/fs/gnunet-service-fs_pr.c:844
 msgid "# duplicate replies discarded (bloomfilter)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:852
+#: src/fs/gnunet-service-fs_pr.c:853
 msgid "# irrelevant replies discarded"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:866
+#: src/fs/gnunet-service-fs_pr.c:867
 #, c-format
 msgid "Unsupported block type %u\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:879
+#: src/fs/gnunet-service-fs_pr.c:880
 msgid "# results found locally"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1000
+#: src/fs/gnunet-service-fs_pr.c:1001
 msgid "# Datastore `PUT' failures"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1027
+#: src/fs/gnunet-service-fs_pr.c:1029
 #, fuzzy
 msgid "# storage requests dropped due to high load"
 msgstr "Nätverksannonsering avstängd i konfigurationen!\n"
 
-#: src/fs/gnunet-service-fs_pr.c:1062
+#: src/fs/gnunet-service-fs_pr.c:1064
 #, fuzzy
 msgid "# Replies received from DHT"
 msgstr "# byte mottagna via HTTP"
 
-#: src/fs/gnunet-service-fs_pr.c:1190
+#: src/fs/gnunet-service-fs_pr.c:1192
 #, fuzzy
 msgid "# Replies received from MESH"
 msgstr "# byte mottagna via HTTP"
 
-#: src/fs/gnunet-service-fs_pr.c:1242
+#: src/fs/gnunet-service-fs_pr.c:1244
 #, c-format
 msgid "Datastore lookup already took %s!\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1262
+#: src/fs/gnunet-service-fs_pr.c:1264
 #, c-format
 msgid "On-demand lookup already took %s!\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1309
+#: src/fs/gnunet-service-fs_pr.c:1311
 msgid "# Datastore lookups concluded (no results)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1324
+#: src/fs/gnunet-service-fs_pr.c:1326
 msgid "# Datastore lookups concluded (seen all)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1333
+#: src/fs/gnunet-service-fs_pr.c:1335
 msgid "# Datastore lookups aborted (more than MAX_RESULTS)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1348
+#: src/fs/gnunet-service-fs_pr.c:1350
 msgid "# requested DBLOCK or IBLOCK not found"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1362
+#: src/fs/gnunet-service-fs_pr.c:1364
 msgid "# on-demand blocks matched requests"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1375
+#: src/fs/gnunet-service-fs_pr.c:1377
 msgid "# on-demand lookups performed successfully"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1380
+#: src/fs/gnunet-service-fs_pr.c:1382
 msgid "# on-demand lookups failed"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1407 src/fs/gnunet-service-fs_pr.c:1447
-#: src/fs/gnunet-service-fs_pr.c:1588
+#: src/fs/gnunet-service-fs_pr.c:1409 src/fs/gnunet-service-fs_pr.c:1449
+#: src/fs/gnunet-service-fs_pr.c:1590
 msgid "# Datastore lookups concluded (error queueing)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1465
+#: src/fs/gnunet-service-fs_pr.c:1467
 msgid "# Datastore lookups concluded (found last result)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1476
+#: src/fs/gnunet-service-fs_pr.c:1478
 msgid "# Datastore lookups concluded (load too high)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1564
+#: src/fs/gnunet-service-fs_pr.c:1566
 msgid "# Datastore lookups initiated"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1649
+#: src/fs/gnunet-service-fs_pr.c:1651
 #, fuzzy
 msgid "# GAP PUT messages received"
 msgstr "# krypterade PONG-meddelanden mottagna"
@@ -3739,6 +3858,34 @@
 msgid "Failed to serialize lookup reply from GNS service!\n"
 msgstr "Misslyckades att ta emot svar till \"%s\" meddelande från gnunetd\n"
 
+#: src/gns/gnunet-bcd.c:123
+#, c-format
+msgid "Refusing `%s' request to HTTP server\n"
+msgstr ""
+
+#: src/gns/gnunet-bcd.c:355 src/hostlist/hostlist-server.c:566
+#, fuzzy, c-format
+msgid "Invalid port number %llu.  Exiting.\n"
+msgstr "Ogiltiga argument. Avslutar.\n"
+
+#: src/gns/gnunet-bcd.c:360
+#, c-format
+msgid "Businesscard HTTP server starts on %llu\n"
+msgstr ""
+
+#: src/gns/gnunet-bcd.c:374
+#, fuzzy, c-format
+msgid "Could not start businesscard HTTP server on port %u\n"
+msgstr "Misslyckades att starta samling.\n"
+
+#: src/gns/gnunet-bcd.c:519
+msgid "Run HTTP serve on port PORT (default is 8888)"
+msgstr ""
+
+#: src/gns/gnunet-bcd.c:531
+msgid "GNUnet HTTP server to create business cards"
+msgstr ""
+
 #: src/gns/gnunet-dns2gns.c:228
 #, fuzzy
 msgid "Failed to pack DNS response into UDP packet!\n"
@@ -3802,189 +3949,206 @@
 msgid "Please specify name to lookup!\n"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:297
+#: src/gns/gnunet-gns.c:298
 #, c-format
 msgid "Ego for `%s' not found, cannot perform lookup.\n"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:335
+#: src/gns/gnunet-gns.c:336 src/gns/gnunet-gns-helper-service-w32.c:753
 #, c-format
 msgid ""
-"Ego for `master-zone' not found, cannot perform lookup.  Did you run gnunet-"
+"Ego for `gns-master' not found, cannot perform lookup.  Did you run gnunet-"
 "gns-import.sh?\n"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:364
+#: src/gns/gnunet-gns.c:365 src/gns/gnunet-gns-helper-service-w32.c:783
 #, fuzzy, c-format
 msgid "Failed to connect to GNS\n"
 msgstr "Misslyckades att ansluta till gnunetd.\n"
 
-#: src/gns/gnunet-gns.c:377
+#: src/gns/gnunet-gns.c:378
 #, c-format
 msgid "Public key `%s' is not well-formed\n"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:426
+#: src/gns/gnunet-gns.c:428
 msgid "Lookup a record for the given name"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:429
+#: src/gns/gnunet-gns.c:431
 #, fuzzy
 msgid "Specify the type of the record to lookup"
 msgstr "ange prioritet för innehållet"
 
-#: src/gns/gnunet-gns.c:432
+#: src/gns/gnunet-gns.c:434
 msgid "No unneeded output"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:435
+#: src/gns/gnunet-gns.c:437
 #, 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:438
+#: src/gns/gnunet-gns.c:440
 #, 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:451
+#: src/gns/gnunet-gns.c:453
 #, fuzzy
 msgid "GNUnet GNS resolver tool"
 msgstr "Spåra GNUnets nätverkstopologi."
 
+#: src/gns/gnunet-gns-helper-service-w32.c:723
+#, c-format
+msgid ""
+"Ego for `gns-short' not found. This is not really fatal, but i'll pretend "
+"that it is and refuse to perform a lookup.  Did you run gnunet-gns-import."
+"sh?\n"
+msgstr ""
+
+#: src/gns/gnunet-gns-helper-service-w32.c:793
+#, fuzzy, c-format
+msgid "Failed to connect to identity service\n"
+msgstr "Misslyckades att ansluta till gnunetd.\n"
+
 #: 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:1067
-#: src/transport/plugin_transport_http_client.c:1082
+#: src/hostlist/hostlist-client.c:683 src/hostlist/hostlist-client.c:689
+#: src/hostlist/hostlist-client.c:741 src/hostlist/hostlist-client.c:750
+#: src/hostlist/hostlist-client.c:871 src/hostlist/hostlist-client.c:963
+#: src/hostlist/hostlist-client.c:968
+#: src/transport/plugin_transport_http_client.c:1071
+#: src/transport/plugin_transport_http_client.c:1086
 #, 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:839
+#: src/gns/gnunet-gns-proxy.c:833
 #, 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
+#: src/gns/gnunet-gns-proxy.c:856
 #, 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
+#: src/gns/gnunet-gns-proxy.c:879
 #, fuzzy, c-format
 msgid "Failed to initialize DANE: %s\n"
 msgstr "Kunde inte initiera SQLite.\n"
 
-#: src/gns/gnunet-gns-proxy.c:898
+#: src/gns/gnunet-gns-proxy.c:892
 #, 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
+#: src/gns/gnunet-gns-proxy.c:907
 #, 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
+#: src/gns/gnunet-gns-proxy.c:917
 #, c-format
 msgid "Failed DANE verification failed with GnuTLS verify status code: %u\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:947
+#: src/gns/gnunet-gns-proxy.c:941
 #, c-format
 msgid "SSL certificate subject name (%s) does not match `%s'\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:1092
+#: src/gns/gnunet-gns-proxy.c:1086
 #, c-format
 msgid "Cookie domain `%s' supplied by server is invalid\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:1609
+#: src/gns/gnunet-gns-proxy.c:1602
 #, fuzzy, c-format
 msgid "Unsupported HTTP method `%s'\n"
 msgstr "Kommando \"%s\" stöds ej.  Avbryter.\n"
 
-#: src/gns/gnunet-gns-proxy.c:1979
+#: src/gns/gnunet-gns-proxy.c:1973
 #, 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:2009
+#: src/gns/gnunet-gns-proxy.c:2003
 #, fuzzy, c-format
 msgid "Unable to import certificate %s\n"
 msgstr "Kunde inte spara konfigurationsfil \"%s\":"
 
-#: src/gns/gnunet-gns-proxy.c:2178
+#: src/gns/gnunet-gns-proxy.c:2177
 #, fuzzy, c-format
 msgid "Failed to start HTTPS server for `%s'\n"
 msgstr "Misslyckades att starta samling.\n"
 
-#: src/gns/gnunet-gns-proxy.c:2197
+#: src/gns/gnunet-gns-proxy.c:2196
 #, fuzzy
 msgid "Failed to pass client to MHD\n"
 msgstr "Misslyckades att ansluta till gnunetd.\n"
 
-#: src/gns/gnunet-gns-proxy.c:2505
+#: src/gns/gnunet-gns-proxy.c:2504
 #, fuzzy, c-format
 msgid "Unsupported socks version %d\n"
 msgstr "Kommando \"%s\" stöds ej.  Avbryter.\n"
 
-#: src/gns/gnunet-gns-proxy.c:2534
+#: src/gns/gnunet-gns-proxy.c:2533
 #, fuzzy, c-format
 msgid "Unsupported socks command %d\n"
 msgstr "Kommando \"%s\" stöds ej.  Avbryter.\n"
 
-#: src/gns/gnunet-gns-proxy.c:2616
+#: src/gns/gnunet-gns-proxy.c:2551 src/gns/gnunet-gns-proxy.c:2580
+msgid "SSL connection to plain IPv4 address requested\n"
+msgstr ""
+
+#: src/gns/gnunet-gns-proxy.c:2631
 #, 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
+#: src/gns/gnunet-gns-proxy.c:2970
 msgid "No ego configured for `shorten-zone`\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:2995
+#: src/gns/gnunet-gns-proxy.c:3010
 #, c-format
 msgid "No ego configured for `%s`\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:3057
+#: src/gns/gnunet-gns-proxy.c:3072
 #, 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:3098
+#: src/gns/gnunet-gns-proxy.c:3113
 msgid "listen on specified port (default: 7777)"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:3101
+#: src/gns/gnunet-gns-proxy.c:3116
 msgid "pem file to use as CA"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:3120
+#: src/gns/gnunet-gns-proxy.c:3135
 msgid "GNUnet GNS proxy"
 msgstr ""
 
-#: src/gns/gnunet-service-gns.c:860
+#: src/gns/gnunet-service-gns.c:862
 #, fuzzy
 msgid "Failed to connect to the namestore!\n"
 msgstr "Misslyckades att ansluta till gnunetd.\n"
 
-#: src/gns/gnunet-service-gns.c:868
+#: src/gns/gnunet-service-gns.c:870
 #, fuzzy
 msgid "Failed to connect to the namecache!\n"
 msgstr "Misslyckades att ansluta till gnunetd.\n"
 
-#: src/gns/gnunet-service-gns.c:901
+#: src/gns/gnunet-service-gns.c:903
 #, fuzzy
 msgid "Could not connect to DHT!\n"
 msgstr "Kunde inte ansluta till gnunetd.\n"
 
-#: src/gns/gnunet-service-gns.c:917
+#: src/gns/gnunet-service-gns.c:919
 #, fuzzy
 msgid "valid public key required"
 msgstr "Ogiltigt argument: \"%s\"\n"
@@ -3998,101 +4162,111 @@
 msgid "Failed to connect to the DNS service!\n"
 msgstr "Misslyckades att ansluta till gnunetd.\n"
 
-#: src/gns/gnunet-service-gns_resolver.c:771
+#: src/gns/gnunet-service-gns_resolver.c:815
 #, 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:913
+#: src/gns/gnunet-service-gns_resolver.c:957
 #, c-format
 msgid "Skipping record of unsupported type %d\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns_resolver.c:1646
+#: src/gns/gnunet-service-gns_resolver.c:1316
 #, c-format
 msgid "GNS lookup resulted in DNS name that is too long (`%s')\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns_resolver.c:1686
+#: src/gns/gnunet-service-gns_resolver.c:1809
 msgid "GNS lookup recursion failed (no delegation record found)\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns_resolver.c:1710
+#: src/gns/gnunet-service-gns_resolver.c:1833
 #, 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:1932
+#: src/gns/gnunet-service-gns_resolver.c:2071
 #, c-format
 msgid "Zone %s was revoked, resolution fails\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns_resolver.c:2054
+#: src/gns/gnunet-service-gns_resolver.c:2220
 #, c-format
 msgid "Hostname `%s' is not well-formed, resolution fails\n"
 msgstr ""
 
-#: src/gns/plugin_gnsrecord_gns.c:142
+#: src/gns/plugin_gnsrecord_gns.c:151
 #, 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
+#: src/gns/plugin_gnsrecord_gns.c:180
 #, fuzzy, c-format
+msgid "Unable to parse GNS2DNS record `%s'\n"
+msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
+
+#: src/gns/plugin_gnsrecord_gns.c:201
+#, 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
+#: src/gns/plugin_gnsrecord_gns.c:217
 #, 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
+#: src/gnsrecord/plugin_gnsrecord_dns.c:293
 #, fuzzy, c-format
 msgid "Unable to parse IPv4 address `%s'\n"
 msgstr "Ogiltigt svar på \"%s\".\n"
 
-#: src/gnsrecord/plugin_gnsrecord_dns.c:282
+#: src/gnsrecord/plugin_gnsrecord_dns.c:314
 #, 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
+#: src/gnsrecord/plugin_gnsrecord_dns.c:336
 #, 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
+#: src/gnsrecord/plugin_gnsrecord_dns.c:420
 #, fuzzy, c-format
+msgid "Failed to serialize CERT record with %u bytes\n"
+msgstr "Kunde inte tolka konfigurationsfil \"%s\".\n"
+
+#: src/gnsrecord/plugin_gnsrecord_dns.c:452
+#, 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
+#: src/gnsrecord/plugin_gnsrecord_dns.c:471
 #, 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
+#: src/gnsrecord/plugin_gnsrecord_dns.c:494
 #, 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
+#: src/gnsrecord/plugin_gnsrecord_dns.c:514
 #, 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
+#: src/gnsrecord/plugin_gnsrecord_dns.c:529
 #, 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
+#: src/gnsrecord/plugin_gnsrecord_dns.c:549
 #, fuzzy, c-format
 msgid "Unable to parse IPv6 address `%s'\n"
 msgstr "Ogiltigt svar på \"%s\".\n"
 
-#: src/gnsrecord/plugin_gnsrecord_dns.c:447
+#: src/gnsrecord/plugin_gnsrecord_dns.c:567
 #, fuzzy, c-format
 msgid "Unable to parse TLSA record string `%s'\n"
 msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
@@ -4171,175 +4345,175 @@
 msgid "Failed to parse `%s' as an address for plugin `%s'\n"
 msgstr "Misslyckades att binda till UDP-port %d.\n"
 
-#: src/hostlist/gnunet-daemon-hostlist.c:260
+#: src/hostlist/gnunet-daemon-hostlist.c:259
 msgid ""
 "None of the functions for the hostlist daemon were enabled.  I have no "
 "reason to run!\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist.c:313
+#: src/hostlist/gnunet-daemon-hostlist.c:308
 msgid "advertise our hostlist to other peers"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist.c:318
+#: src/hostlist/gnunet-daemon-hostlist.c:313
 msgid ""
 "bootstrap using hostlists (it is highly recommended that you always use this "
 "option)"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist.c:321
+#: src/hostlist/gnunet-daemon-hostlist.c:316
 msgid "enable learning about hostlist servers from other peers"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist.c:325
+#: src/hostlist/gnunet-daemon-hostlist.c:320
 msgid "provide a hostlist server"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist.c:340
+#: src/hostlist/gnunet-daemon-hostlist.c:335
 msgid "GNUnet hostlist server and client"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:289
+#: src/hostlist/hostlist-client.c:288
 msgid "# bytes downloaded from hostlist servers"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:310 src/hostlist/hostlist-client.c:340
+#: src/hostlist/hostlist-client.c:309 src/hostlist/hostlist-client.c:339
 msgid "# invalid HELLOs downloaded from hostlist servers"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:313 src/hostlist/hostlist-client.c:343
+#: src/hostlist/hostlist-client.c:312 src/hostlist/hostlist-client.c:342
 #, fuzzy, c-format
 msgid "Invalid `%s' message received from hostlist at `%s'\n"
 msgstr "Ogiltigt meddelande mottogs den %s:%d."
 
-#: src/hostlist/hostlist-client.c:331
+#: src/hostlist/hostlist-client.c:330
 msgid "# valid HELLOs downloaded from hostlist servers"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:589 src/hostlist/hostlist-client.c:1330
+#: src/hostlist/hostlist-client.c:592 src/hostlist/hostlist-client.c:1333
 msgid "# advertised hostlist URIs"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:619
+#: src/hostlist/hostlist-client.c:622
 #, c-format
 msgid "# advertised URI `%s' downloaded"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:661
+#: src/hostlist/hostlist-client.c:664
 #, c-format
 msgid ""
 "Advertised hostlist with URI `%s' could not be downloaded. Advertised URI "
 "gets dismissed.\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:799
+#: src/hostlist/hostlist-client.c:802
 #, fuzzy, c-format
 msgid "Timeout trying to download hostlist from `%s'\n"
 msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 
-#: src/hostlist/hostlist-client.c:813
+#: src/hostlist/hostlist-client.c:816
 #, c-format
 msgid "Download limit of %u bytes exceeded, stopping download\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:833
+#: src/hostlist/hostlist-client.c:836
 #, fuzzy, c-format
 msgid "Download of hostlist from `%s' failed: `%s'\n"
 msgstr ""
 "Uppladdning av \"%s\" klar, aktuell genomsnittshastighet är %8.3f kbps.\n"
 
-#: src/hostlist/hostlist-client.c:839
+#: src/hostlist/hostlist-client.c:842
 #, fuzzy, c-format
 msgid "Download of hostlist `%s' completed.\n"
 msgstr ""
 "Uppladdning av \"%s\" klar, aktuell genomsnittshastighet är %8.3f kbps.\n"
 
-#: src/hostlist/hostlist-client.c:847
+#: src/hostlist/hostlist-client.c:850
 #, c-format
 msgid "Adding successfully tested hostlist `%s' datastore.\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:900
+#: src/hostlist/hostlist-client.c:903
 #, c-format
 msgid "Bootstrapping using hostlist at `%s'.\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:908
+#: src/hostlist/hostlist-client.c:911
 msgid "# hostlist downloads initiated"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1037 src/hostlist/hostlist-client.c:1503
+#: src/hostlist/hostlist-client.c:1040 src/hostlist/hostlist-client.c:1506
 msgid "# milliseconds between hostlist downloads"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1046
+#: src/hostlist/hostlist-client.c:1049
 #, c-format
 msgid "Have %u/%u connections.  Will consider downloading hostlist in %s\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1106 src/hostlist/hostlist-client.c:1122
+#: src/hostlist/hostlist-client.c:1109 src/hostlist/hostlist-client.c:1125
 #, fuzzy
 msgid "# active connections"
 msgstr "Nätverksanslutning"
 
-#: src/hostlist/hostlist-client.c:1278
+#: src/hostlist/hostlist-client.c:1280
 #, fuzzy, c-format
 msgid "Loading saved hostlist entries from file `%s' \n"
 msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 
-#: src/hostlist/hostlist-client.c:1282
+#: src/hostlist/hostlist-client.c:1285
 #, fuzzy, c-format
 msgid "Hostlist file `%s' does not exist\n"
 msgstr "antal meddelanden att använda per iteration"
 
-#: src/hostlist/hostlist-client.c:1293
+#: src/hostlist/hostlist-client.c:1296
 #, fuzzy, c-format
 msgid "Could not open file `%s' for reading to load hostlists: %s\n"
 msgstr "Kunde inte slå upp \"%s\": %s\n"
 
-#: src/hostlist/hostlist-client.c:1326
+#: src/hostlist/hostlist-client.c:1329
 #, c-format
 msgid "%u hostlist URIs loaded from file\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1328
+#: src/hostlist/hostlist-client.c:1331
 msgid "# hostlist URIs read from file"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1373
+#: src/hostlist/hostlist-client.c:1376
 #, fuzzy, c-format
 msgid "Could not open file `%s' for writing to save hostlists: %s\n"
 msgstr "Kunde inte slå upp \"%s\": %s\n"
 
-#: src/hostlist/hostlist-client.c:1378
+#: src/hostlist/hostlist-client.c:1381
 #, fuzzy, c-format
 msgid "Writing %u hostlist URIs to `%s'\n"
 msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 
-#: src/hostlist/hostlist-client.c:1402 src/hostlist/hostlist-client.c:1419
+#: src/hostlist/hostlist-client.c:1405 src/hostlist/hostlist-client.c:1422
 #, c-format
 msgid "Error writing hostlist URIs to file `%s'\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1414
+#: src/hostlist/hostlist-client.c:1417
 msgid "# hostlist URIs written to file"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1468
+#: src/hostlist/hostlist-client.c:1471
 msgid "Learning is enabled on this peer\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1480
+#: src/hostlist/hostlist-client.c:1483
 msgid "Learning is not enabled on this peer\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1492
+#: src/hostlist/hostlist-client.c:1495
 #, c-format
 msgid ""
 "Since learning is not enabled on this peer, hostlist file `%s' was removed\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1496
+#: src/hostlist/hostlist-client.c:1499
 #, c-format
 msgid "Hostlist file `%s' could not be removed\n"
 msgstr ""
@@ -4412,33 +4586,28 @@
 msgid "Advertisement message could not be queued by core\n"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:560 src/peerinfo-tool/gnunet-peerinfo.c:651
-#: src/transport/gnunet-service-transport.c:790
+#: src/hostlist/hostlist-server.c:556 src/peerinfo-tool/gnunet-peerinfo.c:651
+#: src/transport/gnunet-service-transport.c:850
 #, fuzzy
 msgid "Could not access PEERINFO service.  Exiting.\n"
 msgstr "Kunde inte komma åt namnrymdsinformation.\n"
 
-#: src/hostlist/hostlist-server.c:570
-#, fuzzy, c-format
-msgid "Invalid port number %llu.  Exiting.\n"
-msgstr "Ogiltiga argument. Avslutar.\n"
-
-#: src/hostlist/hostlist-server.c:579
+#: src/hostlist/hostlist-server.c:575
 #, c-format
 msgid "Hostlist service starts on %s:%llu\n"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:593
+#: src/hostlist/hostlist-server.c:589
 #, fuzzy, c-format
 msgid "Address to obtain hostlist: `%s'\n"
 msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 
-#: src/hostlist/hostlist-server.c:633
+#: src/hostlist/hostlist-server.c:629
 #, fuzzy, c-format
 msgid "`%s' is not a valid IP address! Ignoring BINDTOIP.\n"
 msgstr "\"%s\" är inte tillgänglig."
 
-#: src/hostlist/hostlist-server.c:676
+#: src/hostlist/hostlist-server.c:672
 #, c-format
 msgid "Could not start hostlist HTTP server on port %u\n"
 msgstr ""
@@ -4483,49 +4652,49 @@
 msgid "Maintain egos"
 msgstr ""
 
-#: src/identity/gnunet-service-identity.c:337
+#: src/identity/gnunet-service-identity.c:338
 msgid "no default known"
 msgstr ""
 
-#: src/identity/gnunet-service-identity.c:360
+#: src/identity/gnunet-service-identity.c:362
 msgid "default configured, but ego unknown (internal error)"
 msgstr ""
 
-#: src/identity/gnunet-service-identity.c:437
-#: src/identity/gnunet-service-identity.c:668
-#: src/identity/gnunet-service-identity.c:776
+#: src/identity/gnunet-service-identity.c:439
+#: src/identity/gnunet-service-identity.c:670
+#: src/identity/gnunet-service-identity.c:778
 #, fuzzy, c-format
 msgid "Failed to write subsystem default identifier map to `%s'.\n"
 msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 
-#: src/identity/gnunet-service-identity.c:444
+#: src/identity/gnunet-service-identity.c:446
 msgid "Unknown ego specified for service (internal error)"
 msgstr ""
 
-#: src/identity/gnunet-service-identity.c:514
+#: src/identity/gnunet-service-identity.c:516
 msgid "identifier already in use for another ego"
 msgstr ""
 
-#: src/identity/gnunet-service-identity.c:645
+#: src/identity/gnunet-service-identity.c:647
 msgid "target name already exists"
 msgstr ""
 
-#: src/identity/gnunet-service-identity.c:684
-#: src/identity/gnunet-service-identity.c:793
+#: src/identity/gnunet-service-identity.c:686
+#: src/identity/gnunet-service-identity.c:795
 msgid "no matching ego found"
 msgstr ""
 
-#: src/identity/gnunet-service-identity.c:827
+#: src/identity/gnunet-service-identity.c:829
 #, fuzzy, c-format
 msgid "Failed to parse ego information in `%s'\n"
 msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 
-#: src/identity/gnunet-service-identity.c:900
+#: src/identity/gnunet-service-identity.c:902
 #, fuzzy, c-format
 msgid "Failed to parse subsystem identity configuration file `%s'\n"
 msgstr "Kunde inte spara konfigurationsfil \"%s\":"
 
-#: src/identity/gnunet-service-identity.c:912
+#: src/identity/gnunet-service-identity.c:914
 #, fuzzy, c-format
 msgid "Failed to create directory `%s' for storing egos\n"
 msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
@@ -4544,45 +4713,52 @@
 msgid "Send ping messages to test connectivity (default == NO)"
 msgstr ""
 
-#: src/mesh/gnunet-mesh.c:146
+#: src/mesh/gnunet-mesh.c:299
 #, fuzzy, c-format
+msgid "Invalid target `%s'\n"
+msgstr "Ogiltigt argument: \"%s\"\n"
+
+#: src/mesh/gnunet-mesh.c:417
+#, fuzzy, c-format
 msgid "Invalid tunnel owner `%s'\n"
 msgstr "Ogiltigt format för IP: \"%s\"\n"
 
-#: src/mesh/gnunet-mesh.c:209
+#: src/mesh/gnunet-mesh.c:482
+msgid "You must NOT give a TARGET when using options\n"
+msgstr ""
+
+#: src/mesh/gnunet-mesh.c:559
 #, fuzzy
-msgid "provide information about all tunnels (continuously) NOT IMPLEMENTED"
+msgid "provide information about a particular channel"
 msgstr "Skriv ut information om GNUnets motparter."
 
-#: src/mesh/gnunet-mesh.c:212
+#: src/mesh/gnunet-mesh.c:562
 #, fuzzy
-msgid "provide information about a particular tunnel"
+msgid "provide information about a particular connection"
 msgstr "Skriv ut information om GNUnets motparter."
 
-#: src/mesh/gnunet-mesh.c:222
+#: src/mesh/gnunet-mesh.c:565
 #, fuzzy
-msgid "Print information about mesh tunnels and peers."
+msgid "provide information about all tunnels"
 msgstr "Skriv ut information om GNUnets motparter."
 
-#: src/mesh/gnunet-service-mesh.c:5633 src/mesh/gnunet-service-mesh_peer.c:350
-msgid "Wrong CORE service\n"
+#: src/mesh/gnunet-mesh.c:568
+#, fuzzy
+msgid "provide information about all tunnels (continuously) NOT IMPLEMENTED"
+msgstr "Skriv ut information om GNUnets motparter."
+
+#: src/mesh/gnunet-mesh.c:571
+msgid "port to listen to (default; 0)"
 msgstr ""
 
-#: 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-mesh.c:574
+#, fuzzy
+msgid "provide information about a particular tunnel"
+msgstr "Skriv ut information om GNUnets motparter."
 
-#: 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"
-msgstr "GNUnet-konfiguration"
+#: src/mesh/gnunet-service-mesh_peer.c:349
+msgid "Wrong CORE service\n"
+msgstr ""
 
 #: src/mysql/mysql.c:174
 #, c-format
@@ -4599,31 +4775,36 @@
 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
+#: src/namecache/gnunet-namecache.c:124 src/namestore/gnunet-namestore.c:394
 #, c-format
 msgid "\tCorrupt or unsupported record of type %u\n"
 msgstr ""
 
-#: src/namecache/gnunet-namecache.c:185 src/namestore/gnunet-namestore.c:777
+#: src/namecache/gnunet-namecache.c:185
 #, 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
+#: src/namecache/gnunet-namecache.c:195 src/namestore/gnunet-namestore.c:692
 #, 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
+#: src/namecache/gnunet-namecache.c:203
+#, fuzzy, c-format
+msgid "You must specify a name\n"
+msgstr "Du måste ange en mottagare!\n"
+
+#: src/namecache/gnunet-namecache.c:234 src/namestore/gnunet-namestore.c:925
 msgid "name of the record to add/delete/display"
 msgstr ""
 
-#: src/namecache/gnunet-namecache.c:229
+#: src/namecache/gnunet-namecache.c:237
 #, 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
+#: src/namecache/gnunet-namecache.c:248 src/namestore/gnunet-namestore.c:957
 #, fuzzy
 msgid "GNUnet zone manipulation tool"
 msgstr "GNUnet-konfiguration"
@@ -4638,70 +4819,70 @@
 msgid "Failed to create indices\n"
 msgstr "Kunde inte skapa namnrymd \"%s\" (existerar?).\n"
 
-#: src/namestore/gnunet-namestore.c:278
+#: src/namestore/gnunet-namestore.c:304
 #, fuzzy, c-format
 msgid "Adding record failed: %s\n"
 msgstr ""
 "\n"
 "Fel vid uppladdning av fil: %s\n"
 
-#: src/namestore/gnunet-namestore.c:306
+#: src/namestore/gnunet-namestore.c:333
 #, fuzzy, c-format
 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:313
+#: src/namestore/gnunet-namestore.c:340
 #, fuzzy, c-format
 msgid "Deleting record failed%s%s\n"
 msgstr ""
 "\n"
 "Fel vid uppladdning av fil: %s\n"
 
-#: src/namestore/gnunet-namestore.c:528
+#: src/namestore/gnunet-namestore.c:555
 #, c-format
 msgid "No options given\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:539
-#: src/namestore/gnunet-namestore-fcfsd.c:964
+#: src/namestore/gnunet-namestore.c:566
+#: src/namestore/gnunet-namestore-fcfsd.c:970
 #, fuzzy
 msgid "Failed to connect to namestore\n"
 msgstr "Misslyckades att ansluta till gnunetd.\n"
 
-#: 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
+#: src/namestore/gnunet-namestore.c:574 src/namestore/gnunet-namestore.c:583
+#: src/namestore/gnunet-namestore.c:600 src/namestore/gnunet-namestore.c:622
+#: src/namestore/gnunet-namestore.c:662
 #, fuzzy, c-format
 msgid "Missing option `%s' for operation `%s'\n"
 msgstr "Konfigurationsfil \"%s\" skapad.\n"
 
-#: src/namestore/gnunet-namestore.c:548 src/namestore/gnunet-namestore.c:557
-#: src/namestore/gnunet-namestore.c:574 src/namestore/gnunet-namestore.c:596
+#: src/namestore/gnunet-namestore.c:575 src/namestore/gnunet-namestore.c:584
+#: src/namestore/gnunet-namestore.c:601 src/namestore/gnunet-namestore.c:623
 msgid "add"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:565
+#: src/namestore/gnunet-namestore.c:592
 #, fuzzy, c-format
 msgid "Unsupported type `%s'\n"
 msgstr "Kommando \"%s\" stöds ej.  Avbryter.\n"
 
-#: src/namestore/gnunet-namestore.c:585
+#: src/namestore/gnunet-namestore.c:612
 #, 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:621
+#: src/namestore/gnunet-namestore.c:648
 #, fuzzy, c-format
 msgid "Invalid time format `%s'\n"
 msgstr "Ogiltigt format för IP: \"%s\"\n"
 
-#: src/namestore/gnunet-namestore.c:636
+#: src/namestore/gnunet-namestore.c:663
 msgid "del"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:689
+#: src/namestore/gnunet-namestore.c:712
 #: src/peerinfo-tool/gnunet-peerinfo.c:703
 #, fuzzy, c-format
 msgid "Invalid URI `%s'\n"
@@ -4709,120 +4890,154 @@
 
 #: src/namestore/gnunet-namestore.c:747
 #, fuzzy, c-format
+msgid "Invalid nick `%s'\n"
+msgstr "Ogiltiga argument: "
+
+#: src/namestore/gnunet-namestore.c:787
+#, 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:806
+#: src/namestore/gnunet-namestore.c:814
+#, fuzzy, c-format
+msgid "No default ego configured in identity service\n"
+msgstr "\"%s\": okänd tjänst: %s\n"
+
+#: src/namestore/gnunet-namestore.c:847
+#, fuzzy, c-format
+msgid "Identity service is not running\n"
+msgstr "\"%s\" är inte en fil.\n"
+
+#: src/namestore/gnunet-namestore.c:859
+#, fuzzy, c-format
+msgid "Cannot connect to identity service\n"
+msgstr "Kunde inte ansluta till gnunetd.\n"
+
+#: src/namestore/gnunet-namestore.c:907
 msgid "add record"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:809
+#: src/namestore/gnunet-namestore.c:910
 msgid "delete record"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:812
+#: src/namestore/gnunet-namestore.c:913
 msgid "display records"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:815
+#: src/namestore/gnunet-namestore.c:916
 msgid ""
 "expiration time for record to use (for adding only), \"never\" is possible"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:818
+#: src/namestore/gnunet-namestore.c:919
 #, fuzzy
+msgid "set the desired nick name for the zone"
+msgstr "Skriv ut information om GNUnets motparter."
+
+#: src/namestore/gnunet-namestore.c:922
+#, fuzzy
 msgid "monitor changes in the namestore"
 msgstr "Misslyckades att ansluta till gnunetd.\n"
 
-#: src/namestore/gnunet-namestore.c:824
+#: src/namestore/gnunet-namestore.c:928
 #, fuzzy
 msgid "determine our name for the given PKEY"
 msgstr "Skriv ut information om GNUnets motparter."
 
-#: src/namestore/gnunet-namestore.c:827
+#: src/namestore/gnunet-namestore.c:931
 msgid "type of the record to add/delete/display"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:830
+#: src/namestore/gnunet-namestore.c:934
 msgid "URI to import into our zone"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:833
+#: src/namestore/gnunet-namestore.c:937
 msgid "value of the record to add/delete"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:836
+#: src/namestore/gnunet-namestore.c:940
 msgid "create or list public record"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:839
+#: src/namestore/gnunet-namestore.c:943
 msgid ""
 "create shadow record (only valid if all other records of the same type have "
 "expired"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:842
+#: src/namestore/gnunet-namestore.c:946
 #, fuzzy
 msgid "name of the ego controlling the zone"
 msgstr "Visa värde av alternativet"
 
-#: src/namestore/gnunet-namestore-fcfsd.c:462
+#: src/namestore/gnunet-namestore-fcfsd.c:464
 #, fuzzy, c-format
 msgid "Unsupported form value `%s'\n"
 msgstr "Kommando \"%s\" stöds ej.  Avbryter.\n"
 
-#: src/namestore/gnunet-namestore-fcfsd.c:489
+#: src/namestore/gnunet-namestore-fcfsd.c:491
 #, 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:524
+#: src/namestore/gnunet-namestore-fcfsd.c:525
 #, c-format
 msgid "Found existing name `%s' for the given key\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:590
+#: src/namestore/gnunet-namestore-fcfsd.c:534
+msgid "Error when mapping zone to name\n"
+msgstr ""
+
+#: src/namestore/gnunet-namestore-fcfsd.c:596
 #, c-format
 msgid "Found %u existing records for domain `%s'\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:646
+#: src/namestore/gnunet-namestore-fcfsd.c:652
 #, 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:662
+#: src/namestore/gnunet-namestore-fcfsd.c:668
 #, 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:698
+#: src/namestore/gnunet-namestore-fcfsd.c:704
 msgid "Domain name must not contain `.'\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:706
+#: src/namestore/gnunet-namestore-fcfsd.c:712
 msgid "Domain name must not contain `+'\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:904
+#: src/namestore/gnunet-namestore-fcfsd.c:910
 msgid "No ego configured for `fcfsd` subsystem\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:930
+#: src/namestore/gnunet-namestore-fcfsd.c:936
 #, fuzzy
 msgid "Failed to start HTTP server\n"
 msgstr "Misslyckades att starta samling.\n"
 
-#: src/namestore/gnunet-namestore-fcfsd.c:999
+#: src/namestore/gnunet-namestore-fcfsd.c:978
+#, fuzzy
+msgid "Failed to connect to identity\n"
+msgstr "Misslyckades att ansluta till gnunetd.\n"
+
+#: src/namestore/gnunet-namestore-fcfsd.c:1011
 msgid "GNU Name System First Come First Serve name registration service"
 msgstr ""
 
-#: src/namestore/gnunet-service-namestore.c:494
+#: src/namestore/gnunet-service-namestore.c:634
 #, fuzzy, c-format
 msgid "Failed to replicate block in namecache: %s\n"
 msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 
-#: src/namestore/namestore_api.c:273
+#: src/namestore/namestore_api.c:275
 msgid "Namestore failed to store record\n"
 msgstr ""
 
@@ -4929,12 +5144,12 @@
 msgid "`upnpc' command not found\n"
 msgstr ""
 
-#: src/nat/nat_test.c:341
+#: src/nat/nat_test.c:345
 #, fuzzy
 msgid "Failed to connect to `gnunet-nat-server'\n"
 msgstr "Misslyckades att ansluta till gnunetd.\n"
 
-#: src/nat/nat_test.c:411
+#: src/nat/nat_test.c:414
 #, c-format
 msgid "Failed to create listen socket bound to `%s' for NAT test: %s\n"
 msgstr ""
@@ -4969,12 +5184,12 @@
 msgid "Measure quality and performance of the NSE service."
 msgstr "Kan inte tillgå tjänsten"
 
-#: src/nse/gnunet-service-nse.c:1460
-#: src/revocation/gnunet-service-revocation.c:580
+#: src/nse/gnunet-service-nse.c:1461
+#: src/revocation/gnunet-service-revocation.c:789
 msgid "Value is too large.\n"
 msgstr ""
 
-#: src/nse/gnunet-service-nse.c:1487
+#: src/nse/gnunet-service-nse.c:1488
 msgid "NSE service is lacking key configuration settings.  Exiting.\n"
 msgstr ""
 
@@ -4983,42 +5198,42 @@
 msgid "Removing expired address of transport `%s'\n"
 msgstr "Tillgängliga transport(er): %s\n"
 
-#: src/peerinfo/gnunet-service-peerinfo.c:352
+#: src/peerinfo/gnunet-service-peerinfo.c:354
 #, 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:369
+#: src/peerinfo/gnunet-service-peerinfo.c:373
 #, 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:447
+#: src/peerinfo/gnunet-service-peerinfo.c:457
 msgid "# peers known"
 msgstr ""
 
-#: src/peerinfo/gnunet-service-peerinfo.c:483
+#: src/peerinfo/gnunet-service-peerinfo.c:494
 #, c-format
 msgid ""
 "File `%s' in directory `%s' does not match naming convention. Removed.\n"
 msgstr ""
 
-#: src/peerinfo/gnunet-service-peerinfo.c:638
+#: src/peerinfo/gnunet-service-peerinfo.c:644
 #, fuzzy, c-format
 msgid "Scanning directory `%s'\n"
 msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 
-#: src/peerinfo/gnunet-service-peerinfo.c:643
+#: src/peerinfo/gnunet-service-peerinfo.c:649
 #, c-format
 msgid "Still no peers found in `%s'!\n"
 msgstr ""
 
-#: src/peerinfo/gnunet-service-peerinfo.c:979
+#: src/peerinfo/gnunet-service-peerinfo.c:985
 #, 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:1269
+#: src/peerinfo/gnunet-service-peerinfo.c:1275
 #, c-format
 msgid "Importing HELLOs from `%s'\n"
 msgstr ""
@@ -5274,69 +5489,76 @@
 msgid "SQLite database running\n"
 msgstr ""
 
-#: src/pt/gnunet-daemon-pt.c:483
+#: src/pt/gnunet-daemon-pt.c:482
 #, 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:489
+#: src/pt/gnunet-daemon-pt.c:488
 #, fuzzy
 msgid "# DNS requests mapped to VPN"
 msgstr "# byte mottogs via TCP"
 
-#: src/pt/gnunet-daemon-pt.c:542
+#: src/pt/gnunet-daemon-pt.c:541
 msgid "# DNS records modified"
 msgstr ""
 
-#: src/pt/gnunet-daemon-pt.c:718
+#: src/pt/gnunet-daemon-pt.c:717
 msgid "# DNS replies intercepted"
 msgstr ""
 
-#: src/pt/gnunet-daemon-pt.c:724
+#: src/pt/gnunet-daemon-pt.c:723
 #, 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:827
+#: src/pt/gnunet-daemon-pt.c:826
 #, fuzzy
 msgid "# DNS requests dropped (timeout)"
 msgstr "Nätverksannonsering avstängd i konfigurationen!\n"
 
-#: src/pt/gnunet-daemon-pt.c:884
+#: src/pt/gnunet-daemon-pt.c:883
 #, fuzzy
 msgid "# DNS requests intercepted"
 msgstr "# byte mottogs via TCP"
 
-#: src/pt/gnunet-daemon-pt.c:889
-msgid "# DNS requests dropped (DNS mesh tunnel down)"
-msgstr ""
+#: src/pt/gnunet-daemon-pt.c:888
+#, fuzzy
+msgid "# DNS requests dropped (DNS mesh channel down)"
+msgstr "# byte mottogs via TCP"
 
-#: src/pt/gnunet-daemon-pt.c:897
+#: src/pt/gnunet-daemon-pt.c:896
 #, fuzzy
 msgid "# DNS requests dropped (malformed)"
 msgstr "# byte mottogs via TCP"
 
-#: src/pt/gnunet-daemon-pt.c:970
+#: src/pt/gnunet-daemon-pt.c:969
 #, fuzzy
 msgid "# DNS replies received"
 msgstr "# byte mottogs via TCP"
 
-#: src/pt/gnunet-daemon-pt.c:986
+#: src/pt/gnunet-daemon-pt.c:985
 #, fuzzy
 msgid "# DNS replies dropped (too late?)"
 msgstr "# byte mottagna av typen %d"
 
-#: 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
+#: src/pt/gnunet-daemon-pt.c:1261 src/pt/gnunet-daemon-pt.c:1270
+#: src/pt/gnunet-daemon-pt.c:1290 src/pt/gnunet-daemon-pt.c:1301
+#: src/pt/gnunet-daemon-pt.c:1310
 #, 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:1348
+#: src/pt/gnunet-daemon-pt.c:1347
 msgid "Daemon to run to perform IP protocol translation to GNUnet"
 msgstr ""
 
+#: src/regex/gnunet-daemon-regexprofiler.c:270
+#: src/regex/gnunet-regex-simulation-profiler.c:659
+#, fuzzy, c-format
+msgid "%s service is lacking key configuration settings (%s).  Exiting.\n"
+msgstr "GNUnet-konfiguration"
+
 #: src/regex/gnunet-daemon-regexprofiler.c:380
 msgid "Daemon to announce regular expressions for the peer using mesh."
 msgstr ""
@@ -5488,94 +5710,112 @@
 "Testing and revoking at the same time is not allowed, only executing test.\n"
 msgstr ""
 
-#: src/revocation/gnunet-revocation.c:451
+#: src/revocation/gnunet-revocation.c:436
+#, fuzzy
+msgid "No filename to store revocation certificate given.\n"
+msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
+
+#: src/revocation/gnunet-revocation.c:458
 #, 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
+#: src/revocation/gnunet-revocation.c:483
 #, fuzzy
 msgid "No action specified. Nothing to do.\n"
 msgstr "Inget tabellnamn angivet, använder \"%s\".\n"
 
-#: src/revocation/gnunet-revocation.c:492
+#: src/revocation/gnunet-revocation.c:499
 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 "
+#: src/revocation/gnunet-revocation.c:502
+msgid ""
+"revoke the private key associated for the 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"
+#: src/revocation/gnunet-revocation.c:505
+msgid "actually perform revocation, otherwise we just do the precomputation"
 msgstr ""
 
-#: src/revocation/gnunet-revocation.c:501
+#: src/revocation/gnunet-revocation.c:508
 msgid "test if the public key KEY has been revoked"
 msgstr ""
 
-#: src/revocation/gnunet-service-revocation.c:250
+#: src/revocation/gnunet-service-revocation.c:272
 msgid "Duplicate revocation received from peer. Ignored.\n"
 msgstr ""
 
-#: src/revocation/gnunet-service-revocation.c:599
+#: src/revocation/gnunet-service-revocation.c:434
+#, c-format
+msgid "Error computing revocation set union with %s\n"
+msgstr ""
+
+#: src/revocation/gnunet-service-revocation.c:486
+msgid "SET service crashed, terminating revocation service\n"
+msgstr ""
+
+#: src/revocation/gnunet-service-revocation.c:812
 #, fuzzy
 msgid "Could not open revocation database file!"
 msgstr "Kunde inte ansluta till gnunetd.\n"
 
-#: src/scalarproduct/gnunet-scalarproduct.c:194
+#: src/scalarproduct/gnunet-scalarproduct.c:225
 #, 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:200
+#: src/scalarproduct/gnunet-scalarproduct.c:232
 msgid "This program needs a session identifier for comparing vectors.\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-scalarproduct.c:206
+#: src/scalarproduct/gnunet-scalarproduct.c:239
 msgid "Please give a session key for --input_key!\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-scalarproduct.c:215
+#: src/scalarproduct/gnunet-scalarproduct.c:251
 #, 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:239
-#: src/scalarproduct/gnunet-scalarproduct.c:297
+#: src/scalarproduct/gnunet-scalarproduct.c:276
 #, fuzzy, c-format
 msgid "Could not convert `%s' to int32_t.\n"
 msgstr "Kunde inte ansluta till gnunetd.\n"
 
-#: src/scalarproduct/gnunet-scalarproduct.c:246
+#: src/scalarproduct/gnunet-scalarproduct.c:284
 msgid "Need elements to compute the vectorproduct, got none.\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-scalarproduct.c:347
+#: src/scalarproduct/gnunet-scalarproduct.c:336
+#, fuzzy, c-format
+msgid "Could not convert `%s' to integer.\n"
+msgstr "Kunde inte ansluta till gnunetd.\n"
+
+#: src/scalarproduct/gnunet-scalarproduct.c:397
 msgid ""
 "A comma separated list of elements to compare as vector with our remote peer."
 msgstr ""
 
-#: src/scalarproduct/gnunet-scalarproduct.c:350
+#: src/scalarproduct/gnunet-scalarproduct.c:400
 msgid ""
 "A comma separated mask to select which elements should actually be compared."
 msgstr ""
 
-#: src/scalarproduct/gnunet-scalarproduct.c:353
+#: src/scalarproduct/gnunet-scalarproduct.c:403
 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:356
+#: src/scalarproduct/gnunet-scalarproduct.c:406
 msgid "Transaction ID shared with peer."
 msgstr ""
 
-#: src/scalarproduct/gnunet-scalarproduct.c:365
+#: src/scalarproduct/gnunet-scalarproduct.c:415
 msgid "Calculate the Vectorproduct with a GNUnet peer."
 msgstr ""
 
@@ -5584,142 +5824,143 @@
 msgid "Generated key set with key length %d bits.\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:775
+#: src/scalarproduct/gnunet-service-scalarproduct.c:776
 #, fuzzy, c-format
 msgid "Client (%p) disconnected from us.\n"
 msgstr "\"%s\" ansluten till \"%s\".\n"
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:847
-#: src/scalarproduct/gnunet-service-scalarproduct.c:936
+#: src/scalarproduct/gnunet-service-scalarproduct.c:848
+#: src/scalarproduct/gnunet-service-scalarproduct.c:938
 #, 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:853
+#: src/scalarproduct/gnunet-service-scalarproduct.c:854
 #, c-format
 msgid "Sending session-end notification to client (%p) for session %s\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:946
+#: src/scalarproduct/gnunet-service-scalarproduct.c:948
 #, c-format
 msgid "Sent result to client (%p), this session (%s) has ended!\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1025
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1163
+#: src/scalarproduct/gnunet-service-scalarproduct.c:1027
+#: src/scalarproduct/gnunet-service-scalarproduct.c:1165
 msgid "Could not send service-response message via mesh!)\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1376
+#: src/scalarproduct/gnunet-service-scalarproduct.c:1391
 #, c-format
 msgid "Failed to communicate with `%s', scalar product calculation aborted.\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1476
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1603
+#: src/scalarproduct/gnunet-service-scalarproduct.c:1495
+#: src/scalarproduct/gnunet-service-scalarproduct.c:1622
 #, fuzzy
 msgid "Transmitting service request.\n"
 msgstr "Startade samling \"%s\".\n"
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1485
+#: src/scalarproduct/gnunet-service-scalarproduct.c:1504
 #, fuzzy
-msgid "Could not send service-request multipart message to tunnel!\n"
+msgid "Could not send service-request multipart message to channel!\n"
 msgstr "Kunde inte skicka begäran till gnunetd.\n"
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1525
+#: src/scalarproduct/gnunet-service-scalarproduct.c:1544
 #, fuzzy, c-format
-msgid "Successfully created new tunnel to peer (%s)!\n"
+msgid "Successfully created new channel to peer (%s)!\n"
 msgstr "Åtkomst nekad för \"%s\" vid %s:%d.\n"
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1612
+#: src/scalarproduct/gnunet-service-scalarproduct.c:1631
 #, fuzzy
-msgid "Could not send message to tunnel!\n"
+msgid "Could not send message to channel!\n"
 msgstr "Kunde inte skicka begäran till gnunetd.\n"
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1669
+#: src/scalarproduct/gnunet-service-scalarproduct.c:1688
 #, fuzzy
 msgid "Too short message received from client!\n"
 msgstr "Meddelande mottaget från klient är ogiltig.\n"
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1682
+#: src/scalarproduct/gnunet-service-scalarproduct.c:1701
 #, fuzzy
 msgid "Invalid message received from client, session information incorrect!\n"
 msgstr "Ogiltigt meddelande mottogs den %s:%d."
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1693
+#: src/scalarproduct/gnunet-service-scalarproduct.c:1712
 #, c-format
 msgid ""
 "Duplicate session information received, cannot create new session with key `"
 "%s'\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1713
+#: src/scalarproduct/gnunet-service-scalarproduct.c:1733
 #, c-format
 msgid ""
-"Got client-request-session with key %s, preparing tunnel to remote service.\n"
+"Got client-request-session with key %s, preparing channel to remote "
+"service.\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1749
+#: src/scalarproduct/gnunet-service-scalarproduct.c:1772
 #, c-format
-msgid "Creating new tunnel for session with key %s.\n"
+msgid "Creating new channel for session with key %s.\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1794
+#: src/scalarproduct/gnunet-service-scalarproduct.c:1819
 #, 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:1802
+#: src/scalarproduct/gnunet-service-scalarproduct.c:1830
 #, 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:1828
+#: src/scalarproduct/gnunet-service-scalarproduct.c:1860
 #, fuzzy, c-format
-msgid "New incoming tunnel from peer %s.\n"
+msgid "New incoming channel from peer %s.\n"
 msgstr "\"%s\" ansluten till \"%s\".\n"
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1859
+#: src/scalarproduct/gnunet-service-scalarproduct.c:1892
 #, c-format
 msgid "Peer disconnected, terminating session %s with peer (%s)\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:2047
-#: src/scalarproduct/gnunet-service-scalarproduct.c:2196
+#: src/scalarproduct/gnunet-service-scalarproduct.c:2083
+#: src/scalarproduct/gnunet-service-scalarproduct.c:2242
 #, c-format
 msgid "Got session with key %s and a matching element set, processing.\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:2054
-#: src/scalarproduct/gnunet-service-scalarproduct.c:2203
+#: src/scalarproduct/gnunet-service-scalarproduct.c:2092
+#: src/scalarproduct/gnunet-service-scalarproduct.c:2249
 #, c-format
 msgid "Got session with key %s without a matching element set, queueing.\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:2142
+#: src/scalarproduct/gnunet-service-scalarproduct.c:2187
 #, c-format
 msgid ""
 "Got message with duplicate session key (`%s'), ignoring service request.\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:2425
+#: src/scalarproduct/gnunet-service-scalarproduct.c:2471
 msgid "Shutting down, initiating cleanup.\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:2490
+#: src/scalarproduct/gnunet-service-scalarproduct.c:2536
 msgid "Generating Paillier-Keyset.\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:2505
+#: src/scalarproduct/gnunet-service-scalarproduct.c:2551
 #, fuzzy
 msgid "Connect to MESH failed\n"
 msgstr " Anslutning misslyckades (fel?)\n"
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:2509
+#: src/scalarproduct/gnunet-service-scalarproduct.c:2555
 #, fuzzy
 msgid "Mesh initialized\n"
 msgstr " Anslutning misslyckades\n"
@@ -5752,6 +5993,11 @@
 msgid "Failed to send a message to the scalarproduct service\n"
 msgstr "Misslyckades att ansluta till gnunetd.\n"
 
+#: src/set/gnunet-service-set.c:1399
+#, fuzzy
+msgid "Could not connect to mesh service\n"
+msgstr "Kunde inte ansluta till gnunetd.\n"
+
 #: src/set/gnunet-set-ibf-profiler.c:221
 #, fuzzy
 msgid "number of element in set A-B"
@@ -5891,16 +6137,16 @@
 "Cannot open %s for writing load statistics.  Not logging load statistics\n"
 msgstr ""
 
-#: src/testbed/gnunet-service-testbed_peers.c:1012
+#: src/testbed/gnunet-service-testbed_peers.c:1015
 #, fuzzy
 msgid "Misconfiguration (can't connect to the ARM service)"
 msgstr "Misslyckades att ansluta till gnunetd.\n"
 
-#: src/testbed/gnunet-service-testbed_peers.c:1018
+#: src/testbed/gnunet-service-testbed_peers.c:1021
 msgid "Request doesn't fit into a message"
 msgstr ""
 
-#: src/testbed/gnunet-service-testbed_peers.c:1056
+#: src/testbed/gnunet-service-testbed_peers.c:1059
 #, c-format
 msgid "%s service can't be started because ARM is shutting down"
 msgstr ""
@@ -6016,44 +6262,44 @@
 "free topology cannot be more than %u.  Given `%s = %llu'"
 msgstr ""
 
-#: src/testbed/testbed_api_topology.c:716
+#: src/testbed/testbed_api_topology.c:715
 #, fuzzy, c-format
 msgid "Topology file %s not found\n"
 msgstr "\"%s\" misslyckades: tabell hittades inte!\n"
 
-#: src/testbed/testbed_api_topology.c:722
+#: src/testbed/testbed_api_topology.c:721
 #, c-format
 msgid "Topology file %s has no data\n"
 msgstr ""
 
-#: src/testbed/testbed_api_topology.c:729
+#: src/testbed/testbed_api_topology.c:728
 #, c-format
 msgid "Topology file %s cannot be read\n"
 msgstr ""
 
-#: src/testbed/testbed_api_topology.c:751
+#: src/testbed/testbed_api_topology.c:750
 #, fuzzy, c-format
 msgid "Failed to read peer index from toology file: %s"
 msgstr "Kunde inte tolka konfigurationsfil \"%s\".\n"
 
-#: src/testbed/testbed_api_topology.c:760
-#: src/testbed/testbed_api_topology.c:784
+#: src/testbed/testbed_api_topology.c:759
+#: src/testbed/testbed_api_topology.c:783
 #, c-format
 msgid "Value in given topology file: %s out of range\n"
 msgstr ""
 
-#: src/testbed/testbed_api_topology.c:766
-#: src/testbed/testbed_api_topology.c:790
+#: src/testbed/testbed_api_topology.c:765
+#: src/testbed/testbed_api_topology.c:789
 #, fuzzy, c-format
 msgid "Failed to read peer index from topology file: %s"
 msgstr "Kunde inte tolka konfigurationsfil \"%s\".\n"
 
-#: src/testbed/testbed_api_topology.c:772
-#: src/testbed/testbed_api_topology.c:796
+#: src/testbed/testbed_api_topology.c:771
+#: src/testbed/testbed_api_topology.c:795
 msgid "Topology file needs more peers than given ones\n"
 msgstr ""
 
-#: src/testbed/testbed_api_topology.c:811
+#: src/testbed/testbed_api_topology.c:810
 #, fuzzy, c-format
 msgid "Ignoring to connect peer %u to peer %u\n"
 msgstr "Kan inte ansluta till %u.%u.%u.%u:%u: %s\n"
@@ -6102,7 +6348,7 @@
 msgid "Hostkeys file not found: %s\n"
 msgstr ""
 
-#: src/testing/testing.c:293
+#: src/testing/testing.c:293 src/util/gnunet-ecc.c:217
 #, c-format
 msgid "Incorrect hostkey file format: %s\n"
 msgstr ""
@@ -6144,17 +6390,17 @@
 msgid "Failed to write hostkey file for peer %u: %s\n"
 msgstr "Kunde inte skapa användarkonto:"
 
-#: src/testing/testing.c:1235
+#: src/testing/testing.c:1238
 #, 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:1335
+#: src/testing/testing.c:1340
 #, fuzzy, c-format
 msgid "Failed to start `%s': %s\n"
 msgstr "Fel vid %s:%d.\n"
 
-#: src/testing/testing.c:1699
+#: src/testing/testing.c:1704
 #, fuzzy, c-format
 msgid "Failed to load configuration from %s\n"
 msgstr "Kunde inte spara konfigurationsfil \"%s\":"
@@ -6241,56 +6487,57 @@
 msgid "# disconnects due to blacklist"
 msgstr ""
 
-#: src/transport/gnunet-service-transport.c:163
+#: src/transport/gnunet-service-transport.c:160
 #, fuzzy
-msgid "# bytes payload discarded due to not connected peer "
+msgid "# bytes payload discarded due to not connected peer"
 msgstr "Nätverksannonsering avstängd i konfigurationen!\n"
 
-#: src/transport/gnunet-service-transport.c:229
+#: src/transport/gnunet-service-transport.c:250
 #, fuzzy
 msgid "# bytes total received"
 msgstr "# byte krypterade"
 
-#: src/transport/gnunet-service-transport.c:277
+#: src/transport/gnunet-service-transport.c:325
 #, fuzzy
 msgid "# bytes payload received"
 msgstr "# byte dekrypterade"
 
-#: src/transport/gnunet-service-transport.c:429
+#: src/transport/gnunet-service-transport.c:479
 #, 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:479
+#: src/transport/gnunet-service-transport.c:529
 #, 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:760
-msgid "Transport service is lacking key configuration settings.  Exiting.\n"
-msgstr ""
+#: src/transport/gnunet-service-transport.c:820
+#, fuzzy
+msgid "Transport service is lacking key configuration settings. Exiting.\n"
+msgstr "GNUnet-konfiguration"
 
-#: src/transport/gnunet-service-transport_clients.c:389
+#: src/transport/gnunet-service-transport_clients.c:384
 #, c-format
 msgid "Dropping message of type %u and size %u, have %u/%u messages pending\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_clients.c:394
+#: src/transport/gnunet-service-transport_clients.c:391
 msgid "# messages dropped due to slow client"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_clients.c:536
+#: src/transport/gnunet-service-transport_clients.c:533
 #, c-format
 msgid "Rejecting control connection from peer `%s', which is not me!\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_clients.c:672
+#: src/transport/gnunet-service-transport_clients.c:674
 msgid "# bytes payload dropped (other peer was not connected)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_clients.c:728
+#: src/transport/gnunet-service-transport_clients.c:731
 #, fuzzy
 msgid "# REQUEST CONNECT messages received"
 msgstr "# krypterade PONG-meddelanden mottagna"
@@ -6299,115 +6546,155 @@
 msgid "# refreshed my HELLO"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1080
+#: src/transport/gnunet-service-transport_neighbours.c:1074
 #, fuzzy
 msgid "# DISCONNECT messages sent"
 msgstr "# krypterade PONG-meddelanden mottagna"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1210
-#: src/transport/gnunet-service-transport_neighbours.c:1545
+#: src/transport/gnunet-service-transport_neighbours.c:1206
+#: src/transport/gnunet-service-transport_neighbours.c:1541
 msgid "# bytes in message queue for other peers"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1215
+#: src/transport/gnunet-service-transport_neighbours.c:1211
 #, fuzzy
 msgid "# messages transmitted to other peers"
 msgstr "# byte skickade av typen %d"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1220
+#: src/transport/gnunet-service-transport_neighbours.c:1216
 #, fuzzy
 msgid "# transmission failures for messages to other peers"
 msgstr "# byte skickade av typen %d"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1277
+#: src/transport/gnunet-service-transport_neighbours.c:1273
 msgid "# messages timed out while in transport queue"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1319
+#: src/transport/gnunet-service-transport_neighbours.c:1315
 #, fuzzy
 msgid "# keepalives sent"
 msgstr "# sessionsnycklar skickade"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1343
+#: src/transport/gnunet-service-transport_neighbours.c:1339
 #, fuzzy
 msgid "# KEEPALIVE messages discarded (peer unknown)"
 msgstr "Nätverksannonsering avstängd i konfigurationen!\n"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1351
+#: src/transport/gnunet-service-transport_neighbours.c:1347
 #, fuzzy
 msgid "# KEEPALIVE messages discarded (no session)"
 msgstr "Nätverksannonsering avstängd i konfigurationen!\n"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1384
+#: src/transport/gnunet-service-transport_neighbours.c:1380
 #, fuzzy
 msgid "# KEEPALIVE_RESPONSE messages discarded (not connected)"
 msgstr "Nätverksannonsering avstängd i konfigurationen!\n"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1393
+#: src/transport/gnunet-service-transport_neighbours.c:1389
 #, fuzzy
 msgid "# KEEPALIVE_RESPONSE messages discarded (not expected)"
 msgstr "Nätverksannonsering avstängd i konfigurationen!\n"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1450
+#: src/transport/gnunet-service-transport_neighbours.c:1446
 #, 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:1484
+#: src/transport/gnunet-service-transport_neighbours.c:1480
 msgid "# bandwidth quota violations by other peers"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1500
+#: src/transport/gnunet-service-transport_neighbours.c:1496
 msgid "# ms throttling suggested"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:2775
+#: src/transport/gnunet-service-transport_neighbours.c:1585
 #, fuzzy
+msgid "# SESSION_CONNECT messages sent"
+msgstr "# krypterade PONG-meddelanden mottagna"
+
+#: src/transport/gnunet-service-transport_neighbours.c:1601
+#, fuzzy, c-format
+msgid "Failed to transmit CONNECT message via plugin to %s\n"
+msgstr "Misslyckades att initiera tjänsten \"%s\".\n"
+
+#: src/transport/gnunet-service-transport_neighbours.c:1641
+#, fuzzy
+msgid "# CONNECT_ACK messages sent"
+msgstr "# krypterade PONG-meddelanden mottagna"
+
+#: src/transport/gnunet-service-transport_neighbours.c:2106
+#, fuzzy
+msgid "# CONNECT messages received"
+msgstr "# krypterade PONG-meddelanden mottagna"
+
+#: src/transport/gnunet-service-transport_neighbours.c:2111
+#, c-format
+msgid "CONNECT request from peer `%s' ignored due impending shutdown\n"
+msgstr ""
+
+#: src/transport/gnunet-service-transport_neighbours.c:2824
+#, fuzzy
+msgid "# CONNECT_ACK messages received"
+msgstr "# krypterade PONG-meddelanden mottagna"
+
+#: src/transport/gnunet-service-transport_neighbours.c:2832
+#, fuzzy
 msgid "# unexpected CONNECT_ACK messages (no peer)"
 msgstr "skicka ANTAL meddelanden"
 
-#: src/transport/gnunet-service-transport_neighbours.c:2790
-#: src/transport/gnunet-service-transport_neighbours.c:2821
+#: src/transport/gnunet-service-transport_neighbours.c:2847
+#: src/transport/gnunet-service-transport_neighbours.c:2882
 #, fuzzy
 msgid "# unexpected CONNECT_ACK messages (not ready)"
 msgstr "skicka ANTAL meddelanden"
 
-#: src/transport/gnunet-service-transport_neighbours.c:2834
+#: src/transport/gnunet-service-transport_neighbours.c:2895
 #, fuzzy
 msgid "# unexpected CONNECT_ACK messages (waiting on ATS)"
 msgstr "skicka ANTAL meddelanden"
 
-#: src/transport/gnunet-service-transport_neighbours.c:2865
+#: src/transport/gnunet-service-transport_neighbours.c:2926
 #, fuzzy
 msgid "# unexpected CONNECT_ACK messages (disconnecting)"
 msgstr "skicka ANTAL meddelanden"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3045
+#: src/transport/gnunet-service-transport_neighbours.c:3106
 #, fuzzy
-msgid "# unexpected SESSION ACK messages"
+msgid "# SESSION_ACK messages received"
+msgstr "# krypterade PONG-meddelanden mottagna"
+
+#: src/transport/gnunet-service-transport_neighbours.c:3122
+#, fuzzy
+msgid "# unexpected SESSION_ACK messages"
 msgstr "# krypterade PONG-meddelanden skickade"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3098
+#: src/transport/gnunet-service-transport_neighbours.c:3176
 msgid "# SET QUOTA messages ignored (no such peer)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3112
+#: src/transport/gnunet-service-transport_neighbours.c:3190
 msgid "# disconnects due to quota of 0"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3143
+#: src/transport/gnunet-service-transport_neighbours.c:3220
 msgid "# disconnect messages ignored (old format)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3154
+#: src/transport/gnunet-service-transport_neighbours.c:3226
+#, fuzzy
+msgid "# DISCONNECT messages received"
+msgstr "# krypterade PONG-meddelanden mottagna"
+
+#: src/transport/gnunet-service-transport_neighbours.c:3235
 msgid "# disconnect messages ignored (timestamp)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3193
+#: src/transport/gnunet-service-transport_neighbours.c:3271
 msgid "# other peer asked to disconnect from us"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3288
+#: src/transport/gnunet-service-transport_neighbours.c:3366
 #, fuzzy
 msgid "# disconnected from peer upon explicit request"
 msgstr "# av anslutna parter"
@@ -6424,11 +6711,12 @@
 #: src/transport/gnunet-service-transport_plugins.c:210
 #: src/transport/gnunet-service-transport_plugins.c:218
 #: src/transport/gnunet-service-transport_plugins.c:226
+#: src/transport/gnunet-service-transport_plugins.c:234
 #, fuzzy, c-format
 msgid "Missing function `%s' in transport plugin for `%s'\n"
 msgstr "Kunde inte slå upp \"%s\": %s\n"
 
-#: src/transport/gnunet-service-transport_plugins.c:233
+#: src/transport/gnunet-service-transport_plugins.c:241
 #, c-format
 msgid "Did not load plugin `%s' due to missing functions\n"
 msgstr ""
@@ -6437,72 +6725,89 @@
 msgid "# address records discarded"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:519
+#: src/transport/gnunet-service-transport_validation.c:526
 #, 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:577
+#: src/transport/gnunet-service-transport_validation.c:584
 #, fuzzy
 msgid "# PING without HELLO messages sent"
 msgstr "# PING-meddelanden i klartext skickade"
 
-#: src/transport/gnunet-service-transport_validation.c:662
+#: src/transport/gnunet-service-transport_validation.c:685
 msgid "# address revalidations started"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:933
+#: src/transport/gnunet-service-transport_validation.c:969
 #, fuzzy
 msgid "# PING message for different peer received"
 msgstr "# PING-meddelanden skapade"
 
-#: src/transport/gnunet-service-transport_validation.c:992
+#: src/transport/gnunet-service-transport_validation.c:1019
+#, c-format
+msgid "Plugin `%s' not available, cannot confirm having this address\n"
+msgstr ""
+
+#: src/transport/gnunet-service-transport_validation.c:1029
 msgid "# failed address checks during validation"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1002
+#: src/transport/gnunet-service-transport_validation.c:1032
+#, c-format
+msgid "Address `%s' is not one of my addresses, not confirming PING\n"
+msgstr ""
+
+#: src/transport/gnunet-service-transport_validation.c:1040
 msgid "# successful address checks during validation"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1021
+#: src/transport/gnunet-service-transport_validation.c:1052
 #, c-format
+msgid ""
+"Not confirming PING from peer `%s' with address `%s' since I cannot confirm "
+"having this address.\n"
+msgstr ""
+
+#: src/transport/gnunet-service-transport_validation.c:1060
+#, c-format
 msgid "Received a PING message with validation bug from `%s'\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1075
+#: src/transport/gnunet-service-transport_validation.c:1114
 #, 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:1124
+#: src/transport/gnunet-service-transport_validation.c:1163
 msgid "# PONGs unicast via reliable transport"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1133
+#: src/transport/gnunet-service-transport_validation.c:1172
 msgid "# PONGs multicast to all available addresses"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1260
+#: src/transport/gnunet-service-transport_validation.c:1312
 msgid "# PONGs dropped, no matching pending validation"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1275
+#: src/transport/gnunet-service-transport_validation.c:1327
 msgid "# PONGs dropped, signature expired"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1381
+#: src/transport/gnunet-service-transport_validation.c:1448
 #, 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:259
+#: src/transport/gnunet-transport.c:258
 #, 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:266
+#: src/transport/gnunet-transport.c:265
 #, c-format
 msgid "Received %llu bytes/s (%llu bytes in %s)\n"
 msgstr ""
@@ -6522,128 +6827,128 @@
 msgid "Failed to list connections, timeout occured\n"
 msgstr "Misslyckades att ansluta till gnunetd.\n"
 
-#: src/transport/gnunet-transport.c:422
+#: src/transport/gnunet-transport.c:423
 msgid "No transport plugins configured, peer will never communicate\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:435
+#: src/transport/gnunet-transport.c:436
 #, c-format
 msgid "No port configured for plugin `%s', cannot test it\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:499
+#: src/transport/gnunet-transport.c:506
 #, 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:522
+#: src/transport/gnunet-transport.c:529
 #, fuzzy, c-format
 msgid "Successfully connected to `%s'\n"
 msgstr "Åtkomst nekad för \"%s\" vid %s:%d.\n"
 
-#: src/transport/gnunet-transport.c:545
+#: src/transport/gnunet-transport.c:552
 #, c-format
 msgid ""
 "Successfully connected to `%s', starting to send benchmark data in %u Kb "
 "blocks\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:580
+#: src/transport/gnunet-transport.c:587
 #, fuzzy, c-format
 msgid "Disconnected from peer `%s' while benchmarking\n"
 msgstr "\"%s\" ansluten till \"%s\".\n"
 
-#: src/transport/gnunet-transport.c:650
+#: src/transport/gnunet-transport.c:660
 #, c-format
 msgid "Received %u bytes from %s\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:673
+#: src/transport/gnunet-transport.c:685
 #, fuzzy, c-format
 msgid "Peer `%s': %s %s\n"
 msgstr "Jag är ändpunkt \"%s\".\n"
 
-#: src/transport/gnunet-transport.c:688
+#: src/transport/gnunet-transport.c:704
 #, c-format
 msgid "Peer `%s': %s <unable to resolve address>\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:752
+#: src/transport/gnunet-transport.c:772
 #, fuzzy, c-format
 msgid "Peer `%s' disconnected\n"
 msgstr "# av anslutna parter"
 
-#: src/transport/gnunet-transport.c:780
+#: src/transport/gnunet-transport.c:802
 #, fuzzy
 msgid "Failed to send connect request to transport service\n"
 msgstr "Misslyckades att ansluta till gnunetd.\n"
 
-#: src/transport/gnunet-transport.c:825
+#: src/transport/gnunet-transport.c:848
 #, c-format
 msgid ""
 "Multiple operations given. Please choose only one operation: %s, %s, %s, %s, "
 "%s, %s\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:831
+#: src/transport/gnunet-transport.c:855
 #, c-format
 msgid ""
 "No operation given. Please choose one operation: %s, %s, %s, %s, %s, %s\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:851 src/transport/gnunet-transport.c:881
-#: src/transport/gnunet-transport.c:903 src/transport/gnunet-transport.c:940
+#: src/transport/gnunet-transport.c:878 src/transport/gnunet-transport.c:910
+#: src/transport/gnunet-transport.c:932 src/transport/gnunet-transport.c:969
 #, fuzzy
 msgid "Failed to connect to transport service\n"
 msgstr "Misslyckades att ansluta till gnunetd.\n"
 
-#: src/transport/gnunet-transport.c:858 src/transport/gnunet-transport.c:888
+#: src/transport/gnunet-transport.c:887 src/transport/gnunet-transport.c:917
 #, fuzzy
 msgid "Failed to send request to transport service\n"
 msgstr "Misslyckades att ansluta till gnunetd.\n"
 
-#: src/transport/gnunet-transport.c:908
+#: src/transport/gnunet-transport.c:937
 msgid "Starting to receive benchmark data\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:990
+#: src/transport/gnunet-transport.c:1019
 msgid "measure how fast we are receiving data from all peers (until CTRL-C)"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:993
+#: src/transport/gnunet-transport.c:1022
 #, fuzzy
 msgid "connect to a peer"
 msgstr "Misslyckades att ansluta till gnunetd.\n"
 
-#: src/transport/gnunet-transport.c:996
+#: src/transport/gnunet-transport.c:1025
 #, fuzzy
 msgid "provide information about all current connections (once)"
 msgstr "Skriv ut information om GNUnets motparter."
 
-#: src/transport/gnunet-transport.c:1002
+#: src/transport/gnunet-transport.c:1031
 #, fuzzy
 msgid ""
 "provide information about all connects and disconnect events (continuously)"
 msgstr "Skriv ut information om GNUnets motparter."
 
-#: src/transport/gnunet-transport.c:1005
+#: src/transport/gnunet-transport.c:1034
 #, fuzzy
 msgid "do not resolve hostnames"
 msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 
-#: src/transport/gnunet-transport.c:1008
+#: src/transport/gnunet-transport.c:1037
 msgid "peer identity"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1012
+#: src/transport/gnunet-transport.c:1041
 msgid "send data for benchmarking to the other peer (until CTRL-C)"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1015
+#: src/transport/gnunet-transport.c:1044
 msgid "test transport configuration (involves external server)"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1026
+#: src/transport/gnunet-transport.c:1055
 #, fuzzy
 msgid "Direct access to transport service."
 msgstr "Misslyckades att ansluta till gnunetd.\n"
@@ -6659,7 +6964,7 @@
 
 #: src/transport/plugin_transport_bluetooth.c:681
 #: src/transport/plugin_transport_bluetooth.c:731
-#: src/transport/plugin_transport_bluetooth.c:1837
+#: src/transport/plugin_transport_bluetooth.c:1854
 #, fuzzy
 msgid "# Bluetooth sessions allocated"
 msgstr "# sessionsnycklar accepterade"
@@ -6675,421 +6980,389 @@
 
 #: src/transport/plugin_transport_bluetooth.c:938
 #: src/transport/plugin_transport_bluetooth.c:1023
-#: src/transport/plugin_transport_bluetooth.c:1839
+#: src/transport/plugin_transport_bluetooth.c:1856
 #, fuzzy
 msgid "# Bluetooth MAC endpoints allocated"
 msgstr "# byte mottogs via TCP"
 
-#: src/transport/plugin_transport_bluetooth.c:1218
+#: src/transport/plugin_transport_bluetooth.c:1235
 #, fuzzy
 msgid "# HELLO messages received via Bluetooth"
 msgstr "# krypterade PONG-meddelanden mottagna"
 
-#: src/transport/plugin_transport_bluetooth.c:1244
+#: src/transport/plugin_transport_bluetooth.c:1261
 #, fuzzy
 msgid "# fragments received via Bluetooth"
 msgstr "# byte mottogs via TCP"
 
-#: src/transport/plugin_transport_bluetooth.c:1254
+#: src/transport/plugin_transport_bluetooth.c:1271
 #, fuzzy
 msgid "# ACKs received via Bluetooth"
 msgstr "# byte mottogs via TCP"
 
-#: src/transport/plugin_transport_bluetooth.c:1311
+#: src/transport/plugin_transport_bluetooth.c:1328
 #, fuzzy
 msgid "# Bluetooth DATA messages discarded due to CRC32 error"
 msgstr "Nätverksannonsering avstängd i konfigurationen!\n"
 
-#: src/transport/plugin_transport_bluetooth.c:1423
+#: src/transport/plugin_transport_bluetooth.c:1440
 #, fuzzy
 msgid "# DATA messages received via Bluetooth"
 msgstr "# krypterade PONG-meddelanden mottagna"
 
-#: src/transport/plugin_transport_bluetooth.c:1458
+#: src/transport/plugin_transport_bluetooth.c:1475
 #, fuzzy
 msgid "# Bluetooth DATA messages processed"
 msgstr "# krypterade PONG-meddelanden mottagna"
 
-#: src/transport/plugin_transport_bluetooth.c:1521
+#: src/transport/plugin_transport_bluetooth.c:1538
 #, fuzzy
 msgid "# HELLO beacons sent via Bluetooth"
 msgstr "# byte skickade via UDP"
 
-#: src/transport/plugin_transport_bluetooth.c:1634
+#: src/transport/plugin_transport_bluetooth.c:1651
 msgid "Bluetooth address with invalid size encountered\n"
 msgstr ""
 
-#: src/transport/plugin_transport_bluetooth.c:1818
+#: src/transport/plugin_transport_bluetooth.c:1835
 #, 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: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: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: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: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:2530
+#: src/transport/plugin_transport_http_client.c:1590
 #, 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: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:2721
-#, fuzzy
-msgid "Port is required! Fix in configuration\n"
-msgstr " gconfig\tGTK-konfiguration\n"
-
-#: src/transport/plugin_transport_http.c:1155
-msgid "Port 0, client only mode\n"
-msgstr ""
-
-#: src/transport/plugin_transport_http.c:1175
-#, c-format
-msgid ""
-"Specific IPv4 address `%s' for plugin %s in configuration file is invalid! "
-"Binding to all addresses!\n"
-msgstr ""
-
-#: src/transport/plugin_transport_http.c:1204
-#, c-format
-msgid ""
-"Specific IPv6 address `%s' for plugin %s in configuration file is invalid! "
-"Binding to all addresses!\n"
-msgstr ""
-
-#: src/transport/plugin_transport_http.c:1221
-#: src/transport/plugin_transport_http_server.c:2836
-#, fuzzy, c-format
-msgid "Using external hostname `%s'\n"
-msgstr "Startade samling \"%s\".\n"
-
-#: src/transport/plugin_transport_http.c:1226
-msgid "No external hostname configured\n"
-msgstr ""
-
-#: 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:1723
-#: src/transport/plugin_transport_http_server.c:2966
+#: src/transport/plugin_transport_http_client.c:1727
+#: src/transport/plugin_transport_http_server.c:2974
 #, fuzzy, c-format
 msgid "Shutting down plugin `%s'\n"
 msgstr "Testar transport(er) %s\n"
 
-#: src/transport/plugin_transport_http_client.c:1748
-#: src/transport/plugin_transport_http_server.c:3026
+#: src/transport/plugin_transport_http_client.c:1752
+#: src/transport/plugin_transport_http_server.c:3032
 #, 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:1776
-#: src/transport/plugin_transport_http_server.c:2866
+#: src/transport/plugin_transport_http_client.c:1780
+#: src/transport/plugin_transport_http_server.c:2874
 #, 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:1381
+#: src/transport/plugin_transport_http_server.c:1389
 #, 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:1646
+#: src/transport/plugin_transport_http_server.c:1653
 #, c-format
 msgid "Accepting connection (%u of %u) from `%s'\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:1654
+#: src/transport/plugin_transport_http_server.c:1661
 #, c-format
 msgid ""
 "Server reached maximum number connections (%u), rejecting new connection\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:1941
+#: src/transport/plugin_transport_http_server.c:1947
 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:1965
+#: src/transport/plugin_transport_http_server.c:1971
 #, c-format
 msgid "No usable TLS certificate found and creating one at `%s/%s' failed!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:2689
+#: src/transport/plugin_transport_http_server.c:2378
+#, fuzzy
+msgid "Require valid port number for service in configuration!\n"
+msgstr "Inga applikationer definierade i konfiguration!\n"
+
+#: src/transport/plugin_transport_http_server.c:2410 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_server.c:2427 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_server.c:2538
 #, c-format
+msgid "Found %u addresses to report to NAT service\n"
+msgstr ""
+
+#: src/transport/plugin_transport_http_server.c:2610
+msgid "Disabling IPv6 since it is not supported on this system!\n"
+msgstr ""
+
+#: src/transport/plugin_transport_http_server.c:2697
+#, c-format
 msgid "IPv4 support is %s\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:2703
+#: src/transport/plugin_transport_http_server.c:2711
 #, c-format
 msgid "IPv6 support is %s\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:2728
+#: src/transport/plugin_transport_http_server.c:2718
+msgid "Neither IPv4 nor IPv6 are enabled! Fix in configuration\n"
+msgstr ""
+
+#: src/transport/plugin_transport_http_server.c:2729
+#, fuzzy
+msgid "Port is required! Fix in configuration\n"
+msgstr " gconfig\tGTK-konfiguration\n"
+
+#: src/transport/plugin_transport_http_server.c:2736
 #, fuzzy, c-format
 msgid "Using port %u\n"
 msgstr "Testar transport(er) %s\n"
 
-#: src/transport/plugin_transport_http_server.c:2743
+#: src/transport/plugin_transport_http_server.c:2751
 #, 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:2753
+#: src/transport/plugin_transport_http_server.c:2761
 #, fuzzy, c-format
 msgid "Binding to IPv4 address %s\n"
 msgstr "Ogiltigt svar på \"%s\".\n"
 
-#: src/transport/plugin_transport_http_server.c:2774
+#: src/transport/plugin_transport_http_server.c:2782
 #, 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:2784
+#: src/transport/plugin_transport_http_server.c:2792
 #, fuzzy, c-format
 msgid "Binding to IPv6 address %s\n"
 msgstr "Ogiltigt svar på \"%s\".\n"
 
-#: src/transport/plugin_transport_http_server.c:2852
+#: src/transport/plugin_transport_http_server.c:2844
 #, fuzzy, c-format
+msgid "Using external hostname `%s'\n"
+msgstr "Startade samling \"%s\".\n"
+
+#: src/transport/plugin_transport_http_server.c:2860
+#, fuzzy, c-format
 msgid "Notifying transport only about hostname `%s'\n"
 msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 
-#: src/transport/plugin_transport_smtp.c:370
+#: src/transport/plugin_transport_smtp.c:223
 #, fuzzy, c-format
 msgid "Received malformed message via %s. Ignored.\n"
 msgstr "Mottog ogiltigt \"%s\" meddelande från \"%s\".\n"
 
 # capped är inte ett bra ord IMHO
-#: src/transport/plugin_transport_smtp.c:457
+#: src/transport/plugin_transport_smtp.c:310
 #, fuzzy
 msgid "SMTP filter string to invalid, lacks ': '\n"
 msgstr "SMTP-filtersträng för lång, kapad till \"%s\"\n"
 
 # capped är inte ett bra ord IMHO
-#: src/transport/plugin_transport_smtp.c:466
+#: src/transport/plugin_transport_smtp.c:319
 #, c-format
 msgid "SMTP filter string to long, capped to `%s'\n"
 msgstr "SMTP-filtersträng för lång, kapad till \"%s\"\n"
 
-#: src/transport/plugin_transport_smtp.c:561
-#: src/transport/plugin_transport_smtp.c:571
-#: src/transport/plugin_transport_smtp.c:584
-#: src/transport/plugin_transport_smtp.c:603
-#: src/transport/plugin_transport_smtp.c:626
-#: src/transport/plugin_transport_smtp.c:634
-#: src/transport/plugin_transport_smtp.c:647
-#: src/transport/plugin_transport_smtp.c:658
+#: src/transport/plugin_transport_smtp.c:414
+#: src/transport/plugin_transport_smtp.c:424
+#: src/transport/plugin_transport_smtp.c:437
+#: src/transport/plugin_transport_smtp.c:456
+#: src/transport/plugin_transport_smtp.c:479
+#: src/transport/plugin_transport_smtp.c:487
+#: src/transport/plugin_transport_smtp.c:500
+#: src/transport/plugin_transport_smtp.c:511
 #, fuzzy, c-format
 msgid "SMTP: `%s' failed: %s.\n"
 msgstr "\"%s\" %s misslyckades: %s\n"
 
-#: src/transport/plugin_transport_smtp.c:799
+#: src/transport/plugin_transport_smtp.c:652
 msgid "No email-address specified, can not start SMTP transport.\n"
 msgstr ""
 
-#: src/transport/plugin_transport_smtp.c:811
+#: src/transport/plugin_transport_smtp.c:664
 #, fuzzy
 msgid "# bytes received via SMTP"
 msgstr "# byte mottogs via TCP"
 
-#: src/transport/plugin_transport_smtp.c:812
+#: src/transport/plugin_transport_smtp.c:665
 #, fuzzy
 msgid "# bytes sent via SMTP"
 msgstr "# byte skickades via TCP"
 
-#: src/transport/plugin_transport_smtp.c:814
+#: src/transport/plugin_transport_smtp.c:667
 #, fuzzy
 msgid "# bytes dropped by SMTP (outgoing)"
 msgstr "# byte kastade via TCP (utgående)"
 
-#: src/transport/plugin_transport_tcp.c:626
+#: src/transport/plugin_transport_tcp.c:632
 #, c-format
 msgid "Unexpected address length: %u bytes\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:834
-#: 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:1206
-#: src/transport/plugin_transport_tcp.c:1223
+#: src/transport/plugin_transport_tcp.c:842
+#: src/transport/plugin_transport_tcp.c:931
+#: src/transport/plugin_transport_tcp.c:981
+#: src/transport/plugin_transport_tcp.c:1077
+#: src/transport/plugin_transport_tcp.c:1225
+#: src/transport/plugin_transport_tcp.c:1242
 #, 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:2015
-#: src/transport/plugin_transport_tcp.c:2696
+#: src/transport/plugin_transport_tcp.c:849
+#: src/transport/plugin_transport_tcp.c:1043
+#: src/transport/plugin_transport_tcp.c:2041
+#: src/transport/plugin_transport_tcp.c:2721
 #, fuzzy
 msgid "# TCP sessions active"
 msgstr "# sessionsnycklar accepterade"
 
-#: src/transport/plugin_transport_tcp.c:927
+#: src/transport/plugin_transport_tcp.c:935
 #, fuzzy
 msgid "# bytes discarded by TCP (timeout)"
 msgstr "# byte kastade via TCP (utgående)"
 
-#: src/transport/plugin_transport_tcp.c:976
+#: src/transport/plugin_transport_tcp.c:984
 #, fuzzy
 msgid "# bytes transmitted via TCP"
 msgstr "# byte skickade av typen %d"
 
-#: src/transport/plugin_transport_tcp.c:1063
+#: src/transport/plugin_transport_tcp.c:1081
 #, fuzzy
 msgid "# bytes discarded by TCP (disconnect)"
 msgstr "# byte kastade via TCP (utgående)"
 
-#: src/transport/plugin_transport_tcp.c:1180
+#: src/transport/plugin_transport_tcp.c:1199
 #, c-format
 msgid "Trying to send with invalid session %p\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:1417
-#: src/transport/plugin_transport_udp.c:1440
+#: src/transport/plugin_transport_tcp.c:1440
+#: src/transport/plugin_transport_udp.c:1471
 msgid "# requests to create session with invalid address"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:1534
+#: src/transport/plugin_transport_tcp.c:1558
 msgid "# transport-service disconnect requests for TCP"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2065
+#: src/transport/plugin_transport_tcp.c:2091
 #, fuzzy
 msgid "# TCP WELCOME messages received"
 msgstr "# krypterade PONG-meddelanden mottagna"
 
-#: src/transport/plugin_transport_tcp.c:2248
+#: src/transport/plugin_transport_tcp.c:2274
 msgid "# bytes received via TCP"
 msgstr "# byte mottogs via TCP"
 
-#: src/transport/plugin_transport_tcp.c:2328
+#: src/transport/plugin_transport_tcp.c:2354
 msgid "# network-level TCP disconnect events"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2576 src/util/service.c:589
+#: src/transport/plugin_transport_tcp.c:2602 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:2590
+#: src/transport/plugin_transport_tcp.c:2616
 #, fuzzy
 msgid "Failed to start service.\n"
 msgstr "Misslyckades att starta samling.\n"
 
-#: src/transport/plugin_transport_tcp.c:2683
+#: src/transport/plugin_transport_tcp.c:2710
 #, c-format
 msgid "TCP transport listening on port %llu\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2687
+#: src/transport/plugin_transport_tcp.c:2713
 msgid "TCP transport not listening on any port (client only)\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2691
+#: src/transport/plugin_transport_tcp.c:2716
 #, c-format
 msgid "TCP transport advertises itself as being on port %llu\n"
 msgstr ""
 
-#: src/transport/plugin_transport_udp_broadcasting.c:134
+#: src/transport/plugin_transport_udp_broadcasting.c:173
 #, fuzzy
 msgid "# IPv6 multicast HELLO beacons received via udp"
 msgstr "# krypterade PONG-meddelanden mottagna"
 
-#: src/transport/plugin_transport_udp_broadcasting.c:184
+#: src/transport/plugin_transport_udp_broadcasting.c:222
 #, fuzzy
 msgid "# IPv4 broadcast HELLO beacons received via udp"
 msgstr "# krypterade PONG-meddelanden mottagna"
 
-#: src/transport/plugin_transport_udp_broadcasting.c:402
+#: src/transport/plugin_transport_udp_broadcasting.c:605
 msgid ""
 "Disabling HELLO broadcasting due to friend-to-friend only configuration!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_udp_broadcasting.c:419
+#: src/transport/plugin_transport_udp_broadcasting.c:619
 #, c-format
 msgid "Failed to set IPv4 broadcast option for broadcast socket on port %d\n"
 msgstr ""
 
-#: src/transport/plugin_transport_udp.c:1550
+#: src/transport/plugin_transport_udp.c:1581
 #, 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:2602
+#: src/transport/plugin_transport_udp.c:2635
 #, 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:2616
-#, c-format
+#: src/transport/plugin_transport_udp.c:2649
 msgid ""
-"UDP could not transmit message to `%s': Please check your network "
-"configuration and disable IPv6 if your connection does not have a global "
-"IPv6 address\n"
+"UDP could not transmit IPv6 message! Please check your network configuration "
+"and disable IPv6 if your connection does not have a global IPv6 address\n"
 msgstr ""
 
-#: src/transport/plugin_transport_udp.c:2917
+#: src/transport/plugin_transport_udp.c:2949
 #, fuzzy
 msgid "Failed to open UDP sockets\n"
 msgstr "Misslyckades att binda till UDP6-port %d.\n"
 
-#: src/transport/plugin_transport_udp.c:3015
+#: src/transport/plugin_transport_udp.c:3046
 #, c-format
 msgid "Given `%s' option is out of range: %llu > %u\n"
 msgstr ""
 
-#: src/transport/plugin_transport_udp.c:3058
+#: src/transport/plugin_transport_udp.c:3089
 #, fuzzy, c-format
 msgid "Invalid IPv6 address: `%s'\n"
 msgstr "Ogiltigt svar på \"%s\".\n"
 
-#: src/transport/plugin_transport_udp.c:3117
+#: src/transport/plugin_transport_udp.c:3148
 #, fuzzy
 msgid "Failed to create network sockets, plugin failed\n"
 msgstr "Kunde inte skapa namnrymd \"%s\" (existerar?).\n"
 
-#: src/transport/plugin_transport_unix.c:1627
+#: src/transport/plugin_transport_unix.c:1625
 #, fuzzy
 msgid "Failed to open UNIX listen socket\n"
 msgstr "Misslyckades att leverera \"%s\" meddelande.\n"
@@ -7103,74 +7376,74 @@
 msgid "# WLAN messages defragmented"
 msgstr "# PING-meddelanden skapade"
 
-#: src/transport/plugin_transport_wlan.c:688
-#: src/transport/plugin_transport_wlan.c:758
-#: src/transport/plugin_transport_wlan.c:1903
+#: src/transport/plugin_transport_wlan.c:691
+#: src/transport/plugin_transport_wlan.c:763
+#: src/transport/plugin_transport_wlan.c:1910
 #, fuzzy
 msgid "# WLAN sessions allocated"
 msgstr "# sessionsnycklar accepterade"
 
-#: src/transport/plugin_transport_wlan.c:863
+#: src/transport/plugin_transport_wlan.c:868
 #, fuzzy
 msgid "# WLAN message fragments sent"
 msgstr "# byte mottogs via TCP"
 
-#: src/transport/plugin_transport_wlan.c:887
+#: src/transport/plugin_transport_wlan.c:892
 msgid "# WLAN messages pending (with fragmentation)"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:995
-#: src/transport/plugin_transport_wlan.c:1080
-#: src/transport/plugin_transport_wlan.c:1905
+#: src/transport/plugin_transport_wlan.c:1000
+#: src/transport/plugin_transport_wlan.c:1086
+#: src/transport/plugin_transport_wlan.c:1912
 #, fuzzy
 msgid "# WLAN MAC endpoints allocated"
 msgstr "# byte mottogs via TCP"
 
-#: src/transport/plugin_transport_wlan.c:1275
+#: src/transport/plugin_transport_wlan.c:1282
 #, fuzzy
 msgid "# HELLO messages received via WLAN"
 msgstr "# krypterade PONG-meddelanden mottagna"
 
-#: src/transport/plugin_transport_wlan.c:1301
+#: src/transport/plugin_transport_wlan.c:1308
 #, fuzzy
 msgid "# fragments received via WLAN"
 msgstr "# byte mottogs via TCP"
 
-#: src/transport/plugin_transport_wlan.c:1311
+#: src/transport/plugin_transport_wlan.c:1318
 #, fuzzy
 msgid "# ACKs received via WLAN"
 msgstr "# byte mottogs via TCP"
 
-#: src/transport/plugin_transport_wlan.c:1368
+#: src/transport/plugin_transport_wlan.c:1375
 #, fuzzy
 msgid "# WLAN DATA messages discarded due to CRC32 error"
 msgstr "Nätverksannonsering avstängd i konfigurationen!\n"
 
-#: src/transport/plugin_transport_wlan.c:1489
+#: src/transport/plugin_transport_wlan.c:1496
 #, fuzzy
 msgid "# DATA messages received via WLAN"
 msgstr "# krypterade PONG-meddelanden mottagna"
 
-#: src/transport/plugin_transport_wlan.c:1524
+#: src/transport/plugin_transport_wlan.c:1531
 #, fuzzy
 msgid "# WLAN DATA messages processed"
 msgstr "# krypterade PONG-meddelanden mottagna"
 
-#: src/transport/plugin_transport_wlan.c:1587
+#: src/transport/plugin_transport_wlan.c:1594
 #, fuzzy
 msgid "# HELLO beacons sent via WLAN"
 msgstr "# byte skickade via UDP"
 
-#: src/transport/plugin_transport_wlan.c:1700
+#: src/transport/plugin_transport_wlan.c:1707
 msgid "WLAN address with invalid size encountered\n"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:1884
+#: src/transport/plugin_transport_wlan.c:1891
 #, c-format
 msgid "Helper binary `%s' not SUID, cannot run WLAN transport\n"
 msgstr ""
 
-#: src/transport/transport_api.c:647
+#: src/transport/transport_api.c:682
 #, 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"
@@ -7237,17 +7510,17 @@
 msgid "Need a non-empty hostname for service `%s'.\n"
 msgstr ""
 
-#: src/util/client.c:991
+#: src/util/client.c:989
 #, fuzzy, c-format
 msgid "Could not connect to service `%s', configuration broken.\n"
 msgstr "Kunde inte ansluta till gnunetd.\n"
 
-#: src/util/client.c:1003
+#: src/util/client.c:1001
 #, 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:1274
+#: src/util/client.c:1284
 msgid "Could not submit request, not expecting to receive a response.\n"
 msgstr ""
 
@@ -7316,17 +7589,17 @@
 "choices\n"
 msgstr ""
 
-#: src/util/configuration.c:1065
+#: src/util/configuration.c:1066
 #, c-format
 msgid "Recursive expansion suspected, aborting $-expansion for term `%s'\n"
 msgstr ""
 
-#: src/util/configuration.c:1097
+#: src/util/configuration.c:1098
 #, fuzzy, c-format
 msgid "Missing closing `%s' in option `%s'\n"
 msgstr "Konfigurationsfil \"%s\" skapad.\n"
 
-#: src/util/configuration.c:1170
+#: src/util/configuration.c:1172
 #, c-format
 msgid ""
 "Failed to expand `%s' in `%s' as it is neither found in [PATHS] nor defined "
@@ -7366,72 +7639,67 @@
 "%llu)\n"
 msgstr ""
 
-#: src/util/crypto_ecc.c:940 src/util/crypto_ecc.c:978
-#: src/util/crypto_ecc.c:1096 src/util/crypto_ecc.c:1134
+#: src/util/crypto_ecc.c:789 src/util/crypto_ecc.c:827
+#: src/util/crypto_ecc.c:945 src/util/crypto_ecc.c:983
 #, 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:945 src/util/crypto_ecc.c:1101
+#: src/util/crypto_ecc.c:794 src/util/crypto_ecc.c:950
 #, 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:982 src/util/crypto_ecc.c:1138
+#: src/util/crypto_ecc.c:831 src/util/crypto_ecc.c:987
 msgid "This may be ok if someone is currently generating a private key.\n"
 msgstr ""
 
-#: src/util/crypto_ecc.c:1012 src/util/crypto_ecc.c:1168
+#: src/util/crypto_ecc.c:861 src/util/crypto_ecc.c:1017
 #, 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:1016 src/util/crypto_ecc.c:1172
+#: src/util/crypto_ecc.c:865 src/util/crypto_ecc.c:1021
 msgid "This may be ok if someone is currently generating a key.\n"
 msgstr ""
 
-#: src/util/crypto_ecc.c:1254
+#: src/util/crypto_ecc.c:1103
 #, fuzzy
 msgid "Could not load peer's private key\n"
 msgstr "Kunde inte tolka konfigurationsfil \"%s\".\n"
 
-#: src/util/crypto_ecc.c:1343
+#: src/util/crypto_ecc.c:1207
 #, 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:1393
+#: src/util/crypto_ecc.c:1257
 #, 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
+#: src/util/crypto_ecc.c:1331
 #, 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
+#: src/util/crypto_ecc.c:1388
 #, fuzzy, c-format
 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:320
+#: src/util/crypto_random.c:280
 #, c-format
-msgid "Starting `%s' process to generate entropy\n"
-msgstr ""
-
-#: 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:1185
+#: src/util/disk.c:1184
 #, 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:1543 src/util/service.c:1315
+#: src/util/disk.c:1546 src/util/service.c:1315
 #, fuzzy, c-format
 msgid "Cannot obtain information about user `%s': %s\n"
 msgstr "Kan inte öppna konfigurationsfil \"%s\".\n"
@@ -7546,54 +7814,81 @@
 msgid "Manipulate GNUnet configuration files"
 msgstr "skriv ut ett värde från konfigurationsfilen till standard ut"
 
-#: src/util/gnunet-ecc.c:60
+#: src/util/gnunet-ecc.c:75
 #, fuzzy, c-format
 msgid "Failed to open `%s': %s\n"
 msgstr "Misslyckades att leverera \"%s\" meddelande.\n"
 
-#: src/util/gnunet-ecc.c:66
+#: src/util/gnunet-ecc.c:81
 #, c-format
 msgid "Generating %u keys, please wait"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:82
+#: src/util/gnunet-ecc.c:97
 #, fuzzy, c-format
 msgid ""
 "\n"
 "Failed to write to `%s': %s\n"
 msgstr "Fel vid %s:%d.\n"
 
-#: src/util/gnunet-ecc.c:92
+#: src/util/gnunet-ecc.c:107
 #, fuzzy, c-format
 msgid ""
 "\n"
 "Finished!\n"
 msgstr "Slutför"
 
-#: src/util/gnunet-ecc.c:95
+#: src/util/gnunet-ecc.c:110
 #, c-format
 msgid ""
 "\n"
 "Error, %u keys not generated\n"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:119
+#: src/util/gnunet-ecc.c:199
+#, fuzzy, c-format
+msgid "Hostkeys file `%s' not found\n"
+msgstr "\"%s\" misslyckades: tabell hittades inte!\n"
+
+#: src/util/gnunet-ecc.c:210
+#, fuzzy, c-format
+msgid "Hostkeys file `%s' is empty\n"
+msgstr "antal meddelanden att använda per iteration"
+
+#: src/util/gnunet-ecc.c:232
+#, fuzzy, c-format
+msgid "Could not read hostkey file: %s\n"
+msgstr "Kunde inte skapa värdnyckel!\n"
+
+#: src/util/gnunet-ecc.c:286
 msgid "No hostkey file specified on command line\n"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:168
+#: src/util/gnunet-ecc.c:341
+msgid "list keys included in a file (for testing)"
+msgstr ""
+
+#: src/util/gnunet-ecc.c:344
+msgid "number of keys to list included in a file (for testing)"
+msgstr ""
+
+#: src/util/gnunet-ecc.c:347
 msgid "create COUNT public-private key pairs (for testing)"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:171
+#: src/util/gnunet-ecc.c:350
 msgid "print the public key in ASCII format"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:174
+#: src/util/gnunet-ecc.c:353
 msgid "print the hash of the public key in ASCII format"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:185
+#: src/util/gnunet-ecc.c:356
+msgid "print examples of ECC operations (used for compatibility testing)"
+msgstr ""
+
+#: src/util/gnunet-ecc.c:367
 #, fuzzy
 msgid "Manipulate GNUnet private ECC key files"
 msgstr "skriv ut ett värde från konfigurationsfilen till standard ut"
@@ -7617,27 +7912,27 @@
 msgid "Could not find IP of host `%s': %s\n"
 msgstr ""
 
-#: src/util/gnunet-uri.c:90
+#: src/util/gnunet-uri.c:84
 #, c-format
 msgid "No URI specified on command line\n"
 msgstr ""
 
-#: src/util/gnunet-uri.c:95
+#: src/util/gnunet-uri.c:89
 #, fuzzy, c-format
 msgid "Invalid URI: does not start with `%s'\n"
 msgstr "Ogiltig nätverksnotation (slutar inte med \";\": \"%s\")\n"
 
-#: src/util/gnunet-uri.c:102
+#: src/util/gnunet-uri.c:96
 #, c-format
 msgid "Invalid URI: fails to specify subsystem\n"
 msgstr ""
 
-#: src/util/gnunet-uri.c:112
+#: src/util/gnunet-uri.c:106
 #, c-format
 msgid "No handler known for subsystem `%s'\n"
 msgstr ""
 
-#: src/util/gnunet-uri.c:174
+#: src/util/gnunet-uri.c:168
 msgid "Perform default-actions for GNUnet URIs"
 msgstr ""
 
@@ -7674,18 +7969,18 @@
 "variable.\n"
 msgstr ""
 
-#: src/util/os_installation.c:710
+#: src/util/os_installation.c:713
 #, 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:770
+#: src/util/os_installation.c:773
 #, 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:780
+#: src/util/os_installation.c:783
 #, c-format
 msgid "GetExitCodeProcess failed for binary %s (%d).\n"
 msgstr ""
@@ -7695,26 +7990,36 @@
 msgid "Initialization of plugin mechanism failed: %s!\n"
 msgstr "Initiering av insticksmekanism misslyckades: %s!\n"
 
-#: src/util/plugin.c:144
+#: src/util/plugin.c:148
 #, 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:217
+#: src/util/plugin.c:223
 #, 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:347
+#: src/util/plugin.c:382
 #, fuzzy
 msgid "Could not determine plugin installation path.\n"
 msgstr "Kunde inte fastställa min publika IPv6-adress.\n"
 
-#: src/util/program.c:262 src/util/service.c:1452
+#: src/util/program.c:260 src/util/service.c:1449
 #, fuzzy, c-format
+msgid "Malformed configuration file `%s', exit ...\n"
+msgstr "Kunde inte spara konfigurationsfil \"%s\":"
+
+#: src/util/program.c:270 src/util/service.c:1464
+#, fuzzy, c-format
 msgid "Could not access configuration file `%s'\n"
 msgstr "Kunde inte tolka konfigurationsfil \"%s\".\n"
 
+#: src/util/program.c:275 src/util/service.c:1459
+#, fuzzy
+msgid "Malformed configuration, exit ...\n"
+msgstr "Kunde inte spara konfigurationsfil \"%s\":"
+
 #: src/util/resolver_api.c:198
 #, fuzzy, c-format
 msgid "Must specify `%s' for `%s' in configuration!\n"
@@ -7743,11 +8048,11 @@
 msgid "Could not resolve our FQDN : %s\n"
 msgstr "Kunde inte slå upp \"%s\": %s\n"
 
-#: src/util/scheduler.c:804
+#: src/util/scheduler.c:813
 msgid "Looks like we're busy waiting...\n"
 msgstr ""
 
-#: src/util/scheduler.c:938
+#: src/util/scheduler.c:948
 #, c-format
 msgid "Attempt to cancel dead task %llu!\n"
 msgstr ""
@@ -7862,7 +8167,7 @@
 msgid "do daemonize (detach from terminal)"
 msgstr ""
 
-#: src/util/signal.c:79
+#: src/util/signal.c:89
 #, fuzzy, c-format
 msgid "signal (%d, %p) returned %d.\n"
 msgstr "Anrop till \"%s\" returnerade %d.\n"
@@ -7871,121 +8176,121 @@
 msgid "b"
 msgstr "b"
 
-#: src/util/strings.c:444
+#: src/util/strings.c:450
 #, c-format
 msgid "Character sets requested were `%s'->`%s'\n"
 msgstr ""
 
-#: src/util/strings.c:572
+#: src/util/strings.c:578
 msgid "Failed to expand `$HOME': environment variable `HOME' not set"
 msgstr ""
 
-#: src/util/strings.c:669
+#: src/util/strings.c:675
 msgid "µs"
 msgstr ""
 
-#: src/util/strings.c:673
+#: src/util/strings.c:679
 msgid "forever"
 msgstr ""
 
-#: src/util/strings.c:675
+#: src/util/strings.c:681
 msgid "0 ms"
 msgstr ""
 
-#: src/util/strings.c:681
+#: src/util/strings.c:687
 msgid "ms"
 msgstr "ms"
 
-#: src/util/strings.c:687
+#: src/util/strings.c:693
 msgid "s"
 msgstr "s"
 
-#: src/util/strings.c:693
+#: src/util/strings.c:699
 msgid "m"
 msgstr "m"
 
-#: src/util/strings.c:699
+#: src/util/strings.c:705
 msgid "h"
 msgstr "h"
 
-#: src/util/strings.c:706
+#: src/util/strings.c:712
 #, fuzzy
 msgid "day"
 msgstr " dagar"
 
-#: src/util/strings.c:708
+#: src/util/strings.c:714
 #, fuzzy
 msgid "days"
 msgstr " dagar"
 
-#: src/util/strings.c:737
+#: src/util/strings.c:743
 msgid "end of time"
 msgstr ""
 
-#: src/util/strings.c:1141
+#: src/util/strings.c:1149
 msgid "IPv6 address did not start with `['\n"
 msgstr ""
 
-#: src/util/strings.c:1149
+#: src/util/strings.c:1157
 msgid "IPv6 address did contain ':' to separate port number\n"
 msgstr ""
 
-#: src/util/strings.c:1155
+#: src/util/strings.c:1163
 msgid "IPv6 address did contain ']' before ':' to separate port number\n"
 msgstr ""
 
-#: src/util/strings.c:1162
+#: src/util/strings.c:1170
 msgid "IPv6 address did contain a valid port number after the last ':'\n"
 msgstr ""
 
-#: src/util/strings.c:1171
+#: src/util/strings.c:1179
 #, fuzzy, c-format
 msgid "Invalid IPv6 address `%s': %s\n"
 msgstr "Ogiltigt svar på \"%s\".\n"
 
-#: src/util/strings.c:1377 src/util/strings.c:1393
+#: src/util/strings.c:1385 src/util/strings.c:1401
 msgid "Port not in range\n"
 msgstr ""
 
-#: src/util/strings.c:1402
+#: src/util/strings.c:1410
 #, 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
+#: src/util/strings.c:1493 src/util/strings.c:1524 src/util/strings.c:1572
+#: src/util/strings.c:1593
 #, c-format
 msgid "Invalid format for IP: `%s'\n"
 msgstr "Ogiltigt format för IP: \"%s\"\n"
 
-#: src/util/strings.c:1543
+#: src/util/strings.c:1550
 #, 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
+#: src/util/strings.c:1602
 #, fuzzy, c-format
 msgid "Invalid format: `%s'\n"
 msgstr "Ogiltigt format för IP: \"%s\"\n"
 
-#: src/util/strings.c:1647
+#: src/util/strings.c:1654
 #, 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
+#: src/util/strings.c:1704
 #, 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
+#: src/util/strings.c:1735
 #, 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
+#: src/vpn/gnunet-service-vpn.c:550 src/vpn/gnunet-service-vpn.c:1086
 #, fuzzy
-msgid "# Active tunnels"
+msgid "# Active channels"
 msgstr "Nätverksanslutning"
 
 #: src/vpn/gnunet-service-vpn.c:642
@@ -7998,103 +8303,103 @@
 msgid "# Bytes dropped in mesh queue (overflow)"
 msgstr "# byte kastade via UDP (utgående)"
 
-#: src/vpn/gnunet-service-vpn.c:754
+#: src/vpn/gnunet-service-vpn.c:753
 #, fuzzy
-msgid "# Mesh tunnels created"
+msgid "# Mesh channels created"
 msgstr "# PING-meddelanden skapade"
 
-#: src/vpn/gnunet-service-vpn.c:786
+#: src/vpn/gnunet-service-vpn.c:784
 #, fuzzy
-msgid "Failed to setup mesh tunnel!\n"
+msgid "Failed to setup mesh channel!\n"
 msgstr "Kunde inte skapa värdnyckel!\n"
 
-#: src/vpn/gnunet-service-vpn.c:980
+#: src/vpn/gnunet-service-vpn.c:978
 #, c-format
 msgid "Protocol %u not supported, dropping\n"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:1307
+#: src/vpn/gnunet-service-vpn.c:1305
 msgid "# ICMPv4 packets dropped (not allowed)"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:1328
+#: src/vpn/gnunet-service-vpn.c:1326
 msgid "# ICMPv6 packets dropped (not allowed)"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:1533
+#: src/vpn/gnunet-service-vpn.c:1531
 #, fuzzy
 msgid "# Packets received from TUN interface"
 msgstr "Meddelande mottaget från klient är ogiltig.\n"
 
-#: src/vpn/gnunet-service-vpn.c:1566 src/vpn/gnunet-service-vpn.c:1602
+#: src/vpn/gnunet-service-vpn.c:1564 src/vpn/gnunet-service-vpn.c:1600
 #, c-format
 msgid "Packet received for unmapped destination `%s' (dropping it)\n"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:1612
+#: src/vpn/gnunet-service-vpn.c:1610
 msgid "Received IPv4 packet with options (dropping it)\n"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:1626
+#: src/vpn/gnunet-service-vpn.c:1624
 #, c-format
 msgid "Received packet of unknown protocol %d from TUN (dropping it)\n"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:1708
+#: src/vpn/gnunet-service-vpn.c:1706
 #, fuzzy
 msgid "# ICMP packets received from mesh"
 msgstr "Meddelande mottaget från klient är ogiltig.\n"
 
-#: src/vpn/gnunet-service-vpn.c:2047
+#: src/vpn/gnunet-service-vpn.c:2045
 #, fuzzy
 msgid "# UDP packets received from mesh"
 msgstr "Meddelande mottaget från klient är ogiltig.\n"
 
-#: src/vpn/gnunet-service-vpn.c:2202
+#: src/vpn/gnunet-service-vpn.c:2200
 #, fuzzy
 msgid "# TCP packets received from mesh"
 msgstr "Meddelande mottaget från klient är ogiltig.\n"
 
-#: src/vpn/gnunet-service-vpn.c:2353
+#: src/vpn/gnunet-service-vpn.c:2351
 msgid "Failed to find unallocated IPv4 address in VPN's range\n"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:2408
+#: src/vpn/gnunet-service-vpn.c:2406
 msgid "Failed to find unallocated IPv6 address in VPN's range\n"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:2449 src/vpn/gnunet-service-vpn.c:2665
+#: src/vpn/gnunet-service-vpn.c:2447 src/vpn/gnunet-service-vpn.c:2663
 #, fuzzy
 msgid "# Active destinations"
 msgstr "Nätverksanslutning"
 
-#: src/vpn/gnunet-service-vpn.c:2717
+#: src/vpn/gnunet-service-vpn.c:2715
 msgid "Failed to allocate IP address for new destination\n"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:2984
+#: src/vpn/gnunet-service-vpn.c:2982
 #, fuzzy
 msgid "Must specify valid IPv6 address"
 msgstr "\"%s\" är inte tillgänglig."
 
-#: src/vpn/gnunet-service-vpn.c:3008
+#: src/vpn/gnunet-service-vpn.c:3006
 msgid "Must specify valid IPv6 mask"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:3016
+#: src/vpn/gnunet-service-vpn.c:3014
 msgid "IPv6 support disabled as this system does not support IPv6\n"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:3029
+#: src/vpn/gnunet-service-vpn.c:3027
 #, fuzzy
 msgid "Must specify valid IPv4 address"
 msgstr "\"%s\" är inte tillgänglig."
 
-#: src/vpn/gnunet-service-vpn.c:3042
+#: src/vpn/gnunet-service-vpn.c:3040
 msgid "Must specify valid IPv4 mask"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:3052
+#: src/vpn/gnunet-service-vpn.c:3050
 msgid "IPv4 support disabled as this system does not support IPv4\n"
 msgstr ""
 
@@ -8183,6 +8488,28 @@
 msgstr "\"%s\" misslyckades för fil \"%s\" vid %s:%d med fel: %s\n"
 
 #, fuzzy
+#~ msgid "Internal error %d\n"
+#~ msgstr "Okänt fel.\n"
+
+#, fuzzy
+#~ msgid "Aborting call to `%s'\n"
+#~ msgstr "Fel vid skapandet av användare"
+
+#, fuzzy
+#~ msgid "You are already in a conversation with `%s'.\n"
+#~ msgstr "Kunde inte tolka konfigurationsfil \"%s\".\n"
+
+#, fuzzy
+#~ msgid "Print information about mesh tunnels and peers."
+#~ msgstr "Skriv ut information om GNUnets motparter."
+
+#, fuzzy
+#~ msgid ""
+#~ "%s service is lacking key configuration settings (%s). Using default "
+#~ "(%u).\n"
+#~ msgstr "GNUnet-konfiguration"
+
+#, fuzzy
 #~ msgid "Loading block plugin `%s'\n"
 #~ msgstr "Testar transport(er) %s\n"
 
@@ -8601,10 +8928,6 @@
 #~ msgstr "Kan inte ändra användare/grupp till \"%s\": %s\n"
 
 #, fuzzy
-#~ msgid "You must specify a nickname\n"
-#~ msgstr "Du måste ange en mottagare!\n"
-
-#, fuzzy
 #~ msgid "Failed to join room `%s'\n"
 #~ msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 
@@ -8721,10 +9044,6 @@
 #~ msgstr "Konfigurationsfil \"%s\" hittades inte.  Kör \"gnunet-setup -d\"!\n"
 
 #, fuzzy
-#~ msgid "Could not read hostkeys file `%s'!\n"
-#~ msgstr "Kunde inte skapa värdnyckel!\n"
-
-#, fuzzy
 #~ msgid "Could not create configuration for peer number %u on `%s'!\n"
 #~ msgstr "Kunde inte komma åt namnrymdsinformation.\n"
 
@@ -8777,10 +9096,6 @@
 #~ msgstr "Kunde inte spara konfigurationsfil \"%s\":"
 
 #, fuzzy
-#~ msgid "Failed to transmit message to `%s' service.\n"
-#~ msgstr "Misslyckades att initiera tjänsten \"%s\".\n"
-
-#, fuzzy
 #~ msgid "Target is %d connections per peer."
 #~ msgstr "Misslyckades att starta samling.\n"
 
@@ -8915,10 +9230,6 @@
 #~ msgstr "Testar transport(er) %s\n"
 
 #, fuzzy
-#~ msgid "# SET QUOTA messages received"
-#~ msgstr "# krypterade PONG-meddelanden mottagna"
-
-#, fuzzy
 #~ msgid "curl failed for `%s' at %s:%d: `%s'\n"
 #~ msgstr "\"%s\" misslyckades vid %s:%d med fel: \"%s\".\n"
 
@@ -8959,10 +9270,6 @@
 #~ msgstr "# PING-meddelanden skapade"
 
 #, fuzzy
-#~ msgid "Failed to connect to core service\n"
-#~ msgstr "Misslyckades att ansluta till gnunetd.\n"
-
-#, fuzzy
 #~ msgid "# bytes successfully transmitted by plugins"
 #~ msgstr "# byte skickade av typen %d"
 

Modified: gnunet/po/vi.po
===================================================================
--- gnunet/po/vi.po     2013-12-12 21:38:43 UTC (rev 31342)
+++ gnunet/po/vi.po     2013-12-12 21:43:39 UTC (rev 31343)
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: gnunet 0.8.0a\n"
 "Report-Msgid-Bugs-To: address@hidden"
-"POT-Creation-Date: 2013-11-05 02:07+0100\n"
+"POT-Creation-Date: 2013-12-12 22:41+0100\n"
 "PO-Revision-Date: 2008-09-10 22:05+0930\n"
 "Last-Translator: Clytie Siddall <address@hidden>\n"
 "Language-Team: Vietnamese <address@hidden>\n"
@@ -38,7 +38,7 @@
 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:216 src/testbed/gnunet-service-testbed_peers.c:1010
+#: src/arm/gnunet-arm.c:216 src/testbed/gnunet-service-testbed_peers.c:1013
 msgid "Message was sent successfully"
 msgstr ""
 
@@ -47,12 +47,12 @@
 msgid "Misconfiguration (can not connect to the ARM service)"
 msgstr "Lỗi kết nối đến gnunetd.\n"
 
-#: src/arm/gnunet-arm.c:220 src/testbed/gnunet-service-testbed_peers.c:1014
+#: src/arm/gnunet-arm.c:220 src/testbed/gnunet-service-testbed_peers.c:1017
 #, fuzzy
 msgid "We disconnected from ARM before we could send a request"
 msgstr "# các yêu cầu lỗ hổng bị bỏ do trọng tải"
 
-#: src/arm/gnunet-arm.c:222 src/testbed/gnunet-service-testbed_peers.c:1016
+#: src/arm/gnunet-arm.c:222 src/testbed/gnunet-service-testbed_peers.c:1019
 msgid "ARM API is busy"
 msgstr ""
 
@@ -60,57 +60,57 @@
 msgid "Request does not fit into a message"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:226 src/testbed/gnunet-service-testbed_peers.c:1020
+#: src/arm/gnunet-arm.c:226 src/testbed/gnunet-service-testbed_peers.c:1023
 #, fuzzy
 msgid "Request timed out"
 msgstr "# các khoá phiên chạy được chấp nhận"
 
-#: src/arm/gnunet-arm.c:228 src/testbed/gnunet-service-testbed_peers.c:1022
+#: src/arm/gnunet-arm.c:228 src/testbed/gnunet-service-testbed_peers.c:1025
 #, fuzzy
 msgid "Unknown request status"
 msgstr "Không rõ người dùng « %s »\n"
 
-#: src/arm/gnunet-arm.c:244 src/testbed/gnunet-service-testbed_peers.c:1038
+#: src/arm/gnunet-arm.c:244 src/testbed/gnunet-service-testbed_peers.c:1041
 #, fuzzy, c-format
 msgid "%s is stopped"
 msgstr "# các byte trong kho dữ liệu"
 
-#: src/arm/gnunet-arm.c:246 src/testbed/gnunet-service-testbed_peers.c:1040
+#: src/arm/gnunet-arm.c:246 src/testbed/gnunet-service-testbed_peers.c:1043
 #, c-format
 msgid "%s is starting"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:248 src/testbed/gnunet-service-testbed_peers.c:1042
+#: src/arm/gnunet-arm.c:248 src/testbed/gnunet-service-testbed_peers.c:1045
 #, c-format
 msgid "%s is stopping"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:250 src/testbed/gnunet-service-testbed_peers.c:1044
+#: src/arm/gnunet-arm.c:250 src/testbed/gnunet-service-testbed_peers.c:1047
 #, fuzzy, c-format
 msgid "%s is starting already"
 msgstr "« %s » đang đăng ký trình điều khiển %d\n"
 
-#: src/arm/gnunet-arm.c:252 src/testbed/gnunet-service-testbed_peers.c:1046
+#: src/arm/gnunet-arm.c:252 src/testbed/gnunet-service-testbed_peers.c:1049
 #, c-format
 msgid "%s is stopping already"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:254 src/testbed/gnunet-service-testbed_peers.c:1048
+#: src/arm/gnunet-arm.c:254 src/testbed/gnunet-service-testbed_peers.c:1051
 #, c-format
 msgid "%s is started already"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:256 src/testbed/gnunet-service-testbed_peers.c:1050
+#: src/arm/gnunet-arm.c:256 src/testbed/gnunet-service-testbed_peers.c:1053
 #, c-format
 msgid "%s is stopped already"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:258 src/testbed/gnunet-service-testbed_peers.c:1052
+#: src/arm/gnunet-arm.c:258 src/testbed/gnunet-service-testbed_peers.c:1055
 #, fuzzy, c-format
 msgid "%s service is not known to ARM"
 msgstr "Không gian tên « %s » có đánh giá %d.\n"
 
-#: src/arm/gnunet-arm.c:260 src/testbed/gnunet-service-testbed_peers.c:1054
+#: src/arm/gnunet-arm.c:260 src/testbed/gnunet-service-testbed_peers.c:1057
 #, fuzzy, c-format
 msgid "%s service failed to start"
 msgstr "Lỗi bắt đầu thu thập.\n"
@@ -120,7 +120,7 @@
 msgid "%s service cannot be started because ARM is shutting down"
 msgstr "« %s » đang tắt.\n"
 
-#: src/arm/gnunet-arm.c:264 src/testbed/gnunet-service-testbed_peers.c:1058
+#: src/arm/gnunet-arm.c:264 src/testbed/gnunet-service-testbed_peers.c:1061
 #, c-format
 msgid "%.s Unknown result code."
 msgstr ""
@@ -144,206 +144,206 @@
 msgid "Failed to stop the ARM service: %s\n"
 msgstr "Lỗi vào phòng « %s »\n"
 
-#: src/arm/gnunet-arm.c:420
+#: src/arm/gnunet-arm.c:421
 #, fuzzy, c-format
 msgid "Failed to send a request to start the `%s' service: %%s\n"
 msgstr "Lỗi kết nối đến gnunetd.\n"
 
-#: src/arm/gnunet-arm.c:429
+#: src/arm/gnunet-arm.c:431
 #, 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:465
+#: src/arm/gnunet-arm.c:468
 #, 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:476
+#: src/arm/gnunet-arm.c:479
 #, 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:512
+#: src/arm/gnunet-arm.c:517
 #, 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:519
+#: src/arm/gnunet-arm.c:525
 #, 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:523
+#: src/arm/gnunet-arm.c:530
 #, fuzzy
 msgid "Running services:\n"
 msgstr "Đang nạp và khởi động dùng « %s ».\n"
 
-#: src/arm/gnunet-arm.c:605
+#: src/arm/gnunet-arm.c:612
 #, c-format
 msgid "Now only monitoring, press CTRL-C to stop.\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:636
+#: src/arm/gnunet-arm.c:643
 #, c-format
 msgid "Stopped %s.\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:639
+#: src/arm/gnunet-arm.c:646
 #, fuzzy, c-format
 msgid "Starting %s...\n"
 msgstr "Đang bắt đầu tài về « %s »\n"
 
-#: src/arm/gnunet-arm.c:642
+#: src/arm/gnunet-arm.c:649
 #, c-format
 msgid "Stopping %s...\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:653
+#: src/arm/gnunet-arm.c:660
 #, 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:717
+#: src/arm/gnunet-arm.c:724
 #, fuzzy
 msgid "stop all GNUnet services"
 msgstr "hủy cài đặt dịch vụ GNUnet"
 
-#: src/arm/gnunet-arm.c:719
+#: src/arm/gnunet-arm.c:726
 msgid "start a particular service"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:721
+#: src/arm/gnunet-arm.c:728
 msgid "stop a particular service"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:723
+#: src/arm/gnunet-arm.c:730
 #, fuzzy
 msgid "start all GNUnet default services"
 msgstr "hủy cài đặt dịch vụ GNUnet"
 
-#: src/arm/gnunet-arm.c:726
+#: src/arm/gnunet-arm.c:733
 #, fuzzy
 msgid "stop and start all GNUnet default services"
 msgstr "hủy cài đặt dịch vụ GNUnet"
 
-#: src/arm/gnunet-arm.c:729
+#: src/arm/gnunet-arm.c:736
 msgid "delete config file and directory on exit"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:732
+#: src/arm/gnunet-arm.c:739
 msgid "monitor ARM activities"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:734
+#: src/arm/gnunet-arm.c:741
 msgid "don't print status messages"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:737
+#: src/arm/gnunet-arm.c:744
 #, 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:739
+#: src/arm/gnunet-arm.c:746
 #, fuzzy
 msgid "list currently running services"
 msgstr "Đang nạp và khởi động dùng « %s ».\n"
 
-#: src/arm/gnunet-arm.c:741
+#: src/arm/gnunet-arm.c:748
 msgid "don't let gnunet-service-arm inherit standard output"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:743
+#: src/arm/gnunet-arm.c:750
 msgid "don't let gnunet-service-arm inherit standard error"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:754
+#: src/arm/gnunet-arm.c:761
 msgid "Control services and the Automated Restart Manager (ARM)"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:268
+#: src/arm/gnunet-service-arm.c:266
 msgid "Could not send status result to client\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:304
+#: src/arm/gnunet-service-arm.c:302
 #, 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:519
+#: src/arm/gnunet-service-arm.c:528
 #, 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:526
+#: src/arm/gnunet-service-arm.c:535
 #, fuzzy, c-format
 msgid "Starting service `%s'\n"
 msgstr "Đang bắt đầu tài về « %s »\n"
 
-#: src/arm/gnunet-service-arm.c:625
+#: src/arm/gnunet-service-arm.c:634
 #, 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:647
+#: src/arm/gnunet-service-arm.c:656
 #, c-format
 msgid "Unable to bind listening socket for service `%s' to address `%s': %s\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:676
+#: src/arm/gnunet-service-arm.c:685
 #, c-format
 msgid "ARM now monitors connections to service `%s' at `%s'\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:809
+#: src/arm/gnunet-service-arm.c:821
 #, 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:1070
+#: src/arm/gnunet-service-arm.c:1085
 #, 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:1163
+#: src/arm/gnunet-service-arm.c:1178
 msgid "exit"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:1168
+#: src/arm/gnunet-service-arm.c:1183
 msgid "signal"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:1173
+#: src/arm/gnunet-service-arm.c:1188
 #, fuzzy
 msgid "unknown"
 msgstr "Lỗi không rõ"
 
-#: src/arm/gnunet-service-arm.c:1179
+#: src/arm/gnunet-service-arm.c:1194
 #, fuzzy, c-format
 msgid "Service `%s' took %s to terminate\n"
 msgstr "Dịch vụ đã bị xoá.\n"
 
-#: src/arm/gnunet-service-arm.c:1201
+#: src/arm/gnunet-service-arm.c:1216
 #, c-format
 msgid "Service `%s' terminated normally, will restart at any time\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:1216
+#: src/arm/gnunet-service-arm.c:1231
 #, c-format
 msgid "Service `%s' terminated with status %s/%d, will restart in %s\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:1463
+#: src/arm/gnunet-service-arm.c:1484
 #, 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:1474
+#: src/arm/gnunet-service-arm.c:1495
 #, c-format
 msgid "Default service `%s' not configured correctly!\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:1488
+#: src/arm/gnunet-service-arm.c:1509
 msgid ""
 "No default services configured, GNUnet will not really start right now.\n"
 msgstr ""
@@ -362,99 +362,99 @@
 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:1475
-#: src/ats/gnunet-service-ats_addresses.c:1519
+#: src/ats/gnunet-service-ats_addresses.c:1946
+#: src/ats/gnunet-service-ats_addresses.c:1990
 #, c-format
 msgid ""
 "Could not load quota for network `%s':  `%s', assigning default bandwidth "
 "%llu\n"
 msgstr ""
 
-#: src/ats/gnunet-service-ats_addresses.c:1482
+#: src/ats/gnunet-service-ats_addresses.c:1953
 #, c-format
 msgid "Outbound quota configure for network `%s' is %llu\n"
 msgstr ""
 
-#: src/ats/gnunet-service-ats_addresses.c:1490
+#: src/ats/gnunet-service-ats_addresses.c:1961
 #, c-format
 msgid ""
 "No outbound quota configured for network `%s', assigning default bandwidth "
 "%llu\n"
 msgstr ""
 
-#: src/ats/gnunet-service-ats_addresses.c:1526
+#: src/ats/gnunet-service-ats_addresses.c:1997
 #, c-format
 msgid "Inbound quota configured for network `%s' is %llu\n"
 msgstr ""
 
-#: src/ats/gnunet-service-ats_addresses.c:1534
+#: src/ats/gnunet-service-ats_addresses.c:2005
 #, c-format
 msgid ""
 "No outbound quota configure for network `%s', assigning default bandwidth "
 "%llu\n"
 msgstr ""
 
-#: src/ats/gnunet-service-ats_addresses.c:1700
+#: src/ats/gnunet-service-ats_addresses.c:2175
 #, c-format
 msgid "Initializing solver `%s '`%s'\n"
 msgstr ""
 
-#: src/ats/gnunet-service-ats_addresses.c:1703
+#: src/ats/gnunet-service-ats_addresses.c:2178
 #, 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
+#: src/ats/gnunet-service-ats_addresses.c:2201
 #, fuzzy
 msgid "Failed to initialize solver!\n"
 msgstr "Không thể sơ khởi SQLite: %s.\n"
 
-#: src/ats/libgnunet_plugin_ats_mlp.c:868
+#: src/ats/plugin_ats_mlp.c:868
 msgid "Problem size too large, cannot allocate memory!\n"
 msgstr ""
 
-#: src/ats/libgnunet_plugin_ats_mlp.c:1239
+#: src/ats/plugin_ats_mlp.c:1281
 #, 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/libgnunet_plugin_ats_mlp.c:1286
+#: src/ats/plugin_ats_mlp.c:1328
 #, c-format
 msgid "Updating address property `%s' for peer `%s' %p not added before\n"
 msgstr ""
 
-#: src/ats/libgnunet_plugin_ats_mlp.c:2010
+#: src/ats/plugin_ats_mlp.c:2059
 #, c-format
 msgid ""
 "Adjusting inconsistent outbound quota configuration for network `%s', is "
 "%llu must be at least %llu\n"
 msgstr ""
 
-#: src/ats/libgnunet_plugin_ats_mlp.c:2018
+#: src/ats/plugin_ats_mlp.c:2067
 #, c-format
 msgid ""
 "Adjusting inconsistent inbound quota configuration for network `%s', is %llu "
 "must be at least %llu\n"
 msgstr ""
 
-#: src/ats/libgnunet_plugin_ats_mlp.c:2028
+#: src/ats/plugin_ats_mlp.c:2077
 #, c-format
 msgid ""
 "Adjusting outbound quota configuration for network `%s'from %llu to %.0f\n"
 msgstr ""
 
-#: src/ats/libgnunet_plugin_ats_mlp.c:2036
+#: src/ats/plugin_ats_mlp.c:2085
 #, c-format
 msgid ""
 "Adjusting inbound quota configuration for network `%s' from %llu to %.0f\n"
 msgstr ""
 
-#: src/ats/libgnunet_plugin_ats_mlp.c:2047
+#: src/ats/plugin_ats_mlp.c:2096
 #, c-format
 msgid "Using default quota configuration for network `%s' (in/out) %llu/%llu\n"
 msgstr ""
 
-#: src/ats/libgnunet_plugin_ats_proportional.c:1438
+#: src/ats/plugin_ats_proportional.c:1514
 #, 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"
@@ -481,13 +481,13 @@
 msgid "Quota for network `%11s' (in/out): %10s / %10s\n"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:347 src/namestore/gnunet-namestore.c:520
-#: src/transport/gnunet-transport.c:807
+#: src/ats-tool/gnunet-ats.c:347 src/namestore/gnunet-namestore.c:547
+#: src/transport/gnunet-transport.c:829
 #, 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:359 src/transport/gnunet-transport.c:816
+#: src/ats-tool/gnunet-ats.c:359 src/transport/gnunet-transport.c:838
 #, fuzzy, c-format
 msgid "Failed to parse peer identity `%s'\n"
 msgstr "Lỗi đọc danh sách bạn bè từ « %s »\n"
@@ -569,222 +569,276 @@
 msgid "Print information about ATS state"
 msgstr "In ra thông tin về các đồng đẳng GNUnet."
 
-#: src/consensus/gnunet-consensus-profiler.c:394
+#: src/consensus/gnunet-consensus-profiler.c:420
 #, fuzzy
 msgid "number of peers in consensus"
 msgstr "số lần lặp lại"
 
-#: src/consensus/gnunet-consensus-profiler.c:397
+#: src/consensus/gnunet-consensus-profiler.c:423
 msgid "how many peers receive one value?"
 msgstr ""
 
-#: src/consensus/gnunet-consensus-profiler.c:400
+#: src/consensus/gnunet-consensus-profiler.c:426
 #: 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:403
+#: src/consensus/gnunet-consensus-profiler.c:429
 #, fuzzy
 msgid "consensus timeout"
 msgstr "# các khoá phiên chạy được chấp nhận"
 
-#: src/consensus/gnunet-consensus-profiler.c:406
+#: src/consensus/gnunet-consensus-profiler.c:432
 msgid "be more verbose (print received values)"
 msgstr ""
 
-#: 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/conversation_api.c:557
+#: src/conversation/conversation_api_call.c:468
+msgid "Connection to conversation service lost, trying to reconnect\n"
+msgstr ""
 
-#: src/conversation/gnunet-conversation.c:186
+#: src/conversation/gnunet-conversation.c:252
 #, c-format
-msgid ""
-"Incoming call from `%s'.\n"
-"Please /accept or /cancel the call.\n"
+msgid "Incoming call from `%s'. Please /accept #%u or /cancel %u the call.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:206
-#: src/conversation/gnunet-conversation.c:315
+#: src/conversation/gnunet-conversation.c:274
 #, c-format
-msgid "Call terminated: %s\n"
+msgid "Call from `%s' terminated\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:226
+#: src/conversation/gnunet-conversation.c:307
 #, c-format
+msgid "Call from `%s' suspended by other user\n"
+msgstr ""
+
+#: src/conversation/gnunet-conversation.c:312
+#, c-format
+msgid "Call from `%s' resumed by other user\n"
+msgstr ""
+
+#: src/conversation/gnunet-conversation.c:330
+#, c-format
 msgid "Ego `%s' no longer available, phone is now down.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:239
+#: src/conversation/gnunet-conversation.c:344
 #, 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
+#: src/conversation/gnunet-conversation.c:357
 #, c-format
 msgid "Phone active on line %u\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:284
-msgid "Resolved address. Now ringing other party.\n"
+#: src/conversation/gnunet-conversation.c:379
+#, c-format
+msgid "Resolved address of `%s'. Now ringing other party.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:290
+#: src/conversation/gnunet-conversation.c:386
 #, fuzzy, c-format
-msgid "Connection established to `%s': %s\n"
+msgid "Connection established to `%s'\n"
 msgstr "%s bị lỗi tại %s:%d: « %s »\n"
 
-#: src/conversation/gnunet-conversation.c:298
+#: src/conversation/gnunet-conversation.c:393
 #, 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"
+#: src/conversation/gnunet-conversation.c:400
+msgid "Call terminated\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:385
+#: src/conversation/gnunet-conversation.c:406
+#, c-format
+msgid "Connection to `%s' suspended (by other user)\n"
+msgstr ""
+
+#: src/conversation/gnunet-conversation.c:412
+#, c-format
+msgid "Connection to `%s' resumed (by other user)\n"
+msgstr ""
+
+#: src/conversation/gnunet-conversation.c:479
 #, 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
+#: src/conversation/gnunet-conversation.c:495
+#: src/conversation/gnunet-conversation.c:509
 #, 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"
+#: src/conversation/gnunet-conversation.c:502
+#: src/conversation/gnunet-conversation.c:552
+msgid "You are calling someone else already, hang up first!\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:424
-#: src/conversation/gnunet-conversation.c:438
+#: src/conversation/gnunet-conversation.c:517
+#: src/conversation/gnunet-conversation.c:565
 #, c-format
-msgid "You are already in a conversation with `%s', refusing to call `%s'.\n"
+msgid "You are answering call from `%s', hang up or suspend that call first!\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"
+#: src/conversation/gnunet-conversation.c:576
+msgid "There is no incoming call to accept here!\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
+#: src/conversation/gnunet-conversation.c:593
 #, c-format
-msgid "You are trying to call `%s', cannot accept incoming calls right now.\n"
+msgid "There is no incoming call `%s' to accept right now!\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:521
+#: src/conversation/gnunet-conversation.c:621
 msgid "We currently do not have an address.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:542
+#: src/conversation/gnunet-conversation.c:644
 #, c-format
 msgid "We are currently trying to locate the private key for the ego `%s'.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:547
+#: src/conversation/gnunet-conversation.c:649
 #, c-format
 msgid "We are listening for incoming calls for ego `%s' on line %u.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:553
+#: src/conversation/gnunet-conversation.c:655
+#: src/conversation/gnunet-conversation.c:679
 #, c-format
-msgid "The phone is rining. `%s' is trying to call us.\n"
+msgid "You are having a conversation with `%s'.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:559
-#, c-format
-msgid "You are having a conversation with `%s'.\n"
+#: src/conversation/gnunet-conversation.c:660
+msgid ""
+"We had an internal error setting up our phone line. You can still make "
+"calls.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:564
+#: src/conversation/gnunet-conversation.c:669
 #, 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
+#: src/conversation/gnunet-conversation.c:674
 #, 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"
+#: src/conversation/gnunet-conversation.c:693
+msgid "Calls waiting:\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:595
+#: src/conversation/gnunet-conversation.c:699
+#, fuzzy, c-format
+msgid "#%u: `%s'\n"
+msgstr "Tôi là đồng đẳng « %s ».\n"
+
+#: src/conversation/gnunet-conversation.c:727
+#: src/conversation/gnunet-conversation.c:742
+msgid "There is no call that could be suspended right now.\n"
+msgstr ""
+
+#: src/conversation/gnunet-conversation.c:775
+#: src/conversation/gnunet-conversation.c:791
+msgid "There is no call that could be resumed right now.\n"
+msgstr ""
+
+#: src/conversation/gnunet-conversation.c:798
+#, c-format
+msgid "Already talking with `%s', cannot resume a call right now.\n"
+msgstr ""
+
+#: src/conversation/gnunet-conversation.c:807
+msgid "There is no incoming call to resume here!\n"
+msgstr ""
+
+#: src/conversation/gnunet-conversation.c:824
+#, c-format
+msgid "There is no incoming call `%s' to resume right now!\n"
+msgstr ""
+
+#: src/conversation/gnunet-conversation.c:859
 msgid "There is no call that could be cancelled right now.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:626
+#: src/conversation/gnunet-conversation.c:867
+msgid "There is no incoming call to refuse here!\n"
+msgstr ""
+
+#: src/conversation/gnunet-conversation.c:884
+#, c-format
+msgid "There is no incoming call `%s' to refuse right now!\n"
+msgstr ""
+
+#: src/conversation/gnunet-conversation.c:911
 msgid "Use `/address' to find out which address this phone should have in GNS"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:628
+#: src/conversation/gnunet-conversation.c:913
 msgid "Use `/call USER.gnu' to call USER"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:630
-msgid "Use `/accept MESSAGE' to accept an incoming call"
+#: src/conversation/gnunet-conversation.c:915
+msgid "Use `/accept #NUM' to accept incoming call #NUM"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:632
-msgid "Use `/cancel MESSAGE' to reject or terminate a call"
+#: src/conversation/gnunet-conversation.c:917
+msgid "Use `/suspend' to suspend the active call"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:634
+#: src/conversation/gnunet-conversation.c:919
+msgid ""
+"Use `/resume [#NUM]' to resume a call, #NUM is needed to resume incoming "
+"calls, no argument is needed to resume the current outgoing call."
+msgstr ""
+
+#: src/conversation/gnunet-conversation.c:921
+msgid "Use `/cancel' to reject or terminate a call"
+msgstr ""
+
+#: src/conversation/gnunet-conversation.c:923
 msgid "Use `/status' to print status information"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:636
+#: src/conversation/gnunet-conversation.c:925
 #, 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
+#: src/conversation/gnunet-conversation.c:927
 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
+#: src/conversation/gnunet-conversation.c:1082
 #, 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
+#: src/conversation/gnunet-conversation.c:1095
 #, 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
+#: src/conversation/gnunet-conversation.c:1130
 #, 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
+#: src/conversation/gnunet-conversation.c:1156
 msgid "sets the NAME of the ego to use for the phone (and name resolution)"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:870
+#: src/conversation/gnunet-conversation.c:1159
 msgid "sets the LINE to use for the phone"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:885
+#: src/conversation/gnunet-conversation.c:1174
 msgid "Enables having a conversation with other GNUnet users."
 msgstr ""
 
@@ -812,7 +866,7 @@
 
 #: 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/multicast/gnunet-multicast.c:70 src/revocation/gnunet-revocation.c:517
 #: src/template/gnunet-template.c:70
 msgid "help text"
 msgstr ""
@@ -827,13 +881,13 @@
 msgstr ""
 
 #: src/conversation/gnunet-helper-audio-playback.c:211
-#: src/conversation/gnunet-helper-audio-record.c:363
+#: src/conversation/gnunet-helper-audio-record.c:362
 #, 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
+#: src/conversation/gnunet-helper-audio-record.c:367
 #, fuzzy, c-format
 msgid "pa_stream_new() failed: %s\n"
 msgstr "SMTP: « %s » bị lỗi: %s\n"
@@ -844,36 +898,36 @@
 msgstr ""
 
 #: src/conversation/gnunet-helper-audio-playback.c:243
-#: src/conversation/gnunet-helper-audio-record.c:394
+#: src/conversation/gnunet-helper-audio-record.c:393
 #, 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
+#: src/conversation/gnunet-helper-audio-record.c:416
 msgid "Wrong Spec\n"
 msgstr ""
 
 #: src/conversation/gnunet-helper-audio-playback.c:270
-#: src/conversation/gnunet-helper-audio-record.c:423
+#: src/conversation/gnunet-helper-audio-record.c:422
 #, 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
+#: src/conversation/gnunet-helper-audio-record.c:437
 #, 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
+#: src/conversation/gnunet-helper-audio-record.c:443
 #, 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
+#: src/conversation/gnunet-helper-audio-record.c:449
 #, 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"
@@ -892,54 +946,55 @@
 msgid "Got signal, exiting.\n"
 msgstr ""
 
-#: src/conversation/gnunet-helper-audio-record.c:301
+#: src/conversation/gnunet-helper-audio-record.c:300
 #, fuzzy
 msgid "Stream successfully created.\n"
 msgstr "Không đủ quyền cho « %s ».\n"
 
-#: src/conversation/gnunet-helper-audio-record.c:306
+#: src/conversation/gnunet-helper-audio-record.c:305
 #, 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
+#: src/conversation/gnunet-helper-audio-record.c:313
 #, c-format
 msgid "Buffer metrics: maxlength=%u, fragsize=%u\n"
 msgstr ""
 
-#: src/conversation/gnunet-helper-audio-record.c:318
+#: src/conversation/gnunet-helper-audio-record.c:317
 #, c-format
 msgid "Using sample spec '%s', channel map '%s'.\n"
 msgstr ""
 
-#: src/conversation/gnunet-helper-audio-record.c:325
+#: src/conversation/gnunet-helper-audio-record.c:324
 #, 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
+#: src/conversation/gnunet-helper-audio-record.c:333
 #, c-format
 msgid "Stream error: %s\n"
 msgstr ""
 
-#: src/conversation/gnunet-helper-audio-record.c:381
+#: src/conversation/gnunet-helper-audio-record.c:380
 #, 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
+#: src/conversation/gnunet-service-conversation.c:825
 msgid "Mesh audio channel not ready; audio data dropped\n"
 msgstr ""
 
-#: src/conversation/gnunet-service-conversation.c:700
+#: src/conversation/gnunet-service-conversation.c:915
 #, c-format
-msgid "No available phone for incoming call on line %u, sending BUSY signal\n"
+msgid ""
+"No available phone for incoming call on line %u, sending HANG_UP signal\n"
 msgstr ""
 
-#: src/conversation/gnunet-service-conversation.c:1054
-#, c-format
-msgid "Received incoming tunnel on port %u\n"
-msgstr ""
+#: src/conversation/gnunet-service-conversation.c:1302
+#, fuzzy, c-format
+msgid "Received incoming channel on port %u\n"
+msgstr "« %.*s » được kết nối tới « %.*s ».\n"
 
 #: src/conversation/microphone.c:121
 #, fuzzy
@@ -956,7 +1011,7 @@
 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
+#: src/core/core_api.c:765
 msgid "Client was disconnected from core service, trying to reconnect.\n"
 msgstr ""
 
@@ -966,28 +1021,27 @@
 msgstr "Tôi là đồng đẳng « %s ».\n"
 
 #: src/core/gnunet-core.c:110 src/core/gnunet-core.c:138
-#: src/transport/gnunet-transport.c:601 src/transport/gnunet-transport.c:625
+#: src/transport/gnunet-transport.c:609 src/transport/gnunet-transport.c:634
 #, c-format
 msgid "%24s: %-17s %4s   (%u connections in total)\n"
 msgstr ""
 
-#: src/core/gnunet-core.c:112 src/transport/gnunet-transport.c:603
+#: src/core/gnunet-core.c:112 src/transport/gnunet-transport.c:611
 #, fuzzy
 msgid "Connected to"
 msgstr "« %s » được kết nối tới « %s ».\n"
 
-#: src/core/gnunet-core.c:140 src/transport/gnunet-transport.c:627
+#: src/core/gnunet-core.c:140 src/transport/gnunet-transport.c:636
 #, fuzzy
 msgid "Disconnected from"
 msgstr "« %.*s » được kết nối tới « %.*s ».\n"
 
-#: src/core/gnunet-core.c:164 src/mesh/gnunet-mesh.c:174
-#: src/peerinfo-tool/gnunet-peerinfo.c:645
+#: src/core/gnunet-core.c:164 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:201 src/transport/gnunet-transport.c:999
+#: src/core/gnunet-core.c:201 src/transport/gnunet-transport.c:1028
 #, fuzzy
 msgid "provide information about all current connections (continuously)"
 msgstr "In ra thông tin về các đồng đẳng GNUnet."
@@ -1034,138 +1088,138 @@
 msgid "# key exchanges initiated"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:701
+#: src/core/gnunet-service-core_kx.c:708
 msgid "# key exchanges stopped"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:764
+#: src/core/gnunet-service-core_kx.c:771
 msgid "# old ephemeral keys ignored"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:770
+#: src/core/gnunet-service-core_kx.c:777
 #, 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:804
+#: src/core/gnunet-service-core_kx.c:811
 #, 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:820
+#: src/core/gnunet-service-core_kx.c:827
 #, 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:923
-#: src/transport/gnunet-service-transport_validation.c:938
+#: src/core/gnunet-service-core_kx.c:930
+#: src/transport/gnunet-service-transport_validation.c:974
 #, fuzzy
 msgid "# PING messages received"
 msgstr "# các thông báo PING được tạo"
 
-#: src/core/gnunet-service-core_kx.c:931
+#: src/core/gnunet-service-core_kx.c:938
 #, 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:958
+#: src/core/gnunet-service-core_kx.c:965
 #, 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:975
+#: src/core/gnunet-service-core_kx.c:982
 #, fuzzy
 msgid "# PONG messages created"
 msgstr "# các thông báo PING được tạo"
 
-#: src/core/gnunet-service-core_kx.c:1001
+#: src/core/gnunet-service-core_kx.c:1008
 #, 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:1011
+#: src/core/gnunet-service-core_kx.c:1018
 #, 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:1068
-#: src/transport/gnunet-service-transport_validation.c:1233
+#: src/core/gnunet-service-core_kx.c:1075
+#: src/transport/gnunet-service-transport_validation.c:1285
 #, 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:1074
+#: src/core/gnunet-service-core_kx.c:1081
 #, 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:1079
+#: src/core/gnunet-service-core_kx.c:1086
 #, 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:1109
+#: src/core/gnunet-service-core_kx.c:1116
 #, fuzzy
 msgid "# PONG messages decrypted"
 msgstr "# các thông báo PING được tạo"
 
-#: src/core/gnunet-service-core_kx.c:1143
+#: src/core/gnunet-service-core_kx.c:1150
 #, 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:1153
+#: src/core/gnunet-service-core_kx.c:1160
 #, fuzzy
 msgid "# timeouts prevented via PONG"
 msgstr "# các byte đã nhận qua TCP"
 
-#: src/core/gnunet-service-core_kx.c:1160
+#: src/core/gnunet-service-core_kx.c:1167
 #, 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:1300
+#: src/core/gnunet-service-core_kx.c:1307
 #, 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:1307
+#: src/core/gnunet-service-core_kx.c:1314
 #, 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:1310
+#: src/core/gnunet-service-core_kx.c:1317
 #, 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:1353
-#: src/core/gnunet-service-core_kx.c:1378
+#: src/core/gnunet-service-core_kx.c:1360
+#: src/core/gnunet-service-core_kx.c:1385
 #, fuzzy
 msgid "# bytes dropped (duplicates)"
 msgstr "# các byte loại bỏ bởi UDP (đi ra)"
 
-#: src/core/gnunet-service-core_kx.c:1365
+#: src/core/gnunet-service-core_kx.c:1372
 #, 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:1406
+#: src/core/gnunet-service-core_kx.c:1413
 #, 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:1414
+#: src/core/gnunet-service-core_kx.c:1421
 #, fuzzy
 msgid "# bytes of payload decrypted"
 msgstr "# các byte đã giải mã"
 
-#: src/core/gnunet-service-core_kx.c:1445
+#: src/core/gnunet-service-core_kx.c:1452
 #, fuzzy
 msgid "# PAYLOAD dropped (out of order)"
 msgstr "# các byte loại bỏ bởi UDP (đi ra)"
@@ -1193,14 +1247,16 @@
 #: 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/dht/gnunet-service-xdht_neighbours.c:662
+#: src/dht/gnunet-service-xdht_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:3052
+#: src/transport/gnunet-service-transport_neighbours.c:1123
+#: src/transport/gnunet-service-transport_neighbours.c:1132
+#: src/transport/gnunet-service-transport_neighbours.c:2860
+#: src/transport/gnunet-service-transport_neighbours.c:3129
 #, fuzzy
 msgid "# peers connected"
 msgstr "# của các đồng đẳng đã kết nối"
@@ -1281,7 +1337,7 @@
 #: src/namecache/plugin_namecache_sqlite.c:52
 #: src/namestore/plugin_namestore_postgres.c:52
 #: src/namestore/plugin_namestore_sqlite.c:52
-#: src/testbed/testbed_api_hosts.c:69 src/util/crypto_ecc.c:53
+#: src/testbed/testbed_api_hosts.c:69 src/util/crypto_ecc.c:51
 #: src/include/gnunet_common.h:602 src/include/gnunet_common.h:611
 #: src/scalarproduct/scalarproduct.h:61
 #, c-format
@@ -1312,105 +1368,105 @@
 msgid "Failed to transmit request to drop database.\n"
 msgstr ""
 
-#: src/datastore/datastore_api.c:393
+#: src/datastore/datastore_api.c:394
 msgid "# queue entry timeouts"
 msgstr ""
 
-#: src/datastore/datastore_api.c:437
+#: src/datastore/datastore_api.c:443
 msgid "# queue overflows"
 msgstr ""
 
-#: src/datastore/datastore_api.c:465
+#: src/datastore/datastore_api.c:471
 #, fuzzy
 msgid "# queue entries created"
 msgstr "# các truy vấn lỗ hổng được định tuyến"
 
-#: src/datastore/datastore_api.c:483
+#: src/datastore/datastore_api.c:491
 #, fuzzy
 msgid "# Requests dropped from datastore queue"
 msgstr "# các yêu cầu lỗ hổng bị bỏ do trọng tải"
 
-#: src/datastore/datastore_api.c:525
+#: src/datastore/datastore_api.c:533
 #, fuzzy
 msgid "# datastore connections (re)created"
 msgstr "# các kết nối dht"
 
-#: src/datastore/datastore_api.c:608 src/scalarproduct/scalarproduct_api.c:279
+#: src/datastore/datastore_api.c:616 src/scalarproduct/scalarproduct_api.c:279
 #, fuzzy
 msgid "# transmission request failures"
 msgstr "# các sự truyền PONG bị lỗi"
 
-#: src/datastore/datastore_api.c:630
+#: src/datastore/datastore_api.c:638
 #, fuzzy
 msgid "# bytes sent to datastore"
 msgstr "# các byte trong kho dữ liệu"
 
-#: src/datastore/datastore_api.c:762
+#: src/datastore/datastore_api.c:770
 #, fuzzy
 msgid "Failed to receive status response from database."
 msgstr ""
 "\n"
 "Không nhận được đáp ứng từ gnunetd.\n"
 
-#: src/datastore/datastore_api.c:776
+#: src/datastore/datastore_api.c:784
 msgid "Error reading response from datastore service"
 msgstr ""
 
-#: src/datastore/datastore_api.c:788 src/datastore/datastore_api.c:794
+#: src/datastore/datastore_api.c:796 src/datastore/datastore_api.c:802
 #, fuzzy
 msgid "Invalid error message received from datastore service"
 msgstr "Nhận được thông báo « %s » sai từ đồng đẳng « %s ».\n"
 
-#: src/datastore/datastore_api.c:798
+#: src/datastore/datastore_api.c:806
 #, fuzzy
 msgid "# status messages received"
 msgstr "# các thông báo phát hiện dht được nhận"
 
-#: src/datastore/datastore_api.c:868
+#: src/datastore/datastore_api.c:876
 #, fuzzy
 msgid "# PUT requests executed"
 msgstr "# các yêu cầu dht được định tuyến"
 
-#: src/datastore/datastore_api.c:935
+#: src/datastore/datastore_api.c:944
 #, fuzzy
 msgid "# RESERVE requests executed"
 msgstr "# các yêu cầu dht được định tuyến"
 
-#: src/datastore/datastore_api.c:996
+#: src/datastore/datastore_api.c:1005
 msgid "# RELEASE RESERVE requests executed"
 msgstr ""
 
-#: src/datastore/datastore_api.c:1055
+#: src/datastore/datastore_api.c:1065
 #, fuzzy
 msgid "# UPDATE requests executed"
 msgstr "# các yêu cầu dht được định tuyến"
 
-#: src/datastore/datastore_api.c:1119
+#: src/datastore/datastore_api.c:1129
 #, fuzzy
 msgid "# REMOVE requests executed"
 msgstr "# các yêu cầu dht được định tuyến"
 
-#: src/datastore/datastore_api.c:1164
+#: src/datastore/datastore_api.c:1174
 #, fuzzy
 msgid "Failed to receive response from database.\n"
 msgstr ""
 "\n"
 "Không nhận được đáp ứng từ gnunetd.\n"
 
-#: src/datastore/datastore_api.c:1223
+#: src/datastore/datastore_api.c:1233
 #, fuzzy
 msgid "# Results received"
 msgstr "# các kết quả dht được nhận"
 
-#: src/datastore/datastore_api.c:1290
+#: src/datastore/datastore_api.c:1300
 msgid "# GET REPLICATION requests executed"
 msgstr ""
 
-#: src/datastore/datastore_api.c:1353
+#: src/datastore/datastore_api.c:1363
 msgid "# GET ZERO ANONYMITY requests executed"
 msgstr ""
 
-#: src/datastore/datastore_api.c:1414
+#: src/datastore/datastore_api.c:1424
 #, fuzzy
 msgid "# GET requests executed"
 msgstr "# các yêu cầu dht được định tuyến"
@@ -1446,12 +1502,12 @@
 msgstr ""
 
 #: src/datastore/gnunet-service-datastore.c:483
-#: src/gns/gnunet-gns-helper-service-w32.c:155
+#: src/gns/gnunet-gns-helper-service-w32.c:187
 msgid "Transmission to client failed!\n"
 msgstr ""
 
 #: src/datastore/gnunet-service-datastore.c:514
-#: src/gns/gnunet-gns-helper-service-w32.c:183
+#: src/gns/gnunet-gns-helper-service-w32.c:215
 msgid "Shutdown in progress, aborting transmission.\n"
 msgstr ""
 
@@ -1779,147 +1835,180 @@
 msgid "Issue a PUT request to the GNUnet DHT insert DATA under KEY."
 msgstr ""
 
-#: src/dht/gnunet-service-dht.c:172
+#: src/dht/gnunet-service-dht.c:172 src/dht/gnunet-service-xdht.c:172
 #, fuzzy
 msgid "Failed to connect to transport service!\n"
 msgstr "Lỗi kết nối đến gnunetd.\n"
 
 #: src/dht/gnunet-service-dht_clients.c:417
+#: src/dht/gnunet-service-xdht_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:511
+#: src/dht/gnunet-service-xdht_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:595
+#: src/dht/gnunet-service-xdht_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:796
+#: src/dht/gnunet-service-xdht_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:1037
+#: src/dht/gnunet-service-xdht_clients.c:1037
 msgid "# Key match, type mismatches in REPLY to CLIENT"
 msgstr ""
 
 #: src/dht/gnunet-service-dht_clients.c:1050
+#: src/dht/gnunet-service-xdht_clients.c:1050
 msgid "# Duplicate REPLIES to CLIENT request dropped"
 msgstr ""
 
 #: src/dht/gnunet-service-dht_clients.c:1087
+#: src/dht/gnunet-service-xdht_clients.c:1087
 #, c-format
 msgid "Unsupported block type (%u) in request!\n"
 msgstr ""
 
 #: src/dht/gnunet-service-dht_clients.c:1110
+#: src/dht/gnunet-service-xdht_clients.c:1110
 msgid "# RESULTS queued for clients"
 msgstr ""
 
 #: src/dht/gnunet-service-dht_clients.c:1164
 #: src/dht/gnunet-service-dht_clients.c:1206
+#: src/dht/gnunet-service-xdht_clients.c:1164
+#: src/dht/gnunet-service-xdht_clients.c:1206
 msgid "# REPLIES ignored for CLIENTS (no match)"
 msgstr ""
 
 #: src/dht/gnunet-service-dht_clients.c:1174
+#: src/dht/gnunet-service-xdht_clients.c:1174
 msgid "Could not pass reply to client, message too big!\n"
 msgstr ""
 
 #: src/dht/gnunet-service-dht_datacache.c:68
+#: src/dht/gnunet-service-xdht_datacache.c:68
 #, fuzzy, c-format
 msgid "%s request received, but have no datacache!\n"
 msgstr "# các byte kiểu %d được nhận"
 
 #: src/dht/gnunet-service-dht_datacache.c:78
+#: src/dht/gnunet-service-xdht_datacache.c:78
 msgid "# ITEMS stored in datacache"
 msgstr ""
 
 #: src/dht/gnunet-service-dht_datacache.c:165
+#: src/dht/gnunet-service-xdht_datacache.c:165
 msgid "# Good RESULTS found in datacache"
 msgstr ""
 
 #: src/dht/gnunet-service-dht_datacache.c:176
+#: src/dht/gnunet-service-xdht_datacache.c:176
 msgid "# Duplicate RESULTS found in datacache"
 msgstr ""
 
 #: src/dht/gnunet-service-dht_datacache.c:182
+#: src/dht/gnunet-service-xdht_datacache.c:182
 msgid "# Invalid RESULTS found in datacache"
 msgstr ""
 
 #: src/dht/gnunet-service-dht_datacache.c:188
+#: src/dht/gnunet-service-xdht_datacache.c:188
 msgid "# Irrelevant RESULTS found in datacache"
 msgstr ""
 
 #: src/dht/gnunet-service-dht_datacache.c:200
+#: src/dht/gnunet-service-xdht_datacache.c:200
 msgid "# Unsupported RESULTS found in datacache"
 msgstr ""
 
 #: src/dht/gnunet-service-dht_datacache.c:203
+#: src/dht/gnunet-service-xdht_datacache.c:203
 #, c-format
 msgid "Unsupported block type (%u) in local response!\n"
 msgstr ""
 
 #: src/dht/gnunet-service-dht_datacache.c:234
+#: src/dht/gnunet-service-xdht_datacache.c:234
 #, fuzzy
 msgid "# GET requests given to datacache"
 msgstr "# các yêu cầu get (lấy) dht được nhận"
 
 #: src/dht/gnunet-service-dht_hello.c:82
+#: src/dht/gnunet-service-xdht_hello.c:82
 #, fuzzy
 msgid "# HELLOs obtained from peerinfo"
 msgstr "Nhận được thông báo « %s » sai từ đồng đẳng « %s ».\n"
 
 #: src/dht/gnunet-service-dht_neighbours.c:516
+#: src/dht/gnunet-service-xdht_neighbours.c:516
 msgid "# Preference updates given to core"
 msgstr ""
 
 #: src/dht/gnunet-service-dht_neighbours.c:610
+#: src/dht/gnunet-service-xdht_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:764
+#: src/dht/gnunet-service-xdht_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:819
+#: src/dht/gnunet-service-xdht_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:857
+#: src/dht/gnunet-service-xdht_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:889
+#: src/dht/gnunet-service-xdht_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:1093
 #: src/dht/gnunet-service-dht_neighbours.c:1130
+#: src/dht/gnunet-service-xdht_neighbours.c:1093
+#: src/dht/gnunet-service-xdht_neighbours.c:1130
 msgid "# Peers excluded from routing due to Bloomfilter"
 msgstr ""
 
 #: src/dht/gnunet-service-dht_neighbours.c:1108
 #: src/dht/gnunet-service-dht_neighbours.c:1145
+#: src/dht/gnunet-service-xdht_neighbours.c:1108
+#: src/dht/gnunet-service-xdht_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:1287
+#: src/dht/gnunet-service-xdht_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:1316
+#: src/dht/gnunet-service-xdht_neighbours.c:1316
 #, fuzzy
 msgid "# PUT messages queued for transmission"
 msgstr "# các thông báo PING được tạo"
@@ -1927,108 +2016,132 @@
 #: src/dht/gnunet-service-dht_neighbours.c:1323
 #: src/dht/gnunet-service-dht_neighbours.c:1440
 #: src/dht/gnunet-service-dht_neighbours.c:1543
+#: src/dht/gnunet-service-xdht_neighbours.c:1323
+#: src/dht/gnunet-service-xdht_neighbours.c:1440
+#: src/dht/gnunet-service-xdht_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:1405
+#: src/dht/gnunet-service-xdht_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:1432
+#: src/dht/gnunet-service-xdht_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:1550
+#: src/dht/gnunet-service-xdht_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:1637
+#: src/dht/gnunet-service-xdht_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:1640
+#: src/dht/gnunet-service-xdht_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:1803
+#: src/dht/gnunet-service-xdht_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:1811
+#: src/dht/gnunet-service-xdht_neighbours.c:1811
 msgid "# FIND PEER requests ignored due to lack of HELLO"
 msgstr ""
 
 #: src/dht/gnunet-service-dht_neighbours.c:1904
+#: src/dht/gnunet-service-xdht_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:1907
+#: src/dht/gnunet-service-xdht_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:1961
+#: src/dht/gnunet-service-xdht_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:1975
+#: src/dht/gnunet-service-xdht_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:2052
+#: src/dht/gnunet-service-xdht_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:2055
+#: src/dht/gnunet-service-xdht_neighbours.c:2055
 #, fuzzy
 msgid "# P2P RESULT bytes received"
 msgstr "# Tín hiệu HTTP PUT được nhận"
 
-#: src/dht/gnunet-service-dht_nse.c:59
+#: src/dht/gnunet-service-dht_nse.c:59 src/dht/gnunet-service-xdht_nse.c:59
 #, fuzzy
 msgid "# Network size estimates received"
 msgstr "# các yêu cầu get (lấy) dht được nhận"
 
 #: src/dht/gnunet-service-dht_routing.c:211
+#: src/dht/gnunet-service-xdht_routing.c:211
 msgid "# Good REPLIES matched against routing table"
 msgstr ""
 
 #: src/dht/gnunet-service-dht_routing.c:220
+#: src/dht/gnunet-service-xdht_routing.c:220
 msgid "# Duplicate REPLIES matched against routing table"
 msgstr ""
 
 #: src/dht/gnunet-service-dht_routing.c:226
+#: src/dht/gnunet-service-xdht_routing.c:226
 msgid "# Invalid REPLIES matched against routing table"
 msgstr ""
 
 #: src/dht/gnunet-service-dht_routing.c:232
+#: src/dht/gnunet-service-xdht_routing.c:232
 msgid "# Irrelevant REPLIES matched against routing table"
 msgstr ""
 
 #: src/dht/gnunet-service-dht_routing.c:244
+#: src/dht/gnunet-service-xdht_routing.c:244
 msgid "# Unsupported REPLIES matched against routing table"
 msgstr ""
 
 #: src/dht/gnunet-service-dht_routing.c:317
+#: src/dht/gnunet-service-xdht_routing.c:317
 msgid "# Entries removed from routing table"
 msgstr ""
 
 #: src/dht/gnunet-service-dht_routing.c:399
+#: src/dht/gnunet-service-xdht_routing.c:399
 msgid "# Entries added to routing table"
 msgstr ""
 
 #: src/dht/gnunet-service-dht_routing.c:417
+#: src/dht/gnunet-service-xdht_routing.c:417
 #, fuzzy
 msgid "# DHT requests combined"
 msgstr "# các yêu cầu get (lấy) dht được nhận"
@@ -2047,12 +2160,12 @@
 msgid "Block of type %u is malformed\n"
 msgstr ""
 
-#: src/dns/dnsparser.c:239
+#: src/dns/dnsparser.c:257
 #, 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:800
+#: src/dns/dnsparser.c:856
 #, 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"
@@ -2144,21 +2257,21 @@
 msgid "# DNS requests received via TUN interface"
 msgstr "# các đáp ứng lỗ hổng được gửi cho trình/máy khách"
 
-#: src/dns/gnunet-service-dns.c:1049 src/exit/gnunet-daemon-exit.c:3498
+#: src/dns/gnunet-service-dns.c:1049 src/exit/gnunet-daemon-exit.c:3499
 #, 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:3555
+#: src/dns/gnunet-service-dns.c:1069 src/exit/gnunet-daemon-exit.c:3556
 #, fuzzy
 msgid "need a valid IPv4 or IPv6 address\n"
 msgstr "Mức ưu tiên tiến trình không hợp lê « %s ».\n"
 
-#: src/dv/gnunet-dv.c:165
+#: src/dv/gnunet-dv.c:166
 msgid "verbose output"
 msgstr ""
 
-#: src/dv/gnunet-dv.c:174
+#: src/dv/gnunet-dv.c:175
 #, fuzzy
 msgid "Print information about DV state"
 msgstr "In ra thông tin về các đồng đẳng GNUnet."
@@ -2170,18 +2283,18 @@
 
 #: src/exit/gnunet-daemon-exit.c:853
 #, fuzzy
-msgid "# Bytes transmitted via mesh tunnels"
+msgid "# Bytes transmitted via mesh channels"
 msgstr "# các byte được gửi"
 
 #: 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
+#: src/exit/gnunet-daemon-exit.c:2651 src/vpn/gnunet-service-vpn.c:1407
+#: src/vpn/gnunet-service-vpn.c:1797 src/vpn/gnunet-service-vpn.c:1960
 msgid "# ICMPv4 packets dropped (type not allowed)"
 msgstr ""
 
 #: 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
+#: src/exit/gnunet-daemon-exit.c:2710 src/vpn/gnunet-service-vpn.c:1463
+#: src/vpn/gnunet-service-vpn.c:1856 src/vpn/gnunet-service-vpn.c:1993
 msgid "# ICMPv6 packets dropped (type not allowed)"
 msgstr ""
 
@@ -2288,13 +2401,13 @@
 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:2636 src/vpn/gnunet-service-vpn.c:1399
-#: src/vpn/gnunet-service-vpn.c:1956
+#: src/exit/gnunet-daemon-exit.c:2636 src/vpn/gnunet-service-vpn.c:1397
+#: src/vpn/gnunet-service-vpn.c:1954
 msgid "# ICMPv4 packets dropped (impossible PT to v6)"
 msgstr ""
 
-#: 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
+#: src/exit/gnunet-daemon-exit.c:2695 src/vpn/gnunet-service-vpn.c:1433
+#: src/vpn/gnunet-service-vpn.c:1445 src/vpn/gnunet-service-vpn.c:1844
 msgid "# ICMPv6 packets dropped (impossible PT to v4)"
 msgstr ""
 
@@ -2318,58 +2431,59 @@
 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:3024
-msgid "# Inbound MESH tunnels created"
-msgstr ""
+#: src/exit/gnunet-daemon-exit.c:3025
+#, fuzzy
+msgid "# Inbound MESH channels created"
+msgstr "# các truy vấn lỗ hổng được định tuyến"
 
-#: src/exit/gnunet-daemon-exit.c:3285
+#: src/exit/gnunet-daemon-exit.c:3286
 #, c-format
 msgid "No addresses found for hostname `%s' of service `%s'!\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3299 src/exit/gnunet-daemon-exit.c:3311
+#: src/exit/gnunet-daemon-exit.c:3300 src/exit/gnunet-daemon-exit.c:3312
 #, c-format
 msgid "Service `%s' configured for IPv4, but IPv4 is disabled!\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3322
+#: src/exit/gnunet-daemon-exit.c:3323
 #, c-format
 msgid "No IP addresses found for hostname `%s' of service `%s'!\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3511
+#: src/exit/gnunet-daemon-exit.c:3512
 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:3519
+#: src/exit/gnunet-daemon-exit.c:3520
 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:3526
+#: src/exit/gnunet-daemon-exit.c:3527
 msgid ""
 "Cannot enable IPv4 exit but disable IPv4 on TUN interface, will use "
 "ENABLE_IPv4=YES\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3532
+#: src/exit/gnunet-daemon-exit.c:3533
 msgid ""
 "Cannot enable IPv6 exit but disable IPv6 on TUN interface, will use "
 "ENABLE_IPv6=YES\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3538 src/pt/gnunet-daemon-pt.c:1248
+#: src/exit/gnunet-daemon-exit.c:3539 src/pt/gnunet-daemon-pt.c:1247
 msgid "No useful service enabled.  Exiting.\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3654
+#: src/exit/gnunet-daemon-exit.c:3655
 msgid "Must be a number"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3796
+#: src/exit/gnunet-daemon-exit.c:3797
 msgid "Daemon to run to provide an IP exit node for the VPN"
 msgstr ""
 
@@ -2599,7 +2713,7 @@
 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:2376 src/fs/fs_api.c:2616
+#: src/fs/fs_api.c:2376 src/fs/fs_api.c:2617
 #, 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"
@@ -2609,21 +2723,21 @@
 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:2406 src/fs/fs_api.c:2425 src/fs/fs_api.c:2908
+#: src/fs/fs_api.c:2407 src/fs/fs_api.c:2426 src/fs/fs_api.c:2909
 #, c-format
 msgid "Failure while resuming search operation `%s': %s\n"
 msgstr ""
 
-#: src/fs/fs_api.c:2607
+#: src/fs/fs_api.c:2608
 #, c-format
 msgid "Failed to resume sub-download `%s': could not open file `%s'\n"
 msgstr ""
 
-#: src/fs/fs_api.c:2852
+#: src/fs/fs_api.c:2853
 msgid "Could not resume running search, will resume as paused search\n"
 msgstr ""
 
-#: src/fs/fs_api.c:2946
+#: src/fs/fs_api.c:2947
 #, c-format
 msgid "Failure while resuming download operation `%s': %s\n"
 msgstr ""
@@ -3282,7 +3396,7 @@
 msgstr "Tùy chọn « %s » cần thiết khi dùng tùy chọn « %s ».\n"
 
 #: src/fs/gnunet-publish.c:778 src/fs/gnunet-publish.c:785
-#: src/transport/gnunet-transport.c:840 src/transport/gnunet-transport.c:870
+#: src/transport/gnunet-transport.c:865 src/transport/gnunet-transport.c:899
 #, 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"
@@ -3400,7 +3514,7 @@
 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/fs/gnunet-service-fs.c:639 src/hostlist/gnunet-daemon-hostlist.c:288
 #: src/topology/gnunet-daemon-topology.c:1253
 #: src/topology/gnunet-daemon-topology.c:1260
 #, fuzzy, c-format
@@ -3476,7 +3590,7 @@
 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:1194
+#: src/fs/gnunet-service-fs_cp.c:1193
 #, 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"
@@ -3547,7 +3661,7 @@
 msgid "Indexed file `%s' changed at offset %llu\n"
 msgstr "Đánh chỉ mục dữ liệu của tập tin « %s » bị lỗi tại vị tri %llu.\n"
 
-#: src/fs/gnunet-service-fs_lc.c:202 src/fs/gnunet-service-fs_lc.c:369
+#: src/fs/gnunet-service-fs_lc.c:202 src/fs/gnunet-service-fs_lc.c:368
 #, fuzzy
 msgid "# client searches active"
 msgstr "# các yêu cầu khách lỗ hổng được nhận"
@@ -3557,42 +3671,47 @@
 msgid "# replies received for local clients"
 msgstr "# các đáp ứng lỗ hổng được gửi cho trình/máy khách"
 
-#: src/fs/gnunet-service-fs_lc.c:328
+#: src/fs/gnunet-service-fs_lc.c:327
 #, fuzzy
 msgid "# client searches received"
 msgstr "# các yêu cầu khách lỗ hổng được nhận"
 
-#: src/fs/gnunet-service-fs_lc.c:363
+#: src/fs/gnunet-service-fs_lc.c:362
 msgid "# client searches updated (merged content seen list)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_mesh_client.c:475
+#: src/fs/gnunet-service-fs_mesh_client.c:484
 #, fuzzy
 msgid "# replies received via mesh"
 msgstr "# các byte kiểu %d được nhận"
 
-#: src/fs/gnunet-service-fs_mesh_client.c:489
+#: src/fs/gnunet-service-fs_mesh_client.c:498
 #, fuzzy
 msgid "# replies received via mesh dropped"
 msgstr "# các byte kiểu %d được nhận"
 
-#: src/fs/gnunet-service-fs_mesh_server.c:259
+#: src/fs/gnunet-service-fs_mesh_server.c:260
 #, fuzzy
 msgid "# Blocks transferred via mesh"
 msgstr "# các byte được gửi"
 
-#: src/fs/gnunet-service-fs_mesh_server.c:412
+#: src/fs/gnunet-service-fs_mesh_server.c:352
 #, fuzzy
+msgid "# queries received via mesh not answered"
+msgstr "# các byte đã nhận qua TCP"
+
+#: src/fs/gnunet-service-fs_mesh_server.c:432
+#, fuzzy
 msgid "# queries received via mesh"
 msgstr "# các byte đã nhận qua TCP"
 
-#: src/fs/gnunet-service-fs_mesh_server.c:455
+#: src/fs/gnunet-service-fs_mesh_server.c:476
 #, fuzzy
 msgid "# mesh client connections rejected"
 msgstr "# các kết nối dht"
 
-#: src/fs/gnunet-service-fs_mesh_server.c:461
-#: src/fs/gnunet-service-fs_mesh_server.c:501
+#: src/fs/gnunet-service-fs_mesh_server.c:482
+#: src/fs/gnunet-service-fs_mesh_server.c:522
 #, fuzzy
 msgid "# mesh connections active"
 msgstr "# các kết nối dht"
@@ -3631,8 +3750,8 @@
 msgid "# requests refreshed"
 msgstr "# các yêu cầu get (lấy) dht được nhận"
 
-#: src/fs/gnunet-service-fs_pe.c:614 src/fs/gnunet-service-fs_pe.c:698
-#: src/fs/gnunet-service-fs_pe.c:769
+#: src/fs/gnunet-service-fs_pe.c:616 src/fs/gnunet-service-fs_pe.c:700
+#: src/fs/gnunet-service-fs_pe.c:771
 msgid "# query plan entries"
 msgstr ""
 
@@ -3646,104 +3765,104 @@
 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:813
+#: src/fs/gnunet-service-fs_pr.c:814
 #, fuzzy
 msgid "# replies received and matched"
 msgstr "# các byte kiểu %d được nhận"
 
-#: src/fs/gnunet-service-fs_pr.c:843
+#: src/fs/gnunet-service-fs_pr.c:844
 msgid "# duplicate replies discarded (bloomfilter)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:852
+#: src/fs/gnunet-service-fs_pr.c:853
 msgid "# irrelevant replies discarded"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:866
+#: src/fs/gnunet-service-fs_pr.c:867
 #, c-format
 msgid "Unsupported block type %u\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:879
+#: src/fs/gnunet-service-fs_pr.c:880
 #, 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:1000
+#: src/fs/gnunet-service-fs_pr.c:1001
 msgid "# Datastore `PUT' failures"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1027
+#: src/fs/gnunet-service-fs_pr.c:1029
 #, 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:1062
+#: src/fs/gnunet-service-fs_pr.c:1064
 #, fuzzy
 msgid "# Replies received from DHT"
 msgstr "# các byte đã nhận qua HTTP"
 
-#: src/fs/gnunet-service-fs_pr.c:1190
+#: src/fs/gnunet-service-fs_pr.c:1192
 #, fuzzy
 msgid "# Replies received from MESH"
 msgstr "# các byte đã nhận qua HTTP"
 
-#: src/fs/gnunet-service-fs_pr.c:1242
+#: src/fs/gnunet-service-fs_pr.c:1244
 #, c-format
 msgid "Datastore lookup already took %s!\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1262
+#: src/fs/gnunet-service-fs_pr.c:1264
 #, c-format
 msgid "On-demand lookup already took %s!\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1309
+#: src/fs/gnunet-service-fs_pr.c:1311
 msgid "# Datastore lookups concluded (no results)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1324
+#: src/fs/gnunet-service-fs_pr.c:1326
 msgid "# Datastore lookups concluded (seen all)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1333
+#: src/fs/gnunet-service-fs_pr.c:1335
 msgid "# Datastore lookups aborted (more than MAX_RESULTS)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1348
+#: src/fs/gnunet-service-fs_pr.c:1350
 msgid "# requested DBLOCK or IBLOCK not found"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1362
+#: src/fs/gnunet-service-fs_pr.c:1364
 msgid "# on-demand blocks matched requests"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1375
+#: src/fs/gnunet-service-fs_pr.c:1377
 msgid "# on-demand lookups performed successfully"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1380
+#: src/fs/gnunet-service-fs_pr.c:1382
 msgid "# on-demand lookups failed"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1407 src/fs/gnunet-service-fs_pr.c:1447
-#: src/fs/gnunet-service-fs_pr.c:1588
+#: src/fs/gnunet-service-fs_pr.c:1409 src/fs/gnunet-service-fs_pr.c:1449
+#: src/fs/gnunet-service-fs_pr.c:1590
 msgid "# Datastore lookups concluded (error queueing)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1465
+#: src/fs/gnunet-service-fs_pr.c:1467
 msgid "# Datastore lookups concluded (found last result)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1476
+#: src/fs/gnunet-service-fs_pr.c:1478
 msgid "# Datastore lookups concluded (load too high)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1564
+#: src/fs/gnunet-service-fs_pr.c:1566
 msgid "# Datastore lookups initiated"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1649
+#: src/fs/gnunet-service-fs_pr.c:1651
 #, fuzzy
 msgid "# GAP PUT messages received"
 msgstr "# các thông báo PONG đã mật mã được nhận"
@@ -3790,6 +3909,34 @@
 "\n"
 "Không nhận được đáp ứng từ gnunetd.\n"
 
+#: src/gns/gnunet-bcd.c:123
+#, fuzzy, c-format
+msgid "Refusing `%s' request to HTTP server\n"
+msgstr "trình phục vụ danh sách máy HTTP hợp nhất"
+
+#: src/gns/gnunet-bcd.c:355 src/hostlist/hostlist-server.c:566
+#, c-format
+msgid "Invalid port number %llu.  Exiting.\n"
+msgstr ""
+
+#: src/gns/gnunet-bcd.c:360
+#, c-format
+msgid "Businesscard HTTP server starts on %llu\n"
+msgstr ""
+
+#: src/gns/gnunet-bcd.c:374
+#, fuzzy, c-format
+msgid "Could not start businesscard HTTP server on port %u\n"
+msgstr "Cổng cho trình phục vụ HTTP danh sách máy chủ thống nhất"
+
+#: src/gns/gnunet-bcd.c:519
+msgid "Run HTTP serve on port PORT (default is 8888)"
+msgstr ""
+
+#: src/gns/gnunet-bcd.c:531
+msgid "GNUnet HTTP server to create business cards"
+msgstr ""
+
 #: src/gns/gnunet-dns2gns.c:228
 #, fuzzy
 msgid "Failed to pack DNS response into UDP packet!\n"
@@ -3853,189 +4000,206 @@
 msgid "Please specify name to lookup!\n"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:297
+#: src/gns/gnunet-gns.c:298
 #, c-format
 msgid "Ego for `%s' not found, cannot perform lookup.\n"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:335
+#: src/gns/gnunet-gns.c:336 src/gns/gnunet-gns-helper-service-w32.c:753
 #, c-format
 msgid ""
-"Ego for `master-zone' not found, cannot perform lookup.  Did you run gnunet-"
+"Ego for `gns-master' not found, cannot perform lookup.  Did you run gnunet-"
 "gns-import.sh?\n"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:364
+#: src/gns/gnunet-gns.c:365 src/gns/gnunet-gns-helper-service-w32.c:783
 #, 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:377
+#: src/gns/gnunet-gns.c:378
 #, c-format
 msgid "Public key `%s' is not well-formed\n"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:426
+#: src/gns/gnunet-gns.c:428
 msgid "Lookup a record for the given name"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:429
+#: src/gns/gnunet-gns.c:431
 #, 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:432
+#: src/gns/gnunet-gns.c:434
 msgid "No unneeded output"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:435
+#: src/gns/gnunet-gns.c:437
 #, 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:438
+#: src/gns/gnunet-gns.c:440
 #, 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:451
+#: src/gns/gnunet-gns.c:453
 #, fuzzy
 msgid "GNUnet GNS resolver tool"
 msgstr "Bản ghi lỗi GNUnet"
 
+#: src/gns/gnunet-gns-helper-service-w32.c:723
+#, c-format
+msgid ""
+"Ego for `gns-short' not found. This is not really fatal, but i'll pretend "
+"that it is and refuse to perform a lookup.  Did you run gnunet-gns-import."
+"sh?\n"
+msgstr ""
+
+#: src/gns/gnunet-gns-helper-service-w32.c:793
+#, fuzzy, c-format
+msgid "Failed to connect to identity service\n"
+msgstr "Lỗi kết nối đến gnunetd.\n"
+
 #: src/gns/gnunet-gns-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:1067
-#: src/transport/plugin_transport_http_client.c:1082
+#: src/hostlist/hostlist-client.c:683 src/hostlist/hostlist-client.c:689
+#: src/hostlist/hostlist-client.c:741 src/hostlist/hostlist-client.c:750
+#: src/hostlist/hostlist-client.c:871 src/hostlist/hostlist-client.c:963
+#: src/hostlist/hostlist-client.c:968
+#: src/transport/plugin_transport_http_client.c:1071
+#: src/transport/plugin_transport_http_client.c:1086
 #, 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:839
+#: src/gns/gnunet-gns-proxy.c:833
 #, 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
+#: src/gns/gnunet-gns-proxy.c:856
 #, 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
+#: src/gns/gnunet-gns-proxy.c:879
 #, 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
+#: src/gns/gnunet-gns-proxy.c:892
 #, 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
+#: src/gns/gnunet-gns-proxy.c:907
 #, 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
+#: src/gns/gnunet-gns-proxy.c:917
 #, c-format
 msgid "Failed DANE verification failed with GnuTLS verify status code: %u\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:947
+#: src/gns/gnunet-gns-proxy.c:941
 #, c-format
 msgid "SSL certificate subject name (%s) does not match `%s'\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:1092
+#: src/gns/gnunet-gns-proxy.c:1086
 #, c-format
 msgid "Cookie domain `%s' supplied by server is invalid\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:1609
+#: src/gns/gnunet-gns-proxy.c:1602
 #, 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
+#: src/gns/gnunet-gns-proxy.c:1973
 #, 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:2009
+#: src/gns/gnunet-gns-proxy.c:2003
 #, 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:2178
+#: src/gns/gnunet-gns-proxy.c:2177
 #, 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:2197
+#: src/gns/gnunet-gns-proxy.c:2196
 #, 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
+#: src/gns/gnunet-gns-proxy.c:2504
 #, 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
+#: src/gns/gnunet-gns-proxy.c:2533
 #, 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
+#: src/gns/gnunet-gns-proxy.c:2551 src/gns/gnunet-gns-proxy.c:2580
+msgid "SSL connection to plain IPv4 address requested\n"
+msgstr ""
+
+#: src/gns/gnunet-gns-proxy.c:2631
 #, 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
+#: src/gns/gnunet-gns-proxy.c:2970
 msgid "No ego configured for `shorten-zone`\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:2995
+#: src/gns/gnunet-gns-proxy.c:3010
 #, c-format
 msgid "No ego configured for `%s`\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:3057
+#: src/gns/gnunet-gns-proxy.c:3072
 #, 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:3098
+#: src/gns/gnunet-gns-proxy.c:3113
 msgid "listen on specified port (default: 7777)"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:3101
+#: src/gns/gnunet-gns-proxy.c:3116
 msgid "pem file to use as CA"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:3120
+#: src/gns/gnunet-gns-proxy.c:3135
 msgid "GNUnet GNS proxy"
 msgstr ""
 
-#: src/gns/gnunet-service-gns.c:860
+#: src/gns/gnunet-service-gns.c:862
 #, 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:868
+#: src/gns/gnunet-service-gns.c:870
 #, 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
+#: src/gns/gnunet-service-gns.c:903
 #, 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:917
+#: src/gns/gnunet-service-gns.c:919
 #, fuzzy
 msgid "valid public key required"
 msgstr "Đối số không hợp lệ cho « %s ».\n"
@@ -4050,101 +4214,111 @@
 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:771
+#: src/gns/gnunet-service-gns_resolver.c:815
 #, 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:913
+#: src/gns/gnunet-service-gns_resolver.c:957
 #, c-format
 msgid "Skipping record of unsupported type %d\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns_resolver.c:1646
+#: src/gns/gnunet-service-gns_resolver.c:1316
 #, c-format
 msgid "GNS lookup resulted in DNS name that is too long (`%s')\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns_resolver.c:1686
+#: src/gns/gnunet-service-gns_resolver.c:1809
 msgid "GNS lookup recursion failed (no delegation record found)\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns_resolver.c:1710
+#: src/gns/gnunet-service-gns_resolver.c:1833
 #, 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:1932
+#: src/gns/gnunet-service-gns_resolver.c:2071
 #, c-format
 msgid "Zone %s was revoked, resolution fails\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns_resolver.c:2054
+#: src/gns/gnunet-service-gns_resolver.c:2220
 #, c-format
 msgid "Hostname `%s' is not well-formed, resolution fails\n"
 msgstr ""
 
-#: src/gns/plugin_gnsrecord_gns.c:142
+#: src/gns/plugin_gnsrecord_gns.c:151
 #, 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
+#: src/gns/plugin_gnsrecord_gns.c:180
 #, fuzzy, c-format
+msgid "Unable to parse GNS2DNS record `%s'\n"
+msgstr "Lỗi đọc danh sách bạn bè từ « %s »\n"
+
+#: src/gns/plugin_gnsrecord_gns.c:201
+#, 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
+#: src/gns/plugin_gnsrecord_gns.c:217
 #, 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
+#: src/gnsrecord/plugin_gnsrecord_dns.c:293
 #, 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
+#: src/gnsrecord/plugin_gnsrecord_dns.c:314
 #, 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
+#: src/gnsrecord/plugin_gnsrecord_dns.c:336
 #, 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
+#: src/gnsrecord/plugin_gnsrecord_dns.c:420
 #, fuzzy, c-format
+msgid "Failed to serialize CERT record with %u bytes\n"
+msgstr "Không thể truy cập đến tập tin gnunet-directory « %s »\n"
+
+#: src/gnsrecord/plugin_gnsrecord_dns.c:452
+#, 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
+#: src/gnsrecord/plugin_gnsrecord_dns.c:471
 #, 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
+#: src/gnsrecord/plugin_gnsrecord_dns.c:494
 #, 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
+#: src/gnsrecord/plugin_gnsrecord_dns.c:514
 #, 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
+#: src/gnsrecord/plugin_gnsrecord_dns.c:529
 #, 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
+#: src/gnsrecord/plugin_gnsrecord_dns.c:549
 #, 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
+#: src/gnsrecord/plugin_gnsrecord_dns.c:567
 #, 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"
@@ -4223,181 +4397,181 @@
 msgid "Failed to parse `%s' as an address for plugin `%s'\n"
 msgstr "Lỗi đóng kết đến cổng %s %d.\n"
 
-#: src/hostlist/gnunet-daemon-hostlist.c:260
+#: src/hostlist/gnunet-daemon-hostlist.c:259
 msgid ""
 "None of the functions for the hostlist daemon were enabled.  I have no "
 "reason to run!\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist.c:313
+#: src/hostlist/gnunet-daemon-hostlist.c:308
 #, fuzzy
 msgid "advertise our hostlist to other peers"
 msgstr "Tắt quảng cáo máy này cho đồng đẳng khác"
 
-#: src/hostlist/gnunet-daemon-hostlist.c:318
+#: src/hostlist/gnunet-daemon-hostlist.c:313
 msgid ""
 "bootstrap using hostlists (it is highly recommended that you always use this "
 "option)"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist.c:321
+#: src/hostlist/gnunet-daemon-hostlist.c:316
 #, fuzzy
 msgid "enable learning about hostlist servers from other peers"
 msgstr "Tắt quảng cáo máy này cho đồng đẳng khác"
 
-#: src/hostlist/gnunet-daemon-hostlist.c:325
+#: src/hostlist/gnunet-daemon-hostlist.c:320
 #, fuzzy
 msgid "provide a hostlist server"
 msgstr "trình phục vụ danh sách máy HTTP hợp nhất"
 
-#: src/hostlist/gnunet-daemon-hostlist.c:340
+#: src/hostlist/gnunet-daemon-hostlist.c:335
 msgid "GNUnet hostlist server and client"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:289
+#: src/hostlist/hostlist-client.c:288
 #, fuzzy
 msgid "# bytes downloaded from hostlist servers"
 msgstr "trình phục vụ danh sách máy HTTP hợp nhất"
 
-#: src/hostlist/hostlist-client.c:310 src/hostlist/hostlist-client.c:340
+#: src/hostlist/hostlist-client.c:309 src/hostlist/hostlist-client.c:339
 #, fuzzy
 msgid "# invalid HELLOs downloaded from hostlist servers"
 msgstr "# các HELLO tải xuống qua HTTP"
 
-#: src/hostlist/hostlist-client.c:313 src/hostlist/hostlist-client.c:343
+#: src/hostlist/hostlist-client.c:312 src/hostlist/hostlist-client.c:342
 #, fuzzy, c-format
 msgid "Invalid `%s' message received from hostlist at `%s'\n"
 msgstr "Nhận được thông báo « %s » sai từ đồng đẳng « %s ».\n"
 
-#: src/hostlist/hostlist-client.c:331
+#: src/hostlist/hostlist-client.c:330
 #, fuzzy
 msgid "# valid HELLOs downloaded from hostlist servers"
 msgstr "# các HELLO tải xuống qua HTTP"
 
-#: src/hostlist/hostlist-client.c:589 src/hostlist/hostlist-client.c:1330
+#: src/hostlist/hostlist-client.c:592 src/hostlist/hostlist-client.c:1333
 msgid "# advertised hostlist URIs"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:619
+#: src/hostlist/hostlist-client.c:622
 #, c-format
 msgid "# advertised URI `%s' downloaded"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:661
+#: src/hostlist/hostlist-client.c:664
 #, c-format
 msgid ""
 "Advertised hostlist with URI `%s' could not be downloaded. Advertised URI "
 "gets dismissed.\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:799
+#: src/hostlist/hostlist-client.c:802
 #, fuzzy, c-format
 msgid "Timeout trying to download hostlist from `%s'\n"
 msgstr "Đang thử tải danh sách các máy xuống « %s »\n"
 
-#: src/hostlist/hostlist-client.c:813
+#: src/hostlist/hostlist-client.c:816
 #, c-format
 msgid "Download limit of %u bytes exceeded, stopping download\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:833
+#: src/hostlist/hostlist-client.c:836
 #, fuzzy, c-format
 msgid "Download of hostlist from `%s' failed: `%s'\n"
 msgstr "Tải lên « %s » hoàn thành, địa chỉ URI là « %s ».\n"
 
-#: src/hostlist/hostlist-client.c:839
+#: src/hostlist/hostlist-client.c:842
 #, fuzzy, c-format
 msgid "Download of hostlist `%s' completed.\n"
 msgstr "Tải lên « %s » hoàn thành, địa chỉ URI là « %s ».\n"
 
-#: src/hostlist/hostlist-client.c:847
+#: src/hostlist/hostlist-client.c:850
 #, c-format
 msgid "Adding successfully tested hostlist `%s' datastore.\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:900
+#: src/hostlist/hostlist-client.c:903
 #, fuzzy, c-format
 msgid "Bootstrapping using hostlist at `%s'.\n"
 msgstr "Đang nạp và khởi động dùng « %s ».\n"
 
-#: src/hostlist/hostlist-client.c:908
+#: src/hostlist/hostlist-client.c:911
 msgid "# hostlist downloads initiated"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1037 src/hostlist/hostlist-client.c:1503
+#: src/hostlist/hostlist-client.c:1040 src/hostlist/hostlist-client.c:1506
 msgid "# milliseconds between hostlist downloads"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1046
+#: src/hostlist/hostlist-client.c:1049
 #, c-format
 msgid "Have %u/%u connections.  Will consider downloading hostlist in %s\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1106 src/hostlist/hostlist-client.c:1122
+#: src/hostlist/hostlist-client.c:1109 src/hostlist/hostlist-client.c:1125
 #, fuzzy
 msgid "# active connections"
 msgstr "# các kết nối dht"
 
-#: src/hostlist/hostlist-client.c:1278
+#: src/hostlist/hostlist-client.c:1280
 #, fuzzy, c-format
 msgid "Loading saved hostlist entries from file `%s' \n"
 msgstr "Đang thử tải danh sách các máy xuống « %s »\n"
 
-#: src/hostlist/hostlist-client.c:1282
+#: src/hostlist/hostlist-client.c:1285
 #, fuzzy, c-format
 msgid "Hostlist file `%s' does not exist\n"
 msgstr "Khoá phiên chạy từ đồng đẳng « %s » không thể được thẩm tra.\n"
 
-#: src/hostlist/hostlist-client.c:1293
+#: src/hostlist/hostlist-client.c:1296
 #, fuzzy, c-format
 msgid "Could not open file `%s' for reading to load hostlists: %s\n"
 msgstr "Lỗi mở tập tin theo dõi « %s »: %s\n"
 
-#: src/hostlist/hostlist-client.c:1326
+#: src/hostlist/hostlist-client.c:1329
 #, c-format
 msgid "%u hostlist URIs loaded from file\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1328
+#: src/hostlist/hostlist-client.c:1331
 #, fuzzy
 msgid "# hostlist URIs read from file"
 msgstr "# các byte danh sách máy được trả về"
 
-#: src/hostlist/hostlist-client.c:1373
+#: src/hostlist/hostlist-client.c:1376
 #, fuzzy, c-format
 msgid "Could not open file `%s' for writing to save hostlists: %s\n"
 msgstr "Lỗi mở tập tin theo dõi « %s »: %s\n"
 
-#: src/hostlist/hostlist-client.c:1378
+#: src/hostlist/hostlist-client.c:1381
 #, fuzzy, c-format
 msgid "Writing %u hostlist URIs to `%s'\n"
 msgstr "Đang thử tải danh sách các máy xuống « %s »\n"
 
-#: src/hostlist/hostlist-client.c:1402 src/hostlist/hostlist-client.c:1419
+#: src/hostlist/hostlist-client.c:1405 src/hostlist/hostlist-client.c:1422
 #, c-format
 msgid "Error writing hostlist URIs to file `%s'\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1414
+#: src/hostlist/hostlist-client.c:1417
 #, fuzzy
 msgid "# hostlist URIs written to file"
 msgstr "# các byte danh sách máy được trả về"
 
-#: src/hostlist/hostlist-client.c:1468
+#: src/hostlist/hostlist-client.c:1471
 msgid "Learning is enabled on this peer\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1480
+#: src/hostlist/hostlist-client.c:1483
 msgid "Learning is not enabled on this peer\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1492
+#: src/hostlist/hostlist-client.c:1495
 #, c-format
 msgid ""
 "Since learning is not enabled on this peer, hostlist file `%s' was removed\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1496
+#: src/hostlist/hostlist-client.c:1499
 #, fuzzy, c-format
 msgid "Hostlist file `%s' could not be removed\n"
 msgstr "Khoá phiên chạy từ đồng đẳng « %s » không thể được thẩm tra.\n"
@@ -4476,33 +4650,28 @@
 msgid "Advertisement message could not be queued by core\n"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:560 src/peerinfo-tool/gnunet-peerinfo.c:651
-#: src/transport/gnunet-service-transport.c:790
+#: src/hostlist/hostlist-server.c:556 src/peerinfo-tool/gnunet-peerinfo.c:651
+#: src/transport/gnunet-service-transport.c:850
 #, fuzzy
 msgid "Could not access PEERINFO service.  Exiting.\n"
 msgstr "Không thể truy cập đến thông tin về không gian tên.\n"
 
-#: src/hostlist/hostlist-server.c:570
+#: src/hostlist/hostlist-server.c:575
 #, c-format
-msgid "Invalid port number %llu.  Exiting.\n"
-msgstr ""
-
-#: src/hostlist/hostlist-server.c:579
-#, c-format
 msgid "Hostlist service starts on %s:%llu\n"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:593
+#: src/hostlist/hostlist-server.c:589
 #, fuzzy, c-format
 msgid "Address to obtain hostlist: `%s'\n"
 msgstr "Đang thử tải danh sách các máy xuống « %s »\n"
 
-#: src/hostlist/hostlist-server.c:633
+#: src/hostlist/hostlist-server.c:629
 #, fuzzy, c-format
 msgid "`%s' is not a valid IP address! Ignoring BINDTOIP.\n"
 msgstr "« %s » không sẵn sàng.\n"
 
-#: src/hostlist/hostlist-server.c:676
+#: src/hostlist/hostlist-server.c:672
 #, fuzzy, c-format
 msgid "Could not start hostlist HTTP server on port %u\n"
 msgstr "Cổng cho trình phục vụ HTTP danh sách máy chủ thống nhất"
@@ -4547,49 +4716,49 @@
 msgid "Maintain egos"
 msgstr ""
 
-#: src/identity/gnunet-service-identity.c:337
+#: src/identity/gnunet-service-identity.c:338
 msgid "no default known"
 msgstr ""
 
-#: src/identity/gnunet-service-identity.c:360
+#: src/identity/gnunet-service-identity.c:362
 msgid "default configured, but ego unknown (internal error)"
 msgstr ""
 
-#: src/identity/gnunet-service-identity.c:437
-#: src/identity/gnunet-service-identity.c:668
-#: src/identity/gnunet-service-identity.c:776
+#: src/identity/gnunet-service-identity.c:439
+#: src/identity/gnunet-service-identity.c:670
+#: src/identity/gnunet-service-identity.c:778
 #, fuzzy, c-format
 msgid "Failed to write subsystem default identifier map to `%s'.\n"
 msgstr "Lỗi đọc danh sách bạn bè từ « %s »\n"
 
-#: src/identity/gnunet-service-identity.c:444
+#: src/identity/gnunet-service-identity.c:446
 msgid "Unknown ego specified for service (internal error)"
 msgstr ""
 
-#: src/identity/gnunet-service-identity.c:514
+#: src/identity/gnunet-service-identity.c:516
 msgid "identifier already in use for another ego"
 msgstr ""
 
-#: src/identity/gnunet-service-identity.c:645
+#: src/identity/gnunet-service-identity.c:647
 msgid "target name already exists"
 msgstr ""
 
-#: src/identity/gnunet-service-identity.c:684
-#: src/identity/gnunet-service-identity.c:793
+#: src/identity/gnunet-service-identity.c:686
+#: src/identity/gnunet-service-identity.c:795
 msgid "no matching ego found"
 msgstr ""
 
-#: src/identity/gnunet-service-identity.c:827
+#: src/identity/gnunet-service-identity.c:829
 #, fuzzy, c-format
 msgid "Failed to parse ego information in `%s'\n"
 msgstr "Lỗi đọc danh sách bạn bè từ « %s »\n"
 
-#: src/identity/gnunet-service-identity.c:900
+#: src/identity/gnunet-service-identity.c:902
 #, fuzzy, c-format
 msgid "Failed to parse subsystem identity configuration file `%s'\n"
 msgstr "Không thể lưu tập tin cấu hình « %s »:"
 
-#: src/identity/gnunet-service-identity.c:912
+#: src/identity/gnunet-service-identity.c:914
 #, fuzzy, c-format
 msgid "Failed to create directory `%s' for storing egos\n"
 msgstr "Lỗi đọc danh sách bạn bè từ « %s »\n"
@@ -4608,45 +4777,52 @@
 msgid "Send ping messages to test connectivity (default == NO)"
 msgstr ""
 
-#: src/mesh/gnunet-mesh.c:146
+#: src/mesh/gnunet-mesh.c:299
 #, fuzzy, c-format
+msgid "Invalid target `%s'\n"
+msgstr "Đối số không hợp lệ cho « %s ».\n"
+
+#: src/mesh/gnunet-mesh.c:417
+#, fuzzy, c-format
 msgid "Invalid tunnel owner `%s'\n"
 msgstr "Địa chỉ IP định dạng sai: %s\n"
 
-#: src/mesh/gnunet-mesh.c:209
+#: src/mesh/gnunet-mesh.c:482
+msgid "You must NOT give a TARGET when using options\n"
+msgstr ""
+
+#: src/mesh/gnunet-mesh.c:559
 #, fuzzy
-msgid "provide information about all tunnels (continuously) NOT IMPLEMENTED"
+msgid "provide information about a particular channel"
 msgstr "In ra thông tin về các đồng đẳng GNUnet."
 
-#: src/mesh/gnunet-mesh.c:212
+#: src/mesh/gnunet-mesh.c:562
 #, fuzzy
-msgid "provide information about a particular tunnel"
+msgid "provide information about a particular connection"
 msgstr "In ra thông tin về các đồng đẳng GNUnet."
 
-#: src/mesh/gnunet-mesh.c:222
+#: src/mesh/gnunet-mesh.c:565
 #, fuzzy
-msgid "Print information about mesh tunnels and peers."
+msgid "provide information about all tunnels"
 msgstr "In ra thông tin về các đồng đẳng GNUnet."
 
-#: src/mesh/gnunet-service-mesh.c:5633 src/mesh/gnunet-service-mesh_peer.c:350
-msgid "Wrong CORE service\n"
+#: src/mesh/gnunet-mesh.c:568
+#, 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:571
+msgid "port to listen to (default; 0)"
 msgstr ""
 
-#: 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-mesh.c:574
+#, fuzzy
+msgid "provide information about a particular tunnel"
+msgstr "In ra thông tin về các đồng đẳng GNUnet."
 
-#: 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"
-msgstr "Lưu cấu hình ngay bây giờ không?"
+#: src/mesh/gnunet-service-mesh_peer.c:349
+msgid "Wrong CORE service\n"
+msgstr ""
 
 #: src/mysql/mysql.c:174
 #, c-format
@@ -4663,31 +4839,36 @@
 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
+#: src/namecache/gnunet-namecache.c:124 src/namestore/gnunet-namestore.c:394
 #, c-format
 msgid "\tCorrupt or unsupported record of type %u\n"
 msgstr ""
 
-#: src/namecache/gnunet-namecache.c:185 src/namestore/gnunet-namestore.c:777
+#: src/namecache/gnunet-namecache.c:185
 #, 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
+#: src/namecache/gnunet-namecache.c:195 src/namestore/gnunet-namestore.c:692
 #, 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
+#: src/namecache/gnunet-namecache.c:203
+#, fuzzy, c-format
+msgid "You must specify a name\n"
+msgstr "Phải ghi rõ tên hiệu\n"
+
+#: src/namecache/gnunet-namecache.c:234 src/namestore/gnunet-namestore.c:925
 msgid "name of the record to add/delete/display"
 msgstr ""
 
-#: src/namecache/gnunet-namecache.c:229
+#: src/namecache/gnunet-namecache.c:237
 #, 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
+#: src/namecache/gnunet-namecache.c:248 src/namestore/gnunet-namestore.c:957
 #, fuzzy
 msgid "GNUnet zone manipulation tool"
 msgstr "Cấu hình GNUnet"
@@ -4702,184 +4883,218 @@
 msgid "Failed to create indices\n"
 msgstr "Không thể tạo miền tên.\n"
 
-#: src/namestore/gnunet-namestore.c:278
+#: src/namestore/gnunet-namestore.c:304
 #, 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:306
+#: src/namestore/gnunet-namestore.c:333
 #, fuzzy, c-format
 msgid "Deleting record failed, record does not exist%s%s\n"
 msgstr "Gặp lỗi khi tải lên tập tin: %s\n"
 
-#: src/namestore/gnunet-namestore.c:313
+#: src/namestore/gnunet-namestore.c:340
 #, 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:528
+#: src/namestore/gnunet-namestore.c:555
 #, fuzzy, c-format
 msgid "No options given\n"
 msgstr "chưa đưa ra tên"
 
-#: src/namestore/gnunet-namestore.c:539
-#: src/namestore/gnunet-namestore-fcfsd.c:964
+#: src/namestore/gnunet-namestore.c:566
+#: src/namestore/gnunet-namestore-fcfsd.c:970
 #, 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: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
+#: src/namestore/gnunet-namestore.c:574 src/namestore/gnunet-namestore.c:583
+#: src/namestore/gnunet-namestore.c:600 src/namestore/gnunet-namestore.c:622
+#: src/namestore/gnunet-namestore.c:662
 #, 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:548 src/namestore/gnunet-namestore.c:557
-#: src/namestore/gnunet-namestore.c:574 src/namestore/gnunet-namestore.c:596
+#: src/namestore/gnunet-namestore.c:575 src/namestore/gnunet-namestore.c:584
+#: src/namestore/gnunet-namestore.c:601 src/namestore/gnunet-namestore.c:623
 msgid "add"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:565
+#: src/namestore/gnunet-namestore.c:592
 #, 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:585
+#: src/namestore/gnunet-namestore.c:612
 #, c-format
 msgid "Value `%s' invalid for record type `%s'\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:621
+#: src/namestore/gnunet-namestore.c:648
 #, fuzzy, c-format
 msgid "Invalid time format `%s'\n"
 msgstr "Địa chỉ IP định dạng sai: %s\n"
 
-#: src/namestore/gnunet-namestore.c:636
+#: src/namestore/gnunet-namestore.c:663
 msgid "del"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:689
+#: src/namestore/gnunet-namestore.c:712
 #: 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:747
+#, fuzzy, c-format
+msgid "Invalid nick `%s'\n"
+msgstr "Dữ liệu nhập không hợp lệ.\n"
+
+#: src/namestore/gnunet-namestore.c:787
 #, c-format
 msgid "Ego `%s' not known to identity service\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:806
+#: src/namestore/gnunet-namestore.c:814
+#, c-format
+msgid "No default ego configured in identity service\n"
+msgstr ""
+
+#: src/namestore/gnunet-namestore.c:847
+#, fuzzy, c-format
+msgid "Identity service is not running\n"
+msgstr "« %s » không phải là một tập tin.\n"
+
+#: src/namestore/gnunet-namestore.c:859
+#, fuzzy, c-format
+msgid "Cannot connect to identity service\n"
+msgstr "Không thể kết nối tới %s:%u: %s\n"
+
+#: src/namestore/gnunet-namestore.c:907
 msgid "add record"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:809
+#: src/namestore/gnunet-namestore.c:910
 msgid "delete record"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:812
+#: src/namestore/gnunet-namestore.c:913
 msgid "display records"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:815
+#: src/namestore/gnunet-namestore.c:916
 msgid ""
 "expiration time for record to use (for adding only), \"never\" is possible"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:818
+#: src/namestore/gnunet-namestore.c:919
 #, fuzzy
+msgid "set the desired nick name for the zone"
+msgstr "In ra thông tin về các đồng đẳng GNUnet."
+
+#: src/namestore/gnunet-namestore.c:922
+#, 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:824
+#: src/namestore/gnunet-namestore.c:928
 #, 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:827
+#: src/namestore/gnunet-namestore.c:931
 msgid "type of the record to add/delete/display"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:830
+#: src/namestore/gnunet-namestore.c:934
 msgid "URI to import into our zone"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:833
+#: src/namestore/gnunet-namestore.c:937
 msgid "value of the record to add/delete"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:836
+#: src/namestore/gnunet-namestore.c:940
 msgid "create or list public record"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:839
+#: src/namestore/gnunet-namestore.c:943
 msgid ""
 "create shadow record (only valid if all other records of the same type have "
 "expired"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:842
+#: src/namestore/gnunet-namestore.c:946
 msgid "name of the ego controlling the zone"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:462
+#: src/namestore/gnunet-namestore-fcfsd.c:464
 #, 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:489
+#: src/namestore/gnunet-namestore-fcfsd.c:491
 #, 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:524
+#: src/namestore/gnunet-namestore-fcfsd.c:525
 #, c-format
 msgid "Found existing name `%s' for the given key\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:590
+#: src/namestore/gnunet-namestore-fcfsd.c:534
+msgid "Error when mapping zone to name\n"
+msgstr ""
+
+#: src/namestore/gnunet-namestore-fcfsd.c:596
 #, c-format
 msgid "Found %u existing records for domain `%s'\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:646
+#: src/namestore/gnunet-namestore-fcfsd.c:652
 #, 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:662
+#: src/namestore/gnunet-namestore-fcfsd.c:668
 #, 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:698
+#: src/namestore/gnunet-namestore-fcfsd.c:704
 msgid "Domain name must not contain `.'\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:706
+#: src/namestore/gnunet-namestore-fcfsd.c:712
 msgid "Domain name must not contain `+'\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:904
+#: src/namestore/gnunet-namestore-fcfsd.c:910
 msgid "No ego configured for `fcfsd` subsystem\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:930
+#: src/namestore/gnunet-namestore-fcfsd.c:936
 #, fuzzy
 msgid "Failed to start HTTP server\n"
 msgstr "Lỗi bắt đầu thu thập.\n"
 
-#: src/namestore/gnunet-namestore-fcfsd.c:999
+#: src/namestore/gnunet-namestore-fcfsd.c:978
+#, fuzzy
+msgid "Failed to connect to identity\n"
+msgstr "Lỗi kết nối đến gnunetd.\n"
+
+#: src/namestore/gnunet-namestore-fcfsd.c:1011
 msgid "GNU Name System First Come First Serve name registration service"
 msgstr ""
 
-#: src/namestore/gnunet-service-namestore.c:494
+#: src/namestore/gnunet-service-namestore.c:634
 #, 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:273
+#: src/namestore/namestore_api.c:275
 msgid "Namestore failed to store record\n"
 msgstr ""
 
@@ -4985,12 +5200,12 @@
 msgid "`upnpc' command not found\n"
 msgstr ""
 
-#: src/nat/nat_test.c:341
+#: src/nat/nat_test.c:345
 #, fuzzy
 msgid "Failed to connect to `gnunet-nat-server'\n"
 msgstr "Lỗi kết nối đến gnunetd.\n"
 
-#: src/nat/nat_test.c:411
+#: src/nat/nat_test.c:414
 #, c-format
 msgid "Failed to create listen socket bound to `%s' for NAT test: %s\n"
 msgstr ""
@@ -5025,13 +5240,13 @@
 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:1460
-#: src/revocation/gnunet-service-revocation.c:580
+#: src/nse/gnunet-service-nse.c:1461
+#: src/revocation/gnunet-service-revocation.c:789
 #, 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
+#: src/nse/gnunet-service-nse.c:1488
 msgid "NSE service is lacking key configuration settings.  Exiting.\n"
 msgstr ""
 
@@ -5040,21 +5255,21 @@
 msgid "Removing expired address of transport `%s'\n"
 msgstr "Đã nạp truyền tải « %s »\n"
 
-#: src/peerinfo/gnunet-service-peerinfo.c:352
+#: src/peerinfo/gnunet-service-peerinfo.c:354
 #, 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:369
+#: src/peerinfo/gnunet-service-peerinfo.c:373
 #, 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:447
+#: src/peerinfo/gnunet-service-peerinfo.c:457
 msgid "# peers known"
 msgstr ""
 
-#: src/peerinfo/gnunet-service-peerinfo.c:483
+#: src/peerinfo/gnunet-service-peerinfo.c:494
 #, c-format
 msgid ""
 "File `%s' in directory `%s' does not match naming convention. Removed.\n"
@@ -5062,22 +5277,22 @@
 "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:638
+#: src/peerinfo/gnunet-service-peerinfo.c:644
 #, 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:643
+#: src/peerinfo/gnunet-service-peerinfo.c:649
 #, 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:979
+#: src/peerinfo/gnunet-service-peerinfo.c:985
 #, 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:1269
+#: src/peerinfo/gnunet-service-peerinfo.c:1275
 #, c-format
 msgid "Importing HELLOs from `%s'\n"
 msgstr ""
@@ -5339,69 +5554,75 @@
 msgid "SQLite database running\n"
 msgstr "kho dữ liệu sqlite"
 
-#: src/pt/gnunet-daemon-pt.c:483
+#: src/pt/gnunet-daemon-pt.c:482
 msgid "Failed to pack DNS request.  Dropping.\n"
 msgstr ""
 
-#: src/pt/gnunet-daemon-pt.c:489
+#: src/pt/gnunet-daemon-pt.c:488
 #, 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:542
+#: src/pt/gnunet-daemon-pt.c:541
 msgid "# DNS records modified"
 msgstr ""
 
-#: src/pt/gnunet-daemon-pt.c:718
+#: src/pt/gnunet-daemon-pt.c:717
 #, fuzzy
 msgid "# DNS replies intercepted"
 msgstr "# các đáp ứng dht được định tuyến"
 
-#: src/pt/gnunet-daemon-pt.c:724
+#: src/pt/gnunet-daemon-pt.c:723
 msgid "Failed to parse DNS request.  Dropping.\n"
 msgstr ""
 
-#: src/pt/gnunet-daemon-pt.c:827
+#: src/pt/gnunet-daemon-pt.c:826
 #, 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:884
+#: src/pt/gnunet-daemon-pt.c:883
 #, 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:889
+#: src/pt/gnunet-daemon-pt.c:888
 #, fuzzy
-msgid "# DNS requests dropped (DNS mesh tunnel down)"
+msgid "# DNS requests dropped (DNS mesh channel down)"
 msgstr "# các yêu cầu lỗ hổng bị bỏ do trọng tải"
 
-#: src/pt/gnunet-daemon-pt.c:897
+#: src/pt/gnunet-daemon-pt.c:896
 #, 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:970
+#: src/pt/gnunet-daemon-pt.c:969
 #, 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:986
+#: src/pt/gnunet-daemon-pt.c:985
 #, fuzzy
 msgid "# DNS replies dropped (too late?)"
 msgstr "# các đáp ứng dht được định tuyến"
 
-#: 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
+#: src/pt/gnunet-daemon-pt.c:1261 src/pt/gnunet-daemon-pt.c:1270
+#: src/pt/gnunet-daemon-pt.c:1290 src/pt/gnunet-daemon-pt.c:1301
+#: src/pt/gnunet-daemon-pt.c:1310
 #, 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:1348
+#: src/pt/gnunet-daemon-pt.c:1347
 msgid "Daemon to run to perform IP protocol translation to GNUnet"
 msgstr ""
 
+#: src/regex/gnunet-daemon-regexprofiler.c:270
+#: src/regex/gnunet-regex-simulation-profiler.c: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/regex/gnunet-daemon-regexprofiler.c:380
 msgid "Daemon to announce regular expressions for the peer using mesh."
 msgstr ""
@@ -5552,94 +5773,112 @@
 "Testing and revoking at the same time is not allowed, only executing test.\n"
 msgstr ""
 
-#: src/revocation/gnunet-revocation.c:451
+#: src/revocation/gnunet-revocation.c:436
+#, fuzzy
+msgid "No filename to store revocation certificate given.\n"
+msgstr "Lỗi đọc danh sách bạn bè từ « %s »\n"
+
+#: src/revocation/gnunet-revocation.c:458
 #, 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
+#: src/revocation/gnunet-revocation.c:483
 #, 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
+#: src/revocation/gnunet-revocation.c:499
 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 "
+#: src/revocation/gnunet-revocation.c:502
+msgid ""
+"revoke the private key associated for the 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"
+#: src/revocation/gnunet-revocation.c:505
+msgid "actually perform revocation, otherwise we just do the precomputation"
 msgstr ""
 
-#: src/revocation/gnunet-revocation.c:501
+#: src/revocation/gnunet-revocation.c:508
 msgid "test if the public key KEY has been revoked"
 msgstr ""
 
-#: src/revocation/gnunet-service-revocation.c:250
+#: src/revocation/gnunet-service-revocation.c:272
 msgid "Duplicate revocation received from peer. Ignored.\n"
 msgstr ""
 
-#: src/revocation/gnunet-service-revocation.c:599
+#: src/revocation/gnunet-service-revocation.c:434
+#, c-format
+msgid "Error computing revocation set union with %s\n"
+msgstr ""
+
+#: src/revocation/gnunet-service-revocation.c:486
+msgid "SET service crashed, terminating revocation service\n"
+msgstr ""
+
+#: src/revocation/gnunet-service-revocation.c:812
 #, fuzzy
 msgid "Could not open revocation database file!"
 msgstr "« %s »: Không thể kết nối.\n"
 
-#: src/scalarproduct/gnunet-scalarproduct.c:194
+#: src/scalarproduct/gnunet-scalarproduct.c:225
 #, 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:200
+#: src/scalarproduct/gnunet-scalarproduct.c:232
 msgid "This program needs a session identifier for comparing vectors.\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-scalarproduct.c:206
+#: src/scalarproduct/gnunet-scalarproduct.c:239
 msgid "Please give a session key for --input_key!\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-scalarproduct.c:215
+#: src/scalarproduct/gnunet-scalarproduct.c:251
 #, 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:239
-#: src/scalarproduct/gnunet-scalarproduct.c:297
+#: src/scalarproduct/gnunet-scalarproduct.c:276
 #, 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:246
+#: src/scalarproduct/gnunet-scalarproduct.c:284
 msgid "Need elements to compute the vectorproduct, got none.\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-scalarproduct.c:347
+#: src/scalarproduct/gnunet-scalarproduct.c:336
+#, fuzzy, c-format
+msgid "Could not convert `%s' to integer.\n"
+msgstr "Không thể kết nối tới %s:%u: %s\n"
+
+#: src/scalarproduct/gnunet-scalarproduct.c:397
 msgid ""
 "A comma separated list of elements to compare as vector with our remote peer."
 msgstr ""
 
-#: src/scalarproduct/gnunet-scalarproduct.c:350
+#: src/scalarproduct/gnunet-scalarproduct.c:400
 msgid ""
 "A comma separated mask to select which elements should actually be compared."
 msgstr ""
 
-#: src/scalarproduct/gnunet-scalarproduct.c:353
+#: src/scalarproduct/gnunet-scalarproduct.c:403
 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:356
+#: src/scalarproduct/gnunet-scalarproduct.c:406
 msgid "Transaction ID shared with peer."
 msgstr ""
 
-#: src/scalarproduct/gnunet-scalarproduct.c:365
+#: src/scalarproduct/gnunet-scalarproduct.c:415
 msgid "Calculate the Vectorproduct with a GNUnet peer."
 msgstr ""
 
@@ -5648,142 +5887,143 @@
 msgid "Generated key set with key length %d bits.\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:775
+#: src/scalarproduct/gnunet-service-scalarproduct.c:776
 #, 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:847
-#: src/scalarproduct/gnunet-service-scalarproduct.c:936
+#: src/scalarproduct/gnunet-service-scalarproduct.c:848
+#: src/scalarproduct/gnunet-service-scalarproduct.c:938
 #, 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:853
+#: src/scalarproduct/gnunet-service-scalarproduct.c:854
 #, c-format
 msgid "Sending session-end notification to client (%p) for session %s\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:946
+#: src/scalarproduct/gnunet-service-scalarproduct.c:948
 #, c-format
 msgid "Sent result to client (%p), this session (%s) has ended!\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1025
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1163
+#: src/scalarproduct/gnunet-service-scalarproduct.c:1027
+#: src/scalarproduct/gnunet-service-scalarproduct.c:1165
 msgid "Could not send service-response message via mesh!)\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1376
+#: src/scalarproduct/gnunet-service-scalarproduct.c:1391
 #, c-format
 msgid "Failed to communicate with `%s', scalar product calculation aborted.\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1476
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1603
+#: src/scalarproduct/gnunet-service-scalarproduct.c:1495
+#: src/scalarproduct/gnunet-service-scalarproduct.c:1622
 #, fuzzy
 msgid "Transmitting service request.\n"
 msgstr "Đang nạp và khởi động dùng « %s ».\n"
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1485
+#: src/scalarproduct/gnunet-service-scalarproduct.c:1504
 #, fuzzy
-msgid "Could not send service-request multipart message to tunnel!\n"
+msgid "Could not send service-request multipart message to channel!\n"
 msgstr "Không thể đọc danh sách bạn bè « %s »\n"
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1525
+#: src/scalarproduct/gnunet-service-scalarproduct.c:1544
 #, fuzzy, c-format
-msgid "Successfully created new tunnel to peer (%s)!\n"
+msgid "Successfully created new channel to peer (%s)!\n"
 msgstr "Không đủ quyền cho « %s ».\n"
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1612
+#: src/scalarproduct/gnunet-service-scalarproduct.c:1631
 #, fuzzy
-msgid "Could not send message to tunnel!\n"
+msgid "Could not send message to channel!\n"
 msgstr "Không thể đọc danh sách bạn bè « %s »\n"
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1669
+#: src/scalarproduct/gnunet-service-scalarproduct.c:1688
 #, 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:1682
+#: src/scalarproduct/gnunet-service-scalarproduct.c:1701
 #, 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:1693
+#: src/scalarproduct/gnunet-service-scalarproduct.c:1712
 #, c-format
 msgid ""
 "Duplicate session information received, cannot create new session with key `"
 "%s'\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1713
+#: src/scalarproduct/gnunet-service-scalarproduct.c:1733
 #, c-format
 msgid ""
-"Got client-request-session with key %s, preparing tunnel to remote service.\n"
+"Got client-request-session with key %s, preparing channel to remote "
+"service.\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1749
+#: src/scalarproduct/gnunet-service-scalarproduct.c:1772
 #, c-format
-msgid "Creating new tunnel for session with key %s.\n"
+msgid "Creating new channel for session with key %s.\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1794
+#: src/scalarproduct/gnunet-service-scalarproduct.c:1819
 #, 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:1802
+#: src/scalarproduct/gnunet-service-scalarproduct.c:1830
 #, 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:1828
+#: src/scalarproduct/gnunet-service-scalarproduct.c:1860
 #, fuzzy, c-format
-msgid "New incoming tunnel from peer %s.\n"
+msgid "New incoming channel from peer %s.\n"
 msgstr "« %.*s » được kết nối tới « %.*s ».\n"
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1859
+#: src/scalarproduct/gnunet-service-scalarproduct.c:1892
 #, c-format
 msgid "Peer disconnected, terminating session %s with peer (%s)\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:2047
-#: src/scalarproduct/gnunet-service-scalarproduct.c:2196
+#: src/scalarproduct/gnunet-service-scalarproduct.c:2083
+#: src/scalarproduct/gnunet-service-scalarproduct.c:2242
 #, c-format
 msgid "Got session with key %s and a matching element set, processing.\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:2054
-#: src/scalarproduct/gnunet-service-scalarproduct.c:2203
+#: src/scalarproduct/gnunet-service-scalarproduct.c:2092
+#: src/scalarproduct/gnunet-service-scalarproduct.c:2249
 #, c-format
 msgid "Got session with key %s without a matching element set, queueing.\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:2142
+#: src/scalarproduct/gnunet-service-scalarproduct.c:2187
 #, c-format
 msgid ""
 "Got message with duplicate session key (`%s'), ignoring service request.\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:2425
+#: src/scalarproduct/gnunet-service-scalarproduct.c:2471
 msgid "Shutting down, initiating cleanup.\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:2490
+#: src/scalarproduct/gnunet-service-scalarproduct.c:2536
 msgid "Generating Paillier-Keyset.\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:2505
+#: src/scalarproduct/gnunet-service-scalarproduct.c:2551
 #, fuzzy
 msgid "Connect to MESH failed\n"
 msgstr " Không kết nối được (lỗi ?)\n"
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:2509
+#: src/scalarproduct/gnunet-service-scalarproduct.c:2555
 #, fuzzy
 msgid "Mesh initialized\n"
 msgstr "Lỗi sơ khởi lõi.\n"
@@ -5816,6 +6056,11 @@
 msgid "Failed to send a message to the scalarproduct service\n"
 msgstr "Lỗi kết nối đến gnunetd.\n"
 
+#: src/set/gnunet-service-set.c:1399
+#, fuzzy
+msgid "Could not connect to mesh service\n"
+msgstr "Không thể kết nối tới %s:%u: %s\n"
+
 #: src/set/gnunet-set-ibf-profiler.c:221
 #, fuzzy
 msgid "number of element in set A-B"
@@ -5955,16 +6200,16 @@
 "Cannot open %s for writing load statistics.  Not logging load statistics\n"
 msgstr ""
 
-#: src/testbed/gnunet-service-testbed_peers.c:1012
+#: src/testbed/gnunet-service-testbed_peers.c:1015
 #, fuzzy
 msgid "Misconfiguration (can't connect to the ARM service)"
 msgstr "Lỗi kết nối đến gnunetd.\n"
 
-#: src/testbed/gnunet-service-testbed_peers.c:1018
+#: src/testbed/gnunet-service-testbed_peers.c:1021
 msgid "Request doesn't fit into a message"
 msgstr ""
 
-#: src/testbed/gnunet-service-testbed_peers.c:1056
+#: src/testbed/gnunet-service-testbed_peers.c:1059
 #, fuzzy, c-format
 msgid "%s service can't be started because ARM is shutting down"
 msgstr "« %s » đang tắt.\n"
@@ -6080,44 +6325,44 @@
 "free topology cannot be more than %u.  Given `%s = %llu'"
 msgstr ""
 
-#: src/testbed/testbed_api_topology.c:716
+#: src/testbed/testbed_api_topology.c:715
 #, fuzzy, c-format
 msgid "Topology file %s not found\n"
 msgstr "Khoá phiên chạy từ đồng đẳng « %s » không thể được thẩm tra.\n"
 
-#: src/testbed/testbed_api_topology.c:722
+#: src/testbed/testbed_api_topology.c:721
 #, fuzzy, c-format
 msgid "Topology file %s has no data\n"
 msgstr "Khoá phiên chạy từ đồng đẳng « %s » không thể được thẩm tra.\n"
 
-#: src/testbed/testbed_api_topology.c:729
+#: src/testbed/testbed_api_topology.c:728
 #, fuzzy, c-format
 msgid "Topology file %s cannot be read\n"
 msgstr "Khoá phiên chạy từ đồng đẳng « %s » không thể được thẩm tra.\n"
 
-#: src/testbed/testbed_api_topology.c:751
+#: src/testbed/testbed_api_topology.c:750
 #, fuzzy, c-format
 msgid "Failed to read peer index from toology file: %s"
 msgstr "Không thể truy cập đến tập tin gnunet-directory « %s »\n"
 
-#: src/testbed/testbed_api_topology.c:760
-#: src/testbed/testbed_api_topology.c:784
+#: src/testbed/testbed_api_topology.c:759
+#: src/testbed/testbed_api_topology.c:783
 #, c-format
 msgid "Value in given topology file: %s out of range\n"
 msgstr ""
 
-#: src/testbed/testbed_api_topology.c:766
-#: src/testbed/testbed_api_topology.c:790
+#: src/testbed/testbed_api_topology.c:765
+#: src/testbed/testbed_api_topology.c:789
 #, fuzzy, c-format
 msgid "Failed to read peer index from topology file: %s"
 msgstr "Không thể truy cập đến tập tin gnunet-directory « %s »\n"
 
-#: src/testbed/testbed_api_topology.c:772
-#: src/testbed/testbed_api_topology.c:796
+#: src/testbed/testbed_api_topology.c:771
+#: src/testbed/testbed_api_topology.c:795
 msgid "Topology file needs more peers than given ones\n"
 msgstr ""
 
-#: src/testbed/testbed_api_topology.c:811
+#: src/testbed/testbed_api_topology.c:810
 #, fuzzy, c-format
 msgid "Ignoring to connect peer %u to peer %u\n"
 msgstr "đang kết nối đồng đẳng %s:%d tới đồng đẳng %s:%d\n"
@@ -6166,7 +6411,7 @@
 msgid "Hostkeys file not found: %s\n"
 msgstr ""
 
-#: src/testing/testing.c:293
+#: src/testing/testing.c:293 src/util/gnunet-ecc.c:217
 #, c-format
 msgid "Incorrect hostkey file format: %s\n"
 msgstr ""
@@ -6207,17 +6452,17 @@
 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:1235
+#: src/testing/testing.c:1238
 #, 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:1335
+#: src/testing/testing.c:1340
 #, fuzzy, c-format
 msgid "Failed to start `%s': %s\n"
 msgstr "Lỗi chạy %s: %s %d\n"
 
-#: src/testing/testing.c:1699
+#: src/testing/testing.c:1704
 #, 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 »:"
@@ -6311,57 +6556,58 @@
 msgid "# disconnects due to blacklist"
 msgstr ""
 
-#: src/transport/gnunet-service-transport.c:163
+#: src/transport/gnunet-service-transport.c:160
 #, fuzzy
-msgid "# bytes payload discarded due to not connected peer "
+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:229
+#: src/transport/gnunet-service-transport.c:250
 #, fuzzy
 msgid "# bytes total received"
 msgstr "# tổng số nội dung lỗ hổng được nhận"
 
-#: src/transport/gnunet-service-transport.c:277
+#: src/transport/gnunet-service-transport.c:325
 #, fuzzy
 msgid "# bytes payload received"
 msgstr "# các byte đã giải mã"
 
-#: src/transport/gnunet-service-transport.c:429
+#: src/transport/gnunet-service-transport.c:479
 #, 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:479
+#: src/transport/gnunet-service-transport.c:529
 #, 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:760
-msgid "Transport service is lacking key configuration settings.  Exiting.\n"
-msgstr ""
+#: src/transport/gnunet-service-transport.c:820
+#, fuzzy
+msgid "Transport service is lacking key configuration settings. Exiting.\n"
+msgstr "Lưu cấu hình ngay bây giờ không?"
 
-#: src/transport/gnunet-service-transport_clients.c:389
+#: src/transport/gnunet-service-transport_clients.c:384
 #, c-format
 msgid "Dropping message of type %u and size %u, have %u/%u messages pending\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_clients.c:394
+#: src/transport/gnunet-service-transport_clients.c:391
 #, fuzzy
 msgid "# messages dropped due to slow client"
 msgstr "# các yêu cầu lỗ hổng bị bỏ do trọng tải"
 
-#: src/transport/gnunet-service-transport_clients.c:536
+#: src/transport/gnunet-service-transport_clients.c:533
 #, c-format
 msgid "Rejecting control connection from peer `%s', which is not me!\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_clients.c:672
+#: src/transport/gnunet-service-transport_clients.c:674
 msgid "# bytes payload dropped (other peer was not connected)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_clients.c:728
+#: src/transport/gnunet-service-transport_clients.c:731
 #, fuzzy
 msgid "# REQUEST CONNECT messages received"
 msgstr "# các thông báo PONG đã mật mã được nhận"
@@ -6370,117 +6616,157 @@
 msgid "# refreshed my HELLO"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1080
+#: src/transport/gnunet-service-transport_neighbours.c:1074
 #, 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:1210
-#: src/transport/gnunet-service-transport_neighbours.c:1545
+#: src/transport/gnunet-service-transport_neighbours.c:1206
+#: src/transport/gnunet-service-transport_neighbours.c:1541
 #, 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:1215
+#: src/transport/gnunet-service-transport_neighbours.c:1211
 #, fuzzy
 msgid "# messages transmitted to other peers"
 msgstr "# các byte kiểu %d được gửi "
 
-#: src/transport/gnunet-service-transport_neighbours.c:1220
+#: src/transport/gnunet-service-transport_neighbours.c:1216
 #, 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:1277
+#: src/transport/gnunet-service-transport_neighbours.c:1273
 msgid "# messages timed out while in transport queue"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1319
+#: src/transport/gnunet-service-transport_neighbours.c:1315
 #, fuzzy
 msgid "# keepalives sent"
 msgstr "# các khoá phiên chạy được gửi"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1343
+#: src/transport/gnunet-service-transport_neighbours.c:1339
 #, 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:1351
+#: src/transport/gnunet-service-transport_neighbours.c:1347
 #, 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:1384
+#: src/transport/gnunet-service-transport_neighbours.c:1380
 #, 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:1393
+#: src/transport/gnunet-service-transport_neighbours.c:1389
 #, 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:1450
+#: src/transport/gnunet-service-transport_neighbours.c:1446
 #, 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:1484
+#: src/transport/gnunet-service-transport_neighbours.c:1480
 #, 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:1500
+#: src/transport/gnunet-service-transport_neighbours.c:1496
 msgid "# ms throttling suggested"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:2775
+#: src/transport/gnunet-service-transport_neighbours.c:1585
 #, fuzzy
+msgid "# SESSION_CONNECT messages sent"
+msgstr "# các thông báo PONG đã mật mã được nhận"
+
+#: src/transport/gnunet-service-transport_neighbours.c:1601
+#, fuzzy, c-format
+msgid "Failed to transmit CONNECT message via plugin to %s\n"
+msgstr "Lỗi sơ khởi dịch vụ « %s ».\n"
+
+#: src/transport/gnunet-service-transport_neighbours.c:1641
+#, fuzzy
+msgid "# CONNECT_ACK messages sent"
+msgstr "# các thông báo PONG đã mật mã được nhận"
+
+#: src/transport/gnunet-service-transport_neighbours.c:2106
+#, fuzzy
+msgid "# CONNECT messages received"
+msgstr "# các thông báo PONG đã mật mã được nhận"
+
+#: src/transport/gnunet-service-transport_neighbours.c:2111
+#, c-format
+msgid "CONNECT request from peer `%s' ignored due impending shutdown\n"
+msgstr ""
+
+#: src/transport/gnunet-service-transport_neighbours.c:2824
+#, fuzzy
+msgid "# CONNECT_ACK messages received"
+msgstr "# các thông báo PONG đã mật mã được nhận"
+
+#: src/transport/gnunet-service-transport_neighbours.c:2832
+#, fuzzy
 msgid "# unexpected CONNECT_ACK messages (no peer)"
 msgstr "gửi ĐẾM thông báo"
 
-#: src/transport/gnunet-service-transport_neighbours.c:2790
-#: src/transport/gnunet-service-transport_neighbours.c:2821
+#: src/transport/gnunet-service-transport_neighbours.c:2847
+#: src/transport/gnunet-service-transport_neighbours.c:2882
 #, fuzzy
 msgid "# unexpected CONNECT_ACK messages (not ready)"
 msgstr "gửi ĐẾM thông báo"
 
-#: src/transport/gnunet-service-transport_neighbours.c:2834
+#: src/transport/gnunet-service-transport_neighbours.c:2895
 #, fuzzy
 msgid "# unexpected CONNECT_ACK messages (waiting on ATS)"
 msgstr "gửi ĐẾM thông báo"
 
-#: src/transport/gnunet-service-transport_neighbours.c:2865
+#: src/transport/gnunet-service-transport_neighbours.c:2926
 #, fuzzy
 msgid "# unexpected CONNECT_ACK messages (disconnecting)"
 msgstr "gửi ĐẾM thông báo"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3045
+#: src/transport/gnunet-service-transport_neighbours.c:3106
 #, fuzzy
-msgid "# unexpected SESSION ACK messages"
+msgid "# SESSION_ACK messages received"
+msgstr "# các thông báo PONG đã mật mã được nhận"
+
+#: src/transport/gnunet-service-transport_neighbours.c:3122
+#, 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:3098
+#: src/transport/gnunet-service-transport_neighbours.c:3176
 msgid "# SET QUOTA messages ignored (no such peer)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3112
+#: src/transport/gnunet-service-transport_neighbours.c:3190
 msgid "# disconnects due to quota of 0"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3143
+#: src/transport/gnunet-service-transport_neighbours.c:3220
 msgid "# disconnect messages ignored (old format)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3154
+#: src/transport/gnunet-service-transport_neighbours.c:3226
+#, fuzzy
+msgid "# DISCONNECT messages received"
+msgstr "# các thông báo PONG đã mật mã được nhận"
+
+#: src/transport/gnunet-service-transport_neighbours.c:3235
 msgid "# disconnect messages ignored (timestamp)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3193
+#: src/transport/gnunet-service-transport_neighbours.c:3271
 msgid "# other peer asked to disconnect from us"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3288
+#: src/transport/gnunet-service-transport_neighbours.c:3366
 #, 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"
@@ -6497,11 +6783,12 @@
 #: src/transport/gnunet-service-transport_plugins.c:210
 #: src/transport/gnunet-service-transport_plugins.c:218
 #: src/transport/gnunet-service-transport_plugins.c:226
+#: src/transport/gnunet-service-transport_plugins.c:234
 #, fuzzy, c-format
 msgid "Missing function `%s' in transport plugin for `%s'\n"
 msgstr "Không thể nạp phần bổ sung truyền tải « %s »\n"
 
-#: src/transport/gnunet-service-transport_plugins.c:233
+#: src/transport/gnunet-service-transport_plugins.c:241
 #, fuzzy, c-format
 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"
@@ -6510,72 +6797,89 @@
 msgid "# address records discarded"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:519
+#: src/transport/gnunet-service-transport_validation.c:526
 #, 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:577
+#: src/transport/gnunet-service-transport_validation.c:584
 #, 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:662
+#: src/transport/gnunet-service-transport_validation.c:685
 msgid "# address revalidations started"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:933
+#: src/transport/gnunet-service-transport_validation.c:969
 #, 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:992
+#: src/transport/gnunet-service-transport_validation.c:1019
+#, c-format
+msgid "Plugin `%s' not available, cannot confirm having this address\n"
+msgstr ""
+
+#: src/transport/gnunet-service-transport_validation.c:1029
 msgid "# failed address checks during validation"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1002
+#: src/transport/gnunet-service-transport_validation.c:1032
+#, c-format
+msgid "Address `%s' is not one of my addresses, not confirming PING\n"
+msgstr ""
+
+#: src/transport/gnunet-service-transport_validation.c:1040
 msgid "# successful address checks during validation"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1021
+#: src/transport/gnunet-service-transport_validation.c:1052
 #, c-format
+msgid ""
+"Not confirming PING from peer `%s' with address `%s' since I cannot confirm "
+"having this address.\n"
+msgstr ""
+
+#: src/transport/gnunet-service-transport_validation.c:1060
+#, c-format
 msgid "Received a PING message with validation bug from `%s'\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1075
+#: src/transport/gnunet-service-transport_validation.c:1114
 #, 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:1124
+#: src/transport/gnunet-service-transport_validation.c:1163
 msgid "# PONGs unicast via reliable transport"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1133
+#: src/transport/gnunet-service-transport_validation.c:1172
 msgid "# PONGs multicast to all available addresses"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1260
+#: src/transport/gnunet-service-transport_validation.c:1312
 msgid "# PONGs dropped, no matching pending validation"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1275
+#: src/transport/gnunet-service-transport_validation.c:1327
 msgid "# PONGs dropped, signature expired"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1381
+#: src/transport/gnunet-service-transport_validation.c:1448
 #, 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:259
+#: src/transport/gnunet-transport.c:258
 #, 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:266
+#: src/transport/gnunet-transport.c:265
 #, fuzzy, c-format
 msgid "Received %llu bytes/s (%llu bytes in %s)\n"
 msgstr "Nhận yêu cầu định tuyến\n"
@@ -6595,128 +6899,128 @@
 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:422
+#: src/transport/gnunet-transport.c:423
 msgid "No transport plugins configured, peer will never communicate\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:435
+#: src/transport/gnunet-transport.c:436
 #, c-format
 msgid "No port configured for plugin `%s', cannot test it\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:499
+#: src/transport/gnunet-transport.c:506
 #, 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:522
+#: src/transport/gnunet-transport.c:529
 #, fuzzy, c-format
 msgid "Successfully connected to `%s'\n"
 msgstr "Không đủ quyền cho « %s ».\n"
 
-#: src/transport/gnunet-transport.c:545
+#: src/transport/gnunet-transport.c:552
 #, c-format
 msgid ""
 "Successfully connected to `%s', starting to send benchmark data in %u Kb "
 "blocks\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:580
+#: src/transport/gnunet-transport.c:587
 #, 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:650
+#: src/transport/gnunet-transport.c:660
 #, 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:673
+#: src/transport/gnunet-transport.c:685
 #, fuzzy, c-format
 msgid "Peer `%s': %s %s\n"
 msgstr "Tôi là đồng đẳng « %s ».\n"
 
-#: src/transport/gnunet-transport.c:688
+#: src/transport/gnunet-transport.c:704
 #, c-format
 msgid "Peer `%s': %s <unable to resolve address>\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:752
+#: src/transport/gnunet-transport.c:772
 #, fuzzy, c-format
 msgid "Peer `%s' disconnected\n"
 msgstr "# của các đồng đẳng đã kết nối"
 
-#: src/transport/gnunet-transport.c:780
+#: src/transport/gnunet-transport.c:802
 #, 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:825
+#: src/transport/gnunet-transport.c:848
 #, c-format
 msgid ""
 "Multiple operations given. Please choose only one operation: %s, %s, %s, %s, "
 "%s, %s\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:831
+#: src/transport/gnunet-transport.c:855
 #, c-format
 msgid ""
 "No operation given. Please choose one operation: %s, %s, %s, %s, %s, %s\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:851 src/transport/gnunet-transport.c:881
-#: src/transport/gnunet-transport.c:903 src/transport/gnunet-transport.c:940
+#: src/transport/gnunet-transport.c:878 src/transport/gnunet-transport.c:910
+#: src/transport/gnunet-transport.c:932 src/transport/gnunet-transport.c:969
 #, fuzzy
 msgid "Failed to connect to transport service\n"
 msgstr "Lỗi kết nối đến gnunetd.\n"
 
-#: src/transport/gnunet-transport.c:858 src/transport/gnunet-transport.c:888
+#: src/transport/gnunet-transport.c:887 src/transport/gnunet-transport.c:917
 #, 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:908
+#: src/transport/gnunet-transport.c:937
 msgid "Starting to receive benchmark data\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:990
+#: src/transport/gnunet-transport.c:1019
 msgid "measure how fast we are receiving data from all peers (until CTRL-C)"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:993
+#: src/transport/gnunet-transport.c:1022
 #, fuzzy
 msgid "connect to a peer"
 msgstr "Lỗi kết nối đến gnunetd.\n"
 
-#: src/transport/gnunet-transport.c:996
+#: src/transport/gnunet-transport.c:1025
 #, 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:1002
+#: src/transport/gnunet-transport.c:1031
 #, 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:1005
+#: src/transport/gnunet-transport.c:1034
 #, fuzzy
 msgid "do not resolve hostnames"
 msgstr "không quyết định các tên máy"
 
-#: src/transport/gnunet-transport.c:1008
+#: src/transport/gnunet-transport.c:1037
 msgid "peer identity"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1012
+#: src/transport/gnunet-transport.c:1041
 msgid "send data for benchmarking to the other peer (until CTRL-C)"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1015
+#: src/transport/gnunet-transport.c:1044
 msgid "test transport configuration (involves external server)"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1026
+#: src/transport/gnunet-transport.c:1055
 #, fuzzy
 msgid "Direct access to transport service."
 msgstr "Lỗi kết nối đến gnunetd.\n"
@@ -6732,7 +7036,7 @@
 
 #: src/transport/plugin_transport_bluetooth.c:681
 #: src/transport/plugin_transport_bluetooth.c:731
-#: src/transport/plugin_transport_bluetooth.c:1837
+#: src/transport/plugin_transport_bluetooth.c:1854
 #, fuzzy
 msgid "# Bluetooth sessions allocated"
 msgstr "# các khoá phiên chạy được chấp nhận"
@@ -6748,412 +7052,380 @@
 
 #: src/transport/plugin_transport_bluetooth.c:938
 #: src/transport/plugin_transport_bluetooth.c:1023
-#: src/transport/plugin_transport_bluetooth.c:1839
+#: src/transport/plugin_transport_bluetooth.c:1856
 #, 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:1218
+#: src/transport/plugin_transport_bluetooth.c:1235
 #, 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:1244
+#: src/transport/plugin_transport_bluetooth.c:1261
 #, fuzzy
 msgid "# fragments received via Bluetooth"
 msgstr "# các mảnh bị loại bỏ"
 
-#: src/transport/plugin_transport_bluetooth.c:1254
+#: src/transport/plugin_transport_bluetooth.c:1271
 #, fuzzy
 msgid "# ACKs received via Bluetooth"
 msgstr "# các byte đã nhận qua TCP"
 
-#: src/transport/plugin_transport_bluetooth.c:1311
+#: src/transport/plugin_transport_bluetooth.c:1328
 #, 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:1423
+#: src/transport/plugin_transport_bluetooth.c:1440
 #, 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:1458
+#: src/transport/plugin_transport_bluetooth.c:1475
 #, 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:1521
+#: src/transport/plugin_transport_bluetooth.c:1538
 #, fuzzy
 msgid "# HELLO beacons sent via Bluetooth"
 msgstr "# các byte đã gửi qua UDP"
 
-#: src/transport/plugin_transport_bluetooth.c:1634
+#: src/transport/plugin_transport_bluetooth.c:1651
 msgid "Bluetooth address with invalid size encountered\n"
 msgstr ""
 
-#: src/transport/plugin_transport_bluetooth.c:1818
+#: src/transport/plugin_transport_bluetooth.c:1835
 #, 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: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: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: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: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:2530
+#: src/transport/plugin_transport_http_client.c:1590
 #, 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: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:2721
-#, fuzzy
-msgid "Port is required! Fix in configuration\n"
-msgstr ""
-"\n"
-"Kết thúc cấu hình.\n"
-
-#: src/transport/plugin_transport_http.c:1155
-msgid "Port 0, client only mode\n"
-msgstr ""
-
-#: src/transport/plugin_transport_http.c:1175
-#, c-format
-msgid ""
-"Specific IPv4 address `%s' for plugin %s in configuration file is invalid! "
-"Binding to all addresses!\n"
-msgstr ""
-
-#: src/transport/plugin_transport_http.c:1204
-#, c-format
-msgid ""
-"Specific IPv6 address `%s' for plugin %s in configuration file is invalid! "
-"Binding to all addresses!\n"
-msgstr ""
-
-#: src/transport/plugin_transport_http.c:1221
-#: 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"
-
-#: src/transport/plugin_transport_http.c:1226
-msgid "No external hostname configured\n"
-msgstr ""
-
-#: 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:1723
-#: src/transport/plugin_transport_http_server.c:2966
+#: src/transport/plugin_transport_http_client.c:1727
+#: src/transport/plugin_transport_http_server.c:2974
 #, 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:1748
-#: src/transport/plugin_transport_http_server.c:3026
+#: src/transport/plugin_transport_http_client.c:1752
+#: src/transport/plugin_transport_http_server.c:3032
 #, 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:1776
-#: src/transport/plugin_transport_http_server.c:2866
+#: src/transport/plugin_transport_http_client.c:1780
+#: src/transport/plugin_transport_http_server.c:2874
 #, 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:1381
+#: src/transport/plugin_transport_http_server.c:1389
 #, 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:1646
+#: src/transport/plugin_transport_http_server.c:1653
 #, c-format
 msgid "Accepting connection (%u of %u) from `%s'\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:1654
+#: src/transport/plugin_transport_http_server.c:1661
 #, c-format
 msgid ""
 "Server reached maximum number connections (%u), rejecting new connection\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:1941
+#: src/transport/plugin_transport_http_server.c:1947
 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:1965
+#: src/transport/plugin_transport_http_server.c:1971
 #, c-format
 msgid "No usable TLS certificate found and creating one at `%s/%s' failed!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:2689
+#: src/transport/plugin_transport_http_server.c:2378
+#, fuzzy
+msgid "Require valid port number for service in configuration!\n"
+msgstr "Lỗi lưu cấu hình."
+
+#: src/transport/plugin_transport_http_server.c:2410 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_server.c:2427 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_server.c:2538
 #, c-format
+msgid "Found %u addresses to report to NAT service\n"
+msgstr ""
+
+#: src/transport/plugin_transport_http_server.c:2610
+msgid "Disabling IPv6 since it is not supported on this system!\n"
+msgstr ""
+
+#: src/transport/plugin_transport_http_server.c:2697
+#, c-format
 msgid "IPv4 support is %s\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:2703
+#: src/transport/plugin_transport_http_server.c:2711
 #, c-format
 msgid "IPv6 support is %s\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:2728
+#: src/transport/plugin_transport_http_server.c:2718
+msgid "Neither IPv4 nor IPv6 are enabled! Fix in configuration\n"
+msgstr ""
+
+#: src/transport/plugin_transport_http_server.c:2729
+#, fuzzy
+msgid "Port is required! Fix in configuration\n"
+msgstr ""
+"\n"
+"Kết thúc cấu hình.\n"
+
+#: src/transport/plugin_transport_http_server.c:2736
 #, 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:2743
+#: src/transport/plugin_transport_http_server.c:2751
 #, 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:2753
+#: src/transport/plugin_transport_http_server.c:2761
 #, 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:2774
+#: src/transport/plugin_transport_http_server.c:2782
 #, 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:2784
+#: src/transport/plugin_transport_http_server.c:2792
 #, 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:2852
+#: src/transport/plugin_transport_http_server.c:2844
 #, fuzzy, c-format
+msgid "Using external hostname `%s'\n"
+msgstr "Đang bắt đầu tài về « %s »\n"
+
+#: src/transport/plugin_transport_http_server.c:2860
+#, fuzzy, c-format
 msgid "Notifying transport only about hostname `%s'\n"
 msgstr "không quyết định các tên máy"
 
-#: src/transport/plugin_transport_smtp.c:370
+#: src/transport/plugin_transport_smtp.c:223
 #, c-format
 msgid "Received malformed message via %s. Ignored.\n"
 msgstr "Nhận được thông báo dạng sai qua %s. Bị bỏ qua.\n"
 
-#: src/transport/plugin_transport_smtp.c:457
+#: src/transport/plugin_transport_smtp.c:310
 msgid "SMTP filter string to invalid, lacks ': '\n"
 msgstr "Chuỗi lọc vào SMTP không hợp lệ, còn thiếu « : »\n"
 
-#: src/transport/plugin_transport_smtp.c:466
+#: src/transport/plugin_transport_smtp.c:319
 #, c-format
 msgid "SMTP filter string to long, capped to `%s'\n"
 msgstr "Chuỗi lọc vào SMTP quá dài, tối đa « %s »\n"
 
-#: src/transport/plugin_transport_smtp.c:561
-#: src/transport/plugin_transport_smtp.c:571
-#: src/transport/plugin_transport_smtp.c:584
-#: src/transport/plugin_transport_smtp.c:603
-#: src/transport/plugin_transport_smtp.c:626
-#: src/transport/plugin_transport_smtp.c:634
-#: src/transport/plugin_transport_smtp.c:647
-#: src/transport/plugin_transport_smtp.c:658
+#: src/transport/plugin_transport_smtp.c:414
+#: src/transport/plugin_transport_smtp.c:424
+#: src/transport/plugin_transport_smtp.c:437
+#: src/transport/plugin_transport_smtp.c:456
+#: src/transport/plugin_transport_smtp.c:479
+#: src/transport/plugin_transport_smtp.c:487
+#: src/transport/plugin_transport_smtp.c:500
+#: src/transport/plugin_transport_smtp.c:511
 #, c-format
 msgid "SMTP: `%s' failed: %s.\n"
 msgstr "SMTP: « %s » bị lỗi: %s\n"
 
-#: src/transport/plugin_transport_smtp.c:799
+#: src/transport/plugin_transport_smtp.c:652
 msgid "No email-address specified, can not start SMTP transport.\n"
 msgstr "Chưa ghi rõ địa chỉ thư điện tử nên không tạo được truyền tải SMTP.\n"
 
-#: src/transport/plugin_transport_smtp.c:811
+#: src/transport/plugin_transport_smtp.c:664
 msgid "# bytes received via SMTP"
 msgstr "# các byte đã nhận qua SMTP"
 
-#: src/transport/plugin_transport_smtp.c:812
+#: src/transport/plugin_transport_smtp.c:665
 msgid "# bytes sent via SMTP"
 msgstr "# các byte đã gửi qua SMTP"
 
-#: src/transport/plugin_transport_smtp.c:814
+#: src/transport/plugin_transport_smtp.c:667
 msgid "# bytes dropped by SMTP (outgoing)"
 msgstr "# các byte loại đi bởi SMTP (đi ra)"
 
-#: src/transport/plugin_transport_tcp.c:626
+#: src/transport/plugin_transport_tcp.c:632
 #, fuzzy, c-format
 msgid "Unexpected address length: %u bytes\n"
 msgstr "Gặp sự kiện bất thường: %d\n"
 
-#: src/transport/plugin_transport_tcp.c:834
-#: 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:1206
-#: src/transport/plugin_transport_tcp.c:1223
+#: src/transport/plugin_transport_tcp.c:842
+#: src/transport/plugin_transport_tcp.c:931
+#: src/transport/plugin_transport_tcp.c:981
+#: src/transport/plugin_transport_tcp.c:1077
+#: src/transport/plugin_transport_tcp.c:1225
+#: src/transport/plugin_transport_tcp.c:1242
 #, 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:2015
-#: src/transport/plugin_transport_tcp.c:2696
+#: src/transport/plugin_transport_tcp.c:849
+#: src/transport/plugin_transport_tcp.c:1043
+#: src/transport/plugin_transport_tcp.c:2041
+#: src/transport/plugin_transport_tcp.c:2721
 #, fuzzy
 msgid "# TCP sessions active"
 msgstr "# các khoá phiên chạy được chấp nhận"
 
-#: src/transport/plugin_transport_tcp.c:927
+#: src/transport/plugin_transport_tcp.c:935
 #, fuzzy
 msgid "# bytes discarded by TCP (timeout)"
 msgstr "# các byte loại đi bởi TCP (đi ra)"
 
-#: src/transport/plugin_transport_tcp.c:976
+#: src/transport/plugin_transport_tcp.c:984
 #, fuzzy
 msgid "# bytes transmitted via TCP"
 msgstr "# các byte được gửi"
 
-#: src/transport/plugin_transport_tcp.c:1063
+#: src/transport/plugin_transport_tcp.c:1081
 #, fuzzy
 msgid "# bytes discarded by TCP (disconnect)"
 msgstr "# các byte loại đi bởi TCP (đi ra)"
 
-#: src/transport/plugin_transport_tcp.c:1180
+#: src/transport/plugin_transport_tcp.c:1199
 #, c-format
 msgid "Trying to send with invalid session %p\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:1417
-#: src/transport/plugin_transport_udp.c:1440
+#: src/transport/plugin_transport_tcp.c:1440
+#: src/transport/plugin_transport_udp.c:1471
 msgid "# requests to create session with invalid address"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:1534
+#: src/transport/plugin_transport_tcp.c:1558
 msgid "# transport-service disconnect requests for TCP"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2065
+#: src/transport/plugin_transport_tcp.c:2091
 #, 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:2248
+#: src/transport/plugin_transport_tcp.c:2274
 msgid "# bytes received via TCP"
 msgstr "# các byte đã nhận qua TCP"
 
-#: src/transport/plugin_transport_tcp.c:2328
+#: src/transport/plugin_transport_tcp.c:2354
 msgid "# network-level TCP disconnect events"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2576 src/util/service.c:589
+#: src/transport/plugin_transport_tcp.c:2602 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:2590
+#: src/transport/plugin_transport_tcp.c:2616
 #, fuzzy
 msgid "Failed to start service.\n"
 msgstr "Lỗi bắt đầu thu thập.\n"
 
-#: src/transport/plugin_transport_tcp.c:2683
+#: src/transport/plugin_transport_tcp.c:2710
 #, c-format
 msgid "TCP transport listening on port %llu\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2687
+#: src/transport/plugin_transport_tcp.c:2713
 msgid "TCP transport not listening on any port (client only)\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2691
+#: src/transport/plugin_transport_tcp.c:2716
 #, c-format
 msgid "TCP transport advertises itself as being on port %llu\n"
 msgstr ""
 
-#: src/transport/plugin_transport_udp_broadcasting.c:134
+#: src/transport/plugin_transport_udp_broadcasting.c:173
 #, fuzzy
 msgid "# IPv6 multicast HELLO beacons received via udp"
 msgstr "# các thông báo PONG đã mật mã được nhận"
 
-#: src/transport/plugin_transport_udp_broadcasting.c:184
+#: src/transport/plugin_transport_udp_broadcasting.c:222
 #, fuzzy
 msgid "# IPv4 broadcast HELLO beacons received via udp"
 msgstr "# các thông báo PONG đã mật mã được nhận"
 
-#: src/transport/plugin_transport_udp_broadcasting.c:402
+#: src/transport/plugin_transport_udp_broadcasting.c:605
 msgid ""
 "Disabling HELLO broadcasting due to friend-to-friend only configuration!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_udp_broadcasting.c:419
+#: src/transport/plugin_transport_udp_broadcasting.c:619
 #, c-format
 msgid "Failed to set IPv4 broadcast option for broadcast socket on port %d\n"
 msgstr ""
 
-#: src/transport/plugin_transport_udp.c:1550
+#: src/transport/plugin_transport_udp.c:1581
 #, 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:2602
+#: src/transport/plugin_transport_udp.c:2635
 #, 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:2616
-#, c-format
+#: src/transport/plugin_transport_udp.c:2649
 msgid ""
-"UDP could not transmit message to `%s': Please check your network "
-"configuration and disable IPv6 if your connection does not have a global "
-"IPv6 address\n"
+"UDP could not transmit IPv6 message! Please check your network configuration "
+"and disable IPv6 if your connection does not have a global IPv6 address\n"
 msgstr ""
 
-#: src/transport/plugin_transport_udp.c:2917
+#: src/transport/plugin_transport_udp.c:2949
 #, 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:3015
+#: src/transport/plugin_transport_udp.c:3046
 #, c-format
 msgid "Given `%s' option is out of range: %llu > %u\n"
 msgstr ""
 
-#: src/transport/plugin_transport_udp.c:3058
+#: src/transport/plugin_transport_udp.c:3089
 #, 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:3117
+#: src/transport/plugin_transport_udp.c:3148
 #, 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:1627
+#: src/transport/plugin_transport_unix.c:1625
 #, fuzzy
 msgid "Failed to open UNIX listen socket\n"
 msgstr "Lỗi mở tập tin ghi sự kiện « %s »: %s\n"
@@ -7167,74 +7439,74 @@
 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:758
-#: src/transport/plugin_transport_wlan.c:1903
+#: src/transport/plugin_transport_wlan.c:691
+#: src/transport/plugin_transport_wlan.c:763
+#: src/transport/plugin_transport_wlan.c:1910
 #, fuzzy
 msgid "# WLAN sessions allocated"
 msgstr "# các khoá phiên chạy được chấp nhận"
 
-#: src/transport/plugin_transport_wlan.c:863
+#: src/transport/plugin_transport_wlan.c:868
 #, fuzzy
 msgid "# WLAN message fragments sent"
 msgstr "# các thông báo bị tế phân"
 
-#: src/transport/plugin_transport_wlan.c:887
+#: src/transport/plugin_transport_wlan.c:892
 msgid "# WLAN messages pending (with fragmentation)"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:995
-#: src/transport/plugin_transport_wlan.c:1080
-#: src/transport/plugin_transport_wlan.c:1905
+#: src/transport/plugin_transport_wlan.c:1000
+#: src/transport/plugin_transport_wlan.c:1086
+#: src/transport/plugin_transport_wlan.c:1912
 #, 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:1275
+#: src/transport/plugin_transport_wlan.c:1282
 #, 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:1301
+#: src/transport/plugin_transport_wlan.c:1308
 #, fuzzy
 msgid "# fragments received via WLAN"
 msgstr "# các mảnh bị loại bỏ"
 
-#: src/transport/plugin_transport_wlan.c:1311
+#: src/transport/plugin_transport_wlan.c:1318
 #, fuzzy
 msgid "# ACKs received via WLAN"
 msgstr "# các byte đã nhận qua TCP"
 
-#: src/transport/plugin_transport_wlan.c:1368
+#: src/transport/plugin_transport_wlan.c:1375
 #, 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:1489
+#: src/transport/plugin_transport_wlan.c:1496
 #, 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:1524
+#: src/transport/plugin_transport_wlan.c:1531
 #, 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:1587
+#: src/transport/plugin_transport_wlan.c:1594
 #, fuzzy
 msgid "# HELLO beacons sent via WLAN"
 msgstr "# các byte đã gửi qua UDP"
 
-#: src/transport/plugin_transport_wlan.c:1700
+#: src/transport/plugin_transport_wlan.c:1707
 msgid "WLAN address with invalid size encountered\n"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:1884
+#: src/transport/plugin_transport_wlan.c:1891
 #, c-format
 msgid "Helper binary `%s' not SUID, cannot run WLAN transport\n"
 msgstr ""
 
-#: src/transport/transport_api.c:647
+#: src/transport/transport_api.c:682
 #, 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"
@@ -7300,17 +7572,17 @@
 msgid "Need a non-empty hostname for service `%s'.\n"
 msgstr ""
 
-#: src/util/client.c:991
+#: src/util/client.c:989
 #, 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:1003
+#: src/util/client.c:1001
 #, 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:1274
+#: src/util/client.c:1284
 msgid "Could not submit request, not expecting to receive a response.\n"
 msgstr ""
 
@@ -7383,17 +7655,17 @@
 "Giá trị cấu hình « %s » cho « %s » trong phần « %s » không phải nằm trong "
 "tập hợp các sự chọn được phép\n"
 
-#: src/util/configuration.c:1065
+#: src/util/configuration.c:1066
 #, c-format
 msgid "Recursive expansion suspected, aborting $-expansion for term `%s'\n"
 msgstr ""
 
-#: src/util/configuration.c:1097
+#: src/util/configuration.c:1098
 #, 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
+#: src/util/configuration.c:1172
 #, c-format
 msgid ""
 "Failed to expand `%s' in `%s' as it is neither found in [PATHS] nor defined "
@@ -7433,72 +7705,67 @@
 "%llu)\n"
 msgstr ""
 
-#: src/util/crypto_ecc.c:940 src/util/crypto_ecc.c:978
-#: src/util/crypto_ecc.c:1096 src/util/crypto_ecc.c:1134
+#: src/util/crypto_ecc.c:789 src/util/crypto_ecc.c:827
+#: src/util/crypto_ecc.c:945 src/util/crypto_ecc.c:983
 #, 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:945 src/util/crypto_ecc.c:1101
+#: src/util/crypto_ecc.c:794 src/util/crypto_ecc.c:950
 #, 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:982 src/util/crypto_ecc.c:1138
+#: src/util/crypto_ecc.c:831 src/util/crypto_ecc.c:987
 msgid "This may be ok if someone is currently generating a private key.\n"
 msgstr ""
 
-#: src/util/crypto_ecc.c:1012 src/util/crypto_ecc.c:1168
+#: src/util/crypto_ecc.c:861 src/util/crypto_ecc.c:1017
 #, 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:1016 src/util/crypto_ecc.c:1172
+#: src/util/crypto_ecc.c:865 src/util/crypto_ecc.c:1021
 msgid "This may be ok if someone is currently generating a key.\n"
 msgstr ""
 
-#: src/util/crypto_ecc.c:1254
+#: src/util/crypto_ecc.c:1103
 #, 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:1343
+#: src/util/crypto_ecc.c:1207
 #, 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:1393
+#: src/util/crypto_ecc.c:1257
 #, 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
+#: src/util/crypto_ecc.c:1331
 #, fuzzy, c-format
 msgid "ECDSA signature verification failed at %s:%d: %s\n"
 msgstr "Lỗi thẩm tra chữ ký RSA tại %s:%d: %s\n"
 
-#: src/util/crypto_ecc.c:1534
+#: src/util/crypto_ecc.c:1388
 #, 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
+#: src/util/crypto_random.c:280
 #, c-format
-msgid "Starting `%s' process to generate entropy\n"
-msgstr ""
-
-#: 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:1185
+#: src/util/disk.c:1184
 #, 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:1543 src/util/service.c:1315
+#: src/util/disk.c:1546 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"
@@ -7613,54 +7880,81 @@
 msgid "Manipulate GNUnet configuration files"
 msgstr "cập nhật một giá trị trong tập tin cấu hình"
 
-#: src/util/gnunet-ecc.c:60
+#: src/util/gnunet-ecc.c:75
 #, fuzzy, c-format
 msgid "Failed to open `%s': %s\n"
 msgstr "Lỗi mở tập tin ghi sự kiện « %s »: %s\n"
 
-#: src/util/gnunet-ecc.c:66
+#: src/util/gnunet-ecc.c:81
 #, c-format
 msgid "Generating %u keys, please wait"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:82
+#: src/util/gnunet-ecc.c:97
 #, fuzzy, c-format
 msgid ""
 "\n"
 "Failed to write to `%s': %s\n"
 msgstr "Lỗi chạy %s: %s %d\n"
 
-#: src/util/gnunet-ecc.c:92
+#: src/util/gnunet-ecc.c:107
 #, c-format
 msgid ""
 "\n"
 "Finished!\n"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:95
+#: src/util/gnunet-ecc.c:110
 #, c-format
 msgid ""
 "\n"
 "Error, %u keys not generated\n"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:119
+#: src/util/gnunet-ecc.c:199
+#, fuzzy, c-format
+msgid "Hostkeys file `%s' not found\n"
+msgstr "Khoá phiên chạy từ đồng đẳng « %s » không thể được thẩm tra.\n"
+
+#: src/util/gnunet-ecc.c:210
+#, fuzzy, c-format
+msgid "Hostkeys file `%s' is empty\n"
+msgstr "Định dạng của tập tin « %s » là không hợp lệ.\n"
+
+#: src/util/gnunet-ecc.c:232
+#, fuzzy, c-format
+msgid "Could not read hostkey file: %s\n"
+msgstr "Không thể đọc danh sách bạn bè « %s »\n"
+
+#: src/util/gnunet-ecc.c:286
 msgid "No hostkey file specified on command line\n"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:168
+#: src/util/gnunet-ecc.c:341
+msgid "list keys included in a file (for testing)"
+msgstr ""
+
+#: src/util/gnunet-ecc.c:344
+msgid "number of keys to list included in a file (for testing)"
+msgstr ""
+
+#: src/util/gnunet-ecc.c:347
 msgid "create COUNT public-private key pairs (for testing)"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:171
+#: src/util/gnunet-ecc.c:350
 msgid "print the public key in ASCII format"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:174
+#: src/util/gnunet-ecc.c:353
 msgid "print the hash of the public key in ASCII format"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:185
+#: src/util/gnunet-ecc.c:356
+msgid "print examples of ECC operations (used for compatibility testing)"
+msgstr ""
+
+#: src/util/gnunet-ecc.c:367
 #, 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"
@@ -7684,27 +7978,27 @@
 msgid "Could not find IP of host `%s': %s\n"
 msgstr "Không tìm thấy địa chỉ IP của máy « %s »: %s\n"
 
-#: src/util/gnunet-uri.c:90
+#: src/util/gnunet-uri.c:84
 #, c-format
 msgid "No URI specified on command line\n"
 msgstr ""
 
-#: src/util/gnunet-uri.c:95
+#: src/util/gnunet-uri.c:89
 #, fuzzy, c-format
 msgid "Invalid URI: does not start with `%s'\n"
 msgstr "Ký hiệu mạng sai (không kết thúc với « ; »: « %s »)\n"
 
-#: src/util/gnunet-uri.c:102
+#: src/util/gnunet-uri.c:96
 #, c-format
 msgid "Invalid URI: fails to specify subsystem\n"
 msgstr ""
 
-#: src/util/gnunet-uri.c:112
+#: src/util/gnunet-uri.c:106
 #, c-format
 msgid "No handler known for subsystem `%s'\n"
 msgstr ""
 
-#: src/util/gnunet-uri.c:174
+#: src/util/gnunet-uri.c:168
 msgid "Perform default-actions for GNUnet URIs"
 msgstr ""
 
@@ -7741,17 +8035,17 @@
 "variable.\n"
 msgstr ""
 
-#: src/util/os_installation.c:710
+#: src/util/os_installation.c:713
 #, 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:770
+#: src/util/os_installation.c:773
 #, 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:780
+#: src/util/os_installation.c:783
 #, c-format
 msgid "GetExitCodeProcess failed for binary %s (%d).\n"
 msgstr ""
@@ -7761,26 +8055,36 @@
 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:144
+#: src/util/plugin.c:148
 #, 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:217
+#: src/util/plugin.c:223
 #, 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:347
+#: src/util/plugin.c:382
 #, 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:262 src/util/service.c:1452
+#: src/util/program.c:260 src/util/service.c:1449
 #, fuzzy, c-format
+msgid "Malformed configuration file `%s', exit ...\n"
+msgstr "Không thể lưu tập tin cấu hình « %s »:"
+
+#: src/util/program.c:270 src/util/service.c:1464
+#, fuzzy, c-format
 msgid "Could not access configuration file `%s'\n"
 msgstr "Không thể truy cập đến tập tin gnunet-directory « %s »\n"
 
+#: src/util/program.c:275 src/util/service.c:1459
+#, fuzzy
+msgid "Malformed configuration, exit ...\n"
+msgstr "Không thể lưu tập tin cấu hình « %s »:"
+
 #: src/util/resolver_api.c:198
 #, fuzzy, c-format
 msgid "Must specify `%s' for `%s' in configuration!\n"
@@ -7807,11 +8111,11 @@
 msgid "Could not resolve our FQDN : %s\n"
 msgstr "Không thể giải quyết « %s » (%s): %s\n"
 
-#: src/util/scheduler.c:804
+#: src/util/scheduler.c:813
 msgid "Looks like we're busy waiting...\n"
 msgstr ""
 
-#: src/util/scheduler.c:938
+#: src/util/scheduler.c:948
 #, c-format
 msgid "Attempt to cancel dead task %llu!\n"
 msgstr ""
@@ -7925,7 +8229,7 @@
 msgid "do daemonize (detach from terminal)"
 msgstr ""
 
-#: src/util/signal.c:79
+#: src/util/signal.c:89
 #, c-format
 msgid "signal (%d, %p) returned %d.\n"
 msgstr ""
@@ -7934,122 +8238,122 @@
 msgid "b"
 msgstr "b"
 
-#: src/util/strings.c:444
+#: src/util/strings.c:450
 #, c-format
 msgid "Character sets requested were `%s'->`%s'\n"
 msgstr ""
 
-#: src/util/strings.c:572
+#: src/util/strings.c:578
 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:669
+#: src/util/strings.c:675
 msgid "µs"
 msgstr ""
 
-#: src/util/strings.c:673
+#: src/util/strings.c:679
 msgid "forever"
 msgstr ""
 
-#: src/util/strings.c:675
+#: src/util/strings.c:681
 msgid "0 ms"
 msgstr ""
 
-#: src/util/strings.c:681
+#: src/util/strings.c:687
 msgid "ms"
 msgstr "mg"
 
-#: src/util/strings.c:687
+#: src/util/strings.c:693
 msgid "s"
 msgstr "g"
 
-#: src/util/strings.c:693
+#: src/util/strings.c:699
 msgid "m"
 msgstr "p"
 
-#: src/util/strings.c:699
+#: src/util/strings.c:705
 msgid "h"
 msgstr "g"
 
-#: src/util/strings.c:706
+#: src/util/strings.c:712
 #, fuzzy
 msgid "day"
 msgstr " ngày"
 
-#: src/util/strings.c:708
+#: src/util/strings.c:714
 #, fuzzy
 msgid "days"
 msgstr " ngày"
 
-#: src/util/strings.c:737
+#: src/util/strings.c:743
 msgid "end of time"
 msgstr ""
 
-#: src/util/strings.c:1141
+#: src/util/strings.c:1149
 msgid "IPv6 address did not start with `['\n"
 msgstr ""
 
-#: src/util/strings.c:1149
+#: src/util/strings.c:1157
 msgid "IPv6 address did contain ':' to separate port number\n"
 msgstr ""
 
-#: src/util/strings.c:1155
+#: src/util/strings.c:1163
 msgid "IPv6 address did contain ']' before ':' to separate port number\n"
 msgstr ""
 
-#: src/util/strings.c:1162
+#: src/util/strings.c:1170
 msgid "IPv6 address did contain a valid port number after the last ':'\n"
 msgstr ""
 
-#: src/util/strings.c:1171
+#: src/util/strings.c:1179
 #, fuzzy, c-format
 msgid "Invalid IPv6 address `%s': %s\n"
 msgstr "Mức ưu tiên tiến trình không hợp lê « %s ».\n"
 
-#: src/util/strings.c:1377 src/util/strings.c:1393
+#: src/util/strings.c:1385 src/util/strings.c:1401
 msgid "Port not in range\n"
 msgstr ""
 
-#: src/util/strings.c:1402
+#: src/util/strings.c:1410
 #, 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
+#: src/util/strings.c:1493 src/util/strings.c:1524 src/util/strings.c:1572
+#: src/util/strings.c:1593
 #, c-format
 msgid "Invalid format for IP: `%s'\n"
 msgstr "Địa chỉ IP định dạng sai: %s\n"
 
-#: src/util/strings.c:1543
+#: src/util/strings.c:1550
 #, 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
+#: src/util/strings.c:1602
 #, fuzzy, c-format
 msgid "Invalid format: `%s'\n"
 msgstr "Địa chỉ IP định dạng sai: %s\n"
 
-#: src/util/strings.c:1647
+#: src/util/strings.c:1654
 #, 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
+#: src/util/strings.c:1704
 #, 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
+#: src/util/strings.c:1735
 #, 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
+#: src/vpn/gnunet-service-vpn.c:550 src/vpn/gnunet-service-vpn.c:1086
 #, fuzzy
-msgid "# Active tunnels"
+msgid "# Active channels"
 msgstr "# các kết nối dht"
 
 #: src/vpn/gnunet-service-vpn.c:642
@@ -8062,103 +8366,103 @@
 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:754
+#: src/vpn/gnunet-service-vpn.c:753
 #, fuzzy
-msgid "# Mesh tunnels created"
+msgid "# Mesh channels created"
 msgstr "# các truy vấn lỗ hổng được định tuyến"
 
-#: src/vpn/gnunet-service-vpn.c:786
+#: src/vpn/gnunet-service-vpn.c:784
 #, fuzzy
-msgid "Failed to setup mesh tunnel!\n"
+msgid "Failed to setup mesh channel!\n"
 msgstr "Lỗi lấy thông kê về truyền tải.\n"
 
-#: src/vpn/gnunet-service-vpn.c:980
+#: src/vpn/gnunet-service-vpn.c:978
 #, c-format
 msgid "Protocol %u not supported, dropping\n"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:1307
+#: src/vpn/gnunet-service-vpn.c:1305
 msgid "# ICMPv4 packets dropped (not allowed)"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:1328
+#: src/vpn/gnunet-service-vpn.c:1326
 msgid "# ICMPv6 packets dropped (not allowed)"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:1533
+#: src/vpn/gnunet-service-vpn.c:1531
 #, 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:1566 src/vpn/gnunet-service-vpn.c:1602
+#: src/vpn/gnunet-service-vpn.c:1564 src/vpn/gnunet-service-vpn.c:1600
 #, c-format
 msgid "Packet received for unmapped destination `%s' (dropping it)\n"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:1612
+#: src/vpn/gnunet-service-vpn.c:1610
 msgid "Received IPv4 packet with options (dropping it)\n"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:1626
+#: src/vpn/gnunet-service-vpn.c:1624
 #, c-format
 msgid "Received packet of unknown protocol %d from TUN (dropping it)\n"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:1708
+#: src/vpn/gnunet-service-vpn.c:1706
 #, 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:2047
+#: src/vpn/gnunet-service-vpn.c:2045
 #, 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:2202
+#: src/vpn/gnunet-service-vpn.c:2200
 #, 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:2353
+#: src/vpn/gnunet-service-vpn.c:2351
 msgid "Failed to find unallocated IPv4 address in VPN's range\n"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:2408
+#: src/vpn/gnunet-service-vpn.c:2406
 msgid "Failed to find unallocated IPv6 address in VPN's range\n"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:2449 src/vpn/gnunet-service-vpn.c:2665
+#: src/vpn/gnunet-service-vpn.c:2447 src/vpn/gnunet-service-vpn.c:2663
 #, fuzzy
 msgid "# Active destinations"
 msgstr "# các kết nối dht"
 
-#: src/vpn/gnunet-service-vpn.c:2717
+#: src/vpn/gnunet-service-vpn.c:2715
 msgid "Failed to allocate IP address for new destination\n"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:2984
+#: src/vpn/gnunet-service-vpn.c:2982
 #, fuzzy
 msgid "Must specify valid IPv6 address"
 msgstr "« %s » không sẵn sàng.\n"
 
-#: src/vpn/gnunet-service-vpn.c:3008
+#: src/vpn/gnunet-service-vpn.c:3006
 msgid "Must specify valid IPv6 mask"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:3016
+#: src/vpn/gnunet-service-vpn.c:3014
 msgid "IPv6 support disabled as this system does not support IPv6\n"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:3029
+#: src/vpn/gnunet-service-vpn.c:3027
 #, fuzzy
 msgid "Must specify valid IPv4 address"
 msgstr "« %s » không sẵn sàng.\n"
 
-#: src/vpn/gnunet-service-vpn.c:3042
+#: src/vpn/gnunet-service-vpn.c:3040
 msgid "Must specify valid IPv4 mask"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:3052
+#: src/vpn/gnunet-service-vpn.c:3050
 msgid "IPv4 support disabled as this system does not support IPv4\n"
 msgstr ""
 
@@ -8247,6 +8551,28 @@
 msgstr "« %s » thất bại ở tập tin « %s » tại %s:%d với lỗi: %s\n"
 
 #, fuzzy
+#~ msgid "Internal error %d\n"
+#~ msgstr "Lỗi VR."
+
+#, fuzzy
+#~ msgid "Aborting call to `%s'\n"
+#~ msgstr "Gặp lỗi khi tạo người dùng"
+
+#, fuzzy
+#~ 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"
+
+#, fuzzy
+#~ msgid "Print information about mesh tunnels and peers."
+#~ msgstr "In ra thông tin về các đồng đẳng GNUnet."
+
+#, fuzzy
+#~ msgid ""
+#~ "%s service is lacking key configuration settings (%s). Using default "
+#~ "(%u).\n"
+#~ msgstr "Lưu cấu hình ngay bây giờ không?"
+
+#, fuzzy
 #~ msgid "Loading block plugin `%s'\n"
 #~ msgstr "Đang nạp các truyền tải « %s »\n"
 
@@ -8284,10 +8610,6 @@
 #~ 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"
 
@@ -8794,9 +9116,6 @@
 #~ "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 "You must specify a nickname\n"
-#~ msgstr "Phải ghi rõ tên hiệu\n"
-
 #~ msgid "Failed to join room `%s'\n"
 #~ msgstr "Lỗi vào phòng « %s »\n"
 
@@ -8947,10 +9266,6 @@
 #~ 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 "Could not read hostkeys file `%s'!\n"
-#~ msgstr "Không thể đọc danh sách bạn bè « %s »\n"
-
-#, fuzzy
 #~ msgid "Could not create configuration for peer number %u on `%s'!\n"
 #~ msgstr "Không thể truy cập đến thông tin về không gian tên.\n"
 
@@ -9013,10 +9328,6 @@
 #~ msgstr "Không thể lưu tập tin cấu hình « %s »:"
 
 #, fuzzy
-#~ msgid "Failed to transmit message to `%s' service.\n"
-#~ msgstr "Lỗi sơ khởi dịch vụ « %s ».\n"
-
-#, fuzzy
 #~ msgid "Target is %d connections per peer."
 #~ msgstr "Lỗi thiết lập kết nối với đồng đẳng.\n"
 
@@ -9190,10 +9501,6 @@
 #~ msgstr "Đang nạp các truyền tải « %s »\n"
 
 #, fuzzy
-#~ msgid "# SET QUOTA messages received"
-#~ msgstr "# các thông báo PONG đã mật mã được nhận"
-
-#, fuzzy
 #~ msgid "curl failed for `%s' at %s:%d: `%s'\n"
 #~ msgstr "%s bị lỗi tại %s:%d: « %s »\n"
 
@@ -9234,10 +9541,6 @@
 #~ msgstr "# các thông báo PING được tạo"
 
 #, fuzzy
-#~ msgid "Failed to connect to core service\n"
-#~ msgstr "Lỗi kết nối đến gnunetd.\n"
-
-#, fuzzy
 #~ msgid "# bytes successfully transmitted by plugins"
 #~ msgstr "# các byte được gửi"
 

Modified: gnunet/po/zh_CN.po
===================================================================
--- gnunet/po/zh_CN.po  2013-12-12 21:38:43 UTC (rev 31342)
+++ gnunet/po/zh_CN.po  2013-12-12 21:43:39 UTC (rev 31343)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: gnunet-0.8.1\n"
 "Report-Msgid-Bugs-To: address@hidden"
-"POT-Creation-Date: 2013-11-05 02:07+0100\n"
+"POT-Creation-Date: 2013-12-12 22:41+0100\n"
 "PO-Revision-Date: 2011-07-09 12:12+0800\n"
 "Last-Translator: Wylmer Wang <address@hidden>\n"
 "Language-Team: Chinese (simplified) <address@hidden>\n"
@@ -35,7 +35,7 @@
 msgid "Failed to remove servicehome directory %s\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:216 src/testbed/gnunet-service-testbed_peers.c:1010
+#: src/arm/gnunet-arm.c:216 src/testbed/gnunet-service-testbed_peers.c:1013
 msgid "Message was sent successfully"
 msgstr ""
 
@@ -44,11 +44,11 @@
 msgid "Misconfiguration (can not connect to the ARM service)"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/arm/gnunet-arm.c:220 src/testbed/gnunet-service-testbed_peers.c:1014
+#: src/arm/gnunet-arm.c:220 src/testbed/gnunet-service-testbed_peers.c:1017
 msgid "We disconnected from ARM before we could send a request"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:222 src/testbed/gnunet-service-testbed_peers.c:1016
+#: src/arm/gnunet-arm.c:222 src/testbed/gnunet-service-testbed_peers.c:1019
 msgid "ARM API is busy"
 msgstr ""
 
@@ -56,56 +56,56 @@
 msgid "Request does not fit into a message"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:226 src/testbed/gnunet-service-testbed_peers.c:1020
+#: src/arm/gnunet-arm.c:226 src/testbed/gnunet-service-testbed_peers.c:1023
 msgid "Request timed out"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:228 src/testbed/gnunet-service-testbed_peers.c:1022
+#: src/arm/gnunet-arm.c:228 src/testbed/gnunet-service-testbed_peers.c:1025
 #, fuzzy
 msgid "Unknown request status"
 msgstr "未知的用户“%s”\n"
 
-#: src/arm/gnunet-arm.c:244 src/testbed/gnunet-service-testbed_peers.c:1038
+#: src/arm/gnunet-arm.c:244 src/testbed/gnunet-service-testbed_peers.c:1041
 #, c-format
 msgid "%s is stopped"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:246 src/testbed/gnunet-service-testbed_peers.c:1040
+#: src/arm/gnunet-arm.c:246 src/testbed/gnunet-service-testbed_peers.c:1043
 #, c-format
 msgid "%s is starting"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:248 src/testbed/gnunet-service-testbed_peers.c:1042
+#: src/arm/gnunet-arm.c:248 src/testbed/gnunet-service-testbed_peers.c:1045
 #, c-format
 msgid "%s is stopping"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:250 src/testbed/gnunet-service-testbed_peers.c:1044
+#: src/arm/gnunet-arm.c:250 src/testbed/gnunet-service-testbed_peers.c:1047
 #, c-format
 msgid "%s is starting already"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:252 src/testbed/gnunet-service-testbed_peers.c:1046
+#: src/arm/gnunet-arm.c:252 src/testbed/gnunet-service-testbed_peers.c:1049
 #, c-format
 msgid "%s is stopping already"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:254 src/testbed/gnunet-service-testbed_peers.c:1048
+#: src/arm/gnunet-arm.c:254 src/testbed/gnunet-service-testbed_peers.c:1051
 #, c-format
 msgid "%s is started already"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:256 src/testbed/gnunet-service-testbed_peers.c:1050
+#: src/arm/gnunet-arm.c:256 src/testbed/gnunet-service-testbed_peers.c:1053
 #, c-format
 msgid "%s is stopped already"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:258 src/testbed/gnunet-service-testbed_peers.c:1052
+#: src/arm/gnunet-arm.c:258 src/testbed/gnunet-service-testbed_peers.c:1055
 #, fuzzy, c-format
 msgid "%s service is not known to ARM"
 msgstr "服务已删除。\n"
 
-#: src/arm/gnunet-arm.c:260 src/testbed/gnunet-service-testbed_peers.c:1054
+#: src/arm/gnunet-arm.c:260 src/testbed/gnunet-service-testbed_peers.c:1057
 #, fuzzy, c-format
 msgid "%s service failed to start"
 msgstr "运行 %s失败:%s %d\n"
@@ -115,7 +115,7 @@
 msgid "%s service cannot be started because ARM is shutting down"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:264 src/testbed/gnunet-service-testbed_peers.c:1058
+#: src/arm/gnunet-arm.c:264 src/testbed/gnunet-service-testbed_peers.c:1061
 #, c-format
 msgid "%.s Unknown result code."
 msgstr ""
@@ -139,204 +139,204 @@
 msgid "Failed to stop the ARM service: %s\n"
 msgstr "打开日志文件“%s”失败:%s\n"
 
-#: src/arm/gnunet-arm.c:420
+#: src/arm/gnunet-arm.c:421
 #, fuzzy, c-format
 msgid "Failed to send a request to start the `%s' service: %%s\n"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/arm/gnunet-arm.c:429
+#: src/arm/gnunet-arm.c:431
 #, fuzzy, c-format
 msgid "Failed to start the `%s' service: %s\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/arm/gnunet-arm.c:465
+#: src/arm/gnunet-arm.c:468
 #, fuzzy, c-format
 msgid "Failed to send a request to kill the `%s' service: %%s\n"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/arm/gnunet-arm.c:476
+#: src/arm/gnunet-arm.c:479
 #, fuzzy, c-format
 msgid "Failed to kill the `%s' service: %s\n"
 msgstr "运行 %s失败:%s %d\n"
 
-#: src/arm/gnunet-arm.c:512
+#: src/arm/gnunet-arm.c:517
 #, fuzzy, c-format
 msgid "Failed to request a list of services: %s\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/arm/gnunet-arm.c:519
+#: src/arm/gnunet-arm.c:525
 #, fuzzy
 msgid "Error communicating with ARM. ARM not running?\n"
 msgstr "连接 %s:%u 出错。守护程序在运行吗?\n"
 
-#: src/arm/gnunet-arm.c:523
+#: src/arm/gnunet-arm.c:530
 msgid "Running services:\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:605
+#: src/arm/gnunet-arm.c:612
 #, c-format
 msgid "Now only monitoring, press CTRL-C to stop.\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:636
+#: src/arm/gnunet-arm.c:643
 #, c-format
 msgid "Stopped %s.\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:639
+#: src/arm/gnunet-arm.c:646
 #, fuzzy, c-format
 msgid "Starting %s...\n"
 msgstr "未知的命令“%s”。\n"
 
-#: src/arm/gnunet-arm.c:642
+#: src/arm/gnunet-arm.c:649
 #, c-format
 msgid "Stopping %s...\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:653
+#: src/arm/gnunet-arm.c:660
 #, fuzzy, c-format
 msgid "Unknown status %u for service %s.\n"
 msgstr "未知的用户“%s”\n"
 
-#: src/arm/gnunet-arm.c:717
+#: src/arm/gnunet-arm.c:724
 #, fuzzy
 msgid "stop all GNUnet services"
 msgstr "卸载 GNUnet 服务"
 
-#: src/arm/gnunet-arm.c:719
+#: src/arm/gnunet-arm.c:726
 msgid "start a particular service"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:721
+#: src/arm/gnunet-arm.c:728
 msgid "stop a particular service"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:723
+#: src/arm/gnunet-arm.c:730
 #, fuzzy
 msgid "start all GNUnet default services"
 msgstr "卸载 GNUnet 服务"
 
-#: src/arm/gnunet-arm.c:726
+#: src/arm/gnunet-arm.c:733
 #, fuzzy
 msgid "stop and start all GNUnet default services"
 msgstr "卸载 GNUnet 服务"
 
-#: src/arm/gnunet-arm.c:729
+#: src/arm/gnunet-arm.c:736
 msgid "delete config file and directory on exit"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:732
+#: src/arm/gnunet-arm.c:739
 msgid "monitor ARM activities"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:734
+#: src/arm/gnunet-arm.c:741
 msgid "don't print status messages"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:737
+#: src/arm/gnunet-arm.c:744
 #, fuzzy
 msgid "timeout in MSECS milliseconds for completing current operation"
 msgstr "等待一次迭代完成的时间(毫秒)"
 
-#: src/arm/gnunet-arm.c:739
+#: src/arm/gnunet-arm.c:746
 msgid "list currently running services"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:741
+#: src/arm/gnunet-arm.c:748
 msgid "don't let gnunet-service-arm inherit standard output"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:743
+#: src/arm/gnunet-arm.c:750
 msgid "don't let gnunet-service-arm inherit standard error"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:754
+#: src/arm/gnunet-arm.c:761
 msgid "Control services and the Automated Restart Manager (ARM)"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:268
+#: src/arm/gnunet-service-arm.c:266
 msgid "Could not send status result to client\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:304
+#: src/arm/gnunet-service-arm.c:302
 #, fuzzy
 msgid "Could not send list result to client\n"
 msgstr "找不到接口“%s”的一个 IP 地址。\n"
 
-#: src/arm/gnunet-service-arm.c:519
+#: src/arm/gnunet-service-arm.c:528
 #, fuzzy, c-format
 msgid "Failed to start service `%s'\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/arm/gnunet-service-arm.c:526
+#: src/arm/gnunet-service-arm.c:535
 #, c-format
 msgid "Starting service `%s'\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:625
+#: src/arm/gnunet-service-arm.c:634
 #, fuzzy, c-format
 msgid "Unable to create socket for service `%s': %s\n"
 msgstr "无法创建用户账户:"
 
-#: src/arm/gnunet-service-arm.c:647
+#: src/arm/gnunet-service-arm.c:656
 #, c-format
 msgid "Unable to bind listening socket for service `%s' to address `%s': %s\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:676
+#: src/arm/gnunet-service-arm.c:685
 #, c-format
 msgid "ARM now monitors connections to service `%s' at `%s'\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:809
+#: src/arm/gnunet-service-arm.c:821
 #, c-format
 msgid "Preparing to stop `%s'\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:1070
+#: src/arm/gnunet-service-arm.c:1085
 #, c-format
 msgid "Restarting service `%s'.\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:1163
+#: src/arm/gnunet-service-arm.c:1178
 msgid "exit"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:1168
+#: src/arm/gnunet-service-arm.c:1183
 msgid "signal"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:1173
+#: src/arm/gnunet-service-arm.c:1188
 #, fuzzy
 msgid "unknown"
 msgstr "未知错误"
 
-#: src/arm/gnunet-service-arm.c:1179
+#: src/arm/gnunet-service-arm.c:1194
 #, fuzzy, c-format
 msgid "Service `%s' took %s to terminate\n"
 msgstr "服务已删除。\n"
 
-#: src/arm/gnunet-service-arm.c:1201
+#: src/arm/gnunet-service-arm.c:1216
 #, c-format
 msgid "Service `%s' terminated normally, will restart at any time\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:1216
+#: src/arm/gnunet-service-arm.c:1231
 #, c-format
 msgid "Service `%s' terminated with status %s/%d, will restart in %s\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:1463
+#: src/arm/gnunet-service-arm.c:1484
 #, fuzzy, c-format
 msgid "Starting default services `%s'\n"
 msgstr "卸载 GNUnet 服务"
 
-#: src/arm/gnunet-service-arm.c:1474
+#: src/arm/gnunet-service-arm.c:1495
 #, c-format
 msgid "Default service `%s' not configured correctly!\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:1488
+#: src/arm/gnunet-service-arm.c:1509
 msgid ""
 "No default services configured, GNUnet will not really start right now.\n"
 msgstr ""
@@ -355,99 +355,99 @@
 msgid "Received last message for %s \n"
 msgstr ""
 
-#: src/ats/gnunet-service-ats_addresses.c:1475
-#: src/ats/gnunet-service-ats_addresses.c:1519
+#: src/ats/gnunet-service-ats_addresses.c:1946
+#: src/ats/gnunet-service-ats_addresses.c:1990
 #, c-format
 msgid ""
 "Could not load quota for network `%s':  `%s', assigning default bandwidth "
 "%llu\n"
 msgstr ""
 
-#: src/ats/gnunet-service-ats_addresses.c:1482
+#: src/ats/gnunet-service-ats_addresses.c:1953
 #, c-format
 msgid "Outbound quota configure for network `%s' is %llu\n"
 msgstr ""
 
-#: src/ats/gnunet-service-ats_addresses.c:1490
+#: src/ats/gnunet-service-ats_addresses.c:1961
 #, c-format
 msgid ""
 "No outbound quota configured for network `%s', assigning default bandwidth "
 "%llu\n"
 msgstr ""
 
-#: src/ats/gnunet-service-ats_addresses.c:1526
+#: src/ats/gnunet-service-ats_addresses.c:1997
 #, c-format
 msgid "Inbound quota configured for network `%s' is %llu\n"
 msgstr ""
 
-#: src/ats/gnunet-service-ats_addresses.c:1534
+#: src/ats/gnunet-service-ats_addresses.c:2005
 #, c-format
 msgid ""
 "No outbound quota configure for network `%s', assigning default bandwidth "
 "%llu\n"
 msgstr ""
 
-#: src/ats/gnunet-service-ats_addresses.c:1700
+#: src/ats/gnunet-service-ats_addresses.c:2175
 #, c-format
 msgid "Initializing solver `%s '`%s'\n"
 msgstr ""
 
-#: src/ats/gnunet-service-ats_addresses.c:1703
+#: src/ats/gnunet-service-ats_addresses.c:2178
 #, fuzzy, c-format
 msgid "Failed to initialize solver `%s'!\n"
 msgstr "无法初始化 SQLite:%s。\n"
 
-#: src/ats/gnunet-service-ats_addresses.c:1726
+#: src/ats/gnunet-service-ats_addresses.c:2201
 #, fuzzy
 msgid "Failed to initialize solver!\n"
 msgstr "无法初始化 SQLite:%s。\n"
 
-#: src/ats/libgnunet_plugin_ats_mlp.c:868
+#: src/ats/plugin_ats_mlp.c:868
 msgid "Problem size too large, cannot allocate memory!\n"
 msgstr ""
 
-#: src/ats/libgnunet_plugin_ats_mlp.c:1239
+#: src/ats/plugin_ats_mlp.c:1281
 #, c-format
 msgid "Adding address for peer `%s' multiple times\n"
 msgstr ""
 
-#: src/ats/libgnunet_plugin_ats_mlp.c:1286
+#: src/ats/plugin_ats_mlp.c:1328
 #, c-format
 msgid "Updating address property `%s' for peer `%s' %p not added before\n"
 msgstr ""
 
-#: src/ats/libgnunet_plugin_ats_mlp.c:2010
+#: src/ats/plugin_ats_mlp.c:2059
 #, c-format
 msgid ""
 "Adjusting inconsistent outbound quota configuration for network `%s', is "
 "%llu must be at least %llu\n"
 msgstr ""
 
-#: src/ats/libgnunet_plugin_ats_mlp.c:2018
+#: src/ats/plugin_ats_mlp.c:2067
 #, c-format
 msgid ""
 "Adjusting inconsistent inbound quota configuration for network `%s', is %llu "
 "must be at least %llu\n"
 msgstr ""
 
-#: src/ats/libgnunet_plugin_ats_mlp.c:2028
+#: src/ats/plugin_ats_mlp.c:2077
 #, c-format
 msgid ""
 "Adjusting outbound quota configuration for network `%s'from %llu to %.0f\n"
 msgstr ""
 
-#: src/ats/libgnunet_plugin_ats_mlp.c:2036
+#: src/ats/plugin_ats_mlp.c:2085
 #, c-format
 msgid ""
 "Adjusting inbound quota configuration for network `%s' from %llu to %.0f\n"
 msgstr ""
 
-#: src/ats/libgnunet_plugin_ats_mlp.c:2047
+#: src/ats/plugin_ats_mlp.c:2096
 #, c-format
 msgid "Using default quota configuration for network `%s' (in/out) %llu/%llu\n"
 msgstr ""
 
-#: src/ats/libgnunet_plugin_ats_proportional.c:1438
+#: src/ats/plugin_ats_proportional.c:1514
 #, fuzzy, c-format
 msgid "Invalid network type `%u' `%s': Disconnect!\n"
 msgstr "找不到主机“%s”的 IP:%s\n"
@@ -474,13 +474,13 @@
 msgid "Quota for network `%11s' (in/out): %10s / %10s\n"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:347 src/namestore/gnunet-namestore.c:520
-#: src/transport/gnunet-transport.c:807
+#: src/ats-tool/gnunet-ats.c:347 src/namestore/gnunet-namestore.c:547
+#: src/transport/gnunet-transport.c:829
 #, fuzzy, c-format
 msgid "Service `%s' is not running\n"
 msgstr "服务已删除。\n"
 
-#: src/ats-tool/gnunet-ats.c:359 src/transport/gnunet-transport.c:816
+#: src/ats-tool/gnunet-ats.c:359 src/transport/gnunet-transport.c:838
 #, fuzzy, c-format
 msgid "Failed to parse peer identity `%s'\n"
 msgstr "解析配置文件“%s”失败\n"
@@ -562,220 +562,274 @@
 msgid "Print information about ATS state"
 msgstr "无法获取有关用户“%s”的信息:%s\n"
 
-#: src/consensus/gnunet-consensus-profiler.c:394
+#: src/consensus/gnunet-consensus-profiler.c:420
 #, fuzzy
 msgid "number of peers in consensus"
 msgstr "迭代次数"
 
-#: src/consensus/gnunet-consensus-profiler.c:397
+#: src/consensus/gnunet-consensus-profiler.c:423
 msgid "how many peers receive one value?"
 msgstr ""
 
-#: src/consensus/gnunet-consensus-profiler.c:400
+#: src/consensus/gnunet-consensus-profiler.c:426
 #: 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:403
+#: src/consensus/gnunet-consensus-profiler.c:429
 msgid "consensus timeout"
 msgstr ""
 
-#: src/consensus/gnunet-consensus-profiler.c:406
+#: src/consensus/gnunet-consensus-profiler.c:432
 msgid "be more verbose (print received values)"
 msgstr ""
 
-#: src/conversation/conversation_api.c:333
-#: src/conversation/conversation_api.c:959
-#, fuzzy, c-format
-msgid "Internal error %d\n"
-msgstr "未知错误。\n"
+#: src/conversation/conversation_api.c:557
+#: src/conversation/conversation_api_call.c:468
+msgid "Connection to conversation service lost, trying to reconnect\n"
+msgstr ""
 
-#: src/conversation/gnunet-conversation.c:186
+#: src/conversation/gnunet-conversation.c:252
 #, c-format
-msgid ""
-"Incoming call from `%s'.\n"
-"Please /accept or /cancel the call.\n"
+msgid "Incoming call from `%s'. Please /accept #%u or /cancel %u the call.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:206
-#: src/conversation/gnunet-conversation.c:315
+#: src/conversation/gnunet-conversation.c:274
 #, c-format
-msgid "Call terminated: %s\n"
+msgid "Call from `%s' terminated\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:226
+#: src/conversation/gnunet-conversation.c:307
 #, c-format
+msgid "Call from `%s' suspended by other user\n"
+msgstr ""
+
+#: src/conversation/gnunet-conversation.c:312
+#, c-format
+msgid "Call from `%s' resumed by other user\n"
+msgstr ""
+
+#: src/conversation/gnunet-conversation.c:330
+#, c-format
 msgid "Ego `%s' no longer available, phone is now down.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:239
+#: src/conversation/gnunet-conversation.c:344
 #, fuzzy
 msgid "Failed to setup phone (internal error)\n"
 msgstr "发送消息失败。\n"
 
-#: src/conversation/gnunet-conversation.c:252
+#: src/conversation/gnunet-conversation.c:357
 #, c-format
 msgid "Phone active on line %u\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:284
-msgid "Resolved address. Now ringing other party.\n"
+#: src/conversation/gnunet-conversation.c:379
+#, c-format
+msgid "Resolved address of `%s'. Now ringing other party.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:290
+#: src/conversation/gnunet-conversation.c:386
 #, fuzzy, c-format
-msgid "Connection established to `%s': %s\n"
+msgid "Connection established to `%s'\n"
 msgstr "找不到接口“%s”的一个 IP 地址。\n"
 
-#: src/conversation/gnunet-conversation.c:298
+#: src/conversation/gnunet-conversation.c:393
 #, fuzzy, c-format
 msgid "Failed to resolve `%s'\n"
 msgstr "打开日志文件“%s”失败:%s\n"
 
-#: src/conversation/gnunet-conversation.c:307
-msgid "Line busy\n"
+#: src/conversation/gnunet-conversation.c:400
+msgid "Call terminated\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:385
+#: src/conversation/gnunet-conversation.c:406
+#, c-format
+msgid "Connection to `%s' suspended (by other user)\n"
+msgstr ""
+
+#: src/conversation/gnunet-conversation.c:412
+#, c-format
+msgid "Connection to `%s' resumed (by other user)\n"
+msgstr ""
+
+#: src/conversation/gnunet-conversation.c:479
 #, fuzzy, c-format
 msgid "Unknown command `%s'\n"
 msgstr "未知的命令“%s”。\n"
 
-#: src/conversation/gnunet-conversation.c:401
-#: src/conversation/gnunet-conversation.c:409
+#: src/conversation/gnunet-conversation.c:495
+#: src/conversation/gnunet-conversation.c:509
 #, 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"
+#: src/conversation/gnunet-conversation.c:502
+#: src/conversation/gnunet-conversation.c:552
+msgid "You are calling someone else already, hang up first!\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:424
-#: src/conversation/gnunet-conversation.c:438
+#: src/conversation/gnunet-conversation.c:517
+#: src/conversation/gnunet-conversation.c:565
 #, c-format
-msgid "You are already in a conversation with `%s', refusing to call `%s'.\n"
+msgid "You are answering call from `%s', hang up or suspend that call first!\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"
+#: src/conversation/gnunet-conversation.c:576
+msgid "There is no incoming call to accept here!\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
+#: src/conversation/gnunet-conversation.c:593
 #, c-format
-msgid "You are trying to call `%s', cannot accept incoming calls right now.\n"
+msgid "There is no incoming call `%s' to accept right now!\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:521
+#: src/conversation/gnunet-conversation.c:621
 msgid "We currently do not have an address.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:542
+#: src/conversation/gnunet-conversation.c:644
 #, c-format
 msgid "We are currently trying to locate the private key for the ego `%s'.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:547
+#: src/conversation/gnunet-conversation.c:649
 #, c-format
 msgid "We are listening for incoming calls for ego `%s' on line %u.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:553
+#: src/conversation/gnunet-conversation.c:655
+#: src/conversation/gnunet-conversation.c:679
 #, c-format
-msgid "The phone is rining. `%s' is trying to call us.\n"
+msgid "You are having a conversation with `%s'.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:559
-#, c-format
-msgid "You are having a conversation with `%s'.\n"
+#: src/conversation/gnunet-conversation.c:660
+msgid ""
+"We had an internal error setting up our phone line. You can still make "
+"calls.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:564
+#: src/conversation/gnunet-conversation.c:669
 #, 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
+#: src/conversation/gnunet-conversation.c:674
 #, 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"
+#: src/conversation/gnunet-conversation.c:693
+msgid "Calls waiting:\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:595
+#: src/conversation/gnunet-conversation.c:699
+#, fuzzy, c-format
+msgid "#%u: `%s'\n"
+msgstr "运行 %s失败:%s %d\n"
+
+#: src/conversation/gnunet-conversation.c:727
+#: src/conversation/gnunet-conversation.c:742
+msgid "There is no call that could be suspended right now.\n"
+msgstr ""
+
+#: src/conversation/gnunet-conversation.c:775
+#: src/conversation/gnunet-conversation.c:791
+msgid "There is no call that could be resumed right now.\n"
+msgstr ""
+
+#: src/conversation/gnunet-conversation.c:798
+#, c-format
+msgid "Already talking with `%s', cannot resume a call right now.\n"
+msgstr ""
+
+#: src/conversation/gnunet-conversation.c:807
+msgid "There is no incoming call to resume here!\n"
+msgstr ""
+
+#: src/conversation/gnunet-conversation.c:824
+#, c-format
+msgid "There is no incoming call `%s' to resume right now!\n"
+msgstr ""
+
+#: src/conversation/gnunet-conversation.c:859
 msgid "There is no call that could be cancelled right now.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:626
+#: src/conversation/gnunet-conversation.c:867
+msgid "There is no incoming call to refuse here!\n"
+msgstr ""
+
+#: src/conversation/gnunet-conversation.c:884
+#, c-format
+msgid "There is no incoming call `%s' to refuse right now!\n"
+msgstr ""
+
+#: src/conversation/gnunet-conversation.c:911
 msgid "Use `/address' to find out which address this phone should have in GNS"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:628
+#: src/conversation/gnunet-conversation.c:913
 msgid "Use `/call USER.gnu' to call USER"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:630
-msgid "Use `/accept MESSAGE' to accept an incoming call"
+#: src/conversation/gnunet-conversation.c:915
+msgid "Use `/accept #NUM' to accept incoming call #NUM"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:632
-msgid "Use `/cancel MESSAGE' to reject or terminate a call"
+#: src/conversation/gnunet-conversation.c:917
+msgid "Use `/suspend' to suspend the active call"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:634
+#: src/conversation/gnunet-conversation.c:919
+msgid ""
+"Use `/resume [#NUM]' to resume a call, #NUM is needed to resume incoming "
+"calls, no argument is needed to resume the current outgoing call."
+msgstr ""
+
+#: src/conversation/gnunet-conversation.c:921
+msgid "Use `/cancel' to reject or terminate a call"
+msgstr ""
+
+#: src/conversation/gnunet-conversation.c:923
 msgid "Use `/status' to print status information"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:636
+#: src/conversation/gnunet-conversation.c:925
 msgid "Use `/quit' to terminate gnunet-conversation"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:638
+#: src/conversation/gnunet-conversation.c:927
 msgid "Use `/help command' to get help for a specific command"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:793
+#: src/conversation/gnunet-conversation.c:1082
 #, fuzzy, c-format
 msgid "Name of our ego changed to `%s'\n"
 msgstr "发送消息失败。\n"
 
-#: src/conversation/gnunet-conversation.c:806
+#: src/conversation/gnunet-conversation.c:1095
 #, c-format
 msgid "Our ego `%s' was deleted!\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:841
+#: src/conversation/gnunet-conversation.c:1130
 #, fuzzy
 msgid "You must specify the NAME of an ego to use\n"
 msgstr "您必须指定一个昵称\n"
 
-#: src/conversation/gnunet-conversation.c:867
+#: src/conversation/gnunet-conversation.c:1156
 msgid "sets the NAME of the ego to use for the phone (and name resolution)"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:870
+#: src/conversation/gnunet-conversation.c:1159
 msgid "sets the LINE to use for the phone"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:885
+#: src/conversation/gnunet-conversation.c:1174
 msgid "Enables having a conversation with other GNUnet users."
 msgstr ""
 
@@ -803,7 +857,7 @@
 
 #: 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/multicast/gnunet-multicast.c:70 src/revocation/gnunet-revocation.c:517
 #: src/template/gnunet-template.c:70
 msgid "help text"
 msgstr ""
@@ -818,12 +872,12 @@
 msgstr ""
 
 #: src/conversation/gnunet-helper-audio-playback.c:211
-#: src/conversation/gnunet-helper-audio-record.c:363
+#: src/conversation/gnunet-helper-audio-record.c:362
 msgid "Connection established.\n"
 msgstr ""
 
 #: src/conversation/gnunet-helper-audio-playback.c:216
-#: src/conversation/gnunet-helper-audio-record.c:368
+#: src/conversation/gnunet-helper-audio-record.c:367
 #, fuzzy, c-format
 msgid "pa_stream_new() failed: %s\n"
 msgstr "“%s”说:%s\n"
@@ -834,34 +888,34 @@
 msgstr ""
 
 #: src/conversation/gnunet-helper-audio-playback.c:243
-#: src/conversation/gnunet-helper-audio-record.c:394
+#: src/conversation/gnunet-helper-audio-record.c:393
 #, 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
+#: src/conversation/gnunet-helper-audio-record.c:416
 msgid "Wrong Spec\n"
 msgstr ""
 
 #: src/conversation/gnunet-helper-audio-playback.c:270
-#: src/conversation/gnunet-helper-audio-record.c:423
+#: src/conversation/gnunet-helper-audio-record.c:422
 msgid "pa_mainloop_new() failed.\n"
 msgstr ""
 
 #: src/conversation/gnunet-helper-audio-playback.c:284
-#: src/conversation/gnunet-helper-audio-record.c:438
+#: src/conversation/gnunet-helper-audio-record.c:437
 msgid "pa_context_new() failed.\n"
 msgstr ""
 
 #: src/conversation/gnunet-helper-audio-playback.c:291
-#: src/conversation/gnunet-helper-audio-record.c:444
+#: src/conversation/gnunet-helper-audio-record.c:443
 #, 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
+#: src/conversation/gnunet-helper-audio-record.c:449
 msgid "pa_mainloop_run() failed.\n"
 msgstr ""
 
@@ -879,54 +933,55 @@
 msgid "Got signal, exiting.\n"
 msgstr ""
 
-#: src/conversation/gnunet-helper-audio-record.c:301
+#: src/conversation/gnunet-helper-audio-record.c:300
 #, fuzzy
 msgid "Stream successfully created.\n"
 msgstr "“%s”已连接到“%s”。\n"
 
-#: src/conversation/gnunet-helper-audio-record.c:306
+#: src/conversation/gnunet-helper-audio-record.c:305
 #, fuzzy, c-format
 msgid "pa_stream_get_buffer_attr() failed: %s\n"
 msgstr "“%s”说:%s\n"
 
-#: src/conversation/gnunet-helper-audio-record.c:314
+#: src/conversation/gnunet-helper-audio-record.c:313
 #, c-format
 msgid "Buffer metrics: maxlength=%u, fragsize=%u\n"
 msgstr ""
 
-#: src/conversation/gnunet-helper-audio-record.c:318
+#: src/conversation/gnunet-helper-audio-record.c:317
 #, c-format
 msgid "Using sample spec '%s', channel map '%s'.\n"
 msgstr ""
 
-#: src/conversation/gnunet-helper-audio-record.c:325
+#: src/conversation/gnunet-helper-audio-record.c:324
 #, fuzzy, c-format
 msgid "Connected to device %s (%u, %ssuspended).\n"
 msgstr "“%s”已连接到“%s”。\n"
 
-#: src/conversation/gnunet-helper-audio-record.c:334
+#: src/conversation/gnunet-helper-audio-record.c:333
 #, c-format
 msgid "Stream error: %s\n"
 msgstr ""
 
-#: src/conversation/gnunet-helper-audio-record.c:381
+#: src/conversation/gnunet-helper-audio-record.c:380
 #, fuzzy, c-format
 msgid "pa_stream_connect_record() failed: %s\n"
 msgstr "“%s”说:%s\n"
 
-#: src/conversation/gnunet-service-conversation.c:612
+#: src/conversation/gnunet-service-conversation.c:825
 msgid "Mesh audio channel not ready; audio data dropped\n"
 msgstr ""
 
-#: src/conversation/gnunet-service-conversation.c:700
+#: src/conversation/gnunet-service-conversation.c:915
 #, c-format
-msgid "No available phone for incoming call on line %u, sending BUSY signal\n"
+msgid ""
+"No available phone for incoming call on line %u, sending HANG_UP signal\n"
 msgstr ""
 
-#: src/conversation/gnunet-service-conversation.c:1054
-#, c-format
-msgid "Received incoming tunnel on port %u\n"
-msgstr ""
+#: src/conversation/gnunet-service-conversation.c:1302
+#, fuzzy, c-format
+msgid "Received incoming channel on port %u\n"
+msgstr "“%s”已连接到“%s”。\n"
 
 #: src/conversation/microphone.c:121
 #, fuzzy
@@ -942,7 +997,7 @@
 msgid "Could not start playback audio helper.\n"
 msgstr ""
 
-#: src/core/core_api.c:761
+#: src/core/core_api.c:765
 msgid "Client was disconnected from core service, trying to reconnect.\n"
 msgstr ""
 
@@ -952,28 +1007,27 @@
 msgstr ""
 
 #: src/core/gnunet-core.c:110 src/core/gnunet-core.c:138
-#: src/transport/gnunet-transport.c:601 src/transport/gnunet-transport.c:625
+#: src/transport/gnunet-transport.c:609 src/transport/gnunet-transport.c:634
 #, c-format
 msgid "%24s: %-17s %4s   (%u connections in total)\n"
 msgstr ""
 
-#: src/core/gnunet-core.c:112 src/transport/gnunet-transport.c:603
+#: src/core/gnunet-core.c:112 src/transport/gnunet-transport.c:611
 #, fuzzy
 msgid "Connected to"
 msgstr "“%s”已连接到“%s”。\n"
 
-#: src/core/gnunet-core.c:140 src/transport/gnunet-transport.c:627
+#: src/core/gnunet-core.c:140 src/transport/gnunet-transport.c:636
 #, fuzzy
 msgid "Disconnected from"
 msgstr "“%s”已连接到“%s”。\n"
 
-#: src/core/gnunet-core.c:164 src/mesh/gnunet-mesh.c:174
-#: src/peerinfo-tool/gnunet-peerinfo.c:645
+#: src/core/gnunet-core.c:164 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:201 src/transport/gnunet-transport.c:999
+#: src/core/gnunet-core.c:201 src/transport/gnunet-transport.c:1028
 msgid "provide information about all current connections (continuously)"
 msgstr ""
 
@@ -1016,118 +1070,118 @@
 msgid "# key exchanges initiated"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:701
+#: src/core/gnunet-service-core_kx.c:708
 msgid "# key exchanges stopped"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:764
+#: src/core/gnunet-service-core_kx.c:771
 msgid "# old ephemeral keys ignored"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:770
+#: src/core/gnunet-service-core_kx.c:777
 msgid "# ephemeral keys received"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:804
+#: src/core/gnunet-service-core_kx.c:811
 #, 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:820
+#: src/core/gnunet-service-core_kx.c:827
 msgid "# EPHEMERAL_KEY messages decrypted"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:923
-#: src/transport/gnunet-service-transport_validation.c:938
+#: src/core/gnunet-service-core_kx.c:930
+#: src/transport/gnunet-service-transport_validation.c:974
 msgid "# PING messages received"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:931
+#: src/core/gnunet-service-core_kx.c:938
 msgid "# PING messages dropped (out of order)"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:958
+#: src/core/gnunet-service-core_kx.c:965
 #, 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:975
+#: src/core/gnunet-service-core_kx.c:982
 msgid "# PONG messages created"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1001
+#: src/core/gnunet-service-core_kx.c:1008
 msgid "# sessions terminated by timeout"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1011
+#: src/core/gnunet-service-core_kx.c:1018
 msgid "# keepalive messages sent"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1068
-#: src/transport/gnunet-service-transport_validation.c:1233
+#: src/core/gnunet-service-core_kx.c:1075
+#: src/transport/gnunet-service-transport_validation.c:1285
 msgid "# PONG messages received"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1074
+#: src/core/gnunet-service-core_kx.c:1081
 msgid "# PONG messages dropped (connection down)"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1079
+#: src/core/gnunet-service-core_kx.c:1086
 msgid "# PONG messages dropped (out of order)"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1109
+#: src/core/gnunet-service-core_kx.c:1116
 msgid "# PONG messages decrypted"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1143
+#: src/core/gnunet-service-core_kx.c:1150
 msgid "# session keys confirmed via PONG"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1153
+#: src/core/gnunet-service-core_kx.c:1160
 msgid "# timeouts prevented via PONG"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1160
+#: src/core/gnunet-service-core_kx.c:1167
 msgid "# rekey operations confirmed via PONG"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1300
+#: src/core/gnunet-service-core_kx.c:1307
 msgid "# DATA message dropped (out of order)"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1307
+#: src/core/gnunet-service-core_kx.c:1314
 #, 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:1310
+#: src/core/gnunet-service-core_kx.c:1317
 msgid "# sessions terminated by key expiration"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1353
-#: src/core/gnunet-service-core_kx.c:1378
+#: src/core/gnunet-service-core_kx.c:1360
+#: src/core/gnunet-service-core_kx.c:1385
 msgid "# bytes dropped (duplicates)"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1365
+#: src/core/gnunet-service-core_kx.c:1372
 msgid "# bytes dropped (out of sequence)"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1406
+#: src/core/gnunet-service-core_kx.c:1413
 msgid "# bytes dropped (ancient message)"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1414
+#: src/core/gnunet-service-core_kx.c:1421
 msgid "# bytes of payload decrypted"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1445
+#: src/core/gnunet-service-core_kx.c:1452
 msgid "# PAYLOAD dropped (out of order)"
 msgstr ""
 
@@ -1153,14 +1207,16 @@
 #: 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/dht/gnunet-service-xdht_neighbours.c:662
+#: src/dht/gnunet-service-xdht_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:3052
+#: src/transport/gnunet-service-transport_neighbours.c:1123
+#: src/transport/gnunet-service-transport_neighbours.c:1132
+#: src/transport/gnunet-service-transport_neighbours.c:2860
+#: src/transport/gnunet-service-transport_neighbours.c:3129
 msgid "# peers connected"
 msgstr ""
 
@@ -1235,7 +1291,7 @@
 #: src/namecache/plugin_namecache_sqlite.c:52
 #: src/namestore/plugin_namestore_postgres.c:52
 #: src/namestore/plugin_namestore_sqlite.c:52
-#: src/testbed/testbed_api_hosts.c:69 src/util/crypto_ecc.c:53
+#: src/testbed/testbed_api_hosts.c:69 src/util/crypto_ecc.c:51
 #: src/include/gnunet_common.h:602 src/include/gnunet_common.h:611
 #: src/scalarproduct/scalarproduct.h:61
 #, fuzzy, c-format
@@ -1266,87 +1322,87 @@
 msgid "Failed to transmit request to drop database.\n"
 msgstr ""
 
-#: src/datastore/datastore_api.c:393
+#: src/datastore/datastore_api.c:394
 msgid "# queue entry timeouts"
 msgstr ""
 
-#: src/datastore/datastore_api.c:437
+#: src/datastore/datastore_api.c:443
 msgid "# queue overflows"
 msgstr ""
 
-#: src/datastore/datastore_api.c:465
+#: src/datastore/datastore_api.c:471
 msgid "# queue entries created"
 msgstr ""
 
-#: src/datastore/datastore_api.c:483
+#: src/datastore/datastore_api.c:491
 msgid "# Requests dropped from datastore queue"
 msgstr ""
 
-#: src/datastore/datastore_api.c:525
+#: src/datastore/datastore_api.c:533
 msgid "# datastore connections (re)created"
 msgstr ""
 
-#: src/datastore/datastore_api.c:608 src/scalarproduct/scalarproduct_api.c:279
+#: src/datastore/datastore_api.c:616 src/scalarproduct/scalarproduct_api.c:279
 msgid "# transmission request failures"
 msgstr ""
 
-#: src/datastore/datastore_api.c:630
+#: src/datastore/datastore_api.c:638
 msgid "# bytes sent to datastore"
 msgstr ""
 
-#: src/datastore/datastore_api.c:762
+#: src/datastore/datastore_api.c:770
 msgid "Failed to receive status response from database."
 msgstr ""
 
-#: src/datastore/datastore_api.c:776
+#: src/datastore/datastore_api.c:784
 msgid "Error reading response from datastore service"
 msgstr ""
 
-#: src/datastore/datastore_api.c:788 src/datastore/datastore_api.c:794
+#: src/datastore/datastore_api.c:796 src/datastore/datastore_api.c:802
 msgid "Invalid error message received from datastore service"
 msgstr ""
 
-#: src/datastore/datastore_api.c:798
+#: src/datastore/datastore_api.c:806
 msgid "# status messages received"
 msgstr ""
 
-#: src/datastore/datastore_api.c:868
+#: src/datastore/datastore_api.c:876
 msgid "# PUT requests executed"
 msgstr ""
 
-#: src/datastore/datastore_api.c:935
+#: src/datastore/datastore_api.c:944
 msgid "# RESERVE requests executed"
 msgstr ""
 
-#: src/datastore/datastore_api.c:996
+#: src/datastore/datastore_api.c:1005
 msgid "# RELEASE RESERVE requests executed"
 msgstr ""
 
-#: src/datastore/datastore_api.c:1055
+#: src/datastore/datastore_api.c:1065
 msgid "# UPDATE requests executed"
 msgstr ""
 
-#: src/datastore/datastore_api.c:1119
+#: src/datastore/datastore_api.c:1129
 msgid "# REMOVE requests executed"
 msgstr ""
 
-#: src/datastore/datastore_api.c:1164
+#: src/datastore/datastore_api.c:1174
 msgid "Failed to receive response from database.\n"
 msgstr ""
 
-#: src/datastore/datastore_api.c:1223
+#: src/datastore/datastore_api.c:1233
 msgid "# Results received"
 msgstr ""
 
-#: src/datastore/datastore_api.c:1290
+#: src/datastore/datastore_api.c:1300
 msgid "# GET REPLICATION requests executed"
 msgstr ""
 
-#: src/datastore/datastore_api.c:1353
+#: src/datastore/datastore_api.c:1363
 msgid "# GET ZERO ANONYMITY requests executed"
 msgstr ""
 
-#: src/datastore/datastore_api.c:1414
+#: src/datastore/datastore_api.c:1424
 msgid "# GET requests executed"
 msgstr ""
 
@@ -1380,12 +1436,12 @@
 msgstr ""
 
 #: src/datastore/gnunet-service-datastore.c:483
-#: src/gns/gnunet-gns-helper-service-w32.c:155
+#: src/gns/gnunet-gns-helper-service-w32.c:187
 msgid "Transmission to client failed!\n"
 msgstr ""
 
 #: src/datastore/gnunet-service-datastore.c:514
-#: src/gns/gnunet-gns-helper-service-w32.c:183
+#: src/gns/gnunet-gns-helper-service-w32.c:215
 msgid "Shutdown in progress, aborting transmission.\n"
 msgstr ""
 
@@ -1703,228 +1759,285 @@
 msgid "Issue a PUT request to the GNUnet DHT insert DATA under KEY."
 msgstr ""
 
-#: src/dht/gnunet-service-dht.c:172
+#: src/dht/gnunet-service-dht.c:172 src/dht/gnunet-service-xdht.c:172
 #, fuzzy
 msgid "Failed to connect to transport service!\n"
 msgstr "初始化“%s”服务失败。\n"
 
 #: src/dht/gnunet-service-dht_clients.c:417
+#: src/dht/gnunet-service-xdht_clients.c:417
 msgid "# GET requests from clients injected"
 msgstr ""
 
 #: src/dht/gnunet-service-dht_clients.c:511
+#: src/dht/gnunet-service-xdht_clients.c:511
 msgid "# PUT requests received from clients"
 msgstr ""
 
 #: src/dht/gnunet-service-dht_clients.c:595
+#: src/dht/gnunet-service-xdht_clients.c:595
 msgid "# GET requests received from clients"
 msgstr ""
 
 #: src/dht/gnunet-service-dht_clients.c:796
+#: src/dht/gnunet-service-xdht_clients.c:796
 msgid "# GET STOP requests received from clients"
 msgstr ""
 
 #: src/dht/gnunet-service-dht_clients.c:1037
+#: src/dht/gnunet-service-xdht_clients.c:1037
 msgid "# Key match, type mismatches in REPLY to CLIENT"
 msgstr ""
 
 #: src/dht/gnunet-service-dht_clients.c:1050
+#: src/dht/gnunet-service-xdht_clients.c:1050
 msgid "# Duplicate REPLIES to CLIENT request dropped"
 msgstr ""
 
 #: src/dht/gnunet-service-dht_clients.c:1087
+#: src/dht/gnunet-service-xdht_clients.c:1087
 #, c-format
 msgid "Unsupported block type (%u) in request!\n"
 msgstr ""
 
 #: src/dht/gnunet-service-dht_clients.c:1110
+#: src/dht/gnunet-service-xdht_clients.c:1110
 msgid "# RESULTS queued for clients"
 msgstr ""
 
 #: src/dht/gnunet-service-dht_clients.c:1164
 #: src/dht/gnunet-service-dht_clients.c:1206
+#: src/dht/gnunet-service-xdht_clients.c:1164
+#: src/dht/gnunet-service-xdht_clients.c:1206
 msgid "# REPLIES ignored for CLIENTS (no match)"
 msgstr ""
 
 #: src/dht/gnunet-service-dht_clients.c:1174
+#: src/dht/gnunet-service-xdht_clients.c:1174
 msgid "Could not pass reply to client, message too big!\n"
 msgstr ""
 
 #: src/dht/gnunet-service-dht_datacache.c:68
+#: src/dht/gnunet-service-xdht_datacache.c:68
 #, c-format
 msgid "%s request received, but have no datacache!\n"
 msgstr ""
 
 #: src/dht/gnunet-service-dht_datacache.c:78
+#: src/dht/gnunet-service-xdht_datacache.c:78
 msgid "# ITEMS stored in datacache"
 msgstr ""
 
 #: src/dht/gnunet-service-dht_datacache.c:165
+#: src/dht/gnunet-service-xdht_datacache.c:165
 msgid "# Good RESULTS found in datacache"
 msgstr ""
 
 #: src/dht/gnunet-service-dht_datacache.c:176
+#: src/dht/gnunet-service-xdht_datacache.c:176
 msgid "# Duplicate RESULTS found in datacache"
 msgstr ""
 
 #: src/dht/gnunet-service-dht_datacache.c:182
+#: src/dht/gnunet-service-xdht_datacache.c:182
 msgid "# Invalid RESULTS found in datacache"
 msgstr ""
 
 #: src/dht/gnunet-service-dht_datacache.c:188
+#: src/dht/gnunet-service-xdht_datacache.c:188
 msgid "# Irrelevant RESULTS found in datacache"
 msgstr ""
 
 #: src/dht/gnunet-service-dht_datacache.c:200
+#: src/dht/gnunet-service-xdht_datacache.c:200
 msgid "# Unsupported RESULTS found in datacache"
 msgstr ""
 
 #: src/dht/gnunet-service-dht_datacache.c:203
+#: src/dht/gnunet-service-xdht_datacache.c:203
 #, c-format
 msgid "Unsupported block type (%u) in local response!\n"
 msgstr ""
 
 #: src/dht/gnunet-service-dht_datacache.c:234
+#: src/dht/gnunet-service-xdht_datacache.c:234
 msgid "# GET requests given to datacache"
 msgstr ""
 
 #: src/dht/gnunet-service-dht_hello.c:82
+#: src/dht/gnunet-service-xdht_hello.c:82
 msgid "# HELLOs obtained from peerinfo"
 msgstr ""
 
 #: src/dht/gnunet-service-dht_neighbours.c:516
+#: src/dht/gnunet-service-xdht_neighbours.c:516
 msgid "# Preference updates given to core"
 msgstr ""
 
 #: src/dht/gnunet-service-dht_neighbours.c:610
+#: src/dht/gnunet-service-xdht_neighbours.c:610
 msgid "# FIND PEER messages initiated"
 msgstr ""
 
 #: src/dht/gnunet-service-dht_neighbours.c:764
+#: src/dht/gnunet-service-xdht_neighbours.c:764
 msgid "# Queued messages discarded (peer disconnected)"
 msgstr ""
 
 #: src/dht/gnunet-service-dht_neighbours.c:819
+#: src/dht/gnunet-service-xdht_neighbours.c:819
 msgid "# Bytes transmitted to other peers"
 msgstr ""
 
 #: src/dht/gnunet-service-dht_neighbours.c:857
+#: src/dht/gnunet-service-xdht_neighbours.c:857
 msgid "# Bytes of bandwidth requested from core"
 msgstr ""
 
 #: src/dht/gnunet-service-dht_neighbours.c:889
+#: src/dht/gnunet-service-xdht_neighbours.c:889
 msgid "# requests TTL-dropped"
 msgstr ""
 
 #: src/dht/gnunet-service-dht_neighbours.c:1093
 #: src/dht/gnunet-service-dht_neighbours.c:1130
+#: src/dht/gnunet-service-xdht_neighbours.c:1093
+#: src/dht/gnunet-service-xdht_neighbours.c:1130
 msgid "# Peers excluded from routing due to Bloomfilter"
 msgstr ""
 
 #: src/dht/gnunet-service-dht_neighbours.c:1108
 #: src/dht/gnunet-service-dht_neighbours.c:1145
+#: src/dht/gnunet-service-xdht_neighbours.c:1108
+#: src/dht/gnunet-service-xdht_neighbours.c:1145
 msgid "# Peer selection failed"
 msgstr ""
 
 #: src/dht/gnunet-service-dht_neighbours.c:1287
+#: src/dht/gnunet-service-xdht_neighbours.c:1287
 msgid "# PUT requests routed"
 msgstr ""
 
 #: src/dht/gnunet-service-dht_neighbours.c:1316
+#: src/dht/gnunet-service-xdht_neighbours.c:1316
 msgid "# PUT messages queued for transmission"
 msgstr ""
 
 #: src/dht/gnunet-service-dht_neighbours.c:1323
 #: src/dht/gnunet-service-dht_neighbours.c:1440
 #: src/dht/gnunet-service-dht_neighbours.c:1543
+#: src/dht/gnunet-service-xdht_neighbours.c:1323
+#: src/dht/gnunet-service-xdht_neighbours.c:1440
+#: src/dht/gnunet-service-xdht_neighbours.c:1543
 msgid "# P2P messages dropped due to full queue"
 msgstr ""
 
 #: src/dht/gnunet-service-dht_neighbours.c:1405
+#: src/dht/gnunet-service-xdht_neighbours.c:1405
 msgid "# GET requests routed"
 msgstr ""
 
 #: src/dht/gnunet-service-dht_neighbours.c:1432
+#: src/dht/gnunet-service-xdht_neighbours.c:1432
 msgid "# GET messages queued for transmission"
 msgstr ""
 
 #: src/dht/gnunet-service-dht_neighbours.c:1550
+#: src/dht/gnunet-service-xdht_neighbours.c:1550
 msgid "# RESULT messages queued for transmission"
 msgstr ""
 
 #: src/dht/gnunet-service-dht_neighbours.c:1637
+#: src/dht/gnunet-service-xdht_neighbours.c:1637
 msgid "# P2P PUT requests received"
 msgstr ""
 
 #: src/dht/gnunet-service-dht_neighbours.c:1640
+#: src/dht/gnunet-service-xdht_neighbours.c:1640
 msgid "# P2P PUT bytes received"
 msgstr ""
 
 #: src/dht/gnunet-service-dht_neighbours.c:1803
+#: src/dht/gnunet-service-xdht_neighbours.c:1803
 msgid "# FIND PEER requests ignored due to Bloomfilter"
 msgstr ""
 
 #: src/dht/gnunet-service-dht_neighbours.c:1811
+#: src/dht/gnunet-service-xdht_neighbours.c:1811
 msgid "# FIND PEER requests ignored due to lack of HELLO"
 msgstr ""
 
 #: src/dht/gnunet-service-dht_neighbours.c:1904
+#: src/dht/gnunet-service-xdht_neighbours.c:1904
 msgid "# P2P GET requests received"
 msgstr ""
 
 #: src/dht/gnunet-service-dht_neighbours.c:1907
+#: src/dht/gnunet-service-xdht_neighbours.c:1907
 msgid "# P2P GET bytes received"
 msgstr ""
 
 #: src/dht/gnunet-service-dht_neighbours.c:1961
+#: src/dht/gnunet-service-xdht_neighbours.c:1961
 msgid "# P2P FIND PEER requests processed"
 msgstr ""
 
 #: src/dht/gnunet-service-dht_neighbours.c:1975
+#: src/dht/gnunet-service-xdht_neighbours.c:1975
 msgid "# P2P GET requests ONLY routed"
 msgstr ""
 
 #: src/dht/gnunet-service-dht_neighbours.c:2052
+#: src/dht/gnunet-service-xdht_neighbours.c:2052
 msgid "# P2P RESULTS received"
 msgstr ""
 
 #: src/dht/gnunet-service-dht_neighbours.c:2055
+#: src/dht/gnunet-service-xdht_neighbours.c:2055
 msgid "# P2P RESULT bytes received"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_nse.c:59
+#: src/dht/gnunet-service-dht_nse.c:59 src/dht/gnunet-service-xdht_nse.c:59
 msgid "# Network size estimates received"
 msgstr ""
 
 #: src/dht/gnunet-service-dht_routing.c:211
+#: src/dht/gnunet-service-xdht_routing.c:211
 msgid "# Good REPLIES matched against routing table"
 msgstr ""
 
 #: src/dht/gnunet-service-dht_routing.c:220
+#: src/dht/gnunet-service-xdht_routing.c:220
 msgid "# Duplicate REPLIES matched against routing table"
 msgstr ""
 
 #: src/dht/gnunet-service-dht_routing.c:226
+#: src/dht/gnunet-service-xdht_routing.c:226
 msgid "# Invalid REPLIES matched against routing table"
 msgstr ""
 
 #: src/dht/gnunet-service-dht_routing.c:232
+#: src/dht/gnunet-service-xdht_routing.c:232
 msgid "# Irrelevant REPLIES matched against routing table"
 msgstr ""
 
 #: src/dht/gnunet-service-dht_routing.c:244
+#: src/dht/gnunet-service-xdht_routing.c:244
 msgid "# Unsupported REPLIES matched against routing table"
 msgstr ""
 
 #: src/dht/gnunet-service-dht_routing.c:317
+#: src/dht/gnunet-service-xdht_routing.c:317
 msgid "# Entries removed from routing table"
 msgstr ""
 
 #: src/dht/gnunet-service-dht_routing.c:399
+#: src/dht/gnunet-service-xdht_routing.c:399
 msgid "# Entries added to routing table"
 msgstr ""
 
 #: src/dht/gnunet-service-dht_routing.c:417
+#: src/dht/gnunet-service-xdht_routing.c:417
 msgid "# DHT requests combined"
 msgstr ""
 
@@ -1942,12 +2055,12 @@
 msgid "Block of type %u is malformed\n"
 msgstr ""
 
-#: src/dns/dnsparser.c:239
+#: src/dns/dnsparser.c:257
 #, fuzzy, c-format
 msgid "Failed to convert DNS IDNA name `%s' to UTF-8: %s\n"
 msgstr "打开日志文件“%s”失败:%s\n"
 
-#: src/dns/dnsparser.c:800
+#: src/dns/dnsparser.c:856
 #, fuzzy, c-format
 msgid "Failed to convert UTF-8 name `%s' to DNS IDNA format: %s\n"
 msgstr "打开日志文件“%s”失败:%s\n"
@@ -2038,21 +2151,21 @@
 msgid "# DNS requests received via TUN interface"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:1049 src/exit/gnunet-daemon-exit.c:3498
+#: src/dns/gnunet-service-dns.c:1049 src/exit/gnunet-daemon-exit.c:3499
 #, 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:3555
+#: src/dns/gnunet-service-dns.c:1069 src/exit/gnunet-daemon-exit.c:3556
 #, fuzzy
 msgid "need a valid IPv4 or IPv6 address\n"
 msgstr "无效的进程优先级“%s”\n"
 
-#: src/dv/gnunet-dv.c:165
+#: src/dv/gnunet-dv.c:166
 msgid "verbose output"
 msgstr ""
 
-#: src/dv/gnunet-dv.c:174
+#: src/dv/gnunet-dv.c:175
 #, fuzzy
 msgid "Print information about DV state"
 msgstr "无法获取有关用户“%s”的信息:%s\n"
@@ -2063,18 +2176,21 @@
 msgstr ""
 
 #: src/exit/gnunet-daemon-exit.c:853
-msgid "# Bytes transmitted via mesh tunnels"
+#, fuzzy
+msgid "# Bytes transmitted via mesh channels"
 msgstr ""
+"\n"
+"按任意键继续\n"
 
 #: 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
+#: src/exit/gnunet-daemon-exit.c:2651 src/vpn/gnunet-service-vpn.c:1407
+#: src/vpn/gnunet-service-vpn.c:1797 src/vpn/gnunet-service-vpn.c:1960
 msgid "# ICMPv4 packets dropped (type not allowed)"
 msgstr ""
 
 #: 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
+#: src/exit/gnunet-daemon-exit.c:2710 src/vpn/gnunet-service-vpn.c:1463
+#: src/vpn/gnunet-service-vpn.c:1856 src/vpn/gnunet-service-vpn.c:1993
 msgid "# ICMPv6 packets dropped (type not allowed)"
 msgstr ""
 
@@ -2169,13 +2285,13 @@
 msgid "# ICMP service requests received via mesh"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:2636 src/vpn/gnunet-service-vpn.c:1399
-#: src/vpn/gnunet-service-vpn.c:1956
+#: src/exit/gnunet-daemon-exit.c:2636 src/vpn/gnunet-service-vpn.c:1397
+#: src/vpn/gnunet-service-vpn.c:1954
 msgid "# ICMPv4 packets dropped (impossible PT to v6)"
 msgstr ""
 
-#: 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
+#: src/exit/gnunet-daemon-exit.c:2695 src/vpn/gnunet-service-vpn.c:1433
+#: src/vpn/gnunet-service-vpn.c:1445 src/vpn/gnunet-service-vpn.c:1844
 msgid "# ICMPv6 packets dropped (impossible PT to v4)"
 msgstr ""
 
@@ -2195,58 +2311,58 @@
 msgid "# UDP requests dropped (no such service)"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3024
-msgid "# Inbound MESH tunnels created"
+#: src/exit/gnunet-daemon-exit.c:3025
+msgid "# Inbound MESH channels created"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3285
+#: src/exit/gnunet-daemon-exit.c:3286
 #, c-format
 msgid "No addresses found for hostname `%s' of service `%s'!\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3299 src/exit/gnunet-daemon-exit.c:3311
+#: src/exit/gnunet-daemon-exit.c:3300 src/exit/gnunet-daemon-exit.c:3312
 #, c-format
 msgid "Service `%s' configured for IPv4, but IPv4 is disabled!\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3322
+#: src/exit/gnunet-daemon-exit.c:3323
 #, c-format
 msgid "No IP addresses found for hostname `%s' of service `%s'!\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3511
+#: src/exit/gnunet-daemon-exit.c:3512
 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:3519
+#: src/exit/gnunet-daemon-exit.c:3520
 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:3526
+#: src/exit/gnunet-daemon-exit.c:3527
 msgid ""
 "Cannot enable IPv4 exit but disable IPv4 on TUN interface, will use "
 "ENABLE_IPv4=YES\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3532
+#: src/exit/gnunet-daemon-exit.c:3533
 msgid ""
 "Cannot enable IPv6 exit but disable IPv6 on TUN interface, will use "
 "ENABLE_IPv6=YES\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3538 src/pt/gnunet-daemon-pt.c:1248
+#: src/exit/gnunet-daemon-exit.c:3539 src/pt/gnunet-daemon-pt.c:1247
 msgid "No useful service enabled.  Exiting.\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3654
+#: src/exit/gnunet-daemon-exit.c:3655
 msgid "Must be a number"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3796
+#: src/exit/gnunet-daemon-exit.c:3797
 msgid "Daemon to run to provide an IP exit node for the VPN"
 msgstr ""
 
@@ -2469,7 +2585,7 @@
 msgid "Failed to resume unindexing operation `%s': %s\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/fs/fs_api.c:2376 src/fs/fs_api.c:2616
+#: src/fs/fs_api.c:2376 src/fs/fs_api.c:2617
 #, fuzzy, c-format
 msgid "Failed to resume sub-download `%s': %s\n"
 msgstr "打开日志文件“%s”失败:%s\n"
@@ -2479,21 +2595,21 @@
 msgid "Failed to resume sub-search `%s': %s\n"
 msgstr "打开日志文件“%s”失败:%s\n"
 
-#: src/fs/fs_api.c:2406 src/fs/fs_api.c:2425 src/fs/fs_api.c:2908
+#: src/fs/fs_api.c:2407 src/fs/fs_api.c:2426 src/fs/fs_api.c:2909
 #, c-format
 msgid "Failure while resuming search operation `%s': %s\n"
 msgstr ""
 
-#: src/fs/fs_api.c:2607
+#: src/fs/fs_api.c:2608
 #, fuzzy, c-format
 msgid "Failed to resume sub-download `%s': could not open file `%s'\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/fs/fs_api.c:2852
+#: src/fs/fs_api.c:2853
 msgid "Could not resume running search, will resume as paused search\n"
 msgstr ""
 
-#: src/fs/fs_api.c:2946
+#: src/fs/fs_api.c:2947
 #, c-format
 msgid "Failure while resuming download operation `%s': %s\n"
 msgstr ""
@@ -3137,7 +3253,7 @@
 msgstr ""
 
 #: src/fs/gnunet-publish.c:778 src/fs/gnunet-publish.c:785
-#: src/transport/gnunet-transport.c:840 src/transport/gnunet-transport.c:870
+#: src/transport/gnunet-transport.c:865 src/transport/gnunet-transport.c:899
 #, c-format
 msgid "Option `%s' makes no sense without option `%s'.\n"
 msgstr ""
@@ -3237,7 +3353,7 @@
 msgid "# Loopback routes suppressed"
 msgstr ""
 
-#: src/fs/gnunet-service-fs.c:639 src/hostlist/gnunet-daemon-hostlist.c:293
+#: src/fs/gnunet-service-fs.c:639 src/hostlist/gnunet-daemon-hostlist.c:288
 #: src/topology/gnunet-daemon-topology.c:1253
 #: src/topology/gnunet-daemon-topology.c:1260
 #, fuzzy, c-format
@@ -3305,7 +3421,7 @@
 msgid "# requests dropped due to initiator not being connected"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1194
+#: src/fs/gnunet-service-fs_cp.c:1193
 msgid "# requests dropped due to missing reverse route"
 msgstr ""
 
@@ -3371,7 +3487,7 @@
 msgid "Indexed file `%s' changed at offset %llu\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_lc.c:202 src/fs/gnunet-service-fs_lc.c:369
+#: src/fs/gnunet-service-fs_lc.c:202 src/fs/gnunet-service-fs_lc.c:368
 msgid "# client searches active"
 msgstr ""
 
@@ -3379,39 +3495,43 @@
 msgid "# replies received for local clients"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_lc.c:328
+#: src/fs/gnunet-service-fs_lc.c:327
 msgid "# client searches received"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_lc.c:363
+#: src/fs/gnunet-service-fs_lc.c:362
 msgid "# client searches updated (merged content seen list)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_mesh_client.c:475
+#: src/fs/gnunet-service-fs_mesh_client.c:484
 msgid "# replies received via mesh"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_mesh_client.c:489
+#: src/fs/gnunet-service-fs_mesh_client.c:498
 msgid "# replies received via mesh dropped"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_mesh_server.c:259
+#: src/fs/gnunet-service-fs_mesh_server.c:260
 msgid "# Blocks transferred via mesh"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_mesh_server.c:412
+#: src/fs/gnunet-service-fs_mesh_server.c:352
+msgid "# queries received via mesh not answered"
+msgstr ""
+
+#: src/fs/gnunet-service-fs_mesh_server.c:432
 msgid "# queries received via mesh"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_mesh_server.c:455
+#: src/fs/gnunet-service-fs_mesh_server.c:476
 #, fuzzy
 msgid "# mesh client connections rejected"
 msgstr ""
 "\n"
 "按任意键继续\n"
 
-#: src/fs/gnunet-service-fs_mesh_server.c:461
-#: src/fs/gnunet-service-fs_mesh_server.c:501
+#: src/fs/gnunet-service-fs_mesh_server.c:482
+#: src/fs/gnunet-service-fs_mesh_server.c:522
 #, fuzzy
 msgid "# mesh connections active"
 msgstr ""
@@ -3446,8 +3566,8 @@
 msgid "# requests refreshed"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pe.c:614 src/fs/gnunet-service-fs_pe.c:698
-#: src/fs/gnunet-service-fs_pe.c:769
+#: src/fs/gnunet-service-fs_pe.c:616 src/fs/gnunet-service-fs_pe.c:700
+#: src/fs/gnunet-service-fs_pe.c:771
 msgid "# query plan entries"
 msgstr ""
 
@@ -3459,99 +3579,99 @@
 msgid "# Pending requests active"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:813
+#: src/fs/gnunet-service-fs_pr.c:814
 msgid "# replies received and matched"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:843
+#: src/fs/gnunet-service-fs_pr.c:844
 msgid "# duplicate replies discarded (bloomfilter)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:852
+#: src/fs/gnunet-service-fs_pr.c:853
 msgid "# irrelevant replies discarded"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:866
+#: src/fs/gnunet-service-fs_pr.c:867
 #, c-format
 msgid "Unsupported block type %u\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:879
+#: src/fs/gnunet-service-fs_pr.c:880
 msgid "# results found locally"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1000
+#: src/fs/gnunet-service-fs_pr.c:1001
 msgid "# Datastore `PUT' failures"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1027
+#: src/fs/gnunet-service-fs_pr.c:1029
 msgid "# storage requests dropped due to high load"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1062
+#: src/fs/gnunet-service-fs_pr.c:1064
 msgid "# Replies received from DHT"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1190
+#: src/fs/gnunet-service-fs_pr.c:1192
 msgid "# Replies received from MESH"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1242
+#: src/fs/gnunet-service-fs_pr.c:1244
 #, c-format
 msgid "Datastore lookup already took %s!\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1262
+#: src/fs/gnunet-service-fs_pr.c:1264
 #, c-format
 msgid "On-demand lookup already took %s!\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1309
+#: src/fs/gnunet-service-fs_pr.c:1311
 msgid "# Datastore lookups concluded (no results)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1324
+#: src/fs/gnunet-service-fs_pr.c:1326
 msgid "# Datastore lookups concluded (seen all)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1333
+#: src/fs/gnunet-service-fs_pr.c:1335
 msgid "# Datastore lookups aborted (more than MAX_RESULTS)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1348
+#: src/fs/gnunet-service-fs_pr.c:1350
 msgid "# requested DBLOCK or IBLOCK not found"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1362
+#: src/fs/gnunet-service-fs_pr.c:1364
 msgid "# on-demand blocks matched requests"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1375
+#: src/fs/gnunet-service-fs_pr.c:1377
 msgid "# on-demand lookups performed successfully"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1380
+#: src/fs/gnunet-service-fs_pr.c:1382
 msgid "# on-demand lookups failed"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1407 src/fs/gnunet-service-fs_pr.c:1447
-#: src/fs/gnunet-service-fs_pr.c:1588
+#: src/fs/gnunet-service-fs_pr.c:1409 src/fs/gnunet-service-fs_pr.c:1449
+#: src/fs/gnunet-service-fs_pr.c:1590
 msgid "# Datastore lookups concluded (error queueing)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1465
+#: src/fs/gnunet-service-fs_pr.c:1467
 msgid "# Datastore lookups concluded (found last result)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1476
+#: src/fs/gnunet-service-fs_pr.c:1478
 msgid "# Datastore lookups concluded (load too high)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1564
+#: src/fs/gnunet-service-fs_pr.c:1566
 msgid "# Datastore lookups initiated"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1649
+#: src/fs/gnunet-service-fs_pr.c:1651
 msgid "# GAP PUT messages received"
 msgstr ""
 
@@ -3591,6 +3711,34 @@
 msgid "Failed to serialize lookup reply from GNS service!\n"
 msgstr "初始化“%s”服务失败。\n"
 
+#: src/gns/gnunet-bcd.c:123
+#, c-format
+msgid "Refusing `%s' request to HTTP server\n"
+msgstr ""
+
+#: src/gns/gnunet-bcd.c:355 src/hostlist/hostlist-server.c:566
+#, c-format
+msgid "Invalid port number %llu.  Exiting.\n"
+msgstr ""
+
+#: src/gns/gnunet-bcd.c:360
+#, c-format
+msgid "Businesscard HTTP server starts on %llu\n"
+msgstr ""
+
+#: src/gns/gnunet-bcd.c:374
+#, fuzzy, c-format
+msgid "Could not start businesscard HTTP server on port %u\n"
+msgstr "初始化“%s”服务失败。\n"
+
+#: src/gns/gnunet-bcd.c:519
+msgid "Run HTTP serve on port PORT (default is 8888)"
+msgstr ""
+
+#: src/gns/gnunet-bcd.c:531
+msgid "GNUnet HTTP server to create business cards"
+msgstr ""
+
 #: src/gns/gnunet-dns2gns.c:228
 #, fuzzy
 msgid "Failed to pack DNS response into UDP packet!\n"
@@ -3652,186 +3800,203 @@
 msgid "Please specify name to lookup!\n"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:297
+#: src/gns/gnunet-gns.c:298
 #, c-format
 msgid "Ego for `%s' not found, cannot perform lookup.\n"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:335
+#: src/gns/gnunet-gns.c:336 src/gns/gnunet-gns-helper-service-w32.c:753
 #, c-format
 msgid ""
-"Ego for `master-zone' not found, cannot perform lookup.  Did you run gnunet-"
+"Ego for `gns-master' not found, cannot perform lookup.  Did you run gnunet-"
 "gns-import.sh?\n"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:364
+#: src/gns/gnunet-gns.c:365 src/gns/gnunet-gns-helper-service-w32.c:783
 #, fuzzy, c-format
 msgid "Failed to connect to GNS\n"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/gns/gnunet-gns.c:377
+#: src/gns/gnunet-gns.c:378
 #, c-format
 msgid "Public key `%s' is not well-formed\n"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:426
+#: src/gns/gnunet-gns.c:428
 msgid "Lookup a record for the given name"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:429
+#: src/gns/gnunet-gns.c:431
 msgid "Specify the type of the record to lookup"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:432
+#: src/gns/gnunet-gns.c:434
 msgid "No unneeded output"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:435
+#: src/gns/gnunet-gns.c:437
 msgid "Specify the public key of the zone to lookup the record in"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:438
+#: src/gns/gnunet-gns.c:440
 msgid "Specify the name of the ego of the zone to lookup the record in"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:451
+#: src/gns/gnunet-gns.c:453
 #, fuzzy
 msgid "GNUnet GNS resolver tool"
 msgstr "GNUnet 错误日志"
 
+#: src/gns/gnunet-gns-helper-service-w32.c:723
+#, c-format
+msgid ""
+"Ego for `gns-short' not found. This is not really fatal, but i'll pretend "
+"that it is and refuse to perform a lookup.  Did you run gnunet-gns-import."
+"sh?\n"
+msgstr ""
+
+#: src/gns/gnunet-gns-helper-service-w32.c:793
+#, fuzzy, c-format
+msgid "Failed to connect to identity service\n"
+msgstr "初始化“%s”服务失败。\n"
+
 #: 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:1067
-#: src/transport/plugin_transport_http_client.c:1082
+#: src/hostlist/hostlist-client.c:683 src/hostlist/hostlist-client.c:689
+#: src/hostlist/hostlist-client.c:741 src/hostlist/hostlist-client.c:750
+#: src/hostlist/hostlist-client.c:871 src/hostlist/hostlist-client.c:963
+#: src/hostlist/hostlist-client.c:968
+#: src/transport/plugin_transport_http_client.c:1071
+#: src/transport/plugin_transport_http_client.c:1086
 #, c-format
 msgid "%s failed at %s:%d: `%s'\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:839
+#: src/gns/gnunet-gns-proxy.c:833
 #, fuzzy, c-format
 msgid "Unsupported CURL SSL backend %d\n"
 msgstr "未知的命令“%s”。\n"
 
-#: src/gns/gnunet-gns-proxy.c:862
+#: src/gns/gnunet-gns-proxy.c:856
 #, fuzzy, c-format
 msgid "Failed to fetch CN from cert: %s\n"
 msgstr "打开日志文件“%s”失败:%s\n"
 
-#: src/gns/gnunet-gns-proxy.c:885
+#: src/gns/gnunet-gns-proxy.c:879
 #, fuzzy, c-format
 msgid "Failed to initialize DANE: %s\n"
 msgstr "无法初始化 SQLite:%s。\n"
 
-#: src/gns/gnunet-gns-proxy.c:898
+#: src/gns/gnunet-gns-proxy.c:892
 #, fuzzy, c-format
 msgid "Failed to parse DANE record: %s\n"
 msgstr "打开日志文件“%s”失败:%s\n"
 
-#: src/gns/gnunet-gns-proxy.c:913
+#: src/gns/gnunet-gns-proxy.c:907
 #, fuzzy, c-format
 msgid "Failed to verify TLS connection using DANE: %s\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/gns/gnunet-gns-proxy.c:923
+#: src/gns/gnunet-gns-proxy.c:917
 #, c-format
 msgid "Failed DANE verification failed with GnuTLS verify status code: %u\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:947
+#: src/gns/gnunet-gns-proxy.c:941
 #, c-format
 msgid "SSL certificate subject name (%s) does not match `%s'\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:1092
+#: src/gns/gnunet-gns-proxy.c:1086
 #, c-format
 msgid "Cookie domain `%s' supplied by server is invalid\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:1609
+#: src/gns/gnunet-gns-proxy.c:1602
 #, fuzzy, c-format
 msgid "Unsupported HTTP method `%s'\n"
 msgstr "未知的命令“%s”。\n"
 
-#: src/gns/gnunet-gns-proxy.c:1979
+#: src/gns/gnunet-gns-proxy.c:1973
 #, fuzzy, c-format
 msgid "Unable to import private key from file `%s'\n"
 msgstr "无法创建用户账户:"
 
-#: src/gns/gnunet-gns-proxy.c:2009
+#: src/gns/gnunet-gns-proxy.c:2003
 #, fuzzy, c-format
 msgid "Unable to import certificate %s\n"
 msgstr "无法保存配置文件“%s”:"
 
-#: src/gns/gnunet-gns-proxy.c:2178
+#: src/gns/gnunet-gns-proxy.c:2177
 #, fuzzy, c-format
 msgid "Failed to start HTTPS server for `%s'\n"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/gns/gnunet-gns-proxy.c:2197
+#: src/gns/gnunet-gns-proxy.c:2196
 #, fuzzy
 msgid "Failed to pass client to MHD\n"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/gns/gnunet-gns-proxy.c:2505
+#: src/gns/gnunet-gns-proxy.c:2504
 #, fuzzy, c-format
 msgid "Unsupported socks version %d\n"
 msgstr "未知的命令“%s”。\n"
 
-#: src/gns/gnunet-gns-proxy.c:2534
+#: src/gns/gnunet-gns-proxy.c:2533
 #, fuzzy, c-format
 msgid "Unsupported socks command %d\n"
 msgstr "未知的命令“%s”。\n"
 
-#: src/gns/gnunet-gns-proxy.c:2616
+#: src/gns/gnunet-gns-proxy.c:2551 src/gns/gnunet-gns-proxy.c:2580
+msgid "SSL connection to plain IPv4 address requested\n"
+msgstr ""
+
+#: src/gns/gnunet-gns-proxy.c:2631
 #, fuzzy, c-format
 msgid "Unsupported socks address type %d\n"
 msgstr "未知的命令“%s”。\n"
 
-#: src/gns/gnunet-gns-proxy.c:2955
+#: src/gns/gnunet-gns-proxy.c:2970
 msgid "No ego configured for `shorten-zone`\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:2995
+#: src/gns/gnunet-gns-proxy.c:3010
 #, c-format
 msgid "No ego configured for `%s`\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:3057
+#: src/gns/gnunet-gns-proxy.c:3072
 #, fuzzy, c-format
 msgid "Failed to load SSL/TLS key and certificate from `%s'\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/gns/gnunet-gns-proxy.c:3098
+#: src/gns/gnunet-gns-proxy.c:3113
 msgid "listen on specified port (default: 7777)"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:3101
+#: src/gns/gnunet-gns-proxy.c:3116
 msgid "pem file to use as CA"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:3120
+#: src/gns/gnunet-gns-proxy.c:3135
 msgid "GNUnet GNS proxy"
 msgstr ""
 
-#: src/gns/gnunet-service-gns.c:860
+#: src/gns/gnunet-service-gns.c:862
 #, fuzzy
 msgid "Failed to connect to the namestore!\n"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/gns/gnunet-service-gns.c:868
+#: src/gns/gnunet-service-gns.c:870
 #, fuzzy
 msgid "Failed to connect to the namecache!\n"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/gns/gnunet-service-gns.c:901
+#: src/gns/gnunet-service-gns.c:903
 #, fuzzy
 msgid "Could not connect to DHT!\n"
 msgstr "无法连接到 %s:%u:%s\n"
 
-#: src/gns/gnunet-service-gns.c:917
+#: src/gns/gnunet-service-gns.c:919
 #, fuzzy
 msgid "valid public key required"
 msgstr "“%s”的参数无效。\n"
@@ -3845,101 +4010,111 @@
 msgid "Failed to connect to the DNS service!\n"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/gns/gnunet-service-gns_resolver.c:771
+#: src/gns/gnunet-service-gns_resolver.c:815
 #, fuzzy
 msgid "Failed to parse DNS response\n"
 msgstr "打开日志文件“%s”失败:%s\n"
 
-#: src/gns/gnunet-service-gns_resolver.c:913
+#: src/gns/gnunet-service-gns_resolver.c:957
 #, c-format
 msgid "Skipping record of unsupported type %d\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns_resolver.c:1646
+#: src/gns/gnunet-service-gns_resolver.c:1316
 #, c-format
 msgid "GNS lookup resulted in DNS name that is too long (`%s')\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns_resolver.c:1686
+#: src/gns/gnunet-service-gns_resolver.c:1809
 msgid "GNS lookup recursion failed (no delegation record found)\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns_resolver.c:1710
+#: src/gns/gnunet-service-gns_resolver.c:1833
 #, fuzzy, c-format
 msgid "Failed to cache GNS resolution: %s\n"
 msgstr "打开日志文件“%s”失败:%s\n"
 
-#: src/gns/gnunet-service-gns_resolver.c:1932
+#: src/gns/gnunet-service-gns_resolver.c:2071
 #, c-format
 msgid "Zone %s was revoked, resolution fails\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns_resolver.c:2054
+#: src/gns/gnunet-service-gns_resolver.c:2220
 #, c-format
 msgid "Hostname `%s' is not well-formed, resolution fails\n"
 msgstr ""
 
-#: src/gns/plugin_gnsrecord_gns.c:142
+#: src/gns/plugin_gnsrecord_gns.c:151
 #, fuzzy, c-format
 msgid "Unable to parse PKEY record `%s'\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/gns/plugin_gnsrecord_gns.c:172
+#: src/gns/plugin_gnsrecord_gns.c:180
 #, fuzzy, c-format
+msgid "Unable to parse GNS2DNS record `%s'\n"
+msgstr "解析配置文件“%s”失败\n"
+
+#: src/gns/plugin_gnsrecord_gns.c:201
+#, fuzzy, c-format
 msgid "Failed to serialize GNS2DNS record with value `%s'\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/gns/plugin_gnsrecord_gns.c:186
+#: src/gns/plugin_gnsrecord_gns.c:217
 #, fuzzy, c-format
 msgid "Unable to parse VPN record string `%s'\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/gnsrecord/plugin_gnsrecord_dns.c:261
+#: src/gnsrecord/plugin_gnsrecord_dns.c:293
 #, fuzzy, c-format
 msgid "Unable to parse IPv4 address `%s'\n"
 msgstr "无效的进程优先级“%s”\n"
 
-#: src/gnsrecord/plugin_gnsrecord_dns.c:282
+#: src/gnsrecord/plugin_gnsrecord_dns.c:314
 #, fuzzy, c-format
 msgid "Failed to serialize NS record with value `%s'\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/gnsrecord/plugin_gnsrecord_dns.c:304
+#: src/gnsrecord/plugin_gnsrecord_dns.c:336
 #, fuzzy, c-format
 msgid "Failed to serialize CNAME record with value `%s'\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/gnsrecord/plugin_gnsrecord_dns.c:332
+#: src/gnsrecord/plugin_gnsrecord_dns.c:420
 #, fuzzy, c-format
+msgid "Failed to serialize CERT record with %u bytes\n"
+msgstr "解析配置文件“%s”失败\n"
+
+#: src/gnsrecord/plugin_gnsrecord_dns.c:452
+#, fuzzy, c-format
 msgid "Unable to parse SOA record `%s'\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/gnsrecord/plugin_gnsrecord_dns.c:351
+#: src/gnsrecord/plugin_gnsrecord_dns.c:471
 #, 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
+#: src/gnsrecord/plugin_gnsrecord_dns.c:494
 #, fuzzy, c-format
 msgid "Failed to serialize PTR record with value `%s'\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/gnsrecord/plugin_gnsrecord_dns.c:394
+#: src/gnsrecord/plugin_gnsrecord_dns.c:514
 #, fuzzy, c-format
 msgid "Unable to parse MX record `%s'\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/gnsrecord/plugin_gnsrecord_dns.c:409
+#: src/gnsrecord/plugin_gnsrecord_dns.c:529
 #, fuzzy, c-format
 msgid "Failed to serialize MX record with hostname `%s'\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/gnsrecord/plugin_gnsrecord_dns.c:429
+#: src/gnsrecord/plugin_gnsrecord_dns.c:549
 #, fuzzy, c-format
 msgid "Unable to parse IPv6 address `%s'\n"
 msgstr "无效的进程优先级“%s”\n"
 
-#: src/gnsrecord/plugin_gnsrecord_dns.c:447
+#: src/gnsrecord/plugin_gnsrecord_dns.c:567
 #, fuzzy, c-format
 msgid "Unable to parse TLSA record string `%s'\n"
 msgstr "解析配置文件“%s”失败\n"
@@ -4017,172 +4192,172 @@
 msgid "Failed to parse `%s' as an address for plugin `%s'\n"
 msgstr "找不到接口“%s”的一个 IP 地址。\n"
 
-#: src/hostlist/gnunet-daemon-hostlist.c:260
+#: src/hostlist/gnunet-daemon-hostlist.c:259
 msgid ""
 "None of the functions for the hostlist daemon were enabled.  I have no "
 "reason to run!\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist.c:313
+#: src/hostlist/gnunet-daemon-hostlist.c:308
 msgid "advertise our hostlist to other peers"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist.c:318
+#: src/hostlist/gnunet-daemon-hostlist.c:313
 msgid ""
 "bootstrap using hostlists (it is highly recommended that you always use this "
 "option)"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist.c:321
+#: src/hostlist/gnunet-daemon-hostlist.c:316
 msgid "enable learning about hostlist servers from other peers"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist.c:325
+#: src/hostlist/gnunet-daemon-hostlist.c:320
 msgid "provide a hostlist server"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist.c:340
+#: src/hostlist/gnunet-daemon-hostlist.c:335
 msgid "GNUnet hostlist server and client"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:289
+#: src/hostlist/hostlist-client.c:288
 msgid "# bytes downloaded from hostlist servers"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:310 src/hostlist/hostlist-client.c:340
+#: src/hostlist/hostlist-client.c:309 src/hostlist/hostlist-client.c:339
 msgid "# invalid HELLOs downloaded from hostlist servers"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:313 src/hostlist/hostlist-client.c:343
+#: src/hostlist/hostlist-client.c:312 src/hostlist/hostlist-client.c:342
 #, c-format
 msgid "Invalid `%s' message received from hostlist at `%s'\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:331
+#: src/hostlist/hostlist-client.c:330
 msgid "# valid HELLOs downloaded from hostlist servers"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:589 src/hostlist/hostlist-client.c:1330
+#: src/hostlist/hostlist-client.c:592 src/hostlist/hostlist-client.c:1333
 msgid "# advertised hostlist URIs"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:619
+#: src/hostlist/hostlist-client.c:622
 #, c-format
 msgid "# advertised URI `%s' downloaded"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:661
+#: src/hostlist/hostlist-client.c:664
 #, c-format
 msgid ""
 "Advertised hostlist with URI `%s' could not be downloaded. Advertised URI "
 "gets dismissed.\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:799
+#: src/hostlist/hostlist-client.c:802
 #, c-format
 msgid "Timeout trying to download hostlist from `%s'\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:813
+#: src/hostlist/hostlist-client.c:816
 #, c-format
 msgid "Download limit of %u bytes exceeded, stopping download\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:833
+#: src/hostlist/hostlist-client.c:836
 #, fuzzy, c-format
 msgid "Download of hostlist from `%s' failed: `%s'\n"
 msgstr "打开日志文件“%s”失败:%s\n"
 
-#: src/hostlist/hostlist-client.c:839
+#: src/hostlist/hostlist-client.c:842
 #, c-format
 msgid "Download of hostlist `%s' completed.\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:847
+#: src/hostlist/hostlist-client.c:850
 #, c-format
 msgid "Adding successfully tested hostlist `%s' datastore.\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:900
+#: src/hostlist/hostlist-client.c:903
 #, c-format
 msgid "Bootstrapping using hostlist at `%s'.\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:908
+#: src/hostlist/hostlist-client.c:911
 msgid "# hostlist downloads initiated"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1037 src/hostlist/hostlist-client.c:1503
+#: src/hostlist/hostlist-client.c:1040 src/hostlist/hostlist-client.c:1506
 msgid "# milliseconds between hostlist downloads"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1046
+#: src/hostlist/hostlist-client.c:1049
 #, c-format
 msgid "Have %u/%u connections.  Will consider downloading hostlist in %s\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1106 src/hostlist/hostlist-client.c:1122
+#: src/hostlist/hostlist-client.c:1109 src/hostlist/hostlist-client.c:1125
 msgid "# active connections"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1278
+#: src/hostlist/hostlist-client.c:1280
 #, c-format
 msgid "Loading saved hostlist entries from file `%s' \n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1282
+#: src/hostlist/hostlist-client.c:1285
 #, c-format
 msgid "Hostlist file `%s' does not exist\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1293
+#: src/hostlist/hostlist-client.c:1296
 #, fuzzy, c-format
 msgid "Could not open file `%s' for reading to load hostlists: %s\n"
 msgstr "无法解析“%s”来确定已方的 IP 地址:%s\n"
 
-#: src/hostlist/hostlist-client.c:1326
+#: src/hostlist/hostlist-client.c:1329
 #, c-format
 msgid "%u hostlist URIs loaded from file\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1328
+#: src/hostlist/hostlist-client.c:1331
 msgid "# hostlist URIs read from file"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1373
+#: src/hostlist/hostlist-client.c:1376
 #, fuzzy, c-format
 msgid "Could not open file `%s' for writing to save hostlists: %s\n"
 msgstr "无法解析“%s”来确定已方的 IP 地址:%s\n"
 
-#: src/hostlist/hostlist-client.c:1378
+#: src/hostlist/hostlist-client.c:1381
 #, c-format
 msgid "Writing %u hostlist URIs to `%s'\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1402 src/hostlist/hostlist-client.c:1419
+#: src/hostlist/hostlist-client.c:1405 src/hostlist/hostlist-client.c:1422
 #, c-format
 msgid "Error writing hostlist URIs to file `%s'\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1414
+#: src/hostlist/hostlist-client.c:1417
 msgid "# hostlist URIs written to file"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1468
+#: src/hostlist/hostlist-client.c:1471
 msgid "Learning is enabled on this peer\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1480
+#: src/hostlist/hostlist-client.c:1483
 msgid "Learning is not enabled on this peer\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1492
+#: src/hostlist/hostlist-client.c:1495
 #, c-format
 msgid ""
 "Since learning is not enabled on this peer, hostlist file `%s' was removed\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1496
+#: src/hostlist/hostlist-client.c:1499
 #, c-format
 msgid "Hostlist file `%s' could not be removed\n"
 msgstr ""
@@ -4254,32 +4429,27 @@
 msgid "Advertisement message could not be queued by core\n"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:560 src/peerinfo-tool/gnunet-peerinfo.c:651
-#: src/transport/gnunet-service-transport.c:790
+#: src/hostlist/hostlist-server.c:556 src/peerinfo-tool/gnunet-peerinfo.c:651
+#: src/transport/gnunet-service-transport.c:850
 msgid "Could not access PEERINFO service.  Exiting.\n"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:570
+#: src/hostlist/hostlist-server.c:575
 #, c-format
-msgid "Invalid port number %llu.  Exiting.\n"
-msgstr ""
-
-#: src/hostlist/hostlist-server.c:579
-#, c-format
 msgid "Hostlist service starts on %s:%llu\n"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:593
+#: src/hostlist/hostlist-server.c:589
 #, c-format
 msgid "Address to obtain hostlist: `%s'\n"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:633
+#: src/hostlist/hostlist-server.c:629
 #, fuzzy, c-format
 msgid "`%s' is not a valid IP address! Ignoring BINDTOIP.\n"
 msgstr "“%s”不可用。\n"
 
-#: src/hostlist/hostlist-server.c:676
+#: src/hostlist/hostlist-server.c:672
 #, c-format
 msgid "Could not start hostlist HTTP server on port %u\n"
 msgstr ""
@@ -4324,49 +4494,49 @@
 msgid "Maintain egos"
 msgstr ""
 
-#: src/identity/gnunet-service-identity.c:337
+#: src/identity/gnunet-service-identity.c:338
 msgid "no default known"
 msgstr ""
 
-#: src/identity/gnunet-service-identity.c:360
+#: src/identity/gnunet-service-identity.c:362
 msgid "default configured, but ego unknown (internal error)"
 msgstr ""
 
-#: src/identity/gnunet-service-identity.c:437
-#: src/identity/gnunet-service-identity.c:668
-#: src/identity/gnunet-service-identity.c:776
+#: src/identity/gnunet-service-identity.c:439
+#: src/identity/gnunet-service-identity.c:670
+#: src/identity/gnunet-service-identity.c:778
 #, fuzzy, c-format
 msgid "Failed to write subsystem default identifier map to `%s'.\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/identity/gnunet-service-identity.c:444
+#: src/identity/gnunet-service-identity.c:446
 msgid "Unknown ego specified for service (internal error)"
 msgstr ""
 
-#: src/identity/gnunet-service-identity.c:514
+#: src/identity/gnunet-service-identity.c:516
 msgid "identifier already in use for another ego"
 msgstr ""
 
-#: src/identity/gnunet-service-identity.c:645
+#: src/identity/gnunet-service-identity.c:647
 msgid "target name already exists"
 msgstr ""
 
-#: src/identity/gnunet-service-identity.c:684
-#: src/identity/gnunet-service-identity.c:793
+#: src/identity/gnunet-service-identity.c:686
+#: src/identity/gnunet-service-identity.c:795
 msgid "no matching ego found"
 msgstr ""
 
-#: src/identity/gnunet-service-identity.c:827
+#: src/identity/gnunet-service-identity.c:829
 #, fuzzy, c-format
 msgid "Failed to parse ego information in `%s'\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/identity/gnunet-service-identity.c:900
+#: src/identity/gnunet-service-identity.c:902
 #, fuzzy, c-format
 msgid "Failed to parse subsystem identity configuration file `%s'\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/identity/gnunet-service-identity.c:912
+#: src/identity/gnunet-service-identity.c:914
 #, fuzzy, c-format
 msgid "Failed to create directory `%s' for storing egos\n"
 msgstr "解析配置文件“%s”失败\n"
@@ -4385,45 +4555,52 @@
 msgid "Send ping messages to test connectivity (default == NO)"
 msgstr ""
 
-#: src/mesh/gnunet-mesh.c:146
+#: src/mesh/gnunet-mesh.c:299
 #, fuzzy, c-format
+msgid "Invalid target `%s'\n"
+msgstr "“%s”的参数无效。\n"
+
+#: src/mesh/gnunet-mesh.c:417
+#, fuzzy, c-format
 msgid "Invalid tunnel owner `%s'\n"
 msgstr "IP 格式无效:“%s”\n"
 
-#: src/mesh/gnunet-mesh.c:209
-msgid "provide information about all tunnels (continuously) NOT IMPLEMENTED"
+#: src/mesh/gnunet-mesh.c:482
+msgid "You must NOT give a TARGET when using options\n"
 msgstr ""
 
-#: src/mesh/gnunet-mesh.c:212
+#: src/mesh/gnunet-mesh.c:559
 #, fuzzy
-msgid "provide information about a particular tunnel"
+msgid "provide information about a particular channel"
 msgstr "无法获取有关用户“%s”的信息:%s\n"
 
-#: src/mesh/gnunet-mesh.c:222
+#: src/mesh/gnunet-mesh.c:562
 #, fuzzy
-msgid "Print information about mesh tunnels and peers."
+msgid "provide information about a particular connection"
 msgstr "无法获取有关用户“%s”的信息:%s\n"
 
-#: src/mesh/gnunet-service-mesh.c:5633 src/mesh/gnunet-service-mesh_peer.c:350
-msgid "Wrong CORE service\n"
+#: src/mesh/gnunet-mesh.c:565
+#, fuzzy
+msgid "provide information about all tunnels"
+msgstr "无法获取有关用户“%s”的信息:%s\n"
+
+#: src/mesh/gnunet-mesh.c:568
+msgid "provide information about all tunnels (continuously) NOT IMPLEMENTED"
 msgstr ""
 
-#: 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-mesh.c:571
+msgid "port to listen to (default; 0)"
+msgstr ""
 
-#: 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"
-msgstr "立即保存配置?"
+#: src/mesh/gnunet-mesh.c:574
+#, fuzzy
+msgid "provide information about a particular tunnel"
+msgstr "无法获取有关用户“%s”的信息:%s\n"
 
+#: src/mesh/gnunet-service-mesh_peer.c:349
+msgid "Wrong CORE service\n"
+msgstr ""
+
 #: src/mysql/mysql.c:174
 #, c-format
 msgid "Trying to use file `%s' for MySQL configuration.\n"
@@ -4439,30 +4616,35 @@
 msgid "No records found for `%s'"
 msgstr "运行 %s失败:%s %d\n"
 
-#: src/namecache/gnunet-namecache.c:124 src/namestore/gnunet-namestore.c:367
+#: src/namecache/gnunet-namecache.c:124 src/namestore/gnunet-namestore.c:394
 #, c-format
 msgid "\tCorrupt or unsupported record of type %u\n"
 msgstr ""
 
-#: src/namecache/gnunet-namecache.c:185 src/namestore/gnunet-namestore.c:777
+#: src/namecache/gnunet-namecache.c:185
 #, 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
+#: src/namecache/gnunet-namecache.c:195 src/namestore/gnunet-namestore.c:692
 #, 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
+#: src/namecache/gnunet-namecache.c:203
+#, fuzzy, c-format
+msgid "You must specify a name\n"
+msgstr "您必须指定一个接收方!\n"
+
+#: src/namecache/gnunet-namecache.c:234 src/namestore/gnunet-namestore.c:925
 msgid "name of the record to add/delete/display"
 msgstr ""
 
-#: src/namecache/gnunet-namecache.c:229
+#: src/namecache/gnunet-namecache.c:237
 msgid "spezifies the public key of the zone to look in"
 msgstr ""
 
-#: src/namecache/gnunet-namecache.c:240 src/namestore/gnunet-namestore.c:853
+#: src/namecache/gnunet-namecache.c:248 src/namestore/gnunet-namestore.c:957
 #, fuzzy
 msgid "GNUnet zone manipulation tool"
 msgstr "GNUnet 配置"
@@ -4477,184 +4659,218 @@
 msgid "Failed to create indices\n"
 msgstr "发送消息失败。\n"
 
-#: src/namestore/gnunet-namestore.c:278
+#: src/namestore/gnunet-namestore.c:304
 #, c-format
 msgid "Adding record failed: %s\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:306
+#: src/namestore/gnunet-namestore.c:333
 #, c-format
 msgid "Deleting record failed, record does not exist%s%s\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:313
+#: src/namestore/gnunet-namestore.c:340
 #, c-format
 msgid "Deleting record failed%s%s\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:528
+#: src/namestore/gnunet-namestore.c:555
 #, c-format
 msgid "No options given\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:539
-#: src/namestore/gnunet-namestore-fcfsd.c:964
+#: src/namestore/gnunet-namestore.c:566
+#: src/namestore/gnunet-namestore-fcfsd.c:970
 #, fuzzy
 msgid "Failed to connect to namestore\n"
 msgstr "初始化“%s”服务失败。\n"
 
-#: 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
+#: src/namestore/gnunet-namestore.c:574 src/namestore/gnunet-namestore.c:583
+#: src/namestore/gnunet-namestore.c:600 src/namestore/gnunet-namestore.c:622
+#: src/namestore/gnunet-namestore.c:662
 #, fuzzy, c-format
 msgid "Missing option `%s' for operation `%s'\n"
 msgstr "配置文件“%s”已写入。\n"
 
-#: src/namestore/gnunet-namestore.c:548 src/namestore/gnunet-namestore.c:557
-#: src/namestore/gnunet-namestore.c:574 src/namestore/gnunet-namestore.c:596
+#: src/namestore/gnunet-namestore.c:575 src/namestore/gnunet-namestore.c:584
+#: src/namestore/gnunet-namestore.c:601 src/namestore/gnunet-namestore.c:623
 msgid "add"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:565
+#: src/namestore/gnunet-namestore.c:592
 #, fuzzy, c-format
 msgid "Unsupported type `%s'\n"
 msgstr "未知的命令“%s”。\n"
 
-#: src/namestore/gnunet-namestore.c:585
+#: src/namestore/gnunet-namestore.c:612
 #, c-format
 msgid "Value `%s' invalid for record type `%s'\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:621
+#: src/namestore/gnunet-namestore.c:648
 #, fuzzy, c-format
 msgid "Invalid time format `%s'\n"
 msgstr "IP 格式无效:“%s”\n"
 
-#: src/namestore/gnunet-namestore.c:636
+#: src/namestore/gnunet-namestore.c:663
 msgid "del"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:689
+#: src/namestore/gnunet-namestore.c:712
 #: src/peerinfo-tool/gnunet-peerinfo.c:703
 #, fuzzy, c-format
 msgid "Invalid URI `%s'\n"
 msgstr "无效条目。\n"
 
 #: src/namestore/gnunet-namestore.c:747
+#, fuzzy, c-format
+msgid "Invalid nick `%s'\n"
+msgstr "无效条目。\n"
+
+#: src/namestore/gnunet-namestore.c:787
 #, c-format
 msgid "Ego `%s' not known to identity service\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:806
+#: src/namestore/gnunet-namestore.c:814
+#, c-format
+msgid "No default ego configured in identity service\n"
+msgstr ""
+
+#: src/namestore/gnunet-namestore.c:847
+#, fuzzy, c-format
+msgid "Identity service is not running\n"
+msgstr "服务已删除。\n"
+
+#: src/namestore/gnunet-namestore.c:859
+#, fuzzy, c-format
+msgid "Cannot connect to identity service\n"
+msgstr "无法连接到 %s:%u:%s\n"
+
+#: src/namestore/gnunet-namestore.c:907
 msgid "add record"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:809
+#: src/namestore/gnunet-namestore.c:910
 msgid "delete record"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:812
+#: src/namestore/gnunet-namestore.c:913
 msgid "display records"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:815
+#: src/namestore/gnunet-namestore.c:916
 msgid ""
 "expiration time for record to use (for adding only), \"never\" is possible"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:818
+#: src/namestore/gnunet-namestore.c:919
 #, fuzzy
+msgid "set the desired nick name for the zone"
+msgstr "无法获取有关用户“%s”的信息:%s\n"
+
+#: src/namestore/gnunet-namestore.c:922
+#, fuzzy
 msgid "monitor changes in the namestore"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/namestore/gnunet-namestore.c:824
+#: src/namestore/gnunet-namestore.c:928
 #, fuzzy
 msgid "determine our name for the given PKEY"
 msgstr "无法获取有关用户“%s”的信息:%s\n"
 
-#: src/namestore/gnunet-namestore.c:827
+#: src/namestore/gnunet-namestore.c:931
 msgid "type of the record to add/delete/display"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:830
+#: src/namestore/gnunet-namestore.c:934
 msgid "URI to import into our zone"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:833
+#: src/namestore/gnunet-namestore.c:937
 msgid "value of the record to add/delete"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:836
+#: src/namestore/gnunet-namestore.c:940
 msgid "create or list public record"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:839
+#: src/namestore/gnunet-namestore.c:943
 msgid ""
 "create shadow record (only valid if all other records of the same type have "
 "expired"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:842
+#: src/namestore/gnunet-namestore.c:946
 msgid "name of the ego controlling the zone"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:462
+#: src/namestore/gnunet-namestore-fcfsd.c:464
 #, fuzzy, c-format
 msgid "Unsupported form value `%s'\n"
 msgstr "未知的命令“%s”。\n"
 
-#: src/namestore/gnunet-namestore-fcfsd.c:489
+#: src/namestore/gnunet-namestore-fcfsd.c:491
 #, fuzzy, c-format
 msgid "Failed to create record for domain `%s': %s\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/namestore/gnunet-namestore-fcfsd.c:524
+#: src/namestore/gnunet-namestore-fcfsd.c:525
 #, c-format
 msgid "Found existing name `%s' for the given key\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:590
+#: src/namestore/gnunet-namestore-fcfsd.c:534
+msgid "Error when mapping zone to name\n"
+msgstr ""
+
+#: src/namestore/gnunet-namestore-fcfsd.c:596
 #, c-format
 msgid "Found %u existing records for domain `%s'\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:646
+#: src/namestore/gnunet-namestore-fcfsd.c:652
 #, fuzzy, c-format
 msgid "Failed to create page for `%s'\n"
 msgstr "发送消息失败。\n"
 
-#: src/namestore/gnunet-namestore-fcfsd.c:662
+#: src/namestore/gnunet-namestore-fcfsd.c:668
 #, fuzzy, c-format
 msgid "Failed to setup post processor for `%s'\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/namestore/gnunet-namestore-fcfsd.c:698
+#: src/namestore/gnunet-namestore-fcfsd.c:704
 msgid "Domain name must not contain `.'\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:706
+#: src/namestore/gnunet-namestore-fcfsd.c:712
 msgid "Domain name must not contain `+'\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:904
+#: src/namestore/gnunet-namestore-fcfsd.c:910
 msgid "No ego configured for `fcfsd` subsystem\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:930
+#: src/namestore/gnunet-namestore-fcfsd.c:936
 #, fuzzy
 msgid "Failed to start HTTP server\n"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/namestore/gnunet-namestore-fcfsd.c:999
+#: src/namestore/gnunet-namestore-fcfsd.c:978
+#, fuzzy
+msgid "Failed to connect to identity\n"
+msgstr "初始化“%s”服务失败。\n"
+
+#: src/namestore/gnunet-namestore-fcfsd.c:1011
 msgid "GNU Name System First Come First Serve name registration service"
 msgstr ""
 
-#: src/namestore/gnunet-service-namestore.c:494
+#: src/namestore/gnunet-service-namestore.c:634
 #, fuzzy, c-format
 msgid "Failed to replicate block in namecache: %s\n"
 msgstr "发送消息失败。\n"
 
-#: src/namestore/namestore_api.c:273
+#: src/namestore/namestore_api.c:275
 msgid "Namestore failed to store record\n"
 msgstr ""
 
@@ -4759,11 +4975,11 @@
 msgid "`upnpc' command not found\n"
 msgstr ""
 
-#: src/nat/nat_test.c:341
+#: src/nat/nat_test.c:345
 msgid "Failed to connect to `gnunet-nat-server'\n"
 msgstr ""
 
-#: src/nat/nat_test.c:411
+#: src/nat/nat_test.c:414
 #, c-format
 msgid "Failed to create listen socket bound to `%s' for NAT test: %s\n"
 msgstr ""
@@ -4797,13 +5013,13 @@
 msgid "Measure quality and performance of the NSE service."
 msgstr "无法访问该服务"
 
-#: src/nse/gnunet-service-nse.c:1460
-#: src/revocation/gnunet-service-revocation.c:580
+#: src/nse/gnunet-service-nse.c:1461
+#: src/revocation/gnunet-service-revocation.c:789
 #, fuzzy
 msgid "Value is too large.\n"
 msgstr "值不在合法范围内。"
 
-#: src/nse/gnunet-service-nse.c:1487
+#: src/nse/gnunet-service-nse.c:1488
 msgid "NSE service is lacking key configuration settings.  Exiting.\n"
 msgstr ""
 
@@ -4812,42 +5028,42 @@
 msgid "Removing expired address of transport `%s'\n"
 msgstr ""
 
-#: src/peerinfo/gnunet-service-peerinfo.c:352
+#: src/peerinfo/gnunet-service-peerinfo.c:354
 #, fuzzy, c-format
 msgid "Failed to parse HELLO in file `%s': %s\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/peerinfo/gnunet-service-peerinfo.c:369
+#: src/peerinfo/gnunet-service-peerinfo.c:373
 #, fuzzy, c-format
 msgid "Failed to parse HELLO in file `%s': %s %u \n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/peerinfo/gnunet-service-peerinfo.c:447
+#: src/peerinfo/gnunet-service-peerinfo.c:457
 msgid "# peers known"
 msgstr ""
 
-#: src/peerinfo/gnunet-service-peerinfo.c:483
+#: src/peerinfo/gnunet-service-peerinfo.c:494
 #, c-format
 msgid ""
 "File `%s' in directory `%s' does not match naming convention. Removed.\n"
 msgstr ""
 
-#: src/peerinfo/gnunet-service-peerinfo.c:638
+#: src/peerinfo/gnunet-service-peerinfo.c:644
 #, fuzzy, c-format
 msgid "Scanning directory `%s'\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/peerinfo/gnunet-service-peerinfo.c:643
+#: src/peerinfo/gnunet-service-peerinfo.c:649
 #, c-format
 msgid "Still no peers found in `%s'!\n"
 msgstr ""
 
-#: src/peerinfo/gnunet-service-peerinfo.c:979
+#: src/peerinfo/gnunet-service-peerinfo.c:985
 #, fuzzy, c-format
 msgid "Cleaning up directory `%s'\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/peerinfo/gnunet-service-peerinfo.c:1269
+#: src/peerinfo/gnunet-service-peerinfo.c:1275
 #, c-format
 msgid "Importing HELLOs from `%s'\n"
 msgstr ""
@@ -5104,61 +5320,67 @@
 msgid "SQLite database running\n"
 msgstr "sqlite 数据仓库"
 
-#: src/pt/gnunet-daemon-pt.c:483
+#: src/pt/gnunet-daemon-pt.c:482
 msgid "Failed to pack DNS request.  Dropping.\n"
 msgstr ""
 
-#: src/pt/gnunet-daemon-pt.c:489
+#: src/pt/gnunet-daemon-pt.c:488
 msgid "# DNS requests mapped to VPN"
 msgstr ""
 
-#: src/pt/gnunet-daemon-pt.c:542
+#: src/pt/gnunet-daemon-pt.c:541
 msgid "# DNS records modified"
 msgstr ""
 
-#: src/pt/gnunet-daemon-pt.c:718
+#: src/pt/gnunet-daemon-pt.c:717
 msgid "# DNS replies intercepted"
 msgstr ""
 
-#: src/pt/gnunet-daemon-pt.c:724
+#: src/pt/gnunet-daemon-pt.c:723
 msgid "Failed to parse DNS request.  Dropping.\n"
 msgstr ""
 
-#: src/pt/gnunet-daemon-pt.c:827
+#: src/pt/gnunet-daemon-pt.c:826
 msgid "# DNS requests dropped (timeout)"
 msgstr ""
 
-#: src/pt/gnunet-daemon-pt.c:884
+#: src/pt/gnunet-daemon-pt.c:883
 msgid "# DNS requests intercepted"
 msgstr ""
 
-#: src/pt/gnunet-daemon-pt.c:889
-msgid "# DNS requests dropped (DNS mesh tunnel down)"
+#: src/pt/gnunet-daemon-pt.c:888
+msgid "# DNS requests dropped (DNS mesh channel down)"
 msgstr ""
 
-#: src/pt/gnunet-daemon-pt.c:897
+#: src/pt/gnunet-daemon-pt.c:896
 msgid "# DNS requests dropped (malformed)"
 msgstr ""
 
-#: src/pt/gnunet-daemon-pt.c:970
+#: src/pt/gnunet-daemon-pt.c:969
 msgid "# DNS replies received"
 msgstr ""
 
-#: src/pt/gnunet-daemon-pt.c:986
+#: src/pt/gnunet-daemon-pt.c:985
 msgid "# DNS replies dropped (too late?)"
 msgstr ""
 
-#: 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
+#: src/pt/gnunet-daemon-pt.c:1261 src/pt/gnunet-daemon-pt.c:1270
+#: src/pt/gnunet-daemon-pt.c:1290 src/pt/gnunet-daemon-pt.c:1301
+#: src/pt/gnunet-daemon-pt.c:1310
 #, fuzzy, c-format
 msgid "Failed to connect to %s service.  Exiting.\n"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/pt/gnunet-daemon-pt.c:1348
+#: src/pt/gnunet-daemon-pt.c:1347
 msgid "Daemon to run to perform IP protocol translation to GNUnet"
 msgstr ""
 
+#: src/regex/gnunet-daemon-regexprofiler.c:270
+#: src/regex/gnunet-regex-simulation-profiler.c:659
+#, fuzzy, c-format
+msgid "%s service is lacking key configuration settings (%s).  Exiting.\n"
+msgstr "立即保存配置?"
+
 #: src/regex/gnunet-daemon-regexprofiler.c:380
 msgid "Daemon to announce regular expressions for the peer using mesh."
 msgstr ""
@@ -5307,94 +5529,112 @@
 "Testing and revoking at the same time is not allowed, only executing test.\n"
 msgstr ""
 
-#: src/revocation/gnunet-revocation.c:451
+#: src/revocation/gnunet-revocation.c:436
+#, fuzzy
+msgid "No filename to store revocation certificate given.\n"
+msgstr "解析配置文件“%s”失败\n"
+
+#: src/revocation/gnunet-revocation.c:458
 #, fuzzy, c-format
 msgid "Failed to read revocation certificate from `%s'\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/revocation/gnunet-revocation.c:476
+#: src/revocation/gnunet-revocation.c:483
 #, fuzzy
 msgid "No action specified. Nothing to do.\n"
 msgstr "没有指定接口,将使用默认。\n"
 
-#: src/revocation/gnunet-revocation.c:492
+#: src/revocation/gnunet-revocation.c:499
 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 "
+#: src/revocation/gnunet-revocation.c:502
+msgid ""
+"revoke the private key associated for the 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"
+#: src/revocation/gnunet-revocation.c:505
+msgid "actually perform revocation, otherwise we just do the precomputation"
 msgstr ""
 
-#: src/revocation/gnunet-revocation.c:501
+#: src/revocation/gnunet-revocation.c:508
 msgid "test if the public key KEY has been revoked"
 msgstr ""
 
-#: src/revocation/gnunet-service-revocation.c:250
+#: src/revocation/gnunet-service-revocation.c:272
 msgid "Duplicate revocation received from peer. Ignored.\n"
 msgstr ""
 
-#: src/revocation/gnunet-service-revocation.c:599
+#: src/revocation/gnunet-service-revocation.c:434
+#, c-format
+msgid "Error computing revocation set union with %s\n"
+msgstr ""
+
+#: src/revocation/gnunet-service-revocation.c:486
+msgid "SET service crashed, terminating revocation service\n"
+msgstr ""
+
+#: src/revocation/gnunet-service-revocation.c:812
 #, fuzzy
 msgid "Could not open revocation database file!"
 msgstr "无法连接到 %s:%u:%s\n"
 
-#: src/scalarproduct/gnunet-scalarproduct.c:194
+#: src/scalarproduct/gnunet-scalarproduct.c:225
 #, fuzzy
 msgid "You must specify at least one message ID to check!\n"
 msgstr "您必须指定一个昵称\n"
 
-#: src/scalarproduct/gnunet-scalarproduct.c:200
+#: src/scalarproduct/gnunet-scalarproduct.c:232
 msgid "This program needs a session identifier for comparing vectors.\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-scalarproduct.c:206
+#: src/scalarproduct/gnunet-scalarproduct.c:239
 msgid "Please give a session key for --input_key!\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-scalarproduct.c:215
+#: src/scalarproduct/gnunet-scalarproduct.c:251
 #, 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:239
-#: src/scalarproduct/gnunet-scalarproduct.c:297
+#: src/scalarproduct/gnunet-scalarproduct.c:276
 #, fuzzy, c-format
 msgid "Could not convert `%s' to int32_t.\n"
 msgstr "无法连接到 %s:%u:%s\n"
 
-#: src/scalarproduct/gnunet-scalarproduct.c:246
+#: src/scalarproduct/gnunet-scalarproduct.c:284
 msgid "Need elements to compute the vectorproduct, got none.\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-scalarproduct.c:347
+#: src/scalarproduct/gnunet-scalarproduct.c:336
+#, fuzzy, c-format
+msgid "Could not convert `%s' to integer.\n"
+msgstr "无法连接到 %s:%u:%s\n"
+
+#: src/scalarproduct/gnunet-scalarproduct.c:397
 msgid ""
 "A comma separated list of elements to compare as vector with our remote peer."
 msgstr ""
 
-#: src/scalarproduct/gnunet-scalarproduct.c:350
+#: src/scalarproduct/gnunet-scalarproduct.c:400
 msgid ""
 "A comma separated mask to select which elements should actually be compared."
 msgstr ""
 
-#: src/scalarproduct/gnunet-scalarproduct.c:353
+#: src/scalarproduct/gnunet-scalarproduct.c:403
 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:356
+#: src/scalarproduct/gnunet-scalarproduct.c:406
 msgid "Transaction ID shared with peer."
 msgstr ""
 
-#: src/scalarproduct/gnunet-scalarproduct.c:365
+#: src/scalarproduct/gnunet-scalarproduct.c:415
 msgid "Calculate the Vectorproduct with a GNUnet peer."
 msgstr ""
 
@@ -5403,139 +5643,140 @@
 msgid "Generated key set with key length %d bits.\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:775
+#: src/scalarproduct/gnunet-service-scalarproduct.c:776
 #, fuzzy, c-format
 msgid "Client (%p) disconnected from us.\n"
 msgstr "“%s”已连接到“%s”。\n"
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:847
-#: src/scalarproduct/gnunet-service-scalarproduct.c:936
+#: src/scalarproduct/gnunet-service-scalarproduct.c:848
+#: src/scalarproduct/gnunet-service-scalarproduct.c:938
 #, fuzzy, c-format
 msgid "Could not send message to client (%p)!\n"
 msgstr "找不到接口“%s”的一个 IP 地址。\n"
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:853
+#: src/scalarproduct/gnunet-service-scalarproduct.c:854
 #, c-format
 msgid "Sending session-end notification to client (%p) for session %s\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:946
+#: src/scalarproduct/gnunet-service-scalarproduct.c:948
 #, c-format
 msgid "Sent result to client (%p), this session (%s) has ended!\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1025
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1163
+#: src/scalarproduct/gnunet-service-scalarproduct.c:1027
+#: src/scalarproduct/gnunet-service-scalarproduct.c:1165
 msgid "Could not send service-response message via mesh!)\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1376
+#: src/scalarproduct/gnunet-service-scalarproduct.c:1391
 #, c-format
 msgid "Failed to communicate with `%s', scalar product calculation aborted.\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1476
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1603
+#: src/scalarproduct/gnunet-service-scalarproduct.c:1495
+#: src/scalarproduct/gnunet-service-scalarproduct.c:1622
 msgid "Transmitting service request.\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1485
+#: src/scalarproduct/gnunet-service-scalarproduct.c:1504
 #, fuzzy
-msgid "Could not send service-request multipart message to tunnel!\n"
+msgid "Could not send service-request multipart message to channel!\n"
 msgstr "找不到接口“%s”的一个 IP 地址。\n"
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1525
+#: src/scalarproduct/gnunet-service-scalarproduct.c:1544
 #, fuzzy, c-format
-msgid "Successfully created new tunnel to peer (%s)!\n"
+msgid "Successfully created new channel to peer (%s)!\n"
 msgstr "“%s”已连接到“%s”。\n"
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1612
+#: src/scalarproduct/gnunet-service-scalarproduct.c:1631
 #, fuzzy
-msgid "Could not send message to tunnel!\n"
+msgid "Could not send message to channel!\n"
 msgstr "找不到接口“%s”的一个 IP 地址。\n"
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1669
+#: src/scalarproduct/gnunet-service-scalarproduct.c:1688
 msgid "Too short message received from client!\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1682
+#: src/scalarproduct/gnunet-service-scalarproduct.c:1701
 msgid "Invalid message received from client, session information incorrect!\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1693
+#: src/scalarproduct/gnunet-service-scalarproduct.c:1712
 #, c-format
 msgid ""
 "Duplicate session information received, cannot create new session with key `"
 "%s'\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1713
+#: src/scalarproduct/gnunet-service-scalarproduct.c:1733
 #, c-format
 msgid ""
-"Got client-request-session with key %s, preparing tunnel to remote service.\n"
+"Got client-request-session with key %s, preparing channel to remote "
+"service.\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1749
+#: src/scalarproduct/gnunet-service-scalarproduct.c:1772
 #, c-format
-msgid "Creating new tunnel for session with key %s.\n"
+msgid "Creating new channel for session with key %s.\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1794
+#: src/scalarproduct/gnunet-service-scalarproduct.c:1819
 #, 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:1802
+#: src/scalarproduct/gnunet-service-scalarproduct.c:1830
 #, 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:1828
+#: src/scalarproduct/gnunet-service-scalarproduct.c:1860
 #, fuzzy, c-format
-msgid "New incoming tunnel from peer %s.\n"
+msgid "New incoming channel from peer %s.\n"
 msgstr "“%s”已连接到“%s”。\n"
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1859
+#: src/scalarproduct/gnunet-service-scalarproduct.c:1892
 #, c-format
 msgid "Peer disconnected, terminating session %s with peer (%s)\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:2047
-#: src/scalarproduct/gnunet-service-scalarproduct.c:2196
+#: src/scalarproduct/gnunet-service-scalarproduct.c:2083
+#: src/scalarproduct/gnunet-service-scalarproduct.c:2242
 #, c-format
 msgid "Got session with key %s and a matching element set, processing.\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:2054
-#: src/scalarproduct/gnunet-service-scalarproduct.c:2203
+#: src/scalarproduct/gnunet-service-scalarproduct.c:2092
+#: src/scalarproduct/gnunet-service-scalarproduct.c:2249
 #, c-format
 msgid "Got session with key %s without a matching element set, queueing.\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:2142
+#: src/scalarproduct/gnunet-service-scalarproduct.c:2187
 #, c-format
 msgid ""
 "Got message with duplicate session key (`%s'), ignoring service request.\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:2425
+#: src/scalarproduct/gnunet-service-scalarproduct.c:2471
 msgid "Shutting down, initiating cleanup.\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:2490
+#: src/scalarproduct/gnunet-service-scalarproduct.c:2536
 msgid "Generating Paillier-Keyset.\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:2505
+#: src/scalarproduct/gnunet-service-scalarproduct.c:2551
 #, fuzzy
 msgid "Connect to MESH failed\n"
 msgstr "“%s”已连接到“%s”。\n"
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:2509
+#: src/scalarproduct/gnunet-service-scalarproduct.c:2555
 msgid "Mesh initialized\n"
 msgstr ""
 
@@ -5565,6 +5806,11 @@
 msgid "Failed to send a message to the scalarproduct service\n"
 msgstr "初始化“%s”服务失败。\n"
 
+#: src/set/gnunet-service-set.c:1399
+#, fuzzy
+msgid "Could not connect to mesh service\n"
+msgstr "无法连接到 %s:%u:%s\n"
+
 #: src/set/gnunet-set-ibf-profiler.c:221
 #, fuzzy
 msgid "number of element in set A-B"
@@ -5704,16 +5950,16 @@
 "Cannot open %s for writing load statistics.  Not logging load statistics\n"
 msgstr ""
 
-#: src/testbed/gnunet-service-testbed_peers.c:1012
+#: src/testbed/gnunet-service-testbed_peers.c:1015
 #, fuzzy
 msgid "Misconfiguration (can't connect to the ARM service)"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/testbed/gnunet-service-testbed_peers.c:1018
+#: src/testbed/gnunet-service-testbed_peers.c:1021
 msgid "Request doesn't fit into a message"
 msgstr ""
 
-#: src/testbed/gnunet-service-testbed_peers.c:1056
+#: src/testbed/gnunet-service-testbed_peers.c:1059
 #, c-format
 msgid "%s service can't be started because ARM is shutting down"
 msgstr ""
@@ -5828,44 +6074,44 @@
 "free topology cannot be more than %u.  Given `%s = %llu'"
 msgstr ""
 
-#: src/testbed/testbed_api_topology.c:716
+#: src/testbed/testbed_api_topology.c:715
 #, c-format
 msgid "Topology file %s not found\n"
 msgstr ""
 
-#: src/testbed/testbed_api_topology.c:722
+#: src/testbed/testbed_api_topology.c:721
 #, c-format
 msgid "Topology file %s has no data\n"
 msgstr ""
 
-#: src/testbed/testbed_api_topology.c:729
+#: src/testbed/testbed_api_topology.c:728
 #, c-format
 msgid "Topology file %s cannot be read\n"
 msgstr ""
 
-#: src/testbed/testbed_api_topology.c:751
+#: src/testbed/testbed_api_topology.c:750
 #, fuzzy, c-format
 msgid "Failed to read peer index from toology file: %s"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/testbed/testbed_api_topology.c:760
-#: src/testbed/testbed_api_topology.c:784
+#: src/testbed/testbed_api_topology.c:759
+#: src/testbed/testbed_api_topology.c:783
 #, c-format
 msgid "Value in given topology file: %s out of range\n"
 msgstr ""
 
-#: src/testbed/testbed_api_topology.c:766
-#: src/testbed/testbed_api_topology.c:790
+#: src/testbed/testbed_api_topology.c:765
+#: src/testbed/testbed_api_topology.c:789
 #, fuzzy, c-format
 msgid "Failed to read peer index from topology file: %s"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/testbed/testbed_api_topology.c:772
-#: src/testbed/testbed_api_topology.c:796
+#: src/testbed/testbed_api_topology.c:771
+#: src/testbed/testbed_api_topology.c:795
 msgid "Topology file needs more peers than given ones\n"
 msgstr ""
 
-#: src/testbed/testbed_api_topology.c:811
+#: src/testbed/testbed_api_topology.c:810
 #, fuzzy, c-format
 msgid "Ignoring to connect peer %u to peer %u\n"
 msgstr "无法连接到 %s:%u:%s\n"
@@ -5914,7 +6160,7 @@
 msgid "Hostkeys file not found: %s\n"
 msgstr ""
 
-#: src/testing/testing.c:293
+#: src/testing/testing.c:293 src/util/gnunet-ecc.c:217
 #, c-format
 msgid "Incorrect hostkey file format: %s\n"
 msgstr ""
@@ -5955,17 +6201,17 @@
 msgid "Failed to write hostkey file for peer %u: %s\n"
 msgstr "发送消息失败。\n"
 
-#: src/testing/testing.c:1235
+#: src/testing/testing.c:1238
 #, fuzzy, c-format
 msgid "Failed to write configuration file `%s' for peer %u: %s\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/testing/testing.c:1335
+#: src/testing/testing.c:1340
 #, fuzzy, c-format
 msgid "Failed to start `%s': %s\n"
 msgstr "运行 %s失败:%s %d\n"
 
-#: src/testing/testing.c:1699
+#: src/testing/testing.c:1704
 #, fuzzy, c-format
 msgid "Failed to load configuration from %s\n"
 msgstr "解析配置文件“%s”失败\n"
@@ -6053,53 +6299,54 @@
 msgid "# disconnects due to blacklist"
 msgstr ""
 
-#: src/transport/gnunet-service-transport.c:163
-msgid "# bytes payload discarded due to not connected peer "
+#: src/transport/gnunet-service-transport.c:160
+msgid "# bytes payload discarded due to not connected peer"
 msgstr ""
 
-#: src/transport/gnunet-service-transport.c:229
+#: src/transport/gnunet-service-transport.c:250
 msgid "# bytes total received"
 msgstr ""
 
-#: src/transport/gnunet-service-transport.c:277
+#: src/transport/gnunet-service-transport.c:325
 msgid "# bytes payload received"
 msgstr ""
 
-#: src/transport/gnunet-service-transport.c:429
+#: src/transport/gnunet-service-transport.c:479
 #, 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:479
+#: src/transport/gnunet-service-transport.c:529
 #, 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:760
-msgid "Transport service is lacking key configuration settings.  Exiting.\n"
-msgstr ""
+#: src/transport/gnunet-service-transport.c:820
+#, fuzzy
+msgid "Transport service is lacking key configuration settings. Exiting.\n"
+msgstr "立即保存配置?"
 
-#: src/transport/gnunet-service-transport_clients.c:389
+#: src/transport/gnunet-service-transport_clients.c:384
 #, c-format
 msgid "Dropping message of type %u and size %u, have %u/%u messages pending\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_clients.c:394
+#: src/transport/gnunet-service-transport_clients.c:391
 msgid "# messages dropped due to slow client"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_clients.c:536
+#: src/transport/gnunet-service-transport_clients.c:533
 #, c-format
 msgid "Rejecting control connection from peer `%s', which is not me!\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_clients.c:672
+#: src/transport/gnunet-service-transport_clients.c:674
 msgid "# bytes payload dropped (other peer was not connected)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_clients.c:728
+#: src/transport/gnunet-service-transport_clients.c:731
 msgid "# REQUEST CONNECT messages received"
 msgstr ""
 
@@ -6107,101 +6354,135 @@
 msgid "# refreshed my HELLO"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1080
+#: src/transport/gnunet-service-transport_neighbours.c:1074
 msgid "# DISCONNECT messages sent"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1210
-#: src/transport/gnunet-service-transport_neighbours.c:1545
+#: src/transport/gnunet-service-transport_neighbours.c:1206
+#: src/transport/gnunet-service-transport_neighbours.c:1541
 msgid "# bytes in message queue for other peers"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1215
+#: src/transport/gnunet-service-transport_neighbours.c:1211
 msgid "# messages transmitted to other peers"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1220
+#: src/transport/gnunet-service-transport_neighbours.c:1216
 msgid "# transmission failures for messages to other peers"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1277
+#: src/transport/gnunet-service-transport_neighbours.c:1273
 msgid "# messages timed out while in transport queue"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1319
+#: src/transport/gnunet-service-transport_neighbours.c:1315
 msgid "# keepalives sent"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1343
+#: src/transport/gnunet-service-transport_neighbours.c:1339
 msgid "# KEEPALIVE messages discarded (peer unknown)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1351
+#: src/transport/gnunet-service-transport_neighbours.c:1347
 msgid "# KEEPALIVE messages discarded (no session)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1384
+#: src/transport/gnunet-service-transport_neighbours.c:1380
 msgid "# KEEPALIVE_RESPONSE messages discarded (not connected)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1393
+#: src/transport/gnunet-service-transport_neighbours.c:1389
 msgid "# KEEPALIVE_RESPONSE messages discarded (not expected)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1450
+#: src/transport/gnunet-service-transport_neighbours.c:1446
 msgid "# messages discarded due to lack of neighbour record"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1484
+#: src/transport/gnunet-service-transport_neighbours.c:1480
 msgid "# bandwidth quota violations by other peers"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1500
+#: src/transport/gnunet-service-transport_neighbours.c:1496
 msgid "# ms throttling suggested"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:2775
+#: src/transport/gnunet-service-transport_neighbours.c:1585
+msgid "# SESSION_CONNECT messages sent"
+msgstr ""
+
+#: src/transport/gnunet-service-transport_neighbours.c:1601
+#, fuzzy, c-format
+msgid "Failed to transmit CONNECT message via plugin to %s\n"
+msgstr "解析配置文件“%s”失败\n"
+
+#: src/transport/gnunet-service-transport_neighbours.c:1641
+msgid "# CONNECT_ACK messages sent"
+msgstr ""
+
+#: src/transport/gnunet-service-transport_neighbours.c:2106
+msgid "# CONNECT messages received"
+msgstr ""
+
+#: src/transport/gnunet-service-transport_neighbours.c:2111
+#, c-format
+msgid "CONNECT request from peer `%s' ignored due impending shutdown\n"
+msgstr ""
+
+#: src/transport/gnunet-service-transport_neighbours.c:2824
+msgid "# CONNECT_ACK messages received"
+msgstr ""
+
+#: src/transport/gnunet-service-transport_neighbours.c:2832
 msgid "# unexpected CONNECT_ACK messages (no peer)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:2790
-#: src/transport/gnunet-service-transport_neighbours.c:2821
+#: src/transport/gnunet-service-transport_neighbours.c:2847
+#: src/transport/gnunet-service-transport_neighbours.c:2882
 msgid "# unexpected CONNECT_ACK messages (not ready)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:2834
+#: src/transport/gnunet-service-transport_neighbours.c:2895
 msgid "# unexpected CONNECT_ACK messages (waiting on ATS)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:2865
+#: src/transport/gnunet-service-transport_neighbours.c:2926
 msgid "# unexpected CONNECT_ACK messages (disconnecting)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3045
-msgid "# unexpected SESSION ACK messages"
+#: src/transport/gnunet-service-transport_neighbours.c:3106
+msgid "# SESSION_ACK messages received"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3098
+#: src/transport/gnunet-service-transport_neighbours.c:3122
+msgid "# unexpected SESSION_ACK messages"
+msgstr ""
+
+#: src/transport/gnunet-service-transport_neighbours.c:3176
 msgid "# SET QUOTA messages ignored (no such peer)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3112
+#: src/transport/gnunet-service-transport_neighbours.c:3190
 msgid "# disconnects due to quota of 0"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3143
+#: src/transport/gnunet-service-transport_neighbours.c:3220
 msgid "# disconnect messages ignored (old format)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3154
+#: src/transport/gnunet-service-transport_neighbours.c:3226
+msgid "# DISCONNECT messages received"
+msgstr ""
+
+#: src/transport/gnunet-service-transport_neighbours.c:3235
 msgid "# disconnect messages ignored (timestamp)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3193
+#: src/transport/gnunet-service-transport_neighbours.c:3271
 msgid "# other peer asked to disconnect from us"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3288
+#: src/transport/gnunet-service-transport_neighbours.c:3366
 msgid "# disconnected from peer upon explicit request"
 msgstr ""
 
@@ -6217,11 +6498,12 @@
 #: src/transport/gnunet-service-transport_plugins.c:210
 #: src/transport/gnunet-service-transport_plugins.c:218
 #: src/transport/gnunet-service-transport_plugins.c:226
+#: src/transport/gnunet-service-transport_plugins.c:234
 #, fuzzy, c-format
 msgid "Missing function `%s' in transport plugin for `%s'\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/transport/gnunet-service-transport_plugins.c:233
+#: src/transport/gnunet-service-transport_plugins.c:241
 #, c-format
 msgid "Did not load plugin `%s' due to missing functions\n"
 msgstr ""
@@ -6230,70 +6512,87 @@
 msgid "# address records discarded"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:519
+#: src/transport/gnunet-service-transport_validation.c:526
 #, 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:577
+#: src/transport/gnunet-service-transport_validation.c:584
 msgid "# PING without HELLO messages sent"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:662
+#: src/transport/gnunet-service-transport_validation.c:685
 msgid "# address revalidations started"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:933
+#: src/transport/gnunet-service-transport_validation.c:969
 msgid "# PING message for different peer received"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:992
+#: src/transport/gnunet-service-transport_validation.c:1019
+#, c-format
+msgid "Plugin `%s' not available, cannot confirm having this address\n"
+msgstr ""
+
+#: src/transport/gnunet-service-transport_validation.c:1029
 msgid "# failed address checks during validation"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1002
+#: src/transport/gnunet-service-transport_validation.c:1032
+#, c-format
+msgid "Address `%s' is not one of my addresses, not confirming PING\n"
+msgstr ""
+
+#: src/transport/gnunet-service-transport_validation.c:1040
 msgid "# successful address checks during validation"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1021
+#: src/transport/gnunet-service-transport_validation.c:1052
 #, c-format
+msgid ""
+"Not confirming PING from peer `%s' with address `%s' since I cannot confirm "
+"having this address.\n"
+msgstr ""
+
+#: src/transport/gnunet-service-transport_validation.c:1060
+#, c-format
 msgid "Received a PING message with validation bug from `%s'\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1075
+#: src/transport/gnunet-service-transport_validation.c:1114
 #, fuzzy, c-format
 msgid "Failed to create PONG signature for peer `%s'\n"
 msgstr "发送消息失败。\n"
 
-#: src/transport/gnunet-service-transport_validation.c:1124
+#: src/transport/gnunet-service-transport_validation.c:1163
 msgid "# PONGs unicast via reliable transport"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1133
+#: src/transport/gnunet-service-transport_validation.c:1172
 msgid "# PONGs multicast to all available addresses"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1260
+#: src/transport/gnunet-service-transport_validation.c:1312
 msgid "# PONGs dropped, no matching pending validation"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1275
+#: src/transport/gnunet-service-transport_validation.c:1327
 msgid "# PONGs dropped, signature expired"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1381
+#: src/transport/gnunet-service-transport_validation.c:1448
 #, c-format
 msgid "Adding `%s' without addresses for peer `%s'\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:259
+#: src/transport/gnunet-transport.c:258
 #, c-format
 msgid "Transmitted %llu bytes/s (%llu bytes in %s)\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:266
+#: src/transport/gnunet-transport.c:265
 #, c-format
 msgid "Received %llu bytes/s (%llu bytes in %s)\n"
 msgstr ""
@@ -6313,127 +6612,127 @@
 msgid "Failed to list connections, timeout occured\n"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/transport/gnunet-transport.c:422
+#: src/transport/gnunet-transport.c:423
 msgid "No transport plugins configured, peer will never communicate\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:435
+#: src/transport/gnunet-transport.c:436
 #, c-format
 msgid "No port configured for plugin `%s', cannot test it\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:499
+#: src/transport/gnunet-transport.c:506
 #, c-format
 msgid "Transmitting %u bytes to %s\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:522
+#: src/transport/gnunet-transport.c:529
 #, fuzzy, c-format
 msgid "Successfully connected to `%s'\n"
 msgstr "“%s”已连接到“%s”。\n"
 
-#: src/transport/gnunet-transport.c:545
+#: src/transport/gnunet-transport.c:552
 #, c-format
 msgid ""
 "Successfully connected to `%s', starting to send benchmark data in %u Kb "
 "blocks\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:580
+#: src/transport/gnunet-transport.c:587
 #, fuzzy, c-format
 msgid "Disconnected from peer `%s' while benchmarking\n"
 msgstr "“%s”已连接到“%s”。\n"
 
-#: src/transport/gnunet-transport.c:650
+#: src/transport/gnunet-transport.c:660
 #, c-format
 msgid "Received %u bytes from %s\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:673
+#: src/transport/gnunet-transport.c:685
 #, fuzzy, c-format
 msgid "Peer `%s': %s %s\n"
 msgstr "运行 %s失败:%s %d\n"
 
-#: src/transport/gnunet-transport.c:688
+#: src/transport/gnunet-transport.c:704
 #, c-format
 msgid "Peer `%s': %s <unable to resolve address>\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:752
+#: src/transport/gnunet-transport.c:772
 #, fuzzy, c-format
 msgid "Peer `%s' disconnected\n"
 msgstr ""
 "\n"
 "按任意键继续\n"
 
-#: src/transport/gnunet-transport.c:780
+#: src/transport/gnunet-transport.c:802
 #, fuzzy
 msgid "Failed to send connect request to transport service\n"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/transport/gnunet-transport.c:825
+#: src/transport/gnunet-transport.c:848
 #, c-format
 msgid ""
 "Multiple operations given. Please choose only one operation: %s, %s, %s, %s, "
 "%s, %s\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:831
+#: src/transport/gnunet-transport.c:855
 #, c-format
 msgid ""
 "No operation given. Please choose one operation: %s, %s, %s, %s, %s, %s\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:851 src/transport/gnunet-transport.c:881
-#: src/transport/gnunet-transport.c:903 src/transport/gnunet-transport.c:940
+#: src/transport/gnunet-transport.c:878 src/transport/gnunet-transport.c:910
+#: src/transport/gnunet-transport.c:932 src/transport/gnunet-transport.c:969
 #, fuzzy
 msgid "Failed to connect to transport service\n"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/transport/gnunet-transport.c:858 src/transport/gnunet-transport.c:888
+#: src/transport/gnunet-transport.c:887 src/transport/gnunet-transport.c:917
 #, fuzzy
 msgid "Failed to send request to transport service\n"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/transport/gnunet-transport.c:908
+#: src/transport/gnunet-transport.c:937
 msgid "Starting to receive benchmark data\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:990
+#: src/transport/gnunet-transport.c:1019
 msgid "measure how fast we are receiving data from all peers (until CTRL-C)"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:993
+#: src/transport/gnunet-transport.c:1022
 #, fuzzy
 msgid "connect to a peer"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/transport/gnunet-transport.c:996
+#: src/transport/gnunet-transport.c:1025
 msgid "provide information about all current connections (once)"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1002
+#: src/transport/gnunet-transport.c:1031
 msgid ""
 "provide information about all connects and disconnect events (continuously)"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1005
+#: src/transport/gnunet-transport.c:1034
 msgid "do not resolve hostnames"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1008
+#: src/transport/gnunet-transport.c:1037
 msgid "peer identity"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1012
+#: src/transport/gnunet-transport.c:1041
 msgid "send data for benchmarking to the other peer (until CTRL-C)"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1015
+#: src/transport/gnunet-transport.c:1044
 msgid "test transport configuration (involves external server)"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1026
+#: src/transport/gnunet-transport.c:1055
 #, fuzzy
 msgid "Direct access to transport service."
 msgstr "初始化“%s”服务失败。\n"
@@ -6448,7 +6747,7 @@
 
 #: src/transport/plugin_transport_bluetooth.c:681
 #: src/transport/plugin_transport_bluetooth.c:731
-#: src/transport/plugin_transport_bluetooth.c:1837
+#: src/transport/plugin_transport_bluetooth.c:1854
 msgid "# Bluetooth sessions allocated"
 msgstr ""
 
@@ -6462,396 +6761,364 @@
 
 #: src/transport/plugin_transport_bluetooth.c:938
 #: src/transport/plugin_transport_bluetooth.c:1023
-#: src/transport/plugin_transport_bluetooth.c:1839
+#: src/transport/plugin_transport_bluetooth.c:1856
 msgid "# Bluetooth MAC endpoints allocated"
 msgstr ""
 
-#: src/transport/plugin_transport_bluetooth.c:1218
+#: src/transport/plugin_transport_bluetooth.c:1235
 msgid "# HELLO messages received via Bluetooth"
 msgstr ""
 
-#: src/transport/plugin_transport_bluetooth.c:1244
+#: src/transport/plugin_transport_bluetooth.c:1261
 msgid "# fragments received via Bluetooth"
 msgstr ""
 
-#: src/transport/plugin_transport_bluetooth.c:1254
+#: src/transport/plugin_transport_bluetooth.c:1271
 msgid "# ACKs received via Bluetooth"
 msgstr ""
 
-#: src/transport/plugin_transport_bluetooth.c:1311
+#: src/transport/plugin_transport_bluetooth.c:1328
 msgid "# Bluetooth DATA messages discarded due to CRC32 error"
 msgstr ""
 
-#: src/transport/plugin_transport_bluetooth.c:1423
+#: src/transport/plugin_transport_bluetooth.c:1440
 msgid "# DATA messages received via Bluetooth"
 msgstr ""
 
-#: src/transport/plugin_transport_bluetooth.c:1458
+#: src/transport/plugin_transport_bluetooth.c:1475
 msgid "# Bluetooth DATA messages processed"
 msgstr ""
 
-#: src/transport/plugin_transport_bluetooth.c:1521
+#: src/transport/plugin_transport_bluetooth.c:1538
 msgid "# HELLO beacons sent via Bluetooth"
 msgstr ""
 
-#: src/transport/plugin_transport_bluetooth.c:1634
+#: src/transport/plugin_transport_bluetooth.c:1651
 msgid "Bluetooth address with invalid size encountered\n"
 msgstr ""
 
-#: src/transport/plugin_transport_bluetooth.c:1818
+#: src/transport/plugin_transport_bluetooth.c:1835
 #, 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: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: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: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: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:2530
+#: src/transport/plugin_transport_http_client.c:1590
 #, 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: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:2721
-#, fuzzy
-msgid "Port is required! Fix in configuration\n"
-msgstr ""
-"\n"
-"结束配置。\n"
-
-#: src/transport/plugin_transport_http.c:1155
-msgid "Port 0, client only mode\n"
-msgstr ""
-
-#: src/transport/plugin_transport_http.c:1175
-#, c-format
-msgid ""
-"Specific IPv4 address `%s' for plugin %s in configuration file is invalid! "
-"Binding to all addresses!\n"
-msgstr ""
-
-#: src/transport/plugin_transport_http.c:1204
-#, c-format
-msgid ""
-"Specific IPv6 address `%s' for plugin %s in configuration file is invalid! "
-"Binding to all addresses!\n"
-msgstr ""
-
-#: src/transport/plugin_transport_http.c:1221
-#: src/transport/plugin_transport_http_server.c:2836
-#, fuzzy, c-format
-msgid "Using external hostname `%s'\n"
-msgstr "卸载 GNUnet 服务"
-
-#: src/transport/plugin_transport_http.c:1226
-msgid "No external hostname configured\n"
-msgstr ""
-
-#: 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:1723
-#: src/transport/plugin_transport_http_server.c:2966
+#: src/transport/plugin_transport_http_client.c:1727
+#: src/transport/plugin_transport_http_server.c:2974
 #, fuzzy, c-format
 msgid "Shutting down plugin `%s'\n"
 msgstr "未知的命令“%s”。\n"
 
-#: src/transport/plugin_transport_http_client.c:1748
-#: src/transport/plugin_transport_http_server.c:3026
+#: src/transport/plugin_transport_http_client.c:1752
+#: src/transport/plugin_transport_http_server.c:3032
 #, c-format
 msgid "Shutdown for plugin `%s' complete\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_client.c:1776
-#: src/transport/plugin_transport_http_server.c:2866
+#: src/transport/plugin_transport_http_client.c:1780
+#: src/transport/plugin_transport_http_server.c:2874
 #, fuzzy, c-format
 msgid "Maximum number of connections is %u\n"
 msgstr "增加 TCP/IP 的最大连接数"
 
-#: src/transport/plugin_transport_http_server.c:1381
+#: src/transport/plugin_transport_http_server.c:1389
 #, 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:1646
+#: src/transport/plugin_transport_http_server.c:1653
 #, c-format
 msgid "Accepting connection (%u of %u) from `%s'\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:1654
+#: src/transport/plugin_transport_http_server.c:1661
 #, c-format
 msgid ""
 "Server reached maximum number connections (%u), rejecting new connection\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:1941
+#: src/transport/plugin_transport_http_server.c:1947
 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:1965
+#: src/transport/plugin_transport_http_server.c:1971
 #, c-format
 msgid "No usable TLS certificate found and creating one at `%s/%s' failed!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:2689
+#: src/transport/plugin_transport_http_server.c:2378
+#, fuzzy
+msgid "Require valid port number for service in configuration!\n"
+msgstr "保存配置失败。"
+
+#: src/transport/plugin_transport_http_server.c:2410 src/util/service.c:696
+#, fuzzy, c-format
+msgid "Failed to resolve `%s': %s\n"
+msgstr "打开日志文件“%s”失败:%s\n"
+
+#: src/transport/plugin_transport_http_server.c:2427 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_server.c:2538
 #, c-format
+msgid "Found %u addresses to report to NAT service\n"
+msgstr ""
+
+#: src/transport/plugin_transport_http_server.c:2610
+msgid "Disabling IPv6 since it is not supported on this system!\n"
+msgstr ""
+
+#: src/transport/plugin_transport_http_server.c:2697
+#, c-format
 msgid "IPv4 support is %s\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:2703
+#: src/transport/plugin_transport_http_server.c:2711
 #, c-format
 msgid "IPv6 support is %s\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:2728
+#: src/transport/plugin_transport_http_server.c:2718
+msgid "Neither IPv4 nor IPv6 are enabled! Fix in configuration\n"
+msgstr ""
+
+#: src/transport/plugin_transport_http_server.c:2729
+#, fuzzy
+msgid "Port is required! Fix in configuration\n"
+msgstr ""
+"\n"
+"结束配置。\n"
+
+#: src/transport/plugin_transport_http_server.c:2736
 #, c-format
 msgid "Using port %u\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:2743
+#: src/transport/plugin_transport_http_server.c:2751
 #, c-format
 msgid "Specific IPv4 address `%s' in configuration file is invalid!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:2753
+#: src/transport/plugin_transport_http_server.c:2761
 #, fuzzy, c-format
 msgid "Binding to IPv4 address %s\n"
 msgstr "无效的进程优先级“%s”\n"
 
-#: src/transport/plugin_transport_http_server.c:2774
+#: src/transport/plugin_transport_http_server.c:2782
 #, c-format
 msgid "Specific IPv6 address `%s' in configuration file is invalid!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:2784
+#: src/transport/plugin_transport_http_server.c:2792
 #, fuzzy, c-format
 msgid "Binding to IPv6 address %s\n"
 msgstr "无效的进程优先级“%s”\n"
 
-#: src/transport/plugin_transport_http_server.c:2852
+#: src/transport/plugin_transport_http_server.c:2844
+#, fuzzy, c-format
+msgid "Using external hostname `%s'\n"
+msgstr "卸载 GNUnet 服务"
+
+#: src/transport/plugin_transport_http_server.c:2860
 #, c-format
 msgid "Notifying transport only about hostname `%s'\n"
 msgstr ""
 
-#: src/transport/plugin_transport_smtp.c:370
+#: src/transport/plugin_transport_smtp.c:223
 #, c-format
 msgid "Received malformed message via %s. Ignored.\n"
 msgstr ""
 
-#: src/transport/plugin_transport_smtp.c:457
+#: src/transport/plugin_transport_smtp.c:310
 msgid "SMTP filter string to invalid, lacks ': '\n"
 msgstr ""
 
-#: src/transport/plugin_transport_smtp.c:466
+#: src/transport/plugin_transport_smtp.c:319
 #, c-format
 msgid "SMTP filter string to long, capped to `%s'\n"
 msgstr ""
 
-#: src/transport/plugin_transport_smtp.c:561
-#: src/transport/plugin_transport_smtp.c:571
-#: src/transport/plugin_transport_smtp.c:584
-#: src/transport/plugin_transport_smtp.c:603
-#: src/transport/plugin_transport_smtp.c:626
-#: src/transport/plugin_transport_smtp.c:634
-#: src/transport/plugin_transport_smtp.c:647
-#: src/transport/plugin_transport_smtp.c:658
+#: src/transport/plugin_transport_smtp.c:414
+#: src/transport/plugin_transport_smtp.c:424
+#: src/transport/plugin_transport_smtp.c:437
+#: src/transport/plugin_transport_smtp.c:456
+#: src/transport/plugin_transport_smtp.c:479
+#: src/transport/plugin_transport_smtp.c:487
+#: src/transport/plugin_transport_smtp.c:500
+#: src/transport/plugin_transport_smtp.c:511
 #, c-format
 msgid "SMTP: `%s' failed: %s.\n"
 msgstr ""
 
-#: src/transport/plugin_transport_smtp.c:799
+#: src/transport/plugin_transport_smtp.c:652
 msgid "No email-address specified, can not start SMTP transport.\n"
 msgstr ""
 
-#: src/transport/plugin_transport_smtp.c:811
+#: src/transport/plugin_transport_smtp.c:664
 msgid "# bytes received via SMTP"
 msgstr ""
 
-#: src/transport/plugin_transport_smtp.c:812
+#: src/transport/plugin_transport_smtp.c:665
 msgid "# bytes sent via SMTP"
 msgstr ""
 
-#: src/transport/plugin_transport_smtp.c:814
+#: src/transport/plugin_transport_smtp.c:667
 msgid "# bytes dropped by SMTP (outgoing)"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:626
+#: src/transport/plugin_transport_tcp.c:632
 #, c-format
 msgid "Unexpected address length: %u bytes\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:834
-#: 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:1206
-#: src/transport/plugin_transport_tcp.c:1223
+#: src/transport/plugin_transport_tcp.c:842
+#: src/transport/plugin_transport_tcp.c:931
+#: src/transport/plugin_transport_tcp.c:981
+#: src/transport/plugin_transport_tcp.c:1077
+#: src/transport/plugin_transport_tcp.c:1225
+#: src/transport/plugin_transport_tcp.c:1242
 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:2015
-#: src/transport/plugin_transport_tcp.c:2696
+#: src/transport/plugin_transport_tcp.c:849
+#: src/transport/plugin_transport_tcp.c:1043
+#: src/transport/plugin_transport_tcp.c:2041
+#: src/transport/plugin_transport_tcp.c:2721
 msgid "# TCP sessions active"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:927
+#: src/transport/plugin_transport_tcp.c:935
 msgid "# bytes discarded by TCP (timeout)"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:976
+#: src/transport/plugin_transport_tcp.c:984
 msgid "# bytes transmitted via TCP"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:1063
+#: src/transport/plugin_transport_tcp.c:1081
 msgid "# bytes discarded by TCP (disconnect)"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:1180
+#: src/transport/plugin_transport_tcp.c:1199
 #, c-format
 msgid "Trying to send with invalid session %p\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:1417
-#: src/transport/plugin_transport_udp.c:1440
+#: src/transport/plugin_transport_tcp.c:1440
+#: src/transport/plugin_transport_udp.c:1471
 msgid "# requests to create session with invalid address"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:1534
+#: src/transport/plugin_transport_tcp.c:1558
 msgid "# transport-service disconnect requests for TCP"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2065
+#: src/transport/plugin_transport_tcp.c:2091
 msgid "# TCP WELCOME messages received"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2248
+#: src/transport/plugin_transport_tcp.c:2274
 msgid "# bytes received via TCP"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2328
+#: src/transport/plugin_transport_tcp.c:2354
 msgid "# network-level TCP disconnect events"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2576 src/util/service.c:589
+#: src/transport/plugin_transport_tcp.c:2602 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:2590
+#: src/transport/plugin_transport_tcp.c:2616
 #, fuzzy
 msgid "Failed to start service.\n"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/transport/plugin_transport_tcp.c:2683
+#: src/transport/plugin_transport_tcp.c:2710
 #, c-format
 msgid "TCP transport listening on port %llu\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2687
+#: src/transport/plugin_transport_tcp.c:2713
 msgid "TCP transport not listening on any port (client only)\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2691
+#: src/transport/plugin_transport_tcp.c:2716
 #, c-format
 msgid "TCP transport advertises itself as being on port %llu\n"
 msgstr ""
 
-#: src/transport/plugin_transport_udp_broadcasting.c:134
+#: src/transport/plugin_transport_udp_broadcasting.c:173
 msgid "# IPv6 multicast HELLO beacons received via udp"
 msgstr ""
 
-#: src/transport/plugin_transport_udp_broadcasting.c:184
+#: src/transport/plugin_transport_udp_broadcasting.c:222
 msgid "# IPv4 broadcast HELLO beacons received via udp"
 msgstr ""
 
-#: src/transport/plugin_transport_udp_broadcasting.c:402
+#: src/transport/plugin_transport_udp_broadcasting.c:605
 msgid ""
 "Disabling HELLO broadcasting due to friend-to-friend only configuration!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_udp_broadcasting.c:419
+#: src/transport/plugin_transport_udp_broadcasting.c:619
 #, c-format
 msgid "Failed to set IPv4 broadcast option for broadcast socket on port %d\n"
 msgstr ""
 
-#: src/transport/plugin_transport_udp.c:1550
+#: src/transport/plugin_transport_udp.c:1581
 #, 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:2602
+#: src/transport/plugin_transport_udp.c:2635
 #, 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:2616
-#, c-format
+#: src/transport/plugin_transport_udp.c:2649
 msgid ""
-"UDP could not transmit message to `%s': Please check your network "
-"configuration and disable IPv6 if your connection does not have a global "
-"IPv6 address\n"
+"UDP could not transmit IPv6 message! Please check your network configuration "
+"and disable IPv6 if your connection does not have a global IPv6 address\n"
 msgstr ""
 
-#: src/transport/plugin_transport_udp.c:2917
+#: src/transport/plugin_transport_udp.c:2949
 #, fuzzy
 msgid "Failed to open UDP sockets\n"
 msgstr "打开日志文件“%s”失败:%s\n"
 
-#: src/transport/plugin_transport_udp.c:3015
+#: src/transport/plugin_transport_udp.c:3046
 #, c-format
 msgid "Given `%s' option is out of range: %llu > %u\n"
 msgstr ""
 
-#: src/transport/plugin_transport_udp.c:3058
+#: src/transport/plugin_transport_udp.c:3089
 #, fuzzy, c-format
 msgid "Invalid IPv6 address: `%s'\n"
 msgstr "无效的进程优先级“%s”\n"
 
-#: src/transport/plugin_transport_udp.c:3117
+#: src/transport/plugin_transport_udp.c:3148
 #, fuzzy
 msgid "Failed to create network sockets, plugin failed\n"
 msgstr "发送消息失败。\n"
 
-#: src/transport/plugin_transport_unix.c:1627
+#: src/transport/plugin_transport_unix.c:1625
 #, fuzzy
 msgid "Failed to open UNIX listen socket\n"
 msgstr "打开日志文件“%s”失败:%s\n"
@@ -6864,64 +7131,64 @@
 msgid "# WLAN messages defragmented"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:688
-#: src/transport/plugin_transport_wlan.c:758
-#: src/transport/plugin_transport_wlan.c:1903
+#: src/transport/plugin_transport_wlan.c:691
+#: src/transport/plugin_transport_wlan.c:763
+#: src/transport/plugin_transport_wlan.c:1910
 msgid "# WLAN sessions allocated"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:863
+#: src/transport/plugin_transport_wlan.c:868
 msgid "# WLAN message fragments sent"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:887
+#: src/transport/plugin_transport_wlan.c:892
 msgid "# WLAN messages pending (with fragmentation)"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:995
-#: src/transport/plugin_transport_wlan.c:1080
-#: src/transport/plugin_transport_wlan.c:1905
+#: src/transport/plugin_transport_wlan.c:1000
+#: src/transport/plugin_transport_wlan.c:1086
+#: src/transport/plugin_transport_wlan.c:1912
 msgid "# WLAN MAC endpoints allocated"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:1275
+#: src/transport/plugin_transport_wlan.c:1282
 msgid "# HELLO messages received via WLAN"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:1301
+#: src/transport/plugin_transport_wlan.c:1308
 msgid "# fragments received via WLAN"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:1311
+#: src/transport/plugin_transport_wlan.c:1318
 msgid "# ACKs received via WLAN"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:1368
+#: src/transport/plugin_transport_wlan.c:1375
 msgid "# WLAN DATA messages discarded due to CRC32 error"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:1489
+#: src/transport/plugin_transport_wlan.c:1496
 msgid "# DATA messages received via WLAN"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:1524
+#: src/transport/plugin_transport_wlan.c:1531
 msgid "# WLAN DATA messages processed"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:1587
+#: src/transport/plugin_transport_wlan.c:1594
 msgid "# HELLO beacons sent via WLAN"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:1700
+#: src/transport/plugin_transport_wlan.c:1707
 msgid "WLAN address with invalid size encountered\n"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:1884
+#: src/transport/plugin_transport_wlan.c:1891
 #, c-format
 msgid "Helper binary `%s' not SUID, cannot run WLAN transport\n"
 msgstr ""
 
-#: src/transport/transport_api.c:647
+#: src/transport/transport_api.c:682
 #, c-format
 msgid "Received unexpected message of type %u in %s:%u\n"
 msgstr ""
@@ -6987,17 +7254,17 @@
 msgid "Need a non-empty hostname for service `%s'.\n"
 msgstr ""
 
-#: src/util/client.c:991
+#: src/util/client.c:989
 #, fuzzy, c-format
 msgid "Could not connect to service `%s', configuration broken.\n"
 msgstr "无法连接到 %s:%u:%s\n"
 
-#: src/util/client.c:1003
+#: src/util/client.c:1001
 #, c-format
 msgid "Failure to transmit request to service `%s'\n"
 msgstr ""
 
-#: src/util/client.c:1274
+#: src/util/client.c:1284
 msgid "Could not submit request, not expecting to receive a response.\n"
 msgstr ""
 
@@ -7066,17 +7333,17 @@
 "choices\n"
 msgstr ""
 
-#: src/util/configuration.c:1065
+#: src/util/configuration.c:1066
 #, c-format
 msgid "Recursive expansion suspected, aborting $-expansion for term `%s'\n"
 msgstr ""
 
-#: src/util/configuration.c:1097
+#: src/util/configuration.c:1098
 #, fuzzy, c-format
 msgid "Missing closing `%s' in option `%s'\n"
 msgstr "配置文件“%s”已写入。\n"
 
-#: src/util/configuration.c:1170
+#: src/util/configuration.c:1172
 #, c-format
 msgid ""
 "Failed to expand `%s' in `%s' as it is neither found in [PATHS] nor defined "
@@ -7116,72 +7383,67 @@
 "%llu)\n"
 msgstr ""
 
-#: src/util/crypto_ecc.c:940 src/util/crypto_ecc.c:978
-#: src/util/crypto_ecc.c:1096 src/util/crypto_ecc.c:1134
+#: src/util/crypto_ecc.c:789 src/util/crypto_ecc.c:827
+#: src/util/crypto_ecc.c:945 src/util/crypto_ecc.c:983
 #, fuzzy, c-format
 msgid "Could not acquire lock on file `%s': %s...\n"
 msgstr "无法解析“%s”(%s):%s\n"
 
-#: src/util/crypto_ecc.c:945 src/util/crypto_ecc.c:1101
+#: src/util/crypto_ecc.c:794 src/util/crypto_ecc.c:950
 #, fuzzy
 msgid "Creating a new private key.  This may take a while.\n"
 msgstr "正在启动数据仓库转换(可能需要一段时间)。\n"
 
-#: src/util/crypto_ecc.c:982 src/util/crypto_ecc.c:1138
+#: src/util/crypto_ecc.c:831 src/util/crypto_ecc.c:987
 msgid "This may be ok if someone is currently generating a private key.\n"
 msgstr ""
 
-#: src/util/crypto_ecc.c:1012 src/util/crypto_ecc.c:1168
+#: src/util/crypto_ecc.c:861 src/util/crypto_ecc.c:1017
 #, 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:1016 src/util/crypto_ecc.c:1172
+#: src/util/crypto_ecc.c:865 src/util/crypto_ecc.c:1021
 msgid "This may be ok if someone is currently generating a key.\n"
 msgstr ""
 
-#: src/util/crypto_ecc.c:1254
+#: src/util/crypto_ecc.c:1103
 #, fuzzy
 msgid "Could not load peer's private key\n"
 msgstr "找不到接口“%s”的一个 IP 地址。\n"
 
-#: src/util/crypto_ecc.c:1343
+#: src/util/crypto_ecc.c:1207
 #, 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:1393
+#: src/util/crypto_ecc.c:1257
 #, 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
+#: src/util/crypto_ecc.c:1331
 #, fuzzy, c-format
 msgid "ECDSA signature verification failed at %s:%d: %s\n"
 msgstr "对驱动器“%2$s”的“%1$s”操作失败:%3$u\n"
 
-#: src/util/crypto_ecc.c:1534
+#: src/util/crypto_ecc.c:1388
 #, 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
+#: src/util/crypto_random.c:280
 #, c-format
-msgid "Starting `%s' process to generate entropy\n"
-msgstr ""
-
-#: 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:1185
+#: src/util/disk.c:1184
 #, c-format
 msgid "Expected `%s' to be a directory!\n"
 msgstr "“%s”应为目录!\n"
 
-#: src/util/disk.c:1543 src/util/service.c:1315
+#: src/util/disk.c:1546 src/util/service.c:1315
 #, c-format
 msgid "Cannot obtain information about user `%s': %s\n"
 msgstr "无法获取有关用户“%s”的信息:%s\n"
@@ -7293,54 +7555,81 @@
 msgid "Manipulate GNUnet configuration files"
 msgstr "更改配置文件中的一个值"
 
-#: src/util/gnunet-ecc.c:60
+#: src/util/gnunet-ecc.c:75
 #, fuzzy, c-format
 msgid "Failed to open `%s': %s\n"
 msgstr "打开日志文件“%s”失败:%s\n"
 
-#: src/util/gnunet-ecc.c:66
+#: src/util/gnunet-ecc.c:81
 #, c-format
 msgid "Generating %u keys, please wait"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:82
+#: src/util/gnunet-ecc.c:97
 #, fuzzy, c-format
 msgid ""
 "\n"
 "Failed to write to `%s': %s\n"
 msgstr "运行 %s失败:%s %d\n"
 
-#: src/util/gnunet-ecc.c:92
+#: src/util/gnunet-ecc.c:107
 #, c-format
 msgid ""
 "\n"
 "Finished!\n"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:95
+#: src/util/gnunet-ecc.c:110
 #, c-format
 msgid ""
 "\n"
 "Error, %u keys not generated\n"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:119
+#: src/util/gnunet-ecc.c:199
+#, c-format
+msgid "Hostkeys file `%s' not found\n"
+msgstr ""
+
+#: src/util/gnunet-ecc.c:210
+#, fuzzy, c-format
+msgid "Hostkeys file `%s' is empty\n"
+msgstr "找不到接口“%s”的一个 IP 地址。\n"
+
+#: src/util/gnunet-ecc.c:232
+#, fuzzy, c-format
+msgid "Could not read hostkey file: %s\n"
+msgstr "找不到接口“%s”的一个 IP 地址。\n"
+
+#: src/util/gnunet-ecc.c:286
 msgid "No hostkey file specified on command line\n"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:168
+#: src/util/gnunet-ecc.c:341
+msgid "list keys included in a file (for testing)"
+msgstr ""
+
+#: src/util/gnunet-ecc.c:344
+msgid "number of keys to list included in a file (for testing)"
+msgstr ""
+
+#: src/util/gnunet-ecc.c:347
 msgid "create COUNT public-private key pairs (for testing)"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:171
+#: src/util/gnunet-ecc.c:350
 msgid "print the public key in ASCII format"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:174
+#: src/util/gnunet-ecc.c:353
 msgid "print the hash of the public key in ASCII format"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:185
+#: src/util/gnunet-ecc.c:356
+msgid "print examples of ECC operations (used for compatibility testing)"
+msgstr ""
+
+#: src/util/gnunet-ecc.c:367
 #, fuzzy
 msgid "Manipulate GNUnet private ECC key files"
 msgstr "更改配置文件中的一个值"
@@ -7364,27 +7653,27 @@
 msgid "Could not find IP of host `%s': %s\n"
 msgstr "找不到主机“%s”的 IP:%s\n"
 
-#: src/util/gnunet-uri.c:90
+#: src/util/gnunet-uri.c:84
 #, c-format
 msgid "No URI specified on command line\n"
 msgstr ""
 
-#: src/util/gnunet-uri.c:95
+#: src/util/gnunet-uri.c:89
 #, fuzzy, c-format
 msgid "Invalid URI: does not start with `%s'\n"
 msgstr "无效的网络表示法(没有以“;”结尾:“%s”)\n"
 
-#: src/util/gnunet-uri.c:102
+#: src/util/gnunet-uri.c:96
 #, c-format
 msgid "Invalid URI: fails to specify subsystem\n"
 msgstr ""
 
-#: src/util/gnunet-uri.c:112
+#: src/util/gnunet-uri.c:106
 #, c-format
 msgid "No handler known for subsystem `%s'\n"
 msgstr ""
 
-#: src/util/gnunet-uri.c:174
+#: src/util/gnunet-uri.c:168
 msgid "Perform default-actions for GNUnet URIs"
 msgstr ""
 
@@ -7421,17 +7710,17 @@
 "variable.\n"
 msgstr "无法确定安装路径。请尝试设置“%s”\n"
 
-#: src/util/os_installation.c:710
+#: src/util/os_installation.c:713
 #, fuzzy, c-format
 msgid "Could not find binary `%s' in PATH!\n"
 msgstr "找不到主机“%s”的 IP:%s\n"
 
-#: src/util/os_installation.c:770
+#: src/util/os_installation.c:773
 #, fuzzy, c-format
 msgid "CreateProcess failed for binary %s (%d).\n"
 msgstr "对驱动器“%2$s”的“%1$s”操作失败:%3$u\n"
 
-#: src/util/os_installation.c:780
+#: src/util/os_installation.c:783
 #, c-format
 msgid "GetExitCodeProcess failed for binary %s (%d).\n"
 msgstr ""
@@ -7441,26 +7730,36 @@
 msgid "Initialization of plugin mechanism failed: %s!\n"
 msgstr "插件机构初始化失败:%s!\n"
 
-#: src/util/plugin.c:144
+#: src/util/plugin.c:148
 #, c-format
 msgid "`%s' failed to resolve method '%s' with error: %s\n"
 msgstr ""
 
-#: src/util/plugin.c:217
+#: src/util/plugin.c:223
 #, c-format
 msgid "`%s' failed for library `%s' with error: %s\n"
 msgstr ""
 
-#: src/util/plugin.c:347
+#: src/util/plugin.c:382
 #, fuzzy
 msgid "Could not determine plugin installation path.\n"
 msgstr "无法确定用户界面定义文件。"
 
-#: src/util/program.c:262 src/util/service.c:1452
+#: src/util/program.c:260 src/util/service.c:1449
 #, fuzzy, c-format
+msgid "Malformed configuration file `%s', exit ...\n"
+msgstr "解析配置文件“%s”失败\n"
+
+#: src/util/program.c:270 src/util/service.c:1464
+#, fuzzy, c-format
 msgid "Could not access configuration file `%s'\n"
 msgstr "找不到接口“%s”的一个 IP 地址。\n"
 
+#: src/util/program.c:275 src/util/service.c:1459
+#, fuzzy
+msgid "Malformed configuration, exit ...\n"
+msgstr "解析配置文件“%s”失败\n"
+
 #: src/util/resolver_api.c:198
 #, c-format
 msgid "Must specify `%s' for `%s' in configuration!\n"
@@ -7487,11 +7786,11 @@
 msgid "Could not resolve our FQDN : %s\n"
 msgstr "无法解析“%s”(%s):%s\n"
 
-#: src/util/scheduler.c:804
+#: src/util/scheduler.c:813
 msgid "Looks like we're busy waiting...\n"
 msgstr ""
 
-#: src/util/scheduler.c:938
+#: src/util/scheduler.c:948
 #, c-format
 msgid "Attempt to cancel dead task %llu!\n"
 msgstr ""
@@ -7605,7 +7904,7 @@
 msgid "do daemonize (detach from terminal)"
 msgstr ""
 
-#: src/util/signal.c:79
+#: src/util/signal.c:89
 #, c-format
 msgid "signal (%d, %p) returned %d.\n"
 msgstr ""
@@ -7614,120 +7913,120 @@
 msgid "b"
 msgstr "b"
 
-#: src/util/strings.c:444
+#: src/util/strings.c:450
 #, c-format
 msgid "Character sets requested were `%s'->`%s'\n"
 msgstr ""
 
-#: src/util/strings.c:572
+#: src/util/strings.c:578
 msgid "Failed to expand `$HOME': environment variable `HOME' not set"
 msgstr "扩展“$HOME”失败:没有设置环境变量“HOME”"
 
-#: src/util/strings.c:669
+#: src/util/strings.c:675
 msgid "µs"
 msgstr ""
 
-#: src/util/strings.c:673
+#: src/util/strings.c:679
 msgid "forever"
 msgstr ""
 
-#: src/util/strings.c:675
+#: src/util/strings.c:681
 msgid "0 ms"
 msgstr ""
 
-#: src/util/strings.c:681
+#: src/util/strings.c:687
 msgid "ms"
 msgstr "毫秒"
 
-#: src/util/strings.c:687
+#: src/util/strings.c:693
 msgid "s"
 msgstr "秒"
 
-#: src/util/strings.c:693
+#: src/util/strings.c:699
 msgid "m"
 msgstr "分"
 
-#: src/util/strings.c:699
+#: src/util/strings.c:705
 msgid "h"
 msgstr "时"
 
-#: src/util/strings.c:706
+#: src/util/strings.c:712
 #, fuzzy
 msgid "day"
 msgstr " 天"
 
-#: src/util/strings.c:708
+#: src/util/strings.c:714
 #, fuzzy
 msgid "days"
 msgstr " 天"
 
-#: src/util/strings.c:737
+#: src/util/strings.c:743
 msgid "end of time"
 msgstr ""
 
-#: src/util/strings.c:1141
+#: src/util/strings.c:1149
 msgid "IPv6 address did not start with `['\n"
 msgstr ""
 
-#: src/util/strings.c:1149
+#: src/util/strings.c:1157
 msgid "IPv6 address did contain ':' to separate port number\n"
 msgstr ""
 
-#: src/util/strings.c:1155
+#: src/util/strings.c:1163
 msgid "IPv6 address did contain ']' before ':' to separate port number\n"
 msgstr ""
 
-#: src/util/strings.c:1162
+#: src/util/strings.c:1170
 msgid "IPv6 address did contain a valid port number after the last ':'\n"
 msgstr ""
 
-#: src/util/strings.c:1171
+#: src/util/strings.c:1179
 #, fuzzy, c-format
 msgid "Invalid IPv6 address `%s': %s\n"
 msgstr "无效的进程优先级“%s”\n"
 
-#: src/util/strings.c:1377 src/util/strings.c:1393
+#: src/util/strings.c:1385 src/util/strings.c:1401
 msgid "Port not in range\n"
 msgstr ""
 
-#: src/util/strings.c:1402
+#: src/util/strings.c:1410
 #, 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
+#: src/util/strings.c:1493 src/util/strings.c:1524 src/util/strings.c:1572
+#: src/util/strings.c:1593
 #, c-format
 msgid "Invalid format for IP: `%s'\n"
 msgstr "IP 格式无效:“%s”\n"
 
-#: src/util/strings.c:1543
+#: src/util/strings.c:1550
 #, c-format
 msgid "Invalid network notation ('/%d' is not legal in IPv4 CIDR)."
 msgstr "网络表示法无效(“/%d” 在 IPv4 CIDR 中是非法的)。"
 
-#: src/util/strings.c:1595
+#: src/util/strings.c:1602
 #, fuzzy, c-format
 msgid "Invalid format: `%s'\n"
 msgstr "IP 格式无效:“%s”\n"
 
-#: src/util/strings.c:1647
+#: src/util/strings.c:1654
 #, c-format
 msgid "Invalid network notation (does not end with ';': `%s')\n"
 msgstr "无效的网络表示法(没有以“;”结尾:“%s”)\n"
 
-#: src/util/strings.c:1697
+#: src/util/strings.c:1704
 #, c-format
 msgid "Wrong format `%s' for netmask\n"
 msgstr "网络掩码的格式“%s”错误\n"
 
-#: src/util/strings.c:1728
+#: src/util/strings.c:1735
 #, 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"
+#: src/vpn/gnunet-service-vpn.c:550 src/vpn/gnunet-service-vpn.c:1086
+msgid "# Active channels"
 msgstr ""
 
 #: src/vpn/gnunet-service-vpn.c:642
@@ -7738,97 +8037,100 @@
 msgid "# Bytes dropped in mesh queue (overflow)"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:754
-msgid "# Mesh tunnels created"
+#: src/vpn/gnunet-service-vpn.c:753
+#, fuzzy
+msgid "# Mesh channels created"
 msgstr ""
+"\n"
+"按任意键继续\n"
 
-#: src/vpn/gnunet-service-vpn.c:786
+#: src/vpn/gnunet-service-vpn.c:784
 #, fuzzy
-msgid "Failed to setup mesh tunnel!\n"
+msgid "Failed to setup mesh channel!\n"
 msgstr "发送消息失败。\n"
 
-#: src/vpn/gnunet-service-vpn.c:980
+#: src/vpn/gnunet-service-vpn.c:978
 #, c-format
 msgid "Protocol %u not supported, dropping\n"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:1307
+#: src/vpn/gnunet-service-vpn.c:1305
 msgid "# ICMPv4 packets dropped (not allowed)"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:1328
+#: src/vpn/gnunet-service-vpn.c:1326
 msgid "# ICMPv6 packets dropped (not allowed)"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:1533
+#: src/vpn/gnunet-service-vpn.c:1531
 msgid "# Packets received from TUN interface"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:1566 src/vpn/gnunet-service-vpn.c:1602
+#: src/vpn/gnunet-service-vpn.c:1564 src/vpn/gnunet-service-vpn.c:1600
 #, c-format
 msgid "Packet received for unmapped destination `%s' (dropping it)\n"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:1612
+#: src/vpn/gnunet-service-vpn.c:1610
 msgid "Received IPv4 packet with options (dropping it)\n"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:1626
+#: src/vpn/gnunet-service-vpn.c:1624
 #, c-format
 msgid "Received packet of unknown protocol %d from TUN (dropping it)\n"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:1708
+#: src/vpn/gnunet-service-vpn.c:1706
 msgid "# ICMP packets received from mesh"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:2047
+#: src/vpn/gnunet-service-vpn.c:2045
 msgid "# UDP packets received from mesh"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:2202
+#: src/vpn/gnunet-service-vpn.c:2200
 msgid "# TCP packets received from mesh"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:2353
+#: src/vpn/gnunet-service-vpn.c:2351
 msgid "Failed to find unallocated IPv4 address in VPN's range\n"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:2408
+#: src/vpn/gnunet-service-vpn.c:2406
 msgid "Failed to find unallocated IPv6 address in VPN's range\n"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:2449 src/vpn/gnunet-service-vpn.c:2665
+#: src/vpn/gnunet-service-vpn.c:2447 src/vpn/gnunet-service-vpn.c:2663
 msgid "# Active destinations"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:2717
+#: src/vpn/gnunet-service-vpn.c:2715
 msgid "Failed to allocate IP address for new destination\n"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:2984
+#: src/vpn/gnunet-service-vpn.c:2982
 #, fuzzy
 msgid "Must specify valid IPv6 address"
 msgstr "“%s”不可用。\n"
 
-#: src/vpn/gnunet-service-vpn.c:3008
+#: src/vpn/gnunet-service-vpn.c:3006
 msgid "Must specify valid IPv6 mask"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:3016
+#: src/vpn/gnunet-service-vpn.c:3014
 msgid "IPv6 support disabled as this system does not support IPv6\n"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:3029
+#: src/vpn/gnunet-service-vpn.c:3027
 #, fuzzy
 msgid "Must specify valid IPv4 address"
 msgstr "“%s”不可用。\n"
 
-#: src/vpn/gnunet-service-vpn.c:3042
+#: src/vpn/gnunet-service-vpn.c:3040
 msgid "Must specify valid IPv4 mask"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:3052
+#: src/vpn/gnunet-service-vpn.c:3050
 msgid "IPv4 support disabled as this system does not support IPv4\n"
 msgstr ""
 
@@ -7915,6 +8217,28 @@
 msgstr ""
 
 #, fuzzy
+#~ msgid "Internal error %d\n"
+#~ msgstr "未知错误。\n"
+
+#, fuzzy
+#~ msgid "Aborting call to `%s'\n"
+#~ msgstr "创建用户出错"
+
+#, fuzzy
+#~ msgid "You are already in a conversation with `%s'.\n"
+#~ msgstr "找不到接口“%s”的一个 IP 地址。\n"
+
+#, fuzzy
+#~ msgid "Print information about mesh tunnels and peers."
+#~ msgstr "无法获取有关用户“%s”的信息:%s\n"
+
+#, fuzzy
+#~ msgid ""
+#~ "%s service is lacking key configuration settings (%s). Using default "
+#~ "(%u).\n"
+#~ msgstr "立即保存配置?"
+
+#, fuzzy
 #~ msgid "Loading block plugin `%s'\n"
 #~ msgstr "打开日志文件“%s”失败:%s\n"
 
@@ -7945,12 +8269,6 @@
 #~ 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"
 
@@ -8092,10 +8410,6 @@
 #~ msgstr "发送消息失败。\n"
 
 #, fuzzy
-#~ msgid "Failed to connect to datastore service"
-#~ msgstr "初始化“%s”服务失败。\n"
-
-#, fuzzy
 #~ msgid "Failed to parse URI `%s' from KBlock!\n"
 #~ msgstr "运行 %s失败:%s %d\n"
 
@@ -8291,10 +8605,6 @@
 #~ msgstr "配置不满足配置规范文件“%s”的约束!\n"
 
 #, fuzzy
-#~ msgid "Could not read hostkeys file `%s'!\n"
-#~ msgstr "找不到接口“%s”的一个 IP 地址。\n"
-
-#, fuzzy
 #~ msgid "Could not create configuration for peer number %u on `%s'!\n"
 #~ msgstr "解析配置文件“%s”失败\n"
 
@@ -8954,9 +9264,6 @@
 #~ msgid "Error establishing connection with gnunetd.\n"
 #~ msgstr "通过 gnunetd 建立连接失败。\n"
 
-#~ msgid "You must specify a receiver!\n"
-#~ msgstr "您必须指定一个接收方!\n"
-
 #~ msgid "Time:\n"
 #~ msgstr "时间:\n"
 

Modified: gnunet/src/arm/Makefile.am
===================================================================
--- gnunet/src/arm/Makefile.am  2013-12-12 21:38:43 UTC (rev 31342)
+++ gnunet/src/arm/Makefile.am  2013-12-12 21:43:39 UTC (rev 31343)
@@ -105,5 +105,4 @@
 
 EXTRA_DIST = \
   test_arm_api_data.conf \
-  test_gnunet_arm.py.in \
-  do_start_process.c
+  test_gnunet_arm.py.in 

Modified: gnunet/src/gns/Makefile.am
===================================================================
--- gnunet/src/gns/Makefile.am  2013-12-12 21:38:43 UTC (rev 31342)
+++ gnunet/src/gns/Makefile.am  2013-12-12 21:43:39 UTC (rev 31343)
@@ -10,9 +10,10 @@
 
 EXTRA_DIST = \
   test_gns_defaults.conf \
+  test_gns_lookup.conf \
+  test_gns_nick_shorten.conf \
+  test_gns_proxy.conf \
   test_gns_simple_lookup.conf \
-  test_gns_nick_shorten.conf \
-  test_gns_dht_default.conf \
   gns-helper-service-w32.conf \
   gnunet-gns-proxy-setup-ca \
   zonefiles/J7POEUT41A8PBFS7KVVDRF88GBOU4HK8PSU5QKVLVE3R9T91E99G.zkey \

Modified: gnunet/src/namecache/Makefile.am
===================================================================
--- gnunet/src/namecache/Makefile.am    2013-12-12 21:38:43 UTC (rev 31342)
+++ gnunet/src/namecache/Makefile.am    2013-12-12 21:43:39 UTC (rev 31343)
@@ -159,6 +159,5 @@
 EXTRA_DIST = \
   test_namecache_api.conf \
   test_plugin_namecache_sqlite.conf \
-  test_plugin_namecache_postgres.conf \
-  test_namecache_defaults.conf
+  test_plugin_namecache_postgres.conf 
 

Modified: gnunet/src/namestore/Makefile.am
===================================================================
--- gnunet/src/namestore/Makefile.am    2013-12-12 21:38:43 UTC (rev 31342)
+++ gnunet/src/namestore/Makefile.am    2013-12-12 21:43:39 UTC (rev 31343)
@@ -330,7 +330,6 @@
   test_namestore_api.conf \
   test_plugin_namestore_sqlite.conf \
   test_plugin_namestore_postgres.conf \
-  test_namestore_defaults.conf \
   test_hostkey \
   zonefiles/S5I9DSGQVAB5FVV16T3B3CC5H1B2JGL3Q412JBKURME8EKU0600G.zkey \
   zonefiles/AQ835GVL939H4O8QJQ7GBLPTQC0QAAO91BN7QK01BA63MDSK6I4G.zkey \




reply via email to

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