-fix build system issues

15 files changed, 2725 insertions, 2546 deletions

diff --git a/doc/Makefile.am b/doc/Makefile.am
index 6f92cc1ad..de22fa58e 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -1,3 +1,3 @@
-SUBDIRS = man
+SUBDIRS = man doxygen
 
 docdir = $(datadir)/doc/gnunet/
diff --git a/po/de.po b/po/de.po
index 371d12feb..e545eba4f 100644
--- a/po/de.po
+++ b/po/de.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: GNUnet 0.7.0b\n"
 "Report-Msgid-Bugs-To: gnunet-developers@mail.gnu.org\n"
-"POT-Creation-Date: 2013-12-12 22:41+0100\n"
+"POT-Creation-Date: 2013-12-23 19:38+0100\n"
 "PO-Revision-Date: 2006-03-17 21:37+0100\n"
 "Last-Translator: Nils Durner <durner@gnunet.org>\n"
 "Language-Team: German <de@li.org>\n"
@@ -358,49 +358,49 @@ msgstr "ungültige `%s' Nachricht empfangen\n"
 msgid "Received last message for %s \n"
 msgstr "GAP hat ungültige Inhalte von `%s' empfangen.\n"
 
-#: src/ats/gnunet-service-ats_addresses.c:1946
-#: src/ats/gnunet-service-ats_addresses.c:1990
+#: src/ats/gnunet-service-ats_addresses.c:1943
+#: src/ats/gnunet-service-ats_addresses.c:1987
 #, c-format
 msgid ""
 "Could not load quota for network `%s':  `%s', assigning default bandwidth "
 "%llu\n"
 msgstr ""
 
-#: src/ats/gnunet-service-ats_addresses.c:1953
+#: src/ats/gnunet-service-ats_addresses.c:1950
 #, c-format
 msgid "Outbound quota configure for network `%s' is %llu\n"
 msgstr ""
 
-#: src/ats/gnunet-service-ats_addresses.c:1961
+#: src/ats/gnunet-service-ats_addresses.c:1958
 #, c-format
 msgid ""
 "No outbound quota configured for network `%s', assigning default bandwidth "
 "%llu\n"
 msgstr ""
 
-#: src/ats/gnunet-service-ats_addresses.c:1997
+#: src/ats/gnunet-service-ats_addresses.c:1994
 #, c-format
 msgid "Inbound quota configured for network `%s' is %llu\n"
 msgstr ""
 
-#: src/ats/gnunet-service-ats_addresses.c:2005
+#: src/ats/gnunet-service-ats_addresses.c:2002
 #, c-format
 msgid ""
 "No outbound quota configure for network `%s', assigning default bandwidth "
 "%llu\n"
 msgstr ""
 
-#: src/ats/gnunet-service-ats_addresses.c:2175
+#: src/ats/gnunet-service-ats_addresses.c:2172
 #, c-format
 msgid "Initializing solver `%s '`%s'\n"
 msgstr ""
 
-#: src/ats/gnunet-service-ats_addresses.c:2178
+#: src/ats/gnunet-service-ats_addresses.c:2175
 #, 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:2201
+#: src/ats/gnunet-service-ats_addresses.c:2198
 #, fuzzy
 msgid "Failed to initialize solver!\n"
 msgstr "SQLite Datenbank konnte nicht initialisiert werden: %s.\n"
@@ -450,7 +450,7 @@ msgstr ""
 msgid "Using default quota configuration for network `%s' (in/out) %llu/%llu\n"
 msgstr ""
 
-#: src/ats/plugin_ats_proportional.c:1514
+#: src/ats/plugin_ats_proportional.c:1511
 #, fuzzy, c-format
 msgid "Invalid network type `%u' `%s': Disconnect!\n"
 msgstr "IP des Hosts `%s' konnte nicht ermittelt werden: %s\n"
@@ -465,102 +465,102 @@ msgstr ""
 msgid "ATS returned results for %u addresses\n"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:204
+#: src/ats-tool/gnunet-ats.c:205
 #, fuzzy, c-format
 msgid ""
 "Peer `%s' plugin `%s', address `%s', `%s' bw out: %u Bytes/s, bw in %u Bytes/"
 "s, %s\n"
 msgstr "Knoten `%s' mit Vertrauen %8u und Adresse `%s'\n"
 
-#: src/ats-tool/gnunet-ats.c:328
+#: src/ats-tool/gnunet-ats.c:333
 #, c-format
 msgid "Quota for network `%11s' (in/out): %10s / %10s\n"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:347 src/namestore/gnunet-namestore.c:547
+#: src/ats-tool/gnunet-ats.c:352 src/namestore/gnunet-namestore.c:550
 #: 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:838
+#: src/ats-tool/gnunet-ats.c:364 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"
 
-#: src/ats-tool/gnunet-ats.c:367
+#: src/ats-tool/gnunet-ats.c:372
 #, c-format
 msgid "Please select one operation : %s or %s or %s or %s or %s\n"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:383 src/ats-tool/gnunet-ats.c:402
-#: src/ats-tool/gnunet-ats.c:419 src/ats-tool/gnunet-ats.c:457
+#: src/ats-tool/gnunet-ats.c:388 src/ats-tool/gnunet-ats.c:407
+#: src/ats-tool/gnunet-ats.c:424 src/ats-tool/gnunet-ats.c:462
 #, fuzzy, c-format
 msgid "Cannot connect to ATS service, exiting...\n"
 msgstr "`%s' Dienst konnte nicht initialisiert werden.\n"
 
-#: src/ats-tool/gnunet-ats.c:392 src/ats-tool/gnunet-ats.c:409
+#: src/ats-tool/gnunet-ats.c:397 src/ats-tool/gnunet-ats.c:414
 #, fuzzy, c-format
 msgid "Cannot issue request to ATS service, exiting...\n"
 msgstr "`%s' Dienst konnte nicht initialisiert werden.\n"
 
-#: src/ats-tool/gnunet-ats.c:427
+#: src/ats-tool/gnunet-ats.c:432
 #, fuzzy, c-format
 msgid "No preference type given!\n"
 msgstr "Informationen über andere GNUnet Knoten ausgeben."
 
-#: src/ats-tool/gnunet-ats.c:432
+#: src/ats-tool/gnunet-ats.c:437
 #, c-format
 msgid "No peer given!\n"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:450
+#: src/ats-tool/gnunet-ats.c:455
 msgid "Valid type required\n"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:508
+#: src/ats-tool/gnunet-ats.c:513
 msgid "get list of active addresses currently used"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:511
+#: src/ats-tool/gnunet-ats.c:516
 msgid "get list of all active addresses"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:514
+#: src/ats-tool/gnunet-ats.c:519
 #, fuzzy
 msgid "do not resolve IP addresses to hostnames"
 msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
 
-#: src/ats-tool/gnunet-ats.c:517
+#: src/ats-tool/gnunet-ats.c:522
 msgid "monitor mode"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:520
+#: src/ats-tool/gnunet-ats.c:525
 #, fuzzy
 msgid "set preference for the given peer"
 msgstr "Informationen über andere GNUnet Knoten ausgeben."
 
-#: src/ats-tool/gnunet-ats.c:523
+#: src/ats-tool/gnunet-ats.c:528
 msgid "print all configured quotas"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:526
+#: src/ats-tool/gnunet-ats.c:531
 msgid "peer id"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:529
+#: src/ats-tool/gnunet-ats.c:534
 msgid "preference type to set: latency | bandwidth"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:532
+#: src/ats-tool/gnunet-ats.c:537
 msgid "preference value"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:535
+#: src/ats-tool/gnunet-ats.c:540
 msgid "verbose output (include ATS address properties)"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:544
+#: src/ats-tool/gnunet-ats.c:549
 #, fuzzy
 msgid "Print information about ATS state"
 msgstr "Informationen über andere GNUnet Knoten ausgeben."
@@ -591,7 +591,7 @@ msgid "be more verbose (print received values)"
 msgstr ""
 
 #: src/conversation/conversation_api.c:557
-#: src/conversation/conversation_api_call.c:468
+#: src/conversation/conversation_api_call.c:470
 msgid "Connection to conversation service lost, trying to reconnect\n"
 msgstr ""
 
@@ -625,216 +625,225 @@ msgstr ""
 msgid "Failed to setup phone (internal error)\n"
 msgstr "Statistiken über den Netzwerkverkehr konnten nicht ermittelt werden.\n"
 
-#: src/conversation/gnunet-conversation.c:357
+#: src/conversation/gnunet-conversation.c:356
 #, c-format
-msgid "Phone active on line %u\n"
+msgid ""
+"Phone active on line %u.  Type `/help' for a list of available commands\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:379
+#: src/conversation/gnunet-conversation.c:378
 #, c-format
 msgid "Resolved address of `%s'. Now ringing other party.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:386
+#: src/conversation/gnunet-conversation.c:385
 #, fuzzy, c-format
 msgid "Connection established to `%s'\n"
 msgstr "`%s' schlug fehl bei %s:%d mit dem Fehler: `%s'.\n"
 
-#: src/conversation/gnunet-conversation.c:393
+#: src/conversation/gnunet-conversation.c:392
 #, fuzzy, c-format
 msgid "Failed to resolve `%s'\n"
 msgstr "Datei wurde als `%s' gespeichert.\n"
 
-#: src/conversation/gnunet-conversation.c:400
+#: src/conversation/gnunet-conversation.c:399
 msgid "Call terminated\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:406
+#: src/conversation/gnunet-conversation.c:405
 #, c-format
 msgid "Connection to `%s' suspended (by other user)\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:412
+#: src/conversation/gnunet-conversation.c:411
 #, c-format
 msgid "Connection to `%s' resumed (by other user)\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:479
+#: src/conversation/gnunet-conversation.c:416
+msgid "Error with the call, restarting it\n"
+msgstr ""
+
+#: src/conversation/gnunet-conversation.c:483
 #, fuzzy, c-format
 msgid "Unknown command `%s'\n"
 msgstr "Unbekannte Operation `%s'\n"
 
-#: src/conversation/gnunet-conversation.c:495
-#: src/conversation/gnunet-conversation.c:509
+#: src/conversation/gnunet-conversation.c:499
+#: src/conversation/gnunet-conversation.c:513
 #, fuzzy, c-format
 msgid "Ego `%s' not available\n"
 msgstr "gconfig ist nicht verfügbar\n"
 
-#: src/conversation/gnunet-conversation.c:502
-#: src/conversation/gnunet-conversation.c:552
+#: src/conversation/gnunet-conversation.c:506
+#: src/conversation/gnunet-conversation.c:563
 msgid "You are calling someone else already, hang up first!\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:517
-#: src/conversation/gnunet-conversation.c:565
+#: src/conversation/gnunet-conversation.c:521
+#: src/conversation/gnunet-conversation.c:576
 #, c-format
 msgid "You are answering call from `%s', hang up or suspend that call first!\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:576
+#: src/conversation/gnunet-conversation.c:532
+msgid "Call recipient missing.\n"
+msgstr ""
+
+#: src/conversation/gnunet-conversation.c:587
 msgid "There is no incoming call to accept here!\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:593
+#: src/conversation/gnunet-conversation.c:604
 #, c-format
 msgid "There is no incoming call `%s' to accept right now!\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:621
+#: src/conversation/gnunet-conversation.c:632
 msgid "We currently do not have an address.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:644
+#: src/conversation/gnunet-conversation.c:655
 #, c-format
 msgid "We are currently trying to locate the private key for the ego `%s'.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:649
+#: src/conversation/gnunet-conversation.c:660
 #, c-format
 msgid "We are listening for incoming calls for ego `%s' on line %u.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:655
-#: src/conversation/gnunet-conversation.c:679
+#: src/conversation/gnunet-conversation.c:666
+#: src/conversation/gnunet-conversation.c:690
 #, c-format
 msgid "You are having a conversation with `%s'.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:660
+#: src/conversation/gnunet-conversation.c:671
 msgid ""
 "We had an internal error setting up our phone line. You can still make "
 "calls.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:669
+#: src/conversation/gnunet-conversation.c:680
 #, 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:674
+#: src/conversation/gnunet-conversation.c:685
 #, c-format
 msgid "We are calling `%s', his phone should be ringing.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:693
+#: src/conversation/gnunet-conversation.c:704
 msgid "Calls waiting:\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:699
+#: src/conversation/gnunet-conversation.c:710
 #, 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
+#: src/conversation/gnunet-conversation.c:738
+#: src/conversation/gnunet-conversation.c:753
 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
+#: src/conversation/gnunet-conversation.c:786
+#: src/conversation/gnunet-conversation.c:802
 msgid "There is no call that could be resumed right now.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:798
+#: src/conversation/gnunet-conversation.c:809
 #, c-format
 msgid "Already talking with `%s', cannot resume a call right now.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:807
+#: src/conversation/gnunet-conversation.c:818
 msgid "There is no incoming call to resume here!\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:824
+#: src/conversation/gnunet-conversation.c:835
 #, c-format
 msgid "There is no incoming call `%s' to resume right now!\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:859
+#: src/conversation/gnunet-conversation.c:870
 msgid "There is no call that could be cancelled right now.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:867
+#: src/conversation/gnunet-conversation.c:878
 msgid "There is no incoming call to refuse here!\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:884
+#: src/conversation/gnunet-conversation.c:895
 #, c-format
 msgid "There is no incoming call `%s' to refuse right now!\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:911
+#: src/conversation/gnunet-conversation.c:922
 msgid "Use `/address' to find out which address this phone should have in GNS"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:913
+#: src/conversation/gnunet-conversation.c:924
 msgid "Use `/call USER.gnu' to call USER"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:915
+#: src/conversation/gnunet-conversation.c:926
 msgid "Use `/accept #NUM' to accept incoming call #NUM"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:917
+#: src/conversation/gnunet-conversation.c:928
 msgid "Use `/suspend' to suspend the active call"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:919
+#: src/conversation/gnunet-conversation.c:930
 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
+#: src/conversation/gnunet-conversation.c:932
 msgid "Use `/cancel' to reject or terminate a call"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:923
+#: src/conversation/gnunet-conversation.c:934
 msgid "Use `/status' to print status information"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:925
+#: src/conversation/gnunet-conversation.c:936
 #, fuzzy
 msgid "Use `/quit' to terminate gnunet-conversation"
 msgstr "Erlaubt es Clients die Konfiguration von gnunetd abzufragen"
 
-#: src/conversation/gnunet-conversation.c:927
+#: src/conversation/gnunet-conversation.c:938
 msgid "Use `/help command' to get help for a specific command"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:1082
+#: src/conversation/gnunet-conversation.c:1093
 #, 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:1095
+#: src/conversation/gnunet-conversation.c:1106
 #, fuzzy, c-format
 msgid "Our ego `%s' was deleted!\n"
 msgstr "Pseudonym `%s' wurde gelöscht.\n"
 
-#: src/conversation/gnunet-conversation.c:1130
+#: src/conversation/gnunet-conversation.c:1141
 #, 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:1156
+#: src/conversation/gnunet-conversation.c:1167
 msgid "sets the NAME of the ego to use for the phone (and name resolution)"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:1159
+#: src/conversation/gnunet-conversation.c:1170
 msgid "sets the LINE to use for the phone"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:1174
+#: src/conversation/gnunet-conversation.c:1185
 msgid "Enables having a conversation with other GNUnet users."
 msgstr ""
 
@@ -861,7 +870,6 @@ msgid ""
 msgstr ""
 
 #: src/conversation/gnunet-conversation-test.c:248
-#: src/integration-tests/connection_watchdog.c:1114
 #: src/multicast/gnunet-multicast.c:70 src/revocation/gnunet-revocation.c:517
 #: src/template/gnunet-template.c:70
 #, fuzzy
@@ -980,17 +988,17 @@ msgstr ""
 "\n"
 "Fehler beim Uploaden der Datei: %s\n"
 
-#: src/conversation/gnunet-service-conversation.c:825
+#: src/conversation/gnunet-service-conversation.c:841
 msgid "Mesh audio channel not ready; audio data dropped\n"
 msgstr ""
 
-#: src/conversation/gnunet-service-conversation.c:915
+#: src/conversation/gnunet-service-conversation.c:932
 #, c-format
 msgid ""
 "No available phone for incoming call on line %u, sending HANG_UP signal\n"
 msgstr ""
 
-#: src/conversation/gnunet-service-conversation.c:1302
+#: src/conversation/gnunet-service-conversation.c:1338
 #, fuzzy, c-format
 msgid "Received incoming channel on port %u\n"
 msgstr "`%s' hat sich mit `%s' verbunden.\n"
@@ -1075,150 +1083,150 @@ msgstr "# defragmentierter Nachrichten"
 msgid "# bytes of messages of type %u received"
 msgstr "# Bytes Rauschen empfangen"
 
-#: src/core/gnunet-service-core_kx.c:531
+#: src/core/gnunet-service-core_kx.c:535
 msgid "# bytes encrypted"
 msgstr "# Bytes verschlüsselt"
 
-#: src/core/gnunet-service-core_kx.c:582
+#: src/core/gnunet-service-core_kx.c:586
 msgid "# bytes decrypted"
 msgstr "# Bytes entschlüsselt"
 
-#: src/core/gnunet-service-core_kx.c:668
+#: src/core/gnunet-service-core_kx.c:672
 msgid "# key exchanges initiated"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:708
+#: src/core/gnunet-service-core_kx.c:712
 msgid "# key exchanges stopped"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:771
+#: src/core/gnunet-service-core_kx.c:809
 msgid "# old ephemeral keys ignored"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:777
+#: src/core/gnunet-service-core_kx.c:815
 #, fuzzy
 msgid "# ephemeral keys received"
 msgstr "# verschlüsselter PING Nachrichten empfangen"
 
-#: src/core/gnunet-service-core_kx.c:811
+#: src/core/gnunet-service-core_kx.c:849
 #, 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:827
+#: src/core/gnunet-service-core_kx.c:860
 #, fuzzy
-msgid "# EPHEMERAL_KEY messages decrypted"
+msgid "# EPHEMERAL_KEY messages received"
 msgstr "# defragmentierter Nachrichten"
 
-#: src/core/gnunet-service-core_kx.c:930
+#: src/core/gnunet-service-core_kx.c:950
 #: src/transport/gnunet-service-transport_validation.c:974
 #, fuzzy
 msgid "# PING messages received"
 msgstr "# PING Nachrichten erstellt"
 
-#: src/core/gnunet-service-core_kx.c:938
+#: src/core/gnunet-service-core_kx.c:958
 #, fuzzy
 msgid "# PING messages dropped (out of order)"
 msgstr "# gap Anfragen verworfen: Kollision in RT"
 
-#: src/core/gnunet-service-core_kx.c:965
+#: src/core/gnunet-service-core_kx.c:985
 #, 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:982
+#: src/core/gnunet-service-core_kx.c:1002
 #, fuzzy
 msgid "# PONG messages created"
 msgstr "# PING Nachrichten erstellt"
 
-#: src/core/gnunet-service-core_kx.c:1008
+#: src/core/gnunet-service-core_kx.c:1028
 #, fuzzy
 msgid "# sessions terminated by timeout"
 msgstr "# Bytes verworfen von TCP (ausgehend)"
 
-#: src/core/gnunet-service-core_kx.c:1018
+#: src/core/gnunet-service-core_kx.c:1038
 #, fuzzy
 msgid "# keepalive messages sent"
 msgstr "# Klartext PING Nachrichten gesendet"
 
-#: src/core/gnunet-service-core_kx.c:1075
+#: src/core/gnunet-service-core_kx.c:1095
 #: 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:1081
+#: src/core/gnunet-service-core_kx.c:1101
 #, fuzzy
 msgid "# PONG messages dropped (connection down)"
 msgstr "# verschlüsselter PONG Nachrichten empfangen"
 
-#: src/core/gnunet-service-core_kx.c:1086
+#: src/core/gnunet-service-core_kx.c:1106
 #, fuzzy
 msgid "# PONG messages dropped (out of order)"
 msgstr "# gap Anfragen verworfen: Kollision in RT"
 
-#: src/core/gnunet-service-core_kx.c:1116
+#: src/core/gnunet-service-core_kx.c:1136
 #, fuzzy
 msgid "# PONG messages decrypted"
 msgstr "# PING Nachrichten erstellt"
 
-#: src/core/gnunet-service-core_kx.c:1150
+#: src/core/gnunet-service-core_kx.c:1170
 #, fuzzy
 msgid "# session keys confirmed via PONG"
 msgstr "# Knotenankündigungen empfangen"
 
-#: src/core/gnunet-service-core_kx.c:1160
+#: src/core/gnunet-service-core_kx.c:1180
 #, fuzzy
 msgid "# timeouts prevented via PONG"
 msgstr "# Bytes empfangen über TCP"
 
-#: src/core/gnunet-service-core_kx.c:1167
+#: src/core/gnunet-service-core_kx.c:1187
 #, fuzzy
 msgid "# rekey operations confirmed via PONG"
 msgstr "# Knotenankündigungen empfangen"
 
-#: src/core/gnunet-service-core_kx.c:1307
+#: src/core/gnunet-service-core_kx.c:1327
 #, fuzzy
 msgid "# DATA message dropped (out of order)"
 msgstr "# Bytes verworfen von UDP (outgoing)"
 
-#: src/core/gnunet-service-core_kx.c:1314
+#: src/core/gnunet-service-core_kx.c:1334
 #, 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:1317
+#: src/core/gnunet-service-core_kx.c:1337
 #, fuzzy
 msgid "# sessions terminated by key expiration"
 msgstr "# Bytes verworfen von TCP (ausgehend)"
 
-#: src/core/gnunet-service-core_kx.c:1360
-#: src/core/gnunet-service-core_kx.c:1385
+#: src/core/gnunet-service-core_kx.c:1380
+#: src/core/gnunet-service-core_kx.c:1405
 #, fuzzy
 msgid "# bytes dropped (duplicates)"
 msgstr "# Bytes verworfen von UDP (outgoing)"
 
-#: src/core/gnunet-service-core_kx.c:1372
+#: src/core/gnunet-service-core_kx.c:1392
 #, fuzzy
 msgid "# bytes dropped (out of sequence)"
 msgstr "# Bytes verworfen von UDP (outgoing)"
 
-#: src/core/gnunet-service-core_kx.c:1413
+#: src/core/gnunet-service-core_kx.c:1433
 #, fuzzy
 msgid "# bytes dropped (ancient message)"
 msgstr "# Bytes verworfen von UDP (outgoing)"
 
-#: src/core/gnunet-service-core_kx.c:1421
+#: src/core/gnunet-service-core_kx.c:1441
 #, fuzzy
 msgid "# bytes of payload decrypted"
 msgstr "# Bytes entschlüsselt"
 
-#: src/core/gnunet-service-core_kx.c:1452
+#: src/core/gnunet-service-core_kx.c:1472
 #, fuzzy
 msgid "# PAYLOAD dropped (out of order)"
 msgstr "# Bytes verworfen von UDP (outgoing)"
@@ -1229,7 +1237,7 @@ msgid "# sessions terminated by transport disconnect"
 msgstr "# Knotenankündigungen empfangen"
 
 #: src/core/gnunet-service-core_neighbours.c:179
-#: src/core/gnunet-service-core_neighbours.c:328
+#: src/core/gnunet-service-core_neighbours.c:329
 msgid "# neighbour entries allocated"
 msgstr ""
 
@@ -1237,7 +1245,7 @@ msgstr ""
 msgid "# encrypted bytes given to transport"
 msgstr ""
 
-#: src/core/gnunet-service-core_neighbours.c:411
+#: src/core/gnunet-service-core_neighbours.c:412
 #, fuzzy, c-format
 msgid "Unsupported message of type %u (%u bytes) received from peer `%s'\n"
 msgstr "Ungültige Nachricht des Typs %u empfangen. Nachricht wird verworfen.\n"
@@ -1251,11 +1259,11 @@ msgstr "Ungültige Nachricht des Typs %u empfangen. Nachricht wird verworfen.\n"
 #: 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: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
+#: src/transport/gnunet-service-transport_neighbours.c:929
+#: src/transport/gnunet-service-transport_neighbours.c:1161
+#: src/transport/gnunet-service-transport_neighbours.c:1170
+#: src/transport/gnunet-service-transport_neighbours.c:3015
+#: src/transport/gnunet-service-transport_neighbours.c:3291
 #, fuzzy
 msgid "# peers connected"
 msgstr "# verbundener Knoten"
@@ -1502,12 +1510,12 @@ msgid "# bytes purged (low-priority)"
 msgstr ""
 
 #: src/datastore/gnunet-service-datastore.c:483
-#: src/gns/gnunet-gns-helper-service-w32.c:187
+#: src/gns/gnunet-gns-helper-service-w32.c:223
 msgid "Transmission to client failed!\n"
 msgstr ""
 
 #: src/datastore/gnunet-service-datastore.c:514
-#: src/gns/gnunet-gns-helper-service-w32.c:215
+#: src/gns/gnunet-gns-helper-service-w32.c:262
 msgid "Shutdown in progress, aborting transmission.\n"
 msgstr ""
 
@@ -1677,7 +1685,7 @@ msgstr ""
 
 #: src/datastore/plugin_datastore_postgres.c:860
 #: src/namecache/plugin_namecache_postgres.c:414
-#: src/namestore/plugin_namestore_postgres.c:564
+#: src/namestore/plugin_namestore_postgres.c:569
 msgid "Postgres database running\n"
 msgstr ""
 
@@ -1770,7 +1778,7 @@ msgstr ""
 #: src/dht/gnunet-dht-get.c:201 src/dht/gnunet-dht-monitor.c:271
 #: src/dht/gnunet-dht-put.c:213 src/fs/gnunet-auto-share.c:753
 #: src/fs/gnunet-download.c:328 src/fs/gnunet-publish.c:877
-#: src/fs/gnunet-search.c:294 src/fs/gnunet-unindex.c:168
+#: src/fs/gnunet-search.c:301 src/fs/gnunet-unindex.c:168
 #: src/nse/gnunet-nse-profiler.c:873
 msgid "be verbose (print progress information)"
 msgstr ""
@@ -2258,21 +2266,21 @@ msgstr ""
 msgid "# DNS requests received via TUN interface"
 msgstr "Empfangene Client-Nachricht ist ungültig.\n"
 
-#: src/dns/gnunet-service-dns.c:1049 src/exit/gnunet-daemon-exit.c:3499
+#: src/dns/gnunet-service-dns.c:1049 src/exit/gnunet-daemon-exit.c:3514
 #, 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:3556
+#: src/dns/gnunet-service-dns.c:1069 src/exit/gnunet-daemon-exit.c:3571
 #, fuzzy
 msgid "need a valid IPv4 or IPv6 address\n"
 msgstr "Ungültiger Parameter: `%s'\n"
 
-#: src/dv/gnunet-dv.c:166
+#: src/dv/gnunet-dv.c:169
 msgid "verbose output"
 msgstr ""
 
-#: src/dv/gnunet-dv.c:175
+#: src/dv/gnunet-dv.c:178
 #, fuzzy
 msgid "Print information about DV state"
 msgstr "Informationen über andere GNUnet Knoten ausgeben."
@@ -2287,14 +2295,14 @@ msgstr ""
 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:1407
+#: src/exit/gnunet-daemon-exit.c:970 src/exit/gnunet-daemon-exit.c:2397
+#: src/exit/gnunet-daemon-exit.c:2654 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:1463
+#: src/exit/gnunet-daemon-exit.c:1007 src/exit/gnunet-daemon-exit.c:2456
+#: src/exit/gnunet-daemon-exit.c:2713 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 ""
@@ -2354,137 +2362,148 @@ msgstr "# Bytes gesendet über UDP"
 msgid "# TCP service creation requests received via mesh"
 msgstr "# Client Trace-Anfragen empfangen"
 
-#: src/exit/gnunet-daemon-exit.c:1875 src/exit/gnunet-daemon-exit.c:1965
-#: src/exit/gnunet-daemon-exit.c:2070 src/exit/gnunet-daemon-exit.c:2318
-#: src/exit/gnunet-daemon-exit.c:2567 src/exit/gnunet-daemon-exit.c:2856
-#: src/exit/gnunet-daemon-exit.c:2963
+#: src/exit/gnunet-daemon-exit.c:1875 src/exit/gnunet-daemon-exit.c:1968
+#: src/exit/gnunet-daemon-exit.c:2073 src/exit/gnunet-daemon-exit.c:2321
+#: src/exit/gnunet-daemon-exit.c:2570 src/exit/gnunet-daemon-exit.c:2859
+#: src/exit/gnunet-daemon-exit.c:2966
 #, fuzzy
 msgid "# Bytes received from MESH"
 msgstr "# Bytes empfangen über HTTP"
 
-#: src/exit/gnunet-daemon-exit.c:1907 src/exit/gnunet-daemon-exit.c:2985
+#: src/exit/gnunet-daemon-exit.c:1909 src/exit/gnunet-daemon-exit.c:2990
 #, c-format
-msgid "No service found for %s on port %d!\n"
+msgid "No service %s found for %s on port %d!\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:1911
+#: src/exit/gnunet-daemon-exit.c:1914
 #, fuzzy
 msgid "# TCP requests dropped (no such service)"
 msgstr "# gap Anfragen verworfen: Kollision in RT"
 
-#: src/exit/gnunet-daemon-exit.c:1968
+#: src/exit/gnunet-daemon-exit.c:1971
 #, fuzzy
 msgid "# TCP IP-exit creation requests received via mesh"
 msgstr "# Client Trace-Anfragen empfangen"
 
-#: src/exit/gnunet-daemon-exit.c:2073
+#: src/exit/gnunet-daemon-exit.c:2076
 #, fuzzy
 msgid "# TCP data requests received via mesh"
 msgstr "# Client Trace-Anfragen empfangen"
 
-#: src/exit/gnunet-daemon-exit.c:2087
+#: src/exit/gnunet-daemon-exit.c:2090
 #, fuzzy
 msgid "# TCP DATA requests dropped (no session)"
 msgstr "# gap Anfragen verworfen: Kollision in RT"
 
-#: src/exit/gnunet-daemon-exit.c:2147
+#: src/exit/gnunet-daemon-exit.c:2150
 #, fuzzy
 msgid "# ICMP packets sent via TUN"
 msgstr "# Bytes gesendet über UDP"
 
-#: src/exit/gnunet-daemon-exit.c:2321
+#: src/exit/gnunet-daemon-exit.c:2324
 #, fuzzy
 msgid "# ICMP IP-exit requests received via mesh"
 msgstr "# Client Trace-Anfragen empfangen"
 
-#: src/exit/gnunet-daemon-exit.c:2570
+#: src/exit/gnunet-daemon-exit.c:2573
 #, fuzzy
 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:1397
+#: src/exit/gnunet-daemon-exit.c:2639 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:1433
+#: src/exit/gnunet-daemon-exit.c:2698 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 ""
 
-#: src/exit/gnunet-daemon-exit.c:2745
+#: src/exit/gnunet-daemon-exit.c:2748
 #, fuzzy
 msgid "# UDP packets sent via TUN"
 msgstr "# Bytes gesendet über UDP"
 
-#: src/exit/gnunet-daemon-exit.c:2859
+#: src/exit/gnunet-daemon-exit.c:2862
 #, fuzzy
 msgid "# UDP IP-exit requests received via mesh"
 msgstr "# Client Trace-Anfragen empfangen"
 
-#: src/exit/gnunet-daemon-exit.c:2966
+#: src/exit/gnunet-daemon-exit.c:2969
 #, fuzzy
 msgid "# UDP service requests received via mesh"
 msgstr "# Client Trace-Anfragen empfangen"
 
-#: src/exit/gnunet-daemon-exit.c:2989
+#: src/exit/gnunet-daemon-exit.c:2995
 #, fuzzy
 msgid "# UDP requests dropped (no such service)"
 msgstr "# gap Anfragen verworfen: Kollision in RT"
 
-#: src/exit/gnunet-daemon-exit.c:3025
+#: src/exit/gnunet-daemon-exit.c:3031
 #, fuzzy
 msgid "# Inbound MESH channels created"
 msgstr "# dht Anfragen weitergeleitet"
 
-#: src/exit/gnunet-daemon-exit.c:3286
+#: src/exit/gnunet-daemon-exit.c:3235 src/exit/gnunet-daemon-exit.c:3245
+#, fuzzy, c-format
+msgid "Option `%s' for domain `%s' is not formatted correctly!\n"
+msgstr "%s: Option `%s' ist mehrdeutig\n"
+
+#: src/exit/gnunet-daemon-exit.c:3259 src/exit/gnunet-daemon-exit.c:3267
+#, c-format
+msgid "`%s' is not a valid port number (for domain `%s')!"
+msgstr ""
+
+#: src/exit/gnunet-daemon-exit.c:3300
 #, c-format
 msgid "No addresses found for hostname `%s' of service `%s'!\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3300 src/exit/gnunet-daemon-exit.c:3312
+#: src/exit/gnunet-daemon-exit.c:3314 src/exit/gnunet-daemon-exit.c:3326
 #, c-format
 msgid "Service `%s' configured for IPv4, but IPv4 is disabled!\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3323
+#: src/exit/gnunet-daemon-exit.c:3337
 #, c-format
 msgid "No IP addresses found for hostname `%s' of service `%s'!\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3512
+#: src/exit/gnunet-daemon-exit.c:3527
 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:3520
+#: src/exit/gnunet-daemon-exit.c:3535
 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:3527
+#: src/exit/gnunet-daemon-exit.c:3542
 msgid ""
 "Cannot enable IPv4 exit but disable IPv4 on TUN interface, will use "
 "ENABLE_IPv4=YES\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3533
+#: src/exit/gnunet-daemon-exit.c:3548
 msgid ""
 "Cannot enable IPv6 exit but disable IPv6 on TUN interface, will use "
 "ENABLE_IPv6=YES\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3539 src/pt/gnunet-daemon-pt.c:1247
+#: src/exit/gnunet-daemon-exit.c:3554 src/exit/gnunet-daemon-exit.c:3717
+#: src/pt/gnunet-daemon-pt.c:1247
 msgid "No useful service enabled.  Exiting.\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3655
+#: src/exit/gnunet-daemon-exit.c:3664
 msgid "Must be a number"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3797
+#: src/exit/gnunet-daemon-exit.c:3813
 msgid "Daemon to run to provide an IP exit node for the VPN"
 msgstr ""
 
@@ -3197,7 +3216,7 @@ msgid "Downloading `%s' done (%s/s).\n"
 msgstr "Upload abgewiesen!"
 
 #: src/fs/gnunet-download.c:209 src/fs/gnunet-publish.c:286
-#: src/fs/gnunet-search.c:193 src/fs/gnunet-unindex.c:108
+#: src/fs/gnunet-search.c:200 src/fs/gnunet-unindex.c:108
 #, c-format
 msgid "Unexpected status: %d\n"
 msgstr ""
@@ -3221,12 +3240,12 @@ msgid "Target filename must be specified.\n"
 msgstr ""
 
 #: src/fs/gnunet-download.c:268 src/fs/gnunet-publish.c:797
-#: src/fs/gnunet-search.c:243 src/fs/gnunet-unindex.c:140
+#: src/fs/gnunet-search.c:250 src/fs/gnunet-unindex.c:140
 #, fuzzy, c-format
 msgid "Could not initialize `%s' subsystem.\n"
 msgstr "`%s' Dienst konnte nicht initialisiert werden.\n"
 
-#: src/fs/gnunet-download.c:305 src/fs/gnunet-search.c:282
+#: src/fs/gnunet-download.c:305 src/fs/gnunet-search.c:289
 msgid "set the desired LEVEL of receiver-anonymity"
 msgstr "Den Grad LEVEL der gewünschten Empfänger-Anonymität setzen"
 
@@ -3234,7 +3253,7 @@ msgstr "Den Grad LEVEL der gewünschten Empfänger-Anonymität setzen"
 msgid "delete incomplete downloads (when aborted with CTRL-C)"
 msgstr ""
 
-#: src/fs/gnunet-download.c:311 src/fs/gnunet-search.c:285
+#: src/fs/gnunet-download.c:311 src/fs/gnunet-search.c:292
 msgid "only search the local peer (no P2P network search)"
 msgstr ""
 
@@ -3395,7 +3414,7 @@ msgstr "Sie dürfen nur eine Datei zum Deindizieren angeben.\n"
 msgid "You must NOT specify an URI and a filename.\n"
 msgstr "Sie müssen einen Empfänger angeben!\n"
 
-#: src/fs/gnunet-publish.c:768 src/vpn/gnunet-vpn.c:208
+#: src/fs/gnunet-publish.c:768 src/vpn/gnunet-vpn.c:209
 #, fuzzy, c-format
 msgid "Option `%s' is required when using option `%s'.\n"
 msgstr "Option `%s' macht keinen Sinn ohne die Option `%s'.\n"
@@ -3478,34 +3497,34 @@ msgstr ""
 msgid "Failed to write directory with search results to `%s'\n"
 msgstr ""
 
-#: src/fs/gnunet-search.c:184
+#: src/fs/gnunet-search.c:191
 #, fuzzy, c-format
 msgid "Error searching: %s.\n"
 msgstr "Fehler beim Verlassen der DHT.\n"
 
-#: src/fs/gnunet-search.c:233
+#: src/fs/gnunet-search.c:240
 #, fuzzy
 msgid "Could not create keyword URI from arguments.\n"
 msgstr "Namespace `%s' konnte nicht erstellt werden (existiert bereits?).\n"
 
-#: src/fs/gnunet-search.c:257
+#: src/fs/gnunet-search.c:264
 #, fuzzy
 msgid "Could not start searching.\n"
 msgstr "Namespace `%s' konnte nicht erstellt werden (existiert bereits?).\n"
 
-#: src/fs/gnunet-search.c:288
+#: src/fs/gnunet-search.c:295
 msgid "write search results to file starting with PREFIX"
 msgstr ""
 
-#: src/fs/gnunet-search.c:291
+#: src/fs/gnunet-search.c:298
 msgid "automatically terminate search after DELAY"
 msgstr ""
 
-#: src/fs/gnunet-search.c:298
+#: src/fs/gnunet-search.c:305
 msgid "automatically terminate search after VALUE results are found"
 msgstr ""
 
-#: src/fs/gnunet-search.c:309
+#: src/fs/gnunet-search.c:316
 msgid "Search GNUnet for files that were published on GNUnet"
 msgstr ""
 
@@ -3904,7 +3923,7 @@ msgstr "Auf die Namespace Informationen konnte nicht zugegriffen werden.\n"
 msgid "Unindex a file that was previously indexed with gnunet-publish."
 msgstr ""
 
-#: src/gns/gns_api.c:387
+#: src/gns/gns_api.c:393
 #, fuzzy
 msgid "Failed to serialize lookup reply from GNS service!\n"
 msgstr "Fehler beim Empfangen der Antwort von gnunetd auf die `%s' Nachricht\n"
@@ -4005,14 +4024,14 @@ msgstr ""
 msgid "Ego for `%s' not found, cannot perform lookup.\n"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:336 src/gns/gnunet-gns-helper-service-w32.c:753
+#: src/gns/gnunet-gns.c:336 src/gns/gnunet-gns-helper-service-w32.c:798
 #, c-format
 msgid ""
 "Ego for `gns-master' not found, cannot perform lookup.  Did you run gnunet-"
 "gns-import.sh?\n"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:365 src/gns/gnunet-gns-helper-service-w32.c:783
+#: src/gns/gnunet-gns.c:365 src/gns/gnunet-gns-helper-service-w32.c:828
 #, fuzzy, c-format
 msgid "Failed to connect to GNS\n"
 msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
@@ -4050,7 +4069,7 @@ msgstr "Die Priorität des Inhalts angeben"
 msgid "GNUnet GNS resolver tool"
 msgstr "GNUnet Netzwerk Topologie tracen."
 
-#: src/gns/gnunet-gns-helper-service-w32.c:723
+#: src/gns/gnunet-gns-helper-service-w32.c:768
 #, c-format
 msgid ""
 "Ego for `gns-short' not found. This is not really fatal, but i'll pretend "
@@ -4058,7 +4077,7 @@ msgid ""
 "sh?\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-helper-service-w32.c:793
+#: src/gns/gnunet-gns-helper-service-w32.c:838
 #, fuzzy, c-format
 msgid "Failed to connect to identity service\n"
 msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
@@ -4068,8 +4087,8 @@ msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
 #: 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
+#: src/transport/plugin_transport_http_client.c:1070
+#: src/transport/plugin_transport_http_client.c:1085
 #, c-format
 msgid "%s failed at %s:%d: `%s'\n"
 msgstr "`%s' schlug fehl bei %s:%d mit dem Fehler: `%s'.\n"
@@ -4214,36 +4233,36 @@ msgstr "Fehler beim Konvertieren von Parametern in URI!\n"
 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:815
+#: src/gns/gnunet-service-gns_resolver.c:816
 #, 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:957
+#: src/gns/gnunet-service-gns_resolver.c:958
 #, c-format
 msgid "Skipping record of unsupported type %d\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns_resolver.c:1316
+#: src/gns/gnunet-service-gns_resolver.c:1317
 #, c-format
 msgid "GNS lookup resulted in DNS name that is too long (`%s')\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns_resolver.c:1809
+#: src/gns/gnunet-service-gns_resolver.c:1817
 msgid "GNS lookup recursion failed (no delegation record found)\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns_resolver.c:1833
+#: src/gns/gnunet-service-gns_resolver.c:1841
 #, 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:2071
+#: src/gns/gnunet-service-gns_resolver.c:2173
 #, c-format
 msgid "Zone %s was revoked, resolution fails\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns_resolver.c:2220
+#: src/gns/gnunet-service-gns_resolver.c:2322
 #, c-format
 msgid "Hostname `%s' is not well-formed, resolution fails\n"
 msgstr ""
@@ -4648,7 +4667,7 @@ msgid "Advertisement message could not be queued by core\n"
 msgstr ""
 
 #: src/hostlist/hostlist-server.c:556 src/peerinfo-tool/gnunet-peerinfo.c:651
-#: src/transport/gnunet-service-transport.c:850
+#: src/transport/gnunet-service-transport.c:946
 #, fuzzy
 msgid "Could not access PEERINFO service.  Exiting.\n"
 msgstr "Auf die Namespace Informationen konnte nicht zugegriffen werden.\n"
@@ -4760,64 +4779,50 @@ msgstr "Fehler beim Speichern der Konfigurationsdatei `%s':"
 msgid "Failed to create directory `%s' for storing egos\n"
 msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
 
-#: src/integration-tests/connection_watchdog.c:1012
-#, fuzzy, c-format
-msgid "Transport plugin: `%s' port %llu\n"
-msgstr "Der Transportdienst auf Port %d konnte nicht gestartet werden.\n"
-
-#: src/integration-tests/connection_watchdog.c:1045
-#, fuzzy, c-format
-msgid "Found %u transport plugins: `%s'\n"
-msgstr "Teste Transport(e) %s\n"
-
-#: src/integration-tests/connection_watchdog.c:1105
-msgid "Send ping messages to test connectivity (default == NO)"
-msgstr ""
-
-#: src/mesh/gnunet-mesh.c:299
+#: src/mesh/gnunet-mesh.c:300
 #, fuzzy, c-format
 msgid "Invalid target `%s'\n"
 msgstr "Ungültiger Parameter: `%s'\n"
 
-#: src/mesh/gnunet-mesh.c:417
+#: src/mesh/gnunet-mesh.c:434
 #, fuzzy, c-format
 msgid "Invalid tunnel owner `%s'\n"
 msgstr "Ungültiger Parameter: `%s'\n"
 
-#: src/mesh/gnunet-mesh.c:482
+#: src/mesh/gnunet-mesh.c:499
 msgid "You must NOT give a TARGET when using options\n"
 msgstr ""
 
-#: src/mesh/gnunet-mesh.c:559
+#: src/mesh/gnunet-mesh.c:576
 #, fuzzy
 msgid "provide information about a particular channel"
 msgstr "Informationen über andere GNUnet Knoten ausgeben."
 
-#: src/mesh/gnunet-mesh.c:562
+#: src/mesh/gnunet-mesh.c:579
 #, fuzzy
 msgid "provide information about a particular connection"
 msgstr "Informationen über andere GNUnet Knoten ausgeben."
 
-#: src/mesh/gnunet-mesh.c:565
+#: src/mesh/gnunet-mesh.c:582
 #, fuzzy
 msgid "provide information about all tunnels"
 msgstr "Informationen über andere GNUnet Knoten ausgeben."
 
-#: src/mesh/gnunet-mesh.c:568
+#: src/mesh/gnunet-mesh.c:585
 #, fuzzy
 msgid "provide information about all tunnels (continuously) NOT IMPLEMENTED"
 msgstr "Informationen über andere GNUnet Knoten ausgeben."
 
-#: src/mesh/gnunet-mesh.c:571
+#: src/mesh/gnunet-mesh.c:588
 msgid "port to listen to (default; 0)"
 msgstr ""
 
-#: src/mesh/gnunet-mesh.c:574
+#: src/mesh/gnunet-mesh.c:591
 #, fuzzy
 msgid "provide information about a particular tunnel"
 msgstr "Informationen über andere GNUnet Knoten ausgeben."
 
-#: src/mesh/gnunet-service-mesh_peer.c:349
+#: src/mesh/gnunet-service-mesh_peer.c:377
 msgid "Wrong CORE service\n"
 msgstr ""
 
@@ -4836,7 +4841,7 @@ msgstr "`%s' konnte nicht aufgelöst werden: %s\n"
 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:394
+#: src/namecache/gnunet-namecache.c:124 src/namestore/gnunet-namestore.c:397
 #, c-format
 msgid "\tCorrupt or unsupported record of type %u\n"
 msgstr ""
@@ -4846,7 +4851,7 @@ msgstr ""
 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:692
+#: src/namecache/gnunet-namecache.c:195 src/namestore/gnunet-namestore.c:695
 #, fuzzy, c-format
 msgid "Invalid public key for reverse lookup `%s'\n"
 msgstr "Ungültiger Parameter: `%s'\n"
@@ -4856,7 +4861,7 @@ msgstr "Ungültiger Parameter: `%s'\n"
 msgid "You must specify a name\n"
 msgstr "Sie müssen einen Empfänger angeben!\n"
 
-#: src/namecache/gnunet-namecache.c:234 src/namestore/gnunet-namestore.c:925
+#: src/namecache/gnunet-namecache.c:234 src/namestore/gnunet-namestore.c:931
 msgid "name of the record to add/delete/display"
 msgstr ""
 
@@ -4865,7 +4870,7 @@ msgstr ""
 msgid "spezifies the public key of the zone to look in"
 msgstr "Die Priorität des Inhalts angeben"
 
-#: src/namecache/gnunet-namecache.c:248 src/namestore/gnunet-namestore.c:957
+#: src/namecache/gnunet-namecache.c:248 src/namestore/gnunet-namestore.c:963
 #, fuzzy
 msgid "GNUnet zone manipulation tool"
 msgstr "GNUnet Konfiguration"
@@ -4875,160 +4880,160 @@ msgid "Namecache failed to cache block"
 msgstr ""
 
 #: src/namecache/plugin_namecache_postgres.c:89
-#: src/namestore/plugin_namestore_postgres.c:93
+#: src/namestore/plugin_namestore_postgres.c:96
 #, fuzzy
 msgid "Failed to create indices\n"
 msgstr "Namespace `%s' konnte nicht erstellt werden (existiert bereits?).\n"
 
-#: src/namestore/gnunet-namestore.c:304
+#: src/namestore/gnunet-namestore.c:303
 #, fuzzy, c-format
 msgid "Adding record failed: %s\n"
 msgstr ""
 "\n"
 "Fehler beim Uploaden der Datei: %s\n"
 
-#: src/namestore/gnunet-namestore.c:333
+#: src/namestore/gnunet-namestore.c:332
 #, 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:340
+#: src/namestore/gnunet-namestore.c:339
 #, fuzzy, c-format
 msgid "Deleting record failed%s%s\n"
 msgstr ""
 "\n"
 "Fehler beim Uploaden der Datei: %s\n"
 
-#: src/namestore/gnunet-namestore.c:555
+#: src/namestore/gnunet-namestore.c:558
 #, c-format
 msgid "No options given\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:566
+#: src/namestore/gnunet-namestore.c:569
 #: 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: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
+#: src/namestore/gnunet-namestore.c:577 src/namestore/gnunet-namestore.c:586
+#: src/namestore/gnunet-namestore.c:603 src/namestore/gnunet-namestore.c:625
+#: src/namestore/gnunet-namestore.c:665
 #, fuzzy, c-format
 msgid "Missing option `%s' for operation `%s'\n"
 msgstr "Konfigurationsdatei `%s' wurde erzeugt.\n"
 
-#: src/namestore/gnunet-namestore.c:575 src/namestore/gnunet-namestore.c:584
-#: src/namestore/gnunet-namestore.c:601 src/namestore/gnunet-namestore.c:623
+#: src/namestore/gnunet-namestore.c:578 src/namestore/gnunet-namestore.c:587
+#: src/namestore/gnunet-namestore.c:604 src/namestore/gnunet-namestore.c:626
 msgid "add"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:592
+#: src/namestore/gnunet-namestore.c:595
 #, 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:612
+#: src/namestore/gnunet-namestore.c:615
 #, 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:648
+#: src/namestore/gnunet-namestore.c:651
 #, fuzzy, c-format
 msgid "Invalid time format `%s'\n"
 msgstr "Ungültiger Parameter: `%s'\n"
 
-#: src/namestore/gnunet-namestore.c:663
+#: src/namestore/gnunet-namestore.c:666
 msgid "del"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:712
+#: src/namestore/gnunet-namestore.c:715
 #: src/peerinfo-tool/gnunet-peerinfo.c:703
 #, fuzzy, c-format
 msgid "Invalid URI `%s'\n"
 msgstr "Ungültiger Parameter: `%s'\n"
 
-#: src/namestore/gnunet-namestore.c:747
+#: src/namestore/gnunet-namestore.c:750
 #, fuzzy, c-format
 msgid "Invalid nick `%s'\n"
 msgstr "Ungültiger Parameter: `%s'\n"
 
-#: src/namestore/gnunet-namestore.c:787
+#: src/namestore/gnunet-namestore.c:790
 #, fuzzy, c-format
 msgid "Ego `%s' not known to identity service\n"
 msgstr "`%s': unbekannter Dienst: %s\n"
 
-#: src/namestore/gnunet-namestore.c:814
+#: src/namestore/gnunet-namestore.c:817
 #, fuzzy, c-format
 msgid "No default ego configured in identity service\n"
 msgstr "`%s': unbekannter Dienst: %s\n"
 
-#: src/namestore/gnunet-namestore.c:847
+#: src/namestore/gnunet-namestore.c:853
 #, fuzzy, c-format
 msgid "Identity service is not running\n"
 msgstr "`%s' ist keine Datei.\n"
 
-#: src/namestore/gnunet-namestore.c:859
+#: src/namestore/gnunet-namestore.c:865
 #, 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
+#: src/namestore/gnunet-namestore.c:913
 msgid "add record"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:910
+#: src/namestore/gnunet-namestore.c:916
 msgid "delete record"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:913
+#: src/namestore/gnunet-namestore.c:919
 msgid "display records"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:916
+#: src/namestore/gnunet-namestore.c:922
 msgid ""
 "expiration time for record to use (for adding only), \"never\" is possible"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:919
+#: src/namestore/gnunet-namestore.c:925
 #, fuzzy
 msgid "set the desired nick name for the zone"
 msgstr "Informationen über andere GNUnet Knoten ausgeben."
 
-#: src/namestore/gnunet-namestore.c:922
+#: src/namestore/gnunet-namestore.c:928
 #, fuzzy
 msgid "monitor changes in the namestore"
 msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden."
 
-#: src/namestore/gnunet-namestore.c:928
+#: src/namestore/gnunet-namestore.c:934
 #, fuzzy
 msgid "determine our name for the given PKEY"
 msgstr "Informationen über andere GNUnet Knoten ausgeben."
 
-#: src/namestore/gnunet-namestore.c:931
+#: src/namestore/gnunet-namestore.c:937
 msgid "type of the record to add/delete/display"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:934
+#: src/namestore/gnunet-namestore.c:940
 msgid "URI to import into our zone"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:937
+#: src/namestore/gnunet-namestore.c:943
 msgid "value of the record to add/delete"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:940
+#: src/namestore/gnunet-namestore.c:946
 msgid "create or list public record"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:943
+#: src/namestore/gnunet-namestore.c:949
 msgid ""
 "create shadow record (only valid if all other records of the same type have "
 "expired"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:946
+#: src/namestore/gnunet-namestore.c:952
 msgid "name of the ego controlling the zone"
 msgstr ""
 
@@ -5092,7 +5097,7 @@ msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
 msgid "GNU Name System First Come First Serve name registration service"
 msgstr ""
 
-#: src/namestore/gnunet-service-namestore.c:634
+#: src/namestore/gnunet-service-namestore.c:638
 #, fuzzy, c-format
 msgid "Failed to replicate block in namecache: %s\n"
 msgstr "Fehler beim Aktualisieren der Daten des Moduls `%s'\n"
@@ -5110,88 +5115,88 @@ msgstr ""
 msgid "GNUnet NAT traversal test helper daemon"
 msgstr ""
 
-#: src/nat/nat_auto.c:169
+#: src/nat/nat_auto.c:170
 msgid "NAT traversal with ICMP Server timed out.\n"
 msgstr ""
 
-#: src/nat/nat_auto.c:199
+#: src/nat/nat_auto.c:200
 msgid "NAT traversal with ICMP Server succeeded.\n"
 msgstr ""
 
-#: src/nat/nat_auto.c:200
+#: src/nat/nat_auto.c:201
 msgid "NAT traversal with ICMP Server failed.\n"
 msgstr ""
 
-#: src/nat/nat_auto.c:219
+#: src/nat/nat_auto.c:222
 #, fuzzy
 msgid "Testing connection reversal with ICMP server.\n"
 msgstr "Informationen über andere GNUnet Knoten ausgeben."
 
-#: src/nat/nat_auto.c:265
+#: src/nat/nat_auto.c:269
 #, fuzzy, c-format
 msgid "Detected external IP `%s'\n"
 msgstr "Ungültiger RPC `%s' empfangen.\n"
 
-#: src/nat/nat_auto.c:331
+#: src/nat/nat_auto.c:339
 msgid "This system has a global IPv6 address, setting IPv6 to supported.\n"
 msgstr ""
 
-#: src/nat/nat_auto.c:347
+#: src/nat/nat_auto.c:355
 #, fuzzy, c-format
 msgid "Detected internal network address `%s'.\n"
 msgstr "GNUnet verwendet nun die IP-Adresse %u.%u.%u.%u.\n"
 
-#: src/nat/nat_auto.c:400
+#: src/nat/nat_auto.c:408
 msgid "upnpc found, enabling its use\n"
 msgstr ""
 
-#: src/nat/nat_auto.c:401
+#: src/nat/nat_auto.c:409
 #, fuzzy
 msgid "upnpc not found\n"
 msgstr "Kommando `%s' wurde nicht gefunden!\n"
 
-#: src/nat/nat_auto.c:434
+#: src/nat/nat_auto.c:442
 msgid "gnunet-helper-nat-server found, testing it\n"
 msgstr ""
 
-#: src/nat/nat_auto.c:435
+#: src/nat/nat_auto.c:443
 msgid "No working gnunet-helper-nat-server found\n"
 msgstr ""
 
-#: src/nat/nat_auto.c:469
+#: src/nat/nat_auto.c:477
 msgid "gnunet-helper-nat-client found, enabling it\n"
 msgstr ""
 
-#: src/nat/nat_auto.c:470
+#: src/nat/nat_auto.c:478
 msgid "gnunet-helper-nat-client not found or behind NAT, disabling it\n"
 msgstr ""
 
-#: src/nat/nat.c:834
+#: src/nat/nat.c:867
 #, c-format
 msgid "gnunet-helper-nat-server generated malformed address `%s'\n"
 msgstr ""
 
-#: src/nat/nat.c:883
+#: src/nat/nat.c:917
 #, fuzzy, c-format
 msgid "Failed to start %s\n"
 msgstr "Fehler beim Starten der Collection.\n"
 
-#: src/nat/nat.c:1152
+#: src/nat/nat.c:1203
 msgid "malformed"
 msgstr ""
 
-#: src/nat/nat.c:1218 src/nat/nat.c:1230
+#: src/nat/nat.c:1274 src/nat/nat.c:1286
 #, c-format
 msgid ""
 "Configuration requires `%s', but binary is not installed properly (SUID bit "
 "not set).  Option disabled.\n"
 msgstr ""
 
-#: src/nat/nat.c:1365
+#: src/nat/nat.c:1424
 msgid "Internal IP address not known, cannot use ICMP NAT traversal method\n"
 msgstr ""
 
-#: src/nat/nat.c:1376
+#: src/nat/nat.c:1440
 #, c-format
 msgid "Running gnunet-helper-nat-client %s %s %u\n"
 msgstr ""
@@ -5204,12 +5209,12 @@ msgstr ""
 msgid "`upnpc' command not found\n"
 msgstr ""
 
-#: src/nat/nat_test.c:345
+#: src/nat/nat_test.c:348
 #, 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:414
+#: src/nat/nat_test.c:420
 #, c-format
 msgid "Failed to create listen socket bound to `%s' for NAT test: %s\n"
 msgstr ""
@@ -5264,15 +5269,16 @@ 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:373
+#: src/peerinfo/gnunet-service-peerinfo.c:390
 #, fuzzy, c-format
-msgid "Failed to parse HELLO in file `%s': %s %u \n"
+msgid "Failed to parse HELLO in file `%s'\n"
 msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
 
-#: src/peerinfo/gnunet-service-peerinfo.c:457
+#: src/peerinfo/gnunet-service-peerinfo.c:468
 msgid "# peers known"
 msgstr ""
 
-#: src/peerinfo/gnunet-service-peerinfo.c:494
+#: src/peerinfo/gnunet-service-peerinfo.c:505
 #, c-format
 msgid ""
 "File `%s' in directory `%s' does not match naming convention. Removed.\n"
@@ -5280,22 +5286,22 @@ msgstr ""
 "Die Datei `%s' im Verzeichnis `%s' entspricht nicht der Namenskonvention. "
 "Datei wurde entfernt.\n"
 
-#: src/peerinfo/gnunet-service-peerinfo.c:644
+#: src/peerinfo/gnunet-service-peerinfo.c:655
 #, fuzzy, c-format
 msgid "Scanning directory `%s'\n"
 msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
 
-#: src/peerinfo/gnunet-service-peerinfo.c:649
+#: src/peerinfo/gnunet-service-peerinfo.c:660
 #, 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:985
+#: src/peerinfo/gnunet-service-peerinfo.c:996
 #, 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:1275
+#: src/peerinfo/gnunet-service-peerinfo.c:1286
 #, c-format
 msgid "Importing HELLOs from `%s'\n"
 msgstr ""
@@ -5419,19 +5425,19 @@ msgid "Print information about peers."
 msgstr "Informationen über andere GNUnet Knoten ausgeben."
 
 #: src/peerinfo-tool/gnunet-peerinfo_plugins.c:105
-#: src/transport/gnunet-service-transport_plugins.c:123
+#: src/transport/gnunet-service-transport_plugins.c:124
 #, fuzzy, c-format
 msgid "Starting transport plugins `%s'\n"
 msgstr "Teste Transport(e) %s\n"
 
 #: src/peerinfo-tool/gnunet-peerinfo_plugins.c:109
-#: src/transport/gnunet-service-transport_plugins.c:127
+#: src/transport/gnunet-service-transport_plugins.c:129
 #, fuzzy, c-format
 msgid "Loading `%s' transport plugin\n"
 msgstr "Teste Transport(e) %s\n"
 
 #: src/peerinfo-tool/gnunet-peerinfo_plugins.c:129
-#: src/transport/gnunet-service-transport_plugins.c:157
+#: src/transport/gnunet-service-transport_plugins.c:159
 #, fuzzy, c-format
 msgid "Failed to load transport plugin for `%s'\n"
 msgstr "Anwendung `%s' konnte nicht initialisiert werden.\n"
@@ -5701,6 +5707,11 @@ msgstr ""
 msgid "Profiler for regex library"
 msgstr ""
 
+#: src/regex/regex_api.c:131
+#, fuzzy, c-format
+msgid "Regex `%s' is too long!\n"
+msgstr "`%s' ist keine Datei.\n"
+
 #: src/revocation/gnunet-revocation.c:121
 #, fuzzy, c-format
 msgid "Key `%s' is valid\n"
@@ -6056,7 +6067,7 @@ msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
 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
+#: src/set/gnunet-service-set.c:1400
 #, fuzzy
 msgid "Could not connect to mesh service\n"
 msgstr "Verbindung zu gnunetd konnte nicht hergestellt werden.\n"
@@ -6177,14 +6188,14 @@ msgstr ""
 msgid "Print statistics about GNUnet operations."
 msgstr "Statistiken der GNUnet Aktivitäten ausgeben."
 
-#: src/statistics/statistics_api.c:509
+#: src/statistics/statistics_api.c:506
 #, fuzzy
 msgid "Could not save some persistent statistics\n"
 msgstr ""
 "IP(v4) dieses Hosts konnte nicht ermittelt werden. Bitte geben Sie die IP in "
 "der Konfigurationsdatei an.\n"
 
-#: src/statistics/statistics_api.c:1054
+#: src/statistics/statistics_api.c:1074
 msgid ""
 "Failed to receive acknowledgement from statistics service, some statistics "
 "might have been lost!\n"
@@ -6558,36 +6569,36 @@ msgstr ""
 msgid "# disconnects due to blacklist"
 msgstr ""
 
-#: src/transport/gnunet-service-transport.c:160
+#: src/transport/gnunet-service-transport.c:206
 #, fuzzy
 msgid "# bytes payload discarded due to not connected peer"
 msgstr "# Knotenankündigungen empfangen"
 
-#: src/transport/gnunet-service-transport.c:250
+#: src/transport/gnunet-service-transport.c:325
 #, fuzzy
 msgid "# bytes total received"
 msgstr "# gap Anfragen insgesamt empfangen"
 
-#: src/transport/gnunet-service-transport.c:325
+#: src/transport/gnunet-service-transport.c:399
 #, fuzzy
 msgid "# bytes payload received"
 msgstr "# Bytes entschlüsselt"
 
-#: src/transport/gnunet-service-transport.c:479
+#: src/transport/gnunet-service-transport.c:574
 #, fuzzy, c-format
-msgid "Could not obtain a valid network for `%s' %s\n"
+msgid "Could not obtain a valid network for `%s' %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:529
+#: src/transport/gnunet-service-transport.c:628
 #, 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:820
+#: src/transport/gnunet-service-transport.c:916
 #, fuzzy
 msgid "Transport service is lacking key configuration settings. Exiting.\n"
 msgstr "GNUnet Konfiguration"
@@ -6620,157 +6631,167 @@ msgstr "# verschlüsselter PONG Nachrichten empfangen"
 msgid "# refreshed my HELLO"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1074
+#: src/transport/gnunet-service-transport_neighbours.c:1108
 #, fuzzy
 msgid "# DISCONNECT messages sent"
 msgstr "# verschlüsselter PONG Nachrichten empfangen"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1206
-#: src/transport/gnunet-service-transport_neighbours.c:1541
+#: src/transport/gnunet-service-transport_neighbours.c:1244
+#: src/transport/gnunet-service-transport_neighbours.c:1653
 #, fuzzy
 msgid "# bytes in message queue for other peers"
 msgstr "# Bytes ausgehender Nachrichten verworfen"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1211
+#: src/transport/gnunet-service-transport_neighbours.c:1249
 #, fuzzy
 msgid "# messages transmitted to other peers"
 msgstr "# Bytes des Typs %d übertragen"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1216
+#: src/transport/gnunet-service-transport_neighbours.c:1254
 #, fuzzy
 msgid "# transmission failures for messages to other peers"
 msgstr "# Bytes ausgehender Nachrichten verworfen"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1273
+#: src/transport/gnunet-service-transport_neighbours.c:1311
 msgid "# messages timed out while in transport queue"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1315
+#: src/transport/gnunet-service-transport_neighbours.c:1368
 #, fuzzy
 msgid "# keepalives sent"
 msgstr "# p2p Trace-Antworten gesendet"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1339
+#: src/transport/gnunet-service-transport_neighbours.c:1401
 #, fuzzy
 msgid "# KEEPALIVE messages discarded (peer unknown)"
 msgstr "# defragmentierter Nachrichten"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1347
+#: src/transport/gnunet-service-transport_neighbours.c:1409
 #, fuzzy
 msgid "# KEEPALIVE messages discarded (no session)"
 msgstr "# defragmentierter Nachrichten"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1380
+#: src/transport/gnunet-service-transport_neighbours.c:1456
 #, fuzzy
 msgid "# KEEPALIVE_RESPONSE messages discarded (not connected)"
 msgstr "# defragmentierter Nachrichten"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1389
+#: src/transport/gnunet-service-transport_neighbours.c:1465
 #, fuzzy
 msgid "# KEEPALIVE_RESPONSE messages discarded (not expected)"
 msgstr "# defragmentierter Nachrichten"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1446
+#: src/transport/gnunet-service-transport_neighbours.c:1473
+#, fuzzy
+msgid "# KEEPALIVE_RESPONSE messages discarded (address changed)"
+msgstr "# defragmentierter Nachrichten"
+
+#: src/transport/gnunet-service-transport_neighbours.c:1481
+#, fuzzy
+msgid "# KEEPALIVE_RESPONSE messages discarded (wrong nonce)"
+msgstr "# defragmentierter Nachrichten"
+
+#: src/transport/gnunet-service-transport_neighbours.c:1558
 #, fuzzy
 msgid "# messages discarded due to lack of neighbour record"
 msgstr "# defragmentierter Nachrichten"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1480
+#: src/transport/gnunet-service-transport_neighbours.c:1592
 #, fuzzy
 msgid "# bandwidth quota violations by other peers"
 msgstr "Verfolgt die Bandbreitennutzung von gnunetd"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1496
+#: src/transport/gnunet-service-transport_neighbours.c:1608
 msgid "# ms throttling suggested"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1585
+#: src/transport/gnunet-service-transport_neighbours.c:1700
 #, fuzzy
 msgid "# SESSION_CONNECT messages sent"
 msgstr "# verschlüsselter PONG Nachrichten empfangen"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1601
+#: src/transport/gnunet-service-transport_neighbours.c:1716
 #, 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
+#: src/transport/gnunet-service-transport_neighbours.c:1759
 #, fuzzy
 msgid "# CONNECT_ACK messages sent"
 msgstr "# verschlüsselter PONG Nachrichten empfangen"
 
-#: src/transport/gnunet-service-transport_neighbours.c:2106
+#: src/transport/gnunet-service-transport_neighbours.c:2236
 #, fuzzy
 msgid "# CONNECT messages received"
 msgstr "# verschlüsselter PONG Nachrichten empfangen"
 
-#: src/transport/gnunet-service-transport_neighbours.c:2111
+#: src/transport/gnunet-service-transport_neighbours.c:2241
 #, c-format
 msgid "CONNECT request from peer `%s' ignored due impending shutdown\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:2824
+#: src/transport/gnunet-service-transport_neighbours.c:2979
 #, fuzzy
 msgid "# CONNECT_ACK messages received"
 msgstr "# verschlüsselter PONG Nachrichten empfangen"
 
-#: src/transport/gnunet-service-transport_neighbours.c:2832
+#: src/transport/gnunet-service-transport_neighbours.c:2987
 #, fuzzy
 msgid "# unexpected CONNECT_ACK messages (no peer)"
 msgstr "COUNT Nachrichten versenden"
 
-#: src/transport/gnunet-service-transport_neighbours.c:2847
-#: src/transport/gnunet-service-transport_neighbours.c:2882
+#: src/transport/gnunet-service-transport_neighbours.c:3002
+#: src/transport/gnunet-service-transport_neighbours.c:3039
 #, fuzzy
 msgid "# unexpected CONNECT_ACK messages (not ready)"
 msgstr "COUNT Nachrichten versenden"
 
-#: src/transport/gnunet-service-transport_neighbours.c:2895
+#: src/transport/gnunet-service-transport_neighbours.c:3052
 #, fuzzy
 msgid "# unexpected CONNECT_ACK messages (waiting on ATS)"
 msgstr "COUNT Nachrichten versenden"
 
-#: src/transport/gnunet-service-transport_neighbours.c:2926
+#: src/transport/gnunet-service-transport_neighbours.c:3085
 #, fuzzy
 msgid "# unexpected CONNECT_ACK messages (disconnecting)"
 msgstr "COUNT Nachrichten versenden"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3106
+#: src/transport/gnunet-service-transport_neighbours.c:3265
 #, fuzzy
 msgid "# SESSION_ACK messages received"
 msgstr "# verschlüsselter PONG Nachrichten empfangen"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3122
+#: src/transport/gnunet-service-transport_neighbours.c:3284
 #, fuzzy
 msgid "# unexpected SESSION_ACK messages"
 msgstr "# verschlüsselter PONG Nachrichten gesendet"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3176
+#: src/transport/gnunet-service-transport_neighbours.c:3340
 msgid "# SET QUOTA messages ignored (no such peer)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3190
+#: src/transport/gnunet-service-transport_neighbours.c:3355
 msgid "# disconnects due to quota of 0"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3220
+#: src/transport/gnunet-service-transport_neighbours.c:3383
 msgid "# disconnect messages ignored (old format)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3226
+#: src/transport/gnunet-service-transport_neighbours.c:3389
 #, fuzzy
 msgid "# DISCONNECT messages received"
 msgstr "# verschlüsselter PONG Nachrichten empfangen"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3235
+#: src/transport/gnunet-service-transport_neighbours.c:3398
 msgid "# disconnect messages ignored (timestamp)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3271
+#: src/transport/gnunet-service-transport_neighbours.c:3434
 msgid "# other peer asked to disconnect from us"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3366
+#: src/transport/gnunet-service-transport_neighbours.c:3532
 #, fuzzy
 msgid "# disconnected from peer upon explicit request"
 msgstr "# gap Anfragen verworfen: Kollision in RT"
@@ -6779,20 +6800,22 @@ msgstr "# gap Anfragen verworfen: Kollision in RT"
 msgid "Transport service is lacking NEIGHBOUR_LIMIT option.\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_plugins.c:170
-#: src/transport/gnunet-service-transport_plugins.c:178
-#: src/transport/gnunet-service-transport_plugins.c:186
-#: src/transport/gnunet-service-transport_plugins.c:194
-#: src/transport/gnunet-service-transport_plugins.c:202
-#: 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
+#: src/transport/gnunet-service-transport_plugins.c:172
+#: src/transport/gnunet-service-transport_plugins.c:180
+#: src/transport/gnunet-service-transport_plugins.c:188
+#: src/transport/gnunet-service-transport_plugins.c:196
+#: src/transport/gnunet-service-transport_plugins.c:204
+#: src/transport/gnunet-service-transport_plugins.c:212
+#: src/transport/gnunet-service-transport_plugins.c:220
+#: src/transport/gnunet-service-transport_plugins.c:228
+#: src/transport/gnunet-service-transport_plugins.c:236
+#: src/transport/gnunet-service-transport_plugins.c:244
+#: src/transport/gnunet-service-transport_plugins.c:252
 #, 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:241
+#: src/transport/gnunet-service-transport_plugins.c:259
 #, 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"
@@ -7040,7 +7063,7 @@ msgstr "# defragmentierter Nachrichten"
 
 #: src/transport/plugin_transport_bluetooth.c:681
 #: src/transport/plugin_transport_bluetooth.c:731
-#: src/transport/plugin_transport_bluetooth.c:1854
+#: src/transport/plugin_transport_bluetooth.c:1881
 #, fuzzy
 msgid "# Bluetooth sessions allocated"
 msgstr "# Sitzungsschlüssel akzeptiert"
@@ -7056,188 +7079,188 @@ msgstr ""
 
 #: src/transport/plugin_transport_bluetooth.c:938
 #: src/transport/plugin_transport_bluetooth.c:1023
-#: src/transport/plugin_transport_bluetooth.c:1856
+#: src/transport/plugin_transport_bluetooth.c:1883
 #, fuzzy
 msgid "# Bluetooth MAC endpoints allocated"
 msgstr "# Client Trace-Anfragen empfangen"
 
-#: src/transport/plugin_transport_bluetooth.c:1235
+#: src/transport/plugin_transport_bluetooth.c:1250
 #, fuzzy
 msgid "# HELLO messages received via Bluetooth"
 msgstr "# verschlüsselter PONG Nachrichten empfangen"
 
-#: src/transport/plugin_transport_bluetooth.c:1261
+#: src/transport/plugin_transport_bluetooth.c:1276
 #, fuzzy
 msgid "# fragments received via Bluetooth"
 msgstr "# verworfener Nachrichten"
 
-#: src/transport/plugin_transport_bluetooth.c:1271
+#: src/transport/plugin_transport_bluetooth.c:1286
 #, fuzzy
 msgid "# ACKs received via Bluetooth"
 msgstr "# Bytes empfangen über TCP"
 
-#: src/transport/plugin_transport_bluetooth.c:1328
+#: src/transport/plugin_transport_bluetooth.c:1343
 #, fuzzy
 msgid "# Bluetooth DATA messages discarded due to CRC32 error"
 msgstr "# defragmentierter Nachrichten"
 
-#: src/transport/plugin_transport_bluetooth.c:1440
+#: src/transport/plugin_transport_bluetooth.c:1455
 #, fuzzy
 msgid "# DATA messages received via Bluetooth"
 msgstr "# verschlüsselter PONG Nachrichten empfangen"
 
-#: src/transport/plugin_transport_bluetooth.c:1475
+#: src/transport/plugin_transport_bluetooth.c:1490
 #, fuzzy
 msgid "# Bluetooth DATA messages processed"
 msgstr "# verschlüsselter PONG Nachrichten empfangen"
 
-#: src/transport/plugin_transport_bluetooth.c:1538
+#: src/transport/plugin_transport_bluetooth.c:1553
 #, fuzzy
 msgid "# HELLO beacons sent via Bluetooth"
 msgstr "# Bytes gesendet über UDP"
 
-#: src/transport/plugin_transport_bluetooth.c:1651
+#: src/transport/plugin_transport_bluetooth.c:1666
 msgid "Bluetooth address with invalid size encountered\n"
 msgstr ""
 
-#: src/transport/plugin_transport_bluetooth.c:1835
+#: src/transport/plugin_transport_bluetooth.c:1862
 #, c-format
 msgid "Helper binary `%s' not SUID, cannot run bluetooth transport\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_client.c:1590
+#: src/transport/plugin_transport_http_client.c:1618
 #, c-format
 msgid "Could not initialize curl multi handle, failed to start %s plugin!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_client.c:1727
-#: src/transport/plugin_transport_http_server.c:2974
+#: src/transport/plugin_transport_http_client.c:1693
+#: src/transport/plugin_transport_http_server.c:3001
 #, fuzzy, c-format
 msgid "Shutting down plugin `%s'\n"
 msgstr "Teste Transport(e) %s\n"
 
-#: src/transport/plugin_transport_http_client.c:1752
-#: src/transport/plugin_transport_http_server.c:3032
+#: src/transport/plugin_transport_http_client.c:1718
+#: src/transport/plugin_transport_http_server.c:3059
 #, 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:1780
-#: src/transport/plugin_transport_http_server.c:2874
+#: src/transport/plugin_transport_http_client.c:1746
+#: src/transport/plugin_transport_http_server.c:2901
 #, 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:1389
+#: src/transport/plugin_transport_http_server.c:1416
 #, 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:1653
+#: src/transport/plugin_transport_http_server.c:1680
 #, c-format
 msgid "Accepting connection (%u of %u) from `%s'\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:1661
+#: src/transport/plugin_transport_http_server.c:1688
 #, c-format
 msgid ""
 "Server reached maximum number connections (%u), rejecting new connection\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:1947
+#: src/transport/plugin_transport_http_server.c:1974
 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:1971
+#: src/transport/plugin_transport_http_server.c:1998
 #, c-format
 msgid "No usable TLS certificate found and creating one at `%s/%s' failed!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:2378
+#: src/transport/plugin_transport_http_server.c:2405
 #, 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
+#: src/transport/plugin_transport_http_server.c:2437 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
+#: src/transport/plugin_transport_http_server.c:2454 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
+#: src/transport/plugin_transport_http_server.c:2565
 #, c-format
 msgid "Found %u addresses to report to NAT service\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:2610
+#: src/transport/plugin_transport_http_server.c:2637
 msgid "Disabling IPv6 since it is not supported on this system!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:2697
+#: src/transport/plugin_transport_http_server.c:2724
 #, c-format
 msgid "IPv4 support is %s\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:2711
+#: src/transport/plugin_transport_http_server.c:2738
 #, c-format
 msgid "IPv6 support is %s\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:2718
+#: src/transport/plugin_transport_http_server.c:2745
 #, 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
+#: src/transport/plugin_transport_http_server.c:2756
 #, fuzzy
 msgid "Port is required! Fix in configuration\n"
 msgstr " gconfig\tGTK Konfiguration\n"
 
-#: src/transport/plugin_transport_http_server.c:2736
+#: src/transport/plugin_transport_http_server.c:2763
 #, fuzzy, c-format
 msgid "Using port %u\n"
 msgstr "Teste Transport(e) %s\n"
 
-#: src/transport/plugin_transport_http_server.c:2751
+#: src/transport/plugin_transport_http_server.c:2778
 #, 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:2761
+#: src/transport/plugin_transport_http_server.c:2788
 #, fuzzy, c-format
 msgid "Binding to IPv4 address %s\n"
 msgstr "Ungültiger Parameter: `%s'\n"
 
-#: src/transport/plugin_transport_http_server.c:2782
+#: src/transport/plugin_transport_http_server.c:2809
 #, 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:2792
+#: src/transport/plugin_transport_http_server.c:2819
 #, fuzzy, c-format
 msgid "Binding to IPv6 address %s\n"
 msgstr "Ungültiger Parameter: `%s'\n"
 
-#: src/transport/plugin_transport_http_server.c:2844
+#: src/transport/plugin_transport_http_server.c:2871
 #, fuzzy, c-format
 msgid "Using external hostname `%s'\n"
 msgstr "Collection `%s' begonnen.\n"
 
-#: src/transport/plugin_transport_http_server.c:2860
+#: src/transport/plugin_transport_http_server.c:2887
 #, fuzzy, c-format
 msgid "Notifying transport only about hostname `%s'\n"
 msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
@@ -7292,68 +7315,68 @@ msgstr "# Bytes gesendet über TCP"
 msgid "# bytes dropped by SMTP (outgoing)"
 msgstr "# Bytes verworfen von TCP (ausgehend)"
 
-#: src/transport/plugin_transport_tcp.c:632
+#: src/transport/plugin_transport_tcp.c:576
 #, c-format
 msgid "Unexpected address length: %u bytes\n"
 msgstr ""
 
-#: 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
+#: src/transport/plugin_transport_tcp.c:799
+#: src/transport/plugin_transport_tcp.c:979
+#: src/transport/plugin_transport_tcp.c:2120
+#: src/transport/plugin_transport_tcp.c:2723
+#, fuzzy
+msgid "# TCP sessions active"
+msgstr "# Sitzungsschlüssel akzeptiert"
+
+#: src/transport/plugin_transport_tcp.c:835
+#: src/transport/plugin_transport_tcp.c:972
+#: src/transport/plugin_transport_tcp.c:1061
+#: src/transport/plugin_transport_tcp.c:1111
+#: src/transport/plugin_transport_tcp.c:1290
+#: src/transport/plugin_transport_tcp.c:1309
 #, fuzzy
 msgid "# bytes currently in TCP buffers"
 msgstr "# Bytes gesendet über TCP"
 
-#: 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
+#: src/transport/plugin_transport_tcp.c:839
 #, fuzzy
-msgid "# TCP sessions active"
-msgstr "# Sitzungsschlüssel akzeptiert"
+msgid "# bytes discarded by TCP (disconnect)"
+msgstr "# Bytes verworfen von TCP (ausgehend)"
 
-#: src/transport/plugin_transport_tcp.c:935
+#: src/transport/plugin_transport_tcp.c:1065
 #, fuzzy
 msgid "# bytes discarded by TCP (timeout)"
 msgstr "# Bytes verworfen von TCP (ausgehend)"
 
-#: src/transport/plugin_transport_tcp.c:984
+#: src/transport/plugin_transport_tcp.c:1114
 #, fuzzy
 msgid "# bytes transmitted via TCP"
 msgstr "# Bytes des Typs %d übertragen"
 
-#: 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:1199
+#: src/transport/plugin_transport_tcp.c:1263
 #, c-format
 msgid "Trying to send with invalid session %p\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:1440
-#: src/transport/plugin_transport_udp.c:1471
+#: src/transport/plugin_transport_tcp.c:1520
+#: src/transport/plugin_transport_udp.c:1488
 msgid "# requests to create session with invalid address"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:1558
+#: src/transport/plugin_transport_tcp.c:1645
 msgid "# transport-service disconnect requests for TCP"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2091
+#: src/transport/plugin_transport_tcp.c:2170
 #, fuzzy
 msgid "# TCP WELCOME messages received"
 msgstr "# verschlüsselter PONG Nachrichten empfangen"
 
-#: src/transport/plugin_transport_tcp.c:2274
+#: src/transport/plugin_transport_tcp.c:2355
 msgid "# bytes received via TCP"
 msgstr "# Bytes empfangen über TCP"
 
-#: src/transport/plugin_transport_tcp.c:2354
+#: src/transport/plugin_transport_tcp.c:2433
 msgid "# network-level TCP disconnect events"
 msgstr ""
 
@@ -7368,16 +7391,16 @@ msgstr ""
 msgid "Failed to start service.\n"
 msgstr "Fehler beim Starten der Collection.\n"
 
-#: src/transport/plugin_transport_tcp.c:2710
+#: src/transport/plugin_transport_tcp.c:2712
 #, 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:2713
+#: src/transport/plugin_transport_tcp.c:2715
 msgid "TCP transport not listening on any port (client only)\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2716
+#: src/transport/plugin_transport_tcp.c:2718
 #, c-format
 msgid "TCP transport advertises itself as being on port %llu\n"
 msgstr ""
@@ -7392,57 +7415,57 @@ msgstr "# verschlüsselter PONG Nachrichten empfangen"
 msgid "# IPv4 broadcast HELLO beacons received via udp"
 msgstr "# verschlüsselter PONG Nachrichten empfangen"
 
-#: src/transport/plugin_transport_udp_broadcasting.c:605
+#: src/transport/plugin_transport_udp_broadcasting.c:606
 msgid ""
 "Disabling HELLO broadcasting due to friend-to-friend only configuration!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_udp_broadcasting.c:619
+#: src/transport/plugin_transport_udp_broadcasting.c:629
 #, c-format
 msgid "Failed to set IPv4 broadcast option for broadcast socket on port %d\n"
 msgstr ""
 
-#: src/transport/plugin_transport_udp.c:1581
+#: src/transport/plugin_transport_udp.c:1599
 #, 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:2635
+#: src/transport/plugin_transport_udp.c:2680
 #, 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:2649
+#: src/transport/plugin_transport_udp.c:2694
 msgid ""
 "UDP could not transmit IPv6 message! Please check your network configuration "
 "and disable IPv6 if your connection does not have a global IPv6 address\n"
 msgstr ""
 
-#: src/transport/plugin_transport_udp.c:2949
+#: src/transport/plugin_transport_udp.c:2993
 #, fuzzy
 msgid "Failed to open UDP sockets\n"
 msgstr "Fehler beim Binden an UDP6 Port %d.\n"
 
-#: src/transport/plugin_transport_udp.c:3046
+#: src/transport/plugin_transport_udp.c:3091
 #, c-format
 msgid "Given `%s' option is out of range: %llu > %u\n"
 msgstr ""
 
-#: src/transport/plugin_transport_udp.c:3089
+#: src/transport/plugin_transport_udp.c:3134
 #, fuzzy, c-format
 msgid "Invalid IPv6 address: `%s'\n"
 msgstr "Ungültiger Parameter: `%s'\n"
 
-#: src/transport/plugin_transport_udp.c:3148
+#: src/transport/plugin_transport_udp.c:3200
 #, 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:1625
+#: src/transport/plugin_transport_unix.c:1657
 #, fuzzy
 msgid "Failed to open UNIX listen socket\n"
 msgstr "Datei wurde als `%s' gespeichert.\n"
@@ -7457,73 +7480,73 @@ msgid "# WLAN messages defragmented"
 msgstr "# defragmentierter Nachrichten"
 
 #: src/transport/plugin_transport_wlan.c:691
-#: src/transport/plugin_transport_wlan.c:763
-#: src/transport/plugin_transport_wlan.c:1910
+#: src/transport/plugin_transport_wlan.c:778
+#: src/transport/plugin_transport_wlan.c:1937
 #, fuzzy
 msgid "# WLAN sessions allocated"
 msgstr "# Sitzungsschlüssel akzeptiert"
 
-#: src/transport/plugin_transport_wlan.c:868
+#: src/transport/plugin_transport_wlan.c:883
 #, fuzzy
 msgid "# WLAN message fragments sent"
 msgstr "# fragmentierter Nachrichten"
 
-#: src/transport/plugin_transport_wlan.c:892
+#: src/transport/plugin_transport_wlan.c:907
 msgid "# WLAN messages pending (with fragmentation)"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:1000
-#: src/transport/plugin_transport_wlan.c:1086
-#: src/transport/plugin_transport_wlan.c:1912
+#: src/transport/plugin_transport_wlan.c:1015
+#: src/transport/plugin_transport_wlan.c:1101
+#: src/transport/plugin_transport_wlan.c:1939
 #, fuzzy
 msgid "# WLAN MAC endpoints allocated"
 msgstr "# Client Trace-Anfragen empfangen"
 
-#: src/transport/plugin_transport_wlan.c:1282
+#: src/transport/plugin_transport_wlan.c:1297
 #, fuzzy
 msgid "# HELLO messages received via WLAN"
 msgstr "# verschlüsselter PONG Nachrichten empfangen"
 
-#: src/transport/plugin_transport_wlan.c:1308
+#: src/transport/plugin_transport_wlan.c:1323
 #, fuzzy
 msgid "# fragments received via WLAN"
 msgstr "# verworfener Nachrichten"
 
-#: src/transport/plugin_transport_wlan.c:1318
+#: src/transport/plugin_transport_wlan.c:1333
 #, fuzzy
 msgid "# ACKs received via WLAN"
 msgstr "# Bytes empfangen über TCP"
 
-#: src/transport/plugin_transport_wlan.c:1375
+#: src/transport/plugin_transport_wlan.c:1390
 #, fuzzy
 msgid "# WLAN DATA messages discarded due to CRC32 error"
 msgstr "# defragmentierter Nachrichten"
 
-#: src/transport/plugin_transport_wlan.c:1496
+#: src/transport/plugin_transport_wlan.c:1511
 #, fuzzy
 msgid "# DATA messages received via WLAN"
 msgstr "# verschlüsselter PONG Nachrichten empfangen"
 
-#: src/transport/plugin_transport_wlan.c:1531
+#: src/transport/plugin_transport_wlan.c:1546
 #, fuzzy
 msgid "# WLAN DATA messages processed"
 msgstr "# verschlüsselter PONG Nachrichten empfangen"
 
-#: src/transport/plugin_transport_wlan.c:1594
+#: src/transport/plugin_transport_wlan.c:1609
 #, fuzzy
 msgid "# HELLO beacons sent via WLAN"
 msgstr "# Bytes gesendet über UDP"
 
-#: src/transport/plugin_transport_wlan.c:1707
+#: src/transport/plugin_transport_wlan.c:1722
 msgid "WLAN address with invalid size encountered\n"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:1891
+#: src/transport/plugin_transport_wlan.c:1918
 #, c-format
 msgid "Helper binary `%s' not SUID, cannot run WLAN transport\n"
 msgstr ""
 
-#: src/transport/transport_api.c:682
+#: src/transport/transport_api.c:690
 #, 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"
@@ -7568,12 +7591,12 @@ msgstr ""
 msgid "Metadata `%s' failed to deserialize"
 msgstr ""
 
-#: src/util/client.c:261 src/util/client.c:851 src/util/service.c:625
+#: src/util/client.c:261 src/util/client.c:857 src/util/service.c:625
 #, c-format
 msgid "UNIXPATH `%s' too long, maximum length is %llu\n"
 msgstr ""
 
-#: src/util/client.c:265 src/util/client.c:856 src/util/service.c:629
+#: src/util/client.c:265 src/util/client.c:862 src/util/service.c:629
 #, fuzzy, c-format
 msgid "Using `%s' instead\n"
 msgstr "%s: Option `%s' ist mehrdeutig\n"
@@ -7590,17 +7613,17 @@ msgstr ""
 msgid "Need a non-empty hostname for service `%s'.\n"
 msgstr ""
 
-#: src/util/client.c:989
+#: src/util/client.c:995
 #, 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:1001
+#: src/util/client.c:1007
 #, 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:1284
+#: src/util/client.c:1290
 msgid "Could not submit request, not expecting to receive a response.\n"
 msgstr ""
 
@@ -7718,7 +7741,7 @@ msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
 msgid "Attempt to connect to `%s' failed\n"
 msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
 
-#: src/util/container_bloomfilter.c:516
+#: src/util/container_bloomfilter.c:531
 #, c-format
 msgid ""
 "Size of file on disk is incorrect for this Bloom filter (want %llu, have "
@@ -7987,13 +8010,13 @@ msgstr ""
 msgid "Use build-in GNUnet stub resolver"
 msgstr ""
 
-#: src/util/gnunet-service-resolver.c:288
+#: src/util/gnunet-service-resolver.c:283
 #, fuzzy, c-format
 msgid "Could not resolve `%s' (%s): %s\n"
 msgstr "`%s' konnte nicht aufgelöst werden: %s\n"
 
-#: src/util/gnunet-service-resolver.c:358
-#: src/util/gnunet-service-resolver.c:399
+#: src/util/gnunet-service-resolver.c:350
+#: src/util/gnunet-service-resolver.c:391
 #, c-format
 msgid "Could not find IP of host `%s': %s\n"
 msgstr "IP des Hosts `%s' konnte nicht ermittelt werden: %s\n"
@@ -8042,7 +8065,7 @@ msgstr "Fehler beim Anlegen des Benutzers"
 msgid "Unable to shorten unix path `%s' while keeping name unique\n"
 msgstr ""
 
-#: src/util/network.c:1397
+#: src/util/network.c:1344 src/util/network.c:1469
 #, c-format
 msgid ""
 "Fatal internal logic error, process hangs in `%s' (abort with CTRL-C)!\n"
@@ -8091,17 +8114,17 @@ msgstr "`%s' fehlgeschlagen für die Bibliothek `%s'. Ort: %s:%d. Fehler: %s\n"
 msgid "Could not determine plugin installation path.\n"
 msgstr "Öffentliche IP-Adresse konnte nicht ermittelt werden.\n"
 
-#: src/util/program.c:260 src/util/service.c:1449
+#: src/util/program.c:262 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
+#: src/util/program.c:274 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
+#: src/util/program.c:279 src/util/service.c:1459
 #, fuzzy
 msgid "Malformed configuration, exit ...\n"
 msgstr "Fehler beim Speichern der Konfigurationsdatei `%s':"
@@ -8261,114 +8284,114 @@ msgstr "Aufruf von `%s' gibt %d zurück.\n"
 msgid "b"
 msgstr "b"
 
-#: src/util/strings.c:450
+#: src/util/strings.c:452
 #, c-format
 msgid "Character sets requested were `%s'->`%s'\n"
 msgstr ""
 
-#: src/util/strings.c:578
+#: src/util/strings.c:580
 msgid "Failed to expand `$HOME': environment variable `HOME' not set"
 msgstr ""
 
-#: src/util/strings.c:675
+#: src/util/strings.c:677
 msgid "µs"
 msgstr ""
 
-#: src/util/strings.c:679
+#: src/util/strings.c:681
 msgid "forever"
 msgstr ""
 
-#: src/util/strings.c:681
+#: src/util/strings.c:683
 msgid "0 ms"
 msgstr ""
 
-#: src/util/strings.c:687
+#: src/util/strings.c:689
 msgid "ms"
 msgstr "ms"
 
-#: src/util/strings.c:693
+#: src/util/strings.c:695
 msgid "s"
 msgstr "s"
 
-#: src/util/strings.c:699
+#: src/util/strings.c:701
 msgid "m"
 msgstr "m"
 
-#: src/util/strings.c:705
+#: src/util/strings.c:707
 msgid "h"
 msgstr "h"
 
-#: src/util/strings.c:712
+#: src/util/strings.c:714
 #, fuzzy
 msgid "day"
 msgstr " Tage"
 
-#: src/util/strings.c:714
+#: src/util/strings.c:716
 #, fuzzy
 msgid "days"
 msgstr " Tage"
 
-#: src/util/strings.c:743
+#: src/util/strings.c:745
 msgid "end of time"
 msgstr ""
 
-#: src/util/strings.c:1149
+#: src/util/strings.c:1178
 msgid "IPv6 address did not start with `['\n"
 msgstr ""
 
-#: src/util/strings.c:1157
+#: src/util/strings.c:1186
 msgid "IPv6 address did contain ':' to separate port number\n"
 msgstr ""
 
-#: src/util/strings.c:1163
+#: src/util/strings.c:1192
 msgid "IPv6 address did contain ']' before ':' to separate port number\n"
 msgstr ""
 
-#: src/util/strings.c:1170
+#: src/util/strings.c:1199
 msgid "IPv6 address did contain a valid port number after the last ':'\n"
 msgstr ""
 
-#: src/util/strings.c:1179
+#: src/util/strings.c:1208
 #, fuzzy, c-format
 msgid "Invalid IPv6 address `%s': %s\n"
 msgstr "Ungültiger Parameter: `%s'\n"
 
-#: src/util/strings.c:1385 src/util/strings.c:1401
+#: src/util/strings.c:1414 src/util/strings.c:1430
 msgid "Port not in range\n"
 msgstr ""
 
-#: src/util/strings.c:1410
+#: src/util/strings.c:1439
 #, fuzzy, c-format
 msgid "Malformed port policy `%s'\n"
 msgstr "Der Transportdienst auf Port %d konnte nicht gestartet werden.\n"
 
-#: src/util/strings.c:1493 src/util/strings.c:1524 src/util/strings.c:1572
-#: src/util/strings.c:1593
+#: src/util/strings.c:1522 src/util/strings.c:1553 src/util/strings.c:1601
+#: src/util/strings.c:1622
 #, c-format
 msgid "Invalid format for IP: `%s'\n"
 msgstr "Ungültiges Format für IP: `%s'\n"
 
-#: src/util/strings.c:1550
+#: src/util/strings.c:1579
 #, 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:1602
+#: src/util/strings.c:1631
 #, fuzzy, c-format
 msgid "Invalid format: `%s'\n"
 msgstr "Ungültiger Parameter: `%s'\n"
 
-#: src/util/strings.c:1654
+#: src/util/strings.c:1683
 #, 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:1704
+#: src/util/strings.c:1733
 #, fuzzy, c-format
 msgid "Wrong format `%s' for netmask\n"
 msgstr "Falsches Format `%s' für Netzmaske: %s\n"
 
-#: src/util/strings.c:1735
+#: src/util/strings.c:1764
 #, fuzzy, c-format
 msgid "Wrong format `%s' for network\n"
 msgstr "Falsches Format `%s' für Netzwerk: %s\n"
@@ -8489,71 +8512,71 @@ msgstr ""
 msgid "IPv4 support disabled as this system does not support IPv4\n"
 msgstr ""
 
-#: src/vpn/gnunet-vpn.c:146
+#: src/vpn/gnunet-vpn.c:147
 #, fuzzy
 msgid "Error creating tunnel\n"
 msgstr "Hostkey wurde erfolgreich erzeugt.\n"
 
-#: src/vpn/gnunet-vpn.c:189 src/vpn/gnunet-vpn.c:220
+#: src/vpn/gnunet-vpn.c:190 src/vpn/gnunet-vpn.c:221
 #, fuzzy, c-format
 msgid "Option `%s' makes no sense with option `%s'.\n"
 msgstr "Option `%s' macht keinen Sinn ohne die Option `%s'.\n"
 
-#: src/vpn/gnunet-vpn.c:202
+#: src/vpn/gnunet-vpn.c:203
 #, fuzzy, c-format
 msgid "Option `%s' or `%s' is required.\n"
 msgstr "%s: Option `%s' ist mehrdeutig\n"
 
-#: src/vpn/gnunet-vpn.c:214
+#: src/vpn/gnunet-vpn.c:215
 #, fuzzy, c-format
 msgid "Option `%s' or `%s' is required when using option `%s'.\n"
 msgstr "Option `%s' macht keinen Sinn ohne die Option `%s'.\n"
 
-#: src/vpn/gnunet-vpn.c:233
+#: src/vpn/gnunet-vpn.c:235
 #, fuzzy, c-format
 msgid "`%s' is not a valid peer identifier.\n"
 msgstr "`%s' ist nicht verfügbar."
 
-#: src/vpn/gnunet-vpn.c:254
+#: src/vpn/gnunet-vpn.c:255
 #, fuzzy, c-format
 msgid "`%s' is not a valid IP address.\n"
 msgstr "`%s' ist nicht verfügbar."
 
-#: src/vpn/gnunet-vpn.c:289
+#: src/vpn/gnunet-vpn.c:290
 msgid "request that result should be an IPv4 address"
 msgstr ""
 
-#: src/vpn/gnunet-vpn.c:292
+#: src/vpn/gnunet-vpn.c:293
 msgid "request that result should be an IPv6 address"
 msgstr ""
 
-#: src/vpn/gnunet-vpn.c:295
+#: src/vpn/gnunet-vpn.c:296
 msgid "how long should the mapping be valid for new tunnels?"
 msgstr ""
 
-#: src/vpn/gnunet-vpn.c:298
+#: src/vpn/gnunet-vpn.c:299
 msgid "destination IP for the tunnel"
 msgstr ""
 
-#: src/vpn/gnunet-vpn.c:301
+#: src/vpn/gnunet-vpn.c:302
 msgid "peer offering the service we would like to access"
 msgstr ""
 
-#: src/vpn/gnunet-vpn.c:304
+#: src/vpn/gnunet-vpn.c:305
 msgid "name of the service we would like to access"
 msgstr ""
 
-#: src/vpn/gnunet-vpn.c:307
+#: src/vpn/gnunet-vpn.c:308
 #, fuzzy
 msgid "service is offered via TCP"
 msgstr "# Bytes empfangen über TCP"
 
-#: src/vpn/gnunet-vpn.c:310
+#: src/vpn/gnunet-vpn.c:311
 #, fuzzy
 msgid "service is offered via UDP"
 msgstr "# Bytes empfangen über UDP"
 
-#: src/vpn/gnunet-vpn.c:322
+#: src/vpn/gnunet-vpn.c:323
 msgid "Setup tunnels via VPN."
 msgstr ""
 
@@ -8574,6 +8597,18 @@ msgid "`%s' failed on file `%s' at %s:%d with error: %s\n"
 msgstr "`%s' schlug bei Datei `%s' fehl. Ort: %s:%d. Fehler: %s\n"
 
 #, fuzzy
+#~ msgid "Transport plugin: `%s' port %llu\n"
+#~ msgstr "Der Transportdienst auf Port %d konnte nicht gestartet werden.\n"
+
+#, fuzzy
+#~ msgid "Found %u transport plugins: `%s'\n"
+#~ msgstr "Teste Transport(e) %s\n"
+
+#, fuzzy
+#~ msgid "Failed to parse HELLO in file `%s': %s %u \n"
+#~ msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
+
+#, fuzzy
 #~ msgid "Internal error %d\n"
 #~ msgstr "Unbekannter Fehler.\n"
 
diff --git a/po/es.po b/po/es.po
index d5a77a74d..e8e23d535 100644
--- a/po/es.po
+++ b/po/es.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnunet 0.9.5a\n"
 "Report-Msgid-Bugs-To: gnunet-developers@mail.gnu.org\n"
-"POT-Creation-Date: 2013-12-12 22:41+0100\n"
+"POT-Creation-Date: 2013-12-23 19:38+0100\n"
 "PO-Revision-Date: 2013-02-23 17:50+0100\n"
 "Last-Translator: Miguel Ángel Arruga Vivas <rosen644835@gmail.com>\n"
 "Language-Team: Spanish <es@li.org>\n"
@@ -382,8 +382,8 @@ msgstr "Recibido mensaje %s\n"
 msgid "Received last message for %s \n"
 msgstr "Recibido último mensaje para %s\n"
 
-#: src/ats/gnunet-service-ats_addresses.c:1946
-#: src/ats/gnunet-service-ats_addresses.c:1990
+#: src/ats/gnunet-service-ats_addresses.c:1943
+#: src/ats/gnunet-service-ats_addresses.c:1987
 #, c-format
 msgid ""
 "Could not load quota for network `%s':  `%s', assigning default bandwidth "
@@ -393,12 +393,12 @@ msgstr ""
 "de banda predeterminado %llu\n"
 
 # Miguel: "Outbound" lo he traducido como salida en todo el texto.
-#: src/ats/gnunet-service-ats_addresses.c:1953
+#: src/ats/gnunet-service-ats_addresses.c:1950
 #, 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:1961
+#: src/ats/gnunet-service-ats_addresses.c:1958
 #, c-format
 msgid ""
 "No outbound quota configured for network `%s', assigning default bandwidth "
@@ -408,12 +408,12 @@ msgstr ""
 "de banda predeterminado %llu\n"
 
 # Miguel: "Inbound" lo he traducido como entrada en todo el texto.
-#: src/ats/gnunet-service-ats_addresses.c:1997
+#: src/ats/gnunet-service-ats_addresses.c:1994
 #, 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:2005
+#: src/ats/gnunet-service-ats_addresses.c:2002
 #, c-format
 msgid ""
 "No outbound quota configure for network `%s', assigning default bandwidth "
@@ -422,17 +422,17 @@ msgstr ""
 "No hay configurada una cuota de salida para la red «%s», asignando el ancho "
 "de banda predeterminado %llu\n"
 
-#: src/ats/gnunet-service-ats_addresses.c:2175
+#: src/ats/gnunet-service-ats_addresses.c:2172
 #, c-format
 msgid "Initializing solver `%s '`%s'\n"
 msgstr ""
 
-#: src/ats/gnunet-service-ats_addresses.c:2178
+#: src/ats/gnunet-service-ats_addresses.c:2175
 #, 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:2201
+#: src/ats/gnunet-service-ats_addresses.c:2198
 #, fuzzy
 msgid "Failed to initialize solver!\n"
 msgstr "¡No se puede inicializar el resolvedor!\n"
@@ -489,7 +489,7 @@ msgstr "La cuota de salida configurada para la red «%s» es %llu\n"
 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/plugin_ats_proportional.c:1514
+#: src/ats/plugin_ats_proportional.c:1511
 #, fuzzy, c-format
 msgid "Invalid network type `%u' `%s': Disconnect!\n"
 msgstr "No se encontró la IP del host «%s»: %s\n"
@@ -510,7 +510,7 @@ msgstr "El ATS devolvió resultados para %u direcciones\n"
 
 # Miguel: "Plugin" está traducido como módulo en todo el texto
 # puesto que no hay módulos fijos en contraposición a cargables.
-#: src/ats-tool/gnunet-ats.c:204
+#: src/ats-tool/gnunet-ats.c:205
 #, c-format
 msgid ""
 "Peer `%s' plugin `%s', address `%s', `%s' bw out: %u Bytes/s, bw in %u Bytes/"
@@ -519,102 +519,102 @@ msgstr ""
 "Par «%s» módulo «%s», dirección «%s», «%s» subida: %u Bytes/s, bajada %u "
 "Bytes/s, %s\n"
 
-#: src/ats-tool/gnunet-ats.c:328
+#: src/ats-tool/gnunet-ats.c:333
 #, c-format
 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:547
+#: src/ats-tool/gnunet-ats.c:352 src/namestore/gnunet-namestore.c:550
 #: 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:838
+#: src/ats-tool/gnunet-ats.c:364 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"
 
-#: src/ats-tool/gnunet-ats.c:367
+#: src/ats-tool/gnunet-ats.c:372
 #, c-format
 msgid "Please select one operation : %s or %s or %s or %s or %s\n"
 msgstr "Por favor, seleccione una operación: %s o %s o %s o %s o %s\n"
 
-#: src/ats-tool/gnunet-ats.c:383 src/ats-tool/gnunet-ats.c:402
-#: src/ats-tool/gnunet-ats.c:419 src/ats-tool/gnunet-ats.c:457
+#: src/ats-tool/gnunet-ats.c:388 src/ats-tool/gnunet-ats.c:407
+#: src/ats-tool/gnunet-ats.c:424 src/ats-tool/gnunet-ats.c:462
 #, c-format
 msgid "Cannot connect to ATS service, exiting...\n"
 msgstr "No se puede conectar al servicio ATS, saliendo...\n"
 
-#: src/ats-tool/gnunet-ats.c:392 src/ats-tool/gnunet-ats.c:409
+#: src/ats-tool/gnunet-ats.c:397 src/ats-tool/gnunet-ats.c:414
 #, c-format
 msgid "Cannot issue request to ATS service, exiting...\n"
 msgstr "No se puede iniciar una petición al servicio ATS, saliendo...\n"
 
-#: src/ats-tool/gnunet-ats.c:427
+#: src/ats-tool/gnunet-ats.c:432
 #, fuzzy, c-format
 msgid "No preference type given!\n"
 msgstr "establece las preferencias para el par dado"
 
-#: src/ats-tool/gnunet-ats.c:432
+#: src/ats-tool/gnunet-ats.c:437
 #, fuzzy, c-format
 msgid "No peer given!\n"
 msgstr "No se han proporcionado opciones\n"
 
-#: src/ats-tool/gnunet-ats.c:450
+#: src/ats-tool/gnunet-ats.c:455
 #, fuzzy
 msgid "Valid type required\n"
 msgstr "Tipo requerido\n"
 
-#: src/ats-tool/gnunet-ats.c:508
+#: src/ats-tool/gnunet-ats.c:513
 msgid "get list of active addresses currently used"
 msgstr "obtiene una lista de direcciones activas usadas actualmente"
 
-#: src/ats-tool/gnunet-ats.c:511
+#: src/ats-tool/gnunet-ats.c:516
 msgid "get list of all active addresses"
 msgstr "obtiene una lista de todas las direcciones activas"
 
-#: src/ats-tool/gnunet-ats.c:514
+#: src/ats-tool/gnunet-ats.c:519
 msgid "do not resolve IP addresses to hostnames"
 msgstr "no resuelve direcciones IP a nombres de máquina"
 
 # Miguel: Aquí he dejado monitorización porque esto es
 # del servicio de traducción de direcciones.
-#: src/ats-tool/gnunet-ats.c:517
+#: src/ats-tool/gnunet-ats.c:522
 msgid "monitor mode"
 msgstr "modo de monitorización"
 
-#: src/ats-tool/gnunet-ats.c:520
+#: src/ats-tool/gnunet-ats.c:525
 msgid "set preference for the given peer"
 msgstr "establece las preferencias para el par dado"
 
-#: src/ats-tool/gnunet-ats.c:523
+#: src/ats-tool/gnunet-ats.c:528
 msgid "print all configured quotas"
 msgstr "imprime todas las cuotas configuradas"
 
 # Miguel: He preferido extender id a identificación por claridad.
-#: src/ats-tool/gnunet-ats.c:526
+#: src/ats-tool/gnunet-ats.c:531
 msgid "peer id"
 msgstr "identificación del par"
 
 # Miguel: No me he encontrado esta opción todavía,
 # pero creo que son palabras clave.
-#: src/ats-tool/gnunet-ats.c:529
+#: src/ats-tool/gnunet-ats.c:534
 msgid "preference type to set: latency | bandwidth"
 msgstr ""
 "tipo de preferencia a modificar: latency (latencia) | bandwidth (ancho de "
 "banda)"
 
-#: src/ats-tool/gnunet-ats.c:532
+#: src/ats-tool/gnunet-ats.c:537
 msgid "preference value"
 msgstr "valor de preferencia"
 
 # Miguel: ¿Algo menos forzado que "salida prolija"?
-#: src/ats-tool/gnunet-ats.c:535
+#: src/ats-tool/gnunet-ats.c:540
 msgid "verbose output (include ATS address properties)"
 msgstr "salida prolija (incluye las propiedades de direcciones del ATS)"
 
-#: src/ats-tool/gnunet-ats.c:544
+#: src/ats-tool/gnunet-ats.c:549
 msgid "Print information about ATS state"
 msgstr "Imprime información acerca del estado del ATS"
 
@@ -643,7 +643,7 @@ msgid "be more verbose (print received values)"
 msgstr ""
 
 #: src/conversation/conversation_api.c:557
-#: src/conversation/conversation_api_call.c:468
+#: src/conversation/conversation_api_call.c:470
 #, fuzzy
 msgid "Connection to conversation service lost, trying to reconnect\n"
 msgstr ""
@@ -679,217 +679,226 @@ msgstr ""
 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:357
+#: src/conversation/gnunet-conversation.c:356
 #, c-format
-msgid "Phone active on line %u\n"
+msgid ""
+"Phone active on line %u.  Type `/help' for a list of available commands\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:379
+#: src/conversation/gnunet-conversation.c:378
 #, c-format
 msgid "Resolved address of `%s'. Now ringing other party.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:386
+#: src/conversation/gnunet-conversation.c:385
 #, fuzzy, c-format
 msgid "Connection established to `%s'\n"
 msgstr "'%s' falló en %s: %d con error: '%s'.\n"
 
-#: src/conversation/gnunet-conversation.c:393
+#: src/conversation/gnunet-conversation.c:392
 #, fuzzy, c-format
 msgid "Failed to resolve `%s'\n"
 msgstr "Se produjo un fallo al resolver «%s»: %s\n"
 
-#: src/conversation/gnunet-conversation.c:400
+#: src/conversation/gnunet-conversation.c:399
 msgid "Call terminated\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:406
+#: src/conversation/gnunet-conversation.c:405
 #, c-format
 msgid "Connection to `%s' suspended (by other user)\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:412
+#: src/conversation/gnunet-conversation.c:411
 #, c-format
 msgid "Connection to `%s' resumed (by other user)\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:479
+#: src/conversation/gnunet-conversation.c:416
+msgid "Error with the call, restarting it\n"
+msgstr ""
+
+#: src/conversation/gnunet-conversation.c:483
 #, c-format
 msgid "Unknown command `%s'\n"
 msgstr "Comando desconocido «%s»\n"
 
-#: src/conversation/gnunet-conversation.c:495
-#: src/conversation/gnunet-conversation.c:509
+#: src/conversation/gnunet-conversation.c:499
+#: src/conversation/gnunet-conversation.c:513
 #, c-format
 msgid "Ego `%s' not available\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:502
-#: src/conversation/gnunet-conversation.c:552
+#: src/conversation/gnunet-conversation.c:506
+#: src/conversation/gnunet-conversation.c:563
 msgid "You are calling someone else already, hang up first!\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:517
-#: src/conversation/gnunet-conversation.c:565
+#: src/conversation/gnunet-conversation.c:521
+#: src/conversation/gnunet-conversation.c:576
 #, c-format
 msgid "You are answering call from `%s', hang up or suspend that call first!\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:576
+#: src/conversation/gnunet-conversation.c:532
+msgid "Call recipient missing.\n"
+msgstr ""
+
+#: src/conversation/gnunet-conversation.c:587
 msgid "There is no incoming call to accept here!\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:593
+#: src/conversation/gnunet-conversation.c:604
 #, c-format
 msgid "There is no incoming call `%s' to accept right now!\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:621
+#: src/conversation/gnunet-conversation.c:632
 msgid "We currently do not have an address.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:644
+#: src/conversation/gnunet-conversation.c:655
 #, c-format
 msgid "We are currently trying to locate the private key for the ego `%s'.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:649
+#: src/conversation/gnunet-conversation.c:660
 #, c-format
 msgid "We are listening for incoming calls for ego `%s' on line %u.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:655
-#: src/conversation/gnunet-conversation.c:679
+#: src/conversation/gnunet-conversation.c:666
+#: src/conversation/gnunet-conversation.c:690
 #, c-format
 msgid "You are having a conversation with `%s'.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:660
+#: src/conversation/gnunet-conversation.c:671
 msgid ""
 "We had an internal error setting up our phone line. You can still make "
 "calls.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:669
+#: src/conversation/gnunet-conversation.c:680
 #, 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:674
+#: src/conversation/gnunet-conversation.c:685
 #, c-format
 msgid "We are calling `%s', his phone should be ringing.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:693
+#: src/conversation/gnunet-conversation.c:704
 msgid "Calls waiting:\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:699
+#: src/conversation/gnunet-conversation.c:710
 #, fuzzy, c-format
 msgid "#%u: `%s'\n"
 msgstr "Par «%s»\n"
 
-#: src/conversation/gnunet-conversation.c:727
-#: src/conversation/gnunet-conversation.c:742
+#: src/conversation/gnunet-conversation.c:738
+#: src/conversation/gnunet-conversation.c:753
 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
+#: src/conversation/gnunet-conversation.c:786
+#: src/conversation/gnunet-conversation.c:802
 msgid "There is no call that could be resumed right now.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:798
+#: src/conversation/gnunet-conversation.c:809
 #, c-format
 msgid "Already talking with `%s', cannot resume a call right now.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:807
+#: src/conversation/gnunet-conversation.c:818
 msgid "There is no incoming call to resume here!\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:824
+#: src/conversation/gnunet-conversation.c:835
 #, c-format
 msgid "There is no incoming call `%s' to resume right now!\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:859
+#: src/conversation/gnunet-conversation.c:870
 msgid "There is no call that could be cancelled right now.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:867
+#: src/conversation/gnunet-conversation.c:878
 msgid "There is no incoming call to refuse here!\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:884
+#: src/conversation/gnunet-conversation.c:895
 #, c-format
 msgid "There is no incoming call `%s' to refuse right now!\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:911
+#: src/conversation/gnunet-conversation.c:922
 msgid "Use `/address' to find out which address this phone should have in GNS"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:913
+#: src/conversation/gnunet-conversation.c:924
 msgid "Use `/call USER.gnu' to call USER"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:915
+#: src/conversation/gnunet-conversation.c:926
 msgid "Use `/accept #NUM' to accept incoming call #NUM"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:917
+#: src/conversation/gnunet-conversation.c:928
 msgid "Use `/suspend' to suspend the active call"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:919
+#: src/conversation/gnunet-conversation.c:930
 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
+#: src/conversation/gnunet-conversation.c:932
 msgid "Use `/cancel' to reject or terminate a call"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:923
+#: src/conversation/gnunet-conversation.c:934
 #, fuzzy
 msgid "Use `/status' to print status information"
 msgstr "ser prolijo (imprime información de progreso)"
 
-#: src/conversation/gnunet-conversation.c:925
+#: src/conversation/gnunet-conversation.c:936
 #, fuzzy
 msgid "Use `/quit' to terminate gnunet-conversation"
 msgstr "Use «/quit» para finalizar «gnunet-chat»"
 
-#: src/conversation/gnunet-conversation.c:927
+#: src/conversation/gnunet-conversation.c:938
 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:1082
+#: src/conversation/gnunet-conversation.c:1093
 #, 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:1095
+#: src/conversation/gnunet-conversation.c:1106
 #, fuzzy, c-format
 msgid "Our ego `%s' was deleted!\n"
 msgstr "El pseudónimo '%s' fue borrado.\n"
 
-#: src/conversation/gnunet-conversation.c:1130
+#: src/conversation/gnunet-conversation.c:1141
 #, 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:1156
+#: src/conversation/gnunet-conversation.c:1167
 msgid "sets the NAME of the ego to use for the phone (and name resolution)"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:1159
+#: src/conversation/gnunet-conversation.c:1170
 msgid "sets the LINE to use for the phone"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:1174
+#: src/conversation/gnunet-conversation.c:1185
 msgid "Enables having a conversation with other GNUnet users."
 msgstr ""
 
@@ -916,7 +925,6 @@ msgid ""
 msgstr ""
 
 #: src/conversation/gnunet-conversation-test.c:248
-#: src/integration-tests/connection_watchdog.c:1114
 #: src/multicast/gnunet-multicast.c:70 src/revocation/gnunet-revocation.c:517
 #: src/template/gnunet-template.c:70
 msgid "help text"
@@ -1033,17 +1041,17 @@ msgstr ""
 msgid "pa_stream_connect_record() failed: %s\n"
 msgstr "No se pudo borrar el registro: %s\n"
 
-#: src/conversation/gnunet-service-conversation.c:825
+#: src/conversation/gnunet-service-conversation.c:841
 msgid "Mesh audio channel not ready; audio data dropped\n"
 msgstr ""
 
-#: src/conversation/gnunet-service-conversation.c:915
+#: src/conversation/gnunet-service-conversation.c:932
 #, c-format
 msgid ""
 "No available phone for incoming call on line %u, sending HANG_UP signal\n"
 msgstr ""
 
-#: src/conversation/gnunet-service-conversation.c:1302
+#: src/conversation/gnunet-service-conversation.c:1338
 #, fuzzy, c-format
 msgid "Received incoming channel on port %u\n"
 msgstr "Desconectado de %s\n"
@@ -1126,54 +1134,54 @@ msgstr "# mensajes descartados (sesión desconectada)"
 msgid "# bytes of messages of type %u received"
 msgstr "# bytes de mensajes del tipo %u recibidos"
 
-#: src/core/gnunet-service-core_kx.c:531
+#: src/core/gnunet-service-core_kx.c:535
 msgid "# bytes encrypted"
 msgstr "# bytes cifrados"
 
-#: src/core/gnunet-service-core_kx.c:582
+#: src/core/gnunet-service-core_kx.c:586
 msgid "# bytes decrypted"
 msgstr "# bytes descifrados"
 
-#: src/core/gnunet-service-core_kx.c:668
+#: src/core/gnunet-service-core_kx.c:672
 msgid "# key exchanges initiated"
 msgstr "# intercambio de claves iniciados"
 
-#: src/core/gnunet-service-core_kx.c:708
+#: src/core/gnunet-service-core_kx.c:712
 msgid "# key exchanges stopped"
 msgstr "# intercambio de claves parados"
 
-#: src/core/gnunet-service-core_kx.c:771
+#: src/core/gnunet-service-core_kx.c:809
 msgid "# old ephemeral keys ignored"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:777
+#: src/core/gnunet-service-core_kx.c:815
 #, fuzzy
 msgid "# ephemeral keys received"
 msgstr "# mapas de tipos recibidos"
 
-#: src/core/gnunet-service-core_kx.c:811
+#: src/core/gnunet-service-core_kx.c:849
 #, 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:827
+#: src/core/gnunet-service-core_kx.c:860
 #, fuzzy
-msgid "# EPHEMERAL_KEY messages decrypted"
+msgid "# EPHEMERAL_KEY messages received"
 msgstr "# mensajes «SET_KEY» descifrados"
 
-#: src/core/gnunet-service-core_kx.c:930
+#: src/core/gnunet-service-core_kx.c:950
 #: src/transport/gnunet-service-transport_validation.c:974
 msgid "# PING messages received"
 msgstr "# mensajes PING recibidos"
 
-#: src/core/gnunet-service-core_kx.c:938
+#: src/core/gnunet-service-core_kx.c:958
 #, 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:965
+#: src/core/gnunet-service-core_kx.c:985
 #, c-format
 msgid ""
 "Received PING from `%s' for different identity: I am `%s', PONG identity: `"
@@ -1182,84 +1190,84 @@ msgstr ""
 "Recibido PING de «%s» para una identidad diferente: Yo soy «%s», identidad "
 "del PONG: «%s»\n"
 
-#: src/core/gnunet-service-core_kx.c:982
+#: src/core/gnunet-service-core_kx.c:1002
 msgid "# PONG messages created"
 msgstr "# mensajes PONG creados"
 
-#: src/core/gnunet-service-core_kx.c:1008
+#: src/core/gnunet-service-core_kx.c:1028
 msgid "# sessions terminated by timeout"
 msgstr "# sesiones terminadas por plazo de expiración"
 
-#: src/core/gnunet-service-core_kx.c:1018
+#: src/core/gnunet-service-core_kx.c:1038
 msgid "# keepalive messages sent"
 msgstr "# mensajes «keepalive» enviados"
 
-#: src/core/gnunet-service-core_kx.c:1075
+#: src/core/gnunet-service-core_kx.c:1095
 #: src/transport/gnunet-service-transport_validation.c:1285
 msgid "# PONG messages received"
 msgstr "# mensajes PONG recibidos"
 
-#: src/core/gnunet-service-core_kx.c:1081
+#: src/core/gnunet-service-core_kx.c:1101
 #, fuzzy
 msgid "# PONG messages dropped (connection down)"
 msgstr "# mensajes PONG recibidos"
 
-#: src/core/gnunet-service-core_kx.c:1086
+#: src/core/gnunet-service-core_kx.c:1106
 #, 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:1116
+#: src/core/gnunet-service-core_kx.c:1136
 msgid "# PONG messages decrypted"
 msgstr "# mensajes PONG descifrados"
 
-#: src/core/gnunet-service-core_kx.c:1150
+#: src/core/gnunet-service-core_kx.c:1170
 msgid "# session keys confirmed via PONG"
 msgstr "# claves de sesión confirmadas vía PONG"
 
-#: src/core/gnunet-service-core_kx.c:1160
+#: src/core/gnunet-service-core_kx.c:1180
 #, fuzzy
 msgid "# timeouts prevented via PONG"
 msgstr "# bytes recibidos vía TCP"
 
-#: src/core/gnunet-service-core_kx.c:1167
+#: src/core/gnunet-service-core_kx.c:1187
 msgid "# rekey operations confirmed via PONG"
 msgstr "# operaciones de cambio de clave confirmadas vía PONG"
 
-#: src/core/gnunet-service-core_kx.c:1307
+#: src/core/gnunet-service-core_kx.c:1327
 #, fuzzy
 msgid "# DATA message dropped (out of order)"
 msgstr "# bytes omitidos (fuera de secuencia)"
 
-#: src/core/gnunet-service-core_kx.c:1314
+#: src/core/gnunet-service-core_kx.c:1334
 #, 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:1317
+#: src/core/gnunet-service-core_kx.c:1337
 #, fuzzy
 msgid "# sessions terminated by key expiration"
 msgstr "# sesiones terminadas por plazo de expiración"
 
-#: src/core/gnunet-service-core_kx.c:1360
-#: src/core/gnunet-service-core_kx.c:1385
+#: src/core/gnunet-service-core_kx.c:1380
+#: src/core/gnunet-service-core_kx.c:1405
 msgid "# bytes dropped (duplicates)"
 msgstr "# bytes omitidos (duplicados)"
 
-#: src/core/gnunet-service-core_kx.c:1372
+#: src/core/gnunet-service-core_kx.c:1392
 msgid "# bytes dropped (out of sequence)"
 msgstr "# bytes omitidos (fuera de secuencia)"
 
-#: src/core/gnunet-service-core_kx.c:1413
+#: src/core/gnunet-service-core_kx.c:1433
 msgid "# bytes dropped (ancient message)"
 msgstr "# bytes omitidos (mensaje antiguo)"
 
-#: src/core/gnunet-service-core_kx.c:1421
+#: src/core/gnunet-service-core_kx.c:1441
 msgid "# bytes of payload decrypted"
 msgstr "# bytes de «payload» descifrados"
 
-#: src/core/gnunet-service-core_kx.c:1452
+#: src/core/gnunet-service-core_kx.c:1472
 #, fuzzy
 msgid "# PAYLOAD dropped (out of order)"
 msgstr "# bytes omitidos (fuera de secuencia)"
@@ -1269,7 +1277,7 @@ msgid "# sessions terminated by transport disconnect"
 msgstr "# sesiones terminadas por desconexión de transporte"
 
 #: src/core/gnunet-service-core_neighbours.c:179
-#: src/core/gnunet-service-core_neighbours.c:328
+#: src/core/gnunet-service-core_neighbours.c:329
 msgid "# neighbour entries allocated"
 msgstr "# entradas de vecinos alojadas"
 
@@ -1277,7 +1285,7 @@ msgstr "# entradas de vecinos alojadas"
 msgid "# encrypted bytes given to transport"
 msgstr "# bytes cifrados dados al transporte"
 
-#: src/core/gnunet-service-core_neighbours.c:411
+#: src/core/gnunet-service-core_neighbours.c:412
 #, c-format
 msgid "Unsupported message of type %u (%u bytes) received from peer `%s'\n"
 msgstr "Mensaje no soportado del tipo %u (%u bytes) recibido del par «%s»\n"
@@ -1291,11 +1299,11 @@ msgstr "Mensaje no soportado del tipo %u (%u bytes) recibido del par «%s»\n"
 #: 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: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
+#: src/transport/gnunet-service-transport_neighbours.c:929
+#: src/transport/gnunet-service-transport_neighbours.c:1161
+#: src/transport/gnunet-service-transport_neighbours.c:1170
+#: src/transport/gnunet-service-transport_neighbours.c:3015
+#: src/transport/gnunet-service-transport_neighbours.c:3291
 msgid "# peers connected"
 msgstr "# pares conectados"
 
@@ -1522,12 +1530,12 @@ msgid "# bytes purged (low-priority)"
 msgstr "# bytes purgados (baja prioridad)"
 
 #: src/datastore/gnunet-service-datastore.c:483
-#: src/gns/gnunet-gns-helper-service-w32.c:187
+#: src/gns/gnunet-gns-helper-service-w32.c:223
 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:215
+#: src/gns/gnunet-gns-helper-service-w32.c:262
 msgid "Shutdown in progress, aborting transmission.\n"
 msgstr "Apagado en proceso, abortando transmisión.\n"
 
@@ -1700,7 +1708,7 @@ msgstr "Se produjo un fallo al borrar una tabla de la base de datos.\n"
 
 #: src/datastore/plugin_datastore_postgres.c:860
 #: src/namecache/plugin_namecache_postgres.c:414
-#: src/namestore/plugin_namestore_postgres.c:564
+#: src/namestore/plugin_namestore_postgres.c:569
 msgid "Postgres database running\n"
 msgstr "Base de datos Postgres ejecutándose\n"
 
@@ -1797,7 +1805,7 @@ msgstr "opción para usar el demultiplexado de la DHT siempre"
 #: src/dht/gnunet-dht-get.c:201 src/dht/gnunet-dht-monitor.c:271
 #: src/dht/gnunet-dht-put.c:213 src/fs/gnunet-auto-share.c:753
 #: src/fs/gnunet-download.c:328 src/fs/gnunet-publish.c:877
-#: src/fs/gnunet-search.c:294 src/fs/gnunet-unindex.c:168
+#: src/fs/gnunet-search.c:301 src/fs/gnunet-unindex.c:168
 #: src/nse/gnunet-nse-profiler.c:873
 msgid "be verbose (print progress information)"
 msgstr "ser prolijo (imprime información de progreso)"
@@ -2273,20 +2281,20 @@ msgstr "# Paquetes UDP no-DNS recibidos vía interfaz TUN"
 msgid "# DNS requests received via TUN interface"
 msgstr "# Peticiones DNS recibidas vía interfaz TUN"
 
-#: src/dns/gnunet-service-dns.c:1049 src/exit/gnunet-daemon-exit.c:3499
+#: src/dns/gnunet-service-dns.c:1049 src/exit/gnunet-daemon-exit.c:3514
 #, 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:3556
+#: src/dns/gnunet-service-dns.c:1069 src/exit/gnunet-daemon-exit.c:3571
 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:166
+#: src/dv/gnunet-dv.c:169
 msgid "verbose output"
 msgstr ""
 
-#: src/dv/gnunet-dv.c:175
+#: src/dv/gnunet-dv.c:178
 #, fuzzy
 msgid "Print information about DV state"
 msgstr "Imprime información acerca del estado del ATS"
@@ -2301,14 +2309,14 @@ msgstr "Hay registros de servicios duplicados para «%s:%u»\n"
 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:1407
+#: src/exit/gnunet-daemon-exit.c:970 src/exit/gnunet-daemon-exit.c:2397
+#: src/exit/gnunet-daemon-exit.c:2654 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:1463
+#: src/exit/gnunet-daemon-exit.c:1007 src/exit/gnunet-daemon-exit.c:2456
+#: src/exit/gnunet-daemon-exit.c:2713 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)"
@@ -2366,97 +2374,107 @@ msgstr "# Paquetes TCP enviados vía TUN"
 msgid "# TCP service creation requests received via mesh"
 msgstr "# Peticiones de creaciones de servicio TCP recibidas vía mesh"
 
-#: src/exit/gnunet-daemon-exit.c:1875 src/exit/gnunet-daemon-exit.c:1965
-#: src/exit/gnunet-daemon-exit.c:2070 src/exit/gnunet-daemon-exit.c:2318
-#: src/exit/gnunet-daemon-exit.c:2567 src/exit/gnunet-daemon-exit.c:2856
-#: src/exit/gnunet-daemon-exit.c:2963
+#: src/exit/gnunet-daemon-exit.c:1875 src/exit/gnunet-daemon-exit.c:1968
+#: src/exit/gnunet-daemon-exit.c:2073 src/exit/gnunet-daemon-exit.c:2321
+#: src/exit/gnunet-daemon-exit.c:2570 src/exit/gnunet-daemon-exit.c:2859
+#: src/exit/gnunet-daemon-exit.c:2966
 msgid "# Bytes received from MESH"
 msgstr "# Bytes recibidos de MESH"
 
-#: src/exit/gnunet-daemon-exit.c:1907 src/exit/gnunet-daemon-exit.c:2985
-#, c-format
-msgid "No service found for %s on port %d!\n"
+#: src/exit/gnunet-daemon-exit.c:1909 src/exit/gnunet-daemon-exit.c:2990
+#, fuzzy, c-format
+msgid "No service %s found for %s on port %d!\n"
 msgstr "¡Ningún servicio encontrado para %s en el puerto %d!\n"
 
-#: src/exit/gnunet-daemon-exit.c:1911
+#: src/exit/gnunet-daemon-exit.c:1914
 msgid "# TCP requests dropped (no such service)"
 msgstr "# Peticiones TCP omitidas (no existe tal servicio)"
 
-#: src/exit/gnunet-daemon-exit.c:1968
+#: src/exit/gnunet-daemon-exit.c:1971
 msgid "# TCP IP-exit creation requests received via mesh"
 msgstr "# Peticiones de creación de salida IP por TCP recibidas vía mesh"
 
-#: src/exit/gnunet-daemon-exit.c:2073
+#: src/exit/gnunet-daemon-exit.c:2076
 msgid "# TCP data requests received via mesh"
 msgstr "# Peticiones de datos TCP recibidas vía mesh"
 
-#: src/exit/gnunet-daemon-exit.c:2087
+#: src/exit/gnunet-daemon-exit.c:2090
 msgid "# TCP DATA requests dropped (no session)"
 msgstr "# Peticiones de datos (DATA) TCP omitidas (no hay sesión)"
 
-#: src/exit/gnunet-daemon-exit.c:2147
+#: src/exit/gnunet-daemon-exit.c:2150
 msgid "# ICMP packets sent via TUN"
 msgstr "# Paquetes ICMP enviados vía TUN"
 
-#: src/exit/gnunet-daemon-exit.c:2321
+#: src/exit/gnunet-daemon-exit.c:2324
 msgid "# ICMP IP-exit requests received via mesh"
 msgstr "# Peticiones de salida IP por ICMP recibidas vía mesh"
 
-#: src/exit/gnunet-daemon-exit.c:2570
+#: src/exit/gnunet-daemon-exit.c:2573
 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:1397
+#: src/exit/gnunet-daemon-exit.c:2639 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:1433
+#: src/exit/gnunet-daemon-exit.c:2698 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)"
 
-#: src/exit/gnunet-daemon-exit.c:2745
+#: src/exit/gnunet-daemon-exit.c:2748
 msgid "# UDP packets sent via TUN"
 msgstr "# Paquetes UDP enviados vía TUN"
 
-#: src/exit/gnunet-daemon-exit.c:2859
+#: src/exit/gnunet-daemon-exit.c:2862
 msgid "# UDP IP-exit requests received via mesh"
 msgstr "# Peticiones de salida IP por UDP recibidas vía mesh"
 
-#: src/exit/gnunet-daemon-exit.c:2966
+#: src/exit/gnunet-daemon-exit.c:2969
 msgid "# UDP service requests received via mesh"
 msgstr "# Peticiones de servicio UDP recibidas vía mesh"
 
-#: src/exit/gnunet-daemon-exit.c:2989
+#: src/exit/gnunet-daemon-exit.c:2995
 msgid "# UDP requests dropped (no such service)"
 msgstr "# Peticiones UDP omitidas (no existe tal servicio)"
 
-#: src/exit/gnunet-daemon-exit.c:3025
+#: src/exit/gnunet-daemon-exit.c:3031
 #, fuzzy
 msgid "# Inbound MESH channels created"
 msgstr "# Túneles interiores MESH creados"
 
-#: src/exit/gnunet-daemon-exit.c:3286
+#: src/exit/gnunet-daemon-exit.c:3235 src/exit/gnunet-daemon-exit.c:3245
+#, fuzzy, c-format
+msgid "Option `%s' for domain `%s' is not formatted correctly!\n"
+msgstr "Las opción «%s» o «%s» es necesaria.\n"
+
+#: src/exit/gnunet-daemon-exit.c:3259 src/exit/gnunet-daemon-exit.c:3267
+#, c-format
+msgid "`%s' is not a valid port number (for domain `%s')!"
+msgstr ""
+
+#: src/exit/gnunet-daemon-exit.c:3300
 #, 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:3300 src/exit/gnunet-daemon-exit.c:3312
+#: src/exit/gnunet-daemon-exit.c:3314 src/exit/gnunet-daemon-exit.c:3326
 #, 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:3323
+#: src/exit/gnunet-daemon-exit.c:3337
 #, 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:3512
+#: src/exit/gnunet-daemon-exit.c:3527
 msgid ""
 "This system does not support IPv4, will disable IPv4 functions despite them "
 "being enabled in the configuration\n"
@@ -2464,7 +2482,7 @@ msgstr ""
 "Este sistema no soporta IPv4, se deshabilitarán las funciones IPv4 aunque "
 "estén habilitadas en la configuración\n"
 
-#: src/exit/gnunet-daemon-exit.c:3520
+#: src/exit/gnunet-daemon-exit.c:3535
 msgid ""
 "This system does not support IPv6, will disable IPv6 functions despite them "
 "being enabled in the configuration\n"
@@ -2472,7 +2490,7 @@ msgstr ""
 "Este sistema no soporta IPv6, se deshabilitarán las funciones IPv6 aunque "
 "estén habilitadas en la configuración\n"
 
-#: src/exit/gnunet-daemon-exit.c:3527
+#: src/exit/gnunet-daemon-exit.c:3542
 msgid ""
 "Cannot enable IPv4 exit but disable IPv4 on TUN interface, will use "
 "ENABLE_IPv4=YES\n"
@@ -2480,7 +2498,7 @@ msgstr ""
 "No se puede habilitar salida IPv4 pero se deshabilita IPv4 sobre interfaz "
 "TUN, se usará ENABLE_IPv4=YES\n"
 
-#: src/exit/gnunet-daemon-exit.c:3533
+#: src/exit/gnunet-daemon-exit.c:3548
 msgid ""
 "Cannot enable IPv6 exit but disable IPv6 on TUN interface, will use "
 "ENABLE_IPv6=YES\n"
@@ -2488,15 +2506,16 @@ msgstr ""
 "No se pudo habilitar la salida IPv6 pero se deshabilita IPv6 sobre interfaz "
 "TUN, se usará ENABLE_IPv6=YES\n"
 
-#: src/exit/gnunet-daemon-exit.c:3539 src/pt/gnunet-daemon-pt.c:1247
+#: src/exit/gnunet-daemon-exit.c:3554 src/exit/gnunet-daemon-exit.c:3717
+#: 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:3655
+#: src/exit/gnunet-daemon-exit.c:3664
 msgid "Must be a number"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3797
+#: src/exit/gnunet-daemon-exit.c:3813
 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"
 
@@ -3218,7 +3237,7 @@ msgid "Downloading `%s' done (%s/s).\n"
 msgstr "Finalizada descarga «%s» (%s/s).\n"
 
 #: src/fs/gnunet-download.c:209 src/fs/gnunet-publish.c:286
-#: src/fs/gnunet-search.c:193 src/fs/gnunet-unindex.c:108
+#: src/fs/gnunet-search.c:200 src/fs/gnunet-unindex.c:108
 #, c-format
 msgid "Unexpected status: %d\n"
 msgstr "Estado inesperado: %d\n"
@@ -3241,12 +3260,12 @@ msgid "Target filename must be specified.\n"
 msgstr "El nombre de fichero de destino debe ser especificado.\n"
 
 #: src/fs/gnunet-download.c:268 src/fs/gnunet-publish.c:797
-#: src/fs/gnunet-search.c:243 src/fs/gnunet-unindex.c:140
+#: src/fs/gnunet-search.c:250 src/fs/gnunet-unindex.c:140
 #, c-format
 msgid "Could not initialize `%s' subsystem.\n"
 msgstr "No se pudo inicializar el subsistema «%s».\n"
 
-#: src/fs/gnunet-download.c:305 src/fs/gnunet-search.c:282
+#: src/fs/gnunet-download.c:305 src/fs/gnunet-search.c:289
 msgid "set the desired LEVEL of receiver-anonymity"
 msgstr "establece el nivel LEVEL deseado de anonimato del receptor"
 
@@ -3254,7 +3273,7 @@ msgstr "establece el nivel LEVEL deseado de anonimato del receptor"
 msgid "delete incomplete downloads (when aborted with CTRL-C)"
 msgstr "borra descargas incompletas (cuando fueron abortadas con CTRL-C="
 
-#: src/fs/gnunet-download.c:311 src/fs/gnunet-search.c:285
+#: src/fs/gnunet-download.c:311 src/fs/gnunet-search.c:292
 msgid "only search the local peer (no P2P network search)"
 msgstr "únicamente buscar en el par local (no buscar en la red P2P)"
 
@@ -3417,7 +3436,7 @@ msgstr "Se debe especificar uno y solo un nombre de fichero para insertar.\n"
 msgid "You must NOT specify an URI and a filename.\n"
 msgstr "No se puede especificar una URI y un nombre de fichero.\n"
 
-#: src/fs/gnunet-publish.c:768 src/vpn/gnunet-vpn.c:208
+#: src/fs/gnunet-publish.c:768 src/vpn/gnunet-vpn.c:209
 #, c-format
 msgid "Option `%s' is required when using option `%s'.\n"
 msgstr "La opción «%s» es obligatoria cuando se usa la opción «%s».\n"
@@ -3504,32 +3523,32 @@ msgstr ""
 "Se produjo un fallo al escribir el directorio con los resultados de búsqueda "
 "de «%s»\n"
 
-#: src/fs/gnunet-search.c:184
+#: src/fs/gnunet-search.c:191
 #, c-format
 msgid "Error searching: %s.\n"
 msgstr "Error buscando: %s.\n"
 
-#: src/fs/gnunet-search.c:233
+#: src/fs/gnunet-search.c:240
 msgid "Could not create keyword URI from arguments.\n"
 msgstr "No se pudo crear URI de palabra clave a partir de los parámetros.\n"
 
-#: src/fs/gnunet-search.c:257
+#: src/fs/gnunet-search.c:264
 msgid "Could not start searching.\n"
 msgstr "No se pudo empezar a buscar.\n"
 
-#: src/fs/gnunet-search.c:288
+#: src/fs/gnunet-search.c:295
 msgid "write search results to file starting with PREFIX"
 msgstr "escribir resultados de búsqueda al fichero que empiecen por «PREFIX»"
 
-#: src/fs/gnunet-search.c:291
+#: src/fs/gnunet-search.c:298
 msgid "automatically terminate search after DELAY"
 msgstr "terminar búsqueda automáticamente después de «DELAY»"
 
-#: src/fs/gnunet-search.c:298
+#: src/fs/gnunet-search.c:305
 msgid "automatically terminate search after VALUE results are found"
 msgstr "terminar búsqueda después de «VALUE» resultados encontrados"
 
-#: src/fs/gnunet-search.c:309
+#: src/fs/gnunet-search.c:316
 msgid "Search GNUnet for files that were published on GNUnet"
 msgstr "Buscar en GNUnet ficheros que han sido publicados en GNUnet"
 
@@ -3905,7 +3924,7 @@ msgstr "No se pudo empezar la operación de desindexado.\n"
 msgid "Unindex a file that was previously indexed with gnunet-publish."
 msgstr "Desindexa un fichero previamente indexado con «gnunet-publish»."
 
-#: src/gns/gns_api.c:387
+#: src/gns/gns_api.c:393
 msgid "Failed to serialize lookup reply from GNS service!\n"
 msgstr ""
 "¡Se produjo un fallo al serializar la respuesta de la búsqueda desde el "
@@ -4011,14 +4030,14 @@ msgstr ""
 msgid "Ego for `%s' not found, cannot perform lookup.\n"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:336 src/gns/gnunet-gns-helper-service-w32.c:753
+#: src/gns/gnunet-gns.c:336 src/gns/gnunet-gns-helper-service-w32.c:798
 #, c-format
 msgid ""
 "Ego for `gns-master' not found, cannot perform lookup.  Did you run gnunet-"
 "gns-import.sh?\n"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:365 src/gns/gnunet-gns-helper-service-w32.c:783
+#: src/gns/gnunet-gns.c:365 src/gns/gnunet-gns-helper-service-w32.c:828
 #, c-format
 msgid "Failed to connect to GNS\n"
 msgstr "Se produjo un fallo al conectar con GNS\n"
@@ -4055,7 +4074,7 @@ msgstr "Especificar el tipo del registro a buscar"
 msgid "GNUnet GNS resolver tool"
 msgstr "Herramienta de acceso GNUnet GNS"
 
-#: src/gns/gnunet-gns-helper-service-w32.c:723
+#: src/gns/gnunet-gns-helper-service-w32.c:768
 #, c-format
 msgid ""
 "Ego for `gns-short' not found. This is not really fatal, but i'll pretend "
@@ -4063,7 +4082,7 @@ msgid ""
 "sh?\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-helper-service-w32.c:793
+#: src/gns/gnunet-gns-helper-service-w32.c:838
 #, fuzzy, c-format
 msgid "Failed to connect to identity service\n"
 msgstr "Fallo al conectar a gnunetd.\n"
@@ -4073,8 +4092,8 @@ msgstr "Fallo al conectar a gnunetd.\n"
 #: 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
+#: src/transport/plugin_transport_http_client.c:1070
+#: src/transport/plugin_transport_http_client.c:1085
 #, c-format
 msgid "%s failed at %s:%d: `%s'\n"
 msgstr "%s falló en %s:%d: «%s».\n"
@@ -4218,36 +4237,36 @@ msgstr "¡Se produjo un error al convertir los argumentos a una URI!\n"
 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:815
+#: src/gns/gnunet-service-gns_resolver.c:816
 #, 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:957
+#: src/gns/gnunet-service-gns_resolver.c:958
 #, c-format
 msgid "Skipping record of unsupported type %d\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns_resolver.c:1316
+#: src/gns/gnunet-service-gns_resolver.c:1317
 #, c-format
 msgid "GNS lookup resulted in DNS name that is too long (`%s')\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns_resolver.c:1809
+#: src/gns/gnunet-service-gns_resolver.c:1817
 msgid "GNS lookup recursion failed (no delegation record found)\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns_resolver.c:1833
+#: src/gns/gnunet-service-gns_resolver.c:1841
 #, 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:2071
+#: src/gns/gnunet-service-gns_resolver.c:2173
 #, c-format
 msgid "Zone %s was revoked, resolution fails\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns_resolver.c:2220
+#: src/gns/gnunet-service-gns_resolver.c:2322
 #, c-format
 msgid "Hostname `%s' is not well-formed, resolution fails\n"
 msgstr ""
@@ -4674,7 +4693,7 @@ msgstr ""
 "Los mensajes de anuncio no pudieron encolarse por el servicio principal\n"
 
 #: src/hostlist/hostlist-server.c:556 src/peerinfo-tool/gnunet-peerinfo.c:651
-#: src/transport/gnunet-service-transport.c:850
+#: src/transport/gnunet-service-transport.c:946
 msgid "Could not access PEERINFO service.  Exiting.\n"
 msgstr ""
 "No se pudo acceder al servicio de información de pares (PEERINFO).  "
@@ -4795,65 +4814,50 @@ msgstr "Se produjo un fallo al borrar el fichero de configuración %s\n"
 msgid "Failed to create directory `%s' for storing egos\n"
 msgstr "Se produjo un fallo al leer el directorio «%s»\n"
 
-#: src/integration-tests/connection_watchdog.c:1012
-#, c-format
-msgid "Transport plugin: `%s' port %llu\n"
-msgstr "Módulo de transporte: «%s» puerto %llu\n"
-
-#: src/integration-tests/connection_watchdog.c:1045
-#, c-format
-msgid "Found %u transport plugins: `%s'\n"
-msgstr "Encontrados %u módulos de transporte: «%s»\n"
-
-#: src/integration-tests/connection_watchdog.c:1105
-msgid "Send ping messages to test connectivity (default == NO)"
-msgstr ""
-"Enviar mensajes «ping» para probar la conectividad (predeterminado: NO)"
-
-#: src/mesh/gnunet-mesh.c:299
+#: src/mesh/gnunet-mesh.c:300
 #, fuzzy, c-format
 msgid "Invalid target `%s'\n"
 msgstr "Parámetro no válido «%s»\n"
 
-#: src/mesh/gnunet-mesh.c:417
+#: src/mesh/gnunet-mesh.c:434
 #, fuzzy, c-format
 msgid "Invalid tunnel owner `%s'\n"
 msgstr "Formato de tiempo no válido «%s»\n"
 
-#: src/mesh/gnunet-mesh.c:482
+#: src/mesh/gnunet-mesh.c:499
 msgid "You must NOT give a TARGET when using options\n"
 msgstr ""
 
-#: src/mesh/gnunet-mesh.c:559
+#: src/mesh/gnunet-mesh.c:576
 #, 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
+#: src/mesh/gnunet-mesh.c:579
 #, 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
+#: src/mesh/gnunet-mesh.c:582
 #, fuzzy
 msgid "provide information about all tunnels"
 msgstr "proveer información acerca de un túnel en particular"
 
-#: src/mesh/gnunet-mesh.c:568
+#: src/mesh/gnunet-mesh.c:585
 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:571
+#: src/mesh/gnunet-mesh.c:588
 msgid "port to listen to (default; 0)"
 msgstr ""
 
-#: src/mesh/gnunet-mesh.c:574
+#: src/mesh/gnunet-mesh.c:591
 msgid "provide information about a particular tunnel"
 msgstr "proveer información acerca de un túnel en particular"
 
-#: src/mesh/gnunet-service-mesh_peer.c:349
+#: src/mesh/gnunet-service-mesh_peer.c:377
 msgid "Wrong CORE service\n"
 msgstr "Servicio principal (CORE) erróneo\n"
 
@@ -4872,7 +4876,7 @@ msgstr "No se pudo acceder al fichero «%s»: %s\n"
 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:394
+#: src/namecache/gnunet-namecache.c:124 src/namestore/gnunet-namestore.c:397
 #, c-format
 msgid "\tCorrupt or unsupported record of type %u\n"
 msgstr "\tRegistro corrupto o no soportado del tipo %u\n"
@@ -4882,7 +4886,7 @@ msgstr "\tRegistro corrupto o no soportado del tipo %u\n"
 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:692
+#: src/namecache/gnunet-namecache.c:195 src/namestore/gnunet-namestore.c:695
 #, fuzzy, c-format
 msgid "Invalid public key for reverse lookup `%s'\n"
 msgstr "Parámetro no válido «%s»\n"
@@ -4892,7 +4896,7 @@ msgstr "Parámetro no válido «%s»\n"
 msgid "You must specify a name\n"
 msgstr "¡Debes especificar un receptor!\n"
 
-#: src/namecache/gnunet-namecache.c:234 src/namestore/gnunet-namestore.c:925
+#: src/namecache/gnunet-namecache.c:234 src/namestore/gnunet-namestore.c:931
 msgid "name of the record to add/delete/display"
 msgstr "nombre del registro a añadir/borrar/mostrar"
 
@@ -4901,7 +4905,7 @@ msgstr "nombre del registro a añadir/borrar/mostrar"
 msgid "spezifies the public key of the zone to look in"
 msgstr "Especificar el tipo del registro a buscar"
 
-#: src/namecache/gnunet-namecache.c:248 src/namestore/gnunet-namestore.c:957
+#: src/namecache/gnunet-namecache.c:248 src/namestore/gnunet-namestore.c:963
 msgid "GNUnet zone manipulation tool"
 msgstr "Herramienta de manipulación de zona de GNUnet"
 
@@ -4911,154 +4915,154 @@ msgid "Namecache failed to cache block"
 msgstr "El almacén de nombres no pudo añadir el registro"
 
 #: src/namecache/plugin_namecache_postgres.c:89
-#: src/namestore/plugin_namestore_postgres.c:93
+#: src/namestore/plugin_namestore_postgres.c:96
 msgid "Failed to create indices\n"
 msgstr "Se produjo un fallo al crear los índices\n"
 
-#: src/namestore/gnunet-namestore.c:304
+#: src/namestore/gnunet-namestore.c:303
 #, c-format
 msgid "Adding record failed: %s\n"
 msgstr "No se pudo añadir el registro: %s\n"
 
-#: src/namestore/gnunet-namestore.c:333
+#: src/namestore/gnunet-namestore.c:332
 #, 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:340
+#: src/namestore/gnunet-namestore.c:339
 #, fuzzy, c-format
 msgid "Deleting record failed%s%s\n"
 msgstr "No se pudo borrar el registro: %s\n"
 
-#: src/namestore/gnunet-namestore.c:555
+#: src/namestore/gnunet-namestore.c:558
 #, c-format
 msgid "No options given\n"
 msgstr "No se han proporcionado opciones\n"
 
-#: src/namestore/gnunet-namestore.c:566
+#: src/namestore/gnunet-namestore.c:569
 #: 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: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
+#: src/namestore/gnunet-namestore.c:577 src/namestore/gnunet-namestore.c:586
+#: src/namestore/gnunet-namestore.c:603 src/namestore/gnunet-namestore.c:625
+#: src/namestore/gnunet-namestore.c:665
 #, 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:575 src/namestore/gnunet-namestore.c:584
-#: src/namestore/gnunet-namestore.c:601 src/namestore/gnunet-namestore.c:623
+#: src/namestore/gnunet-namestore.c:578 src/namestore/gnunet-namestore.c:587
+#: src/namestore/gnunet-namestore.c:604 src/namestore/gnunet-namestore.c:626
 msgid "add"
 msgstr "añadir"
 
-#: src/namestore/gnunet-namestore.c:592
+#: src/namestore/gnunet-namestore.c:595
 #, c-format
 msgid "Unsupported type `%s'\n"
 msgstr "Tipo no soportado «%s»\n"
 
-#: src/namestore/gnunet-namestore.c:612
+#: src/namestore/gnunet-namestore.c:615
 #, 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:648
+#: src/namestore/gnunet-namestore.c:651
 #, c-format
 msgid "Invalid time format `%s'\n"
 msgstr "Formato de tiempo no válido «%s»\n"
 
-#: src/namestore/gnunet-namestore.c:663
+#: src/namestore/gnunet-namestore.c:666
 msgid "del"
 msgstr "borrar"
 
-#: src/namestore/gnunet-namestore.c:712
+#: src/namestore/gnunet-namestore.c:715
 #: src/peerinfo-tool/gnunet-peerinfo.c:703
 #, c-format
 msgid "Invalid URI `%s'\n"
 msgstr "URI no válida: «%s»\n"
 
-#: src/namestore/gnunet-namestore.c:747
+#: src/namestore/gnunet-namestore.c:750
 #, fuzzy, c-format
 msgid "Invalid nick `%s'\n"
 msgstr "URI no válida: «%s»\n"
 
-#: src/namestore/gnunet-namestore.c:787
+#: src/namestore/gnunet-namestore.c:790
 #, fuzzy, c-format
 msgid "Ego `%s' not known to identity service\n"
 msgstr "'%s': servicio desconocido: %s\n"
 
-#: src/namestore/gnunet-namestore.c:814
+#: src/namestore/gnunet-namestore.c:817
 #, fuzzy, c-format
 msgid "No default ego configured in identity service\n"
 msgstr "'%s': servicio desconocido: %s\n"
 
-#: src/namestore/gnunet-namestore.c:847
+#: src/namestore/gnunet-namestore.c:853
 #, fuzzy, c-format
 msgid "Identity service is not running\n"
 msgstr "El servicio «%s» no está ejecutandose\n"
 
-#: src/namestore/gnunet-namestore.c:859
+#: src/namestore/gnunet-namestore.c:865
 #, 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
+#: src/namestore/gnunet-namestore.c:913
 msgid "add record"
 msgstr "añadir registro"
 
-#: src/namestore/gnunet-namestore.c:910
+#: src/namestore/gnunet-namestore.c:916
 msgid "delete record"
 msgstr "borrar registro"
 
-#: src/namestore/gnunet-namestore.c:913
+#: src/namestore/gnunet-namestore.c:919
 msgid "display records"
 msgstr "mostrar registros"
 
-#: src/namestore/gnunet-namestore.c:916
+#: src/namestore/gnunet-namestore.c:922
 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:919
+#: src/namestore/gnunet-namestore.c:925
 #, 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
+#: src/namestore/gnunet-namestore.c:928
 #, 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:928
+#: src/namestore/gnunet-namestore.c:934
 #, fuzzy
 msgid "determine our name for the given PKEY"
 msgstr "establece las preferencias para el par dado"
 
-#: src/namestore/gnunet-namestore.c:931
+#: src/namestore/gnunet-namestore.c:937
 msgid "type of the record to add/delete/display"
 msgstr "tipo del registro a añadir/borrar/mostrar"
 
-#: src/namestore/gnunet-namestore.c:934
+#: src/namestore/gnunet-namestore.c:940
 msgid "URI to import into our zone"
 msgstr "URI a importar a nuestra zona"
 
-#: src/namestore/gnunet-namestore.c:937
+#: src/namestore/gnunet-namestore.c:943
 msgid "value of the record to add/delete"
 msgstr "valor del registro a añadir/borrar"
 
-#: src/namestore/gnunet-namestore.c:940
+#: src/namestore/gnunet-namestore.c:946
 msgid "create or list public record"
 msgstr "crear o listar registros públicos"
 
-#: src/namestore/gnunet-namestore.c:943
+#: src/namestore/gnunet-namestore.c:949
 msgid ""
 "create shadow record (only valid if all other records of the same type have "
 "expired"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:946
+#: src/namestore/gnunet-namestore.c:952
 #, fuzzy
 msgid "name of the ego controlling the zone"
 msgstr "nombre de la sección a la que acceder"
@@ -5124,7 +5128,7 @@ msgstr "Se produjo un fallo al conectar con GNS\n"
 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:634
+#: src/namestore/gnunet-service-namestore.c:638
 #, 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"
@@ -5145,78 +5149,78 @@ msgstr ""
 msgid "GNUnet NAT traversal test helper daemon"
 msgstr "Demonio de ayuda en las pruebas de recorrido NAT de GNUnet"
 
-#: src/nat/nat_auto.c:169
+#: src/nat/nat_auto.c:170
 msgid "NAT traversal with ICMP Server timed out.\n"
 msgstr "Recorrido NAT con servidor ICMP expirado.\n"
 
-#: src/nat/nat_auto.c:199
+#: src/nat/nat_auto.c:200
 msgid "NAT traversal with ICMP Server succeeded.\n"
 msgstr "Recorrido NAT con servidor ICMP satisfactorio.\n"
 
-#: src/nat/nat_auto.c:200
+#: src/nat/nat_auto.c:201
 msgid "NAT traversal with ICMP Server failed.\n"
 msgstr "Recorrido NAT con servidor ICMP fallido.\n"
 
-#: src/nat/nat_auto.c:219
+#: src/nat/nat_auto.c:222
 msgid "Testing connection reversal with ICMP server.\n"
 msgstr "Probando conexión inversa con el servidor ICMP.\n"
 
-#: src/nat/nat_auto.c:265
+#: src/nat/nat_auto.c:269
 #, c-format
 msgid "Detected external IP `%s'\n"
 msgstr "Detectada IP externa «%s»\n"
 
-#: src/nat/nat_auto.c:331
+#: src/nat/nat_auto.c:339
 msgid "This system has a global IPv6 address, setting IPv6 to supported.\n"
 msgstr ""
 "Este sistema tiene una dirección IPv6 global, fijando IPv6 a habilitado.\n"
 
-#: src/nat/nat_auto.c:347
+#: src/nat/nat_auto.c:355
 #, c-format
 msgid "Detected internal network address `%s'.\n"
 msgstr "Detectada dirección de la red interna «%s».\n"
 
-#: src/nat/nat_auto.c:400
+#: src/nat/nat_auto.c:408
 msgid "upnpc found, enabling its use\n"
 msgstr "«upnpc» encontrado, habilitando su uso\n"
 
-#: src/nat/nat_auto.c:401
+#: src/nat/nat_auto.c:409
 msgid "upnpc not found\n"
 msgstr "«upnpc» no encontrado\n"
 
-#: src/nat/nat_auto.c:434
+#: src/nat/nat_auto.c:442
 msgid "gnunet-helper-nat-server found, testing it\n"
 msgstr "«gnunet-helper-nat-server» encontrado, probándolo\n"
 
-#: src/nat/nat_auto.c:435
+#: src/nat/nat_auto.c:443
 msgid "No working gnunet-helper-nat-server found\n"
 msgstr "No se ha encontrado un «gnunet-helper-nat-server» funcional\n"
 
-#: src/nat/nat_auto.c:469
+#: src/nat/nat_auto.c:477
 msgid "gnunet-helper-nat-client found, enabling it\n"
 msgstr "«gnunet-helper-nat-client» encontrado, habilitando su uso\n"
 
-#: src/nat/nat_auto.c:470
+#: src/nat/nat_auto.c:478
 msgid "gnunet-helper-nat-client not found or behind NAT, disabling it\n"
 msgstr ""
 "«gnunet-helper-nat-client» no encontrado o detrás de NAT, deshabilitando su "
 "uso\n"
 
-#: src/nat/nat.c:834
+#: src/nat/nat.c:867
 #, c-format
 msgid "gnunet-helper-nat-server generated malformed address `%s'\n"
 msgstr "«gnunet-helper-nat-server» generó la dirección mal formada «%s»\n"
 
-#: src/nat/nat.c:883
+#: src/nat/nat.c:917
 #, c-format
 msgid "Failed to start %s\n"
 msgstr "Se produjo un fallo al arrancar %s\n"
 
-#: src/nat/nat.c:1152
+#: src/nat/nat.c:1203
 msgid "malformed"
 msgstr "mal formado"
 
-#: src/nat/nat.c:1218 src/nat/nat.c:1230
+#: src/nat/nat.c:1274 src/nat/nat.c:1286
 #, c-format
 msgid ""
 "Configuration requires `%s', but binary is not installed properly (SUID bit "
@@ -5225,13 +5229,13 @@ msgstr ""
 "La configuración requiere «%s», pero el binario no está instalado de forma "
 "correcta (SUID bit no activado).  Opción deshabilitada.\n"
 
-#: src/nat/nat.c:1365
+#: src/nat/nat.c:1424
 msgid "Internal IP address not known, cannot use ICMP NAT traversal method\n"
 msgstr ""
 "Direcciones internas IP no conocidas, no se puede usar el método del "
 "recorrido NAT ICMP\n"
 
-#: src/nat/nat.c:1376
+#: src/nat/nat.c:1440
 #, c-format
 msgid "Running gnunet-helper-nat-client %s %s %u\n"
 msgstr "Ejecutando gnunet-helper-nat-client %s %s %u\n"
@@ -5244,11 +5248,11 @@ msgstr "comando «external-ip» no encontrado\n"
 msgid "`upnpc' command not found\n"
 msgstr "comando «upnpc» no encontrado\n"
 
-#: src/nat/nat_test.c:345
+#: src/nat/nat_test.c:348
 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:414
+#: src/nat/nat_test.c:420
 #, c-format
 msgid "Failed to create listen socket bound to `%s' for NAT test: %s\n"
 msgstr ""
@@ -5307,15 +5311,16 @@ 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:373
+#: src/peerinfo/gnunet-service-peerinfo.c:390
 #, fuzzy, c-format
-msgid "Failed to parse HELLO in file `%s': %s %u \n"
+msgid "Failed to parse HELLO in file `%s'\n"
 msgstr "Se produjo un fallo al procesar «HELLO» en el fichero «%s»\n"
 
-#: src/peerinfo/gnunet-service-peerinfo.c:457
+#: src/peerinfo/gnunet-service-peerinfo.c:468
 msgid "# peers known"
 msgstr "# pares conocidos"
 
-#: src/peerinfo/gnunet-service-peerinfo.c:494
+#: src/peerinfo/gnunet-service-peerinfo.c:505
 #, c-format
 msgid ""
 "File `%s' in directory `%s' does not match naming convention. Removed.\n"
@@ -5323,22 +5328,22 @@ msgstr ""
 "El fichero «%s» en el directorio «%s» no sigue la convención de nombres. "
 "Eliminado.\n"
 
-#: src/peerinfo/gnunet-service-peerinfo.c:644
+#: src/peerinfo/gnunet-service-peerinfo.c:655
 #, fuzzy, c-format
 msgid "Scanning directory `%s'\n"
 msgstr "Escaneando directorio «%s».\n"
 
-#: src/peerinfo/gnunet-service-peerinfo.c:649
+#: src/peerinfo/gnunet-service-peerinfo.c:660
 #, 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:985
+#: src/peerinfo/gnunet-service-peerinfo.c:996
 #, fuzzy, c-format
 msgid "Cleaning up directory `%s'\n"
 msgstr "Escaneando directorio «%s».\n"
 
-#: src/peerinfo/gnunet-service-peerinfo.c:1275
+#: src/peerinfo/gnunet-service-peerinfo.c:1286
 #, c-format
 msgid "Importing HELLOs from `%s'\n"
 msgstr "Importando HELLO de «%s»\n"
@@ -5464,19 +5469,19 @@ msgid "Print information about peers."
 msgstr "Imprimir información sobre los pares."
 
 #: src/peerinfo-tool/gnunet-peerinfo_plugins.c:105
-#: src/transport/gnunet-service-transport_plugins.c:123
+#: src/transport/gnunet-service-transport_plugins.c:124
 #, c-format
 msgid "Starting transport plugins `%s'\n"
 msgstr "Iniciando los módulos de transporte «%s»\n"
 
 #: src/peerinfo-tool/gnunet-peerinfo_plugins.c:109
-#: src/transport/gnunet-service-transport_plugins.c:127
+#: src/transport/gnunet-service-transport_plugins.c:129
 #, c-format
 msgid "Loading `%s' transport plugin\n"
 msgstr "Cargando el módulo de transporte «%s»\n"
 
 #: src/peerinfo-tool/gnunet-peerinfo_plugins.c:129
-#: src/transport/gnunet-service-transport_plugins.c:157
+#: src/transport/gnunet-service-transport_plugins.c:159
 #, c-format
 msgid "Failed to load transport plugin for `%s'\n"
 msgstr "Se produjo un fallo al cargar el módulo del transporte para «%s»\n"
@@ -5744,6 +5749,11 @@ msgstr "longitud de la máxima compresión de rutas"
 msgid "Profiler for regex library"
 msgstr "Analizador de rendimiento para la biblioteca de expresiones regulares"
 
+#: src/regex/regex_api.c:131
+#, fuzzy, c-format
+msgid "Regex `%s' is too long!\n"
+msgstr "El servicio «%s» no está ejecutandose\n"
+
 #: src/revocation/gnunet-revocation.c:121
 #, fuzzy, c-format
 msgid "Key `%s' is valid\n"
@@ -6107,7 +6117,7 @@ msgstr "¡Se produjo un fallo al conectar al servicio de estadísticas!\n"
 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
+#: src/set/gnunet-service-set.c:1400
 #, fuzzy
 msgid "Could not connect to mesh service\n"
 msgstr "¡No se pudo conectar al servicio %s!\n"
@@ -6231,11 +6241,11 @@ msgstr "puerto del equipo remoto"
 msgid "Print statistics about GNUnet operations."
 msgstr "Imprime estadísticas acerca de las operaciones de GNUnet."
 
-#: src/statistics/statistics_api.c:509
+#: src/statistics/statistics_api.c:506
 msgid "Could not save some persistent statistics\n"
 msgstr "No se pudieron guardar algunas estadísticas persistentes\n"
 
-#: src/statistics/statistics_api.c:1054
+#: src/statistics/statistics_api.c:1074
 msgid ""
 "Failed to receive acknowledgement from statistics service, some statistics "
 "might have been lost!\n"
@@ -6631,32 +6641,32 @@ msgstr ""
 msgid "# disconnects due to blacklist"
 msgstr "# desconexiones debido a la lista negra"
 
-#: src/transport/gnunet-service-transport.c:160
+#: src/transport/gnunet-service-transport.c:206
 #, 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:250
+#: src/transport/gnunet-service-transport.c:325
 msgid "# bytes total received"
 msgstr "# total de bytes recibidos"
 
-#: src/transport/gnunet-service-transport.c:325
+#: src/transport/gnunet-service-transport.c:399
 msgid "# bytes payload received"
 msgstr "# bytes de «payload» recibidos"
 
-#: src/transport/gnunet-service-transport.c:479
+#: src/transport/gnunet-service-transport.c:574
 #, fuzzy, c-format
-msgid "Could not obtain a valid network for `%s' %s\n"
+msgid "Could not obtain a valid network for `%s' %s (%s)\n"
 msgstr "Imposible obtener IP para la interfaz '%s' usando '%s'.\n"
 
-#: src/transport/gnunet-service-transport.c:529
+#: src/transport/gnunet-service-transport.c:628
 #, 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:820
+#: src/transport/gnunet-service-transport.c:916
 #, fuzzy
 msgid "Transport service is lacking key configuration settings. Exiting.\n"
 msgstr ""
@@ -6690,143 +6700,153 @@ msgstr "# mensajes «REQUEST CONNECT» recibidos"
 msgid "# refreshed my HELLO"
 msgstr "# refrescos de mi «HELLO»"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1074
+#: src/transport/gnunet-service-transport_neighbours.c:1108
 msgid "# DISCONNECT messages sent"
 msgstr "# Mensajes «DISCONNECT» enviados"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1206
-#: src/transport/gnunet-service-transport_neighbours.c:1541
+#: src/transport/gnunet-service-transport_neighbours.c:1244
+#: src/transport/gnunet-service-transport_neighbours.c:1653
 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:1211
+#: src/transport/gnunet-service-transport_neighbours.c:1249
 msgid "# messages transmitted to other peers"
 msgstr "# mensajes transmitidos a otros pares"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1216
+#: src/transport/gnunet-service-transport_neighbours.c:1254
 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:1273
+#: src/transport/gnunet-service-transport_neighbours.c:1311
 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:1315
+#: src/transport/gnunet-service-transport_neighbours.c:1368
 msgid "# keepalives sent"
 msgstr "# «keepalives» enviados"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1339
+#: src/transport/gnunet-service-transport_neighbours.c:1401
 msgid "# KEEPALIVE messages discarded (peer unknown)"
 msgstr "# Mensajes «KEEPALIVE» descartados (par desconocido)"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1347
+#: src/transport/gnunet-service-transport_neighbours.c:1409
 msgid "# KEEPALIVE messages discarded (no session)"
 msgstr "# mensajes «KEEPALIVE» descartados (no hay sesión)"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1380
+#: src/transport/gnunet-service-transport_neighbours.c:1456
 msgid "# KEEPALIVE_RESPONSE messages discarded (not connected)"
 msgstr "# mensajes «KEEPALIVE_RESPONSE» descartados (no conectado)"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1389
+#: src/transport/gnunet-service-transport_neighbours.c:1465
 msgid "# KEEPALIVE_RESPONSE messages discarded (not expected)"
 msgstr "# Mensajes «KEEPALIVE_RESPONSE» descartados (no esperado)"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1446
+#: src/transport/gnunet-service-transport_neighbours.c:1473
+#, fuzzy
+msgid "# KEEPALIVE_RESPONSE messages discarded (address changed)"
+msgstr "# mensajes «KEEPALIVE_RESPONSE» descartados (no conectado)"
+
+#: src/transport/gnunet-service-transport_neighbours.c:1481
+#, fuzzy
+msgid "# KEEPALIVE_RESPONSE messages discarded (wrong nonce)"
+msgstr "# mensajes «KEEPALIVE_RESPONSE» descartados (no conectado)"
+
+#: src/transport/gnunet-service-transport_neighbours.c:1558
 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:1480
+#: src/transport/gnunet-service-transport_neighbours.c:1592
 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:1496
+#: src/transport/gnunet-service-transport_neighbours.c:1608
 msgid "# ms throttling suggested"
 msgstr "# ms de impulso sugeridos"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1585
+#: src/transport/gnunet-service-transport_neighbours.c:1700
 #, fuzzy
 msgid "# SESSION_CONNECT messages sent"
 msgstr "# Mensajes «DISCONNECT» enviados"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1601
+#: src/transport/gnunet-service-transport_neighbours.c:1716
 #, 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
+#: src/transport/gnunet-service-transport_neighbours.c:1759
 #, fuzzy
 msgid "# CONNECT_ACK messages sent"
 msgstr "# Mensajes «DISCONNECT» enviados"
 
-#: src/transport/gnunet-service-transport_neighbours.c:2106
+#: src/transport/gnunet-service-transport_neighbours.c:2236
 #, fuzzy
 msgid "# CONNECT messages received"
 msgstr "# mensajes «REQUEST CONNECT» recibidos"
 
-#: src/transport/gnunet-service-transport_neighbours.c:2111
+#: src/transport/gnunet-service-transport_neighbours.c:2241
 #, c-format
 msgid "CONNECT request from peer `%s' ignored due impending shutdown\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:2824
+#: src/transport/gnunet-service-transport_neighbours.c:2979
 #, fuzzy
 msgid "# CONNECT_ACK messages received"
 msgstr "# mensajes «REQUEST CONNECT» recibidos"
 
-#: src/transport/gnunet-service-transport_neighbours.c:2832
+#: src/transport/gnunet-service-transport_neighbours.c:2987
 msgid "# unexpected CONNECT_ACK messages (no peer)"
 msgstr "# Mensajes «CONNECT_ACK» inesperados (sin par)"
 
-#: src/transport/gnunet-service-transport_neighbours.c:2847
-#: src/transport/gnunet-service-transport_neighbours.c:2882
+#: src/transport/gnunet-service-transport_neighbours.c:3002
+#: src/transport/gnunet-service-transport_neighbours.c:3039
 msgid "# unexpected CONNECT_ACK messages (not ready)"
 msgstr "# Mensajes «CONNECT_ACK» inesperados (no estaba preparado)"
 
-#: src/transport/gnunet-service-transport_neighbours.c:2895
+#: src/transport/gnunet-service-transport_neighbours.c:3052
 msgid "# unexpected CONNECT_ACK messages (waiting on ATS)"
 msgstr "# Mensajes «CONNECT_ACK» inesperados (esperando en el ATS)"
 
-#: src/transport/gnunet-service-transport_neighbours.c:2926
+#: src/transport/gnunet-service-transport_neighbours.c:3085
 msgid "# unexpected CONNECT_ACK messages (disconnecting)"
 msgstr "# Mensajes «CONNECT_ACK» inesperados (desconectando)"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3106
+#: src/transport/gnunet-service-transport_neighbours.c:3265
 #, fuzzy
 msgid "# SESSION_ACK messages received"
 msgstr "# mensajes SET QUOTA recibidos"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3122
+#: src/transport/gnunet-service-transport_neighbours.c:3284
 #, fuzzy
 msgid "# unexpected SESSION_ACK messages"
 msgstr "# Mensajes «SESSION ACK» inesperados"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3176
+#: src/transport/gnunet-service-transport_neighbours.c:3340
 msgid "# SET QUOTA messages ignored (no such peer)"
 msgstr "# Mensajes «SET QUOTA» ignorados (no existe tal par)"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3190
+#: src/transport/gnunet-service-transport_neighbours.c:3355
 msgid "# disconnects due to quota of 0"
 msgstr "# desconexiones debido a una cuota de 0"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3220
+#: src/transport/gnunet-service-transport_neighbours.c:3383
 msgid "# disconnect messages ignored (old format)"
 msgstr "# mensajes de desconexión ignorados (formato antiguo)"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3226
+#: src/transport/gnunet-service-transport_neighbours.c:3389
 #, fuzzy
 msgid "# DISCONNECT messages received"
 msgstr "# mensajes «REQUEST CONNECT» recibidos"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3235
+#: src/transport/gnunet-service-transport_neighbours.c:3398
 msgid "# disconnect messages ignored (timestamp)"
 msgstr "# mensajes de desconexión ignorados (marca temporal)"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3271
+#: src/transport/gnunet-service-transport_neighbours.c:3434
 msgid "# other peer asked to disconnect from us"
 msgstr "# peticiones de otro par para desconectarse de nosotros"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3366
+#: src/transport/gnunet-service-transport_neighbours.c:3532
 msgid "# disconnected from peer upon explicit request"
 msgstr "# desconexiones del par debido a una petición explícita"
 
@@ -6834,20 +6854,22 @@ msgstr "# desconexiones del par debido a una petición explícita"
 msgid "Transport service is lacking NEIGHBOUR_LIMIT option.\n"
 msgstr "El servicio de transporte carece de la opción «NEIGHBOUR_LIMIT».\n"
 
-#: src/transport/gnunet-service-transport_plugins.c:170
-#: src/transport/gnunet-service-transport_plugins.c:178
-#: src/transport/gnunet-service-transport_plugins.c:186
-#: src/transport/gnunet-service-transport_plugins.c:194
-#: src/transport/gnunet-service-transport_plugins.c:202
-#: 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
+#: src/transport/gnunet-service-transport_plugins.c:172
+#: src/transport/gnunet-service-transport_plugins.c:180
+#: src/transport/gnunet-service-transport_plugins.c:188
+#: src/transport/gnunet-service-transport_plugins.c:196
+#: src/transport/gnunet-service-transport_plugins.c:204
+#: src/transport/gnunet-service-transport_plugins.c:212
+#: src/transport/gnunet-service-transport_plugins.c:220
+#: src/transport/gnunet-service-transport_plugins.c:228
+#: src/transport/gnunet-service-transport_plugins.c:236
+#: src/transport/gnunet-service-transport_plugins.c:244
+#: src/transport/gnunet-service-transport_plugins.c:252
 #, 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:241
+#: src/transport/gnunet-service-transport_plugins.c:259
 #, 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"
@@ -7105,7 +7127,7 @@ msgstr "# mensajes defragmentados"
 
 #: src/transport/plugin_transport_bluetooth.c:681
 #: src/transport/plugin_transport_bluetooth.c:731
-#: src/transport/plugin_transport_bluetooth.c:1854
+#: src/transport/plugin_transport_bluetooth.c:1881
 #, fuzzy
 msgid "# Bluetooth sessions allocated"
 msgstr "# sesiones WLAN alojadas"
@@ -7122,84 +7144,84 @@ msgstr "# mensajes WLAN pendientes (con fragmentación)"
 
 #: src/transport/plugin_transport_bluetooth.c:938
 #: src/transport/plugin_transport_bluetooth.c:1023
-#: src/transport/plugin_transport_bluetooth.c:1856
+#: src/transport/plugin_transport_bluetooth.c:1883
 #, fuzzy
 msgid "# Bluetooth MAC endpoints allocated"
 msgstr "# MAC de destino WLAN alojadas"
 
-#: src/transport/plugin_transport_bluetooth.c:1235
+#: src/transport/plugin_transport_bluetooth.c:1250
 #, fuzzy
 msgid "# HELLO messages received via Bluetooth"
 msgstr "# mensajes HELLO recibidos vía WLAN"
 
-#: src/transport/plugin_transport_bluetooth.c:1261
+#: src/transport/plugin_transport_bluetooth.c:1276
 #, fuzzy
 msgid "# fragments received via Bluetooth"
 msgstr "# fragmentos recibidos vía WLAN"
 
-#: src/transport/plugin_transport_bluetooth.c:1271
+#: src/transport/plugin_transport_bluetooth.c:1286
 #, fuzzy
 msgid "# ACKs received via Bluetooth"
 msgstr "# ACK recibidos vía WLAN"
 
-#: src/transport/plugin_transport_bluetooth.c:1328
+#: src/transport/plugin_transport_bluetooth.c:1343
 #, 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:1440
+#: src/transport/plugin_transport_bluetooth.c:1455
 #, fuzzy
 msgid "# DATA messages received via Bluetooth"
 msgstr "# mensajes «DATA» recibidos vía WLAN"
 
-#: src/transport/plugin_transport_bluetooth.c:1475
+#: src/transport/plugin_transport_bluetooth.c:1490
 #, fuzzy
 msgid "# Bluetooth DATA messages processed"
 msgstr "# mensajes «DATA» WLAN procesados"
 
-#: src/transport/plugin_transport_bluetooth.c:1538
+#: src/transport/plugin_transport_bluetooth.c:1553
 #, fuzzy
 msgid "# HELLO beacons sent via Bluetooth"
 msgstr "# «beacons HELLO» enviados vía WLAN"
 
-#: src/transport/plugin_transport_bluetooth.c:1651
+#: src/transport/plugin_transport_bluetooth.c:1666
 #, 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:1835
+#: src/transport/plugin_transport_bluetooth.c:1862
 #, 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_client.c:1590
+#: src/transport/plugin_transport_http_client.c:1618
 #, 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:1727
-#: src/transport/plugin_transport_http_server.c:2974
+#: src/transport/plugin_transport_http_client.c:1693
+#: src/transport/plugin_transport_http_server.c:3001
 #, c-format
 msgid "Shutting down plugin `%s'\n"
 msgstr "Finalizando el módulo «%s»\n"
 
-#: src/transport/plugin_transport_http_client.c:1752
-#: src/transport/plugin_transport_http_server.c:3032
+#: src/transport/plugin_transport_http_client.c:1718
+#: src/transport/plugin_transport_http_server.c:3059
 #, 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:1780
-#: src/transport/plugin_transport_http_server.c:2874
+#: src/transport/plugin_transport_http_client.c:1746
+#: src/transport/plugin_transport_http_server.c:2901
 #, 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:1389
+#: src/transport/plugin_transport_http_server.c:1416
 #, c-format
 msgid ""
 "Access from connection %p (%u of %u) for `%s' `%s' url `%s' with upload data "
@@ -7208,12 +7230,12 @@ msgstr ""
 "Acceso desde la conexión %p (%u de %u) para «%s» «%s» URL «%s» con tamaño de "
 "los datos de subida %u\n"
 
-#: src/transport/plugin_transport_http_server.c:1653
+#: src/transport/plugin_transport_http_server.c:1680
 #, 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:1661
+#: src/transport/plugin_transport_http_server.c:1688
 #, c-format
 msgid ""
 "Server reached maximum number connections (%u), rejecting new connection\n"
@@ -7221,7 +7243,7 @@ msgstr ""
 "El servidor ha alcanzado el número máximo de conexiones (%u), rechazando "
 "nueva conexión\n"
 
-#: src/transport/plugin_transport_http_server.c:1947
+#: src/transport/plugin_transport_http_server.c:1974
 msgid ""
 "Could not create a new TLS certificate, program `gnunet-transport-"
 "certificate-creation' could not be started!\n"
@@ -7229,89 +7251,89 @@ msgstr ""
 "¡No se pudo crear un certificado TLS nuevo, el programa «gnunet-transport-"
 "certificate-creation» no pudo ser iniciado!\n"
 
-#: src/transport/plugin_transport_http_server.c:1971
+#: src/transport/plugin_transport_http_server.c:1998
 #, 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:2378
+#: src/transport/plugin_transport_http_server.c:2405
 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
+#: src/transport/plugin_transport_http_server.c:2437 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
+#: src/transport/plugin_transport_http_server.c:2454 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
+#: src/transport/plugin_transport_http_server.c:2565
 #, 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
+#: src/transport/plugin_transport_http_server.c:2637
 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
+#: src/transport/plugin_transport_http_server.c:2724
 #, c-format
 msgid "IPv4 support is %s\n"
 msgstr "El soporte IPv4 es %s\n"
 
-#: src/transport/plugin_transport_http_server.c:2711
+#: src/transport/plugin_transport_http_server.c:2738
 #, c-format
 msgid "IPv6 support is %s\n"
 msgstr "El soporte IPv6 es %s\n"
 
-#: src/transport/plugin_transport_http_server.c:2718
+#: src/transport/plugin_transport_http_server.c:2745
 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
+#: src/transport/plugin_transport_http_server.c:2756
 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
+#: src/transport/plugin_transport_http_server.c:2763
 #, c-format
 msgid "Using port %u\n"
 msgstr "Usando puerto %u\n"
 
-#: src/transport/plugin_transport_http_server.c:2751
+#: src/transport/plugin_transport_http_server.c:2778
 #, 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:2761
+#: src/transport/plugin_transport_http_server.c:2788
 #, 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:2782
+#: src/transport/plugin_transport_http_server.c:2809
 #, 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:2792
+#: src/transport/plugin_transport_http_server.c:2819
 #, 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:2844
+#: src/transport/plugin_transport_http_server.c:2871
 #, 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
+#: src/transport/plugin_transport_http_server.c:2887
 #, c-format
 msgid "Notifying transport only about hostname `%s'\n"
 msgstr "Notificando al transporte sólo el nombre de máquina «%s»\n"
@@ -7361,62 +7383,62 @@ msgstr "# bytes enviados vía SMTP"
 msgid "# bytes dropped by SMTP (outgoing)"
 msgstr "# bytes omitidos por SMTP (salientes)"
 
-#: src/transport/plugin_transport_tcp.c:632
+#: src/transport/plugin_transport_tcp.c:576
 #, c-format
 msgid "Unexpected address length: %u bytes\n"
 msgstr "Longitud de dirección inesperada: %u bytes\n"
 
-#: 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
+#: src/transport/plugin_transport_tcp.c:799
+#: src/transport/plugin_transport_tcp.c:979
+#: src/transport/plugin_transport_tcp.c:2120
+#: src/transport/plugin_transport_tcp.c:2723
+msgid "# TCP sessions active"
+msgstr "# Sesiones TCP activas"
+
+#: src/transport/plugin_transport_tcp.c:835
+#: src/transport/plugin_transport_tcp.c:972
+#: src/transport/plugin_transport_tcp.c:1061
+#: src/transport/plugin_transport_tcp.c:1111
+#: src/transport/plugin_transport_tcp.c:1290
+#: src/transport/plugin_transport_tcp.c:1309
 msgid "# bytes currently in TCP buffers"
 msgstr "# bytes actualmente en los buffer TCP"
 
-#: 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:839
+msgid "# bytes discarded by TCP (disconnect)"
+msgstr "# bytes descartados por TCP (desconectado)"
 
-#: src/transport/plugin_transport_tcp.c:935
+#: src/transport/plugin_transport_tcp.c:1065
 msgid "# bytes discarded by TCP (timeout)"
 msgstr "# bytes omitidos por TCP (expirados)"
 
-#: src/transport/plugin_transport_tcp.c:984
+#: src/transport/plugin_transport_tcp.c:1114
 msgid "# bytes transmitted via TCP"
 msgstr "# bytes recibidos vía TCP"
 
-#: 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:1199
+#: src/transport/plugin_transport_tcp.c:1263
 #, 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:1440
-#: src/transport/plugin_transport_udp.c:1471
+#: src/transport/plugin_transport_tcp.c:1520
+#: src/transport/plugin_transport_udp.c:1488
 msgid "# requests to create session with invalid address"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:1558
+#: src/transport/plugin_transport_tcp.c:1645
 msgid "# transport-service disconnect requests for TCP"
 msgstr "# peticiones de desconexión del servicio de transporte por TCP"
 
-#: src/transport/plugin_transport_tcp.c:2091
+#: src/transport/plugin_transport_tcp.c:2170
 msgid "# TCP WELCOME messages received"
 msgstr "# Mensajes «WELCOME» TCP recibidos"
 
-#: src/transport/plugin_transport_tcp.c:2274
+#: src/transport/plugin_transport_tcp.c:2355
 msgid "# bytes received via TCP"
 msgstr "# bytes recibidos vía TCP"
 
-#: src/transport/plugin_transport_tcp.c:2354
+#: src/transport/plugin_transport_tcp.c:2433
 msgid "# network-level TCP disconnect events"
 msgstr "# eventos de desconexión TCP a nivel de red"
 
@@ -7432,16 +7454,16 @@ msgstr ""
 msgid "Failed to start service.\n"
 msgstr "Se produjo un fallo al iniciar el servicio.\n"
 
-#: src/transport/plugin_transport_tcp.c:2710
+#: src/transport/plugin_transport_tcp.c:2712
 #, 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:2713
+#: src/transport/plugin_transport_tcp.c:2715
 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:2716
+#: src/transport/plugin_transport_tcp.c:2718
 #, 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"
@@ -7454,26 +7476,26 @@ msgstr "# beacons HELLO multicast IPv6 recibidos vía UDP"
 msgid "# IPv4 broadcast HELLO beacons received via udp"
 msgstr "# beacons HELLO broadcast IPv4 recibidos vía UDP"
 
-#: src/transport/plugin_transport_udp_broadcasting.c:605
+#: src/transport/plugin_transport_udp_broadcasting.c:606
 msgid ""
 "Disabling HELLO broadcasting due to friend-to-friend only configuration!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_udp_broadcasting.c:619
+#: src/transport/plugin_transport_udp_broadcasting.c:629
 #, 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:1581
+#: src/transport/plugin_transport_udp.c:1599
 #, 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:2635
+#: src/transport/plugin_transport_udp.c:2680
 #, c-format
 msgid ""
 "UDP could not transmit message to `%s': Network seems down, please check "
@@ -7482,7 +7504,7 @@ msgstr ""
 "UDP no pudo transmitir el mensaje a «%s»: La red parece caída, por favor, "
 "compruebe su configuración de red\n"
 
-#: src/transport/plugin_transport_udp.c:2649
+#: src/transport/plugin_transport_udp.c:2694
 #, fuzzy
 msgid ""
 "UDP could not transmit IPv6 message! Please check your network configuration "
@@ -7492,26 +7514,26 @@ msgstr ""
 "configuración de red y deshabilite IPv6 si su conexión carece de una "
 "dirección IPv6 global\n"
 
-#: src/transport/plugin_transport_udp.c:2949
+#: src/transport/plugin_transport_udp.c:2993
 msgid "Failed to open UDP sockets\n"
 msgstr "Se produjo un fallo al abrir los «sockets» UDP\n"
 
-#: src/transport/plugin_transport_udp.c:3046
+#: src/transport/plugin_transport_udp.c:3091
 #, 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:3089
+#: src/transport/plugin_transport_udp.c:3134
 #, c-format
 msgid "Invalid IPv6 address: `%s'\n"
 msgstr "Dirección IPv6 no válida: «%s»\n"
 
-#: src/transport/plugin_transport_udp.c:3148
+#: src/transport/plugin_transport_udp.c:3200
 #, 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:1625
+#: src/transport/plugin_transport_unix.c:1657
 #, fuzzy
 msgid "Failed to open UNIX listen socket\n"
 msgstr "Se produjo un fallo al abrir los «sockets» UNIX\n"
@@ -7525,65 +7547,65 @@ msgid "# WLAN messages defragmented"
 msgstr "# mensajes WLAN defragmentados"
 
 #: src/transport/plugin_transport_wlan.c:691
-#: src/transport/plugin_transport_wlan.c:763
-#: src/transport/plugin_transport_wlan.c:1910
+#: src/transport/plugin_transport_wlan.c:778
+#: src/transport/plugin_transport_wlan.c:1937
 msgid "# WLAN sessions allocated"
 msgstr "# sesiones WLAN alojadas"
 
-#: src/transport/plugin_transport_wlan.c:868
+#: src/transport/plugin_transport_wlan.c:883
 msgid "# WLAN message fragments sent"
 msgstr "# fragmentos de mensaje WLAN enviados"
 
-#: src/transport/plugin_transport_wlan.c:892
+#: src/transport/plugin_transport_wlan.c:907
 msgid "# WLAN messages pending (with fragmentation)"
 msgstr "# mensajes WLAN pendientes (con fragmentación)"
 
-#: src/transport/plugin_transport_wlan.c:1000
-#: src/transport/plugin_transport_wlan.c:1086
-#: src/transport/plugin_transport_wlan.c:1912
+#: src/transport/plugin_transport_wlan.c:1015
+#: src/transport/plugin_transport_wlan.c:1101
+#: src/transport/plugin_transport_wlan.c:1939
 msgid "# WLAN MAC endpoints allocated"
 msgstr "# MAC de destino WLAN alojadas"
 
-#: src/transport/plugin_transport_wlan.c:1282
+#: src/transport/plugin_transport_wlan.c:1297
 msgid "# HELLO messages received via WLAN"
 msgstr "# mensajes HELLO recibidos vía WLAN"
 
-#: src/transport/plugin_transport_wlan.c:1308
+#: src/transport/plugin_transport_wlan.c:1323
 msgid "# fragments received via WLAN"
 msgstr "# fragmentos recibidos vía WLAN"
 
-#: src/transport/plugin_transport_wlan.c:1318
+#: src/transport/plugin_transport_wlan.c:1333
 msgid "# ACKs received via WLAN"
 msgstr "# ACK recibidos vía WLAN"
 
-#: src/transport/plugin_transport_wlan.c:1375
+#: src/transport/plugin_transport_wlan.c:1390
 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:1496
+#: src/transport/plugin_transport_wlan.c:1511
 msgid "# DATA messages received via WLAN"
 msgstr "# mensajes «DATA» recibidos vía WLAN"
 
-#: src/transport/plugin_transport_wlan.c:1531
+#: src/transport/plugin_transport_wlan.c:1546
 msgid "# WLAN DATA messages processed"
 msgstr "# mensajes «DATA» WLAN procesados"
 
-#: src/transport/plugin_transport_wlan.c:1594
+#: src/transport/plugin_transport_wlan.c:1609
 msgid "# HELLO beacons sent via WLAN"
 msgstr "# «beacons HELLO» enviados vía WLAN"
 
-#: src/transport/plugin_transport_wlan.c:1707
+#: src/transport/plugin_transport_wlan.c:1722
 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:1891
+#: src/transport/plugin_transport_wlan.c:1918
 #, 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:682
+#: src/transport/transport_api.c:690
 #, c-format
 msgid "Received unexpected message of type %u in %s:%u\n"
 msgstr "Recibido mensaje inesperado del tipo %u en %s:%u\n"
@@ -7626,13 +7648,13 @@ msgstr "Los metadatos serializados «%s» son mayores de lo permitido (%u>%u)"
 msgid "Metadata `%s' failed to deserialize"
 msgstr "Se produjo un fallo al deserializar los metadatos «%s»"
 
-#: src/util/client.c:261 src/util/client.c:851 src/util/service.c:625
+#: src/util/client.c:261 src/util/client.c:857 src/util/service.c:625
 #, c-format
 msgid "UNIXPATH `%s' too long, maximum length is %llu\n"
 msgstr ""
 "La ruta tipo UNIX «%s» es demasiado larga, la longitud máxima es %llu\n"
 
-#: src/util/client.c:265 src/util/client.c:856 src/util/service.c:629
+#: src/util/client.c:265 src/util/client.c:862 src/util/service.c:629
 #, c-format
 msgid "Using `%s' instead\n"
 msgstr "Usando «%s» en su defecto\n"
@@ -7651,17 +7673,17 @@ msgstr ""
 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:989
+#: src/util/client.c:995
 #, 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:1001
+#: src/util/client.c:1007
 #, 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:1284
+#: src/util/client.c:1290
 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 "
@@ -7783,7 +7805,7 @@ msgstr "Intentando conectar a «%s» (%p)\n"
 msgid "Attempt to connect to `%s' failed\n"
 msgstr "El intento de conectar a «%s» falló\n"
 
-#: src/util/container_bloomfilter.c:516
+#: src/util/container_bloomfilter.c:531
 #, c-format
 msgid ""
 "Size of file on disk is incorrect for this Bloom filter (want %llu, have "
@@ -8059,13 +8081,13 @@ msgstr "realizar una búsqueda inversa"
 msgid "Use build-in GNUnet stub resolver"
 msgstr "Utilizar el resolvedor interno para pruebas de GNUnet"
 
-#: src/util/gnunet-service-resolver.c:288
+#: src/util/gnunet-service-resolver.c:283
 #, c-format
 msgid "Could not resolve `%s' (%s): %s\n"
 msgstr "No se pudo resolver «%s» (%s): %s\n"
 
-#: src/util/gnunet-service-resolver.c:358
-#: src/util/gnunet-service-resolver.c:399
+#: src/util/gnunet-service-resolver.c:350
+#: src/util/gnunet-service-resolver.c:391
 #, c-format
 msgid "Could not find IP of host `%s': %s\n"
 msgstr "No se encontró la IP del host «%s»: %s\n"
@@ -8116,7 +8138,7 @@ msgstr "Error escribiendo a «%s»: %s\n"
 msgid "Unable to shorten unix path `%s' while keeping name unique\n"
 msgstr "Imposible acortar la ruta unix «%s» manteniendo el nombre único\n"
 
-#: src/util/network.c:1397
+#: src/util/network.c:1344 src/util/network.c:1469
 #, c-format
 msgid ""
 "Fatal internal logic error, process hangs in `%s' (abort with CTRL-C)!\n"
@@ -8167,17 +8189,17 @@ msgstr "Falló «%s» para la biblioteca «%s» con error: %s\n"
 msgid "Could not determine plugin installation path.\n"
 msgstr "No se pudo determinar la ruta de instalación de los módulos.\n"
 
-#: src/util/program.c:260 src/util/service.c:1449
+#: src/util/program.c:262 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
+#: src/util/program.c:274 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
+#: src/util/program.c:279 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"
@@ -8351,118 +8373,118 @@ msgstr "señal (%d, %p) devolvió %d.\n"
 msgid "b"
 msgstr "b"
 
-#: src/util/strings.c:450
+#: src/util/strings.c:452
 #, c-format
 msgid "Character sets requested were `%s'->`%s'\n"
 msgstr "Los conjuntos de caracteres pedidos fueron «%s»->«%s»\n"
 
-#: src/util/strings.c:578
+#: src/util/strings.c:580
 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:675
+#: src/util/strings.c:677
 msgid "µs"
 msgstr ""
 
-#: src/util/strings.c:679
+#: src/util/strings.c:681
 msgid "forever"
 msgstr "para siempre"
 
-#: src/util/strings.c:681
+#: src/util/strings.c:683
 msgid "0 ms"
 msgstr "0 ms"
 
-#: src/util/strings.c:687
+#: src/util/strings.c:689
 msgid "ms"
 msgstr "ms"
 
-#: src/util/strings.c:693
+#: src/util/strings.c:695
 msgid "s"
 msgstr "s"
 
-#: src/util/strings.c:699
+#: src/util/strings.c:701
 msgid "m"
 msgstr "m"
 
-#: src/util/strings.c:705
+#: src/util/strings.c:707
 msgid "h"
 msgstr "h"
 
-#: src/util/strings.c:712
+#: src/util/strings.c:714
 msgid "day"
 msgstr "día"
 
-#: src/util/strings.c:714
+#: src/util/strings.c:716
 msgid "days"
 msgstr "días"
 
-#: src/util/strings.c:743
+#: src/util/strings.c:745
 msgid "end of time"
 msgstr "fin del plazo"
 
-#: src/util/strings.c:1149
+#: src/util/strings.c:1178
 msgid "IPv6 address did not start with `['\n"
 msgstr "La dirección IPv6 no empezaba con «[»\n"
 
-#: src/util/strings.c:1157
+#: src/util/strings.c:1186
 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:1163
+#: src/util/strings.c:1192
 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:1170
+#: src/util/strings.c:1199
 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:1179
+#: src/util/strings.c:1208
 #, c-format
 msgid "Invalid IPv6 address `%s': %s\n"
 msgstr "Dirección IPv6 «%s» no válida: %s\n"
 
-#: src/util/strings.c:1385 src/util/strings.c:1401
+#: src/util/strings.c:1414 src/util/strings.c:1430
 msgid "Port not in range\n"
 msgstr ""
 
-#: src/util/strings.c:1410
+#: src/util/strings.c:1439
 #, fuzzy, c-format
 msgid "Malformed port policy `%s'\n"
 msgstr "Se produjo un fallo al iniciar el servicio «%s»\n"
 
-#: src/util/strings.c:1493 src/util/strings.c:1524 src/util/strings.c:1572
-#: src/util/strings.c:1593
+#: src/util/strings.c:1522 src/util/strings.c:1553 src/util/strings.c:1601
+#: src/util/strings.c:1622
 #, c-format
 msgid "Invalid format for IP: `%s'\n"
 msgstr "Formato no válido para la IP: «%s»\n"
 
-#: src/util/strings.c:1550
+#: src/util/strings.c:1579
 #, 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:1602
+#: src/util/strings.c:1631
 #, fuzzy, c-format
 msgid "Invalid format: `%s'\n"
 msgstr "Formato de tiempo no válido «%s»\n"
 
-#: src/util/strings.c:1654
+#: src/util/strings.c:1683
 #, 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:1704
+#: src/util/strings.c:1733
 #, c-format
 msgid "Wrong format `%s' for netmask\n"
 msgstr "Formato «%s» erroneo para máscara de red\n"
 
-#: src/util/strings.c:1735
+#: src/util/strings.c:1764
 #, c-format
 msgid "Wrong format `%s' for network\n"
 msgstr "Formato «%s» erroneo para red\n"
@@ -8578,68 +8600,68 @@ msgid "IPv4 support disabled as this system does not support IPv4\n"
 msgstr ""
 "El soporte de IPv4 se deshabilita porque este sistema no soporta IPv4\n"
 
-#: src/vpn/gnunet-vpn.c:146
+#: src/vpn/gnunet-vpn.c:147
 msgid "Error creating tunnel\n"
 msgstr "Error creando el túnel\n"
 
-#: src/vpn/gnunet-vpn.c:189 src/vpn/gnunet-vpn.c:220
+#: src/vpn/gnunet-vpn.c:190 src/vpn/gnunet-vpn.c:221
 #, c-format
 msgid "Option `%s' makes no sense with option `%s'.\n"
 msgstr "La opción «%s» no tiene sentido con la opción «%s».\n"
 
-#: src/vpn/gnunet-vpn.c:202
+#: src/vpn/gnunet-vpn.c:203
 #, c-format
 msgid "Option `%s' or `%s' is required.\n"
 msgstr "Las opción «%s» o «%s» es necesaria.\n"
 
-#: src/vpn/gnunet-vpn.c:214
+#: src/vpn/gnunet-vpn.c:215
 #, c-format
 msgid "Option `%s' or `%s' is required when using option `%s'.\n"
 msgstr "Las opción «%s» o «%s» es necesaria cuando se usa la opción «%s».\n"
 
-#: src/vpn/gnunet-vpn.c:233
+#: src/vpn/gnunet-vpn.c:235
 #, c-format
 msgid "`%s' is not a valid peer identifier.\n"
 msgstr "«%s» no es un identificador de par válido\n"
 
-#: src/vpn/gnunet-vpn.c:254
+#: src/vpn/gnunet-vpn.c:255
 #, c-format
 msgid "`%s' is not a valid IP address.\n"
 msgstr "«%s» no es una dirección IP válida.\n"
 
-#: src/vpn/gnunet-vpn.c:289
+#: src/vpn/gnunet-vpn.c:290
 msgid "request that result should be an IPv4 address"
 msgstr "petición cuyo resultado debe ser una dirección IPv4"
 
-#: src/vpn/gnunet-vpn.c:292
+#: src/vpn/gnunet-vpn.c:293
 msgid "request that result should be an IPv6 address"
 msgstr "petición cuyo resultado debe ser una dirección IPv6"
 
-#: src/vpn/gnunet-vpn.c:295
+#: src/vpn/gnunet-vpn.c:296
 msgid "how long should the mapping be valid for new tunnels?"
 msgstr "¿cuánto tiempo debe ser válido el mapeado para túneles nuevos?"
 
-#: src/vpn/gnunet-vpn.c:298
+#: src/vpn/gnunet-vpn.c:299
 msgid "destination IP for the tunnel"
 msgstr "IP de destino para el túnel"
 
-#: src/vpn/gnunet-vpn.c:301
+#: src/vpn/gnunet-vpn.c:302
 msgid "peer offering the service we would like to access"
 msgstr "par que ofrece el servicio al que nos gustaría acceder"
 
-#: src/vpn/gnunet-vpn.c:304
+#: src/vpn/gnunet-vpn.c:305
 msgid "name of the service we would like to access"
 msgstr "nombre del servicio al que nos gustaría acceder"
 
-#: src/vpn/gnunet-vpn.c:307
+#: src/vpn/gnunet-vpn.c:308
 msgid "service is offered via TCP"
 msgstr "el servicio es ofrecido vía TCP"
 
-#: src/vpn/gnunet-vpn.c:310
+#: src/vpn/gnunet-vpn.c:311
 msgid "service is offered via UDP"
 msgstr "el servicio es ofrecido vía UDP"
 
-#: src/vpn/gnunet-vpn.c:322
+#: src/vpn/gnunet-vpn.c:323
 msgid "Setup tunnels via VPN."
 msgstr "Configurar túneles vía VPN."
 
@@ -8659,6 +8681,20 @@ msgstr "Violación externa del protocolo detectada en %s:%d.\n"
 msgid "`%s' failed on file `%s' at %s:%d with error: %s\n"
 msgstr "«%s» falló en el fichero «%s» en %s:%d con el error: %s\n"
 
+#~ msgid "Transport plugin: `%s' port %llu\n"
+#~ msgstr "Módulo de transporte: «%s» puerto %llu\n"
+
+#~ msgid "Found %u transport plugins: `%s'\n"
+#~ msgstr "Encontrados %u módulos de transporte: «%s»\n"
+
+#~ msgid "Send ping messages to test connectivity (default == NO)"
+#~ msgstr ""
+#~ "Enviar mensajes «ping» para probar la conectividad (predeterminado: NO)"
+
+#, fuzzy
+#~ msgid "Failed to parse HELLO in file `%s': %s %u \n"
+#~ msgstr "Se produjo un fallo al procesar «HELLO» en el fichero «%s»\n"
+
 #, fuzzy
 #~ msgid "Internal error %d\n"
 #~ msgstr "Error interno."
diff --git a/po/sv.po b/po/sv.po
index 90fa34a67..5458ccbc7 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: GNUnet 0.7.0b\n"
 "Report-Msgid-Bugs-To: gnunet-developers@mail.gnu.org\n"
-"POT-Creation-Date: 2013-12-12 22:41+0100\n"
+"POT-Creation-Date: 2013-12-23 19:38+0100\n"
 "PO-Revision-Date: 2006-01-21 17:16+0100\n"
 "Last-Translator: Daniel Nylander <po@danielnylander.se>\n"
 "Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n"
@@ -356,49 +356,49 @@ msgstr "mottog ogiltigt \"%s\" meddelande\n"
 msgid "Received last message for %s \n"
 msgstr "Mottog ogiltigt \"%s\" meddelande från \"%s\".\n"
 
-#: src/ats/gnunet-service-ats_addresses.c:1946
-#: src/ats/gnunet-service-ats_addresses.c:1990
+#: src/ats/gnunet-service-ats_addresses.c:1943
+#: src/ats/gnunet-service-ats_addresses.c:1987
 #, c-format
 msgid ""
 "Could not load quota for network `%s':  `%s', assigning default bandwidth "
 "%llu\n"
 msgstr ""
 
-#: src/ats/gnunet-service-ats_addresses.c:1953
+#: src/ats/gnunet-service-ats_addresses.c:1950
 #, c-format
 msgid "Outbound quota configure for network `%s' is %llu\n"
 msgstr ""
 
-#: src/ats/gnunet-service-ats_addresses.c:1961
+#: src/ats/gnunet-service-ats_addresses.c:1958
 #, c-format
 msgid ""
 "No outbound quota configured for network `%s', assigning default bandwidth "
 "%llu\n"
 msgstr ""
 
-#: src/ats/gnunet-service-ats_addresses.c:1997
+#: src/ats/gnunet-service-ats_addresses.c:1994
 #, c-format
 msgid "Inbound quota configured for network `%s' is %llu\n"
 msgstr ""
 
-#: src/ats/gnunet-service-ats_addresses.c:2005
+#: src/ats/gnunet-service-ats_addresses.c:2002
 #, c-format
 msgid ""
 "No outbound quota configure for network `%s', assigning default bandwidth "
 "%llu\n"
 msgstr ""
 
-#: src/ats/gnunet-service-ats_addresses.c:2175
+#: src/ats/gnunet-service-ats_addresses.c:2172
 #, c-format
 msgid "Initializing solver `%s '`%s'\n"
 msgstr ""
 
-#: src/ats/gnunet-service-ats_addresses.c:2178
+#: src/ats/gnunet-service-ats_addresses.c:2175
 #, fuzzy, c-format
 msgid "Failed to initialize solver `%s'!\n"
 msgstr "Kunde inte initiera SQLite.\n"
 
-#: src/ats/gnunet-service-ats_addresses.c:2201
+#: src/ats/gnunet-service-ats_addresses.c:2198
 #, fuzzy
 msgid "Failed to initialize solver!\n"
 msgstr "Kunde inte initiera SQLite.\n"
@@ -448,7 +448,7 @@ msgstr ""
 msgid "Using default quota configuration for network `%s' (in/out) %llu/%llu\n"
 msgstr ""
 
-#: src/ats/plugin_ats_proportional.c:1514
+#: src/ats/plugin_ats_proportional.c:1511
 #, fuzzy, c-format
 msgid "Invalid network type `%u' `%s': Disconnect!\n"
 msgstr "Kan inte öppna konfigurationsfil \"%s\".\n"
@@ -463,102 +463,102 @@ msgstr ""
 msgid "ATS returned results for %u addresses\n"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:204
+#: src/ats-tool/gnunet-ats.c:205
 #, fuzzy, c-format
 msgid ""
 "Peer `%s' plugin `%s', address `%s', `%s' bw out: %u Bytes/s, bw in %u Bytes/"
 "s, %s\n"
 msgstr "Motpart \"%s\" med pålitlighet %8u och adress \"%s\"\n"
 
-#: src/ats-tool/gnunet-ats.c:328
+#: src/ats-tool/gnunet-ats.c:333
 #, c-format
 msgid "Quota for network `%11s' (in/out): %10s / %10s\n"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:347 src/namestore/gnunet-namestore.c:547
+#: src/ats-tool/gnunet-ats.c:352 src/namestore/gnunet-namestore.c:550
 #: 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:838
+#: src/ats-tool/gnunet-ats.c:364 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"
 
-#: src/ats-tool/gnunet-ats.c:367
+#: src/ats-tool/gnunet-ats.c:372
 #, c-format
 msgid "Please select one operation : %s or %s or %s or %s or %s\n"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:383 src/ats-tool/gnunet-ats.c:402
-#: src/ats-tool/gnunet-ats.c:419 src/ats-tool/gnunet-ats.c:457
+#: src/ats-tool/gnunet-ats.c:388 src/ats-tool/gnunet-ats.c:407
+#: src/ats-tool/gnunet-ats.c:424 src/ats-tool/gnunet-ats.c:462
 #, fuzzy, c-format
 msgid "Cannot connect to ATS service, exiting...\n"
 msgstr "Misslyckades att initiera tjänsten \"%s\".\n"
 
-#: src/ats-tool/gnunet-ats.c:392 src/ats-tool/gnunet-ats.c:409
+#: src/ats-tool/gnunet-ats.c:397 src/ats-tool/gnunet-ats.c:414
 #, fuzzy, c-format
 msgid "Cannot issue request to ATS service, exiting...\n"
 msgstr "Misslyckades att initiera tjänsten \"%s\".\n"
 
-#: src/ats-tool/gnunet-ats.c:427
+#: src/ats-tool/gnunet-ats.c:432
 #, fuzzy, c-format
 msgid "No preference type given!\n"
 msgstr "Skriv ut information om GNUnets motparter."
 
-#: src/ats-tool/gnunet-ats.c:432
+#: src/ats-tool/gnunet-ats.c:437
 #, c-format
 msgid "No peer given!\n"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:450
+#: src/ats-tool/gnunet-ats.c:455
 msgid "Valid type required\n"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:508
+#: src/ats-tool/gnunet-ats.c:513
 msgid "get list of active addresses currently used"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:511
+#: src/ats-tool/gnunet-ats.c:516
 msgid "get list of all active addresses"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:514
+#: src/ats-tool/gnunet-ats.c:519
 #, fuzzy
 msgid "do not resolve IP addresses to hostnames"
 msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 
-#: src/ats-tool/gnunet-ats.c:517
+#: src/ats-tool/gnunet-ats.c:522
 msgid "monitor mode"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:520
+#: src/ats-tool/gnunet-ats.c:525
 #, fuzzy
 msgid "set preference for the given peer"
 msgstr "Skriv ut information om GNUnets motparter."
 
-#: src/ats-tool/gnunet-ats.c:523
+#: src/ats-tool/gnunet-ats.c:528
 msgid "print all configured quotas"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:526
+#: src/ats-tool/gnunet-ats.c:531
 msgid "peer id"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:529
+#: src/ats-tool/gnunet-ats.c:534
 msgid "preference type to set: latency | bandwidth"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:532
+#: src/ats-tool/gnunet-ats.c:537
 msgid "preference value"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:535
+#: src/ats-tool/gnunet-ats.c:540
 msgid "verbose output (include ATS address properties)"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:544
+#: src/ats-tool/gnunet-ats.c:549
 #, fuzzy
 msgid "Print information about ATS state"
 msgstr "Skriv ut information om GNUnets motparter."
@@ -589,7 +589,7 @@ msgid "be more verbose (print received values)"
 msgstr ""
 
 #: src/conversation/conversation_api.c:557
-#: src/conversation/conversation_api_call.c:468
+#: src/conversation/conversation_api_call.c:470
 msgid "Connection to conversation service lost, trying to reconnect\n"
 msgstr ""
 
@@ -623,216 +623,225 @@ msgstr ""
 msgid "Failed to setup phone (internal error)\n"
 msgstr "Kunde inte skapa värdnyckel!\n"
 
-#: src/conversation/gnunet-conversation.c:357
+#: src/conversation/gnunet-conversation.c:356
 #, c-format
-msgid "Phone active on line %u\n"
+msgid ""
+"Phone active on line %u.  Type `/help' for a list of available commands\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:379
+#: src/conversation/gnunet-conversation.c:378
 #, c-format
 msgid "Resolved address of `%s'. Now ringing other party.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:386
+#: src/conversation/gnunet-conversation.c:385
 #, fuzzy, c-format
 msgid "Connection established to `%s'\n"
 msgstr "Misslyckades att leverera \"%s\" meddelande.\n"
 
-#: src/conversation/gnunet-conversation.c:393
+#: src/conversation/gnunet-conversation.c:392
 #, fuzzy, c-format
 msgid "Failed to resolve `%s'\n"
 msgstr "Misslyckades att leverera \"%s\" meddelande.\n"
 
-#: src/conversation/gnunet-conversation.c:400
+#: src/conversation/gnunet-conversation.c:399
 msgid "Call terminated\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:406
+#: src/conversation/gnunet-conversation.c:405
 #, c-format
 msgid "Connection to `%s' suspended (by other user)\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:412
+#: src/conversation/gnunet-conversation.c:411
 #, c-format
 msgid "Connection to `%s' resumed (by other user)\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:479
+#: src/conversation/gnunet-conversation.c:416
+msgid "Error with the call, restarting it\n"
+msgstr ""
+
+#: src/conversation/gnunet-conversation.c:483
 #, fuzzy, c-format
 msgid "Unknown command `%s'\n"
 msgstr "Okänd operation \"%s\"\n"
 
-#: src/conversation/gnunet-conversation.c:495
-#: src/conversation/gnunet-conversation.c:509
+#: src/conversation/gnunet-conversation.c:499
+#: src/conversation/gnunet-conversation.c:513
 #, c-format
 msgid "Ego `%s' not available\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:502
-#: src/conversation/gnunet-conversation.c:552
+#: src/conversation/gnunet-conversation.c:506
+#: src/conversation/gnunet-conversation.c:563
 msgid "You are calling someone else already, hang up first!\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:517
-#: src/conversation/gnunet-conversation.c:565
+#: src/conversation/gnunet-conversation.c:521
+#: src/conversation/gnunet-conversation.c:576
 #, c-format
 msgid "You are answering call from `%s', hang up or suspend that call first!\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:576
+#: src/conversation/gnunet-conversation.c:532
+msgid "Call recipient missing.\n"
+msgstr ""
+
+#: src/conversation/gnunet-conversation.c:587
 msgid "There is no incoming call to accept here!\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:593
+#: src/conversation/gnunet-conversation.c:604
 #, c-format
 msgid "There is no incoming call `%s' to accept right now!\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:621
+#: src/conversation/gnunet-conversation.c:632
 msgid "We currently do not have an address.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:644
+#: src/conversation/gnunet-conversation.c:655
 #, c-format
 msgid "We are currently trying to locate the private key for the ego `%s'.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:649
+#: src/conversation/gnunet-conversation.c:660
 #, c-format
 msgid "We are listening for incoming calls for ego `%s' on line %u.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:655
-#: src/conversation/gnunet-conversation.c:679
+#: src/conversation/gnunet-conversation.c:666
+#: src/conversation/gnunet-conversation.c:690
 #, c-format
 msgid "You are having a conversation with `%s'.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:660
+#: src/conversation/gnunet-conversation.c:671
 msgid ""
 "We had an internal error setting up our phone line. You can still make "
 "calls.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:669
+#: src/conversation/gnunet-conversation.c:680
 #, c-format
 msgid "We are trying to find the network address to call `%s'.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:674
+#: src/conversation/gnunet-conversation.c:685
 #, c-format
 msgid "We are calling `%s', his phone should be ringing.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:693
+#: src/conversation/gnunet-conversation.c:704
 msgid "Calls waiting:\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:699
+#: src/conversation/gnunet-conversation.c:710
 #, 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
+#: src/conversation/gnunet-conversation.c:738
+#: src/conversation/gnunet-conversation.c:753
 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
+#: src/conversation/gnunet-conversation.c:786
+#: src/conversation/gnunet-conversation.c:802
 msgid "There is no call that could be resumed right now.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:798
+#: src/conversation/gnunet-conversation.c:809
 #, c-format
 msgid "Already talking with `%s', cannot resume a call right now.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:807
+#: src/conversation/gnunet-conversation.c:818
 msgid "There is no incoming call to resume here!\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:824
+#: src/conversation/gnunet-conversation.c:835
 #, c-format
 msgid "There is no incoming call `%s' to resume right now!\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:859
+#: src/conversation/gnunet-conversation.c:870
 msgid "There is no call that could be cancelled right now.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:867
+#: src/conversation/gnunet-conversation.c:878
 msgid "There is no incoming call to refuse here!\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:884
+#: src/conversation/gnunet-conversation.c:895
 #, c-format
 msgid "There is no incoming call `%s' to refuse right now!\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:911
+#: src/conversation/gnunet-conversation.c:922
 msgid "Use `/address' to find out which address this phone should have in GNS"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:913
+#: src/conversation/gnunet-conversation.c:924
 msgid "Use `/call USER.gnu' to call USER"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:915
+#: src/conversation/gnunet-conversation.c:926
 msgid "Use `/accept #NUM' to accept incoming call #NUM"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:917
+#: src/conversation/gnunet-conversation.c:928
 msgid "Use `/suspend' to suspend the active call"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:919
+#: src/conversation/gnunet-conversation.c:930
 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
+#: src/conversation/gnunet-conversation.c:932
 msgid "Use `/cancel' to reject or terminate a call"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:923
+#: src/conversation/gnunet-conversation.c:934
 msgid "Use `/status' to print status information"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:925
+#: src/conversation/gnunet-conversation.c:936
 #, fuzzy
 msgid "Use `/quit' to terminate gnunet-conversation"
 msgstr "tillåter klienter att fastställa gnunetds konfiguration"
 
-#: src/conversation/gnunet-conversation.c:927
+#: src/conversation/gnunet-conversation.c:938
 msgid "Use `/help command' to get help for a specific command"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:1082
+#: src/conversation/gnunet-conversation.c:1093
 #, 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:1095
+#: src/conversation/gnunet-conversation.c:1106
 #, fuzzy, c-format
 msgid "Our ego `%s' was deleted!\n"
 msgstr "Pseudonym \"%s\" togs bort.\n"
 
-#: src/conversation/gnunet-conversation.c:1130
+#: src/conversation/gnunet-conversation.c:1141
 #, 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:1156
+#: src/conversation/gnunet-conversation.c:1167
 msgid "sets the NAME of the ego to use for the phone (and name resolution)"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:1159
+#: src/conversation/gnunet-conversation.c:1170
 msgid "sets the LINE to use for the phone"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:1174
+#: src/conversation/gnunet-conversation.c:1185
 msgid "Enables having a conversation with other GNUnet users."
 msgstr ""
 
@@ -859,7 +868,6 @@ msgid ""
 msgstr ""
 
 #: src/conversation/gnunet-conversation-test.c:248
-#: src/integration-tests/connection_watchdog.c:1114
 #: src/multicast/gnunet-multicast.c:70 src/revocation/gnunet-revocation.c:517
 #: src/template/gnunet-template.c:70
 #, fuzzy
@@ -978,17 +986,17 @@ msgstr ""
 "\n"
 "Fel vid uppladdning av fil: %s\n"
 
-#: src/conversation/gnunet-service-conversation.c:825
+#: src/conversation/gnunet-service-conversation.c:841
 msgid "Mesh audio channel not ready; audio data dropped\n"
 msgstr ""
 
-#: src/conversation/gnunet-service-conversation.c:915
+#: src/conversation/gnunet-service-conversation.c:932
 #, c-format
 msgid ""
 "No available phone for incoming call on line %u, sending HANG_UP signal\n"
 msgstr ""
 
-#: src/conversation/gnunet-service-conversation.c:1302
+#: src/conversation/gnunet-service-conversation.c:1338
 #, fuzzy, c-format
 msgid "Received incoming channel on port %u\n"
 msgstr "\"%s\" ansluten till \"%s\".\n"
@@ -1072,150 +1080,150 @@ msgstr "Nätverksannonsering avstängd i konfigurationen!\n"
 msgid "# bytes of messages of type %u received"
 msgstr "# krypterade PONG-meddelanden mottagna"
 
-#: src/core/gnunet-service-core_kx.c:531
+#: src/core/gnunet-service-core_kx.c:535
 msgid "# bytes encrypted"
 msgstr "# byte krypterade"
 
-#: src/core/gnunet-service-core_kx.c:582
+#: src/core/gnunet-service-core_kx.c:586
 msgid "# bytes decrypted"
 msgstr "# byte dekrypterade"
 
-#: src/core/gnunet-service-core_kx.c:668
+#: src/core/gnunet-service-core_kx.c:672
 msgid "# key exchanges initiated"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:708
+#: src/core/gnunet-service-core_kx.c:712
 msgid "# key exchanges stopped"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:771
+#: src/core/gnunet-service-core_kx.c:809
 msgid "# old ephemeral keys ignored"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:777
+#: src/core/gnunet-service-core_kx.c:815
 #, fuzzy
 msgid "# ephemeral keys received"
 msgstr "# krypterade PONG-meddelanden mottagna"
 
-#: src/core/gnunet-service-core_kx.c:811
+#: src/core/gnunet-service-core_kx.c:849
 #, 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:827
+#: src/core/gnunet-service-core_kx.c:860
 #, fuzzy
-msgid "# EPHEMERAL_KEY messages decrypted"
+msgid "# EPHEMERAL_KEY messages received"
 msgstr "# PING-meddelanden skapade"
 
-#: src/core/gnunet-service-core_kx.c:930
+#: src/core/gnunet-service-core_kx.c:950
 #: src/transport/gnunet-service-transport_validation.c:974
 #, fuzzy
 msgid "# PING messages received"
 msgstr "# PING-meddelanden skapade"
 
-#: src/core/gnunet-service-core_kx.c:938
+#: src/core/gnunet-service-core_kx.c:958
 #, fuzzy
 msgid "# PING messages dropped (out of order)"
 msgstr "Nätverksannonsering avstängd i konfigurationen!\n"
 
-#: src/core/gnunet-service-core_kx.c:965
+#: src/core/gnunet-service-core_kx.c:985
 #, 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:982
+#: src/core/gnunet-service-core_kx.c:1002
 #, fuzzy
 msgid "# PONG messages created"
 msgstr "# PING-meddelanden skapade"
 
-#: src/core/gnunet-service-core_kx.c:1008
+#: src/core/gnunet-service-core_kx.c:1028
 #, fuzzy
 msgid "# sessions terminated by timeout"
 msgstr "# byte kastade via TCP (utgående)"
 
-#: src/core/gnunet-service-core_kx.c:1018
+#: src/core/gnunet-service-core_kx.c:1038
 #, fuzzy
 msgid "# keepalive messages sent"
 msgstr "# PING-meddelanden i klartext skickade"
 
-#: src/core/gnunet-service-core_kx.c:1075
+#: src/core/gnunet-service-core_kx.c:1095
 #: 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:1081
+#: src/core/gnunet-service-core_kx.c:1101
 #, fuzzy
 msgid "# PONG messages dropped (connection down)"
 msgstr "# krypterade PONG-meddelanden mottagna"
 
-#: src/core/gnunet-service-core_kx.c:1086
+#: src/core/gnunet-service-core_kx.c:1106
 #, fuzzy
 msgid "# PONG messages dropped (out of order)"
 msgstr "Nätverksannonsering avstängd i konfigurationen!\n"
 
-#: src/core/gnunet-service-core_kx.c:1116
+#: src/core/gnunet-service-core_kx.c:1136
 #, fuzzy
 msgid "# PONG messages decrypted"
 msgstr "# PING-meddelanden skapade"
 
-#: src/core/gnunet-service-core_kx.c:1150
+#: src/core/gnunet-service-core_kx.c:1170
 #, fuzzy
 msgid "# session keys confirmed via PONG"
 msgstr "# sessionnycklar vägrade"
 
-#: src/core/gnunet-service-core_kx.c:1160
+#: src/core/gnunet-service-core_kx.c:1180
 #, fuzzy
 msgid "# timeouts prevented via PONG"
 msgstr "# byte mottogs via TCP"
 
-#: src/core/gnunet-service-core_kx.c:1167
+#: src/core/gnunet-service-core_kx.c:1187
 #, fuzzy
 msgid "# rekey operations confirmed via PONG"
 msgstr "# sessionnycklar vägrade"
 
-#: src/core/gnunet-service-core_kx.c:1307
+#: src/core/gnunet-service-core_kx.c:1327
 #, fuzzy
 msgid "# DATA message dropped (out of order)"
 msgstr "# byte kastade via UDP (utgående)"
 
-#: src/core/gnunet-service-core_kx.c:1314
+#: src/core/gnunet-service-core_kx.c:1334
 #, 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:1317
+#: src/core/gnunet-service-core_kx.c:1337
 #, fuzzy
 msgid "# sessions terminated by key expiration"
 msgstr "# byte kastade via TCP (utgående)"
 
-#: src/core/gnunet-service-core_kx.c:1360
-#: src/core/gnunet-service-core_kx.c:1385
+#: src/core/gnunet-service-core_kx.c:1380
+#: src/core/gnunet-service-core_kx.c:1405
 #, fuzzy
 msgid "# bytes dropped (duplicates)"
 msgstr "# byte kastade via UDP (utgående)"
 
-#: src/core/gnunet-service-core_kx.c:1372
+#: src/core/gnunet-service-core_kx.c:1392
 #, fuzzy
 msgid "# bytes dropped (out of sequence)"
 msgstr "# byte kastade via UDP (utgående)"
 
-#: src/core/gnunet-service-core_kx.c:1413
+#: src/core/gnunet-service-core_kx.c:1433
 #, fuzzy
 msgid "# bytes dropped (ancient message)"
 msgstr "# byte kastade via UDP (utgående)"
 
-#: src/core/gnunet-service-core_kx.c:1421
+#: src/core/gnunet-service-core_kx.c:1441
 #, fuzzy
 msgid "# bytes of payload decrypted"
 msgstr "# byte dekrypterade"
 
-#: src/core/gnunet-service-core_kx.c:1452
+#: src/core/gnunet-service-core_kx.c:1472
 #, fuzzy
 msgid "# PAYLOAD dropped (out of order)"
 msgstr "# byte kastade via UDP (utgående)"
@@ -1226,7 +1234,7 @@ msgid "# sessions terminated by transport disconnect"
 msgstr "Nätverksannonsering avstängd i konfigurationen!\n"
 
 #: src/core/gnunet-service-core_neighbours.c:179
-#: src/core/gnunet-service-core_neighbours.c:328
+#: src/core/gnunet-service-core_neighbours.c:329
 msgid "# neighbour entries allocated"
 msgstr ""
 
@@ -1234,7 +1242,7 @@ msgstr ""
 msgid "# encrypted bytes given to transport"
 msgstr ""
 
-#: src/core/gnunet-service-core_neighbours.c:411
+#: src/core/gnunet-service-core_neighbours.c:412
 #, c-format
 msgid "Unsupported message of type %u (%u bytes) received from peer `%s'\n"
 msgstr ""
@@ -1248,11 +1256,11 @@ msgstr ""
 #: 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: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
+#: src/transport/gnunet-service-transport_neighbours.c:929
+#: src/transport/gnunet-service-transport_neighbours.c:1161
+#: src/transport/gnunet-service-transport_neighbours.c:1170
+#: src/transport/gnunet-service-transport_neighbours.c:3015
+#: src/transport/gnunet-service-transport_neighbours.c:3291
 #, fuzzy
 msgid "# peers connected"
 msgstr "# av anslutna parter"
@@ -1487,12 +1495,12 @@ msgid "# bytes purged (low-priority)"
 msgstr ""
 
 #: src/datastore/gnunet-service-datastore.c:483
-#: src/gns/gnunet-gns-helper-service-w32.c:187
+#: src/gns/gnunet-gns-helper-service-w32.c:223
 msgid "Transmission to client failed!\n"
 msgstr ""
 
 #: src/datastore/gnunet-service-datastore.c:514
-#: src/gns/gnunet-gns-helper-service-w32.c:215
+#: src/gns/gnunet-gns-helper-service-w32.c:262
 msgid "Shutdown in progress, aborting transmission.\n"
 msgstr ""
 
@@ -1657,7 +1665,7 @@ msgstr "Misslyckades att ta emot svar till \"%s\" meddelande från gnunetd\n"
 
 #: src/datastore/plugin_datastore_postgres.c:860
 #: src/namecache/plugin_namecache_postgres.c:414
-#: src/namestore/plugin_namestore_postgres.c:564
+#: src/namestore/plugin_namestore_postgres.c:569
 msgid "Postgres database running\n"
 msgstr ""
 
@@ -1748,7 +1756,7 @@ msgstr ""
 #: src/dht/gnunet-dht-get.c:201 src/dht/gnunet-dht-monitor.c:271
 #: src/dht/gnunet-dht-put.c:213 src/fs/gnunet-auto-share.c:753
 #: src/fs/gnunet-download.c:328 src/fs/gnunet-publish.c:877
-#: src/fs/gnunet-search.c:294 src/fs/gnunet-unindex.c:168
+#: src/fs/gnunet-search.c:301 src/fs/gnunet-unindex.c:168
 #: src/nse/gnunet-nse-profiler.c:873
 msgid "be verbose (print progress information)"
 msgstr ""
@@ -2234,21 +2242,21 @@ msgstr ""
 msgid "# DNS requests received via TUN interface"
 msgstr "Meddelande mottaget från klient är ogiltig.\n"
 
-#: src/dns/gnunet-service-dns.c:1049 src/exit/gnunet-daemon-exit.c:3499
+#: src/dns/gnunet-service-dns.c:1049 src/exit/gnunet-daemon-exit.c:3514
 #, 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:3556
+#: src/dns/gnunet-service-dns.c:1069 src/exit/gnunet-daemon-exit.c:3571
 #, fuzzy
 msgid "need a valid IPv4 or IPv6 address\n"
 msgstr "Ogiltigt svar på \"%s\".\n"
 
-#: src/dv/gnunet-dv.c:166
+#: src/dv/gnunet-dv.c:169
 msgid "verbose output"
 msgstr ""
 
-#: src/dv/gnunet-dv.c:175
+#: src/dv/gnunet-dv.c:178
 #, fuzzy
 msgid "Print information about DV state"
 msgstr "Skriv ut information om GNUnets motparter."
@@ -2263,14 +2271,14 @@ msgstr ""
 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:1407
+#: src/exit/gnunet-daemon-exit.c:970 src/exit/gnunet-daemon-exit.c:2397
+#: src/exit/gnunet-daemon-exit.c:2654 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:1463
+#: src/exit/gnunet-daemon-exit.c:1007 src/exit/gnunet-daemon-exit.c:2456
+#: src/exit/gnunet-daemon-exit.c:2713 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 ""
@@ -2329,137 +2337,148 @@ msgstr "# byte skickade via UDP"
 msgid "# TCP service creation requests received via mesh"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:1875 src/exit/gnunet-daemon-exit.c:1965
-#: src/exit/gnunet-daemon-exit.c:2070 src/exit/gnunet-daemon-exit.c:2318
-#: src/exit/gnunet-daemon-exit.c:2567 src/exit/gnunet-daemon-exit.c:2856
-#: src/exit/gnunet-daemon-exit.c:2963
+#: src/exit/gnunet-daemon-exit.c:1875 src/exit/gnunet-daemon-exit.c:1968
+#: src/exit/gnunet-daemon-exit.c:2073 src/exit/gnunet-daemon-exit.c:2321
+#: src/exit/gnunet-daemon-exit.c:2570 src/exit/gnunet-daemon-exit.c:2859
+#: src/exit/gnunet-daemon-exit.c:2966
 #, fuzzy
 msgid "# Bytes received from MESH"
 msgstr "# byte mottagna via HTTP"
 
-#: src/exit/gnunet-daemon-exit.c:1907 src/exit/gnunet-daemon-exit.c:2985
+#: src/exit/gnunet-daemon-exit.c:1909 src/exit/gnunet-daemon-exit.c:2990
 #, c-format
-msgid "No service found for %s on port %d!\n"
+msgid "No service %s found for %s on port %d!\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:1911
+#: src/exit/gnunet-daemon-exit.c:1914
 #, fuzzy
 msgid "# TCP requests dropped (no such service)"
 msgstr "# byte mottogs via TCP"
 
-#: src/exit/gnunet-daemon-exit.c:1968
+#: src/exit/gnunet-daemon-exit.c:1971
 #, fuzzy
 msgid "# TCP IP-exit creation requests received via mesh"
 msgstr "# byte mottogs via TCP"
 
-#: src/exit/gnunet-daemon-exit.c:2073
+#: src/exit/gnunet-daemon-exit.c:2076
 #, fuzzy
 msgid "# TCP data requests received via mesh"
 msgstr "# byte mottogs via TCP"
 
-#: src/exit/gnunet-daemon-exit.c:2087
+#: src/exit/gnunet-daemon-exit.c:2090
 #, fuzzy
 msgid "# TCP DATA requests dropped (no session)"
 msgstr "# byte mottogs via TCP"
 
-#: src/exit/gnunet-daemon-exit.c:2147
+#: src/exit/gnunet-daemon-exit.c:2150
 #, fuzzy
 msgid "# ICMP packets sent via TUN"
 msgstr "# byte skickade via UDP"
 
-#: src/exit/gnunet-daemon-exit.c:2321
+#: src/exit/gnunet-daemon-exit.c:2324
 #, fuzzy
 msgid "# ICMP IP-exit requests received via mesh"
 msgstr "# byte mottogs via TCP"
 
-#: src/exit/gnunet-daemon-exit.c:2570
+#: src/exit/gnunet-daemon-exit.c:2573
 #, fuzzy
 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:1397
+#: src/exit/gnunet-daemon-exit.c:2639 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:1433
+#: src/exit/gnunet-daemon-exit.c:2698 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 ""
 
-#: src/exit/gnunet-daemon-exit.c:2745
+#: src/exit/gnunet-daemon-exit.c:2748
 #, fuzzy
 msgid "# UDP packets sent via TUN"
 msgstr "# byte skickade via UDP"
 
-#: src/exit/gnunet-daemon-exit.c:2859
+#: src/exit/gnunet-daemon-exit.c:2862
 #, fuzzy
 msgid "# UDP IP-exit requests received via mesh"
 msgstr "# byte mottogs via TCP"
 
-#: src/exit/gnunet-daemon-exit.c:2966
+#: src/exit/gnunet-daemon-exit.c:2969
 #, fuzzy
 msgid "# UDP service requests received via mesh"
 msgstr "# byte mottogs via TCP"
 
-#: src/exit/gnunet-daemon-exit.c:2989
+#: src/exit/gnunet-daemon-exit.c:2995
 #, fuzzy
 msgid "# UDP requests dropped (no such service)"
 msgstr "# byte mottogs via TCP"
 
-#: src/exit/gnunet-daemon-exit.c:3025
+#: src/exit/gnunet-daemon-exit.c:3031
 #, fuzzy
 msgid "# Inbound MESH channels created"
 msgstr "# PING-meddelanden skapade"
 
-#: src/exit/gnunet-daemon-exit.c:3286
+#: src/exit/gnunet-daemon-exit.c:3235 src/exit/gnunet-daemon-exit.c:3245
+#, fuzzy, c-format
+msgid "Option `%s' for domain `%s' is not formatted correctly!\n"
+msgstr "%s: flagga \"%s\" är tvetydig\n"
+
+#: src/exit/gnunet-daemon-exit.c:3259 src/exit/gnunet-daemon-exit.c:3267
+#, c-format
+msgid "`%s' is not a valid port number (for domain `%s')!"
+msgstr ""
+
+#: src/exit/gnunet-daemon-exit.c:3300
 #, c-format
 msgid "No addresses found for hostname `%s' of service `%s'!\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3300 src/exit/gnunet-daemon-exit.c:3312
+#: src/exit/gnunet-daemon-exit.c:3314 src/exit/gnunet-daemon-exit.c:3326
 #, c-format
 msgid "Service `%s' configured for IPv4, but IPv4 is disabled!\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3323
+#: src/exit/gnunet-daemon-exit.c:3337
 #, c-format
 msgid "No IP addresses found for hostname `%s' of service `%s'!\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3512
+#: src/exit/gnunet-daemon-exit.c:3527
 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:3520
+#: src/exit/gnunet-daemon-exit.c:3535
 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:3527
+#: src/exit/gnunet-daemon-exit.c:3542
 msgid ""
 "Cannot enable IPv4 exit but disable IPv4 on TUN interface, will use "
 "ENABLE_IPv4=YES\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3533
+#: src/exit/gnunet-daemon-exit.c:3548
 msgid ""
 "Cannot enable IPv6 exit but disable IPv6 on TUN interface, will use "
 "ENABLE_IPv6=YES\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3539 src/pt/gnunet-daemon-pt.c:1247
+#: src/exit/gnunet-daemon-exit.c:3554 src/exit/gnunet-daemon-exit.c:3717
+#: src/pt/gnunet-daemon-pt.c:1247
 msgid "No useful service enabled.  Exiting.\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3655
+#: src/exit/gnunet-daemon-exit.c:3664
 msgid "Must be a number"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3797
+#: src/exit/gnunet-daemon-exit.c:3813
 msgid "Daemon to run to provide an IP exit node for the VPN"
 msgstr ""
 
@@ -3169,7 +3188,7 @@ msgid "Downloading `%s' done (%s/s).\n"
 msgstr "Uppladdning vägrades!"
 
 #: src/fs/gnunet-download.c:209 src/fs/gnunet-publish.c:286
-#: src/fs/gnunet-search.c:193 src/fs/gnunet-unindex.c:108
+#: src/fs/gnunet-search.c:200 src/fs/gnunet-unindex.c:108
 #, c-format
 msgid "Unexpected status: %d\n"
 msgstr ""
@@ -3193,12 +3212,12 @@ msgid "Target filename must be specified.\n"
 msgstr ""
 
 #: src/fs/gnunet-download.c:268 src/fs/gnunet-publish.c:797
-#: src/fs/gnunet-search.c:243 src/fs/gnunet-unindex.c:140
+#: src/fs/gnunet-search.c:250 src/fs/gnunet-unindex.c:140
 #, fuzzy, c-format
 msgid "Could not initialize `%s' subsystem.\n"
 msgstr "Misslyckades att initiera tjänsten \"%s\".\n"
 
-#: src/fs/gnunet-download.c:305 src/fs/gnunet-search.c:282
+#: src/fs/gnunet-download.c:305 src/fs/gnunet-search.c:289
 msgid "set the desired LEVEL of receiver-anonymity"
 msgstr ""
 
@@ -3206,7 +3225,7 @@ msgstr ""
 msgid "delete incomplete downloads (when aborted with CTRL-C)"
 msgstr ""
 
-#: src/fs/gnunet-download.c:311 src/fs/gnunet-search.c:285
+#: src/fs/gnunet-download.c:311 src/fs/gnunet-search.c:292
 msgid "only search the local peer (no P2P network search)"
 msgstr ""
 
@@ -3367,7 +3386,7 @@ msgstr "Du måste ange en och endast en fil att avindexera.\n"
 msgid "You must NOT specify an URI and a filename.\n"
 msgstr "Du måste ange en och endast en fil att avindexera.\n"
 
-#: src/fs/gnunet-publish.c:768 src/vpn/gnunet-vpn.c:208
+#: src/fs/gnunet-publish.c:768 src/vpn/gnunet-vpn.c:209
 #, fuzzy, c-format
 msgid "Option `%s' is required when using option `%s'.\n"
 msgstr "Kommando \"%s\" kräver ett argument (\"%s\").\n"
@@ -3436,34 +3455,34 @@ msgstr ""
 msgid "Failed to write directory with search results to `%s'\n"
 msgstr ""
 
-#: src/fs/gnunet-search.c:184
+#: src/fs/gnunet-search.c:191
 #, fuzzy, c-format
 msgid "Error searching: %s.\n"
 msgstr "Fel vid lämning av DHT.\n"
 
-#: src/fs/gnunet-search.c:233
+#: src/fs/gnunet-search.c:240
 #, fuzzy
 msgid "Could not create keyword URI from arguments.\n"
 msgstr "Kunde inte skapa namnrymd \"%s\" (existerar?).\n"
 
-#: src/fs/gnunet-search.c:257
+#: src/fs/gnunet-search.c:264
 #, fuzzy
 msgid "Could not start searching.\n"
 msgstr "Kunde inte skapa namnrymd \"%s\" (existerar?).\n"
 
-#: src/fs/gnunet-search.c:288
+#: src/fs/gnunet-search.c:295
 msgid "write search results to file starting with PREFIX"
 msgstr ""
 
-#: src/fs/gnunet-search.c:291
+#: src/fs/gnunet-search.c:298
 msgid "automatically terminate search after DELAY"
 msgstr ""
 
-#: src/fs/gnunet-search.c:298
+#: src/fs/gnunet-search.c:305
 msgid "automatically terminate search after VALUE results are found"
 msgstr ""
 
-#: src/fs/gnunet-search.c:309
+#: src/fs/gnunet-search.c:316
 msgid "Search GNUnet for files that were published on GNUnet"
 msgstr ""
 
@@ -3853,7 +3872,7 @@ msgstr "Kunde inte komma åt namnrymdsinformation.\n"
 msgid "Unindex a file that was previously indexed with gnunet-publish."
 msgstr ""
 
-#: src/gns/gns_api.c:387
+#: src/gns/gns_api.c:393
 #, fuzzy
 msgid "Failed to serialize lookup reply from GNS service!\n"
 msgstr "Misslyckades att ta emot svar till \"%s\" meddelande från gnunetd\n"
@@ -3954,14 +3973,14 @@ msgstr ""
 msgid "Ego for `%s' not found, cannot perform lookup.\n"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:336 src/gns/gnunet-gns-helper-service-w32.c:753
+#: src/gns/gnunet-gns.c:336 src/gns/gnunet-gns-helper-service-w32.c:798
 #, c-format
 msgid ""
 "Ego for `gns-master' not found, cannot perform lookup.  Did you run gnunet-"
 "gns-import.sh?\n"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:365 src/gns/gnunet-gns-helper-service-w32.c:783
+#: src/gns/gnunet-gns.c:365 src/gns/gnunet-gns-helper-service-w32.c:828
 #, fuzzy, c-format
 msgid "Failed to connect to GNS\n"
 msgstr "Misslyckades att ansluta till gnunetd.\n"
@@ -3999,7 +4018,7 @@ msgstr "ange prioritet för innehållet"
 msgid "GNUnet GNS resolver tool"
 msgstr "Spåra GNUnets nätverkstopologi."
 
-#: src/gns/gnunet-gns-helper-service-w32.c:723
+#: src/gns/gnunet-gns-helper-service-w32.c:768
 #, c-format
 msgid ""
 "Ego for `gns-short' not found. This is not really fatal, but i'll pretend "
@@ -4007,7 +4026,7 @@ msgid ""
 "sh?\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-helper-service-w32.c:793
+#: src/gns/gnunet-gns-helper-service-w32.c:838
 #, fuzzy, c-format
 msgid "Failed to connect to identity service\n"
 msgstr "Misslyckades att ansluta till gnunetd.\n"
@@ -4017,8 +4036,8 @@ msgstr "Misslyckades att ansluta till gnunetd.\n"
 #: 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
+#: src/transport/plugin_transport_http_client.c:1070
+#: src/transport/plugin_transport_http_client.c:1085
 #, fuzzy, c-format
 msgid "%s failed at %s:%d: `%s'\n"
 msgstr "\"%s\" misslyckades vid %s:%d med fel: \"%s\".\n"
@@ -4162,36 +4181,36 @@ msgstr ""
 msgid "Failed to connect to the DNS service!\n"
 msgstr "Misslyckades att ansluta till gnunetd.\n"
 
-#: src/gns/gnunet-service-gns_resolver.c:815
+#: src/gns/gnunet-service-gns_resolver.c:816
 #, 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:957
+#: src/gns/gnunet-service-gns_resolver.c:958
 #, c-format
 msgid "Skipping record of unsupported type %d\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns_resolver.c:1316
+#: src/gns/gnunet-service-gns_resolver.c:1317
 #, c-format
 msgid "GNS lookup resulted in DNS name that is too long (`%s')\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns_resolver.c:1809
+#: src/gns/gnunet-service-gns_resolver.c:1817
 msgid "GNS lookup recursion failed (no delegation record found)\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns_resolver.c:1833
+#: src/gns/gnunet-service-gns_resolver.c:1841
 #, 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:2071
+#: src/gns/gnunet-service-gns_resolver.c:2173
 #, c-format
 msgid "Zone %s was revoked, resolution fails\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns_resolver.c:2220
+#: src/gns/gnunet-service-gns_resolver.c:2322
 #, c-format
 msgid "Hostname `%s' is not well-formed, resolution fails\n"
 msgstr ""
@@ -4587,7 +4606,7 @@ msgid "Advertisement message could not be queued by core\n"
 msgstr ""
 
 #: src/hostlist/hostlist-server.c:556 src/peerinfo-tool/gnunet-peerinfo.c:651
-#: src/transport/gnunet-service-transport.c:850
+#: src/transport/gnunet-service-transport.c:946
 #, fuzzy
 msgid "Could not access PEERINFO service.  Exiting.\n"
 msgstr "Kunde inte komma åt namnrymdsinformation.\n"
@@ -4699,64 +4718,50 @@ msgstr "Kunde inte spara konfigurationsfil \"%s\":"
 msgid "Failed to create directory `%s' for storing egos\n"
 msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 
-#: src/integration-tests/connection_watchdog.c:1012
-#, fuzzy, c-format
-msgid "Transport plugin: `%s' port %llu\n"
-msgstr "Testar transport(er) %s\n"
-
-#: src/integration-tests/connection_watchdog.c:1045
-#, fuzzy, c-format
-msgid "Found %u transport plugins: `%s'\n"
-msgstr "Testar transport(er) %s\n"
-
-#: src/integration-tests/connection_watchdog.c:1105
-msgid "Send ping messages to test connectivity (default == NO)"
-msgstr ""
-
-#: src/mesh/gnunet-mesh.c:299
+#: src/mesh/gnunet-mesh.c:300
 #, fuzzy, c-format
 msgid "Invalid target `%s'\n"
 msgstr "Ogiltigt argument: \"%s\"\n"
 
-#: src/mesh/gnunet-mesh.c:417
+#: src/mesh/gnunet-mesh.c:434
 #, fuzzy, c-format
 msgid "Invalid tunnel owner `%s'\n"
 msgstr "Ogiltigt format för IP: \"%s\"\n"
 
-#: src/mesh/gnunet-mesh.c:482
+#: src/mesh/gnunet-mesh.c:499
 msgid "You must NOT give a TARGET when using options\n"
 msgstr ""
 
-#: src/mesh/gnunet-mesh.c:559
+#: src/mesh/gnunet-mesh.c:576
 #, fuzzy
 msgid "provide information about a particular channel"
 msgstr "Skriv ut information om GNUnets motparter."
 
-#: src/mesh/gnunet-mesh.c:562
+#: src/mesh/gnunet-mesh.c:579
 #, fuzzy
 msgid "provide information about a particular connection"
 msgstr "Skriv ut information om GNUnets motparter."
 
-#: src/mesh/gnunet-mesh.c:565
+#: src/mesh/gnunet-mesh.c:582
 #, fuzzy
 msgid "provide information about all tunnels"
 msgstr "Skriv ut information om GNUnets motparter."
 
-#: src/mesh/gnunet-mesh.c:568
+#: src/mesh/gnunet-mesh.c:585
 #, fuzzy
 msgid "provide information about all tunnels (continuously) NOT IMPLEMENTED"
 msgstr "Skriv ut information om GNUnets motparter."
 
-#: src/mesh/gnunet-mesh.c:571
+#: src/mesh/gnunet-mesh.c:588
 msgid "port to listen to (default; 0)"
 msgstr ""
 
-#: src/mesh/gnunet-mesh.c:574
+#: src/mesh/gnunet-mesh.c:591
 #, fuzzy
 msgid "provide information about a particular tunnel"
 msgstr "Skriv ut information om GNUnets motparter."
 
-#: src/mesh/gnunet-service-mesh_peer.c:349
+#: src/mesh/gnunet-service-mesh_peer.c:377
 msgid "Wrong CORE service\n"
 msgstr ""
 
@@ -4775,7 +4780,7 @@ msgstr "Kunde inte köra \"%s\": %s\n"
 msgid "No records found for `%s'"
 msgstr "%d filer hittades i katalog.\n"
 
-#: src/namecache/gnunet-namecache.c:124 src/namestore/gnunet-namestore.c:394
+#: src/namecache/gnunet-namecache.c:124 src/namestore/gnunet-namestore.c:397
 #, c-format
 msgid "\tCorrupt or unsupported record of type %u\n"
 msgstr ""
@@ -4785,7 +4790,7 @@ msgstr ""
 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:692
+#: src/namecache/gnunet-namecache.c:195 src/namestore/gnunet-namestore.c:695
 #, fuzzy, c-format
 msgid "Invalid public key for reverse lookup `%s'\n"
 msgstr "Ogiltigt argument: \"%s\"\n"
@@ -4795,7 +4800,7 @@ msgstr "Ogiltigt argument: \"%s\"\n"
 msgid "You must specify a name\n"
 msgstr "Du måste ange en mottagare!\n"
 
-#: src/namecache/gnunet-namecache.c:234 src/namestore/gnunet-namestore.c:925
+#: src/namecache/gnunet-namecache.c:234 src/namestore/gnunet-namestore.c:931
 msgid "name of the record to add/delete/display"
 msgstr ""
 
@@ -4804,7 +4809,7 @@ msgstr ""
 msgid "spezifies the public key of the zone to look in"
 msgstr "ange prioritet för innehållet"
 
-#: src/namecache/gnunet-namecache.c:248 src/namestore/gnunet-namestore.c:957
+#: src/namecache/gnunet-namecache.c:248 src/namestore/gnunet-namestore.c:963
 #, fuzzy
 msgid "GNUnet zone manipulation tool"
 msgstr "GNUnet-konfiguration"
@@ -4814,160 +4819,160 @@ msgid "Namecache failed to cache block"
 msgstr ""
 
 #: src/namecache/plugin_namecache_postgres.c:89
-#: src/namestore/plugin_namestore_postgres.c:93
+#: src/namestore/plugin_namestore_postgres.c:96
 #, fuzzy
 msgid "Failed to create indices\n"
 msgstr "Kunde inte skapa namnrymd \"%s\" (existerar?).\n"
 
-#: src/namestore/gnunet-namestore.c:304
+#: src/namestore/gnunet-namestore.c:303
 #, fuzzy, c-format
 msgid "Adding record failed: %s\n"
 msgstr ""
 "\n"
 "Fel vid uppladdning av fil: %s\n"
 
-#: src/namestore/gnunet-namestore.c:333
+#: src/namestore/gnunet-namestore.c:332
 #, 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:340
+#: src/namestore/gnunet-namestore.c:339
 #, fuzzy, c-format
 msgid "Deleting record failed%s%s\n"
 msgstr ""
 "\n"
 "Fel vid uppladdning av fil: %s\n"
 
-#: src/namestore/gnunet-namestore.c:555
+#: src/namestore/gnunet-namestore.c:558
 #, c-format
 msgid "No options given\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:566
+#: src/namestore/gnunet-namestore.c:569
 #: 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: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
+#: src/namestore/gnunet-namestore.c:577 src/namestore/gnunet-namestore.c:586
+#: src/namestore/gnunet-namestore.c:603 src/namestore/gnunet-namestore.c:625
+#: src/namestore/gnunet-namestore.c:665
 #, fuzzy, c-format
 msgid "Missing option `%s' for operation `%s'\n"
 msgstr "Konfigurationsfil \"%s\" skapad.\n"
 
-#: src/namestore/gnunet-namestore.c:575 src/namestore/gnunet-namestore.c:584
-#: src/namestore/gnunet-namestore.c:601 src/namestore/gnunet-namestore.c:623
+#: src/namestore/gnunet-namestore.c:578 src/namestore/gnunet-namestore.c:587
+#: src/namestore/gnunet-namestore.c:604 src/namestore/gnunet-namestore.c:626
 msgid "add"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:592
+#: src/namestore/gnunet-namestore.c:595
 #, fuzzy, c-format
 msgid "Unsupported type `%s'\n"
 msgstr "Kommando \"%s\" stöds ej.  Avbryter.\n"
 
-#: src/namestore/gnunet-namestore.c:612
+#: src/namestore/gnunet-namestore.c:615
 #, 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:648
+#: src/namestore/gnunet-namestore.c:651
 #, fuzzy, c-format
 msgid "Invalid time format `%s'\n"
 msgstr "Ogiltigt format för IP: \"%s\"\n"
 
-#: src/namestore/gnunet-namestore.c:663
+#: src/namestore/gnunet-namestore.c:666
 msgid "del"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:712
+#: src/namestore/gnunet-namestore.c:715
 #: src/peerinfo-tool/gnunet-peerinfo.c:703
 #, fuzzy, c-format
 msgid "Invalid URI `%s'\n"
 msgstr "Ogiltiga argument: "
 
-#: src/namestore/gnunet-namestore.c:747
+#: src/namestore/gnunet-namestore.c:750
 #, fuzzy, c-format
 msgid "Invalid nick `%s'\n"
 msgstr "Ogiltiga argument: "
 
-#: src/namestore/gnunet-namestore.c:787
+#: src/namestore/gnunet-namestore.c:790
 #, 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:814
+#: src/namestore/gnunet-namestore.c:817
 #, 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
+#: src/namestore/gnunet-namestore.c:853
 #, fuzzy, c-format
 msgid "Identity service is not running\n"
 msgstr "\"%s\" är inte en fil.\n"
 
-#: src/namestore/gnunet-namestore.c:859
+#: src/namestore/gnunet-namestore.c:865
 #, fuzzy, c-format
 msgid "Cannot connect to identity service\n"
 msgstr "Kunde inte ansluta till gnunetd.\n"
 
-#: src/namestore/gnunet-namestore.c:907
+#: src/namestore/gnunet-namestore.c:913
 msgid "add record"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:910
+#: src/namestore/gnunet-namestore.c:916
 msgid "delete record"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:913
+#: src/namestore/gnunet-namestore.c:919
 msgid "display records"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:916
+#: src/namestore/gnunet-namestore.c:922
 msgid ""
 "expiration time for record to use (for adding only), \"never\" is possible"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:919
+#: src/namestore/gnunet-namestore.c:925
 #, fuzzy
 msgid "set the desired nick name for the zone"
 msgstr "Skriv ut information om GNUnets motparter."
 
-#: src/namestore/gnunet-namestore.c:922
+#: src/namestore/gnunet-namestore.c:928
 #, fuzzy
 msgid "monitor changes in the namestore"
 msgstr "Misslyckades att ansluta till gnunetd.\n"
 
-#: src/namestore/gnunet-namestore.c:928
+#: src/namestore/gnunet-namestore.c:934
 #, fuzzy
 msgid "determine our name for the given PKEY"
 msgstr "Skriv ut information om GNUnets motparter."
 
-#: src/namestore/gnunet-namestore.c:931
+#: src/namestore/gnunet-namestore.c:937
 msgid "type of the record to add/delete/display"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:934
+#: src/namestore/gnunet-namestore.c:940
 msgid "URI to import into our zone"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:937
+#: src/namestore/gnunet-namestore.c:943
 msgid "value of the record to add/delete"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:940
+#: src/namestore/gnunet-namestore.c:946
 msgid "create or list public record"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:943
+#: src/namestore/gnunet-namestore.c:949
 msgid ""
 "create shadow record (only valid if all other records of the same type have "
 "expired"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:946
+#: src/namestore/gnunet-namestore.c:952
 #, fuzzy
 msgid "name of the ego controlling the zone"
 msgstr "Visa värde av alternativet"
@@ -5032,7 +5037,7 @@ msgstr "Misslyckades att ansluta till gnunetd.\n"
 msgid "GNU Name System First Come First Serve name registration service"
 msgstr ""
 
-#: src/namestore/gnunet-service-namestore.c:634
+#: src/namestore/gnunet-service-namestore.c:638
 #, fuzzy, c-format
 msgid "Failed to replicate block in namecache: %s\n"
 msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
@@ -5050,88 +5055,88 @@ msgstr ""
 msgid "GNUnet NAT traversal test helper daemon"
 msgstr ""
 
-#: src/nat/nat_auto.c:169
+#: src/nat/nat_auto.c:170
 msgid "NAT traversal with ICMP Server timed out.\n"
 msgstr ""
 
-#: src/nat/nat_auto.c:199
+#: src/nat/nat_auto.c:200
 msgid "NAT traversal with ICMP Server succeeded.\n"
 msgstr ""
 
-#: src/nat/nat_auto.c:200
+#: src/nat/nat_auto.c:201
 msgid "NAT traversal with ICMP Server failed.\n"
 msgstr ""
 
-#: src/nat/nat_auto.c:219
+#: src/nat/nat_auto.c:222
 #, fuzzy
 msgid "Testing connection reversal with ICMP server.\n"
 msgstr "Skriv ut information om GNUnets motparter."
 
-#: src/nat/nat_auto.c:265
+#: src/nat/nat_auto.c:269
 #, fuzzy, c-format
 msgid "Detected external IP `%s'\n"
 msgstr "Mottog ogiltig RPC \"%s\".\n"
 
-#: src/nat/nat_auto.c:331
+#: src/nat/nat_auto.c:339
 msgid "This system has a global IPv6 address, setting IPv6 to supported.\n"
 msgstr ""
 
-#: src/nat/nat_auto.c:347
+#: src/nat/nat_auto.c:355
 #, c-format
 msgid "Detected internal network address `%s'.\n"
 msgstr ""
 
-#: src/nat/nat_auto.c:400
+#: src/nat/nat_auto.c:408
 msgid "upnpc found, enabling its use\n"
 msgstr ""
 
-#: src/nat/nat_auto.c:401
+#: src/nat/nat_auto.c:409
 #, fuzzy
 msgid "upnpc not found\n"
 msgstr "Kommando \"%s\" hittades inte!\n"
 
-#: src/nat/nat_auto.c:434
+#: src/nat/nat_auto.c:442
 msgid "gnunet-helper-nat-server found, testing it\n"
 msgstr ""
 
-#: src/nat/nat_auto.c:435
+#: src/nat/nat_auto.c:443
 msgid "No working gnunet-helper-nat-server found\n"
 msgstr ""
 
-#: src/nat/nat_auto.c:469
+#: src/nat/nat_auto.c:477
 msgid "gnunet-helper-nat-client found, enabling it\n"
 msgstr ""
 
-#: src/nat/nat_auto.c:470
+#: src/nat/nat_auto.c:478
 msgid "gnunet-helper-nat-client not found or behind NAT, disabling it\n"
 msgstr ""
 
-#: src/nat/nat.c:834
+#: src/nat/nat.c:867
 #, c-format
 msgid "gnunet-helper-nat-server generated malformed address `%s'\n"
 msgstr ""
 
-#: src/nat/nat.c:883
+#: src/nat/nat.c:917
 #, fuzzy, c-format
 msgid "Failed to start %s\n"
 msgstr "Misslyckades att starta samling.\n"
 
-#: src/nat/nat.c:1152
+#: src/nat/nat.c:1203
 msgid "malformed"
 msgstr ""
 
-#: src/nat/nat.c:1218 src/nat/nat.c:1230
+#: src/nat/nat.c:1274 src/nat/nat.c:1286
 #, c-format
 msgid ""
 "Configuration requires `%s', but binary is not installed properly (SUID bit "
 "not set).  Option disabled.\n"
 msgstr ""
 
-#: src/nat/nat.c:1365
+#: src/nat/nat.c:1424
 msgid "Internal IP address not known, cannot use ICMP NAT traversal method\n"
 msgstr ""
 
-#: src/nat/nat.c:1376
+#: src/nat/nat.c:1440
 #, c-format
 msgid "Running gnunet-helper-nat-client %s %s %u\n"
 msgstr ""
@@ -5144,12 +5149,12 @@ msgstr ""
 msgid "`upnpc' command not found\n"
 msgstr ""
 
-#: src/nat/nat_test.c:345
+#: src/nat/nat_test.c:348
 #, fuzzy
 msgid "Failed to connect to `gnunet-nat-server'\n"
 msgstr "Misslyckades att ansluta till gnunetd.\n"
 
-#: src/nat/nat_test.c:414
+#: src/nat/nat_test.c:420
 #, c-format
 msgid "Failed to create listen socket bound to `%s' for NAT test: %s\n"
 msgstr ""
@@ -5204,36 +5209,37 @@ 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:373
+#: src/peerinfo/gnunet-service-peerinfo.c:390
 #, fuzzy, c-format
-msgid "Failed to parse HELLO in file `%s': %s %u \n"
+msgid "Failed to parse HELLO in file `%s'\n"
 msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 
-#: src/peerinfo/gnunet-service-peerinfo.c:457
+#: src/peerinfo/gnunet-service-peerinfo.c:468
 msgid "# peers known"
 msgstr ""
 
-#: src/peerinfo/gnunet-service-peerinfo.c:494
+#: src/peerinfo/gnunet-service-peerinfo.c:505
 #, c-format
 msgid ""
 "File `%s' in directory `%s' does not match naming convention. Removed.\n"
 msgstr ""
 
-#: src/peerinfo/gnunet-service-peerinfo.c:644
+#: src/peerinfo/gnunet-service-peerinfo.c:655
 #, fuzzy, c-format
 msgid "Scanning directory `%s'\n"
 msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 
-#: src/peerinfo/gnunet-service-peerinfo.c:649
+#: src/peerinfo/gnunet-service-peerinfo.c:660
 #, c-format
 msgid "Still no peers found in `%s'!\n"
 msgstr ""
 
-#: src/peerinfo/gnunet-service-peerinfo.c:985
+#: src/peerinfo/gnunet-service-peerinfo.c:996
 #, 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:1275
+#: src/peerinfo/gnunet-service-peerinfo.c:1286
 #, c-format
 msgid "Importing HELLOs from `%s'\n"
 msgstr ""
@@ -5357,19 +5363,19 @@ msgid "Print information about peers."
 msgstr "Skriv ut information om GNUnets motparter."
 
 #: src/peerinfo-tool/gnunet-peerinfo_plugins.c:105
-#: src/transport/gnunet-service-transport_plugins.c:123
+#: src/transport/gnunet-service-transport_plugins.c:124
 #, fuzzy, c-format
 msgid "Starting transport plugins `%s'\n"
 msgstr "Testar transport(er) %s\n"
 
 #: src/peerinfo-tool/gnunet-peerinfo_plugins.c:109
-#: src/transport/gnunet-service-transport_plugins.c:127
+#: src/transport/gnunet-service-transport_plugins.c:129
 #, fuzzy, c-format
 msgid "Loading `%s' transport plugin\n"
 msgstr "Testar transport(er) %s\n"
 
 #: src/peerinfo-tool/gnunet-peerinfo_plugins.c:129
-#: src/transport/gnunet-service-transport_plugins.c:157
+#: src/transport/gnunet-service-transport_plugins.c:159
 #, fuzzy, c-format
 msgid "Failed to load transport plugin for `%s'\n"
 msgstr "Kunde inte slå upp \"%s\": %s\n"
@@ -5639,6 +5645,11 @@ msgstr ""
 msgid "Profiler for regex library"
 msgstr ""
 
+#: src/regex/regex_api.c:131
+#, fuzzy, c-format
+msgid "Regex `%s' is too long!\n"
+msgstr "\"%s\" är inte en fil.\n"
+
 #: src/revocation/gnunet-revocation.c:121
 #, fuzzy, c-format
 msgid "Key `%s' is valid\n"
@@ -5993,7 +6004,7 @@ msgstr "Misslyckades att ansluta till gnunetd.\n"
 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
+#: src/set/gnunet-service-set.c:1400
 #, fuzzy
 msgid "Could not connect to mesh service\n"
 msgstr "Kunde inte ansluta till gnunetd.\n"
@@ -6114,12 +6125,12 @@ msgstr ""
 msgid "Print statistics about GNUnet operations."
 msgstr "Skriv ut statistik om GNUnet-operationer."
 
-#: src/statistics/statistics_api.c:509
+#: src/statistics/statistics_api.c:506
 #, fuzzy
 msgid "Could not save some persistent statistics\n"
 msgstr "Kunde inte skapa värdnyckel!\n"
 
-#: src/statistics/statistics_api.c:1054
+#: src/statistics/statistics_api.c:1074
 msgid ""
 "Failed to receive acknowledgement from statistics service, some statistics "
 "might have been lost!\n"
@@ -6487,34 +6498,34 @@ msgstr ""
 msgid "# disconnects due to blacklist"
 msgstr ""
 
-#: src/transport/gnunet-service-transport.c:160
+#: src/transport/gnunet-service-transport.c:206
 #, fuzzy
 msgid "# bytes payload discarded due to not connected peer"
 msgstr "Nätverksannonsering avstängd i konfigurationen!\n"
 
-#: src/transport/gnunet-service-transport.c:250
+#: src/transport/gnunet-service-transport.c:325
 #, fuzzy
 msgid "# bytes total received"
 msgstr "# byte krypterade"
 
-#: src/transport/gnunet-service-transport.c:325
+#: src/transport/gnunet-service-transport.c:399
 #, fuzzy
 msgid "# bytes payload received"
 msgstr "# byte dekrypterade"
 
-#: src/transport/gnunet-service-transport.c:479
+#: src/transport/gnunet-service-transport.c:574
 #, fuzzy, c-format
-msgid "Could not obtain a valid network for `%s' %s\n"
+msgid "Could not obtain a valid network for `%s' %s (%s)\n"
 msgstr "Kunde inte köra \"%s\": %s\n"
 
-#: src/transport/gnunet-service-transport.c:529
+#: src/transport/gnunet-service-transport.c:628
 #, 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:820
+#: src/transport/gnunet-service-transport.c:916
 #, fuzzy
 msgid "Transport service is lacking key configuration settings. Exiting.\n"
 msgstr "GNUnet-konfiguration"
@@ -6546,155 +6557,165 @@ msgstr "# krypterade PONG-meddelanden mottagna"
 msgid "# refreshed my HELLO"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1074
+#: src/transport/gnunet-service-transport_neighbours.c:1108
 #, fuzzy
 msgid "# DISCONNECT messages sent"
 msgstr "# krypterade PONG-meddelanden mottagna"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1206
-#: src/transport/gnunet-service-transport_neighbours.c:1541
+#: src/transport/gnunet-service-transport_neighbours.c:1244
+#: src/transport/gnunet-service-transport_neighbours.c:1653
 msgid "# bytes in message queue for other peers"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1211
+#: src/transport/gnunet-service-transport_neighbours.c:1249
 #, fuzzy
 msgid "# messages transmitted to other peers"
 msgstr "# byte skickade av typen %d"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1216
+#: src/transport/gnunet-service-transport_neighbours.c:1254
 #, fuzzy
 msgid "# transmission failures for messages to other peers"
 msgstr "# byte skickade av typen %d"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1273
+#: src/transport/gnunet-service-transport_neighbours.c:1311
 msgid "# messages timed out while in transport queue"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1315
+#: src/transport/gnunet-service-transport_neighbours.c:1368
 #, fuzzy
 msgid "# keepalives sent"
 msgstr "# sessionsnycklar skickade"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1339
+#: src/transport/gnunet-service-transport_neighbours.c:1401
 #, fuzzy
 msgid "# KEEPALIVE messages discarded (peer unknown)"
 msgstr "Nätverksannonsering avstängd i konfigurationen!\n"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1347
+#: src/transport/gnunet-service-transport_neighbours.c:1409
 #, fuzzy
 msgid "# KEEPALIVE messages discarded (no session)"
 msgstr "Nätverksannonsering avstängd i konfigurationen!\n"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1380
+#: src/transport/gnunet-service-transport_neighbours.c:1456
 #, fuzzy
 msgid "# KEEPALIVE_RESPONSE messages discarded (not connected)"
 msgstr "Nätverksannonsering avstängd i konfigurationen!\n"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1389
+#: src/transport/gnunet-service-transport_neighbours.c:1465
 #, fuzzy
 msgid "# KEEPALIVE_RESPONSE messages discarded (not expected)"
 msgstr "Nätverksannonsering avstängd i konfigurationen!\n"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1446
+#: src/transport/gnunet-service-transport_neighbours.c:1473
+#, fuzzy
+msgid "# KEEPALIVE_RESPONSE messages discarded (address changed)"
+msgstr "Nätverksannonsering avstängd i konfigurationen!\n"
+
+#: src/transport/gnunet-service-transport_neighbours.c:1481
+#, fuzzy
+msgid "# KEEPALIVE_RESPONSE messages discarded (wrong nonce)"
+msgstr "Nätverksannonsering avstängd i konfigurationen!\n"
+
+#: src/transport/gnunet-service-transport_neighbours.c:1558
 #, 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:1480
+#: src/transport/gnunet-service-transport_neighbours.c:1592
 msgid "# bandwidth quota violations by other peers"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1496
+#: src/transport/gnunet-service-transport_neighbours.c:1608
 msgid "# ms throttling suggested"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1585
+#: src/transport/gnunet-service-transport_neighbours.c:1700
 #, fuzzy
 msgid "# SESSION_CONNECT messages sent"
 msgstr "# krypterade PONG-meddelanden mottagna"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1601
+#: src/transport/gnunet-service-transport_neighbours.c:1716
 #, 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
+#: src/transport/gnunet-service-transport_neighbours.c:1759
 #, fuzzy
 msgid "# CONNECT_ACK messages sent"
 msgstr "# krypterade PONG-meddelanden mottagna"
 
-#: src/transport/gnunet-service-transport_neighbours.c:2106
+#: src/transport/gnunet-service-transport_neighbours.c:2236
 #, fuzzy
 msgid "# CONNECT messages received"
 msgstr "# krypterade PONG-meddelanden mottagna"
 
-#: src/transport/gnunet-service-transport_neighbours.c:2111
+#: src/transport/gnunet-service-transport_neighbours.c:2241
 #, c-format
 msgid "CONNECT request from peer `%s' ignored due impending shutdown\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:2824
+#: src/transport/gnunet-service-transport_neighbours.c:2979
 #, fuzzy
 msgid "# CONNECT_ACK messages received"
 msgstr "# krypterade PONG-meddelanden mottagna"
 
-#: src/transport/gnunet-service-transport_neighbours.c:2832
+#: src/transport/gnunet-service-transport_neighbours.c:2987
 #, fuzzy
 msgid "# unexpected CONNECT_ACK messages (no peer)"
 msgstr "skicka ANTAL meddelanden"
 
-#: src/transport/gnunet-service-transport_neighbours.c:2847
-#: src/transport/gnunet-service-transport_neighbours.c:2882
+#: src/transport/gnunet-service-transport_neighbours.c:3002
+#: src/transport/gnunet-service-transport_neighbours.c:3039
 #, fuzzy
 msgid "# unexpected CONNECT_ACK messages (not ready)"
 msgstr "skicka ANTAL meddelanden"
 
-#: src/transport/gnunet-service-transport_neighbours.c:2895
+#: src/transport/gnunet-service-transport_neighbours.c:3052
 #, fuzzy
 msgid "# unexpected CONNECT_ACK messages (waiting on ATS)"
 msgstr "skicka ANTAL meddelanden"
 
-#: src/transport/gnunet-service-transport_neighbours.c:2926
+#: src/transport/gnunet-service-transport_neighbours.c:3085
 #, fuzzy
 msgid "# unexpected CONNECT_ACK messages (disconnecting)"
 msgstr "skicka ANTAL meddelanden"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3106
+#: src/transport/gnunet-service-transport_neighbours.c:3265
 #, fuzzy
 msgid "# SESSION_ACK messages received"
 msgstr "# krypterade PONG-meddelanden mottagna"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3122
+#: src/transport/gnunet-service-transport_neighbours.c:3284
 #, fuzzy
 msgid "# unexpected SESSION_ACK messages"
 msgstr "# krypterade PONG-meddelanden skickade"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3176
+#: src/transport/gnunet-service-transport_neighbours.c:3340
 msgid "# SET QUOTA messages ignored (no such peer)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3190
+#: src/transport/gnunet-service-transport_neighbours.c:3355
 msgid "# disconnects due to quota of 0"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3220
+#: src/transport/gnunet-service-transport_neighbours.c:3383
 msgid "# disconnect messages ignored (old format)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3226
+#: src/transport/gnunet-service-transport_neighbours.c:3389
 #, fuzzy
 msgid "# DISCONNECT messages received"
 msgstr "# krypterade PONG-meddelanden mottagna"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3235
+#: src/transport/gnunet-service-transport_neighbours.c:3398
 msgid "# disconnect messages ignored (timestamp)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3271
+#: src/transport/gnunet-service-transport_neighbours.c:3434
 msgid "# other peer asked to disconnect from us"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3366
+#: src/transport/gnunet-service-transport_neighbours.c:3532
 #, fuzzy
 msgid "# disconnected from peer upon explicit request"
 msgstr "# av anslutna parter"
@@ -6703,20 +6724,22 @@ msgstr "# av anslutna parter"
 msgid "Transport service is lacking NEIGHBOUR_LIMIT option.\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_plugins.c:170
-#: src/transport/gnunet-service-transport_plugins.c:178
-#: src/transport/gnunet-service-transport_plugins.c:186
-#: src/transport/gnunet-service-transport_plugins.c:194
-#: src/transport/gnunet-service-transport_plugins.c:202
-#: 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
+#: src/transport/gnunet-service-transport_plugins.c:172
+#: src/transport/gnunet-service-transport_plugins.c:180
+#: src/transport/gnunet-service-transport_plugins.c:188
+#: src/transport/gnunet-service-transport_plugins.c:196
+#: src/transport/gnunet-service-transport_plugins.c:204
+#: src/transport/gnunet-service-transport_plugins.c:212
+#: src/transport/gnunet-service-transport_plugins.c:220
+#: src/transport/gnunet-service-transport_plugins.c:228
+#: src/transport/gnunet-service-transport_plugins.c:236
+#: src/transport/gnunet-service-transport_plugins.c:244
+#: src/transport/gnunet-service-transport_plugins.c:252
 #, 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:241
+#: src/transport/gnunet-service-transport_plugins.c:259
 #, c-format
 msgid "Did not load plugin `%s' due to missing functions\n"
 msgstr ""
@@ -6964,7 +6987,7 @@ msgstr "# PING-meddelanden skapade"
 
 #: src/transport/plugin_transport_bluetooth.c:681
 #: src/transport/plugin_transport_bluetooth.c:731
-#: src/transport/plugin_transport_bluetooth.c:1854
+#: src/transport/plugin_transport_bluetooth.c:1881
 #, fuzzy
 msgid "# Bluetooth sessions allocated"
 msgstr "# sessionsnycklar accepterade"
@@ -6980,186 +7003,186 @@ msgstr ""
 
 #: src/transport/plugin_transport_bluetooth.c:938
 #: src/transport/plugin_transport_bluetooth.c:1023
-#: src/transport/plugin_transport_bluetooth.c:1856
+#: src/transport/plugin_transport_bluetooth.c:1883
 #, fuzzy
 msgid "# Bluetooth MAC endpoints allocated"
 msgstr "# byte mottogs via TCP"
 
-#: src/transport/plugin_transport_bluetooth.c:1235
+#: src/transport/plugin_transport_bluetooth.c:1250
 #, fuzzy
 msgid "# HELLO messages received via Bluetooth"
 msgstr "# krypterade PONG-meddelanden mottagna"
 
-#: src/transport/plugin_transport_bluetooth.c:1261
+#: src/transport/plugin_transport_bluetooth.c:1276
 #, fuzzy
 msgid "# fragments received via Bluetooth"
 msgstr "# byte mottogs via TCP"
 
-#: src/transport/plugin_transport_bluetooth.c:1271
+#: src/transport/plugin_transport_bluetooth.c:1286
 #, fuzzy
 msgid "# ACKs received via Bluetooth"
 msgstr "# byte mottogs via TCP"
 
-#: src/transport/plugin_transport_bluetooth.c:1328
+#: src/transport/plugin_transport_bluetooth.c:1343
 #, fuzzy
 msgid "# Bluetooth DATA messages discarded due to CRC32 error"
 msgstr "Nätverksannonsering avstängd i konfigurationen!\n"
 
-#: src/transport/plugin_transport_bluetooth.c:1440
+#: src/transport/plugin_transport_bluetooth.c:1455
 #, fuzzy
 msgid "# DATA messages received via Bluetooth"
 msgstr "# krypterade PONG-meddelanden mottagna"
 
-#: src/transport/plugin_transport_bluetooth.c:1475
+#: src/transport/plugin_transport_bluetooth.c:1490
 #, fuzzy
 msgid "# Bluetooth DATA messages processed"
 msgstr "# krypterade PONG-meddelanden mottagna"
 
-#: src/transport/plugin_transport_bluetooth.c:1538
+#: src/transport/plugin_transport_bluetooth.c:1553
 #, fuzzy
 msgid "# HELLO beacons sent via Bluetooth"
 msgstr "# byte skickade via UDP"
 
-#: src/transport/plugin_transport_bluetooth.c:1651
+#: src/transport/plugin_transport_bluetooth.c:1666
 msgid "Bluetooth address with invalid size encountered\n"
 msgstr ""
 
-#: src/transport/plugin_transport_bluetooth.c:1835
+#: src/transport/plugin_transport_bluetooth.c:1862
 #, c-format
 msgid "Helper binary `%s' not SUID, cannot run bluetooth transport\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_client.c:1590
+#: src/transport/plugin_transport_http_client.c:1618
 #, c-format
 msgid "Could not initialize curl multi handle, failed to start %s plugin!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_client.c:1727
-#: src/transport/plugin_transport_http_server.c:2974
+#: src/transport/plugin_transport_http_client.c:1693
+#: src/transport/plugin_transport_http_server.c:3001
 #, fuzzy, c-format
 msgid "Shutting down plugin `%s'\n"
 msgstr "Testar transport(er) %s\n"
 
-#: src/transport/plugin_transport_http_client.c:1752
-#: src/transport/plugin_transport_http_server.c:3032
+#: src/transport/plugin_transport_http_client.c:1718
+#: src/transport/plugin_transport_http_server.c:3059
 #, 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:1780
-#: src/transport/plugin_transport_http_server.c:2874
+#: src/transport/plugin_transport_http_client.c:1746
+#: src/transport/plugin_transport_http_server.c:2901
 #, 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:1389
+#: src/transport/plugin_transport_http_server.c:1416
 #, 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:1653
+#: src/transport/plugin_transport_http_server.c:1680
 #, c-format
 msgid "Accepting connection (%u of %u) from `%s'\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:1661
+#: src/transport/plugin_transport_http_server.c:1688
 #, c-format
 msgid ""
 "Server reached maximum number connections (%u), rejecting new connection\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:1947
+#: src/transport/plugin_transport_http_server.c:1974
 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:1971
+#: src/transport/plugin_transport_http_server.c:1998
 #, c-format
 msgid "No usable TLS certificate found and creating one at `%s/%s' failed!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:2378
+#: src/transport/plugin_transport_http_server.c:2405
 #, 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
+#: src/transport/plugin_transport_http_server.c:2437 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
+#: src/transport/plugin_transport_http_server.c:2454 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
+#: src/transport/plugin_transport_http_server.c:2565
 #, c-format
 msgid "Found %u addresses to report to NAT service\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:2610
+#: src/transport/plugin_transport_http_server.c:2637
 msgid "Disabling IPv6 since it is not supported on this system!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:2697
+#: src/transport/plugin_transport_http_server.c:2724
 #, c-format
 msgid "IPv4 support is %s\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:2711
+#: src/transport/plugin_transport_http_server.c:2738
 #, c-format
 msgid "IPv6 support is %s\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:2718
+#: src/transport/plugin_transport_http_server.c:2745
 msgid "Neither IPv4 nor IPv6 are enabled! Fix in configuration\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:2729
+#: src/transport/plugin_transport_http_server.c:2756
 #, fuzzy
 msgid "Port is required! Fix in configuration\n"
 msgstr " gconfig\tGTK-konfiguration\n"
 
-#: src/transport/plugin_transport_http_server.c:2736
+#: src/transport/plugin_transport_http_server.c:2763
 #, fuzzy, c-format
 msgid "Using port %u\n"
 msgstr "Testar transport(er) %s\n"
 
-#: src/transport/plugin_transport_http_server.c:2751
+#: src/transport/plugin_transport_http_server.c:2778
 #, 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:2761
+#: src/transport/plugin_transport_http_server.c:2788
 #, fuzzy, c-format
 msgid "Binding to IPv4 address %s\n"
 msgstr "Ogiltigt svar på \"%s\".\n"
 
-#: src/transport/plugin_transport_http_server.c:2782
+#: src/transport/plugin_transport_http_server.c:2809
 #, 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:2792
+#: src/transport/plugin_transport_http_server.c:2819
 #, fuzzy, c-format
 msgid "Binding to IPv6 address %s\n"
 msgstr "Ogiltigt svar på \"%s\".\n"
 
-#: src/transport/plugin_transport_http_server.c:2844
+#: src/transport/plugin_transport_http_server.c:2871
 #, fuzzy, c-format
 msgid "Using external hostname `%s'\n"
 msgstr "Startade samling \"%s\".\n"
 
-#: src/transport/plugin_transport_http_server.c:2860
+#: src/transport/plugin_transport_http_server.c:2887
 #, fuzzy, c-format
 msgid "Notifying transport only about hostname `%s'\n"
 msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
@@ -7212,68 +7235,68 @@ msgstr "# byte skickades via TCP"
 msgid "# bytes dropped by SMTP (outgoing)"
 msgstr "# byte kastade via TCP (utgående)"
 
-#: src/transport/plugin_transport_tcp.c:632
+#: src/transport/plugin_transport_tcp.c:576
 #, c-format
 msgid "Unexpected address length: %u bytes\n"
 msgstr ""
 
-#: 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
+#: src/transport/plugin_transport_tcp.c:799
+#: src/transport/plugin_transport_tcp.c:979
+#: src/transport/plugin_transport_tcp.c:2120
+#: src/transport/plugin_transport_tcp.c:2723
+#, fuzzy
+msgid "# TCP sessions active"
+msgstr "# sessionsnycklar accepterade"
+
+#: src/transport/plugin_transport_tcp.c:835
+#: src/transport/plugin_transport_tcp.c:972
+#: src/transport/plugin_transport_tcp.c:1061
+#: src/transport/plugin_transport_tcp.c:1111
+#: src/transport/plugin_transport_tcp.c:1290
+#: src/transport/plugin_transport_tcp.c:1309
 #, fuzzy
 msgid "# bytes currently in TCP buffers"
 msgstr "# byte skickades via TCP"
 
-#: 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
+#: src/transport/plugin_transport_tcp.c:839
 #, fuzzy
-msgid "# TCP sessions active"
-msgstr "# sessionsnycklar accepterade"
+msgid "# bytes discarded by TCP (disconnect)"
+msgstr "# byte kastade via TCP (utgående)"
 
-#: src/transport/plugin_transport_tcp.c:935
+#: src/transport/plugin_transport_tcp.c:1065
 #, fuzzy
 msgid "# bytes discarded by TCP (timeout)"
 msgstr "# byte kastade via TCP (utgående)"
 
-#: src/transport/plugin_transport_tcp.c:984
+#: src/transport/plugin_transport_tcp.c:1114
 #, fuzzy
 msgid "# bytes transmitted via TCP"
 msgstr "# byte skickade av typen %d"
 
-#: 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:1199
+#: src/transport/plugin_transport_tcp.c:1263
 #, c-format
 msgid "Trying to send with invalid session %p\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:1440
-#: src/transport/plugin_transport_udp.c:1471
+#: src/transport/plugin_transport_tcp.c:1520
+#: src/transport/plugin_transport_udp.c:1488
 msgid "# requests to create session with invalid address"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:1558
+#: src/transport/plugin_transport_tcp.c:1645
 msgid "# transport-service disconnect requests for TCP"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2091
+#: src/transport/plugin_transport_tcp.c:2170
 #, fuzzy
 msgid "# TCP WELCOME messages received"
 msgstr "# krypterade PONG-meddelanden mottagna"
 
-#: src/transport/plugin_transport_tcp.c:2274
+#: src/transport/plugin_transport_tcp.c:2355
 msgid "# bytes received via TCP"
 msgstr "# byte mottogs via TCP"
 
-#: src/transport/plugin_transport_tcp.c:2354
+#: src/transport/plugin_transport_tcp.c:2433
 msgid "# network-level TCP disconnect events"
 msgstr ""
 
@@ -7288,16 +7311,16 @@ msgstr ""
 msgid "Failed to start service.\n"
 msgstr "Misslyckades att starta samling.\n"
 
-#: src/transport/plugin_transport_tcp.c:2710
+#: src/transport/plugin_transport_tcp.c:2712
 #, c-format
 msgid "TCP transport listening on port %llu\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2713
+#: src/transport/plugin_transport_tcp.c:2715
 msgid "TCP transport not listening on any port (client only)\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2716
+#: src/transport/plugin_transport_tcp.c:2718
 #, c-format
 msgid "TCP transport advertises itself as being on port %llu\n"
 msgstr ""
@@ -7312,57 +7335,57 @@ msgstr "# krypterade PONG-meddelanden mottagna"
 msgid "# IPv4 broadcast HELLO beacons received via udp"
 msgstr "# krypterade PONG-meddelanden mottagna"
 
-#: src/transport/plugin_transport_udp_broadcasting.c:605
+#: src/transport/plugin_transport_udp_broadcasting.c:606
 msgid ""
 "Disabling HELLO broadcasting due to friend-to-friend only configuration!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_udp_broadcasting.c:619
+#: src/transport/plugin_transport_udp_broadcasting.c:629
 #, c-format
 msgid "Failed to set IPv4 broadcast option for broadcast socket on port %d\n"
 msgstr ""
 
-#: src/transport/plugin_transport_udp.c:1581
+#: src/transport/plugin_transport_udp.c:1599
 #, 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:2635
+#: src/transport/plugin_transport_udp.c:2680
 #, 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:2649
+#: src/transport/plugin_transport_udp.c:2694
 msgid ""
 "UDP could not transmit IPv6 message! Please check your network configuration "
 "and disable IPv6 if your connection does not have a global IPv6 address\n"
 msgstr ""
 
-#: src/transport/plugin_transport_udp.c:2949
+#: src/transport/plugin_transport_udp.c:2993
 #, fuzzy
 msgid "Failed to open UDP sockets\n"
 msgstr "Misslyckades att binda till UDP6-port %d.\n"
 
-#: src/transport/plugin_transport_udp.c:3046
+#: src/transport/plugin_transport_udp.c:3091
 #, c-format
 msgid "Given `%s' option is out of range: %llu > %u\n"
 msgstr ""
 
-#: src/transport/plugin_transport_udp.c:3089
+#: src/transport/plugin_transport_udp.c:3134
 #, fuzzy, c-format
 msgid "Invalid IPv6 address: `%s'\n"
 msgstr "Ogiltigt svar på \"%s\".\n"
 
-#: src/transport/plugin_transport_udp.c:3148
+#: src/transport/plugin_transport_udp.c:3200
 #, fuzzy
 msgid "Failed to create network sockets, plugin failed\n"
 msgstr "Kunde inte skapa namnrymd \"%s\" (existerar?).\n"
 
-#: src/transport/plugin_transport_unix.c:1625
+#: src/transport/plugin_transport_unix.c:1657
 #, fuzzy
 msgid "Failed to open UNIX listen socket\n"
 msgstr "Misslyckades att leverera \"%s\" meddelande.\n"
@@ -7377,73 +7400,73 @@ msgid "# WLAN messages defragmented"
 msgstr "# PING-meddelanden skapade"
 
 #: src/transport/plugin_transport_wlan.c:691
-#: src/transport/plugin_transport_wlan.c:763
-#: src/transport/plugin_transport_wlan.c:1910
+#: src/transport/plugin_transport_wlan.c:778
+#: src/transport/plugin_transport_wlan.c:1937
 #, fuzzy
 msgid "# WLAN sessions allocated"
 msgstr "# sessionsnycklar accepterade"
 
-#: src/transport/plugin_transport_wlan.c:868
+#: src/transport/plugin_transport_wlan.c:883
 #, fuzzy
 msgid "# WLAN message fragments sent"
 msgstr "# byte mottogs via TCP"
 
-#: src/transport/plugin_transport_wlan.c:892
+#: src/transport/plugin_transport_wlan.c:907
 msgid "# WLAN messages pending (with fragmentation)"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:1000
-#: src/transport/plugin_transport_wlan.c:1086
-#: src/transport/plugin_transport_wlan.c:1912
+#: src/transport/plugin_transport_wlan.c:1015
+#: src/transport/plugin_transport_wlan.c:1101
+#: src/transport/plugin_transport_wlan.c:1939
 #, fuzzy
 msgid "# WLAN MAC endpoints allocated"
 msgstr "# byte mottogs via TCP"
 
-#: src/transport/plugin_transport_wlan.c:1282
+#: src/transport/plugin_transport_wlan.c:1297
 #, fuzzy
 msgid "# HELLO messages received via WLAN"
 msgstr "# krypterade PONG-meddelanden mottagna"
 
-#: src/transport/plugin_transport_wlan.c:1308
+#: src/transport/plugin_transport_wlan.c:1323
 #, fuzzy
 msgid "# fragments received via WLAN"
 msgstr "# byte mottogs via TCP"
 
-#: src/transport/plugin_transport_wlan.c:1318
+#: src/transport/plugin_transport_wlan.c:1333
 #, fuzzy
 msgid "# ACKs received via WLAN"
 msgstr "# byte mottogs via TCP"
 
-#: src/transport/plugin_transport_wlan.c:1375
+#: src/transport/plugin_transport_wlan.c:1390
 #, fuzzy
 msgid "# WLAN DATA messages discarded due to CRC32 error"
 msgstr "Nätverksannonsering avstängd i konfigurationen!\n"
 
-#: src/transport/plugin_transport_wlan.c:1496
+#: src/transport/plugin_transport_wlan.c:1511
 #, fuzzy
 msgid "# DATA messages received via WLAN"
 msgstr "# krypterade PONG-meddelanden mottagna"
 
-#: src/transport/plugin_transport_wlan.c:1531
+#: src/transport/plugin_transport_wlan.c:1546
 #, fuzzy
 msgid "# WLAN DATA messages processed"
 msgstr "# krypterade PONG-meddelanden mottagna"
 
-#: src/transport/plugin_transport_wlan.c:1594
+#: src/transport/plugin_transport_wlan.c:1609
 #, fuzzy
 msgid "# HELLO beacons sent via WLAN"
 msgstr "# byte skickade via UDP"
 
-#: src/transport/plugin_transport_wlan.c:1707
+#: src/transport/plugin_transport_wlan.c:1722
 msgid "WLAN address with invalid size encountered\n"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:1891
+#: src/transport/plugin_transport_wlan.c:1918
 #, c-format
 msgid "Helper binary `%s' not SUID, cannot run WLAN transport\n"
 msgstr ""
 
-#: src/transport/transport_api.c:682
+#: src/transport/transport_api.c:690
 #, 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"
@@ -7488,12 +7511,12 @@ msgstr ""
 msgid "Metadata `%s' failed to deserialize"
 msgstr ""
 
-#: src/util/client.c:261 src/util/client.c:851 src/util/service.c:625
+#: src/util/client.c:261 src/util/client.c:857 src/util/service.c:625
 #, c-format
 msgid "UNIXPATH `%s' too long, maximum length is %llu\n"
 msgstr ""
 
-#: src/util/client.c:265 src/util/client.c:856 src/util/service.c:629
+#: src/util/client.c:265 src/util/client.c:862 src/util/service.c:629
 #, fuzzy, c-format
 msgid "Using `%s' instead\n"
 msgstr "%s: flagga \"%s\" är tvetydig\n"
@@ -7510,17 +7533,17 @@ msgstr ""
 msgid "Need a non-empty hostname for service `%s'.\n"
 msgstr ""
 
-#: src/util/client.c:989
+#: src/util/client.c:995
 #, fuzzy, c-format
 msgid "Could not connect to service `%s', configuration broken.\n"
 msgstr "Kunde inte ansluta till gnunetd.\n"
 
-#: src/util/client.c:1001
+#: src/util/client.c:1007
 #, 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:1284
+#: src/util/client.c:1290
 msgid "Could not submit request, not expecting to receive a response.\n"
 msgstr ""
 
@@ -7632,7 +7655,7 @@ msgstr "Kan inte ansluta till %u.%u.%u.%u:%u: %s\n"
 msgid "Attempt to connect to `%s' failed\n"
 msgstr " Anslutning misslyckades\n"
 
-#: src/util/container_bloomfilter.c:516
+#: src/util/container_bloomfilter.c:531
 #, c-format
 msgid ""
 "Size of file on disk is incorrect for this Bloom filter (want %llu, have "
@@ -7901,13 +7924,13 @@ msgstr ""
 msgid "Use build-in GNUnet stub resolver"
 msgstr ""
 
-#: src/util/gnunet-service-resolver.c:288
+#: src/util/gnunet-service-resolver.c:283
 #, fuzzy, c-format
 msgid "Could not resolve `%s' (%s): %s\n"
 msgstr "Kunde inte slå upp \"%s\": %s\n"
 
-#: src/util/gnunet-service-resolver.c:358
-#: src/util/gnunet-service-resolver.c:399
+#: src/util/gnunet-service-resolver.c:350
+#: src/util/gnunet-service-resolver.c:391
 #, c-format
 msgid "Could not find IP of host `%s': %s\n"
 msgstr ""
@@ -7956,7 +7979,7 @@ msgstr "Fel vid skapandet av användare"
 msgid "Unable to shorten unix path `%s' while keeping name unique\n"
 msgstr ""
 
-#: src/util/network.c:1397
+#: src/util/network.c:1344 src/util/network.c:1469
 #, c-format
 msgid ""
 "Fatal internal logic error, process hangs in `%s' (abort with CTRL-C)!\n"
@@ -8005,17 +8028,17 @@ msgstr "\"%s\" misslyckades vid %s:%d med fel: %s\n"
 msgid "Could not determine plugin installation path.\n"
 msgstr "Kunde inte fastställa min publika IPv6-adress.\n"
 
-#: src/util/program.c:260 src/util/service.c:1449
+#: src/util/program.c:262 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
+#: src/util/program.c:274 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
+#: src/util/program.c:279 src/util/service.c:1459
 #, fuzzy
 msgid "Malformed configuration, exit ...\n"
 msgstr "Kunde inte spara konfigurationsfil \"%s\":"
@@ -8176,114 +8199,114 @@ msgstr "Anrop till \"%s\" returnerade %d.\n"
 msgid "b"
 msgstr "b"
 
-#: src/util/strings.c:450
+#: src/util/strings.c:452
 #, c-format
 msgid "Character sets requested were `%s'->`%s'\n"
 msgstr ""
 
-#: src/util/strings.c:578
+#: src/util/strings.c:580
 msgid "Failed to expand `$HOME': environment variable `HOME' not set"
 msgstr ""
 
-#: src/util/strings.c:675
+#: src/util/strings.c:677
 msgid "µs"
 msgstr ""
 
-#: src/util/strings.c:679
+#: src/util/strings.c:681
 msgid "forever"
 msgstr ""
 
-#: src/util/strings.c:681
+#: src/util/strings.c:683
 msgid "0 ms"
 msgstr ""
 
-#: src/util/strings.c:687
+#: src/util/strings.c:689
 msgid "ms"
 msgstr "ms"
 
-#: src/util/strings.c:693
+#: src/util/strings.c:695
 msgid "s"
 msgstr "s"
 
-#: src/util/strings.c:699
+#: src/util/strings.c:701
 msgid "m"
 msgstr "m"
 
-#: src/util/strings.c:705
+#: src/util/strings.c:707
 msgid "h"
 msgstr "h"
 
-#: src/util/strings.c:712
+#: src/util/strings.c:714
 #, fuzzy
 msgid "day"
 msgstr " dagar"
 
-#: src/util/strings.c:714
+#: src/util/strings.c:716
 #, fuzzy
 msgid "days"
 msgstr " dagar"
 
-#: src/util/strings.c:743
+#: src/util/strings.c:745
 msgid "end of time"
 msgstr ""
 
-#: src/util/strings.c:1149
+#: src/util/strings.c:1178
 msgid "IPv6 address did not start with `['\n"
 msgstr ""
 
-#: src/util/strings.c:1157
+#: src/util/strings.c:1186
 msgid "IPv6 address did contain ':' to separate port number\n"
 msgstr ""
 
-#: src/util/strings.c:1163
+#: src/util/strings.c:1192
 msgid "IPv6 address did contain ']' before ':' to separate port number\n"
 msgstr ""
 
-#: src/util/strings.c:1170
+#: src/util/strings.c:1199
 msgid "IPv6 address did contain a valid port number after the last ':'\n"
 msgstr ""
 
-#: src/util/strings.c:1179
+#: src/util/strings.c:1208
 #, fuzzy, c-format
 msgid "Invalid IPv6 address `%s': %s\n"
 msgstr "Ogiltigt svar på \"%s\".\n"
 
-#: src/util/strings.c:1385 src/util/strings.c:1401
+#: src/util/strings.c:1414 src/util/strings.c:1430
 msgid "Port not in range\n"
 msgstr ""
 
-#: src/util/strings.c:1410
+#: src/util/strings.c:1439
 #, fuzzy, c-format
 msgid "Malformed port policy `%s'\n"
 msgstr "Misslyckades att starta samling.\n"
 
-#: src/util/strings.c:1493 src/util/strings.c:1524 src/util/strings.c:1572
-#: src/util/strings.c:1593
+#: src/util/strings.c:1522 src/util/strings.c:1553 src/util/strings.c:1601
+#: src/util/strings.c:1622
 #, c-format
 msgid "Invalid format for IP: `%s'\n"
 msgstr "Ogiltigt format för IP: \"%s\"\n"
 
-#: src/util/strings.c:1550
+#: src/util/strings.c:1579
 #, 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:1602
+#: src/util/strings.c:1631
 #, fuzzy, c-format
 msgid "Invalid format: `%s'\n"
 msgstr "Ogiltigt format för IP: \"%s\"\n"
 
-#: src/util/strings.c:1654
+#: src/util/strings.c:1683
 #, 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:1704
+#: src/util/strings.c:1733
 #, fuzzy, c-format
 msgid "Wrong format `%s' for netmask\n"
 msgstr "Fel format \"%s\" för nätmask: %s\n"
 
-#: src/util/strings.c:1735
+#: src/util/strings.c:1764
 #, fuzzy, c-format
 msgid "Wrong format `%s' for network\n"
 msgstr "Fel format \"%s\" för nätverk: %s\n"
@@ -8403,71 +8426,71 @@ msgstr ""
 msgid "IPv4 support disabled as this system does not support IPv4\n"
 msgstr ""
 
-#: src/vpn/gnunet-vpn.c:146
+#: src/vpn/gnunet-vpn.c:147
 #, fuzzy
 msgid "Error creating tunnel\n"
 msgstr "Klar med skapandet av värdnyckel.\n"
 
-#: src/vpn/gnunet-vpn.c:189 src/vpn/gnunet-vpn.c:220
+#: src/vpn/gnunet-vpn.c:190 src/vpn/gnunet-vpn.c:221
 #, fuzzy, c-format
 msgid "Option `%s' makes no sense with option `%s'.\n"
 msgstr "Kommando \"%s\" kräver ett argument (\"%s\").\n"
 
-#: src/vpn/gnunet-vpn.c:202
+#: src/vpn/gnunet-vpn.c:203
 #, fuzzy, c-format
 msgid "Option `%s' or `%s' is required.\n"
 msgstr "%s: flagga \"%s\" är tvetydig\n"
 
-#: src/vpn/gnunet-vpn.c:214
+#: src/vpn/gnunet-vpn.c:215
 #, fuzzy, c-format
 msgid "Option `%s' or `%s' is required when using option `%s'.\n"
 msgstr "Kommando \"%s\" kräver ett argument (\"%s\").\n"
 
-#: src/vpn/gnunet-vpn.c:233
+#: src/vpn/gnunet-vpn.c:235
 #, fuzzy, c-format
 msgid "`%s' is not a valid peer identifier.\n"
 msgstr "\"%s\" är inte en vanlig fil.\n"
 
-#: src/vpn/gnunet-vpn.c:254
+#: src/vpn/gnunet-vpn.c:255
 #, fuzzy, c-format
 msgid "`%s' is not a valid IP address.\n"
 msgstr "\"%s\" är inte tillgänglig."
 
-#: src/vpn/gnunet-vpn.c:289
+#: src/vpn/gnunet-vpn.c:290
 msgid "request that result should be an IPv4 address"
 msgstr ""
 
-#: src/vpn/gnunet-vpn.c:292
+#: src/vpn/gnunet-vpn.c:293
 msgid "request that result should be an IPv6 address"
 msgstr ""
 
-#: src/vpn/gnunet-vpn.c:295
+#: src/vpn/gnunet-vpn.c:296
 msgid "how long should the mapping be valid for new tunnels?"
 msgstr ""
 
-#: src/vpn/gnunet-vpn.c:298
+#: src/vpn/gnunet-vpn.c:299
 msgid "destination IP for the tunnel"
 msgstr ""
 
-#: src/vpn/gnunet-vpn.c:301
+#: src/vpn/gnunet-vpn.c:302
 msgid "peer offering the service we would like to access"
 msgstr ""
 
-#: src/vpn/gnunet-vpn.c:304
+#: src/vpn/gnunet-vpn.c:305
 msgid "name of the service we would like to access"
 msgstr ""
 
-#: src/vpn/gnunet-vpn.c:307
+#: src/vpn/gnunet-vpn.c:308
 #, fuzzy
 msgid "service is offered via TCP"
 msgstr "# byte mottogs via TCP"
 
-#: src/vpn/gnunet-vpn.c:310
+#: src/vpn/gnunet-vpn.c:311
 #, fuzzy
 msgid "service is offered via UDP"
 msgstr "# byte mottagna via UDP"
 
-#: src/vpn/gnunet-vpn.c:322
+#: src/vpn/gnunet-vpn.c:323
 msgid "Setup tunnels via VPN."
 msgstr ""
 
@@ -8488,6 +8511,18 @@ msgid "`%s' failed on file `%s' at %s:%d with error: %s\n"
 msgstr "\"%s\" misslyckades för fil \"%s\" vid %s:%d med fel: %s\n"
 
 #, fuzzy
+#~ msgid "Transport plugin: `%s' port %llu\n"
+#~ msgstr "Testar transport(er) %s\n"
+
+#, fuzzy
+#~ msgid "Found %u transport plugins: `%s'\n"
+#~ msgstr "Testar transport(er) %s\n"
+
+#, fuzzy
+#~ msgid "Failed to parse HELLO in file `%s': %s %u \n"
+#~ msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
+
+#, fuzzy
 #~ msgid "Internal error %d\n"
 #~ msgstr "Okänt fel.\n"
 
diff --git a/po/vi.po b/po/vi.po
index e6d12e553..47d473dc0 100644
--- a/po/vi.po
+++ b/po/vi.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnunet 0.8.0a\n"
 "Report-Msgid-Bugs-To: gnunet-developers@mail.gnu.org\n"
-"POT-Creation-Date: 2013-12-12 22:41+0100\n"
+"POT-Creation-Date: 2013-12-23 19:38+0100\n"
 "PO-Revision-Date: 2008-09-10 22:05+0930\n"
 "Last-Translator: Clytie Siddall <clytie@riverland.net.au>\n"
 "Language-Team: Vietnamese <vi-VN@googlegroups.com>\n"
@@ -362,49 +362,49 @@ msgstr "Nhận yêu cầu định tuyến\n"
 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:1946
-#: src/ats/gnunet-service-ats_addresses.c:1990
+#: src/ats/gnunet-service-ats_addresses.c:1943
+#: src/ats/gnunet-service-ats_addresses.c:1987
 #, c-format
 msgid ""
 "Could not load quota for network `%s':  `%s', assigning default bandwidth "
 "%llu\n"
 msgstr ""
 
-#: src/ats/gnunet-service-ats_addresses.c:1953
+#: src/ats/gnunet-service-ats_addresses.c:1950
 #, c-format
 msgid "Outbound quota configure for network `%s' is %llu\n"
 msgstr ""
 
-#: src/ats/gnunet-service-ats_addresses.c:1961
+#: src/ats/gnunet-service-ats_addresses.c:1958
 #, c-format
 msgid ""
 "No outbound quota configured for network `%s', assigning default bandwidth "
 "%llu\n"
 msgstr ""
 
-#: src/ats/gnunet-service-ats_addresses.c:1997
+#: src/ats/gnunet-service-ats_addresses.c:1994
 #, c-format
 msgid "Inbound quota configured for network `%s' is %llu\n"
 msgstr ""
 
-#: src/ats/gnunet-service-ats_addresses.c:2005
+#: src/ats/gnunet-service-ats_addresses.c:2002
 #, c-format
 msgid ""
 "No outbound quota configure for network `%s', assigning default bandwidth "
 "%llu\n"
 msgstr ""
 
-#: src/ats/gnunet-service-ats_addresses.c:2175
+#: src/ats/gnunet-service-ats_addresses.c:2172
 #, c-format
 msgid "Initializing solver `%s '`%s'\n"
 msgstr ""
 
-#: src/ats/gnunet-service-ats_addresses.c:2178
+#: src/ats/gnunet-service-ats_addresses.c:2175
 #, 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:2201
+#: src/ats/gnunet-service-ats_addresses.c:2198
 #, fuzzy
 msgid "Failed to initialize solver!\n"
 msgstr "Không thể sơ khởi SQLite: %s.\n"
@@ -454,7 +454,7 @@ msgstr ""
 msgid "Using default quota configuration for network `%s' (in/out) %llu/%llu\n"
 msgstr ""
 
-#: src/ats/plugin_ats_proportional.c:1514
+#: src/ats/plugin_ats_proportional.c:1511
 #, 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"
@@ -469,102 +469,102 @@ msgstr ""
 msgid "ATS returned results for %u addresses\n"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:204
+#: src/ats-tool/gnunet-ats.c:205
 #, fuzzy, c-format
 msgid ""
 "Peer `%s' plugin `%s', address `%s', `%s' bw out: %u Bytes/s, bw in %u Bytes/"
 "s, %s\n"
 msgstr "Đồng đẳng « %s » có mức tin cậy %8u và địa chỉ « %s »\n"
 
-#: src/ats-tool/gnunet-ats.c:328
+#: src/ats-tool/gnunet-ats.c:333
 #, c-format
 msgid "Quota for network `%11s' (in/out): %10s / %10s\n"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:347 src/namestore/gnunet-namestore.c:547
+#: src/ats-tool/gnunet-ats.c:352 src/namestore/gnunet-namestore.c:550
 #: 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:838
+#: src/ats-tool/gnunet-ats.c:364 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"
 
-#: src/ats-tool/gnunet-ats.c:367
+#: src/ats-tool/gnunet-ats.c:372
 #, c-format
 msgid "Please select one operation : %s or %s or %s or %s or %s\n"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:383 src/ats-tool/gnunet-ats.c:402
-#: src/ats-tool/gnunet-ats.c:419 src/ats-tool/gnunet-ats.c:457
+#: src/ats-tool/gnunet-ats.c:388 src/ats-tool/gnunet-ats.c:407
+#: src/ats-tool/gnunet-ats.c:424 src/ats-tool/gnunet-ats.c:462
 #, fuzzy, c-format
 msgid "Cannot connect to ATS service, exiting...\n"
 msgstr "Lỗi sơ khởi dịch vụ « %s ».\n"
 
-#: src/ats-tool/gnunet-ats.c:392 src/ats-tool/gnunet-ats.c:409
+#: src/ats-tool/gnunet-ats.c:397 src/ats-tool/gnunet-ats.c:414
 #, fuzzy, c-format
 msgid "Cannot issue request to ATS service, exiting...\n"
 msgstr "Lỗi sơ khởi dịch vụ « %s ».\n"
 
-#: src/ats-tool/gnunet-ats.c:427
+#: src/ats-tool/gnunet-ats.c:432
 #, fuzzy, c-format
 msgid "No preference type given!\n"
 msgstr "In ra thông tin về các đồng đẳng GNUnet."
 
-#: src/ats-tool/gnunet-ats.c:432
+#: src/ats-tool/gnunet-ats.c:437
 #, fuzzy, c-format
 msgid "No peer given!\n"
 msgstr "chưa đưa ra tên"
 
-#: src/ats-tool/gnunet-ats.c:450
+#: src/ats-tool/gnunet-ats.c:455
 msgid "Valid type required\n"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:508
+#: src/ats-tool/gnunet-ats.c:513
 msgid "get list of active addresses currently used"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:511
+#: src/ats-tool/gnunet-ats.c:516
 msgid "get list of all active addresses"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:514
+#: src/ats-tool/gnunet-ats.c:519
 #, fuzzy
 msgid "do not resolve IP addresses to hostnames"
 msgstr "không quyết định các tên máy"
 
-#: src/ats-tool/gnunet-ats.c:517
+#: src/ats-tool/gnunet-ats.c:522
 msgid "monitor mode"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:520
+#: src/ats-tool/gnunet-ats.c:525
 #, fuzzy
 msgid "set preference for the given peer"
 msgstr "In ra thông tin về các đồng đẳng GNUnet."
 
-#: src/ats-tool/gnunet-ats.c:523
+#: src/ats-tool/gnunet-ats.c:528
 msgid "print all configured quotas"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:526
+#: src/ats-tool/gnunet-ats.c:531
 msgid "peer id"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:529
+#: src/ats-tool/gnunet-ats.c:534
 msgid "preference type to set: latency | bandwidth"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:532
+#: src/ats-tool/gnunet-ats.c:537
 msgid "preference value"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:535
+#: src/ats-tool/gnunet-ats.c:540
 msgid "verbose output (include ATS address properties)"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:544
+#: src/ats-tool/gnunet-ats.c:549
 #, fuzzy
 msgid "Print information about ATS state"
 msgstr "In ra thông tin về các đồng đẳng GNUnet."
@@ -595,7 +595,7 @@ msgid "be more verbose (print received values)"
 msgstr ""
 
 #: src/conversation/conversation_api.c:557
-#: src/conversation/conversation_api_call.c:468
+#: src/conversation/conversation_api_call.c:470
 msgid "Connection to conversation service lost, trying to reconnect\n"
 msgstr ""
 
@@ -629,216 +629,225 @@ msgstr ""
 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:357
+#: src/conversation/gnunet-conversation.c:356
 #, c-format
-msgid "Phone active on line %u\n"
+msgid ""
+"Phone active on line %u.  Type `/help' for a list of available commands\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:379
+#: src/conversation/gnunet-conversation.c:378
 #, c-format
 msgid "Resolved address of `%s'. Now ringing other party.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:386
+#: src/conversation/gnunet-conversation.c:385
 #, fuzzy, c-format
 msgid "Connection established to `%s'\n"
 msgstr "%s bị lỗi tại %s:%d: « %s »\n"
 
-#: src/conversation/gnunet-conversation.c:393
+#: src/conversation/gnunet-conversation.c:392
 #, 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:400
+#: src/conversation/gnunet-conversation.c:399
 msgid "Call terminated\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:406
+#: src/conversation/gnunet-conversation.c:405
 #, c-format
 msgid "Connection to `%s' suspended (by other user)\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:412
+#: src/conversation/gnunet-conversation.c:411
 #, c-format
 msgid "Connection to `%s' resumed (by other user)\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:479
+#: src/conversation/gnunet-conversation.c:416
+msgid "Error with the call, restarting it\n"
+msgstr ""
+
+#: src/conversation/gnunet-conversation.c:483
 #, fuzzy, c-format
 msgid "Unknown command `%s'\n"
 msgstr "Không rõ câu lệnh « %s ».\n"
 
-#: src/conversation/gnunet-conversation.c:495
-#: src/conversation/gnunet-conversation.c:509
+#: src/conversation/gnunet-conversation.c:499
+#: src/conversation/gnunet-conversation.c:513
 #, c-format
 msgid "Ego `%s' not available\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:502
-#: src/conversation/gnunet-conversation.c:552
+#: src/conversation/gnunet-conversation.c:506
+#: src/conversation/gnunet-conversation.c:563
 msgid "You are calling someone else already, hang up first!\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:517
-#: src/conversation/gnunet-conversation.c:565
+#: src/conversation/gnunet-conversation.c:521
+#: src/conversation/gnunet-conversation.c:576
 #, c-format
 msgid "You are answering call from `%s', hang up or suspend that call first!\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:576
+#: src/conversation/gnunet-conversation.c:532
+msgid "Call recipient missing.\n"
+msgstr ""
+
+#: src/conversation/gnunet-conversation.c:587
 msgid "There is no incoming call to accept here!\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:593
+#: src/conversation/gnunet-conversation.c:604
 #, c-format
 msgid "There is no incoming call `%s' to accept right now!\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:621
+#: src/conversation/gnunet-conversation.c:632
 msgid "We currently do not have an address.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:644
+#: src/conversation/gnunet-conversation.c:655
 #, c-format
 msgid "We are currently trying to locate the private key for the ego `%s'.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:649
+#: src/conversation/gnunet-conversation.c:660
 #, c-format
 msgid "We are listening for incoming calls for ego `%s' on line %u.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:655
-#: src/conversation/gnunet-conversation.c:679
+#: src/conversation/gnunet-conversation.c:666
+#: src/conversation/gnunet-conversation.c:690
 #, c-format
 msgid "You are having a conversation with `%s'.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:660
+#: src/conversation/gnunet-conversation.c:671
 msgid ""
 "We had an internal error setting up our phone line. You can still make "
 "calls.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:669
+#: src/conversation/gnunet-conversation.c:680
 #, 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:674
+#: src/conversation/gnunet-conversation.c:685
 #, c-format
 msgid "We are calling `%s', his phone should be ringing.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:693
+#: src/conversation/gnunet-conversation.c:704
 msgid "Calls waiting:\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:699
+#: src/conversation/gnunet-conversation.c:710
 #, 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
+#: src/conversation/gnunet-conversation.c:738
+#: src/conversation/gnunet-conversation.c:753
 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
+#: src/conversation/gnunet-conversation.c:786
+#: src/conversation/gnunet-conversation.c:802
 msgid "There is no call that could be resumed right now.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:798
+#: src/conversation/gnunet-conversation.c:809
 #, c-format
 msgid "Already talking with `%s', cannot resume a call right now.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:807
+#: src/conversation/gnunet-conversation.c:818
 msgid "There is no incoming call to resume here!\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:824
+#: src/conversation/gnunet-conversation.c:835
 #, c-format
 msgid "There is no incoming call `%s' to resume right now!\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:859
+#: src/conversation/gnunet-conversation.c:870
 msgid "There is no call that could be cancelled right now.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:867
+#: src/conversation/gnunet-conversation.c:878
 msgid "There is no incoming call to refuse here!\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:884
+#: src/conversation/gnunet-conversation.c:895
 #, c-format
 msgid "There is no incoming call `%s' to refuse right now!\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:911
+#: src/conversation/gnunet-conversation.c:922
 msgid "Use `/address' to find out which address this phone should have in GNS"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:913
+#: src/conversation/gnunet-conversation.c:924
 msgid "Use `/call USER.gnu' to call USER"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:915
+#: src/conversation/gnunet-conversation.c:926
 msgid "Use `/accept #NUM' to accept incoming call #NUM"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:917
+#: src/conversation/gnunet-conversation.c:928
 msgid "Use `/suspend' to suspend the active call"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:919
+#: src/conversation/gnunet-conversation.c:930
 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
+#: src/conversation/gnunet-conversation.c:932
 msgid "Use `/cancel' to reject or terminate a call"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:923
+#: src/conversation/gnunet-conversation.c:934
 msgid "Use `/status' to print status information"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:925
+#: src/conversation/gnunet-conversation.c:936
 #, 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:927
+#: src/conversation/gnunet-conversation.c:938
 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:1082
+#: src/conversation/gnunet-conversation.c:1093
 #, 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:1095
+#: src/conversation/gnunet-conversation.c:1106
 #, fuzzy, c-format
 msgid "Our ego `%s' was deleted!\n"
 msgstr "Biệt hiệu « %s » bị xoá.\n"
 
-#: src/conversation/gnunet-conversation.c:1130
+#: src/conversation/gnunet-conversation.c:1141
 #, 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:1156
+#: src/conversation/gnunet-conversation.c:1167
 msgid "sets the NAME of the ego to use for the phone (and name resolution)"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:1159
+#: src/conversation/gnunet-conversation.c:1170
 msgid "sets the LINE to use for the phone"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:1174
+#: src/conversation/gnunet-conversation.c:1185
 msgid "Enables having a conversation with other GNUnet users."
 msgstr ""
 
@@ -865,7 +874,6 @@ msgid ""
 msgstr ""
 
 #: src/conversation/gnunet-conversation-test.c:248
-#: src/integration-tests/connection_watchdog.c:1114
 #: src/multicast/gnunet-multicast.c:70 src/revocation/gnunet-revocation.c:517
 #: src/template/gnunet-template.c:70
 msgid "help text"
@@ -981,17 +989,17 @@ msgstr ""
 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:825
+#: src/conversation/gnunet-service-conversation.c:841
 msgid "Mesh audio channel not ready; audio data dropped\n"
 msgstr ""
 
-#: src/conversation/gnunet-service-conversation.c:915
+#: src/conversation/gnunet-service-conversation.c:932
 #, c-format
 msgid ""
 "No available phone for incoming call on line %u, sending HANG_UP signal\n"
 msgstr ""
 
-#: src/conversation/gnunet-service-conversation.c:1302
+#: src/conversation/gnunet-service-conversation.c:1338
 #, fuzzy, c-format
 msgid "Received incoming channel on port %u\n"
 msgstr "« %.*s » được kết nối tới « %.*s ».\n"
@@ -1076,150 +1084,150 @@ msgstr "# các thông báo được chắp liền"
 msgid "# bytes of messages of type %u received"
 msgstr "# các byte nhiễu được nhận"
 
-#: src/core/gnunet-service-core_kx.c:531
+#: src/core/gnunet-service-core_kx.c:535
 msgid "# bytes encrypted"
 msgstr "# các byte đã mã hoá"
 
-#: src/core/gnunet-service-core_kx.c:582
+#: src/core/gnunet-service-core_kx.c:586
 msgid "# bytes decrypted"
 msgstr "# các byte đã giải mã"
 
-#: src/core/gnunet-service-core_kx.c:668
+#: src/core/gnunet-service-core_kx.c:672
 msgid "# key exchanges initiated"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:708
+#: src/core/gnunet-service-core_kx.c:712
 msgid "# key exchanges stopped"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:771
+#: src/core/gnunet-service-core_kx.c:809
 msgid "# old ephemeral keys ignored"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:777
+#: src/core/gnunet-service-core_kx.c:815
 #, 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:811
+#: src/core/gnunet-service-core_kx.c:849
 #, 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:827
+#: src/core/gnunet-service-core_kx.c:860
 #, fuzzy
-msgid "# EPHEMERAL_KEY messages decrypted"
+msgid "# EPHEMERAL_KEY messages received"
 msgstr "# các thông báo được chắp liền"
 
-#: src/core/gnunet-service-core_kx.c:930
+#: src/core/gnunet-service-core_kx.c:950
 #: 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:938
+#: src/core/gnunet-service-core_kx.c:958
 #, 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:965
+#: src/core/gnunet-service-core_kx.c:985
 #, 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:982
+#: src/core/gnunet-service-core_kx.c:1002
 #, fuzzy
 msgid "# PONG messages created"
 msgstr "# các thông báo PING được tạo"
 
-#: src/core/gnunet-service-core_kx.c:1008
+#: src/core/gnunet-service-core_kx.c:1028
 #, 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:1018
+#: src/core/gnunet-service-core_kx.c:1038
 #, 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:1075
+#: src/core/gnunet-service-core_kx.c:1095
 #: 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:1081
+#: src/core/gnunet-service-core_kx.c:1101
 #, 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:1086
+#: src/core/gnunet-service-core_kx.c:1106
 #, 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:1116
+#: src/core/gnunet-service-core_kx.c:1136
 #, fuzzy
 msgid "# PONG messages decrypted"
 msgstr "# các thông báo PING được tạo"
 
-#: src/core/gnunet-service-core_kx.c:1150
+#: src/core/gnunet-service-core_kx.c:1170
 #, 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:1160
+#: src/core/gnunet-service-core_kx.c:1180
 #, fuzzy
 msgid "# timeouts prevented via PONG"
 msgstr "# các byte đã nhận qua TCP"
 
-#: src/core/gnunet-service-core_kx.c:1167
+#: src/core/gnunet-service-core_kx.c:1187
 #, 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:1307
+#: src/core/gnunet-service-core_kx.c:1327
 #, 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:1314
+#: src/core/gnunet-service-core_kx.c:1334
 #, 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:1317
+#: src/core/gnunet-service-core_kx.c:1337
 #, 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:1360
-#: src/core/gnunet-service-core_kx.c:1385
+#: src/core/gnunet-service-core_kx.c:1380
+#: src/core/gnunet-service-core_kx.c:1405
 #, fuzzy
 msgid "# bytes dropped (duplicates)"
 msgstr "# các byte loại bỏ bởi UDP (đi ra)"
 
-#: src/core/gnunet-service-core_kx.c:1372
+#: src/core/gnunet-service-core_kx.c:1392
 #, 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:1413
+#: src/core/gnunet-service-core_kx.c:1433
 #, 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:1421
+#: src/core/gnunet-service-core_kx.c:1441
 #, fuzzy
 msgid "# bytes of payload decrypted"
 msgstr "# các byte đã giải mã"
 
-#: src/core/gnunet-service-core_kx.c:1452
+#: src/core/gnunet-service-core_kx.c:1472
 #, fuzzy
 msgid "# PAYLOAD dropped (out of order)"
 msgstr "# các byte loại bỏ bởi UDP (đi ra)"
@@ -1230,7 +1238,7 @@ msgid "# sessions terminated by transport disconnect"
 msgstr "# Các quảng cáo đồng đẳng bị hủy do trọng tải"
 
 #: src/core/gnunet-service-core_neighbours.c:179
-#: src/core/gnunet-service-core_neighbours.c:328
+#: src/core/gnunet-service-core_neighbours.c:329
 msgid "# neighbour entries allocated"
 msgstr ""
 
@@ -1238,7 +1246,7 @@ msgstr ""
 msgid "# encrypted bytes given to transport"
 msgstr ""
 
-#: src/core/gnunet-service-core_neighbours.c:411
+#: src/core/gnunet-service-core_neighbours.c:412
 #, c-format
 msgid "Unsupported message of type %u (%u bytes) received from peer `%s'\n"
 msgstr ""
@@ -1252,11 +1260,11 @@ msgstr ""
 #: 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: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
+#: src/transport/gnunet-service-transport_neighbours.c:929
+#: src/transport/gnunet-service-transport_neighbours.c:1161
+#: src/transport/gnunet-service-transport_neighbours.c:1170
+#: src/transport/gnunet-service-transport_neighbours.c:3015
+#: src/transport/gnunet-service-transport_neighbours.c:3291
 #, fuzzy
 msgid "# peers connected"
 msgstr "# của các đồng đẳng đã kết nối"
@@ -1502,12 +1510,12 @@ msgid "# bytes purged (low-priority)"
 msgstr ""
 
 #: src/datastore/gnunet-service-datastore.c:483
-#: src/gns/gnunet-gns-helper-service-w32.c:187
+#: src/gns/gnunet-gns-helper-service-w32.c:223
 msgid "Transmission to client failed!\n"
 msgstr ""
 
 #: src/datastore/gnunet-service-datastore.c:514
-#: src/gns/gnunet-gns-helper-service-w32.c:215
+#: src/gns/gnunet-gns-helper-service-w32.c:262
 msgid "Shutdown in progress, aborting transmission.\n"
 msgstr ""
 
@@ -1677,7 +1685,7 @@ msgstr ""
 
 #: src/datastore/plugin_datastore_postgres.c:860
 #: src/namecache/plugin_namecache_postgres.c:414
-#: src/namestore/plugin_namestore_postgres.c:564
+#: src/namestore/plugin_namestore_postgres.c:569
 msgid "Postgres database running\n"
 msgstr ""
 
@@ -1770,7 +1778,7 @@ msgstr ""
 #: src/dht/gnunet-dht-get.c:201 src/dht/gnunet-dht-monitor.c:271
 #: src/dht/gnunet-dht-put.c:213 src/fs/gnunet-auto-share.c:753
 #: src/fs/gnunet-download.c:328 src/fs/gnunet-publish.c:877
-#: src/fs/gnunet-search.c:294 src/fs/gnunet-unindex.c:168
+#: src/fs/gnunet-search.c:301 src/fs/gnunet-unindex.c:168
 #: src/nse/gnunet-nse-profiler.c:873
 msgid "be verbose (print progress information)"
 msgstr ""
@@ -2257,21 +2265,21 @@ msgstr ""
 msgid "# DNS requests received via TUN interface"
 msgstr "# các đáp ứng lỗ hổng được gửi cho trình/máy khách"
 
-#: src/dns/gnunet-service-dns.c:1049 src/exit/gnunet-daemon-exit.c:3499
+#: src/dns/gnunet-service-dns.c:1049 src/exit/gnunet-daemon-exit.c:3514
 #, 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:3556
+#: src/dns/gnunet-service-dns.c:1069 src/exit/gnunet-daemon-exit.c:3571
 #, 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:166
+#: src/dv/gnunet-dv.c:169
 msgid "verbose output"
 msgstr ""
 
-#: src/dv/gnunet-dv.c:175
+#: src/dv/gnunet-dv.c:178
 #, fuzzy
 msgid "Print information about DV state"
 msgstr "In ra thông tin về các đồng đẳng GNUnet."
@@ -2286,14 +2294,14 @@ msgstr ""
 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:1407
+#: src/exit/gnunet-daemon-exit.c:970 src/exit/gnunet-daemon-exit.c:2397
+#: src/exit/gnunet-daemon-exit.c:2654 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:1463
+#: src/exit/gnunet-daemon-exit.c:1007 src/exit/gnunet-daemon-exit.c:2456
+#: src/exit/gnunet-daemon-exit.c:2713 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 ""
@@ -2353,137 +2361,148 @@ msgstr "# các byte đã gửi qua UDP"
 msgid "# TCP service creation requests received via mesh"
 msgstr "# các yêu cầu danh sách máy được nhận"
 
-#: src/exit/gnunet-daemon-exit.c:1875 src/exit/gnunet-daemon-exit.c:1965
-#: src/exit/gnunet-daemon-exit.c:2070 src/exit/gnunet-daemon-exit.c:2318
-#: src/exit/gnunet-daemon-exit.c:2567 src/exit/gnunet-daemon-exit.c:2856
-#: src/exit/gnunet-daemon-exit.c:2963
+#: src/exit/gnunet-daemon-exit.c:1875 src/exit/gnunet-daemon-exit.c:1968
+#: src/exit/gnunet-daemon-exit.c:2073 src/exit/gnunet-daemon-exit.c:2321
+#: src/exit/gnunet-daemon-exit.c:2570 src/exit/gnunet-daemon-exit.c:2859
+#: src/exit/gnunet-daemon-exit.c:2966
 #, fuzzy
 msgid "# Bytes received from MESH"
 msgstr "# các byte đã nhận qua HTTP"
 
-#: src/exit/gnunet-daemon-exit.c:1907 src/exit/gnunet-daemon-exit.c:2985
+#: src/exit/gnunet-daemon-exit.c:1909 src/exit/gnunet-daemon-exit.c:2990
 #, c-format
-msgid "No service found for %s on port %d!\n"
+msgid "No service %s found for %s on port %d!\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:1911
+#: src/exit/gnunet-daemon-exit.c:1914
 #, fuzzy
 msgid "# TCP requests dropped (no such service)"
 msgstr "# các yêu cầu lỗ hổng bị bỏ do trọng tải"
 
-#: src/exit/gnunet-daemon-exit.c:1968
+#: src/exit/gnunet-daemon-exit.c:1971
 #, fuzzy
 msgid "# TCP IP-exit creation requests received via mesh"
 msgstr "# các yêu cầu danh sách máy được nhận"
 
-#: src/exit/gnunet-daemon-exit.c:2073
+#: src/exit/gnunet-daemon-exit.c:2076
 #, fuzzy
 msgid "# TCP data requests received via mesh"
 msgstr "# các yêu cầu get (lấy) dht được nhận"
 
-#: src/exit/gnunet-daemon-exit.c:2087
+#: src/exit/gnunet-daemon-exit.c:2090
 #, fuzzy
 msgid "# TCP DATA requests dropped (no session)"
 msgstr "# các yêu cầu lỗ hổng bị bỏ do trọng tải"
 
-#: src/exit/gnunet-daemon-exit.c:2147
+#: src/exit/gnunet-daemon-exit.c:2150
 #, fuzzy
 msgid "# ICMP packets sent via TUN"
 msgstr "# các byte đã gửi qua UDP"
 
-#: src/exit/gnunet-daemon-exit.c:2321
+#: src/exit/gnunet-daemon-exit.c:2324
 #, fuzzy
 msgid "# ICMP IP-exit requests received via mesh"
 msgstr "# các yêu cầu get (lấy) dht được nhận"
 
-#: src/exit/gnunet-daemon-exit.c:2570
+#: src/exit/gnunet-daemon-exit.c:2573
 #, fuzzy
 msgid "# ICMP service requests received via mesh"
 msgstr "# các đáp ứng lỗ hổng được gửi cho trình/máy khách"
 
-#: src/exit/gnunet-daemon-exit.c:2636 src/vpn/gnunet-service-vpn.c:1397
+#: src/exit/gnunet-daemon-exit.c:2639 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:1433
+#: src/exit/gnunet-daemon-exit.c:2698 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 ""
 
-#: src/exit/gnunet-daemon-exit.c:2745
+#: src/exit/gnunet-daemon-exit.c:2748
 #, fuzzy
 msgid "# UDP packets sent via TUN"
 msgstr "# các byte đã gửi qua UDP"
 
-#: src/exit/gnunet-daemon-exit.c:2859
+#: src/exit/gnunet-daemon-exit.c:2862
 #, fuzzy
 msgid "# UDP IP-exit requests received via mesh"
 msgstr "# các yêu cầu get (lấy) dht được nhận"
 
-#: src/exit/gnunet-daemon-exit.c:2966
+#: src/exit/gnunet-daemon-exit.c:2969
 #, fuzzy
 msgid "# UDP service requests received via mesh"
 msgstr "# các yêu cầu get (lấy) dht được nhận"
 
-#: src/exit/gnunet-daemon-exit.c:2989
+#: src/exit/gnunet-daemon-exit.c:2995
 #, fuzzy
 msgid "# UDP requests dropped (no such service)"
 msgstr "# các yêu cầu lỗ hổng bị bỏ do trọng tải"
 
-#: src/exit/gnunet-daemon-exit.c:3025
+#: src/exit/gnunet-daemon-exit.c:3031
 #, 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:3286
+#: src/exit/gnunet-daemon-exit.c:3235 src/exit/gnunet-daemon-exit.c:3245
+#, fuzzy, c-format
+msgid "Option `%s' for domain `%s' is not formatted correctly!\n"
+msgstr "Bị từ chối đặt tùy chọn « %s » trong phần « %s » thành « %s ».\n"
+
+#: src/exit/gnunet-daemon-exit.c:3259 src/exit/gnunet-daemon-exit.c:3267
+#, c-format
+msgid "`%s' is not a valid port number (for domain `%s')!"
+msgstr ""
+
+#: src/exit/gnunet-daemon-exit.c:3300
 #, c-format
 msgid "No addresses found for hostname `%s' of service `%s'!\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3300 src/exit/gnunet-daemon-exit.c:3312
+#: src/exit/gnunet-daemon-exit.c:3314 src/exit/gnunet-daemon-exit.c:3326
 #, c-format
 msgid "Service `%s' configured for IPv4, but IPv4 is disabled!\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3323
+#: src/exit/gnunet-daemon-exit.c:3337
 #, c-format
 msgid "No IP addresses found for hostname `%s' of service `%s'!\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3512
+#: src/exit/gnunet-daemon-exit.c:3527
 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:3520
+#: src/exit/gnunet-daemon-exit.c:3535
 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:3527
+#: src/exit/gnunet-daemon-exit.c:3542
 msgid ""
 "Cannot enable IPv4 exit but disable IPv4 on TUN interface, will use "
 "ENABLE_IPv4=YES\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3533
+#: src/exit/gnunet-daemon-exit.c:3548
 msgid ""
 "Cannot enable IPv6 exit but disable IPv6 on TUN interface, will use "
 "ENABLE_IPv6=YES\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3539 src/pt/gnunet-daemon-pt.c:1247
+#: src/exit/gnunet-daemon-exit.c:3554 src/exit/gnunet-daemon-exit.c:3717
+#: src/pt/gnunet-daemon-pt.c:1247
 msgid "No useful service enabled.  Exiting.\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3655
+#: src/exit/gnunet-daemon-exit.c:3664
 msgid "Must be a number"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3797
+#: src/exit/gnunet-daemon-exit.c:3813
 msgid "Daemon to run to provide an IP exit node for the VPN"
 msgstr ""
 
@@ -3190,7 +3209,7 @@ msgid "Downloading `%s' done (%s/s).\n"
 msgstr "Tiến trình tải lên « %s » đã tiếp tục lại.\n"
 
 #: src/fs/gnunet-download.c:209 src/fs/gnunet-publish.c:286
-#: src/fs/gnunet-search.c:193 src/fs/gnunet-unindex.c:108
+#: src/fs/gnunet-search.c:200 src/fs/gnunet-unindex.c:108
 #, fuzzy, c-format
 msgid "Unexpected status: %d\n"
 msgstr "Gặp sự kiện bất thường: %d\n"
@@ -3214,12 +3233,12 @@ msgid "Target filename must be specified.\n"
 msgstr ""
 
 #: src/fs/gnunet-download.c:268 src/fs/gnunet-publish.c:797
-#: src/fs/gnunet-search.c:243 src/fs/gnunet-unindex.c:140
+#: src/fs/gnunet-search.c:250 src/fs/gnunet-unindex.c:140
 #, fuzzy, c-format
 msgid "Could not initialize `%s' subsystem.\n"
 msgstr "Lỗi sơ khởi dịch vụ « %s ».\n"
 
-#: src/fs/gnunet-download.c:305 src/fs/gnunet-search.c:282
+#: src/fs/gnunet-download.c:305 src/fs/gnunet-search.c:289
 #, fuzzy
 msgid "set the desired LEVEL of receiver-anonymity"
 msgstr "đặt CẤP mong muốn của tình trạng nặc danh của người gửi"
@@ -3228,7 +3247,7 @@ msgstr "đặt CẤP mong muốn của tình trạng nặc danh của người g
 msgid "delete incomplete downloads (when aborted with CTRL-C)"
 msgstr "xoá việc tải về không hoàn thành (khi hủy bở dùng CTRL-C)"
 
-#: src/fs/gnunet-download.c:311 src/fs/gnunet-search.c:285
+#: src/fs/gnunet-download.c:311 src/fs/gnunet-search.c:292
 msgid "only search the local peer (no P2P network search)"
 msgstr ""
 
@@ -3390,7 +3409,7 @@ msgstr "Phải ghi rõ chỉ một tên tập tin để chèn.\n"
 msgid "You must NOT specify an URI and a filename.\n"
 msgstr "KHÔNG cho phép ghi rõ cả hai địa chỉ URI và tên tập tin.\n"
 
-#: src/fs/gnunet-publish.c:768 src/vpn/gnunet-vpn.c:208
+#: src/fs/gnunet-publish.c:768 src/vpn/gnunet-vpn.c:209
 #, c-format
 msgid "Option `%s' is required when using option `%s'.\n"
 msgstr "Tùy chọn « %s » cần thiết khi dùng tùy chọn « %s ».\n"
@@ -3473,34 +3492,34 @@ msgstr ""
 msgid "Failed to write directory with search results to `%s'\n"
 msgstr ""
 
-#: src/fs/gnunet-search.c:184
+#: src/fs/gnunet-search.c:191
 #, fuzzy, c-format
 msgid "Error searching: %s.\n"
 msgstr "Gặp lỗi khi tải xuống: %s\n"
 
-#: src/fs/gnunet-search.c:233
+#: src/fs/gnunet-search.c:240
 #, fuzzy
 msgid "Could not create keyword URI from arguments.\n"
 msgstr "Không thể tạo miền tên.\n"
 
-#: src/fs/gnunet-search.c:257
+#: src/fs/gnunet-search.c:264
 #, fuzzy
 msgid "Could not start searching.\n"
 msgstr "Không thể tạo miền tên.\n"
 
-#: src/fs/gnunet-search.c:288
+#: src/fs/gnunet-search.c:295
 msgid "write search results to file starting with PREFIX"
 msgstr ""
 
-#: src/fs/gnunet-search.c:291
+#: src/fs/gnunet-search.c:298
 msgid "automatically terminate search after DELAY"
 msgstr ""
 
-#: src/fs/gnunet-search.c:298
+#: src/fs/gnunet-search.c:305
 msgid "automatically terminate search after VALUE results are found"
 msgstr ""
 
-#: src/fs/gnunet-search.c:309
+#: src/fs/gnunet-search.c:316
 #, fuzzy
 msgid "Search GNUnet for files that were published on GNUnet"
 msgstr "Không hiển thị kết quả tìm kiếm cho tập tin được chúng ta tải lên"
@@ -3902,7 +3921,7 @@ msgstr "Không thể truy cập đến thông tin về không gian tên.\n"
 msgid "Unindex a file that was previously indexed with gnunet-publish."
 msgstr ""
 
-#: src/gns/gns_api.c:387
+#: src/gns/gns_api.c:393
 #, fuzzy
 msgid "Failed to serialize lookup reply from GNS service!\n"
 msgstr ""
@@ -4005,14 +4024,14 @@ msgstr ""
 msgid "Ego for `%s' not found, cannot perform lookup.\n"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:336 src/gns/gnunet-gns-helper-service-w32.c:753
+#: src/gns/gnunet-gns.c:336 src/gns/gnunet-gns-helper-service-w32.c:798
 #, c-format
 msgid ""
 "Ego for `gns-master' not found, cannot perform lookup.  Did you run gnunet-"
 "gns-import.sh?\n"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:365 src/gns/gnunet-gns-helper-service-w32.c:783
+#: src/gns/gnunet-gns.c:365 src/gns/gnunet-gns-helper-service-w32.c:828
 #, fuzzy, c-format
 msgid "Failed to connect to GNS\n"
 msgstr "Lỗi kết nối đến gnunetd.\n"
@@ -4050,7 +4069,7 @@ msgstr "xác định mức ưu tiên của nội dung"
 msgid "GNUnet GNS resolver tool"
 msgstr "Bản ghi lỗi GNUnet"
 
-#: src/gns/gnunet-gns-helper-service-w32.c:723
+#: src/gns/gnunet-gns-helper-service-w32.c:768
 #, c-format
 msgid ""
 "Ego for `gns-short' not found. This is not really fatal, but i'll pretend "
@@ -4058,7 +4077,7 @@ msgid ""
 "sh?\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-helper-service-w32.c:793
+#: src/gns/gnunet-gns-helper-service-w32.c:838
 #, fuzzy, c-format
 msgid "Failed to connect to identity service\n"
 msgstr "Lỗi kết nối đến gnunetd.\n"
@@ -4068,8 +4087,8 @@ msgstr "Lỗi kết nối đến gnunetd.\n"
 #: 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
+#: src/transport/plugin_transport_http_client.c:1070
+#: src/transport/plugin_transport_http_client.c:1085
 #, c-format
 msgid "%s failed at %s:%d: `%s'\n"
 msgstr "%s bị lỗi tại %s:%d: « %s »\n"
@@ -4214,36 +4233,36 @@ msgstr "Gặp lỗi khi chuyển đổi các đối số sang URI.\n"
 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:815
+#: src/gns/gnunet-service-gns_resolver.c:816
 #, 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:957
+#: src/gns/gnunet-service-gns_resolver.c:958
 #, c-format
 msgid "Skipping record of unsupported type %d\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns_resolver.c:1316
+#: src/gns/gnunet-service-gns_resolver.c:1317
 #, c-format
 msgid "GNS lookup resulted in DNS name that is too long (`%s')\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns_resolver.c:1809
+#: src/gns/gnunet-service-gns_resolver.c:1817
 msgid "GNS lookup recursion failed (no delegation record found)\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns_resolver.c:1833
+#: src/gns/gnunet-service-gns_resolver.c:1841
 #, 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:2071
+#: src/gns/gnunet-service-gns_resolver.c:2173
 #, c-format
 msgid "Zone %s was revoked, resolution fails\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns_resolver.c:2220
+#: src/gns/gnunet-service-gns_resolver.c:2322
 #, c-format
 msgid "Hostname `%s' is not well-formed, resolution fails\n"
 msgstr ""
@@ -4651,7 +4670,7 @@ msgid "Advertisement message could not be queued by core\n"
 msgstr ""
 
 #: src/hostlist/hostlist-server.c:556 src/peerinfo-tool/gnunet-peerinfo.c:651
-#: src/transport/gnunet-service-transport.c:850
+#: src/transport/gnunet-service-transport.c:946
 #, 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"
@@ -4763,64 +4782,50 @@ msgstr "Không thể lưu tập tin cấu hình « %s »:"
 msgid "Failed to create directory `%s' for storing egos\n"
 msgstr "Lỗi đọc danh sách bạn bè từ « %s »\n"
 
-#: src/integration-tests/connection_watchdog.c:1012
-#, fuzzy, c-format
-msgid "Transport plugin: `%s' port %llu\n"
-msgstr "Đang nạp các truyền tải « %s »\n"
-
-#: src/integration-tests/connection_watchdog.c:1045
-#, fuzzy, c-format
-msgid "Found %u transport plugins: `%s'\n"
-msgstr "Đang nạp các truyền tải « %s »\n"
-
-#: src/integration-tests/connection_watchdog.c:1105
-msgid "Send ping messages to test connectivity (default == NO)"
-msgstr ""
-
-#: src/mesh/gnunet-mesh.c:299
+#: src/mesh/gnunet-mesh.c:300
 #, 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
+#: src/mesh/gnunet-mesh.c:434
 #, fuzzy, c-format
 msgid "Invalid tunnel owner `%s'\n"
 msgstr "Địa chỉ IP định dạng sai: %s\n"
 
-#: src/mesh/gnunet-mesh.c:482
+#: src/mesh/gnunet-mesh.c:499
 msgid "You must NOT give a TARGET when using options\n"
 msgstr ""
 
-#: src/mesh/gnunet-mesh.c:559
+#: src/mesh/gnunet-mesh.c:576
 #, fuzzy
 msgid "provide information about a particular channel"
 msgstr "In ra thông tin về các đồng đẳng GNUnet."
 
-#: src/mesh/gnunet-mesh.c:562
+#: src/mesh/gnunet-mesh.c:579
 #, fuzzy
 msgid "provide information about a particular connection"
 msgstr "In ra thông tin về các đồng đẳng GNUnet."
 
-#: src/mesh/gnunet-mesh.c:565
+#: src/mesh/gnunet-mesh.c:582
 #, fuzzy
 msgid "provide information about all tunnels"
 msgstr "In ra thông tin về các đồng đẳng GNUnet."
 
-#: src/mesh/gnunet-mesh.c:568
+#: src/mesh/gnunet-mesh.c:585
 #, 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
+#: src/mesh/gnunet-mesh.c:588
 msgid "port to listen to (default; 0)"
 msgstr ""
 
-#: src/mesh/gnunet-mesh.c:574
+#: src/mesh/gnunet-mesh.c:591
 #, 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_peer.c:349
+#: src/mesh/gnunet-service-mesh_peer.c:377
 msgid "Wrong CORE service\n"
 msgstr ""
 
@@ -4839,7 +4844,7 @@ msgstr "Không thể truy cập đến « %s »: %s\n"
 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:394
+#: src/namecache/gnunet-namecache.c:124 src/namestore/gnunet-namestore.c:397
 #, c-format
 msgid "\tCorrupt or unsupported record of type %u\n"
 msgstr ""
@@ -4849,7 +4854,7 @@ msgstr ""
 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:692
+#: src/namecache/gnunet-namecache.c:195 src/namestore/gnunet-namestore.c:695
 #, fuzzy, c-format
 msgid "Invalid public key for reverse lookup `%s'\n"
 msgstr "Đối số không hợp lệ cho « %s ».\n"
@@ -4859,7 +4864,7 @@ msgstr "Đối số không hợp lệ cho « %s ».\n"
 msgid "You must specify a name\n"
 msgstr "Phải ghi rõ tên hiệu\n"
 
-#: src/namecache/gnunet-namecache.c:234 src/namestore/gnunet-namestore.c:925
+#: src/namecache/gnunet-namecache.c:234 src/namestore/gnunet-namestore.c:931
 msgid "name of the record to add/delete/display"
 msgstr ""
 
@@ -4868,7 +4873,7 @@ msgstr ""
 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:248 src/namestore/gnunet-namestore.c:957
+#: src/namecache/gnunet-namecache.c:248 src/namestore/gnunet-namestore.c:963
 #, fuzzy
 msgid "GNUnet zone manipulation tool"
 msgstr "Cấu hình GNUnet"
@@ -4878,154 +4883,154 @@ msgid "Namecache failed to cache block"
 msgstr ""
 
 #: src/namecache/plugin_namecache_postgres.c:89
-#: src/namestore/plugin_namestore_postgres.c:93
+#: src/namestore/plugin_namestore_postgres.c:96
 #, fuzzy
 msgid "Failed to create indices\n"
 msgstr "Không thể tạo miền tên.\n"
 
-#: src/namestore/gnunet-namestore.c:304
+#: src/namestore/gnunet-namestore.c:303
 #, 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:333
+#: src/namestore/gnunet-namestore.c:332
 #, 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:340
+#: src/namestore/gnunet-namestore.c:339
 #, 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:555
+#: src/namestore/gnunet-namestore.c:558
 #, fuzzy, c-format
 msgid "No options given\n"
 msgstr "chưa đưa ra tên"
 
-#: src/namestore/gnunet-namestore.c:566
+#: src/namestore/gnunet-namestore.c:569
 #: 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: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
+#: src/namestore/gnunet-namestore.c:577 src/namestore/gnunet-namestore.c:586
+#: src/namestore/gnunet-namestore.c:603 src/namestore/gnunet-namestore.c:625
+#: src/namestore/gnunet-namestore.c:665
 #, 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:575 src/namestore/gnunet-namestore.c:584
-#: src/namestore/gnunet-namestore.c:601 src/namestore/gnunet-namestore.c:623
+#: src/namestore/gnunet-namestore.c:578 src/namestore/gnunet-namestore.c:587
+#: src/namestore/gnunet-namestore.c:604 src/namestore/gnunet-namestore.c:626
 msgid "add"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:592
+#: src/namestore/gnunet-namestore.c:595
 #, 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:612
+#: src/namestore/gnunet-namestore.c:615
 #, c-format
 msgid "Value `%s' invalid for record type `%s'\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:648
+#: src/namestore/gnunet-namestore.c:651
 #, fuzzy, c-format
 msgid "Invalid time format `%s'\n"
 msgstr "Địa chỉ IP định dạng sai: %s\n"
 
-#: src/namestore/gnunet-namestore.c:663
+#: src/namestore/gnunet-namestore.c:666
 msgid "del"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:712
+#: src/namestore/gnunet-namestore.c:715
 #: 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
+#: src/namestore/gnunet-namestore.c:750
 #, 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
+#: src/namestore/gnunet-namestore.c:790
 #, c-format
 msgid "Ego `%s' not known to identity service\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:814
+#: src/namestore/gnunet-namestore.c:817
 #, c-format
 msgid "No default ego configured in identity service\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:847
+#: src/namestore/gnunet-namestore.c:853
 #, 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
+#: src/namestore/gnunet-namestore.c:865
 #, 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
+#: src/namestore/gnunet-namestore.c:913
 msgid "add record"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:910
+#: src/namestore/gnunet-namestore.c:916
 msgid "delete record"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:913
+#: src/namestore/gnunet-namestore.c:919
 msgid "display records"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:916
+#: src/namestore/gnunet-namestore.c:922
 msgid ""
 "expiration time for record to use (for adding only), \"never\" is possible"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:919
+#: src/namestore/gnunet-namestore.c:925
 #, 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
+#: src/namestore/gnunet-namestore.c:928
 #, 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:928
+#: src/namestore/gnunet-namestore.c:934
 #, 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:931
+#: src/namestore/gnunet-namestore.c:937
 msgid "type of the record to add/delete/display"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:934
+#: src/namestore/gnunet-namestore.c:940
 msgid "URI to import into our zone"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:937
+#: src/namestore/gnunet-namestore.c:943
 msgid "value of the record to add/delete"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:940
+#: src/namestore/gnunet-namestore.c:946
 msgid "create or list public record"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:943
+#: src/namestore/gnunet-namestore.c:949
 msgid ""
 "create shadow record (only valid if all other records of the same type have "
 "expired"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:946
+#: src/namestore/gnunet-namestore.c:952
 msgid "name of the ego controlling the zone"
 msgstr ""
 
@@ -5089,7 +5094,7 @@ msgstr "Lỗi kết nối đến gnunetd.\n"
 msgid "GNU Name System First Come First Serve name registration service"
 msgstr ""
 
-#: src/namestore/gnunet-service-namestore.c:634
+#: src/namestore/gnunet-service-namestore.c:638
 #, 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"
@@ -5107,87 +5112,87 @@ msgstr ""
 msgid "GNUnet NAT traversal test helper daemon"
 msgstr ""
 
-#: src/nat/nat_auto.c:169
+#: src/nat/nat_auto.c:170
 msgid "NAT traversal with ICMP Server timed out.\n"
 msgstr ""
 
-#: src/nat/nat_auto.c:199
+#: src/nat/nat_auto.c:200
 msgid "NAT traversal with ICMP Server succeeded.\n"
 msgstr ""
 
-#: src/nat/nat_auto.c:200
+#: src/nat/nat_auto.c:201
 msgid "NAT traversal with ICMP Server failed.\n"
 msgstr ""
 
-#: src/nat/nat_auto.c:219
+#: src/nat/nat_auto.c:222
 #, fuzzy
 msgid "Testing connection reversal with ICMP server.\n"
 msgstr "Cổng để liên lạc với giao diện người dùng GNUnet"
 
-#: src/nat/nat_auto.c:265
+#: src/nat/nat_auto.c:269
 #, c-format
 msgid "Detected external IP `%s'\n"
 msgstr ""
 
-#: src/nat/nat_auto.c:331
+#: src/nat/nat_auto.c:339
 msgid "This system has a global IPv6 address, setting IPv6 to supported.\n"
 msgstr ""
 
-#: src/nat/nat_auto.c:347
+#: src/nat/nat_auto.c:355
 #, fuzzy, c-format
 msgid "Detected internal network address `%s'.\n"
 msgstr "GNUnet bây giờ sử dụng địa chỉ IP %s.\n"
 
-#: src/nat/nat_auto.c:400
+#: src/nat/nat_auto.c:408
 msgid "upnpc found, enabling its use\n"
 msgstr ""
 
-#: src/nat/nat_auto.c:401
+#: src/nat/nat_auto.c:409
 msgid "upnpc not found\n"
 msgstr ""
 
-#: src/nat/nat_auto.c:434
+#: src/nat/nat_auto.c:442
 msgid "gnunet-helper-nat-server found, testing it\n"
 msgstr ""
 
-#: src/nat/nat_auto.c:435
+#: src/nat/nat_auto.c:443
 msgid "No working gnunet-helper-nat-server found\n"
 msgstr ""
 
-#: src/nat/nat_auto.c:469
+#: src/nat/nat_auto.c:477
 msgid "gnunet-helper-nat-client found, enabling it\n"
 msgstr ""
 
-#: src/nat/nat_auto.c:470
+#: src/nat/nat_auto.c:478
 msgid "gnunet-helper-nat-client not found or behind NAT, disabling it\n"
 msgstr ""
 
-#: src/nat/nat.c:834
+#: src/nat/nat.c:867
 #, c-format
 msgid "gnunet-helper-nat-server generated malformed address `%s'\n"
 msgstr ""
 
-#: src/nat/nat.c:883
+#: src/nat/nat.c:917
 #, fuzzy, c-format
 msgid "Failed to start %s\n"
 msgstr "Lỗi bắt đầu thu thập.\n"
 
-#: src/nat/nat.c:1152
+#: src/nat/nat.c:1203
 msgid "malformed"
 msgstr ""
 
-#: src/nat/nat.c:1218 src/nat/nat.c:1230
+#: src/nat/nat.c:1274 src/nat/nat.c:1286
 #, c-format
 msgid ""
 "Configuration requires `%s', but binary is not installed properly (SUID bit "
 "not set).  Option disabled.\n"
 msgstr ""
 
-#: src/nat/nat.c:1365
+#: src/nat/nat.c:1424
 msgid "Internal IP address not known, cannot use ICMP NAT traversal method\n"
 msgstr ""
 
-#: src/nat/nat.c:1376
+#: src/nat/nat.c:1440
 #, c-format
 msgid "Running gnunet-helper-nat-client %s %s %u\n"
 msgstr ""
@@ -5200,12 +5205,12 @@ msgstr ""
 msgid "`upnpc' command not found\n"
 msgstr ""
 
-#: src/nat/nat_test.c:345
+#: src/nat/nat_test.c:348
 #, 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:414
+#: src/nat/nat_test.c:420
 #, c-format
 msgid "Failed to create listen socket bound to `%s' for NAT test: %s\n"
 msgstr ""
@@ -5261,15 +5266,16 @@ 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:373
+#: src/peerinfo/gnunet-service-peerinfo.c:390
 #, fuzzy, c-format
-msgid "Failed to parse HELLO in file `%s': %s %u \n"
+msgid "Failed to parse HELLO in file `%s'\n"
 msgstr "Lỗi đọc danh sách bạn bè từ « %s »\n"
 
-#: src/peerinfo/gnunet-service-peerinfo.c:457
+#: src/peerinfo/gnunet-service-peerinfo.c:468
 msgid "# peers known"
 msgstr ""
 
-#: src/peerinfo/gnunet-service-peerinfo.c:494
+#: src/peerinfo/gnunet-service-peerinfo.c:505
 #, c-format
 msgid ""
 "File `%s' in directory `%s' does not match naming convention. Removed.\n"
@@ -5277,22 +5283,22 @@ msgstr ""
 "Tập tin « %s » trong thư mục « %s » không tùy theo quy ước đặt tên. Bị gỡ "
 "bỏ.\n"
 
-#: src/peerinfo/gnunet-service-peerinfo.c:644
+#: src/peerinfo/gnunet-service-peerinfo.c:655
 #, fuzzy, c-format
 msgid "Scanning directory `%s'\n"
 msgstr "Lỗi đọc danh sách bạn bè từ « %s »\n"
 
-#: src/peerinfo/gnunet-service-peerinfo.c:649
+#: src/peerinfo/gnunet-service-peerinfo.c:660
 #, 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:985
+#: src/peerinfo/gnunet-service-peerinfo.c:996
 #, 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:1275
+#: src/peerinfo/gnunet-service-peerinfo.c:1286
 #, c-format
 msgid "Importing HELLOs from `%s'\n"
 msgstr ""
@@ -5421,19 +5427,19 @@ msgid "Print information about peers."
 msgstr "In ra thông tin về các đồng đẳng GNUnet."
 
 #: src/peerinfo-tool/gnunet-peerinfo_plugins.c:105
-#: src/transport/gnunet-service-transport_plugins.c:123
+#: src/transport/gnunet-service-transport_plugins.c:124
 #, fuzzy, c-format
 msgid "Starting transport plugins `%s'\n"
 msgstr "Đang nạp các truyền tải « %s »\n"
 
 #: src/peerinfo-tool/gnunet-peerinfo_plugins.c:109
-#: src/transport/gnunet-service-transport_plugins.c:127
+#: src/transport/gnunet-service-transport_plugins.c:129
 #, fuzzy, c-format
 msgid "Loading `%s' transport plugin\n"
 msgstr "Đang nạp các truyền tải « %s »\n"
 
 #: src/peerinfo-tool/gnunet-peerinfo_plugins.c:129
-#: src/transport/gnunet-service-transport_plugins.c:157
+#: src/transport/gnunet-service-transport_plugins.c:159
 #, fuzzy, c-format
 msgid "Failed to load transport plugin for `%s'\n"
 msgstr "Không thể nạp phần bổ sung truyền tải « %s »\n"
@@ -5702,6 +5708,11 @@ msgstr ""
 msgid "Profiler for regex library"
 msgstr ""
 
+#: src/regex/regex_api.c:131
+#, fuzzy, c-format
+msgid "Regex `%s' is too long!\n"
+msgstr "« %s » không phải là một tập tin.\n"
+
 #: src/revocation/gnunet-revocation.c:121
 #, fuzzy, c-format
 msgid "Key `%s' is valid\n"
@@ -6056,7 +6067,7 @@ msgstr "Lỗi kết nối đến gnunetd.\n"
 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
+#: src/set/gnunet-service-set.c:1400
 #, fuzzy
 msgid "Could not connect to mesh service\n"
 msgstr "Không thể kết nối tới %s:%u: %s\n"
@@ -6177,12 +6188,12 @@ msgstr ""
 msgid "Print statistics about GNUnet operations."
 msgstr "In ra thống kê về các thao tác GNUnet."
 
-#: src/statistics/statistics_api.c:509
+#: src/statistics/statistics_api.c:506
 #, fuzzy
 msgid "Could not save some persistent statistics\n"
 msgstr "Không thể tạo miền tên.\n"
 
-#: src/statistics/statistics_api.c:1054
+#: src/statistics/statistics_api.c:1074
 msgid ""
 "Failed to receive acknowledgement from statistics service, some statistics "
 "might have been lost!\n"
@@ -6556,34 +6567,34 @@ msgstr ""
 msgid "# disconnects due to blacklist"
 msgstr ""
 
-#: src/transport/gnunet-service-transport.c:160
+#: src/transport/gnunet-service-transport.c:206
 #, fuzzy
 msgid "# bytes payload discarded due to not connected peer"
 msgstr "# Các quảng cáo đồng đẳng bị hủy do trọng tải"
 
-#: src/transport/gnunet-service-transport.c:250
+#: src/transport/gnunet-service-transport.c:325
 #, fuzzy
 msgid "# bytes total received"
 msgstr "# tổng số nội dung lỗ hổng được nhận"
 
-#: src/transport/gnunet-service-transport.c:325
+#: src/transport/gnunet-service-transport.c:399
 #, fuzzy
 msgid "# bytes payload received"
 msgstr "# các byte đã giải mã"
 
-#: src/transport/gnunet-service-transport.c:479
+#: src/transport/gnunet-service-transport.c:574
 #, fuzzy, c-format
-msgid "Could not obtain a valid network for `%s' %s\n"
+msgid "Could not obtain a valid network for `%s' %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:529
+#: src/transport/gnunet-service-transport.c:628
 #, 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:820
+#: src/transport/gnunet-service-transport.c:916
 #, fuzzy
 msgid "Transport service is lacking key configuration settings. Exiting.\n"
 msgstr "Lưu cấu hình ngay bây giờ không?"
@@ -6616,157 +6627,167 @@ msgstr "# các thông báo PONG đã mật mã được nhận"
 msgid "# refreshed my HELLO"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1074
+#: src/transport/gnunet-service-transport_neighbours.c:1108
 #, 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:1206
-#: src/transport/gnunet-service-transport_neighbours.c:1541
+#: src/transport/gnunet-service-transport_neighbours.c:1244
+#: src/transport/gnunet-service-transport_neighbours.c:1653
 #, 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:1211
+#: src/transport/gnunet-service-transport_neighbours.c:1249
 #, fuzzy
 msgid "# messages transmitted to other peers"
 msgstr "# các byte kiểu %d được gửi "
 
-#: src/transport/gnunet-service-transport_neighbours.c:1216
+#: src/transport/gnunet-service-transport_neighbours.c:1254
 #, 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:1273
+#: src/transport/gnunet-service-transport_neighbours.c:1311
 msgid "# messages timed out while in transport queue"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1315
+#: src/transport/gnunet-service-transport_neighbours.c:1368
 #, fuzzy
 msgid "# keepalives sent"
 msgstr "# các khoá phiên chạy được gửi"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1339
+#: src/transport/gnunet-service-transport_neighbours.c:1401
 #, 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:1347
+#: src/transport/gnunet-service-transport_neighbours.c:1409
 #, 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:1380
+#: src/transport/gnunet-service-transport_neighbours.c:1456
 #, 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:1389
+#: src/transport/gnunet-service-transport_neighbours.c:1465
 #, 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:1446
+#: src/transport/gnunet-service-transport_neighbours.c:1473
+#, fuzzy
+msgid "# KEEPALIVE_RESPONSE messages discarded (address changed)"
+msgstr "# các thông báo được chắp liền"
+
+#: src/transport/gnunet-service-transport_neighbours.c:1481
+#, fuzzy
+msgid "# KEEPALIVE_RESPONSE messages discarded (wrong nonce)"
+msgstr "# các thông báo được chắp liền"
+
+#: src/transport/gnunet-service-transport_neighbours.c:1558
 #, 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:1480
+#: src/transport/gnunet-service-transport_neighbours.c:1592
 #, 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:1496
+#: src/transport/gnunet-service-transport_neighbours.c:1608
 msgid "# ms throttling suggested"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1585
+#: src/transport/gnunet-service-transport_neighbours.c:1700
 #, 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
+#: src/transport/gnunet-service-transport_neighbours.c:1716
 #, 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
+#: src/transport/gnunet-service-transport_neighbours.c:1759
 #, 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
+#: src/transport/gnunet-service-transport_neighbours.c:2236
 #, 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
+#: src/transport/gnunet-service-transport_neighbours.c:2241
 #, c-format
 msgid "CONNECT request from peer `%s' ignored due impending shutdown\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:2824
+#: src/transport/gnunet-service-transport_neighbours.c:2979
 #, 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
+#: src/transport/gnunet-service-transport_neighbours.c:2987
 #, fuzzy
 msgid "# unexpected CONNECT_ACK messages (no peer)"
 msgstr "gửi ĐẾM thông báo"
 
-#: src/transport/gnunet-service-transport_neighbours.c:2847
-#: src/transport/gnunet-service-transport_neighbours.c:2882
+#: src/transport/gnunet-service-transport_neighbours.c:3002
+#: src/transport/gnunet-service-transport_neighbours.c:3039
 #, fuzzy
 msgid "# unexpected CONNECT_ACK messages (not ready)"
 msgstr "gửi ĐẾM thông báo"
 
-#: src/transport/gnunet-service-transport_neighbours.c:2895
+#: src/transport/gnunet-service-transport_neighbours.c:3052
 #, fuzzy
 msgid "# unexpected CONNECT_ACK messages (waiting on ATS)"
 msgstr "gửi ĐẾM thông báo"
 
-#: src/transport/gnunet-service-transport_neighbours.c:2926
+#: src/transport/gnunet-service-transport_neighbours.c:3085
 #, fuzzy
 msgid "# unexpected CONNECT_ACK messages (disconnecting)"
 msgstr "gửi ĐẾM thông báo"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3106
+#: src/transport/gnunet-service-transport_neighbours.c:3265
 #, fuzzy
 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
+#: src/transport/gnunet-service-transport_neighbours.c:3284
 #, 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:3176
+#: src/transport/gnunet-service-transport_neighbours.c:3340
 msgid "# SET QUOTA messages ignored (no such peer)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3190
+#: src/transport/gnunet-service-transport_neighbours.c:3355
 msgid "# disconnects due to quota of 0"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3220
+#: src/transport/gnunet-service-transport_neighbours.c:3383
 msgid "# disconnect messages ignored (old format)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3226
+#: src/transport/gnunet-service-transport_neighbours.c:3389
 #, 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
+#: src/transport/gnunet-service-transport_neighbours.c:3398
 msgid "# disconnect messages ignored (timestamp)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3271
+#: src/transport/gnunet-service-transport_neighbours.c:3434
 msgid "# other peer asked to disconnect from us"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3366
+#: src/transport/gnunet-service-transport_neighbours.c:3532
 #, 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"
@@ -6775,20 +6796,22 @@ msgstr "# các yêu cầu lỗ hổng bị bỏ do trọng tải"
 msgid "Transport service is lacking NEIGHBOUR_LIMIT option.\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_plugins.c:170
-#: src/transport/gnunet-service-transport_plugins.c:178
-#: src/transport/gnunet-service-transport_plugins.c:186
-#: src/transport/gnunet-service-transport_plugins.c:194
-#: src/transport/gnunet-service-transport_plugins.c:202
-#: 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
+#: src/transport/gnunet-service-transport_plugins.c:172
+#: src/transport/gnunet-service-transport_plugins.c:180
+#: src/transport/gnunet-service-transport_plugins.c:188
+#: src/transport/gnunet-service-transport_plugins.c:196
+#: src/transport/gnunet-service-transport_plugins.c:204
+#: src/transport/gnunet-service-transport_plugins.c:212
+#: src/transport/gnunet-service-transport_plugins.c:220
+#: src/transport/gnunet-service-transport_plugins.c:228
+#: src/transport/gnunet-service-transport_plugins.c:236
+#: src/transport/gnunet-service-transport_plugins.c:244
+#: src/transport/gnunet-service-transport_plugins.c:252
 #, 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:241
+#: src/transport/gnunet-service-transport_plugins.c:259
 #, 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"
@@ -7036,7 +7059,7 @@ msgstr "# các thông báo được chắp liền"
 
 #: src/transport/plugin_transport_bluetooth.c:681
 #: src/transport/plugin_transport_bluetooth.c:731
-#: src/transport/plugin_transport_bluetooth.c:1854
+#: src/transport/plugin_transport_bluetooth.c:1881
 #, fuzzy
 msgid "# Bluetooth sessions allocated"
 msgstr "# các khoá phiên chạy được chấp nhận"
@@ -7052,183 +7075,183 @@ msgstr ""
 
 #: src/transport/plugin_transport_bluetooth.c:938
 #: src/transport/plugin_transport_bluetooth.c:1023
-#: src/transport/plugin_transport_bluetooth.c:1856
+#: src/transport/plugin_transport_bluetooth.c:1883
 #, 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:1235
+#: src/transport/plugin_transport_bluetooth.c:1250
 #, 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:1261
+#: src/transport/plugin_transport_bluetooth.c:1276
 #, fuzzy
 msgid "# fragments received via Bluetooth"
 msgstr "# các mảnh bị loại bỏ"
 
-#: src/transport/plugin_transport_bluetooth.c:1271
+#: src/transport/plugin_transport_bluetooth.c:1286
 #, fuzzy
 msgid "# ACKs received via Bluetooth"
 msgstr "# các byte đã nhận qua TCP"
 
-#: src/transport/plugin_transport_bluetooth.c:1328
+#: src/transport/plugin_transport_bluetooth.c:1343
 #, 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:1440
+#: src/transport/plugin_transport_bluetooth.c:1455
 #, 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:1475
+#: src/transport/plugin_transport_bluetooth.c:1490
 #, 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:1538
+#: src/transport/plugin_transport_bluetooth.c:1553
 #, fuzzy
 msgid "# HELLO beacons sent via Bluetooth"
 msgstr "# các byte đã gửi qua UDP"
 
-#: src/transport/plugin_transport_bluetooth.c:1651
+#: src/transport/plugin_transport_bluetooth.c:1666
 msgid "Bluetooth address with invalid size encountered\n"
 msgstr ""
 
-#: src/transport/plugin_transport_bluetooth.c:1835
+#: src/transport/plugin_transport_bluetooth.c:1862
 #, c-format
 msgid "Helper binary `%s' not SUID, cannot run bluetooth transport\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_client.c:1590
+#: src/transport/plugin_transport_http_client.c:1618
 #, c-format
 msgid "Could not initialize curl multi handle, failed to start %s plugin!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_client.c:1727
-#: src/transport/plugin_transport_http_server.c:2974
+#: src/transport/plugin_transport_http_client.c:1693
+#: src/transport/plugin_transport_http_server.c:3001
 #, 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:1752
-#: src/transport/plugin_transport_http_server.c:3032
+#: src/transport/plugin_transport_http_client.c:1718
+#: src/transport/plugin_transport_http_server.c:3059
 #, 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:1780
-#: src/transport/plugin_transport_http_server.c:2874
+#: src/transport/plugin_transport_http_client.c:1746
+#: src/transport/plugin_transport_http_server.c:2901
 #, 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:1389
+#: src/transport/plugin_transport_http_server.c:1416
 #, 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:1653
+#: src/transport/plugin_transport_http_server.c:1680
 #, c-format
 msgid "Accepting connection (%u of %u) from `%s'\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:1661
+#: src/transport/plugin_transport_http_server.c:1688
 #, c-format
 msgid ""
 "Server reached maximum number connections (%u), rejecting new connection\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:1947
+#: src/transport/plugin_transport_http_server.c:1974
 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:1971
+#: src/transport/plugin_transport_http_server.c:1998
 #, c-format
 msgid "No usable TLS certificate found and creating one at `%s/%s' failed!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:2378
+#: src/transport/plugin_transport_http_server.c:2405
 #, 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
+#: src/transport/plugin_transport_http_server.c:2437 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
+#: src/transport/plugin_transport_http_server.c:2454 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
+#: src/transport/plugin_transport_http_server.c:2565
 #, c-format
 msgid "Found %u addresses to report to NAT service\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:2610
+#: src/transport/plugin_transport_http_server.c:2637
 msgid "Disabling IPv6 since it is not supported on this system!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:2697
+#: src/transport/plugin_transport_http_server.c:2724
 #, c-format
 msgid "IPv4 support is %s\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:2711
+#: src/transport/plugin_transport_http_server.c:2738
 #, c-format
 msgid "IPv6 support is %s\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:2718
+#: src/transport/plugin_transport_http_server.c:2745
 msgid "Neither IPv4 nor IPv6 are enabled! Fix in configuration\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:2729
+#: src/transport/plugin_transport_http_server.c:2756
 #, 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
+#: src/transport/plugin_transport_http_server.c:2763
 #, 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:2751
+#: src/transport/plugin_transport_http_server.c:2778
 #, 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:2761
+#: src/transport/plugin_transport_http_server.c:2788
 #, 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:2782
+#: src/transport/plugin_transport_http_server.c:2809
 #, 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:2792
+#: src/transport/plugin_transport_http_server.c:2819
 #, 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:2844
+#: src/transport/plugin_transport_http_server.c:2871
 #, 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
+#: src/transport/plugin_transport_http_server.c:2887
 #, fuzzy, c-format
 msgid "Notifying transport only about hostname `%s'\n"
 msgstr "không quyết định các tên máy"
@@ -7275,68 +7298,68 @@ msgstr "# các byte đã gửi qua SMTP"
 msgid "# bytes dropped by SMTP (outgoing)"
 msgstr "# các byte loại đi bởi SMTP (đi ra)"
 
-#: src/transport/plugin_transport_tcp.c:632
+#: src/transport/plugin_transport_tcp.c:576
 #, 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: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
+#: src/transport/plugin_transport_tcp.c:799
+#: src/transport/plugin_transport_tcp.c:979
+#: src/transport/plugin_transport_tcp.c:2120
+#: src/transport/plugin_transport_tcp.c:2723
+#, fuzzy
+msgid "# TCP sessions active"
+msgstr "# các khoá phiên chạy được chấp nhận"
+
+#: src/transport/plugin_transport_tcp.c:835
+#: src/transport/plugin_transport_tcp.c:972
+#: src/transport/plugin_transport_tcp.c:1061
+#: src/transport/plugin_transport_tcp.c:1111
+#: src/transport/plugin_transport_tcp.c:1290
+#: src/transport/plugin_transport_tcp.c:1309
 #, fuzzy
 msgid "# bytes currently in TCP buffers"
 msgstr "# các byte đã gừi qua TCP"
 
-#: 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
+#: src/transport/plugin_transport_tcp.c:839
 #, fuzzy
-msgid "# TCP sessions active"
-msgstr "# các khoá phiên chạy đư��c chấp nhận"
+msgid "# bytes discarded by TCP (disconnect)"
+msgstr "# các byte loại đi b��i TCP (đi ra)"
 
-#: src/transport/plugin_transport_tcp.c:935
+#: src/transport/plugin_transport_tcp.c:1065
 #, 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:984
+#: src/transport/plugin_transport_tcp.c:1114
 #, fuzzy
 msgid "# bytes transmitted via TCP"
 msgstr "# các byte được gửi"
 
-#: 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:1199
+#: src/transport/plugin_transport_tcp.c:1263
 #, c-format
 msgid "Trying to send with invalid session %p\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:1440
-#: src/transport/plugin_transport_udp.c:1471
+#: src/transport/plugin_transport_tcp.c:1520
+#: src/transport/plugin_transport_udp.c:1488
 msgid "# requests to create session with invalid address"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:1558
+#: src/transport/plugin_transport_tcp.c:1645
 msgid "# transport-service disconnect requests for TCP"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2091
+#: src/transport/plugin_transport_tcp.c:2170
 #, 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:2274
+#: src/transport/plugin_transport_tcp.c:2355
 msgid "# bytes received via TCP"
 msgstr "# các byte đã nhận qua TCP"
 
-#: src/transport/plugin_transport_tcp.c:2354
+#: src/transport/plugin_transport_tcp.c:2433
 msgid "# network-level TCP disconnect events"
 msgstr ""
 
@@ -7351,16 +7374,16 @@ msgstr ""
 msgid "Failed to start service.\n"
 msgstr "Lỗi bắt đầu thu thập.\n"
 
-#: src/transport/plugin_transport_tcp.c:2710
+#: src/transport/plugin_transport_tcp.c:2712
 #, c-format
 msgid "TCP transport listening on port %llu\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2713
+#: src/transport/plugin_transport_tcp.c:2715
 msgid "TCP transport not listening on any port (client only)\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2716
+#: src/transport/plugin_transport_tcp.c:2718
 #, c-format
 msgid "TCP transport advertises itself as being on port %llu\n"
 msgstr ""
@@ -7375,57 +7398,57 @@ msgstr "# các thông báo PONG đã mật mã được nhận"
 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:605
+#: src/transport/plugin_transport_udp_broadcasting.c:606
 msgid ""
 "Disabling HELLO broadcasting due to friend-to-friend only configuration!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_udp_broadcasting.c:619
+#: src/transport/plugin_transport_udp_broadcasting.c:629
 #, c-format
 msgid "Failed to set IPv4 broadcast option for broadcast socket on port %d\n"
 msgstr ""
 
-#: src/transport/plugin_transport_udp.c:1581
+#: src/transport/plugin_transport_udp.c:1599
 #, 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:2635
+#: src/transport/plugin_transport_udp.c:2680
 #, 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:2649
+#: src/transport/plugin_transport_udp.c:2694
 msgid ""
 "UDP could not transmit IPv6 message! Please check your network configuration "
 "and disable IPv6 if your connection does not have a global IPv6 address\n"
 msgstr ""
 
-#: src/transport/plugin_transport_udp.c:2949
+#: src/transport/plugin_transport_udp.c:2993
 #, 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:3046
+#: src/transport/plugin_transport_udp.c:3091
 #, c-format
 msgid "Given `%s' option is out of range: %llu > %u\n"
 msgstr ""
 
-#: src/transport/plugin_transport_udp.c:3089
+#: src/transport/plugin_transport_udp.c:3134
 #, 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:3148
+#: src/transport/plugin_transport_udp.c:3200
 #, 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:1625
+#: src/transport/plugin_transport_unix.c:1657
 #, fuzzy
 msgid "Failed to open UNIX listen socket\n"
 msgstr "Lỗi mở tập tin ghi sự kiện « %s »: %s\n"
@@ -7440,73 +7463,73 @@ msgid "# WLAN messages defragmented"
 msgstr "# các thông báo được chắp liền"
 
 #: src/transport/plugin_transport_wlan.c:691
-#: src/transport/plugin_transport_wlan.c:763
-#: src/transport/plugin_transport_wlan.c:1910
+#: src/transport/plugin_transport_wlan.c:778
+#: src/transport/plugin_transport_wlan.c:1937
 #, fuzzy
 msgid "# WLAN sessions allocated"
 msgstr "# các khoá phiên chạy được chấp nhận"
 
-#: src/transport/plugin_transport_wlan.c:868
+#: src/transport/plugin_transport_wlan.c:883
 #, fuzzy
 msgid "# WLAN message fragments sent"
 msgstr "# các thông báo bị tế phân"
 
-#: src/transport/plugin_transport_wlan.c:892
+#: src/transport/plugin_transport_wlan.c:907
 msgid "# WLAN messages pending (with fragmentation)"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:1000
-#: src/transport/plugin_transport_wlan.c:1086
-#: src/transport/plugin_transport_wlan.c:1912
+#: src/transport/plugin_transport_wlan.c:1015
+#: src/transport/plugin_transport_wlan.c:1101
+#: src/transport/plugin_transport_wlan.c:1939
 #, 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:1282
+#: src/transport/plugin_transport_wlan.c:1297
 #, 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:1308
+#: src/transport/plugin_transport_wlan.c:1323
 #, fuzzy
 msgid "# fragments received via WLAN"
 msgstr "# các mảnh bị loại bỏ"
 
-#: src/transport/plugin_transport_wlan.c:1318
+#: src/transport/plugin_transport_wlan.c:1333
 #, fuzzy
 msgid "# ACKs received via WLAN"
 msgstr "# các byte đã nhận qua TCP"
 
-#: src/transport/plugin_transport_wlan.c:1375
+#: src/transport/plugin_transport_wlan.c:1390
 #, 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:1496
+#: src/transport/plugin_transport_wlan.c:1511
 #, 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:1531
+#: src/transport/plugin_transport_wlan.c:1546
 #, 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:1594
+#: src/transport/plugin_transport_wlan.c:1609
 #, fuzzy
 msgid "# HELLO beacons sent via WLAN"
 msgstr "# các byte đã gửi qua UDP"
 
-#: src/transport/plugin_transport_wlan.c:1707
+#: src/transport/plugin_transport_wlan.c:1722
 msgid "WLAN address with invalid size encountered\n"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:1891
+#: src/transport/plugin_transport_wlan.c:1918
 #, c-format
 msgid "Helper binary `%s' not SUID, cannot run WLAN transport\n"
 msgstr ""
 
-#: src/transport/transport_api.c:682
+#: src/transport/transport_api.c:690
 #, 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"
@@ -7550,12 +7573,12 @@ msgstr ""
 msgid "Metadata `%s' failed to deserialize"
 msgstr ""
 
-#: src/util/client.c:261 src/util/client.c:851 src/util/service.c:625
+#: src/util/client.c:261 src/util/client.c:857 src/util/service.c:625
 #, c-format
 msgid "UNIXPATH `%s' too long, maximum length is %llu\n"
 msgstr ""
 
-#: src/util/client.c:265 src/util/client.c:856 src/util/service.c:629
+#: src/util/client.c:265 src/util/client.c:862 src/util/service.c:629
 #, fuzzy, c-format
 msgid "Using `%s' instead\n"
 msgstr "%s: tùy chọn « %s » là mơ hồ\n"
@@ -7572,17 +7595,17 @@ msgstr ""
 msgid "Need a non-empty hostname for service `%s'.\n"
 msgstr ""
 
-#: src/util/client.c:989
+#: src/util/client.c:995
 #, 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:1001
+#: src/util/client.c:1007
 #, 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:1284
+#: src/util/client.c:1290
 msgid "Could not submit request, not expecting to receive a response.\n"
 msgstr ""
 
@@ -7698,7 +7721,7 @@ msgstr "Không thể kết nối tới %s:%u: %s\n"
 msgid "Attempt to connect to `%s' failed\n"
 msgstr " Lỗi kết nối\n"
 
-#: src/util/container_bloomfilter.c:516
+#: src/util/container_bloomfilter.c:531
 #, c-format
 msgid ""
 "Size of file on disk is incorrect for this Bloom filter (want %llu, have "
@@ -7967,13 +7990,13 @@ msgstr ""
 msgid "Use build-in GNUnet stub resolver"
 msgstr ""
 
-#: src/util/gnunet-service-resolver.c:288
+#: src/util/gnunet-service-resolver.c:283
 #, c-format
 msgid "Could not resolve `%s' (%s): %s\n"
 msgstr "Không thể giải quyết « %s » (%s): %s\n"
 
-#: src/util/gnunet-service-resolver.c:358
-#: src/util/gnunet-service-resolver.c:399
+#: src/util/gnunet-service-resolver.c:350
+#: src/util/gnunet-service-resolver.c:391
 #, c-format
 msgid "Could not find IP of host `%s': %s\n"
 msgstr "Không tìm thấy địa chỉ IP của máy « %s »: %s\n"
@@ -8022,7 +8045,7 @@ msgstr "Gặp lỗi khi tạo người dùng"
 msgid "Unable to shorten unix path `%s' while keeping name unique\n"
 msgstr ""
 
-#: src/util/network.c:1397
+#: src/util/network.c:1344 src/util/network.c:1469
 #, c-format
 msgid ""
 "Fatal internal logic error, process hangs in `%s' (abort with CTRL-C)!\n"
@@ -8070,17 +8093,17 @@ msgstr "« %s » thất bại cho thư viện « %s » với lỗi: %s\n"
 msgid "Could not determine plugin installation path.\n"
 msgstr "Không thể truy cập đến thông tin về không gian tên.\n"
 
-#: src/util/program.c:260 src/util/service.c:1449
+#: src/util/program.c:262 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
+#: src/util/program.c:274 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
+#: src/util/program.c:279 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 »:"
@@ -8238,115 +8261,115 @@ msgstr ""
 msgid "b"
 msgstr "b"
 
-#: src/util/strings.c:450
+#: src/util/strings.c:452
 #, c-format
 msgid "Character sets requested were `%s'->`%s'\n"
 msgstr ""
 
-#: src/util/strings.c:578
+#: src/util/strings.c:580
 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:675
+#: src/util/strings.c:677
 msgid "µs"
 msgstr ""
 
-#: src/util/strings.c:679
+#: src/util/strings.c:681
 msgid "forever"
 msgstr ""
 
-#: src/util/strings.c:681
+#: src/util/strings.c:683
 msgid "0 ms"
 msgstr ""
 
-#: src/util/strings.c:687
+#: src/util/strings.c:689
 msgid "ms"
 msgstr "mg"
 
-#: src/util/strings.c:693
+#: src/util/strings.c:695
 msgid "s"
 msgstr "g"
 
-#: src/util/strings.c:699
+#: src/util/strings.c:701
 msgid "m"
 msgstr "p"
 
-#: src/util/strings.c:705
+#: src/util/strings.c:707
 msgid "h"
 msgstr "g"
 
-#: src/util/strings.c:712
+#: src/util/strings.c:714
 #, fuzzy
 msgid "day"
 msgstr " ngày"
 
-#: src/util/strings.c:714
+#: src/util/strings.c:716
 #, fuzzy
 msgid "days"
 msgstr " ngày"
 
-#: src/util/strings.c:743
+#: src/util/strings.c:745
 msgid "end of time"
 msgstr ""
 
-#: src/util/strings.c:1149
+#: src/util/strings.c:1178
 msgid "IPv6 address did not start with `['\n"
 msgstr ""
 
-#: src/util/strings.c:1157
+#: src/util/strings.c:1186
 msgid "IPv6 address did contain ':' to separate port number\n"
 msgstr ""
 
-#: src/util/strings.c:1163
+#: src/util/strings.c:1192
 msgid "IPv6 address did contain ']' before ':' to separate port number\n"
 msgstr ""
 
-#: src/util/strings.c:1170
+#: src/util/strings.c:1199
 msgid "IPv6 address did contain a valid port number after the last ':'\n"
 msgstr ""
 
-#: src/util/strings.c:1179
+#: src/util/strings.c:1208
 #, 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:1385 src/util/strings.c:1401
+#: src/util/strings.c:1414 src/util/strings.c:1430
 msgid "Port not in range\n"
 msgstr ""
 
-#: src/util/strings.c:1410
+#: src/util/strings.c:1439
 #, fuzzy, c-format
 msgid "Malformed port policy `%s'\n"
 msgstr "Lỗi bắt đầu thu thập.\n"
 
-#: src/util/strings.c:1493 src/util/strings.c:1524 src/util/strings.c:1572
-#: src/util/strings.c:1593
+#: src/util/strings.c:1522 src/util/strings.c:1553 src/util/strings.c:1601
+#: src/util/strings.c:1622
 #, c-format
 msgid "Invalid format for IP: `%s'\n"
 msgstr "Địa chỉ IP định dạng sai: %s\n"
 
-#: src/util/strings.c:1550
+#: src/util/strings.c:1579
 #, 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:1602
+#: src/util/strings.c:1631
 #, fuzzy, c-format
 msgid "Invalid format: `%s'\n"
 msgstr "Địa chỉ IP định dạng sai: %s\n"
 
-#: src/util/strings.c:1654
+#: src/util/strings.c:1683
 #, 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:1704
+#: src/util/strings.c:1733
 #, 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:1735
+#: src/util/strings.c:1764
 #, fuzzy, c-format
 msgid "Wrong format `%s' for network\n"
 msgstr "Mạng có định dạng sai « %s »: %s\n"
@@ -8466,71 +8489,71 @@ msgstr ""
 msgid "IPv4 support disabled as this system does not support IPv4\n"
 msgstr ""
 
-#: src/vpn/gnunet-vpn.c:146
+#: src/vpn/gnunet-vpn.c:147
 #, fuzzy
 msgid "Error creating tunnel\n"
 msgstr "Hoàn thành tạo khoá.\n"
 
-#: src/vpn/gnunet-vpn.c:189 src/vpn/gnunet-vpn.c:220
+#: src/vpn/gnunet-vpn.c:190 src/vpn/gnunet-vpn.c:221
 #, fuzzy, c-format
 msgid "Option `%s' makes no sense with option `%s'.\n"
 msgstr "Tùy chọn « %s » không có nghĩa khi không có tùy chọn « %s ».\n"
 
-#: src/vpn/gnunet-vpn.c:202
+#: src/vpn/gnunet-vpn.c:203
 #, fuzzy, c-format
 msgid "Option `%s' or `%s' is required.\n"
 msgstr "Bị từ chối đặt tùy chọn « %s » trong phần « %s » thành « %s ».\n"
 
-#: src/vpn/gnunet-vpn.c:214
+#: src/vpn/gnunet-vpn.c:215
 #, fuzzy, c-format
 msgid "Option `%s' or `%s' is required when using option `%s'.\n"
 msgstr "Tùy chọn « %s » cần thiết khi dùng tùy chọn « %s ».\n"
 
-#: src/vpn/gnunet-vpn.c:233
+#: src/vpn/gnunet-vpn.c:235
 #, fuzzy, c-format
 msgid "`%s' is not a valid peer identifier.\n"
 msgstr "« %s » không sẵn sàng.\n"
 
-#: src/vpn/gnunet-vpn.c:254
+#: src/vpn/gnunet-vpn.c:255
 #, fuzzy, c-format
 msgid "`%s' is not a valid IP address.\n"
 msgstr "« %s » không sẵn sàng.\n"
 
-#: src/vpn/gnunet-vpn.c:289
+#: src/vpn/gnunet-vpn.c:290
 msgid "request that result should be an IPv4 address"
 msgstr ""
 
-#: src/vpn/gnunet-vpn.c:292
+#: src/vpn/gnunet-vpn.c:293
 msgid "request that result should be an IPv6 address"
 msgstr ""
 
-#: src/vpn/gnunet-vpn.c:295
+#: src/vpn/gnunet-vpn.c:296
 msgid "how long should the mapping be valid for new tunnels?"
 msgstr ""
 
-#: src/vpn/gnunet-vpn.c:298
+#: src/vpn/gnunet-vpn.c:299
 msgid "destination IP for the tunnel"
 msgstr ""
 
-#: src/vpn/gnunet-vpn.c:301
+#: src/vpn/gnunet-vpn.c:302
 msgid "peer offering the service we would like to access"
 msgstr ""
 
-#: src/vpn/gnunet-vpn.c:304
+#: src/vpn/gnunet-vpn.c:305
 msgid "name of the service we would like to access"
 msgstr ""
 
-#: src/vpn/gnunet-vpn.c:307
+#: src/vpn/gnunet-vpn.c:308
 #, fuzzy
 msgid "service is offered via TCP"
 msgstr "# các byte đã nhận qua TCP"
 
-#: src/vpn/gnunet-vpn.c:310
+#: src/vpn/gnunet-vpn.c:311
 #, fuzzy
 msgid "service is offered via UDP"
 msgstr "# các byte đã nhận qua UDP"
 
-#: src/vpn/gnunet-vpn.c:322
+#: src/vpn/gnunet-vpn.c:323
 msgid "Setup tunnels via VPN."
 msgstr ""
 
@@ -8551,6 +8574,18 @@ msgid "`%s' failed on file `%s' at %s:%d with error: %s\n"
 msgstr "« %s » thất bại ở tập tin « %s » tại %s:%d với lỗi: %s\n"
 
 #, fuzzy
+#~ msgid "Transport plugin: `%s' port %llu\n"
+#~ msgstr "Đang nạp các truyền tải « %s »\n"
+
+#, fuzzy
+#~ msgid "Found %u transport plugins: `%s'\n"
+#~ msgstr "Đang nạp các truyền tải « %s »\n"
+
+#, fuzzy
+#~ msgid "Failed to parse HELLO in file `%s': %s %u \n"
+#~ msgstr "Lỗi đọc danh sách bạn bè từ « %s »\n"
+
+#, fuzzy
 #~ msgid "Internal error %d\n"
 #~ msgstr "Lỗi VR."
 
@@ -12574,8 +12609,8 @@ msgstr "« %s » thất bại ở tập tin « %s » tại %s:%d với lỗi: %s
 #~ "insert sử dụng libextractor để trích các từ khoá khỏi tập tin. "
 #~ "libextractor cũng có thể mở rộng động để quản lý định dạng tập tin bổ "
 #~ "sung. Muốn sử dụng bộ trích bên ngoài tập hợp mặc định thì ghi rõ ở đây "
-#~ "những thư viện trích bổ sung. Định dạng là « [[-]tên_thư_viện[:[-]"
-#~ "tên_thư_viện]*] ».\n"
+#~ "những thư viện trích bổ sung. Định dạng là « [[-]tên_thư_viện[:"
+#~ "[-]tên_thư_viện]*] ».\n"
 #~ "\n"
 #~ "Mặc định là dùng tên tập tin, và ngắt từ lớn ở dấu cách, dấu gạch dưới v."
 #~ "v. Đây nên ổn cho phần lớn người dùng. Dấu gạch nối « - » đằng trước một "
diff --git a/po/zh_CN.po b/po/zh_CN.po
index bc6f963f9..c832102a8 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnunet-0.8.1\n"
 "Report-Msgid-Bugs-To: gnunet-developers@mail.gnu.org\n"
-"POT-Creation-Date: 2013-12-12 22:41+0100\n"
+"POT-Creation-Date: 2013-12-23 19:38+0100\n"
 "PO-Revision-Date: 2011-07-09 12:12+0800\n"
 "Last-Translator: Wylmer Wang <wantinghard@gmail.com>\n"
 "Language-Team: Chinese (simplified) <i18n-zh@googlegroups.com>\n"
@@ -355,49 +355,49 @@ msgstr ""
 msgid "Received last message for %s \n"
 msgstr ""
 
-#: src/ats/gnunet-service-ats_addresses.c:1946
-#: src/ats/gnunet-service-ats_addresses.c:1990
+#: src/ats/gnunet-service-ats_addresses.c:1943
+#: src/ats/gnunet-service-ats_addresses.c:1987
 #, c-format
 msgid ""
 "Could not load quota for network `%s':  `%s', assigning default bandwidth "
 "%llu\n"
 msgstr ""
 
-#: src/ats/gnunet-service-ats_addresses.c:1953
+#: src/ats/gnunet-service-ats_addresses.c:1950
 #, c-format
 msgid "Outbound quota configure for network `%s' is %llu\n"
 msgstr ""
 
-#: src/ats/gnunet-service-ats_addresses.c:1961
+#: src/ats/gnunet-service-ats_addresses.c:1958
 #, c-format
 msgid ""
 "No outbound quota configured for network `%s', assigning default bandwidth "
 "%llu\n"
 msgstr ""
 
-#: src/ats/gnunet-service-ats_addresses.c:1997
+#: src/ats/gnunet-service-ats_addresses.c:1994
 #, c-format
 msgid "Inbound quota configured for network `%s' is %llu\n"
 msgstr ""
 
-#: src/ats/gnunet-service-ats_addresses.c:2005
+#: src/ats/gnunet-service-ats_addresses.c:2002
 #, c-format
 msgid ""
 "No outbound quota configure for network `%s', assigning default bandwidth "
 "%llu\n"
 msgstr ""
 
-#: src/ats/gnunet-service-ats_addresses.c:2175
+#: src/ats/gnunet-service-ats_addresses.c:2172
 #, c-format
 msgid "Initializing solver `%s '`%s'\n"
 msgstr ""
 
-#: src/ats/gnunet-service-ats_addresses.c:2178
+#: src/ats/gnunet-service-ats_addresses.c:2175
 #, fuzzy, c-format
 msgid "Failed to initialize solver `%s'!\n"
 msgstr "无法初始化 SQLite：%s。\n"
 
-#: src/ats/gnunet-service-ats_addresses.c:2201
+#: src/ats/gnunet-service-ats_addresses.c:2198
 #, fuzzy
 msgid "Failed to initialize solver!\n"
 msgstr "无法初始化 SQLite：%s。\n"
@@ -447,7 +447,7 @@ msgstr ""
 msgid "Using default quota configuration for network `%s' (in/out) %llu/%llu\n"
 msgstr ""
 
-#: src/ats/plugin_ats_proportional.c:1514
+#: src/ats/plugin_ats_proportional.c:1511
 #, fuzzy, c-format
 msgid "Invalid network type `%u' `%s': Disconnect!\n"
 msgstr "找不到主机“%s”的 IP：%s\n"
@@ -462,102 +462,102 @@ msgstr ""
 msgid "ATS returned results for %u addresses\n"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:204
+#: src/ats-tool/gnunet-ats.c:205
 #, c-format
 msgid ""
 "Peer `%s' plugin `%s', address `%s', `%s' bw out: %u Bytes/s, bw in %u Bytes/"
 "s, %s\n"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:328
+#: src/ats-tool/gnunet-ats.c:333
 #, c-format
 msgid "Quota for network `%11s' (in/out): %10s / %10s\n"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:347 src/namestore/gnunet-namestore.c:547
+#: src/ats-tool/gnunet-ats.c:352 src/namestore/gnunet-namestore.c:550
 #: 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:838
+#: src/ats-tool/gnunet-ats.c:364 src/transport/gnunet-transport.c:838
 #, fuzzy, c-format
 msgid "Failed to parse peer identity `%s'\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/ats-tool/gnunet-ats.c:367
+#: src/ats-tool/gnunet-ats.c:372
 #, c-format
 msgid "Please select one operation : %s or %s or %s or %s or %s\n"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:383 src/ats-tool/gnunet-ats.c:402
-#: src/ats-tool/gnunet-ats.c:419 src/ats-tool/gnunet-ats.c:457
+#: src/ats-tool/gnunet-ats.c:388 src/ats-tool/gnunet-ats.c:407
+#: src/ats-tool/gnunet-ats.c:424 src/ats-tool/gnunet-ats.c:462
 #, fuzzy, c-format
 msgid "Cannot connect to ATS service, exiting...\n"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/ats-tool/gnunet-ats.c:392 src/ats-tool/gnunet-ats.c:409
+#: src/ats-tool/gnunet-ats.c:397 src/ats-tool/gnunet-ats.c:414
 #, fuzzy, c-format
 msgid "Cannot issue request to ATS service, exiting...\n"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/ats-tool/gnunet-ats.c:427
+#: src/ats-tool/gnunet-ats.c:432
 #, fuzzy, c-format
 msgid "No preference type given!\n"
 msgstr "无法获取有关用户“%s”的信息：%s\n"
 
-#: src/ats-tool/gnunet-ats.c:432
+#: src/ats-tool/gnunet-ats.c:437
 #, c-format
 msgid "No peer given!\n"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:450
+#: src/ats-tool/gnunet-ats.c:455
 msgid "Valid type required\n"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:508
+#: src/ats-tool/gnunet-ats.c:513
 msgid "get list of active addresses currently used"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:511
+#: src/ats-tool/gnunet-ats.c:516
 msgid "get list of all active addresses"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:514
+#: src/ats-tool/gnunet-ats.c:519
 #, fuzzy
 msgid "do not resolve IP addresses to hostnames"
 msgstr "GNUnet 现在使用 IP 地址 %s。\n"
 
-#: src/ats-tool/gnunet-ats.c:517
+#: src/ats-tool/gnunet-ats.c:522
 msgid "monitor mode"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:520
+#: src/ats-tool/gnunet-ats.c:525
 #, fuzzy
 msgid "set preference for the given peer"
 msgstr "无法获取有关用户“%s”的信息：%s\n"
 
-#: src/ats-tool/gnunet-ats.c:523
+#: src/ats-tool/gnunet-ats.c:528
 msgid "print all configured quotas"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:526
+#: src/ats-tool/gnunet-ats.c:531
 msgid "peer id"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:529
+#: src/ats-tool/gnunet-ats.c:534
 msgid "preference type to set: latency | bandwidth"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:532
+#: src/ats-tool/gnunet-ats.c:537
 msgid "preference value"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:535
+#: src/ats-tool/gnunet-ats.c:540
 msgid "verbose output (include ATS address properties)"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:544
+#: src/ats-tool/gnunet-ats.c:549
 #, fuzzy
 msgid "Print information about ATS state"
 msgstr "无法获取有关用户“%s”的信息：%s\n"
@@ -587,7 +587,7 @@ msgid "be more verbose (print received values)"
 msgstr ""
 
 #: src/conversation/conversation_api.c:557
-#: src/conversation/conversation_api_call.c:468
+#: src/conversation/conversation_api_call.c:470
 msgid "Connection to conversation service lost, trying to reconnect\n"
 msgstr ""
 
@@ -621,215 +621,224 @@ msgstr ""
 msgid "Failed to setup phone (internal error)\n"
 msgstr "发送消息失败。\n"
 
-#: src/conversation/gnunet-conversation.c:357
+#: src/conversation/gnunet-conversation.c:356
 #, c-format
-msgid "Phone active on line %u\n"
+msgid ""
+"Phone active on line %u.  Type `/help' for a list of available commands\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:379
+#: src/conversation/gnunet-conversation.c:378
 #, c-format
 msgid "Resolved address of `%s'. Now ringing other party.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:386
+#: src/conversation/gnunet-conversation.c:385
 #, fuzzy, c-format
 msgid "Connection established to `%s'\n"
 msgstr "找不到接口“%s”的一个 IP 地址。\n"
 
-#: src/conversation/gnunet-conversation.c:393
+#: src/conversation/gnunet-conversation.c:392
 #, fuzzy, c-format
 msgid "Failed to resolve `%s'\n"
 msgstr "打开日志文件“%s”失败：%s\n"
 
-#: src/conversation/gnunet-conversation.c:400
+#: src/conversation/gnunet-conversation.c:399
 msgid "Call terminated\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:406
+#: src/conversation/gnunet-conversation.c:405
 #, c-format
 msgid "Connection to `%s' suspended (by other user)\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:412
+#: src/conversation/gnunet-conversation.c:411
 #, c-format
 msgid "Connection to `%s' resumed (by other user)\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:479
+#: src/conversation/gnunet-conversation.c:416
+msgid "Error with the call, restarting it\n"
+msgstr ""
+
+#: src/conversation/gnunet-conversation.c:483
 #, fuzzy, c-format
 msgid "Unknown command `%s'\n"
 msgstr "未知的命令“%s”。\n"
 
-#: src/conversation/gnunet-conversation.c:495
-#: src/conversation/gnunet-conversation.c:509
+#: src/conversation/gnunet-conversation.c:499
+#: src/conversation/gnunet-conversation.c:513
 #, c-format
 msgid "Ego `%s' not available\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:502
-#: src/conversation/gnunet-conversation.c:552
+#: src/conversation/gnunet-conversation.c:506
+#: src/conversation/gnunet-conversation.c:563
 msgid "You are calling someone else already, hang up first!\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:517
-#: src/conversation/gnunet-conversation.c:565
+#: src/conversation/gnunet-conversation.c:521
+#: src/conversation/gnunet-conversation.c:576
 #, c-format
 msgid "You are answering call from `%s', hang up or suspend that call first!\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:576
+#: src/conversation/gnunet-conversation.c:532
+msgid "Call recipient missing.\n"
+msgstr ""
+
+#: src/conversation/gnunet-conversation.c:587
 msgid "There is no incoming call to accept here!\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:593
+#: src/conversation/gnunet-conversation.c:604
 #, c-format
 msgid "There is no incoming call `%s' to accept right now!\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:621
+#: src/conversation/gnunet-conversation.c:632
 msgid "We currently do not have an address.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:644
+#: src/conversation/gnunet-conversation.c:655
 #, c-format
 msgid "We are currently trying to locate the private key for the ego `%s'.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:649
+#: src/conversation/gnunet-conversation.c:660
 #, c-format
 msgid "We are listening for incoming calls for ego `%s' on line %u.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:655
-#: src/conversation/gnunet-conversation.c:679
+#: src/conversation/gnunet-conversation.c:666
+#: src/conversation/gnunet-conversation.c:690
 #, c-format
 msgid "You are having a conversation with `%s'.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:660
+#: src/conversation/gnunet-conversation.c:671
 msgid ""
 "We had an internal error setting up our phone line. You can still make "
 "calls.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:669
+#: src/conversation/gnunet-conversation.c:680
 #, 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:674
+#: src/conversation/gnunet-conversation.c:685
 #, c-format
 msgid "We are calling `%s', his phone should be ringing.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:693
+#: src/conversation/gnunet-conversation.c:704
 msgid "Calls waiting:\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:699
+#: src/conversation/gnunet-conversation.c:710
 #, fuzzy, c-format
 msgid "#%u: `%s'\n"
 msgstr "运行 %s失败：%s %d\n"
 
-#: src/conversation/gnunet-conversation.c:727
-#: src/conversation/gnunet-conversation.c:742
+#: src/conversation/gnunet-conversation.c:738
+#: src/conversation/gnunet-conversation.c:753
 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
+#: src/conversation/gnunet-conversation.c:786
+#: src/conversation/gnunet-conversation.c:802
 msgid "There is no call that could be resumed right now.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:798
+#: src/conversation/gnunet-conversation.c:809
 #, c-format
 msgid "Already talking with `%s', cannot resume a call right now.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:807
+#: src/conversation/gnunet-conversation.c:818
 msgid "There is no incoming call to resume here!\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:824
+#: src/conversation/gnunet-conversation.c:835
 #, c-format
 msgid "There is no incoming call `%s' to resume right now!\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:859
+#: src/conversation/gnunet-conversation.c:870
 msgid "There is no call that could be cancelled right now.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:867
+#: src/conversation/gnunet-conversation.c:878
 msgid "There is no incoming call to refuse here!\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:884
+#: src/conversation/gnunet-conversation.c:895
 #, c-format
 msgid "There is no incoming call `%s' to refuse right now!\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:911
+#: src/conversation/gnunet-conversation.c:922
 msgid "Use `/address' to find out which address this phone should have in GNS"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:913
+#: src/conversation/gnunet-conversation.c:924
 msgid "Use `/call USER.gnu' to call USER"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:915
+#: src/conversation/gnunet-conversation.c:926
 msgid "Use `/accept #NUM' to accept incoming call #NUM"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:917
+#: src/conversation/gnunet-conversation.c:928
 msgid "Use `/suspend' to suspend the active call"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:919
+#: src/conversation/gnunet-conversation.c:930
 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
+#: src/conversation/gnunet-conversation.c:932
 msgid "Use `/cancel' to reject or terminate a call"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:923
+#: src/conversation/gnunet-conversation.c:934
 msgid "Use `/status' to print status information"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:925
+#: src/conversation/gnunet-conversation.c:936
 msgid "Use `/quit' to terminate gnunet-conversation"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:927
+#: src/conversation/gnunet-conversation.c:938
 msgid "Use `/help command' to get help for a specific command"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:1082
+#: src/conversation/gnunet-conversation.c:1093
 #, fuzzy, c-format
 msgid "Name of our ego changed to `%s'\n"
 msgstr "发送消息失败。\n"
 
-#: src/conversation/gnunet-conversation.c:1095
+#: src/conversation/gnunet-conversation.c:1106
 #, c-format
 msgid "Our ego `%s' was deleted!\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:1130
+#: src/conversation/gnunet-conversation.c:1141
 #, fuzzy
 msgid "You must specify the NAME of an ego to use\n"
 msgstr "您必须指定一个昵称\n"
 
-#: src/conversation/gnunet-conversation.c:1156
+#: src/conversation/gnunet-conversation.c:1167
 msgid "sets the NAME of the ego to use for the phone (and name resolution)"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:1159
+#: src/conversation/gnunet-conversation.c:1170
 msgid "sets the LINE to use for the phone"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:1174
+#: src/conversation/gnunet-conversation.c:1185
 msgid "Enables having a conversation with other GNUnet users."
 msgstr ""
 
@@ -856,7 +865,6 @@ msgid ""
 msgstr ""
 
 #: src/conversation/gnunet-conversation-test.c:248
-#: src/integration-tests/connection_watchdog.c:1114
 #: src/multicast/gnunet-multicast.c:70 src/revocation/gnunet-revocation.c:517
 #: src/template/gnunet-template.c:70
 msgid "help text"
@@ -968,17 +976,17 @@ msgstr ""
 msgid "pa_stream_connect_record() failed: %s\n"
 msgstr "“%s”说：%s\n"
 
-#: src/conversation/gnunet-service-conversation.c:825
+#: src/conversation/gnunet-service-conversation.c:841
 msgid "Mesh audio channel not ready; audio data dropped\n"
 msgstr ""
 
-#: src/conversation/gnunet-service-conversation.c:915
+#: src/conversation/gnunet-service-conversation.c:932
 #, c-format
 msgid ""
 "No available phone for incoming call on line %u, sending HANG_UP signal\n"
 msgstr ""
 
-#: src/conversation/gnunet-service-conversation.c:1302
+#: src/conversation/gnunet-service-conversation.c:1338
 #, fuzzy, c-format
 msgid "Received incoming channel on port %u\n"
 msgstr "“%s”已连接到“%s”。\n"
@@ -1058,130 +1066,130 @@ msgstr ""
 msgid "# bytes of messages of type %u received"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:531
+#: src/core/gnunet-service-core_kx.c:535
 msgid "# bytes encrypted"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:582
+#: src/core/gnunet-service-core_kx.c:586
 msgid "# bytes decrypted"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:668
+#: src/core/gnunet-service-core_kx.c:672
 msgid "# key exchanges initiated"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:708
+#: src/core/gnunet-service-core_kx.c:712
 msgid "# key exchanges stopped"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:771
+#: src/core/gnunet-service-core_kx.c:809
 msgid "# old ephemeral keys ignored"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:777
+#: src/core/gnunet-service-core_kx.c:815
 msgid "# ephemeral keys received"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:811
+#: src/core/gnunet-service-core_kx.c:849
 #, 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:827
-msgid "# EPHEMERAL_KEY messages decrypted"
+#: src/core/gnunet-service-core_kx.c:860
+msgid "# EPHEMERAL_KEY messages received"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:930
+#: src/core/gnunet-service-core_kx.c:950
 #: src/transport/gnunet-service-transport_validation.c:974
 msgid "# PING messages received"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:938
+#: src/core/gnunet-service-core_kx.c:958
 msgid "# PING messages dropped (out of order)"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:965
+#: src/core/gnunet-service-core_kx.c:985
 #, 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:982
+#: src/core/gnunet-service-core_kx.c:1002
 msgid "# PONG messages created"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1008
+#: src/core/gnunet-service-core_kx.c:1028
 msgid "# sessions terminated by timeout"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1018
+#: src/core/gnunet-service-core_kx.c:1038
 msgid "# keepalive messages sent"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1075
+#: src/core/gnunet-service-core_kx.c:1095
 #: src/transport/gnunet-service-transport_validation.c:1285
 msgid "# PONG messages received"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1081
+#: src/core/gnunet-service-core_kx.c:1101
 msgid "# PONG messages dropped (connection down)"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1086
+#: src/core/gnunet-service-core_kx.c:1106
 msgid "# PONG messages dropped (out of order)"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1116
+#: src/core/gnunet-service-core_kx.c:1136
 msgid "# PONG messages decrypted"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1150
+#: src/core/gnunet-service-core_kx.c:1170
 msgid "# session keys confirmed via PONG"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1160
+#: src/core/gnunet-service-core_kx.c:1180
 msgid "# timeouts prevented via PONG"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1167
+#: src/core/gnunet-service-core_kx.c:1187
 msgid "# rekey operations confirmed via PONG"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1307
+#: src/core/gnunet-service-core_kx.c:1327
 msgid "# DATA message dropped (out of order)"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1314
+#: src/core/gnunet-service-core_kx.c:1334
 #, 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:1317
+#: src/core/gnunet-service-core_kx.c:1337
 msgid "# sessions terminated by key expiration"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1360
-#: src/core/gnunet-service-core_kx.c:1385
+#: src/core/gnunet-service-core_kx.c:1380
+#: src/core/gnunet-service-core_kx.c:1405
 msgid "# bytes dropped (duplicates)"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1372
+#: src/core/gnunet-service-core_kx.c:1392
 msgid "# bytes dropped (out of sequence)"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1413
+#: src/core/gnunet-service-core_kx.c:1433
 msgid "# bytes dropped (ancient message)"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1421
+#: src/core/gnunet-service-core_kx.c:1441
 msgid "# bytes of payload decrypted"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1452
+#: src/core/gnunet-service-core_kx.c:1472
 msgid "# PAYLOAD dropped (out of order)"
 msgstr ""
 
@@ -1190,7 +1198,7 @@ msgid "# sessions terminated by transport disconnect"
 msgstr ""
 
 #: src/core/gnunet-service-core_neighbours.c:179
-#: src/core/gnunet-service-core_neighbours.c:328
+#: src/core/gnunet-service-core_neighbours.c:329
 msgid "# neighbour entries allocated"
 msgstr ""
 
@@ -1198,7 +1206,7 @@ msgstr ""
 msgid "# encrypted bytes given to transport"
 msgstr ""
 
-#: src/core/gnunet-service-core_neighbours.c:411
+#: src/core/gnunet-service-core_neighbours.c:412
 #, c-format
 msgid "Unsupported message of type %u (%u bytes) received from peer `%s'\n"
 msgstr ""
@@ -1212,11 +1220,11 @@ msgstr ""
 #: 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: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
+#: src/transport/gnunet-service-transport_neighbours.c:929
+#: src/transport/gnunet-service-transport_neighbours.c:1161
+#: src/transport/gnunet-service-transport_neighbours.c:1170
+#: src/transport/gnunet-service-transport_neighbours.c:3015
+#: src/transport/gnunet-service-transport_neighbours.c:3291
 msgid "# peers connected"
 msgstr ""
 
@@ -1436,12 +1444,12 @@ msgid "# bytes purged (low-priority)"
 msgstr ""
 
 #: src/datastore/gnunet-service-datastore.c:483
-#: src/gns/gnunet-gns-helper-service-w32.c:187
+#: src/gns/gnunet-gns-helper-service-w32.c:223
 msgid "Transmission to client failed!\n"
 msgstr ""
 
 #: src/datastore/gnunet-service-datastore.c:514
-#: src/gns/gnunet-gns-helper-service-w32.c:215
+#: src/gns/gnunet-gns-helper-service-w32.c:262
 msgid "Shutdown in progress, aborting transmission.\n"
 msgstr ""
 
@@ -1603,7 +1611,7 @@ msgstr "发送消息失败。\n"
 
 #: src/datastore/plugin_datastore_postgres.c:860
 #: src/namecache/plugin_namecache_postgres.c:414
-#: src/namestore/plugin_namestore_postgres.c:564
+#: src/namestore/plugin_namestore_postgres.c:569
 msgid "Postgres database running\n"
 msgstr ""
 
@@ -1696,7 +1704,7 @@ msgstr ""
 #: src/dht/gnunet-dht-get.c:201 src/dht/gnunet-dht-monitor.c:271
 #: src/dht/gnunet-dht-put.c:213 src/fs/gnunet-auto-share.c:753
 #: src/fs/gnunet-download.c:328 src/fs/gnunet-publish.c:877
-#: src/fs/gnunet-search.c:294 src/fs/gnunet-unindex.c:168
+#: src/fs/gnunet-search.c:301 src/fs/gnunet-unindex.c:168
 #: src/nse/gnunet-nse-profiler.c:873
 msgid "be verbose (print progress information)"
 msgstr ""
@@ -2151,21 +2159,21 @@ msgstr ""
 msgid "# DNS requests received via TUN interface"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:1049 src/exit/gnunet-daemon-exit.c:3499
+#: src/dns/gnunet-service-dns.c:1049 src/exit/gnunet-daemon-exit.c:3514
 #, 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:3556
+#: src/dns/gnunet-service-dns.c:1069 src/exit/gnunet-daemon-exit.c:3571
 #, fuzzy
 msgid "need a valid IPv4 or IPv6 address\n"
 msgstr "无效的进程优先级“%s”\n"
 
-#: src/dv/gnunet-dv.c:166
+#: src/dv/gnunet-dv.c:169
 msgid "verbose output"
 msgstr ""
 
-#: src/dv/gnunet-dv.c:175
+#: src/dv/gnunet-dv.c:178
 #, fuzzy
 msgid "Print information about DV state"
 msgstr "无法获取有关用户“%s”的信息：%s\n"
@@ -2182,14 +2190,14 @@ 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:1407
+#: src/exit/gnunet-daemon-exit.c:970 src/exit/gnunet-daemon-exit.c:2397
+#: src/exit/gnunet-daemon-exit.c:2654 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:1463
+#: src/exit/gnunet-daemon-exit.c:1007 src/exit/gnunet-daemon-exit.c:2456
+#: src/exit/gnunet-daemon-exit.c:2713 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 ""
@@ -2245,124 +2253,135 @@ msgstr ""
 msgid "# TCP service creation requests received via mesh"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:1875 src/exit/gnunet-daemon-exit.c:1965
-#: src/exit/gnunet-daemon-exit.c:2070 src/exit/gnunet-daemon-exit.c:2318
-#: src/exit/gnunet-daemon-exit.c:2567 src/exit/gnunet-daemon-exit.c:2856
-#: src/exit/gnunet-daemon-exit.c:2963
+#: src/exit/gnunet-daemon-exit.c:1875 src/exit/gnunet-daemon-exit.c:1968
+#: src/exit/gnunet-daemon-exit.c:2073 src/exit/gnunet-daemon-exit.c:2321
+#: src/exit/gnunet-daemon-exit.c:2570 src/exit/gnunet-daemon-exit.c:2859
+#: src/exit/gnunet-daemon-exit.c:2966
 msgid "# Bytes received from MESH"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:1907 src/exit/gnunet-daemon-exit.c:2985
+#: src/exit/gnunet-daemon-exit.c:1909 src/exit/gnunet-daemon-exit.c:2990
 #, c-format
-msgid "No service found for %s on port %d!\n"
+msgid "No service %s found for %s on port %d!\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:1911
+#: src/exit/gnunet-daemon-exit.c:1914
 msgid "# TCP requests dropped (no such service)"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:1968
+#: src/exit/gnunet-daemon-exit.c:1971
 msgid "# TCP IP-exit creation requests received via mesh"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:2073
+#: src/exit/gnunet-daemon-exit.c:2076
 msgid "# TCP data requests received via mesh"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:2087
+#: src/exit/gnunet-daemon-exit.c:2090
 msgid "# TCP DATA requests dropped (no session)"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:2147
+#: src/exit/gnunet-daemon-exit.c:2150
 msgid "# ICMP packets sent via TUN"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:2321
+#: src/exit/gnunet-daemon-exit.c:2324
 msgid "# ICMP IP-exit requests received via mesh"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:2570
+#: src/exit/gnunet-daemon-exit.c:2573
 msgid "# ICMP service requests received via mesh"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:2636 src/vpn/gnunet-service-vpn.c:1397
+#: src/exit/gnunet-daemon-exit.c:2639 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:1433
+#: src/exit/gnunet-daemon-exit.c:2698 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 ""
 
-#: src/exit/gnunet-daemon-exit.c:2745
+#: src/exit/gnunet-daemon-exit.c:2748
 msgid "# UDP packets sent via TUN"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:2859
+#: src/exit/gnunet-daemon-exit.c:2862
 msgid "# UDP IP-exit requests received via mesh"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:2966
+#: src/exit/gnunet-daemon-exit.c:2969
 msgid "# UDP service requests received via mesh"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:2989
+#: src/exit/gnunet-daemon-exit.c:2995
 msgid "# UDP requests dropped (no such service)"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3025
+#: src/exit/gnunet-daemon-exit.c:3031
 msgid "# Inbound MESH channels created"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3286
+#: src/exit/gnunet-daemon-exit.c:3235 src/exit/gnunet-daemon-exit.c:3245
+#, fuzzy, c-format
+msgid "Option `%s' for domain `%s' is not formatted correctly!\n"
+msgstr "%s：选项“%s”有歧义\n"
+
+#: src/exit/gnunet-daemon-exit.c:3259 src/exit/gnunet-daemon-exit.c:3267
+#, c-format
+msgid "`%s' is not a valid port number (for domain `%s')!"
+msgstr ""
+
+#: src/exit/gnunet-daemon-exit.c:3300
 #, c-format
 msgid "No addresses found for hostname `%s' of service `%s'!\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3300 src/exit/gnunet-daemon-exit.c:3312
+#: src/exit/gnunet-daemon-exit.c:3314 src/exit/gnunet-daemon-exit.c:3326
 #, c-format
 msgid "Service `%s' configured for IPv4, but IPv4 is disabled!\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3323
+#: src/exit/gnunet-daemon-exit.c:3337
 #, c-format
 msgid "No IP addresses found for hostname `%s' of service `%s'!\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3512
+#: src/exit/gnunet-daemon-exit.c:3527
 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:3520
+#: src/exit/gnunet-daemon-exit.c:3535
 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:3527
+#: src/exit/gnunet-daemon-exit.c:3542
 msgid ""
 "Cannot enable IPv4 exit but disable IPv4 on TUN interface, will use "
 "ENABLE_IPv4=YES\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3533
+#: src/exit/gnunet-daemon-exit.c:3548
 msgid ""
 "Cannot enable IPv6 exit but disable IPv6 on TUN interface, will use "
 "ENABLE_IPv6=YES\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3539 src/pt/gnunet-daemon-pt.c:1247
+#: src/exit/gnunet-daemon-exit.c:3554 src/exit/gnunet-daemon-exit.c:3717
+#: src/pt/gnunet-daemon-pt.c:1247
 msgid "No useful service enabled.  Exiting.\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3655
+#: src/exit/gnunet-daemon-exit.c:3664
 msgid "Must be a number"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3797
+#: src/exit/gnunet-daemon-exit.c:3813
 msgid "Daemon to run to provide an IP exit node for the VPN"
 msgstr ""
 
@@ -3053,7 +3072,7 @@ msgid "Downloading `%s' done (%s/s).\n"
 msgstr ""
 
 #: src/fs/gnunet-download.c:209 src/fs/gnunet-publish.c:286
-#: src/fs/gnunet-search.c:193 src/fs/gnunet-unindex.c:108
+#: src/fs/gnunet-search.c:200 src/fs/gnunet-unindex.c:108
 #, c-format
 msgid "Unexpected status: %d\n"
 msgstr ""
@@ -3077,12 +3096,12 @@ msgid "Target filename must be specified.\n"
 msgstr ""
 
 #: src/fs/gnunet-download.c:268 src/fs/gnunet-publish.c:797
-#: src/fs/gnunet-search.c:243 src/fs/gnunet-unindex.c:140
+#: src/fs/gnunet-search.c:250 src/fs/gnunet-unindex.c:140
 #, fuzzy, c-format
 msgid "Could not initialize `%s' subsystem.\n"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/fs/gnunet-download.c:305 src/fs/gnunet-search.c:282
+#: src/fs/gnunet-download.c:305 src/fs/gnunet-search.c:289
 msgid "set the desired LEVEL of receiver-anonymity"
 msgstr ""
 
@@ -3090,7 +3109,7 @@ msgstr ""
 msgid "delete incomplete downloads (when aborted with CTRL-C)"
 msgstr ""
 
-#: src/fs/gnunet-download.c:311 src/fs/gnunet-search.c:285
+#: src/fs/gnunet-download.c:311 src/fs/gnunet-search.c:292
 msgid "only search the local peer (no P2P network search)"
 msgstr ""
 
@@ -3247,7 +3266,7 @@ msgstr ""
 msgid "You must NOT specify an URI and a filename.\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:768 src/vpn/gnunet-vpn.c:208
+#: src/fs/gnunet-publish.c:768 src/vpn/gnunet-vpn.c:209
 #, c-format
 msgid "Option `%s' is required when using option `%s'.\n"
 msgstr ""
@@ -3316,32 +3335,32 @@ msgstr ""
 msgid "Failed to write directory with search results to `%s'\n"
 msgstr ""
 
-#: src/fs/gnunet-search.c:184
+#: src/fs/gnunet-search.c:191
 #, fuzzy, c-format
 msgid "Error searching: %s.\n"
 msgstr "创建用户出错"
 
-#: src/fs/gnunet-search.c:233
+#: src/fs/gnunet-search.c:240
 msgid "Could not create keyword URI from arguments.\n"
 msgstr ""
 
-#: src/fs/gnunet-search.c:257
+#: src/fs/gnunet-search.c:264
 msgid "Could not start searching.\n"
 msgstr ""
 
-#: src/fs/gnunet-search.c:288
+#: src/fs/gnunet-search.c:295
 msgid "write search results to file starting with PREFIX"
 msgstr ""
 
-#: src/fs/gnunet-search.c:291
+#: src/fs/gnunet-search.c:298
 msgid "automatically terminate search after DELAY"
 msgstr ""
 
-#: src/fs/gnunet-search.c:298
+#: src/fs/gnunet-search.c:305
 msgid "automatically terminate search after VALUE results are found"
 msgstr ""
 
-#: src/fs/gnunet-search.c:309
+#: src/fs/gnunet-search.c:316
 msgid "Search GNUnet for files that were published on GNUnet"
 msgstr ""
 
@@ -3706,7 +3725,7 @@ msgstr ""
 msgid "Unindex a file that was previously indexed with gnunet-publish."
 msgstr ""
 
-#: src/gns/gns_api.c:387
+#: src/gns/gns_api.c:393
 #, fuzzy
 msgid "Failed to serialize lookup reply from GNS service!\n"
 msgstr "初始化“%s”服务失败。\n"
@@ -3805,14 +3824,14 @@ msgstr ""
 msgid "Ego for `%s' not found, cannot perform lookup.\n"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:336 src/gns/gnunet-gns-helper-service-w32.c:753
+#: src/gns/gnunet-gns.c:336 src/gns/gnunet-gns-helper-service-w32.c:798
 #, c-format
 msgid ""
 "Ego for `gns-master' not found, cannot perform lookup.  Did you run gnunet-"
 "gns-import.sh?\n"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:365 src/gns/gnunet-gns-helper-service-w32.c:783
+#: src/gns/gnunet-gns.c:365 src/gns/gnunet-gns-helper-service-w32.c:828
 #, fuzzy, c-format
 msgid "Failed to connect to GNS\n"
 msgstr "初始化“%s”服务失败。\n"
@@ -3847,7 +3866,7 @@ msgstr ""
 msgid "GNUnet GNS resolver tool"
 msgstr "GNUnet 错误日志"
 
-#: src/gns/gnunet-gns-helper-service-w32.c:723
+#: src/gns/gnunet-gns-helper-service-w32.c:768
 #, c-format
 msgid ""
 "Ego for `gns-short' not found. This is not really fatal, but i'll pretend "
@@ -3855,7 +3874,7 @@ msgid ""
 "sh?\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-helper-service-w32.c:793
+#: src/gns/gnunet-gns-helper-service-w32.c:838
 #, fuzzy, c-format
 msgid "Failed to connect to identity service\n"
 msgstr "初始化“%s”服务失败。\n"
@@ -3865,8 +3884,8 @@ msgstr "初始化“%s”服务失败。\n"
 #: 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
+#: src/transport/plugin_transport_http_client.c:1070
+#: src/transport/plugin_transport_http_client.c:1085
 #, c-format
 msgid "%s failed at %s:%d: `%s'\n"
 msgstr ""
@@ -4010,36 +4029,36 @@ msgstr ""
 msgid "Failed to connect to the DNS service!\n"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/gns/gnunet-service-gns_resolver.c:815
+#: src/gns/gnunet-service-gns_resolver.c:816
 #, fuzzy
 msgid "Failed to parse DNS response\n"
 msgstr "打开日志文件“%s”失败：%s\n"
 
-#: src/gns/gnunet-service-gns_resolver.c:957
+#: src/gns/gnunet-service-gns_resolver.c:958
 #, c-format
 msgid "Skipping record of unsupported type %d\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns_resolver.c:1316
+#: src/gns/gnunet-service-gns_resolver.c:1317
 #, c-format
 msgid "GNS lookup resulted in DNS name that is too long (`%s')\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns_resolver.c:1809
+#: src/gns/gnunet-service-gns_resolver.c:1817
 msgid "GNS lookup recursion failed (no delegation record found)\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns_resolver.c:1833
+#: src/gns/gnunet-service-gns_resolver.c:1841
 #, fuzzy, c-format
 msgid "Failed to cache GNS resolution: %s\n"
 msgstr "打开日志文件“%s”失败：%s\n"
 
-#: src/gns/gnunet-service-gns_resolver.c:2071
+#: src/gns/gnunet-service-gns_resolver.c:2173
 #, c-format
 msgid "Zone %s was revoked, resolution fails\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns_resolver.c:2220
+#: src/gns/gnunet-service-gns_resolver.c:2322
 #, c-format
 msgid "Hostname `%s' is not well-formed, resolution fails\n"
 msgstr ""
@@ -4430,7 +4449,7 @@ msgid "Advertisement message could not be queued by core\n"
 msgstr ""
 
 #: src/hostlist/hostlist-server.c:556 src/peerinfo-tool/gnunet-peerinfo.c:651
-#: src/transport/gnunet-service-transport.c:850
+#: src/transport/gnunet-service-transport.c:946
 msgid "Could not access PEERINFO service.  Exiting.\n"
 msgstr ""
 
@@ -4541,63 +4560,49 @@ msgstr "解析配置文件“%s”失败\n"
 msgid "Failed to create directory `%s' for storing egos\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/integration-tests/connection_watchdog.c:1012
-#, c-format
-msgid "Transport plugin: `%s' port %llu\n"
-msgstr ""
-
-#: src/integration-tests/connection_watchdog.c:1045
-#, fuzzy, c-format
-msgid "Found %u transport plugins: `%s'\n"
-msgstr "解析配置文件“%s”失败\n"
-
-#: src/integration-tests/connection_watchdog.c:1105
-msgid "Send ping messages to test connectivity (default == NO)"
-msgstr ""
-
-#: src/mesh/gnunet-mesh.c:299
+#: src/mesh/gnunet-mesh.c:300
 #, fuzzy, c-format
 msgid "Invalid target `%s'\n"
 msgstr "“%s”的参数无效。\n"
 
-#: src/mesh/gnunet-mesh.c:417
+#: src/mesh/gnunet-mesh.c:434
 #, fuzzy, c-format
 msgid "Invalid tunnel owner `%s'\n"
 msgstr "IP 格式无效：“%s”\n"
 
-#: src/mesh/gnunet-mesh.c:482
+#: src/mesh/gnunet-mesh.c:499
 msgid "You must NOT give a TARGET when using options\n"
 msgstr ""
 
-#: src/mesh/gnunet-mesh.c:559
+#: src/mesh/gnunet-mesh.c:576
 #, fuzzy
 msgid "provide information about a particular channel"
 msgstr "无法获取有关用户“%s”的信息：%s\n"
 
-#: src/mesh/gnunet-mesh.c:562
+#: src/mesh/gnunet-mesh.c:579
 #, fuzzy
 msgid "provide information about a particular connection"
 msgstr "无法获取有关用户“%s”的信息：%s\n"
 
-#: src/mesh/gnunet-mesh.c:565
+#: src/mesh/gnunet-mesh.c:582
 #, fuzzy
 msgid "provide information about all tunnels"
 msgstr "无法获取有关用户“%s”的信息：%s\n"
 
-#: src/mesh/gnunet-mesh.c:568
+#: src/mesh/gnunet-mesh.c:585
 msgid "provide information about all tunnels (continuously) NOT IMPLEMENTED"
 msgstr ""
 
-#: src/mesh/gnunet-mesh.c:571
+#: src/mesh/gnunet-mesh.c:588
 msgid "port to listen to (default; 0)"
 msgstr ""
 
-#: src/mesh/gnunet-mesh.c:574
+#: src/mesh/gnunet-mesh.c:591
 #, fuzzy
 msgid "provide information about a particular tunnel"
 msgstr "无法获取有关用户“%s”的信息：%s\n"
 
-#: src/mesh/gnunet-service-mesh_peer.c:349
+#: src/mesh/gnunet-service-mesh_peer.c:377
 msgid "Wrong CORE service\n"
 msgstr ""
 
@@ -4616,7 +4621,7 @@ msgstr "无法解析“%s”(%s)：%s\n"
 msgid "No records found for `%s'"
 msgstr "运行 %s失败：%s %d\n"
 
-#: src/namecache/gnunet-namecache.c:124 src/namestore/gnunet-namestore.c:394
+#: src/namecache/gnunet-namecache.c:124 src/namestore/gnunet-namestore.c:397
 #, c-format
 msgid "\tCorrupt or unsupported record of type %u\n"
 msgstr ""
@@ -4626,7 +4631,7 @@ msgstr ""
 msgid "You must specify which zone should be accessed\n"
 msgstr "您必须指定一个昵称\n"
 
-#: src/namecache/gnunet-namecache.c:195 src/namestore/gnunet-namestore.c:692
+#: src/namecache/gnunet-namecache.c:195 src/namestore/gnunet-namestore.c:695
 #, fuzzy, c-format
 msgid "Invalid public key for reverse lookup `%s'\n"
 msgstr "“%s”的参数无效。\n"
@@ -4636,7 +4641,7 @@ msgstr "“%s”的参数无效。\n"
 msgid "You must specify a name\n"
 msgstr "您必须指定一个接收方！\n"
 
-#: src/namecache/gnunet-namecache.c:234 src/namestore/gnunet-namestore.c:925
+#: src/namecache/gnunet-namecache.c:234 src/namestore/gnunet-namestore.c:931
 msgid "name of the record to add/delete/display"
 msgstr ""
 
@@ -4644,7 +4649,7 @@ msgstr ""
 msgid "spezifies the public key of the zone to look in"
 msgstr ""
 
-#: src/namecache/gnunet-namecache.c:248 src/namestore/gnunet-namestore.c:957
+#: src/namecache/gnunet-namecache.c:248 src/namestore/gnunet-namestore.c:963
 #, fuzzy
 msgid "GNUnet zone manipulation tool"
 msgstr "GNUnet 配置"
@@ -4654,154 +4659,154 @@ msgid "Namecache failed to cache block"
 msgstr ""
 
 #: src/namecache/plugin_namecache_postgres.c:89
-#: src/namestore/plugin_namestore_postgres.c:93
+#: src/namestore/plugin_namestore_postgres.c:96
 #, fuzzy
 msgid "Failed to create indices\n"
 msgstr "发送消息失败。\n"
 
-#: src/namestore/gnunet-namestore.c:304
+#: src/namestore/gnunet-namestore.c:303
 #, c-format
 msgid "Adding record failed: %s\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:333
+#: src/namestore/gnunet-namestore.c:332
 #, c-format
 msgid "Deleting record failed, record does not exist%s%s\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:340
+#: src/namestore/gnunet-namestore.c:339
 #, c-format
 msgid "Deleting record failed%s%s\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:555
+#: src/namestore/gnunet-namestore.c:558
 #, c-format
 msgid "No options given\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:566
+#: src/namestore/gnunet-namestore.c:569
 #: src/namestore/gnunet-namestore-fcfsd.c:970
 #, fuzzy
 msgid "Failed to connect to namestore\n"
 msgstr "初始化“%s”服务失败。\n"
 
-#: 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
+#: src/namestore/gnunet-namestore.c:577 src/namestore/gnunet-namestore.c:586
+#: src/namestore/gnunet-namestore.c:603 src/namestore/gnunet-namestore.c:625
+#: src/namestore/gnunet-namestore.c:665
 #, fuzzy, c-format
 msgid "Missing option `%s' for operation `%s'\n"
 msgstr "配置文件“%s”已写入。\n"
 
-#: src/namestore/gnunet-namestore.c:575 src/namestore/gnunet-namestore.c:584
-#: src/namestore/gnunet-namestore.c:601 src/namestore/gnunet-namestore.c:623
+#: src/namestore/gnunet-namestore.c:578 src/namestore/gnunet-namestore.c:587
+#: src/namestore/gnunet-namestore.c:604 src/namestore/gnunet-namestore.c:626
 msgid "add"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:592
+#: src/namestore/gnunet-namestore.c:595
 #, fuzzy, c-format
 msgid "Unsupported type `%s'\n"
 msgstr "未知的命令“%s”。\n"
 
-#: src/namestore/gnunet-namestore.c:612
+#: src/namestore/gnunet-namestore.c:615
 #, c-format
 msgid "Value `%s' invalid for record type `%s'\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:648
+#: src/namestore/gnunet-namestore.c:651
 #, fuzzy, c-format
 msgid "Invalid time format `%s'\n"
 msgstr "IP 格式无效：“%s”\n"
 
-#: src/namestore/gnunet-namestore.c:663
+#: src/namestore/gnunet-namestore.c:666
 msgid "del"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:712
+#: src/namestore/gnunet-namestore.c:715
 #: src/peerinfo-tool/gnunet-peerinfo.c:703
 #, fuzzy, c-format
 msgid "Invalid URI `%s'\n"
 msgstr "无效条目。\n"
 
-#: src/namestore/gnunet-namestore.c:747
+#: src/namestore/gnunet-namestore.c:750
 #, fuzzy, c-format
 msgid "Invalid nick `%s'\n"
 msgstr "无效条目。\n"
 
-#: src/namestore/gnunet-namestore.c:787
+#: src/namestore/gnunet-namestore.c:790
 #, c-format
 msgid "Ego `%s' not known to identity service\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:814
+#: src/namestore/gnunet-namestore.c:817
 #, c-format
 msgid "No default ego configured in identity service\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:847
+#: src/namestore/gnunet-namestore.c:853
 #, fuzzy, c-format
 msgid "Identity service is not running\n"
 msgstr "服务已删除。\n"
 
-#: src/namestore/gnunet-namestore.c:859
+#: src/namestore/gnunet-namestore.c:865
 #, fuzzy, c-format
 msgid "Cannot connect to identity service\n"
 msgstr "无法连接到 %s:%u：%s\n"
 
-#: src/namestore/gnunet-namestore.c:907
+#: src/namestore/gnunet-namestore.c:913
 msgid "add record"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:910
+#: src/namestore/gnunet-namestore.c:916
 msgid "delete record"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:913
+#: src/namestore/gnunet-namestore.c:919
 msgid "display records"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:916
+#: src/namestore/gnunet-namestore.c:922
 msgid ""
 "expiration time for record to use (for adding only), \"never\" is possible"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:919
+#: src/namestore/gnunet-namestore.c:925
 #, fuzzy
 msgid "set the desired nick name for the zone"
 msgstr "无法获取有关用户“%s”的信息：%s\n"
 
-#: src/namestore/gnunet-namestore.c:922
+#: src/namestore/gnunet-namestore.c:928
 #, fuzzy
 msgid "monitor changes in the namestore"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/namestore/gnunet-namestore.c:928
+#: src/namestore/gnunet-namestore.c:934
 #, fuzzy
 msgid "determine our name for the given PKEY"
 msgstr "无法获取有关用户“%s”的信息：%s\n"
 
-#: src/namestore/gnunet-namestore.c:931
+#: src/namestore/gnunet-namestore.c:937
 msgid "type of the record to add/delete/display"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:934
+#: src/namestore/gnunet-namestore.c:940
 msgid "URI to import into our zone"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:937
+#: src/namestore/gnunet-namestore.c:943
 msgid "value of the record to add/delete"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:940
+#: src/namestore/gnunet-namestore.c:946
 msgid "create or list public record"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:943
+#: src/namestore/gnunet-namestore.c:949
 msgid ""
 "create shadow record (only valid if all other records of the same type have "
 "expired"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:946
+#: src/namestore/gnunet-namestore.c:952
 msgid "name of the ego controlling the zone"
 msgstr ""
 
@@ -4865,7 +4870,7 @@ msgstr "初始化“%s”服务失败。\n"
 msgid "GNU Name System First Come First Serve name registration service"
 msgstr ""
 
-#: src/namestore/gnunet-service-namestore.c:634
+#: src/namestore/gnunet-service-namestore.c:638
 #, fuzzy, c-format
 msgid "Failed to replicate block in namecache: %s\n"
 msgstr "发送消息失败。\n"
@@ -4883,86 +4888,86 @@ msgstr ""
 msgid "GNUnet NAT traversal test helper daemon"
 msgstr ""
 
-#: src/nat/nat_auto.c:169
+#: src/nat/nat_auto.c:170
 msgid "NAT traversal with ICMP Server timed out.\n"
 msgstr ""
 
-#: src/nat/nat_auto.c:199
+#: src/nat/nat_auto.c:200
 msgid "NAT traversal with ICMP Server succeeded.\n"
 msgstr ""
 
-#: src/nat/nat_auto.c:200
+#: src/nat/nat_auto.c:201
 msgid "NAT traversal with ICMP Server failed.\n"
 msgstr ""
 
-#: src/nat/nat_auto.c:219
+#: src/nat/nat_auto.c:222
 msgid "Testing connection reversal with ICMP server.\n"
 msgstr ""
 
-#: src/nat/nat_auto.c:265
+#: src/nat/nat_auto.c:269
 #, c-format
 msgid "Detected external IP `%s'\n"
 msgstr ""
 
-#: src/nat/nat_auto.c:331
+#: src/nat/nat_auto.c:339
 msgid "This system has a global IPv6 address, setting IPv6 to supported.\n"
 msgstr ""
 
-#: src/nat/nat_auto.c:347
+#: src/nat/nat_auto.c:355
 #, fuzzy, c-format
 msgid "Detected internal network address `%s'.\n"
 msgstr "GNUnet 现在使用 IP 地址 %s。\n"
 
-#: src/nat/nat_auto.c:400
+#: src/nat/nat_auto.c:408
 msgid "upnpc found, enabling its use\n"
 msgstr ""
 
-#: src/nat/nat_auto.c:401
+#: src/nat/nat_auto.c:409
 msgid "upnpc not found\n"
 msgstr ""
 
-#: src/nat/nat_auto.c:434
+#: src/nat/nat_auto.c:442
 msgid "gnunet-helper-nat-server found, testing it\n"
 msgstr ""
 
-#: src/nat/nat_auto.c:435
+#: src/nat/nat_auto.c:443
 msgid "No working gnunet-helper-nat-server found\n"
 msgstr ""
 
-#: src/nat/nat_auto.c:469
+#: src/nat/nat_auto.c:477
 msgid "gnunet-helper-nat-client found, enabling it\n"
 msgstr ""
 
-#: src/nat/nat_auto.c:470
+#: src/nat/nat_auto.c:478
 msgid "gnunet-helper-nat-client not found or behind NAT, disabling it\n"
 msgstr ""
 
-#: src/nat/nat.c:834
+#: src/nat/nat.c:867
 #, c-format
 msgid "gnunet-helper-nat-server generated malformed address `%s'\n"
 msgstr ""
 
-#: src/nat/nat.c:883
+#: src/nat/nat.c:917
 #, fuzzy, c-format
 msgid "Failed to start %s\n"
 msgstr "运行 %s失败：%s %d\n"
 
-#: src/nat/nat.c:1152
+#: src/nat/nat.c:1203
 msgid "malformed"
 msgstr ""
 
-#: src/nat/nat.c:1218 src/nat/nat.c:1230
+#: src/nat/nat.c:1274 src/nat/nat.c:1286
 #, c-format
 msgid ""
 "Configuration requires `%s', but binary is not installed properly (SUID bit "
 "not set).  Option disabled.\n"
 msgstr ""
 
-#: src/nat/nat.c:1365
+#: src/nat/nat.c:1424
 msgid "Internal IP address not known, cannot use ICMP NAT traversal method\n"
 msgstr ""
 
-#: src/nat/nat.c:1376
+#: src/nat/nat.c:1440
 #, c-format
 msgid "Running gnunet-helper-nat-client %s %s %u\n"
 msgstr ""
@@ -4975,11 +4980,11 @@ msgstr ""
 msgid "`upnpc' command not found\n"
 msgstr ""
 
-#: src/nat/nat_test.c:345
+#: src/nat/nat_test.c:348
 msgid "Failed to connect to `gnunet-nat-server'\n"
 msgstr ""
 
-#: src/nat/nat_test.c:414
+#: src/nat/nat_test.c:420
 #, c-format
 msgid "Failed to create listen socket bound to `%s' for NAT test: %s\n"
 msgstr ""
@@ -5034,36 +5039,37 @@ msgid "Failed to parse HELLO in file `%s': %s\n"
 msgstr "解析配置文件“%s”失败\n"
 
 #: src/peerinfo/gnunet-service-peerinfo.c:373
+#: src/peerinfo/gnunet-service-peerinfo.c:390
 #, fuzzy, c-format
-msgid "Failed to parse HELLO in file `%s': %s %u \n"
+msgid "Failed to parse HELLO in file `%s'\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/peerinfo/gnunet-service-peerinfo.c:457
+#: src/peerinfo/gnunet-service-peerinfo.c:468
 msgid "# peers known"
 msgstr ""
 
-#: src/peerinfo/gnunet-service-peerinfo.c:494
+#: src/peerinfo/gnunet-service-peerinfo.c:505
 #, c-format
 msgid ""
 "File `%s' in directory `%s' does not match naming convention. Removed.\n"
 msgstr ""
 
-#: src/peerinfo/gnunet-service-peerinfo.c:644
+#: src/peerinfo/gnunet-service-peerinfo.c:655
 #, fuzzy, c-format
 msgid "Scanning directory `%s'\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/peerinfo/gnunet-service-peerinfo.c:649
+#: src/peerinfo/gnunet-service-peerinfo.c:660
 #, c-format
 msgid "Still no peers found in `%s'!\n"
 msgstr ""
 
-#: src/peerinfo/gnunet-service-peerinfo.c:985
+#: src/peerinfo/gnunet-service-peerinfo.c:996
 #, fuzzy, c-format
 msgid "Cleaning up directory `%s'\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/peerinfo/gnunet-service-peerinfo.c:1275
+#: src/peerinfo/gnunet-service-peerinfo.c:1286
 #, c-format
 msgid "Importing HELLOs from `%s'\n"
 msgstr ""
@@ -5187,19 +5193,19 @@ msgid "Print information about peers."
 msgstr "无法获取有关用户“%s”的信息：%s\n"
 
 #: src/peerinfo-tool/gnunet-peerinfo_plugins.c:105
-#: src/transport/gnunet-service-transport_plugins.c:123
+#: src/transport/gnunet-service-transport_plugins.c:124
 #, c-format
 msgid "Starting transport plugins `%s'\n"
 msgstr ""
 
 #: src/peerinfo-tool/gnunet-peerinfo_plugins.c:109
-#: src/transport/gnunet-service-transport_plugins.c:127
+#: src/transport/gnunet-service-transport_plugins.c:129
 #, c-format
 msgid "Loading `%s' transport plugin\n"
 msgstr ""
 
 #: src/peerinfo-tool/gnunet-peerinfo_plugins.c:129
-#: src/transport/gnunet-service-transport_plugins.c:157
+#: src/transport/gnunet-service-transport_plugins.c:159
 #, fuzzy, c-format
 msgid "Failed to load transport plugin for `%s'\n"
 msgstr "解析配置文件“%s”失败\n"
@@ -5459,6 +5465,11 @@ msgstr ""
 msgid "Profiler for regex library"
 msgstr ""
 
+#: src/regex/regex_api.c:131
+#, fuzzy, c-format
+msgid "Regex `%s' is too long!\n"
+msgstr "服务已删除。\n"
+
 #: src/revocation/gnunet-revocation.c:121
 #, c-format
 msgid "Key `%s' is valid\n"
@@ -5806,7 +5817,7 @@ msgstr "初始化“%s”服务失败。\n"
 msgid "Failed to send a message to the scalarproduct service\n"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/set/gnunet-service-set.c:1399
+#: src/set/gnunet-service-set.c:1400
 #, fuzzy
 msgid "Could not connect to mesh service\n"
 msgstr "无法连接到 %s:%u：%s\n"
@@ -5927,12 +5938,12 @@ msgstr ""
 msgid "Print statistics about GNUnet operations."
 msgstr ""
 
-#: src/statistics/statistics_api.c:509
+#: src/statistics/statistics_api.c:506
 #, fuzzy
 msgid "Could not save some persistent statistics\n"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/statistics/statistics_api.c:1054
+#: src/statistics/statistics_api.c:1074
 msgid ""
 "Failed to receive acknowledgement from statistics service, some statistics "
 "might have been lost!\n"
@@ -6299,31 +6310,31 @@ msgstr ""
 msgid "# disconnects due to blacklist"
 msgstr ""
 
-#: src/transport/gnunet-service-transport.c:160
+#: src/transport/gnunet-service-transport.c:206
 msgid "# bytes payload discarded due to not connected peer"
 msgstr ""
 
-#: src/transport/gnunet-service-transport.c:250
+#: src/transport/gnunet-service-transport.c:325
 msgid "# bytes total received"
 msgstr ""
 
-#: src/transport/gnunet-service-transport.c:325
+#: src/transport/gnunet-service-transport.c:399
 msgid "# bytes payload received"
 msgstr ""
 
-#: src/transport/gnunet-service-transport.c:479
+#: src/transport/gnunet-service-transport.c:574
 #, fuzzy, c-format
-msgid "Could not obtain a valid network for `%s' %s\n"
+msgid "Could not obtain a valid network for `%s' %s (%s)\n"
 msgstr "无法利用“%2$s”获取接口“%1$s”的 IP。\n"
 
-#: src/transport/gnunet-service-transport.c:529
+#: src/transport/gnunet-service-transport.c:628
 #, 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:820
+#: src/transport/gnunet-service-transport.c:916
 #, fuzzy
 msgid "Transport service is lacking key configuration settings. Exiting.\n"
 msgstr "立即保存配置？"
@@ -6354,135 +6365,143 @@ msgstr ""
 msgid "# refreshed my HELLO"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1074
+#: src/transport/gnunet-service-transport_neighbours.c:1108
 msgid "# DISCONNECT messages sent"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1206
-#: src/transport/gnunet-service-transport_neighbours.c:1541
+#: src/transport/gnunet-service-transport_neighbours.c:1244
+#: src/transport/gnunet-service-transport_neighbours.c:1653
 msgid "# bytes in message queue for other peers"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1211
+#: src/transport/gnunet-service-transport_neighbours.c:1249
 msgid "# messages transmitted to other peers"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1216
+#: src/transport/gnunet-service-transport_neighbours.c:1254
 msgid "# transmission failures for messages to other peers"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1273
+#: src/transport/gnunet-service-transport_neighbours.c:1311
 msgid "# messages timed out while in transport queue"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1315
+#: src/transport/gnunet-service-transport_neighbours.c:1368
 msgid "# keepalives sent"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1339
+#: src/transport/gnunet-service-transport_neighbours.c:1401
 msgid "# KEEPALIVE messages discarded (peer unknown)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1347
+#: src/transport/gnunet-service-transport_neighbours.c:1409
 msgid "# KEEPALIVE messages discarded (no session)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1380
+#: src/transport/gnunet-service-transport_neighbours.c:1456
 msgid "# KEEPALIVE_RESPONSE messages discarded (not connected)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1389
+#: src/transport/gnunet-service-transport_neighbours.c:1465
 msgid "# KEEPALIVE_RESPONSE messages discarded (not expected)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1446
+#: src/transport/gnunet-service-transport_neighbours.c:1473
+msgid "# KEEPALIVE_RESPONSE messages discarded (address changed)"
+msgstr ""
+
+#: src/transport/gnunet-service-transport_neighbours.c:1481
+msgid "# KEEPALIVE_RESPONSE messages discarded (wrong nonce)"
+msgstr ""
+
+#: src/transport/gnunet-service-transport_neighbours.c:1558
 msgid "# messages discarded due to lack of neighbour record"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1480
+#: src/transport/gnunet-service-transport_neighbours.c:1592
 msgid "# bandwidth quota violations by other peers"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1496
+#: src/transport/gnunet-service-transport_neighbours.c:1608
 msgid "# ms throttling suggested"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1585
+#: src/transport/gnunet-service-transport_neighbours.c:1700
 msgid "# SESSION_CONNECT messages sent"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1601
+#: src/transport/gnunet-service-transport_neighbours.c:1716
 #, 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
+#: src/transport/gnunet-service-transport_neighbours.c:1759
 msgid "# CONNECT_ACK messages sent"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:2106
+#: src/transport/gnunet-service-transport_neighbours.c:2236
 msgid "# CONNECT messages received"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:2111
+#: src/transport/gnunet-service-transport_neighbours.c:2241
 #, c-format
 msgid "CONNECT request from peer `%s' ignored due impending shutdown\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:2824
+#: src/transport/gnunet-service-transport_neighbours.c:2979
 msgid "# CONNECT_ACK messages received"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:2832
+#: src/transport/gnunet-service-transport_neighbours.c:2987
 msgid "# unexpected CONNECT_ACK messages (no peer)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:2847
-#: src/transport/gnunet-service-transport_neighbours.c:2882
+#: src/transport/gnunet-service-transport_neighbours.c:3002
+#: src/transport/gnunet-service-transport_neighbours.c:3039
 msgid "# unexpected CONNECT_ACK messages (not ready)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:2895
+#: src/transport/gnunet-service-transport_neighbours.c:3052
 msgid "# unexpected CONNECT_ACK messages (waiting on ATS)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:2926
+#: src/transport/gnunet-service-transport_neighbours.c:3085
 msgid "# unexpected CONNECT_ACK messages (disconnecting)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3106
+#: src/transport/gnunet-service-transport_neighbours.c:3265
 msgid "# SESSION_ACK messages received"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3122
+#: src/transport/gnunet-service-transport_neighbours.c:3284
 msgid "# unexpected SESSION_ACK messages"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3176
+#: src/transport/gnunet-service-transport_neighbours.c:3340
 msgid "# SET QUOTA messages ignored (no such peer)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3190
+#: src/transport/gnunet-service-transport_neighbours.c:3355
 msgid "# disconnects due to quota of 0"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3220
+#: src/transport/gnunet-service-transport_neighbours.c:3383
 msgid "# disconnect messages ignored (old format)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3226
+#: src/transport/gnunet-service-transport_neighbours.c:3389
 msgid "# DISCONNECT messages received"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3235
+#: src/transport/gnunet-service-transport_neighbours.c:3398
 msgid "# disconnect messages ignored (timestamp)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3271
+#: src/transport/gnunet-service-transport_neighbours.c:3434
 msgid "# other peer asked to disconnect from us"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3366
+#: src/transport/gnunet-service-transport_neighbours.c:3532
 msgid "# disconnected from peer upon explicit request"
 msgstr ""
 
@@ -6490,20 +6509,22 @@ msgstr ""
 msgid "Transport service is lacking NEIGHBOUR_LIMIT option.\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_plugins.c:170
-#: src/transport/gnunet-service-transport_plugins.c:178
-#: src/transport/gnunet-service-transport_plugins.c:186
-#: src/transport/gnunet-service-transport_plugins.c:194
-#: src/transport/gnunet-service-transport_plugins.c:202
-#: 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
+#: src/transport/gnunet-service-transport_plugins.c:172
+#: src/transport/gnunet-service-transport_plugins.c:180
+#: src/transport/gnunet-service-transport_plugins.c:188
+#: src/transport/gnunet-service-transport_plugins.c:196
+#: src/transport/gnunet-service-transport_plugins.c:204
+#: src/transport/gnunet-service-transport_plugins.c:212
+#: src/transport/gnunet-service-transport_plugins.c:220
+#: src/transport/gnunet-service-transport_plugins.c:228
+#: src/transport/gnunet-service-transport_plugins.c:236
+#: src/transport/gnunet-service-transport_plugins.c:244
+#: src/transport/gnunet-service-transport_plugins.c:252
 #, fuzzy, c-format
 msgid "Missing function `%s' in transport plugin for `%s'\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/transport/gnunet-service-transport_plugins.c:241
+#: src/transport/gnunet-service-transport_plugins.c:259
 #, c-format
 msgid "Did not load plugin `%s' due to missing functions\n"
 msgstr ""
@@ -6747,7 +6768,7 @@ msgstr ""
 
 #: src/transport/plugin_transport_bluetooth.c:681
 #: src/transport/plugin_transport_bluetooth.c:731
-#: src/transport/plugin_transport_bluetooth.c:1854
+#: src/transport/plugin_transport_bluetooth.c:1881
 msgid "# Bluetooth sessions allocated"
 msgstr ""
 
@@ -6761,175 +6782,175 @@ msgstr ""
 
 #: src/transport/plugin_transport_bluetooth.c:938
 #: src/transport/plugin_transport_bluetooth.c:1023
-#: src/transport/plugin_transport_bluetooth.c:1856
+#: src/transport/plugin_transport_bluetooth.c:1883
 msgid "# Bluetooth MAC endpoints allocated"
 msgstr ""
 
-#: src/transport/plugin_transport_bluetooth.c:1235
+#: src/transport/plugin_transport_bluetooth.c:1250
 msgid "# HELLO messages received via Bluetooth"
 msgstr ""
 
-#: src/transport/plugin_transport_bluetooth.c:1261
+#: src/transport/plugin_transport_bluetooth.c:1276
 msgid "# fragments received via Bluetooth"
 msgstr ""
 
-#: src/transport/plugin_transport_bluetooth.c:1271
+#: src/transport/plugin_transport_bluetooth.c:1286
 msgid "# ACKs received via Bluetooth"
 msgstr ""
 
-#: src/transport/plugin_transport_bluetooth.c:1328
+#: src/transport/plugin_transport_bluetooth.c:1343
 msgid "# Bluetooth DATA messages discarded due to CRC32 error"
 msgstr ""
 
-#: src/transport/plugin_transport_bluetooth.c:1440
+#: src/transport/plugin_transport_bluetooth.c:1455
 msgid "# DATA messages received via Bluetooth"
 msgstr ""
 
-#: src/transport/plugin_transport_bluetooth.c:1475
+#: src/transport/plugin_transport_bluetooth.c:1490
 msgid "# Bluetooth DATA messages processed"
 msgstr ""
 
-#: src/transport/plugin_transport_bluetooth.c:1538
+#: src/transport/plugin_transport_bluetooth.c:1553
 msgid "# HELLO beacons sent via Bluetooth"
 msgstr ""
 
-#: src/transport/plugin_transport_bluetooth.c:1651
+#: src/transport/plugin_transport_bluetooth.c:1666
 msgid "Bluetooth address with invalid size encountered\n"
 msgstr ""
 
-#: src/transport/plugin_transport_bluetooth.c:1835
+#: src/transport/plugin_transport_bluetooth.c:1862
 #, c-format
 msgid "Helper binary `%s' not SUID, cannot run bluetooth transport\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_client.c:1590
+#: src/transport/plugin_transport_http_client.c:1618
 #, c-format
 msgid "Could not initialize curl multi handle, failed to start %s plugin!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_client.c:1727
-#: src/transport/plugin_transport_http_server.c:2974
+#: src/transport/plugin_transport_http_client.c:1693
+#: src/transport/plugin_transport_http_server.c:3001
 #, fuzzy, c-format
 msgid "Shutting down plugin `%s'\n"
 msgstr "未知的命令“%s”。\n"
 
-#: src/transport/plugin_transport_http_client.c:1752
-#: src/transport/plugin_transport_http_server.c:3032
+#: src/transport/plugin_transport_http_client.c:1718
+#: src/transport/plugin_transport_http_server.c:3059
 #, c-format
 msgid "Shutdown for plugin `%s' complete\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_client.c:1780
-#: src/transport/plugin_transport_http_server.c:2874
+#: src/transport/plugin_transport_http_client.c:1746
+#: src/transport/plugin_transport_http_server.c:2901
 #, fuzzy, c-format
 msgid "Maximum number of connections is %u\n"
 msgstr "增加 TCP/IP 的最大连接数"
 
-#: src/transport/plugin_transport_http_server.c:1389
+#: src/transport/plugin_transport_http_server.c:1416
 #, 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:1653
+#: src/transport/plugin_transport_http_server.c:1680
 #, c-format
 msgid "Accepting connection (%u of %u) from `%s'\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:1661
+#: src/transport/plugin_transport_http_server.c:1688
 #, c-format
 msgid ""
 "Server reached maximum number connections (%u), rejecting new connection\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:1947
+#: src/transport/plugin_transport_http_server.c:1974
 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:1971
+#: src/transport/plugin_transport_http_server.c:1998
 #, c-format
 msgid "No usable TLS certificate found and creating one at `%s/%s' failed!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:2378
+#: src/transport/plugin_transport_http_server.c:2405
 #, 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
+#: src/transport/plugin_transport_http_server.c:2437 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
+#: src/transport/plugin_transport_http_server.c:2454 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
+#: src/transport/plugin_transport_http_server.c:2565
 #, c-format
 msgid "Found %u addresses to report to NAT service\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:2610
+#: src/transport/plugin_transport_http_server.c:2637
 msgid "Disabling IPv6 since it is not supported on this system!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:2697
+#: src/transport/plugin_transport_http_server.c:2724
 #, c-format
 msgid "IPv4 support is %s\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:2711
+#: src/transport/plugin_transport_http_server.c:2738
 #, c-format
 msgid "IPv6 support is %s\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:2718
+#: src/transport/plugin_transport_http_server.c:2745
 msgid "Neither IPv4 nor IPv6 are enabled! Fix in configuration\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:2729
+#: src/transport/plugin_transport_http_server.c:2756
 #, fuzzy
 msgid "Port is required! Fix in configuration\n"
 msgstr ""
 "\n"
 "结束配置。\n"
 
-#: src/transport/plugin_transport_http_server.c:2736
+#: src/transport/plugin_transport_http_server.c:2763
 #, c-format
 msgid "Using port %u\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:2751
+#: src/transport/plugin_transport_http_server.c:2778
 #, c-format
 msgid "Specific IPv4 address `%s' in configuration file is invalid!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:2761
+#: src/transport/plugin_transport_http_server.c:2788
 #, fuzzy, c-format
 msgid "Binding to IPv4 address %s\n"
 msgstr "无效的进程优先级“%s”\n"
 
-#: src/transport/plugin_transport_http_server.c:2782
+#: src/transport/plugin_transport_http_server.c:2809
 #, c-format
 msgid "Specific IPv6 address `%s' in configuration file is invalid!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:2792
+#: src/transport/plugin_transport_http_server.c:2819
 #, fuzzy, c-format
 msgid "Binding to IPv6 address %s\n"
 msgstr "无效的进程优先级“%s”\n"
 
-#: src/transport/plugin_transport_http_server.c:2844
+#: src/transport/plugin_transport_http_server.c:2871
 #, fuzzy, c-format
 msgid "Using external hostname `%s'\n"
 msgstr "卸载 GNUnet 服务"
 
-#: src/transport/plugin_transport_http_server.c:2860
+#: src/transport/plugin_transport_http_server.c:2887
 #, c-format
 msgid "Notifying transport only about hostname `%s'\n"
 msgstr ""
@@ -6976,62 +6997,62 @@ msgstr ""
 msgid "# bytes dropped by SMTP (outgoing)"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:632
+#: src/transport/plugin_transport_tcp.c:576
 #, c-format
 msgid "Unexpected address length: %u bytes\n"
 msgstr ""
 
-#: 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
+#: src/transport/plugin_transport_tcp.c:799
+#: src/transport/plugin_transport_tcp.c:979
+#: src/transport/plugin_transport_tcp.c:2120
+#: src/transport/plugin_transport_tcp.c:2723
+msgid "# TCP sessions active"
+msgstr ""
+
+#: src/transport/plugin_transport_tcp.c:835
+#: src/transport/plugin_transport_tcp.c:972
+#: src/transport/plugin_transport_tcp.c:1061
+#: src/transport/plugin_transport_tcp.c:1111
+#: src/transport/plugin_transport_tcp.c:1290
+#: src/transport/plugin_transport_tcp.c:1309
 msgid "# bytes currently in TCP buffers"
 msgstr ""
 
-#: 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"
+#: src/transport/plugin_transport_tcp.c:839
+msgid "# bytes discarded by TCP (disconnect)"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:935
+#: src/transport/plugin_transport_tcp.c:1065
 msgid "# bytes discarded by TCP (timeout)"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:984
+#: src/transport/plugin_transport_tcp.c:1114
 msgid "# bytes transmitted via TCP"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:1081
-msgid "# bytes discarded by TCP (disconnect)"
-msgstr ""
-
-#: src/transport/plugin_transport_tcp.c:1199
+#: src/transport/plugin_transport_tcp.c:1263
 #, c-format
 msgid "Trying to send with invalid session %p\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:1440
-#: src/transport/plugin_transport_udp.c:1471
+#: src/transport/plugin_transport_tcp.c:1520
+#: src/transport/plugin_transport_udp.c:1488
 msgid "# requests to create session with invalid address"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:1558
+#: src/transport/plugin_transport_tcp.c:1645
 msgid "# transport-service disconnect requests for TCP"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2091
+#: src/transport/plugin_transport_tcp.c:2170
 msgid "# TCP WELCOME messages received"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2274
+#: src/transport/plugin_transport_tcp.c:2355
 msgid "# bytes received via TCP"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2354
+#: src/transport/plugin_transport_tcp.c:2433
 msgid "# network-level TCP disconnect events"
 msgstr ""
 
@@ -7046,16 +7067,16 @@ msgstr ""
 msgid "Failed to start service.\n"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/transport/plugin_transport_tcp.c:2710
+#: src/transport/plugin_transport_tcp.c:2712
 #, c-format
 msgid "TCP transport listening on port %llu\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2713
+#: src/transport/plugin_transport_tcp.c:2715
 msgid "TCP transport not listening on any port (client only)\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2716
+#: src/transport/plugin_transport_tcp.c:2718
 #, c-format
 msgid "TCP transport advertises itself as being on port %llu\n"
 msgstr ""
@@ -7068,57 +7089,57 @@ msgstr ""
 msgid "# IPv4 broadcast HELLO beacons received via udp"
 msgstr ""
 
-#: src/transport/plugin_transport_udp_broadcasting.c:605
+#: src/transport/plugin_transport_udp_broadcasting.c:606
 msgid ""
 "Disabling HELLO broadcasting due to friend-to-friend only configuration!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_udp_broadcasting.c:619
+#: src/transport/plugin_transport_udp_broadcasting.c:629
 #, c-format
 msgid "Failed to set IPv4 broadcast option for broadcast socket on port %d\n"
 msgstr ""
 
-#: src/transport/plugin_transport_udp.c:1581
+#: src/transport/plugin_transport_udp.c:1599
 #, 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:2635
+#: src/transport/plugin_transport_udp.c:2680
 #, 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:2649
+#: src/transport/plugin_transport_udp.c:2694
 msgid ""
 "UDP could not transmit IPv6 message! Please check your network configuration "
 "and disable IPv6 if your connection does not have a global IPv6 address\n"
 msgstr ""
 
-#: src/transport/plugin_transport_udp.c:2949
+#: src/transport/plugin_transport_udp.c:2993
 #, fuzzy
 msgid "Failed to open UDP sockets\n"
 msgstr "打开日志文件“%s”失败：%s\n"
 
-#: src/transport/plugin_transport_udp.c:3046
+#: src/transport/plugin_transport_udp.c:3091
 #, c-format
 msgid "Given `%s' option is out of range: %llu > %u\n"
 msgstr ""
 
-#: src/transport/plugin_transport_udp.c:3089
+#: src/transport/plugin_transport_udp.c:3134
 #, fuzzy, c-format
 msgid "Invalid IPv6 address: `%s'\n"
 msgstr "无效的进程优先级“%s”\n"
 
-#: src/transport/plugin_transport_udp.c:3148
+#: src/transport/plugin_transport_udp.c:3200
 #, fuzzy
 msgid "Failed to create network sockets, plugin failed\n"
 msgstr "发送消息失败。\n"
 
-#: src/transport/plugin_transport_unix.c:1625
+#: src/transport/plugin_transport_unix.c:1657
 #, fuzzy
 msgid "Failed to open UNIX listen socket\n"
 msgstr "打开日志文件“%s”失败：%s\n"
@@ -7132,63 +7153,63 @@ msgid "# WLAN messages defragmented"
 msgstr ""
 
 #: src/transport/plugin_transport_wlan.c:691
-#: src/transport/plugin_transport_wlan.c:763
-#: src/transport/plugin_transport_wlan.c:1910
+#: src/transport/plugin_transport_wlan.c:778
+#: src/transport/plugin_transport_wlan.c:1937
 msgid "# WLAN sessions allocated"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:868
+#: src/transport/plugin_transport_wlan.c:883
 msgid "# WLAN message fragments sent"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:892
+#: src/transport/plugin_transport_wlan.c:907
 msgid "# WLAN messages pending (with fragmentation)"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:1000
-#: src/transport/plugin_transport_wlan.c:1086
-#: src/transport/plugin_transport_wlan.c:1912
+#: src/transport/plugin_transport_wlan.c:1015
+#: src/transport/plugin_transport_wlan.c:1101
+#: src/transport/plugin_transport_wlan.c:1939
 msgid "# WLAN MAC endpoints allocated"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:1282
+#: src/transport/plugin_transport_wlan.c:1297
 msgid "# HELLO messages received via WLAN"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:1308
+#: src/transport/plugin_transport_wlan.c:1323
 msgid "# fragments received via WLAN"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:1318
+#: src/transport/plugin_transport_wlan.c:1333
 msgid "# ACKs received via WLAN"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:1375
+#: src/transport/plugin_transport_wlan.c:1390
 msgid "# WLAN DATA messages discarded due to CRC32 error"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:1496
+#: src/transport/plugin_transport_wlan.c:1511
 msgid "# DATA messages received via WLAN"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:1531
+#: src/transport/plugin_transport_wlan.c:1546
 msgid "# WLAN DATA messages processed"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:1594
+#: src/transport/plugin_transport_wlan.c:1609
 msgid "# HELLO beacons sent via WLAN"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:1707
+#: src/transport/plugin_transport_wlan.c:1722
 msgid "WLAN address with invalid size encountered\n"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:1891
+#: src/transport/plugin_transport_wlan.c:1918
 #, c-format
 msgid "Helper binary `%s' not SUID, cannot run WLAN transport\n"
 msgstr ""
 
-#: src/transport/transport_api.c:682
+#: src/transport/transport_api.c:690
 #, c-format
 msgid "Received unexpected message of type %u in %s:%u\n"
 msgstr ""
@@ -7232,12 +7253,12 @@ msgstr ""
 msgid "Metadata `%s' failed to deserialize"
 msgstr ""
 
-#: src/util/client.c:261 src/util/client.c:851 src/util/service.c:625
+#: src/util/client.c:261 src/util/client.c:857 src/util/service.c:625
 #, c-format
 msgid "UNIXPATH `%s' too long, maximum length is %llu\n"
 msgstr ""
 
-#: src/util/client.c:265 src/util/client.c:856 src/util/service.c:629
+#: src/util/client.c:265 src/util/client.c:862 src/util/service.c:629
 #, fuzzy, c-format
 msgid "Using `%s' instead\n"
 msgstr "%s：选项“%s”有歧义\n"
@@ -7254,17 +7275,17 @@ msgstr ""
 msgid "Need a non-empty hostname for service `%s'.\n"
 msgstr ""
 
-#: src/util/client.c:989
+#: src/util/client.c:995
 #, fuzzy, c-format
 msgid "Could not connect to service `%s', configuration broken.\n"
 msgstr "无法连接到 %s:%u：%s\n"
 
-#: src/util/client.c:1001
+#: src/util/client.c:1007
 #, c-format
 msgid "Failure to transmit request to service `%s'\n"
 msgstr ""
 
-#: src/util/client.c:1284
+#: src/util/client.c:1290
 msgid "Could not submit request, not expecting to receive a response.\n"
 msgstr ""
 
@@ -7376,7 +7397,7 @@ msgstr "无法连接到 %s:%u：%s\n"
 msgid "Attempt to connect to `%s' failed\n"
 msgstr ""
 
-#: src/util/container_bloomfilter.c:516
+#: src/util/container_bloomfilter.c:531
 #, c-format
 msgid ""
 "Size of file on disk is incorrect for this Bloom filter (want %llu, have "
@@ -7642,13 +7663,13 @@ msgstr ""
 msgid "Use build-in GNUnet stub resolver"
 msgstr ""
 
-#: src/util/gnunet-service-resolver.c:288
+#: src/util/gnunet-service-resolver.c:283
 #, c-format
 msgid "Could not resolve `%s' (%s): %s\n"
 msgstr "无法解析“%s”(%s)：%s\n"
 
-#: src/util/gnunet-service-resolver.c:358
-#: src/util/gnunet-service-resolver.c:399
+#: src/util/gnunet-service-resolver.c:350
+#: src/util/gnunet-service-resolver.c:391
 #, c-format
 msgid "Could not find IP of host `%s': %s\n"
 msgstr "找不到主机“%s”的 IP：%s\n"
@@ -7697,7 +7718,7 @@ msgstr "创建用户出错"
 msgid "Unable to shorten unix path `%s' while keeping name unique\n"
 msgstr ""
 
-#: src/util/network.c:1397
+#: src/util/network.c:1344 src/util/network.c:1469
 #, c-format
 msgid ""
 "Fatal internal logic error, process hangs in `%s' (abort with CTRL-C)!\n"
@@ -7745,17 +7766,17 @@ msgstr ""
 msgid "Could not determine plugin installation path.\n"
 msgstr "无法确定用户界面定义文件。"
 
-#: src/util/program.c:260 src/util/service.c:1449
+#: src/util/program.c:262 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
+#: src/util/program.c:274 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
+#: src/util/program.c:279 src/util/service.c:1459
 #, fuzzy
 msgid "Malformed configuration, exit ...\n"
 msgstr "解析配置文件“%s”失败\n"
@@ -7913,114 +7934,114 @@ msgstr ""
 msgid "b"
 msgstr "b"
 
-#: src/util/strings.c:450
+#: src/util/strings.c:452
 #, c-format
 msgid "Character sets requested were `%s'->`%s'\n"
 msgstr ""
 
-#: src/util/strings.c:578
+#: src/util/strings.c:580
 msgid "Failed to expand `$HOME': environment variable `HOME' not set"
 msgstr "扩展“$HOME”失败：没有设置环境变量“HOME”"
 
-#: src/util/strings.c:675
+#: src/util/strings.c:677
 msgid "µs"
 msgstr ""
 
-#: src/util/strings.c:679
+#: src/util/strings.c:681
 msgid "forever"
 msgstr ""
 
-#: src/util/strings.c:681
+#: src/util/strings.c:683
 msgid "0 ms"
 msgstr ""
 
-#: src/util/strings.c:687
+#: src/util/strings.c:689
 msgid "ms"
 msgstr "毫秒"
 
-#: src/util/strings.c:693
+#: src/util/strings.c:695
 msgid "s"
 msgstr "秒"
 
-#: src/util/strings.c:699
+#: src/util/strings.c:701
 msgid "m"
 msgstr "分"
 
-#: src/util/strings.c:705
+#: src/util/strings.c:707
 msgid "h"
 msgstr "时"
 
-#: src/util/strings.c:712
+#: src/util/strings.c:714
 #, fuzzy
 msgid "day"
 msgstr " 天"
 
-#: src/util/strings.c:714
+#: src/util/strings.c:716
 #, fuzzy
 msgid "days"
 msgstr " 天"
 
-#: src/util/strings.c:743
+#: src/util/strings.c:745
 msgid "end of time"
 msgstr ""
 
-#: src/util/strings.c:1149
+#: src/util/strings.c:1178
 msgid "IPv6 address did not start with `['\n"
 msgstr ""
 
-#: src/util/strings.c:1157
+#: src/util/strings.c:1186
 msgid "IPv6 address did contain ':' to separate port number\n"
 msgstr ""
 
-#: src/util/strings.c:1163
+#: src/util/strings.c:1192
 msgid "IPv6 address did contain ']' before ':' to separate port number\n"
 msgstr ""
 
-#: src/util/strings.c:1170
+#: src/util/strings.c:1199
 msgid "IPv6 address did contain a valid port number after the last ':'\n"
 msgstr ""
 
-#: src/util/strings.c:1179
+#: src/util/strings.c:1208
 #, fuzzy, c-format
 msgid "Invalid IPv6 address `%s': %s\n"
 msgstr "无效的进程优先级“%s”\n"
 
-#: src/util/strings.c:1385 src/util/strings.c:1401
+#: src/util/strings.c:1414 src/util/strings.c:1430
 msgid "Port not in range\n"
 msgstr ""
 
-#: src/util/strings.c:1410
+#: src/util/strings.c:1439
 #, fuzzy, c-format
 msgid "Malformed port policy `%s'\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/util/strings.c:1493 src/util/strings.c:1524 src/util/strings.c:1572
-#: src/util/strings.c:1593
+#: src/util/strings.c:1522 src/util/strings.c:1553 src/util/strings.c:1601
+#: src/util/strings.c:1622
 #, c-format
 msgid "Invalid format for IP: `%s'\n"
 msgstr "IP 格式无效：“%s”\n"
 
-#: src/util/strings.c:1550
+#: src/util/strings.c:1579
 #, c-format
 msgid "Invalid network notation ('/%d' is not legal in IPv4 CIDR)."
 msgstr "网络表示法无效(“/%d” 在 IPv4 CIDR 中是非法的)。"
 
-#: src/util/strings.c:1602
+#: src/util/strings.c:1631
 #, fuzzy, c-format
 msgid "Invalid format: `%s'\n"
 msgstr "IP 格式无效：“%s”\n"
 
-#: src/util/strings.c:1654
+#: src/util/strings.c:1683
 #, c-format
 msgid "Invalid network notation (does not end with ';': `%s')\n"
 msgstr "无效的网络表示法(没有以“;”结尾：“%s”)\n"
 
-#: src/util/strings.c:1704
+#: src/util/strings.c:1733
 #, c-format
 msgid "Wrong format `%s' for netmask\n"
 msgstr "网络掩码的格式“%s”错误\n"
 
-#: src/util/strings.c:1735
+#: src/util/strings.c:1764
 #, c-format
 msgid "Wrong format `%s' for network\n"
 msgstr "网络的格式“%s”错误\n"
@@ -8134,69 +8155,69 @@ msgstr ""
 msgid "IPv4 support disabled as this system does not support IPv4\n"
 msgstr ""
 
-#: src/vpn/gnunet-vpn.c:146
+#: src/vpn/gnunet-vpn.c:147
 #, fuzzy
 msgid "Error creating tunnel\n"
 msgstr "创建用户出错"
 
-#: src/vpn/gnunet-vpn.c:189 src/vpn/gnunet-vpn.c:220
+#: src/vpn/gnunet-vpn.c:190 src/vpn/gnunet-vpn.c:221
 #, c-format
 msgid "Option `%s' makes no sense with option `%s'.\n"
 msgstr ""
 
-#: src/vpn/gnunet-vpn.c:202
+#: src/vpn/gnunet-vpn.c:203
 #, fuzzy, c-format
 msgid "Option `%s' or `%s' is required.\n"
 msgstr "%s：选项“%s”有歧义\n"
 
-#: src/vpn/gnunet-vpn.c:214
+#: src/vpn/gnunet-vpn.c:215
 #, c-format
 msgid "Option `%s' or `%s' is required when using option `%s'.\n"
 msgstr ""
 
-#: src/vpn/gnunet-vpn.c:233
+#: src/vpn/gnunet-vpn.c:235
 #, fuzzy, c-format
 msgid "`%s' is not a valid peer identifier.\n"
 msgstr "“%s”不可用。\n"
 
-#: src/vpn/gnunet-vpn.c:254
+#: src/vpn/gnunet-vpn.c:255
 #, fuzzy, c-format
 msgid "`%s' is not a valid IP address.\n"
 msgstr "“%s”不可用。\n"
 
-#: src/vpn/gnunet-vpn.c:289
+#: src/vpn/gnunet-vpn.c:290
 msgid "request that result should be an IPv4 address"
 msgstr ""
 
-#: src/vpn/gnunet-vpn.c:292
+#: src/vpn/gnunet-vpn.c:293
 msgid "request that result should be an IPv6 address"
 msgstr ""
 
-#: src/vpn/gnunet-vpn.c:295
+#: src/vpn/gnunet-vpn.c:296
 msgid "how long should the mapping be valid for new tunnels?"
 msgstr ""
 
-#: src/vpn/gnunet-vpn.c:298
+#: src/vpn/gnunet-vpn.c:299
 msgid "destination IP for the tunnel"
 msgstr ""
 
-#: src/vpn/gnunet-vpn.c:301
+#: src/vpn/gnunet-vpn.c:302
 msgid "peer offering the service we would like to access"
 msgstr ""
 
-#: src/vpn/gnunet-vpn.c:304
+#: src/vpn/gnunet-vpn.c:305
 msgid "name of the service we would like to access"
 msgstr ""
 
-#: src/vpn/gnunet-vpn.c:307
+#: src/vpn/gnunet-vpn.c:308
 msgid "service is offered via TCP"
 msgstr ""
 
-#: src/vpn/gnunet-vpn.c:310
+#: src/vpn/gnunet-vpn.c:311
 msgid "service is offered via UDP"
 msgstr ""
 
-#: src/vpn/gnunet-vpn.c:322
+#: src/vpn/gnunet-vpn.c:323
 msgid "Setup tunnels via VPN."
 msgstr ""
 
@@ -8217,6 +8238,14 @@ msgid "`%s' failed on file `%s' at %s:%d with error: %s\n"
 msgstr ""
 
 #, fuzzy
+#~ msgid "Found %u transport plugins: `%s'\n"
+#~ msgstr "解析配置文件“%s”失败\n"
+
+#, fuzzy
+#~ msgid "Failed to parse HELLO in file `%s': %s %u \n"
+#~ msgstr "解析配置文件“%s”失败\n"
+
+#, fuzzy
 #~ msgid "Internal error %d\n"
 #~ msgstr "未知错误。\n"
 
diff --git a/src/Makefile.am b/src/Makefile.am
index dcaedc1e8..94345a5bd 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -16,6 +16,7 @@ if HAVE_EXPERIMENTAL
   scalarproduct \
   multicast \
   env \
+  psycstore \
   psyc \
   $(CONSENSUS) \
   $(SECRETSHARING) \
@@ -77,7 +78,6 @@ SUBDIRS = \
   vpn \
   gns \
   $(CONVERSATION_DIR) \
-  psycstore \
   fs \
   exit \
   pt \
diff --git a/src/ats/Makefile.am b/src/ats/Makefile.am
index 964fd0c26..60300f07c 100644
--- a/src/ats/Makefile.am
+++ b/src/ats/Makefile.am
@@ -10,7 +10,7 @@ pkgcfg_DATA = \
   ats.conf
 
 if MINGW
- WINFLAGS = -Wl,--no-undefined -Wl,--export-all-symbols 
+ WINFLAGS = -Wl,--no-undefined -Wl,--export-all-symbols
 endif
 
 if USE_COVERAGE
@@ -39,7 +39,7 @@ plugin_LTLIBRARIES = \
 
 libgnunetats_la_SOURCES = \
   ats_api_scheduling.c \
-  ats_api_performance.c  
+  ats_api_performance.c
 libgnunetats_la_LIBADD = \
  $(top_builddir)/src/util/libgnunetutil.la \
  $(LTLIBINTL)
@@ -55,7 +55,7 @@ libgnunet_plugin_ats_proportional_la_LIBADD = \
   $(top_builddir)/src/util/libgnunetutil.la \
   $(LTLIBINTL)
 libgnunet_plugin_ats_proportional_la_DEPENDENCIES = \
-  libgnunetats.la  
+  libgnunetats.la
 libgnunet_plugin_ats_proportional_la_LDFLAGS = \
   $(GN_PLUGIN_LDFLAGS)
 
@@ -138,7 +138,7 @@ TESTING_TESTS = \
  test_ats_solver_alternative_after_delete_address_ril \
  perf_ats_solver_proportional \
  $(GN_MLP_SOLVER_PERF) \
- perf_ats_solver_ril 
+ perf_ats_solver_ril
 endif
 
 check_PROGRAMS = \
@@ -157,7 +157,7 @@ test_ats_api_scheduling_init_LDADD = \
   $(top_builddir)/src/util/libgnunetutil.la \
   $(top_builddir)/src/testing/libgnunettesting.la \
   $(top_builddir)/src/ats/libgnunetats.la \
-  $(top_builddir)/src/statistics/libgnunetstatistics.la      
+  $(top_builddir)/src/statistics/libgnunetstatistics.la
 
 test_ats_api_scheduling_add_address_SOURCES = \
  test_ats_api_scheduling_add_address.c \
@@ -166,7 +166,7 @@ test_ats_api_scheduling_add_address_LDADD = \
   $(top_builddir)/src/util/libgnunetutil.la \
   $(top_builddir)/src/testing/libgnunettesting.la \
   $(top_builddir)/src/ats/libgnunetats.la \
-  $(top_builddir)/src/statistics/libgnunetstatistics.la    
+  $(top_builddir)/src/statistics/libgnunetstatistics.la
 
 test_ats_api_scheduling_add_address_inbound_SOURCES = \
  test_ats_api_scheduling_add_address_inbound.c \
@@ -175,7 +175,7 @@ test_ats_api_scheduling_add_address_inbound_LDADD = \
   $(top_builddir)/src/util/libgnunetutil.la \
   $(top_builddir)/src/testing/libgnunettesting.la \
   $(top_builddir)/src/ats/libgnunetats.la \
-  $(top_builddir)/src/statistics/libgnunetstatistics.la    
+  $(top_builddir)/src/statistics/libgnunetstatistics.la
 
 test_ats_api_scheduling_add_address_duplicate_SOURCES = \
  test_ats_api_scheduling_add_address_duplicate.c \
@@ -184,7 +184,7 @@ test_ats_api_scheduling_add_address_duplicate_LDADD = \
   $(top_builddir)/src/util/libgnunetutil.la \
   $(top_builddir)/src/testing/libgnunettesting.la \
   $(top_builddir)/src/ats/libgnunetats.la \
-  $(top_builddir)/src/statistics/libgnunetstatistics.la    
+  $(top_builddir)/src/statistics/libgnunetstatistics.la
 
 test_ats_api_scheduling_destroy_address_SOURCES = \
  test_ats_api_scheduling_destroy_address.c \
@@ -193,7 +193,7 @@ test_ats_api_scheduling_destroy_address_LDADD = \
   $(top_builddir)/src/util/libgnunetutil.la \
   $(top_builddir)/src/testing/libgnunettesting.la \
   $(top_builddir)/src/ats/libgnunetats.la \
-  $(top_builddir)/src/statistics/libgnunetstatistics.la    
+  $(top_builddir)/src/statistics/libgnunetstatistics.la
 
 test_ats_api_scheduling_destroy_address_twice_SOURCES = \
  test_ats_api_scheduling_destroy_address_twice.c \
@@ -202,7 +202,7 @@ test_ats_api_scheduling_destroy_address_twice_LDADD = \
   $(top_builddir)/src/util/libgnunetutil.la \
   $(top_builddir)/src/testing/libgnunettesting.la \
   $(top_builddir)/src/ats/libgnunetats.la \
-  $(top_builddir)/src/statistics/libgnunetstatistics.la    
+  $(top_builddir)/src/statistics/libgnunetstatistics.la
 
 test_ats_api_scheduling_add_session_SOURCES = \
  test_ats_api_scheduling_add_session.c test_ats_api_common.c
@@ -210,7 +210,7 @@ test_ats_api_scheduling_add_session_LDADD = \
   $(top_builddir)/src/util/libgnunetutil.la \
   $(top_builddir)/src/testing/libgnunettesting.la \
   $(top_builddir)/src/ats/libgnunetats.la \
-  $(top_builddir)/src/statistics/libgnunetstatistics.la  
+  $(top_builddir)/src/statistics/libgnunetstatistics.la
 
 test_ats_api_scheduling_destroy_session_SOURCES = \
  test_ats_api_scheduling_destroy_session.c test_ats_api_common.c
@@ -218,7 +218,7 @@ test_ats_api_scheduling_destroy_session_LDADD = \
   $(top_builddir)/src/util/libgnunetutil.la \
   $(top_builddir)/src/testing/libgnunettesting.la \
   $(top_builddir)/src/ats/libgnunetats.la \
-  $(top_builddir)/src/statistics/libgnunetstatistics.la  
+  $(top_builddir)/src/statistics/libgnunetstatistics.la
 
 # performance API tests
 
@@ -239,7 +239,7 @@ test_ats_api_performance_list_peer_addresses_LDADD = \
   $(top_builddir)/src/hello/libgnunethello.la \
   $(top_builddir)/src/ats/libgnunetats.la \
         $(top_builddir)/src/statistics/libgnunetstatistics.la
-        
+
 test_ats_api_performance_list_all_addresses_active_SOURCES = \
  test_ats_api_performance_list_all_addresses_active.c
 test_ats_api_performance_list_all_addresses_active_LDADD = \
@@ -257,16 +257,16 @@ test_ats_api_performance_monitor_LDADD = \
   $(top_builddir)/src/hello/libgnunethello.la \
   $(top_builddir)/src/ats/libgnunetats.la \
         $(top_builddir)/src/statistics/libgnunetstatistics.la
-        
+
 test_ats_api_performance_monitor_initial_callback_SOURCES = \
- test_ats_api_performance_monitor_initial_callback.c    
+ test_ats_api_performance_monitor_initial_callback.c
 test_ats_api_performance_monitor_initial_callback_LDADD = \
   $(top_builddir)/src/util/libgnunetutil.la \
   $(top_builddir)/src/testing/libgnunettesting.la \
   $(top_builddir)/src/hello/libgnunethello.la \
   $(top_builddir)/src/ats/libgnunetats.la \
         $(top_builddir)/src/statistics/libgnunetstatistics.la
-        
+
 # solver tests
 test_ats_solver_add_address_proportional_SOURCES = \
  test_ats_solver_add_address.c \
@@ -277,8 +277,8 @@ test_ats_solver_add_address_proportional_LDADD = \
   $(top_builddir)/src/hello/libgnunethello.la \
   $(top_builddir)/src/ats/libgnunetats.la \
         $(top_builddir)/src/statistics/libgnunetstatistics.la
-        
-if HAVE_LIBGLPK 
+
+if HAVE_LIBGLPK
 test_ats_solver_add_address_mlp_SOURCES = \
  test_ats_solver_add_address.c \
  test_ats_api_common.c test_ats_api_common.h
@@ -288,8 +288,8 @@ test_ats_solver_add_address_mlp_LDADD = \
   $(top_builddir)/src/hello/libgnunethello.la \
   $(top_builddir)/src/ats/libgnunetats.la \
         $(top_builddir)/src/statistics/libgnunetstatistics.la
-endif  
-                        
+endif
+
 test_ats_solver_add_address_ril_SOURCES = \
  test_ats_solver_add_address.c \
  test_ats_api_common.c test_ats_api_common.h
@@ -299,7 +299,7 @@ test_ats_solver_add_address_ril_LDADD = \
   $(top_builddir)/src/hello/libgnunethello.la \
   $(top_builddir)/src/ats/libgnunetats.la \
         $(top_builddir)/src/statistics/libgnunetstatistics.la
-                        
+
 test_ats_solver_add_address_and_request_proportional_SOURCES = \
  test_ats_solver_add_address_and_request.c \
  test_ats_api_common.c test_ats_api_common.h
@@ -309,8 +309,8 @@ test_ats_solver_add_address_and_request_proportional_LDADD = \
   $(top_builddir)/src/hello/libgnunethello.la \
   $(top_builddir)/src/ats/libgnunetats.la \
         $(top_builddir)/src/statistics/libgnunetstatistics.la
-        
-if HAVE_LIBGLPK 
+
+if HAVE_LIBGLPK
 test_ats_solver_add_address_and_request_mlp_SOURCES = \
  test_ats_solver_add_address_and_request.c \
  test_ats_api_common.c test_ats_api_common.h
@@ -320,8 +320,8 @@ test_ats_solver_add_address_and_request_mlp_LDADD = \
   $(top_builddir)/src/hello/libgnunethello.la \
   $(top_builddir)/src/ats/libgnunetats.la \
         $(top_builddir)/src/statistics/libgnunetstatistics.la
-endif  
-                        
+endif
+
 test_ats_solver_add_address_and_request_ril_SOURCES = \
  test_ats_solver_add_address_and_request.c \
  test_ats_api_common.c test_ats_api_common.h
@@ -342,8 +342,8 @@ test_ats_solver_request_and_add_address_proportional_LDADD = \
   $(top_builddir)/src/hello/libgnunethello.la \
   $(top_builddir)/src/ats/libgnunetats.la \
         $(top_builddir)/src/statistics/libgnunetstatistics.la
-        
-if HAVE_LIBGLPK 
+
+if HAVE_LIBGLPK
 test_ats_solver_request_and_add_address_mlp_SOURCES = \
  test_ats_solver_request_and_add_address.c \
  test_ats_api_common.c test_ats_api_common.h
@@ -353,8 +353,8 @@ test_ats_solver_request_and_add_address_mlp_LDADD = \
   $(top_builddir)/src/hello/libgnunethello.la \
   $(top_builddir)/src/ats/libgnunetats.la \
         $(top_builddir)/src/statistics/libgnunetstatistics.la
-endif  
-                        
+endif
+
 test_ats_solver_request_and_add_address_ril_SOURCES = \
  test_ats_solver_request_and_add_address.c \
  test_ats_api_common.c test_ats_api_common.h
@@ -375,8 +375,8 @@ test_ats_solver_request_and_delete_address_proportional_LDADD = \
   $(top_builddir)/src/hello/libgnunethello.la \
   $(top_builddir)/src/ats/libgnunetats.la \
         $(top_builddir)/src/statistics/libgnunetstatistics.la
-        
-if HAVE_LIBGLPK 
+
+if HAVE_LIBGLPK
 test_ats_solver_request_and_delete_address_mlp_SOURCES = \
  test_ats_solver_request_and_delete_address.c \
  test_ats_api_common.c test_ats_api_common.h
@@ -386,8 +386,8 @@ test_ats_solver_request_and_delete_address_mlp_LDADD = \
   $(top_builddir)/src/hello/libgnunethello.la \
   $(top_builddir)/src/ats/libgnunetats.la \
         $(top_builddir)/src/statistics/libgnunetstatistics.la
-endif  
-                        
+endif
+
 test_ats_solver_request_and_delete_address_ril_SOURCES = \
  test_ats_solver_request_and_delete_address.c \
  test_ats_api_common.c test_ats_api_common.h
@@ -418,8 +418,8 @@ test_ats_solver_preferences_proportional_LDADD = \
   $(top_builddir)/src/hello/libgnunethello.la \
   $(top_builddir)/src/ats/libgnunetats.la \
         $(top_builddir)/src/statistics/libgnunetstatistics.la
-        
-if HAVE_LIBGLPK 
+
+if HAVE_LIBGLPK
 test_ats_solver_alternative_after_delete_address_mlp_SOURCES = \
  test_ats_solver_alternative_after_delete_address.c \
  test_ats_api_common.c test_ats_api_common.h
@@ -429,7 +429,7 @@ test_ats_solver_alternative_after_delete_address_mlp_LDADD = \
   $(top_builddir)/src/hello/libgnunethello.la \
   $(top_builddir)/src/ats/libgnunetats.la \
         $(top_builddir)/src/statistics/libgnunetstatistics.la
-        
+
 test_ats_solver_preferences_mlp_SOURCES = \
  test_ats_solver_preferences.c \
  test_ats_api_common.c test_ats_api_common.h
@@ -439,8 +439,8 @@ test_ats_solver_preferences_mlp_LDADD = \
   $(top_builddir)/src/hello/libgnunethello.la \
   $(top_builddir)/src/ats/libgnunetats.la \
         $(top_builddir)/src/statistics/libgnunetstatistics.la
-endif  
-                        
+endif
+
 test_ats_solver_alternative_after_delete_address_ril_SOURCES = \
  test_ats_solver_alternative_after_delete_address.c \
  test_ats_api_common.c test_ats_api_common.h
@@ -457,7 +457,7 @@ test_ats_solver_alternative_after_delete_address_ril_LDADD = \
 #  $(GN_LIBGLPK) \
 #  $(top_builddir)/src/util/libgnunetutil.la \
 #  $(top_builddir)/src/statistics/libgnunetstatistics.la \
-#  $(top_builddir)/src/ats/libgnunetats.la  
+#  $(top_builddir)/src/ats/libgnunetats.la
 
 perf_ats_solver_mlp_SOURCES = \
   perf_ats_solver.c test_ats_api_common.c gnunet-service-ats_normalization.c
@@ -465,7 +465,7 @@ perf_ats_solver_mlp_LDADD = \
   $(GN_LIBGLPK) \
   $(top_builddir)/src/util/libgnunetutil.la \
   $(top_builddir)/src/statistics/libgnunetstatistics.la \
-  $(top_builddir)/src/ats/libgnunetats.la 
+  $(top_builddir)/src/ats/libgnunetats.la
 
 perf_ats_solver_proportional_SOURCES = \
   perf_ats_solver.c test_ats_api_common.c gnunet-service-ats_normalization.c
@@ -473,7 +473,7 @@ perf_ats_solver_proportional_LDADD = \
   $(GN_LIBGLPK) \
   $(top_builddir)/src/util/libgnunetutil.la \
   $(top_builddir)/src/statistics/libgnunetstatistics.la \
-  $(top_builddir)/src/ats/libgnunetats.la 
+  $(top_builddir)/src/ats/libgnunetats.la
 
 perf_ats_solver_ril_SOURCES = \
   perf_ats_solver.c test_ats_api_common.c gnunet-service-ats_normalization.c
@@ -481,7 +481,7 @@ perf_ats_solver_ril_LDADD = \
   $(GN_LIBGLPK) \
   $(top_builddir)/src/util/libgnunetutil.la \
   $(top_builddir)/src/statistics/libgnunetstatistics.la \
-  $(top_builddir)/src/ats/libgnunetats.la 
+  $(top_builddir)/src/ats/libgnunetats.la
 
 test_ats_solver_preferences_ril_SOURCES = \
  test_ats_solver_preferences.c \
@@ -492,7 +492,7 @@ test_ats_solver_preferences_ril_LDADD = \
   $(top_builddir)/src/hello/libgnunethello.la \
   $(top_builddir)/src/ats/libgnunetats.la \
         $(top_builddir)/src/statistics/libgnunetstatistics.la
-        
+
 test_ats_solver_convergence_ril_SOURCES = \
  test_ats_solver_convergence.c \
  test_ats_api_common.c test_ats_api_common.h
@@ -505,6 +505,9 @@ test_ats_solver_convergence_ril_LDADD = \
 
 EXTRA_DIST = \
   ats.h \
+  plugin_ats_proportional.h \
+  plugin_ats_mlp.h \
+  plugin_ats_ril.h \
   test_ats_api.conf \
   test_ats_mlp.conf \
   test_ats_solver_default.conf \
diff --git a/src/conversation/Makefile.am b/src/conversation/Makefile.am
index da5702653..e455ba45e 100644
--- a/src/conversation/Makefile.am
+++ b/src/conversation/Makefile.am
@@ -48,7 +48,8 @@ libgnunetspeaker_la_LDFLAGS = \
 
 libgnunetconversation_la_SOURCES = \
   conversation_api.c \
-  conversation_api_call.c
+  conversation_api_call.c \
+  conversation.h
 libgnunetconversation_la_LIBADD = \
   $(top_builddir)/src/gns/libgnunetgns.la \
   $(top_builddir)/src/gnsrecord/libgnunetgnsrecord.la \
diff --git a/src/include/Makefile.am b/src/include/Makefile.am
index 5b5783146..e55f0aca6 100644
--- a/src/include/Makefile.am
+++ b/src/include/Makefile.am
@@ -18,6 +18,7 @@ gnunetinclude_HEADERS = \
   gnunet_applications.h \
   gnunet_arm_service.h \
   gnunet_ats_service.h \
+  gnunet_ats_plugin.h \
   gnunet_bandwidth_lib.h \
   gnunet_bio_lib.h \
   gnunet_block_lib.h \
@@ -41,6 +42,7 @@ gnunetinclude_HEADERS = \
   gnunet_dnsstub_lib.h \
   gnunet_dns_service.h \
   gnunet_dv_service.h \
+  gnunet_env_lib.h \
   gnunet_fragmentation_lib.h \
   gnunet_friends_lib.h \
   gnunet_fs_service.h \
@@ -54,6 +56,7 @@ gnunetinclude_HEADERS = \
   gnunet_load_lib.h \
   gnunet_mesh_service.h \
   gnunet_microphone_lib.h \
+  gnunet_multicast_service.h \
   gnunet_mq_lib.h \
   gnunet_mysql_lib.h \
   gnunet_namecache_plugin.h \
@@ -68,6 +71,9 @@ gnunetinclude_HEADERS = \
   gnunet_peerinfo_service.h \
   gnunet_plugin_lib.h \
   gnunet_postgres_lib.h \
+  gnunet_psycstore_plugin.h \
+  gnunet_psycstore_service.h \
+  gnunet_psyc_service.h \
   gnunet_program_lib.h \
   gnunet_protocols.h \
   gnunet_resolver_service.h \
@@ -77,6 +83,7 @@ gnunetinclude_HEADERS = \
   gnunet_scheduler_lib.h \
   gnunet_server_lib.h \
   gnunet_service_lib.h \
+  gnunet_set_service.h \
   gnunet_signal_lib.h \
   gnunet_signatures.h \
   gnunet_speaker_lib.h \
diff --git a/src/mesh/Makefile.am b/src/mesh/Makefile.am
index a81ac4589..ffcee8c0e 100644
--- a/src/mesh/Makefile.am
+++ b/src/mesh/Makefile.am
@@ -63,13 +63,13 @@ gnunet_mesh_DEPENDENCIES = \
   libgnunetmesh.la
 
 gnunet_service_mesh_SOURCES = \
- gnunet-service-mesh_tunnel.c \
- gnunet-service-mesh_connection.c \
- gnunet-service-mesh_channel.c \
- gnunet-service-mesh_local.c \
- gnunet-service-mesh_peer.c \
- gnunet-service-mesh_dht.c \
- mesh_path.c \
+ gnunet-service-mesh_tunnel.c gnunet-service-mesh_tunnel.h \
+ gnunet-service-mesh_connection.c gnunet-service-mesh_connection.h \
+ gnunet-service-mesh_channel.c gnunet-service-mesh_channel.h \
+ gnunet-service-mesh_local.c gnunet-service-mesh_local.h \
+ gnunet-service-mesh_peer.c gnunet-service-mesh_peer.h \
+ gnunet-service-mesh_dht.c gnunet-service-mesh_dht.h \
+ mesh_path.c mesh_path.h \
  mesh_common.c \
  gnunet-service-mesh.c
 gnunet_service_mesh_CFLAGS = $(AM_CFLAGS)
diff --git a/src/set/Makefile.am b/src/set/Makefile.am
index a2ca25f94..124818ce4 100644
--- a/src/set/Makefile.am
+++ b/src/set/Makefile.am
@@ -8,7 +8,7 @@ pkgcfg_DATA = \
   set.conf
 
 if MINGW
- WINFLAGS = -Wl,--no-undefined -Wl,--export-all-symbols 
+ WINFLAGS = -Wl,--no-undefined -Wl,--export-all-symbols
 endif
 
 if USE_COVERAGE
@@ -43,11 +43,12 @@ gnunet_set_ibf_profiler_LDADD = \
   $(GN_LIBINTL)
 
 gnunet_service_set_SOURCES = \
- gnunet-service-set.c \
+ gnunet-service-set.c gnunet-service-set.h \
  gnunet-service-set_union.c \
  gnunet-service-set_intersection.c \
- ibf.c \
- strata_estimator.c
+ ibf.c ibf.h \
+ strata_estimator.c strata_estimator.h \
+ set_protocol.h
 gnunet_service_set_LDADD = \
   $(top_builddir)/src/util/libgnunetutil.la \
   $(top_builddir)/src/core/libgnunetcore.la \
@@ -56,7 +57,7 @@ gnunet_service_set_LDADD = \
   $(GN_LIBINTL)
 
 libgnunetset_la_SOURCES = \
-  set_api.c
+  set_api.c set.h
 libgnunetset_la_LIBADD = \
   $(top_builddir)/src/util/libgnunetutil.la \
   $(LTLIBINTL)
diff --git a/src/testbed/Makefile.am b/src/testbed/Makefile.am
index 57ea49a00..c52fc1f16 100644
--- a/src/testbed/Makefile.am
+++ b/src/testbed/Makefile.am
@@ -26,19 +26,15 @@ bin_PROGRAMS = \
   gnunet-testbed-profiler
 
 gnunet_service_testbed_SOURCES = \
-  gnunet-service-testbed.h \
-  gnunet-service-testbed.c \
-  gnunet-service-testbed_links.c \
+  gnunet-service-testbed.c gnunet-service-testbed.h \
+  gnunet-service-testbed_links.c gnunet-service-testbed_links.h \
   gnunet-service-testbed_peers.c \
   gnunet-service-testbed_cache.c \
   gnunet-service-testbed_oc.c \
   gnunet-service-testbed_cpustatus.c \
-  gnunet-service-testbed_meminfo.c \
-  gnunet-service-testbed_meminfo.h \
-  gnunet-service-testbed_barriers.c \
-  gnunet-service-testbed_barriers.h \
-  gnunet-service-testbed_connectionpool.c \
-  gnunet-service-testbed_connectionpool.h
+  gnunet-service-testbed_meminfo.c gnunet-service-testbed_meminfo.h \
+  gnunet-service-testbed_barriers.c gnunet-service-testbed_barriers.h \
+  gnunet-service-testbed_connectionpool.c gnunet-service-testbed_connectionpool.h
 gnunet_service_testbed_LDADD = $(XLIB) \
  $(top_builddir)/src/util/libgnunetutil.la \
  $(top_builddir)/src/core/libgnunetcore.la \
@@ -102,7 +98,7 @@ libgnunettestbed_la_SOURCES = \
   testbed_api_test.c \
   testbed_api_topology.c testbed_api_topology.h \
   testbed_api_sd.c testbed_api_sd.h \
-  testbed_api_barriers.c 
+  testbed_api_barriers.c testbed_api_barriers.h
 libgnunettestbed_la_LIBADD = $(XLIB) \
  $(top_builddir)/src/core/libgnunetcore.la \
  $(top_builddir)/src/statistics/libgnunetstatistics.la \
diff --git a/src/transport/plugin_transport_tcp.c b/src/transport/plugin_transport_tcp.c
index c77d82812..7e3970aaa 100644
--- a/src/transport/plugin_transport_tcp.c
+++ b/src/transport/plugin_transport_tcp.c
@@ -1936,7 +1936,7 @@ check_port (struct Plugin *plugin, uint16_t in_port)
  * traffic to a 3rd party that might try to man-in-the-middle our
  * traffic.
  *
- * @param cls closure, our 'struct Plugin*'
+ * @param cls closure, our `struct Plugin *`
  * @param addr pointer to the address
  * @param addrlen length of addr
  * @return #GNUNET_OK if this is a plausible address for this peer
diff --git a/src/util/Makefile.am b/src/util/Makefile.am
index 5cd61ddcf..dcd2f9121 100644
--- a/src/util/Makefile.am
+++ b/src/util/Makefile.am
@@ -539,4 +539,5 @@ EXTRA_DIST = \
   test_program_data.conf \
   test_resolver_api_data.conf \
   test_service_data.conf \
-  test_speedup_data.conf
+  test_speedup_data.conf \
+  gnunet-qr.py.in