gnunet-svn
[Top][All Lists]
Advanced

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

[GNUnet-SVN] r33522 - in gnunet: po src/util


From: gnunet
Subject: [GNUnet-SVN] r33522 - in gnunet: po src/util
Date: Wed, 4 Jun 2014 18:38:42 +0200

Author: dold
Date: 2014-06-04 18:38:42 +0200 (Wed, 04 Jun 2014)
New Revision: 33522

Modified:
   gnunet/po/de.po
   gnunet/po/es.po
   gnunet/po/sv.po
   gnunet/po/vi.po
   gnunet/po/zh_CN.po
   gnunet/src/util/mq.c
Log:
fix bug in mq destroy

Modified: gnunet/po/de.po
===================================================================
--- gnunet/po/de.po     2014-06-04 16:03:17 UTC (rev 33521)
+++ gnunet/po/de.po     2014-06-04 16:38:42 UTC (rev 33522)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: GNUnet 0.7.0b\n"
 "Report-Msgid-Bugs-To: address@hidden"
-"POT-Creation-Date: 2014-04-08 11:11+0200\n"
+"POT-Creation-Date: 2014-06-04 18:25+0200\n"
 "PO-Revision-Date: 2006-03-17 21:37+0100\n"
 "Last-Translator: Nils Durner <address@hidden>\n"
 "Language-Team: German <address@hidden>\n"
@@ -348,130 +348,159 @@
 msgid "Initiating shutdown as requested by client.\n"
 msgstr ""
 
-#: src/ats/ats_api_performance.c:468
+#: src/ats/ats_api_performance.c:485
 #, fuzzy, c-format
 msgid "Received %s message\n"
 msgstr "ungültige `%s' Nachricht empfangen\n"
 
-#: src/ats/ats_api_performance.c:511
+#: src/ats/ats_api_performance.c:528
 #, fuzzy, c-format
 msgid "Received last message for %s \n"
 msgstr "GAP hat ungültige Inhalte von `%s' empfangen.\n"
 
-#: src/ats/gnunet-ats-solver-eval.c:2199 src/ats/gnunet-ats-solver-eval.c:2233
-#: src/ats/gnunet-service-ats_addresses.c:1980
-#: src/ats/gnunet-service-ats_addresses.c:2024
+#: src/ats/gnunet-ats-solver-eval.c:2793 src/ats/gnunet-ats-solver-eval.c:2827
+#: src/ats/gnunet-service-ats_addresses.c:1675
+#: src/ats/gnunet-service-ats_addresses.c:1719
 #, c-format
 msgid ""
 "Could not load quota for network `%s':  `%s', assigning default bandwidth "
 "%llu\n"
 msgstr ""
 
-#: src/ats/gnunet-ats-solver-eval.c:2205
-#: src/ats/gnunet-service-ats_addresses.c:1987
+#: src/ats/gnunet-ats-solver-eval.c:2799
+#: src/ats/gnunet-service-ats_addresses.c:1682
 #, c-format
 msgid "Outbound quota configure for network `%s' is %llu\n"
 msgstr ""
 
-#: src/ats/gnunet-ats-solver-eval.c:2212
-#: src/ats/gnunet-service-ats_addresses.c:1995
+#: src/ats/gnunet-ats-solver-eval.c:2806
+#: src/ats/gnunet-service-ats_addresses.c:1690
 #, c-format
 msgid ""
 "No outbound quota configured for network `%s', assigning default bandwidth "
 "%llu\n"
 msgstr ""
 
-#: src/ats/gnunet-ats-solver-eval.c:2239
-#: src/ats/gnunet-service-ats_addresses.c:2031
+#: src/ats/gnunet-ats-solver-eval.c:2833
+#: src/ats/gnunet-service-ats_addresses.c:1726
 #, c-format
 msgid "Inbound quota configured for network `%s' is %llu\n"
 msgstr ""
 
-#: src/ats/gnunet-ats-solver-eval.c:2246
-#: src/ats/gnunet-service-ats_addresses.c:2039
+#: src/ats/gnunet-ats-solver-eval.c:2840
+#: src/ats/gnunet-service-ats_addresses.c:1734
 #, c-format
 msgid ""
 "No outbound quota configure for network `%s', assigning default bandwidth "
 "%llu\n"
 msgstr ""
 
-#: src/ats/gnunet-ats-solver-eval.c:2671
+#: src/ats/gnunet-ats-solver-eval.c:3397
 #: src/ats-tests/gnunet-solver-eval.c:919
 msgid "solver to use"
 msgstr ""
 
-#: src/ats/gnunet-ats-solver-eval.c:2674 src/ats/gnunet-ats-solver-eval.c:2677
+#: src/ats/gnunet-ats-solver-eval.c:3400
 #: src/ats-tests/gnunet-solver-eval.c:922
 #: src/ats-tests/gnunet-solver-eval.c:925
 msgid "experiment to use"
 msgstr ""
 
-#: src/ats/gnunet-ats-solver-eval.c:2680
+#: src/ats/gnunet-ats-solver-eval.c:3403
+msgid "be verbose"
+msgstr "umfangreiche Meldungen ausgeben"
+
+#: src/ats/gnunet-ats-solver-eval.c:3406
 #, fuzzy
 msgid "print logging"
 msgstr "Collection `%s' begonnen.\n"
 
-#: src/ats/gnunet-service-ats_addresses.c:2217
+#: src/ats/gnunet-ats-solver-eval.c:3409
+msgid "save logging to disk"
+msgstr ""
+
+#: src/ats/gnunet-ats-solver-eval.c:3412
+msgid "disable normalization"
+msgstr ""
+
+#: src/ats/gnunet-service-ats_addresses.c:1912
 #, c-format
 msgid "Initializing solver `%s '`%s'\n"
 msgstr ""
 
-#: src/ats/gnunet-service-ats_addresses.c:2220
+#: src/ats/gnunet-service-ats_addresses.c:1915
 #, 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:2243
+#: src/ats/gnunet-service-ats_addresses.c:1938
 #, fuzzy
 msgid "Failed to initialize solver!\n"
 msgstr "SQLite Datenbank konnte nicht initialisiert werden: %s.\n"
 
-#: src/ats/plugin_ats_mlp.c:892
+#: src/ats/plugin_ats_mlp.c:949
 msgid "Problem size too large, cannot allocate memory!\n"
 msgstr ""
 
-#: src/ats/plugin_ats_mlp.c:1329
+#: src/ats/plugin_ats_mlp.c:1542
 #, fuzzy, c-format
 msgid "Adding address for peer `%s' multiple times\n"
 msgstr "Adresse des Knotens `%s' konnte nicht ermittelt werden.\n"
 
-#: src/ats/plugin_ats_mlp.c:1376
+#: src/ats/plugin_ats_mlp.c:1589
 #, c-format
 msgid "Updating address property `%s' for peer `%s' %p not added before\n"
 msgstr ""
 
-#: src/ats/plugin_ats_mlp.c:2122
+#: src/ats/plugin_ats_mlp.c:2299
+msgid ""
+"MLP solver is not optimizing for anything, changing to feasibility check\n"
+msgstr ""
+
+#: src/ats/plugin_ats_mlp.c:2339 src/ats/plugin_ats_mlp.c:2356
+#: src/ats/plugin_ats_mlp.c:2388 src/ats/plugin_ats_mlp.c:2406
+#: src/ats/plugin_ats_mlp.c:2425 src/ats/plugin_ats_proportional.c:458
+#: src/ats/plugin_ats_proportional.c:475 src/ats/plugin_ats_ril.c:2220
+#: src/ats/plugin_ats_ril.c:2237 src/ats/plugin_ats_ril.c:2254
+#: src/ats/plugin_ats_ril.c:2271 src/ats/plugin_ats_ril.c:2288
+#: src/ats/plugin_ats_ril.c:2305 src/ats/plugin_ats_ril.c:2322
+#: src/ats/plugin_ats_ril.c:2339
+#, fuzzy, c-format
+msgid "Invalid %s configuration %f \n"
+msgstr "Fehler beim Speichern der Konfigurationsdatei `%s':"
+
+#: src/ats/plugin_ats_mlp.c:2512
 #, c-format
 msgid ""
 "Adjusting inconsistent outbound quota configuration for network `%s', is "
 "%llu must be at least %llu\n"
 msgstr ""
 
-#: src/ats/plugin_ats_mlp.c:2131
+#: src/ats/plugin_ats_mlp.c:2521
 #, c-format
 msgid ""
 "Adjusting inconsistent inbound quota configuration for network `%s', is %llu "
 "must be at least %llu\n"
 msgstr ""
 
-#: src/ats/plugin_ats_mlp.c:2142
+#: src/ats/plugin_ats_mlp.c:2532
 #, c-format
 msgid ""
 "Adjusting outbound quota configuration for network `%s'from %llu to %.0f\n"
 msgstr ""
 
-#: src/ats/plugin_ats_mlp.c:2150
+#: src/ats/plugin_ats_mlp.c:2540
 #, c-format
 msgid ""
 "Adjusting inbound quota configuration for network `%s' from %llu to %.0f\n"
 msgstr ""
 
-#: src/ats/plugin_ats_mlp.c:2161
+#: src/ats/plugin_ats_mlp.c:2551
 #, c-format
 msgid "Using default quota configuration for network `%s' (in/out) %llu/%llu\n"
 msgstr ""
 
-#: src/ats/plugin_ats_proportional.c:1511
+#: src/ats/plugin_ats_proportional.c:1819
 #, fuzzy, c-format
 msgid "Invalid network type `%u' `%s': Disconnect!\n"
 msgstr "IP des Hosts `%s' konnte nicht ermittelt werden: %s\n"
@@ -509,7 +538,7 @@
 msgid "Could not connect master [%u] and slave [%u]\n"
 msgstr "Verbindung zu gnunetd konnte nicht hergestellt werden.\n"
 
-#: src/ats-tests/ats-testing.c:490 src/ats-tests/ats-testing.c:671
+#: src/ats-tests/ats-testing.c:490 src/ats-tests/ats-testing.c:673
 #, fuzzy
 msgid "Initialization failed, shutdown\n"
 msgstr "Initialisierung des Plugin Mechanismuses fehlgeschlagen: %s!\n"
@@ -540,108 +569,164 @@
 msgid "ATS returned results for %u addresses\n"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:232
+#: src/ats-tool/gnunet-ats.c:258
 #, 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:413
+#: src/ats-tool/gnunet-ats.c:467
 #, c-format
 msgid "Quota for network `%11s' (in/out): %10s / %10s\n"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:433 src/core/gnunet-core.c:163
-#: src/namestore/gnunet-namestore.c:550 src/transport/gnunet-transport.c:1246
+#: src/ats-tool/gnunet-ats.c:487 src/namestore/gnunet-namestore.c:639
+#: src/transport/gnunet-transport.c:1349
 #, fuzzy, c-format
 msgid "Service `%s' is not running\n"
 msgstr "`%s' ist keine Datei.\n"
 
-#: src/ats-tool/gnunet-ats.c:445 src/transport/gnunet-transport.c:1255
+#: src/ats-tool/gnunet-ats.c:499 src/transport/gnunet-transport.c:1358
 #, 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:454
+#: src/ats-tool/gnunet-ats.c:508
 #, c-format
 msgid "Please select one operation : %s or %s or %s or %s or %s\n"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:470 src/ats-tool/gnunet-ats.c:489
-#: src/ats-tool/gnunet-ats.c:506 src/ats-tool/gnunet-ats.c:543
+#: src/ats-tool/gnunet-ats.c:524 src/ats-tool/gnunet-ats.c:543
+#: src/ats-tool/gnunet-ats.c:560 src/ats-tool/gnunet-ats.c:597
 #, 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:478 src/ats-tool/gnunet-ats.c:495
+#: src/ats-tool/gnunet-ats.c:532 src/ats-tool/gnunet-ats.c:549
 #, 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:515
+#: src/ats-tool/gnunet-ats.c:569
 #, fuzzy, c-format
 msgid "No preference type given!\n"
 msgstr "Informationen über andere GNUnet Knoten ausgeben."
 
-#: src/ats-tool/gnunet-ats.c:520
+#: src/ats-tool/gnunet-ats.c:574
 #, c-format
 msgid "No peer given!\n"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:536
+#: src/ats-tool/gnunet-ats.c:590
 msgid "Valid type required\n"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:594
+#: src/ats-tool/gnunet-ats.c:648
 msgid "get list of active addresses currently used"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:596
+#: src/ats-tool/gnunet-ats.c:650
 msgid "get list of all active addresses"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:599
+#: src/ats-tool/gnunet-ats.c:653
 #, 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:601
+#: src/ats-tool/gnunet-ats.c:655
 msgid "monitor mode"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:603
+#: src/ats-tool/gnunet-ats.c:657
 #, fuzzy
 msgid "set preference for the given peer"
 msgstr "Informationen über andere GNUnet Knoten ausgeben."
 
-#: src/ats-tool/gnunet-ats.c:605
+#: src/ats-tool/gnunet-ats.c:659
 msgid "print all configured quotas"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:607
+#: src/ats-tool/gnunet-ats.c:661
 msgid "peer id"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:610
+#: src/ats-tool/gnunet-ats.c:664
 msgid "preference type to set: latency | bandwidth"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:612
+#: src/ats-tool/gnunet-ats.c:666
 msgid "preference value"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:615
+#: src/ats-tool/gnunet-ats.c:669
 msgid "verbose output (include ATS address properties)"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:622
+#: src/ats-tool/gnunet-ats.c:676
 #, fuzzy
 msgid "Print information about ATS state"
 msgstr "Informationen über andere GNUnet Knoten ausgeben."
 
+#: src/cadet/gnunet-cadet.c:357
+#, fuzzy, c-format
+msgid "Invalid target `%s'\n"
+msgstr "Ungültiger Parameter: `%s'\n"
+
+#: src/cadet/gnunet-cadet.c:607
+#, fuzzy, c-format
+msgid "Invalid peer ID `%s'\n"
+msgstr "Ungültiger Parameter: `%s'\n"
+
+#: src/cadet/gnunet-cadet.c:650
+#, fuzzy, c-format
+msgid "Invalid tunnel owner `%s'\n"
+msgstr "Ungültiger Parameter: `%s'\n"
+
+#: src/cadet/gnunet-cadet.c:716
+msgid "You must NOT give a TARGETwhen using 'request all' options\n"
+msgstr ""
+
+#: src/cadet/gnunet-cadet.c:807
+#, fuzzy
+msgid "provide information about a particular connection"
+msgstr "Informationen über andere GNUnet Knoten ausgeben."
+
+#: src/cadet/gnunet-cadet.c:810
+msgid "activate echo mode"
+msgstr ""
+
+#: src/cadet/gnunet-cadet.c:816
+msgid "port to listen to (default; 0)"
+msgstr ""
+
+#: src/cadet/gnunet-cadet.c:819
+#, fuzzy
+msgid "provide information about a patricular peer"
+msgstr "Informationen über andere GNUnet Knoten ausgeben."
+
+#: src/cadet/gnunet-cadet.c:822
+#, fuzzy
+msgid "provide information about all peers"
+msgstr "Informationen über andere GNUnet Knoten ausgeben."
+
+#: src/cadet/gnunet-cadet.c:825
+#, fuzzy
+msgid "provide information about a particular tunnel"
+msgstr "Informationen über andere GNUnet Knoten ausgeben."
+
+#: src/cadet/gnunet-cadet.c:828
+#, fuzzy
+msgid "provide information about all tunnels"
+msgstr "Informationen über andere GNUnet Knoten ausgeben."
+
+#: src/cadet/gnunet-service-cadet_peer.c:429
+msgid "Wrong CORE service\n"
+msgstr ""
+
 #: src/consensus/gnunet-consensus-profiler.c:437
-#: src/secretsharing/gnunet-secretsharing-profiler.c:535
+#: src/secretsharing/gnunet-secretsharing-profiler.c:610
 #, fuzzy
 msgid "number of peers in consensus"
 msgstr "Anzahl an Durchläufen"
@@ -667,7 +752,7 @@
 msgstr ""
 
 #: src/consensus/gnunet-consensus-profiler.c:452
-#: src/secretsharing/gnunet-secretsharing-profiler.c:550
+#: src/secretsharing/gnunet-secretsharing-profiler.c:625
 msgid "be more verbose (print received values)"
 msgstr ""
 
@@ -676,6 +761,11 @@
 msgid "Connection to conversation service lost, trying to reconnect\n"
 msgstr ""
 
+#: src/conversation/conversation_api.c:681
+#, fuzzy
+msgid "number too large"
+msgstr "Anzahl an Durchläufen"
+
 #: src/conversation/gnunet-conversation.c:264
 #, c-format
 msgid "Incoming call from `%s'. Please /accept #%u or /cancel %u the call.\n"
@@ -1094,19 +1184,19 @@
 msgid "Failed to allocate %d bytes for second packet\n"
 msgstr "Dateiformat fehlerhaft (kein GNUnet Verzeichnis?)\n"
 
-#: src/conversation/gnunet-service-conversation.c:841
-msgid "Mesh audio channel not ready; audio data dropped\n"
+#: src/conversation/gnunet-service-conversation.c:852
+msgid "Cadet audio channel not ready; audio data dropped\n"
 msgstr ""
 
-#: src/conversation/gnunet-service-conversation.c:932
+#: src/conversation/gnunet-service-conversation.c:943
 #, c-format
 msgid ""
 "No available phone for incoming call on line %u, sending HANG_UP signal\n"
 msgstr ""
 
-#: src/conversation/gnunet-service-conversation.c:1338
+#: src/conversation/gnunet-service-conversation.c:1349
 #, fuzzy, c-format
-msgid "Received incoming channel on port %u\n"
+msgid "Received incoming Cadet channel on port %u\n"
 msgstr "`%s' hat sich mit `%s' verbunden.\n"
 
 #: src/conversation/microphone.c:121
@@ -1124,215 +1214,242 @@
 msgid "Could not start playback audio helper.\n"
 msgstr "Anwendung `%s' konnte nicht initialisiert werden.\n"
 
-#: src/core/core_api.c:767
+#: src/core/core_api.c:768
 msgid "Client was disconnected from core service, trying to reconnect.\n"
 msgstr ""
 
-#: src/core/gnunet-core.c:80
-#, fuzzy, c-format
-msgid "Peer `%s'\n"
-msgstr "Ich bin Peer `%s'.\n"
+#: src/core/gnunet-core.c:92
+#, fuzzy
+msgid "fresh connection"
+msgstr "# verbundener Knoten"
 
-#: src/core/gnunet-core.c:110 src/core/gnunet-core.c:138
-#: src/transport/gnunet-transport.c:910 src/transport/gnunet-transport.c:930
-#, c-format
-msgid "%24s: %-17s %4s   (%u connections in total)\n"
+#: src/core/gnunet-core.c:95
+msgid "key sent"
 msgstr ""
 
-#: src/core/gnunet-core.c:112 src/transport/gnunet-transport.c:911
+#: src/core/gnunet-core.c:98
 #, fuzzy
-msgid "Connected to"
-msgstr "`%s' hat sich mit `%s' verbunden.\n"
+msgid "key received"
+msgstr "# Sitzungsschlüssel abgelehnt"
 
-#: src/core/gnunet-core.c:140 src/transport/gnunet-transport.c:931
+#: src/core/gnunet-core.c:101
 #, fuzzy
-msgid "Disconnected from"
+msgid "connection established"
+msgstr "Collection beendet.\n"
+
+#: src/core/gnunet-core.c:104
+msgid "rekeying"
+msgstr ""
+
+#: src/core/gnunet-core.c:107
+#, fuzzy
+msgid "disconnected"
 msgstr "`%s' hat sich mit `%s' verbunden.\n"
 
-#: src/core/gnunet-core.c:211 src/peerinfo-tool/gnunet-peerinfo.c:694
+#: src/core/gnunet-core.c:114
+msgid "Connection to CORE service lost (reconnecting)"
+msgstr ""
+
+#: src/core/gnunet-core.c:117
+#, fuzzy
+msgid "unknown state"
+msgstr "Unbekannter Fehler"
+
+#: src/core/gnunet-core.c:122
+#, c-format
+msgid "%24s: %-30s %4s (timeout in %6s)\n"
+msgstr ""
+
+#: src/core/gnunet-core.c:146 src/peerinfo-tool/gnunet-peerinfo.c:705
 #, fuzzy, c-format
 msgid "Invalid command line argument `%s'\n"
 msgstr "Ungültige Kommandozeilen Parameter:\n"
 
-#: src/core/gnunet-core.c:233 src/transport/gnunet-transport.c:1486
+#: src/core/gnunet-core.c:157
+#: src/experimentation/gnunet-daemon-experimentation_nodes.c:1104
 #, fuzzy
+msgid "Failed to connect to CORE service!\n"
+msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
+
+#: src/core/gnunet-core.c:179 src/transport/gnunet-transport.c:1590
+#, fuzzy
 msgid "provide information about all current connections (continuously)"
 msgstr "Informationen über andere GNUnet Knoten ausgeben."
 
-#: src/core/gnunet-core.c:244
+#: src/core/gnunet-core.c:188
 #, fuzzy
 msgid "Print information about connected peers."
 msgstr "Informationen über andere GNUnet Knoten ausgeben."
 
-#: src/core/gnunet-service-core.c:105
+#: src/core/gnunet-service-core.c:104
 #, fuzzy
 msgid "Core service is lacking HOSTKEY configuration setting.  Exiting.\n"
 msgstr "GNUnet Konfiguration"
 
-#: src/core/gnunet-service-core.c:126
+#: src/core/gnunet-service-core.c:128
 #, c-format
 msgid "Core service of `%4s' ready.\n"
 msgstr ""
 
-#: src/core/gnunet-service-core_clients.c:370
+#: src/core/gnunet-service-core_clients.c:372
 #, fuzzy
 msgid "# send requests dropped (disconnected)"
 msgstr "# gap Anfragen verworfen: Kollision in RT"
 
-#: src/core/gnunet-service-core_clients.c:480
+#: src/core/gnunet-service-core_clients.c:483
 #, fuzzy
 msgid "# messages discarded (session disconnected)"
 msgstr "# defragmentierter Nachrichten"
 
-#: src/core/gnunet-service-core_clients.c:526
+#: src/core/gnunet-service-core_clients.c:529
 #, fuzzy, c-format
 msgid "# bytes of messages of type %u received"
 msgstr "# Bytes Rauschen empfangen"
 
-#: src/core/gnunet-service-core_kx.c:535
+#: src/core/gnunet-service-core_kx.c:549
 msgid "# bytes encrypted"
 msgstr "# Bytes verschlüsselt"
 
-#: src/core/gnunet-service-core_kx.c:586
+#: src/core/gnunet-service-core_kx.c:601
 msgid "# bytes decrypted"
 msgstr "# Bytes entschlüsselt"
 
-#: src/core/gnunet-service-core_kx.c:673
+#: src/core/gnunet-service-core_kx.c:688
 msgid "# key exchanges initiated"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:713
+#: src/core/gnunet-service-core_kx.c:732
 msgid "# key exchanges stopped"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:810
+#: src/core/gnunet-service-core_kx.c:832
 msgid "# old ephemeral keys ignored"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:816
+#: src/core/gnunet-service-core_kx.c:839
 #, fuzzy
 msgid "# ephemeral keys received"
 msgstr "# verschlüsselter PING Nachrichten empfangen"
 
-#: src/core/gnunet-service-core_kx.c:850
+#: src/core/gnunet-service-core_kx.c:873
 #, 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:861
+#: src/core/gnunet-service-core_kx.c:884
 #, fuzzy
 msgid "# EPHEMERAL_KEY messages received"
 msgstr "# defragmentierter Nachrichten"
 
-#: src/core/gnunet-service-core_kx.c:951
+#: src/core/gnunet-service-core_kx.c:983
 #: src/transport/gnunet-service-transport_validation.c:1016
 #, fuzzy
 msgid "# PING messages received"
 msgstr "# PING Nachrichten erstellt"
 
-#: src/core/gnunet-service-core_kx.c:959
+#: src/core/gnunet-service-core_kx.c:991
 #, fuzzy
 msgid "# PING messages dropped (out of order)"
 msgstr "# gap Anfragen verworfen: Kollision in RT"
 
-#: src/core/gnunet-service-core_kx.c:986
+#: src/core/gnunet-service-core_kx.c:1018
 #, 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:1003
+#: src/core/gnunet-service-core_kx.c:1035
 #, fuzzy
 msgid "# PONG messages created"
 msgstr "# PING Nachrichten erstellt"
 
-#: src/core/gnunet-service-core_kx.c:1029
+#: src/core/gnunet-service-core_kx.c:1061
 #, fuzzy
 msgid "# sessions terminated by timeout"
 msgstr "# Bytes verworfen von TCP (ausgehend)"
 
-#: src/core/gnunet-service-core_kx.c:1039
+#: src/core/gnunet-service-core_kx.c:1072
 #, fuzzy
 msgid "# keepalive messages sent"
 msgstr "# Klartext PING Nachrichten gesendet"
 
-#: src/core/gnunet-service-core_kx.c:1096
+#: src/core/gnunet-service-core_kx.c:1139
 #: src/transport/gnunet-service-transport_validation.c:1328
 #, fuzzy
 msgid "# PONG messages received"
 msgstr "# verschlüsselter PONG Nachrichten empfangen"
 
-#: src/core/gnunet-service-core_kx.c:1102
+#: src/core/gnunet-service-core_kx.c:1145
 #, fuzzy
 msgid "# PONG messages dropped (connection down)"
 msgstr "# verschlüsselter PONG Nachrichten empfangen"
 
-#: src/core/gnunet-service-core_kx.c:1107
+#: src/core/gnunet-service-core_kx.c:1150
 #, fuzzy
 msgid "# PONG messages dropped (out of order)"
 msgstr "# gap Anfragen verworfen: Kollision in RT"
 
-#: src/core/gnunet-service-core_kx.c:1137
+#: src/core/gnunet-service-core_kx.c:1180
 #, fuzzy
 msgid "# PONG messages decrypted"
 msgstr "# PING Nachrichten erstellt"
 
-#: src/core/gnunet-service-core_kx.c:1171
+#: src/core/gnunet-service-core_kx.c:1215
 #, fuzzy
 msgid "# session keys confirmed via PONG"
 msgstr "# Knotenankündigungen empfangen"
 
-#: src/core/gnunet-service-core_kx.c:1181
+#: src/core/gnunet-service-core_kx.c:1226
 #, fuzzy
 msgid "# timeouts prevented via PONG"
 msgstr "# Bytes empfangen über TCP"
 
-#: src/core/gnunet-service-core_kx.c:1188
+#: src/core/gnunet-service-core_kx.c:1233
 #, fuzzy
 msgid "# rekey operations confirmed via PONG"
 msgstr "# Knotenankündigungen empfangen"
 
-#: src/core/gnunet-service-core_kx.c:1328
+#: src/core/gnunet-service-core_kx.c:1374
 #, fuzzy
 msgid "# DATA message dropped (out of order)"
 msgstr "# Bytes verworfen von UDP (outgoing)"
 
-#: src/core/gnunet-service-core_kx.c:1335
+#: src/core/gnunet-service-core_kx.c:1381
 #, 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:1338
+#: src/core/gnunet-service-core_kx.c:1384
 #, fuzzy
 msgid "# sessions terminated by key expiration"
 msgstr "# Bytes verworfen von TCP (ausgehend)"
 
-#: src/core/gnunet-service-core_kx.c:1383
-#: src/core/gnunet-service-core_kx.c:1408
+#: src/core/gnunet-service-core_kx.c:1430
+#: src/core/gnunet-service-core_kx.c:1455
 #, fuzzy
 msgid "# bytes dropped (duplicates)"
 msgstr "# Bytes verworfen von UDP (outgoing)"
 
-#: src/core/gnunet-service-core_kx.c:1395
+#: src/core/gnunet-service-core_kx.c:1442
 #, fuzzy
 msgid "# bytes dropped (out of sequence)"
 msgstr "# Bytes verworfen von UDP (outgoing)"
 
-#: src/core/gnunet-service-core_kx.c:1437
+#: src/core/gnunet-service-core_kx.c:1484
 #, fuzzy
 msgid "# bytes dropped (ancient message)"
 msgstr "# Bytes verworfen von UDP (outgoing)"
 
-#: src/core/gnunet-service-core_kx.c:1445
+#: src/core/gnunet-service-core_kx.c:1492
 #, fuzzy
 msgid "# bytes of payload decrypted"
 msgstr "# Bytes entschlüsselt"
 
-#: src/core/gnunet-service-core_kx.c:1480
+#: src/core/gnunet-service-core_kx.c:1527
 #, fuzzy
 msgid "# PAYLOAD dropped (out of order)"
 msgstr "# Bytes verworfen von UDP (outgoing)"
@@ -1356,38 +1473,48 @@
 msgid "Unsupported message of type %u (%u bytes) received from peer `%s'\n"
 msgstr "Ungültige Nachricht des Typs %u empfangen. Nachricht wird verworfen.\n"
 
-#: src/core/gnunet-service-core_sessions.c:216
-#: src/core/gnunet-service-core_sessions.c:288
+#: src/core/gnunet-service-core_sessions.c:245
+#: src/core/gnunet-service-core_sessions.c:328
 #: src/dht/gnunet-service-dht_neighbours.c:662
 #: src/dht/gnunet-service-dht_neighbours.c:727
-#: src/dht/gnunet-service-xdht_neighbours.c:1304
+#: src/dht/gnunet-service-xdht_neighbours.c:3586
 #: src/fs/gnunet-service-fs_cp.c:606 src/fs/gnunet-service-fs_cp.c:1501
 #: src/topology/gnunet-daemon-topology.c:707
 #: src/topology/gnunet-daemon-topology.c:808
 #: src/transport/gnunet-service-transport_neighbours.c:917
 #: src/transport/gnunet-service-transport_neighbours.c:1141
-#: src/transport/gnunet-service-transport_neighbours.c:3142
-#: src/transport/gnunet-service-transport_neighbours.c:3438
+#: src/transport/gnunet-service-transport_neighbours.c:3146
+#: src/transport/gnunet-service-transport_neighbours.c:3449
 #, fuzzy
 msgid "# peers connected"
 msgstr "# verbundener Knoten"
 
-#: src/core/gnunet-service-core_sessions.c:255
+#: src/core/gnunet-service-core_sessions.c:278
 #, fuzzy
 msgid "# type map refreshes sent"
 msgstr "# p2p Trace-Antworten gesendet"
 
-#: src/core/gnunet-service-core_sessions.c:426
+#: src/core/gnunet-service-core_sessions.c:394
+#, fuzzy
+msgid "# outdated typemap confirmations received"
+msgstr "Fehler beim Speichern der Konfiguration!"
+
+#: src/core/gnunet-service-core_sessions.c:405
+#, fuzzy
+msgid "# valid typemap confirmations received"
+msgstr "Fehler beim Speichern der Konfiguration!"
+
+#: src/core/gnunet-service-core_sessions.c:543
 msgid "# messages discarded (expired prior to transmission)"
 msgstr ""
 
-#: src/core/gnunet-service-core_typemap.c:110
-#: src/core/gnunet-service-core_typemap.c:121
+#: src/core/gnunet-service-core_typemap.c:169
+#: src/core/gnunet-service-core_typemap.c:180
 #, fuzzy
 msgid "# type maps received"
 msgstr "# verschlüsselter PING Nachrichten empfangen"
 
-#: src/core/gnunet-service-core_typemap.c:151
+#: src/core/gnunet-service-core_typemap.c:210
 msgid "# updates to my type map"
 msgstr ""
 
@@ -1448,12 +1575,13 @@
 #: src/namecache/plugin_namecache_sqlite.c:52
 #: src/namestore/plugin_namestore_postgres.c:52
 #: src/namestore/plugin_namestore_sqlite.c:52
+#: src/peerstore/plugin_peerstore_sqlite.c:50
 #: src/testbed/generate-underlay-topology.c:47
 #: src/testbed/gnunet-daemon-latency-logger.c:52
 #: src/testbed/gnunet-daemon-testbed-underlay.c:55
 #: src/testbed/testbed_api_hosts.c:69 src/util/crypto_ecc.c:51
 #: src/util/crypto_mpi.c:39 src/include/gnunet_common.h:602
-#: src/include/gnunet_common.h:611 src/scalarproduct/scalarproduct.h:50
+#: src/include/gnunet_common.h:611 src/scalarproduct/scalarproduct.h:44
 #, c-format
 msgid "`%s' failed at %s:%d with error: %s\n"
 msgstr "`%s' schlug bei %s:%d mit dem Fehler %s fehl\n"
@@ -1505,7 +1633,7 @@
 msgid "# datastore connections (re)created"
 msgstr ""
 
-#: src/datastore/datastore_api.c:616 src/scalarproduct/scalarproduct_api.c:279
+#: src/datastore/datastore_api.c:616
 #, fuzzy
 msgid "# transmission request failures"
 msgstr "# Klartext PONG Nachrichten empfangen"
@@ -1807,6 +1935,7 @@
 #: src/datastore/plugin_datastore_sqlite.c:255
 #: src/namecache/plugin_namecache_sqlite.c:193
 #: src/namestore/plugin_namestore_sqlite.c:204
+#: src/peerstore/plugin_peerstore_sqlite.c:434
 #: src/psycstore/plugin_psycstore_sqlite.c:319
 #, c-format
 msgid "Unable to initialize SQLite: %s.\n"
@@ -1965,102 +2094,102 @@
 msgstr "# Client Trace-Anfragen empfangen"
 
 #: src/dht/gnunet-service-dht_clients.c:513
-#: src/dht/gnunet-service-xdht_clients.c:927
+#: src/dht/gnunet-service-xdht_clients.c:925
 #, fuzzy
 msgid "# PUT requests received from clients"
 msgstr "Empfangene Client-Nachricht ist ungültig.\n"
 
 #: src/dht/gnunet-service-dht_clients.c:597
-#: src/dht/gnunet-service-xdht_clients.c:1013
+#: src/dht/gnunet-service-xdht_clients.c:1010
 #, fuzzy
 msgid "# GET requests received from clients"
 msgstr "Empfangene Client-Nachricht ist ungültig.\n"
 
 #: src/dht/gnunet-service-dht_clients.c:798
-#: src/dht/gnunet-service-xdht_clients.c:1214
+#: src/dht/gnunet-service-xdht_clients.c:1211
 #, fuzzy
 msgid "# GET STOP requests received from clients"
 msgstr "Empfangene Client-Nachricht ist ungültig.\n"
 
-#: src/dht/gnunet-service-dht_clients.c:1039
+#: src/dht/gnunet-service-dht_clients.c:1040
 #: src/dht/gnunet-service-xdht_clients.c:498
 msgid "# Key match, type mismatches in REPLY to CLIENT"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_clients.c:1052
+#: src/dht/gnunet-service-dht_clients.c:1053
 #: src/dht/gnunet-service-xdht_clients.c:511
 msgid "# Duplicate REPLIES to CLIENT request dropped"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_clients.c:1089
+#: src/dht/gnunet-service-dht_clients.c:1090
 #: src/dht/gnunet-service-xdht_clients.c:548
 #, fuzzy, c-format
 msgid "Unsupported block type (%u) in request!\n"
 msgstr "Ungültige Nachricht des Typs %u empfangen. Nachricht wird verworfen.\n"
 
-#: src/dht/gnunet-service-dht_clients.c:1112
+#: src/dht/gnunet-service-dht_clients.c:1113
 #: src/dht/gnunet-service-xdht_clients.c:571
 #, fuzzy
 msgid "# RESULTS queued for clients"
 msgstr "Empfangene Client-Nachricht ist ungültig.\n"
 
-#: src/dht/gnunet-service-dht_clients.c:1166
-#: src/dht/gnunet-service-dht_clients.c:1209
+#: src/dht/gnunet-service-dht_clients.c:1167
+#: src/dht/gnunet-service-dht_clients.c:1210
 #: src/dht/gnunet-service-xdht_clients.c:625
 #: src/dht/gnunet-service-xdht_clients.c:668
 msgid "# REPLIES ignored for CLIENTS (no match)"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_clients.c:1176
+#: src/dht/gnunet-service-dht_clients.c:1177
 #: src/dht/gnunet-service-xdht_clients.c:635
 #, fuzzy
 msgid "Could not pass reply to client, message too big!\n"
 msgstr "'join' Nachricht konnte nicht an gnunetd gesendet werden.\n"
 
 #: src/dht/gnunet-service-dht_datacache.c:68
-#: src/dht/gnunet-service-xdht_datacache.c:68
+#: src/dht/gnunet-service-xdht_datacache.c:69
 #, fuzzy, c-format
 msgid "%s request received, but have no datacache!\n"
 msgstr "# Bytes empfangen über TCP"
 
 #: src/dht/gnunet-service-dht_datacache.c:78
-#: src/dht/gnunet-service-xdht_datacache.c:78
+#: src/dht/gnunet-service-xdht_datacache.c:79
 msgid "# ITEMS stored in datacache"
 msgstr ""
 
 #: src/dht/gnunet-service-dht_datacache.c:165
-#: src/dht/gnunet-service-xdht_datacache.c:165
+#: src/dht/gnunet-service-xdht_datacache.c:213
 msgid "# Good RESULTS found in datacache"
 msgstr ""
 
 #: src/dht/gnunet-service-dht_datacache.c:176
-#: src/dht/gnunet-service-xdht_datacache.c:176
+#: src/dht/gnunet-service-xdht_datacache.c:234
 msgid "# Duplicate RESULTS found in datacache"
 msgstr ""
 
 #: src/dht/gnunet-service-dht_datacache.c:182
-#: src/dht/gnunet-service-xdht_datacache.c:182
+#: src/dht/gnunet-service-xdht_datacache.c:240
 msgid "# Invalid RESULTS found in datacache"
 msgstr ""
 
 #: src/dht/gnunet-service-dht_datacache.c:188
-#: src/dht/gnunet-service-xdht_datacache.c:188
+#: src/dht/gnunet-service-xdht_datacache.c:246
 msgid "# Irrelevant RESULTS found in datacache"
 msgstr ""
 
 #: src/dht/gnunet-service-dht_datacache.c:200
-#: src/dht/gnunet-service-xdht_datacache.c:200
+#: src/dht/gnunet-service-xdht_datacache.c:258
 msgid "# Unsupported RESULTS found in datacache"
 msgstr ""
 
 #: src/dht/gnunet-service-dht_datacache.c:203
-#: src/dht/gnunet-service-xdht_datacache.c:203
+#: src/dht/gnunet-service-xdht_datacache.c:261
 #, c-format
 msgid "Unsupported block type (%u) in local response!\n"
 msgstr ""
 
 #: src/dht/gnunet-service-dht_datacache.c:234
-#: src/dht/gnunet-service-xdht_datacache.c:234
+#: src/dht/gnunet-service-xdht_datacache.c:298
 #, fuzzy
 msgid "# GET requests given to datacache"
 msgstr "# Client Trace-Anfragen empfangen"
@@ -2086,13 +2215,13 @@
 msgstr "# defragmentierter Nachrichten"
 
 #: src/dht/gnunet-service-dht_neighbours.c:819
-#: src/dht/gnunet-service-xdht_neighbours.c:703
+#: src/dht/gnunet-service-xdht_neighbours.c:745
 #, fuzzy
 msgid "# Bytes transmitted to other peers"
 msgstr "# Bytes des Typs %d übertragen"
 
 #: src/dht/gnunet-service-dht_neighbours.c:857
-#: src/dht/gnunet-service-xdht_neighbours.c:742
+#: src/dht/gnunet-service-xdht_neighbours.c:786
 #, fuzzy
 msgid "# Bytes of bandwidth requested from core"
 msgstr "# Client Trace-Anfragen empfangen"
@@ -2113,87 +2242,91 @@
 msgid "# Peer selection failed"
 msgstr " Verbindung fehlgeschlagen\n"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1287
+#: src/dht/gnunet-service-dht_neighbours.c:1289
 #, fuzzy
 msgid "# PUT requests routed"
 msgstr "# dht Anfragen weitergeleitet"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1316
+#: src/dht/gnunet-service-dht_neighbours.c:1318
 #, fuzzy
 msgid "# PUT messages queued for transmission"
 msgstr "# PING Nachrichten erstellt"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1323
-#: src/dht/gnunet-service-dht_neighbours.c:1440
-#: src/dht/gnunet-service-dht_neighbours.c:1543
-#: src/dht/gnunet-service-xdht_neighbours.c:794
-#: src/dht/gnunet-service-xdht_neighbours.c:860
-#: src/dht/gnunet-service-xdht_neighbours.c:919
-#: src/dht/gnunet-service-xdht_neighbours.c:981
-#: src/dht/gnunet-service-xdht_neighbours.c:1041
+#: src/dht/gnunet-service-dht_neighbours.c:1328
+#: src/dht/gnunet-service-dht_neighbours.c:1452
+#: src/dht/gnunet-service-dht_neighbours.c:1557
+#: src/dht/gnunet-service-xdht_neighbours.c:843
+#: src/dht/gnunet-service-xdht_neighbours.c:910
+#: src/dht/gnunet-service-xdht_neighbours.c:980
+#: src/dht/gnunet-service-xdht_neighbours.c:1040
+#: src/dht/gnunet-service-xdht_neighbours.c:1098
+#: src/dht/gnunet-service-xdht_neighbours.c:1157
+#: src/dht/gnunet-service-xdht_neighbours.c:1218
+#: src/dht/gnunet-service-xdht_neighbours.c:1280
+#: src/dht/gnunet-service-xdht_neighbours.c:1341
 #, fuzzy
 msgid "# P2P messages dropped due to full queue"
 msgstr "# gap Anfragen verworfen: Kollision in RT"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1405
+#: src/dht/gnunet-service-dht_neighbours.c:1414
 #, fuzzy
 msgid "# GET requests routed"
 msgstr "# dht Anfragen weitergeleitet"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1432
+#: src/dht/gnunet-service-dht_neighbours.c:1441
 #, fuzzy
 msgid "# GET messages queued for transmission"
 msgstr "# PING Nachrichten erstellt"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1550
+#: src/dht/gnunet-service-dht_neighbours.c:1564
 #, fuzzy
 msgid "# RESULT messages queued for transmission"
 msgstr "# PING Nachrichten erstellt"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1636
+#: src/dht/gnunet-service-dht_neighbours.c:1651
 #, fuzzy
 msgid "# P2P PUT requests received"
 msgstr "# Client Trace-Anfragen empfangen"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1639
+#: src/dht/gnunet-service-dht_neighbours.c:1654
 #, fuzzy
 msgid "# P2P PUT bytes received"
 msgstr "# Client Trace-Anfragen empfangen"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1803
+#: src/dht/gnunet-service-dht_neighbours.c:1821
 msgid "# FIND PEER requests ignored due to Bloomfilter"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1811
+#: src/dht/gnunet-service-dht_neighbours.c:1829
 msgid "# FIND PEER requests ignored due to lack of HELLO"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1904
+#: src/dht/gnunet-service-dht_neighbours.c:1924
 #, fuzzy
 msgid "# P2P GET requests received"
 msgstr "# Client Trace-Anfragen empfangen"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1907
+#: src/dht/gnunet-service-dht_neighbours.c:1927
 #, fuzzy
 msgid "# P2P GET bytes received"
 msgstr "# Client Trace-Anfragen empfangen"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1961
+#: src/dht/gnunet-service-dht_neighbours.c:1984
 #, fuzzy
 msgid "# P2P FIND PEER requests processed"
 msgstr "# Client Trace-Anfragen empfangen"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1975
+#: src/dht/gnunet-service-dht_neighbours.c:1998
 #, fuzzy
 msgid "# P2P GET requests ONLY routed"
 msgstr "# dht Anfragen weitergeleitet"
 
-#: src/dht/gnunet-service-dht_neighbours.c:2052
+#: src/dht/gnunet-service-dht_neighbours.c:2083
 #, fuzzy
 msgid "# P2P RESULTS received"
 msgstr "# Bytes empfangen über TCP"
 
-#: src/dht/gnunet-service-dht_neighbours.c:2055
+#: src/dht/gnunet-service-dht_neighbours.c:2086
 #, fuzzy
 msgid "# P2P RESULT bytes received"
 msgstr "# Bytes empfangen über TCP"
@@ -2236,24 +2369,6 @@
 msgid "# DHT requests combined"
 msgstr "# Client Trace-Anfragen empfangen"
 
-#: src/dht/gnunet-service-xdht_neighbours.c:1398
-#, c-format
-msgid ""
-"\n"
-"SUPU %s, %s, %d,my_identity = %s"
-msgstr ""
-
-#: src/dht/gnunet-service-xdht_neighbours.c:1514
-#: src/dht/gnunet-service-xdht_neighbours.c:1524
-#: src/dht/gnunet-service-xdht_neighbours.c:1530
-#: src/dht/gnunet-service-xdht_neighbours.c:1536
-#: src/dht/gnunet-service-xdht_neighbours.c:1545
-#, c-format
-msgid ""
-"\n"
-"SUPU %s, %s, %d"
-msgstr ""
-
 #: src/dht/plugin_block_dht.c:138
 #, fuzzy, c-format
 msgid "Block not of type %u\n"
@@ -2365,12 +2480,12 @@
 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:3514
+#: src/dns/gnunet-service-dns.c:1049
 #, 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:3571
+#: src/dns/gnunet-service-dns.c:1069 src/exit/gnunet-daemon-exit.c:3594
 #, fuzzy
 msgid "need a valid IPv4 or IPv6 address\n"
 msgstr "Ungültiger Parameter: `%s'\n"
@@ -2391,7 +2506,7 @@
 
 #: src/exit/gnunet-daemon-exit.c:853
 #, fuzzy
-msgid "# Bytes transmitted via mesh channels"
+msgid "# Bytes transmitted via cadet channels"
 msgstr "# Bytes des Typs %d übertragen"
 
 #: src/exit/gnunet-daemon-exit.c:970 src/exit/gnunet-daemon-exit.c:2397
@@ -2458,7 +2573,7 @@
 
 #: src/exit/gnunet-daemon-exit.c:1872
 #, fuzzy
-msgid "# TCP service creation requests received via mesh"
+msgid "# TCP service creation requests received via cadet"
 msgstr "# Client Trace-Anfragen empfangen"
 
 #: src/exit/gnunet-daemon-exit.c:1875 src/exit/gnunet-daemon-exit.c:1968
@@ -2466,7 +2581,7 @@
 #: 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"
+msgid "# Bytes received from CADET"
 msgstr "# Bytes empfangen über HTTP"
 
 #: src/exit/gnunet-daemon-exit.c:1909 src/exit/gnunet-daemon-exit.c:2990
@@ -2481,12 +2596,12 @@
 
 #: src/exit/gnunet-daemon-exit.c:1971
 #, fuzzy
-msgid "# TCP IP-exit creation requests received via mesh"
+msgid "# TCP IP-exit creation requests received via cadet"
 msgstr "# Client Trace-Anfragen empfangen"
 
 #: src/exit/gnunet-daemon-exit.c:2076
 #, fuzzy
-msgid "# TCP data requests received via mesh"
+msgid "# TCP data requests received via cadet"
 msgstr "# Client Trace-Anfragen empfangen"
 
 #: src/exit/gnunet-daemon-exit.c:2090
@@ -2501,12 +2616,12 @@
 
 #: src/exit/gnunet-daemon-exit.c:2324
 #, fuzzy
-msgid "# ICMP IP-exit requests received via mesh"
+msgid "# ICMP IP-exit requests received via cadet"
 msgstr "# Client Trace-Anfragen empfangen"
 
 #: src/exit/gnunet-daemon-exit.c:2573
 #, fuzzy
-msgid "# ICMP service requests received via mesh"
+msgid "# ICMP service requests received via cadet"
 msgstr "Empfangene Client-Nachricht ist ungültig.\n"
 
 #: src/exit/gnunet-daemon-exit.c:2639 src/vpn/gnunet-service-vpn.c:1397
@@ -2526,12 +2641,12 @@
 
 #: src/exit/gnunet-daemon-exit.c:2862
 #, fuzzy
-msgid "# UDP IP-exit requests received via mesh"
+msgid "# UDP IP-exit requests received via cadet"
 msgstr "# Client Trace-Anfragen empfangen"
 
 #: src/exit/gnunet-daemon-exit.c:2969
 #, fuzzy
-msgid "# UDP service requests received via mesh"
+msgid "# UDP service requests received via cadet"
 msgstr "# Client Trace-Anfragen empfangen"
 
 #: src/exit/gnunet-daemon-exit.c:2995
@@ -2541,68 +2656,73 @@
 
 #: src/exit/gnunet-daemon-exit.c:3031
 #, fuzzy
-msgid "# Inbound MESH channels created"
+msgid "# Inbound CADET channels created"
 msgstr "# dht Anfragen weitergeleitet"
 
-#: src/exit/gnunet-daemon-exit.c:3235 src/exit/gnunet-daemon-exit.c:3245
+#: src/exit/gnunet-daemon-exit.c:3255 src/exit/gnunet-daemon-exit.c:3265
 #, 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
+#: src/exit/gnunet-daemon-exit.c:3279 src/exit/gnunet-daemon-exit.c:3287
 #, c-format
 msgid "`%s' is not a valid port number (for domain `%s')!"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3300
+#: src/exit/gnunet-daemon-exit.c:3320
 #, c-format
 msgid "No addresses found for hostname `%s' of service `%s'!\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3314 src/exit/gnunet-daemon-exit.c:3326
+#: src/exit/gnunet-daemon-exit.c:3334 src/exit/gnunet-daemon-exit.c:3346
 #, c-format
 msgid "Service `%s' configured for IPv4, but IPv4 is disabled!\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3337
+#: src/exit/gnunet-daemon-exit.c:3357
 #, c-format
 msgid "No IP addresses found for hostname `%s' of service `%s'!\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3527
+#: src/exit/gnunet-daemon-exit.c:3534
+#, c-format
+msgid "`%s' must be installed SUID, EXIT will not work\n"
+msgstr ""
+
+#: src/exit/gnunet-daemon-exit.c:3550
 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:3535
+#: src/exit/gnunet-daemon-exit.c:3558
 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:3542
+#: src/exit/gnunet-daemon-exit.c:3565
 msgid ""
 "Cannot enable IPv4 exit but disable IPv4 on TUN interface, will use "
 "ENABLE_IPv4=YES\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3548
+#: src/exit/gnunet-daemon-exit.c:3571
 msgid ""
 "Cannot enable IPv6 exit but disable IPv6 on TUN interface, will use "
 "ENABLE_IPv6=YES\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3554 src/exit/gnunet-daemon-exit.c:3717
+#: src/exit/gnunet-daemon-exit.c:3577 src/exit/gnunet-daemon-exit.c:3742
 #: src/pt/gnunet-daemon-pt.c:1247
 msgid "No useful service enabled.  Exiting.\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3664
+#: src/exit/gnunet-daemon-exit.c:3689
 msgid "Must be a number"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3813
+#: src/exit/gnunet-daemon-exit.c:3838
 msgid "Daemon to run to provide an IP exit node for the VPN"
 msgstr ""
 
@@ -2712,11 +2832,6 @@
 msgid "Disconnected from peer %s\n"
 msgstr "`%s' hat sich mit `%s' verbunden.\n"
 
-#: src/experimentation/gnunet-daemon-experimentation_nodes.c:1104
-#, fuzzy
-msgid "Failed to connect to CORE service!\n"
-msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
-
 #: src/experimentation/gnunet-daemon-experimentation_scheduler.c:108
 #, c-format
 msgid "Peer `%s' did not respond to request for experiment `%s'\n"
@@ -3047,12 +3162,12 @@
 msgid "Internal error."
 msgstr "Unbekannter Fehler.\n"
 
-#: src/fs/fs_search.c:813
+#: src/fs/fs_search.c:751 src/fs/fs_search.c:817
 #, fuzzy, c-format
 msgid "Failed to parse URI `%s': %s\n"
 msgstr "Datei `%s' hat URI: %s\n"
 
-#: src/fs/fs_search.c:872
+#: src/fs/fs_search.c:876
 #, c-format
 msgid "Got result with unknown block type `%d', ignoring"
 msgstr ""
@@ -3114,79 +3229,101 @@
 msgid "Failed to compute hash of file."
 msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden."
 
-#: src/fs/fs_uri.c:222
-#, no-c-format
-msgid "`%' must be followed by HEX number"
-msgstr ""
+#: src/fs/fs_uri.c:223
+#, fuzzy, no-c-format
+msgid "Malformed KSK URI (`%' must be followed by HEX number)"
+msgstr "Ungültige URL `%s' (muss mit `%s' beginnen)\n"
 
-#: src/fs/fs_uri.c:281
+#: src/fs/fs_uri.c:283
 #, fuzzy
 msgid "Malformed KSK URI (must not begin or end with `+')"
 msgstr "Ungültige URL `%s' (muss mit `%s' beginnen)\n"
 
-#: src/fs/fs_uri.c:299
-msgid "`++' not allowed in KSK URI"
+#: src/fs/fs_uri.c:301
+#, fuzzy
+msgid "Malformed KSK URI (`++' not allowed)"
+msgstr "Ungültige URL `%s' (muss mit `%s' beginnen)\n"
+
+#: src/fs/fs_uri.c:308
+#, fuzzy
+msgid "Malformed KSK URI (quotes not balanced)"
+msgstr "Ungültige URL `%s' (muss mit `%s' beginnen)\n"
+
+#: src/fs/fs_uri.c:379
+msgid "Malformed SKS URI (wrong syntax)"
 msgstr ""
 
-#: src/fs/fs_uri.c:306
-msgid "Quotes not balanced in KSK URI"
+#: src/fs/fs_uri.c:423
+msgid "Malformed CHK URI (wrong syntax)"
 msgstr ""
 
-#: src/fs/fs_uri.c:376
-msgid "Malformed SKS URI"
+#: src/fs/fs_uri.c:438
+msgid "Malformed CHK URI (failed to decode CHK)"
 msgstr ""
 
-#: src/fs/fs_uri.c:419 src/fs/fs_uri.c:434
-msgid "Malformed CHK URI"
+#: src/fs/fs_uri.c:517
+msgid "LOC URI malformed (wrong syntax)"
 msgstr ""
 
-#: src/fs/fs_uri.c:512 src/fs/fs_uri.c:580
-msgid "SKS URI malformed"
+#: src/fs/fs_uri.c:532
+msgid "LOC URI malformed (no CHK)"
 msgstr ""
 
-#: src/fs/fs_uri.c:527 src/fs/fs_uri.c:537
-msgid "LOC URI malformed"
+#: src/fs/fs_uri.c:542
+msgid "LOC URI malformed (missing LOC)"
 msgstr ""
 
-#: src/fs/fs_uri.c:545 src/fs/fs_uri.c:553
+#: src/fs/fs_uri.c:550
+msgid "LOC URI malformed (wrong syntax for public key)"
+msgstr ""
+
+#: src/fs/fs_uri.c:558
 msgid "LOC URI malformed (could not decode public key)"
 msgstr ""
 
-#: src/fs/fs_uri.c:559
-msgid "SKS URI malformed (could not find signature)"
+#: src/fs/fs_uri.c:564
+msgid "LOC URI malformed (could not find signature)"
 msgstr ""
 
-#: src/fs/fs_uri.c:565 src/fs/fs_uri.c:574
-msgid "SKS URI malformed (could not decode signature)"
+#: src/fs/fs_uri.c:570
+msgid "LOC URI malformed (wrong syntax for signature)"
 msgstr ""
 
-#: src/fs/fs_uri.c:586
-msgid "SKS URI malformed (could not parse expiration time)"
+#: src/fs/fs_uri.c:579
+msgid "LOC URI malformed (could not decode signature)"
 msgstr ""
 
-#: src/fs/fs_uri.c:598
-msgid "SKS URI malformed (signature failed validation)"
+#: src/fs/fs_uri.c:585
+msgid "LOC URI malformed (wrong syntax for expiration time)"
 msgstr ""
 
-#: src/fs/fs_uri.c:636
+#: src/fs/fs_uri.c:591
+msgid "LOC URI malformed (could not parse expiration time)"
+msgstr ""
+
+#: src/fs/fs_uri.c:603
+msgid "LOC URI malformed (signature failed validation)"
+msgstr ""
+
+#: src/fs/fs_uri.c:642
 msgid "Unrecognized URI type"
 msgstr ""
 
-#: src/fs/fs_uri.c:860
+#: src/fs/fs_uri.c:866
 #, fuzzy
 msgid "Lacking key configuration settings.\n"
 msgstr "GNUnet Konfiguration"
 
-#: src/fs/fs_uri.c:866
+#: src/fs/fs_uri.c:872
 #, fuzzy, c-format
 msgid "Could not access hostkey file `%s'.\n"
 msgstr "Konfigurationsdatei `%s' konnte nicht geparst werden.\n"
 
-#: src/fs/fs_uri.c:1050 src/fs/fs_uri.c:1077
+#: src/fs/fs_uri.c:1057 src/fs/fs_uri.c:1084
 msgid "No keywords specified!\n"
 msgstr "Keine Schlüsselwörter angegeben!\n"
 
-#: src/fs/fs_uri.c:1083
+#: src/fs/fs_uri.c:1090
 msgid "Number of double-quotes not balanced!\n"
 msgstr ""
 
@@ -3519,8 +3656,8 @@
 msgstr "Option `%s' macht keinen Sinn ohne die Option `%s'.\n"
 
 #: src/fs/gnunet-publish.c:778 src/fs/gnunet-publish.c:785
-#: src/transport/gnunet-transport.c:1284 src/transport/gnunet-transport.c:1314
-#: src/transport/gnunet-transport.c:1344
+#: src/transport/gnunet-transport.c:1387 src/transport/gnunet-transport.c:1417
+#: src/transport/gnunet-transport.c:1447
 #, c-format
 msgid "Option `%s' makes no sense without option `%s'.\n"
 msgstr "Option `%s' macht keinen Sinn ohne die Option `%s'.\n"
@@ -3628,22 +3765,58 @@
 msgid "Search GNUnet for files that were published on GNUnet"
 msgstr ""
 
-#: src/fs/gnunet-service-fs.c:271
+#: src/fs/gnunet-service-fs.c:277
 msgid "# running average P2P latency (ms)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs.c:326 src/fs/gnunet-service-fs.c:539
+#: src/fs/gnunet-service-fs.c:332 src/fs/gnunet-service-fs.c:545
 #, fuzzy
 msgid "# Loopback routes suppressed"
 msgstr "# gap Routing erfolgreich (insgesamt)"
 
-#: src/fs/gnunet-service-fs.c:639 src/hostlist/gnunet-daemon-hostlist.c:288
-#: src/topology/gnunet-daemon-topology.c:1254
-#: src/topology/gnunet-daemon-topology.c:1261
+#: src/fs/gnunet-service-fs.c:645 src/hostlist/gnunet-daemon-hostlist.c:303
+#: src/topology/gnunet-daemon-topology.c:1260
+#: src/topology/gnunet-daemon-topology.c:1267
 #, fuzzy, c-format
 msgid "Failed to connect to `%s' service.\n"
 msgstr "`%s' Dienst konnte nicht initialisiert werden.\n"
 
+#: src/fs/gnunet-service-fs_cadet_client.c:484
+#, fuzzy
+msgid "# replies received via cadet"
+msgstr "# Bytes empfangen über TCP"
+
+#: src/fs/gnunet-service-fs_cadet_client.c:498
+#, fuzzy
+msgid "# replies received via cadet dropped"
+msgstr "# Bytes empfangen über TCP"
+
+#: src/fs/gnunet-service-fs_cadet_server.c:260
+#, fuzzy
+msgid "# Blocks transferred via cadet"
+msgstr "# Bytes des Typs %d übertragen"
+
+#: src/fs/gnunet-service-fs_cadet_server.c:352
+#, fuzzy
+msgid "# queries received via cadet not answered"
+msgstr "# Bytes empfangen über TCP"
+
+#: src/fs/gnunet-service-fs_cadet_server.c:432
+#, fuzzy
+msgid "# queries received via cadet"
+msgstr "# Bytes empfangen über TCP"
+
+#: src/fs/gnunet-service-fs_cadet_server.c:476
+#, fuzzy
+msgid "# cadet client connections rejected"
+msgstr "GNUnet Konfiguration"
+
+#: src/fs/gnunet-service-fs_cadet_server.c:482
+#: src/fs/gnunet-service-fs_cadet_server.c:522
+#, fuzzy
+msgid "# cadet connections active"
+msgstr "# verbundener Knoten"
+
 #: src/fs/gnunet-service-fs_cp.c:682
 #, fuzzy
 msgid "# migration stop messages received"
@@ -3803,42 +3976,6 @@
 msgid "# client searches updated (merged content seen list)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_mesh_client.c:484
-#, fuzzy
-msgid "# replies received via mesh"
-msgstr "# Bytes empfangen über TCP"
-
-#: src/fs/gnunet-service-fs_mesh_client.c:498
-#, fuzzy
-msgid "# replies received via mesh dropped"
-msgstr "# Bytes empfangen über TCP"
-
-#: src/fs/gnunet-service-fs_mesh_server.c:260
-#, fuzzy
-msgid "# Blocks transferred via mesh"
-msgstr "# Bytes des Typs %d übertragen"
-
-#: src/fs/gnunet-service-fs_mesh_server.c:352
-#, fuzzy
-msgid "# queries received via mesh not answered"
-msgstr "# Bytes empfangen über TCP"
-
-#: src/fs/gnunet-service-fs_mesh_server.c:432
-#, fuzzy
-msgid "# queries received via mesh"
-msgstr "# Bytes empfangen über TCP"
-
-#: src/fs/gnunet-service-fs_mesh_server.c:476
-#, fuzzy
-msgid "# mesh client connections rejected"
-msgstr "GNUnet Konfiguration"
-
-#: src/fs/gnunet-service-fs_mesh_server.c:482
-#: src/fs/gnunet-service-fs_mesh_server.c:522
-#, fuzzy
-msgid "# mesh connections active"
-msgstr "# verbundener Knoten"
-
 #: src/fs/gnunet-service-fs_pe.c:269
 msgid "# average retransmission delay (ms)"
 msgstr ""
@@ -3925,7 +4062,7 @@
 
 #: src/fs/gnunet-service-fs_pr.c:1192
 #, fuzzy
-msgid "# Replies received from MESH"
+msgid "# Replies received from CADET"
 msgstr "# Bytes empfangen über HTTP"
 
 #: src/fs/gnunet-service-fs_pr.c:1244
@@ -4033,7 +4170,7 @@
 msgid "Refusing `%s' request to HTTP server\n"
 msgstr "Fehler beim Senden einer `%s' Anfrage an den SMTP Server.\n"
 
-#: src/gns/gnunet-bcd.c:355 src/hostlist/hostlist-server.c:567
+#: src/gns/gnunet-bcd.c:355 src/hostlist/gnunet-daemon-hostlist_server.c:695
 #, fuzzy, c-format
 msgid "Invalid port number %llu.  Exiting.\n"
 msgstr "Ungültige Parameter. Abbruch.\n"
@@ -4191,13 +4328,17 @@
 msgid "This program will import some GNS authorities into your GNS namestore."
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:105 src/hostlist/hostlist-client.c:469
-#: src/hostlist/hostlist-client.c:683 src/hostlist/hostlist-client.c:689
-#: src/hostlist/hostlist-client.c:741 src/hostlist/hostlist-client.c:750
-#: src/hostlist/hostlist-client.c:871 src/hostlist/hostlist-client.c:963
-#: src/hostlist/hostlist-client.c:968
-#: src/transport/plugin_transport_http_client.c:1062
-#: src/transport/plugin_transport_http_client.c:1077
+#: src/gns/gnunet-gns-proxy.c:105
+#: src/hostlist/gnunet-daemon-hostlist_client.c:524
+#: src/hostlist/gnunet-daemon-hostlist_client.c:741
+#: src/hostlist/gnunet-daemon-hostlist_client.c:747
+#: src/hostlist/gnunet-daemon-hostlist_client.c:800
+#: src/hostlist/gnunet-daemon-hostlist_client.c:809
+#: src/hostlist/gnunet-daemon-hostlist_client.c:931
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1026
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1031
+#: src/transport/plugin_transport_http_client.c:1095
+#: src/transport/plugin_transport_http_client.c:1110
 #, c-format
 msgid "%s failed at %s:%d: `%s'\n"
 msgstr "`%s' schlug fehl bei %s:%d mit dem Fehler: `%s'.\n"
@@ -4342,36 +4483,36 @@
 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:816
+#: src/gns/gnunet-service-gns_resolver.c:832
 #, 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:958
+#: src/gns/gnunet-service-gns_resolver.c:974
 #, c-format
 msgid "Skipping record of unsupported type %d\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns_resolver.c:1317
+#: src/gns/gnunet-service-gns_resolver.c:1333
 #, c-format
 msgid "GNS lookup resulted in DNS name that is too long (`%s')\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns_resolver.c:1817
+#: src/gns/gnunet-service-gns_resolver.c:1831
 msgid "GNS lookup recursion failed (no delegation record found)\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns_resolver.c:1841
+#: src/gns/gnunet-service-gns_resolver.c:1855
 #, 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:2123
+#: src/gns/gnunet-service-gns_resolver.c:2137
 #, c-format
 msgid "Zone %s was revoked, resolution fails\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns_resolver.c:2272
+#: src/gns/gnunet-service-gns_resolver.c:2286
 #, c-format
 msgid "Hostname `%s' is not well-formed, resolution fails\n"
 msgstr ""
@@ -4490,314 +4631,338 @@
 msgid "Modified %u addresses \n"
 msgstr ""
 
-#: src/hello/hello.c:944
+#: src/hello/hello.c:957
 #, fuzzy
 msgid "Failed to parse HELLO message: missing expiration time\n"
 msgstr "Fehler beim Speichern der Konfiguration!"
 
-#: src/hello/hello.c:953
+#: src/hello/hello.c:966
 #, fuzzy
 msgid "Failed to parse HELLO message: invalid expiration time\n"
 msgstr "Fehler beim Speichern der Konfiguration!"
 
-#: src/hello/hello.c:963
+#: src/hello/hello.c:976
 #, fuzzy
 msgid "Failed to parse HELLO message: malformed\n"
 msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
 
-#: src/hello/hello.c:973
+#: src/hello/hello.c:986
 #, fuzzy
 msgid "Failed to parse HELLO message: missing transport plugin\n"
 msgstr "Anwendung `%s' konnte nicht initialisiert werden.\n"
 
-#: src/hello/hello.c:990
+#: src/hello/hello.c:1004
 #, c-format
-msgid "Plugin `%s' not found\n"
+msgid "Plugin `%s' not found, skipping address\n"
 msgstr ""
 
-#: src/hello/hello.c:999
+#: src/hello/hello.c:1012
 #, c-format
 msgid "Plugin `%s' does not support URIs yet\n"
 msgstr ""
 
-#: src/hello/hello.c:1018
+#: src/hello/hello.c:1031
 #, fuzzy, c-format
 msgid "Failed to parse `%s' as an address for plugin `%s'\n"
 msgstr "Fehler beim Binden an UDP Port %d.\n"
 
-#: src/hostlist/gnunet-daemon-hostlist.c:259
+#: src/hello/hello.c:1104
+#, c-format
+msgid "HELLO URI contained %u addresses, added %u addresses\n"
+msgstr ""
+
+#: src/hostlist/gnunet-daemon-hostlist.c:274
 msgid ""
 "None of the functions for the hostlist daemon were enabled.  I have no "
 "reason to run!\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist.c:308
+#: src/hostlist/gnunet-daemon-hostlist.c:323
 msgid "advertise our hostlist to other peers"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist.c:313
+#: src/hostlist/gnunet-daemon-hostlist.c:328
 msgid ""
 "bootstrap using hostlists (it is highly recommended that you always use this "
 "option)"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist.c:316
+#: src/hostlist/gnunet-daemon-hostlist.c:331
 msgid "enable learning about hostlist servers from other peers"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist.c:320
+#: src/hostlist/gnunet-daemon-hostlist.c:335
 msgid "provide a hostlist server"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist.c:335
+#: src/hostlist/gnunet-daemon-hostlist.c:350
 msgid "GNUnet hostlist server and client"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:288
+#: src/hostlist/gnunet-daemon-hostlist_client.c:343
 msgid "# bytes downloaded from hostlist servers"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:309 src/hostlist/hostlist-client.c:339
+#: src/hostlist/gnunet-daemon-hostlist_client.c:364
+#: src/hostlist/gnunet-daemon-hostlist_client.c:394
 #, fuzzy
 msgid "# invalid HELLOs downloaded from hostlist servers"
 msgstr "# Hellos per HTTP heruntergeladen"
 
-#: src/hostlist/hostlist-client.c:312 src/hostlist/hostlist-client.c:342
+#: src/hostlist/gnunet-daemon-hostlist_client.c:367
+#: src/hostlist/gnunet-daemon-hostlist_client.c:397
 #, fuzzy, c-format
 msgid "Invalid `%s' message received from hostlist at `%s'\n"
 msgstr "Ungültige `%s' Nachricht von Knoten `%s' empfangen.\n"
 
-#: src/hostlist/hostlist-client.c:330
+#: src/hostlist/gnunet-daemon-hostlist_client.c:385
 #, fuzzy
 msgid "# valid HELLOs downloaded from hostlist servers"
 msgstr "# Hellos per HTTP heruntergeladen"
 
-#: src/hostlist/hostlist-client.c:592 src/hostlist/hostlist-client.c:1333
+#: src/hostlist/gnunet-daemon-hostlist_client.c:650
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1401
 msgid "# advertised hostlist URIs"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:622
+#: src/hostlist/gnunet-daemon-hostlist_client.c:680
 #, c-format
 msgid "# advertised URI `%s' downloaded"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:664
+#: src/hostlist/gnunet-daemon-hostlist_client.c:722
 #, c-format
 msgid ""
 "Advertised hostlist with URI `%s' could not be downloaded. Advertised URI "
 "gets dismissed.\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:802
+#: src/hostlist/gnunet-daemon-hostlist_client.c:862
 #, fuzzy, c-format
 msgid "Timeout trying to download hostlist from `%s'\n"
 msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
 
-#: src/hostlist/hostlist-client.c:816
+#: src/hostlist/gnunet-daemon-hostlist_client.c:876
 #, c-format
 msgid "Download limit of %u bytes exceeded, stopping download\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:836
+#: src/hostlist/gnunet-daemon-hostlist_client.c:896
 #, fuzzy, c-format
 msgid "Download of hostlist from `%s' failed: `%s'\n"
 msgstr ""
 "Upload von `%s' komplett, derzeitige durchschnittliche Geschwindigkeit "
 "beträgt %8.3f KB/s.\n"
 
-#: src/hostlist/hostlist-client.c:842
+#: src/hostlist/gnunet-daemon-hostlist_client.c:902
 #, fuzzy, c-format
 msgid "Download of hostlist `%s' completed.\n"
 msgstr ""
 "Upload von `%s' komplett, derzeitige durchschnittliche Geschwindigkeit "
 "beträgt %8.3f KB/s.\n"
 
-#: src/hostlist/hostlist-client.c:850
+#: src/hostlist/gnunet-daemon-hostlist_client.c:910
 #, c-format
 msgid "Adding successfully tested hostlist `%s' datastore.\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:903
+#: src/hostlist/gnunet-daemon-hostlist_client.c:963
 #, c-format
 msgid "Bootstrapping using hostlist at `%s'.\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:911
+#: src/hostlist/gnunet-daemon-hostlist_client.c:971
 msgid "# hostlist downloads initiated"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1040 src/hostlist/hostlist-client.c:1506
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1103
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1646
 msgid "# milliseconds between hostlist downloads"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1049
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1112
 #, c-format
 msgid "Have %u/%u connections.  Will consider downloading hostlist in %s\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1109 src/hostlist/hostlist-client.c:1125
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1172
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1188
 #, fuzzy
 msgid "# active connections"
 msgstr "GNUnet Konfiguration"
 
-#: src/hostlist/hostlist-client.c:1280
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1347
 #, fuzzy, c-format
 msgid "Loading saved hostlist entries from file `%s' \n"
 msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
 
-#: src/hostlist/hostlist-client.c:1285
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1352
 #, fuzzy, c-format
 msgid "Hostlist file `%s' does not exist\n"
 msgstr "Sitzungsschlüssel von Knoten `%s' konnte nicht überprüft werden.\n"
 
-#: src/hostlist/hostlist-client.c:1296
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1361
 #, fuzzy, c-format
 msgid "Could not open file `%s' for reading to load hostlists: %s\n"
 msgstr "Datei wurde als `%s' gespeichert.\n"
 
-#: src/hostlist/hostlist-client.c:1329
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1395
 #, c-format
 msgid "%u hostlist URIs loaded from file\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1331
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1398
 msgid "# hostlist URIs read from file"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1376
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1445
 #, fuzzy, c-format
 msgid "Could not open file `%s' for writing to save hostlists: %s\n"
 msgstr "Datei wurde als `%s' gespeichert.\n"
 
-#: src/hostlist/hostlist-client.c:1381
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1450
 #, fuzzy, c-format
 msgid "Writing %u hostlist URIs to `%s'\n"
 msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
 
-#: src/hostlist/hostlist-client.c:1405 src/hostlist/hostlist-client.c:1422
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1474
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1491
 #, c-format
 msgid "Error writing hostlist URIs to file `%s'\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1417
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1486
 msgid "# hostlist URIs written to file"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1471
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1581
+#: src/transport/plugin_transport_http_client.c:1866
+#, c-format
+msgid "Invalid proxy type: `%s', disabling proxy! Check configuration!\n"
+msgstr ""
+
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1611
 msgid "Learning is enabled on this peer\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1483
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1623
 msgid "Learning is not enabled on this peer\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1495
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1635
 #, c-format
 msgid ""
 "Since learning is not enabled on this peer, hostlist file `%s' was removed\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1499
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1639
 #, fuzzy, c-format
 msgid "Hostlist file `%s' could not be removed\n"
 msgstr "Sitzungsschlüssel von Knoten `%s' konnte nicht überprüft werden.\n"
 
-#: src/hostlist/hostlist-server.c:137
+#: src/hostlist/gnunet-daemon-hostlist_server.c:143
 #, fuzzy
 msgid "bytes in hostlist"
 msgstr "# bytes in der Datenbank"
 
-#: src/hostlist/hostlist-server.c:161
+#: src/hostlist/gnunet-daemon-hostlist_server.c:168
 msgid "expired addresses encountered"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:189 src/hostlist/hostlist-server.c:425
-#: src/peerinfo-tool/gnunet-peerinfo.c:350
-#: src/peerinfo-tool/gnunet-peerinfo.c:419
-#: src/peerinfo-tool/gnunet-peerinfo.c:490
+#: src/hostlist/gnunet-daemon-hostlist_server.c:203
+#: src/hostlist/gnunet-daemon-hostlist_server.c:534
+#: src/peerinfo-tool/gnunet-peerinfo.c:361
+#: src/peerinfo-tool/gnunet-peerinfo.c:430
+#: src/peerinfo-tool/gnunet-peerinfo.c:501
 #: src/topology/gnunet-daemon-topology.c:925
 #, fuzzy, c-format
 msgid "Error in communication with PEERINFO service: %s\n"
 msgstr "Informationen über andere GNUnet Knoten ausgeben."
 
-#: src/hostlist/hostlist-server.c:210
+#: src/hostlist/gnunet-daemon-hostlist_server.c:227
 msgid "HELLOs without addresses encountered (ignored)"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:224
+#: src/hostlist/gnunet-daemon-hostlist_server.c:243
 msgid "bytes not included in hostlist (size limit)"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:268
+#: src/hostlist/gnunet-daemon-hostlist_server.c:363
 #, fuzzy, c-format
 msgid "Refusing `%s' request to hostlist server\n"
 msgstr "Fehler beim Senden einer `%s' Anfrage an den SMTP Server.\n"
 
-#: src/hostlist/hostlist-server.c:271
+#: src/hostlist/gnunet-daemon-hostlist_server.c:366
 #, fuzzy
 msgid "hostlist requests refused (not HTTP GET)"
 msgstr "# Client Trace-Anfragen empfangen"
 
-#: src/hostlist/hostlist-server.c:284
+#: src/hostlist/gnunet-daemon-hostlist_server.c:380
 #, c-format
 msgid "Refusing `%s' request with %llu bytes of upload data\n"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:288
+#: src/hostlist/gnunet-daemon-hostlist_server.c:384
 #, fuzzy
 msgid "hostlist requests refused (upload data)"
 msgstr "# Client Trace-Anfragen empfangen"
 
-#: src/hostlist/hostlist-server.c:296
+#: src/hostlist/gnunet-daemon-hostlist_server.c:391
 msgid "Could not handle hostlist request since I do not have a response yet\n"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:299
+#: src/hostlist/gnunet-daemon-hostlist_server.c:394
 #, fuzzy
 msgid "hostlist requests refused (not ready)"
 msgstr "# Client Trace-Anfragen empfangen"
 
-#: src/hostlist/hostlist-server.c:303
+#: src/hostlist/gnunet-daemon-hostlist_server.c:399
 msgid "Received request for our hostlist\n"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:304
+#: src/hostlist/gnunet-daemon-hostlist_server.c:401
 #, fuzzy
 msgid "hostlist requests processed"
 msgstr "# Client Trace-Anfragen empfangen"
 
-#: src/hostlist/hostlist-server.c:346
+#: src/hostlist/gnunet-daemon-hostlist_server.c:448
 #, fuzzy
 msgid "# hostlist advertisements send"
 msgstr "# Bekanntmachungen von anderen übertragen"
 
-#: src/hostlist/hostlist-server.c:390
+#: src/hostlist/gnunet-daemon-hostlist_server.c:496
 msgid "Advertisement message could not be queued by core\n"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:557 src/peerinfo-tool/gnunet-peerinfo.c:639
-#: src/transport/gnunet-service-transport.c:1114
+#: src/hostlist/gnunet-daemon-hostlist_server.c:683
+#: src/peerinfo-tool/gnunet-peerinfo.c:650
+#: src/transport/gnunet-service-transport.c:1136
 #, fuzzy
 msgid "Could not access PEERINFO service.  Exiting.\n"
 msgstr "Auf die Namespace Informationen konnte nicht zugegriffen werden.\n"
 
-#: src/hostlist/hostlist-server.c:576
+#: src/hostlist/gnunet-daemon-hostlist_server.c:707
 #, c-format
 msgid "Hostlist service starts on %s:%llu\n"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:590
+#: src/hostlist/gnunet-daemon-hostlist_server.c:722
 #, fuzzy, c-format
 msgid "Address to obtain hostlist: `%s'\n"
 msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
 
-#: src/hostlist/hostlist-server.c:630
+#: src/hostlist/gnunet-daemon-hostlist_server.c:760
 #, fuzzy, c-format
-msgid "`%s' is not a valid IP address! Ignoring BINDTOIP.\n"
+msgid "`%s' is not a valid IPv4 address! Ignoring BINDTOIPV4.\n"
 msgstr "`%s' ist nicht verfügbar."
 
-#: src/hostlist/hostlist-server.c:673
+#: src/hostlist/gnunet-daemon-hostlist_server.c:780
 #, fuzzy, c-format
+msgid "`%s' is not a valid IPv6 address! Ignoring BINDTOIPV6.\n"
+msgstr "`%s' ist nicht verfügbar."
+
+#: src/hostlist/gnunet-daemon-hostlist_server.c:820
+#, fuzzy, c-format
 msgid "Could not start hostlist HTTP server on port %u\n"
 msgstr "Der Transportdienst auf Port %d konnte nicht gestartet werden.\n"
 
@@ -4888,57 +5053,6 @@
 msgid "Failed to create directory `%s' for storing egos\n"
 msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
 
-#: src/mesh/gnunet-mesh.c:357
-#, fuzzy, c-format
-msgid "Invalid target `%s'\n"
-msgstr "Ungültiger Parameter: `%s'\n"
-
-#: src/mesh/gnunet-mesh.c:607
-#, fuzzy, c-format
-msgid "Invalid peer ID `%s'\n"
-msgstr "Ungültiger Parameter: `%s'\n"
-
-#: src/mesh/gnunet-mesh.c:650
-#, fuzzy, c-format
-msgid "Invalid tunnel owner `%s'\n"
-msgstr "Ungültiger Parameter: `%s'\n"
-
-#: src/mesh/gnunet-mesh.c:716
-msgid "You must NOT give a TARGETwhen using 'request all' options\n"
-msgstr ""
-
-#: src/mesh/gnunet-mesh.c:807
-#, fuzzy
-msgid "provide information about a particular connection"
-msgstr "Informationen über andere GNUnet Knoten ausgeben."
-
-#: src/mesh/gnunet-mesh.c:810
-msgid "activate echo mode"
-msgstr ""
-
-#: src/mesh/gnunet-mesh.c:816
-msgid "port to listen to (default; 0)"
-msgstr ""
-
-#: src/mesh/gnunet-mesh.c:819 src/mesh/gnunet-mesh.c:822
-#, fuzzy
-msgid "provide information about all peers"
-msgstr "Informationen über andere GNUnet Knoten ausgeben."
-
-#: src/mesh/gnunet-mesh.c:825
-#, fuzzy
-msgid "provide information about a particular tunnel"
-msgstr "Informationen über andere GNUnet Knoten ausgeben."
-
-#: src/mesh/gnunet-mesh.c:828
-#, fuzzy
-msgid "provide information about all tunnels"
-msgstr "Informationen über andere GNUnet Knoten ausgeben."
-
-#: src/mesh/gnunet-service-mesh_peer.c:390
-msgid "Wrong CORE service\n"
-msgstr ""
-
 #: src/mysql/mysql.c:174
 #, c-format
 msgid "Trying to use file `%s' for MySQL configuration.\n"
@@ -4954,7 +5068,7 @@
 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:397
+#: src/namecache/gnunet-namecache.c:124 src/namestore/gnunet-namestore.c:402
 #, c-format
 msgid "\tCorrupt or unsupported record of type %u\n"
 msgstr ""
@@ -4964,7 +5078,7 @@
 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:695
+#: src/namecache/gnunet-namecache.c:195 src/namestore/gnunet-namestore.c:783
 #, fuzzy, c-format
 msgid "Invalid public key for reverse lookup `%s'\n"
 msgstr "Ungültiger Parameter: `%s'\n"
@@ -4974,7 +5088,7 @@
 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:931
+#: src/namecache/gnunet-namecache.c:234 src/namestore/gnunet-namestore.c:1020
 msgid "name of the record to add/delete/display"
 msgstr ""
 
@@ -4983,7 +5097,7 @@
 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:963
+#: src/namecache/gnunet-namecache.c:248 src/namestore/gnunet-namestore.c:1055
 #, fuzzy
 msgid "GNUnet zone manipulation tool"
 msgstr "GNUnet Konfiguration"
@@ -4998,155 +5112,170 @@
 msgid "Failed to create indices\n"
 msgstr "Namespace `%s' konnte nicht erstellt werden (existiert bereits?).\n"
 
-#: src/namestore/gnunet-namestore.c:303
+#: src/namestore/gnunet-namestore.c:308
 #, fuzzy, c-format
 msgid "Adding record failed: %s\n"
 msgstr ""
 "\n"
 "Fehler beim Uploaden der Datei: %s\n"
 
-#: src/namestore/gnunet-namestore.c:332
+#: src/namestore/gnunet-namestore.c:337
 #, 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:339
+#: src/namestore/gnunet-namestore.c:344
 #, fuzzy, c-format
 msgid "Deleting record failed%s%s\n"
 msgstr ""
 "\n"
 "Fehler beim Uploaden der Datei: %s\n"
 
-#: src/namestore/gnunet-namestore.c:558
+#: src/namestore/gnunet-namestore.c:567
 #, c-format
+msgid "There are no records under label `%s' that could be deleted.\n"
+msgstr ""
+
+#: src/namestore/gnunet-namestore.c:606
+#, c-format
+msgid ""
+"There are no records under label `%s' that match the request for deletion.\n"
+msgstr ""
+
+#: src/namestore/gnunet-namestore.c:647
+#, c-format
 msgid "No options given\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:569
+#: src/namestore/gnunet-namestore.c:658
 #: 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: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
+#: src/namestore/gnunet-namestore.c:666 src/namestore/gnunet-namestore.c:675
+#: src/namestore/gnunet-namestore.c:692 src/namestore/gnunet-namestore.c:714
+#: src/namestore/gnunet-namestore.c:754
 #, fuzzy, c-format
 msgid "Missing option `%s' for operation `%s'\n"
 msgstr "Konfigurationsdatei `%s' wurde erzeugt.\n"
 
-#: src/namestore/gnunet-namestore.c:578 src/namestore/gnunet-namestore.c:587
-#: src/namestore/gnunet-namestore.c:604 src/namestore/gnunet-namestore.c:626
+#: src/namestore/gnunet-namestore.c:667 src/namestore/gnunet-namestore.c:676
+#: src/namestore/gnunet-namestore.c:693 src/namestore/gnunet-namestore.c:715
 msgid "add"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:595
+#: src/namestore/gnunet-namestore.c:684
 #, 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:615
+#: src/namestore/gnunet-namestore.c:704
 #, 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:651
+#: src/namestore/gnunet-namestore.c:740
 #, fuzzy, c-format
 msgid "Invalid time format `%s'\n"
 msgstr "Ungültiger Parameter: `%s'\n"
 
-#: src/namestore/gnunet-namestore.c:666
+#: src/namestore/gnunet-namestore.c:755
 msgid "del"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:715
-#: src/peerinfo-tool/gnunet-peerinfo.c:723
+#: src/namestore/gnunet-namestore.c:803
+#: src/peerinfo-tool/gnunet-peerinfo.c:734
 #, fuzzy, c-format
 msgid "Invalid URI `%s'\n"
 msgstr "Ungültiger Parameter: `%s'\n"
 
-#: src/namestore/gnunet-namestore.c:750
+#: src/namestore/gnunet-namestore.c:838
 #, fuzzy, c-format
 msgid "Invalid nick `%s'\n"
 msgstr "Ungültiger Parameter: `%s'\n"
 
-#: src/namestore/gnunet-namestore.c:790
+#: src/namestore/gnunet-namestore.c:878
 #, fuzzy, c-format
 msgid "Ego `%s' not known to identity service\n"
 msgstr "`%s': unbekannter Dienst: %s\n"
 
-#: src/namestore/gnunet-namestore.c:817
+#: src/namestore/gnunet-namestore.c:905
 #, fuzzy, c-format
 msgid "No default ego configured in identity service\n"
 msgstr "`%s': unbekannter Dienst: %s\n"
 
-#: src/namestore/gnunet-namestore.c:853
+#: src/namestore/gnunet-namestore.c:941
 #, fuzzy, c-format
 msgid "Identity service is not running\n"
 msgstr "`%s' ist keine Datei.\n"
 
-#: src/namestore/gnunet-namestore.c:865
+#: src/namestore/gnunet-namestore.c:953
 #, fuzzy, c-format
 msgid "Cannot connect to identity service\n"
 msgstr "Verbindung zu gnunetd konnte nicht hergestellt werden.\n"
 
-#: src/namestore/gnunet-namestore.c:913
+#: src/namestore/gnunet-namestore.c:1002
 msgid "add record"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:916
+#: src/namestore/gnunet-namestore.c:1005
 msgid "delete record"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:919
+#: src/namestore/gnunet-namestore.c:1008
 msgid "display records"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:922
+#: src/namestore/gnunet-namestore.c:1011
 msgid ""
 "expiration time for record to use (for adding only), \"never\" is possible"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:925
+#: src/namestore/gnunet-namestore.c:1014
 #, fuzzy
 msgid "set the desired nick name for the zone"
 msgstr "Informationen über andere GNUnet Knoten ausgeben."
 
-#: src/namestore/gnunet-namestore.c:928
+#: src/namestore/gnunet-namestore.c:1017
 #, fuzzy
 msgid "monitor changes in the namestore"
 msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden."
 
-#: src/namestore/gnunet-namestore.c:934
+#: src/namestore/gnunet-namestore.c:1023
 #, fuzzy
 msgid "determine our name for the given PKEY"
 msgstr "Informationen über andere GNUnet Knoten ausgeben."
 
-#: src/namestore/gnunet-namestore.c:937
+#: src/namestore/gnunet-namestore.c:1026
 msgid "type of the record to add/delete/display"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:940
+#: src/namestore/gnunet-namestore.c:1029
 msgid "URI to import into our zone"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:943
+#: src/namestore/gnunet-namestore.c:1032
 msgid "value of the record to add/delete"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:946
+#: src/namestore/gnunet-namestore.c:1035
 msgid "create or list public record"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:949
+#: src/namestore/gnunet-namestore.c:1038
+msgid "create record that is pending approval (and thus for now inactive)"
+msgstr ""
+
+#: src/namestore/gnunet-namestore.c:1041
 msgid ""
 "create shadow record (only valid if all other records of the same type have "
 "expired"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:952
+#: src/namestore/gnunet-namestore.c:1044
 msgid "name of the ego controlling the zone"
 msgstr ""
 
@@ -5228,59 +5357,63 @@
 msgid "GNUnet NAT traversal test helper daemon"
 msgstr ""
 
-#: src/nat/nat_auto.c:170
+#: src/nat/nat_auto.c:175
 msgid "NAT traversal with ICMP Server timed out.\n"
 msgstr ""
 
-#: src/nat/nat_auto.c:203
+#: src/nat/nat_auto.c:207
 msgid "NAT traversal with ICMP Server succeeded.\n"
 msgstr ""
 
-#: src/nat/nat_auto.c:204
+#: src/nat/nat_auto.c:208
 msgid "NAT traversal with ICMP Server failed.\n"
 msgstr ""
 
-#: src/nat/nat_auto.c:225
+#: src/nat/nat_auto.c:229
 #, fuzzy
 msgid "Testing connection reversal with ICMP server.\n"
 msgstr "Informationen über andere GNUnet Knoten ausgeben."
 
-#: src/nat/nat_auto.c:274
+#: src/nat/nat_auto.c:284
 #, fuzzy, c-format
 msgid "Detected external IP `%s'\n"
 msgstr "Ungültiger RPC `%s' empfangen.\n"
 
-#: src/nat/nat_auto.c:344
+#: src/nat/nat_auto.c:362
 msgid "This system has a global IPv6 address, setting IPv6 to supported.\n"
 msgstr ""
 
-#: src/nat/nat_auto.c:360
+#: src/nat/nat_auto.c:378
 #, 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:413
+#: src/nat/nat_auto.c:441
 msgid "upnpc found, enabling its use\n"
 msgstr ""
 
-#: src/nat/nat_auto.c:414
+#: src/nat/nat_auto.c:442
 #, fuzzy
 msgid "upnpc not found\n"
 msgstr "Kommando `%s' wurde nicht gefunden!\n"
 
-#: src/nat/nat_auto.c:447
-msgid "gnunet-helper-nat-server found, testing it\n"
+#: src/nat/nat_auto.c:472
+msgid "test_icmp_server not possible, as we have no public IPv4 address\n"
 msgstr ""
 
-#: src/nat/nat_auto.c:448
+#: src/nat/nat_auto.c:480
+msgid "test_icmp_server not possible, as we are not behind NAT\n"
+msgstr ""
+
+#: src/nat/nat_auto.c:488
 msgid "No working gnunet-helper-nat-server found\n"
 msgstr ""
 
-#: src/nat/nat_auto.c:482
+#: src/nat/nat_auto.c:527
 msgid "gnunet-helper-nat-client found, enabling it\n"
 msgstr ""
 
-#: src/nat/nat_auto.c:483
+#: src/nat/nat_auto.c:528
 msgid "gnunet-helper-nat-client not found or behind NAT, disabling it\n"
 msgstr ""
 
@@ -5294,60 +5427,49 @@
 msgid "Failed to start %s\n"
 msgstr "Fehler beim Starten der Collection.\n"
 
-#: src/nat/nat.c:1205
+#: src/nat/nat.c:1032
+msgid "Error while running upnp client:\n"
+msgstr ""
+
+#: src/nat/nat.c:1102
+#, fuzzy, c-format
+msgid "Failed to run upnp client for port %u\n"
+msgstr "SQLite Datenbank konnte nicht initialisiert werden.\n"
+
+#: src/nat/nat.c:1243
 msgid "malformed"
 msgstr ""
 
-#: src/nat/nat.c:1276 src/nat/nat.c:1288
+#: src/nat/nat.c:1297
+msgid ""
+"UPnP enabled in configuration, but UPnP client `upnpc` command not found, "
+"disabling UPnP \n"
+msgstr ""
+
+#: src/nat/nat.c:1324 src/nat/nat.c:1336
 #, c-format
 msgid ""
 "Configuration requires `%s', but binary is not installed properly (SUID bit "
 "not set).  Option disabled.\n"
 msgstr ""
 
-#: src/nat/nat.c:1426
+#: src/nat/nat.c:1474
 msgid "Internal IP address not known, cannot use ICMP NAT traversal method\n"
 msgstr ""
 
-#: src/nat/nat.c:1442
+#: src/nat/nat.c:1490
 #, c-format
 msgid "Running gnunet-helper-nat-client %s %s %u\n"
 msgstr ""
 
-#: src/nat/nat_mini.c:155
-msgid "no valid address was returned by `external-ip'"
-msgstr ""
-
-#: src/nat/nat_mini.c:175
-msgid "`external-ip' command not found"
-msgstr ""
-
-#: src/nat/nat_mini.c:201
+#: src/nat/nat_mini.c:203
 msgid "`external-ip' command not found\n"
 msgstr ""
 
-#: src/nat/nat_mini.c:366
-#, fuzzy
-msgid "Failed to run `upnpc` command"
-msgstr "Fehler beim Starten der Collection.\n"
-
-#: src/nat/nat_mini.c:512
-msgid "`upnpc' command took too long, process killed"
-msgstr ""
-
-#: src/nat/nat_mini.c:540
-msgid "`upnpc' command failed to establish port mapping"
-msgstr ""
-
-#: src/nat/nat_mini.c:604
+#: src/nat/nat_mini.c:609
 msgid "`upnpc' command not found\n"
 msgstr ""
 
-#: src/nat/nat_mini.c:608
-#, fuzzy
-msgid "`upnpc` command not found"
-msgstr "Kommando `%s' wurde nicht gefunden!\n"
-
 #: src/nat/nat_test.c:351
 #, fuzzy
 msgid "Failed to connect to `gnunet-nat-server'\n"
@@ -5358,6 +5480,11 @@
 msgid "Failed to create listen socket bound to `%s' for NAT test: %s\n"
 msgstr ""
 
+#: src/nat/nat_test.c:453
+#, fuzzy
+msgid "NAT test failed to start NAT library\n"
+msgstr "Fehler beim Starten der Collection.\n"
+
 #: src/nse/gnunet-nse.c:117
 #, fuzzy
 msgid "NSE service is not running\n"
@@ -5463,7 +5590,7 @@
 msgid "aborted due to explicit disconnect request"
 msgstr ""
 
-#: src/peerinfo/peerinfo_api.c:356
+#: src/peerinfo/peerinfo_api.c:356 src/sensor/sensor_api.c:519
 #, fuzzy
 msgid "failed to transmit request (service down?)"
 msgstr "Fehler beim Senden einer `%s' Anfrage an den SMTP Server.\n"
@@ -5490,89 +5617,94 @@
 msgid "Could not connect to `%s' service.\n"
 msgstr "Verbindung zu gnunetd konnte nicht hergestellt werden.\n"
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:232
+#: src/peerinfo-tool/gnunet-peerinfo.c:233
 #, fuzzy, c-format
 msgid "%sPeer `%s'\n"
 msgstr "Ich bin Peer `%s'.\n"
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:239
+#: src/peerinfo-tool/gnunet-peerinfo.c:240
 #, c-format
 msgid "\tExpires: %s \t %s\n"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:428
+#: src/peerinfo-tool/gnunet-peerinfo.c:282
 #, fuzzy, c-format
+msgid "Failure: Cannot convert address to string for peer `%s'\n"
+msgstr "Fehler beim Binden an UDP Port %d.\n"
+
+#: src/peerinfo-tool/gnunet-peerinfo.c:439
+#, fuzzy, c-format
 msgid "Failure: Did not receive %s\n"
 msgstr "Datei wurde als `%s' gespeichert.\n"
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:436
+#: src/peerinfo-tool/gnunet-peerinfo.c:447
 #, fuzzy, c-format
 msgid "Failure: Received invalid %s\n"
 msgstr "ungültige `%s' Nachricht empfangen: %s.\n"
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:445
+#: src/peerinfo-tool/gnunet-peerinfo.c:456
 #, fuzzy, c-format
 msgid "Failed to write HELLO with %u bytes to file `%s'\n"
 msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:458
+#: src/peerinfo-tool/gnunet-peerinfo.c:469
 #, c-format
 msgid "Wrote %s HELLO containing %u addresses with %u bytes to file `%s'\n"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:522
+#: src/peerinfo-tool/gnunet-peerinfo.c:533
 #, fuzzy, c-format
 msgid "Failure adding HELLO: %s\n"
 msgstr "Fehler bei %s:%d.\n"
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:633
+#: src/peerinfo-tool/gnunet-peerinfo.c:644
 #, fuzzy, c-format
 msgid "Service `%s' is not running, please start GNUnet\n"
 msgstr "`%s' ist keine Datei.\n"
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:654 src/util/gnunet-scrypt.c:224
+#: src/peerinfo-tool/gnunet-peerinfo.c:665 src/util/gnunet-scrypt.c:224
 #, fuzzy, c-format
 msgid "Loading hostkey from `%s' failed.\n"
 msgstr "Das Parsen des Hello von `%s' schlug fehl.\n"
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:745
+#: src/peerinfo-tool/gnunet-peerinfo.c:756
 #, c-format
 msgid "I am peer `%s'.\n"
 msgstr "Ich bin Peer `%s'.\n"
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:789
+#: src/peerinfo-tool/gnunet-peerinfo.c:800
 msgid "don't resolve host names"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:792
+#: src/peerinfo-tool/gnunet-peerinfo.c:803
 msgid "output only the identity strings"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:795
+#: src/peerinfo-tool/gnunet-peerinfo.c:806
 msgid "include friend-only information"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:798
+#: src/peerinfo-tool/gnunet-peerinfo.c:809
 msgid "output our own identity only"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:801
+#: src/peerinfo-tool/gnunet-peerinfo.c:812
 msgid "list all known peers"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:804
+#: src/peerinfo-tool/gnunet-peerinfo.c:815
 msgid "dump hello to file"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:807
+#: src/peerinfo-tool/gnunet-peerinfo.c:818
 msgid "also output HELLO uri(s)"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:810
+#: src/peerinfo-tool/gnunet-peerinfo.c:821
 msgid "add given HELLO uri to the database"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:821
+#: src/peerinfo-tool/gnunet-peerinfo.c:832
 #, fuzzy
 msgid "Print information about peers."
 msgstr "Informationen über andere GNUnet Knoten ausgeben."
@@ -5595,6 +5727,36 @@
 msgid "Failed to load transport plugin for `%s'\n"
 msgstr "Anwendung `%s' konnte nicht initialisiert werden.\n"
 
+#: src/peerstore/gnunet-peerstore.c:97
+msgid "peerstore"
+msgstr ""
+
+#: src/peerstore/peerstore_api.c:486
+#, fuzzy
+msgid "Error communicating with `PEERSTORE' service."
+msgstr "Informationen über andere GNUnet Knoten ausgeben."
+
+#: src/peerstore/peerstore_api.c:503
+#, fuzzy
+msgid "Received a malformed response from service."
+msgstr "GAP hat ungültige Inhalte von `%s' empfangen.\n"
+
+#: src/peerstore/plugin_peerstore_sqlite.c:352
+#: src/psycstore/plugin_psycstore_sqlite.c:276
+#, fuzzy, c-format
+msgid ""
+"Error executing SQL query: %s\n"
+"  %s\n"
+msgstr "Fehler beim Anlegen des Benutzers"
+
+#: src/peerstore/plugin_peerstore_sqlite.c:377
+#: src/psycstore/plugin_psycstore_sqlite.c:253
+#, fuzzy, c-format
+msgid ""
+"Error preparing SQL query: %s\n"
+"  %s\n"
+msgstr "Fehler beim Anlegen des Benutzers"
+
 #: src/postgres/postgres.c:59
 #, fuzzy, c-format
 msgid "`%s:%s' failed at %s:%d with error: %s"
@@ -5692,20 +5854,6 @@
 msgid "`%s' failed at %s:%d with error: %s (%d)\n"
 msgstr "`%s' schlug bei %s:%d mit dem Fehler %s fehl\n"
 
-#: src/psycstore/plugin_psycstore_sqlite.c:253
-#, fuzzy, c-format
-msgid ""
-"Error preparing SQL query: %s\n"
-"  %s\n"
-msgstr "Fehler beim Anlegen des Benutzers"
-
-#: src/psycstore/plugin_psycstore_sqlite.c:276
-#, fuzzy, c-format
-msgid ""
-"Error executing SQL query: %s\n"
-"  %s\n"
-msgstr "Fehler beim Anlegen des Benutzers"
-
 #: src/psycstore/plugin_psycstore_sqlite.c:1796
 #, fuzzy
 msgid "SQLite database running\n"
@@ -5746,7 +5894,7 @@
 
 #: src/pt/gnunet-daemon-pt.c:888
 #, fuzzy
-msgid "# DNS requests dropped (DNS mesh channel down)"
+msgid "# DNS requests dropped (DNS cadet channel down)"
 msgstr "# gap Anfragen verworfen: Kollision in RT"
 
 #: src/pt/gnunet-daemon-pt.c:896
@@ -5782,7 +5930,7 @@
 msgstr "GNUnet Konfiguration"
 
 #: src/regex/gnunet-daemon-regexprofiler.c:380
-msgid "Daemon to announce regular expressions for the peer using mesh."
+msgid "Daemon to announce regular expressions for the peer using cadet."
 msgstr ""
 
 #: src/regex/gnunet-regex-profiler.c:1288
@@ -5987,250 +6135,317 @@
 msgid "Could not open revocation database file!"
 msgstr "Verbindung zu gnunetd konnte nicht hergestellt werden.\n"
 
-#: src/scalarproduct/gnunet-scalarproduct.c:225
+#: src/scalarproduct/gnunet-scalarproduct.c:224
 #, fuzzy
 msgid "You must specify at least one message ID to check!\n"
 msgstr "Sie müssen eine Liste von Dateien zum Einfügen angeben.\n"
 
-#: src/scalarproduct/gnunet-scalarproduct.c:232
+#: src/scalarproduct/gnunet-scalarproduct.c:231
 msgid "This program needs a session identifier for comparing vectors.\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-scalarproduct.c:239
+#: src/scalarproduct/gnunet-scalarproduct.c:238
 msgid "Please give a session key for --input_key!\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-scalarproduct.c:251
+#: src/scalarproduct/gnunet-scalarproduct.c:250
 #, c-format
 msgid ""
 "Tried to set initiator mode, as peer ID was given. However, `%s' is not a "
 "valid peer identifier.\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-scalarproduct.c:278
-#: src/scalarproduct/gnunet-scalarproduct.c:314
-#, fuzzy, c-format
-msgid "Could not convert `%s' to int32_t.\n"
-msgstr "Verbindung zu gnunetd konnte nicht hergestellt werden.\n"
-
-#: src/scalarproduct/gnunet-scalarproduct.c:286
+#: src/scalarproduct/gnunet-scalarproduct.c:261
 msgid "Need elements to compute the vectorproduct, got none.\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-scalarproduct.c:346
+#: src/scalarproduct/gnunet-scalarproduct.c:283
 #, fuzzy, c-format
-msgid "Could not convert `%s' to integer.\n"
+msgid "Malformed input, could not parse `%s'\n"
+msgstr "Der Transportdienst auf Port %d konnte nicht gestartet werden.\n"
+
+#: src/scalarproduct/gnunet-scalarproduct.c:296
+#, fuzzy, c-format
+msgid "Could not convert `%s' to int64_t.\n"
 msgstr "Verbindung zu gnunetd konnte nicht hergestellt werden.\n"
 
-#: src/scalarproduct/gnunet-scalarproduct.c:407
+#: src/scalarproduct/gnunet-scalarproduct.c:345
 msgid ""
 "A comma separated list of elements to compare as vector with our remote peer."
 msgstr ""
 
-#: src/scalarproduct/gnunet-scalarproduct.c:410
+#: src/scalarproduct/gnunet-scalarproduct.c:348
 msgid ""
-"A comma separated mask to select which elements should actually be compared."
-msgstr ""
-
-#: src/scalarproduct/gnunet-scalarproduct.c:413
-msgid ""
 "[Optional] peer to calculate our scalarproduct with. If this parameter is "
 "not given, the service will wait for a remote peer to compute the request."
 msgstr ""
 
-#: src/scalarproduct/gnunet-scalarproduct.c:416
+#: src/scalarproduct/gnunet-scalarproduct.c:351
 msgid "Transaction ID shared with peer."
 msgstr ""
 
-#: src/scalarproduct/gnunet-scalarproduct.c:425
+#: src/scalarproduct/gnunet-scalarproduct.c:360
 msgid "Calculate the Vectorproduct with a GNUnet peer."
 msgstr ""
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:541
+#: src/scalarproduct/gnunet-service-scalarproduct.c:678
 #, fuzzy, c-format
-msgid "Client (%p) disconnected from us.\n"
+msgid "Client %p disconnected from us.\n"
 msgstr "`%s' hat sich mit `%s' verbunden.\n"
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:613
-#: src/scalarproduct/gnunet-service-scalarproduct.c:702
+#: src/scalarproduct/gnunet-service-scalarproduct.c:748
 #, fuzzy, c-format
 msgid "Could not send message to client (%p)!\n"
 msgstr "Nachricht konnte nicht an gnunetd gesendet werden.\n"
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:619
+#: src/scalarproduct/gnunet-service-scalarproduct.c:759
 #, c-format
 msgid "Sending session-end notification to client (%p) for session %s\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:712
-#, c-format
-msgid "Sent result to client (%p), this session (%s) has ended!\n"
-msgstr ""
+#: src/scalarproduct/gnunet-service-scalarproduct.c:781
+#: src/scalarproduct/gnunet-service-scalarproduct.c:1459
+#, fuzzy, c-format
+msgid "Successfully created new channel to peer (%s)!\n"
+msgstr "Zugriff verweigert für `%s' bei %s:%d.\n"
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:766
-#: src/scalarproduct/gnunet-service-scalarproduct.c:855
+#: src/scalarproduct/gnunet-service-scalarproduct.c:818
+#: src/scalarproduct/gnunet-service-scalarproduct.c:1469
+#: src/scalarproduct/gnunet-service-scalarproduct.c:1539
 #, fuzzy
-msgid "Could not send service-response message via mesh!)\n"
-msgstr "Nachricht konnte nicht an gnunetd gesendet werden.\n"
-
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1028
-#, c-format
-msgid "Failed to communicate with `%s', scalar product calculation aborted.\n"
-msgstr ""
-
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1099
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1208
-#, fuzzy
 msgid "Transmitting service request.\n"
 msgstr "Collection `%s' begonnen.\n"
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1108
+#: src/scalarproduct/gnunet-service-scalarproduct.c:830
+#: src/scalarproduct/gnunet-service-scalarproduct.c:1481
 #, fuzzy
-msgid "Could not send service-request multipart message to channel!\n"
+msgid "Could not send message to channel!\n"
 msgstr "Nachricht konnte nicht an gnunetd gesendet werden.\n"
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1147
-#, fuzzy, c-format
-msgid "Successfully created new channel to peer (%s)!\n"
-msgstr "Zugriff verweigert für `%s' bei %s:%d.\n"
-
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1217
+#: src/scalarproduct/gnunet-service-scalarproduct.c:891
+#: src/scalarproduct/gnunet-service-scalarproduct.c:991
 #, fuzzy
-msgid "Could not send message to channel!\n"
+msgid "Could not send service-response message via cadet!)\n"
 msgstr "Nachricht konnte nicht an gnunetd gesendet werden.\n"
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1274
-#, fuzzy
-msgid "Too short message received from client!\n"
-msgstr "Empfangene Client-Nachricht ist ungültig.\n"
+#: src/scalarproduct/gnunet-service-scalarproduct.c:1442
+#, c-format
+msgid "Sent result to client (%p), this session (%s) has ended!\n"
+msgstr ""
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1287
+#: src/scalarproduct/gnunet-service-scalarproduct.c:1550
 #, fuzzy
-msgid "Invalid message received from client, session information incorrect!\n"
-msgstr "Ungültige `%s' Nachricht von Knoten `%s' empfangen.\n"
+msgid "Could not send service-request multipart message to channel!\n"
+msgstr "Nachricht konnte nicht an gnunetd gesendet werden.\n"
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1298
+#: src/scalarproduct/gnunet-service-scalarproduct.c:1579
 #, c-format
 msgid ""
-"Duplicate session information received, cannot create new session with key `"
-"%s'\n"
+"Got client-responder-session with key %s and a matching service-request-"
+"session set, processing.\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1318
+#: src/scalarproduct/gnunet-service-scalarproduct.c:1601
 #, c-format
 msgid ""
-"Got client-request-session with key %s, preparing channel to remote "
-"service.\n"
+"Got client-responder-session with key %s but NO matching service-request-"
+"session set, queuing element for later use.\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1354
+#: src/scalarproduct/gnunet-service-scalarproduct.c:1618
 #, c-format
 msgid "Creating new channel for session with key %s.\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1399
+#: src/scalarproduct/gnunet-service-scalarproduct.c:1777
 #, c-format
 msgid ""
-"Got client-responder-session with key %s and a matching service-request-"
-"session set, processing.\n"
+"Duplicate session information received, can not create new session with key `"
+"%s'\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1409
-#, c-format
-msgid ""
-"Got client-responder-session with key %s but NO matching service-request-"
-"session set, queuing element for later use.\n"
-msgstr ""
-
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1439
+#: src/scalarproduct/gnunet-service-scalarproduct.c:1862
 #, fuzzy, c-format
 msgid "New incoming channel from peer %s.\n"
 msgstr "`%s' hat sich mit `%s' verbunden.\n"
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1471
+#: src/scalarproduct/gnunet-service-scalarproduct.c:1892
 #, c-format
 msgid "Peer disconnected, terminating session %s with peer (%s)\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1672
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1814
+#: src/scalarproduct/gnunet-service-scalarproduct.c:2270
 #, c-format
-msgid "Got session with key %s and a matching element set, processing.\n"
+msgid ""
+"Got message with duplicate session key (`%s'), ignoring service request.\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1681
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1821
+#: src/scalarproduct/gnunet-service-scalarproduct.c:2297
 #, c-format
-msgid "Got session with key %s without a matching element set, queueing.\n"
+msgid "Got session with key %s and a matching element set, processing.\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1771
+#: src/scalarproduct/gnunet-service-scalarproduct.c:2318
 #, c-format
-msgid ""
-"Got message with duplicate session key (`%s'), ignoring service request.\n"
+msgid "Got session with key %s without a matching element set, queueing.\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:2014
+#: src/scalarproduct/gnunet-service-scalarproduct.c:2565
 msgid "Shutting down, initiating cleanup.\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:2100
+#: src/scalarproduct/gnunet-service-scalarproduct.c:2659
 #, fuzzy
-msgid "Connect to MESH failed\n"
+msgid "Connect to CADET failed\n"
 msgstr " Verbindung fehlgeschlagen (Bug?)\n"
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:2104
+#: src/scalarproduct/gnunet-service-scalarproduct.c:2664
 #, fuzzy
-msgid "Mesh initialized\n"
+msgid "CADET initialized\n"
 msgstr " Verbindung fehlgeschlagen\n"
 
-#: src/scalarproduct/scalarproduct_api.c:246
+#: src/secretsharing/gnunet-secretsharing-profiler.c:613
+msgid "dkg start delay"
+msgstr ""
+
+#: src/secretsharing/gnunet-secretsharing-profiler.c:616
+msgid "dkg timeout"
+msgstr ""
+
+#: src/secretsharing/gnunet-secretsharing-profiler.c:619
+msgid "threshold"
+msgstr ""
+
+#: src/secretsharing/gnunet-secretsharing-profiler.c:622
+msgid "also profile decryption"
+msgstr ""
+
+#: src/sensor/gnunet-sensor.c:148
 #, fuzzy
-msgid "# SUC responder result messages received"
-msgstr "# verschlüsselter PING Nachrichten empfangen"
+msgid "Retrieve information about all defined sensors"
+msgstr "Informationen über andere GNUnet Knoten ausgeben."
 
-#: src/scalarproduct/scalarproduct_api.c:300
+#: src/sensor/gnunet-sensor.c:151
 #, fuzzy
-msgid "# bytes sent to scalarproduct"
-msgstr "# bytes in der Datenbank"
+msgid "Retrieve information about a single sensor"
+msgstr "Informationen über andere GNUnet Knoten ausgeben."
 
-#: src/scalarproduct/scalarproduct_api.c:345
-#: src/scalarproduct/scalarproduct_api.c:440
+#: src/sensor/gnunet-sensor.c:160
+msgid "sensor"
+msgstr ""
+
+#: src/sensor/gnunet-service-sensor.c:367
 #, fuzzy
-msgid "Failed to connect to the scalarproduct service\n"
-msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
+msgid "Error reading sensor version\n"
+msgstr "Fehler beim Anlegen des Benutzers"
 
-#: src/scalarproduct/scalarproduct_api.c:353
-#: src/scalarproduct/scalarproduct_api.c:448
+#: src/sensor/gnunet-service-sensor.c:373
+msgid "Invalid sensor version number, format should be major.minor\n"
+msgstr ""
+
+#: src/sensor/gnunet-service-sensor.c:385
 #, fuzzy
-msgid "Failed to send a message to the statistics service\n"
-msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
+msgid "Error reading sensor category\n"
+msgstr "Fehler beim Anlegen des Benutzers"
 
-#: src/scalarproduct/scalarproduct_api.c:387
-#: src/scalarproduct/scalarproduct_api.c:485
+#: src/sensor/gnunet-service-sensor.c:413
 #, fuzzy
-msgid "Failed to send a message to the scalarproduct service\n"
-msgstr "Der Transportdienst auf Port %d konnte nicht gestartet werden.\n"
+msgid "Error reading sensor run interval\n"
+msgstr "Hostkey wurde erfolgreich erzeugt.\n"
 
-#: src/secretsharing/gnunet-secretsharing-profiler.c:538
-msgid "dkg start delay"
+#: src/sensor/gnunet-service-sensor.c:419
+#, c-format
+msgid "Sensor run interval too low (%<PRIu64> < %d)\n"
 msgstr ""
 
-#: src/secretsharing/gnunet-secretsharing-profiler.c:541
-msgid "dkg timeout"
+#: src/sensor/gnunet-service-sensor.c:436
+#, fuzzy
+msgid "Error reading sensor source\n"
+msgstr "Fehler beim Anlegen des Benutzers"
+
+#: src/sensor/gnunet-service-sensor.c:445
+msgid "Error reading sensor gnunet-statistics source information\n"
 msgstr ""
 
-#: src/secretsharing/gnunet-secretsharing-profiler.c:544
-msgid "threshold"
+#: src/sensor/gnunet-service-sensor.c:455
+#, fuzzy
+msgid "Error reading sensor process name\n"
+msgstr "Fehler beim Anlegen des Benutzers"
+
+#: src/sensor/gnunet-service-sensor.c:464
+msgid "Error reading sensor expected datatype\n"
 msgstr ""
 
-#: src/secretsharing/gnunet-secretsharing-profiler.c:547
-msgid "also profile decryption"
+#: src/sensor/gnunet-service-sensor.c:470
+msgid "Invalid expected datatype, gnunet-statistics returns uint64 values\n"
 msgstr ""
 
+#: src/sensor/gnunet-service-sensor.c:498
+#, fuzzy, c-format
+msgid "Failed to access sensor file: %s\n"
+msgstr "Datei wurde als `%s' gespeichert.\n"
+
+#: src/sensor/gnunet-service-sensor.c:506
+#, fuzzy, c-format
+msgid "Failed to load sensor definition: %s\n"
+msgstr "Datei wurde als `%s' gespeichert.\n"
+
+#: src/sensor/gnunet-service-sensor.c:559
+#, c-format
+msgid "Sensor `%s' already exists with same or newer version\n"
+msgstr ""
+
+#: src/sensor/gnunet-service-sensor.c:566
+#, c-format
+msgid "Upgrading sensor `%s' to a newer version\n"
+msgstr ""
+
+#: src/sensor/gnunet-service-sensor.c:571
+#, c-format
+msgid ""
+"Error adding new sensor `%s' to global hashmap, this should not happen\n"
+msgstr ""
+
+#: src/sensor/gnunet-service-sensor.c:595
+#, fuzzy, c-format
+msgid "Error loading sensor from file: %s\n"
+msgstr ""
+"\n"
+"Fehler beim Uploaden der Datei: %s\n"
+
+#: src/sensor/gnunet-service-sensor.c:599
+#, c-format
+msgid "Sensor `%s' added to global hashmap\n"
+msgstr ""
+
+#: src/sensor/gnunet-service-sensor.c:635
+#, fuzzy, c-format
+msgid "Reloading sensor definitions from directory `%s'\n"
+msgstr "Dateien aus dem GNUnet herunterladen."
+
+#: src/sensor/gnunet-service-sensor.c:640
+#, fuzzy, c-format
+msgid "Loaded %d sensors from directory `%s'\n"
+msgstr "Dateien aus dem GNUnet herunterladen."
+
+#: src/sensor/sensor_api.c:345
+#, fuzzy
+msgid "Timeout transmitting iteration request to `SENSOR' service."
+msgstr "Fehler beim Senden einer `%s' Anfrage an den SMTP Server.\n"
+
+#: src/sensor/sensor_api.c:388
+#, fuzzy
+msgid "Failed to receive response from `SENSOR' service."
+msgstr "Fehler beim Empfangen der Antwort von gnunetd auf die `%s' Nachricht\n"
+
+#: src/sensor/sensor_api.c:431
+#, fuzzy
+msgid "Received invalid message from `SENSOR' service."
+msgstr "Ungültige `%s' Anfrage von `%s' empfangen.\n"
+
 #: src/set/gnunet-service-set.c:1431
 #, fuzzy
-msgid "Could not connect to mesh service\n"
+msgid "Could not connect to cadet service\n"
 msgstr "Verbindung zu gnunetd konnte nicht hergestellt werden.\n"
 
 #: src/set/gnunet-set-ibf-profiler.c:221
@@ -6433,7 +6648,7 @@
 "content/topology-file-format\n"
 msgstr ""
 
-#: src/testbed/gnunet-daemon-latency-logger.c:325
+#: src/testbed/gnunet-daemon-latency-logger.c:331
 msgid "Daemon to log latency values of connections to neighbours"
 msgstr ""
 
@@ -6800,8 +7015,8 @@
 msgid "# HELLO messages gossipped"
 msgstr "# ausgehender Nachrichten verworfen"
 
-#: src/topology/gnunet-daemon-topology.c:1290
-msgid "GNUnet topology control (maintaining P2P mesh and F2F constraints)"
+#: src/topology/gnunet-daemon-topology.c:1296
+msgid "GNUnet topology control (maintaining P2P cadet and F2F constraints)"
 msgstr ""
 
 #: src/transport/gnunet-service-transport_blacklist.c:271
@@ -6834,21 +7049,21 @@
 msgid "# bytes payload received"
 msgstr "# Bytes entschlüsselt"
 
-#: src/transport/gnunet-service-transport.c:686
+#: src/transport/gnunet-service-transport.c:708
 #, fuzzy, c-format
 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:733
+#: src/transport/gnunet-service-transport.c:755
 #, 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:1084
+#: src/transport/gnunet-service-transport.c:1106
 #, fuzzy
 msgid "Transport service is lacking key configuration settings. Exiting.\n"
 msgstr "GNUnet Konfiguration"
@@ -6902,7 +7117,7 @@
 msgid "Received a request disconnect message for peer `%s'\n"
 msgstr "GAP hat ungültige Inhalte von `%s' empfangen.\n"
 
-#: src/transport/gnunet-service-transport_hello.c:181
+#: src/transport/gnunet-service-transport_hello.c:182
 msgid "# refreshed my HELLO"
 msgstr ""
 
@@ -6912,7 +7127,7 @@
 msgstr "# verschlüsselter PONG Nachrichten empfangen"
 
 #: src/transport/gnunet-service-transport_neighbours.c:1220
-#: src/transport/gnunet-service-transport_neighbours.c:1629
+#: src/transport/gnunet-service-transport_neighbours.c:1635
 #, fuzzy
 msgid "# bytes in message queue for other peers"
 msgstr "# Bytes ausgehender Nachrichten verworfen"
@@ -6927,186 +7142,186 @@
 msgid "# transmission failures for messages to other peers"
 msgstr "# Bytes ausgehender Nachrichten verworfen"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1287
+#: src/transport/gnunet-service-transport_neighbours.c:1288
 msgid "# messages timed out while in transport queue"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1343
+#: src/transport/gnunet-service-transport_neighbours.c:1349
 #, fuzzy
 msgid "# keepalives sent"
 msgstr "# p2p Trace-Antworten gesendet"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1376
+#: src/transport/gnunet-service-transport_neighbours.c:1382
 #, fuzzy
 msgid "# KEEPALIVE messages discarded (peer unknown)"
 msgstr "# defragmentierter Nachrichten"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1384
+#: src/transport/gnunet-service-transport_neighbours.c:1390
 #, fuzzy
 msgid "# KEEPALIVE messages discarded (no session)"
 msgstr "# defragmentierter Nachrichten"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1431
+#: src/transport/gnunet-service-transport_neighbours.c:1437
 #, fuzzy
 msgid "# KEEPALIVE_RESPONSE messages discarded (not connected)"
 msgstr "# defragmentierter Nachrichten"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1440
+#: src/transport/gnunet-service-transport_neighbours.c:1446
 #, fuzzy
 msgid "# KEEPALIVE_RESPONSE messages discarded (not expected)"
 msgstr "# defragmentierter Nachrichten"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1448
+#: src/transport/gnunet-service-transport_neighbours.c:1454
 #, fuzzy
 msgid "# KEEPALIVE_RESPONSE messages discarded (address changed)"
 msgstr "# defragmentierter Nachrichten"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1456
+#: src/transport/gnunet-service-transport_neighbours.c:1462
 #, fuzzy
 msgid "# KEEPALIVE_RESPONSE messages discarded (wrong nonce)"
 msgstr "# defragmentierter Nachrichten"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1534
+#: src/transport/gnunet-service-transport_neighbours.c:1540
 #, fuzzy
 msgid "# messages discarded due to lack of neighbour record"
 msgstr "# defragmentierter Nachrichten"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1568
+#: src/transport/gnunet-service-transport_neighbours.c:1574
 #, fuzzy
 msgid "# bandwidth quota violations by other peers"
 msgstr "Verfolgt die Bandbreitennutzung von gnunetd"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1584
+#: src/transport/gnunet-service-transport_neighbours.c:1590
 msgid "# ms throttling suggested"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1678
+#: src/transport/gnunet-service-transport_neighbours.c:1685
 #, fuzzy, c-format
 msgid ""
 "Failed to send CONNECT message to peer `%s' using address `%s' session %p\n"
 msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1705
+#: src/transport/gnunet-service-transport_neighbours.c:1712
 msgid "# Failed attempts to switch addresses (failed to send CONNECT CONT)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1751
+#: src/transport/gnunet-service-transport_neighbours.c:1757
 #, fuzzy
 msgid "# SESSION_CONNECT messages sent"
 msgstr "# verschlüsselter PONG Nachrichten empfangen"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1767
+#: src/transport/gnunet-service-transport_neighbours.c:1773
 #, 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:1794
+#: src/transport/gnunet-service-transport_neighbours.c:1800
 msgid "# Failed attempts to switch addresses (failed to send CONNECT)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1844
+#: src/transport/gnunet-service-transport_neighbours.c:1849
 #, c-format
 msgid ""
 "Failed to send CONNECT_ACK message to peer `%s' using address `%s' session "
 "%p\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1899
+#: src/transport/gnunet-service-transport_neighbours.c:1904
 #, fuzzy
 msgid "# CONNECT_ACK messages sent"
 msgstr "# verschlüsselter PONG Nachrichten empfangen"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1914
+#: src/transport/gnunet-service-transport_neighbours.c:1919
 #, fuzzy, c-format
 msgid "Failed to transmit CONNECT_ACK message via plugin to %s\n"
 msgstr "`%s' Dienst konnte nicht initialisiert werden.\n"
 
-#: src/transport/gnunet-service-transport_neighbours.c:2192
+#: src/transport/gnunet-service-transport_neighbours.c:2196
 #, fuzzy, c-format
 msgid "Blacklisting disapproved to connect to peer `%s'\n"
 msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
 
-#: src/transport/gnunet-service-transport_neighbours.c:2312
+#: src/transport/gnunet-service-transport_neighbours.c:2316
 #, fuzzy
 msgid "# CONNECT messages received"
 msgstr "# verschlüsselter PONG Nachrichten empfangen"
 
-#: src/transport/gnunet-service-transport_neighbours.c:2317
+#: src/transport/gnunet-service-transport_neighbours.c:2321
 #, c-format
 msgid "CONNECT request from peer `%s' ignored due impending shutdown\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:2590
+#: src/transport/gnunet-service-transport_neighbours.c:2594
 msgid "# Attempts to switch addresses"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3012
+#: src/transport/gnunet-service-transport_neighbours.c:3016
 #, fuzzy
 msgid "# Failed attempts to switch addresses (no response)"
 msgstr "Fehler beim Senden einer `%s' Anfrage an den SMTP Server.\n"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3107
+#: src/transport/gnunet-service-transport_neighbours.c:3111
 #, fuzzy
 msgid "# CONNECT_ACK messages received"
 msgstr "# verschlüsselter PONG Nachrichten empfangen"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3115
+#: src/transport/gnunet-service-transport_neighbours.c:3119
 #, fuzzy
 msgid "# unexpected CONNECT_ACK messages (no peer)"
 msgstr "COUNT Nachrichten versenden"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3129
-#: src/transport/gnunet-service-transport_neighbours.c:3164
+#: src/transport/gnunet-service-transport_neighbours.c:3133
+#: src/transport/gnunet-service-transport_neighbours.c:3168
 #, fuzzy
 msgid "# unexpected CONNECT_ACK messages (not ready)"
 msgstr "COUNT Nachrichten versenden"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3176
+#: src/transport/gnunet-service-transport_neighbours.c:3180
 #, fuzzy
 msgid "# unexpected CONNECT_ACK messages (waiting on ATS)"
 msgstr "COUNT Nachrichten versenden"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3200
+#: src/transport/gnunet-service-transport_neighbours.c:3203
 msgid "# Successful attempts to switch addresses"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3208
+#: src/transport/gnunet-service-transport_neighbours.c:3211
 #, fuzzy
 msgid "# unexpected CONNECT_ACK messages (disconnecting)"
 msgstr "COUNT Nachrichten versenden"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3396
+#: src/transport/gnunet-service-transport_neighbours.c:3399
 #, fuzzy
 msgid "# SESSION_ACK messages received"
 msgstr "# verschlüsselter PONG Nachrichten empfangen"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3424
+#: src/transport/gnunet-service-transport_neighbours.c:3435
 #, fuzzy
 msgid "# unexpected SESSION_ACK messages"
 msgstr "# verschlüsselter PONG Nachrichten gesendet"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3490
+#: src/transport/gnunet-service-transport_neighbours.c:3509
 msgid "# SET QUOTA messages ignored (no such peer)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3505
+#: src/transport/gnunet-service-transport_neighbours.c:3524
 msgid "# disconnects due to quota of 0"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3545
+#: src/transport/gnunet-service-transport_neighbours.c:3564
 msgid "# disconnect messages ignored (malformed)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3551
+#: src/transport/gnunet-service-transport_neighbours.c:3570
 #, fuzzy
 msgid "# DISCONNECT messages received"
 msgstr "# verschlüsselter PONG Nachrichten empfangen"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3560
+#: src/transport/gnunet-service-transport_neighbours.c:3579
 msgid "# disconnect messages ignored (timestamp)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3687
+#: src/transport/gnunet-service-transport_neighbours.c:3706
 #, fuzzy
 msgid "# disconnected from peer upon explicit request"
 msgstr "# gap Anfragen verworfen: Kollision in RT"
@@ -7221,33 +7436,62 @@
 msgid "Adding `%s' without addresses for peer `%s'\n"
 msgstr "Adresse des Knotens `%s' konnte nicht ermittelt werden.\n"
 
-#: src/transport/gnunet-transport.c:367
+#: src/transport/gnunet-transport.c:388
 #, fuzzy, c-format
 msgid "Transmitted %llu bytes/s (%llu bytes in %s)\n"
 msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
 
-#: src/transport/gnunet-transport.c:375
+#: src/transport/gnunet-transport.c:396
 #, fuzzy, c-format
 msgid "Received %llu bytes/s (%llu bytes in %s)\n"
 msgstr "GAP hat ungültige Inhalte von `%s' empfangen.\n"
 
-#: src/transport/gnunet-transport.c:415
+#: src/transport/gnunet-transport.c:436
 #, fuzzy, c-format
 msgid "Failed to connect to `%s'\n"
 msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
 
-#: src/transport/gnunet-transport.c:428
+#: src/transport/gnunet-transport.c:449
 #, fuzzy, c-format
 msgid "Failed to resolve address for peer `%s'\n"
 msgstr "Fehler beim Binden an UDP Port %d.\n"
 
-#: src/transport/gnunet-transport.c:438
+#: src/transport/gnunet-transport.c:459
 #, fuzzy
 msgid "Failed to list connections, timeout occured\n"
 msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden."
 
-#: src/transport/gnunet-transport.c:559
+#: src/transport/gnunet-transport.c:483
 #, fuzzy, c-format
+msgid "Configuration for plugin `%s' did not work!\n"
+msgstr ""
+"Die Konfigurationsdatei muss in der Sektion `%s' unter `%s' ein Verzeichnis "
+"angeben, in dem FS Daten gespeichert werden.\n"
+
+#: src/transport/gnunet-transport.c:487
+#, fuzzy, c-format
+msgid "Configuration for plugin `%s' did work!\n"
+msgstr ""
+"Die Konfigurationsdatei muss in der Sektion `%s' unter `%s' ein Verzeichnis "
+"angeben, in dem FS Daten gespeichert werden.\n"
+
+#: src/transport/gnunet-transport.c:491
+#, fuzzy, c-format
+msgid "Internal NAT error while running test for plugin `%s'\n"
+msgstr "=\tFehler beim Lesen des Verzeichnisses.\n"
+
+#: src/transport/gnunet-transport.c:495
+#, fuzzy, c-format
+msgid "Failed to start NAT test for plugin `%s'\n"
+msgstr "Fehler beim Starten der Collection.\n"
+
+#: src/transport/gnunet-transport.c:499
+#, c-format
+msgid "Timeout while waiting for result of NAT test for plugin `%s'\n"
+msgstr ""
+
+#: src/transport/gnunet-transport.c:614
+#, fuzzy, c-format
 msgid ""
 "Peer `%s' %s %s\n"
 "\t%s%s\n"
@@ -7255,155 +7499,180 @@
 "\t%s%s\n"
 msgstr "Ich bin Peer `%s'.\n"
 
-#: src/transport/gnunet-transport.c:586
+#: src/transport/gnunet-transport.c:643
 #, fuzzy, c-format
 msgid "Peer `%s' %s `%s' \n"
 msgstr "Ich bin Peer `%s'.\n"
 
-#: src/transport/gnunet-transport.c:712
+#: src/transport/gnunet-transport.c:717 src/transport/gnunet-transport.c:1240
+#, fuzzy
+msgid "Monitor disconnected from transport service. Reconnecting.\n"
+msgstr "Der Transportdienst auf Port %d konnte nicht gestartet werden.\n"
+
+#: src/transport/gnunet-transport.c:784
 msgid "No transport plugins configured, peer will never communicate\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:726
+#: src/transport/gnunet-transport.c:798
 #, c-format
 msgid "No port configured for plugin `%s', cannot test it\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:789
+#: src/transport/gnunet-transport.c:823
+#, fuzzy
+msgid "Failed to start resolver!\n"
+msgstr "Fehler beim Starten der Collection.\n"
+
+#: src/transport/gnunet-transport.c:866
 #, fuzzy, c-format
 msgid "Transmitting %u bytes to %s\n"
 msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
 
-#: src/transport/gnunet-transport.c:810
+#: src/transport/gnunet-transport.c:888
 #, fuzzy, c-format
 msgid "Successfully connected to `%s'\n"
 msgstr "Zugriff verweigert für `%s' bei %s:%d.\n"
 
-#: src/transport/gnunet-transport.c:834
+#: src/transport/gnunet-transport.c:912
 #, c-format
 msgid ""
 "Successfully connected to `%s', starting to send benchmark data in %u Kb "
 "blocks\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:865
+#: src/transport/gnunet-transport.c:943
 #, fuzzy, c-format
 msgid "Successfully disconnected from `%s'\n"
 msgstr "Zugriff verweigert für `%s' bei %s:%d.\n"
 
-#: src/transport/gnunet-transport.c:888
+#: src/transport/gnunet-transport.c:966
 #, fuzzy, c-format
 msgid "Disconnected from peer `%s' while benchmarking\n"
 msgstr "`%s' hat sich mit `%s' verbunden.\n"
 
-#: src/transport/gnunet-transport.c:950
+#: src/transport/gnunet-transport.c:988 src/transport/gnunet-transport.c:1009
+#, c-format
+msgid "%24s: %-17s %4s   (%u connections in total)\n"
+msgstr ""
+
+#: src/transport/gnunet-transport.c:989
+#, fuzzy
+msgid "Connected to"
+msgstr "`%s' hat sich mit `%s' verbunden.\n"
+
+#: src/transport/gnunet-transport.c:1010
+#, fuzzy
+msgid "Disconnected from"
+msgstr "`%s' hat sich mit `%s' verbunden.\n"
+
+#: src/transport/gnunet-transport.c:1031
 #, fuzzy, c-format
 msgid "Received %u bytes from %s\n"
 msgstr "GAP hat ungültige Inhalte von `%s' empfangen.\n"
 
-#: src/transport/gnunet-transport.c:975
+#: src/transport/gnunet-transport.c:1061
 #, c-format
 msgid "Peer `%s': %s %s in state `%s' until %s\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:986
+#: src/transport/gnunet-transport.c:1072
 #, fuzzy, c-format
 msgid "Peer `%s': %s %s\n"
 msgstr "Ich bin Peer `%s'.\n"
 
-#: src/transport/gnunet-transport.c:1197 src/transport/gnunet-transport.c:1222
+#: src/transport/gnunet-transport.c:1300 src/transport/gnunet-transport.c:1325
 #, fuzzy
 msgid "Failed to send connect request to transport service\n"
 msgstr "Der Transportdienst auf Port %d konnte nicht gestartet werden.\n"
 
-#: src/transport/gnunet-transport.c:1266
+#: src/transport/gnunet-transport.c:1369
 #, c-format
 msgid ""
 "Multiple operations given. Please choose only one operation: %s, %s, %s, %s, "
 "%s, %s\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1274
+#: src/transport/gnunet-transport.c:1377
 #, c-format
 msgid ""
 "No operation given. Please choose one operation: %s, %s, %s, %s, %s, %s\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1293 src/transport/gnunet-transport.c:1323
-#: src/transport/gnunet-transport.c:1353 src/transport/gnunet-transport.c:1376
-#: src/transport/gnunet-transport.c:1419
+#: src/transport/gnunet-transport.c:1396 src/transport/gnunet-transport.c:1426
+#: src/transport/gnunet-transport.c:1456 src/transport/gnunet-transport.c:1479
+#: src/transport/gnunet-transport.c:1523
 #, fuzzy
 msgid "Failed to connect to transport service\n"
 msgstr "Der Transportdienst auf Port %d konnte nicht gestartet werden.\n"
 
-#: src/transport/gnunet-transport.c:1302 src/transport/gnunet-transport.c:1332
-#: src/transport/gnunet-transport.c:1362
+#: src/transport/gnunet-transport.c:1405 src/transport/gnunet-transport.c:1435
+#: src/transport/gnunet-transport.c:1465
 #, fuzzy
 msgid "Failed to send request to transport service\n"
 msgstr "Der Transportdienst auf Port %d konnte nicht gestartet werden.\n"
 
-#: src/transport/gnunet-transport.c:1381
+#: src/transport/gnunet-transport.c:1484
 msgid "Starting to receive benchmark data\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1465
+#: src/transport/gnunet-transport.c:1569
 #, fuzzy
 msgid "print information for all peers (instead of only connected peers )"
 msgstr "Informationen über andere GNUnet Knoten ausgeben."
 
-#: src/transport/gnunet-transport.c:1468
+#: src/transport/gnunet-transport.c:1572
 msgid "measure how fast we are receiving data from all peers (until CTRL-C)"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1471
+#: src/transport/gnunet-transport.c:1575
 #, fuzzy
 msgid "connect to a peer"
 msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
 
-#: src/transport/gnunet-transport.c:1474
+#: src/transport/gnunet-transport.c:1578
 #, fuzzy
 msgid "disconnect to a peer"
 msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
 
-#: src/transport/gnunet-transport.c:1477
+#: src/transport/gnunet-transport.c:1581
 #, fuzzy
 msgid "print information for all pending validations "
 msgstr "Informationen über andere GNUnet Knoten ausgeben."
 
-#: src/transport/gnunet-transport.c:1480
+#: src/transport/gnunet-transport.c:1584
 #, fuzzy
 msgid "print information for all pending validations continously"
 msgstr "Informationen über andere GNUnet Knoten ausgeben."
 
-#: src/transport/gnunet-transport.c:1483
+#: src/transport/gnunet-transport.c:1587
 #, fuzzy
 msgid "provide information about all current connections (once)"
 msgstr "Informationen über andere GNUnet Knoten ausgeben."
 
-#: src/transport/gnunet-transport.c:1489
+#: src/transport/gnunet-transport.c:1593
 #, fuzzy
 msgid ""
 "provide information about all connects and disconnect events (continuously)"
 msgstr "Informationen über andere GNUnet Knoten ausgeben."
 
-#: src/transport/gnunet-transport.c:1491
+#: src/transport/gnunet-transport.c:1595
 #, fuzzy
 msgid "do not resolve hostnames"
 msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
 
-#: src/transport/gnunet-transport.c:1493
+#: src/transport/gnunet-transport.c:1597
 msgid "peer identity"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1495
+#: src/transport/gnunet-transport.c:1599
 msgid "send data for benchmarking to the other peer (until CTRL-C)"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1498
+#: src/transport/gnunet-transport.c:1602
 msgid "test transport configuration (involves external server)"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1507
+#: src/transport/gnunet-transport.c:1611
 #, fuzzy
 msgid "Direct access to transport service."
 msgstr "Der Transportdienst auf Port %d konnte nicht gestartet werden.\n"
@@ -7475,152 +7744,153 @@
 msgid "# HELLO beacons sent via Bluetooth"
 msgstr "# Bytes gesendet über UDP"
 
-#: src/transport/plugin_transport_bluetooth.c:1723
-msgid "Bluetooth address with invalid size encountered\n"
-msgstr ""
-
 #: src/transport/plugin_transport_bluetooth.c:1923
 #, c-format
 msgid "Helper binary `%s' not SUID, cannot run bluetooth transport\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_client.c:1622
+#: src/transport/plugin_transport_http_client.c:1685
 #, c-format
 msgid "Could not initialize curl multi handle, failed to start %s plugin!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_client.c:1697
-#: src/transport/plugin_transport_http_server.c:3007
+#: src/transport/plugin_transport_http_client.c:1760
+#: src/transport/plugin_transport_http_server.c:3031
 #, fuzzy, c-format
 msgid "Shutting down plugin `%s'\n"
 msgstr "Teste Transport(e) %s\n"
 
-#: src/transport/plugin_transport_http_client.c:1722
-#: src/transport/plugin_transport_http_server.c:3063
+#: src/transport/plugin_transport_http_client.c:1785
+#: src/transport/plugin_transport_http_server.c:3088
 #, 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:1750
-#: src/transport/plugin_transport_http_server.c:2907
+#: src/transport/plugin_transport_http_client.c:1819
+#: src/transport/plugin_transport_http_server.c:2931
 #, 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:1402
+#: src/transport/plugin_transport_http_server.c:1423
 #, 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:1663
+#: src/transport/plugin_transport_http_server.c:1687
 #, c-format
 msgid "Accepting connection (%u of %u) from `%s'\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:1671
+#: src/transport/plugin_transport_http_server.c:1695
 #, c-format
 msgid ""
 "Server reached maximum number connections (%u), rejecting new connection\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:1958
+#: src/transport/plugin_transport_http_server.c:1982
 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:1982
+#: src/transport/plugin_transport_http_server.c:2006
 #, c-format
 msgid "No usable TLS certificate found and creating one at `%s/%s' failed!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:2405
+#: src/transport/plugin_transport_http_server.c:2429
 #, 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:2437 src/util/service.c:698
+#: src/transport/plugin_transport_http_server.c:2461 src/util/service.c:700
 #, fuzzy, c-format
 msgid "Failed to resolve `%s': %s\n"
 msgstr "Datei wurde als `%s' gespeichert.\n"
 
-#: src/transport/plugin_transport_http_server.c:2454 src/util/service.c:715
+#: src/transport/plugin_transport_http_server.c:2478 src/util/service.c:719
 #, 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:2565
+#: src/transport/plugin_transport_http_server.c:2589
 #, c-format
 msgid "Found %u addresses to report to NAT service\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:2637
+#: src/transport/plugin_transport_http_server.c:2661
 msgid "Disabling IPv6 since it is not supported on this system!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:2730
+#: src/transport/plugin_transport_http_server.c:2754
 #, c-format
 msgid "IPv4 support is %s\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:2744
+#: src/transport/plugin_transport_http_server.c:2768
 #, c-format
 msgid "IPv6 support is %s\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:2751
+#: src/transport/plugin_transport_http_server.c:2775
 #, 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:2762
+#: src/transport/plugin_transport_http_server.c:2786
 #, fuzzy
 msgid "Port is required! Fix in configuration\n"
 msgstr " gconfig\tGTK Konfiguration\n"
 
-#: src/transport/plugin_transport_http_server.c:2769
+#: src/transport/plugin_transport_http_server.c:2793
 #, fuzzy, c-format
 msgid "Using port %u\n"
 msgstr "Teste Transport(e) %s\n"
 
-#: src/transport/plugin_transport_http_server.c:2784
+#: src/transport/plugin_transport_http_server.c:2808
 #, 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:2794
+#: src/transport/plugin_transport_http_server.c:2818
 #, fuzzy, c-format
 msgid "Binding to IPv4 address %s\n"
 msgstr "Ungültiger Parameter: `%s'\n"
 
-#: src/transport/plugin_transport_http_server.c:2815
+#: src/transport/plugin_transport_http_server.c:2839
 #, 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:2825
+#: src/transport/plugin_transport_http_server.c:2849
 #, fuzzy, c-format
 msgid "Binding to IPv6 address %s\n"
 msgstr "Ungültiger Parameter: `%s'\n"
 
-#: src/transport/plugin_transport_http_server.c:2877
+#: src/transport/plugin_transport_http_server.c:2901
 #, fuzzy, c-format
 msgid "Using external hostname `%s'\n"
 msgstr "Collection `%s' begonnen.\n"
 
-#: src/transport/plugin_transport_http_server.c:2893
+#: src/transport/plugin_transport_http_server.c:2917
 #, fuzzy, c-format
 msgid "Notifying transport only about hostname `%s'\n"
 msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
 
+#: src/transport/plugin_transport_http_server.c:3177
+#, fuzzy
+msgid "Unable to compile URL regex\n"
+msgstr "SQLite Datenbank konnte nicht initialisiert werden: %s.\n"
+
 #: src/transport/plugin_transport_smtp.c:223
 #, fuzzy, c-format
 msgid "Received malformed message via %s. Ignored.\n"
@@ -7671,91 +7941,91 @@
 msgid "# bytes dropped by SMTP (outgoing)"
 msgstr "# Bytes verworfen von TCP (ausgehend)"
 
-#: src/transport/plugin_transport_tcp.c:555
+#: src/transport/plugin_transport_tcp.c:565
 #, c-format
 msgid "Unexpected address length: %u bytes\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:762
-#: src/transport/plugin_transport_tcp.c:928
-#: src/transport/plugin_transport_tcp.c:2005
-#: src/transport/plugin_transport_tcp.c:2558
+#: src/transport/plugin_transport_tcp.c:787
+#: src/transport/plugin_transport_tcp.c:962
+#: src/transport/plugin_transport_tcp.c:2047
+#: src/transport/plugin_transport_tcp.c:2620
 #, fuzzy
 msgid "# TCP sessions active"
 msgstr "# Sitzungsschlüssel akzeptiert"
 
-#: src/transport/plugin_transport_tcp.c:795
-#: src/transport/plugin_transport_tcp.c:921
-#: src/transport/plugin_transport_tcp.c:1009
-#: src/transport/plugin_transport_tcp.c:1056
-#: src/transport/plugin_transport_tcp.c:1219
-#: src/transport/plugin_transport_tcp.c:1237
+#: src/transport/plugin_transport_tcp.c:823
+#: src/transport/plugin_transport_tcp.c:955
+#: src/transport/plugin_transport_tcp.c:1045
+#: src/transport/plugin_transport_tcp.c:1093
+#: src/transport/plugin_transport_tcp.c:1259
+#: src/transport/plugin_transport_tcp.c:1277
 #, fuzzy
 msgid "# bytes currently in TCP buffers"
 msgstr "# Bytes gesendet über TCP"
 
-#: src/transport/plugin_transport_tcp.c:798
+#: src/transport/plugin_transport_tcp.c:826
 #, fuzzy
 msgid "# bytes discarded by TCP (disconnect)"
 msgstr "# Bytes verworfen von TCP (ausgehend)"
 
-#: src/transport/plugin_transport_tcp.c:1012
+#: src/transport/plugin_transport_tcp.c:1048
 #, fuzzy
 msgid "# bytes discarded by TCP (timeout)"
 msgstr "# Bytes verworfen von TCP (ausgehend)"
 
-#: src/transport/plugin_transport_tcp.c:1059
+#: src/transport/plugin_transport_tcp.c:1096
 #, fuzzy
 msgid "# bytes transmitted via TCP"
 msgstr "# Bytes des Typs %d übertragen"
 
-#: src/transport/plugin_transport_tcp.c:1193
+#: src/transport/plugin_transport_tcp.c:1233
 #, c-format
 msgid "Trying to send with invalid session %p\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:1462
+#: src/transport/plugin_transport_tcp.c:1504
 msgid "# requests to create session with invalid address"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:1567
+#: src/transport/plugin_transport_tcp.c:1609
 msgid "# transport-service disconnect requests for TCP"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2055
+#: src/transport/plugin_transport_tcp.c:2097
 #, fuzzy
 msgid "# TCP WELCOME messages received"
 msgstr "# verschlüsselter PONG Nachrichten empfangen"
 
-#: src/transport/plugin_transport_tcp.c:2215
+#: src/transport/plugin_transport_tcp.c:2257
 msgid "# bytes received via TCP"
 msgstr "# Bytes empfangen über TCP"
 
-#: src/transport/plugin_transport_tcp.c:2279
+#: src/transport/plugin_transport_tcp.c:2321
 msgid "# network-level TCP disconnect events"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2437 src/util/service.c:582
+#: src/transport/plugin_transport_tcp.c:2490 src/util/service.c:582
 #: src/util/service.c:588
 #, c-format
 msgid "Require valid port number for service `%s' in configuration!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2451
+#: src/transport/plugin_transport_tcp.c:2504
 #, fuzzy
 msgid "Failed to start service.\n"
 msgstr "Fehler beim Starten der Collection.\n"
 
-#: src/transport/plugin_transport_tcp.c:2547
+#: src/transport/plugin_transport_tcp.c:2607
 #, 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:2551
+#: src/transport/plugin_transport_tcp.c:2611
 msgid "TCP transport not listening on any port (client only)\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2554
+#: src/transport/plugin_transport_tcp.c:2615
 #, c-format
 msgid "TCP transport advertises itself as being on port %llu\n"
 msgstr ""
@@ -7825,12 +8095,12 @@
 msgid "Cannot create path to `%s'\n"
 msgstr "Namespace `%s' konnte nicht erstellt werden (existiert bereits?).\n"
 
-#: src/transport/plugin_transport_unix.c:1652
+#: src/transport/plugin_transport_unix.c:1645
 #, fuzzy
 msgid "No UNIXPATH given in configuration!\n"
 msgstr "Fehler beim Speichern der Konfiguration!"
 
-#: src/transport/plugin_transport_unix.c:1688
+#: src/transport/plugin_transport_unix.c:1681
 #, fuzzy
 msgid "Failed to open UNIX listen socket\n"
 msgstr "Datei wurde als `%s' gespeichert.\n"
@@ -7902,10 +8172,6 @@
 msgid "# HELLO beacons sent via WLAN"
 msgstr "# Bytes gesendet über UDP"
 
-#: src/transport/plugin_transport_wlan.c:1729
-msgid "WLAN address with invalid size encountered\n"
-msgstr ""
-
 #: src/transport/plugin_transport_wlan.c:1929
 #, c-format
 msgid "Helper binary `%s' not SUID, cannot run WLAN transport\n"
@@ -8056,24 +8322,24 @@
 msgid "Syntax error while deserializing in line %u\n"
 msgstr "Syntaxfehler in Konfigurationsdatei `%s' in Zeile %d.\n"
 
-#: src/util/configuration.c:996
+#: src/util/configuration.c:1023
 #, c-format
 msgid ""
 "Configuration value '%s' for '%s' in section '%s' is not in set of legal "
 "choices\n"
 msgstr ""
 
-#: src/util/configuration.c:1066
+#: src/util/configuration.c:1093
 #, c-format
 msgid "Recursive expansion suspected, aborting $-expansion for term `%s'\n"
 msgstr ""
 
-#: src/util/configuration.c:1098
+#: src/util/configuration.c:1125
 #, fuzzy, c-format
 msgid "Missing closing `%s' in option `%s'\n"
 msgstr "Konfigurationsdatei `%s' wurde erzeugt.\n"
 
-#: src/util/configuration.c:1172
+#: src/util/configuration.c:1199
 #, c-format
 msgid ""
 "Failed to expand `%s' in `%s' as it is neither found in [PATHS] nor defined "
@@ -8174,7 +8440,7 @@
 msgid "Expected `%s' to be a directory!\n"
 msgstr "`%s' erwartet, dass `%s' ein Verzeichnis ist!\n"
 
-#: src/util/disk.c:1546 src/util/service.c:1318
+#: src/util/disk.c:1546 src/util/service.c:1323
 #, fuzzy, c-format
 msgid "Cannot obtain information about user `%s': %s\n"
 msgstr "Fehler beim Speichern der Konfigurationsdatei: `%s': %s.\n"
@@ -8501,17 +8767,17 @@
 msgid "Could not determine plugin installation path.\n"
 msgstr "Öffentliche IP-Adresse konnte nicht ermittelt werden.\n"
 
-#: src/util/program.c:246 src/util/service.c:1452
+#: src/util/program.c:246 src/util/service.c:1457
 #, fuzzy, c-format
 msgid "Malformed configuration file `%s', exit ...\n"
 msgstr "Fehler beim Speichern der Konfigurationsdatei `%s':"
 
-#: src/util/program.c:258 src/util/service.c:1467
+#: src/util/program.c:258 src/util/service.c:1472
 #, fuzzy, c-format
 msgid "Could not access configuration file `%s'\n"
 msgstr "Konfigurationsdatei `%s' konnte nicht geparst werden.\n"
 
-#: src/util/program.c:263 src/util/service.c:1462
+#: src/util/program.c:263 src/util/service.c:1467
 #, fuzzy
 msgid "Malformed configuration, exit ...\n"
 msgstr "Fehler beim Speichern der Konfigurationsdatei `%s':"
@@ -8613,52 +8879,52 @@
 msgid "Have neither PORT nor UNIXPATH for service `%s', but one is required\n"
 msgstr ""
 
-#: src/util/service.c:903
+#: src/util/service.c:908
 msgid "Could not access a pre-bound socket, will try to bind myself\n"
 msgstr ""
 
-#: src/util/service.c:952 src/util/service.c:970
+#: src/util/service.c:957 src/util/service.c:975
 #, c-format
 msgid "Specified value for `%s' of service `%s' is invalid\n"
 msgstr ""
 
-#: src/util/service.c:995
+#: src/util/service.c:1000
 #, c-format
 msgid "Could not access pre-bound socket %u, will try to bind myself\n"
 msgstr ""
 
-#: src/util/service.c:1165
+#: src/util/service.c:1170
 #, fuzzy, c-format
 msgid "Failed to start `%s' at `%s'\n"
 msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
 
-#: src/util/service.c:1207
+#: src/util/service.c:1212
 #, fuzzy, c-format
 msgid "Service `%s' runs at %s\n"
 msgstr "Knoten `%s' mit Vertrauen %8u und Adresse `%s'\n"
 
-#: src/util/service.c:1256
+#: src/util/service.c:1261
 msgid "Service process failed to initialize\n"
 msgstr ""
 
-#: src/util/service.c:1260
+#: src/util/service.c:1265
 msgid "Service process could not initialize server function\n"
 msgstr ""
 
-#: src/util/service.c:1264
+#: src/util/service.c:1269
 msgid "Service process failed to report status\n"
 msgstr ""
 
-#: src/util/service.c:1319
+#: src/util/service.c:1324
 msgid "No such user"
 msgstr ""
 
-#: src/util/service.c:1332
+#: src/util/service.c:1337
 #, c-format
 msgid "Cannot change user/group to `%s': %s\n"
 msgstr "Benutzer/Gruppe kann nicht zu `%s' gewechselt werden: %s\n"
 
-#: src/util/service.c:1402
+#: src/util/service.c:1407
 msgid "do daemonize (detach from terminal)"
 msgstr ""
 
@@ -8790,22 +9056,22 @@
 
 #: src/vpn/gnunet-service-vpn.c:642
 #, fuzzy
-msgid "# Bytes given to mesh for transmission"
+msgid "# Bytes given to cadet for transmission"
 msgstr "# PING Nachrichten erstellt"
 
 #: src/vpn/gnunet-service-vpn.c:680
 #, fuzzy
-msgid "# Bytes dropped in mesh queue (overflow)"
+msgid "# Bytes dropped in cadet queue (overflow)"
 msgstr "# Bytes verworfen von UDP (outgoing)"
 
 #: src/vpn/gnunet-service-vpn.c:753
 #, fuzzy
-msgid "# Mesh channels created"
+msgid "# Cadet channels created"
 msgstr "# dht Anfragen weitergeleitet"
 
 #: src/vpn/gnunet-service-vpn.c:784
 #, fuzzy
-msgid "Failed to setup mesh channel!\n"
+msgid "Failed to setup cadet channel!\n"
 msgstr "Statistiken über den Netzwerkverkehr konnten nicht ermittelt werden.\n"
 
 #: src/vpn/gnunet-service-vpn.c:978
@@ -8842,17 +9108,17 @@
 
 #: src/vpn/gnunet-service-vpn.c:1706
 #, fuzzy
-msgid "# ICMP packets received from mesh"
+msgid "# ICMP packets received from cadet"
 msgstr "Empfangene Client-Nachricht ist ungültig.\n"
 
 #: src/vpn/gnunet-service-vpn.c:2045
 #, fuzzy
-msgid "# UDP packets received from mesh"
+msgid "# UDP packets received from cadet"
 msgstr "Empfangene Client-Nachricht ist ungültig.\n"
 
 #: src/vpn/gnunet-service-vpn.c:2200
 #, fuzzy
-msgid "# TCP packets received from mesh"
+msgid "# TCP packets received from cadet"
 msgstr "Empfangene Client-Nachricht ist ungültig.\n"
 
 #: src/vpn/gnunet-service-vpn.c:2351
@@ -8873,29 +9139,29 @@
 msgid "Failed to allocate IP address for new destination\n"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:2982
+#: src/vpn/gnunet-service-vpn.c:2987
 #, fuzzy
 msgid "Must specify valid IPv6 address"
 msgstr "`%s' ist nicht verfügbar."
 
-#: src/vpn/gnunet-service-vpn.c:3006
+#: src/vpn/gnunet-service-vpn.c:3011
 msgid "Must specify valid IPv6 mask"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:3014
+#: src/vpn/gnunet-service-vpn.c:3019
 msgid "IPv6 support disabled as this system does not support IPv6\n"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:3027
+#: src/vpn/gnunet-service-vpn.c:3032
 #, fuzzy
 msgid "Must specify valid IPv4 address"
 msgstr "`%s' ist nicht verfügbar."
 
-#: src/vpn/gnunet-service-vpn.c:3040
+#: src/vpn/gnunet-service-vpn.c:3045
 msgid "Must specify valid IPv4 mask"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:3050
+#: src/vpn/gnunet-service-vpn.c:3055
 msgid "IPv4 support disabled as this system does not support IPv4\n"
 msgstr ""
 
@@ -8984,6 +9250,59 @@
 msgstr "`%s' schlug bei Datei `%s' fehl. Ort: %s:%d. Fehler: %s\n"
 
 #, fuzzy
+#~ msgid "Peer `%s'\n"
+#~ msgstr "Ich bin Peer `%s'.\n"
+
+#, fuzzy
+#~ msgid "# Bytes received from MESH"
+#~ msgstr "# Bytes empfangen über HTTP"
+
+#, fuzzy
+#~ msgid "# Replies received from MESH"
+#~ msgstr "# Bytes empfangen über HTTP"
+
+#, fuzzy
+#~ msgid "Failed to run `upnpc` command"
+#~ msgstr "Fehler beim Starten der Collection.\n"
+
+#, fuzzy
+#~ msgid "`upnpc` command not found"
+#~ msgstr "Kommando `%s' wurde nicht gefunden!\n"
+
+#, fuzzy
+#~ msgid "Could not convert `%s' to integer.\n"
+#~ msgstr "Verbindung zu gnunetd konnte nicht hergestellt werden.\n"
+
+#, fuzzy
+#~ msgid "Too short message received from client!\n"
+#~ msgstr "Empfangene Client-Nachricht ist ungültig.\n"
+
+#, fuzzy
+#~ msgid ""
+#~ "Invalid message received from client, session information incorrect!\n"
+#~ msgstr "Ungültige `%s' Nachricht von Knoten `%s' empfangen.\n"
+
+#, fuzzy
+#~ msgid "# SUC responder result messages received"
+#~ msgstr "# verschlüsselter PING Nachrichten empfangen"
+
+#, fuzzy
+#~ msgid "# bytes sent to scalarproduct"
+#~ msgstr "# bytes in der Datenbank"
+
+#, fuzzy
+#~ msgid "Failed to connect to the scalarproduct service\n"
+#~ msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
+
+#, fuzzy
+#~ msgid "Failed to send a message to the statistics service\n"
+#~ msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
+
+#, fuzzy
+#~ msgid "Failed to send a message to the scalarproduct service\n"
+#~ msgstr "Der Transportdienst auf Port %d konnte nicht gestartet werden.\n"
+
+#, fuzzy
 #~ msgid "# TRAIL SETUP requests received"
 #~ msgstr "# Client Trace-Anfragen empfangen"
 
@@ -9157,10 +9476,6 @@
 #~ msgstr "Fehler beim Aktualisieren der Daten des Moduls `%s'\n"
 
 #, fuzzy
-#~ msgid "Unable to initialize resolver!\n"
-#~ msgstr "SQLite Datenbank konnte nicht initialisiert werden: %s.\n"
-
-#, fuzzy
 #~ msgid "Using default zone file `%s'\n"
 #~ msgstr "Collection `%s' begonnen.\n"
 
@@ -9321,10 +9636,6 @@
 #~ msgstr "Diese Suche läuft bereits!\n"
 
 #, fuzzy
-#~ msgid "Error communicating with ARM service.\n"
-#~ msgstr "Informationen über andere GNUnet Knoten ausgeben."
-
-#, fuzzy
 #~ msgid "Timeout communicating with ARM service.\n"
 #~ msgstr "Informationen über andere GNUnet Knoten ausgeben."
 
@@ -9369,10 +9680,6 @@
 #~ msgstr "Fehler beim Starten der Collection.\n"
 
 #, fuzzy
-#~ msgid "# session keys received"
-#~ msgstr "# Sitzungsschlüssel abgelehnt"
-
-#, fuzzy
 #~ msgid "`%s' is for `%s', not for me.  Ignoring.\n"
 #~ msgstr "Größe der `%s' Nachricht ist zu kurz. Nachricht wird ignoriert.\n"
 
@@ -9543,10 +9850,6 @@
 #~ msgstr "Fehler beim Abfragen der Netzwerkverkehrsbedingungen von gnunetd.\n"
 
 #, fuzzy
-#~ msgid "Failed to queue a confirmation receipt\n"
-#~ msgstr "Fehler beim Speichern der Konfiguration!"
-
-#, fuzzy
 #~ msgid "Failed to queue a leave notification\n"
 #~ msgstr "Fehler beim Speichern der Konfiguration!"
 
@@ -9555,12 +9858,6 @@
 #~ msgstr "`%s' hat sich mit `%s' verbunden.\n"
 
 #, fuzzy
-#~ msgid "Configuration fails to specify `%s' in section `%s'\n"
-#~ msgstr ""
-#~ "Die Konfigurationsdatei muss in der Sektion `%s' unter `%s' ein "
-#~ "Verzeichnis angeben, in dem FS Daten gespeichert werden.\n"
-
-#, fuzzy
 #~ msgid "Configuration fails to specify `%s', assuming default value."
 #~ msgstr "Konfigurationsdatei `%s' wurde erzeugt.\n"
 
@@ -9842,9 +10139,6 @@
 #~ msgid "print the version number"
 #~ msgstr "Versionsnummer ausgeben"
 
-#~ msgid "be verbose"
-#~ msgstr "umfangreiche Meldungen ausgeben"
-
 #, fuzzy
 #~ msgid "Failed to start service `%s'!\n"
 #~ msgstr "Der Transportdienst auf Port %d konnte nicht gestartet werden.\n"
@@ -10989,15 +11283,7 @@
 #~ "\n"
 #~ "Upload abgebrochen.\n"
 
-#, fuzzy
 #~ msgid ""
-#~ "\n"
-#~ "Error uploading file: %s"
-#~ msgstr ""
-#~ "\n"
-#~ "Fehler beim Uploaden der Datei: %s\n"
-
-#~ msgid ""
 #~ "even if gnunetd is running on the local machine, force the creation of a "
 #~ "copy instead of making a link to the GNUnet share directory"
 #~ msgstr ""
@@ -11064,10 +11350,6 @@
 #~ msgid "No filename specified, using `%s' instead (for now).\n"
 #~ msgstr "Kein Tabellenname angegeben, verwende `%s'.\n"
 
-#, fuzzy
-#~ msgid "Downloading %d files from directory `%s'.\n"
-#~ msgstr "Dateien aus dem GNUnet herunterladen."
-
 #~ msgid "File stored as `%s'.\n"
 #~ msgstr "Datei wurde als `%s' gespeichert.\n"
 

Modified: gnunet/po/es.po
===================================================================
--- gnunet/po/es.po     2014-06-04 16:03:17 UTC (rev 33521)
+++ gnunet/po/es.po     2014-06-04 16:38:42 UTC (rev 33522)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: gnunet 0.9.5a\n"
 "Report-Msgid-Bugs-To: address@hidden"
-"POT-Creation-Date: 2014-04-08 11:11+0200\n"
+"POT-Creation-Date: 2014-06-04 18:25+0200\n"
 "PO-Revision-Date: 2013-02-23 17:50+0100\n"
 "Last-Translator: Miguel Ángel Arruga Vivas <address@hidden>\n"
 "Language-Team: Spanish <address@hidden>\n"
@@ -372,19 +372,19 @@
 msgid "Initiating shutdown as requested by client.\n"
 msgstr "Iniciando apagado bajo petición del cliente.\n"
 
-#: src/ats/ats_api_performance.c:468
+#: src/ats/ats_api_performance.c:485
 #, c-format
 msgid "Received %s message\n"
 msgstr "Recibido mensaje %s\n"
 
-#: src/ats/ats_api_performance.c:511
+#: src/ats/ats_api_performance.c:528
 #, c-format
 msgid "Received last message for %s \n"
 msgstr "Recibido último mensaje para %s\n"
 
-#: src/ats/gnunet-ats-solver-eval.c:2199 src/ats/gnunet-ats-solver-eval.c:2233
-#: src/ats/gnunet-service-ats_addresses.c:1980
-#: src/ats/gnunet-service-ats_addresses.c:2024
+#: src/ats/gnunet-ats-solver-eval.c:2793 src/ats/gnunet-ats-solver-eval.c:2827
+#: src/ats/gnunet-service-ats_addresses.c:1675
+#: src/ats/gnunet-service-ats_addresses.c:1719
 #, c-format
 msgid ""
 "Could not load quota for network `%s':  `%s', assigning default bandwidth "
@@ -394,14 +394,14 @@
 "de banda predeterminado %llu\n"
 
 # Miguel: "Outbound" lo he traducido como salida en todo el texto.
-#: src/ats/gnunet-ats-solver-eval.c:2205
-#: src/ats/gnunet-service-ats_addresses.c:1987
+#: src/ats/gnunet-ats-solver-eval.c:2799
+#: src/ats/gnunet-service-ats_addresses.c:1682
 #, 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-ats-solver-eval.c:2212
-#: src/ats/gnunet-service-ats_addresses.c:1995
+#: src/ats/gnunet-ats-solver-eval.c:2806
+#: src/ats/gnunet-service-ats_addresses.c:1690
 #, c-format
 msgid ""
 "No outbound quota configured for network `%s', assigning default bandwidth "
@@ -411,14 +411,14 @@
 "de banda predeterminado %llu\n"
 
 # Miguel: "Inbound" lo he traducido como entrada en todo el texto.
-#: src/ats/gnunet-ats-solver-eval.c:2239
-#: src/ats/gnunet-service-ats_addresses.c:2031
+#: src/ats/gnunet-ats-solver-eval.c:2833
+#: src/ats/gnunet-service-ats_addresses.c:1726
 #, 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-ats-solver-eval.c:2246
-#: src/ats/gnunet-service-ats_addresses.c:2039
+#: src/ats/gnunet-ats-solver-eval.c:2840
+#: src/ats/gnunet-service-ats_addresses.c:1734
 #, c-format
 msgid ""
 "No outbound quota configure for network `%s', assigning default bandwidth "
@@ -427,54 +427,83 @@
 "No hay configurada una cuota de salida para la red «%s», asignando el ancho "
 "de banda predeterminado %llu\n"
 
-#: src/ats/gnunet-ats-solver-eval.c:2671
+#: src/ats/gnunet-ats-solver-eval.c:3397
 #: src/ats-tests/gnunet-solver-eval.c:919
 #, fuzzy
 msgid "solver to use"
 msgstr "valor a establecer"
 
-#: src/ats/gnunet-ats-solver-eval.c:2674 src/ats/gnunet-ats-solver-eval.c:2677
+#: src/ats/gnunet-ats-solver-eval.c:3400
 #: src/ats-tests/gnunet-solver-eval.c:922
 #: src/ats-tests/gnunet-solver-eval.c:925
 msgid "experiment to use"
 msgstr ""
 
-#: src/ats/gnunet-ats-solver-eval.c:2680
+#: src/ats/gnunet-ats-solver-eval.c:3403
+msgid "be verbose"
+msgstr ""
+
+#: src/ats/gnunet-ats-solver-eval.c:3406
 #, fuzzy
 msgid "print logging"
 msgstr "Iniciando descarga «%s».\n"
 
-#: src/ats/gnunet-service-ats_addresses.c:2217
+#: src/ats/gnunet-ats-solver-eval.c:3409
+msgid "save logging to disk"
+msgstr ""
+
+#: src/ats/gnunet-ats-solver-eval.c:3412
+msgid "disable normalization"
+msgstr ""
+
+#: src/ats/gnunet-service-ats_addresses.c:1912
 #, c-format
 msgid "Initializing solver `%s '`%s'\n"
 msgstr ""
 
-#: src/ats/gnunet-service-ats_addresses.c:2220
+#: src/ats/gnunet-service-ats_addresses.c:1915
 #, 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:2243
+#: src/ats/gnunet-service-ats_addresses.c:1938
 #, fuzzy
 msgid "Failed to initialize solver!\n"
 msgstr "¡No se puede inicializar el resolvedor!\n"
 
-#: src/ats/plugin_ats_mlp.c:892
+#: src/ats/plugin_ats_mlp.c:949
 msgid "Problem size too large, cannot allocate memory!\n"
 msgstr ""
 
-#: src/ats/plugin_ats_mlp.c:1329
+#: src/ats/plugin_ats_mlp.c:1542
 #, fuzzy, c-format
 msgid "Adding address for peer `%s' multiple times\n"
 msgstr "Añadiendo «%s» sin direcciones para el par «%s»\n"
 
-#: src/ats/plugin_ats_mlp.c:1376
+#: src/ats/plugin_ats_mlp.c:1589
 #, c-format
 msgid "Updating address property `%s' for peer `%s' %p not added before\n"
 msgstr ""
 
-#: src/ats/plugin_ats_mlp.c:2122
+#: src/ats/plugin_ats_mlp.c:2299
+msgid ""
+"MLP solver is not optimizing for anything, changing to feasibility check\n"
+msgstr ""
+
+#: src/ats/plugin_ats_mlp.c:2339 src/ats/plugin_ats_mlp.c:2356
+#: src/ats/plugin_ats_mlp.c:2388 src/ats/plugin_ats_mlp.c:2406
+#: src/ats/plugin_ats_mlp.c:2425 src/ats/plugin_ats_proportional.c:458
+#: src/ats/plugin_ats_proportional.c:475 src/ats/plugin_ats_ril.c:2220
+#: src/ats/plugin_ats_ril.c:2237 src/ats/plugin_ats_ril.c:2254
+#: src/ats/plugin_ats_ril.c:2271 src/ats/plugin_ats_ril.c:2288
+#: src/ats/plugin_ats_ril.c:2305 src/ats/plugin_ats_ril.c:2322
+#: src/ats/plugin_ats_ril.c:2339
 #, fuzzy, c-format
+msgid "Invalid %s configuration %f \n"
+msgstr "Se produjo un fallo al cargar la configuración de %s\n"
+
+#: src/ats/plugin_ats_mlp.c:2512
+#, fuzzy, c-format
 msgid ""
 "Adjusting inconsistent outbound quota configuration for network `%s', is "
 "%llu must be at least %llu\n"
@@ -482,7 +511,7 @@
 "No hay configurada una cuota de salida para la red «%s», asignando el ancho "
 "de banda predeterminado %llu\n"
 
-#: src/ats/plugin_ats_mlp.c:2131
+#: src/ats/plugin_ats_mlp.c:2521
 #, fuzzy, c-format
 msgid ""
 "Adjusting inconsistent inbound quota configuration for network `%s', is %llu "
@@ -492,26 +521,26 @@
 "ancho de banda predeterminado (%llu)\n"
 
 # Miguel: "Outbound" lo he traducido como salida en todo el texto.
-#: src/ats/plugin_ats_mlp.c:2142
+#: src/ats/plugin_ats_mlp.c:2532
 #, fuzzy, c-format
 msgid ""
 "Adjusting outbound quota configuration for network `%s'from %llu to %.0f\n"
 msgstr "La cuota de salida configurada para la red «%s» es %llu\n"
 
 # Miguel: "Outbound" lo he traducido como salida en todo el texto.
-#: src/ats/plugin_ats_mlp.c:2150
+#: src/ats/plugin_ats_mlp.c:2540
 #, fuzzy, c-format
 msgid ""
 "Adjusting inbound quota configuration for network `%s' from %llu to %.0f\n"
 msgstr "La cuota de salida configurada para la red «%s» es %llu\n"
 
 # Miguel: "Outbound" lo he traducido como salida en todo el texto.
-#: src/ats/plugin_ats_mlp.c:2161
+#: src/ats/plugin_ats_mlp.c:2551
 #, fuzzy, c-format
 msgid "Using default quota configuration for network `%s' (in/out) %llu/%llu\n"
 msgstr "La cuota de salida configurada para la red «%s» es %llu\n"
 
-#: src/ats/plugin_ats_proportional.c:1511
+#: src/ats/plugin_ats_proportional.c:1819
 #, fuzzy, c-format
 msgid "Invalid network type `%u' `%s': Disconnect!\n"
 msgstr "No se encontró la IP del host «%s»: %s\n"
@@ -549,7 +578,7 @@
 msgid "Could not connect master [%u] and slave [%u]\n"
 msgstr "¡No se pudo conectar al servicio %s!\n"
 
-#: src/ats-tests/ats-testing.c:490 src/ats-tests/ats-testing.c:671
+#: src/ats-tests/ats-testing.c:490 src/ats-tests/ats-testing.c:673
 #, fuzzy
 msgid "Initialization failed, shutdown\n"
 msgstr "¡La inicialización del mecanismo de módulos falló: %s!\n"
@@ -586,7 +615,7 @@
 
 # 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:232
+#: src/ats-tool/gnunet-ats.c:258
 #, c-format
 msgid ""
 "Peer `%s' plugin `%s', address `%s', `%s' bw out: %u Bytes/s, bw in %u Bytes/"
@@ -595,107 +624,162 @@
 "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:413
+#: src/ats-tool/gnunet-ats.c:467
 #, 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:433 src/core/gnunet-core.c:163
-#: src/namestore/gnunet-namestore.c:550 src/transport/gnunet-transport.c:1246
+#: src/ats-tool/gnunet-ats.c:487 src/namestore/gnunet-namestore.c:639
+#: src/transport/gnunet-transport.c:1349
 #, c-format
 msgid "Service `%s' is not running\n"
 msgstr "El servicio «%s» no está ejecutandose\n"
 
-#: src/ats-tool/gnunet-ats.c:445 src/transport/gnunet-transport.c:1255
+#: src/ats-tool/gnunet-ats.c:499 src/transport/gnunet-transport.c:1358
 #, 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:454
+#: src/ats-tool/gnunet-ats.c:508
 #, 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:470 src/ats-tool/gnunet-ats.c:489
-#: src/ats-tool/gnunet-ats.c:506 src/ats-tool/gnunet-ats.c:543
+#: src/ats-tool/gnunet-ats.c:524 src/ats-tool/gnunet-ats.c:543
+#: src/ats-tool/gnunet-ats.c:560 src/ats-tool/gnunet-ats.c:597
 #, 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:478 src/ats-tool/gnunet-ats.c:495
+#: src/ats-tool/gnunet-ats.c:532 src/ats-tool/gnunet-ats.c:549
 #, 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:515
+#: src/ats-tool/gnunet-ats.c:569
 #, fuzzy, c-format
 msgid "No preference type given!\n"
 msgstr "establece las preferencias para el par dado"
 
-#: src/ats-tool/gnunet-ats.c:520
+#: src/ats-tool/gnunet-ats.c:574
 #, fuzzy, c-format
 msgid "No peer given!\n"
 msgstr "No se han proporcionado opciones\n"
 
-#: src/ats-tool/gnunet-ats.c:536
+#: src/ats-tool/gnunet-ats.c:590
 #, fuzzy
 msgid "Valid type required\n"
 msgstr "Tipo requerido\n"
 
-#: src/ats-tool/gnunet-ats.c:594
+#: src/ats-tool/gnunet-ats.c:648
 msgid "get list of active addresses currently used"
 msgstr "obtiene una lista de direcciones activas usadas actualmente"
 
-#: src/ats-tool/gnunet-ats.c:596
+#: src/ats-tool/gnunet-ats.c:650
 msgid "get list of all active addresses"
 msgstr "obtiene una lista de todas las direcciones activas"
 
-#: src/ats-tool/gnunet-ats.c:599
+#: src/ats-tool/gnunet-ats.c:653
 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:601
+#: src/ats-tool/gnunet-ats.c:655
 msgid "monitor mode"
 msgstr "modo de monitorización"
 
-#: src/ats-tool/gnunet-ats.c:603
+#: src/ats-tool/gnunet-ats.c:657
 msgid "set preference for the given peer"
 msgstr "establece las preferencias para el par dado"
 
-#: src/ats-tool/gnunet-ats.c:605
+#: src/ats-tool/gnunet-ats.c:659
 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:607
+#: src/ats-tool/gnunet-ats.c:661
 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:610
+#: src/ats-tool/gnunet-ats.c:664
 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:612
+#: src/ats-tool/gnunet-ats.c:666
 msgid "preference value"
 msgstr "valor de preferencia"
 
 # Miguel: ¿Algo menos forzado que "salida prolija"?
-#: src/ats-tool/gnunet-ats.c:615
+#: src/ats-tool/gnunet-ats.c:669
 msgid "verbose output (include ATS address properties)"
 msgstr "salida prolija (incluye las propiedades de direcciones del ATS)"
 
-#: src/ats-tool/gnunet-ats.c:622
+#: src/ats-tool/gnunet-ats.c:676
 msgid "Print information about ATS state"
 msgstr "Imprime información acerca del estado del ATS"
 
+#: src/cadet/gnunet-cadet.c:357
+#, fuzzy, c-format
+msgid "Invalid target `%s'\n"
+msgstr "Parámetro no válido «%s»\n"
+
+#: src/cadet/gnunet-cadet.c:607
+#, fuzzy, c-format
+msgid "Invalid peer ID `%s'\n"
+msgstr "URI no válida: «%s»\n"
+
+#: src/cadet/gnunet-cadet.c:650
+#, fuzzy, c-format
+msgid "Invalid tunnel owner `%s'\n"
+msgstr "Formato de tiempo no válido «%s»\n"
+
+#: src/cadet/gnunet-cadet.c:716
+msgid "You must NOT give a TARGETwhen using 'request all' options\n"
+msgstr ""
+
+#: src/cadet/gnunet-cadet.c:807
+#, fuzzy
+msgid "provide information about a particular connection"
+msgstr "proveer información acerca de un túnel en particular"
+
+#: src/cadet/gnunet-cadet.c:810
+msgid "activate echo mode"
+msgstr ""
+
+#: src/cadet/gnunet-cadet.c:816
+msgid "port to listen to (default; 0)"
+msgstr ""
+
+#: src/cadet/gnunet-cadet.c:819
+#, fuzzy
+msgid "provide information about a patricular peer"
+msgstr "proveer información acerca de un túnel en particular"
+
+#: src/cadet/gnunet-cadet.c:822
+#, fuzzy
+msgid "provide information about all peers"
+msgstr "proveer información acerca de un túnel en particular"
+
+#: src/cadet/gnunet-cadet.c:825
+msgid "provide information about a particular tunnel"
+msgstr "proveer información acerca de un túnel en particular"
+
+#: src/cadet/gnunet-cadet.c:828
+#, fuzzy
+msgid "provide information about all tunnels"
+msgstr "proveer información acerca de un túnel en particular"
+
+#: src/cadet/gnunet-service-cadet_peer.c:429
+msgid "Wrong CORE service\n"
+msgstr "Servicio principal (CORE) erróneo\n"
+
 #: src/consensus/gnunet-consensus-profiler.c:437
-#: src/secretsharing/gnunet-secretsharing-profiler.c:535
+#: src/secretsharing/gnunet-secretsharing-profiler.c:610
 msgid "number of peers in consensus"
 msgstr "número de pares en consenso"
 
@@ -720,7 +804,7 @@
 msgstr ""
 
 #: src/consensus/gnunet-consensus-profiler.c:452
-#: src/secretsharing/gnunet-secretsharing-profiler.c:550
+#: src/secretsharing/gnunet-secretsharing-profiler.c:625
 msgid "be more verbose (print received values)"
 msgstr ""
 
@@ -731,6 +815,11 @@
 msgstr ""
 "El cliente se desconectó del servicio principal, tratando de reconectar.\n"
 
+#: src/conversation/conversation_api.c:681
+#, fuzzy
+msgid "number too large"
+msgstr "número de valores"
+
 #: src/conversation/gnunet-conversation.c:264
 #, c-format
 msgid "Incoming call from `%s'. Please /accept #%u or /cancel %u the call.\n"
@@ -1149,19 +1238,19 @@
 msgstr ""
 "Se produjo un fallo al alojar las direcciones IP para el nuevo destino\n"
 
-#: src/conversation/gnunet-service-conversation.c:841
-msgid "Mesh audio channel not ready; audio data dropped\n"
+#: src/conversation/gnunet-service-conversation.c:852
+msgid "Cadet audio channel not ready; audio data dropped\n"
 msgstr ""
 
-#: src/conversation/gnunet-service-conversation.c:932
+#: src/conversation/gnunet-service-conversation.c:943
 #, c-format
 msgid ""
 "No available phone for incoming call on line %u, sending HANG_UP signal\n"
 msgstr ""
 
-#: src/conversation/gnunet-service-conversation.c:1338
+#: src/conversation/gnunet-service-conversation.c:1349
 #, fuzzy, c-format
-msgid "Received incoming channel on port %u\n"
+msgid "Received incoming Cadet channel on port %u\n"
 msgstr "Desconectado de %s\n"
 
 #: src/conversation/microphone.c:121
@@ -1179,117 +1268,148 @@
 msgid "Could not start playback audio helper.\n"
 msgstr "No se pudo empezar a publicar.\n"
 
-#: src/core/core_api.c:767
+#: src/core/core_api.c:768
 msgid "Client was disconnected from core service, trying to reconnect.\n"
 msgstr ""
 "El cliente se desconectó del servicio principal, tratando de reconectar.\n"
 
-#: src/core/gnunet-core.c:80
-#, c-format
-msgid "Peer `%s'\n"
-msgstr "Par «%s»\n"
+#: src/core/gnunet-core.c:92
+#, fuzzy
+msgid "fresh connection"
+msgstr "# amigos conectados"
 
-#: src/core/gnunet-core.c:110 src/core/gnunet-core.c:138
-#: src/transport/gnunet-transport.c:910 src/transport/gnunet-transport.c:930
-#, c-format
-msgid "%24s: %-17s %4s   (%u connections in total)\n"
-msgstr "%24s: %-17s %4s   (%u conexiones en total)\n"
+#: src/core/gnunet-core.c:95
+msgid "key sent"
+msgstr ""
 
-#: src/core/gnunet-core.c:112 src/transport/gnunet-transport.c:911
-msgid "Connected to"
-msgstr "Conectado a"
+#: src/core/gnunet-core.c:98
+#, fuzzy
+msgid "key received"
+msgstr "# claves de sesión recibidas"
 
-#: src/core/gnunet-core.c:140 src/transport/gnunet-transport.c:931
-msgid "Disconnected from"
+#: src/core/gnunet-core.c:101
+#, fuzzy
+msgid "connection established"
+msgstr "Colección detenida.\n"
+
+#: src/core/gnunet-core.c:104
+msgid "rekeying"
+msgstr ""
+
+#: src/core/gnunet-core.c:107
+#, fuzzy
+msgid "disconnected"
 msgstr "Desconectado de"
 
-#: src/core/gnunet-core.c:211 src/peerinfo-tool/gnunet-peerinfo.c:694
+#: src/core/gnunet-core.c:114
+#, fuzzy
+msgid "Connection to CORE service lost (reconnecting)"
+msgstr ""
+"El cliente se desconectó del servicio principal, tratando de reconectar.\n"
+
+#: src/core/gnunet-core.c:117
+#, fuzzy
+msgid "unknown state"
+msgstr "<tiempo desconocido>"
+
+#: src/core/gnunet-core.c:122
+#, fuzzy, c-format
+msgid "%24s: %-30s %4s (timeout in %6s)\n"
+msgstr "%24s: %-17s %4s   (%u conexiones en total)\n"
+
+#: src/core/gnunet-core.c:146 src/peerinfo-tool/gnunet-peerinfo.c:705
 #, c-format
 msgid "Invalid command line argument `%s'\n"
 msgstr "Parámetro no válido «%s» en la línea de comandos\n"
 
+#: src/core/gnunet-core.c:157
+#: src/experimentation/gnunet-daemon-experimentation_nodes.c:1104
+#, fuzzy
+msgid "Failed to connect to CORE service!\n"
+msgstr "¡Se produjo un fallo al conectar con el servicio DHT!\n"
+
 # Miguel: ¿Quizá continuamente fuese mejor?
-#: src/core/gnunet-core.c:233 src/transport/gnunet-transport.c:1486
+#: src/core/gnunet-core.c:179 src/transport/gnunet-transport.c:1590
 msgid "provide information about all current connections (continuously)"
 msgstr ""
 "provee información sobre todas las conexiones actuales (de forma continua)"
 
-#: src/core/gnunet-core.c:244
+#: src/core/gnunet-core.c:188
 msgid "Print information about connected peers."
 msgstr "Imprime información sobre los pares conectados."
 
-#: src/core/gnunet-service-core.c:105
+#: src/core/gnunet-service-core.c:104
 msgid "Core service is lacking HOSTKEY configuration setting.  Exiting.\n"
 msgstr ""
 "Al servicio principal le falta la configuración de la clave de máquina "
 "(HOSTKEY).  Saliendo.\n"
 
-#: src/core/gnunet-service-core.c:126
+#: src/core/gnunet-service-core.c:128
 #, c-format
 msgid "Core service of `%4s' ready.\n"
 msgstr "El servicio principal de «%4s» está listo.\n"
 
-#: src/core/gnunet-service-core_clients.c:370
+#: src/core/gnunet-service-core_clients.c:372
 msgid "# send requests dropped (disconnected)"
 msgstr "# peticiones de envío descartadas (desconectado)"
 
-#: src/core/gnunet-service-core_clients.c:480
+#: src/core/gnunet-service-core_clients.c:483
 msgid "# messages discarded (session disconnected)"
 msgstr "# mensajes descartados (sesión desconectada)"
 
-#: src/core/gnunet-service-core_clients.c:526
+#: src/core/gnunet-service-core_clients.c:529
 #, c-format
 msgid "# bytes of messages of type %u received"
 msgstr "# bytes de mensajes del tipo %u recibidos"
 
-#: src/core/gnunet-service-core_kx.c:535
+#: src/core/gnunet-service-core_kx.c:549
 msgid "# bytes encrypted"
 msgstr "# bytes cifrados"
 
-#: src/core/gnunet-service-core_kx.c:586
+#: src/core/gnunet-service-core_kx.c:601
 msgid "# bytes decrypted"
 msgstr "# bytes descifrados"
 
-#: src/core/gnunet-service-core_kx.c:673
+#: src/core/gnunet-service-core_kx.c:688
 msgid "# key exchanges initiated"
 msgstr "# intercambio de claves iniciados"
 
-#: src/core/gnunet-service-core_kx.c:713
+#: src/core/gnunet-service-core_kx.c:732
 msgid "# key exchanges stopped"
 msgstr "# intercambio de claves parados"
 
-#: src/core/gnunet-service-core_kx.c:810
+#: src/core/gnunet-service-core_kx.c:832
 msgid "# old ephemeral keys ignored"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:816
+#: src/core/gnunet-service-core_kx.c:839
 #, fuzzy
 msgid "# ephemeral keys received"
 msgstr "# mapas de tipos recibidos"
 
-#: src/core/gnunet-service-core_kx.c:850
+#: src/core/gnunet-service-core_kx.c:873
 #, 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:861
+#: src/core/gnunet-service-core_kx.c:884
 #, fuzzy
 msgid "# EPHEMERAL_KEY messages received"
 msgstr "# mensajes «SET_KEY» descifrados"
 
-#: src/core/gnunet-service-core_kx.c:951
+#: src/core/gnunet-service-core_kx.c:983
 #: src/transport/gnunet-service-transport_validation.c:1016
 msgid "# PING messages received"
 msgstr "# mensajes PING recibidos"
 
-#: src/core/gnunet-service-core_kx.c:959
+#: src/core/gnunet-service-core_kx.c:991
 #, 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:986
+#: src/core/gnunet-service-core_kx.c:1018
 #, c-format
 msgid ""
 "Received PING from `%s' for different identity: I am `%s', PONG identity: `"
@@ -1298,84 +1418,84 @@
 "Recibido PING de «%s» para una identidad diferente: Yo soy «%s», identidad "
 "del PONG: «%s»\n"
 
-#: src/core/gnunet-service-core_kx.c:1003
+#: src/core/gnunet-service-core_kx.c:1035
 msgid "# PONG messages created"
 msgstr "# mensajes PONG creados"
 
-#: src/core/gnunet-service-core_kx.c:1029
+#: src/core/gnunet-service-core_kx.c:1061
 msgid "# sessions terminated by timeout"
 msgstr "# sesiones terminadas por plazo de expiración"
 
-#: src/core/gnunet-service-core_kx.c:1039
+#: src/core/gnunet-service-core_kx.c:1072
 msgid "# keepalive messages sent"
 msgstr "# mensajes «keepalive» enviados"
 
-#: src/core/gnunet-service-core_kx.c:1096
+#: src/core/gnunet-service-core_kx.c:1139
 #: src/transport/gnunet-service-transport_validation.c:1328
 msgid "# PONG messages received"
 msgstr "# mensajes PONG recibidos"
 
-#: src/core/gnunet-service-core_kx.c:1102
+#: src/core/gnunet-service-core_kx.c:1145
 #, fuzzy
 msgid "# PONG messages dropped (connection down)"
 msgstr "# mensajes PONG recibidos"
 
-#: src/core/gnunet-service-core_kx.c:1107
+#: src/core/gnunet-service-core_kx.c:1150
 #, 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:1137
+#: src/core/gnunet-service-core_kx.c:1180
 msgid "# PONG messages decrypted"
 msgstr "# mensajes PONG descifrados"
 
-#: src/core/gnunet-service-core_kx.c:1171
+#: src/core/gnunet-service-core_kx.c:1215
 msgid "# session keys confirmed via PONG"
 msgstr "# claves de sesión confirmadas vía PONG"
 
-#: src/core/gnunet-service-core_kx.c:1181
+#: src/core/gnunet-service-core_kx.c:1226
 #, fuzzy
 msgid "# timeouts prevented via PONG"
 msgstr "# bytes recibidos vía TCP"
 
-#: src/core/gnunet-service-core_kx.c:1188
+#: src/core/gnunet-service-core_kx.c:1233
 msgid "# rekey operations confirmed via PONG"
 msgstr "# operaciones de cambio de clave confirmadas vía PONG"
 
-#: src/core/gnunet-service-core_kx.c:1328
+#: src/core/gnunet-service-core_kx.c:1374
 #, fuzzy
 msgid "# DATA message dropped (out of order)"
 msgstr "# bytes omitidos (fuera de secuencia)"
 
-#: src/core/gnunet-service-core_kx.c:1335
+#: src/core/gnunet-service-core_kx.c:1381
 #, 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:1338
+#: src/core/gnunet-service-core_kx.c:1384
 #, fuzzy
 msgid "# sessions terminated by key expiration"
 msgstr "# sesiones terminadas por plazo de expiración"
 
-#: src/core/gnunet-service-core_kx.c:1383
-#: src/core/gnunet-service-core_kx.c:1408
+#: src/core/gnunet-service-core_kx.c:1430
+#: src/core/gnunet-service-core_kx.c:1455
 msgid "# bytes dropped (duplicates)"
 msgstr "# bytes omitidos (duplicados)"
 
-#: src/core/gnunet-service-core_kx.c:1395
+#: src/core/gnunet-service-core_kx.c:1442
 msgid "# bytes dropped (out of sequence)"
 msgstr "# bytes omitidos (fuera de secuencia)"
 
-#: src/core/gnunet-service-core_kx.c:1437
+#: src/core/gnunet-service-core_kx.c:1484
 msgid "# bytes dropped (ancient message)"
 msgstr "# bytes omitidos (mensaje antiguo)"
 
-#: src/core/gnunet-service-core_kx.c:1445
+#: src/core/gnunet-service-core_kx.c:1492
 msgid "# bytes of payload decrypted"
 msgstr "# bytes de «payload» descifrados"
 
-#: src/core/gnunet-service-core_kx.c:1480
+#: src/core/gnunet-service-core_kx.c:1527
 #, fuzzy
 msgid "# PAYLOAD dropped (out of order)"
 msgstr "# bytes omitidos (fuera de secuencia)"
@@ -1398,35 +1518,45 @@
 msgid "Unsupported message of type %u (%u bytes) received from peer `%s'\n"
 msgstr "Mensaje no soportado del tipo %u (%u bytes) recibido del par «%s»\n"
 
-#: src/core/gnunet-service-core_sessions.c:216
-#: src/core/gnunet-service-core_sessions.c:288
+#: src/core/gnunet-service-core_sessions.c:245
+#: src/core/gnunet-service-core_sessions.c:328
 #: src/dht/gnunet-service-dht_neighbours.c:662
 #: src/dht/gnunet-service-dht_neighbours.c:727
-#: src/dht/gnunet-service-xdht_neighbours.c:1304
+#: src/dht/gnunet-service-xdht_neighbours.c:3586
 #: src/fs/gnunet-service-fs_cp.c:606 src/fs/gnunet-service-fs_cp.c:1501
 #: src/topology/gnunet-daemon-topology.c:707
 #: src/topology/gnunet-daemon-topology.c:808
 #: src/transport/gnunet-service-transport_neighbours.c:917
 #: src/transport/gnunet-service-transport_neighbours.c:1141
-#: src/transport/gnunet-service-transport_neighbours.c:3142
-#: src/transport/gnunet-service-transport_neighbours.c:3438
+#: src/transport/gnunet-service-transport_neighbours.c:3146
+#: src/transport/gnunet-service-transport_neighbours.c:3449
 msgid "# peers connected"
 msgstr "# pares conectados"
 
-#: src/core/gnunet-service-core_sessions.c:255
+#: src/core/gnunet-service-core_sessions.c:278
 msgid "# type map refreshes sent"
 msgstr "# envíos de refrescos del mapa de tipos"
 
-#: src/core/gnunet-service-core_sessions.c:426
+#: src/core/gnunet-service-core_sessions.c:394
+#, fuzzy
+msgid "# outdated typemap confirmations received"
+msgstr "Se produjo un fallo al encolar una confirmación de recepción\n"
+
+#: src/core/gnunet-service-core_sessions.c:405
+#, fuzzy
+msgid "# valid typemap confirmations received"
+msgstr "Se produjo un fallo al encolar una confirmación de recepción\n"
+
+#: src/core/gnunet-service-core_sessions.c:543
 msgid "# messages discarded (expired prior to transmission)"
 msgstr "# mensajes descartados (expirados antes de su transmisión)"
 
-#: src/core/gnunet-service-core_typemap.c:110
-#: src/core/gnunet-service-core_typemap.c:121
+#: src/core/gnunet-service-core_typemap.c:169
+#: src/core/gnunet-service-core_typemap.c:180
 msgid "# type maps received"
 msgstr "# mapas de tipos recibidos"
 
-#: src/core/gnunet-service-core_typemap.c:151
+#: src/core/gnunet-service-core_typemap.c:210
 msgid "# updates to my type map"
 msgstr "# actualizaciones de mi mapa de tipos"
 
@@ -1484,12 +1614,13 @@
 #: src/namecache/plugin_namecache_sqlite.c:52
 #: src/namestore/plugin_namestore_postgres.c:52
 #: src/namestore/plugin_namestore_sqlite.c:52
+#: src/peerstore/plugin_peerstore_sqlite.c:50
 #: src/testbed/generate-underlay-topology.c:47
 #: src/testbed/gnunet-daemon-latency-logger.c:52
 #: src/testbed/gnunet-daemon-testbed-underlay.c:55
 #: src/testbed/testbed_api_hosts.c:69 src/util/crypto_ecc.c:51
 #: src/util/crypto_mpi.c:39 src/include/gnunet_common.h:602
-#: src/include/gnunet_common.h:611 src/scalarproduct/scalarproduct.h:50
+#: src/include/gnunet_common.h:611 src/scalarproduct/scalarproduct.h:44
 #, c-format
 msgid "`%s' failed at %s:%d with error: %s\n"
 msgstr "«%s» falló en %s: %d con el error: %s\n"
@@ -1543,7 +1674,7 @@
 msgid "# datastore connections (re)created"
 msgstr "# conexiones a almacenes de datos (re)creadas"
 
-#: src/datastore/datastore_api.c:616 src/scalarproduct/scalarproduct_api.c:279
+#: src/datastore/datastore_api.c:616
 msgid "# transmission request failures"
 msgstr "# fallos en peticiones de transmisión"
 
@@ -1832,6 +1963,7 @@
 #: src/datastore/plugin_datastore_sqlite.c:255
 #: src/namecache/plugin_namecache_sqlite.c:193
 #: src/namestore/plugin_namestore_sqlite.c:204
+#: src/peerstore/plugin_peerstore_sqlite.c:434
 #: src/psycstore/plugin_psycstore_sqlite.c:319
 #, c-format
 msgid "Unable to initialize SQLite: %s.\n"
@@ -1993,102 +2125,102 @@
 msgstr "# peticiones «GET» inyectadas de clientes"
 
 #: src/dht/gnunet-service-dht_clients.c:513
-#: src/dht/gnunet-service-xdht_clients.c:927
+#: src/dht/gnunet-service-xdht_clients.c:925
 msgid "# PUT requests received from clients"
 msgstr "# peticiones «PUT» recibidas de clientes"
 
 #: src/dht/gnunet-service-dht_clients.c:597
-#: src/dht/gnunet-service-xdht_clients.c:1013
+#: src/dht/gnunet-service-xdht_clients.c:1010
 msgid "# GET requests received from clients"
 msgstr "# peticiones «GET» recibidas de clientes"
 
 #: src/dht/gnunet-service-dht_clients.c:798
-#: src/dht/gnunet-service-xdht_clients.c:1214
+#: src/dht/gnunet-service-xdht_clients.c:1211
 msgid "# GET STOP requests received from clients"
 msgstr "# peticiones «GET STOP» recibidas de clientes"
 
-#: src/dht/gnunet-service-dht_clients.c:1039
+#: src/dht/gnunet-service-dht_clients.c:1040
 #: src/dht/gnunet-service-xdht_clients.c:498
 msgid "# Key match, type mismatches in REPLY to CLIENT"
 msgstr ""
 "# Coincidencias de clave, diferencias de tipo en la respuesta (REPLY) del "
 "cliente (CLIENT)"
 
-#: src/dht/gnunet-service-dht_clients.c:1052
+#: src/dht/gnunet-service-dht_clients.c:1053
 #: src/dht/gnunet-service-xdht_clients.c:511
 msgid "# Duplicate REPLIES to CLIENT request dropped"
 msgstr ""
 "# Peticiones duplicadas de respuestas (REPLIES) a clientes (CLIENT) omitidas"
 
-#: src/dht/gnunet-service-dht_clients.c:1089
+#: src/dht/gnunet-service-dht_clients.c:1090
 #: src/dht/gnunet-service-xdht_clients.c:548
 #, c-format
 msgid "Unsupported block type (%u) in request!\n"
 msgstr "¡Tipo de bloque no soportado (%u) en la petición!\n"
 
-#: src/dht/gnunet-service-dht_clients.c:1112
+#: src/dht/gnunet-service-dht_clients.c:1113
 #: src/dht/gnunet-service-xdht_clients.c:571
 msgid "# RESULTS queued for clients"
 msgstr "# Resultados (RESULTS) encolados para clientes"
 
-#: src/dht/gnunet-service-dht_clients.c:1166
-#: src/dht/gnunet-service-dht_clients.c:1209
+#: src/dht/gnunet-service-dht_clients.c:1167
+#: src/dht/gnunet-service-dht_clients.c:1210
 #: src/dht/gnunet-service-xdht_clients.c:625
 #: src/dht/gnunet-service-xdht_clients.c:668
 msgid "# REPLIES ignored for CLIENTS (no match)"
 msgstr ""
 "# Respuestas (REPLIES) ignoradas para clientes (CLIENTS) (sin coincidencia)"
 
-#: src/dht/gnunet-service-dht_clients.c:1176
+#: src/dht/gnunet-service-dht_clients.c:1177
 #: src/dht/gnunet-service-xdht_clients.c:635
 msgid "Could not pass reply to client, message too big!\n"
 msgstr ""
 "¡No se pudo enviar respuesta al cliente, el mensaje es demasiado grande!\n"
 
 #: src/dht/gnunet-service-dht_datacache.c:68
-#: src/dht/gnunet-service-xdht_datacache.c:68
+#: src/dht/gnunet-service-xdht_datacache.c:69
 #, c-format
 msgid "%s request received, but have no datacache!\n"
 msgstr "¡Petición %s recibida, pero no tiene caché de datos!\n"
 
 #: src/dht/gnunet-service-dht_datacache.c:78
-#: src/dht/gnunet-service-xdht_datacache.c:78
+#: src/dht/gnunet-service-xdht_datacache.c:79
 msgid "# ITEMS stored in datacache"
 msgstr "# Elementos (ITEMS) almacenados en la caché de datos"
 
 #: src/dht/gnunet-service-dht_datacache.c:165
-#: src/dht/gnunet-service-xdht_datacache.c:165
+#: src/dht/gnunet-service-xdht_datacache.c:213
 msgid "# Good RESULTS found in datacache"
 msgstr "# Buenos resultados (RESULTS) encontrados en la caché de datos"
 
 #: src/dht/gnunet-service-dht_datacache.c:176
-#: src/dht/gnunet-service-xdht_datacache.c:176
+#: src/dht/gnunet-service-xdht_datacache.c:234
 msgid "# Duplicate RESULTS found in datacache"
 msgstr "# Resultados (RESULTS) duplicados encontrados en la caché de datos"
 
 #: src/dht/gnunet-service-dht_datacache.c:182
-#: src/dht/gnunet-service-xdht_datacache.c:182
+#: src/dht/gnunet-service-xdht_datacache.c:240
 msgid "# Invalid RESULTS found in datacache"
 msgstr "# Resultados (RESULTS) no válidos encontrados en la caché de datos"
 
 #: src/dht/gnunet-service-dht_datacache.c:188
-#: src/dht/gnunet-service-xdht_datacache.c:188
+#: src/dht/gnunet-service-xdht_datacache.c:246
 msgid "# Irrelevant RESULTS found in datacache"
 msgstr "# Resultados (RESULTS) irrelevantes encontrados en la caché de datos"
 
 #: src/dht/gnunet-service-dht_datacache.c:200
-#: src/dht/gnunet-service-xdht_datacache.c:200
+#: src/dht/gnunet-service-xdht_datacache.c:258
 msgid "# Unsupported RESULTS found in datacache"
 msgstr "# Resultados (RESULTS) no soportados encontrados en la caché de datos"
 
 #: src/dht/gnunet-service-dht_datacache.c:203
-#: src/dht/gnunet-service-xdht_datacache.c:203
+#: src/dht/gnunet-service-xdht_datacache.c:261
 #, c-format
 msgid "Unsupported block type (%u) in local response!\n"
 msgstr "¡Tipo de bloque no soportado (%u) en respuesta local!\n"
 
 #: src/dht/gnunet-service-dht_datacache.c:234
-#: src/dht/gnunet-service-xdht_datacache.c:234
+#: src/dht/gnunet-service-xdht_datacache.c:298
 msgid "# GET requests given to datacache"
 msgstr "# Peticiones «GET» realizadas a la caché de datos"
 
@@ -2110,12 +2242,12 @@
 msgstr "# Mensajes encolados descartados (par desconectado)"
 
 #: src/dht/gnunet-service-dht_neighbours.c:819
-#: src/dht/gnunet-service-xdht_neighbours.c:703
+#: src/dht/gnunet-service-xdht_neighbours.c:745
 msgid "# Bytes transmitted to other peers"
 msgstr "# Bytes transmitidos a otros pares"
 
 #: src/dht/gnunet-service-dht_neighbours.c:857
-#: src/dht/gnunet-service-xdht_neighbours.c:742
+#: src/dht/gnunet-service-xdht_neighbours.c:786
 msgid "# Bytes of bandwidth requested from core"
 msgstr "# Bytes de ancho de banda solicitados por el servicio principal"
 
@@ -2134,76 +2266,80 @@
 msgid "# Peer selection failed"
 msgstr "# Selecciones de pares fallidas"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1287
+#: src/dht/gnunet-service-dht_neighbours.c:1289
 msgid "# PUT requests routed"
 msgstr "# Peticiones «PUT» encaminadas"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1316
+#: src/dht/gnunet-service-dht_neighbours.c:1318
 msgid "# PUT messages queued for transmission"
 msgstr "# mensajes «PUT» encolados para transmisión"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1323
-#: src/dht/gnunet-service-dht_neighbours.c:1440
-#: src/dht/gnunet-service-dht_neighbours.c:1543
-#: src/dht/gnunet-service-xdht_neighbours.c:794
-#: src/dht/gnunet-service-xdht_neighbours.c:860
-#: src/dht/gnunet-service-xdht_neighbours.c:919
-#: src/dht/gnunet-service-xdht_neighbours.c:981
-#: src/dht/gnunet-service-xdht_neighbours.c:1041
+#: src/dht/gnunet-service-dht_neighbours.c:1328
+#: src/dht/gnunet-service-dht_neighbours.c:1452
+#: src/dht/gnunet-service-dht_neighbours.c:1557
+#: src/dht/gnunet-service-xdht_neighbours.c:843
+#: src/dht/gnunet-service-xdht_neighbours.c:910
+#: src/dht/gnunet-service-xdht_neighbours.c:980
+#: src/dht/gnunet-service-xdht_neighbours.c:1040
+#: src/dht/gnunet-service-xdht_neighbours.c:1098
+#: src/dht/gnunet-service-xdht_neighbours.c:1157
+#: src/dht/gnunet-service-xdht_neighbours.c:1218
+#: src/dht/gnunet-service-xdht_neighbours.c:1280
+#: src/dht/gnunet-service-xdht_neighbours.c:1341
 msgid "# P2P messages dropped due to full queue"
 msgstr "# Mensajes P2P omitidos debido a saturación de la cola"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1405
+#: src/dht/gnunet-service-dht_neighbours.c:1414
 msgid "# GET requests routed"
 msgstr "# Peticiones «GET» encaminadas"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1432
+#: src/dht/gnunet-service-dht_neighbours.c:1441
 msgid "# GET messages queued for transmission"
 msgstr "# Mensajes «GET» encolados para transmisión"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1550
+#: src/dht/gnunet-service-dht_neighbours.c:1564
 msgid "# RESULT messages queued for transmission"
 msgstr "# Mensajes «RESULT» encolados para transmisión"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1636
+#: src/dht/gnunet-service-dht_neighbours.c:1651
 msgid "# P2P PUT requests received"
 msgstr "# Peticiones «PUT» P2P recibidas"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1639
+#: src/dht/gnunet-service-dht_neighbours.c:1654
 #, fuzzy
 msgid "# P2P PUT bytes received"
 msgstr "# Peticiones «PUT» P2P recibidas"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1803
+#: src/dht/gnunet-service-dht_neighbours.c:1821
 msgid "# FIND PEER requests ignored due to Bloomfilter"
 msgstr "# Peticiones «FIND PEER» ignoradas debido a «Bloomfilter»"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1811
+#: src/dht/gnunet-service-dht_neighbours.c:1829
 msgid "# FIND PEER requests ignored due to lack of HELLO"
 msgstr "# Peticiones «FIND PEER» ignoradas debido a falta de «HELLO»"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1904
+#: src/dht/gnunet-service-dht_neighbours.c:1924
 msgid "# P2P GET requests received"
 msgstr "# Peticiones «GET» P2P recibidas"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1907
+#: src/dht/gnunet-service-dht_neighbours.c:1927
 #, fuzzy
 msgid "# P2P GET bytes received"
 msgstr "# Peticiones «GET» P2P recibidas"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1961
+#: src/dht/gnunet-service-dht_neighbours.c:1984
 msgid "# P2P FIND PEER requests processed"
 msgstr "# Peticiones «FIND PEER» P2P procesadas"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1975
+#: src/dht/gnunet-service-dht_neighbours.c:1998
 msgid "# P2P GET requests ONLY routed"
 msgstr "# Peticiones «GET» P2P SOLAMENTE encaminadas"
 
-#: src/dht/gnunet-service-dht_neighbours.c:2052
+#: src/dht/gnunet-service-dht_neighbours.c:2083
 msgid "# P2P RESULTS received"
 msgstr "# Resultados (RESULTS) P2P recibidos"
 
-#: src/dht/gnunet-service-dht_neighbours.c:2055
+#: src/dht/gnunet-service-dht_neighbours.c:2086
 #, fuzzy
 msgid "# P2P RESULT bytes received"
 msgstr "# Resultados (RESULTS) P2P recibidos"
@@ -2250,24 +2386,6 @@
 msgid "# DHT requests combined"
 msgstr "# Peticiones a la DHT combinadas"
 
-#: src/dht/gnunet-service-xdht_neighbours.c:1398
-#, c-format
-msgid ""
-"\n"
-"SUPU %s, %s, %d,my_identity = %s"
-msgstr ""
-
-#: src/dht/gnunet-service-xdht_neighbours.c:1514
-#: src/dht/gnunet-service-xdht_neighbours.c:1524
-#: src/dht/gnunet-service-xdht_neighbours.c:1530
-#: src/dht/gnunet-service-xdht_neighbours.c:1536
-#: src/dht/gnunet-service-xdht_neighbours.c:1545
-#, c-format
-msgid ""
-"\n"
-"SUPU %s, %s, %d"
-msgstr ""
-
 #: src/dht/plugin_block_dht.c:138
 #, c-format
 msgid "Block not of type %u\n"
@@ -2382,12 +2500,12 @@
 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:3514
+#: src/dns/gnunet-service-dns.c:1049
 #, 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:3571
+#: src/dns/gnunet-service-dns.c:1069 src/exit/gnunet-daemon-exit.c:3594
 msgid "need a valid IPv4 or IPv6 address\n"
 msgstr "se necesita una dirección IPv4 o IPv6 válida\n"
 
@@ -2407,7 +2525,7 @@
 
 #: src/exit/gnunet-daemon-exit.c:853
 #, fuzzy
-msgid "# Bytes transmitted via mesh channels"
+msgid "# Bytes transmitted via cadet channels"
 msgstr "# Bytes transmitidos vía túneles MESH"
 
 #: src/exit/gnunet-daemon-exit.c:970 src/exit/gnunet-daemon-exit.c:2397
@@ -2472,15 +2590,17 @@
 msgstr "# Paquetes TCP enviados vía TUN"
 
 #: src/exit/gnunet-daemon-exit.c:1872
-msgid "# TCP service creation requests received via mesh"
+#, fuzzy
+msgid "# TCP service creation requests received via cadet"
 msgstr "# Peticiones de creaciones de servicio TCP recibidas vía mesh"
 
 #: src/exit/gnunet-daemon-exit.c: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"
+#, fuzzy
+msgid "# Bytes received from CADET"
+msgstr "# Bytes recibidos de TUN"
 
 #: src/exit/gnunet-daemon-exit.c:1909 src/exit/gnunet-daemon-exit.c:2990
 #, fuzzy, c-format
@@ -2492,11 +2612,13 @@
 msgstr "# Peticiones TCP omitidas (no existe tal servicio)"
 
 #: src/exit/gnunet-daemon-exit.c:1971
-msgid "# TCP IP-exit creation requests received via mesh"
+#, fuzzy
+msgid "# TCP IP-exit creation requests received via cadet"
 msgstr "# Peticiones de creación de salida IP por TCP recibidas vía mesh"
 
 #: src/exit/gnunet-daemon-exit.c:2076
-msgid "# TCP data requests received via mesh"
+#, fuzzy
+msgid "# TCP data requests received via cadet"
 msgstr "# Peticiones de datos TCP recibidas vía mesh"
 
 #: src/exit/gnunet-daemon-exit.c:2090
@@ -2508,11 +2630,13 @@
 msgstr "# Paquetes ICMP enviados vía TUN"
 
 #: src/exit/gnunet-daemon-exit.c:2324
-msgid "# ICMP IP-exit requests received via mesh"
+#, fuzzy
+msgid "# ICMP IP-exit requests received via cadet"
 msgstr "# Peticiones de salida IP por ICMP recibidas vía mesh"
 
 #: src/exit/gnunet-daemon-exit.c:2573
-msgid "# ICMP service requests received via mesh"
+#, fuzzy
+msgid "# ICMP service requests received via cadet"
 msgstr "# Peticiones de servicio ICMP recibidas vía mesh"
 
 #: src/exit/gnunet-daemon-exit.c:2639 src/vpn/gnunet-service-vpn.c:1397
@@ -2530,11 +2654,13 @@
 msgstr "# Paquetes UDP enviados vía TUN"
 
 #: src/exit/gnunet-daemon-exit.c:2862
-msgid "# UDP IP-exit requests received via mesh"
+#, fuzzy
+msgid "# UDP IP-exit requests received via cadet"
 msgstr "# Peticiones de salida IP por UDP recibidas vía mesh"
 
 #: src/exit/gnunet-daemon-exit.c:2969
-msgid "# UDP service requests received via mesh"
+#, fuzzy
+msgid "# UDP service requests received via cadet"
 msgstr "# Peticiones de servicio UDP recibidas vía mesh"
 
 #: src/exit/gnunet-daemon-exit.c:2995
@@ -2543,39 +2669,44 @@
 
 #: src/exit/gnunet-daemon-exit.c:3031
 #, fuzzy
-msgid "# Inbound MESH channels created"
+msgid "# Inbound CADET channels created"
 msgstr "# Túneles interiores MESH creados"
 
-#: src/exit/gnunet-daemon-exit.c:3235 src/exit/gnunet-daemon-exit.c:3245
+#: src/exit/gnunet-daemon-exit.c:3255 src/exit/gnunet-daemon-exit.c:3265
 #, 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
+#: src/exit/gnunet-daemon-exit.c:3279 src/exit/gnunet-daemon-exit.c:3287
 #, c-format
 msgid "`%s' is not a valid port number (for domain `%s')!"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3300
+#: src/exit/gnunet-daemon-exit.c:3320
 #, 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:3314 src/exit/gnunet-daemon-exit.c:3326
+#: src/exit/gnunet-daemon-exit.c:3334 src/exit/gnunet-daemon-exit.c:3346
 #, 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:3337
+#: src/exit/gnunet-daemon-exit.c:3357
 #, 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:3527
+#: src/exit/gnunet-daemon-exit.c:3534
+#, fuzzy, c-format
+msgid "`%s' must be installed SUID, EXIT will not work\n"
+msgstr "«%s» debe ser instalado con SUID, se niega a arrancar\n"
+
+#: src/exit/gnunet-daemon-exit.c:3550
 msgid ""
 "This system does not support IPv4, will disable IPv4 functions despite them "
 "being enabled in the configuration\n"
@@ -2583,7 +2714,7 @@
 "Este sistema no soporta IPv4, se deshabilitarán las funciones IPv4 aunque "
 "estén habilitadas en la configuración\n"
 
-#: src/exit/gnunet-daemon-exit.c:3535
+#: src/exit/gnunet-daemon-exit.c:3558
 msgid ""
 "This system does not support IPv6, will disable IPv6 functions despite them "
 "being enabled in the configuration\n"
@@ -2591,7 +2722,7 @@
 "Este sistema no soporta IPv6, se deshabilitarán las funciones IPv6 aunque "
 "estén habilitadas en la configuración\n"
 
-#: src/exit/gnunet-daemon-exit.c:3542
+#: src/exit/gnunet-daemon-exit.c:3565
 msgid ""
 "Cannot enable IPv4 exit but disable IPv4 on TUN interface, will use "
 "ENABLE_IPv4=YES\n"
@@ -2599,7 +2730,7 @@
 "No se puede habilitar salida IPv4 pero se deshabilita IPv4 sobre interfaz "
 "TUN, se usará ENABLE_IPv4=YES\n"
 
-#: src/exit/gnunet-daemon-exit.c:3548
+#: src/exit/gnunet-daemon-exit.c:3571
 msgid ""
 "Cannot enable IPv6 exit but disable IPv6 on TUN interface, will use "
 "ENABLE_IPv6=YES\n"
@@ -2607,16 +2738,16 @@
 "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:3554 src/exit/gnunet-daemon-exit.c:3717
+#: src/exit/gnunet-daemon-exit.c:3577 src/exit/gnunet-daemon-exit.c:3742
 #: 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:3664
+#: src/exit/gnunet-daemon-exit.c:3689
 msgid "Must be a number"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3813
+#: src/exit/gnunet-daemon-exit.c:3838
 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"
 
@@ -2726,11 +2857,6 @@
 msgid "Disconnected from peer %s\n"
 msgstr "Desconectado de %s\n"
 
-#: src/experimentation/gnunet-daemon-experimentation_nodes.c:1104
-#, fuzzy
-msgid "Failed to connect to CORE service!\n"
-msgstr "¡Se produjo un fallo al conectar con el servicio DHT!\n"
-
 #: src/experimentation/gnunet-daemon-experimentation_scheduler.c:108
 #, c-format
 msgid "Peer `%s' did not respond to request for experiment `%s'\n"
@@ -3072,12 +3198,12 @@
 msgid "Internal error."
 msgstr "Error interno."
 
-#: src/fs/fs_search.c:813
+#: src/fs/fs_search.c:751 src/fs/fs_search.c:817
 #, fuzzy, c-format
 msgid "Failed to parse URI `%s': %s\n"
 msgstr "Se produjo un fallo al procesar la URI: %s\n"
 
-#: src/fs/fs_search.c:872
+#: src/fs/fs_search.c:876
 #, c-format
 msgid "Got result with unknown block type `%d', ignoring"
 msgstr ""
@@ -3137,79 +3263,112 @@
 msgstr "Se produjo un fallo al calcular el hash del fichero."
 
 # Cadena erronea, corregida en SVN.
-#: src/fs/fs_uri.c:222
-#, no-c-format
-msgid "`%' must be followed by HEX number"
+#: src/fs/fs_uri.c:223
+#, fuzzy, no-c-format
+msgid "Malformed KSK URI (`%' must be followed by HEX number)"
 msgstr "'%' debe ser seguido por un número hexadecimal"
 
-#: src/fs/fs_uri.c:281
+#: src/fs/fs_uri.c:283
 msgid "Malformed KSK URI (must not begin or end with `+')"
 msgstr "URI KSK mal formada (no debe empezar ni terminar con «+»)"
 
-#: src/fs/fs_uri.c:299
-msgid "`++' not allowed in KSK URI"
-msgstr "«++» no permitido en URI KSK"
+#: src/fs/fs_uri.c:301
+#, fuzzy
+msgid "Malformed KSK URI (`++' not allowed)"
+msgstr "URI KSK mal formada (no debe empezar ni terminar con «+»)"
 
-#: src/fs/fs_uri.c:306
-msgid "Quotes not balanced in KSK URI"
-msgstr "Comillas no cerradas en URI KSK"
+#: src/fs/fs_uri.c:308
+#, fuzzy
+msgid "Malformed KSK URI (quotes not balanced)"
+msgstr "URI KSK mal formada (no debe empezar ni terminar con «+»)"
 
-#: src/fs/fs_uri.c:376
-msgid "Malformed SKS URI"
+#: src/fs/fs_uri.c:379
+#, fuzzy
+msgid "Malformed SKS URI (wrong syntax)"
 msgstr "URI SKS mal formada"
 
-#: src/fs/fs_uri.c:419 src/fs/fs_uri.c:434
-msgid "Malformed CHK URI"
+#: src/fs/fs_uri.c:423
+#, fuzzy
+msgid "Malformed CHK URI (wrong syntax)"
 msgstr "URI CHK mal formada"
 
-#: src/fs/fs_uri.c:512 src/fs/fs_uri.c:580
-msgid "SKS URI malformed"
+#: src/fs/fs_uri.c:438
+msgid "Malformed CHK URI (failed to decode CHK)"
+msgstr ""
+
+#: src/fs/fs_uri.c:517
+#, fuzzy
+msgid "LOC URI malformed (wrong syntax)"
 msgstr "URI SKS mal formada"
 
-#: src/fs/fs_uri.c:527 src/fs/fs_uri.c:537
+#: src/fs/fs_uri.c:532
 #, fuzzy
-msgid "LOC URI malformed"
+msgid "LOC URI malformed (no CHK)"
 msgstr "URI SKS mal formada"
 
-#: src/fs/fs_uri.c:545 src/fs/fs_uri.c:553
+#: src/fs/fs_uri.c:542
 #, fuzzy
+msgid "LOC URI malformed (missing LOC)"
+msgstr "URI SKS mal formada"
+
+#: src/fs/fs_uri.c:550
+#, fuzzy
+msgid "LOC URI malformed (wrong syntax for public key)"
+msgstr "URI SKS mal formada (no se pudo decodificar la clave pública)"
+
+#: src/fs/fs_uri.c:558
+#, fuzzy
 msgid "LOC URI malformed (could not decode public key)"
 msgstr "URI SKS mal formada (no se pudo decodificar la clave pública)"
 
-#: src/fs/fs_uri.c:559
-msgid "SKS URI malformed (could not find signature)"
+#: src/fs/fs_uri.c:564
+#, fuzzy
+msgid "LOC URI malformed (could not find signature)"
 msgstr "URI SKS mal formada (no se pudo encontrar la firma)"
 
-#: src/fs/fs_uri.c:565 src/fs/fs_uri.c:574
-msgid "SKS URI malformed (could not decode signature)"
+#: src/fs/fs_uri.c:570
+#, fuzzy
+msgid "LOC URI malformed (wrong syntax for signature)"
+msgstr "URI SKS mal formada (no se pudo encontrar la firma)"
+
+#: src/fs/fs_uri.c:579
+#, fuzzy
+msgid "LOC URI malformed (could not decode signature)"
 msgstr "URI SKS mal formada (no se pudo decodificar la firma)"
 
-#: src/fs/fs_uri.c:586
-msgid "SKS URI malformed (could not parse expiration time)"
+#: src/fs/fs_uri.c:585
+#, fuzzy
+msgid "LOC URI malformed (wrong syntax for expiration time)"
 msgstr "URI SKS mal formada (no se encuentra el tiempo de expiración)"
 
-#: src/fs/fs_uri.c:598
-msgid "SKS URI malformed (signature failed validation)"
+#: src/fs/fs_uri.c:591
+#, fuzzy
+msgid "LOC URI malformed (could not parse expiration time)"
+msgstr "URI SKS mal formada (no se encuentra el tiempo de expiración)"
+
+#: src/fs/fs_uri.c:603
+#, fuzzy
+msgid "LOC URI malformed (signature failed validation)"
 msgstr "URI SKS mal formada (se produjo un fallo al validar la firma)"
 
-#: src/fs/fs_uri.c:636
+#: src/fs/fs_uri.c:642
 msgid "Unrecognized URI type"
 msgstr "Tipo de URI no reconocido"
 
-#: src/fs/fs_uri.c:860
+#: src/fs/fs_uri.c:866
 msgid "Lacking key configuration settings.\n"
 msgstr "Falta configuración sobre las opciones de claves.\n"
 
-#: src/fs/fs_uri.c:866
+#: src/fs/fs_uri.c:872
 #, c-format
 msgid "Could not access hostkey file `%s'.\n"
 msgstr "No se pudo acceder al fichero de clave de máquina «%s».\n"
 
-#: src/fs/fs_uri.c:1050 src/fs/fs_uri.c:1077
+#: src/fs/fs_uri.c:1057 src/fs/fs_uri.c:1084
 msgid "No keywords specified!\n"
 msgstr "¡Ninguna palabra clave especificada!\n"
 
-#: src/fs/fs_uri.c:1083
+#: src/fs/fs_uri.c:1090
 msgid "Number of double-quotes not balanced!\n"
 msgstr "¡Número de comillas dobles no balanceado!\n"
 
@@ -3543,8 +3702,8 @@
 msgstr "La opción «%s» es obligatoria cuando se usa la opción «%s».\n"
 
 #: src/fs/gnunet-publish.c:778 src/fs/gnunet-publish.c:785
-#: src/transport/gnunet-transport.c:1284 src/transport/gnunet-transport.c:1314
-#: src/transport/gnunet-transport.c:1344
+#: src/transport/gnunet-transport.c:1387 src/transport/gnunet-transport.c:1417
+#: src/transport/gnunet-transport.c:1447
 #, c-format
 msgid "Option `%s' makes no sense without option `%s'.\n"
 msgstr "La opción «%s» no tiene sentido sin la opción «%s».\n"
@@ -3654,21 +3813,57 @@
 msgid "Search GNUnet for files that were published on GNUnet"
 msgstr "Buscar en GNUnet ficheros que han sido publicados en GNUnet"
 
-#: src/fs/gnunet-service-fs.c:271
+#: src/fs/gnunet-service-fs.c:277
 msgid "# running average P2P latency (ms)"
 msgstr "# latencia media de P2P en ejecución (ms)"
 
-#: src/fs/gnunet-service-fs.c:326 src/fs/gnunet-service-fs.c:539
+#: src/fs/gnunet-service-fs.c:332 src/fs/gnunet-service-fs.c:545
 msgid "# Loopback routes suppressed"
 msgstr "# Rutas en bucle local eliminadas"
 
-#: src/fs/gnunet-service-fs.c:639 src/hostlist/gnunet-daemon-hostlist.c:288
-#: src/topology/gnunet-daemon-topology.c:1254
-#: src/topology/gnunet-daemon-topology.c:1261
+#: src/fs/gnunet-service-fs.c:645 src/hostlist/gnunet-daemon-hostlist.c:303
+#: src/topology/gnunet-daemon-topology.c:1260
+#: src/topology/gnunet-daemon-topology.c:1267
 #, c-format
 msgid "Failed to connect to `%s' service.\n"
 msgstr "Se produjo un fallo al conectar con el servicio «%s».\n"
 
+#: src/fs/gnunet-service-fs_cadet_client.c:484
+#, fuzzy
+msgid "# replies received via cadet"
+msgstr "# respuestas recibidas vía «stream»"
+
+#: src/fs/gnunet-service-fs_cadet_client.c:498
+#, fuzzy
+msgid "# replies received via cadet dropped"
+msgstr "# respuestas recibidas omitidas vía «stream»"
+
+#: src/fs/gnunet-service-fs_cadet_server.c:260
+#, fuzzy
+msgid "# Blocks transferred via cadet"
+msgstr "# Bloques transferidos vía «stream»"
+
+#: src/fs/gnunet-service-fs_cadet_server.c:352
+#, fuzzy
+msgid "# queries received via cadet not answered"
+msgstr "# consultas recibidas vía «stream»"
+
+#: src/fs/gnunet-service-fs_cadet_server.c:432
+#, fuzzy
+msgid "# queries received via cadet"
+msgstr "# consultas recibidas vía «stream»"
+
+#: src/fs/gnunet-service-fs_cadet_server.c:476
+#, fuzzy
+msgid "# cadet client connections rejected"
+msgstr "# conexiones de clientes «stream» rechazadas"
+
+#: src/fs/gnunet-service-fs_cadet_server.c:482
+#: src/fs/gnunet-service-fs_cadet_server.c:522
+#, fuzzy
+msgid "# cadet connections active"
+msgstr "# conexiones «stream» activas"
+
 #: src/fs/gnunet-service-fs_cp.c:682
 msgid "# migration stop messages received"
 msgstr "# mensajes de detención de migración recibidos"
@@ -3818,42 +4013,6 @@
 msgstr ""
 "# búsquedas de clientes actualizadas (contenido unido visto en la lista)"
 
-#: src/fs/gnunet-service-fs_mesh_client.c:484
-#, fuzzy
-msgid "# replies received via mesh"
-msgstr "# respuestas recibidas vía «stream»"
-
-#: src/fs/gnunet-service-fs_mesh_client.c:498
-#, fuzzy
-msgid "# replies received via mesh dropped"
-msgstr "# respuestas recibidas omitidas vía «stream»"
-
-#: src/fs/gnunet-service-fs_mesh_server.c:260
-#, fuzzy
-msgid "# Blocks transferred via mesh"
-msgstr "# Bloques transferidos vía «stream»"
-
-#: src/fs/gnunet-service-fs_mesh_server.c:352
-#, fuzzy
-msgid "# queries received via mesh not answered"
-msgstr "# consultas recibidas vía «stream»"
-
-#: src/fs/gnunet-service-fs_mesh_server.c:432
-#, fuzzy
-msgid "# queries received via mesh"
-msgstr "# consultas recibidas vía «stream»"
-
-#: src/fs/gnunet-service-fs_mesh_server.c:476
-#, fuzzy
-msgid "# mesh client connections rejected"
-msgstr "# conexiones de clientes «stream» rechazadas"
-
-#: src/fs/gnunet-service-fs_mesh_server.c:482
-#: src/fs/gnunet-service-fs_mesh_server.c:522
-#, fuzzy
-msgid "# mesh connections active"
-msgstr "# conexiones «stream» activas"
-
 #: src/fs/gnunet-service-fs_pe.c:269
 msgid "# average retransmission delay (ms)"
 msgstr "# retardo de retransmisión medio (ms)"
@@ -3932,7 +4091,7 @@
 
 #: src/fs/gnunet-service-fs_pr.c:1192
 #, fuzzy
-msgid "# Replies received from MESH"
+msgid "# Replies received from CADET"
 msgstr "# Respuestas recibidas de la DHT"
 
 #: src/fs/gnunet-service-fs_pr.c:1244
@@ -4038,7 +4197,7 @@
 msgid "Refusing `%s' request to HTTP server\n"
 msgstr "Rechazando petición «%s» al servidor de listas de máquinas\n"
 
-#: src/gns/gnunet-bcd.c:355 src/hostlist/hostlist-server.c:567
+#: src/gns/gnunet-bcd.c:355 src/hostlist/gnunet-daemon-hostlist_server.c:695
 #, c-format
 msgid "Invalid port number %llu.  Exiting.\n"
 msgstr "Número de puerto %llu no válido.  Saliendo.\n"
@@ -4199,13 +4358,17 @@
 msgid "This program will import some GNS authorities into your GNS namestore."
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:105 src/hostlist/hostlist-client.c:469
-#: src/hostlist/hostlist-client.c:683 src/hostlist/hostlist-client.c:689
-#: src/hostlist/hostlist-client.c:741 src/hostlist/hostlist-client.c:750
-#: src/hostlist/hostlist-client.c:871 src/hostlist/hostlist-client.c:963
-#: src/hostlist/hostlist-client.c:968
-#: src/transport/plugin_transport_http_client.c:1062
-#: src/transport/plugin_transport_http_client.c:1077
+#: src/gns/gnunet-gns-proxy.c:105
+#: src/hostlist/gnunet-daemon-hostlist_client.c:524
+#: src/hostlist/gnunet-daemon-hostlist_client.c:741
+#: src/hostlist/gnunet-daemon-hostlist_client.c:747
+#: src/hostlist/gnunet-daemon-hostlist_client.c:800
+#: src/hostlist/gnunet-daemon-hostlist_client.c:809
+#: src/hostlist/gnunet-daemon-hostlist_client.c:931
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1026
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1031
+#: src/transport/plugin_transport_http_client.c:1095
+#: src/transport/plugin_transport_http_client.c:1110
 #, c-format
 msgid "%s failed at %s:%d: `%s'\n"
 msgstr "%s falló en %s:%d: «%s».\n"
@@ -4349,36 +4512,36 @@
 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:816
+#: src/gns/gnunet-service-gns_resolver.c:832
 #, 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:958
+#: src/gns/gnunet-service-gns_resolver.c:974
 #, c-format
 msgid "Skipping record of unsupported type %d\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns_resolver.c:1317
+#: src/gns/gnunet-service-gns_resolver.c:1333
 #, c-format
 msgid "GNS lookup resulted in DNS name that is too long (`%s')\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns_resolver.c:1817
+#: src/gns/gnunet-service-gns_resolver.c:1831
 msgid "GNS lookup recursion failed (no delegation record found)\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns_resolver.c:1841
+#: src/gns/gnunet-service-gns_resolver.c:1855
 #, 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:2123
+#: src/gns/gnunet-service-gns_resolver.c:2137
 #, c-format
 msgid "Zone %s was revoked, resolution fails\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns_resolver.c:2272
+#: src/gns/gnunet-service-gns_resolver.c:2286
 #, c-format
 msgid "Hostname `%s' is not well-formed, resolution fails\n"
 msgstr ""
@@ -4509,45 +4672,50 @@
 msgid "Modified %u addresses \n"
 msgstr ""
 
-#: src/hello/hello.c:944
+#: src/hello/hello.c:957
 msgid "Failed to parse HELLO message: missing expiration time\n"
 msgstr ""
 "Se produjo un fallo al procesar un mensaje «HELLO»: falta el tiempo de "
 "expiración\n"
 
-#: src/hello/hello.c:953
+#: src/hello/hello.c:966
 msgid "Failed to parse HELLO message: invalid expiration time\n"
 msgstr ""
 "Se produjo un fallo al procesar un mensaje «HELLO»: tiempo de expiración no "
 "válido\n"
 
-#: src/hello/hello.c:963
+#: src/hello/hello.c:976
 msgid "Failed to parse HELLO message: malformed\n"
 msgstr "Se produjo un fallo al procesar un mensaje «HELLO»: mal formado\n"
 
-#: src/hello/hello.c:973
+#: src/hello/hello.c:986
 msgid "Failed to parse HELLO message: missing transport plugin\n"
 msgstr ""
 "Se produjo un fallo al procesar un mensaje «HELLO»: falta el módulo de "
 "transporte\n"
 
-#: src/hello/hello.c:990
-#, c-format
-msgid "Plugin `%s' not found\n"
+#: src/hello/hello.c:1004
+#, fuzzy, c-format
+msgid "Plugin `%s' not found, skipping address\n"
 msgstr "Módulo «%s» no encontrado\n"
 
-#: src/hello/hello.c:999
+#: src/hello/hello.c:1012
 #, c-format
 msgid "Plugin `%s' does not support URIs yet\n"
 msgstr "El módulo «%s» no soporta URI todavía\n"
 
-#: src/hello/hello.c:1018
+#: src/hello/hello.c:1031
 #, c-format
 msgid "Failed to parse `%s' as an address for plugin `%s'\n"
 msgstr ""
 "Se produjo un fallo al procesar «%s» como una dirección para el módulo «%s»\n"
 
-#: src/hostlist/gnunet-daemon-hostlist.c:259
+#: src/hello/hello.c:1104
+#, c-format
+msgid "HELLO URI contained %u addresses, added %u addresses\n"
+msgstr ""
+
+#: src/hostlist/gnunet-daemon-hostlist.c:274
 msgid ""
 "None of the functions for the hostlist daemon were enabled.  I have no "
 "reason to run!\n"
@@ -4555,11 +4723,11 @@
 "Ninguna de las funciones para el demonio de listas de máquinas fue "
 "activada.  ¡No tengo razón para ejecutarme!\n"
 
-#: src/hostlist/gnunet-daemon-hostlist.c:308
+#: src/hostlist/gnunet-daemon-hostlist.c:323
 msgid "advertise our hostlist to other peers"
 msgstr "anuncia nuestra lista de máquinas a otros pares"
 
-#: src/hostlist/gnunet-daemon-hostlist.c:313
+#: src/hostlist/gnunet-daemon-hostlist.c:328
 msgid ""
 "bootstrap using hostlists (it is highly recommended that you always use this "
 "option)"
@@ -4567,46 +4735,49 @@
 "realizar inicialización usando listas de máquinas (es altamente recomendable "
 "que siempre se use esta opción)"
 
-#: src/hostlist/gnunet-daemon-hostlist.c:316
+#: src/hostlist/gnunet-daemon-hostlist.c:331
 msgid "enable learning about hostlist servers from other peers"
 msgstr ""
 "habilitar aprendizaje de servidores de listas de máquinas de otros pares"
 
-#: src/hostlist/gnunet-daemon-hostlist.c:320
+#: src/hostlist/gnunet-daemon-hostlist.c:335
 msgid "provide a hostlist server"
 msgstr "proveer un servidor de listas de máquinas"
 
-#: src/hostlist/gnunet-daemon-hostlist.c:335
+#: src/hostlist/gnunet-daemon-hostlist.c:350
 msgid "GNUnet hostlist server and client"
 msgstr "Servidor y cliente GNUnet de listas de máquinas"
 
-#: src/hostlist/hostlist-client.c:288
+#: src/hostlist/gnunet-daemon-hostlist_client.c:343
 msgid "# bytes downloaded from hostlist servers"
 msgstr "# bytes descargados de servidores de listas de máquinas"
 
-#: src/hostlist/hostlist-client.c:309 src/hostlist/hostlist-client.c:339
+#: src/hostlist/gnunet-daemon-hostlist_client.c:364
+#: src/hostlist/gnunet-daemon-hostlist_client.c:394
 msgid "# invalid HELLOs downloaded from hostlist servers"
 msgstr "# «HELLO» no válidos descargados de servidores de listas de máquinas"
 
-#: src/hostlist/hostlist-client.c:312 src/hostlist/hostlist-client.c:342
+#: src/hostlist/gnunet-daemon-hostlist_client.c:367
+#: src/hostlist/gnunet-daemon-hostlist_client.c:397
 #, c-format
 msgid "Invalid `%s' message received from hostlist at `%s'\n"
 msgstr "Mensaje «%s» no válido recibido de la lista de máquinas en «%s»\n"
 
-#: src/hostlist/hostlist-client.c:330
+#: src/hostlist/gnunet-daemon-hostlist_client.c:385
 msgid "# valid HELLOs downloaded from hostlist servers"
 msgstr "# «HELLO» válidos descargados de servidores de listas de máquinas"
 
-#: src/hostlist/hostlist-client.c:592 src/hostlist/hostlist-client.c:1333
+#: src/hostlist/gnunet-daemon-hostlist_client.c:650
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1401
 msgid "# advertised hostlist URIs"
 msgstr "# URI de listas de máquinas anunciadas"
 
-#: src/hostlist/hostlist-client.c:622
+#: src/hostlist/gnunet-daemon-hostlist_client.c:680
 #, c-format
 msgid "# advertised URI `%s' downloaded"
 msgstr "# URI anunciadas «%s» descargadas"
 
-#: src/hostlist/hostlist-client.c:664
+#: src/hostlist/gnunet-daemon-hostlist_client.c:722
 #, c-format
 msgid ""
 "Advertised hostlist with URI `%s' could not be downloaded. Advertised URI "
@@ -4615,111 +4786,120 @@
 "Lista de máquinas anunciada con la URI «%s» no pudo ser descargada. La URI "
 "anunciada es descartada.\n"
 
-#: src/hostlist/hostlist-client.c:802
+#: src/hostlist/gnunet-daemon-hostlist_client.c:862
 #, c-format
 msgid "Timeout trying to download hostlist from `%s'\n"
 msgstr ""
 "Finalizado el plazo mientras se intentaba bajar lista de máquinas de «%s»\n"
 
-#: src/hostlist/hostlist-client.c:816
+#: src/hostlist/gnunet-daemon-hostlist_client.c:876
 #, c-format
 msgid "Download limit of %u bytes exceeded, stopping download\n"
 msgstr "Límite de descarga de %u bytes superado, parando descarga\n"
 
-#: src/hostlist/hostlist-client.c:836
+#: src/hostlist/gnunet-daemon-hostlist_client.c:896
 #, c-format
 msgid "Download of hostlist from `%s' failed: `%s'\n"
 msgstr "Descarga de lista de máquinas de «%s» fallida: «%s»\n"
 
-#: src/hostlist/hostlist-client.c:842
+#: src/hostlist/gnunet-daemon-hostlist_client.c:902
 #, c-format
 msgid "Download of hostlist `%s' completed.\n"
 msgstr "Descarga de lista de máquinas «%s» completada.\n"
 
-#: src/hostlist/hostlist-client.c:850
+#: src/hostlist/gnunet-daemon-hostlist_client.c:910
 #, c-format
 msgid "Adding successfully tested hostlist `%s' datastore.\n"
 msgstr "Añadiendo el almacén de datos de la lista de máquinas probada «%s».\n"
 
-#: src/hostlist/hostlist-client.c:903
+#: src/hostlist/gnunet-daemon-hostlist_client.c:963
 #, c-format
 msgid "Bootstrapping using hostlist at `%s'.\n"
 msgstr "Inicializando usando lista de máquinas en «%s».\n"
 
-#: src/hostlist/hostlist-client.c:911
+#: src/hostlist/gnunet-daemon-hostlist_client.c:971
 msgid "# hostlist downloads initiated"
 msgstr "# descargas de listas de máquinas iniciadas"
 
-#: src/hostlist/hostlist-client.c:1040 src/hostlist/hostlist-client.c:1506
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1103
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1646
 msgid "# milliseconds between hostlist downloads"
 msgstr "# milisegundos entre descargas de listas de máquinas"
 
-#: src/hostlist/hostlist-client.c:1049
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1112
 #, c-format
 msgid "Have %u/%u connections.  Will consider downloading hostlist in %s\n"
 msgstr ""
 "Hay %u/%u conexiones.  Se considerará descargar una lista de máquinas en %s\n"
 
-#: src/hostlist/hostlist-client.c:1109 src/hostlist/hostlist-client.c:1125
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1172
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1188
 msgid "# active connections"
 msgstr "# conexiones activas"
 
-#: src/hostlist/hostlist-client.c:1280
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1347
 #, c-format
 msgid "Loading saved hostlist entries from file `%s' \n"
 msgstr "Cargando entradas guardadas de listas de máquinas del fichero «%s»\n"
 
-#: src/hostlist/hostlist-client.c:1285
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1352
 #, c-format
 msgid "Hostlist file `%s' does not exist\n"
 msgstr "El fichero de listas de máquinas «%s» no existe\n"
 
-#: src/hostlist/hostlist-client.c:1296
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1361
 #, c-format
 msgid "Could not open file `%s' for reading to load hostlists: %s\n"
 msgstr ""
 "No se pudo abrir el fichero «%s» en modo lectura para cargar las listas de "
 "máquinas: %s\n"
 
-#: src/hostlist/hostlist-client.c:1329
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1395
 #, c-format
 msgid "%u hostlist URIs loaded from file\n"
 msgstr "%u URI de listas de máquinas cargadas del fichero\n"
 
-#: src/hostlist/hostlist-client.c:1331
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1398
 msgid "# hostlist URIs read from file"
 msgstr "# URI de listas de máquinas leídas de fichero"
 
-#: src/hostlist/hostlist-client.c:1376
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1445
 #, c-format
 msgid "Could not open file `%s' for writing to save hostlists: %s\n"
 msgstr ""
 "No se pudo abrir el fichero «%s» en modo escritura para almacenar las listas "
 "de máquinas: %s\n"
 
-#: src/hostlist/hostlist-client.c:1381
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1450
 #, c-format
 msgid "Writing %u hostlist URIs to `%s'\n"
 msgstr "Escribiendo %u URI de listas de máquinas a «%s»\n"
 
-#: src/hostlist/hostlist-client.c:1405 src/hostlist/hostlist-client.c:1422
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1474
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1491
 #, c-format
 msgid "Error writing hostlist URIs to file `%s'\n"
 msgstr "Error escribiendo URI de listas de máquinas al fichero «%s»\n"
 
-#: src/hostlist/hostlist-client.c:1417
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1486
 msgid "# hostlist URIs written to file"
 msgstr "# URI de listas de máquinas escritas a fichero"
 
-#: src/hostlist/hostlist-client.c:1471
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1581
+#: src/transport/plugin_transport_http_client.c:1866
+#, c-format
+msgid "Invalid proxy type: `%s', disabling proxy! Check configuration!\n"
+msgstr ""
+
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1611
 msgid "Learning is enabled on this peer\n"
 msgstr "El aprendizaje está habilitado en este par\n"
 
-#: src/hostlist/hostlist-client.c:1483
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1623
 msgid "Learning is not enabled on this peer\n"
 msgstr "El aprendizaje no está habilitado en este par\n"
 
-#: src/hostlist/hostlist-client.c:1495
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1635
 #, c-format
 msgid ""
 "Since learning is not enabled on this peer, hostlist file `%s' was removed\n"
@@ -4727,23 +4907,24 @@
 "La lista de máquinas «%s» fue eliminada puesto que el aprendizaje no está "
 "habilitado en este par\n"
 
-#: src/hostlist/hostlist-client.c:1499
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1639
 #, c-format
 msgid "Hostlist file `%s' could not be removed\n"
 msgstr "El fichero de listas de máquinas «%s» no pudo ser eliminado\n"
 
-#: src/hostlist/hostlist-server.c:137
+#: src/hostlist/gnunet-daemon-hostlist_server.c:143
 msgid "bytes in hostlist"
 msgstr "bytes en la lista de máquinas"
 
-#: src/hostlist/hostlist-server.c:161
+#: src/hostlist/gnunet-daemon-hostlist_server.c:168
 msgid "expired addresses encountered"
 msgstr "direcciones expiradas encontradas"
 
-#: src/hostlist/hostlist-server.c:189 src/hostlist/hostlist-server.c:425
-#: src/peerinfo-tool/gnunet-peerinfo.c:350
-#: src/peerinfo-tool/gnunet-peerinfo.c:419
-#: src/peerinfo-tool/gnunet-peerinfo.c:490
+#: src/hostlist/gnunet-daemon-hostlist_server.c:203
+#: src/hostlist/gnunet-daemon-hostlist_server.c:534
+#: src/peerinfo-tool/gnunet-peerinfo.c:361
+#: src/peerinfo-tool/gnunet-peerinfo.c:430
+#: src/peerinfo-tool/gnunet-peerinfo.c:501
 #: src/topology/gnunet-daemon-topology.c:925
 #, c-format
 msgid "Error in communication with PEERINFO service: %s\n"
@@ -4751,82 +4932,88 @@
 "Error en la comunicación con el servicio de información de pares (PEERINFO): "
 "%s\n"
 
-#: src/hostlist/hostlist-server.c:210
+#: src/hostlist/gnunet-daemon-hostlist_server.c:227
 msgid "HELLOs without addresses encountered (ignored)"
 msgstr "«HELLO» sin dirección encontrados (ignorados)"
 
-#: src/hostlist/hostlist-server.c:224
+#: src/hostlist/gnunet-daemon-hostlist_server.c:243
 msgid "bytes not included in hostlist (size limit)"
 msgstr "bytes no incluidos en la lista de máquinas (límite de tamaño)"
 
-#: src/hostlist/hostlist-server.c:268
+#: src/hostlist/gnunet-daemon-hostlist_server.c:363
 #, c-format
 msgid "Refusing `%s' request to hostlist server\n"
 msgstr "Rechazando petición «%s» al servidor de listas de máquinas\n"
 
-#: src/hostlist/hostlist-server.c:271
+#: src/hostlist/gnunet-daemon-hostlist_server.c:366
 msgid "hostlist requests refused (not HTTP GET)"
 msgstr "Peticiones de listas de máquinas rechazadas (no HTTP GET)"
 
-#: src/hostlist/hostlist-server.c:284
+#: src/hostlist/gnunet-daemon-hostlist_server.c:380
 #, c-format
 msgid "Refusing `%s' request with %llu bytes of upload data\n"
 msgstr "Rechazando petición «%s» con %llu bytes de datos de subida\n"
 
-#: src/hostlist/hostlist-server.c:288
+#: src/hostlist/gnunet-daemon-hostlist_server.c:384
 msgid "hostlist requests refused (upload data)"
 msgstr "Peticiones de listas de máquinas rechazadas (datos de subida)"
 
-#: src/hostlist/hostlist-server.c:296
+#: src/hostlist/gnunet-daemon-hostlist_server.c:391
 msgid "Could not handle hostlist request since I do not have a response yet\n"
 msgstr ""
 "No se pudo manejar una petición de lista de máquinas debido a que no hay una "
 "respuesta todavía\n"
 
-#: src/hostlist/hostlist-server.c:299
+#: src/hostlist/gnunet-daemon-hostlist_server.c:394
 msgid "hostlist requests refused (not ready)"
 msgstr "Peticiones de listas de máquinas rechazadas (no preparados)"
 
-#: src/hostlist/hostlist-server.c:303
+#: src/hostlist/gnunet-daemon-hostlist_server.c:399
 msgid "Received request for our hostlist\n"
 msgstr "Peticiones recibidas de nuestra lista de máquinas\n"
 
-#: src/hostlist/hostlist-server.c:304
+#: src/hostlist/gnunet-daemon-hostlist_server.c:401
 msgid "hostlist requests processed"
 msgstr "Peticiones de lista de máquinas procesadas"
 
-#: src/hostlist/hostlist-server.c:346
+#: src/hostlist/gnunet-daemon-hostlist_server.c:448
 msgid "# hostlist advertisements send"
 msgstr "# anuncios de listas de máquinas enviados"
 
-#: src/hostlist/hostlist-server.c:390
+#: src/hostlist/gnunet-daemon-hostlist_server.c:496
 msgid "Advertisement message could not be queued by core\n"
 msgstr ""
 "Los mensajes de anuncio no pudieron encolarse por el servicio principal\n"
 
-#: src/hostlist/hostlist-server.c:557 src/peerinfo-tool/gnunet-peerinfo.c:639
-#: src/transport/gnunet-service-transport.c:1114
+#: src/hostlist/gnunet-daemon-hostlist_server.c:683
+#: src/peerinfo-tool/gnunet-peerinfo.c:650
+#: src/transport/gnunet-service-transport.c:1136
 msgid "Could not access PEERINFO service.  Exiting.\n"
 msgstr ""
 "No se pudo acceder al servicio de información de pares (PEERINFO).  "
 "Saliendo.\n"
 
-#: src/hostlist/hostlist-server.c:576
+#: src/hostlist/gnunet-daemon-hostlist_server.c:707
 #, c-format
 msgid "Hostlist service starts on %s:%llu\n"
 msgstr "Servicio de listas de máquinas arranca en %s:%llu\n"
 
-#: src/hostlist/hostlist-server.c:590
+#: src/hostlist/gnunet-daemon-hostlist_server.c:722
 #, c-format
 msgid "Address to obtain hostlist: `%s'\n"
 msgstr "Dirección para obtener la lista de máquinas: «%s»\n"
 
-#: src/hostlist/hostlist-server.c:630
-#, c-format
-msgid "`%s' is not a valid IP address! Ignoring BINDTOIP.\n"
+#: src/hostlist/gnunet-daemon-hostlist_server.c:760
+#, fuzzy, c-format
+msgid "`%s' is not a valid IPv4 address! Ignoring BINDTOIPV4.\n"
 msgstr "¡«%s» no es una dirección IP válida! Ignorando «BINDTOIP».\n"
 
-#: src/hostlist/hostlist-server.c:673
+#: src/hostlist/gnunet-daemon-hostlist_server.c:780
+#, fuzzy, c-format
+msgid "`%s' is not a valid IPv6 address! Ignoring BINDTOIPV6.\n"
+msgstr "¡«%s» no es una dirección IP válida! Ignorando «BINDTOIP».\n"
+
+#: src/hostlist/gnunet-daemon-hostlist_server.c:820
 #, c-format
 msgid "Could not start hostlist HTTP server on port %u\n"
 msgstr ""
@@ -4926,56 +5113,6 @@
 msgid "Failed to create directory `%s' for storing egos\n"
 msgstr "Se produjo un fallo al leer el directorio «%s»\n"
 
-#: src/mesh/gnunet-mesh.c:357
-#, fuzzy, c-format
-msgid "Invalid target `%s'\n"
-msgstr "Parámetro no válido «%s»\n"
-
-#: src/mesh/gnunet-mesh.c:607
-#, fuzzy, c-format
-msgid "Invalid peer ID `%s'\n"
-msgstr "URI no válida: «%s»\n"
-
-#: src/mesh/gnunet-mesh.c:650
-#, fuzzy, c-format
-msgid "Invalid tunnel owner `%s'\n"
-msgstr "Formato de tiempo no válido «%s»\n"
-
-#: src/mesh/gnunet-mesh.c:716
-msgid "You must NOT give a TARGETwhen using 'request all' options\n"
-msgstr ""
-
-#: src/mesh/gnunet-mesh.c:807
-#, fuzzy
-msgid "provide information about a particular connection"
-msgstr "proveer información acerca de un túnel en particular"
-
-#: src/mesh/gnunet-mesh.c:810
-msgid "activate echo mode"
-msgstr ""
-
-#: src/mesh/gnunet-mesh.c:816
-msgid "port to listen to (default; 0)"
-msgstr ""
-
-#: src/mesh/gnunet-mesh.c:819 src/mesh/gnunet-mesh.c:822
-#, fuzzy
-msgid "provide information about all peers"
-msgstr "proveer información acerca de un túnel en particular"
-
-#: src/mesh/gnunet-mesh.c:825
-msgid "provide information about a particular tunnel"
-msgstr "proveer información acerca de un túnel en particular"
-
-#: src/mesh/gnunet-mesh.c:828
-#, fuzzy
-msgid "provide information about all tunnels"
-msgstr "proveer información acerca de un túnel en particular"
-
-#: src/mesh/gnunet-service-mesh_peer.c:390
-msgid "Wrong CORE service\n"
-msgstr "Servicio principal (CORE) erróneo\n"
-
 #: src/mysql/mysql.c:174
 #, c-format
 msgid "Trying to use file `%s' for MySQL configuration.\n"
@@ -4991,7 +5128,7 @@
 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:397
+#: src/namecache/gnunet-namecache.c:124 src/namestore/gnunet-namestore.c:402
 #, c-format
 msgid "\tCorrupt or unsupported record of type %u\n"
 msgstr "\tRegistro corrupto o no soportado del tipo %u\n"
@@ -5001,7 +5138,7 @@
 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:695
+#: src/namecache/gnunet-namecache.c:195 src/namestore/gnunet-namestore.c:783
 #, fuzzy, c-format
 msgid "Invalid public key for reverse lookup `%s'\n"
 msgstr "Parámetro no válido «%s»\n"
@@ -5011,7 +5148,7 @@
 msgid "You must specify a name\n"
 msgstr "¡Debes especificar un receptor!\n"
 
-#: src/namecache/gnunet-namecache.c:234 src/namestore/gnunet-namestore.c:931
+#: src/namecache/gnunet-namecache.c:234 src/namestore/gnunet-namestore.c:1020
 msgid "name of the record to add/delete/display"
 msgstr "nombre del registro a añadir/borrar/mostrar"
 
@@ -5020,7 +5157,7 @@
 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:963
+#: src/namecache/gnunet-namecache.c:248 src/namestore/gnunet-namestore.c:1055
 msgid "GNUnet zone manipulation tool"
 msgstr "Herramienta de manipulación de zona de GNUnet"
 
@@ -5034,150 +5171,165 @@
 msgid "Failed to create indices\n"
 msgstr "Se produjo un fallo al crear los índices\n"
 
-#: src/namestore/gnunet-namestore.c:303
+#: src/namestore/gnunet-namestore.c:308
 #, c-format
 msgid "Adding record failed: %s\n"
 msgstr "No se pudo añadir el registro: %s\n"
 
-#: src/namestore/gnunet-namestore.c:332
+#: src/namestore/gnunet-namestore.c:337
 #, 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:339
+#: src/namestore/gnunet-namestore.c:344
 #, fuzzy, c-format
 msgid "Deleting record failed%s%s\n"
 msgstr "No se pudo borrar el registro: %s\n"
 
-#: src/namestore/gnunet-namestore.c:558
+#: src/namestore/gnunet-namestore.c:567
 #, c-format
+msgid "There are no records under label `%s' that could be deleted.\n"
+msgstr ""
+
+#: src/namestore/gnunet-namestore.c:606
+#, c-format
+msgid ""
+"There are no records under label `%s' that match the request for deletion.\n"
+msgstr ""
+
+#: src/namestore/gnunet-namestore.c:647
+#, c-format
 msgid "No options given\n"
 msgstr "No se han proporcionado opciones\n"
 
-#: src/namestore/gnunet-namestore.c:569
+#: src/namestore/gnunet-namestore.c:658
 #: 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: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
+#: src/namestore/gnunet-namestore.c:666 src/namestore/gnunet-namestore.c:675
+#: src/namestore/gnunet-namestore.c:692 src/namestore/gnunet-namestore.c:714
+#: src/namestore/gnunet-namestore.c:754
 #, 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:578 src/namestore/gnunet-namestore.c:587
-#: src/namestore/gnunet-namestore.c:604 src/namestore/gnunet-namestore.c:626
+#: src/namestore/gnunet-namestore.c:667 src/namestore/gnunet-namestore.c:676
+#: src/namestore/gnunet-namestore.c:693 src/namestore/gnunet-namestore.c:715
 msgid "add"
 msgstr "añadir"
 
-#: src/namestore/gnunet-namestore.c:595
+#: src/namestore/gnunet-namestore.c:684
 #, c-format
 msgid "Unsupported type `%s'\n"
 msgstr "Tipo no soportado «%s»\n"
 
-#: src/namestore/gnunet-namestore.c:615
+#: src/namestore/gnunet-namestore.c:704
 #, 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:651
+#: src/namestore/gnunet-namestore.c:740
 #, c-format
 msgid "Invalid time format `%s'\n"
 msgstr "Formato de tiempo no válido «%s»\n"
 
-#: src/namestore/gnunet-namestore.c:666
+#: src/namestore/gnunet-namestore.c:755
 msgid "del"
 msgstr "borrar"
 
-#: src/namestore/gnunet-namestore.c:715
-#: src/peerinfo-tool/gnunet-peerinfo.c:723
+#: src/namestore/gnunet-namestore.c:803
+#: src/peerinfo-tool/gnunet-peerinfo.c:734
 #, c-format
 msgid "Invalid URI `%s'\n"
 msgstr "URI no válida: «%s»\n"
 
-#: src/namestore/gnunet-namestore.c:750
+#: src/namestore/gnunet-namestore.c:838
 #, fuzzy, c-format
 msgid "Invalid nick `%s'\n"
 msgstr "URI no válida: «%s»\n"
 
-#: src/namestore/gnunet-namestore.c:790
+#: src/namestore/gnunet-namestore.c:878
 #, fuzzy, c-format
 msgid "Ego `%s' not known to identity service\n"
 msgstr "'%s': servicio desconocido: %s\n"
 
-#: src/namestore/gnunet-namestore.c:817
+#: src/namestore/gnunet-namestore.c:905
 #, fuzzy, c-format
 msgid "No default ego configured in identity service\n"
 msgstr "'%s': servicio desconocido: %s\n"
 
-#: src/namestore/gnunet-namestore.c:853
+#: src/namestore/gnunet-namestore.c:941
 #, fuzzy, c-format
 msgid "Identity service is not running\n"
 msgstr "El servicio «%s» no está ejecutandose\n"
 
-#: src/namestore/gnunet-namestore.c:865
+#: src/namestore/gnunet-namestore.c:953
 #, fuzzy, c-format
 msgid "Cannot connect to identity service\n"
 msgstr "¡No se pudo conectar al servicio %s!\n"
 
-#: src/namestore/gnunet-namestore.c:913
+#: src/namestore/gnunet-namestore.c:1002
 msgid "add record"
 msgstr "añadir registro"
 
-#: src/namestore/gnunet-namestore.c:916
+#: src/namestore/gnunet-namestore.c:1005
 msgid "delete record"
 msgstr "borrar registro"
 
-#: src/namestore/gnunet-namestore.c:919
+#: src/namestore/gnunet-namestore.c:1008
 msgid "display records"
 msgstr "mostrar registros"
 
-#: src/namestore/gnunet-namestore.c:922
+#: src/namestore/gnunet-namestore.c:1011
 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:925
+#: src/namestore/gnunet-namestore.c:1014
 #, fuzzy
 msgid "set the desired nick name for the zone"
 msgstr "establece el nivel LEVEL deseado de replicación"
 
-#: src/namestore/gnunet-namestore.c:928
+#: src/namestore/gnunet-namestore.c:1017
 #, 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:934
+#: src/namestore/gnunet-namestore.c:1023
 #, fuzzy
 msgid "determine our name for the given PKEY"
 msgstr "establece las preferencias para el par dado"
 
-#: src/namestore/gnunet-namestore.c:937
+#: src/namestore/gnunet-namestore.c:1026
 msgid "type of the record to add/delete/display"
 msgstr "tipo del registro a añadir/borrar/mostrar"
 
-#: src/namestore/gnunet-namestore.c:940
+#: src/namestore/gnunet-namestore.c:1029
 msgid "URI to import into our zone"
 msgstr "URI a importar a nuestra zona"
 
-#: src/namestore/gnunet-namestore.c:943
+#: src/namestore/gnunet-namestore.c:1032
 msgid "value of the record to add/delete"
 msgstr "valor del registro a añadir/borrar"
 
-#: src/namestore/gnunet-namestore.c:946
+#: src/namestore/gnunet-namestore.c:1035
 msgid "create or list public record"
 msgstr "crear o listar registros públicos"
 
-#: src/namestore/gnunet-namestore.c:949
+#: src/namestore/gnunet-namestore.c:1038
+msgid "create record that is pending approval (and thus for now inactive)"
+msgstr ""
+
+#: src/namestore/gnunet-namestore.c:1041
 msgid ""
 "create shadow record (only valid if all other records of the same type have "
 "expired"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:952
+#: src/namestore/gnunet-namestore.c:1044
 #, fuzzy
 msgid "name of the ego controlling the zone"
 msgstr "nombre de la sección a la que acceder"
@@ -5264,58 +5416,62 @@
 msgid "GNUnet NAT traversal test helper daemon"
 msgstr "Demonio de ayuda en las pruebas de recorrido NAT de GNUnet"
 
-#: src/nat/nat_auto.c:170
+#: src/nat/nat_auto.c:175
 msgid "NAT traversal with ICMP Server timed out.\n"
 msgstr "Recorrido NAT con servidor ICMP expirado.\n"
 
-#: src/nat/nat_auto.c:203
+#: src/nat/nat_auto.c:207
 msgid "NAT traversal with ICMP Server succeeded.\n"
 msgstr "Recorrido NAT con servidor ICMP satisfactorio.\n"
 
-#: src/nat/nat_auto.c:204
+#: src/nat/nat_auto.c:208
 msgid "NAT traversal with ICMP Server failed.\n"
 msgstr "Recorrido NAT con servidor ICMP fallido.\n"
 
-#: src/nat/nat_auto.c:225
+#: src/nat/nat_auto.c:229
 msgid "Testing connection reversal with ICMP server.\n"
 msgstr "Probando conexión inversa con el servidor ICMP.\n"
 
-#: src/nat/nat_auto.c:274
+#: src/nat/nat_auto.c:284
 #, c-format
 msgid "Detected external IP `%s'\n"
 msgstr "Detectada IP externa «%s»\n"
 
-#: src/nat/nat_auto.c:344
+#: src/nat/nat_auto.c:362
 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:360
+#: src/nat/nat_auto.c:378
 #, c-format
 msgid "Detected internal network address `%s'.\n"
 msgstr "Detectada dirección de la red interna «%s».\n"
 
-#: src/nat/nat_auto.c:413
+#: src/nat/nat_auto.c:441
 msgid "upnpc found, enabling its use\n"
 msgstr "«upnpc» encontrado, habilitando su uso\n"
 
-#: src/nat/nat_auto.c:414
+#: src/nat/nat_auto.c:442
 msgid "upnpc not found\n"
 msgstr "«upnpc» no encontrado\n"
 
-#: src/nat/nat_auto.c:447
-msgid "gnunet-helper-nat-server found, testing it\n"
-msgstr "«gnunet-helper-nat-server» encontrado, probándolo\n"
+#: src/nat/nat_auto.c:472
+msgid "test_icmp_server not possible, as we have no public IPv4 address\n"
+msgstr ""
 
-#: src/nat/nat_auto.c:448
+#: src/nat/nat_auto.c:480
+msgid "test_icmp_server not possible, as we are not behind NAT\n"
+msgstr ""
+
+#: src/nat/nat_auto.c:488
 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:482
+#: src/nat/nat_auto.c:527
 msgid "gnunet-helper-nat-client found, enabling it\n"
 msgstr "«gnunet-helper-nat-client» encontrado, habilitando su uso\n"
 
-#: src/nat/nat_auto.c:483
+#: src/nat/nat_auto.c:528
 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 "
@@ -5331,11 +5487,27 @@
 msgid "Failed to start %s\n"
 msgstr "Se produjo un fallo al arrancar %s\n"
 
-#: src/nat/nat.c:1205
+#: src/nat/nat.c:1032
+msgid "Error while running upnp client:\n"
+msgstr ""
+
+#: src/nat/nat.c:1102
+#, fuzzy, c-format
+msgid "Failed to run upnp client for port %u\n"
+msgstr ""
+"Se produjo un fallo al inicializar la clave de la máquina desde el par %u\n"
+
+#: src/nat/nat.c:1243
 msgid "malformed"
 msgstr "mal formado"
 
-#: src/nat/nat.c:1276 src/nat/nat.c:1288
+#: src/nat/nat.c:1297
+msgid ""
+"UPnP enabled in configuration, but UPnP client `upnpc` command not found, "
+"disabling UPnP \n"
+msgstr ""
+
+#: src/nat/nat.c:1324 src/nat/nat.c:1336
 #, c-format
 msgid ""
 "Configuration requires `%s', but binary is not installed properly (SUID bit "
@@ -5344,53 +5516,25 @@
 "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:1426
+#: src/nat/nat.c:1474
 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:1442
+#: src/nat/nat.c:1490
 #, c-format
 msgid "Running gnunet-helper-nat-client %s %s %u\n"
 msgstr "Ejecutando gnunet-helper-nat-client %s %s %u\n"
 
-#: src/nat/nat_mini.c:155
-msgid "no valid address was returned by `external-ip'"
-msgstr ""
-
-#: src/nat/nat_mini.c:175
-#, fuzzy
-msgid "`external-ip' command not found"
-msgstr "comando «external-ip» no encontrado\n"
-
-#: src/nat/nat_mini.c:201
+#: src/nat/nat_mini.c:203
 msgid "`external-ip' command not found\n"
 msgstr "comando «external-ip» no encontrado\n"
 
-#: src/nat/nat_mini.c:366
-#, fuzzy
-msgid "Failed to run `upnpc` command"
-msgstr "Se produjo un fallo al ejecutar «%s»\n"
-
-#: src/nat/nat_mini.c:512
-#, fuzzy
-msgid "`upnpc' command took too long, process killed"
-msgstr "comando «upnpc» no encontrado\n"
-
-#: src/nat/nat_mini.c:540
-msgid "`upnpc' command failed to establish port mapping"
-msgstr ""
-
-#: src/nat/nat_mini.c:604
+#: src/nat/nat_mini.c:609
 msgid "`upnpc' command not found\n"
 msgstr "comando «upnpc» no encontrado\n"
 
-#: src/nat/nat_mini.c:608
-#, fuzzy
-msgid "`upnpc` command not found"
-msgstr "comando «upnpc» no encontrado\n"
-
 #: src/nat/nat_test.c:351
 msgid "Failed to connect to `gnunet-nat-server'\n"
 msgstr "Se produjo un fallo al conectar con «gnunet-nat-server»\n"
@@ -5402,6 +5546,11 @@
 "Se produjo un fallo al crear el «socket» de escucha asociado a «%s» para "
 "pruebas NAT: %s\n"
 
+#: src/nat/nat_test.c:453
+#, fuzzy
+msgid "NAT test failed to start NAT library\n"
+msgstr "El almacén de nombres no pudo añadir el registro\n"
+
 #: src/nse/gnunet-nse.c:117
 #, fuzzy
 msgid "NSE service is not running\n"
@@ -5508,7 +5657,7 @@
 msgid "aborted due to explicit disconnect request"
 msgstr "abortado debido a petición de desconexión explícita"
 
-#: src/peerinfo/peerinfo_api.c:356
+#: src/peerinfo/peerinfo_api.c:356 src/sensor/sensor_api.c:519
 msgid "failed to transmit request (service down?)"
 msgstr ""
 "se produjo un fallo al transmitir la petición (¿está caido el servicio?)"
@@ -5538,89 +5687,94 @@
 msgid "Could not connect to `%s' service.\n"
 msgstr "No se pudo conectar al servicio %s.\n"
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:232
+#: src/peerinfo-tool/gnunet-peerinfo.c:233
 #, fuzzy, c-format
 msgid "%sPeer `%s'\n"
 msgstr "Par «%s»\n"
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:239
+#: src/peerinfo-tool/gnunet-peerinfo.c:240
 #, c-format
 msgid "\tExpires: %s \t %s\n"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:428
+#: src/peerinfo-tool/gnunet-peerinfo.c:282
 #, fuzzy, c-format
+msgid "Failure: Cannot convert address to string for peer `%s'\n"
+msgstr "Se produjo un fallo al resolver la dirección para el par «%s»\n"
+
+#: src/peerinfo-tool/gnunet-peerinfo.c:439
+#, fuzzy, c-format
 msgid "Failure: Did not receive %s\n"
 msgstr "Se produjo un fallo al resolver «%s»: %s\n"
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:436
+#: src/peerinfo-tool/gnunet-peerinfo.c:447
 #, fuzzy, c-format
 msgid "Failure: Received invalid %s\n"
 msgstr "recibido mensaje '%s' no válido: %s.\n"
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:445
+#: src/peerinfo-tool/gnunet-peerinfo.c:456
 #, fuzzy, c-format
 msgid "Failed to write HELLO with %u bytes to file `%s'\n"
 msgstr "Se produjo un fallo al procesar «HELLO» en el fichero «%s»\n"
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:458
+#: src/peerinfo-tool/gnunet-peerinfo.c:469
 #, c-format
 msgid "Wrote %s HELLO containing %u addresses with %u bytes to file `%s'\n"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:522
+#: src/peerinfo-tool/gnunet-peerinfo.c:533
 #, c-format
 msgid "Failure adding HELLO: %s\n"
 msgstr "Fallo añadiendo «HELLO»: %s\n"
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:633
+#: src/peerinfo-tool/gnunet-peerinfo.c:644
 #, fuzzy, c-format
 msgid "Service `%s' is not running, please start GNUnet\n"
 msgstr "El servicio «%s» no está ejecutandose\n"
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:654 src/util/gnunet-scrypt.c:224
+#: src/peerinfo-tool/gnunet-peerinfo.c:665 src/util/gnunet-scrypt.c:224
 #, c-format
 msgid "Loading hostkey from `%s' failed.\n"
 msgstr "La carga de la clave de la máquina desde «%s» ha fallado.\n"
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:745
+#: src/peerinfo-tool/gnunet-peerinfo.c:756
 #, c-format
 msgid "I am peer `%s'.\n"
 msgstr "Yo soy el par «%s».\n"
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:789
+#: src/peerinfo-tool/gnunet-peerinfo.c:800
 msgid "don't resolve host names"
 msgstr "no resolver nombres de máquina"
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:792
+#: src/peerinfo-tool/gnunet-peerinfo.c:803
 msgid "output only the identity strings"
 msgstr "mostrar únicamente las cadenas de identidad"
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:795
+#: src/peerinfo-tool/gnunet-peerinfo.c:806
 msgid "include friend-only information"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:798
+#: src/peerinfo-tool/gnunet-peerinfo.c:809
 msgid "output our own identity only"
 msgstr "muestra únicamente nuestra propia identidad"
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:801
+#: src/peerinfo-tool/gnunet-peerinfo.c:812
 msgid "list all known peers"
 msgstr "mostrar todos los pares conocidos"
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:804
+#: src/peerinfo-tool/gnunet-peerinfo.c:815
 msgid "dump hello to file"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:807
+#: src/peerinfo-tool/gnunet-peerinfo.c:818
 msgid "also output HELLO uri(s)"
 msgstr "también mostrar las URI de «HELLO»"
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:810
+#: src/peerinfo-tool/gnunet-peerinfo.c:821
 msgid "add given HELLO uri to the database"
 msgstr "añade la URI de «HELLO» dada a la base de datos"
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:821
+#: src/peerinfo-tool/gnunet-peerinfo.c:832
 msgid "Print information about peers."
 msgstr "Imprimir información sobre los pares."
 
@@ -5642,6 +5796,37 @@
 msgid "Failed to load transport plugin for `%s'\n"
 msgstr "Se produjo un fallo al cargar el módulo del transporte para «%s»\n"
 
+#: src/peerstore/gnunet-peerstore.c:97
+msgid "peerstore"
+msgstr ""
+
+# Miguel: ¿Conectar y conexión?
+#: src/peerstore/peerstore_api.c:486
+#, fuzzy
+msgid "Error communicating with `PEERSTORE' service."
+msgstr "Error al comunicar con el servicio ARM.\n"
+
+#: src/peerstore/peerstore_api.c:503
+#, fuzzy
+msgid "Received a malformed response from service."
+msgstr "Recibida petición DNS mal formada de %s\n"
+
+#: src/peerstore/plugin_peerstore_sqlite.c:352
+#: src/psycstore/plugin_psycstore_sqlite.c:276
+#, fuzzy, c-format
+msgid ""
+"Error executing SQL query: %s\n"
+"  %s\n"
+msgstr "Error abriendo fichero «%s»: %s\n"
+
+#: src/peerstore/plugin_peerstore_sqlite.c:377
+#: src/psycstore/plugin_psycstore_sqlite.c:253
+#, fuzzy, c-format
+msgid ""
+"Error preparing SQL query: %s\n"
+"  %s\n"
+msgstr "Error leyendo de «%s»: %s\n"
+
 #: src/postgres/postgres.c:59
 #, c-format
 msgid "`%s:%s' failed at %s:%d with error: %s"
@@ -5739,20 +5924,6 @@
 msgid "`%s' failed at %s:%d with error: %s (%d)\n"
 msgstr "«%s» falló en %s: %d con el error: %s\n"
 
-#: src/psycstore/plugin_psycstore_sqlite.c:253
-#, fuzzy, c-format
-msgid ""
-"Error preparing SQL query: %s\n"
-"  %s\n"
-msgstr "Error leyendo de «%s»: %s\n"
-
-#: src/psycstore/plugin_psycstore_sqlite.c:276
-#, fuzzy, c-format
-msgid ""
-"Error executing SQL query: %s\n"
-"  %s\n"
-msgstr "Error abriendo fichero «%s»: %s\n"
-
 #: src/psycstore/plugin_psycstore_sqlite.c:1796
 #, fuzzy
 msgid "SQLite database running\n"
@@ -5788,7 +5959,7 @@
 
 #: src/pt/gnunet-daemon-pt.c:888
 #, fuzzy
-msgid "# DNS requests dropped (DNS mesh channel down)"
+msgid "# DNS requests dropped (DNS cadet channel down)"
 msgstr "# Peticiones DNS omitidas (túnel mesh DNS caído)"
 
 #: src/pt/gnunet-daemon-pt.c:896
@@ -5824,7 +5995,8 @@
 "Saliendo.\n"
 
 #: src/regex/gnunet-daemon-regexprofiler.c:380
-msgid "Daemon to announce regular expressions for the peer using mesh."
+#, fuzzy
+msgid "Daemon to announce regular expressions for the peer using cadet."
 msgstr "Demonio para anunciar expresiones regulares para el par usando mesh."
 
 #: src/regex/gnunet-regex-profiler.c:1288
@@ -6035,255 +6207,331 @@
 msgid "Could not open revocation database file!"
 msgstr "No se pudo conectar con el almacén de datos."
 
-#: src/scalarproduct/gnunet-scalarproduct.c:225
+#: src/scalarproduct/gnunet-scalarproduct.c:224
 #, fuzzy
 msgid "You must specify at least one message ID to check!\n"
 msgstr "Debes especificar un fichero a inspeccionar.\n"
 
-#: src/scalarproduct/gnunet-scalarproduct.c:232
+#: src/scalarproduct/gnunet-scalarproduct.c:231
 msgid "This program needs a session identifier for comparing vectors.\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-scalarproduct.c:239
+#: src/scalarproduct/gnunet-scalarproduct.c:238
 msgid "Please give a session key for --input_key!\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-scalarproduct.c:251
+#: src/scalarproduct/gnunet-scalarproduct.c:250
 #, c-format
 msgid ""
 "Tried to set initiator mode, as peer ID was given. However, `%s' is not a "
 "valid peer identifier.\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-scalarproduct.c:278
-#: src/scalarproduct/gnunet-scalarproduct.c:314
-#, fuzzy, c-format
-msgid "Could not convert `%s' to int32_t.\n"
-msgstr "No se pudo conectar al servicio %s.\n"
-
-#: src/scalarproduct/gnunet-scalarproduct.c:286
+#: src/scalarproduct/gnunet-scalarproduct.c:261
 msgid "Need elements to compute the vectorproduct, got none.\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-scalarproduct.c:346
+#: src/scalarproduct/gnunet-scalarproduct.c:283
 #, fuzzy, c-format
-msgid "Could not convert `%s' to integer.\n"
+msgid "Malformed input, could not parse `%s'\n"
+msgstr "Se produjo un fallo al iniciar el servicio «%s»\n"
+
+#: src/scalarproduct/gnunet-scalarproduct.c:296
+#, fuzzy, c-format
+msgid "Could not convert `%s' to int64_t.\n"
 msgstr "No se pudo conectar al servicio %s.\n"
 
-#: src/scalarproduct/gnunet-scalarproduct.c:407
+#: src/scalarproduct/gnunet-scalarproduct.c:345
 msgid ""
 "A comma separated list of elements to compare as vector with our remote peer."
 msgstr ""
 
-#: src/scalarproduct/gnunet-scalarproduct.c:410
+#: src/scalarproduct/gnunet-scalarproduct.c:348
 msgid ""
-"A comma separated mask to select which elements should actually be compared."
-msgstr ""
-
-#: src/scalarproduct/gnunet-scalarproduct.c:413
-msgid ""
 "[Optional] peer to calculate our scalarproduct with. If this parameter is "
 "not given, the service will wait for a remote peer to compute the request."
 msgstr ""
 
-#: src/scalarproduct/gnunet-scalarproduct.c:416
+#: src/scalarproduct/gnunet-scalarproduct.c:351
 msgid "Transaction ID shared with peer."
 msgstr ""
 
-#: src/scalarproduct/gnunet-scalarproduct.c:425
+#: src/scalarproduct/gnunet-scalarproduct.c:360
 msgid "Calculate the Vectorproduct with a GNUnet peer."
 msgstr ""
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:541
+#: src/scalarproduct/gnunet-service-scalarproduct.c:678
 #, fuzzy, c-format
-msgid "Client (%p) disconnected from us.\n"
+msgid "Client %p disconnected from us.\n"
 msgstr "Desconectado de %s\n"
 
 # Miguel: Si no me equivoco, "status result" es un
 # resultado de tipo estado.
-#: src/scalarproduct/gnunet-service-scalarproduct.c:613
-#: src/scalarproduct/gnunet-service-scalarproduct.c:702
+#: src/scalarproduct/gnunet-service-scalarproduct.c:748
 #, fuzzy, c-format
 msgid "Could not send message to client (%p)!\n"
 msgstr "No se pudo mandar el resultado (estado) al cliente\n"
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:619
+#: src/scalarproduct/gnunet-service-scalarproduct.c:759
 #, c-format
 msgid "Sending session-end notification to client (%p) for session %s\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:712
-#, c-format
-msgid "Sent result to client (%p), this session (%s) has ended!\n"
-msgstr ""
+#: src/scalarproduct/gnunet-service-scalarproduct.c:781
+#: src/scalarproduct/gnunet-service-scalarproduct.c:1459
+#, fuzzy, c-format
+msgid "Successfully created new channel to peer (%s)!\n"
+msgstr "Conectado satisfactoriamente a «%s»\n"
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:766
-#: src/scalarproduct/gnunet-service-scalarproduct.c:855
-msgid "Could not send service-response message via mesh!)\n"
-msgstr ""
-
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1028
-#, c-format
-msgid "Failed to communicate with `%s', scalar product calculation aborted.\n"
-msgstr ""
-
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1099
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1208
+#: src/scalarproduct/gnunet-service-scalarproduct.c:818
+#: src/scalarproduct/gnunet-service-scalarproduct.c:1469
+#: src/scalarproduct/gnunet-service-scalarproduct.c:1539
 #, fuzzy
 msgid "Transmitting service request.\n"
 msgstr "Reiniciando el servicio «%s»\n"
 
 # Miguel: Si no me equivoco, "list result" es un resultado
 # de tipo lista.
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1108
+#: src/scalarproduct/gnunet-service-scalarproduct.c:830
+#: src/scalarproduct/gnunet-service-scalarproduct.c:1481
 #, fuzzy
-msgid "Could not send service-request multipart message to channel!\n"
+msgid "Could not send message to channel!\n"
 msgstr "No se pudo mandar el resultado (lista) al cliente\n"
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1147
-#, fuzzy, c-format
-msgid "Successfully created new channel to peer (%s)!\n"
-msgstr "Conectado satisfactoriamente a «%s»\n"
-
 # Miguel: Si no me equivoco, "list result" es un resultado
 # de tipo lista.
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1217
+#: src/scalarproduct/gnunet-service-scalarproduct.c:891
+#: src/scalarproduct/gnunet-service-scalarproduct.c:991
 #, fuzzy
-msgid "Could not send message to channel!\n"
+msgid "Could not send service-response message via cadet!)\n"
 msgstr "No se pudo mandar el resultado (lista) al cliente\n"
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1274
-#, fuzzy
-msgid "Too short message received from client!\n"
-msgstr "# peticiones «PUT» recibidas de clientes"
+#: src/scalarproduct/gnunet-service-scalarproduct.c:1442
+#, c-format
+msgid "Sent result to client (%p), this session (%s) has ended!\n"
+msgstr ""
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1287
+# Miguel: Si no me equivoco, "list result" es un resultado
+# de tipo lista.
+#: src/scalarproduct/gnunet-service-scalarproduct.c:1550
 #, fuzzy
-msgid "Invalid message received from client, session information incorrect!\n"
-msgstr "Mensaje «%s» no válido recibido de la lista de máquinas en «%s»\n"
+msgid "Could not send service-request multipart message to channel!\n"
+msgstr "No se pudo mandar el resultado (lista) al cliente\n"
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1298
+#: src/scalarproduct/gnunet-service-scalarproduct.c:1579
 #, c-format
 msgid ""
-"Duplicate session information received, cannot create new session with key `"
-"%s'\n"
+"Got client-responder-session with key %s and a matching service-request-"
+"session set, processing.\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1318
+#: src/scalarproduct/gnunet-service-scalarproduct.c:1601
 #, c-format
 msgid ""
-"Got client-request-session with key %s, preparing channel to remote "
-"service.\n"
+"Got client-responder-session with key %s but NO matching service-request-"
+"session set, queuing element for later use.\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1354
+#: src/scalarproduct/gnunet-service-scalarproduct.c:1618
 #, c-format
 msgid "Creating new channel for session with key %s.\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1399
+#: src/scalarproduct/gnunet-service-scalarproduct.c:1777
 #, c-format
 msgid ""
-"Got client-responder-session with key %s and a matching service-request-"
-"session set, processing.\n"
+"Duplicate session information received, can not create new session with key `"
+"%s'\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1409
-#, c-format
-msgid ""
-"Got client-responder-session with key %s but NO matching service-request-"
-"session set, queuing element for later use.\n"
-msgstr ""
-
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1439
+#: src/scalarproduct/gnunet-service-scalarproduct.c:1862
 #, fuzzy, c-format
 msgid "New incoming channel from peer %s.\n"
 msgstr "Desconectado de %s\n"
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1471
+#: src/scalarproduct/gnunet-service-scalarproduct.c:1892
 #, c-format
 msgid "Peer disconnected, terminating session %s with peer (%s)\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1672
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1814
+#: src/scalarproduct/gnunet-service-scalarproduct.c:2270
 #, c-format
-msgid "Got session with key %s and a matching element set, processing.\n"
+msgid ""
+"Got message with duplicate session key (`%s'), ignoring service request.\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1681
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1821
+#: src/scalarproduct/gnunet-service-scalarproduct.c:2297
 #, c-format
-msgid "Got session with key %s without a matching element set, queueing.\n"
+msgid "Got session with key %s and a matching element set, processing.\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1771
+#: src/scalarproduct/gnunet-service-scalarproduct.c:2318
 #, c-format
-msgid ""
-"Got message with duplicate session key (`%s'), ignoring service request.\n"
+msgid "Got session with key %s without a matching element set, queueing.\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:2014
+#: src/scalarproduct/gnunet-service-scalarproduct.c:2565
 msgid "Shutting down, initiating cleanup.\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:2100
+#: src/scalarproduct/gnunet-service-scalarproduct.c:2659
 #, fuzzy
-msgid "Connect to MESH failed\n"
+msgid "Connect to CADET failed\n"
 msgstr "Conexión fallida (¿bug?)\n"
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:2104
+#: src/scalarproduct/gnunet-service-scalarproduct.c:2664
 #, fuzzy
-msgid "Mesh initialized\n"
+msgid "CADET initialized\n"
 msgstr "Conexión fallida\n"
 
-#: src/scalarproduct/scalarproduct_api.c:246
+#: src/secretsharing/gnunet-secretsharing-profiler.c:613
+msgid "dkg start delay"
+msgstr ""
+
+#: src/secretsharing/gnunet-secretsharing-profiler.c:616
+msgid "dkg timeout"
+msgstr ""
+
+#: src/secretsharing/gnunet-secretsharing-profiler.c:619
+msgid "threshold"
+msgstr ""
+
+#: src/secretsharing/gnunet-secretsharing-profiler.c:622
+msgid "also profile decryption"
+msgstr ""
+
+#: src/sensor/gnunet-sensor.c:148
 #, fuzzy
-msgid "# SUC responder result messages received"
-msgstr "# mensajes de detención de migración recibidos"
+msgid "Retrieve information about all defined sensors"
+msgstr "proveer información acerca de un túnel en particular"
 
-#: src/scalarproduct/scalarproduct_api.c:300
+#: src/sensor/gnunet-sensor.c:151
 #, fuzzy
-msgid "# bytes sent to scalarproduct"
-msgstr "# bytes mandados al almacén de datos"
+msgid "Retrieve information about a single sensor"
+msgstr "proveer información acerca de un túnel en particular"
 
-#: src/scalarproduct/scalarproduct_api.c:345
-#: src/scalarproduct/scalarproduct_api.c:440
+#: src/sensor/gnunet-sensor.c:160
+msgid "sensor"
+msgstr ""
+
+#: src/sensor/gnunet-service-sensor.c:367
 #, fuzzy
-msgid "Failed to connect to the scalarproduct service\n"
-msgstr "Se produjo un fallo al conectar con el servicio de chat\n"
+msgid "Error reading sensor version\n"
+msgstr "Error leyendo «%s»: %s"
 
-#: src/scalarproduct/scalarproduct_api.c:353
-#: src/scalarproduct/scalarproduct_api.c:448
+#: src/sensor/gnunet-service-sensor.c:373
+msgid "Invalid sensor version number, format should be major.minor\n"
+msgstr ""
+
+#: src/sensor/gnunet-service-sensor.c:385
 #, fuzzy
-msgid "Failed to send a message to the statistics service\n"
-msgstr "¡Se produjo un fallo al conectar al servicio de estadísticas!\n"
+msgid "Error reading sensor category\n"
+msgstr "Error leyendo «%s»: %s"
 
-#: src/scalarproduct/scalarproduct_api.c:387
-#: src/scalarproduct/scalarproduct_api.c:485
+#: src/sensor/gnunet-service-sensor.c:413
 #, fuzzy
-msgid "Failed to send a message to the scalarproduct service\n"
-msgstr "Se produjo un fallo al enviar una petición al servicio de transporte\n"
+msgid "Error reading sensor run interval\n"
+msgstr "Error creando el túnel\n"
 
-#: src/secretsharing/gnunet-secretsharing-profiler.c:538
-msgid "dkg start delay"
+#: src/sensor/gnunet-service-sensor.c:419
+#, c-format
+msgid "Sensor run interval too low (%<PRIu64> < %d)\n"
 msgstr ""
 
-#: src/secretsharing/gnunet-secretsharing-profiler.c:541
-msgid "dkg timeout"
+#: src/sensor/gnunet-service-sensor.c:436
+#, fuzzy
+msgid "Error reading sensor source\n"
+msgstr "Error leyendo «%s»: %s"
+
+#: src/sensor/gnunet-service-sensor.c:445
+msgid "Error reading sensor gnunet-statistics source information\n"
 msgstr ""
 
-#: src/secretsharing/gnunet-secretsharing-profiler.c:544
-msgid "threshold"
+#: src/sensor/gnunet-service-sensor.c:455
+#, fuzzy
+msgid "Error reading sensor process name\n"
+msgstr "Error leyendo de «%s»: %s\n"
+
+#: src/sensor/gnunet-service-sensor.c:464
+msgid "Error reading sensor expected datatype\n"
 msgstr ""
 
-#: src/secretsharing/gnunet-secretsharing-profiler.c:547
-msgid "also profile decryption"
+#: src/sensor/gnunet-service-sensor.c:470
+msgid "Invalid expected datatype, gnunet-statistics returns uint64 values\n"
 msgstr ""
 
+#: src/sensor/gnunet-service-sensor.c:498
+#, fuzzy, c-format
+msgid "Failed to access sensor file: %s\n"
+msgstr "Se produjo un fallo al acceder «%s»: %s\n"
+
+#: src/sensor/gnunet-service-sensor.c:506
+#, fuzzy, c-format
+msgid "Failed to load sensor definition: %s\n"
+msgstr "Se produjo un fallo al abrir «%s» para escritura: %s\n"
+
+#: src/sensor/gnunet-service-sensor.c:559
+#, c-format
+msgid "Sensor `%s' already exists with same or newer version\n"
+msgstr ""
+
+#: src/sensor/gnunet-service-sensor.c:566
+#, c-format
+msgid "Upgrading sensor `%s' to a newer version\n"
+msgstr ""
+
+#: src/sensor/gnunet-service-sensor.c:571
+#, c-format
+msgid ""
+"Error adding new sensor `%s' to global hashmap, this should not happen\n"
+msgstr ""
+
+#: src/sensor/gnunet-service-sensor.c:595
+#, fuzzy, c-format
+msgid "Error loading sensor from file: %s\n"
+msgstr ""
+"\n"
+"Error subiendo el fichero %s\n"
+
+#: src/sensor/gnunet-service-sensor.c:599
+#, c-format
+msgid "Sensor `%s' added to global hashmap\n"
+msgstr ""
+
+#: src/sensor/gnunet-service-sensor.c:635
+#, fuzzy, c-format
+msgid "Reloading sensor definitions from directory `%s'\n"
+msgstr "Descarga los ficheros de GNUnet"
+
+#: src/sensor/gnunet-service-sensor.c:640
+#, fuzzy, c-format
+msgid "Loaded %d sensors from directory `%s'\n"
+msgstr "Descarga los ficheros de GNUnet"
+
+#: src/sensor/sensor_api.c:345
+#, fuzzy
+msgid "Timeout transmitting iteration request to `SENSOR' service."
+msgstr ""
+"Petición de transmisión de iteración de expiración al servicio de "
+"información de pares (PEERINFO)."
+
+# Miguel: "Failed to receive" también aquí está traducido como
+# "no se obtuvo respuesta" por claridad.
+#: src/sensor/sensor_api.c:388
+#, fuzzy
+msgid "Failed to receive response from `SENSOR' service."
+msgstr ""
+"No se obtuvo respuesta del servicio de información de pares (PEERINFO)."
+
+#: src/sensor/sensor_api.c:431
+#, fuzzy
+msgid "Received invalid message from `SENSOR' service."
+msgstr ""
+"Recibido mensaje no válido del servicio de información de pares (PEERINFO)."
+
 #: src/set/gnunet-service-set.c:1431
 #, fuzzy
-msgid "Could not connect to mesh service\n"
+msgid "Could not connect to cadet service\n"
 msgstr "¡No se pudo conectar al servicio %s!\n"
 
 # Miguel: Conjunto resta.
@@ -6489,7 +6737,7 @@
 "content/topology-file-format\n"
 msgstr ""
 
-#: src/testbed/gnunet-daemon-latency-logger.c:325
+#: src/testbed/gnunet-daemon-latency-logger.c:331
 msgid "Daemon to log latency values of connections to neighbours"
 msgstr ""
 
@@ -6875,8 +7123,9 @@
 msgid "# HELLO messages gossipped"
 msgstr "# Mensajes «HELLO» rumoreados"
 
-#: src/topology/gnunet-daemon-topology.c:1290
-msgid "GNUnet topology control (maintaining P2P mesh and F2F constraints)"
+#: src/topology/gnunet-daemon-topology.c:1296
+#, fuzzy
+msgid "GNUnet topology control (maintaining P2P cadet and F2F constraints)"
 msgstr ""
 "Control de topología de GNUnet (manteniendo las restricciones del mesh de "
 "P2P y de F2F)"
@@ -6909,19 +7158,19 @@
 msgid "# bytes payload received"
 msgstr "# bytes de «payload» recibidos"
 
-#: src/transport/gnunet-service-transport.c:686
+#: src/transport/gnunet-service-transport.c:708
 #, fuzzy, c-format
 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:733
+#: src/transport/gnunet-service-transport.c:755
 #, 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:1084
+#: src/transport/gnunet-service-transport.c:1106
 #, fuzzy
 msgid "Transport service is lacking key configuration settings. Exiting.\n"
 msgstr ""
@@ -6976,7 +7225,7 @@
 msgid "Received a request disconnect message for peer `%s'\n"
 msgstr "Recibido último mensaje para %s\n"
 
-#: src/transport/gnunet-service-transport_hello.c:181
+#: src/transport/gnunet-service-transport_hello.c:182
 msgid "# refreshed my HELLO"
 msgstr "# refrescos de mi «HELLO»"
 
@@ -6985,7 +7234,7 @@
 msgstr "# Mensajes «DISCONNECT» enviados"
 
 #: src/transport/gnunet-service-transport_neighbours.c:1220
-#: src/transport/gnunet-service-transport_neighbours.c:1629
+#: src/transport/gnunet-service-transport_neighbours.c:1635
 msgid "# bytes in message queue for other peers"
 msgstr "# bytes en la cola de mensajes para otros pares"
 
@@ -6997,177 +7246,177 @@
 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:1287
+#: src/transport/gnunet-service-transport_neighbours.c:1288
 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:1343
+#: src/transport/gnunet-service-transport_neighbours.c:1349
 msgid "# keepalives sent"
 msgstr "# «keepalives» enviados"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1376
+#: src/transport/gnunet-service-transport_neighbours.c:1382
 msgid "# KEEPALIVE messages discarded (peer unknown)"
 msgstr "# Mensajes «KEEPALIVE» descartados (par desconocido)"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1384
+#: src/transport/gnunet-service-transport_neighbours.c:1390
 msgid "# KEEPALIVE messages discarded (no session)"
 msgstr "# mensajes «KEEPALIVE» descartados (no hay sesión)"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1431
+#: src/transport/gnunet-service-transport_neighbours.c:1437
 msgid "# KEEPALIVE_RESPONSE messages discarded (not connected)"
 msgstr "# mensajes «KEEPALIVE_RESPONSE» descartados (no conectado)"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1440
+#: src/transport/gnunet-service-transport_neighbours.c:1446
 msgid "# KEEPALIVE_RESPONSE messages discarded (not expected)"
 msgstr "# Mensajes «KEEPALIVE_RESPONSE» descartados (no esperado)"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1448
+#: src/transport/gnunet-service-transport_neighbours.c:1454
 #, fuzzy
 msgid "# KEEPALIVE_RESPONSE messages discarded (address changed)"
 msgstr "# mensajes «KEEPALIVE_RESPONSE» descartados (no conectado)"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1456
+#: src/transport/gnunet-service-transport_neighbours.c:1462
 #, fuzzy
 msgid "# KEEPALIVE_RESPONSE messages discarded (wrong nonce)"
 msgstr "# mensajes «KEEPALIVE_RESPONSE» descartados (no conectado)"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1534
+#: src/transport/gnunet-service-transport_neighbours.c:1540
 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:1568
+#: src/transport/gnunet-service-transport_neighbours.c:1574
 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:1584
+#: src/transport/gnunet-service-transport_neighbours.c:1590
 msgid "# ms throttling suggested"
 msgstr "# ms de impulso sugeridos"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1678
+#: src/transport/gnunet-service-transport_neighbours.c:1685
 #, fuzzy, c-format
 msgid ""
 "Failed to send CONNECT message to peer `%s' using address `%s' session %p\n"
 msgstr "¡Se produjo un fallo al conectar al servicio de estadísticas!\n"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1705
+#: src/transport/gnunet-service-transport_neighbours.c:1712
 msgid "# Failed attempts to switch addresses (failed to send CONNECT CONT)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1751
+#: src/transport/gnunet-service-transport_neighbours.c:1757
 #, fuzzy
 msgid "# SESSION_CONNECT messages sent"
 msgstr "# Mensajes «DISCONNECT» enviados"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1767
+#: src/transport/gnunet-service-transport_neighbours.c:1773
 #, 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:1794
+#: src/transport/gnunet-service-transport_neighbours.c:1800
 msgid "# Failed attempts to switch addresses (failed to send CONNECT)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1844
+#: src/transport/gnunet-service-transport_neighbours.c:1849
 #, c-format
 msgid ""
 "Failed to send CONNECT_ACK message to peer `%s' using address `%s' session "
 "%p\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1899
+#: src/transport/gnunet-service-transport_neighbours.c:1904
 #, fuzzy
 msgid "# CONNECT_ACK messages sent"
 msgstr "# Mensajes «DISCONNECT» enviados"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1914
+#: src/transport/gnunet-service-transport_neighbours.c:1919
 #, fuzzy, c-format
 msgid "Failed to transmit CONNECT_ACK 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:2192
+#: src/transport/gnunet-service-transport_neighbours.c:2196
 #, fuzzy, c-format
 msgid "Blacklisting disapproved to connect to peer `%s'\n"
 msgstr "Se produjo un fallo al conectar con «%s»\n"
 
-#: src/transport/gnunet-service-transport_neighbours.c:2312
+#: src/transport/gnunet-service-transport_neighbours.c:2316
 #, fuzzy
 msgid "# CONNECT messages received"
 msgstr "# mensajes «REQUEST CONNECT» recibidos"
 
-#: src/transport/gnunet-service-transport_neighbours.c:2317
+#: src/transport/gnunet-service-transport_neighbours.c:2321
 #, c-format
 msgid "CONNECT request from peer `%s' ignored due impending shutdown\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:2590
+#: src/transport/gnunet-service-transport_neighbours.c:2594
 msgid "# Attempts to switch addresses"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3012
+#: src/transport/gnunet-service-transport_neighbours.c:3016
 #, fuzzy
 msgid "# Failed attempts to switch addresses (no response)"
 msgstr "Se produjo un fallo al procesar la petición DNS.  Omitiendo.\n"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3107
+#: src/transport/gnunet-service-transport_neighbours.c:3111
 #, fuzzy
 msgid "# CONNECT_ACK messages received"
 msgstr "# mensajes «REQUEST CONNECT» recibidos"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3115
+#: src/transport/gnunet-service-transport_neighbours.c:3119
 msgid "# unexpected CONNECT_ACK messages (no peer)"
 msgstr "# Mensajes «CONNECT_ACK» inesperados (sin par)"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3129
-#: src/transport/gnunet-service-transport_neighbours.c:3164
+#: src/transport/gnunet-service-transport_neighbours.c:3133
+#: src/transport/gnunet-service-transport_neighbours.c:3168
 msgid "# unexpected CONNECT_ACK messages (not ready)"
 msgstr "# Mensajes «CONNECT_ACK» inesperados (no estaba preparado)"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3176
+#: src/transport/gnunet-service-transport_neighbours.c:3180
 msgid "# unexpected CONNECT_ACK messages (waiting on ATS)"
 msgstr "# Mensajes «CONNECT_ACK» inesperados (esperando en el ATS)"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3200
+#: src/transport/gnunet-service-transport_neighbours.c:3203
 msgid "# Successful attempts to switch addresses"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3208
+#: src/transport/gnunet-service-transport_neighbours.c:3211
 msgid "# unexpected CONNECT_ACK messages (disconnecting)"
 msgstr "# Mensajes «CONNECT_ACK» inesperados (desconectando)"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3396
+#: src/transport/gnunet-service-transport_neighbours.c:3399
 #, fuzzy
 msgid "# SESSION_ACK messages received"
 msgstr "# mensajes SET QUOTA recibidos"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3424
+#: src/transport/gnunet-service-transport_neighbours.c:3435
 #, fuzzy
 msgid "# unexpected SESSION_ACK messages"
 msgstr "# Mensajes «SESSION ACK» inesperados"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3490
+#: src/transport/gnunet-service-transport_neighbours.c:3509
 msgid "# SET QUOTA messages ignored (no such peer)"
 msgstr "# Mensajes «SET QUOTA» ignorados (no existe tal par)"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3505
+#: src/transport/gnunet-service-transport_neighbours.c:3524
 msgid "# disconnects due to quota of 0"
 msgstr "# desconexiones debido a una cuota de 0"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3545
+#: src/transport/gnunet-service-transport_neighbours.c:3564
 #, fuzzy
 msgid "# disconnect messages ignored (malformed)"
 msgstr "# mensajes de desconexión ignorados (formato antiguo)"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3551
+#: src/transport/gnunet-service-transport_neighbours.c:3570
 #, fuzzy
 msgid "# DISCONNECT messages received"
 msgstr "# mensajes «REQUEST CONNECT» recibidos"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3560
+#: src/transport/gnunet-service-transport_neighbours.c:3579
 msgid "# disconnect messages ignored (timestamp)"
 msgstr "# mensajes de desconexión ignorados (marca temporal)"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3687
+#: src/transport/gnunet-service-transport_neighbours.c:3706
 msgid "# disconnected from peer upon explicit request"
 msgstr "# desconexiones del par debido a una petición explícita"
 
@@ -7285,34 +7534,59 @@
 msgid "Adding `%s' without addresses for peer `%s'\n"
 msgstr "Añadiendo «%s» sin direcciones para el par «%s»\n"
 
-#: src/transport/gnunet-transport.c:367
+#: src/transport/gnunet-transport.c:388
 #, c-format
 msgid "Transmitted %llu bytes/s (%llu bytes in %s)\n"
 msgstr "Transmitidos %llu bytes/s (%llu bytes en %s)\n"
 
-#: src/transport/gnunet-transport.c:375
+#: src/transport/gnunet-transport.c:396
 #, c-format
 msgid "Received %llu bytes/s (%llu bytes in %s)\n"
 msgstr "Recibidos %llu bytes/s (%llu bytes en %s)\n"
 
-#: src/transport/gnunet-transport.c:415
+#: src/transport/gnunet-transport.c:436
 #, c-format
 msgid "Failed to connect to `%s'\n"
 msgstr "Se produjo un fallo al conectar con «%s»\n"
 
-#: src/transport/gnunet-transport.c:428
+#: src/transport/gnunet-transport.c:449
 #, c-format
 msgid "Failed to resolve address for peer `%s'\n"
 msgstr "Se produjo un fallo al resolver la dirección para el par «%s»\n"
 
 # Miguel: La traducción no es literal, pero me parece más correcta
 # en castellano.
-#: src/transport/gnunet-transport.c:438
+#: src/transport/gnunet-transport.c:459
 msgid "Failed to list connections, timeout occured\n"
 msgstr "No se pudieron listar las conexiones, expiró el plazo\n"
 
-#: src/transport/gnunet-transport.c:559
+#: src/transport/gnunet-transport.c:483
 #, fuzzy, c-format
+msgid "Configuration for plugin `%s' did not work!\n"
+msgstr "El fichero de configuración debe especificar «%s» en la sección «%s»\n"
+
+#: src/transport/gnunet-transport.c:487
+#, fuzzy, c-format
+msgid "Configuration for plugin `%s' did work!\n"
+msgstr "El fichero de configuración debe especificar «%s» en la sección «%s»\n"
+
+#: src/transport/gnunet-transport.c:491
+#, fuzzy, c-format
+msgid "Internal NAT error while running test for plugin `%s'\n"
+msgstr "Error interno escaneando «%s».\n"
+
+#: src/transport/gnunet-transport.c:495
+#, fuzzy, c-format
+msgid "Failed to start NAT test for plugin `%s'\n"
+msgstr "Se produjo un fallo al iniciar el servidor HTTP\n"
+
+#: src/transport/gnunet-transport.c:499
+#, c-format
+msgid "Timeout while waiting for result of NAT test for plugin `%s'\n"
+msgstr ""
+
+#: src/transport/gnunet-transport.c:614
+#, fuzzy, c-format
 msgid ""
 "Peer `%s' %s %s\n"
 "\t%s%s\n"
@@ -7320,33 +7594,44 @@
 "\t%s%s\n"
 msgstr "Par «%s»: %s %s\n"
 
-#: src/transport/gnunet-transport.c:586
+#: src/transport/gnunet-transport.c:643
 #, fuzzy, c-format
 msgid "Peer `%s' %s `%s' \n"
 msgstr "Par «%s»: %s %s\n"
 
-#: src/transport/gnunet-transport.c:712
+#: src/transport/gnunet-transport.c:717 src/transport/gnunet-transport.c:1240
+#, fuzzy
+msgid "Monitor disconnected from transport service. Reconnecting.\n"
+msgstr ""
+"El cliente se desconectó del servicio principal, tratando de reconectar.\n"
+
+#: src/transport/gnunet-transport.c:784
 msgid "No transport plugins configured, peer will never communicate\n"
 msgstr ""
 "No hay módulos de transporte configurados, el par nunca se comunicará\n"
 
-#: src/transport/gnunet-transport.c:726
+#: src/transport/gnunet-transport.c:798
 #, c-format
 msgid "No port configured for plugin `%s', cannot test it\n"
 msgstr ""
 "Ningún puerto fue configurado para el módulo «%s», no se puede probar\n"
 
-#: src/transport/gnunet-transport.c:789
+#: src/transport/gnunet-transport.c:823
+#, fuzzy
+msgid "Failed to start resolver!\n"
+msgstr "Se produjo un fallo al arrancar %s\n"
+
+#: src/transport/gnunet-transport.c:866
 #, c-format
 msgid "Transmitting %u bytes to %s\n"
 msgstr "Transmitiendo %u bytes a %s\n"
 
-#: src/transport/gnunet-transport.c:810
+#: src/transport/gnunet-transport.c:888
 #, c-format
 msgid "Successfully connected to `%s'\n"
 msgstr "Conectado satisfactoriamente a «%s»\n"
 
-#: src/transport/gnunet-transport.c:834
+#: src/transport/gnunet-transport.c:912
 #, c-format
 msgid ""
 "Successfully connected to `%s', starting to send benchmark data in %u Kb "
@@ -7355,38 +7640,51 @@
 "Conectado satisfactoriamente a «%s», empezando a mandar datos de prueba en "
 "bloques de %u Kb\n"
 
-#: src/transport/gnunet-transport.c:865
+#: src/transport/gnunet-transport.c:943
 #, fuzzy, c-format
 msgid "Successfully disconnected from `%s'\n"
 msgstr "Conectado satisfactoriamente a «%s»\n"
 
-#: src/transport/gnunet-transport.c:888
+#: src/transport/gnunet-transport.c:966
 #, c-format
 msgid "Disconnected from peer `%s' while benchmarking\n"
 msgstr "Desconectado del par «%s» mientras probaba\n"
 
-#: src/transport/gnunet-transport.c:950
+#: src/transport/gnunet-transport.c:988 src/transport/gnunet-transport.c:1009
 #, c-format
+msgid "%24s: %-17s %4s   (%u connections in total)\n"
+msgstr "%24s: %-17s %4s   (%u conexiones en total)\n"
+
+#: src/transport/gnunet-transport.c:989
+msgid "Connected to"
+msgstr "Conectado a"
+
+#: src/transport/gnunet-transport.c:1010
+msgid "Disconnected from"
+msgstr "Desconectado de"
+
+#: src/transport/gnunet-transport.c:1031
+#, c-format
 msgid "Received %u bytes from %s\n"
 msgstr "Recibidos %u bytes de %s\n"
 
-#: src/transport/gnunet-transport.c:975
+#: src/transport/gnunet-transport.c:1061
 #, c-format
 msgid "Peer `%s': %s %s in state `%s' until %s\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:986
+#: src/transport/gnunet-transport.c:1072
 #, c-format
 msgid "Peer `%s': %s %s\n"
 msgstr "Par «%s»: %s %s\n"
 
-#: src/transport/gnunet-transport.c:1197 src/transport/gnunet-transport.c:1222
+#: src/transport/gnunet-transport.c:1300 src/transport/gnunet-transport.c:1325
 msgid "Failed to send connect request to transport service\n"
 msgstr ""
 "Se produjo un fallo al enviar una petición de conexión al servicio de "
 "transporte\n"
 
-#: src/transport/gnunet-transport.c:1266
+#: src/transport/gnunet-transport.c:1369
 #, c-format
 msgid ""
 "Multiple operations given. Please choose only one operation: %s, %s, %s, %s, "
@@ -7395,7 +7693,7 @@
 "Múltiples operaciones introducidas. Por favor, seleccione únicamente una "
 "operación: %s, %s, %s, %s, %s, %s\n"
 
-#: src/transport/gnunet-transport.c:1274
+#: src/transport/gnunet-transport.c:1377
 #, c-format
 msgid ""
 "No operation given. Please choose one operation: %s, %s, %s, %s, %s, %s\n"
@@ -7403,79 +7701,79 @@
 "Ninguna operación introducida. Por favor, seleccione alguna operación: %s, "
 "%s, %s, %s, %s, %s\n"
 
-#: src/transport/gnunet-transport.c:1293 src/transport/gnunet-transport.c:1323
-#: src/transport/gnunet-transport.c:1353 src/transport/gnunet-transport.c:1376
-#: src/transport/gnunet-transport.c:1419
+#: src/transport/gnunet-transport.c:1396 src/transport/gnunet-transport.c:1426
+#: src/transport/gnunet-transport.c:1456 src/transport/gnunet-transport.c:1479
+#: src/transport/gnunet-transport.c:1523
 msgid "Failed to connect to transport service\n"
 msgstr "Se produjo un fallo al conectar con el servicio de transporte\n"
 
-#: src/transport/gnunet-transport.c:1302 src/transport/gnunet-transport.c:1332
-#: src/transport/gnunet-transport.c:1362
+#: src/transport/gnunet-transport.c:1405 src/transport/gnunet-transport.c:1435
+#: src/transport/gnunet-transport.c:1465
 msgid "Failed to send request to transport service\n"
 msgstr "Se produjo un fallo al enviar una petición al servicio de transporte\n"
 
-#: src/transport/gnunet-transport.c:1381
+#: src/transport/gnunet-transport.c:1484
 msgid "Starting to receive benchmark data\n"
 msgstr "Empezando a recibir datos de prueba\n"
 
-#: src/transport/gnunet-transport.c:1465
+#: src/transport/gnunet-transport.c:1569
 #, fuzzy
 msgid "print information for all peers (instead of only connected peers )"
 msgstr "Imprime información sobre los pares conectados."
 
-#: src/transport/gnunet-transport.c:1468
+#: src/transport/gnunet-transport.c:1572
 msgid "measure how fast we are receiving data from all peers (until CTRL-C)"
 msgstr "medir cómo de rápido recibimos datos de todos los pares (hasta CTRL-C)"
 
-#: src/transport/gnunet-transport.c:1471
+#: src/transport/gnunet-transport.c:1575
 msgid "connect to a peer"
 msgstr "conectar a un par"
 
-#: src/transport/gnunet-transport.c:1474
+#: src/transport/gnunet-transport.c:1578
 #, fuzzy
 msgid "disconnect to a peer"
 msgstr "conectar a un par"
 
-#: src/transport/gnunet-transport.c:1477
+#: src/transport/gnunet-transport.c:1581
 #, fuzzy
 msgid "print information for all pending validations "
 msgstr "Imprime información de los pares de GNUnet."
 
 # Miguel: ¿Quizá continuamente fuese mejor?
-#: src/transport/gnunet-transport.c:1480
+#: src/transport/gnunet-transport.c:1584
 #, fuzzy
 msgid "print information for all pending validations continously"
 msgstr ""
 "provee información sobre todas las conexiones actuales (de forma continua)"
 
-#: src/transport/gnunet-transport.c:1483
+#: src/transport/gnunet-transport.c:1587
 msgid "provide information about all current connections (once)"
 msgstr "provee información sobre todas las conexiones actuales (una vez)"
 
-#: src/transport/gnunet-transport.c:1489
+#: src/transport/gnunet-transport.c:1593
 msgid ""
 "provide information about all connects and disconnect events (continuously)"
 msgstr ""
 "provee información sobre todas los eventos de conexión y desconexión "
 "(continuamente)"
 
-#: src/transport/gnunet-transport.c:1491
+#: src/transport/gnunet-transport.c:1595
 msgid "do not resolve hostnames"
 msgstr "no resolver nombres de máquinas"
 
-#: src/transport/gnunet-transport.c:1493
+#: src/transport/gnunet-transport.c:1597
 msgid "peer identity"
 msgstr "identidad del par"
 
-#: src/transport/gnunet-transport.c:1495
+#: src/transport/gnunet-transport.c:1599
 msgid "send data for benchmarking to the other peer (until CTRL-C)"
 msgstr "enviar data para prueba a otro par (hasta CTRL-C)"
 
-#: src/transport/gnunet-transport.c:1498
+#: src/transport/gnunet-transport.c:1602
 msgid "test transport configuration (involves external server)"
 msgstr "probar configuración de transporte (requiere un servidor externo)"
 
-#: src/transport/gnunet-transport.c:1507
+#: src/transport/gnunet-transport.c:1611
 msgid "Direct access to transport service."
 msgstr "Acceso directo al servicio de transporte."
 
@@ -7548,11 +7846,6 @@
 msgid "# HELLO beacons sent via Bluetooth"
 msgstr "# «beacons HELLO» enviados vía WLAN"
 
-#: src/transport/plugin_transport_bluetooth.c:1723
-#, 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:1923
 #, fuzzy, c-format
 msgid "Helper binary `%s' not SUID, cannot run bluetooth transport\n"
@@ -7560,32 +7853,32 @@
 "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:1622
+#: src/transport/plugin_transport_http_client.c:1685
 #, 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:1697
-#: src/transport/plugin_transport_http_server.c:3007
+#: src/transport/plugin_transport_http_client.c:1760
+#: src/transport/plugin_transport_http_server.c:3031
 #, c-format
 msgid "Shutting down plugin `%s'\n"
 msgstr "Finalizando el módulo «%s»\n"
 
-#: src/transport/plugin_transport_http_client.c:1722
-#: src/transport/plugin_transport_http_server.c:3063
+#: src/transport/plugin_transport_http_client.c:1785
+#: src/transport/plugin_transport_http_server.c:3088
 #, 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:1750
-#: src/transport/plugin_transport_http_server.c:2907
+#: src/transport/plugin_transport_http_client.c:1819
+#: src/transport/plugin_transport_http_server.c:2931
 #, 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:1402
+#: src/transport/plugin_transport_http_server.c:1423
 #, c-format
 msgid ""
 "Access from connection %p (%u of %u) for `%s' `%s' url `%s' with upload data "
@@ -7594,12 +7887,12 @@
 "Acceso desde la conexión %p (%u de %u) para «%s» «%s» URL «%s» con tamaño de "
 "los datos de subida %u\n"
 
-#: src/transport/plugin_transport_http_server.c:1663
+#: src/transport/plugin_transport_http_server.c:1687
 #, 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:1671
+#: src/transport/plugin_transport_http_server.c:1695
 #, c-format
 msgid ""
 "Server reached maximum number connections (%u), rejecting new connection\n"
@@ -7607,7 +7900,7 @@
 "El servidor ha alcanzado el número máximo de conexiones (%u), rechazando "
 "nueva conexión\n"
 
-#: src/transport/plugin_transport_http_server.c:1958
+#: src/transport/plugin_transport_http_server.c:1982
 msgid ""
 "Could not create a new TLS certificate, program `gnunet-transport-"
 "certificate-creation' could not be started!\n"
@@ -7615,93 +7908,98 @@
 "¡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:1982
+#: src/transport/plugin_transport_http_server.c:2006
 #, 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:2405
+#: src/transport/plugin_transport_http_server.c:2429
 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:2437 src/util/service.c:698
+#: src/transport/plugin_transport_http_server.c:2461 src/util/service.c:700
 #, 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:2454 src/util/service.c:715
+#: src/transport/plugin_transport_http_server.c:2478 src/util/service.c:719
 #, 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:2565
+#: src/transport/plugin_transport_http_server.c:2589
 #, 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:2637
+#: src/transport/plugin_transport_http_server.c:2661
 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:2730
+#: src/transport/plugin_transport_http_server.c:2754
 #, c-format
 msgid "IPv4 support is %s\n"
 msgstr "El soporte IPv4 es %s\n"
 
-#: src/transport/plugin_transport_http_server.c:2744
+#: src/transport/plugin_transport_http_server.c:2768
 #, c-format
 msgid "IPv6 support is %s\n"
 msgstr "El soporte IPv6 es %s\n"
 
-#: src/transport/plugin_transport_http_server.c:2751
+#: src/transport/plugin_transport_http_server.c:2775
 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:2762
+#: src/transport/plugin_transport_http_server.c:2786
 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:2769
+#: src/transport/plugin_transport_http_server.c:2793
 #, c-format
 msgid "Using port %u\n"
 msgstr "Usando puerto %u\n"
 
-#: src/transport/plugin_transport_http_server.c:2784
+#: src/transport/plugin_transport_http_server.c:2808
 #, 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:2794
+#: src/transport/plugin_transport_http_server.c:2818
 #, 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:2815
+#: src/transport/plugin_transport_http_server.c:2839
 #, 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:2825
+#: src/transport/plugin_transport_http_server.c:2849
 #, 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:2877
+#: src/transport/plugin_transport_http_server.c:2901
 #, c-format
 msgid "Using external hostname `%s'\n"
 msgstr "Usando nombre de máquina externo «%s»\n"
 
-#: src/transport/plugin_transport_http_server.c:2893
+#: src/transport/plugin_transport_http_server.c:2917
 #, c-format
 msgid "Notifying transport only about hostname `%s'\n"
 msgstr "Notificando al transporte sólo el nombre de máquina «%s»\n"
 
+#: src/transport/plugin_transport_http_server.c:3177
+#, fuzzy
+msgid "Unable to compile URL regex\n"
+msgstr "¡Imposible obtener «HELLO» del par!\n"
+
 #: src/transport/plugin_transport_smtp.c:223
 #, c-format
 msgid "Received malformed message via %s. Ignored.\n"
@@ -7747,65 +8045,65 @@
 msgid "# bytes dropped by SMTP (outgoing)"
 msgstr "# bytes omitidos por SMTP (salientes)"
 
-#: src/transport/plugin_transport_tcp.c:555
+#: src/transport/plugin_transport_tcp.c:565
 #, c-format
 msgid "Unexpected address length: %u bytes\n"
 msgstr "Longitud de dirección inesperada: %u bytes\n"
 
-#: src/transport/plugin_transport_tcp.c:762
-#: src/transport/plugin_transport_tcp.c:928
-#: src/transport/plugin_transport_tcp.c:2005
-#: src/transport/plugin_transport_tcp.c:2558
+#: src/transport/plugin_transport_tcp.c:787
+#: src/transport/plugin_transport_tcp.c:962
+#: src/transport/plugin_transport_tcp.c:2047
+#: src/transport/plugin_transport_tcp.c:2620
 msgid "# TCP sessions active"
 msgstr "# Sesiones TCP activas"
 
-#: src/transport/plugin_transport_tcp.c:795
-#: src/transport/plugin_transport_tcp.c:921
-#: src/transport/plugin_transport_tcp.c:1009
-#: src/transport/plugin_transport_tcp.c:1056
-#: src/transport/plugin_transport_tcp.c:1219
-#: src/transport/plugin_transport_tcp.c:1237
+#: src/transport/plugin_transport_tcp.c:823
+#: src/transport/plugin_transport_tcp.c:955
+#: src/transport/plugin_transport_tcp.c:1045
+#: src/transport/plugin_transport_tcp.c:1093
+#: src/transport/plugin_transport_tcp.c:1259
+#: src/transport/plugin_transport_tcp.c:1277
 msgid "# bytes currently in TCP buffers"
 msgstr "# bytes actualmente en los buffer TCP"
 
-#: src/transport/plugin_transport_tcp.c:798
+#: src/transport/plugin_transport_tcp.c:826
 msgid "# bytes discarded by TCP (disconnect)"
 msgstr "# bytes descartados por TCP (desconectado)"
 
-#: src/transport/plugin_transport_tcp.c:1012
+#: src/transport/plugin_transport_tcp.c:1048
 msgid "# bytes discarded by TCP (timeout)"
 msgstr "# bytes omitidos por TCP (expirados)"
 
-#: src/transport/plugin_transport_tcp.c:1059
+#: src/transport/plugin_transport_tcp.c:1096
 msgid "# bytes transmitted via TCP"
 msgstr "# bytes recibidos vía TCP"
 
-#: src/transport/plugin_transport_tcp.c:1193
+#: src/transport/plugin_transport_tcp.c:1233
 #, 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:1462
+#: src/transport/plugin_transport_tcp.c:1504
 msgid "# requests to create session with invalid address"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:1567
+#: src/transport/plugin_transport_tcp.c:1609
 msgid "# transport-service disconnect requests for TCP"
 msgstr "# peticiones de desconexión del servicio de transporte por TCP"
 
-#: src/transport/plugin_transport_tcp.c:2055
+#: src/transport/plugin_transport_tcp.c:2097
 msgid "# TCP WELCOME messages received"
 msgstr "# Mensajes «WELCOME» TCP recibidos"
 
-#: src/transport/plugin_transport_tcp.c:2215
+#: src/transport/plugin_transport_tcp.c:2257
 msgid "# bytes received via TCP"
 msgstr "# bytes recibidos vía TCP"
 
-#: src/transport/plugin_transport_tcp.c:2279
+#: src/transport/plugin_transport_tcp.c:2321
 msgid "# network-level TCP disconnect events"
 msgstr "# eventos de desconexión TCP a nivel de red"
 
-#: src/transport/plugin_transport_tcp.c:2437 src/util/service.c:582
+#: src/transport/plugin_transport_tcp.c:2490 src/util/service.c:582
 #: src/util/service.c:588
 #, c-format
 msgid "Require valid port number for service `%s' in configuration!\n"
@@ -7813,20 +8111,20 @@
 "¡Se requiere un número de puerto válido para el servicio «%s» en la "
 "configuración!\n"
 
-#: src/transport/plugin_transport_tcp.c:2451
+#: src/transport/plugin_transport_tcp.c:2504
 msgid "Failed to start service.\n"
 msgstr "Se produjo un fallo al iniciar el servicio.\n"
 
-#: src/transport/plugin_transport_tcp.c:2547
+#: src/transport/plugin_transport_tcp.c:2607
 #, 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:2551
+#: src/transport/plugin_transport_tcp.c:2611
 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:2554
+#: src/transport/plugin_transport_tcp.c:2615
 #, 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"
@@ -7901,12 +8199,12 @@
 msgid "Cannot create path to `%s'\n"
 msgstr "Se produjo un fallo al crear la página para «%s»\n"
 
-#: src/transport/plugin_transport_unix.c:1652
+#: src/transport/plugin_transport_unix.c:1645
 #, fuzzy
 msgid "No UNIXPATH given in configuration!\n"
 msgstr "¡%s mal formada «%s» dada en la configuración!\n"
 
-#: src/transport/plugin_transport_unix.c:1688
+#: src/transport/plugin_transport_unix.c:1681
 #, fuzzy
 msgid "Failed to open UNIX listen socket\n"
 msgstr "Se produjo un fallo al abrir los «sockets» UNIX\n"
@@ -7967,10 +8265,6 @@
 msgid "# HELLO beacons sent via WLAN"
 msgstr "# «beacons HELLO» enviados vía WLAN"
 
-#: src/transport/plugin_transport_wlan.c:1729
-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:1929
 #, c-format
 msgid "Helper binary `%s' not SUID, cannot run WLAN transport\n"
@@ -8124,7 +8418,7 @@
 msgid "Syntax error while deserializing in line %u\n"
 msgstr "Error de sintaxis en la línea %u mientras se deserializaba\n"
 
-#: src/util/configuration.c:996
+#: src/util/configuration.c:1023
 #, c-format
 msgid ""
 "Configuration value '%s' for '%s' in section '%s' is not in set of legal "
@@ -8133,17 +8427,17 @@
 "El valor de configuración «%s» para «%s» de la sección «%s» no está dentro "
 "de las opciones legales\n"
 
-#: src/util/configuration.c:1066
+#: src/util/configuration.c:1093
 #, c-format
 msgid "Recursive expansion suspected, aborting $-expansion for term `%s'\n"
 msgstr ""
 
-#: src/util/configuration.c:1098
+#: src/util/configuration.c:1125
 #, fuzzy, c-format
 msgid "Missing closing `%s' in option `%s'\n"
 msgstr "Falta la opción «%s» para la operación «%s»\n"
 
-#: src/util/configuration.c:1172
+#: src/util/configuration.c:1199
 #, c-format
 msgid ""
 "Failed to expand `%s' in `%s' as it is neither found in [PATHS] nor defined "
@@ -8252,7 +8546,7 @@
 msgid "Expected `%s' to be a directory!\n"
 msgstr "¡Se esperaba que «%s» fuera un directorio!\n"
 
-#: src/util/disk.c:1546 src/util/service.c:1318
+#: src/util/disk.c:1546 src/util/service.c:1323
 #, c-format
 msgid "Cannot obtain information about user `%s': %s\n"
 msgstr "No se pudo obtener información acerca del usuario «%s»: %s\n"
@@ -8583,17 +8877,17 @@
 msgid "Could not determine plugin installation path.\n"
 msgstr "No se pudo determinar la ruta de instalación de los módulos.\n"
 
-#: src/util/program.c:246 src/util/service.c:1452
+#: src/util/program.c:246 src/util/service.c:1457
 #, 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:258 src/util/service.c:1467
+#: src/util/program.c:258 src/util/service.c:1472
 #, 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:263 src/util/service.c:1462
+#: src/util/program.c:263 src/util/service.c:1467
 #, fuzzy
 msgid "Malformed configuration, exit ...\n"
 msgstr "Se produjo un fallo al borrar el fichero de configuración %s\n"
@@ -8704,57 +8998,57 @@
 "No hay ni puerto (PORT) ni ruta unix (UNIXPATH) para el servicio «%s», pero "
 "uno es necesario\n"
 
-#: src/util/service.c:903
+#: src/util/service.c:908
 msgid "Could not access a pre-bound socket, will try to bind myself\n"
 msgstr ""
 "No se pudo acceder a un «socket» pre-ascociado, lo intentaré asociar yo "
 "mismo\n"
 
-#: src/util/service.c:952 src/util/service.c:970
+#: src/util/service.c:957 src/util/service.c:975
 #, c-format
 msgid "Specified value for `%s' of service `%s' is invalid\n"
 msgstr "El valor especificado «%s» para el servicio «%s» no es válido\n"
 
-#: src/util/service.c:995
+#: src/util/service.c:1000
 #, c-format
 msgid "Could not access pre-bound socket %u, will try to bind myself\n"
 msgstr ""
 "No se pudo acceder al «socket» pre-ascociado %u, lo intentaré asociar yo "
 "mismo\n"
 
-#: src/util/service.c:1165
+#: src/util/service.c:1170
 #, c-format
 msgid "Failed to start `%s' at `%s'\n"
 msgstr "Se produjo un fallo al inciar «%s» en «%s»\n"
 
-#: src/util/service.c:1207
+#: src/util/service.c:1212
 #, c-format
 msgid "Service `%s' runs at %s\n"
 msgstr "El servicio «%s» se ejecuta en %s\n"
 
-#: src/util/service.c:1256
+#: src/util/service.c:1261
 msgid "Service process failed to initialize\n"
 msgstr "No se pudo inicializar el proceso del servicio\n"
 
-#: src/util/service.c:1260
+#: src/util/service.c:1265
 msgid "Service process could not initialize server function\n"
 msgstr ""
 "No se pudo inicializar la función del servidor en el proceso del servicio\n"
 
-#: src/util/service.c:1264
+#: src/util/service.c:1269
 msgid "Service process failed to report status\n"
 msgstr "El proceso del servicio no devolvió un estado\n"
 
-#: src/util/service.c:1319
+#: src/util/service.c:1324
 msgid "No such user"
 msgstr "No existe tal usuario"
 
-#: src/util/service.c:1332
+#: src/util/service.c:1337
 #, c-format
 msgid "Cannot change user/group to `%s': %s\n"
 msgstr "Imposible cambiar el usuario/grupo a «%s»: %s\n"
 
-#: src/util/service.c:1402
+#: src/util/service.c:1407
 msgid "do daemonize (detach from terminal)"
 msgstr "demonizar (desasociar del terminal)"
 
@@ -8889,21 +9183,23 @@
 msgstr "# Túneles activos"
 
 #: src/vpn/gnunet-service-vpn.c:642
-msgid "# Bytes given to mesh for transmission"
+#, fuzzy
+msgid "# Bytes given to cadet for transmission"
 msgstr "# Bytes dados para transmisión a mesh"
 
 #: src/vpn/gnunet-service-vpn.c:680
-msgid "# Bytes dropped in mesh queue (overflow)"
+#, fuzzy
+msgid "# Bytes dropped in cadet queue (overflow)"
 msgstr "# Bytes omitidos en la cola mesh (desbordamiento)"
 
 #: src/vpn/gnunet-service-vpn.c:753
 #, fuzzy
-msgid "# Mesh channels created"
+msgid "# Cadet channels created"
 msgstr "# Túneles mesh creados"
 
 #: src/vpn/gnunet-service-vpn.c:784
 #, fuzzy
-msgid "Failed to setup mesh channel!\n"
+msgid "Failed to setup cadet channel!\n"
 msgstr "¡Se produjo un fallo al configurar el túnel mesh!\n"
 
 #: src/vpn/gnunet-service-vpn.c:978
@@ -8938,15 +9234,18 @@
 msgstr "Recibido paquete de protocolo %d desconocido desde TUN (omitiéndolo)\n"
 
 #: src/vpn/gnunet-service-vpn.c:1706
-msgid "# ICMP packets received from mesh"
+#, fuzzy
+msgid "# ICMP packets received from cadet"
 msgstr "# Paquetes ICMP recibidos de mesh"
 
 #: src/vpn/gnunet-service-vpn.c:2045
-msgid "# UDP packets received from mesh"
+#, fuzzy
+msgid "# UDP packets received from cadet"
 msgstr "# Paquetes UDP recibidos de mesh"
 
 #: src/vpn/gnunet-service-vpn.c:2200
-msgid "# TCP packets received from mesh"
+#, fuzzy
+msgid "# TCP packets received from cadet"
 msgstr "# Paquetes TCP recibidos de mesh"
 
 #: src/vpn/gnunet-service-vpn.c:2351
@@ -8966,30 +9265,30 @@
 msgstr ""
 "Se produjo un fallo al alojar las direcciones IP para el nuevo destino\n"
 
-#: src/vpn/gnunet-service-vpn.c:2982
+#: src/vpn/gnunet-service-vpn.c:2987
 #, fuzzy
 msgid "Must specify valid IPv6 address"
 msgstr "«%s» no es una dirección IP válida.\n"
 
-#: src/vpn/gnunet-service-vpn.c:3006
+#: src/vpn/gnunet-service-vpn.c:3011
 msgid "Must specify valid IPv6 mask"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:3014
+#: src/vpn/gnunet-service-vpn.c:3019
 msgid "IPv6 support disabled as this system does not support IPv6\n"
 msgstr ""
 "El soporte de IPv6 se deshabilita porque este sistema no soporta IPv6\n"
 
-#: src/vpn/gnunet-service-vpn.c:3027
+#: src/vpn/gnunet-service-vpn.c:3032
 #, fuzzy
 msgid "Must specify valid IPv4 address"
 msgstr "«%s» no es una dirección IP válida.\n"
 
-#: src/vpn/gnunet-service-vpn.c:3040
+#: src/vpn/gnunet-service-vpn.c:3045
 msgid "Must specify valid IPv4 mask"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:3050
+#: src/vpn/gnunet-service-vpn.c:3055
 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"
@@ -9075,7 +9374,86 @@
 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 "Peer `%s'\n"
+#~ msgstr "Par «%s»\n"
+
+#~ msgid "# Bytes received from MESH"
+#~ msgstr "# Bytes recibidos de MESH"
+
+#~ msgid "`++' not allowed in KSK URI"
+#~ msgstr "«++» no permitido en URI KSK"
+
+#~ msgid "Quotes not balanced in KSK URI"
+#~ msgstr "Comillas no cerradas en URI KSK"
+
+#~ msgid "SKS URI malformed"
+#~ msgstr "URI SKS mal formada"
+
 #, fuzzy
+#~ msgid "# Replies received from MESH"
+#~ msgstr "# Respuestas recibidas de la DHT"
+
+#~ msgid "gnunet-helper-nat-server found, testing it\n"
+#~ msgstr "«gnunet-helper-nat-server» encontrado, probándolo\n"
+
+#, fuzzy
+#~ msgid "`external-ip' command not found"
+#~ msgstr "comando «external-ip» no encontrado\n"
+
+#, fuzzy
+#~ msgid "Failed to run `upnpc` command"
+#~ msgstr "Se produjo un fallo al ejecutar «%s»\n"
+
+#, fuzzy
+#~ msgid "`upnpc' command took too long, process killed"
+#~ msgstr "comando «upnpc» no encontrado\n"
+
+#, fuzzy
+#~ msgid "`upnpc` command not found"
+#~ msgstr "comando «upnpc» no encontrado\n"
+
+#, fuzzy
+#~ msgid "Could not convert `%s' to integer.\n"
+#~ msgstr "No se pudo conectar al servicio %s.\n"
+
+#, fuzzy
+#~ msgid "Too short message received from client!\n"
+#~ msgstr "# peticiones «PUT» recibidas de clientes"
+
+#, fuzzy
+#~ msgid ""
+#~ "Invalid message received from client, session information incorrect!\n"
+#~ msgstr "Mensaje «%s» no válido recibido de la lista de máquinas en «%s»\n"
+
+#, fuzzy
+#~ msgid "# SUC responder result messages received"
+#~ msgstr "# mensajes de detención de migración recibidos"
+
+#, fuzzy
+#~ msgid "# bytes sent to scalarproduct"
+#~ msgstr "# bytes mandados al almacén de datos"
+
+#, fuzzy
+#~ msgid "Failed to connect to the scalarproduct service\n"
+#~ msgstr "Se produjo un fallo al conectar con el servicio de chat\n"
+
+#, fuzzy
+#~ msgid "Failed to send a message to the statistics service\n"
+#~ msgstr "¡Se produjo un fallo al conectar al servicio de estadísticas!\n"
+
+#, fuzzy
+#~ msgid "Failed to send a message to the scalarproduct service\n"
+#~ msgstr ""
+#~ "Se produjo un fallo al enviar una petición al servicio de transporte\n"
+
+#, fuzzy
+#~ msgid "Bluetooth address with invalid size encountered\n"
+#~ msgstr "Dirección WLAN con tamaño no válido encontrada\n"
+
+#~ msgid "WLAN address with invalid size encountered\n"
+#~ msgstr "Dirección WLAN con tamaño no válido encontrada\n"
+
+#, fuzzy
 #~ msgid "# TRAIL SETUP requests received"
 #~ msgstr "# peticiones «GET» recibidas"
 
@@ -9550,10 +9928,6 @@
 #~ msgid "Service `%s' was already not running.\n"
 #~ msgstr "El servicio «%s» no se estaba ejecutando.\n"
 
-# Miguel: ¿Conectar y conexión?
-#~ msgid "Error communicating with ARM service.\n"
-#~ msgstr "Error al comunicar con el servicio ARM.\n"
-
 #~ msgid "Timeout communicating with ARM service.\n"
 #~ msgstr "Fin del tiempo de espera en la comunicación con el servicio ARM.\n"
 
@@ -9643,9 +10017,6 @@
 #~ msgid "# Delayed connecting due to lack of public key"
 #~ msgstr "# Retrasada la conexión debido a la falta de clave pública"
 
-#~ msgid "# session keys received"
-#~ msgstr "# claves de sesión recibidas"
-
 #~ msgid "`%s' is for `%s', not for me.  Ignoring.\n"
 #~ msgstr "«%s» es para «%s», no para mí. Ignorándolo.\n"
 
@@ -9970,9 +10341,6 @@
 #~ msgid "Failed to queue a join notification\n"
 #~ msgstr "Se produjo un fallo al encolar una notificación de unión\n"
 
-#~ msgid "Failed to queue a confirmation receipt\n"
-#~ msgstr "Se produjo un fallo al encolar una confirmación de recepción\n"
-
 #~ msgid "Failed to queue a leave notification\n"
 #~ msgstr "Se produjo un fallo al encolar una notificación de abandono\n"
 
@@ -10007,10 +10375,6 @@
 #~ "¡Configurado para proveer salida DNS, pero no hay ningún servidor DNS "
 #~ "válido configurado!\n"
 
-#~ msgid "Configuration fails to specify `%s' in section `%s'\n"
-#~ msgstr ""
-#~ "El fichero de configuración debe especificar «%s» en la sección «%s»\n"
-
 #~ msgid "Could not create namespace `%s'\n"
 #~ msgstr "No se pudo crear el espacio de nombres «%s»\n"
 
@@ -10141,9 +10505,6 @@
 #~ msgid "`ssh' does not seem to terminate.\n"
 #~ msgstr "«ssh» no parece terminar.\n"
 
-#~ msgid "Unable to get HELLO for peer!\n"
-#~ msgstr "¡Imposible obtener «HELLO» del par!\n"
-
 #~ msgid "`gnunet-arm' terminated with non-zero exit status (or timed out)!\n"
 #~ msgstr ""
 #~ "¡«gnunet-arm» terminó con un estado de salida no cero (o expiró el "
@@ -11672,15 +12033,7 @@
 #~ "Upload aborted.\n"
 #~ msgstr "Descarga abortada"
 
-#, fuzzy
 #~ msgid ""
-#~ "\n"
-#~ "Error uploading file: %s"
-#~ msgstr ""
-#~ "\n"
-#~ "Error subiendo el fichero %s\n"
-
-#~ msgid ""
 #~ "even if gnunetd is running on the local machine, force the creation of a "
 #~ "copy instead of making a link to the GNUnet share directory"
 #~ msgstr ""
@@ -11754,10 +12107,6 @@
 #~ msgid "No filename specified, using `%s' instead (for now).\n"
 #~ msgstr "Ningún nombre especificado para la tabla, usando '%s'.\n"
 
-#, fuzzy
-#~ msgid "Downloading %d files from directory `%s'.\n"
-#~ msgstr "Descarga los ficheros de GNUnet"
-
 #~ msgid "File stored as `%s'.\n"
 #~ msgstr "Fichero almacenado en '%s'.\n"
 

Modified: gnunet/po/sv.po
===================================================================
--- gnunet/po/sv.po     2014-06-04 16:03:17 UTC (rev 33521)
+++ gnunet/po/sv.po     2014-06-04 16:38:42 UTC (rev 33522)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: GNUnet 0.7.0b\n"
 "Report-Msgid-Bugs-To: address@hidden"
-"POT-Creation-Date: 2014-04-08 11:11+0200\n"
+"POT-Creation-Date: 2014-06-04 18:25+0200\n"
 "PO-Revision-Date: 2006-01-21 17:16+0100\n"
 "Last-Translator: Daniel Nylander <address@hidden>\n"
 "Language-Team: Swedish <address@hidden>\n"
@@ -346,130 +346,159 @@
 msgid "Initiating shutdown as requested by client.\n"
 msgstr ""
 
-#: src/ats/ats_api_performance.c:468
+#: src/ats/ats_api_performance.c:485
 #, fuzzy, c-format
 msgid "Received %s message\n"
 msgstr "mottog ogiltigt \"%s\" meddelande\n"
 
-#: src/ats/ats_api_performance.c:511
+#: src/ats/ats_api_performance.c:528
 #, fuzzy, c-format
 msgid "Received last message for %s \n"
 msgstr "Mottog ogiltigt \"%s\" meddelande från \"%s\".\n"
 
-#: src/ats/gnunet-ats-solver-eval.c:2199 src/ats/gnunet-ats-solver-eval.c:2233
-#: src/ats/gnunet-service-ats_addresses.c:1980
-#: src/ats/gnunet-service-ats_addresses.c:2024
+#: src/ats/gnunet-ats-solver-eval.c:2793 src/ats/gnunet-ats-solver-eval.c:2827
+#: src/ats/gnunet-service-ats_addresses.c:1675
+#: src/ats/gnunet-service-ats_addresses.c:1719
 #, c-format
 msgid ""
 "Could not load quota for network `%s':  `%s', assigning default bandwidth "
 "%llu\n"
 msgstr ""
 
-#: src/ats/gnunet-ats-solver-eval.c:2205
-#: src/ats/gnunet-service-ats_addresses.c:1987
+#: src/ats/gnunet-ats-solver-eval.c:2799
+#: src/ats/gnunet-service-ats_addresses.c:1682
 #, c-format
 msgid "Outbound quota configure for network `%s' is %llu\n"
 msgstr ""
 
-#: src/ats/gnunet-ats-solver-eval.c:2212
-#: src/ats/gnunet-service-ats_addresses.c:1995
+#: src/ats/gnunet-ats-solver-eval.c:2806
+#: src/ats/gnunet-service-ats_addresses.c:1690
 #, c-format
 msgid ""
 "No outbound quota configured for network `%s', assigning default bandwidth "
 "%llu\n"
 msgstr ""
 
-#: src/ats/gnunet-ats-solver-eval.c:2239
-#: src/ats/gnunet-service-ats_addresses.c:2031
+#: src/ats/gnunet-ats-solver-eval.c:2833
+#: src/ats/gnunet-service-ats_addresses.c:1726
 #, c-format
 msgid "Inbound quota configured for network `%s' is %llu\n"
 msgstr ""
 
-#: src/ats/gnunet-ats-solver-eval.c:2246
-#: src/ats/gnunet-service-ats_addresses.c:2039
+#: src/ats/gnunet-ats-solver-eval.c:2840
+#: src/ats/gnunet-service-ats_addresses.c:1734
 #, c-format
 msgid ""
 "No outbound quota configure for network `%s', assigning default bandwidth "
 "%llu\n"
 msgstr ""
 
-#: src/ats/gnunet-ats-solver-eval.c:2671
+#: src/ats/gnunet-ats-solver-eval.c:3397
 #: src/ats-tests/gnunet-solver-eval.c:919
 msgid "solver to use"
 msgstr ""
 
-#: src/ats/gnunet-ats-solver-eval.c:2674 src/ats/gnunet-ats-solver-eval.c:2677
+#: src/ats/gnunet-ats-solver-eval.c:3400
 #: src/ats-tests/gnunet-solver-eval.c:922
 #: src/ats-tests/gnunet-solver-eval.c:925
 msgid "experiment to use"
 msgstr ""
 
-#: src/ats/gnunet-ats-solver-eval.c:2680
+#: src/ats/gnunet-ats-solver-eval.c:3403
+msgid "be verbose"
+msgstr "var informativ"
+
+#: src/ats/gnunet-ats-solver-eval.c:3406
 #, fuzzy
 msgid "print logging"
 msgstr "Startade samling \"%s\".\n"
 
-#: src/ats/gnunet-service-ats_addresses.c:2217
+#: src/ats/gnunet-ats-solver-eval.c:3409
+msgid "save logging to disk"
+msgstr ""
+
+#: src/ats/gnunet-ats-solver-eval.c:3412
+msgid "disable normalization"
+msgstr ""
+
+#: src/ats/gnunet-service-ats_addresses.c:1912
 #, c-format
 msgid "Initializing solver `%s '`%s'\n"
 msgstr ""
 
-#: src/ats/gnunet-service-ats_addresses.c:2220
+#: src/ats/gnunet-service-ats_addresses.c:1915
 #, fuzzy, c-format
 msgid "Failed to initialize solver `%s'!\n"
 msgstr "Kunde inte initiera SQLite.\n"
 
-#: src/ats/gnunet-service-ats_addresses.c:2243
+#: src/ats/gnunet-service-ats_addresses.c:1938
 #, fuzzy
 msgid "Failed to initialize solver!\n"
 msgstr "Kunde inte initiera SQLite.\n"
 
-#: src/ats/plugin_ats_mlp.c:892
+#: src/ats/plugin_ats_mlp.c:949
 msgid "Problem size too large, cannot allocate memory!\n"
 msgstr ""
 
-#: src/ats/plugin_ats_mlp.c:1329
+#: src/ats/plugin_ats_mlp.c:1542
 #, fuzzy, c-format
 msgid "Adding address for peer `%s' multiple times\n"
 msgstr "Motpart \"%s\" med pålitlighet %8u och adress \"%s\"\n"
 
-#: src/ats/plugin_ats_mlp.c:1376
+#: src/ats/plugin_ats_mlp.c:1589
 #, c-format
 msgid "Updating address property `%s' for peer `%s' %p not added before\n"
 msgstr ""
 
-#: src/ats/plugin_ats_mlp.c:2122
+#: src/ats/plugin_ats_mlp.c:2299
+msgid ""
+"MLP solver is not optimizing for anything, changing to feasibility check\n"
+msgstr ""
+
+#: src/ats/plugin_ats_mlp.c:2339 src/ats/plugin_ats_mlp.c:2356
+#: src/ats/plugin_ats_mlp.c:2388 src/ats/plugin_ats_mlp.c:2406
+#: src/ats/plugin_ats_mlp.c:2425 src/ats/plugin_ats_proportional.c:458
+#: src/ats/plugin_ats_proportional.c:475 src/ats/plugin_ats_ril.c:2220
+#: src/ats/plugin_ats_ril.c:2237 src/ats/plugin_ats_ril.c:2254
+#: src/ats/plugin_ats_ril.c:2271 src/ats/plugin_ats_ril.c:2288
+#: src/ats/plugin_ats_ril.c:2305 src/ats/plugin_ats_ril.c:2322
+#: src/ats/plugin_ats_ril.c:2339
+#, fuzzy, c-format
+msgid "Invalid %s configuration %f \n"
+msgstr "Kunde inte spara konfigurationsfil \"%s\":"
+
+#: src/ats/plugin_ats_mlp.c:2512
 #, c-format
 msgid ""
 "Adjusting inconsistent outbound quota configuration for network `%s', is "
 "%llu must be at least %llu\n"
 msgstr ""
 
-#: src/ats/plugin_ats_mlp.c:2131
+#: src/ats/plugin_ats_mlp.c:2521
 #, c-format
 msgid ""
 "Adjusting inconsistent inbound quota configuration for network `%s', is %llu "
 "must be at least %llu\n"
 msgstr ""
 
-#: src/ats/plugin_ats_mlp.c:2142
+#: src/ats/plugin_ats_mlp.c:2532
 #, c-format
 msgid ""
 "Adjusting outbound quota configuration for network `%s'from %llu to %.0f\n"
 msgstr ""
 
-#: src/ats/plugin_ats_mlp.c:2150
+#: src/ats/plugin_ats_mlp.c:2540
 #, c-format
 msgid ""
 "Adjusting inbound quota configuration for network `%s' from %llu to %.0f\n"
 msgstr ""
 
-#: src/ats/plugin_ats_mlp.c:2161
+#: src/ats/plugin_ats_mlp.c:2551
 #, c-format
 msgid "Using default quota configuration for network `%s' (in/out) %llu/%llu\n"
 msgstr ""
 
-#: src/ats/plugin_ats_proportional.c:1511
+#: src/ats/plugin_ats_proportional.c:1819
 #, fuzzy, c-format
 msgid "Invalid network type `%u' `%s': Disconnect!\n"
 msgstr "Kan inte öppna konfigurationsfil \"%s\".\n"
@@ -507,7 +536,7 @@
 msgid "Could not connect master [%u] and slave [%u]\n"
 msgstr "Kunde inte ansluta till gnunetd.\n"
 
-#: src/ats-tests/ats-testing.c:490 src/ats-tests/ats-testing.c:671
+#: src/ats-tests/ats-testing.c:490 src/ats-tests/ats-testing.c:673
 #, fuzzy
 msgid "Initialization failed, shutdown\n"
 msgstr "Initiering av insticksmekanism misslyckades: %s!\n"
@@ -538,108 +567,164 @@
 msgid "ATS returned results for %u addresses\n"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:232
+#: src/ats-tool/gnunet-ats.c:258
 #, 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:413
+#: src/ats-tool/gnunet-ats.c:467
 #, c-format
 msgid "Quota for network `%11s' (in/out): %10s / %10s\n"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:433 src/core/gnunet-core.c:163
-#: src/namestore/gnunet-namestore.c:550 src/transport/gnunet-transport.c:1246
+#: src/ats-tool/gnunet-ats.c:487 src/namestore/gnunet-namestore.c:639
+#: src/transport/gnunet-transport.c:1349
 #, fuzzy, c-format
 msgid "Service `%s' is not running\n"
 msgstr "\"%s\" är inte en fil.\n"
 
-#: src/ats-tool/gnunet-ats.c:445 src/transport/gnunet-transport.c:1255
+#: src/ats-tool/gnunet-ats.c:499 src/transport/gnunet-transport.c:1358
 #, 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:454
+#: src/ats-tool/gnunet-ats.c:508
 #, c-format
 msgid "Please select one operation : %s or %s or %s or %s or %s\n"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:470 src/ats-tool/gnunet-ats.c:489
-#: src/ats-tool/gnunet-ats.c:506 src/ats-tool/gnunet-ats.c:543
+#: src/ats-tool/gnunet-ats.c:524 src/ats-tool/gnunet-ats.c:543
+#: src/ats-tool/gnunet-ats.c:560 src/ats-tool/gnunet-ats.c:597
 #, 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:478 src/ats-tool/gnunet-ats.c:495
+#: src/ats-tool/gnunet-ats.c:532 src/ats-tool/gnunet-ats.c:549
 #, 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:515
+#: src/ats-tool/gnunet-ats.c:569
 #, fuzzy, c-format
 msgid "No preference type given!\n"
 msgstr "Skriv ut information om GNUnets motparter."
 
-#: src/ats-tool/gnunet-ats.c:520
+#: src/ats-tool/gnunet-ats.c:574
 #, c-format
 msgid "No peer given!\n"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:536
+#: src/ats-tool/gnunet-ats.c:590
 msgid "Valid type required\n"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:594
+#: src/ats-tool/gnunet-ats.c:648
 msgid "get list of active addresses currently used"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:596
+#: src/ats-tool/gnunet-ats.c:650
 msgid "get list of all active addresses"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:599
+#: src/ats-tool/gnunet-ats.c:653
 #, 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:601
+#: src/ats-tool/gnunet-ats.c:655
 msgid "monitor mode"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:603
+#: src/ats-tool/gnunet-ats.c:657
 #, fuzzy
 msgid "set preference for the given peer"
 msgstr "Skriv ut information om GNUnets motparter."
 
-#: src/ats-tool/gnunet-ats.c:605
+#: src/ats-tool/gnunet-ats.c:659
 msgid "print all configured quotas"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:607
+#: src/ats-tool/gnunet-ats.c:661
 msgid "peer id"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:610
+#: src/ats-tool/gnunet-ats.c:664
 msgid "preference type to set: latency | bandwidth"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:612
+#: src/ats-tool/gnunet-ats.c:666
 msgid "preference value"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:615
+#: src/ats-tool/gnunet-ats.c:669
 msgid "verbose output (include ATS address properties)"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:622
+#: src/ats-tool/gnunet-ats.c:676
 #, fuzzy
 msgid "Print information about ATS state"
 msgstr "Skriv ut information om GNUnets motparter."
 
+#: src/cadet/gnunet-cadet.c:357
+#, fuzzy, c-format
+msgid "Invalid target `%s'\n"
+msgstr "Ogiltigt argument: \"%s\"\n"
+
+#: src/cadet/gnunet-cadet.c:607
+#, fuzzy, c-format
+msgid "Invalid peer ID `%s'\n"
+msgstr "Ogiltiga argument: "
+
+#: src/cadet/gnunet-cadet.c:650
+#, fuzzy, c-format
+msgid "Invalid tunnel owner `%s'\n"
+msgstr "Ogiltigt format för IP: \"%s\"\n"
+
+#: src/cadet/gnunet-cadet.c:716
+msgid "You must NOT give a TARGETwhen using 'request all' options\n"
+msgstr ""
+
+#: src/cadet/gnunet-cadet.c:807
+#, fuzzy
+msgid "provide information about a particular connection"
+msgstr "Skriv ut information om GNUnets motparter."
+
+#: src/cadet/gnunet-cadet.c:810
+msgid "activate echo mode"
+msgstr ""
+
+#: src/cadet/gnunet-cadet.c:816
+msgid "port to listen to (default; 0)"
+msgstr ""
+
+#: src/cadet/gnunet-cadet.c:819
+#, fuzzy
+msgid "provide information about a patricular peer"
+msgstr "Skriv ut information om GNUnets motparter."
+
+#: src/cadet/gnunet-cadet.c:822
+#, fuzzy
+msgid "provide information about all peers"
+msgstr "Skriv ut information om GNUnets motparter."
+
+#: src/cadet/gnunet-cadet.c:825
+#, fuzzy
+msgid "provide information about a particular tunnel"
+msgstr "Skriv ut information om GNUnets motparter."
+
+#: src/cadet/gnunet-cadet.c:828
+#, fuzzy
+msgid "provide information about all tunnels"
+msgstr "Skriv ut information om GNUnets motparter."
+
+#: src/cadet/gnunet-service-cadet_peer.c:429
+msgid "Wrong CORE service\n"
+msgstr ""
+
 #: src/consensus/gnunet-consensus-profiler.c:437
-#: src/secretsharing/gnunet-secretsharing-profiler.c:535
+#: src/secretsharing/gnunet-secretsharing-profiler.c:610
 #, fuzzy
 msgid "number of peers in consensus"
 msgstr "antal iterationer"
@@ -665,7 +750,7 @@
 msgstr ""
 
 #: src/consensus/gnunet-consensus-profiler.c:452
-#: src/secretsharing/gnunet-secretsharing-profiler.c:550
+#: src/secretsharing/gnunet-secretsharing-profiler.c:625
 msgid "be more verbose (print received values)"
 msgstr ""
 
@@ -674,6 +759,11 @@
 msgid "Connection to conversation service lost, trying to reconnect\n"
 msgstr ""
 
+#: src/conversation/conversation_api.c:681
+#, fuzzy
+msgid "number too large"
+msgstr "antal iterationer"
+
 #: src/conversation/gnunet-conversation.c:264
 #, c-format
 msgid "Incoming call from `%s'. Please /accept #%u or /cancel %u the call.\n"
@@ -1092,19 +1182,19 @@
 msgid "Failed to allocate %d bytes for second packet\n"
 msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 
-#: src/conversation/gnunet-service-conversation.c:841
-msgid "Mesh audio channel not ready; audio data dropped\n"
+#: src/conversation/gnunet-service-conversation.c:852
+msgid "Cadet audio channel not ready; audio data dropped\n"
 msgstr ""
 
-#: src/conversation/gnunet-service-conversation.c:932
+#: src/conversation/gnunet-service-conversation.c:943
 #, c-format
 msgid ""
 "No available phone for incoming call on line %u, sending HANG_UP signal\n"
 msgstr ""
 
-#: src/conversation/gnunet-service-conversation.c:1338
+#: src/conversation/gnunet-service-conversation.c:1349
 #, fuzzy, c-format
-msgid "Received incoming channel on port %u\n"
+msgid "Received incoming Cadet channel on port %u\n"
 msgstr "\"%s\" ansluten till \"%s\".\n"
 
 #: src/conversation/microphone.c:121
@@ -1122,214 +1212,241 @@
 msgid "Could not start playback audio helper.\n"
 msgstr "Kunde inte slå upp \"%s\": %s\n"
 
-#: src/core/core_api.c:767
+#: src/core/core_api.c:768
 msgid "Client was disconnected from core service, trying to reconnect.\n"
 msgstr ""
 
-#: src/core/gnunet-core.c:80
-#, fuzzy, c-format
-msgid "Peer `%s'\n"
-msgstr "Jag är ändpunkt \"%s\".\n"
+#: src/core/gnunet-core.c:92
+#, fuzzy
+msgid "fresh connection"
+msgstr "# av anslutna parter"
 
-#: src/core/gnunet-core.c:110 src/core/gnunet-core.c:138
-#: src/transport/gnunet-transport.c:910 src/transport/gnunet-transport.c:930
-#, c-format
-msgid "%24s: %-17s %4s   (%u connections in total)\n"
+#: src/core/gnunet-core.c:95
+msgid "key sent"
 msgstr ""
 
-#: src/core/gnunet-core.c:112 src/transport/gnunet-transport.c:911
+#: src/core/gnunet-core.c:98
 #, fuzzy
-msgid "Connected to"
-msgstr "\"%s\" ansluten till \"%s\".\n"
+msgid "key received"
+msgstr "# sessionnycklar vägrade"
 
-#: src/core/gnunet-core.c:140 src/transport/gnunet-transport.c:931
+#: src/core/gnunet-core.c:101
 #, fuzzy
-msgid "Disconnected from"
+msgid "connection established"
+msgstr "Samling stoppad.\n"
+
+#: src/core/gnunet-core.c:104
+msgid "rekeying"
+msgstr ""
+
+#: src/core/gnunet-core.c:107
+#, fuzzy
+msgid "disconnected"
 msgstr "\"%s\" ansluten till \"%s\".\n"
 
-#: src/core/gnunet-core.c:211 src/peerinfo-tool/gnunet-peerinfo.c:694
+#: src/core/gnunet-core.c:114
+msgid "Connection to CORE service lost (reconnecting)"
+msgstr ""
+
+#: src/core/gnunet-core.c:117
+#, fuzzy
+msgid "unknown state"
+msgstr "Okänt fel"
+
+#: src/core/gnunet-core.c:122
+#, c-format
+msgid "%24s: %-30s %4s (timeout in %6s)\n"
+msgstr ""
+
+#: src/core/gnunet-core.c:146 src/peerinfo-tool/gnunet-peerinfo.c:705
 #, fuzzy, c-format
 msgid "Invalid command line argument `%s'\n"
 msgstr "Ogiltiga kommandoradsargument:\n"
 
-#: src/core/gnunet-core.c:233 src/transport/gnunet-transport.c:1486
+#: src/core/gnunet-core.c:157
+#: src/experimentation/gnunet-daemon-experimentation_nodes.c:1104
 #, fuzzy
+msgid "Failed to connect to CORE service!\n"
+msgstr "Misslyckades att ansluta till gnunetd.\n"
+
+#: src/core/gnunet-core.c:179 src/transport/gnunet-transport.c:1590
+#, fuzzy
 msgid "provide information about all current connections (continuously)"
 msgstr "Skriv ut information om GNUnets motparter."
 
-#: src/core/gnunet-core.c:244
+#: src/core/gnunet-core.c:188
 #, fuzzy
 msgid "Print information about connected peers."
 msgstr "Skriv ut information om GNUnets motparter."
 
-#: src/core/gnunet-service-core.c:105
+#: src/core/gnunet-service-core.c:104
 #, fuzzy
 msgid "Core service is lacking HOSTKEY configuration setting.  Exiting.\n"
 msgstr "GNUnet-konfiguration"
 
-#: src/core/gnunet-service-core.c:126
+#: src/core/gnunet-service-core.c:128
 #, c-format
 msgid "Core service of `%4s' ready.\n"
 msgstr ""
 
-#: src/core/gnunet-service-core_clients.c:370
+#: src/core/gnunet-service-core_clients.c:372
 msgid "# send requests dropped (disconnected)"
 msgstr ""
 
-#: src/core/gnunet-service-core_clients.c:480
+#: src/core/gnunet-service-core_clients.c:483
 #, fuzzy
 msgid "# messages discarded (session disconnected)"
 msgstr "Nätverksannonsering avstängd i konfigurationen!\n"
 
-#: src/core/gnunet-service-core_clients.c:526
+#: src/core/gnunet-service-core_clients.c:529
 #, fuzzy, c-format
 msgid "# bytes of messages of type %u received"
 msgstr "# krypterade PONG-meddelanden mottagna"
 
-#: src/core/gnunet-service-core_kx.c:535
+#: src/core/gnunet-service-core_kx.c:549
 msgid "# bytes encrypted"
 msgstr "# byte krypterade"
 
-#: src/core/gnunet-service-core_kx.c:586
+#: src/core/gnunet-service-core_kx.c:601
 msgid "# bytes decrypted"
 msgstr "# byte dekrypterade"
 
-#: src/core/gnunet-service-core_kx.c:673
+#: src/core/gnunet-service-core_kx.c:688
 msgid "# key exchanges initiated"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:713
+#: src/core/gnunet-service-core_kx.c:732
 msgid "# key exchanges stopped"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:810
+#: src/core/gnunet-service-core_kx.c:832
 msgid "# old ephemeral keys ignored"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:816
+#: src/core/gnunet-service-core_kx.c:839
 #, fuzzy
 msgid "# ephemeral keys received"
 msgstr "# krypterade PONG-meddelanden mottagna"
 
-#: src/core/gnunet-service-core_kx.c:850
+#: src/core/gnunet-service-core_kx.c:873
 #, 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:861
+#: src/core/gnunet-service-core_kx.c:884
 #, fuzzy
 msgid "# EPHEMERAL_KEY messages received"
 msgstr "# PING-meddelanden skapade"
 
-#: src/core/gnunet-service-core_kx.c:951
+#: src/core/gnunet-service-core_kx.c:983
 #: src/transport/gnunet-service-transport_validation.c:1016
 #, fuzzy
 msgid "# PING messages received"
 msgstr "# PING-meddelanden skapade"
 
-#: src/core/gnunet-service-core_kx.c:959
+#: src/core/gnunet-service-core_kx.c:991
 #, fuzzy
 msgid "# PING messages dropped (out of order)"
 msgstr "Nätverksannonsering avstängd i konfigurationen!\n"
 
-#: src/core/gnunet-service-core_kx.c:986
+#: src/core/gnunet-service-core_kx.c:1018
 #, 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:1003
+#: src/core/gnunet-service-core_kx.c:1035
 #, fuzzy
 msgid "# PONG messages created"
 msgstr "# PING-meddelanden skapade"
 
-#: src/core/gnunet-service-core_kx.c:1029
+#: src/core/gnunet-service-core_kx.c:1061
 #, fuzzy
 msgid "# sessions terminated by timeout"
 msgstr "# byte kastade via TCP (utgående)"
 
-#: src/core/gnunet-service-core_kx.c:1039
+#: src/core/gnunet-service-core_kx.c:1072
 #, fuzzy
 msgid "# keepalive messages sent"
 msgstr "# PING-meddelanden i klartext skickade"
 
-#: src/core/gnunet-service-core_kx.c:1096
+#: src/core/gnunet-service-core_kx.c:1139
 #: src/transport/gnunet-service-transport_validation.c:1328
 #, fuzzy
 msgid "# PONG messages received"
 msgstr "# krypterade PONG-meddelanden mottagna"
 
-#: src/core/gnunet-service-core_kx.c:1102
+#: src/core/gnunet-service-core_kx.c:1145
 #, fuzzy
 msgid "# PONG messages dropped (connection down)"
 msgstr "# krypterade PONG-meddelanden mottagna"
 
-#: src/core/gnunet-service-core_kx.c:1107
+#: src/core/gnunet-service-core_kx.c:1150
 #, fuzzy
 msgid "# PONG messages dropped (out of order)"
 msgstr "Nätverksannonsering avstängd i konfigurationen!\n"
 
-#: src/core/gnunet-service-core_kx.c:1137
+#: src/core/gnunet-service-core_kx.c:1180
 #, fuzzy
 msgid "# PONG messages decrypted"
 msgstr "# PING-meddelanden skapade"
 
-#: src/core/gnunet-service-core_kx.c:1171
+#: src/core/gnunet-service-core_kx.c:1215
 #, fuzzy
 msgid "# session keys confirmed via PONG"
 msgstr "# sessionnycklar vägrade"
 
-#: src/core/gnunet-service-core_kx.c:1181
+#: src/core/gnunet-service-core_kx.c:1226
 #, fuzzy
 msgid "# timeouts prevented via PONG"
 msgstr "# byte mottogs via TCP"
 
-#: src/core/gnunet-service-core_kx.c:1188
+#: src/core/gnunet-service-core_kx.c:1233
 #, fuzzy
 msgid "# rekey operations confirmed via PONG"
 msgstr "# sessionnycklar vägrade"
 
-#: src/core/gnunet-service-core_kx.c:1328
+#: src/core/gnunet-service-core_kx.c:1374
 #, fuzzy
 msgid "# DATA message dropped (out of order)"
 msgstr "# byte kastade via UDP (utgående)"
 
-#: src/core/gnunet-service-core_kx.c:1335
+#: src/core/gnunet-service-core_kx.c:1381
 #, 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:1338
+#: src/core/gnunet-service-core_kx.c:1384
 #, fuzzy
 msgid "# sessions terminated by key expiration"
 msgstr "# byte kastade via TCP (utgående)"
 
-#: src/core/gnunet-service-core_kx.c:1383
-#: src/core/gnunet-service-core_kx.c:1408
+#: src/core/gnunet-service-core_kx.c:1430
+#: src/core/gnunet-service-core_kx.c:1455
 #, fuzzy
 msgid "# bytes dropped (duplicates)"
 msgstr "# byte kastade via UDP (utgående)"
 
-#: src/core/gnunet-service-core_kx.c:1395
+#: src/core/gnunet-service-core_kx.c:1442
 #, fuzzy
 msgid "# bytes dropped (out of sequence)"
 msgstr "# byte kastade via UDP (utgående)"
 
-#: src/core/gnunet-service-core_kx.c:1437
+#: src/core/gnunet-service-core_kx.c:1484
 #, fuzzy
 msgid "# bytes dropped (ancient message)"
 msgstr "# byte kastade via UDP (utgående)"
 
-#: src/core/gnunet-service-core_kx.c:1445
+#: src/core/gnunet-service-core_kx.c:1492
 #, fuzzy
 msgid "# bytes of payload decrypted"
 msgstr "# byte dekrypterade"
 
-#: src/core/gnunet-service-core_kx.c:1480
+#: src/core/gnunet-service-core_kx.c:1527
 #, fuzzy
 msgid "# PAYLOAD dropped (out of order)"
 msgstr "# byte kastade via UDP (utgående)"
@@ -1353,37 +1470,47 @@
 msgid "Unsupported message of type %u (%u bytes) received from peer `%s'\n"
 msgstr ""
 
-#: src/core/gnunet-service-core_sessions.c:216
-#: src/core/gnunet-service-core_sessions.c:288
+#: src/core/gnunet-service-core_sessions.c:245
+#: src/core/gnunet-service-core_sessions.c:328
 #: src/dht/gnunet-service-dht_neighbours.c:662
 #: src/dht/gnunet-service-dht_neighbours.c:727
-#: src/dht/gnunet-service-xdht_neighbours.c:1304
+#: src/dht/gnunet-service-xdht_neighbours.c:3586
 #: src/fs/gnunet-service-fs_cp.c:606 src/fs/gnunet-service-fs_cp.c:1501
 #: src/topology/gnunet-daemon-topology.c:707
 #: src/topology/gnunet-daemon-topology.c:808
 #: src/transport/gnunet-service-transport_neighbours.c:917
 #: src/transport/gnunet-service-transport_neighbours.c:1141
-#: src/transport/gnunet-service-transport_neighbours.c:3142
-#: src/transport/gnunet-service-transport_neighbours.c:3438
+#: src/transport/gnunet-service-transport_neighbours.c:3146
+#: src/transport/gnunet-service-transport_neighbours.c:3449
 #, fuzzy
 msgid "# peers connected"
 msgstr "# av anslutna parter"
 
-#: src/core/gnunet-service-core_sessions.c:255
+#: src/core/gnunet-service-core_sessions.c:278
 msgid "# type map refreshes sent"
 msgstr ""
 
-#: src/core/gnunet-service-core_sessions.c:426
+#: src/core/gnunet-service-core_sessions.c:394
+#, fuzzy
+msgid "# outdated typemap confirmations received"
+msgstr "Kunde inte spara konfiguration!"
+
+#: src/core/gnunet-service-core_sessions.c:405
+#, fuzzy
+msgid "# valid typemap confirmations received"
+msgstr "Kunde inte spara konfiguration!"
+
+#: src/core/gnunet-service-core_sessions.c:543
 msgid "# messages discarded (expired prior to transmission)"
 msgstr ""
 
-#: src/core/gnunet-service-core_typemap.c:110
-#: src/core/gnunet-service-core_typemap.c:121
+#: src/core/gnunet-service-core_typemap.c:169
+#: src/core/gnunet-service-core_typemap.c:180
 #, fuzzy
 msgid "# type maps received"
 msgstr "# krypterade PONG-meddelanden mottagna"
 
-#: src/core/gnunet-service-core_typemap.c:151
+#: src/core/gnunet-service-core_typemap.c:210
 msgid "# updates to my type map"
 msgstr ""
 
@@ -1443,12 +1570,13 @@
 #: src/namecache/plugin_namecache_sqlite.c:52
 #: src/namestore/plugin_namestore_postgres.c:52
 #: src/namestore/plugin_namestore_sqlite.c:52
+#: src/peerstore/plugin_peerstore_sqlite.c:50
 #: src/testbed/generate-underlay-topology.c:47
 #: src/testbed/gnunet-daemon-latency-logger.c:52
 #: src/testbed/gnunet-daemon-testbed-underlay.c:55
 #: src/testbed/testbed_api_hosts.c:69 src/util/crypto_ecc.c:51
 #: src/util/crypto_mpi.c:39 src/include/gnunet_common.h:602
-#: src/include/gnunet_common.h:611 src/scalarproduct/scalarproduct.h:50
+#: src/include/gnunet_common.h:611 src/scalarproduct/scalarproduct.h:44
 #, c-format
 msgid "`%s' failed at %s:%d with error: %s\n"
 msgstr "\"%s\" misslyckades vid %s:%d med fel: %s\n"
@@ -1500,7 +1628,7 @@
 msgid "# datastore connections (re)created"
 msgstr "Nätverksanslutning"
 
-#: src/datastore/datastore_api.c:616 src/scalarproduct/scalarproduct_api.c:279
+#: src/datastore/datastore_api.c:616
 #, fuzzy
 msgid "# transmission request failures"
 msgstr "# klartext PONG-meddelanden mottagna"
@@ -1787,6 +1915,7 @@
 #: src/datastore/plugin_datastore_sqlite.c:255
 #: src/namecache/plugin_namecache_sqlite.c:193
 #: src/namestore/plugin_namestore_sqlite.c:204
+#: src/peerstore/plugin_peerstore_sqlite.c:434
 #: src/psycstore/plugin_psycstore_sqlite.c:319
 #, fuzzy, c-format
 msgid "Unable to initialize SQLite: %s.\n"
@@ -1943,102 +2072,102 @@
 msgstr "# byte mottogs via TCP"
 
 #: src/dht/gnunet-service-dht_clients.c:513
-#: src/dht/gnunet-service-xdht_clients.c:927
+#: src/dht/gnunet-service-xdht_clients.c:925
 #, fuzzy
 msgid "# PUT requests received from clients"
 msgstr "Meddelande mottaget från klient är ogiltig.\n"
 
 #: src/dht/gnunet-service-dht_clients.c:597
-#: src/dht/gnunet-service-xdht_clients.c:1013
+#: src/dht/gnunet-service-xdht_clients.c:1010
 #, fuzzy
 msgid "# GET requests received from clients"
 msgstr "Meddelande mottaget från klient är ogiltig.\n"
 
 #: src/dht/gnunet-service-dht_clients.c:798
-#: src/dht/gnunet-service-xdht_clients.c:1214
+#: src/dht/gnunet-service-xdht_clients.c:1211
 #, fuzzy
 msgid "# GET STOP requests received from clients"
 msgstr "Meddelande mottaget från klient är ogiltig.\n"
 
-#: src/dht/gnunet-service-dht_clients.c:1039
+#: src/dht/gnunet-service-dht_clients.c:1040
 #: src/dht/gnunet-service-xdht_clients.c:498
 msgid "# Key match, type mismatches in REPLY to CLIENT"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_clients.c:1052
+#: src/dht/gnunet-service-dht_clients.c:1053
 #: src/dht/gnunet-service-xdht_clients.c:511
 msgid "# Duplicate REPLIES to CLIENT request dropped"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_clients.c:1089
+#: src/dht/gnunet-service-dht_clients.c:1090
 #: src/dht/gnunet-service-xdht_clients.c:548
 #, c-format
 msgid "Unsupported block type (%u) in request!\n"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_clients.c:1112
+#: src/dht/gnunet-service-dht_clients.c:1113
 #: src/dht/gnunet-service-xdht_clients.c:571
 #, fuzzy
 msgid "# RESULTS queued for clients"
 msgstr "Meddelande mottaget från klient är ogiltig.\n"
 
-#: src/dht/gnunet-service-dht_clients.c:1166
-#: src/dht/gnunet-service-dht_clients.c:1209
+#: src/dht/gnunet-service-dht_clients.c:1167
+#: src/dht/gnunet-service-dht_clients.c:1210
 #: src/dht/gnunet-service-xdht_clients.c:625
 #: src/dht/gnunet-service-xdht_clients.c:668
 msgid "# REPLIES ignored for CLIENTS (no match)"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_clients.c:1176
+#: src/dht/gnunet-service-dht_clients.c:1177
 #: src/dht/gnunet-service-xdht_clients.c:635
 #, fuzzy
 msgid "Could not pass reply to client, message too big!\n"
 msgstr "Kunde inte skicka meddelande till gnunetd\n"
 
 #: src/dht/gnunet-service-dht_datacache.c:68
-#: src/dht/gnunet-service-xdht_datacache.c:68
+#: src/dht/gnunet-service-xdht_datacache.c:69
 #, fuzzy, c-format
 msgid "%s request received, but have no datacache!\n"
 msgstr "# byte mottagna av typen %d"
 
 #: src/dht/gnunet-service-dht_datacache.c:78
-#: src/dht/gnunet-service-xdht_datacache.c:78
+#: src/dht/gnunet-service-xdht_datacache.c:79
 msgid "# ITEMS stored in datacache"
 msgstr ""
 
 #: src/dht/gnunet-service-dht_datacache.c:165
-#: src/dht/gnunet-service-xdht_datacache.c:165
+#: src/dht/gnunet-service-xdht_datacache.c:213
 msgid "# Good RESULTS found in datacache"
 msgstr ""
 
 #: src/dht/gnunet-service-dht_datacache.c:176
-#: src/dht/gnunet-service-xdht_datacache.c:176
+#: src/dht/gnunet-service-xdht_datacache.c:234
 msgid "# Duplicate RESULTS found in datacache"
 msgstr ""
 
 #: src/dht/gnunet-service-dht_datacache.c:182
-#: src/dht/gnunet-service-xdht_datacache.c:182
+#: src/dht/gnunet-service-xdht_datacache.c:240
 msgid "# Invalid RESULTS found in datacache"
 msgstr ""
 
 #: src/dht/gnunet-service-dht_datacache.c:188
-#: src/dht/gnunet-service-xdht_datacache.c:188
+#: src/dht/gnunet-service-xdht_datacache.c:246
 msgid "# Irrelevant RESULTS found in datacache"
 msgstr ""
 
 #: src/dht/gnunet-service-dht_datacache.c:200
-#: src/dht/gnunet-service-xdht_datacache.c:200
+#: src/dht/gnunet-service-xdht_datacache.c:258
 msgid "# Unsupported RESULTS found in datacache"
 msgstr ""
 
 #: src/dht/gnunet-service-dht_datacache.c:203
-#: src/dht/gnunet-service-xdht_datacache.c:203
+#: src/dht/gnunet-service-xdht_datacache.c:261
 #, c-format
 msgid "Unsupported block type (%u) in local response!\n"
 msgstr ""
 
 #: src/dht/gnunet-service-dht_datacache.c:234
-#: src/dht/gnunet-service-xdht_datacache.c:234
+#: src/dht/gnunet-service-xdht_datacache.c:298
 #, fuzzy
 msgid "# GET requests given to datacache"
 msgstr "# byte mottogs via TCP"
@@ -2064,13 +2193,13 @@
 msgstr "Nätverksannonsering avstängd i konfigurationen!\n"
 
 #: src/dht/gnunet-service-dht_neighbours.c:819
-#: src/dht/gnunet-service-xdht_neighbours.c:703
+#: src/dht/gnunet-service-xdht_neighbours.c:745
 #, fuzzy
 msgid "# Bytes transmitted to other peers"
 msgstr "# byte skickade av typen %d"
 
 #: src/dht/gnunet-service-dht_neighbours.c:857
-#: src/dht/gnunet-service-xdht_neighbours.c:742
+#: src/dht/gnunet-service-xdht_neighbours.c:786
 msgid "# Bytes of bandwidth requested from core"
 msgstr ""
 
@@ -2089,87 +2218,91 @@
 msgid "# Peer selection failed"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1287
+#: src/dht/gnunet-service-dht_neighbours.c:1289
 #, fuzzy
 msgid "# PUT requests routed"
 msgstr "# byte mottogs via TCP"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1316
+#: src/dht/gnunet-service-dht_neighbours.c:1318
 #, fuzzy
 msgid "# PUT messages queued for transmission"
 msgstr "# PING-meddelanden skapade"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1323
-#: src/dht/gnunet-service-dht_neighbours.c:1440
-#: src/dht/gnunet-service-dht_neighbours.c:1543
-#: src/dht/gnunet-service-xdht_neighbours.c:794
-#: src/dht/gnunet-service-xdht_neighbours.c:860
-#: src/dht/gnunet-service-xdht_neighbours.c:919
-#: src/dht/gnunet-service-xdht_neighbours.c:981
-#: src/dht/gnunet-service-xdht_neighbours.c:1041
+#: src/dht/gnunet-service-dht_neighbours.c:1328
+#: src/dht/gnunet-service-dht_neighbours.c:1452
+#: src/dht/gnunet-service-dht_neighbours.c:1557
+#: src/dht/gnunet-service-xdht_neighbours.c:843
+#: src/dht/gnunet-service-xdht_neighbours.c:910
+#: src/dht/gnunet-service-xdht_neighbours.c:980
+#: src/dht/gnunet-service-xdht_neighbours.c:1040
+#: src/dht/gnunet-service-xdht_neighbours.c:1098
+#: src/dht/gnunet-service-xdht_neighbours.c:1157
+#: src/dht/gnunet-service-xdht_neighbours.c:1218
+#: src/dht/gnunet-service-xdht_neighbours.c:1280
+#: src/dht/gnunet-service-xdht_neighbours.c:1341
 #, fuzzy
 msgid "# P2P messages dropped due to full queue"
 msgstr "Nätverksannonsering avstängd i konfigurationen!\n"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1405
+#: src/dht/gnunet-service-dht_neighbours.c:1414
 #, fuzzy
 msgid "# GET requests routed"
 msgstr "# byte mottogs via TCP"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1432
+#: src/dht/gnunet-service-dht_neighbours.c:1441
 #, fuzzy
 msgid "# GET messages queued for transmission"
 msgstr "# PING-meddelanden skapade"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1550
+#: src/dht/gnunet-service-dht_neighbours.c:1564
 #, fuzzy
 msgid "# RESULT messages queued for transmission"
 msgstr "# PING-meddelanden skapade"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1636
+#: src/dht/gnunet-service-dht_neighbours.c:1651
 #, fuzzy
 msgid "# P2P PUT requests received"
 msgstr "# byte mottogs via TCP"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1639
+#: src/dht/gnunet-service-dht_neighbours.c:1654
 #, fuzzy
 msgid "# P2P PUT bytes received"
 msgstr "# byte mottogs via TCP"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1803
+#: src/dht/gnunet-service-dht_neighbours.c:1821
 msgid "# FIND PEER requests ignored due to Bloomfilter"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1811
+#: src/dht/gnunet-service-dht_neighbours.c:1829
 msgid "# FIND PEER requests ignored due to lack of HELLO"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1904
+#: src/dht/gnunet-service-dht_neighbours.c:1924
 #, fuzzy
 msgid "# P2P GET requests received"
 msgstr "# byte mottogs via TCP"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1907
+#: src/dht/gnunet-service-dht_neighbours.c:1927
 #, fuzzy
 msgid "# P2P GET bytes received"
 msgstr "# byte mottogs via TCP"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1961
+#: src/dht/gnunet-service-dht_neighbours.c:1984
 #, fuzzy
 msgid "# P2P FIND PEER requests processed"
 msgstr "# byte mottogs via TCP"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1975
+#: src/dht/gnunet-service-dht_neighbours.c:1998
 #, fuzzy
 msgid "# P2P GET requests ONLY routed"
 msgstr "# byte mottogs via TCP"
 
-#: src/dht/gnunet-service-dht_neighbours.c:2052
+#: src/dht/gnunet-service-dht_neighbours.c:2083
 #, fuzzy
 msgid "# P2P RESULTS received"
 msgstr "# krypterade PONG-meddelanden mottagna"
 
-#: src/dht/gnunet-service-dht_neighbours.c:2055
+#: src/dht/gnunet-service-dht_neighbours.c:2086
 #, fuzzy
 msgid "# P2P RESULT bytes received"
 msgstr "# krypterade PONG-meddelanden mottagna"
@@ -2212,24 +2345,6 @@
 msgid "# DHT requests combined"
 msgstr "# byte mottogs via TCP"
 
-#: src/dht/gnunet-service-xdht_neighbours.c:1398
-#, c-format
-msgid ""
-"\n"
-"SUPU %s, %s, %d,my_identity = %s"
-msgstr ""
-
-#: src/dht/gnunet-service-xdht_neighbours.c:1514
-#: src/dht/gnunet-service-xdht_neighbours.c:1524
-#: src/dht/gnunet-service-xdht_neighbours.c:1530
-#: src/dht/gnunet-service-xdht_neighbours.c:1536
-#: src/dht/gnunet-service-xdht_neighbours.c:1545
-#, c-format
-msgid ""
-"\n"
-"SUPU %s, %s, %d"
-msgstr ""
-
 #: src/dht/plugin_block_dht.c:138
 #, fuzzy, c-format
 msgid "Block not of type %u\n"
@@ -2341,12 +2456,12 @@
 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:3514
+#: src/dns/gnunet-service-dns.c:1049
 #, 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:3571
+#: src/dns/gnunet-service-dns.c:1069 src/exit/gnunet-daemon-exit.c:3594
 #, fuzzy
 msgid "need a valid IPv4 or IPv6 address\n"
 msgstr "Ogiltigt svar på \"%s\".\n"
@@ -2367,7 +2482,7 @@
 
 #: src/exit/gnunet-daemon-exit.c:853
 #, fuzzy
-msgid "# Bytes transmitted via mesh channels"
+msgid "# Bytes transmitted via cadet channels"
 msgstr "# byte skickade av typen %d"
 
 #: src/exit/gnunet-daemon-exit.c:970 src/exit/gnunet-daemon-exit.c:2397
@@ -2433,15 +2548,16 @@
 msgstr "# byte skickade via UDP"
 
 #: src/exit/gnunet-daemon-exit.c:1872
-msgid "# TCP service creation requests received via mesh"
-msgstr ""
+#, fuzzy
+msgid "# TCP service creation requests received via cadet"
+msgstr "# byte mottogs via TCP"
 
 #: 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"
+msgid "# Bytes received from CADET"
 msgstr "# byte mottagna via HTTP"
 
 #: src/exit/gnunet-daemon-exit.c:1909 src/exit/gnunet-daemon-exit.c:2990
@@ -2456,12 +2572,12 @@
 
 #: src/exit/gnunet-daemon-exit.c:1971
 #, fuzzy
-msgid "# TCP IP-exit creation requests received via mesh"
+msgid "# TCP IP-exit creation requests received via cadet"
 msgstr "# byte mottogs via TCP"
 
 #: src/exit/gnunet-daemon-exit.c:2076
 #, fuzzy
-msgid "# TCP data requests received via mesh"
+msgid "# TCP data requests received via cadet"
 msgstr "# byte mottogs via TCP"
 
 #: src/exit/gnunet-daemon-exit.c:2090
@@ -2476,12 +2592,12 @@
 
 #: src/exit/gnunet-daemon-exit.c:2324
 #, fuzzy
-msgid "# ICMP IP-exit requests received via mesh"
+msgid "# ICMP IP-exit requests received via cadet"
 msgstr "# byte mottogs via TCP"
 
 #: src/exit/gnunet-daemon-exit.c:2573
 #, fuzzy
-msgid "# ICMP service requests received via mesh"
+msgid "# ICMP service requests received via cadet"
 msgstr "Meddelande mottaget från klient är ogiltig.\n"
 
 #: src/exit/gnunet-daemon-exit.c:2639 src/vpn/gnunet-service-vpn.c:1397
@@ -2501,12 +2617,12 @@
 
 #: src/exit/gnunet-daemon-exit.c:2862
 #, fuzzy
-msgid "# UDP IP-exit requests received via mesh"
+msgid "# UDP IP-exit requests received via cadet"
 msgstr "# byte mottogs via TCP"
 
 #: src/exit/gnunet-daemon-exit.c:2969
 #, fuzzy
-msgid "# UDP service requests received via mesh"
+msgid "# UDP service requests received via cadet"
 msgstr "# byte mottogs via TCP"
 
 #: src/exit/gnunet-daemon-exit.c:2995
@@ -2516,68 +2632,73 @@
 
 #: src/exit/gnunet-daemon-exit.c:3031
 #, fuzzy
-msgid "# Inbound MESH channels created"
+msgid "# Inbound CADET channels created"
 msgstr "# PING-meddelanden skapade"
 
-#: src/exit/gnunet-daemon-exit.c:3235 src/exit/gnunet-daemon-exit.c:3245
+#: src/exit/gnunet-daemon-exit.c:3255 src/exit/gnunet-daemon-exit.c:3265
 #, 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
+#: src/exit/gnunet-daemon-exit.c:3279 src/exit/gnunet-daemon-exit.c:3287
 #, c-format
 msgid "`%s' is not a valid port number (for domain `%s')!"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3300
+#: src/exit/gnunet-daemon-exit.c:3320
 #, c-format
 msgid "No addresses found for hostname `%s' of service `%s'!\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3314 src/exit/gnunet-daemon-exit.c:3326
+#: src/exit/gnunet-daemon-exit.c:3334 src/exit/gnunet-daemon-exit.c:3346
 #, c-format
 msgid "Service `%s' configured for IPv4, but IPv4 is disabled!\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3337
+#: src/exit/gnunet-daemon-exit.c:3357
 #, c-format
 msgid "No IP addresses found for hostname `%s' of service `%s'!\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3527
+#: src/exit/gnunet-daemon-exit.c:3534
+#, c-format
+msgid "`%s' must be installed SUID, EXIT will not work\n"
+msgstr ""
+
+#: src/exit/gnunet-daemon-exit.c:3550
 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:3535
+#: src/exit/gnunet-daemon-exit.c:3558
 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:3542
+#: src/exit/gnunet-daemon-exit.c:3565
 msgid ""
 "Cannot enable IPv4 exit but disable IPv4 on TUN interface, will use "
 "ENABLE_IPv4=YES\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3548
+#: src/exit/gnunet-daemon-exit.c:3571
 msgid ""
 "Cannot enable IPv6 exit but disable IPv6 on TUN interface, will use "
 "ENABLE_IPv6=YES\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3554 src/exit/gnunet-daemon-exit.c:3717
+#: src/exit/gnunet-daemon-exit.c:3577 src/exit/gnunet-daemon-exit.c:3742
 #: src/pt/gnunet-daemon-pt.c:1247
 msgid "No useful service enabled.  Exiting.\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3664
+#: src/exit/gnunet-daemon-exit.c:3689
 msgid "Must be a number"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3813
+#: src/exit/gnunet-daemon-exit.c:3838
 msgid "Daemon to run to provide an IP exit node for the VPN"
 msgstr ""
 
@@ -2687,11 +2808,6 @@
 msgid "Disconnected from peer %s\n"
 msgstr "\"%s\" ansluten till \"%s\".\n"
 
-#: src/experimentation/gnunet-daemon-experimentation_nodes.c:1104
-#, fuzzy
-msgid "Failed to connect to CORE service!\n"
-msgstr "Misslyckades att ansluta till gnunetd.\n"
-
 #: src/experimentation/gnunet-daemon-experimentation_scheduler.c:108
 #, c-format
 msgid "Peer `%s' did not respond to request for experiment `%s'\n"
@@ -3019,12 +3135,12 @@
 msgid "Internal error."
 msgstr "Okänt fel.\n"
 
-#: src/fs/fs_search.c:813
+#: src/fs/fs_search.c:751 src/fs/fs_search.c:817
 #, fuzzy, c-format
 msgid "Failed to parse URI `%s': %s\n"
 msgstr "Fil \"%s\" har URI: %s\n"
 
-#: src/fs/fs_search.c:872
+#: src/fs/fs_search.c:876
 #, c-format
 msgid "Got result with unknown block type `%d', ignoring"
 msgstr ""
@@ -3086,79 +3202,101 @@
 msgid "Failed to compute hash of file."
 msgstr "Misslyckades att ansluta till gnunetd.\n"
 
-#: src/fs/fs_uri.c:222
-#, no-c-format
-msgid "`%' must be followed by HEX number"
-msgstr ""
+#: src/fs/fs_uri.c:223
+#, fuzzy, no-c-format
+msgid "Malformed KSK URI (`%' must be followed by HEX number)"
+msgstr "Ogiltig URL \"%s\" (måste börja med \"%s\")\n"
 
-#: src/fs/fs_uri.c:281
+#: src/fs/fs_uri.c:283
 #, fuzzy
 msgid "Malformed KSK URI (must not begin or end with `+')"
 msgstr "Ogiltig URL \"%s\" (måste börja med \"%s\")\n"
 
-#: src/fs/fs_uri.c:299
-msgid "`++' not allowed in KSK URI"
+#: src/fs/fs_uri.c:301
+#, fuzzy
+msgid "Malformed KSK URI (`++' not allowed)"
+msgstr "Ogiltig URL \"%s\" (måste börja med \"%s\")\n"
+
+#: src/fs/fs_uri.c:308
+#, fuzzy
+msgid "Malformed KSK URI (quotes not balanced)"
+msgstr "Ogiltig URL \"%s\" (måste börja med \"%s\")\n"
+
+#: src/fs/fs_uri.c:379
+msgid "Malformed SKS URI (wrong syntax)"
 msgstr ""
 
-#: src/fs/fs_uri.c:306
-msgid "Quotes not balanced in KSK URI"
+#: src/fs/fs_uri.c:423
+msgid "Malformed CHK URI (wrong syntax)"
 msgstr ""
 
-#: src/fs/fs_uri.c:376
-msgid "Malformed SKS URI"
+#: src/fs/fs_uri.c:438
+msgid "Malformed CHK URI (failed to decode CHK)"
 msgstr ""
 
-#: src/fs/fs_uri.c:419 src/fs/fs_uri.c:434
-msgid "Malformed CHK URI"
+#: src/fs/fs_uri.c:517
+msgid "LOC URI malformed (wrong syntax)"
 msgstr ""
 
-#: src/fs/fs_uri.c:512 src/fs/fs_uri.c:580
-msgid "SKS URI malformed"
+#: src/fs/fs_uri.c:532
+msgid "LOC URI malformed (no CHK)"
 msgstr ""
 
-#: src/fs/fs_uri.c:527 src/fs/fs_uri.c:537
-msgid "LOC URI malformed"
+#: src/fs/fs_uri.c:542
+msgid "LOC URI malformed (missing LOC)"
 msgstr ""
 
-#: src/fs/fs_uri.c:545 src/fs/fs_uri.c:553
+#: src/fs/fs_uri.c:550
+msgid "LOC URI malformed (wrong syntax for public key)"
+msgstr ""
+
+#: src/fs/fs_uri.c:558
 msgid "LOC URI malformed (could not decode public key)"
 msgstr ""
 
-#: src/fs/fs_uri.c:559
-msgid "SKS URI malformed (could not find signature)"
+#: src/fs/fs_uri.c:564
+msgid "LOC URI malformed (could not find signature)"
 msgstr ""
 
-#: src/fs/fs_uri.c:565 src/fs/fs_uri.c:574
-msgid "SKS URI malformed (could not decode signature)"
+#: src/fs/fs_uri.c:570
+msgid "LOC URI malformed (wrong syntax for signature)"
 msgstr ""
 
-#: src/fs/fs_uri.c:586
-msgid "SKS URI malformed (could not parse expiration time)"
+#: src/fs/fs_uri.c:579
+msgid "LOC URI malformed (could not decode signature)"
 msgstr ""
 
-#: src/fs/fs_uri.c:598
-msgid "SKS URI malformed (signature failed validation)"
+#: src/fs/fs_uri.c:585
+msgid "LOC URI malformed (wrong syntax for expiration time)"
 msgstr ""
 
-#: src/fs/fs_uri.c:636
+#: src/fs/fs_uri.c:591
+msgid "LOC URI malformed (could not parse expiration time)"
+msgstr ""
+
+#: src/fs/fs_uri.c:603
+msgid "LOC URI malformed (signature failed validation)"
+msgstr ""
+
+#: src/fs/fs_uri.c:642
 msgid "Unrecognized URI type"
 msgstr ""
 
-#: src/fs/fs_uri.c:860
+#: src/fs/fs_uri.c:866
 #, fuzzy
 msgid "Lacking key configuration settings.\n"
 msgstr "GNUnet-konfiguration"
 
-#: src/fs/fs_uri.c:866
+#: src/fs/fs_uri.c:872
 #, fuzzy, c-format
 msgid "Could not access hostkey file `%s'.\n"
 msgstr "Kunde inte tolka konfigurationsfil \"%s\".\n"
 
-#: src/fs/fs_uri.c:1050 src/fs/fs_uri.c:1077
+#: src/fs/fs_uri.c:1057 src/fs/fs_uri.c:1084
 msgid "No keywords specified!\n"
 msgstr "Inga nyckelord angivna!\n"
 
-#: src/fs/fs_uri.c:1083
+#: src/fs/fs_uri.c:1090
 msgid "Number of double-quotes not balanced!\n"
 msgstr ""
 
@@ -3491,8 +3629,8 @@
 msgstr "Kommando \"%s\" kräver ett argument (\"%s\").\n"
 
 #: src/fs/gnunet-publish.c:778 src/fs/gnunet-publish.c:785
-#: src/transport/gnunet-transport.c:1284 src/transport/gnunet-transport.c:1314
-#: src/transport/gnunet-transport.c:1344
+#: src/transport/gnunet-transport.c:1387 src/transport/gnunet-transport.c:1417
+#: src/transport/gnunet-transport.c:1447
 #, c-format
 msgid "Option `%s' makes no sense without option `%s'.\n"
 msgstr ""
@@ -3586,21 +3724,57 @@
 msgid "Search GNUnet for files that were published on GNUnet"
 msgstr ""
 
-#: src/fs/gnunet-service-fs.c:271
+#: src/fs/gnunet-service-fs.c:277
 msgid "# running average P2P latency (ms)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs.c:326 src/fs/gnunet-service-fs.c:539
+#: src/fs/gnunet-service-fs.c:332 src/fs/gnunet-service-fs.c:545
 msgid "# Loopback routes suppressed"
 msgstr ""
 
-#: src/fs/gnunet-service-fs.c:639 src/hostlist/gnunet-daemon-hostlist.c:288
-#: src/topology/gnunet-daemon-topology.c:1254
-#: src/topology/gnunet-daemon-topology.c:1261
+#: src/fs/gnunet-service-fs.c:645 src/hostlist/gnunet-daemon-hostlist.c:303
+#: src/topology/gnunet-daemon-topology.c:1260
+#: src/topology/gnunet-daemon-topology.c:1267
 #, fuzzy, c-format
 msgid "Failed to connect to `%s' service.\n"
 msgstr "Misslyckades att initiera tjänsten \"%s\".\n"
 
+#: src/fs/gnunet-service-fs_cadet_client.c:484
+#, fuzzy
+msgid "# replies received via cadet"
+msgstr "# byte mottagna av typen %d"
+
+#: src/fs/gnunet-service-fs_cadet_client.c:498
+#, fuzzy
+msgid "# replies received via cadet dropped"
+msgstr "# byte mottagna av typen %d"
+
+#: src/fs/gnunet-service-fs_cadet_server.c:260
+#, fuzzy
+msgid "# Blocks transferred via cadet"
+msgstr "# byte skickade av typen %d"
+
+#: src/fs/gnunet-service-fs_cadet_server.c:352
+#, fuzzy
+msgid "# queries received via cadet not answered"
+msgstr "# byte mottogs via TCP"
+
+#: src/fs/gnunet-service-fs_cadet_server.c:432
+#, fuzzy
+msgid "# queries received via cadet"
+msgstr "# byte mottogs via TCP"
+
+#: src/fs/gnunet-service-fs_cadet_server.c:476
+#, fuzzy
+msgid "# cadet client connections rejected"
+msgstr "Nätverksanslutning"
+
+#: src/fs/gnunet-service-fs_cadet_server.c:482
+#: src/fs/gnunet-service-fs_cadet_server.c:522
+#, fuzzy
+msgid "# cadet connections active"
+msgstr "Nätverksanslutning"
+
 #: src/fs/gnunet-service-fs_cp.c:682
 #, fuzzy
 msgid "# migration stop messages received"
@@ -3754,42 +3928,6 @@
 msgid "# client searches updated (merged content seen list)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_mesh_client.c:484
-#, fuzzy
-msgid "# replies received via mesh"
-msgstr "# byte mottagna av typen %d"
-
-#: src/fs/gnunet-service-fs_mesh_client.c:498
-#, fuzzy
-msgid "# replies received via mesh dropped"
-msgstr "# byte mottagna av typen %d"
-
-#: src/fs/gnunet-service-fs_mesh_server.c:260
-#, fuzzy
-msgid "# Blocks transferred via mesh"
-msgstr "# byte skickade av typen %d"
-
-#: src/fs/gnunet-service-fs_mesh_server.c:352
-#, fuzzy
-msgid "# queries received via mesh not answered"
-msgstr "# byte mottogs via TCP"
-
-#: src/fs/gnunet-service-fs_mesh_server.c:432
-#, fuzzy
-msgid "# queries received via mesh"
-msgstr "# byte mottogs via TCP"
-
-#: src/fs/gnunet-service-fs_mesh_server.c:476
-#, fuzzy
-msgid "# mesh client connections rejected"
-msgstr "Nätverksanslutning"
-
-#: src/fs/gnunet-service-fs_mesh_server.c:482
-#: src/fs/gnunet-service-fs_mesh_server.c:522
-#, fuzzy
-msgid "# mesh connections active"
-msgstr "Nätverksanslutning"
-
 #: src/fs/gnunet-service-fs_pe.c:269
 msgid "# average retransmission delay (ms)"
 msgstr ""
@@ -3874,7 +4012,7 @@
 
 #: src/fs/gnunet-service-fs_pr.c:1192
 #, fuzzy
-msgid "# Replies received from MESH"
+msgid "# Replies received from CADET"
 msgstr "# byte mottagna via HTTP"
 
 #: src/fs/gnunet-service-fs_pr.c:1244
@@ -3982,7 +4120,7 @@
 msgid "Refusing `%s' request to HTTP server\n"
 msgstr ""
 
-#: src/gns/gnunet-bcd.c:355 src/hostlist/hostlist-server.c:567
+#: src/gns/gnunet-bcd.c:355 src/hostlist/gnunet-daemon-hostlist_server.c:695
 #, fuzzy, c-format
 msgid "Invalid port number %llu.  Exiting.\n"
 msgstr "Ogiltiga argument. Avslutar.\n"
@@ -4140,13 +4278,17 @@
 msgid "This program will import some GNS authorities into your GNS namestore."
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:105 src/hostlist/hostlist-client.c:469
-#: src/hostlist/hostlist-client.c:683 src/hostlist/hostlist-client.c:689
-#: src/hostlist/hostlist-client.c:741 src/hostlist/hostlist-client.c:750
-#: src/hostlist/hostlist-client.c:871 src/hostlist/hostlist-client.c:963
-#: src/hostlist/hostlist-client.c:968
-#: src/transport/plugin_transport_http_client.c:1062
-#: src/transport/plugin_transport_http_client.c:1077
+#: src/gns/gnunet-gns-proxy.c:105
+#: src/hostlist/gnunet-daemon-hostlist_client.c:524
+#: src/hostlist/gnunet-daemon-hostlist_client.c:741
+#: src/hostlist/gnunet-daemon-hostlist_client.c:747
+#: src/hostlist/gnunet-daemon-hostlist_client.c:800
+#: src/hostlist/gnunet-daemon-hostlist_client.c:809
+#: src/hostlist/gnunet-daemon-hostlist_client.c:931
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1026
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1031
+#: src/transport/plugin_transport_http_client.c:1095
+#: src/transport/plugin_transport_http_client.c:1110
 #, fuzzy, c-format
 msgid "%s failed at %s:%d: `%s'\n"
 msgstr "\"%s\" misslyckades vid %s:%d med fel: \"%s\".\n"
@@ -4290,36 +4432,36 @@
 msgid "Failed to connect to the DNS service!\n"
 msgstr "Misslyckades att ansluta till gnunetd.\n"
 
-#: src/gns/gnunet-service-gns_resolver.c:816
+#: src/gns/gnunet-service-gns_resolver.c:832
 #, 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:958
+#: src/gns/gnunet-service-gns_resolver.c:974
 #, c-format
 msgid "Skipping record of unsupported type %d\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns_resolver.c:1317
+#: src/gns/gnunet-service-gns_resolver.c:1333
 #, c-format
 msgid "GNS lookup resulted in DNS name that is too long (`%s')\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns_resolver.c:1817
+#: src/gns/gnunet-service-gns_resolver.c:1831
 msgid "GNS lookup recursion failed (no delegation record found)\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns_resolver.c:1841
+#: src/gns/gnunet-service-gns_resolver.c:1855
 #, 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:2123
+#: src/gns/gnunet-service-gns_resolver.c:2137
 #, c-format
 msgid "Zone %s was revoked, resolution fails\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns_resolver.c:2272
+#: src/gns/gnunet-service-gns_resolver.c:2286
 #, c-format
 msgid "Hostname `%s' is not well-formed, resolution fails\n"
 msgstr ""
@@ -4438,304 +4580,328 @@
 msgid "Modified %u addresses \n"
 msgstr ""
 
-#: src/hello/hello.c:944
+#: src/hello/hello.c:957
 #, fuzzy
 msgid "Failed to parse HELLO message: missing expiration time\n"
 msgstr "Kunde inte spara konfiguration!"
 
-#: src/hello/hello.c:953
+#: src/hello/hello.c:966
 #, fuzzy
 msgid "Failed to parse HELLO message: invalid expiration time\n"
 msgstr "Kunde inte spara konfiguration!"
 
-#: src/hello/hello.c:963
+#: src/hello/hello.c:976
 #, fuzzy
 msgid "Failed to parse HELLO message: malformed\n"
 msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 
-#: src/hello/hello.c:973
+#: src/hello/hello.c:986
 #, fuzzy
 msgid "Failed to parse HELLO message: missing transport plugin\n"
 msgstr "Kunde inte slå upp \"%s\": %s\n"
 
-#: src/hello/hello.c:990
+#: src/hello/hello.c:1004
 #, c-format
-msgid "Plugin `%s' not found\n"
+msgid "Plugin `%s' not found, skipping address\n"
 msgstr ""
 
-#: src/hello/hello.c:999
+#: src/hello/hello.c:1012
 #, c-format
 msgid "Plugin `%s' does not support URIs yet\n"
 msgstr ""
 
-#: src/hello/hello.c:1018
+#: src/hello/hello.c:1031
 #, fuzzy, c-format
 msgid "Failed to parse `%s' as an address for plugin `%s'\n"
 msgstr "Misslyckades att binda till UDP-port %d.\n"
 
-#: src/hostlist/gnunet-daemon-hostlist.c:259
+#: src/hello/hello.c:1104
+#, c-format
+msgid "HELLO URI contained %u addresses, added %u addresses\n"
+msgstr ""
+
+#: src/hostlist/gnunet-daemon-hostlist.c:274
 msgid ""
 "None of the functions for the hostlist daemon were enabled.  I have no "
 "reason to run!\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist.c:308
+#: src/hostlist/gnunet-daemon-hostlist.c:323
 msgid "advertise our hostlist to other peers"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist.c:313
+#: src/hostlist/gnunet-daemon-hostlist.c:328
 msgid ""
 "bootstrap using hostlists (it is highly recommended that you always use this "
 "option)"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist.c:316
+#: src/hostlist/gnunet-daemon-hostlist.c:331
 msgid "enable learning about hostlist servers from other peers"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist.c:320
+#: src/hostlist/gnunet-daemon-hostlist.c:335
 msgid "provide a hostlist server"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist.c:335
+#: src/hostlist/gnunet-daemon-hostlist.c:350
 msgid "GNUnet hostlist server and client"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:288
+#: src/hostlist/gnunet-daemon-hostlist_client.c:343
 msgid "# bytes downloaded from hostlist servers"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:309 src/hostlist/hostlist-client.c:339
+#: src/hostlist/gnunet-daemon-hostlist_client.c:364
+#: src/hostlist/gnunet-daemon-hostlist_client.c:394
 msgid "# invalid HELLOs downloaded from hostlist servers"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:312 src/hostlist/hostlist-client.c:342
+#: src/hostlist/gnunet-daemon-hostlist_client.c:367
+#: src/hostlist/gnunet-daemon-hostlist_client.c:397
 #, fuzzy, c-format
 msgid "Invalid `%s' message received from hostlist at `%s'\n"
 msgstr "Ogiltigt meddelande mottogs den %s:%d."
 
-#: src/hostlist/hostlist-client.c:330
+#: src/hostlist/gnunet-daemon-hostlist_client.c:385
 msgid "# valid HELLOs downloaded from hostlist servers"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:592 src/hostlist/hostlist-client.c:1333
+#: src/hostlist/gnunet-daemon-hostlist_client.c:650
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1401
 msgid "# advertised hostlist URIs"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:622
+#: src/hostlist/gnunet-daemon-hostlist_client.c:680
 #, c-format
 msgid "# advertised URI `%s' downloaded"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:664
+#: src/hostlist/gnunet-daemon-hostlist_client.c:722
 #, c-format
 msgid ""
 "Advertised hostlist with URI `%s' could not be downloaded. Advertised URI "
 "gets dismissed.\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:802
+#: src/hostlist/gnunet-daemon-hostlist_client.c:862
 #, fuzzy, c-format
 msgid "Timeout trying to download hostlist from `%s'\n"
 msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 
-#: src/hostlist/hostlist-client.c:816
+#: src/hostlist/gnunet-daemon-hostlist_client.c:876
 #, c-format
 msgid "Download limit of %u bytes exceeded, stopping download\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:836
+#: src/hostlist/gnunet-daemon-hostlist_client.c:896
 #, fuzzy, c-format
 msgid "Download of hostlist from `%s' failed: `%s'\n"
 msgstr ""
 "Uppladdning av \"%s\" klar, aktuell genomsnittshastighet är %8.3f kbps.\n"
 
-#: src/hostlist/hostlist-client.c:842
+#: src/hostlist/gnunet-daemon-hostlist_client.c:902
 #, fuzzy, c-format
 msgid "Download of hostlist `%s' completed.\n"
 msgstr ""
 "Uppladdning av \"%s\" klar, aktuell genomsnittshastighet är %8.3f kbps.\n"
 
-#: src/hostlist/hostlist-client.c:850
+#: src/hostlist/gnunet-daemon-hostlist_client.c:910
 #, c-format
 msgid "Adding successfully tested hostlist `%s' datastore.\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:903
+#: src/hostlist/gnunet-daemon-hostlist_client.c:963
 #, c-format
 msgid "Bootstrapping using hostlist at `%s'.\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:911
+#: src/hostlist/gnunet-daemon-hostlist_client.c:971
 msgid "# hostlist downloads initiated"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1040 src/hostlist/hostlist-client.c:1506
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1103
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1646
 msgid "# milliseconds between hostlist downloads"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1049
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1112
 #, c-format
 msgid "Have %u/%u connections.  Will consider downloading hostlist in %s\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1109 src/hostlist/hostlist-client.c:1125
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1172
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1188
 #, fuzzy
 msgid "# active connections"
 msgstr "Nätverksanslutning"
 
-#: src/hostlist/hostlist-client.c:1280
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1347
 #, fuzzy, c-format
 msgid "Loading saved hostlist entries from file `%s' \n"
 msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 
-#: src/hostlist/hostlist-client.c:1285
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1352
 #, fuzzy, c-format
 msgid "Hostlist file `%s' does not exist\n"
 msgstr "antal meddelanden att använda per iteration"
 
-#: src/hostlist/hostlist-client.c:1296
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1361
 #, fuzzy, c-format
 msgid "Could not open file `%s' for reading to load hostlists: %s\n"
 msgstr "Kunde inte slå upp \"%s\": %s\n"
 
-#: src/hostlist/hostlist-client.c:1329
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1395
 #, c-format
 msgid "%u hostlist URIs loaded from file\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1331
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1398
 msgid "# hostlist URIs read from file"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1376
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1445
 #, fuzzy, c-format
 msgid "Could not open file `%s' for writing to save hostlists: %s\n"
 msgstr "Kunde inte slå upp \"%s\": %s\n"
 
-#: src/hostlist/hostlist-client.c:1381
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1450
 #, fuzzy, c-format
 msgid "Writing %u hostlist URIs to `%s'\n"
 msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 
-#: src/hostlist/hostlist-client.c:1405 src/hostlist/hostlist-client.c:1422
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1474
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1491
 #, c-format
 msgid "Error writing hostlist URIs to file `%s'\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1417
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1486
 msgid "# hostlist URIs written to file"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1471
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1581
+#: src/transport/plugin_transport_http_client.c:1866
+#, c-format
+msgid "Invalid proxy type: `%s', disabling proxy! Check configuration!\n"
+msgstr ""
+
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1611
 msgid "Learning is enabled on this peer\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1483
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1623
 msgid "Learning is not enabled on this peer\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1495
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1635
 #, c-format
 msgid ""
 "Since learning is not enabled on this peer, hostlist file `%s' was removed\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1499
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1639
 #, c-format
 msgid "Hostlist file `%s' could not be removed\n"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:137
+#: src/hostlist/gnunet-daemon-hostlist_server.c:143
 #, fuzzy
 msgid "bytes in hostlist"
 msgstr "# byte krypterade"
 
-#: src/hostlist/hostlist-server.c:161
+#: src/hostlist/gnunet-daemon-hostlist_server.c:168
 msgid "expired addresses encountered"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:189 src/hostlist/hostlist-server.c:425
-#: src/peerinfo-tool/gnunet-peerinfo.c:350
-#: src/peerinfo-tool/gnunet-peerinfo.c:419
-#: src/peerinfo-tool/gnunet-peerinfo.c:490
+#: src/hostlist/gnunet-daemon-hostlist_server.c:203
+#: src/hostlist/gnunet-daemon-hostlist_server.c:534
+#: src/peerinfo-tool/gnunet-peerinfo.c:361
+#: src/peerinfo-tool/gnunet-peerinfo.c:430
+#: src/peerinfo-tool/gnunet-peerinfo.c:501
 #: src/topology/gnunet-daemon-topology.c:925
 #, fuzzy, c-format
 msgid "Error in communication with PEERINFO service: %s\n"
 msgstr "Skriv ut information om GNUnets motparter."
 
-#: src/hostlist/hostlist-server.c:210
+#: src/hostlist/gnunet-daemon-hostlist_server.c:227
 msgid "HELLOs without addresses encountered (ignored)"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:224
+#: src/hostlist/gnunet-daemon-hostlist_server.c:243
 msgid "bytes not included in hostlist (size limit)"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:268
+#: src/hostlist/gnunet-daemon-hostlist_server.c:363
 #, c-format
 msgid "Refusing `%s' request to hostlist server\n"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:271
+#: src/hostlist/gnunet-daemon-hostlist_server.c:366
 msgid "hostlist requests refused (not HTTP GET)"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:284
+#: src/hostlist/gnunet-daemon-hostlist_server.c:380
 #, c-format
 msgid "Refusing `%s' request with %llu bytes of upload data\n"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:288
+#: src/hostlist/gnunet-daemon-hostlist_server.c:384
 msgid "hostlist requests refused (upload data)"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:296
+#: src/hostlist/gnunet-daemon-hostlist_server.c:391
 msgid "Could not handle hostlist request since I do not have a response yet\n"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:299
+#: src/hostlist/gnunet-daemon-hostlist_server.c:394
 msgid "hostlist requests refused (not ready)"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:303
+#: src/hostlist/gnunet-daemon-hostlist_server.c:399
 msgid "Received request for our hostlist\n"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:304
+#: src/hostlist/gnunet-daemon-hostlist_server.c:401
 msgid "hostlist requests processed"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:346
+#: src/hostlist/gnunet-daemon-hostlist_server.c:448
 msgid "# hostlist advertisements send"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:390
+#: src/hostlist/gnunet-daemon-hostlist_server.c:496
 msgid "Advertisement message could not be queued by core\n"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:557 src/peerinfo-tool/gnunet-peerinfo.c:639
-#: src/transport/gnunet-service-transport.c:1114
+#: src/hostlist/gnunet-daemon-hostlist_server.c:683
+#: src/peerinfo-tool/gnunet-peerinfo.c:650
+#: src/transport/gnunet-service-transport.c:1136
 #, fuzzy
 msgid "Could not access PEERINFO service.  Exiting.\n"
 msgstr "Kunde inte komma åt namnrymdsinformation.\n"
 
-#: src/hostlist/hostlist-server.c:576
+#: src/hostlist/gnunet-daemon-hostlist_server.c:707
 #, c-format
 msgid "Hostlist service starts on %s:%llu\n"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:590
+#: src/hostlist/gnunet-daemon-hostlist_server.c:722
 #, fuzzy, c-format
 msgid "Address to obtain hostlist: `%s'\n"
 msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 
-#: src/hostlist/hostlist-server.c:630
+#: src/hostlist/gnunet-daemon-hostlist_server.c:760
 #, fuzzy, c-format
-msgid "`%s' is not a valid IP address! Ignoring BINDTOIP.\n"
+msgid "`%s' is not a valid IPv4 address! Ignoring BINDTOIPV4.\n"
 msgstr "\"%s\" är inte tillgänglig."
 
-#: src/hostlist/hostlist-server.c:673
+#: src/hostlist/gnunet-daemon-hostlist_server.c:780
+#, fuzzy, c-format
+msgid "`%s' is not a valid IPv6 address! Ignoring BINDTOIPV6.\n"
+msgstr "\"%s\" är inte tillgänglig."
+
+#: src/hostlist/gnunet-daemon-hostlist_server.c:820
 #, c-format
 msgid "Could not start hostlist HTTP server on port %u\n"
 msgstr ""
@@ -4827,57 +4993,6 @@
 msgid "Failed to create directory `%s' for storing egos\n"
 msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 
-#: src/mesh/gnunet-mesh.c:357
-#, fuzzy, c-format
-msgid "Invalid target `%s'\n"
-msgstr "Ogiltigt argument: \"%s\"\n"
-
-#: src/mesh/gnunet-mesh.c:607
-#, fuzzy, c-format
-msgid "Invalid peer ID `%s'\n"
-msgstr "Ogiltiga argument: "
-
-#: src/mesh/gnunet-mesh.c:650
-#, fuzzy, c-format
-msgid "Invalid tunnel owner `%s'\n"
-msgstr "Ogiltigt format för IP: \"%s\"\n"
-
-#: src/mesh/gnunet-mesh.c:716
-msgid "You must NOT give a TARGETwhen using 'request all' options\n"
-msgstr ""
-
-#: src/mesh/gnunet-mesh.c:807
-#, fuzzy
-msgid "provide information about a particular connection"
-msgstr "Skriv ut information om GNUnets motparter."
-
-#: src/mesh/gnunet-mesh.c:810
-msgid "activate echo mode"
-msgstr ""
-
-#: src/mesh/gnunet-mesh.c:816
-msgid "port to listen to (default; 0)"
-msgstr ""
-
-#: src/mesh/gnunet-mesh.c:819 src/mesh/gnunet-mesh.c:822
-#, fuzzy
-msgid "provide information about all peers"
-msgstr "Skriv ut information om GNUnets motparter."
-
-#: src/mesh/gnunet-mesh.c:825
-#, fuzzy
-msgid "provide information about a particular tunnel"
-msgstr "Skriv ut information om GNUnets motparter."
-
-#: src/mesh/gnunet-mesh.c:828
-#, fuzzy
-msgid "provide information about all tunnels"
-msgstr "Skriv ut information om GNUnets motparter."
-
-#: src/mesh/gnunet-service-mesh_peer.c:390
-msgid "Wrong CORE service\n"
-msgstr ""
-
 #: src/mysql/mysql.c:174
 #, c-format
 msgid "Trying to use file `%s' for MySQL configuration.\n"
@@ -4893,7 +5008,7 @@
 msgid "No records found for `%s'"
 msgstr "%d filer hittades i katalog.\n"
 
-#: src/namecache/gnunet-namecache.c:124 src/namestore/gnunet-namestore.c:397
+#: src/namecache/gnunet-namecache.c:124 src/namestore/gnunet-namestore.c:402
 #, c-format
 msgid "\tCorrupt or unsupported record of type %u\n"
 msgstr ""
@@ -4903,7 +5018,7 @@
 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:695
+#: src/namecache/gnunet-namecache.c:195 src/namestore/gnunet-namestore.c:783
 #, fuzzy, c-format
 msgid "Invalid public key for reverse lookup `%s'\n"
 msgstr "Ogiltigt argument: \"%s\"\n"
@@ -4913,7 +5028,7 @@
 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:931
+#: src/namecache/gnunet-namecache.c:234 src/namestore/gnunet-namestore.c:1020
 msgid "name of the record to add/delete/display"
 msgstr ""
 
@@ -4922,7 +5037,7 @@
 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:963
+#: src/namecache/gnunet-namecache.c:248 src/namestore/gnunet-namestore.c:1055
 #, fuzzy
 msgid "GNUnet zone manipulation tool"
 msgstr "GNUnet-konfiguration"
@@ -4937,155 +5052,170 @@
 msgid "Failed to create indices\n"
 msgstr "Kunde inte skapa namnrymd \"%s\" (existerar?).\n"
 
-#: src/namestore/gnunet-namestore.c:303
+#: src/namestore/gnunet-namestore.c:308
 #, fuzzy, c-format
 msgid "Adding record failed: %s\n"
 msgstr ""
 "\n"
 "Fel vid uppladdning av fil: %s\n"
 
-#: src/namestore/gnunet-namestore.c:332
+#: src/namestore/gnunet-namestore.c:337
 #, 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:339
+#: src/namestore/gnunet-namestore.c:344
 #, fuzzy, c-format
 msgid "Deleting record failed%s%s\n"
 msgstr ""
 "\n"
 "Fel vid uppladdning av fil: %s\n"
 
-#: src/namestore/gnunet-namestore.c:558
+#: src/namestore/gnunet-namestore.c:567
 #, c-format
+msgid "There are no records under label `%s' that could be deleted.\n"
+msgstr ""
+
+#: src/namestore/gnunet-namestore.c:606
+#, c-format
+msgid ""
+"There are no records under label `%s' that match the request for deletion.\n"
+msgstr ""
+
+#: src/namestore/gnunet-namestore.c:647
+#, c-format
 msgid "No options given\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:569
+#: src/namestore/gnunet-namestore.c:658
 #: 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: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
+#: src/namestore/gnunet-namestore.c:666 src/namestore/gnunet-namestore.c:675
+#: src/namestore/gnunet-namestore.c:692 src/namestore/gnunet-namestore.c:714
+#: src/namestore/gnunet-namestore.c:754
 #, fuzzy, c-format
 msgid "Missing option `%s' for operation `%s'\n"
 msgstr "Konfigurationsfil \"%s\" skapad.\n"
 
-#: src/namestore/gnunet-namestore.c:578 src/namestore/gnunet-namestore.c:587
-#: src/namestore/gnunet-namestore.c:604 src/namestore/gnunet-namestore.c:626
+#: src/namestore/gnunet-namestore.c:667 src/namestore/gnunet-namestore.c:676
+#: src/namestore/gnunet-namestore.c:693 src/namestore/gnunet-namestore.c:715
 msgid "add"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:595
+#: src/namestore/gnunet-namestore.c:684
 #, fuzzy, c-format
 msgid "Unsupported type `%s'\n"
 msgstr "Kommando \"%s\" stöds ej.  Avbryter.\n"
 
-#: src/namestore/gnunet-namestore.c:615
+#: src/namestore/gnunet-namestore.c:704
 #, 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:651
+#: src/namestore/gnunet-namestore.c:740
 #, fuzzy, c-format
 msgid "Invalid time format `%s'\n"
 msgstr "Ogiltigt format för IP: \"%s\"\n"
 
-#: src/namestore/gnunet-namestore.c:666
+#: src/namestore/gnunet-namestore.c:755
 msgid "del"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:715
-#: src/peerinfo-tool/gnunet-peerinfo.c:723
+#: src/namestore/gnunet-namestore.c:803
+#: src/peerinfo-tool/gnunet-peerinfo.c:734
 #, fuzzy, c-format
 msgid "Invalid URI `%s'\n"
 msgstr "Ogiltiga argument: "
 
-#: src/namestore/gnunet-namestore.c:750
+#: src/namestore/gnunet-namestore.c:838
 #, fuzzy, c-format
 msgid "Invalid nick `%s'\n"
 msgstr "Ogiltiga argument: "
 
-#: src/namestore/gnunet-namestore.c:790
+#: src/namestore/gnunet-namestore.c:878
 #, 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:817
+#: src/namestore/gnunet-namestore.c:905
 #, 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:853
+#: src/namestore/gnunet-namestore.c:941
 #, fuzzy, c-format
 msgid "Identity service is not running\n"
 msgstr "\"%s\" är inte en fil.\n"
 
-#: src/namestore/gnunet-namestore.c:865
+#: src/namestore/gnunet-namestore.c:953
 #, fuzzy, c-format
 msgid "Cannot connect to identity service\n"
 msgstr "Kunde inte ansluta till gnunetd.\n"
 
-#: src/namestore/gnunet-namestore.c:913
+#: src/namestore/gnunet-namestore.c:1002
 msgid "add record"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:916
+#: src/namestore/gnunet-namestore.c:1005
 msgid "delete record"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:919
+#: src/namestore/gnunet-namestore.c:1008
 msgid "display records"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:922
+#: src/namestore/gnunet-namestore.c:1011
 msgid ""
 "expiration time for record to use (for adding only), \"never\" is possible"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:925
+#: src/namestore/gnunet-namestore.c:1014
 #, fuzzy
 msgid "set the desired nick name for the zone"
 msgstr "Skriv ut information om GNUnets motparter."
 
-#: src/namestore/gnunet-namestore.c:928
+#: src/namestore/gnunet-namestore.c:1017
 #, fuzzy
 msgid "monitor changes in the namestore"
 msgstr "Misslyckades att ansluta till gnunetd.\n"
 
-#: src/namestore/gnunet-namestore.c:934
+#: src/namestore/gnunet-namestore.c:1023
 #, fuzzy
 msgid "determine our name for the given PKEY"
 msgstr "Skriv ut information om GNUnets motparter."
 
-#: src/namestore/gnunet-namestore.c:937
+#: src/namestore/gnunet-namestore.c:1026
 msgid "type of the record to add/delete/display"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:940
+#: src/namestore/gnunet-namestore.c:1029
 msgid "URI to import into our zone"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:943
+#: src/namestore/gnunet-namestore.c:1032
 msgid "value of the record to add/delete"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:946
+#: src/namestore/gnunet-namestore.c:1035
 msgid "create or list public record"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:949
+#: src/namestore/gnunet-namestore.c:1038
+msgid "create record that is pending approval (and thus for now inactive)"
+msgstr ""
+
+#: src/namestore/gnunet-namestore.c:1041
 msgid ""
 "create shadow record (only valid if all other records of the same type have "
 "expired"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:952
+#: src/namestore/gnunet-namestore.c:1044
 #, fuzzy
 msgid "name of the ego controlling the zone"
 msgstr "Visa värde av alternativet"
@@ -5168,59 +5298,63 @@
 msgid "GNUnet NAT traversal test helper daemon"
 msgstr ""
 
-#: src/nat/nat_auto.c:170
+#: src/nat/nat_auto.c:175
 msgid "NAT traversal with ICMP Server timed out.\n"
 msgstr ""
 
-#: src/nat/nat_auto.c:203
+#: src/nat/nat_auto.c:207
 msgid "NAT traversal with ICMP Server succeeded.\n"
 msgstr ""
 
-#: src/nat/nat_auto.c:204
+#: src/nat/nat_auto.c:208
 msgid "NAT traversal with ICMP Server failed.\n"
 msgstr ""
 
-#: src/nat/nat_auto.c:225
+#: src/nat/nat_auto.c:229
 #, fuzzy
 msgid "Testing connection reversal with ICMP server.\n"
 msgstr "Skriv ut information om GNUnets motparter."
 
-#: src/nat/nat_auto.c:274
+#: src/nat/nat_auto.c:284
 #, fuzzy, c-format
 msgid "Detected external IP `%s'\n"
 msgstr "Mottog ogiltig RPC \"%s\".\n"
 
-#: src/nat/nat_auto.c:344
+#: src/nat/nat_auto.c:362
 msgid "This system has a global IPv6 address, setting IPv6 to supported.\n"
 msgstr ""
 
-#: src/nat/nat_auto.c:360
+#: src/nat/nat_auto.c:378
 #, c-format
 msgid "Detected internal network address `%s'.\n"
 msgstr ""
 
-#: src/nat/nat_auto.c:413
+#: src/nat/nat_auto.c:441
 msgid "upnpc found, enabling its use\n"
 msgstr ""
 
-#: src/nat/nat_auto.c:414
+#: src/nat/nat_auto.c:442
 #, fuzzy
 msgid "upnpc not found\n"
 msgstr "Kommando \"%s\" hittades inte!\n"
 
-#: src/nat/nat_auto.c:447
-msgid "gnunet-helper-nat-server found, testing it\n"
+#: src/nat/nat_auto.c:472
+msgid "test_icmp_server not possible, as we have no public IPv4 address\n"
 msgstr ""
 
-#: src/nat/nat_auto.c:448
+#: src/nat/nat_auto.c:480
+msgid "test_icmp_server not possible, as we are not behind NAT\n"
+msgstr ""
+
+#: src/nat/nat_auto.c:488
 msgid "No working gnunet-helper-nat-server found\n"
 msgstr ""
 
-#: src/nat/nat_auto.c:482
+#: src/nat/nat_auto.c:527
 msgid "gnunet-helper-nat-client found, enabling it\n"
 msgstr ""
 
-#: src/nat/nat_auto.c:483
+#: src/nat/nat_auto.c:528
 msgid "gnunet-helper-nat-client not found or behind NAT, disabling it\n"
 msgstr ""
 
@@ -5234,60 +5368,49 @@
 msgid "Failed to start %s\n"
 msgstr "Misslyckades att starta samling.\n"
 
-#: src/nat/nat.c:1205
+#: src/nat/nat.c:1032
+msgid "Error while running upnp client:\n"
+msgstr ""
+
+#: src/nat/nat.c:1102
+#, fuzzy, c-format
+msgid "Failed to run upnp client for port %u\n"
+msgstr "Misslyckades att initiera tjänsten \"%s\".\n"
+
+#: src/nat/nat.c:1243
 msgid "malformed"
 msgstr ""
 
-#: src/nat/nat.c:1276 src/nat/nat.c:1288
+#: src/nat/nat.c:1297
+msgid ""
+"UPnP enabled in configuration, but UPnP client `upnpc` command not found, "
+"disabling UPnP \n"
+msgstr ""
+
+#: src/nat/nat.c:1324 src/nat/nat.c:1336
 #, c-format
 msgid ""
 "Configuration requires `%s', but binary is not installed properly (SUID bit "
 "not set).  Option disabled.\n"
 msgstr ""
 
-#: src/nat/nat.c:1426
+#: src/nat/nat.c:1474
 msgid "Internal IP address not known, cannot use ICMP NAT traversal method\n"
 msgstr ""
 
-#: src/nat/nat.c:1442
+#: src/nat/nat.c:1490
 #, c-format
 msgid "Running gnunet-helper-nat-client %s %s %u\n"
 msgstr ""
 
-#: src/nat/nat_mini.c:155
-msgid "no valid address was returned by `external-ip'"
-msgstr ""
-
-#: src/nat/nat_mini.c:175
-msgid "`external-ip' command not found"
-msgstr ""
-
-#: src/nat/nat_mini.c:201
+#: src/nat/nat_mini.c:203
 msgid "`external-ip' command not found\n"
 msgstr ""
 
-#: src/nat/nat_mini.c:366
-#, fuzzy
-msgid "Failed to run `upnpc` command"
-msgstr "Misslyckades att starta samling.\n"
-
-#: src/nat/nat_mini.c:512
-msgid "`upnpc' command took too long, process killed"
-msgstr ""
-
-#: src/nat/nat_mini.c:540
-msgid "`upnpc' command failed to establish port mapping"
-msgstr ""
-
-#: src/nat/nat_mini.c:604
+#: src/nat/nat_mini.c:609
 msgid "`upnpc' command not found\n"
 msgstr ""
 
-#: src/nat/nat_mini.c:608
-#, fuzzy
-msgid "`upnpc` command not found"
-msgstr "Kommando \"%s\" hittades inte!\n"
-
 #: src/nat/nat_test.c:351
 #, fuzzy
 msgid "Failed to connect to `gnunet-nat-server'\n"
@@ -5298,6 +5421,11 @@
 msgid "Failed to create listen socket bound to `%s' for NAT test: %s\n"
 msgstr ""
 
+#: src/nat/nat_test.c:453
+#, fuzzy
+msgid "NAT test failed to start NAT library\n"
+msgstr "Misslyckades att starta samling.\n"
+
 #: src/nse/gnunet-nse.c:117
 #, fuzzy
 msgid "NSE service is not running\n"
@@ -5401,7 +5529,7 @@
 msgid "aborted due to explicit disconnect request"
 msgstr ""
 
-#: src/peerinfo/peerinfo_api.c:356
+#: src/peerinfo/peerinfo_api.c:356 src/sensor/sensor_api.c:519
 #, fuzzy
 msgid "failed to transmit request (service down?)"
 msgstr "Misslyckades att skicka HTTP-begäran till värd \"%s\": %s\n"
@@ -5428,89 +5556,94 @@
 msgid "Could not connect to `%s' service.\n"
 msgstr "Kunde inte ansluta till gnunetd.\n"
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:232
+#: src/peerinfo-tool/gnunet-peerinfo.c:233
 #, fuzzy, c-format
 msgid "%sPeer `%s'\n"
 msgstr "Jag är ändpunkt \"%s\".\n"
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:239
+#: src/peerinfo-tool/gnunet-peerinfo.c:240
 #, c-format
 msgid "\tExpires: %s \t %s\n"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:428
+#: src/peerinfo-tool/gnunet-peerinfo.c:282
 #, fuzzy, c-format
+msgid "Failure: Cannot convert address to string for peer `%s'\n"
+msgstr "Misslyckades att binda till UDP-port %d.\n"
+
+#: src/peerinfo-tool/gnunet-peerinfo.c:439
+#, fuzzy, c-format
 msgid "Failure: Did not receive %s\n"
 msgstr "Misslyckades att leverera \"%s\" meddelande.\n"
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:436
+#: src/peerinfo-tool/gnunet-peerinfo.c:447
 #, c-format
 msgid "Failure: Received invalid %s\n"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:445
+#: src/peerinfo-tool/gnunet-peerinfo.c:456
 #, fuzzy, c-format
 msgid "Failed to write HELLO with %u bytes to file `%s'\n"
 msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:458
+#: src/peerinfo-tool/gnunet-peerinfo.c:469
 #, c-format
 msgid "Wrote %s HELLO containing %u addresses with %u bytes to file `%s'\n"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:522
+#: src/peerinfo-tool/gnunet-peerinfo.c:533
 #, c-format
 msgid "Failure adding HELLO: %s\n"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:633
+#: src/peerinfo-tool/gnunet-peerinfo.c:644
 #, fuzzy, c-format
 msgid "Service `%s' is not running, please start GNUnet\n"
 msgstr "\"%s\" är inte en fil.\n"
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:654 src/util/gnunet-scrypt.c:224
+#: src/peerinfo-tool/gnunet-peerinfo.c:665 src/util/gnunet-scrypt.c:224
 #, fuzzy, c-format
 msgid "Loading hostkey from `%s' failed.\n"
 msgstr "Tolkning av HTTP-svar för URL \"%s\" misslyckades.\n"
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:745
+#: src/peerinfo-tool/gnunet-peerinfo.c:756
 #, c-format
 msgid "I am peer `%s'.\n"
 msgstr "Jag är ändpunkt \"%s\".\n"
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:789
+#: src/peerinfo-tool/gnunet-peerinfo.c:800
 msgid "don't resolve host names"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:792
+#: src/peerinfo-tool/gnunet-peerinfo.c:803
 msgid "output only the identity strings"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:795
+#: src/peerinfo-tool/gnunet-peerinfo.c:806
 msgid "include friend-only information"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:798
+#: src/peerinfo-tool/gnunet-peerinfo.c:809
 msgid "output our own identity only"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:801
+#: src/peerinfo-tool/gnunet-peerinfo.c:812
 msgid "list all known peers"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:804
+#: src/peerinfo-tool/gnunet-peerinfo.c:815
 msgid "dump hello to file"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:807
+#: src/peerinfo-tool/gnunet-peerinfo.c:818
 msgid "also output HELLO uri(s)"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:810
+#: src/peerinfo-tool/gnunet-peerinfo.c:821
 msgid "add given HELLO uri to the database"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:821
+#: src/peerinfo-tool/gnunet-peerinfo.c:832
 #, fuzzy
 msgid "Print information about peers."
 msgstr "Skriv ut information om GNUnets motparter."
@@ -5533,6 +5666,36 @@
 msgid "Failed to load transport plugin for `%s'\n"
 msgstr "Kunde inte slå upp \"%s\": %s\n"
 
+#: src/peerstore/gnunet-peerstore.c:97
+msgid "peerstore"
+msgstr ""
+
+#: src/peerstore/peerstore_api.c:486
+#, fuzzy
+msgid "Error communicating with `PEERSTORE' service."
+msgstr "Skriv ut information om GNUnets motparter."
+
+#: src/peerstore/peerstore_api.c:503
+#, fuzzy
+msgid "Received a malformed response from service."
+msgstr "Mottog ogiltig \"%s\" begäran (storlek %d)\n"
+
+#: src/peerstore/plugin_peerstore_sqlite.c:352
+#: src/psycstore/plugin_psycstore_sqlite.c:276
+#, fuzzy, c-format
+msgid ""
+"Error executing SQL query: %s\n"
+"  %s\n"
+msgstr "Fel vid skapandet av användare"
+
+#: src/peerstore/plugin_peerstore_sqlite.c:377
+#: src/psycstore/plugin_psycstore_sqlite.c:253
+#, fuzzy, c-format
+msgid ""
+"Error preparing SQL query: %s\n"
+"  %s\n"
+msgstr "Fel vid skapandet av användare"
+
 #: src/postgres/postgres.c:59
 #, fuzzy, c-format
 msgid "`%s:%s' failed at %s:%d with error: %s"
@@ -5630,20 +5793,6 @@
 msgid "`%s' failed at %s:%d with error: %s (%d)\n"
 msgstr "\"%s\" misslyckades vid %s:%d med fel: %s\n"
 
-#: src/psycstore/plugin_psycstore_sqlite.c:253
-#, fuzzy, c-format
-msgid ""
-"Error preparing SQL query: %s\n"
-"  %s\n"
-msgstr "Fel vid skapandet av användare"
-
-#: src/psycstore/plugin_psycstore_sqlite.c:276
-#, fuzzy, c-format
-msgid ""
-"Error executing SQL query: %s\n"
-"  %s\n"
-msgstr "Fel vid skapandet av användare"
-
 #: src/psycstore/plugin_psycstore_sqlite.c:1796
 msgid "SQLite database running\n"
 msgstr ""
@@ -5683,7 +5832,7 @@
 
 #: src/pt/gnunet-daemon-pt.c:888
 #, fuzzy
-msgid "# DNS requests dropped (DNS mesh channel down)"
+msgid "# DNS requests dropped (DNS cadet channel down)"
 msgstr "# byte mottogs via TCP"
 
 #: src/pt/gnunet-daemon-pt.c:896
@@ -5719,7 +5868,7 @@
 msgstr "GNUnet-konfiguration"
 
 #: src/regex/gnunet-daemon-regexprofiler.c:380
-msgid "Daemon to announce regular expressions for the peer using mesh."
+msgid "Daemon to announce regular expressions for the peer using cadet."
 msgstr ""
 
 #: src/regex/gnunet-regex-profiler.c:1288
@@ -5925,249 +6074,317 @@
 msgid "Could not open revocation database file!"
 msgstr "Kunde inte ansluta till gnunetd.\n"
 
-#: src/scalarproduct/gnunet-scalarproduct.c:225
+#: src/scalarproduct/gnunet-scalarproduct.c:224
 #, fuzzy
 msgid "You must specify at least one message ID to check!\n"
 msgstr "Du måste ange en lista av filer att lägga in.\n"
 
-#: src/scalarproduct/gnunet-scalarproduct.c:232
+#: src/scalarproduct/gnunet-scalarproduct.c:231
 msgid "This program needs a session identifier for comparing vectors.\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-scalarproduct.c:239
+#: src/scalarproduct/gnunet-scalarproduct.c:238
 msgid "Please give a session key for --input_key!\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-scalarproduct.c:251
+#: src/scalarproduct/gnunet-scalarproduct.c:250
 #, c-format
 msgid ""
 "Tried to set initiator mode, as peer ID was given. However, `%s' is not a "
 "valid peer identifier.\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-scalarproduct.c:278
-#: src/scalarproduct/gnunet-scalarproduct.c:314
-#, fuzzy, c-format
-msgid "Could not convert `%s' to int32_t.\n"
-msgstr "Kunde inte ansluta till gnunetd.\n"
-
-#: src/scalarproduct/gnunet-scalarproduct.c:286
+#: src/scalarproduct/gnunet-scalarproduct.c:261
 msgid "Need elements to compute the vectorproduct, got none.\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-scalarproduct.c:346
+#: src/scalarproduct/gnunet-scalarproduct.c:283
 #, fuzzy, c-format
-msgid "Could not convert `%s' to integer.\n"
+msgid "Malformed input, could not parse `%s'\n"
+msgstr "Misslyckades att starta samling.\n"
+
+#: src/scalarproduct/gnunet-scalarproduct.c:296
+#, fuzzy, c-format
+msgid "Could not convert `%s' to int64_t.\n"
 msgstr "Kunde inte ansluta till gnunetd.\n"
 
-#: src/scalarproduct/gnunet-scalarproduct.c:407
+#: src/scalarproduct/gnunet-scalarproduct.c:345
 msgid ""
 "A comma separated list of elements to compare as vector with our remote peer."
 msgstr ""
 
-#: src/scalarproduct/gnunet-scalarproduct.c:410
+#: src/scalarproduct/gnunet-scalarproduct.c:348
 msgid ""
-"A comma separated mask to select which elements should actually be compared."
-msgstr ""
-
-#: src/scalarproduct/gnunet-scalarproduct.c:413
-msgid ""
 "[Optional] peer to calculate our scalarproduct with. If this parameter is "
 "not given, the service will wait for a remote peer to compute the request."
 msgstr ""
 
-#: src/scalarproduct/gnunet-scalarproduct.c:416
+#: src/scalarproduct/gnunet-scalarproduct.c:351
 msgid "Transaction ID shared with peer."
 msgstr ""
 
-#: src/scalarproduct/gnunet-scalarproduct.c:425
+#: src/scalarproduct/gnunet-scalarproduct.c:360
 msgid "Calculate the Vectorproduct with a GNUnet peer."
 msgstr ""
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:541
+#: src/scalarproduct/gnunet-service-scalarproduct.c:678
 #, fuzzy, c-format
-msgid "Client (%p) disconnected from us.\n"
+msgid "Client %p disconnected from us.\n"
 msgstr "\"%s\" ansluten till \"%s\".\n"
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:613
-#: src/scalarproduct/gnunet-service-scalarproduct.c:702
+#: src/scalarproduct/gnunet-service-scalarproduct.c:748
 #, fuzzy, c-format
 msgid "Could not send message to client (%p)!\n"
 msgstr "Kunde inte skicka begäran till gnunetd.\n"
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:619
+#: src/scalarproduct/gnunet-service-scalarproduct.c:759
 #, c-format
 msgid "Sending session-end notification to client (%p) for session %s\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:712
-#, c-format
-msgid "Sent result to client (%p), this session (%s) has ended!\n"
-msgstr ""
+#: src/scalarproduct/gnunet-service-scalarproduct.c:781
+#: src/scalarproduct/gnunet-service-scalarproduct.c:1459
+#, fuzzy, c-format
+msgid "Successfully created new channel to peer (%s)!\n"
+msgstr "Åtkomst nekad för \"%s\" vid %s:%d.\n"
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:766
-#: src/scalarproduct/gnunet-service-scalarproduct.c:855
-msgid "Could not send service-response message via mesh!)\n"
-msgstr ""
-
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1028
-#, c-format
-msgid "Failed to communicate with `%s', scalar product calculation aborted.\n"
-msgstr ""
-
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1099
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1208
+#: src/scalarproduct/gnunet-service-scalarproduct.c:818
+#: src/scalarproduct/gnunet-service-scalarproduct.c:1469
+#: src/scalarproduct/gnunet-service-scalarproduct.c:1539
 #, fuzzy
 msgid "Transmitting service request.\n"
 msgstr "Startade samling \"%s\".\n"
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1108
+#: src/scalarproduct/gnunet-service-scalarproduct.c:830
+#: src/scalarproduct/gnunet-service-scalarproduct.c:1481
 #, fuzzy
-msgid "Could not send service-request multipart message to channel!\n"
+msgid "Could not send message to channel!\n"
 msgstr "Kunde inte skicka begäran till gnunetd.\n"
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1147
-#, fuzzy, c-format
-msgid "Successfully created new channel to peer (%s)!\n"
-msgstr "Åtkomst nekad för \"%s\" vid %s:%d.\n"
-
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1217
+#: src/scalarproduct/gnunet-service-scalarproduct.c:891
+#: src/scalarproduct/gnunet-service-scalarproduct.c:991
 #, fuzzy
-msgid "Could not send message to channel!\n"
+msgid "Could not send service-response message via cadet!)\n"
 msgstr "Kunde inte skicka begäran till gnunetd.\n"
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1274
-#, fuzzy
-msgid "Too short message received from client!\n"
-msgstr "Meddelande mottaget från klient är ogiltig.\n"
+#: src/scalarproduct/gnunet-service-scalarproduct.c:1442
+#, c-format
+msgid "Sent result to client (%p), this session (%s) has ended!\n"
+msgstr ""
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1287
+#: src/scalarproduct/gnunet-service-scalarproduct.c:1550
 #, fuzzy
-msgid "Invalid message received from client, session information incorrect!\n"
-msgstr "Ogiltigt meddelande mottogs den %s:%d."
+msgid "Could not send service-request multipart message to channel!\n"
+msgstr "Kunde inte skicka begäran till gnunetd.\n"
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1298
+#: src/scalarproduct/gnunet-service-scalarproduct.c:1579
 #, c-format
 msgid ""
-"Duplicate session information received, cannot create new session with key `"
-"%s'\n"
+"Got client-responder-session with key %s and a matching service-request-"
+"session set, processing.\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1318
+#: src/scalarproduct/gnunet-service-scalarproduct.c:1601
 #, c-format
 msgid ""
-"Got client-request-session with key %s, preparing channel to remote "
-"service.\n"
+"Got client-responder-session with key %s but NO matching service-request-"
+"session set, queuing element for later use.\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1354
+#: src/scalarproduct/gnunet-service-scalarproduct.c:1618
 #, c-format
 msgid "Creating new channel for session with key %s.\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1399
+#: src/scalarproduct/gnunet-service-scalarproduct.c:1777
 #, c-format
 msgid ""
-"Got client-responder-session with key %s and a matching service-request-"
-"session set, processing.\n"
+"Duplicate session information received, can not create new session with key `"
+"%s'\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1409
-#, c-format
-msgid ""
-"Got client-responder-session with key %s but NO matching service-request-"
-"session set, queuing element for later use.\n"
-msgstr ""
-
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1439
+#: src/scalarproduct/gnunet-service-scalarproduct.c:1862
 #, fuzzy, c-format
 msgid "New incoming channel from peer %s.\n"
 msgstr "\"%s\" ansluten till \"%s\".\n"
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1471
+#: src/scalarproduct/gnunet-service-scalarproduct.c:1892
 #, c-format
 msgid "Peer disconnected, terminating session %s with peer (%s)\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1672
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1814
+#: src/scalarproduct/gnunet-service-scalarproduct.c:2270
 #, c-format
-msgid "Got session with key %s and a matching element set, processing.\n"
+msgid ""
+"Got message with duplicate session key (`%s'), ignoring service request.\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1681
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1821
+#: src/scalarproduct/gnunet-service-scalarproduct.c:2297
 #, c-format
-msgid "Got session with key %s without a matching element set, queueing.\n"
+msgid "Got session with key %s and a matching element set, processing.\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1771
+#: src/scalarproduct/gnunet-service-scalarproduct.c:2318
 #, c-format
-msgid ""
-"Got message with duplicate session key (`%s'), ignoring service request.\n"
+msgid "Got session with key %s without a matching element set, queueing.\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:2014
+#: src/scalarproduct/gnunet-service-scalarproduct.c:2565
 msgid "Shutting down, initiating cleanup.\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:2100
+#: src/scalarproduct/gnunet-service-scalarproduct.c:2659
 #, fuzzy
-msgid "Connect to MESH failed\n"
+msgid "Connect to CADET failed\n"
 msgstr " Anslutning misslyckades (fel?)\n"
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:2104
+#: src/scalarproduct/gnunet-service-scalarproduct.c:2664
 #, fuzzy
-msgid "Mesh initialized\n"
+msgid "CADET initialized\n"
 msgstr " Anslutning misslyckades\n"
 
-#: src/scalarproduct/scalarproduct_api.c:246
+#: src/secretsharing/gnunet-secretsharing-profiler.c:613
+msgid "dkg start delay"
+msgstr ""
+
+#: src/secretsharing/gnunet-secretsharing-profiler.c:616
+msgid "dkg timeout"
+msgstr ""
+
+#: src/secretsharing/gnunet-secretsharing-profiler.c:619
+msgid "threshold"
+msgstr ""
+
+#: src/secretsharing/gnunet-secretsharing-profiler.c:622
+msgid "also profile decryption"
+msgstr ""
+
+#: src/sensor/gnunet-sensor.c:148
 #, fuzzy
-msgid "# SUC responder result messages received"
-msgstr "# krypterade PONG-meddelanden mottagna"
+msgid "Retrieve information about all defined sensors"
+msgstr "Skriv ut information om GNUnets motparter."
 
-#: src/scalarproduct/scalarproduct_api.c:300
+#: src/sensor/gnunet-sensor.c:151
 #, fuzzy
-msgid "# bytes sent to scalarproduct"
-msgstr "# byte krypterade"
+msgid "Retrieve information about a single sensor"
+msgstr "Skriv ut information om GNUnets motparter."
 
-#: src/scalarproduct/scalarproduct_api.c:345
-#: src/scalarproduct/scalarproduct_api.c:440
+#: src/sensor/gnunet-sensor.c:160
+msgid "sensor"
+msgstr ""
+
+#: src/sensor/gnunet-service-sensor.c:367
 #, fuzzy
-msgid "Failed to connect to the scalarproduct service\n"
-msgstr "Misslyckades att ansluta till gnunetd.\n"
+msgid "Error reading sensor version\n"
+msgstr "Fel vid skapandet av användare"
 
-#: src/scalarproduct/scalarproduct_api.c:353
-#: src/scalarproduct/scalarproduct_api.c:448
+#: src/sensor/gnunet-service-sensor.c:373
+msgid "Invalid sensor version number, format should be major.minor\n"
+msgstr ""
+
+#: src/sensor/gnunet-service-sensor.c:385
 #, fuzzy
-msgid "Failed to send a message to the statistics service\n"
-msgstr "Misslyckades att ansluta till gnunetd.\n"
+msgid "Error reading sensor category\n"
+msgstr "Fel vid skapandet av användare"
 
-#: src/scalarproduct/scalarproduct_api.c:387
-#: src/scalarproduct/scalarproduct_api.c:485
+#: src/sensor/gnunet-service-sensor.c:413
 #, fuzzy
-msgid "Failed to send a message to the scalarproduct service\n"
-msgstr "Misslyckades att ansluta till gnunetd.\n"
+msgid "Error reading sensor run interval\n"
+msgstr "Klar med skapandet av värdnyckel.\n"
 
-#: src/secretsharing/gnunet-secretsharing-profiler.c:538
-msgid "dkg start delay"
+#: src/sensor/gnunet-service-sensor.c:419
+#, c-format
+msgid "Sensor run interval too low (%<PRIu64> < %d)\n"
 msgstr ""
 
-#: src/secretsharing/gnunet-secretsharing-profiler.c:541
-msgid "dkg timeout"
+#: src/sensor/gnunet-service-sensor.c:436
+#, fuzzy
+msgid "Error reading sensor source\n"
+msgstr "Fel vid skapandet av användare"
+
+#: src/sensor/gnunet-service-sensor.c:445
+msgid "Error reading sensor gnunet-statistics source information\n"
 msgstr ""
 
-#: src/secretsharing/gnunet-secretsharing-profiler.c:544
-msgid "threshold"
+#: src/sensor/gnunet-service-sensor.c:455
+#, fuzzy
+msgid "Error reading sensor process name\n"
+msgstr "Fel vid skapandet av användare"
+
+#: src/sensor/gnunet-service-sensor.c:464
+msgid "Error reading sensor expected datatype\n"
 msgstr ""
 
-#: src/secretsharing/gnunet-secretsharing-profiler.c:547
-msgid "also profile decryption"
+#: src/sensor/gnunet-service-sensor.c:470
+msgid "Invalid expected datatype, gnunet-statistics returns uint64 values\n"
 msgstr ""
 
+#: src/sensor/gnunet-service-sensor.c:498
+#, fuzzy, c-format
+msgid "Failed to access sensor file: %s\n"
+msgstr "Misslyckades att leverera \"%s\" meddelande.\n"
+
+#: src/sensor/gnunet-service-sensor.c:506
+#, fuzzy, c-format
+msgid "Failed to load sensor definition: %s\n"
+msgstr "Misslyckades att leverera \"%s\" meddelande.\n"
+
+#: src/sensor/gnunet-service-sensor.c:559
+#, c-format
+msgid "Sensor `%s' already exists with same or newer version\n"
+msgstr ""
+
+#: src/sensor/gnunet-service-sensor.c:566
+#, c-format
+msgid "Upgrading sensor `%s' to a newer version\n"
+msgstr ""
+
+#: src/sensor/gnunet-service-sensor.c:571
+#, c-format
+msgid ""
+"Error adding new sensor `%s' to global hashmap, this should not happen\n"
+msgstr ""
+
+#: src/sensor/gnunet-service-sensor.c:595
+#, fuzzy, c-format
+msgid "Error loading sensor from file: %s\n"
+msgstr ""
+"\n"
+"Fel vid uppladdning av fil: %s\n"
+
+#: src/sensor/gnunet-service-sensor.c:599
+#, c-format
+msgid "Sensor `%s' added to global hashmap\n"
+msgstr ""
+
+#: src/sensor/gnunet-service-sensor.c:635
+#, fuzzy, c-format
+msgid "Reloading sensor definitions from directory `%s'\n"
+msgstr "Ladda ner filer från GNUnet."
+
+#: src/sensor/gnunet-service-sensor.c:640
+#, fuzzy, c-format
+msgid "Loaded %d sensors from directory `%s'\n"
+msgstr "Ladda ner filer från GNUnet."
+
+#: src/sensor/sensor_api.c:345
+#, fuzzy
+msgid "Timeout transmitting iteration request to `SENSOR' service."
+msgstr "Misslyckades att initiera tjänsten \"%s\".\n"
+
+#: src/sensor/sensor_api.c:388
+#, fuzzy
+msgid "Failed to receive response from `SENSOR' service."
+msgstr "Misslyckades att ta emot svar till \"%s\" meddelande från gnunetd\n"
+
+#: src/sensor/sensor_api.c:431
+#, fuzzy
+msgid "Received invalid message from `SENSOR' service."
+msgstr "mottog ogiltigt \"%s\" meddelande: %s.\n"
+
 #: src/set/gnunet-service-set.c:1431
 #, fuzzy
-msgid "Could not connect to mesh service\n"
+msgid "Could not connect to cadet service\n"
 msgstr "Kunde inte ansluta till gnunetd.\n"
 
 #: src/set/gnunet-set-ibf-profiler.c:221
@@ -6368,7 +6585,7 @@
 "content/topology-file-format\n"
 msgstr ""
 
-#: src/testbed/gnunet-daemon-latency-logger.c:325
+#: src/testbed/gnunet-daemon-latency-logger.c:331
 msgid "Daemon to log latency values of connections to neighbours"
 msgstr ""
 
@@ -6729,8 +6946,8 @@
 msgid "# HELLO messages gossipped"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:1290
-msgid "GNUnet topology control (maintaining P2P mesh and F2F constraints)"
+#: src/topology/gnunet-daemon-topology.c:1296
+msgid "GNUnet topology control (maintaining P2P cadet and F2F constraints)"
 msgstr ""
 
 #: src/transport/gnunet-service-transport_blacklist.c:271
@@ -6763,19 +6980,19 @@
 msgid "# bytes payload received"
 msgstr "# byte dekrypterade"
 
-#: src/transport/gnunet-service-transport.c:686
+#: src/transport/gnunet-service-transport.c:708
 #, fuzzy, c-format
 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:733
+#: src/transport/gnunet-service-transport.c:755
 #, 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:1084
+#: src/transport/gnunet-service-transport.c:1106
 #, fuzzy
 msgid "Transport service is lacking key configuration settings. Exiting.\n"
 msgstr "GNUnet-konfiguration"
@@ -6828,7 +7045,7 @@
 msgid "Received a request disconnect message for peer `%s'\n"
 msgstr "Mottog ogiltigt \"%s\" meddelande från \"%s\".\n"
 
-#: src/transport/gnunet-service-transport_hello.c:181
+#: src/transport/gnunet-service-transport_hello.c:182
 msgid "# refreshed my HELLO"
 msgstr ""
 
@@ -6838,7 +7055,7 @@
 msgstr "# krypterade PONG-meddelanden mottagna"
 
 #: src/transport/gnunet-service-transport_neighbours.c:1220
-#: src/transport/gnunet-service-transport_neighbours.c:1629
+#: src/transport/gnunet-service-transport_neighbours.c:1635
 msgid "# bytes in message queue for other peers"
 msgstr ""
 
@@ -6852,185 +7069,185 @@
 msgid "# transmission failures for messages to other peers"
 msgstr "# byte skickade av typen %d"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1287
+#: src/transport/gnunet-service-transport_neighbours.c:1288
 msgid "# messages timed out while in transport queue"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1343
+#: src/transport/gnunet-service-transport_neighbours.c:1349
 #, fuzzy
 msgid "# keepalives sent"
 msgstr "# sessionsnycklar skickade"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1376
+#: src/transport/gnunet-service-transport_neighbours.c:1382
 #, fuzzy
 msgid "# KEEPALIVE messages discarded (peer unknown)"
 msgstr "Nätverksannonsering avstängd i konfigurationen!\n"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1384
+#: src/transport/gnunet-service-transport_neighbours.c:1390
 #, fuzzy
 msgid "# KEEPALIVE messages discarded (no session)"
 msgstr "Nätverksannonsering avstängd i konfigurationen!\n"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1431
+#: src/transport/gnunet-service-transport_neighbours.c:1437
 #, fuzzy
 msgid "# KEEPALIVE_RESPONSE messages discarded (not connected)"
 msgstr "Nätverksannonsering avstängd i konfigurationen!\n"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1440
+#: src/transport/gnunet-service-transport_neighbours.c:1446
 #, fuzzy
 msgid "# KEEPALIVE_RESPONSE messages discarded (not expected)"
 msgstr "Nätverksannonsering avstängd i konfigurationen!\n"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1448
+#: src/transport/gnunet-service-transport_neighbours.c:1454
 #, fuzzy
 msgid "# KEEPALIVE_RESPONSE messages discarded (address changed)"
 msgstr "Nätverksannonsering avstängd i konfigurationen!\n"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1456
+#: src/transport/gnunet-service-transport_neighbours.c:1462
 #, fuzzy
 msgid "# KEEPALIVE_RESPONSE messages discarded (wrong nonce)"
 msgstr "Nätverksannonsering avstängd i konfigurationen!\n"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1534
+#: src/transport/gnunet-service-transport_neighbours.c:1540
 #, 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:1568
+#: src/transport/gnunet-service-transport_neighbours.c:1574
 msgid "# bandwidth quota violations by other peers"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1584
+#: src/transport/gnunet-service-transport_neighbours.c:1590
 msgid "# ms throttling suggested"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1678
+#: src/transport/gnunet-service-transport_neighbours.c:1685
 #, fuzzy, c-format
 msgid ""
 "Failed to send CONNECT message to peer `%s' using address `%s' session %p\n"
 msgstr "Misslyckades att ansluta till gnunetd.\n"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1705
+#: src/transport/gnunet-service-transport_neighbours.c:1712
 msgid "# Failed attempts to switch addresses (failed to send CONNECT CONT)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1751
+#: src/transport/gnunet-service-transport_neighbours.c:1757
 #, fuzzy
 msgid "# SESSION_CONNECT messages sent"
 msgstr "# krypterade PONG-meddelanden mottagna"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1767
+#: src/transport/gnunet-service-transport_neighbours.c:1773
 #, 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:1794
+#: src/transport/gnunet-service-transport_neighbours.c:1800
 msgid "# Failed attempts to switch addresses (failed to send CONNECT)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1844
+#: src/transport/gnunet-service-transport_neighbours.c:1849
 #, c-format
 msgid ""
 "Failed to send CONNECT_ACK message to peer `%s' using address `%s' session "
 "%p\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1899
+#: src/transport/gnunet-service-transport_neighbours.c:1904
 #, fuzzy
 msgid "# CONNECT_ACK messages sent"
 msgstr "# krypterade PONG-meddelanden mottagna"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1914
+#: src/transport/gnunet-service-transport_neighbours.c:1919
 #, fuzzy, c-format
 msgid "Failed to transmit CONNECT_ACK message via plugin to %s\n"
 msgstr "Misslyckades att initiera tjänsten \"%s\".\n"
 
-#: src/transport/gnunet-service-transport_neighbours.c:2192
+#: src/transport/gnunet-service-transport_neighbours.c:2196
 #, fuzzy, c-format
 msgid "Blacklisting disapproved to connect to peer `%s'\n"
 msgstr "Misslyckades att ansluta till gnunetd.\n"
 
-#: src/transport/gnunet-service-transport_neighbours.c:2312
+#: src/transport/gnunet-service-transport_neighbours.c:2316
 #, fuzzy
 msgid "# CONNECT messages received"
 msgstr "# krypterade PONG-meddelanden mottagna"
 
-#: src/transport/gnunet-service-transport_neighbours.c:2317
+#: src/transport/gnunet-service-transport_neighbours.c:2321
 #, c-format
 msgid "CONNECT request from peer `%s' ignored due impending shutdown\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:2590
+#: src/transport/gnunet-service-transport_neighbours.c:2594
 msgid "# Attempts to switch addresses"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3012
+#: src/transport/gnunet-service-transport_neighbours.c:3016
 #, fuzzy
 msgid "# Failed attempts to switch addresses (no response)"
 msgstr "Misslyckades att skicka HTTP-begäran till värd \"%s\": %s\n"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3107
+#: src/transport/gnunet-service-transport_neighbours.c:3111
 #, fuzzy
 msgid "# CONNECT_ACK messages received"
 msgstr "# krypterade PONG-meddelanden mottagna"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3115
+#: src/transport/gnunet-service-transport_neighbours.c:3119
 #, fuzzy
 msgid "# unexpected CONNECT_ACK messages (no peer)"
 msgstr "skicka ANTAL meddelanden"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3129
-#: src/transport/gnunet-service-transport_neighbours.c:3164
+#: src/transport/gnunet-service-transport_neighbours.c:3133
+#: src/transport/gnunet-service-transport_neighbours.c:3168
 #, fuzzy
 msgid "# unexpected CONNECT_ACK messages (not ready)"
 msgstr "skicka ANTAL meddelanden"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3176
+#: src/transport/gnunet-service-transport_neighbours.c:3180
 #, fuzzy
 msgid "# unexpected CONNECT_ACK messages (waiting on ATS)"
 msgstr "skicka ANTAL meddelanden"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3200
+#: src/transport/gnunet-service-transport_neighbours.c:3203
 msgid "# Successful attempts to switch addresses"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3208
+#: src/transport/gnunet-service-transport_neighbours.c:3211
 #, fuzzy
 msgid "# unexpected CONNECT_ACK messages (disconnecting)"
 msgstr "skicka ANTAL meddelanden"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3396
+#: src/transport/gnunet-service-transport_neighbours.c:3399
 #, fuzzy
 msgid "# SESSION_ACK messages received"
 msgstr "# krypterade PONG-meddelanden mottagna"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3424
+#: src/transport/gnunet-service-transport_neighbours.c:3435
 #, fuzzy
 msgid "# unexpected SESSION_ACK messages"
 msgstr "# krypterade PONG-meddelanden skickade"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3490
+#: src/transport/gnunet-service-transport_neighbours.c:3509
 msgid "# SET QUOTA messages ignored (no such peer)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3505
+#: src/transport/gnunet-service-transport_neighbours.c:3524
 msgid "# disconnects due to quota of 0"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3545
+#: src/transport/gnunet-service-transport_neighbours.c:3564
 msgid "# disconnect messages ignored (malformed)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3551
+#: src/transport/gnunet-service-transport_neighbours.c:3570
 #, fuzzy
 msgid "# DISCONNECT messages received"
 msgstr "# krypterade PONG-meddelanden mottagna"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3560
+#: src/transport/gnunet-service-transport_neighbours.c:3579
 msgid "# disconnect messages ignored (timestamp)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3687
+#: src/transport/gnunet-service-transport_neighbours.c:3706
 #, fuzzy
 msgid "# disconnected from peer upon explicit request"
 msgstr "# av anslutna parter"
@@ -7145,33 +7362,58 @@
 msgid "Adding `%s' without addresses for peer `%s'\n"
 msgstr "Motpart \"%s\" med pålitlighet %8u och adress \"%s\"\n"
 
-#: src/transport/gnunet-transport.c:367
+#: src/transport/gnunet-transport.c:388
 #, fuzzy, c-format
 msgid "Transmitted %llu bytes/s (%llu bytes in %s)\n"
 msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 
-#: src/transport/gnunet-transport.c:375
+#: src/transport/gnunet-transport.c:396
 #, c-format
 msgid "Received %llu bytes/s (%llu bytes in %s)\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:415
+#: src/transport/gnunet-transport.c:436
 #, fuzzy, c-format
 msgid "Failed to connect to `%s'\n"
 msgstr "Misslyckades att ansluta till gnunetd.\n"
 
-#: src/transport/gnunet-transport.c:428
+#: src/transport/gnunet-transport.c:449
 #, fuzzy, c-format
 msgid "Failed to resolve address for peer `%s'\n"
 msgstr "Misslyckades att binda till UDP-port %d.\n"
 
-#: src/transport/gnunet-transport.c:438
+#: src/transport/gnunet-transport.c:459
 #, fuzzy
 msgid "Failed to list connections, timeout occured\n"
 msgstr "Misslyckades att ansluta till gnunetd.\n"
 
-#: src/transport/gnunet-transport.c:559
+#: src/transport/gnunet-transport.c:483
 #, fuzzy, c-format
+msgid "Configuration for plugin `%s' did not work!\n"
+msgstr "Konfigurationsfil \"%s\" skapad.\n"
+
+#: src/transport/gnunet-transport.c:487
+#, fuzzy, c-format
+msgid "Configuration for plugin `%s' did work!\n"
+msgstr "Konfigurationsfil \"%s\" skapad.\n"
+
+#: src/transport/gnunet-transport.c:491
+#, fuzzy, c-format
+msgid "Internal NAT error while running test for plugin `%s'\n"
+msgstr "=\tFel vid läsning av katalog.\n"
+
+#: src/transport/gnunet-transport.c:495
+#, fuzzy, c-format
+msgid "Failed to start NAT test for plugin `%s'\n"
+msgstr "Misslyckades att starta samling.\n"
+
+#: src/transport/gnunet-transport.c:499
+#, c-format
+msgid "Timeout while waiting for result of NAT test for plugin `%s'\n"
+msgstr ""
+
+#: src/transport/gnunet-transport.c:614
+#, fuzzy, c-format
 msgid ""
 "Peer `%s' %s %s\n"
 "\t%s%s\n"
@@ -7179,155 +7421,180 @@
 "\t%s%s\n"
 msgstr "Jag är ändpunkt \"%s\".\n"
 
-#: src/transport/gnunet-transport.c:586
+#: src/transport/gnunet-transport.c:643
 #, fuzzy, c-format
 msgid "Peer `%s' %s `%s' \n"
 msgstr "Jag är ändpunkt \"%s\".\n"
 
-#: src/transport/gnunet-transport.c:712
+#: src/transport/gnunet-transport.c:717 src/transport/gnunet-transport.c:1240
+#, fuzzy
+msgid "Monitor disconnected from transport service. Reconnecting.\n"
+msgstr "Misslyckades att ansluta till gnunetd.\n"
+
+#: src/transport/gnunet-transport.c:784
 msgid "No transport plugins configured, peer will never communicate\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:726
+#: src/transport/gnunet-transport.c:798
 #, c-format
 msgid "No port configured for plugin `%s', cannot test it\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:789
+#: src/transport/gnunet-transport.c:823
+#, fuzzy
+msgid "Failed to start resolver!\n"
+msgstr "Misslyckades att starta samling.\n"
+
+#: src/transport/gnunet-transport.c:866
 #, fuzzy, c-format
 msgid "Transmitting %u bytes to %s\n"
 msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 
-#: src/transport/gnunet-transport.c:810
+#: src/transport/gnunet-transport.c:888
 #, fuzzy, c-format
 msgid "Successfully connected to `%s'\n"
 msgstr "Åtkomst nekad för \"%s\" vid %s:%d.\n"
 
-#: src/transport/gnunet-transport.c:834
+#: src/transport/gnunet-transport.c:912
 #, c-format
 msgid ""
 "Successfully connected to `%s', starting to send benchmark data in %u Kb "
 "blocks\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:865
+#: src/transport/gnunet-transport.c:943
 #, fuzzy, c-format
 msgid "Successfully disconnected from `%s'\n"
 msgstr "Åtkomst nekad för \"%s\" vid %s:%d.\n"
 
-#: src/transport/gnunet-transport.c:888
+#: src/transport/gnunet-transport.c:966
 #, fuzzy, c-format
 msgid "Disconnected from peer `%s' while benchmarking\n"
 msgstr "\"%s\" ansluten till \"%s\".\n"
 
-#: src/transport/gnunet-transport.c:950
+#: src/transport/gnunet-transport.c:988 src/transport/gnunet-transport.c:1009
 #, c-format
+msgid "%24s: %-17s %4s   (%u connections in total)\n"
+msgstr ""
+
+#: src/transport/gnunet-transport.c:989
+#, fuzzy
+msgid "Connected to"
+msgstr "\"%s\" ansluten till \"%s\".\n"
+
+#: src/transport/gnunet-transport.c:1010
+#, fuzzy
+msgid "Disconnected from"
+msgstr "\"%s\" ansluten till \"%s\".\n"
+
+#: src/transport/gnunet-transport.c:1031
+#, c-format
 msgid "Received %u bytes from %s\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:975
+#: src/transport/gnunet-transport.c:1061
 #, c-format
 msgid "Peer `%s': %s %s in state `%s' until %s\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:986
+#: src/transport/gnunet-transport.c:1072
 #, fuzzy, c-format
 msgid "Peer `%s': %s %s\n"
 msgstr "Jag är ändpunkt \"%s\".\n"
 
-#: src/transport/gnunet-transport.c:1197 src/transport/gnunet-transport.c:1222
+#: src/transport/gnunet-transport.c:1300 src/transport/gnunet-transport.c:1325
 #, fuzzy
 msgid "Failed to send connect request to transport service\n"
 msgstr "Misslyckades att ansluta till gnunetd.\n"
 
-#: src/transport/gnunet-transport.c:1266
+#: src/transport/gnunet-transport.c:1369
 #, c-format
 msgid ""
 "Multiple operations given. Please choose only one operation: %s, %s, %s, %s, "
 "%s, %s\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1274
+#: src/transport/gnunet-transport.c:1377
 #, c-format
 msgid ""
 "No operation given. Please choose one operation: %s, %s, %s, %s, %s, %s\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1293 src/transport/gnunet-transport.c:1323
-#: src/transport/gnunet-transport.c:1353 src/transport/gnunet-transport.c:1376
-#: src/transport/gnunet-transport.c:1419
+#: src/transport/gnunet-transport.c:1396 src/transport/gnunet-transport.c:1426
+#: src/transport/gnunet-transport.c:1456 src/transport/gnunet-transport.c:1479
+#: src/transport/gnunet-transport.c:1523
 #, fuzzy
 msgid "Failed to connect to transport service\n"
 msgstr "Misslyckades att ansluta till gnunetd.\n"
 
-#: src/transport/gnunet-transport.c:1302 src/transport/gnunet-transport.c:1332
-#: src/transport/gnunet-transport.c:1362
+#: src/transport/gnunet-transport.c:1405 src/transport/gnunet-transport.c:1435
+#: src/transport/gnunet-transport.c:1465
 #, fuzzy
 msgid "Failed to send request to transport service\n"
 msgstr "Misslyckades att ansluta till gnunetd.\n"
 
-#: src/transport/gnunet-transport.c:1381
+#: src/transport/gnunet-transport.c:1484
 msgid "Starting to receive benchmark data\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1465
+#: src/transport/gnunet-transport.c:1569
 #, fuzzy
 msgid "print information for all peers (instead of only connected peers )"
 msgstr "Skriv ut information om GNUnets motparter."
 
-#: src/transport/gnunet-transport.c:1468
+#: src/transport/gnunet-transport.c:1572
 msgid "measure how fast we are receiving data from all peers (until CTRL-C)"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1471
+#: src/transport/gnunet-transport.c:1575
 #, fuzzy
 msgid "connect to a peer"
 msgstr "Misslyckades att ansluta till gnunetd.\n"
 
-#: src/transport/gnunet-transport.c:1474
+#: src/transport/gnunet-transport.c:1578
 #, fuzzy
 msgid "disconnect to a peer"
 msgstr "Misslyckades att ansluta till gnunetd.\n"
 
-#: src/transport/gnunet-transport.c:1477
+#: src/transport/gnunet-transport.c:1581
 #, fuzzy
 msgid "print information for all pending validations "
 msgstr "Skriv ut information om GNUnets motparter."
 
-#: src/transport/gnunet-transport.c:1480
+#: src/transport/gnunet-transport.c:1584
 #, fuzzy
 msgid "print information for all pending validations continously"
 msgstr "Skriv ut information om GNUnets motparter."
 
-#: src/transport/gnunet-transport.c:1483
+#: src/transport/gnunet-transport.c:1587
 #, fuzzy
 msgid "provide information about all current connections (once)"
 msgstr "Skriv ut information om GNUnets motparter."
 
-#: src/transport/gnunet-transport.c:1489
+#: src/transport/gnunet-transport.c:1593
 #, fuzzy
 msgid ""
 "provide information about all connects and disconnect events (continuously)"
 msgstr "Skriv ut information om GNUnets motparter."
 
-#: src/transport/gnunet-transport.c:1491
+#: src/transport/gnunet-transport.c:1595
 #, fuzzy
 msgid "do not resolve hostnames"
 msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 
-#: src/transport/gnunet-transport.c:1493
+#: src/transport/gnunet-transport.c:1597
 msgid "peer identity"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1495
+#: src/transport/gnunet-transport.c:1599
 msgid "send data for benchmarking to the other peer (until CTRL-C)"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1498
+#: src/transport/gnunet-transport.c:1602
 msgid "test transport configuration (involves external server)"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1507
+#: src/transport/gnunet-transport.c:1611
 #, fuzzy
 msgid "Direct access to transport service."
 msgstr "Misslyckades att ansluta till gnunetd.\n"
@@ -7399,150 +7666,151 @@
 msgid "# HELLO beacons sent via Bluetooth"
 msgstr "# byte skickade via UDP"
 
-#: src/transport/plugin_transport_bluetooth.c:1723
-msgid "Bluetooth address with invalid size encountered\n"
-msgstr ""
-
 #: src/transport/plugin_transport_bluetooth.c:1923
 #, c-format
 msgid "Helper binary `%s' not SUID, cannot run bluetooth transport\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_client.c:1622
+#: src/transport/plugin_transport_http_client.c:1685
 #, c-format
 msgid "Could not initialize curl multi handle, failed to start %s plugin!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_client.c:1697
-#: src/transport/plugin_transport_http_server.c:3007
+#: src/transport/plugin_transport_http_client.c:1760
+#: src/transport/plugin_transport_http_server.c:3031
 #, fuzzy, c-format
 msgid "Shutting down plugin `%s'\n"
 msgstr "Testar transport(er) %s\n"
 
-#: src/transport/plugin_transport_http_client.c:1722
-#: src/transport/plugin_transport_http_server.c:3063
+#: src/transport/plugin_transport_http_client.c:1785
+#: src/transport/plugin_transport_http_server.c:3088
 #, 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:1750
-#: src/transport/plugin_transport_http_server.c:2907
+#: src/transport/plugin_transport_http_client.c:1819
+#: src/transport/plugin_transport_http_server.c:2931
 #, 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:1402
+#: src/transport/plugin_transport_http_server.c:1423
 #, 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:1663
+#: src/transport/plugin_transport_http_server.c:1687
 #, c-format
 msgid "Accepting connection (%u of %u) from `%s'\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:1671
+#: src/transport/plugin_transport_http_server.c:1695
 #, c-format
 msgid ""
 "Server reached maximum number connections (%u), rejecting new connection\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:1958
+#: src/transport/plugin_transport_http_server.c:1982
 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:1982
+#: src/transport/plugin_transport_http_server.c:2006
 #, c-format
 msgid "No usable TLS certificate found and creating one at `%s/%s' failed!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:2405
+#: src/transport/plugin_transport_http_server.c:2429
 #, 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:2437 src/util/service.c:698
+#: src/transport/plugin_transport_http_server.c:2461 src/util/service.c:700
 #, fuzzy, c-format
 msgid "Failed to resolve `%s': %s\n"
 msgstr "Misslyckades att leverera \"%s\" meddelande.\n"
 
-#: src/transport/plugin_transport_http_server.c:2454 src/util/service.c:715
+#: src/transport/plugin_transport_http_server.c:2478 src/util/service.c:719
 #, 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:2565
+#: src/transport/plugin_transport_http_server.c:2589
 #, c-format
 msgid "Found %u addresses to report to NAT service\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:2637
+#: src/transport/plugin_transport_http_server.c:2661
 msgid "Disabling IPv6 since it is not supported on this system!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:2730
+#: src/transport/plugin_transport_http_server.c:2754
 #, c-format
 msgid "IPv4 support is %s\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:2744
+#: src/transport/plugin_transport_http_server.c:2768
 #, c-format
 msgid "IPv6 support is %s\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:2751
+#: src/transport/plugin_transport_http_server.c:2775
 msgid "Neither IPv4 nor IPv6 are enabled! Fix in configuration\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:2762
+#: src/transport/plugin_transport_http_server.c:2786
 #, fuzzy
 msgid "Port is required! Fix in configuration\n"
 msgstr " gconfig\tGTK-konfiguration\n"
 
-#: src/transport/plugin_transport_http_server.c:2769
+#: src/transport/plugin_transport_http_server.c:2793
 #, fuzzy, c-format
 msgid "Using port %u\n"
 msgstr "Testar transport(er) %s\n"
 
-#: src/transport/plugin_transport_http_server.c:2784
+#: src/transport/plugin_transport_http_server.c:2808
 #, 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:2794
+#: src/transport/plugin_transport_http_server.c:2818
 #, fuzzy, c-format
 msgid "Binding to IPv4 address %s\n"
 msgstr "Ogiltigt svar på \"%s\".\n"
 
-#: src/transport/plugin_transport_http_server.c:2815
+#: src/transport/plugin_transport_http_server.c:2839
 #, 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:2825
+#: src/transport/plugin_transport_http_server.c:2849
 #, fuzzy, c-format
 msgid "Binding to IPv6 address %s\n"
 msgstr "Ogiltigt svar på \"%s\".\n"
 
-#: src/transport/plugin_transport_http_server.c:2877
+#: src/transport/plugin_transport_http_server.c:2901
 #, fuzzy, c-format
 msgid "Using external hostname `%s'\n"
 msgstr "Startade samling \"%s\".\n"
 
-#: src/transport/plugin_transport_http_server.c:2893
+#: src/transport/plugin_transport_http_server.c:2917
 #, fuzzy, c-format
 msgid "Notifying transport only about hostname `%s'\n"
 msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 
+#: src/transport/plugin_transport_http_server.c:3177
+#, fuzzy
+msgid "Unable to compile URL regex\n"
+msgstr "Kunde inte initiera SQLite.\n"
+
 #: src/transport/plugin_transport_smtp.c:223
 #, fuzzy, c-format
 msgid "Received malformed message via %s. Ignored.\n"
@@ -7591,91 +7859,91 @@
 msgid "# bytes dropped by SMTP (outgoing)"
 msgstr "# byte kastade via TCP (utgående)"
 
-#: src/transport/plugin_transport_tcp.c:555
+#: src/transport/plugin_transport_tcp.c:565
 #, c-format
 msgid "Unexpected address length: %u bytes\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:762
-#: src/transport/plugin_transport_tcp.c:928
-#: src/transport/plugin_transport_tcp.c:2005
-#: src/transport/plugin_transport_tcp.c:2558
+#: src/transport/plugin_transport_tcp.c:787
+#: src/transport/plugin_transport_tcp.c:962
+#: src/transport/plugin_transport_tcp.c:2047
+#: src/transport/plugin_transport_tcp.c:2620
 #, fuzzy
 msgid "# TCP sessions active"
 msgstr "# sessionsnycklar accepterade"
 
-#: src/transport/plugin_transport_tcp.c:795
-#: src/transport/plugin_transport_tcp.c:921
-#: src/transport/plugin_transport_tcp.c:1009
-#: src/transport/plugin_transport_tcp.c:1056
-#: src/transport/plugin_transport_tcp.c:1219
-#: src/transport/plugin_transport_tcp.c:1237
+#: src/transport/plugin_transport_tcp.c:823
+#: src/transport/plugin_transport_tcp.c:955
+#: src/transport/plugin_transport_tcp.c:1045
+#: src/transport/plugin_transport_tcp.c:1093
+#: src/transport/plugin_transport_tcp.c:1259
+#: src/transport/plugin_transport_tcp.c:1277
 #, fuzzy
 msgid "# bytes currently in TCP buffers"
 msgstr "# byte skickades via TCP"
 
-#: src/transport/plugin_transport_tcp.c:798
+#: src/transport/plugin_transport_tcp.c:826
 #, fuzzy
 msgid "# bytes discarded by TCP (disconnect)"
 msgstr "# byte kastade via TCP (utgående)"
 
-#: src/transport/plugin_transport_tcp.c:1012
+#: src/transport/plugin_transport_tcp.c:1048
 #, fuzzy
 msgid "# bytes discarded by TCP (timeout)"
 msgstr "# byte kastade via TCP (utgående)"
 
-#: src/transport/plugin_transport_tcp.c:1059
+#: src/transport/plugin_transport_tcp.c:1096
 #, fuzzy
 msgid "# bytes transmitted via TCP"
 msgstr "# byte skickade av typen %d"
 
-#: src/transport/plugin_transport_tcp.c:1193
+#: src/transport/plugin_transport_tcp.c:1233
 #, c-format
 msgid "Trying to send with invalid session %p\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:1462
+#: src/transport/plugin_transport_tcp.c:1504
 msgid "# requests to create session with invalid address"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:1567
+#: src/transport/plugin_transport_tcp.c:1609
 msgid "# transport-service disconnect requests for TCP"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2055
+#: src/transport/plugin_transport_tcp.c:2097
 #, fuzzy
 msgid "# TCP WELCOME messages received"
 msgstr "# krypterade PONG-meddelanden mottagna"
 
-#: src/transport/plugin_transport_tcp.c:2215
+#: src/transport/plugin_transport_tcp.c:2257
 msgid "# bytes received via TCP"
 msgstr "# byte mottogs via TCP"
 
-#: src/transport/plugin_transport_tcp.c:2279
+#: src/transport/plugin_transport_tcp.c:2321
 msgid "# network-level TCP disconnect events"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2437 src/util/service.c:582
+#: src/transport/plugin_transport_tcp.c:2490 src/util/service.c:582
 #: src/util/service.c:588
 #, c-format
 msgid "Require valid port number for service `%s' in configuration!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2451
+#: src/transport/plugin_transport_tcp.c:2504
 #, fuzzy
 msgid "Failed to start service.\n"
 msgstr "Misslyckades att starta samling.\n"
 
-#: src/transport/plugin_transport_tcp.c:2547
+#: src/transport/plugin_transport_tcp.c:2607
 #, c-format
 msgid "TCP transport listening on port %llu\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2551
+#: src/transport/plugin_transport_tcp.c:2611
 msgid "TCP transport not listening on any port (client only)\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2554
+#: src/transport/plugin_transport_tcp.c:2615
 #, c-format
 msgid "TCP transport advertises itself as being on port %llu\n"
 msgstr ""
@@ -7745,12 +8013,12 @@
 msgid "Cannot create path to `%s'\n"
 msgstr "Kunde inte skapa namnrymd \"%s\" (existerar?).\n"
 
-#: src/transport/plugin_transport_unix.c:1652
+#: src/transport/plugin_transport_unix.c:1645
 #, fuzzy
 msgid "No UNIXPATH given in configuration!\n"
 msgstr "Kunde inte spara konfiguration!"
 
-#: src/transport/plugin_transport_unix.c:1688
+#: src/transport/plugin_transport_unix.c:1681
 #, fuzzy
 msgid "Failed to open UNIX listen socket\n"
 msgstr "Misslyckades att leverera \"%s\" meddelande.\n"
@@ -7822,10 +8090,6 @@
 msgid "# HELLO beacons sent via WLAN"
 msgstr "# byte skickade via UDP"
 
-#: src/transport/plugin_transport_wlan.c:1729
-msgid "WLAN address with invalid size encountered\n"
-msgstr ""
-
 #: src/transport/plugin_transport_wlan.c:1929
 #, c-format
 msgid "Helper binary `%s' not SUID, cannot run WLAN transport\n"
@@ -7970,24 +8234,24 @@
 msgid "Syntax error while deserializing in line %u\n"
 msgstr "Syntaxfel i konfigurationsfil \"%s\" på rad %d.\n"
 
-#: src/util/configuration.c:996
+#: src/util/configuration.c:1023
 #, c-format
 msgid ""
 "Configuration value '%s' for '%s' in section '%s' is not in set of legal "
 "choices\n"
 msgstr ""
 
-#: src/util/configuration.c:1066
+#: src/util/configuration.c:1093
 #, c-format
 msgid "Recursive expansion suspected, aborting $-expansion for term `%s'\n"
 msgstr ""
 
-#: src/util/configuration.c:1098
+#: src/util/configuration.c:1125
 #, fuzzy, c-format
 msgid "Missing closing `%s' in option `%s'\n"
 msgstr "Konfigurationsfil \"%s\" skapad.\n"
 
-#: src/util/configuration.c:1172
+#: src/util/configuration.c:1199
 #, c-format
 msgid ""
 "Failed to expand `%s' in `%s' as it is neither found in [PATHS] nor defined "
@@ -8087,7 +8351,7 @@
 msgid "Expected `%s' to be a directory!\n"
 msgstr "\"%s\" förväntade att \"%s\" skulle vara en katalog!\n"
 
-#: src/util/disk.c:1546 src/util/service.c:1318
+#: src/util/disk.c:1546 src/util/service.c:1323
 #, fuzzy, c-format
 msgid "Cannot obtain information about user `%s': %s\n"
 msgstr "Kan inte öppna konfigurationsfil \"%s\".\n"
@@ -8414,17 +8678,17 @@
 msgid "Could not determine plugin installation path.\n"
 msgstr "Kunde inte fastställa min publika IPv6-adress.\n"
 
-#: src/util/program.c:246 src/util/service.c:1452
+#: src/util/program.c:246 src/util/service.c:1457
 #, fuzzy, c-format
 msgid "Malformed configuration file `%s', exit ...\n"
 msgstr "Kunde inte spara konfigurationsfil \"%s\":"
 
-#: src/util/program.c:258 src/util/service.c:1467
+#: src/util/program.c:258 src/util/service.c:1472
 #, fuzzy, c-format
 msgid "Could not access configuration file `%s'\n"
 msgstr "Kunde inte tolka konfigurationsfil \"%s\".\n"
 
-#: src/util/program.c:263 src/util/service.c:1462
+#: src/util/program.c:263 src/util/service.c:1467
 #, fuzzy
 msgid "Malformed configuration, exit ...\n"
 msgstr "Kunde inte spara konfigurationsfil \"%s\":"
@@ -8527,52 +8791,52 @@
 msgid "Have neither PORT nor UNIXPATH for service `%s', but one is required\n"
 msgstr ""
 
-#: src/util/service.c:903
+#: src/util/service.c:908
 msgid "Could not access a pre-bound socket, will try to bind myself\n"
 msgstr ""
 
-#: src/util/service.c:952 src/util/service.c:970
+#: src/util/service.c:957 src/util/service.c:975
 #, c-format
 msgid "Specified value for `%s' of service `%s' is invalid\n"
 msgstr ""
 
-#: src/util/service.c:995
+#: src/util/service.c:1000
 #, c-format
 msgid "Could not access pre-bound socket %u, will try to bind myself\n"
 msgstr ""
 
-#: src/util/service.c:1165
+#: src/util/service.c:1170
 #, fuzzy, c-format
 msgid "Failed to start `%s' at `%s'\n"
 msgstr "Fel vid %s:%d.\n"
 
-#: src/util/service.c:1207
+#: src/util/service.c:1212
 #, fuzzy, c-format
 msgid "Service `%s' runs at %s\n"
 msgstr "Motpart \"%s\" med pålitlighet %8u och adress \"%s\"\n"
 
-#: src/util/service.c:1256
+#: src/util/service.c:1261
 msgid "Service process failed to initialize\n"
 msgstr ""
 
-#: src/util/service.c:1260
+#: src/util/service.c:1265
 msgid "Service process could not initialize server function\n"
 msgstr ""
 
-#: src/util/service.c:1264
+#: src/util/service.c:1269
 msgid "Service process failed to report status\n"
 msgstr ""
 
-#: src/util/service.c:1319
+#: src/util/service.c:1324
 msgid "No such user"
 msgstr ""
 
-#: src/util/service.c:1332
+#: src/util/service.c:1337
 #, c-format
 msgid "Cannot change user/group to `%s': %s\n"
 msgstr "Kan inte ändra användare/grupp till \"%s\": %s\n"
 
-#: src/util/service.c:1402
+#: src/util/service.c:1407
 msgid "do daemonize (detach from terminal)"
 msgstr ""
 
@@ -8704,22 +8968,22 @@
 
 #: src/vpn/gnunet-service-vpn.c:642
 #, fuzzy
-msgid "# Bytes given to mesh for transmission"
+msgid "# Bytes given to cadet for transmission"
 msgstr "# PING-meddelanden skapade"
 
 #: src/vpn/gnunet-service-vpn.c:680
 #, fuzzy
-msgid "# Bytes dropped in mesh queue (overflow)"
+msgid "# Bytes dropped in cadet queue (overflow)"
 msgstr "# byte kastade via UDP (utgående)"
 
 #: src/vpn/gnunet-service-vpn.c:753
 #, fuzzy
-msgid "# Mesh channels created"
+msgid "# Cadet channels created"
 msgstr "# PING-meddelanden skapade"
 
 #: src/vpn/gnunet-service-vpn.c:784
 #, fuzzy
-msgid "Failed to setup mesh channel!\n"
+msgid "Failed to setup cadet channel!\n"
 msgstr "Kunde inte skapa värdnyckel!\n"
 
 #: src/vpn/gnunet-service-vpn.c:978
@@ -8756,17 +9020,17 @@
 
 #: src/vpn/gnunet-service-vpn.c:1706
 #, fuzzy
-msgid "# ICMP packets received from mesh"
+msgid "# ICMP packets received from cadet"
 msgstr "Meddelande mottaget från klient är ogiltig.\n"
 
 #: src/vpn/gnunet-service-vpn.c:2045
 #, fuzzy
-msgid "# UDP packets received from mesh"
+msgid "# UDP packets received from cadet"
 msgstr "Meddelande mottaget från klient är ogiltig.\n"
 
 #: src/vpn/gnunet-service-vpn.c:2200
 #, fuzzy
-msgid "# TCP packets received from mesh"
+msgid "# TCP packets received from cadet"
 msgstr "Meddelande mottaget från klient är ogiltig.\n"
 
 #: src/vpn/gnunet-service-vpn.c:2351
@@ -8786,29 +9050,29 @@
 msgid "Failed to allocate IP address for new destination\n"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:2982
+#: src/vpn/gnunet-service-vpn.c:2987
 #, fuzzy
 msgid "Must specify valid IPv6 address"
 msgstr "\"%s\" är inte tillgänglig."
 
-#: src/vpn/gnunet-service-vpn.c:3006
+#: src/vpn/gnunet-service-vpn.c:3011
 msgid "Must specify valid IPv6 mask"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:3014
+#: src/vpn/gnunet-service-vpn.c:3019
 msgid "IPv6 support disabled as this system does not support IPv6\n"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:3027
+#: src/vpn/gnunet-service-vpn.c:3032
 #, fuzzy
 msgid "Must specify valid IPv4 address"
 msgstr "\"%s\" är inte tillgänglig."
 
-#: src/vpn/gnunet-service-vpn.c:3040
+#: src/vpn/gnunet-service-vpn.c:3045
 msgid "Must specify valid IPv4 mask"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:3050
+#: src/vpn/gnunet-service-vpn.c:3055
 msgid "IPv4 support disabled as this system does not support IPv4\n"
 msgstr ""
 
@@ -8897,6 +9161,59 @@
 msgstr "\"%s\" misslyckades för fil \"%s\" vid %s:%d med fel: %s\n"
 
 #, fuzzy
+#~ msgid "Peer `%s'\n"
+#~ msgstr "Jag är ändpunkt \"%s\".\n"
+
+#, fuzzy
+#~ msgid "# Bytes received from MESH"
+#~ msgstr "# byte mottagna via HTTP"
+
+#, fuzzy
+#~ msgid "# Replies received from MESH"
+#~ msgstr "# byte mottagna via HTTP"
+
+#, fuzzy
+#~ msgid "Failed to run `upnpc` command"
+#~ msgstr "Misslyckades att starta samling.\n"
+
+#, fuzzy
+#~ msgid "`upnpc` command not found"
+#~ msgstr "Kommando \"%s\" hittades inte!\n"
+
+#, fuzzy
+#~ msgid "Could not convert `%s' to integer.\n"
+#~ msgstr "Kunde inte ansluta till gnunetd.\n"
+
+#, fuzzy
+#~ msgid "Too short message received from client!\n"
+#~ msgstr "Meddelande mottaget från klient är ogiltig.\n"
+
+#, fuzzy
+#~ msgid ""
+#~ "Invalid message received from client, session information incorrect!\n"
+#~ msgstr "Ogiltigt meddelande mottogs den %s:%d."
+
+#, fuzzy
+#~ msgid "# SUC responder result messages received"
+#~ msgstr "# krypterade PONG-meddelanden mottagna"
+
+#, fuzzy
+#~ msgid "# bytes sent to scalarproduct"
+#~ msgstr "# byte krypterade"
+
+#, fuzzy
+#~ msgid "Failed to connect to the scalarproduct service\n"
+#~ msgstr "Misslyckades att ansluta till gnunetd.\n"
+
+#, fuzzy
+#~ msgid "Failed to send a message to the statistics service\n"
+#~ msgstr "Misslyckades att ansluta till gnunetd.\n"
+
+#, fuzzy
+#~ msgid "Failed to send a message to the scalarproduct service\n"
+#~ msgstr "Misslyckades att ansluta till gnunetd.\n"
+
+#, fuzzy
 #~ msgid "# TRAIL SETUP requests received"
 #~ msgstr "# byte mottogs via TCP"
 
@@ -9040,10 +9357,6 @@
 #~ msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 
 #, fuzzy
-#~ msgid "Unable to initialize resolver!\n"
-#~ msgstr "Kunde inte initiera SQLite.\n"
-
-#, fuzzy
 #~ msgid "Using default zone file `%s'\n"
 #~ msgstr "Startade samling \"%s\".\n"
 
@@ -9185,10 +9498,6 @@
 #~ msgstr "\"%s\" är inte en fil.\n"
 
 #, fuzzy
-#~ msgid "Error communicating with ARM service.\n"
-#~ msgstr "Skriv ut information om GNUnets motparter."
-
-#, fuzzy
 #~ msgid "Timeout communicating with ARM service.\n"
 #~ msgstr "Skriv ut information om GNUnets motparter."
 
@@ -9229,10 +9538,6 @@
 #~ msgstr "Misslyckades att starta samling.\n"
 
 #, fuzzy
-#~ msgid "# session keys received"
-#~ msgstr "# sessionnycklar vägrade"
-
-#, fuzzy
 #~ msgid "`%s' is for `%s', not for me.  Ignoring.\n"
 #~ msgstr "storlek på \"%s\" meddelande är för litet. Ignorerar.\n"
 
@@ -9377,10 +9682,6 @@
 #~ msgstr "Kunde inte spara konfiguration!"
 
 #, fuzzy
-#~ msgid "Failed to queue a confirmation receipt\n"
-#~ msgstr "Kunde inte spara konfiguration!"
-
-#, fuzzy
 #~ msgid "Failed to queue a leave notification\n"
 #~ msgstr "Kunde inte spara konfiguration!"
 
@@ -9389,10 +9690,6 @@
 #~ msgstr "\"%s\" ansluten till \"%s\".\n"
 
 #, fuzzy
-#~ msgid "Configuration fails to specify `%s' in section `%s'\n"
-#~ msgstr "Konfigurationsfil \"%s\" skapad.\n"
-
-#, fuzzy
 #~ msgid "Configuration fails to specify `%s', assuming default value."
 #~ msgstr "Konfigurationsfil \"%s\" skapad.\n"
 
@@ -9619,9 +9916,6 @@
 #~ msgid "print the version number"
 #~ msgstr "skriv ut versionsnummer"
 
-#~ msgid "be verbose"
-#~ msgstr "var informativ"
-
 #, fuzzy
 #~ msgid "Failed to start service `%s'!\n"
 #~ msgstr "Misslyckades att starta samling.\n"
@@ -10190,15 +10484,7 @@
 #~ "Upload aborted.\n"
 #~ msgstr "Nedladdning avbruten."
 
-#, fuzzy
 #~ msgid ""
-#~ "\n"
-#~ "Error uploading file: %s"
-#~ msgstr ""
-#~ "\n"
-#~ "Fel vid uppladdning av fil: %s\n"
-
-#~ msgid ""
 #~ "even if gnunetd is running on the local machine, force the creation of a "
 #~ "copy instead of making a link to the GNUnet share directory"
 #~ msgstr ""
@@ -10262,10 +10548,6 @@
 #~ msgid "No filename specified, using `%s' instead (for now).\n"
 #~ msgstr "Inget tabellnamn angivet, använder \"%s\".\n"
 
-#, fuzzy
-#~ msgid "Downloading %d files from directory `%s'.\n"
-#~ msgstr "Ladda ner filer från GNUnet."
-
 #~ msgid "File stored as `%s'.\n"
 #~ msgstr "Fil lagrad som \"%s\".\n"
 

Modified: gnunet/po/vi.po
===================================================================
--- gnunet/po/vi.po     2014-06-04 16:03:17 UTC (rev 33521)
+++ gnunet/po/vi.po     2014-06-04 16:38:42 UTC (rev 33522)
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: gnunet 0.8.0a\n"
 "Report-Msgid-Bugs-To: address@hidden"
-"POT-Creation-Date: 2014-04-08 11:11+0200\n"
+"POT-Creation-Date: 2014-06-04 18:25+0200\n"
 "PO-Revision-Date: 2008-09-10 22:05+0930\n"
 "Last-Translator: Clytie Siddall <address@hidden>\n"
 "Language-Team: Vietnamese <address@hidden>\n"
@@ -352,130 +352,159 @@
 msgid "Initiating shutdown as requested by client.\n"
 msgstr ""
 
-#: src/ats/ats_api_performance.c:468
+#: src/ats/ats_api_performance.c:485
 #, fuzzy, c-format
 msgid "Received %s message\n"
 msgstr "Nhận yêu cầu định tuyến\n"
 
-#: src/ats/ats_api_performance.c:511
+#: src/ats/ats_api_performance.c:528
 #, fuzzy, c-format
 msgid "Received last message for %s \n"
 msgstr "Nhận yêu cầu định tuyến\n"
 
-#: src/ats/gnunet-ats-solver-eval.c:2199 src/ats/gnunet-ats-solver-eval.c:2233
-#: src/ats/gnunet-service-ats_addresses.c:1980
-#: src/ats/gnunet-service-ats_addresses.c:2024
+#: src/ats/gnunet-ats-solver-eval.c:2793 src/ats/gnunet-ats-solver-eval.c:2827
+#: src/ats/gnunet-service-ats_addresses.c:1675
+#: src/ats/gnunet-service-ats_addresses.c:1719
 #, c-format
 msgid ""
 "Could not load quota for network `%s':  `%s', assigning default bandwidth "
 "%llu\n"
 msgstr ""
 
-#: src/ats/gnunet-ats-solver-eval.c:2205
-#: src/ats/gnunet-service-ats_addresses.c:1987
+#: src/ats/gnunet-ats-solver-eval.c:2799
+#: src/ats/gnunet-service-ats_addresses.c:1682
 #, c-format
 msgid "Outbound quota configure for network `%s' is %llu\n"
 msgstr ""
 
-#: src/ats/gnunet-ats-solver-eval.c:2212
-#: src/ats/gnunet-service-ats_addresses.c:1995
+#: src/ats/gnunet-ats-solver-eval.c:2806
+#: src/ats/gnunet-service-ats_addresses.c:1690
 #, c-format
 msgid ""
 "No outbound quota configured for network `%s', assigning default bandwidth "
 "%llu\n"
 msgstr ""
 
-#: src/ats/gnunet-ats-solver-eval.c:2239
-#: src/ats/gnunet-service-ats_addresses.c:2031
+#: src/ats/gnunet-ats-solver-eval.c:2833
+#: src/ats/gnunet-service-ats_addresses.c:1726
 #, c-format
 msgid "Inbound quota configured for network `%s' is %llu\n"
 msgstr ""
 
-#: src/ats/gnunet-ats-solver-eval.c:2246
-#: src/ats/gnunet-service-ats_addresses.c:2039
+#: src/ats/gnunet-ats-solver-eval.c:2840
+#: src/ats/gnunet-service-ats_addresses.c:1734
 #, c-format
 msgid ""
 "No outbound quota configure for network `%s', assigning default bandwidth "
 "%llu\n"
 msgstr ""
 
-#: src/ats/gnunet-ats-solver-eval.c:2671
+#: src/ats/gnunet-ats-solver-eval.c:3397
 #: src/ats-tests/gnunet-solver-eval.c:919
 msgid "solver to use"
 msgstr ""
 
-#: src/ats/gnunet-ats-solver-eval.c:2674 src/ats/gnunet-ats-solver-eval.c:2677
+#: src/ats/gnunet-ats-solver-eval.c:3400
 #: src/ats-tests/gnunet-solver-eval.c:922
 #: src/ats-tests/gnunet-solver-eval.c:925
 msgid "experiment to use"
 msgstr ""
 
-#: src/ats/gnunet-ats-solver-eval.c:2680
+#: src/ats/gnunet-ats-solver-eval.c:3403
+msgid "be verbose"
+msgstr "xuất chi tiết"
+
+#: src/ats/gnunet-ats-solver-eval.c:3406
 #, fuzzy
 msgid "print logging"
 msgstr "Theo dõi"
 
-#: src/ats/gnunet-service-ats_addresses.c:2217
+#: src/ats/gnunet-ats-solver-eval.c:3409
+msgid "save logging to disk"
+msgstr ""
+
+#: src/ats/gnunet-ats-solver-eval.c:3412
+msgid "disable normalization"
+msgstr ""
+
+#: src/ats/gnunet-service-ats_addresses.c:1912
 #, c-format
 msgid "Initializing solver `%s '`%s'\n"
 msgstr ""
 
-#: src/ats/gnunet-service-ats_addresses.c:2220
+#: src/ats/gnunet-service-ats_addresses.c:1915
 #, 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:2243
+#: src/ats/gnunet-service-ats_addresses.c:1938
 #, fuzzy
 msgid "Failed to initialize solver!\n"
 msgstr "Không thể sơ khởi SQLite: %s.\n"
 
-#: src/ats/plugin_ats_mlp.c:892
+#: src/ats/plugin_ats_mlp.c:949
 msgid "Problem size too large, cannot allocate memory!\n"
 msgstr ""
 
-#: src/ats/plugin_ats_mlp.c:1329
+#: src/ats/plugin_ats_mlp.c:1542
 #, fuzzy, c-format
 msgid "Adding address for peer `%s' multiple times\n"
 msgstr "Không thể lấy địa chỉ của đồng đẳng « %s ».\n"
 
-#: src/ats/plugin_ats_mlp.c:1376
+#: src/ats/plugin_ats_mlp.c:1589
 #, c-format
 msgid "Updating address property `%s' for peer `%s' %p not added before\n"
 msgstr ""
 
-#: src/ats/plugin_ats_mlp.c:2122
+#: src/ats/plugin_ats_mlp.c:2299
+msgid ""
+"MLP solver is not optimizing for anything, changing to feasibility check\n"
+msgstr ""
+
+#: src/ats/plugin_ats_mlp.c:2339 src/ats/plugin_ats_mlp.c:2356
+#: src/ats/plugin_ats_mlp.c:2388 src/ats/plugin_ats_mlp.c:2406
+#: src/ats/plugin_ats_mlp.c:2425 src/ats/plugin_ats_proportional.c:458
+#: src/ats/plugin_ats_proportional.c:475 src/ats/plugin_ats_ril.c:2220
+#: src/ats/plugin_ats_ril.c:2237 src/ats/plugin_ats_ril.c:2254
+#: src/ats/plugin_ats_ril.c:2271 src/ats/plugin_ats_ril.c:2288
+#: src/ats/plugin_ats_ril.c:2305 src/ats/plugin_ats_ril.c:2322
+#: src/ats/plugin_ats_ril.c:2339
+#, fuzzy, c-format
+msgid "Invalid %s configuration %f \n"
+msgstr "Không thể lưu tập tin cấu hình « %s »:"
+
+#: src/ats/plugin_ats_mlp.c:2512
 #, c-format
 msgid ""
 "Adjusting inconsistent outbound quota configuration for network `%s', is "
 "%llu must be at least %llu\n"
 msgstr ""
 
-#: src/ats/plugin_ats_mlp.c:2131
+#: src/ats/plugin_ats_mlp.c:2521
 #, c-format
 msgid ""
 "Adjusting inconsistent inbound quota configuration for network `%s', is %llu "
 "must be at least %llu\n"
 msgstr ""
 
-#: src/ats/plugin_ats_mlp.c:2142
+#: src/ats/plugin_ats_mlp.c:2532
 #, c-format
 msgid ""
 "Adjusting outbound quota configuration for network `%s'from %llu to %.0f\n"
 msgstr ""
 
-#: src/ats/plugin_ats_mlp.c:2150
+#: src/ats/plugin_ats_mlp.c:2540
 #, c-format
 msgid ""
 "Adjusting inbound quota configuration for network `%s' from %llu to %.0f\n"
 msgstr ""
 
-#: src/ats/plugin_ats_mlp.c:2161
+#: src/ats/plugin_ats_mlp.c:2551
 #, c-format
 msgid "Using default quota configuration for network `%s' (in/out) %llu/%llu\n"
 msgstr ""
 
-#: src/ats/plugin_ats_proportional.c:1511
+#: src/ats/plugin_ats_proportional.c:1819
 #, 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"
@@ -513,7 +542,7 @@
 msgid "Could not connect master [%u] and slave [%u]\n"
 msgstr "Không thể kết nối tới %s:%u: %s\n"
 
-#: src/ats-tests/ats-testing.c:490 src/ats-tests/ats-testing.c:671
+#: src/ats-tests/ats-testing.c:490 src/ats-tests/ats-testing.c:673
 #, fuzzy
 msgid "Initialization failed, shutdown\n"
 msgstr "Lỗi sơ khởi cơ chế phần bổ sung: %s\n"
@@ -545,108 +574,164 @@
 msgid "ATS returned results for %u addresses\n"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:232
+#: src/ats-tool/gnunet-ats.c:258
 #, 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:413
+#: src/ats-tool/gnunet-ats.c:467
 #, c-format
 msgid "Quota for network `%11s' (in/out): %10s / %10s\n"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:433 src/core/gnunet-core.c:163
-#: src/namestore/gnunet-namestore.c:550 src/transport/gnunet-transport.c:1246
+#: src/ats-tool/gnunet-ats.c:487 src/namestore/gnunet-namestore.c:639
+#: src/transport/gnunet-transport.c:1349
 #, 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:445 src/transport/gnunet-transport.c:1255
+#: src/ats-tool/gnunet-ats.c:499 src/transport/gnunet-transport.c:1358
 #, 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:454
+#: src/ats-tool/gnunet-ats.c:508
 #, c-format
 msgid "Please select one operation : %s or %s or %s or %s or %s\n"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:470 src/ats-tool/gnunet-ats.c:489
-#: src/ats-tool/gnunet-ats.c:506 src/ats-tool/gnunet-ats.c:543
+#: src/ats-tool/gnunet-ats.c:524 src/ats-tool/gnunet-ats.c:543
+#: src/ats-tool/gnunet-ats.c:560 src/ats-tool/gnunet-ats.c:597
 #, 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:478 src/ats-tool/gnunet-ats.c:495
+#: src/ats-tool/gnunet-ats.c:532 src/ats-tool/gnunet-ats.c:549
 #, 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:515
+#: src/ats-tool/gnunet-ats.c:569
 #, 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:520
+#: src/ats-tool/gnunet-ats.c:574
 #, fuzzy, c-format
 msgid "No peer given!\n"
 msgstr "chưa đưa ra tên"
 
-#: src/ats-tool/gnunet-ats.c:536
+#: src/ats-tool/gnunet-ats.c:590
 msgid "Valid type required\n"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:594
+#: src/ats-tool/gnunet-ats.c:648
 msgid "get list of active addresses currently used"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:596
+#: src/ats-tool/gnunet-ats.c:650
 msgid "get list of all active addresses"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:599
+#: src/ats-tool/gnunet-ats.c:653
 #, 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:601
+#: src/ats-tool/gnunet-ats.c:655
 msgid "monitor mode"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:603
+#: src/ats-tool/gnunet-ats.c:657
 #, 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:605
+#: src/ats-tool/gnunet-ats.c:659
 msgid "print all configured quotas"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:607
+#: src/ats-tool/gnunet-ats.c:661
 msgid "peer id"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:610
+#: src/ats-tool/gnunet-ats.c:664
 msgid "preference type to set: latency | bandwidth"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:612
+#: src/ats-tool/gnunet-ats.c:666
 msgid "preference value"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:615
+#: src/ats-tool/gnunet-ats.c:669
 msgid "verbose output (include ATS address properties)"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:622
+#: src/ats-tool/gnunet-ats.c:676
 #, fuzzy
 msgid "Print information about ATS state"
 msgstr "In ra thông tin về các đồng đẳng GNUnet."
 
+#: src/cadet/gnunet-cadet.c:357
+#, fuzzy, c-format
+msgid "Invalid target `%s'\n"
+msgstr "Đối số không hợp lệ cho « %s ».\n"
+
+#: src/cadet/gnunet-cadet.c:607
+#, fuzzy, c-format
+msgid "Invalid peer ID `%s'\n"
+msgstr "Dữ liệu nhập không hợp lệ.\n"
+
+#: src/cadet/gnunet-cadet.c:650
+#, fuzzy, c-format
+msgid "Invalid tunnel owner `%s'\n"
+msgstr "Địa chỉ IP định dạng sai: %s\n"
+
+#: src/cadet/gnunet-cadet.c:716
+msgid "You must NOT give a TARGETwhen using 'request all' options\n"
+msgstr ""
+
+#: src/cadet/gnunet-cadet.c:807
+#, fuzzy
+msgid "provide information about a particular connection"
+msgstr "In ra thông tin về các đồng đẳng GNUnet."
+
+#: src/cadet/gnunet-cadet.c:810
+msgid "activate echo mode"
+msgstr ""
+
+#: src/cadet/gnunet-cadet.c:816
+msgid "port to listen to (default; 0)"
+msgstr ""
+
+#: src/cadet/gnunet-cadet.c:819
+#, fuzzy
+msgid "provide information about a patricular peer"
+msgstr "In ra thông tin về các đồng đẳng GNUnet."
+
+#: src/cadet/gnunet-cadet.c:822
+#, fuzzy
+msgid "provide information about all peers"
+msgstr "In ra thông tin về các đồng đẳng GNUnet."
+
+#: src/cadet/gnunet-cadet.c:825
+#, fuzzy
+msgid "provide information about a particular tunnel"
+msgstr "In ra thông tin về các đồng đẳng GNUnet."
+
+#: src/cadet/gnunet-cadet.c:828
+#, fuzzy
+msgid "provide information about all tunnels"
+msgstr "In ra thông tin về các đồng đẳng GNUnet."
+
+#: src/cadet/gnunet-service-cadet_peer.c:429
+msgid "Wrong CORE service\n"
+msgstr ""
+
 #: src/consensus/gnunet-consensus-profiler.c:437
-#: src/secretsharing/gnunet-secretsharing-profiler.c:535
+#: src/secretsharing/gnunet-secretsharing-profiler.c:610
 #, fuzzy
 msgid "number of peers in consensus"
 msgstr "số lần lặp lại"
@@ -672,7 +757,7 @@
 msgstr ""
 
 #: src/consensus/gnunet-consensus-profiler.c:452
-#: src/secretsharing/gnunet-secretsharing-profiler.c:550
+#: src/secretsharing/gnunet-secretsharing-profiler.c:625
 msgid "be more verbose (print received values)"
 msgstr ""
 
@@ -681,6 +766,11 @@
 msgid "Connection to conversation service lost, trying to reconnect\n"
 msgstr ""
 
+#: src/conversation/conversation_api.c:681
+#, fuzzy
+msgid "number too large"
+msgstr "số lần lặp lại"
+
 #: src/conversation/gnunet-conversation.c:264
 #, c-format
 msgid "Incoming call from `%s'. Please /accept #%u or /cancel %u the call.\n"
@@ -1096,19 +1186,19 @@
 msgid "Failed to allocate %d bytes for second packet\n"
 msgstr "Lỗi tạo thư mục tạm thời."
 
-#: src/conversation/gnunet-service-conversation.c:841
-msgid "Mesh audio channel not ready; audio data dropped\n"
+#: src/conversation/gnunet-service-conversation.c:852
+msgid "Cadet audio channel not ready; audio data dropped\n"
 msgstr ""
 
-#: src/conversation/gnunet-service-conversation.c:932
+#: src/conversation/gnunet-service-conversation.c:943
 #, c-format
 msgid ""
 "No available phone for incoming call on line %u, sending HANG_UP signal\n"
 msgstr ""
 
-#: src/conversation/gnunet-service-conversation.c:1338
+#: src/conversation/gnunet-service-conversation.c:1349
 #, fuzzy, c-format
-msgid "Received incoming channel on port %u\n"
+msgid "Received incoming Cadet channel on port %u\n"
 msgstr "« %.*s » được kết nối tới « %.*s ».\n"
 
 #: src/conversation/microphone.c:121
@@ -1126,215 +1216,242 @@
 msgid "Could not start playback audio helper.\n"
 msgstr "Không thể nạp phần bổ sung truyền tải « %s »\n"
 
-#: src/core/core_api.c:767
+#: src/core/core_api.c:768
 msgid "Client was disconnected from core service, trying to reconnect.\n"
 msgstr ""
 
-#: src/core/gnunet-core.c:80
-#, fuzzy, c-format
-msgid "Peer `%s'\n"
-msgstr "Tôi là đồng đẳng « %s ».\n"
+#: src/core/gnunet-core.c:92
+#, fuzzy
+msgid "fresh connection"
+msgstr "# của các đồng đẳng đã kết nối"
 
-#: src/core/gnunet-core.c:110 src/core/gnunet-core.c:138
-#: src/transport/gnunet-transport.c:910 src/transport/gnunet-transport.c:930
-#, c-format
-msgid "%24s: %-17s %4s   (%u connections in total)\n"
+#: src/core/gnunet-core.c:95
+msgid "key sent"
 msgstr ""
 
-#: src/core/gnunet-core.c:112 src/transport/gnunet-transport.c:911
+#: src/core/gnunet-core.c:98
 #, fuzzy
-msgid "Connected to"
-msgstr "« %s » được kết nối tới « %s ».\n"
+msgid "key received"
+msgstr "# các khoá phiên chạy bị từ chối"
 
-#: src/core/gnunet-core.c:140 src/transport/gnunet-transport.c:931
+#: src/core/gnunet-core.c:101
 #, fuzzy
-msgid "Disconnected from"
+msgid "connection established"
+msgstr "Thu thập bị dừng.\n"
+
+#: src/core/gnunet-core.c:104
+msgid "rekeying"
+msgstr ""
+
+#: src/core/gnunet-core.c:107
+#, fuzzy
+msgid "disconnected"
 msgstr "« %.*s » được kết nối tới « %.*s ».\n"
 
-#: src/core/gnunet-core.c:211 src/peerinfo-tool/gnunet-peerinfo.c:694
+#: src/core/gnunet-core.c:114
+msgid "Connection to CORE service lost (reconnecting)"
+msgstr ""
+
+#: src/core/gnunet-core.c:117
+#, fuzzy
+msgid "unknown state"
+msgstr "Lỗi không rõ"
+
+#: src/core/gnunet-core.c:122
+#, c-format
+msgid "%24s: %-30s %4s (timeout in %6s)\n"
+msgstr ""
+
+#: src/core/gnunet-core.c:146 src/peerinfo-tool/gnunet-peerinfo.c:705
 #, fuzzy, c-format
 msgid "Invalid command line argument `%s'\n"
 msgstr "Đối số không hợp lệ cho « %s ».\n"
 
-#: src/core/gnunet-core.c:233 src/transport/gnunet-transport.c:1486
+#: src/core/gnunet-core.c:157
+#: src/experimentation/gnunet-daemon-experimentation_nodes.c:1104
 #, fuzzy
+msgid "Failed to connect to CORE service!\n"
+msgstr "Lỗi kết nối đến gnunetd.\n"
+
+#: src/core/gnunet-core.c:179 src/transport/gnunet-transport.c:1590
+#, fuzzy
 msgid "provide information about all current connections (continuously)"
 msgstr "In ra thông tin về các đồng đẳng GNUnet."
 
-#: src/core/gnunet-core.c:244
+#: src/core/gnunet-core.c:188
 #, fuzzy
 msgid "Print information about connected peers."
 msgstr "In ra thông tin về các đồng đẳng GNUnet."
 
-#: src/core/gnunet-service-core.c:105
+#: src/core/gnunet-service-core.c:104
 #, fuzzy
 msgid "Core service is lacking HOSTKEY configuration setting.  Exiting.\n"
 msgstr "Lưu cấu hình ngay bây giờ không?"
 
-#: src/core/gnunet-service-core.c:126
+#: src/core/gnunet-service-core.c:128
 #, c-format
 msgid "Core service of `%4s' ready.\n"
 msgstr ""
 
-#: src/core/gnunet-service-core_clients.c:370
+#: src/core/gnunet-service-core_clients.c:372
 #, fuzzy
 msgid "# send requests dropped (disconnected)"
 msgstr "# các yêu cầu lỗ hổng bị bỏ do trọng tải"
 
-#: src/core/gnunet-service-core_clients.c:480
+#: src/core/gnunet-service-core_clients.c:483
 #, fuzzy
 msgid "# messages discarded (session disconnected)"
 msgstr "# các thông báo được chắp liền"
 
-#: src/core/gnunet-service-core_clients.c:526
+#: src/core/gnunet-service-core_clients.c:529
 #, fuzzy, c-format
 msgid "# bytes of messages of type %u received"
 msgstr "# các byte nhiễu được nhận"
 
-#: src/core/gnunet-service-core_kx.c:535
+#: src/core/gnunet-service-core_kx.c:549
 msgid "# bytes encrypted"
 msgstr "# các byte đã mã hoá"
 
-#: src/core/gnunet-service-core_kx.c:586
+#: src/core/gnunet-service-core_kx.c:601
 msgid "# bytes decrypted"
 msgstr "# các byte đã giải mã"
 
-#: src/core/gnunet-service-core_kx.c:673
+#: src/core/gnunet-service-core_kx.c:688
 msgid "# key exchanges initiated"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:713
+#: src/core/gnunet-service-core_kx.c:732
 msgid "# key exchanges stopped"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:810
+#: src/core/gnunet-service-core_kx.c:832
 msgid "# old ephemeral keys ignored"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:816
+#: src/core/gnunet-service-core_kx.c:839
 #, 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:850
+#: src/core/gnunet-service-core_kx.c:873
 #, 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:861
+#: src/core/gnunet-service-core_kx.c:884
 #, fuzzy
 msgid "# EPHEMERAL_KEY messages received"
 msgstr "# các thông báo được chắp liền"
 
-#: src/core/gnunet-service-core_kx.c:951
+#: src/core/gnunet-service-core_kx.c:983
 #: src/transport/gnunet-service-transport_validation.c:1016
 #, fuzzy
 msgid "# PING messages received"
 msgstr "# các thông báo PING được tạo"
 
-#: src/core/gnunet-service-core_kx.c:959
+#: src/core/gnunet-service-core_kx.c:991
 #, 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:986
+#: src/core/gnunet-service-core_kx.c:1018
 #, 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:1003
+#: src/core/gnunet-service-core_kx.c:1035
 #, fuzzy
 msgid "# PONG messages created"
 msgstr "# các thông báo PING được tạo"
 
-#: src/core/gnunet-service-core_kx.c:1029
+#: src/core/gnunet-service-core_kx.c:1061
 #, 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:1039
+#: src/core/gnunet-service-core_kx.c:1072
 #, 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:1096
+#: src/core/gnunet-service-core_kx.c:1139
 #: src/transport/gnunet-service-transport_validation.c:1328
 #, 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:1102
+#: src/core/gnunet-service-core_kx.c:1145
 #, 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:1107
+#: src/core/gnunet-service-core_kx.c:1150
 #, 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:1137
+#: src/core/gnunet-service-core_kx.c:1180
 #, fuzzy
 msgid "# PONG messages decrypted"
 msgstr "# các thông báo PING được tạo"
 
-#: src/core/gnunet-service-core_kx.c:1171
+#: src/core/gnunet-service-core_kx.c:1215
 #, 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:1181
+#: src/core/gnunet-service-core_kx.c:1226
 #, fuzzy
 msgid "# timeouts prevented via PONG"
 msgstr "# các byte đã nhận qua TCP"
 
-#: src/core/gnunet-service-core_kx.c:1188
+#: src/core/gnunet-service-core_kx.c:1233
 #, 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:1328
+#: src/core/gnunet-service-core_kx.c:1374
 #, 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:1335
+#: src/core/gnunet-service-core_kx.c:1381
 #, 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:1338
+#: src/core/gnunet-service-core_kx.c:1384
 #, 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:1383
-#: src/core/gnunet-service-core_kx.c:1408
+#: src/core/gnunet-service-core_kx.c:1430
+#: src/core/gnunet-service-core_kx.c:1455
 #, fuzzy
 msgid "# bytes dropped (duplicates)"
 msgstr "# các byte loại bỏ bởi UDP (đi ra)"
 
-#: src/core/gnunet-service-core_kx.c:1395
+#: src/core/gnunet-service-core_kx.c:1442
 #, 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:1437
+#: src/core/gnunet-service-core_kx.c:1484
 #, 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:1445
+#: src/core/gnunet-service-core_kx.c:1492
 #, fuzzy
 msgid "# bytes of payload decrypted"
 msgstr "# các byte đã giải mã"
 
-#: src/core/gnunet-service-core_kx.c:1480
+#: src/core/gnunet-service-core_kx.c:1527
 #, fuzzy
 msgid "# PAYLOAD dropped (out of order)"
 msgstr "# các byte loại bỏ bởi UDP (đi ra)"
@@ -1358,38 +1475,48 @@
 msgid "Unsupported message of type %u (%u bytes) received from peer `%s'\n"
 msgstr ""
 
-#: src/core/gnunet-service-core_sessions.c:216
-#: src/core/gnunet-service-core_sessions.c:288
+#: src/core/gnunet-service-core_sessions.c:245
+#: src/core/gnunet-service-core_sessions.c:328
 #: src/dht/gnunet-service-dht_neighbours.c:662
 #: src/dht/gnunet-service-dht_neighbours.c:727
-#: src/dht/gnunet-service-xdht_neighbours.c:1304
+#: src/dht/gnunet-service-xdht_neighbours.c:3586
 #: src/fs/gnunet-service-fs_cp.c:606 src/fs/gnunet-service-fs_cp.c:1501
 #: src/topology/gnunet-daemon-topology.c:707
 #: src/topology/gnunet-daemon-topology.c:808
 #: src/transport/gnunet-service-transport_neighbours.c:917
 #: src/transport/gnunet-service-transport_neighbours.c:1141
-#: src/transport/gnunet-service-transport_neighbours.c:3142
-#: src/transport/gnunet-service-transport_neighbours.c:3438
+#: src/transport/gnunet-service-transport_neighbours.c:3146
+#: src/transport/gnunet-service-transport_neighbours.c:3449
 #, fuzzy
 msgid "# peers connected"
 msgstr "# của các đồng đẳng đã kết nối"
 
-#: src/core/gnunet-service-core_sessions.c:255
+#: src/core/gnunet-service-core_sessions.c:278
 #, fuzzy
 msgid "# type map refreshes sent"
 msgstr "# tổng số yêu cầu lỗ hổng được gửi"
 
-#: src/core/gnunet-service-core_sessions.c:426
+#: src/core/gnunet-service-core_sessions.c:394
+#, fuzzy
+msgid "# outdated typemap confirmations received"
+msgstr "Lỗi lưu cấu hình."
+
+#: src/core/gnunet-service-core_sessions.c:405
+#, fuzzy
+msgid "# valid typemap confirmations received"
+msgstr "Lỗi lưu cấu hình."
+
+#: src/core/gnunet-service-core_sessions.c:543
 msgid "# messages discarded (expired prior to transmission)"
 msgstr ""
 
-#: src/core/gnunet-service-core_typemap.c:110
-#: src/core/gnunet-service-core_typemap.c:121
+#: src/core/gnunet-service-core_typemap.c:169
+#: src/core/gnunet-service-core_typemap.c:180
 #, fuzzy
 msgid "# type maps received"
 msgstr "# các thông báo phát hiện dht được nhận"
 
-#: src/core/gnunet-service-core_typemap.c:151
+#: src/core/gnunet-service-core_typemap.c:210
 msgid "# updates to my type map"
 msgstr ""
 
@@ -1450,12 +1577,13 @@
 #: src/namecache/plugin_namecache_sqlite.c:52
 #: src/namestore/plugin_namestore_postgres.c:52
 #: src/namestore/plugin_namestore_sqlite.c:52
+#: src/peerstore/plugin_peerstore_sqlite.c:50
 #: src/testbed/generate-underlay-topology.c:47
 #: src/testbed/gnunet-daemon-latency-logger.c:52
 #: src/testbed/gnunet-daemon-testbed-underlay.c:55
 #: src/testbed/testbed_api_hosts.c:69 src/util/crypto_ecc.c:51
 #: src/util/crypto_mpi.c:39 src/include/gnunet_common.h:602
-#: src/include/gnunet_common.h:611 src/scalarproduct/scalarproduct.h:50
+#: src/include/gnunet_common.h:611 src/scalarproduct/scalarproduct.h:44
 #, c-format
 msgid "`%s' failed at %s:%d with error: %s\n"
 msgstr "« %s » bị lỗi tại %s:%d với lỗi: %s\n"
@@ -1507,7 +1635,7 @@
 msgid "# datastore connections (re)created"
 msgstr "# các kết nối dht"
 
-#: src/datastore/datastore_api.c:616 src/scalarproduct/scalarproduct_api.c:279
+#: src/datastore/datastore_api.c:616
 #, fuzzy
 msgid "# transmission request failures"
 msgstr "# các sự truyền PONG bị lỗi"
@@ -1808,6 +1936,7 @@
 #: src/datastore/plugin_datastore_sqlite.c:255
 #: src/namecache/plugin_namecache_sqlite.c:193
 #: src/namestore/plugin_namestore_sqlite.c:204
+#: src/peerstore/plugin_peerstore_sqlite.c:434
 #: src/psycstore/plugin_psycstore_sqlite.c:319
 #, c-format
 msgid "Unable to initialize SQLite: %s.\n"
@@ -1966,100 +2095,100 @@
 msgstr "# các yêu cầu get (lấy) dht được nhận"
 
 #: src/dht/gnunet-service-dht_clients.c:513
-#: src/dht/gnunet-service-xdht_clients.c:927
+#: src/dht/gnunet-service-xdht_clients.c:925
 #, fuzzy
 msgid "# PUT requests received from clients"
 msgstr "# các đáp ứng lỗ hổng được gửi cho trình/máy khách"
 
 #: src/dht/gnunet-service-dht_clients.c:597
-#: src/dht/gnunet-service-xdht_clients.c:1013
+#: src/dht/gnunet-service-xdht_clients.c:1010
 #, fuzzy
 msgid "# GET requests received from clients"
 msgstr "# các yêu cầu get (lấy) dht được nhận"
 
 #: src/dht/gnunet-service-dht_clients.c:798
-#: src/dht/gnunet-service-xdht_clients.c:1214
+#: src/dht/gnunet-service-xdht_clients.c:1211
 #, fuzzy
 msgid "# GET STOP requests received from clients"
 msgstr "# các yêu cầu get (lấy) dht được nhận"
 
-#: src/dht/gnunet-service-dht_clients.c:1039
+#: src/dht/gnunet-service-dht_clients.c:1040
 #: src/dht/gnunet-service-xdht_clients.c:498
 msgid "# Key match, type mismatches in REPLY to CLIENT"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_clients.c:1052
+#: src/dht/gnunet-service-dht_clients.c:1053
 #: src/dht/gnunet-service-xdht_clients.c:511
 msgid "# Duplicate REPLIES to CLIENT request dropped"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_clients.c:1089
+#: src/dht/gnunet-service-dht_clients.c:1090
 #: src/dht/gnunet-service-xdht_clients.c:548
 #, c-format
 msgid "Unsupported block type (%u) in request!\n"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_clients.c:1112
+#: src/dht/gnunet-service-dht_clients.c:1113
 #: src/dht/gnunet-service-xdht_clients.c:571
 msgid "# RESULTS queued for clients"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_clients.c:1166
-#: src/dht/gnunet-service-dht_clients.c:1209
+#: src/dht/gnunet-service-dht_clients.c:1167
+#: src/dht/gnunet-service-dht_clients.c:1210
 #: src/dht/gnunet-service-xdht_clients.c:625
 #: src/dht/gnunet-service-xdht_clients.c:668
 msgid "# REPLIES ignored for CLIENTS (no match)"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_clients.c:1176
+#: src/dht/gnunet-service-dht_clients.c:1177
 #: src/dht/gnunet-service-xdht_clients.c:635
 msgid "Could not pass reply to client, message too big!\n"
 msgstr ""
 
 #: src/dht/gnunet-service-dht_datacache.c:68
-#: src/dht/gnunet-service-xdht_datacache.c:68
+#: src/dht/gnunet-service-xdht_datacache.c:69
 #, fuzzy, c-format
 msgid "%s request received, but have no datacache!\n"
 msgstr "# các byte kiểu %d được nhận"
 
 #: src/dht/gnunet-service-dht_datacache.c:78
-#: src/dht/gnunet-service-xdht_datacache.c:78
+#: src/dht/gnunet-service-xdht_datacache.c:79
 msgid "# ITEMS stored in datacache"
 msgstr ""
 
 #: src/dht/gnunet-service-dht_datacache.c:165
-#: src/dht/gnunet-service-xdht_datacache.c:165
+#: src/dht/gnunet-service-xdht_datacache.c:213
 msgid "# Good RESULTS found in datacache"
 msgstr ""
 
 #: src/dht/gnunet-service-dht_datacache.c:176
-#: src/dht/gnunet-service-xdht_datacache.c:176
+#: src/dht/gnunet-service-xdht_datacache.c:234
 msgid "# Duplicate RESULTS found in datacache"
 msgstr ""
 
 #: src/dht/gnunet-service-dht_datacache.c:182
-#: src/dht/gnunet-service-xdht_datacache.c:182
+#: src/dht/gnunet-service-xdht_datacache.c:240
 msgid "# Invalid RESULTS found in datacache"
 msgstr ""
 
 #: src/dht/gnunet-service-dht_datacache.c:188
-#: src/dht/gnunet-service-xdht_datacache.c:188
+#: src/dht/gnunet-service-xdht_datacache.c:246
 msgid "# Irrelevant RESULTS found in datacache"
 msgstr ""
 
 #: src/dht/gnunet-service-dht_datacache.c:200
-#: src/dht/gnunet-service-xdht_datacache.c:200
+#: src/dht/gnunet-service-xdht_datacache.c:258
 msgid "# Unsupported RESULTS found in datacache"
 msgstr ""
 
 #: src/dht/gnunet-service-dht_datacache.c:203
-#: src/dht/gnunet-service-xdht_datacache.c:203
+#: src/dht/gnunet-service-xdht_datacache.c:261
 #, c-format
 msgid "Unsupported block type (%u) in local response!\n"
 msgstr ""
 
 #: src/dht/gnunet-service-dht_datacache.c:234
-#: src/dht/gnunet-service-xdht_datacache.c:234
+#: src/dht/gnunet-service-xdht_datacache.c:298
 #, fuzzy
 msgid "# GET requests given to datacache"
 msgstr "# các yêu cầu get (lấy) dht được nhận"
@@ -2085,13 +2214,13 @@
 msgstr "# các thông báo được chắp liền"
 
 #: src/dht/gnunet-service-dht_neighbours.c:819
-#: src/dht/gnunet-service-xdht_neighbours.c:703
+#: src/dht/gnunet-service-xdht_neighbours.c:745
 #, fuzzy
 msgid "# Bytes transmitted to other peers"
 msgstr "# các byte kiểu %d được gửi "
 
 #: src/dht/gnunet-service-dht_neighbours.c:857
-#: src/dht/gnunet-service-xdht_neighbours.c:742
+#: src/dht/gnunet-service-xdht_neighbours.c:786
 #, fuzzy
 msgid "# Bytes of bandwidth requested from core"
 msgstr "# các yêu cầu máy/trình khách lỗ hổng được phun vào"
@@ -2112,88 +2241,92 @@
 msgid "# Peer selection failed"
 msgstr "# các cuộc gọi HTTP select (lựa chọn)"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1287
+#: src/dht/gnunet-service-dht_neighbours.c:1289
 #, fuzzy
 msgid "# PUT requests routed"
 msgstr "# các yêu cầu dht được định tuyến"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1316
+#: src/dht/gnunet-service-dht_neighbours.c:1318
 #, fuzzy
 msgid "# PUT messages queued for transmission"
 msgstr "# các thông báo PING được tạo"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1323
-#: src/dht/gnunet-service-dht_neighbours.c:1440
-#: src/dht/gnunet-service-dht_neighbours.c:1543
-#: src/dht/gnunet-service-xdht_neighbours.c:794
-#: src/dht/gnunet-service-xdht_neighbours.c:860
-#: src/dht/gnunet-service-xdht_neighbours.c:919
-#: src/dht/gnunet-service-xdht_neighbours.c:981
-#: src/dht/gnunet-service-xdht_neighbours.c:1041
+#: src/dht/gnunet-service-dht_neighbours.c:1328
+#: src/dht/gnunet-service-dht_neighbours.c:1452
+#: src/dht/gnunet-service-dht_neighbours.c:1557
+#: src/dht/gnunet-service-xdht_neighbours.c:843
+#: src/dht/gnunet-service-xdht_neighbours.c:910
+#: src/dht/gnunet-service-xdht_neighbours.c:980
+#: src/dht/gnunet-service-xdht_neighbours.c:1040
+#: src/dht/gnunet-service-xdht_neighbours.c:1098
+#: src/dht/gnunet-service-xdht_neighbours.c:1157
+#: src/dht/gnunet-service-xdht_neighbours.c:1218
+#: src/dht/gnunet-service-xdht_neighbours.c:1280
+#: src/dht/gnunet-service-xdht_neighbours.c:1341
 #, fuzzy
 msgid "# P2P messages dropped due to full queue"
 msgstr "# các yêu cầu lỗ hổng bị bỏ do trọng tải"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1405
+#: src/dht/gnunet-service-dht_neighbours.c:1414
 #, fuzzy
 msgid "# GET requests routed"
 msgstr "# các yêu cầu dht được định tuyến"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1432
+#: src/dht/gnunet-service-dht_neighbours.c:1441
 #, fuzzy
 msgid "# GET messages queued for transmission"
 msgstr "# các thông báo PING được tạo"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1550
+#: src/dht/gnunet-service-dht_neighbours.c:1564
 #, fuzzy
 msgid "# RESULT messages queued for transmission"
 msgstr "# các thông báo PING được tạo"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1636
+#: src/dht/gnunet-service-dht_neighbours.c:1651
 #, fuzzy
 msgid "# P2P PUT requests received"
 msgstr "# các yêu cầu get (lấy) dht được nhận"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1639
+#: src/dht/gnunet-service-dht_neighbours.c:1654
 #, fuzzy
 msgid "# P2P PUT bytes received"
 msgstr "# các yêu cầu get (lấy) dht được nhận"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1803
+#: src/dht/gnunet-service-dht_neighbours.c:1821
 #, fuzzy
 msgid "# FIND PEER requests ignored due to Bloomfilter"
 msgstr "# các yêu cầu được lọc theo bộ lọc bloom"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1811
+#: src/dht/gnunet-service-dht_neighbours.c:1829
 msgid "# FIND PEER requests ignored due to lack of HELLO"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1904
+#: src/dht/gnunet-service-dht_neighbours.c:1924
 #, fuzzy
 msgid "# P2P GET requests received"
 msgstr "# các yêu cầu get (lấy) dht được nhận"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1907
+#: src/dht/gnunet-service-dht_neighbours.c:1927
 #, fuzzy
 msgid "# P2P GET bytes received"
 msgstr "# các yêu cầu get (lấy) dht được nhận"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1961
+#: src/dht/gnunet-service-dht_neighbours.c:1984
 #, fuzzy
 msgid "# P2P FIND PEER requests processed"
 msgstr "# các yêu cầu get (lấy) dht được nhận"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1975
+#: src/dht/gnunet-service-dht_neighbours.c:1998
 #, fuzzy
 msgid "# P2P GET requests ONLY routed"
 msgstr "# các yêu cầu dht được định tuyến"
 
-#: src/dht/gnunet-service-dht_neighbours.c:2052
+#: src/dht/gnunet-service-dht_neighbours.c:2083
 #, fuzzy
 msgid "# P2P RESULTS received"
 msgstr "# Tín hiệu HTTP PUT được nhận"
 
-#: src/dht/gnunet-service-dht_neighbours.c:2055
+#: src/dht/gnunet-service-dht_neighbours.c:2086
 #, fuzzy
 msgid "# P2P RESULT bytes received"
 msgstr "# Tín hiệu HTTP PUT được nhận"
@@ -2236,24 +2369,6 @@
 msgid "# DHT requests combined"
 msgstr "# các yêu cầu get (lấy) dht được nhận"
 
-#: src/dht/gnunet-service-xdht_neighbours.c:1398
-#, c-format
-msgid ""
-"\n"
-"SUPU %s, %s, %d,my_identity = %s"
-msgstr ""
-
-#: src/dht/gnunet-service-xdht_neighbours.c:1514
-#: src/dht/gnunet-service-xdht_neighbours.c:1524
-#: src/dht/gnunet-service-xdht_neighbours.c:1530
-#: src/dht/gnunet-service-xdht_neighbours.c:1536
-#: src/dht/gnunet-service-xdht_neighbours.c:1545
-#, c-format
-msgid ""
-"\n"
-"SUPU %s, %s, %d"
-msgstr ""
-
 #: src/dht/plugin_block_dht.c:138
 #, fuzzy, c-format
 msgid "Block not of type %u\n"
@@ -2365,12 +2480,12 @@
 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:3514
+#: src/dns/gnunet-service-dns.c:1049
 #, 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:3571
+#: src/dns/gnunet-service-dns.c:1069 src/exit/gnunet-daemon-exit.c:3594
 #, 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"
@@ -2391,7 +2506,7 @@
 
 #: src/exit/gnunet-daemon-exit.c:853
 #, fuzzy
-msgid "# Bytes transmitted via mesh channels"
+msgid "# Bytes transmitted via cadet channels"
 msgstr "# các byte được gửi"
 
 #: src/exit/gnunet-daemon-exit.c:970 src/exit/gnunet-daemon-exit.c:2397
@@ -2458,7 +2573,7 @@
 
 #: src/exit/gnunet-daemon-exit.c:1872
 #, fuzzy
-msgid "# TCP service creation requests received via mesh"
+msgid "# TCP service creation requests received via cadet"
 msgstr "# các yêu cầu danh sách máy được nhận"
 
 #: src/exit/gnunet-daemon-exit.c:1875 src/exit/gnunet-daemon-exit.c:1968
@@ -2466,7 +2581,7 @@
 #: 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"
+msgid "# Bytes received from CADET"
 msgstr "# các byte đã nhận qua HTTP"
 
 #: src/exit/gnunet-daemon-exit.c:1909 src/exit/gnunet-daemon-exit.c:2990
@@ -2481,12 +2596,12 @@
 
 #: src/exit/gnunet-daemon-exit.c:1971
 #, fuzzy
-msgid "# TCP IP-exit creation requests received via mesh"
+msgid "# TCP IP-exit creation requests received via cadet"
 msgstr "# các yêu cầu danh sách máy được nhận"
 
 #: src/exit/gnunet-daemon-exit.c:2076
 #, fuzzy
-msgid "# TCP data requests received via mesh"
+msgid "# TCP data requests received via cadet"
 msgstr "# các yêu cầu get (lấy) dht được nhận"
 
 #: src/exit/gnunet-daemon-exit.c:2090
@@ -2501,12 +2616,12 @@
 
 #: src/exit/gnunet-daemon-exit.c:2324
 #, fuzzy
-msgid "# ICMP IP-exit requests received via mesh"
+msgid "# ICMP IP-exit requests received via cadet"
 msgstr "# các yêu cầu get (lấy) dht được nhận"
 
 #: src/exit/gnunet-daemon-exit.c:2573
 #, fuzzy
-msgid "# ICMP service requests received via mesh"
+msgid "# ICMP service requests received via cadet"
 msgstr "# các đáp ứng lỗ hổng được gửi cho trình/máy khách"
 
 #: src/exit/gnunet-daemon-exit.c:2639 src/vpn/gnunet-service-vpn.c:1397
@@ -2526,12 +2641,12 @@
 
 #: src/exit/gnunet-daemon-exit.c:2862
 #, fuzzy
-msgid "# UDP IP-exit requests received via mesh"
+msgid "# UDP IP-exit requests received via cadet"
 msgstr "# các yêu cầu get (lấy) dht được nhận"
 
 #: src/exit/gnunet-daemon-exit.c:2969
 #, fuzzy
-msgid "# UDP service requests received via mesh"
+msgid "# UDP service requests received via cadet"
 msgstr "# các yêu cầu get (lấy) dht được nhận"
 
 #: src/exit/gnunet-daemon-exit.c:2995
@@ -2541,68 +2656,73 @@
 
 #: src/exit/gnunet-daemon-exit.c:3031
 #, fuzzy
-msgid "# Inbound MESH channels created"
+msgid "# Inbound CADET channels created"
 msgstr "# các truy vấn lỗ hổng được định tuyến"
 
-#: src/exit/gnunet-daemon-exit.c:3235 src/exit/gnunet-daemon-exit.c:3245
+#: src/exit/gnunet-daemon-exit.c:3255 src/exit/gnunet-daemon-exit.c:3265
 #, 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
+#: src/exit/gnunet-daemon-exit.c:3279 src/exit/gnunet-daemon-exit.c:3287
 #, c-format
 msgid "`%s' is not a valid port number (for domain `%s')!"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3300
+#: src/exit/gnunet-daemon-exit.c:3320
 #, c-format
 msgid "No addresses found for hostname `%s' of service `%s'!\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3314 src/exit/gnunet-daemon-exit.c:3326
+#: src/exit/gnunet-daemon-exit.c:3334 src/exit/gnunet-daemon-exit.c:3346
 #, c-format
 msgid "Service `%s' configured for IPv4, but IPv4 is disabled!\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3337
+#: src/exit/gnunet-daemon-exit.c:3357
 #, c-format
 msgid "No IP addresses found for hostname `%s' of service `%s'!\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3527
+#: src/exit/gnunet-daemon-exit.c:3534
+#, c-format
+msgid "`%s' must be installed SUID, EXIT will not work\n"
+msgstr ""
+
+#: src/exit/gnunet-daemon-exit.c:3550
 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:3535
+#: src/exit/gnunet-daemon-exit.c:3558
 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:3542
+#: src/exit/gnunet-daemon-exit.c:3565
 msgid ""
 "Cannot enable IPv4 exit but disable IPv4 on TUN interface, will use "
 "ENABLE_IPv4=YES\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3548
+#: src/exit/gnunet-daemon-exit.c:3571
 msgid ""
 "Cannot enable IPv6 exit but disable IPv6 on TUN interface, will use "
 "ENABLE_IPv6=YES\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3554 src/exit/gnunet-daemon-exit.c:3717
+#: src/exit/gnunet-daemon-exit.c:3577 src/exit/gnunet-daemon-exit.c:3742
 #: src/pt/gnunet-daemon-pt.c:1247
 msgid "No useful service enabled.  Exiting.\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3664
+#: src/exit/gnunet-daemon-exit.c:3689
 msgid "Must be a number"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3813
+#: src/exit/gnunet-daemon-exit.c:3838
 msgid "Daemon to run to provide an IP exit node for the VPN"
 msgstr ""
 
@@ -2712,11 +2832,6 @@
 msgid "Disconnected from peer %s\n"
 msgstr "« %.*s » được kết nối tới « %.*s ».\n"
 
-#: src/experimentation/gnunet-daemon-experimentation_nodes.c:1104
-#, fuzzy
-msgid "Failed to connect to CORE service!\n"
-msgstr "Lỗi kết nối đến gnunetd.\n"
-
 #: src/experimentation/gnunet-daemon-experimentation_scheduler.c:108
 #, c-format
 msgid "Peer `%s' did not respond to request for experiment `%s'\n"
@@ -3043,12 +3158,12 @@
 msgid "Internal error."
 msgstr "Lỗi VR."
 
-#: src/fs/fs_search.c:813
+#: src/fs/fs_search.c:751 src/fs/fs_search.c:817
 #, fuzzy, c-format
 msgid "Failed to parse URI `%s': %s\n"
 msgstr "Tập tin « %s » có URI: %s\n"
 
-#: src/fs/fs_search.c:872
+#: src/fs/fs_search.c:876
 #, c-format
 msgid "Got result with unknown block type `%d', ignoring"
 msgstr ""
@@ -3110,78 +3225,98 @@
 msgid "Failed to compute hash of file."
 msgstr "Không kết nối được đến trình nền gnunetd."
 
-#: src/fs/fs_uri.c:222
+#: src/fs/fs_uri.c:223
 #, no-c-format
-msgid "`%' must be followed by HEX number"
+msgid "Malformed KSK URI (`%' must be followed by HEX number)"
 msgstr ""
 
-#: src/fs/fs_uri.c:281
+#: src/fs/fs_uri.c:283
 msgid "Malformed KSK URI (must not begin or end with `+')"
 msgstr ""
 
-#: src/fs/fs_uri.c:299
-msgid "`++' not allowed in KSK URI"
+#: src/fs/fs_uri.c:301
+msgid "Malformed KSK URI (`++' not allowed)"
 msgstr ""
 
-#: src/fs/fs_uri.c:306
-msgid "Quotes not balanced in KSK URI"
+#: src/fs/fs_uri.c:308
+msgid "Malformed KSK URI (quotes not balanced)"
 msgstr ""
 
-#: src/fs/fs_uri.c:376
-msgid "Malformed SKS URI"
+#: src/fs/fs_uri.c:379
+msgid "Malformed SKS URI (wrong syntax)"
 msgstr ""
 
-#: src/fs/fs_uri.c:419 src/fs/fs_uri.c:434
-msgid "Malformed CHK URI"
+#: src/fs/fs_uri.c:423
+msgid "Malformed CHK URI (wrong syntax)"
 msgstr ""
 
-#: src/fs/fs_uri.c:512 src/fs/fs_uri.c:580
-msgid "SKS URI malformed"
+#: src/fs/fs_uri.c:438
+msgid "Malformed CHK URI (failed to decode CHK)"
 msgstr ""
 
-#: src/fs/fs_uri.c:527 src/fs/fs_uri.c:537
-msgid "LOC URI malformed"
+#: src/fs/fs_uri.c:517
+msgid "LOC URI malformed (wrong syntax)"
 msgstr ""
 
-#: src/fs/fs_uri.c:545 src/fs/fs_uri.c:553
+#: src/fs/fs_uri.c:532
+msgid "LOC URI malformed (no CHK)"
+msgstr ""
+
+#: src/fs/fs_uri.c:542
+msgid "LOC URI malformed (missing LOC)"
+msgstr ""
+
+#: src/fs/fs_uri.c:550
+msgid "LOC URI malformed (wrong syntax for public key)"
+msgstr ""
+
+#: src/fs/fs_uri.c:558
 msgid "LOC URI malformed (could not decode public key)"
 msgstr ""
 
-#: src/fs/fs_uri.c:559
-msgid "SKS URI malformed (could not find signature)"
+#: src/fs/fs_uri.c:564
+msgid "LOC URI malformed (could not find signature)"
 msgstr ""
 
-#: src/fs/fs_uri.c:565 src/fs/fs_uri.c:574
-msgid "SKS URI malformed (could not decode signature)"
+#: src/fs/fs_uri.c:570
+msgid "LOC URI malformed (wrong syntax for signature)"
 msgstr ""
 
-#: src/fs/fs_uri.c:586
-msgid "SKS URI malformed (could not parse expiration time)"
+#: src/fs/fs_uri.c:579
+msgid "LOC URI malformed (could not decode signature)"
 msgstr ""
 
-#: src/fs/fs_uri.c:598
-msgid "SKS URI malformed (signature failed validation)"
+#: src/fs/fs_uri.c:585
+msgid "LOC URI malformed (wrong syntax for expiration time)"
 msgstr ""
 
-#: src/fs/fs_uri.c:636
+#: src/fs/fs_uri.c:591
+msgid "LOC URI malformed (could not parse expiration time)"
+msgstr ""
+
+#: src/fs/fs_uri.c:603
+msgid "LOC URI malformed (signature failed validation)"
+msgstr ""
+
+#: src/fs/fs_uri.c:642
 msgid "Unrecognized URI type"
 msgstr ""
 
-#: src/fs/fs_uri.c:860
+#: src/fs/fs_uri.c:866
 #, fuzzy
 msgid "Lacking key configuration settings.\n"
 msgstr "Lưu cấu hình ngay bây giờ không?"
 
-#: src/fs/fs_uri.c:866
+#: src/fs/fs_uri.c:872
 #, fuzzy, c-format
 msgid "Could not access hostkey file `%s'.\n"
 msgstr "Không thể truy cập đến tập tin gnunet-directory « %s »\n"
 
-#: src/fs/fs_uri.c:1050 src/fs/fs_uri.c:1077
+#: src/fs/fs_uri.c:1057 src/fs/fs_uri.c:1084
 msgid "No keywords specified!\n"
 msgstr "Chưa ghi rõ từ khoá.\n"
 
-#: src/fs/fs_uri.c:1083
+#: src/fs/fs_uri.c:1090
 msgid "Number of double-quotes not balanced!\n"
 msgstr "Có dấu nháy kép thừa hay thiếu.\n"
 
@@ -3515,8 +3650,8 @@
 msgstr "Tùy chọn « %s » cần thiết khi dùng tùy chọn « %s ».\n"
 
 #: src/fs/gnunet-publish.c:778 src/fs/gnunet-publish.c:785
-#: src/transport/gnunet-transport.c:1284 src/transport/gnunet-transport.c:1314
-#: src/transport/gnunet-transport.c:1344
+#: src/transport/gnunet-transport.c:1387 src/transport/gnunet-transport.c:1417
+#: src/transport/gnunet-transport.c:1447
 #, c-format
 msgid "Option `%s' makes no sense without option `%s'.\n"
 msgstr "Tùy chọn « %s » không có nghĩa khi không có tùy chọn « %s ».\n"
@@ -3625,22 +3760,58 @@
 msgid "Search GNUnet for files that were published on GNUnet"
 msgstr "Không hiển thị kết quả tìm kiếm cho tập tin được chúng ta tải lên"
 
-#: src/fs/gnunet-service-fs.c:271
+#: src/fs/gnunet-service-fs.c:277
 msgid "# running average P2P latency (ms)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs.c:326 src/fs/gnunet-service-fs.c:539
+#: src/fs/gnunet-service-fs.c:332 src/fs/gnunet-service-fs.c:545
 #, fuzzy
 msgid "# Loopback routes suppressed"
 msgstr "# tổng số định tuyến lỗ hổng thành công"
 
-#: src/fs/gnunet-service-fs.c:639 src/hostlist/gnunet-daemon-hostlist.c:288
-#: src/topology/gnunet-daemon-topology.c:1254
-#: src/topology/gnunet-daemon-topology.c:1261
+#: src/fs/gnunet-service-fs.c:645 src/hostlist/gnunet-daemon-hostlist.c:303
+#: src/topology/gnunet-daemon-topology.c:1260
+#: src/topology/gnunet-daemon-topology.c:1267
 #, fuzzy, c-format
 msgid "Failed to connect to `%s' service.\n"
 msgstr "Lỗi sơ khởi dịch vụ « %s ».\n"
 
+#: src/fs/gnunet-service-fs_cadet_client.c:484
+#, fuzzy
+msgid "# replies received via cadet"
+msgstr "# các byte kiểu %d được nhận"
+
+#: src/fs/gnunet-service-fs_cadet_client.c:498
+#, fuzzy
+msgid "# replies received via cadet dropped"
+msgstr "# các byte kiểu %d được nhận"
+
+#: src/fs/gnunet-service-fs_cadet_server.c:260
+#, fuzzy
+msgid "# Blocks transferred via cadet"
+msgstr "# các byte được gửi"
+
+#: src/fs/gnunet-service-fs_cadet_server.c:352
+#, fuzzy
+msgid "# queries received via cadet not answered"
+msgstr "# các byte đã nhận qua TCP"
+
+#: src/fs/gnunet-service-fs_cadet_server.c:432
+#, fuzzy
+msgid "# queries received via cadet"
+msgstr "# các byte đã nhận qua TCP"
+
+#: src/fs/gnunet-service-fs_cadet_server.c:476
+#, fuzzy
+msgid "# cadet client connections rejected"
+msgstr "# các kết nối dht"
+
+#: src/fs/gnunet-service-fs_cadet_server.c:482
+#: src/fs/gnunet-service-fs_cadet_server.c:522
+#, fuzzy
+msgid "# cadet connections active"
+msgstr "# các kết nối dht"
+
 #: src/fs/gnunet-service-fs_cp.c:682
 #, fuzzy
 msgid "# migration stop messages received"
@@ -3800,42 +3971,6 @@
 msgid "# client searches updated (merged content seen list)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_mesh_client.c:484
-#, fuzzy
-msgid "# replies received via mesh"
-msgstr "# các byte kiểu %d được nhận"
-
-#: src/fs/gnunet-service-fs_mesh_client.c:498
-#, fuzzy
-msgid "# replies received via mesh dropped"
-msgstr "# các byte kiểu %d được nhận"
-
-#: src/fs/gnunet-service-fs_mesh_server.c:260
-#, fuzzy
-msgid "# Blocks transferred via mesh"
-msgstr "# các byte được gửi"
-
-#: src/fs/gnunet-service-fs_mesh_server.c:352
-#, fuzzy
-msgid "# queries received via mesh not answered"
-msgstr "# các byte đã nhận qua TCP"
-
-#: src/fs/gnunet-service-fs_mesh_server.c:432
-#, fuzzy
-msgid "# queries received via mesh"
-msgstr "# các byte đã nhận qua TCP"
-
-#: src/fs/gnunet-service-fs_mesh_server.c:476
-#, fuzzy
-msgid "# mesh client connections rejected"
-msgstr "# các kết nối dht"
-
-#: src/fs/gnunet-service-fs_mesh_server.c:482
-#: src/fs/gnunet-service-fs_mesh_server.c:522
-#, fuzzy
-msgid "# mesh connections active"
-msgstr "# các kết nối dht"
-
 #: src/fs/gnunet-service-fs_pe.c:269
 #, fuzzy
 msgid "# average retransmission delay (ms)"
@@ -3924,7 +4059,7 @@
 
 #: src/fs/gnunet-service-fs_pr.c:1192
 #, fuzzy
-msgid "# Replies received from MESH"
+msgid "# Replies received from CADET"
 msgstr "# các byte đã nhận qua HTTP"
 
 #: src/fs/gnunet-service-fs_pr.c:1244
@@ -4034,7 +4169,7 @@
 msgid "Refusing `%s' request to HTTP server\n"
 msgstr "trình phục vụ danh sách máy HTTP hợp nhất"
 
-#: src/gns/gnunet-bcd.c:355 src/hostlist/hostlist-server.c:567
+#: src/gns/gnunet-bcd.c:355 src/hostlist/gnunet-daemon-hostlist_server.c:695
 #, c-format
 msgid "Invalid port number %llu.  Exiting.\n"
 msgstr ""
@@ -4192,13 +4327,17 @@
 msgid "This program will import some GNS authorities into your GNS namestore."
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:105 src/hostlist/hostlist-client.c:469
-#: src/hostlist/hostlist-client.c:683 src/hostlist/hostlist-client.c:689
-#: src/hostlist/hostlist-client.c:741 src/hostlist/hostlist-client.c:750
-#: src/hostlist/hostlist-client.c:871 src/hostlist/hostlist-client.c:963
-#: src/hostlist/hostlist-client.c:968
-#: src/transport/plugin_transport_http_client.c:1062
-#: src/transport/plugin_transport_http_client.c:1077
+#: src/gns/gnunet-gns-proxy.c:105
+#: src/hostlist/gnunet-daemon-hostlist_client.c:524
+#: src/hostlist/gnunet-daemon-hostlist_client.c:741
+#: src/hostlist/gnunet-daemon-hostlist_client.c:747
+#: src/hostlist/gnunet-daemon-hostlist_client.c:800
+#: src/hostlist/gnunet-daemon-hostlist_client.c:809
+#: src/hostlist/gnunet-daemon-hostlist_client.c:931
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1026
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1031
+#: src/transport/plugin_transport_http_client.c:1095
+#: src/transport/plugin_transport_http_client.c:1110
 #, c-format
 msgid "%s failed at %s:%d: `%s'\n"
 msgstr "%s bị lỗi tại %s:%d: « %s »\n"
@@ -4343,36 +4482,36 @@
 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:816
+#: src/gns/gnunet-service-gns_resolver.c:832
 #, 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:958
+#: src/gns/gnunet-service-gns_resolver.c:974
 #, c-format
 msgid "Skipping record of unsupported type %d\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns_resolver.c:1317
+#: src/gns/gnunet-service-gns_resolver.c:1333
 #, c-format
 msgid "GNS lookup resulted in DNS name that is too long (`%s')\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns_resolver.c:1817
+#: src/gns/gnunet-service-gns_resolver.c:1831
 msgid "GNS lookup recursion failed (no delegation record found)\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns_resolver.c:1841
+#: src/gns/gnunet-service-gns_resolver.c:1855
 #, 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:2123
+#: src/gns/gnunet-service-gns_resolver.c:2137
 #, c-format
 msgid "Zone %s was revoked, resolution fails\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns_resolver.c:2272
+#: src/gns/gnunet-service-gns_resolver.c:2286
 #, c-format
 msgid "Hostname `%s' is not well-formed, resolution fails\n"
 msgstr ""
@@ -4491,317 +4630,341 @@
 msgid "Modified %u addresses \n"
 msgstr ""
 
-#: src/hello/hello.c:944
+#: src/hello/hello.c:957
 #, fuzzy
 msgid "Failed to parse HELLO message: missing expiration time\n"
 msgstr "Lỗi lưu cấu hình."
 
-#: src/hello/hello.c:953
+#: src/hello/hello.c:966
 #, fuzzy
 msgid "Failed to parse HELLO message: invalid expiration time\n"
 msgstr "Lỗi lưu cấu hình."
 
-#: src/hello/hello.c:963
+#: src/hello/hello.c:976
 #, fuzzy
 msgid "Failed to parse HELLO message: malformed\n"
 msgstr "Lỗi đọc danh sách bạn bè từ « %s »\n"
 
-#: src/hello/hello.c:973
+#: src/hello/hello.c:986
 #, fuzzy
 msgid "Failed to parse HELLO message: missing transport plugin\n"
 msgstr "Không thể nạp phần bổ sung truyền tải « %s »\n"
 
-#: src/hello/hello.c:990
+#: src/hello/hello.c:1004
 #, c-format
-msgid "Plugin `%s' not found\n"
+msgid "Plugin `%s' not found, skipping address\n"
 msgstr ""
 
-#: src/hello/hello.c:999
+#: src/hello/hello.c:1012
 #, c-format
 msgid "Plugin `%s' does not support URIs yet\n"
 msgstr ""
 
-#: src/hello/hello.c:1018
+#: src/hello/hello.c:1031
 #, fuzzy, c-format
 msgid "Failed to parse `%s' as an address for plugin `%s'\n"
 msgstr "Lỗi đóng kết đến cổng %s %d.\n"
 
-#: src/hostlist/gnunet-daemon-hostlist.c:259
+#: src/hello/hello.c:1104
+#, c-format
+msgid "HELLO URI contained %u addresses, added %u addresses\n"
+msgstr ""
+
+#: src/hostlist/gnunet-daemon-hostlist.c:274
 msgid ""
 "None of the functions for the hostlist daemon were enabled.  I have no "
 "reason to run!\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist.c:308
+#: src/hostlist/gnunet-daemon-hostlist.c:323
 #, fuzzy
 msgid "advertise our hostlist to other peers"
 msgstr "Tắt quảng cáo máy này cho đồng đẳng khác"
 
-#: src/hostlist/gnunet-daemon-hostlist.c:313
+#: src/hostlist/gnunet-daemon-hostlist.c:328
 msgid ""
 "bootstrap using hostlists (it is highly recommended that you always use this "
 "option)"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist.c:316
+#: src/hostlist/gnunet-daemon-hostlist.c:331
 #, fuzzy
 msgid "enable learning about hostlist servers from other peers"
 msgstr "Tắt quảng cáo máy này cho đồng đẳng khác"
 
-#: src/hostlist/gnunet-daemon-hostlist.c:320
+#: src/hostlist/gnunet-daemon-hostlist.c:335
 #, fuzzy
 msgid "provide a hostlist server"
 msgstr "trình phục vụ danh sách máy HTTP hợp nhất"
 
-#: src/hostlist/gnunet-daemon-hostlist.c:335
+#: src/hostlist/gnunet-daemon-hostlist.c:350
 msgid "GNUnet hostlist server and client"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:288
+#: src/hostlist/gnunet-daemon-hostlist_client.c:343
 #, fuzzy
 msgid "# bytes downloaded from hostlist servers"
 msgstr "trình phục vụ danh sách máy HTTP hợp nhất"
 
-#: src/hostlist/hostlist-client.c:309 src/hostlist/hostlist-client.c:339
+#: src/hostlist/gnunet-daemon-hostlist_client.c:364
+#: src/hostlist/gnunet-daemon-hostlist_client.c:394
 #, fuzzy
 msgid "# invalid HELLOs downloaded from hostlist servers"
 msgstr "# các HELLO tải xuống qua HTTP"
 
-#: src/hostlist/hostlist-client.c:312 src/hostlist/hostlist-client.c:342
+#: src/hostlist/gnunet-daemon-hostlist_client.c:367
+#: src/hostlist/gnunet-daemon-hostlist_client.c:397
 #, fuzzy, c-format
 msgid "Invalid `%s' message received from hostlist at `%s'\n"
 msgstr "Nhận được thông báo « %s » sai từ đồng đẳng « %s ».\n"
 
-#: src/hostlist/hostlist-client.c:330
+#: src/hostlist/gnunet-daemon-hostlist_client.c:385
 #, fuzzy
 msgid "# valid HELLOs downloaded from hostlist servers"
 msgstr "# các HELLO tải xuống qua HTTP"
 
-#: src/hostlist/hostlist-client.c:592 src/hostlist/hostlist-client.c:1333
+#: src/hostlist/gnunet-daemon-hostlist_client.c:650
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1401
 msgid "# advertised hostlist URIs"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:622
+#: src/hostlist/gnunet-daemon-hostlist_client.c:680
 #, c-format
 msgid "# advertised URI `%s' downloaded"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:664
+#: src/hostlist/gnunet-daemon-hostlist_client.c:722
 #, c-format
 msgid ""
 "Advertised hostlist with URI `%s' could not be downloaded. Advertised URI "
 "gets dismissed.\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:802
+#: src/hostlist/gnunet-daemon-hostlist_client.c:862
 #, fuzzy, c-format
 msgid "Timeout trying to download hostlist from `%s'\n"
 msgstr "Đang thử tải danh sách các máy xuống « %s »\n"
 
-#: src/hostlist/hostlist-client.c:816
+#: src/hostlist/gnunet-daemon-hostlist_client.c:876
 #, c-format
 msgid "Download limit of %u bytes exceeded, stopping download\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:836
+#: src/hostlist/gnunet-daemon-hostlist_client.c:896
 #, fuzzy, c-format
 msgid "Download of hostlist from `%s' failed: `%s'\n"
 msgstr "Tải lên « %s » hoàn thành, địa chỉ URI là « %s ».\n"
 
-#: src/hostlist/hostlist-client.c:842
+#: src/hostlist/gnunet-daemon-hostlist_client.c:902
 #, fuzzy, c-format
 msgid "Download of hostlist `%s' completed.\n"
 msgstr "Tải lên « %s » hoàn thành, địa chỉ URI là « %s ».\n"
 
-#: src/hostlist/hostlist-client.c:850
+#: src/hostlist/gnunet-daemon-hostlist_client.c:910
 #, c-format
 msgid "Adding successfully tested hostlist `%s' datastore.\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:903
+#: src/hostlist/gnunet-daemon-hostlist_client.c:963
 #, fuzzy, c-format
 msgid "Bootstrapping using hostlist at `%s'.\n"
 msgstr "Đang nạp và khởi động dùng « %s ».\n"
 
-#: src/hostlist/hostlist-client.c:911
+#: src/hostlist/gnunet-daemon-hostlist_client.c:971
 msgid "# hostlist downloads initiated"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1040 src/hostlist/hostlist-client.c:1506
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1103
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1646
 msgid "# milliseconds between hostlist downloads"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1049
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1112
 #, c-format
 msgid "Have %u/%u connections.  Will consider downloading hostlist in %s\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1109 src/hostlist/hostlist-client.c:1125
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1172
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1188
 #, fuzzy
 msgid "# active connections"
 msgstr "# các kết nối dht"
 
-#: src/hostlist/hostlist-client.c:1280
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1347
 #, fuzzy, c-format
 msgid "Loading saved hostlist entries from file `%s' \n"
 msgstr "Đang thử tải danh sách các máy xuống « %s »\n"
 
-#: src/hostlist/hostlist-client.c:1285
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1352
 #, fuzzy, c-format
 msgid "Hostlist file `%s' does not exist\n"
 msgstr "Khoá phiên chạy từ đồng đẳng « %s » không thể được thẩm tra.\n"
 
-#: src/hostlist/hostlist-client.c:1296
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1361
 #, fuzzy, c-format
 msgid "Could not open file `%s' for reading to load hostlists: %s\n"
 msgstr "Lỗi mở tập tin theo dõi « %s »: %s\n"
 
-#: src/hostlist/hostlist-client.c:1329
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1395
 #, c-format
 msgid "%u hostlist URIs loaded from file\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1331
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1398
 #, fuzzy
 msgid "# hostlist URIs read from file"
 msgstr "# các byte danh sách máy được trả về"
 
-#: src/hostlist/hostlist-client.c:1376
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1445
 #, fuzzy, c-format
 msgid "Could not open file `%s' for writing to save hostlists: %s\n"
 msgstr "Lỗi mở tập tin theo dõi « %s »: %s\n"
 
-#: src/hostlist/hostlist-client.c:1381
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1450
 #, fuzzy, c-format
 msgid "Writing %u hostlist URIs to `%s'\n"
 msgstr "Đang thử tải danh sách các máy xuống « %s »\n"
 
-#: src/hostlist/hostlist-client.c:1405 src/hostlist/hostlist-client.c:1422
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1474
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1491
 #, c-format
 msgid "Error writing hostlist URIs to file `%s'\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1417
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1486
 #, fuzzy
 msgid "# hostlist URIs written to file"
 msgstr "# các byte danh sách máy được trả về"
 
-#: src/hostlist/hostlist-client.c:1471
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1581
+#: src/transport/plugin_transport_http_client.c:1866
+#, c-format
+msgid "Invalid proxy type: `%s', disabling proxy! Check configuration!\n"
+msgstr ""
+
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1611
 msgid "Learning is enabled on this peer\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1483
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1623
 msgid "Learning is not enabled on this peer\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1495
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1635
 #, c-format
 msgid ""
 "Since learning is not enabled on this peer, hostlist file `%s' was removed\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1499
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1639
 #, fuzzy, c-format
 msgid "Hostlist file `%s' could not be removed\n"
 msgstr "Khoá phiên chạy từ đồng đẳng « %s » không thể được thẩm tra.\n"
 
-#: src/hostlist/hostlist-server.c:137
+#: src/hostlist/gnunet-daemon-hostlist_server.c:143
 #, fuzzy
 msgid "bytes in hostlist"
 msgstr "# các byte trong kho dữ liệu"
 
-#: src/hostlist/hostlist-server.c:161
+#: src/hostlist/gnunet-daemon-hostlist_server.c:168
 msgid "expired addresses encountered"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:189 src/hostlist/hostlist-server.c:425
-#: src/peerinfo-tool/gnunet-peerinfo.c:350
-#: src/peerinfo-tool/gnunet-peerinfo.c:419
-#: src/peerinfo-tool/gnunet-peerinfo.c:490
+#: src/hostlist/gnunet-daemon-hostlist_server.c:203
+#: src/hostlist/gnunet-daemon-hostlist_server.c:534
+#: src/peerinfo-tool/gnunet-peerinfo.c:361
+#: src/peerinfo-tool/gnunet-peerinfo.c:430
+#: src/peerinfo-tool/gnunet-peerinfo.c:501
 #: src/topology/gnunet-daemon-topology.c:925
 #, fuzzy, c-format
 msgid "Error in communication with PEERINFO service: %s\n"
 msgstr "Cổng để liên lạc với giao diện người dùng GNUnet"
 
-#: src/hostlist/hostlist-server.c:210
+#: src/hostlist/gnunet-daemon-hostlist_server.c:227
 msgid "HELLOs without addresses encountered (ignored)"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:224
+#: src/hostlist/gnunet-daemon-hostlist_server.c:243
 msgid "bytes not included in hostlist (size limit)"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:268
+#: src/hostlist/gnunet-daemon-hostlist_server.c:363
 #, fuzzy, c-format
 msgid "Refusing `%s' request to hostlist server\n"
 msgstr "trình phục vụ danh sách máy HTTP hợp nhất"
 
-#: src/hostlist/hostlist-server.c:271
+#: src/hostlist/gnunet-daemon-hostlist_server.c:366
 #, fuzzy
 msgid "hostlist requests refused (not HTTP GET)"
 msgstr "# các yêu cầu danh sách máy được nhận"
 
-#: src/hostlist/hostlist-server.c:284
+#: src/hostlist/gnunet-daemon-hostlist_server.c:380
 #, c-format
 msgid "Refusing `%s' request with %llu bytes of upload data\n"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:288
+#: src/hostlist/gnunet-daemon-hostlist_server.c:384
 #, fuzzy
 msgid "hostlist requests refused (upload data)"
 msgstr "# các yêu cầu danh sách máy được nhận"
 
-#: src/hostlist/hostlist-server.c:296
+#: src/hostlist/gnunet-daemon-hostlist_server.c:391
 msgid "Could not handle hostlist request since I do not have a response yet\n"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:299
+#: src/hostlist/gnunet-daemon-hostlist_server.c:394
 #, fuzzy
 msgid "hostlist requests refused (not ready)"
 msgstr "# các yêu cầu danh sách máy được nhận"
 
-#: src/hostlist/hostlist-server.c:303
+#: src/hostlist/gnunet-daemon-hostlist_server.c:399
 #, fuzzy
 msgid "Received request for our hostlist\n"
 msgstr "Nhận yêu cầu định tuyến\n"
 
-#: src/hostlist/hostlist-server.c:304
+#: src/hostlist/gnunet-daemon-hostlist_server.c:401
 #, fuzzy
 msgid "hostlist requests processed"
 msgstr "# các yêu cầu danh sách máy được nhận"
 
-#: src/hostlist/hostlist-server.c:346
+#: src/hostlist/gnunet-daemon-hostlist_server.c:448
 #, fuzzy
 msgid "# hostlist advertisements send"
 msgstr "# Các quảng cáo ngoại được chuyển tiếp"
 
-#: src/hostlist/hostlist-server.c:390
+#: src/hostlist/gnunet-daemon-hostlist_server.c:496
 msgid "Advertisement message could not be queued by core\n"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:557 src/peerinfo-tool/gnunet-peerinfo.c:639
-#: src/transport/gnunet-service-transport.c:1114
+#: src/hostlist/gnunet-daemon-hostlist_server.c:683
+#: src/peerinfo-tool/gnunet-peerinfo.c:650
+#: src/transport/gnunet-service-transport.c:1136
 #, fuzzy
 msgid "Could not access PEERINFO service.  Exiting.\n"
 msgstr "Không thể truy cập đến thông tin về không gian tên.\n"
 
-#: src/hostlist/hostlist-server.c:576
+#: src/hostlist/gnunet-daemon-hostlist_server.c:707
 #, c-format
 msgid "Hostlist service starts on %s:%llu\n"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:590
+#: src/hostlist/gnunet-daemon-hostlist_server.c:722
 #, fuzzy, c-format
 msgid "Address to obtain hostlist: `%s'\n"
 msgstr "Đang thử tải danh sách các máy xuống « %s »\n"
 
-#: src/hostlist/hostlist-server.c:630
+#: src/hostlist/gnunet-daemon-hostlist_server.c:760
 #, fuzzy, c-format
-msgid "`%s' is not a valid IP address! Ignoring BINDTOIP.\n"
+msgid "`%s' is not a valid IPv4 address! Ignoring BINDTOIPV4.\n"
 msgstr "« %s » không sẵn sàng.\n"
 
-#: src/hostlist/hostlist-server.c:673
+#: src/hostlist/gnunet-daemon-hostlist_server.c:780
 #, fuzzy, c-format
+msgid "`%s' is not a valid IPv6 address! Ignoring BINDTOIPV6.\n"
+msgstr "« %s » không sẵn sàng.\n"
+
+#: src/hostlist/gnunet-daemon-hostlist_server.c:820
+#, fuzzy, c-format
 msgid "Could not start hostlist HTTP server on port %u\n"
 msgstr "Cổng cho trình phục vụ HTTP danh sách máy chủ thống nhất"
 
@@ -4892,57 +5055,6 @@
 msgid "Failed to create directory `%s' for storing egos\n"
 msgstr "Lỗi đọc danh sách bạn bè từ « %s »\n"
 
-#: src/mesh/gnunet-mesh.c:357
-#, fuzzy, c-format
-msgid "Invalid target `%s'\n"
-msgstr "Đối số không hợp lệ cho « %s ».\n"
-
-#: src/mesh/gnunet-mesh.c:607
-#, fuzzy, c-format
-msgid "Invalid peer ID `%s'\n"
-msgstr "Dữ liệu nhập không hợp lệ.\n"
-
-#: src/mesh/gnunet-mesh.c:650
-#, fuzzy, c-format
-msgid "Invalid tunnel owner `%s'\n"
-msgstr "Địa chỉ IP định dạng sai: %s\n"
-
-#: src/mesh/gnunet-mesh.c:716
-msgid "You must NOT give a TARGETwhen using 'request all' options\n"
-msgstr ""
-
-#: src/mesh/gnunet-mesh.c:807
-#, 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:810
-msgid "activate echo mode"
-msgstr ""
-
-#: src/mesh/gnunet-mesh.c:816
-msgid "port to listen to (default; 0)"
-msgstr ""
-
-#: src/mesh/gnunet-mesh.c:819 src/mesh/gnunet-mesh.c:822
-#, fuzzy
-msgid "provide information about all peers"
-msgstr "In ra thông tin về các đồng đẳng GNUnet."
-
-#: src/mesh/gnunet-mesh.c:825
-#, fuzzy
-msgid "provide information about a particular tunnel"
-msgstr "In ra thông tin về các đồng đẳng GNUnet."
-
-#: src/mesh/gnunet-mesh.c:828
-#, fuzzy
-msgid "provide information about all tunnels"
-msgstr "In ra thông tin về các đồng đẳng GNUnet."
-
-#: src/mesh/gnunet-service-mesh_peer.c:390
-msgid "Wrong CORE service\n"
-msgstr ""
-
 #: src/mysql/mysql.c:174
 #, c-format
 msgid "Trying to use file `%s' for MySQL configuration.\n"
@@ -4958,7 +5070,7 @@
 msgid "No records found for `%s'"
 msgstr "Vẫn còn không tìm thấy đồng đẳng trong « %s ».\n"
 
-#: src/namecache/gnunet-namecache.c:124 src/namestore/gnunet-namestore.c:397
+#: src/namecache/gnunet-namecache.c:124 src/namestore/gnunet-namestore.c:402
 #, c-format
 msgid "\tCorrupt or unsupported record of type %u\n"
 msgstr ""
@@ -4968,7 +5080,7 @@
 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:695
+#: src/namecache/gnunet-namecache.c:195 src/namestore/gnunet-namestore.c:783
 #, fuzzy, c-format
 msgid "Invalid public key for reverse lookup `%s'\n"
 msgstr "Đối số không hợp lệ cho « %s ».\n"
@@ -4978,7 +5090,7 @@
 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:931
+#: src/namecache/gnunet-namecache.c:234 src/namestore/gnunet-namestore.c:1020
 msgid "name of the record to add/delete/display"
 msgstr ""
 
@@ -4987,7 +5099,7 @@
 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:963
+#: src/namecache/gnunet-namecache.c:248 src/namestore/gnunet-namestore.c:1055
 #, fuzzy
 msgid "GNUnet zone manipulation tool"
 msgstr "Cấu hình GNUnet"
@@ -5002,149 +5114,164 @@
 msgid "Failed to create indices\n"
 msgstr "Không thể tạo miền tên.\n"
 
-#: src/namestore/gnunet-namestore.c:303
+#: src/namestore/gnunet-namestore.c:308
 #, 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:332
+#: src/namestore/gnunet-namestore.c:337
 #, 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:339
+#: src/namestore/gnunet-namestore.c:344
 #, 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:558
+#: src/namestore/gnunet-namestore.c:567
+#, c-format
+msgid "There are no records under label `%s' that could be deleted.\n"
+msgstr ""
+
+#: src/namestore/gnunet-namestore.c:606
+#, c-format
+msgid ""
+"There are no records under label `%s' that match the request for deletion.\n"
+msgstr ""
+
+#: src/namestore/gnunet-namestore.c:647
 #, fuzzy, c-format
 msgid "No options given\n"
 msgstr "chưa đưa ra tên"
 
-#: src/namestore/gnunet-namestore.c:569
+#: src/namestore/gnunet-namestore.c:658
 #: 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: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
+#: src/namestore/gnunet-namestore.c:666 src/namestore/gnunet-namestore.c:675
+#: src/namestore/gnunet-namestore.c:692 src/namestore/gnunet-namestore.c:714
+#: src/namestore/gnunet-namestore.c:754
 #, 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:578 src/namestore/gnunet-namestore.c:587
-#: src/namestore/gnunet-namestore.c:604 src/namestore/gnunet-namestore.c:626
+#: src/namestore/gnunet-namestore.c:667 src/namestore/gnunet-namestore.c:676
+#: src/namestore/gnunet-namestore.c:693 src/namestore/gnunet-namestore.c:715
 msgid "add"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:595
+#: src/namestore/gnunet-namestore.c:684
 #, 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:615
+#: src/namestore/gnunet-namestore.c:704
 #, c-format
 msgid "Value `%s' invalid for record type `%s'\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:651
+#: src/namestore/gnunet-namestore.c:740
 #, fuzzy, c-format
 msgid "Invalid time format `%s'\n"
 msgstr "Địa chỉ IP định dạng sai: %s\n"
 
-#: src/namestore/gnunet-namestore.c:666
+#: src/namestore/gnunet-namestore.c:755
 msgid "del"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:715
-#: src/peerinfo-tool/gnunet-peerinfo.c:723
+#: src/namestore/gnunet-namestore.c:803
+#: src/peerinfo-tool/gnunet-peerinfo.c:734
 #, 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:750
+#: src/namestore/gnunet-namestore.c:838
 #, 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:790
+#: src/namestore/gnunet-namestore.c:878
 #, c-format
 msgid "Ego `%s' not known to identity service\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:817
+#: src/namestore/gnunet-namestore.c:905
 #, c-format
 msgid "No default ego configured in identity service\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:853
+#: src/namestore/gnunet-namestore.c:941
 #, 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:865
+#: src/namestore/gnunet-namestore.c:953
 #, 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:913
+#: src/namestore/gnunet-namestore.c:1002
 msgid "add record"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:916
+#: src/namestore/gnunet-namestore.c:1005
 msgid "delete record"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:919
+#: src/namestore/gnunet-namestore.c:1008
 msgid "display records"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:922
+#: src/namestore/gnunet-namestore.c:1011
 msgid ""
 "expiration time for record to use (for adding only), \"never\" is possible"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:925
+#: src/namestore/gnunet-namestore.c:1014
 #, 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:928
+#: src/namestore/gnunet-namestore.c:1017
 #, 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:934
+#: src/namestore/gnunet-namestore.c:1023
 #, 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:937
+#: src/namestore/gnunet-namestore.c:1026
 msgid "type of the record to add/delete/display"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:940
+#: src/namestore/gnunet-namestore.c:1029
 msgid "URI to import into our zone"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:943
+#: src/namestore/gnunet-namestore.c:1032
 msgid "value of the record to add/delete"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:946
+#: src/namestore/gnunet-namestore.c:1035
 msgid "create or list public record"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:949
+#: src/namestore/gnunet-namestore.c:1038
+msgid "create record that is pending approval (and thus for now inactive)"
+msgstr ""
+
+#: src/namestore/gnunet-namestore.c:1041
 msgid ""
 "create shadow record (only valid if all other records of the same type have "
 "expired"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:952
+#: src/namestore/gnunet-namestore.c:1044
 msgid "name of the ego controlling the zone"
 msgstr ""
 
@@ -5226,58 +5353,62 @@
 msgid "GNUnet NAT traversal test helper daemon"
 msgstr ""
 
-#: src/nat/nat_auto.c:170
+#: src/nat/nat_auto.c:175
 msgid "NAT traversal with ICMP Server timed out.\n"
 msgstr ""
 
-#: src/nat/nat_auto.c:203
+#: src/nat/nat_auto.c:207
 msgid "NAT traversal with ICMP Server succeeded.\n"
 msgstr ""
 
-#: src/nat/nat_auto.c:204
+#: src/nat/nat_auto.c:208
 msgid "NAT traversal with ICMP Server failed.\n"
 msgstr ""
 
-#: src/nat/nat_auto.c:225
+#: src/nat/nat_auto.c:229
 #, 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:274
+#: src/nat/nat_auto.c:284
 #, c-format
 msgid "Detected external IP `%s'\n"
 msgstr ""
 
-#: src/nat/nat_auto.c:344
+#: src/nat/nat_auto.c:362
 msgid "This system has a global IPv6 address, setting IPv6 to supported.\n"
 msgstr ""
 
-#: src/nat/nat_auto.c:360
+#: src/nat/nat_auto.c:378
 #, 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:413
+#: src/nat/nat_auto.c:441
 msgid "upnpc found, enabling its use\n"
 msgstr ""
 
-#: src/nat/nat_auto.c:414
+#: src/nat/nat_auto.c:442
 msgid "upnpc not found\n"
 msgstr ""
 
-#: src/nat/nat_auto.c:447
-msgid "gnunet-helper-nat-server found, testing it\n"
+#: src/nat/nat_auto.c:472
+msgid "test_icmp_server not possible, as we have no public IPv4 address\n"
 msgstr ""
 
-#: src/nat/nat_auto.c:448
+#: src/nat/nat_auto.c:480
+msgid "test_icmp_server not possible, as we are not behind NAT\n"
+msgstr ""
+
+#: src/nat/nat_auto.c:488
 msgid "No working gnunet-helper-nat-server found\n"
 msgstr ""
 
-#: src/nat/nat_auto.c:482
+#: src/nat/nat_auto.c:527
 msgid "gnunet-helper-nat-client found, enabling it\n"
 msgstr ""
 
-#: src/nat/nat_auto.c:483
+#: src/nat/nat_auto.c:528
 msgid "gnunet-helper-nat-client not found or behind NAT, disabling it\n"
 msgstr ""
 
@@ -5291,59 +5422,49 @@
 msgid "Failed to start %s\n"
 msgstr "Lỗi bắt đầu thu thập.\n"
 
-#: src/nat/nat.c:1205
+#: src/nat/nat.c:1032
+msgid "Error while running upnp client:\n"
+msgstr ""
+
+#: src/nat/nat.c:1102
+#, fuzzy, c-format
+msgid "Failed to run upnp client for port %u\n"
+msgstr "Lỗi sơ khởi dịch vụ « %s ».\n"
+
+#: src/nat/nat.c:1243
 msgid "malformed"
 msgstr ""
 
-#: src/nat/nat.c:1276 src/nat/nat.c:1288
+#: src/nat/nat.c:1297
+msgid ""
+"UPnP enabled in configuration, but UPnP client `upnpc` command not found, "
+"disabling UPnP \n"
+msgstr ""
+
+#: src/nat/nat.c:1324 src/nat/nat.c:1336
 #, c-format
 msgid ""
 "Configuration requires `%s', but binary is not installed properly (SUID bit "
 "not set).  Option disabled.\n"
 msgstr ""
 
-#: src/nat/nat.c:1426
+#: src/nat/nat.c:1474
 msgid "Internal IP address not known, cannot use ICMP NAT traversal method\n"
 msgstr ""
 
-#: src/nat/nat.c:1442
+#: src/nat/nat.c:1490
 #, c-format
 msgid "Running gnunet-helper-nat-client %s %s %u\n"
 msgstr ""
 
-#: src/nat/nat_mini.c:155
-msgid "no valid address was returned by `external-ip'"
-msgstr ""
-
-#: src/nat/nat_mini.c:175
-msgid "`external-ip' command not found"
-msgstr ""
-
-#: src/nat/nat_mini.c:201
+#: src/nat/nat_mini.c:203
 msgid "`external-ip' command not found\n"
 msgstr ""
 
-#: src/nat/nat_mini.c:366
-#, fuzzy
-msgid "Failed to run `upnpc` command"
-msgstr "Lỗi bắt đầu thu thập.\n"
-
-#: src/nat/nat_mini.c:512
-msgid "`upnpc' command took too long, process killed"
-msgstr ""
-
-#: src/nat/nat_mini.c:540
-msgid "`upnpc' command failed to establish port mapping"
-msgstr ""
-
-#: src/nat/nat_mini.c:604
+#: src/nat/nat_mini.c:609
 msgid "`upnpc' command not found\n"
 msgstr ""
 
-#: src/nat/nat_mini.c:608
-msgid "`upnpc` command not found"
-msgstr ""
-
 #: src/nat/nat_test.c:351
 #, fuzzy
 msgid "Failed to connect to `gnunet-nat-server'\n"
@@ -5354,6 +5475,11 @@
 msgid "Failed to create listen socket bound to `%s' for NAT test: %s\n"
 msgstr ""
 
+#: src/nat/nat_test.c:453
+#, fuzzy
+msgid "NAT test failed to start NAT library\n"
+msgstr "Lỗi bắt đầu thu thập.\n"
+
 #: src/nse/gnunet-nse.c:117
 #, fuzzy
 msgid "NSE service is not running\n"
@@ -5460,7 +5586,7 @@
 msgid "aborted due to explicit disconnect request"
 msgstr ""
 
-#: src/peerinfo/peerinfo_api.c:356
+#: src/peerinfo/peerinfo_api.c:356 src/sensor/sensor_api.c:519
 #, fuzzy
 msgid "failed to transmit request (service down?)"
 msgstr "Lỗi đọc danh sách bạn bè từ « %s »\n"
@@ -5491,90 +5617,95 @@
 msgid "Could not connect to `%s' service.\n"
 msgstr "Không thể kết nối tới %s:%u: %s\n"
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:232
+#: src/peerinfo-tool/gnunet-peerinfo.c:233
 #, fuzzy, c-format
 msgid "%sPeer `%s'\n"
 msgstr "Tôi là đồng đẳng « %s ».\n"
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:239
+#: src/peerinfo-tool/gnunet-peerinfo.c:240
 #, c-format
 msgid "\tExpires: %s \t %s\n"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:428
+#: src/peerinfo-tool/gnunet-peerinfo.c:282
 #, fuzzy, c-format
+msgid "Failure: Cannot convert address to string for peer `%s'\n"
+msgstr "Lỗi đóng kết đến cổng %s %d.\n"
+
+#: src/peerinfo-tool/gnunet-peerinfo.c:439
+#, fuzzy, c-format
 msgid "Failure: Did not receive %s\n"
 msgstr "Lỗi mở tập tin ghi sự kiện « %s »: %s\n"
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:436
+#: src/peerinfo-tool/gnunet-peerinfo.c:447
 #, c-format
 msgid "Failure: Received invalid %s\n"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:445
+#: src/peerinfo-tool/gnunet-peerinfo.c:456
 #, fuzzy, c-format
 msgid "Failed to write HELLO with %u bytes to file `%s'\n"
 msgstr "Lỗi đọc danh sách bạn bè từ « %s »\n"
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:458
+#: src/peerinfo-tool/gnunet-peerinfo.c:469
 #, c-format
 msgid "Wrote %s HELLO containing %u addresses with %u bytes to file `%s'\n"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:522
+#: src/peerinfo-tool/gnunet-peerinfo.c:533
 #, c-format
 msgid "Failure adding HELLO: %s\n"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:633
+#: src/peerinfo-tool/gnunet-peerinfo.c:644
 #, fuzzy, c-format
 msgid "Service `%s' is not running, please start GNUnet\n"
 msgstr "« %s » không phải là một tập tin.\n"
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:654 src/util/gnunet-scrypt.c:224
+#: src/peerinfo-tool/gnunet-peerinfo.c:665 src/util/gnunet-scrypt.c:224
 #, c-format
 msgid "Loading hostkey from `%s' failed.\n"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:745
+#: src/peerinfo-tool/gnunet-peerinfo.c:756
 #, c-format
 msgid "I am peer `%s'.\n"
 msgstr "Tôi là đồng đẳng « %s ».\n"
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:789
+#: src/peerinfo-tool/gnunet-peerinfo.c:800
 msgid "don't resolve host names"
 msgstr "không quyết định các tên máy"
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:792
+#: src/peerinfo-tool/gnunet-peerinfo.c:803
 msgid "output only the identity strings"
 msgstr "chỉ xuất những chuỗi nhận diện"
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:795
+#: src/peerinfo-tool/gnunet-peerinfo.c:806
 msgid "include friend-only information"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:798
+#: src/peerinfo-tool/gnunet-peerinfo.c:809
 msgid "output our own identity only"
 msgstr "chỉ xuất nhận diện mình"
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:801
+#: src/peerinfo-tool/gnunet-peerinfo.c:812
 #, fuzzy
 msgid "list all known peers"
 msgstr "liệt kê mọi bộ tiếp hợp mạng"
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:804
+#: src/peerinfo-tool/gnunet-peerinfo.c:815
 msgid "dump hello to file"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:807
+#: src/peerinfo-tool/gnunet-peerinfo.c:818
 msgid "also output HELLO uri(s)"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:810
+#: src/peerinfo-tool/gnunet-peerinfo.c:821
 msgid "add given HELLO uri to the database"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:821
+#: src/peerinfo-tool/gnunet-peerinfo.c:832
 #, fuzzy
 msgid "Print information about peers."
 msgstr "In ra thông tin về các đồng đẳng GNUnet."
@@ -5597,6 +5728,36 @@
 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"
 
+#: src/peerstore/gnunet-peerstore.c:97
+msgid "peerstore"
+msgstr ""
+
+#: src/peerstore/peerstore_api.c:486
+#, fuzzy
+msgid "Error communicating with `PEERSTORE' service."
+msgstr "Cổng để liên lạc với giao diện người dùng GNUnet"
+
+#: src/peerstore/peerstore_api.c:503
+#, fuzzy
+msgid "Received a malformed response from service."
+msgstr "Nhận yêu cầu định tuyến\n"
+
+#: src/peerstore/plugin_peerstore_sqlite.c:352
+#: src/psycstore/plugin_psycstore_sqlite.c:276
+#, fuzzy, c-format
+msgid ""
+"Error executing SQL query: %s\n"
+"  %s\n"
+msgstr "Gặp lỗi khi tạo người dùng"
+
+#: src/peerstore/plugin_peerstore_sqlite.c:377
+#: src/psycstore/plugin_psycstore_sqlite.c:253
+#, fuzzy, c-format
+msgid ""
+"Error preparing SQL query: %s\n"
+"  %s\n"
+msgstr "Gặp lỗi khi tạo người dùng"
+
 #: src/postgres/postgres.c:59
 #, fuzzy, c-format
 msgid "`%s:%s' failed at %s:%d with error: %s"
@@ -5694,20 +5855,6 @@
 msgid "`%s' failed at %s:%d with error: %s (%d)\n"
 msgstr "« %s » bị lỗi tại %s:%d với lỗi: %s\n"
 
-#: src/psycstore/plugin_psycstore_sqlite.c:253
-#, fuzzy, c-format
-msgid ""
-"Error preparing SQL query: %s\n"
-"  %s\n"
-msgstr "Gặp lỗi khi tạo người dùng"
-
-#: src/psycstore/plugin_psycstore_sqlite.c:276
-#, fuzzy, c-format
-msgid ""
-"Error executing SQL query: %s\n"
-"  %s\n"
-msgstr "Gặp lỗi khi tạo người dùng"
-
 #: src/psycstore/plugin_psycstore_sqlite.c:1796
 #, fuzzy
 msgid "SQLite database running\n"
@@ -5747,7 +5894,7 @@
 
 #: src/pt/gnunet-daemon-pt.c:888
 #, fuzzy
-msgid "# DNS requests dropped (DNS mesh channel down)"
+msgid "# DNS requests dropped (DNS cadet channel down)"
 msgstr "# các yêu cầu lỗ hổng bị bỏ do trọng tải"
 
 #: src/pt/gnunet-daemon-pt.c:896
@@ -5783,7 +5930,7 @@
 msgstr "Lưu cấu hình ngay bây giờ không?"
 
 #: src/regex/gnunet-daemon-regexprofiler.c:380
-msgid "Daemon to announce regular expressions for the peer using mesh."
+msgid "Daemon to announce regular expressions for the peer using cadet."
 msgstr ""
 
 #: src/regex/gnunet-regex-profiler.c:1288
@@ -5988,249 +6135,321 @@
 msgid "Could not open revocation database file!"
 msgstr "« %s »: Không thể kết nối.\n"
 
-#: src/scalarproduct/gnunet-scalarproduct.c:225
+#: src/scalarproduct/gnunet-scalarproduct.c:224
 #, fuzzy
 msgid "You must specify at least one message ID to check!\n"
 msgstr "Phải ghi rõ chỉ một tên tập tin để chèn.\n"
 
-#: src/scalarproduct/gnunet-scalarproduct.c:232
+#: src/scalarproduct/gnunet-scalarproduct.c:231
 msgid "This program needs a session identifier for comparing vectors.\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-scalarproduct.c:239
+#: src/scalarproduct/gnunet-scalarproduct.c:238
 msgid "Please give a session key for --input_key!\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-scalarproduct.c:251
+#: src/scalarproduct/gnunet-scalarproduct.c:250
 #, c-format
 msgid ""
 "Tried to set initiator mode, as peer ID was given. However, `%s' is not a "
 "valid peer identifier.\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-scalarproduct.c:278
-#: src/scalarproduct/gnunet-scalarproduct.c:314
-#, fuzzy, c-format
-msgid "Could not convert `%s' to int32_t.\n"
-msgstr "Không thể kết nối tới %s:%u: %s\n"
-
-#: src/scalarproduct/gnunet-scalarproduct.c:286
+#: src/scalarproduct/gnunet-scalarproduct.c:261
 msgid "Need elements to compute the vectorproduct, got none.\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-scalarproduct.c:346
+#: src/scalarproduct/gnunet-scalarproduct.c:283
 #, fuzzy, c-format
-msgid "Could not convert `%s' to integer.\n"
+msgid "Malformed input, could not parse `%s'\n"
+msgstr "Lỗi bắt đầu thu thập.\n"
+
+#: src/scalarproduct/gnunet-scalarproduct.c:296
+#, fuzzy, c-format
+msgid "Could not convert `%s' to int64_t.\n"
 msgstr "Không thể kết nối tới %s:%u: %s\n"
 
-#: src/scalarproduct/gnunet-scalarproduct.c:407
+#: src/scalarproduct/gnunet-scalarproduct.c:345
 msgid ""
 "A comma separated list of elements to compare as vector with our remote peer."
 msgstr ""
 
-#: src/scalarproduct/gnunet-scalarproduct.c:410
+#: src/scalarproduct/gnunet-scalarproduct.c:348
 msgid ""
-"A comma separated mask to select which elements should actually be compared."
-msgstr ""
-
-#: src/scalarproduct/gnunet-scalarproduct.c:413
-msgid ""
 "[Optional] peer to calculate our scalarproduct with. If this parameter is "
 "not given, the service will wait for a remote peer to compute the request."
 msgstr ""
 
-#: src/scalarproduct/gnunet-scalarproduct.c:416
+#: src/scalarproduct/gnunet-scalarproduct.c:351
 msgid "Transaction ID shared with peer."
 msgstr ""
 
-#: src/scalarproduct/gnunet-scalarproduct.c:425
+#: src/scalarproduct/gnunet-scalarproduct.c:360
 msgid "Calculate the Vectorproduct with a GNUnet peer."
 msgstr ""
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:541
+#: src/scalarproduct/gnunet-service-scalarproduct.c:678
 #, fuzzy, c-format
-msgid "Client (%p) disconnected from us.\n"
+msgid "Client %p disconnected from us.\n"
 msgstr "« %.*s » được kết nối tới « %.*s ».\n"
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:613
-#: src/scalarproduct/gnunet-service-scalarproduct.c:702
+#: src/scalarproduct/gnunet-service-scalarproduct.c:748
 #, fuzzy, c-format
 msgid "Could not send message to client (%p)!\n"
 msgstr "Không thể đọc danh sách bạn bè « %s »\n"
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:619
+#: src/scalarproduct/gnunet-service-scalarproduct.c:759
 #, c-format
 msgid "Sending session-end notification to client (%p) for session %s\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:712
-#, c-format
-msgid "Sent result to client (%p), this session (%s) has ended!\n"
-msgstr ""
+#: src/scalarproduct/gnunet-service-scalarproduct.c:781
+#: src/scalarproduct/gnunet-service-scalarproduct.c:1459
+#, fuzzy, c-format
+msgid "Successfully created new channel to peer (%s)!\n"
+msgstr "Không đủ quyền cho « %s ».\n"
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:766
-#: src/scalarproduct/gnunet-service-scalarproduct.c:855
-msgid "Could not send service-response message via mesh!)\n"
-msgstr ""
-
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1028
-#, c-format
-msgid "Failed to communicate with `%s', scalar product calculation aborted.\n"
-msgstr ""
-
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1099
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1208
+#: src/scalarproduct/gnunet-service-scalarproduct.c:818
+#: src/scalarproduct/gnunet-service-scalarproduct.c:1469
+#: src/scalarproduct/gnunet-service-scalarproduct.c:1539
 #, fuzzy
 msgid "Transmitting service request.\n"
 msgstr "Đang nạp và khởi động dùng « %s ».\n"
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1108
+#: src/scalarproduct/gnunet-service-scalarproduct.c:830
+#: src/scalarproduct/gnunet-service-scalarproduct.c:1481
 #, fuzzy
-msgid "Could not send service-request multipart message to channel!\n"
+msgid "Could not send message to channel!\n"
 msgstr "Không thể đọc danh sách bạn bè « %s »\n"
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1147
-#, fuzzy, c-format
-msgid "Successfully created new channel to peer (%s)!\n"
-msgstr "Không đủ quyền cho « %s ».\n"
-
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1217
+#: src/scalarproduct/gnunet-service-scalarproduct.c:891
+#: src/scalarproduct/gnunet-service-scalarproduct.c:991
 #, fuzzy
-msgid "Could not send message to channel!\n"
+msgid "Could not send service-response message via cadet!)\n"
 msgstr "Không thể đọc danh sách bạn bè « %s »\n"
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1274
-#, fuzzy
-msgid "Too short message received from client!\n"
-msgstr "# các đáp ứng lỗ hổng được gửi cho trình/máy khách"
+#: src/scalarproduct/gnunet-service-scalarproduct.c:1442
+#, c-format
+msgid "Sent result to client (%p), this session (%s) has ended!\n"
+msgstr ""
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1287
+#: src/scalarproduct/gnunet-service-scalarproduct.c:1550
 #, fuzzy
-msgid "Invalid message received from client, session information incorrect!\n"
-msgstr "Nhận được thông báo « %s » sai từ đồng đẳng « %s ».\n"
+msgid "Could not send service-request multipart message to channel!\n"
+msgstr "Không thể đọc danh sách bạn bè « %s »\n"
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1298
+#: src/scalarproduct/gnunet-service-scalarproduct.c:1579
 #, c-format
 msgid ""
-"Duplicate session information received, cannot create new session with key `"
-"%s'\n"
+"Got client-responder-session with key %s and a matching service-request-"
+"session set, processing.\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1318
+#: src/scalarproduct/gnunet-service-scalarproduct.c:1601
 #, c-format
 msgid ""
-"Got client-request-session with key %s, preparing channel to remote "
-"service.\n"
+"Got client-responder-session with key %s but NO matching service-request-"
+"session set, queuing element for later use.\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1354
+#: src/scalarproduct/gnunet-service-scalarproduct.c:1618
 #, c-format
 msgid "Creating new channel for session with key %s.\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1399
+#: src/scalarproduct/gnunet-service-scalarproduct.c:1777
 #, c-format
 msgid ""
-"Got client-responder-session with key %s and a matching service-request-"
-"session set, processing.\n"
+"Duplicate session information received, can not create new session with key `"
+"%s'\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1409
-#, c-format
-msgid ""
-"Got client-responder-session with key %s but NO matching service-request-"
-"session set, queuing element for later use.\n"
-msgstr ""
-
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1439
+#: src/scalarproduct/gnunet-service-scalarproduct.c:1862
 #, fuzzy, c-format
 msgid "New incoming channel from peer %s.\n"
 msgstr "« %.*s » được kết nối tới « %.*s ».\n"
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1471
+#: src/scalarproduct/gnunet-service-scalarproduct.c:1892
 #, c-format
 msgid "Peer disconnected, terminating session %s with peer (%s)\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1672
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1814
+#: src/scalarproduct/gnunet-service-scalarproduct.c:2270
 #, c-format
-msgid "Got session with key %s and a matching element set, processing.\n"
+msgid ""
+"Got message with duplicate session key (`%s'), ignoring service request.\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1681
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1821
+#: src/scalarproduct/gnunet-service-scalarproduct.c:2297
 #, c-format
-msgid "Got session with key %s without a matching element set, queueing.\n"
+msgid "Got session with key %s and a matching element set, processing.\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1771
+#: src/scalarproduct/gnunet-service-scalarproduct.c:2318
 #, c-format
-msgid ""
-"Got message with duplicate session key (`%s'), ignoring service request.\n"
+msgid "Got session with key %s without a matching element set, queueing.\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:2014
+#: src/scalarproduct/gnunet-service-scalarproduct.c:2565
 msgid "Shutting down, initiating cleanup.\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:2100
+#: src/scalarproduct/gnunet-service-scalarproduct.c:2659
 #, fuzzy
-msgid "Connect to MESH failed\n"
+msgid "Connect to CADET failed\n"
 msgstr " Không kết nối được (lỗi ?)\n"
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:2104
+#: src/scalarproduct/gnunet-service-scalarproduct.c:2664
 #, fuzzy
-msgid "Mesh initialized\n"
+msgid "CADET initialized\n"
 msgstr "Lỗi sơ khởi lõi.\n"
 
-#: src/scalarproduct/scalarproduct_api.c:246
+#: src/secretsharing/gnunet-secretsharing-profiler.c:613
+msgid "dkg start delay"
+msgstr ""
+
+#: src/secretsharing/gnunet-secretsharing-profiler.c:616
+msgid "dkg timeout"
+msgstr ""
+
+#: src/secretsharing/gnunet-secretsharing-profiler.c:619
+msgid "threshold"
+msgstr ""
+
+#: src/secretsharing/gnunet-secretsharing-profiler.c:622
+msgid "also profile decryption"
+msgstr ""
+
+#: src/sensor/gnunet-sensor.c:148
 #, fuzzy
-msgid "# SUC responder result messages received"
-msgstr "# các thông báo phát hiện dht được nhận"
+msgid "Retrieve information about all defined sensors"
+msgstr "In ra thông tin về các đồng đẳng GNUnet."
 
-#: src/scalarproduct/scalarproduct_api.c:300
+#: src/sensor/gnunet-sensor.c:151
 #, fuzzy
-msgid "# bytes sent to scalarproduct"
-msgstr "# các byte trong kho dữ liệu"
+msgid "Retrieve information about a single sensor"
+msgstr "In ra thông tin về các đồng đẳng GNUnet."
 
-#: src/scalarproduct/scalarproduct_api.c:345
-#: src/scalarproduct/scalarproduct_api.c:440
+#: src/sensor/gnunet-sensor.c:160
+msgid "sensor"
+msgstr ""
+
+#: src/sensor/gnunet-service-sensor.c:367
 #, fuzzy
-msgid "Failed to connect to the scalarproduct service\n"
-msgstr "Lỗi kết nối đến gnunetd.\n"
+msgid "Error reading sensor version\n"
+msgstr "Gặp lỗi khi tạo người dùng"
 
-#: src/scalarproduct/scalarproduct_api.c:353
-#: src/scalarproduct/scalarproduct_api.c:448
+#: src/sensor/gnunet-service-sensor.c:373
+msgid "Invalid sensor version number, format should be major.minor\n"
+msgstr ""
+
+#: src/sensor/gnunet-service-sensor.c:385
 #, fuzzy
-msgid "Failed to send a message to the statistics service\n"
-msgstr "Lỗi kết nối đến gnunetd.\n"
+msgid "Error reading sensor category\n"
+msgstr "Gặp lỗi khi tạo người dùng"
 
-#: src/scalarproduct/scalarproduct_api.c:387
-#: src/scalarproduct/scalarproduct_api.c:485
+#: src/sensor/gnunet-service-sensor.c:413
 #, fuzzy
-msgid "Failed to send a message to the scalarproduct service\n"
-msgstr "Lỗi kết nối đến gnunetd.\n"
+msgid "Error reading sensor run interval\n"
+msgstr "Hoàn thành tạo khoá.\n"
 
-#: src/secretsharing/gnunet-secretsharing-profiler.c:538
-msgid "dkg start delay"
+#: src/sensor/gnunet-service-sensor.c:419
+#, c-format
+msgid "Sensor run interval too low (%<PRIu64> < %d)\n"
 msgstr ""
 
-#: src/secretsharing/gnunet-secretsharing-profiler.c:541
-msgid "dkg timeout"
+#: src/sensor/gnunet-service-sensor.c:436
+#, fuzzy
+msgid "Error reading sensor source\n"
+msgstr "Gặp lỗi khi tạo người dùng"
+
+#: src/sensor/gnunet-service-sensor.c:445
+msgid "Error reading sensor gnunet-statistics source information\n"
 msgstr ""
 
-#: src/secretsharing/gnunet-secretsharing-profiler.c:544
-msgid "threshold"
+#: src/sensor/gnunet-service-sensor.c:455
+#, fuzzy
+msgid "Error reading sensor process name\n"
+msgstr "Gặp lỗi khi tạo người dùng"
+
+#: src/sensor/gnunet-service-sensor.c:464
+msgid "Error reading sensor expected datatype\n"
 msgstr ""
 
-#: src/secretsharing/gnunet-secretsharing-profiler.c:547
-msgid "also profile decryption"
+#: src/sensor/gnunet-service-sensor.c:470
+msgid "Invalid expected datatype, gnunet-statistics returns uint64 values\n"
 msgstr ""
 
+#: src/sensor/gnunet-service-sensor.c:498
+#, fuzzy, c-format
+msgid "Failed to access sensor file: %s\n"
+msgstr "Lỗi mở tập tin ghi sự kiện « %s »: %s\n"
+
+#: src/sensor/gnunet-service-sensor.c:506
+#, fuzzy, c-format
+msgid "Failed to load sensor definition: %s\n"
+msgstr "Lỗi mở tập tin ghi sự kiện « %s »: %s\n"
+
+#: src/sensor/gnunet-service-sensor.c:559
+#, c-format
+msgid "Sensor `%s' already exists with same or newer version\n"
+msgstr ""
+
+#: src/sensor/gnunet-service-sensor.c:566
+#, c-format
+msgid "Upgrading sensor `%s' to a newer version\n"
+msgstr ""
+
+#: src/sensor/gnunet-service-sensor.c:571
+#, c-format
+msgid ""
+"Error adding new sensor `%s' to global hashmap, this should not happen\n"
+msgstr ""
+
+#: src/sensor/gnunet-service-sensor.c:595
+#, fuzzy, c-format
+msgid "Error loading sensor from file: %s\n"
+msgstr ""
+"\n"
+"Gặp lỗi khi tải lên tập tin: %s"
+
+#: src/sensor/gnunet-service-sensor.c:599
+#, c-format
+msgid "Sensor `%s' added to global hashmap\n"
+msgstr ""
+
+#: src/sensor/gnunet-service-sensor.c:635
+#, fuzzy, c-format
+msgid "Reloading sensor definitions from directory `%s'\n"
+msgstr "Đang tải %d tập tin xuống thư mục « %s ».\n"
+
+#: src/sensor/gnunet-service-sensor.c:640
+#, fuzzy, c-format
+msgid "Loaded %d sensors from directory `%s'\n"
+msgstr "Đang tải %d tập tin xuống thư mục « %s ».\n"
+
+#: src/sensor/sensor_api.c:345
+#, fuzzy
+msgid "Timeout transmitting iteration request to `SENSOR' service."
+msgstr "Lỗi sơ khởi dịch vụ « %s ».\n"
+
+#: src/sensor/sensor_api.c:388
+#, fuzzy
+msgid "Failed to receive response from `SENSOR' service."
+msgstr ""
+"\n"
+"Không nhận được đáp ứng từ gnunetd.\n"
+
+#: src/sensor/sensor_api.c:431
+#, fuzzy
+msgid "Received invalid message from `SENSOR' service."
+msgstr ""
+"\n"
+"Không nhận được đáp ứng từ gnunetd.\n"
+
 #: src/set/gnunet-service-set.c:1431
 #, fuzzy
-msgid "Could not connect to mesh service\n"
+msgid "Could not connect to cadet service\n"
 msgstr "Không thể kết nối tới %s:%u: %s\n"
 
 #: src/set/gnunet-set-ibf-profiler.c:221
@@ -6431,7 +6650,7 @@
 "content/topology-file-format\n"
 msgstr ""
 
-#: src/testbed/gnunet-daemon-latency-logger.c:325
+#: src/testbed/gnunet-daemon-latency-logger.c:331
 msgid "Daemon to log latency values of connections to neighbours"
 msgstr ""
 
@@ -6798,8 +7017,8 @@
 msgid "# HELLO messages gossipped"
 msgstr "# các thông báo gửi đi bị loại bỏ"
 
-#: src/topology/gnunet-daemon-topology.c:1290
-msgid "GNUnet topology control (maintaining P2P mesh and F2F constraints)"
+#: src/topology/gnunet-daemon-topology.c:1296
+msgid "GNUnet topology control (maintaining P2P cadet and F2F constraints)"
 msgstr ""
 
 #: src/transport/gnunet-service-transport_blacklist.c:271
@@ -6832,19 +7051,19 @@
 msgid "# bytes payload received"
 msgstr "# các byte đã giải mã"
 
-#: src/transport/gnunet-service-transport.c:686
+#: src/transport/gnunet-service-transport.c:708
 #, fuzzy, c-format
 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:733
+#: src/transport/gnunet-service-transport.c:755
 #, 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:1084
+#: src/transport/gnunet-service-transport.c:1106
 #, fuzzy
 msgid "Transport service is lacking key configuration settings. Exiting.\n"
 msgstr "Lưu cấu hình ngay bây giờ không?"
@@ -6898,7 +7117,7 @@
 msgid "Received a request disconnect message for peer `%s'\n"
 msgstr "Nhận yêu cầu định tuyến\n"
 
-#: src/transport/gnunet-service-transport_hello.c:181
+#: src/transport/gnunet-service-transport_hello.c:182
 msgid "# refreshed my HELLO"
 msgstr ""
 
@@ -6908,7 +7127,7 @@
 msgstr "# các thông báo PONG đã mật mã được nhận"
 
 #: src/transport/gnunet-service-transport_neighbours.c:1220
-#: src/transport/gnunet-service-transport_neighbours.c:1629
+#: src/transport/gnunet-service-transport_neighbours.c:1635
 #, fuzzy
 msgid "# bytes in message queue for other peers"
 msgstr "# các byte thông báo gửi đi bị loại bỏ"
@@ -6923,186 +7142,186 @@
 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:1287
+#: src/transport/gnunet-service-transport_neighbours.c:1288
 msgid "# messages timed out while in transport queue"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1343
+#: src/transport/gnunet-service-transport_neighbours.c:1349
 #, fuzzy
 msgid "# keepalives sent"
 msgstr "# các khoá phiên chạy được gửi"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1376
+#: src/transport/gnunet-service-transport_neighbours.c:1382
 #, 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:1384
+#: src/transport/gnunet-service-transport_neighbours.c:1390
 #, 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:1431
+#: src/transport/gnunet-service-transport_neighbours.c:1437
 #, 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:1440
+#: src/transport/gnunet-service-transport_neighbours.c:1446
 #, 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:1448
+#: src/transport/gnunet-service-transport_neighbours.c:1454
 #, 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:1456
+#: src/transport/gnunet-service-transport_neighbours.c:1462
 #, 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:1534
+#: src/transport/gnunet-service-transport_neighbours.c:1540
 #, 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:1568
+#: src/transport/gnunet-service-transport_neighbours.c:1574
 #, 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:1584
+#: src/transport/gnunet-service-transport_neighbours.c:1590
 msgid "# ms throttling suggested"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1678
+#: src/transport/gnunet-service-transport_neighbours.c:1685
 #, fuzzy, c-format
 msgid ""
 "Failed to send CONNECT message to peer `%s' using address `%s' session %p\n"
 msgstr "Lỗi kết nối đến gnunetd.\n"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1705
+#: src/transport/gnunet-service-transport_neighbours.c:1712
 msgid "# Failed attempts to switch addresses (failed to send CONNECT CONT)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1751
+#: src/transport/gnunet-service-transport_neighbours.c:1757
 #, 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:1767
+#: src/transport/gnunet-service-transport_neighbours.c:1773
 #, 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:1794
+#: src/transport/gnunet-service-transport_neighbours.c:1800
 msgid "# Failed attempts to switch addresses (failed to send CONNECT)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1844
+#: src/transport/gnunet-service-transport_neighbours.c:1849
 #, c-format
 msgid ""
 "Failed to send CONNECT_ACK message to peer `%s' using address `%s' session "
 "%p\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1899
+#: src/transport/gnunet-service-transport_neighbours.c:1904
 #, 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:1914
+#: src/transport/gnunet-service-transport_neighbours.c:1919
 #, fuzzy, c-format
 msgid "Failed to transmit CONNECT_ACK message via plugin to %s\n"
 msgstr "Lỗi sơ khởi dịch vụ « %s ».\n"
 
-#: src/transport/gnunet-service-transport_neighbours.c:2192
+#: src/transport/gnunet-service-transport_neighbours.c:2196
 #, fuzzy, c-format
 msgid "Blacklisting disapproved to connect to peer `%s'\n"
 msgstr "Lỗi kết nối đến gnunetd.\n"
 
-#: src/transport/gnunet-service-transport_neighbours.c:2312
+#: src/transport/gnunet-service-transport_neighbours.c:2316
 #, 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:2317
+#: src/transport/gnunet-service-transport_neighbours.c:2321
 #, c-format
 msgid "CONNECT request from peer `%s' ignored due impending shutdown\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:2590
+#: src/transport/gnunet-service-transport_neighbours.c:2594
 msgid "# Attempts to switch addresses"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3012
+#: src/transport/gnunet-service-transport_neighbours.c:3016
 #, fuzzy
 msgid "# Failed attempts to switch addresses (no response)"
 msgstr "Lỗi mở tập tin ghi sự kiện « %s »: %s\n"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3107
+#: src/transport/gnunet-service-transport_neighbours.c:3111
 #, 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:3115
+#: src/transport/gnunet-service-transport_neighbours.c:3119
 #, fuzzy
 msgid "# unexpected CONNECT_ACK messages (no peer)"
 msgstr "gửi ĐẾM thông báo"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3129
-#: src/transport/gnunet-service-transport_neighbours.c:3164
+#: src/transport/gnunet-service-transport_neighbours.c:3133
+#: src/transport/gnunet-service-transport_neighbours.c:3168
 #, fuzzy
 msgid "# unexpected CONNECT_ACK messages (not ready)"
 msgstr "gửi ĐẾM thông báo"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3176
+#: src/transport/gnunet-service-transport_neighbours.c:3180
 #, fuzzy
 msgid "# unexpected CONNECT_ACK messages (waiting on ATS)"
 msgstr "gửi ĐẾM thông báo"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3200
+#: src/transport/gnunet-service-transport_neighbours.c:3203
 msgid "# Successful attempts to switch addresses"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3208
+#: src/transport/gnunet-service-transport_neighbours.c:3211
 #, fuzzy
 msgid "# unexpected CONNECT_ACK messages (disconnecting)"
 msgstr "gửi ĐẾM thông báo"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3396
+#: src/transport/gnunet-service-transport_neighbours.c:3399
 #, 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:3424
+#: src/transport/gnunet-service-transport_neighbours.c:3435
 #, 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:3490
+#: src/transport/gnunet-service-transport_neighbours.c:3509
 msgid "# SET QUOTA messages ignored (no such peer)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3505
+#: src/transport/gnunet-service-transport_neighbours.c:3524
 msgid "# disconnects due to quota of 0"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3545
+#: src/transport/gnunet-service-transport_neighbours.c:3564
 msgid "# disconnect messages ignored (malformed)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3551
+#: src/transport/gnunet-service-transport_neighbours.c:3570
 #, 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:3560
+#: src/transport/gnunet-service-transport_neighbours.c:3579
 msgid "# disconnect messages ignored (timestamp)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3687
+#: src/transport/gnunet-service-transport_neighbours.c:3706
 #, 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"
@@ -7217,33 +7436,58 @@
 msgid "Adding `%s' without addresses for peer `%s'\n"
 msgstr "Không thể lấy địa chỉ của đồng đẳng « %s ».\n"
 
-#: src/transport/gnunet-transport.c:367
+#: src/transport/gnunet-transport.c:388
 #, fuzzy, c-format
 msgid "Transmitted %llu bytes/s (%llu bytes in %s)\n"
 msgstr "Đang thử tải danh sách các máy xuống « %s »\n"
 
-#: src/transport/gnunet-transport.c:375
+#: src/transport/gnunet-transport.c:396
 #, fuzzy, c-format
 msgid "Received %llu bytes/s (%llu bytes in %s)\n"
 msgstr "Nhận yêu cầu định tuyến\n"
 
-#: src/transport/gnunet-transport.c:415
+#: src/transport/gnunet-transport.c:436
 #, fuzzy, c-format
 msgid "Failed to connect to `%s'\n"
 msgstr "Lỗi kết nối đến gnunetd.\n"
 
-#: src/transport/gnunet-transport.c:428
+#: src/transport/gnunet-transport.c:449
 #, fuzzy, c-format
 msgid "Failed to resolve address for peer `%s'\n"
 msgstr "Lỗi đóng kết đến cổng %s %d.\n"
 
-#: src/transport/gnunet-transport.c:438
+#: src/transport/gnunet-transport.c:459
 #, fuzzy
 msgid "Failed to list connections, timeout occured\n"
 msgstr "Không kết nối được đến trình nền gnunetd."
 
-#: src/transport/gnunet-transport.c:559
+#: src/transport/gnunet-transport.c:483
 #, fuzzy, c-format
+msgid "Configuration for plugin `%s' did not work!\n"
+msgstr "Tập tin cấu hình « %s » đã được ghi.\n"
+
+#: src/transport/gnunet-transport.c:487
+#, fuzzy, c-format
+msgid "Configuration for plugin `%s' did work!\n"
+msgstr "Tập tin cấu hình « %s » đã được ghi.\n"
+
+#: src/transport/gnunet-transport.c:491
+#, fuzzy, c-format
+msgid "Internal NAT error while running test for plugin `%s'\n"
+msgstr "=\tLỗi đọc thư mục.\n"
+
+#: src/transport/gnunet-transport.c:495
+#, fuzzy, c-format
+msgid "Failed to start NAT test for plugin `%s'\n"
+msgstr "Lỗi bắt đầu thu thập.\n"
+
+#: src/transport/gnunet-transport.c:499
+#, c-format
+msgid "Timeout while waiting for result of NAT test for plugin `%s'\n"
+msgstr ""
+
+#: src/transport/gnunet-transport.c:614
+#, fuzzy, c-format
 msgid ""
 "Peer `%s' %s %s\n"
 "\t%s%s\n"
@@ -7251,155 +7495,180 @@
 "\t%s%s\n"
 msgstr "Tôi là đồng đẳng « %s ».\n"
 
-#: src/transport/gnunet-transport.c:586
+#: src/transport/gnunet-transport.c:643
 #, fuzzy, c-format
 msgid "Peer `%s' %s `%s' \n"
 msgstr "Tôi là đồng đẳng « %s ».\n"
 
-#: src/transport/gnunet-transport.c:712
+#: src/transport/gnunet-transport.c:717 src/transport/gnunet-transport.c:1240
+#, fuzzy
+msgid "Monitor disconnected from transport service. Reconnecting.\n"
+msgstr "Lỗi kết nối đến gnunetd.\n"
+
+#: src/transport/gnunet-transport.c:784
 msgid "No transport plugins configured, peer will never communicate\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:726
+#: src/transport/gnunet-transport.c:798
 #, c-format
 msgid "No port configured for plugin `%s', cannot test it\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:789
+#: src/transport/gnunet-transport.c:823
+#, fuzzy
+msgid "Failed to start resolver!\n"
+msgstr "Lỗi bắt đầu thu thập.\n"
+
+#: src/transport/gnunet-transport.c:866
 #, fuzzy, c-format
 msgid "Transmitting %u bytes to %s\n"
 msgstr "Đang thử tải danh sách các máy xuống « %s »\n"
 
-#: src/transport/gnunet-transport.c:810
+#: src/transport/gnunet-transport.c:888
 #, fuzzy, c-format
 msgid "Successfully connected to `%s'\n"
 msgstr "Không đủ quyền cho « %s ».\n"
 
-#: src/transport/gnunet-transport.c:834
+#: src/transport/gnunet-transport.c:912
 #, c-format
 msgid ""
 "Successfully connected to `%s', starting to send benchmark data in %u Kb "
 "blocks\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:865
+#: src/transport/gnunet-transport.c:943
 #, fuzzy, c-format
 msgid "Successfully disconnected from `%s'\n"
 msgstr "Không đủ quyền cho « %s ».\n"
 
-#: src/transport/gnunet-transport.c:888
+#: src/transport/gnunet-transport.c:966
 #, fuzzy, c-format
 msgid "Disconnected from peer `%s' while benchmarking\n"
 msgstr "« %.*s » được kết nối tới « %.*s ».\n"
 
-#: src/transport/gnunet-transport.c:950
+#: src/transport/gnunet-transport.c:988 src/transport/gnunet-transport.c:1009
+#, c-format
+msgid "%24s: %-17s %4s   (%u connections in total)\n"
+msgstr ""
+
+#: src/transport/gnunet-transport.c:989
+#, fuzzy
+msgid "Connected to"
+msgstr "« %s » được kết nối tới « %s ».\n"
+
+#: src/transport/gnunet-transport.c:1010
+#, fuzzy
+msgid "Disconnected from"
+msgstr "« %.*s » được kết nối tới « %.*s ».\n"
+
+#: src/transport/gnunet-transport.c:1031
 #, fuzzy, c-format
 msgid "Received %u bytes from %s\n"
 msgstr "Nhận yêu cầu định tuyến\n"
 
-#: src/transport/gnunet-transport.c:975
+#: src/transport/gnunet-transport.c:1061
 #, c-format
 msgid "Peer `%s': %s %s in state `%s' until %s\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:986
+#: src/transport/gnunet-transport.c:1072
 #, fuzzy, c-format
 msgid "Peer `%s': %s %s\n"
 msgstr "Tôi là đồng đẳng « %s ».\n"
 
-#: src/transport/gnunet-transport.c:1197 src/transport/gnunet-transport.c:1222
+#: src/transport/gnunet-transport.c:1300 src/transport/gnunet-transport.c:1325
 #, fuzzy
 msgid "Failed to send connect request to transport service\n"
 msgstr "Lỗi kết nối đến gnunetd.\n"
 
-#: src/transport/gnunet-transport.c:1266
+#: src/transport/gnunet-transport.c:1369
 #, c-format
 msgid ""
 "Multiple operations given. Please choose only one operation: %s, %s, %s, %s, "
 "%s, %s\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1274
+#: src/transport/gnunet-transport.c:1377
 #, c-format
 msgid ""
 "No operation given. Please choose one operation: %s, %s, %s, %s, %s, %s\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1293 src/transport/gnunet-transport.c:1323
-#: src/transport/gnunet-transport.c:1353 src/transport/gnunet-transport.c:1376
-#: src/transport/gnunet-transport.c:1419
+#: src/transport/gnunet-transport.c:1396 src/transport/gnunet-transport.c:1426
+#: src/transport/gnunet-transport.c:1456 src/transport/gnunet-transport.c:1479
+#: src/transport/gnunet-transport.c:1523
 #, fuzzy
 msgid "Failed to connect to transport service\n"
 msgstr "Lỗi kết nối đến gnunetd.\n"
 
-#: src/transport/gnunet-transport.c:1302 src/transport/gnunet-transport.c:1332
-#: src/transport/gnunet-transport.c:1362
+#: src/transport/gnunet-transport.c:1405 src/transport/gnunet-transport.c:1435
+#: src/transport/gnunet-transport.c:1465
 #, fuzzy
 msgid "Failed to send request to transport service\n"
 msgstr "Lỗi kết nối đến gnunetd.\n"
 
-#: src/transport/gnunet-transport.c:1381
+#: src/transport/gnunet-transport.c:1484
 msgid "Starting to receive benchmark data\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1465
+#: src/transport/gnunet-transport.c:1569
 #, fuzzy
 msgid "print information for all peers (instead of only connected peers )"
 msgstr "In ra thông tin về các đồng đẳng GNUnet."
 
-#: src/transport/gnunet-transport.c:1468
+#: src/transport/gnunet-transport.c:1572
 msgid "measure how fast we are receiving data from all peers (until CTRL-C)"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1471
+#: src/transport/gnunet-transport.c:1575
 #, fuzzy
 msgid "connect to a peer"
 msgstr "Lỗi kết nối đến gnunetd.\n"
 
-#: src/transport/gnunet-transport.c:1474
+#: src/transport/gnunet-transport.c:1578
 #, fuzzy
 msgid "disconnect to a peer"
 msgstr "Lỗi kết nối đến gnunetd.\n"
 
-#: src/transport/gnunet-transport.c:1477
+#: src/transport/gnunet-transport.c:1581
 #, fuzzy
 msgid "print information for all pending validations "
 msgstr "In ra thông tin về các đồng đẳng GNUnet."
 
-#: src/transport/gnunet-transport.c:1480
+#: src/transport/gnunet-transport.c:1584
 #, fuzzy
 msgid "print information for all pending validations continously"
 msgstr "In ra thông tin về các đồng đẳng GNUnet."
 
-#: src/transport/gnunet-transport.c:1483
+#: src/transport/gnunet-transport.c:1587
 #, fuzzy
 msgid "provide information about all current connections (once)"
 msgstr "In ra thông tin về các đồng đẳng GNUnet."
 
-#: src/transport/gnunet-transport.c:1489
+#: src/transport/gnunet-transport.c:1593
 #, fuzzy
 msgid ""
 "provide information about all connects and disconnect events (continuously)"
 msgstr "In ra thông tin về các đồng đẳng GNUnet."
 
-#: src/transport/gnunet-transport.c:1491
+#: src/transport/gnunet-transport.c:1595
 #, fuzzy
 msgid "do not resolve hostnames"
 msgstr "không quyết định các tên máy"
 
-#: src/transport/gnunet-transport.c:1493
+#: src/transport/gnunet-transport.c:1597
 msgid "peer identity"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1495
+#: src/transport/gnunet-transport.c:1599
 msgid "send data for benchmarking to the other peer (until CTRL-C)"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1498
+#: src/transport/gnunet-transport.c:1602
 msgid "test transport configuration (involves external server)"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1507
+#: src/transport/gnunet-transport.c:1611
 #, fuzzy
 msgid "Direct access to transport service."
 msgstr "Lỗi kết nối đến gnunetd.\n"
@@ -7471,147 +7740,148 @@
 msgid "# HELLO beacons sent via Bluetooth"
 msgstr "# các byte đã gửi qua UDP"
 
-#: src/transport/plugin_transport_bluetooth.c:1723
-msgid "Bluetooth address with invalid size encountered\n"
-msgstr ""
-
 #: src/transport/plugin_transport_bluetooth.c:1923
 #, c-format
 msgid "Helper binary `%s' not SUID, cannot run bluetooth transport\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_client.c:1622
+#: src/transport/plugin_transport_http_client.c:1685
 #, c-format
 msgid "Could not initialize curl multi handle, failed to start %s plugin!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_client.c:1697
-#: src/transport/plugin_transport_http_server.c:3007
+#: src/transport/plugin_transport_http_client.c:1760
+#: src/transport/plugin_transport_http_server.c:3031
 #, 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:1722
-#: src/transport/plugin_transport_http_server.c:3063
+#: src/transport/plugin_transport_http_client.c:1785
+#: src/transport/plugin_transport_http_server.c:3088
 #, 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:1750
-#: src/transport/plugin_transport_http_server.c:2907
+#: src/transport/plugin_transport_http_client.c:1819
+#: src/transport/plugin_transport_http_server.c:2931
 #, 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:1402
+#: src/transport/plugin_transport_http_server.c:1423
 #, 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:1663
+#: src/transport/plugin_transport_http_server.c:1687
 #, c-format
 msgid "Accepting connection (%u of %u) from `%s'\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:1671
+#: src/transport/plugin_transport_http_server.c:1695
 #, c-format
 msgid ""
 "Server reached maximum number connections (%u), rejecting new connection\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:1958
+#: src/transport/plugin_transport_http_server.c:1982
 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:1982
+#: src/transport/plugin_transport_http_server.c:2006
 #, c-format
 msgid "No usable TLS certificate found and creating one at `%s/%s' failed!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:2405
+#: src/transport/plugin_transport_http_server.c:2429
 #, 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:2437 src/util/service.c:698
+#: src/transport/plugin_transport_http_server.c:2461 src/util/service.c:700
 #, 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:2454 src/util/service.c:715
+#: src/transport/plugin_transport_http_server.c:2478 src/util/service.c:719
 #, 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:2565
+#: src/transport/plugin_transport_http_server.c:2589
 #, c-format
 msgid "Found %u addresses to report to NAT service\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:2637
+#: src/transport/plugin_transport_http_server.c:2661
 msgid "Disabling IPv6 since it is not supported on this system!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:2730
+#: src/transport/plugin_transport_http_server.c:2754
 #, c-format
 msgid "IPv4 support is %s\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:2744
+#: src/transport/plugin_transport_http_server.c:2768
 #, c-format
 msgid "IPv6 support is %s\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:2751
+#: src/transport/plugin_transport_http_server.c:2775
 msgid "Neither IPv4 nor IPv6 are enabled! Fix in configuration\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:2762
+#: src/transport/plugin_transport_http_server.c:2786
 #, 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:2769
+#: src/transport/plugin_transport_http_server.c:2793
 #, 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:2784
+#: src/transport/plugin_transport_http_server.c:2808
 #, 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:2794
+#: src/transport/plugin_transport_http_server.c:2818
 #, 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:2815
+#: src/transport/plugin_transport_http_server.c:2839
 #, 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:2825
+#: src/transport/plugin_transport_http_server.c:2849
 #, 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:2877
+#: src/transport/plugin_transport_http_server.c:2901
 #, 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:2893
+#: src/transport/plugin_transport_http_server.c:2917
 #, fuzzy, c-format
 msgid "Notifying transport only about hostname `%s'\n"
 msgstr "không quyết định các tên máy"
 
+#: src/transport/plugin_transport_http_server.c:3177
+#, fuzzy
+msgid "Unable to compile URL regex\n"
+msgstr "Không thể sơ khởi SQLite: %s.\n"
+
 #: src/transport/plugin_transport_smtp.c:223
 #, c-format
 msgid "Received malformed message via %s. Ignored.\n"
@@ -7654,91 +7924,91 @@
 msgid "# bytes dropped by SMTP (outgoing)"
 msgstr "# các byte loại đi bởi SMTP (đi ra)"
 
-#: src/transport/plugin_transport_tcp.c:555
+#: src/transport/plugin_transport_tcp.c:565
 #, 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:762
-#: src/transport/plugin_transport_tcp.c:928
-#: src/transport/plugin_transport_tcp.c:2005
-#: src/transport/plugin_transport_tcp.c:2558
+#: src/transport/plugin_transport_tcp.c:787
+#: src/transport/plugin_transport_tcp.c:962
+#: src/transport/plugin_transport_tcp.c:2047
+#: src/transport/plugin_transport_tcp.c:2620
 #, fuzzy
 msgid "# TCP sessions active"
 msgstr "# các khoá phiên chạy được chấp nhận"
 
-#: src/transport/plugin_transport_tcp.c:795
-#: src/transport/plugin_transport_tcp.c:921
-#: src/transport/plugin_transport_tcp.c:1009
-#: src/transport/plugin_transport_tcp.c:1056
-#: src/transport/plugin_transport_tcp.c:1219
-#: src/transport/plugin_transport_tcp.c:1237
+#: src/transport/plugin_transport_tcp.c:823
+#: src/transport/plugin_transport_tcp.c:955
+#: src/transport/plugin_transport_tcp.c:1045
+#: src/transport/plugin_transport_tcp.c:1093
+#: src/transport/plugin_transport_tcp.c:1259
+#: src/transport/plugin_transport_tcp.c:1277
 #, fuzzy
 msgid "# bytes currently in TCP buffers"
 msgstr "# các byte đã gừi qua TCP"
 
-#: src/transport/plugin_transport_tcp.c:798
+#: src/transport/plugin_transport_tcp.c:826
 #, 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:1012
+#: src/transport/plugin_transport_tcp.c:1048
 #, 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:1059
+#: src/transport/plugin_transport_tcp.c:1096
 #, fuzzy
 msgid "# bytes transmitted via TCP"
 msgstr "# các byte được gửi"
 
-#: src/transport/plugin_transport_tcp.c:1193
+#: src/transport/plugin_transport_tcp.c:1233
 #, c-format
 msgid "Trying to send with invalid session %p\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:1462
+#: src/transport/plugin_transport_tcp.c:1504
 msgid "# requests to create session with invalid address"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:1567
+#: src/transport/plugin_transport_tcp.c:1609
 msgid "# transport-service disconnect requests for TCP"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2055
+#: src/transport/plugin_transport_tcp.c:2097
 #, 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:2215
+#: src/transport/plugin_transport_tcp.c:2257
 msgid "# bytes received via TCP"
 msgstr "# các byte đã nhận qua TCP"
 
-#: src/transport/plugin_transport_tcp.c:2279
+#: src/transport/plugin_transport_tcp.c:2321
 msgid "# network-level TCP disconnect events"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2437 src/util/service.c:582
+#: src/transport/plugin_transport_tcp.c:2490 src/util/service.c:582
 #: src/util/service.c:588
 #, c-format
 msgid "Require valid port number for service `%s' in configuration!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2451
+#: src/transport/plugin_transport_tcp.c:2504
 #, fuzzy
 msgid "Failed to start service.\n"
 msgstr "Lỗi bắt đầu thu thập.\n"
 
-#: src/transport/plugin_transport_tcp.c:2547
+#: src/transport/plugin_transport_tcp.c:2607
 #, c-format
 msgid "TCP transport listening on port %llu\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2551
+#: src/transport/plugin_transport_tcp.c:2611
 msgid "TCP transport not listening on any port (client only)\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2554
+#: src/transport/plugin_transport_tcp.c:2615
 #, c-format
 msgid "TCP transport advertises itself as being on port %llu\n"
 msgstr ""
@@ -7808,12 +8078,12 @@
 msgid "Cannot create path to `%s'\n"
 msgstr "Không thể tạo miền tên.\n"
 
-#: src/transport/plugin_transport_unix.c:1652
+#: src/transport/plugin_transport_unix.c:1645
 #, fuzzy
 msgid "No UNIXPATH given in configuration!\n"
 msgstr "Lỗi lưu cấu hình."
 
-#: src/transport/plugin_transport_unix.c:1688
+#: src/transport/plugin_transport_unix.c:1681
 #, fuzzy
 msgid "Failed to open UNIX listen socket\n"
 msgstr "Lỗi mở tập tin ghi sự kiện « %s »: %s\n"
@@ -7885,10 +8155,6 @@
 msgid "# HELLO beacons sent via WLAN"
 msgstr "# các byte đã gửi qua UDP"
 
-#: src/transport/plugin_transport_wlan.c:1729
-msgid "WLAN address with invalid size encountered\n"
-msgstr ""
-
 #: src/transport/plugin_transport_wlan.c:1929
 #, c-format
 msgid "Helper binary `%s' not SUID, cannot run WLAN transport\n"
@@ -8034,7 +8300,7 @@
 msgid "Syntax error while deserializing in line %u\n"
 msgstr "Gặp lỗi cú pháp trong tập tin cấu hình « %s » tại dòng %d.\n"
 
-#: src/util/configuration.c:996
+#: src/util/configuration.c:1023
 #, c-format
 msgid ""
 "Configuration value '%s' for '%s' in section '%s' is not in set of legal "
@@ -8043,17 +8309,17 @@
 "Giá trị cấu hình « %s » cho « %s » trong phần « %s » không phải nằm trong "
 "tập hợp các sự chọn được phép\n"
 
-#: src/util/configuration.c:1066
+#: src/util/configuration.c:1093
 #, c-format
 msgid "Recursive expansion suspected, aborting $-expansion for term `%s'\n"
 msgstr ""
 
-#: src/util/configuration.c:1098
+#: src/util/configuration.c:1125
 #, fuzzy, c-format
 msgid "Missing closing `%s' in option `%s'\n"
 msgstr "Giá trị cấu hình « %s » cho « %s » trong phần « %s » nên là con số\n"
 
-#: src/util/configuration.c:1172
+#: src/util/configuration.c:1199
 #, c-format
 msgid ""
 "Failed to expand `%s' in `%s' as it is neither found in [PATHS] nor defined "
@@ -8153,7 +8419,7 @@
 msgid "Expected `%s' to be a directory!\n"
 msgstr "Mong đợi « %s » là một thư mục.\n"
 
-#: src/util/disk.c:1546 src/util/service.c:1318
+#: src/util/disk.c:1546 src/util/service.c:1323
 #, c-format
 msgid "Cannot obtain information about user `%s': %s\n"
 msgstr "Không thể lấy thông tin về người dùng « %s »: %s\n"
@@ -8479,17 +8745,17 @@
 msgid "Could not determine plugin installation path.\n"
 msgstr "Không thể truy cập đến thông tin về không gian tên.\n"
 
-#: src/util/program.c:246 src/util/service.c:1452
+#: src/util/program.c:246 src/util/service.c:1457
 #, 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:258 src/util/service.c:1467
+#: src/util/program.c:258 src/util/service.c:1472
 #, 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:263 src/util/service.c:1462
+#: src/util/program.c:263 src/util/service.c:1467
 #, fuzzy
 msgid "Malformed configuration, exit ...\n"
 msgstr "Không thể lưu tập tin cấu hình « %s »:"
@@ -8589,52 +8855,52 @@
 msgid "Have neither PORT nor UNIXPATH for service `%s', but one is required\n"
 msgstr ""
 
-#: src/util/service.c:903
+#: src/util/service.c:908
 msgid "Could not access a pre-bound socket, will try to bind myself\n"
 msgstr ""
 
-#: src/util/service.c:952 src/util/service.c:970
+#: src/util/service.c:957 src/util/service.c:975
 #, c-format
 msgid "Specified value for `%s' of service `%s' is invalid\n"
 msgstr ""
 
-#: src/util/service.c:995
+#: src/util/service.c:1000
 #, c-format
 msgid "Could not access pre-bound socket %u, will try to bind myself\n"
 msgstr ""
 
-#: src/util/service.c:1165
+#: src/util/service.c:1170
 #, fuzzy, c-format
 msgid "Failed to start `%s' at `%s'\n"
 msgstr "Lỗi chạy %s: %s %d\n"
 
-#: src/util/service.c:1207
+#: src/util/service.c:1212
 #, fuzzy, c-format
 msgid "Service `%s' runs at %s\n"
 msgstr "Đồng đẳng « %s » có mức tin cậy %8u\n"
 
-#: src/util/service.c:1256
+#: src/util/service.c:1261
 msgid "Service process failed to initialize\n"
 msgstr ""
 
-#: src/util/service.c:1260
+#: src/util/service.c:1265
 msgid "Service process could not initialize server function\n"
 msgstr ""
 
-#: src/util/service.c:1264
+#: src/util/service.c:1269
 msgid "Service process failed to report status\n"
 msgstr ""
 
-#: src/util/service.c:1319
+#: src/util/service.c:1324
 msgid "No such user"
 msgstr "Không có người dùng như vậy"
 
-#: src/util/service.c:1332
+#: src/util/service.c:1337
 #, c-format
 msgid "Cannot change user/group to `%s': %s\n"
 msgstr "Không thể thay đổi người dùng/nhóm thành « %s »: %s\n"
 
-#: src/util/service.c:1402
+#: src/util/service.c:1407
 msgid "do daemonize (detach from terminal)"
 msgstr ""
 
@@ -8767,22 +9033,22 @@
 
 #: src/vpn/gnunet-service-vpn.c:642
 #, fuzzy
-msgid "# Bytes given to mesh for transmission"
+msgid "# Bytes given to cadet for transmission"
 msgstr "# các thông báo PING được tạo"
 
 #: src/vpn/gnunet-service-vpn.c:680
 #, fuzzy
-msgid "# Bytes dropped in mesh queue (overflow)"
+msgid "# Bytes dropped in cadet queue (overflow)"
 msgstr "# các byte loại bỏ bởi UDP (đi ra)"
 
 #: src/vpn/gnunet-service-vpn.c:753
 #, fuzzy
-msgid "# Mesh channels created"
+msgid "# Cadet channels created"
 msgstr "# các truy vấn lỗ hổng được định tuyến"
 
 #: src/vpn/gnunet-service-vpn.c:784
 #, fuzzy
-msgid "Failed to setup mesh channel!\n"
+msgid "Failed to setup cadet channel!\n"
 msgstr "Lỗi lấy thông kê về truyền tải.\n"
 
 #: src/vpn/gnunet-service-vpn.c:978
@@ -8819,17 +9085,17 @@
 
 #: src/vpn/gnunet-service-vpn.c:1706
 #, fuzzy
-msgid "# ICMP packets received from mesh"
+msgid "# ICMP packets received from cadet"
 msgstr "# các đáp ứng lỗ hổng được gửi cho trình/máy khách"
 
 #: src/vpn/gnunet-service-vpn.c:2045
 #, fuzzy
-msgid "# UDP packets received from mesh"
+msgid "# UDP packets received from cadet"
 msgstr "# các đáp ứng lỗ hổng được gửi cho trình/máy khách"
 
 #: src/vpn/gnunet-service-vpn.c:2200
 #, fuzzy
-msgid "# TCP packets received from mesh"
+msgid "# TCP packets received from cadet"
 msgstr "# các đáp ứng lỗ hổng được gửi cho trình/máy khách"
 
 #: src/vpn/gnunet-service-vpn.c:2351
@@ -8849,29 +9115,29 @@
 msgid "Failed to allocate IP address for new destination\n"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:2982
+#: src/vpn/gnunet-service-vpn.c:2987
 #, fuzzy
 msgid "Must specify valid IPv6 address"
 msgstr "« %s » không sẵn sàng.\n"
 
-#: src/vpn/gnunet-service-vpn.c:3006
+#: src/vpn/gnunet-service-vpn.c:3011
 msgid "Must specify valid IPv6 mask"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:3014
+#: src/vpn/gnunet-service-vpn.c:3019
 msgid "IPv6 support disabled as this system does not support IPv6\n"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:3027
+#: src/vpn/gnunet-service-vpn.c:3032
 #, fuzzy
 msgid "Must specify valid IPv4 address"
 msgstr "« %s » không sẵn sàng.\n"
 
-#: src/vpn/gnunet-service-vpn.c:3040
+#: src/vpn/gnunet-service-vpn.c:3045
 msgid "Must specify valid IPv4 mask"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:3050
+#: src/vpn/gnunet-service-vpn.c:3055
 msgid "IPv4 support disabled as this system does not support IPv4\n"
 msgstr ""
 
@@ -8960,6 +9226,55 @@
 msgstr "« %s » thất bại ở tập tin « %s » tại %s:%d với lỗi: %s\n"
 
 #, fuzzy
+#~ msgid "Peer `%s'\n"
+#~ msgstr "Tôi là đồng đẳng « %s ».\n"
+
+#, fuzzy
+#~ msgid "# Bytes received from MESH"
+#~ msgstr "# các byte đã nhận qua HTTP"
+
+#, fuzzy
+#~ msgid "# Replies received from MESH"
+#~ msgstr "# các byte đã nhận qua HTTP"
+
+#, fuzzy
+#~ msgid "Failed to run `upnpc` command"
+#~ msgstr "Lỗi bắt đầu thu thập.\n"
+
+#, fuzzy
+#~ msgid "Could not convert `%s' to integer.\n"
+#~ msgstr "Không thể kết nối tới %s:%u: %s\n"
+
+#, fuzzy
+#~ msgid "Too short message received from client!\n"
+#~ msgstr "# các đáp ứng lỗ hổng được gửi cho trình/máy khách"
+
+#, fuzzy
+#~ msgid ""
+#~ "Invalid message received from client, session information incorrect!\n"
+#~ msgstr "Nhận được thông báo « %s » sai từ đồng đẳng « %s ».\n"
+
+#, fuzzy
+#~ msgid "# SUC responder result messages received"
+#~ msgstr "# các thông báo phát hiện dht được nhận"
+
+#, fuzzy
+#~ msgid "# bytes sent to scalarproduct"
+#~ msgstr "# các byte trong kho dữ liệu"
+
+#, fuzzy
+#~ msgid "Failed to connect to the scalarproduct service\n"
+#~ msgstr "Lỗi kết nối đến gnunetd.\n"
+
+#, fuzzy
+#~ msgid "Failed to send a message to the statistics service\n"
+#~ msgstr "Lỗi kết nối đến gnunetd.\n"
+
+#, fuzzy
+#~ msgid "Failed to send a message to the scalarproduct service\n"
+#~ msgstr "Lỗi kết nối đến gnunetd.\n"
+
+#, fuzzy
 #~ msgid "# TRAIL SETUP requests received"
 #~ msgstr "# các yêu cầu get (lấy) dht được nhận"
 
@@ -9117,10 +9432,6 @@
 #~ msgstr "Lỗi cập nhật dữ liệu cho mô-đun « %s »\n"
 
 #, fuzzy
-#~ msgid "Unable to initialize resolver!\n"
-#~ msgstr "Không thể sơ khởi SQLite: %s.\n"
-
-#, fuzzy
 #~ msgid "Using default zone file `%s'\n"
 #~ msgstr "Đang bắt đầu tài về « %s »\n"
 
@@ -9277,10 +9588,6 @@
 #~ msgstr "« %s » không phải là một tập tin.\n"
 
 #, fuzzy
-#~ msgid "Error communicating with ARM service.\n"
-#~ msgstr "Cổng để liên lạc với giao diện người dùng GNUnet"
-
-#, fuzzy
 #~ msgid "Timeout communicating with ARM service.\n"
 #~ msgstr "Cổng để liên lạc với giao diện người dùng GNUnet"
 
@@ -9321,10 +9628,6 @@
 #~ msgstr "Lỗi bắt đầu thu thập.\n"
 
 #, fuzzy
-#~ msgid "# session keys received"
-#~ msgstr "# các khoá phiên chạy bị từ chối"
-
-#, fuzzy
 #~ msgid "# SET_KEY and PING messages created"
 #~ msgstr "# các thông báo PING được tạo"
 
@@ -9571,10 +9874,6 @@
 #~ msgstr "Lỗi lưu cấu hình."
 
 #, fuzzy
-#~ msgid "Failed to queue a confirmation receipt\n"
-#~ msgstr "Lỗi lưu cấu hình."
-
-#, fuzzy
 #~ msgid "Failed to queue a leave notification\n"
 #~ msgstr "Lỗi lưu cấu hình."
 
@@ -9583,10 +9882,6 @@
 #~ msgstr "« %s » được kết nối tới « %s ».\n"
 
 #, fuzzy
-#~ msgid "Configuration fails to specify `%s' in section `%s'\n"
-#~ msgstr "Tập tin cấu hình « %s » đã được ghi.\n"
-
-#, fuzzy
 #~ msgid "Configuration fails to specify `%s', assuming default value."
 #~ msgstr "Tập tin cấu hình « %s » đã được ghi.\n"
 
@@ -9870,9 +10165,6 @@
 #~ msgid "configure logging to use LOGLEVEL"
 #~ msgstr "cấu hình chức năng ghi sự kiện để dùng CẤP_GHI_LƯU"
 
-#~ msgid "be verbose"
-#~ msgstr "xuất chi tiết"
-
 #, fuzzy
 #~ msgid "Failed to start service `%s'!\n"
 #~ msgstr "Lỗi bắt đầu thu thập.\n"
@@ -11104,13 +11396,6 @@
 
 #~ msgid ""
 #~ "\n"
-#~ "Error uploading file: %s"
-#~ msgstr ""
-#~ "\n"
-#~ "Gặp lỗi khi tải lên tập tin: %s"
-
-#~ msgid ""
-#~ "\n"
 #~ "Unexpected event: %d\n"
 #~ msgstr ""
 #~ "\n"
@@ -11190,9 +11475,6 @@
 #~ msgid "No filename specified, using `%s' instead (for now).\n"
 #~ msgstr "Chưa ghi rõ tên tập tin, đang dùng « %s » để thay thế (lúc này).\n"
 
-#~ msgid "Downloading %d files from directory `%s'.\n"
-#~ msgstr "Đang tải %d tập tin xuống thư mục « %s ».\n"
-
 #~ msgid "File stored as `%s'.\n"
 #~ msgstr "Tập tin được lưu dạng « %s ».\n"
 

Modified: gnunet/po/zh_CN.po
===================================================================
--- gnunet/po/zh_CN.po  2014-06-04 16:03:17 UTC (rev 33521)
+++ gnunet/po/zh_CN.po  2014-06-04 16:38:42 UTC (rev 33522)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: gnunet-0.8.1\n"
 "Report-Msgid-Bugs-To: address@hidden"
-"POT-Creation-Date: 2014-04-08 11:11+0200\n"
+"POT-Creation-Date: 2014-06-04 18:25+0200\n"
 "PO-Revision-Date: 2011-07-09 12:12+0800\n"
 "Last-Translator: Wylmer Wang <address@hidden>\n"
 "Language-Team: Chinese (simplified) <address@hidden>\n"
@@ -345,130 +345,159 @@
 msgid "Initiating shutdown as requested by client.\n"
 msgstr ""
 
-#: src/ats/ats_api_performance.c:468
+#: src/ats/ats_api_performance.c:485
 #, c-format
 msgid "Received %s message\n"
 msgstr ""
 
-#: src/ats/ats_api_performance.c:511
+#: src/ats/ats_api_performance.c:528
 #, c-format
 msgid "Received last message for %s \n"
 msgstr ""
 
-#: src/ats/gnunet-ats-solver-eval.c:2199 src/ats/gnunet-ats-solver-eval.c:2233
-#: src/ats/gnunet-service-ats_addresses.c:1980
-#: src/ats/gnunet-service-ats_addresses.c:2024
+#: src/ats/gnunet-ats-solver-eval.c:2793 src/ats/gnunet-ats-solver-eval.c:2827
+#: src/ats/gnunet-service-ats_addresses.c:1675
+#: src/ats/gnunet-service-ats_addresses.c:1719
 #, c-format
 msgid ""
 "Could not load quota for network `%s':  `%s', assigning default bandwidth "
 "%llu\n"
 msgstr ""
 
-#: src/ats/gnunet-ats-solver-eval.c:2205
-#: src/ats/gnunet-service-ats_addresses.c:1987
+#: src/ats/gnunet-ats-solver-eval.c:2799
+#: src/ats/gnunet-service-ats_addresses.c:1682
 #, c-format
 msgid "Outbound quota configure for network `%s' is %llu\n"
 msgstr ""
 
-#: src/ats/gnunet-ats-solver-eval.c:2212
-#: src/ats/gnunet-service-ats_addresses.c:1995
+#: src/ats/gnunet-ats-solver-eval.c:2806
+#: src/ats/gnunet-service-ats_addresses.c:1690
 #, c-format
 msgid ""
 "No outbound quota configured for network `%s', assigning default bandwidth "
 "%llu\n"
 msgstr ""
 
-#: src/ats/gnunet-ats-solver-eval.c:2239
-#: src/ats/gnunet-service-ats_addresses.c:2031
+#: src/ats/gnunet-ats-solver-eval.c:2833
+#: src/ats/gnunet-service-ats_addresses.c:1726
 #, c-format
 msgid "Inbound quota configured for network `%s' is %llu\n"
 msgstr ""
 
-#: src/ats/gnunet-ats-solver-eval.c:2246
-#: src/ats/gnunet-service-ats_addresses.c:2039
+#: src/ats/gnunet-ats-solver-eval.c:2840
+#: src/ats/gnunet-service-ats_addresses.c:1734
 #, c-format
 msgid ""
 "No outbound quota configure for network `%s', assigning default bandwidth "
 "%llu\n"
 msgstr ""
 
-#: src/ats/gnunet-ats-solver-eval.c:2671
+#: src/ats/gnunet-ats-solver-eval.c:3397
 #: src/ats-tests/gnunet-solver-eval.c:919
 msgid "solver to use"
 msgstr ""
 
-#: src/ats/gnunet-ats-solver-eval.c:2674 src/ats/gnunet-ats-solver-eval.c:2677
+#: src/ats/gnunet-ats-solver-eval.c:3400
 #: src/ats-tests/gnunet-solver-eval.c:922
 #: src/ats-tests/gnunet-solver-eval.c:925
 msgid "experiment to use"
 msgstr ""
 
-#: src/ats/gnunet-ats-solver-eval.c:2680
+#: src/ats/gnunet-ats-solver-eval.c:3403
+msgid "be verbose"
+msgstr ""
+
+#: src/ats/gnunet-ats-solver-eval.c:3406
 #, fuzzy
 msgid "print logging"
 msgstr "未知的命令“%s”。\n"
 
-#: src/ats/gnunet-service-ats_addresses.c:2217
+#: src/ats/gnunet-ats-solver-eval.c:3409
+msgid "save logging to disk"
+msgstr ""
+
+#: src/ats/gnunet-ats-solver-eval.c:3412
+msgid "disable normalization"
+msgstr ""
+
+#: src/ats/gnunet-service-ats_addresses.c:1912
 #, c-format
 msgid "Initializing solver `%s '`%s'\n"
 msgstr ""
 
-#: src/ats/gnunet-service-ats_addresses.c:2220
+#: src/ats/gnunet-service-ats_addresses.c:1915
 #, fuzzy, c-format
 msgid "Failed to initialize solver `%s'!\n"
 msgstr "无法初始化 SQLite:%s。\n"
 
-#: src/ats/gnunet-service-ats_addresses.c:2243
+#: src/ats/gnunet-service-ats_addresses.c:1938
 #, fuzzy
 msgid "Failed to initialize solver!\n"
 msgstr "无法初始化 SQLite:%s。\n"
 
-#: src/ats/plugin_ats_mlp.c:892
+#: src/ats/plugin_ats_mlp.c:949
 msgid "Problem size too large, cannot allocate memory!\n"
 msgstr ""
 
-#: src/ats/plugin_ats_mlp.c:1329
+#: src/ats/plugin_ats_mlp.c:1542
 #, c-format
 msgid "Adding address for peer `%s' multiple times\n"
 msgstr ""
 
-#: src/ats/plugin_ats_mlp.c:1376
+#: src/ats/plugin_ats_mlp.c:1589
 #, c-format
 msgid "Updating address property `%s' for peer `%s' %p not added before\n"
 msgstr ""
 
-#: src/ats/plugin_ats_mlp.c:2122
+#: src/ats/plugin_ats_mlp.c:2299
+msgid ""
+"MLP solver is not optimizing for anything, changing to feasibility check\n"
+msgstr ""
+
+#: src/ats/plugin_ats_mlp.c:2339 src/ats/plugin_ats_mlp.c:2356
+#: src/ats/plugin_ats_mlp.c:2388 src/ats/plugin_ats_mlp.c:2406
+#: src/ats/plugin_ats_mlp.c:2425 src/ats/plugin_ats_proportional.c:458
+#: src/ats/plugin_ats_proportional.c:475 src/ats/plugin_ats_ril.c:2220
+#: src/ats/plugin_ats_ril.c:2237 src/ats/plugin_ats_ril.c:2254
+#: src/ats/plugin_ats_ril.c:2271 src/ats/plugin_ats_ril.c:2288
+#: src/ats/plugin_ats_ril.c:2305 src/ats/plugin_ats_ril.c:2322
+#: src/ats/plugin_ats_ril.c:2339
+#, fuzzy, c-format
+msgid "Invalid %s configuration %f \n"
+msgstr "解析配置文件“%s”失败\n"
+
+#: src/ats/plugin_ats_mlp.c:2512
 #, c-format
 msgid ""
 "Adjusting inconsistent outbound quota configuration for network `%s', is "
 "%llu must be at least %llu\n"
 msgstr ""
 
-#: src/ats/plugin_ats_mlp.c:2131
+#: src/ats/plugin_ats_mlp.c:2521
 #, c-format
 msgid ""
 "Adjusting inconsistent inbound quota configuration for network `%s', is %llu "
 "must be at least %llu\n"
 msgstr ""
 
-#: src/ats/plugin_ats_mlp.c:2142
+#: src/ats/plugin_ats_mlp.c:2532
 #, c-format
 msgid ""
 "Adjusting outbound quota configuration for network `%s'from %llu to %.0f\n"
 msgstr ""
 
-#: src/ats/plugin_ats_mlp.c:2150
+#: src/ats/plugin_ats_mlp.c:2540
 #, c-format
 msgid ""
 "Adjusting inbound quota configuration for network `%s' from %llu to %.0f\n"
 msgstr ""
 
-#: src/ats/plugin_ats_mlp.c:2161
+#: src/ats/plugin_ats_mlp.c:2551
 #, c-format
 msgid "Using default quota configuration for network `%s' (in/out) %llu/%llu\n"
 msgstr ""
 
-#: src/ats/plugin_ats_proportional.c:1511
+#: src/ats/plugin_ats_proportional.c:1819
 #, fuzzy, c-format
 msgid "Invalid network type `%u' `%s': Disconnect!\n"
 msgstr "找不到主机“%s”的 IP:%s\n"
@@ -506,7 +535,7 @@
 msgid "Could not connect master [%u] and slave [%u]\n"
 msgstr "无法连接到 %s:%u:%s\n"
 
-#: src/ats-tests/ats-testing.c:490 src/ats-tests/ats-testing.c:671
+#: src/ats-tests/ats-testing.c:490 src/ats-tests/ats-testing.c:673
 #, fuzzy
 msgid "Initialization failed, shutdown\n"
 msgstr "插件机构初始化失败:%s!\n"
@@ -537,108 +566,164 @@
 msgid "ATS returned results for %u addresses\n"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:232
+#: src/ats-tool/gnunet-ats.c:258
 #, 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:413
+#: src/ats-tool/gnunet-ats.c:467
 #, c-format
 msgid "Quota for network `%11s' (in/out): %10s / %10s\n"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:433 src/core/gnunet-core.c:163
-#: src/namestore/gnunet-namestore.c:550 src/transport/gnunet-transport.c:1246
+#: src/ats-tool/gnunet-ats.c:487 src/namestore/gnunet-namestore.c:639
+#: src/transport/gnunet-transport.c:1349
 #, fuzzy, c-format
 msgid "Service `%s' is not running\n"
 msgstr "服务已删除。\n"
 
-#: src/ats-tool/gnunet-ats.c:445 src/transport/gnunet-transport.c:1255
+#: src/ats-tool/gnunet-ats.c:499 src/transport/gnunet-transport.c:1358
 #, fuzzy, c-format
 msgid "Failed to parse peer identity `%s'\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/ats-tool/gnunet-ats.c:454
+#: src/ats-tool/gnunet-ats.c:508
 #, c-format
 msgid "Please select one operation : %s or %s or %s or %s or %s\n"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:470 src/ats-tool/gnunet-ats.c:489
-#: src/ats-tool/gnunet-ats.c:506 src/ats-tool/gnunet-ats.c:543
+#: src/ats-tool/gnunet-ats.c:524 src/ats-tool/gnunet-ats.c:543
+#: src/ats-tool/gnunet-ats.c:560 src/ats-tool/gnunet-ats.c:597
 #, fuzzy, c-format
 msgid "Cannot connect to ATS service, exiting...\n"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/ats-tool/gnunet-ats.c:478 src/ats-tool/gnunet-ats.c:495
+#: src/ats-tool/gnunet-ats.c:532 src/ats-tool/gnunet-ats.c:549
 #, fuzzy, c-format
 msgid "Cannot issue request to ATS service, exiting...\n"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/ats-tool/gnunet-ats.c:515
+#: src/ats-tool/gnunet-ats.c:569
 #, fuzzy, c-format
 msgid "No preference type given!\n"
 msgstr "无法获取有关用户“%s”的信息:%s\n"
 
-#: src/ats-tool/gnunet-ats.c:520
+#: src/ats-tool/gnunet-ats.c:574
 #, c-format
 msgid "No peer given!\n"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:536
+#: src/ats-tool/gnunet-ats.c:590
 msgid "Valid type required\n"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:594
+#: src/ats-tool/gnunet-ats.c:648
 msgid "get list of active addresses currently used"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:596
+#: src/ats-tool/gnunet-ats.c:650
 msgid "get list of all active addresses"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:599
+#: src/ats-tool/gnunet-ats.c:653
 #, fuzzy
 msgid "do not resolve IP addresses to hostnames"
 msgstr "GNUnet 现在使用 IP 地址 %s。\n"
 
-#: src/ats-tool/gnunet-ats.c:601
+#: src/ats-tool/gnunet-ats.c:655
 msgid "monitor mode"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:603
+#: src/ats-tool/gnunet-ats.c:657
 #, fuzzy
 msgid "set preference for the given peer"
 msgstr "无法获取有关用户“%s”的信息:%s\n"
 
-#: src/ats-tool/gnunet-ats.c:605
+#: src/ats-tool/gnunet-ats.c:659
 msgid "print all configured quotas"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:607
+#: src/ats-tool/gnunet-ats.c:661
 msgid "peer id"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:610
+#: src/ats-tool/gnunet-ats.c:664
 msgid "preference type to set: latency | bandwidth"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:612
+#: src/ats-tool/gnunet-ats.c:666
 msgid "preference value"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:615
+#: src/ats-tool/gnunet-ats.c:669
 msgid "verbose output (include ATS address properties)"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:622
+#: src/ats-tool/gnunet-ats.c:676
 #, fuzzy
 msgid "Print information about ATS state"
 msgstr "无法获取有关用户“%s”的信息:%s\n"
 
+#: src/cadet/gnunet-cadet.c:357
+#, fuzzy, c-format
+msgid "Invalid target `%s'\n"
+msgstr "“%s”的参数无效。\n"
+
+#: src/cadet/gnunet-cadet.c:607
+#, fuzzy, c-format
+msgid "Invalid peer ID `%s'\n"
+msgstr "无效条目。\n"
+
+#: src/cadet/gnunet-cadet.c:650
+#, fuzzy, c-format
+msgid "Invalid tunnel owner `%s'\n"
+msgstr "IP 格式无效:“%s”\n"
+
+#: src/cadet/gnunet-cadet.c:716
+msgid "You must NOT give a TARGETwhen using 'request all' options\n"
+msgstr ""
+
+#: src/cadet/gnunet-cadet.c:807
+#, fuzzy
+msgid "provide information about a particular connection"
+msgstr "无法获取有关用户“%s”的信息:%s\n"
+
+#: src/cadet/gnunet-cadet.c:810
+msgid "activate echo mode"
+msgstr ""
+
+#: src/cadet/gnunet-cadet.c:816
+msgid "port to listen to (default; 0)"
+msgstr ""
+
+#: src/cadet/gnunet-cadet.c:819
+#, fuzzy
+msgid "provide information about a patricular peer"
+msgstr "无法获取有关用户“%s”的信息:%s\n"
+
+#: src/cadet/gnunet-cadet.c:822
+#, fuzzy
+msgid "provide information about all peers"
+msgstr "无法获取有关用户“%s”的信息:%s\n"
+
+#: src/cadet/gnunet-cadet.c:825
+#, fuzzy
+msgid "provide information about a particular tunnel"
+msgstr "无法获取有关用户“%s”的信息:%s\n"
+
+#: src/cadet/gnunet-cadet.c:828
+#, fuzzy
+msgid "provide information about all tunnels"
+msgstr "无法获取有关用户“%s”的信息:%s\n"
+
+#: src/cadet/gnunet-service-cadet_peer.c:429
+msgid "Wrong CORE service\n"
+msgstr ""
+
 #: src/consensus/gnunet-consensus-profiler.c:437
-#: src/secretsharing/gnunet-secretsharing-profiler.c:535
+#: src/secretsharing/gnunet-secretsharing-profiler.c:610
 #, fuzzy
 msgid "number of peers in consensus"
 msgstr "迭代次数"
@@ -663,7 +748,7 @@
 msgstr ""
 
 #: src/consensus/gnunet-consensus-profiler.c:452
-#: src/secretsharing/gnunet-secretsharing-profiler.c:550
+#: src/secretsharing/gnunet-secretsharing-profiler.c:625
 msgid "be more verbose (print received values)"
 msgstr ""
 
@@ -672,6 +757,11 @@
 msgid "Connection to conversation service lost, trying to reconnect\n"
 msgstr ""
 
+#: src/conversation/conversation_api.c:681
+#, fuzzy
+msgid "number too large"
+msgstr "迭代次数"
+
 #: src/conversation/gnunet-conversation.c:264
 #, c-format
 msgid "Incoming call from `%s'. Please /accept #%u or /cancel %u the call.\n"
@@ -1082,19 +1172,19 @@
 msgid "Failed to allocate %d bytes for second packet\n"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/conversation/gnunet-service-conversation.c:841
-msgid "Mesh audio channel not ready; audio data dropped\n"
+#: src/conversation/gnunet-service-conversation.c:852
+msgid "Cadet audio channel not ready; audio data dropped\n"
 msgstr ""
 
-#: src/conversation/gnunet-service-conversation.c:932
+#: src/conversation/gnunet-service-conversation.c:943
 #, c-format
 msgid ""
 "No available phone for incoming call on line %u, sending HANG_UP signal\n"
 msgstr ""
 
-#: src/conversation/gnunet-service-conversation.c:1338
+#: src/conversation/gnunet-service-conversation.c:1349
 #, fuzzy, c-format
-msgid "Received incoming channel on port %u\n"
+msgid "Received incoming Cadet channel on port %u\n"
 msgstr "“%s”已连接到“%s”。\n"
 
 #: src/conversation/microphone.c:121
@@ -1111,191 +1201,219 @@
 msgid "Could not start playback audio helper.\n"
 msgstr ""
 
-#: src/core/core_api.c:767
+#: src/core/core_api.c:768
 msgid "Client was disconnected from core service, trying to reconnect.\n"
 msgstr ""
 
-#: src/core/gnunet-core.c:80
-#, c-format
-msgid "Peer `%s'\n"
+#: src/core/gnunet-core.c:92
+#, fuzzy
+msgid "fresh connection"
 msgstr ""
+"\n"
+"按任意键继续\n"
 
-#: src/core/gnunet-core.c:110 src/core/gnunet-core.c:138
-#: src/transport/gnunet-transport.c:910 src/transport/gnunet-transport.c:930
-#, c-format
-msgid "%24s: %-17s %4s   (%u connections in total)\n"
+#: src/core/gnunet-core.c:95
+msgid "key sent"
 msgstr ""
 
-#: src/core/gnunet-core.c:112 src/transport/gnunet-transport.c:911
+#: src/core/gnunet-core.c:98
+msgid "key received"
+msgstr ""
+
+#: src/core/gnunet-core.c:101
 #, fuzzy
-msgid "Connected to"
-msgstr "“%s”已连接到“%s”。\n"
+msgid "connection established"
+msgstr "找不到接口“%s”的一个 IP 地址。\n"
 
-#: src/core/gnunet-core.c:140 src/transport/gnunet-transport.c:931
+#: src/core/gnunet-core.c:104
+msgid "rekeying"
+msgstr ""
+
+#: src/core/gnunet-core.c:107
 #, fuzzy
-msgid "Disconnected from"
+msgid "disconnected"
 msgstr "“%s”已连接到“%s”。\n"
 
-#: src/core/gnunet-core.c:211 src/peerinfo-tool/gnunet-peerinfo.c:694
+#: src/core/gnunet-core.c:114
+msgid "Connection to CORE service lost (reconnecting)"
+msgstr ""
+
+#: src/core/gnunet-core.c:117
+#, fuzzy
+msgid "unknown state"
+msgstr "未知错误"
+
+#: src/core/gnunet-core.c:122
+#, c-format
+msgid "%24s: %-30s %4s (timeout in %6s)\n"
+msgstr ""
+
+#: src/core/gnunet-core.c:146 src/peerinfo-tool/gnunet-peerinfo.c:705
 #, fuzzy, c-format
 msgid "Invalid command line argument `%s'\n"
 msgstr "“%s”的参数无效。\n"
 
-#: src/core/gnunet-core.c:233 src/transport/gnunet-transport.c:1486
+#: src/core/gnunet-core.c:157
+#: src/experimentation/gnunet-daemon-experimentation_nodes.c:1104
+#, fuzzy
+msgid "Failed to connect to CORE service!\n"
+msgstr "初始化“%s”服务失败。\n"
+
+#: src/core/gnunet-core.c:179 src/transport/gnunet-transport.c:1590
 msgid "provide information about all current connections (continuously)"
 msgstr ""
 
-#: src/core/gnunet-core.c:244
+#: src/core/gnunet-core.c:188
 msgid "Print information about connected peers."
 msgstr ""
 
-#: src/core/gnunet-service-core.c:105
+#: src/core/gnunet-service-core.c:104
 #, fuzzy
 msgid "Core service is lacking HOSTKEY configuration setting.  Exiting.\n"
 msgstr "立即保存配置?"
 
-#: src/core/gnunet-service-core.c:126
+#: src/core/gnunet-service-core.c:128
 #, c-format
 msgid "Core service of `%4s' ready.\n"
 msgstr ""
 
-#: src/core/gnunet-service-core_clients.c:370
+#: src/core/gnunet-service-core_clients.c:372
 msgid "# send requests dropped (disconnected)"
 msgstr ""
 
-#: src/core/gnunet-service-core_clients.c:480
+#: src/core/gnunet-service-core_clients.c:483
 msgid "# messages discarded (session disconnected)"
 msgstr ""
 
-#: src/core/gnunet-service-core_clients.c:526
+#: src/core/gnunet-service-core_clients.c:529
 #, c-format
 msgid "# bytes of messages of type %u received"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:535
+#: src/core/gnunet-service-core_kx.c:549
 msgid "# bytes encrypted"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:586
+#: src/core/gnunet-service-core_kx.c:601
 msgid "# bytes decrypted"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:673
+#: src/core/gnunet-service-core_kx.c:688
 msgid "# key exchanges initiated"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:713
+#: src/core/gnunet-service-core_kx.c:732
 msgid "# key exchanges stopped"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:810
+#: src/core/gnunet-service-core_kx.c:832
 msgid "# old ephemeral keys ignored"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:816
+#: src/core/gnunet-service-core_kx.c:839
 msgid "# ephemeral keys received"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:850
+#: src/core/gnunet-service-core_kx.c:873
 #, 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:861
+#: src/core/gnunet-service-core_kx.c:884
 msgid "# EPHEMERAL_KEY messages received"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:951
+#: src/core/gnunet-service-core_kx.c:983
 #: src/transport/gnunet-service-transport_validation.c:1016
 msgid "# PING messages received"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:959
+#: src/core/gnunet-service-core_kx.c:991
 msgid "# PING messages dropped (out of order)"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:986
+#: src/core/gnunet-service-core_kx.c:1018
 #, 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:1003
+#: src/core/gnunet-service-core_kx.c:1035
 msgid "# PONG messages created"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1029
+#: src/core/gnunet-service-core_kx.c:1061
 msgid "# sessions terminated by timeout"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1039
+#: src/core/gnunet-service-core_kx.c:1072
 msgid "# keepalive messages sent"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1096
+#: src/core/gnunet-service-core_kx.c:1139
 #: src/transport/gnunet-service-transport_validation.c:1328
 msgid "# PONG messages received"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1102
+#: src/core/gnunet-service-core_kx.c:1145
 msgid "# PONG messages dropped (connection down)"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1107
+#: src/core/gnunet-service-core_kx.c:1150
 msgid "# PONG messages dropped (out of order)"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1137
+#: src/core/gnunet-service-core_kx.c:1180
 msgid "# PONG messages decrypted"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1171
+#: src/core/gnunet-service-core_kx.c:1215
 msgid "# session keys confirmed via PONG"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1181
+#: src/core/gnunet-service-core_kx.c:1226
 msgid "# timeouts prevented via PONG"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1188
+#: src/core/gnunet-service-core_kx.c:1233
 msgid "# rekey operations confirmed via PONG"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1328
+#: src/core/gnunet-service-core_kx.c:1374
 msgid "# DATA message dropped (out of order)"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1335
+#: src/core/gnunet-service-core_kx.c:1381
 #, 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:1338
+#: src/core/gnunet-service-core_kx.c:1384
 msgid "# sessions terminated by key expiration"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1383
-#: src/core/gnunet-service-core_kx.c:1408
+#: src/core/gnunet-service-core_kx.c:1430
+#: src/core/gnunet-service-core_kx.c:1455
 msgid "# bytes dropped (duplicates)"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1395
+#: src/core/gnunet-service-core_kx.c:1442
 msgid "# bytes dropped (out of sequence)"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1437
+#: src/core/gnunet-service-core_kx.c:1484
 msgid "# bytes dropped (ancient message)"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1445
+#: src/core/gnunet-service-core_kx.c:1492
 msgid "# bytes of payload decrypted"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1480
+#: src/core/gnunet-service-core_kx.c:1527
 msgid "# PAYLOAD dropped (out of order)"
 msgstr ""
 
@@ -1317,35 +1435,45 @@
 msgid "Unsupported message of type %u (%u bytes) received from peer `%s'\n"
 msgstr ""
 
-#: src/core/gnunet-service-core_sessions.c:216
-#: src/core/gnunet-service-core_sessions.c:288
+#: src/core/gnunet-service-core_sessions.c:245
+#: src/core/gnunet-service-core_sessions.c:328
 #: src/dht/gnunet-service-dht_neighbours.c:662
 #: src/dht/gnunet-service-dht_neighbours.c:727
-#: src/dht/gnunet-service-xdht_neighbours.c:1304
+#: src/dht/gnunet-service-xdht_neighbours.c:3586
 #: src/fs/gnunet-service-fs_cp.c:606 src/fs/gnunet-service-fs_cp.c:1501
 #: src/topology/gnunet-daemon-topology.c:707
 #: src/topology/gnunet-daemon-topology.c:808
 #: src/transport/gnunet-service-transport_neighbours.c:917
 #: src/transport/gnunet-service-transport_neighbours.c:1141
-#: src/transport/gnunet-service-transport_neighbours.c:3142
-#: src/transport/gnunet-service-transport_neighbours.c:3438
+#: src/transport/gnunet-service-transport_neighbours.c:3146
+#: src/transport/gnunet-service-transport_neighbours.c:3449
 msgid "# peers connected"
 msgstr ""
 
-#: src/core/gnunet-service-core_sessions.c:255
+#: src/core/gnunet-service-core_sessions.c:278
 msgid "# type map refreshes sent"
 msgstr ""
 
-#: src/core/gnunet-service-core_sessions.c:426
+#: src/core/gnunet-service-core_sessions.c:394
+#, fuzzy
+msgid "# outdated typemap confirmations received"
+msgstr "保存配置失败。"
+
+#: src/core/gnunet-service-core_sessions.c:405
+#, fuzzy
+msgid "# valid typemap confirmations received"
+msgstr "保存配置失败。"
+
+#: src/core/gnunet-service-core_sessions.c:543
 msgid "# messages discarded (expired prior to transmission)"
 msgstr ""
 
-#: src/core/gnunet-service-core_typemap.c:110
-#: src/core/gnunet-service-core_typemap.c:121
+#: src/core/gnunet-service-core_typemap.c:169
+#: src/core/gnunet-service-core_typemap.c:180
 msgid "# type maps received"
 msgstr ""
 
-#: src/core/gnunet-service-core_typemap.c:151
+#: src/core/gnunet-service-core_typemap.c:210
 msgid "# updates to my type map"
 msgstr ""
 
@@ -1403,12 +1531,13 @@
 #: src/namecache/plugin_namecache_sqlite.c:52
 #: src/namestore/plugin_namestore_postgres.c:52
 #: src/namestore/plugin_namestore_sqlite.c:52
+#: src/peerstore/plugin_peerstore_sqlite.c:50
 #: src/testbed/generate-underlay-topology.c:47
 #: src/testbed/gnunet-daemon-latency-logger.c:52
 #: src/testbed/gnunet-daemon-testbed-underlay.c:55
 #: src/testbed/testbed_api_hosts.c:69 src/util/crypto_ecc.c:51
 #: src/util/crypto_mpi.c:39 src/include/gnunet_common.h:602
-#: src/include/gnunet_common.h:611 src/scalarproduct/scalarproduct.h:50
+#: src/include/gnunet_common.h:611 src/scalarproduct/scalarproduct.h:44
 #, fuzzy, c-format
 msgid "`%s' failed at %s:%d with error: %s\n"
 msgstr "“%s”于 %s:%d 处失败,错误为:%s\n"
@@ -1457,7 +1586,7 @@
 msgid "# datastore connections (re)created"
 msgstr ""
 
-#: src/datastore/datastore_api.c:616 src/scalarproduct/scalarproduct_api.c:279
+#: src/datastore/datastore_api.c:616
 msgid "# transmission request failures"
 msgstr ""
 
@@ -1733,6 +1862,7 @@
 #: src/datastore/plugin_datastore_sqlite.c:255
 #: src/namecache/plugin_namecache_sqlite.c:193
 #: src/namestore/plugin_namestore_sqlite.c:204
+#: src/peerstore/plugin_peerstore_sqlite.c:434
 #: src/psycstore/plugin_psycstore_sqlite.c:319
 #, c-format
 msgid "Unable to initialize SQLite: %s.\n"
@@ -1888,97 +2018,97 @@
 msgstr ""
 
 #: src/dht/gnunet-service-dht_clients.c:513
-#: src/dht/gnunet-service-xdht_clients.c:927
+#: src/dht/gnunet-service-xdht_clients.c:925
 msgid "# PUT requests received from clients"
 msgstr ""
 
 #: src/dht/gnunet-service-dht_clients.c:597
-#: src/dht/gnunet-service-xdht_clients.c:1013
+#: src/dht/gnunet-service-xdht_clients.c:1010
 msgid "# GET requests received from clients"
 msgstr ""
 
 #: src/dht/gnunet-service-dht_clients.c:798
-#: src/dht/gnunet-service-xdht_clients.c:1214
+#: src/dht/gnunet-service-xdht_clients.c:1211
 msgid "# GET STOP requests received from clients"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_clients.c:1039
+#: src/dht/gnunet-service-dht_clients.c:1040
 #: src/dht/gnunet-service-xdht_clients.c:498
 msgid "# Key match, type mismatches in REPLY to CLIENT"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_clients.c:1052
+#: src/dht/gnunet-service-dht_clients.c:1053
 #: src/dht/gnunet-service-xdht_clients.c:511
 msgid "# Duplicate REPLIES to CLIENT request dropped"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_clients.c:1089
+#: src/dht/gnunet-service-dht_clients.c:1090
 #: src/dht/gnunet-service-xdht_clients.c:548
 #, c-format
 msgid "Unsupported block type (%u) in request!\n"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_clients.c:1112
+#: src/dht/gnunet-service-dht_clients.c:1113
 #: src/dht/gnunet-service-xdht_clients.c:571
 msgid "# RESULTS queued for clients"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_clients.c:1166
-#: src/dht/gnunet-service-dht_clients.c:1209
+#: src/dht/gnunet-service-dht_clients.c:1167
+#: src/dht/gnunet-service-dht_clients.c:1210
 #: src/dht/gnunet-service-xdht_clients.c:625
 #: src/dht/gnunet-service-xdht_clients.c:668
 msgid "# REPLIES ignored for CLIENTS (no match)"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_clients.c:1176
+#: src/dht/gnunet-service-dht_clients.c:1177
 #: src/dht/gnunet-service-xdht_clients.c:635
 msgid "Could not pass reply to client, message too big!\n"
 msgstr ""
 
 #: src/dht/gnunet-service-dht_datacache.c:68
-#: src/dht/gnunet-service-xdht_datacache.c:68
+#: src/dht/gnunet-service-xdht_datacache.c:69
 #, c-format
 msgid "%s request received, but have no datacache!\n"
 msgstr ""
 
 #: src/dht/gnunet-service-dht_datacache.c:78
-#: src/dht/gnunet-service-xdht_datacache.c:78
+#: src/dht/gnunet-service-xdht_datacache.c:79
 msgid "# ITEMS stored in datacache"
 msgstr ""
 
 #: src/dht/gnunet-service-dht_datacache.c:165
-#: src/dht/gnunet-service-xdht_datacache.c:165
+#: src/dht/gnunet-service-xdht_datacache.c:213
 msgid "# Good RESULTS found in datacache"
 msgstr ""
 
 #: src/dht/gnunet-service-dht_datacache.c:176
-#: src/dht/gnunet-service-xdht_datacache.c:176
+#: src/dht/gnunet-service-xdht_datacache.c:234
 msgid "# Duplicate RESULTS found in datacache"
 msgstr ""
 
 #: src/dht/gnunet-service-dht_datacache.c:182
-#: src/dht/gnunet-service-xdht_datacache.c:182
+#: src/dht/gnunet-service-xdht_datacache.c:240
 msgid "# Invalid RESULTS found in datacache"
 msgstr ""
 
 #: src/dht/gnunet-service-dht_datacache.c:188
-#: src/dht/gnunet-service-xdht_datacache.c:188
+#: src/dht/gnunet-service-xdht_datacache.c:246
 msgid "# Irrelevant RESULTS found in datacache"
 msgstr ""
 
 #: src/dht/gnunet-service-dht_datacache.c:200
-#: src/dht/gnunet-service-xdht_datacache.c:200
+#: src/dht/gnunet-service-xdht_datacache.c:258
 msgid "# Unsupported RESULTS found in datacache"
 msgstr ""
 
 #: src/dht/gnunet-service-dht_datacache.c:203
-#: src/dht/gnunet-service-xdht_datacache.c:203
+#: src/dht/gnunet-service-xdht_datacache.c:261
 #, c-format
 msgid "Unsupported block type (%u) in local response!\n"
 msgstr ""
 
 #: src/dht/gnunet-service-dht_datacache.c:234
-#: src/dht/gnunet-service-xdht_datacache.c:234
+#: src/dht/gnunet-service-xdht_datacache.c:298
 msgid "# GET requests given to datacache"
 msgstr ""
 
@@ -2000,12 +2130,12 @@
 msgstr ""
 
 #: src/dht/gnunet-service-dht_neighbours.c:819
-#: src/dht/gnunet-service-xdht_neighbours.c:703
+#: src/dht/gnunet-service-xdht_neighbours.c:745
 msgid "# Bytes transmitted to other peers"
 msgstr ""
 
 #: src/dht/gnunet-service-dht_neighbours.c:857
-#: src/dht/gnunet-service-xdht_neighbours.c:742
+#: src/dht/gnunet-service-xdht_neighbours.c:786
 msgid "# Bytes of bandwidth requested from core"
 msgstr ""
 
@@ -2023,74 +2153,78 @@
 msgid "# Peer selection failed"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1287
+#: src/dht/gnunet-service-dht_neighbours.c:1289
 msgid "# PUT requests routed"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1316
+#: src/dht/gnunet-service-dht_neighbours.c:1318
 msgid "# PUT messages queued for transmission"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1323
-#: src/dht/gnunet-service-dht_neighbours.c:1440
-#: src/dht/gnunet-service-dht_neighbours.c:1543
-#: src/dht/gnunet-service-xdht_neighbours.c:794
-#: src/dht/gnunet-service-xdht_neighbours.c:860
-#: src/dht/gnunet-service-xdht_neighbours.c:919
-#: src/dht/gnunet-service-xdht_neighbours.c:981
-#: src/dht/gnunet-service-xdht_neighbours.c:1041
+#: src/dht/gnunet-service-dht_neighbours.c:1328
+#: src/dht/gnunet-service-dht_neighbours.c:1452
+#: src/dht/gnunet-service-dht_neighbours.c:1557
+#: src/dht/gnunet-service-xdht_neighbours.c:843
+#: src/dht/gnunet-service-xdht_neighbours.c:910
+#: src/dht/gnunet-service-xdht_neighbours.c:980
+#: src/dht/gnunet-service-xdht_neighbours.c:1040
+#: src/dht/gnunet-service-xdht_neighbours.c:1098
+#: src/dht/gnunet-service-xdht_neighbours.c:1157
+#: src/dht/gnunet-service-xdht_neighbours.c:1218
+#: src/dht/gnunet-service-xdht_neighbours.c:1280
+#: src/dht/gnunet-service-xdht_neighbours.c:1341
 msgid "# P2P messages dropped due to full queue"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1405
+#: src/dht/gnunet-service-dht_neighbours.c:1414
 msgid "# GET requests routed"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1432
+#: src/dht/gnunet-service-dht_neighbours.c:1441
 msgid "# GET messages queued for transmission"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1550
+#: src/dht/gnunet-service-dht_neighbours.c:1564
 msgid "# RESULT messages queued for transmission"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1636
+#: src/dht/gnunet-service-dht_neighbours.c:1651
 msgid "# P2P PUT requests received"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1639
+#: src/dht/gnunet-service-dht_neighbours.c:1654
 msgid "# P2P PUT bytes received"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1803
+#: src/dht/gnunet-service-dht_neighbours.c:1821
 msgid "# FIND PEER requests ignored due to Bloomfilter"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1811
+#: src/dht/gnunet-service-dht_neighbours.c:1829
 msgid "# FIND PEER requests ignored due to lack of HELLO"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1904
+#: src/dht/gnunet-service-dht_neighbours.c:1924
 msgid "# P2P GET requests received"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1907
+#: src/dht/gnunet-service-dht_neighbours.c:1927
 msgid "# P2P GET bytes received"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1961
+#: src/dht/gnunet-service-dht_neighbours.c:1984
 msgid "# P2P FIND PEER requests processed"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1975
+#: src/dht/gnunet-service-dht_neighbours.c:1998
 msgid "# P2P GET requests ONLY routed"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:2052
+#: src/dht/gnunet-service-dht_neighbours.c:2083
 msgid "# P2P RESULTS received"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:2055
+#: src/dht/gnunet-service-dht_neighbours.c:2086
 msgid "# P2P RESULT bytes received"
 msgstr ""
 
@@ -2130,24 +2264,6 @@
 msgid "# DHT requests combined"
 msgstr ""
 
-#: src/dht/gnunet-service-xdht_neighbours.c:1398
-#, c-format
-msgid ""
-"\n"
-"SUPU %s, %s, %d,my_identity = %s"
-msgstr ""
-
-#: src/dht/gnunet-service-xdht_neighbours.c:1514
-#: src/dht/gnunet-service-xdht_neighbours.c:1524
-#: src/dht/gnunet-service-xdht_neighbours.c:1530
-#: src/dht/gnunet-service-xdht_neighbours.c:1536
-#: src/dht/gnunet-service-xdht_neighbours.c:1545
-#, c-format
-msgid ""
-"\n"
-"SUPU %s, %s, %d"
-msgstr ""
-
 #: src/dht/plugin_block_dht.c:138
 #, c-format
 msgid "Block not of type %u\n"
@@ -2258,12 +2374,12 @@
 msgid "# DNS requests received via TUN interface"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:1049 src/exit/gnunet-daemon-exit.c:3514
+#: src/dns/gnunet-service-dns.c:1049
 #, 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:3571
+#: src/dns/gnunet-service-dns.c:1069 src/exit/gnunet-daemon-exit.c:3594
 #, fuzzy
 msgid "need a valid IPv4 or IPv6 address\n"
 msgstr "无效的进程优先级“%s”\n"
@@ -2284,7 +2400,7 @@
 
 #: src/exit/gnunet-daemon-exit.c:853
 #, fuzzy
-msgid "# Bytes transmitted via mesh channels"
+msgid "# Bytes transmitted via cadet channels"
 msgstr ""
 "\n"
 "按任意键继续\n"
@@ -2349,14 +2465,14 @@
 msgstr ""
 
 #: src/exit/gnunet-daemon-exit.c:1872
-msgid "# TCP service creation requests received via mesh"
+msgid "# TCP service creation requests received via cadet"
 msgstr ""
 
 #: 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"
+msgid "# Bytes received from CADET"
 msgstr ""
 
 #: src/exit/gnunet-daemon-exit.c:1909 src/exit/gnunet-daemon-exit.c:2990
@@ -2369,11 +2485,11 @@
 msgstr ""
 
 #: src/exit/gnunet-daemon-exit.c:1971
-msgid "# TCP IP-exit creation requests received via mesh"
+msgid "# TCP IP-exit creation requests received via cadet"
 msgstr ""
 
 #: src/exit/gnunet-daemon-exit.c:2076
-msgid "# TCP data requests received via mesh"
+msgid "# TCP data requests received via cadet"
 msgstr ""
 
 #: src/exit/gnunet-daemon-exit.c:2090
@@ -2385,11 +2501,11 @@
 msgstr ""
 
 #: src/exit/gnunet-daemon-exit.c:2324
-msgid "# ICMP IP-exit requests received via mesh"
+msgid "# ICMP IP-exit requests received via cadet"
 msgstr ""
 
 #: src/exit/gnunet-daemon-exit.c:2573
-msgid "# ICMP service requests received via mesh"
+msgid "# ICMP service requests received via cadet"
 msgstr ""
 
 #: src/exit/gnunet-daemon-exit.c:2639 src/vpn/gnunet-service-vpn.c:1397
@@ -2407,11 +2523,11 @@
 msgstr ""
 
 #: src/exit/gnunet-daemon-exit.c:2862
-msgid "# UDP IP-exit requests received via mesh"
+msgid "# UDP IP-exit requests received via cadet"
 msgstr ""
 
 #: src/exit/gnunet-daemon-exit.c:2969
-msgid "# UDP service requests received via mesh"
+msgid "# UDP service requests received via cadet"
 msgstr ""
 
 #: src/exit/gnunet-daemon-exit.c:2995
@@ -2419,68 +2535,76 @@
 msgstr ""
 
 #: src/exit/gnunet-daemon-exit.c:3031
-msgid "# Inbound MESH channels created"
+#, fuzzy
+msgid "# Inbound CADET channels created"
 msgstr ""
+"\n"
+"按任意键继续\n"
 
-#: src/exit/gnunet-daemon-exit.c:3235 src/exit/gnunet-daemon-exit.c:3245
+#: src/exit/gnunet-daemon-exit.c:3255 src/exit/gnunet-daemon-exit.c:3265
 #, 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
+#: src/exit/gnunet-daemon-exit.c:3279 src/exit/gnunet-daemon-exit.c:3287
 #, c-format
 msgid "`%s' is not a valid port number (for domain `%s')!"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3300
+#: src/exit/gnunet-daemon-exit.c:3320
 #, c-format
 msgid "No addresses found for hostname `%s' of service `%s'!\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3314 src/exit/gnunet-daemon-exit.c:3326
+#: src/exit/gnunet-daemon-exit.c:3334 src/exit/gnunet-daemon-exit.c:3346
 #, c-format
 msgid "Service `%s' configured for IPv4, but IPv4 is disabled!\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3337
+#: src/exit/gnunet-daemon-exit.c:3357
 #, c-format
 msgid "No IP addresses found for hostname `%s' of service `%s'!\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3527
+#: src/exit/gnunet-daemon-exit.c:3534
+#, c-format
+msgid "`%s' must be installed SUID, EXIT will not work\n"
+msgstr ""
+
+#: src/exit/gnunet-daemon-exit.c:3550
 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:3535
+#: src/exit/gnunet-daemon-exit.c:3558
 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:3542
+#: src/exit/gnunet-daemon-exit.c:3565
 msgid ""
 "Cannot enable IPv4 exit but disable IPv4 on TUN interface, will use "
 "ENABLE_IPv4=YES\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3548
+#: src/exit/gnunet-daemon-exit.c:3571
 msgid ""
 "Cannot enable IPv6 exit but disable IPv6 on TUN interface, will use "
 "ENABLE_IPv6=YES\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3554 src/exit/gnunet-daemon-exit.c:3717
+#: src/exit/gnunet-daemon-exit.c:3577 src/exit/gnunet-daemon-exit.c:3742
 #: src/pt/gnunet-daemon-pt.c:1247
 msgid "No useful service enabled.  Exiting.\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3664
+#: src/exit/gnunet-daemon-exit.c:3689
 msgid "Must be a number"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3813
+#: src/exit/gnunet-daemon-exit.c:3838
 msgid "Daemon to run to provide an IP exit node for the VPN"
 msgstr ""
 
@@ -2590,11 +2714,6 @@
 msgid "Disconnected from peer %s\n"
 msgstr "“%s”已连接到“%s”。\n"
 
-#: src/experimentation/gnunet-daemon-experimentation_nodes.c:1104
-#, fuzzy
-msgid "Failed to connect to CORE service!\n"
-msgstr "初始化“%s”服务失败。\n"
-
 #: src/experimentation/gnunet-daemon-experimentation_scheduler.c:108
 #, c-format
 msgid "Peer `%s' did not respond to request for experiment `%s'\n"
@@ -2908,12 +3027,12 @@
 msgid "Internal error."
 msgstr "未知错误。\n"
 
-#: src/fs/fs_search.c:813
+#: src/fs/fs_search.c:751 src/fs/fs_search.c:817
 #, fuzzy, c-format
 msgid "Failed to parse URI `%s': %s\n"
 msgstr "运行 %s失败:%s %d\n"
 
-#: src/fs/fs_search.c:872
+#: src/fs/fs_search.c:876
 #, c-format
 msgid "Got result with unknown block type `%d', ignoring"
 msgstr ""
@@ -2973,78 +3092,98 @@
 msgid "Failed to compute hash of file."
 msgstr ""
 
-#: src/fs/fs_uri.c:222
+#: src/fs/fs_uri.c:223
 #, no-c-format
-msgid "`%' must be followed by HEX number"
+msgid "Malformed KSK URI (`%' must be followed by HEX number)"
 msgstr ""
 
-#: src/fs/fs_uri.c:281
+#: src/fs/fs_uri.c:283
 msgid "Malformed KSK URI (must not begin or end with `+')"
 msgstr ""
 
-#: src/fs/fs_uri.c:299
-msgid "`++' not allowed in KSK URI"
+#: src/fs/fs_uri.c:301
+msgid "Malformed KSK URI (`++' not allowed)"
 msgstr ""
 
-#: src/fs/fs_uri.c:306
-msgid "Quotes not balanced in KSK URI"
+#: src/fs/fs_uri.c:308
+msgid "Malformed KSK URI (quotes not balanced)"
 msgstr ""
 
-#: src/fs/fs_uri.c:376
-msgid "Malformed SKS URI"
+#: src/fs/fs_uri.c:379
+msgid "Malformed SKS URI (wrong syntax)"
 msgstr ""
 
-#: src/fs/fs_uri.c:419 src/fs/fs_uri.c:434
-msgid "Malformed CHK URI"
+#: src/fs/fs_uri.c:423
+msgid "Malformed CHK URI (wrong syntax)"
 msgstr ""
 
-#: src/fs/fs_uri.c:512 src/fs/fs_uri.c:580
-msgid "SKS URI malformed"
+#: src/fs/fs_uri.c:438
+msgid "Malformed CHK URI (failed to decode CHK)"
 msgstr ""
 
-#: src/fs/fs_uri.c:527 src/fs/fs_uri.c:537
-msgid "LOC URI malformed"
+#: src/fs/fs_uri.c:517
+msgid "LOC URI malformed (wrong syntax)"
 msgstr ""
 
-#: src/fs/fs_uri.c:545 src/fs/fs_uri.c:553
+#: src/fs/fs_uri.c:532
+msgid "LOC URI malformed (no CHK)"
+msgstr ""
+
+#: src/fs/fs_uri.c:542
+msgid "LOC URI malformed (missing LOC)"
+msgstr ""
+
+#: src/fs/fs_uri.c:550
+msgid "LOC URI malformed (wrong syntax for public key)"
+msgstr ""
+
+#: src/fs/fs_uri.c:558
 msgid "LOC URI malformed (could not decode public key)"
 msgstr ""
 
-#: src/fs/fs_uri.c:559
-msgid "SKS URI malformed (could not find signature)"
+#: src/fs/fs_uri.c:564
+msgid "LOC URI malformed (could not find signature)"
 msgstr ""
 
-#: src/fs/fs_uri.c:565 src/fs/fs_uri.c:574
-msgid "SKS URI malformed (could not decode signature)"
+#: src/fs/fs_uri.c:570
+msgid "LOC URI malformed (wrong syntax for signature)"
 msgstr ""
 
-#: src/fs/fs_uri.c:586
-msgid "SKS URI malformed (could not parse expiration time)"
+#: src/fs/fs_uri.c:579
+msgid "LOC URI malformed (could not decode signature)"
 msgstr ""
 
-#: src/fs/fs_uri.c:598
-msgid "SKS URI malformed (signature failed validation)"
+#: src/fs/fs_uri.c:585
+msgid "LOC URI malformed (wrong syntax for expiration time)"
 msgstr ""
 
-#: src/fs/fs_uri.c:636
+#: src/fs/fs_uri.c:591
+msgid "LOC URI malformed (could not parse expiration time)"
+msgstr ""
+
+#: src/fs/fs_uri.c:603
+msgid "LOC URI malformed (signature failed validation)"
+msgstr ""
+
+#: src/fs/fs_uri.c:642
 msgid "Unrecognized URI type"
 msgstr ""
 
-#: src/fs/fs_uri.c:860
+#: src/fs/fs_uri.c:866
 #, fuzzy
 msgid "Lacking key configuration settings.\n"
 msgstr "立即保存配置?"
 
-#: src/fs/fs_uri.c:866
+#: src/fs/fs_uri.c:872
 #, fuzzy, c-format
 msgid "Could not access hostkey file `%s'.\n"
 msgstr "找不到接口“%s”的一个 IP 地址。\n"
 
-#: src/fs/fs_uri.c:1050 src/fs/fs_uri.c:1077
+#: src/fs/fs_uri.c:1057 src/fs/fs_uri.c:1084
 msgid "No keywords specified!\n"
 msgstr ""
 
-#: src/fs/fs_uri.c:1083
+#: src/fs/fs_uri.c:1090
 msgid "Number of double-quotes not balanced!\n"
 msgstr ""
 
@@ -3371,8 +3510,8 @@
 msgstr ""
 
 #: src/fs/gnunet-publish.c:778 src/fs/gnunet-publish.c:785
-#: src/transport/gnunet-transport.c:1284 src/transport/gnunet-transport.c:1314
-#: src/transport/gnunet-transport.c:1344
+#: src/transport/gnunet-transport.c:1387 src/transport/gnunet-transport.c:1417
+#: src/transport/gnunet-transport.c:1447
 #, c-format
 msgid "Option `%s' makes no sense without option `%s'.\n"
 msgstr ""
@@ -3464,21 +3603,56 @@
 msgid "Search GNUnet for files that were published on GNUnet"
 msgstr ""
 
-#: src/fs/gnunet-service-fs.c:271
+#: src/fs/gnunet-service-fs.c:277
 msgid "# running average P2P latency (ms)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs.c:326 src/fs/gnunet-service-fs.c:539
+#: src/fs/gnunet-service-fs.c:332 src/fs/gnunet-service-fs.c:545
 msgid "# Loopback routes suppressed"
 msgstr ""
 
-#: src/fs/gnunet-service-fs.c:639 src/hostlist/gnunet-daemon-hostlist.c:288
-#: src/topology/gnunet-daemon-topology.c:1254
-#: src/topology/gnunet-daemon-topology.c:1261
+#: src/fs/gnunet-service-fs.c:645 src/hostlist/gnunet-daemon-hostlist.c:303
+#: src/topology/gnunet-daemon-topology.c:1260
+#: src/topology/gnunet-daemon-topology.c:1267
 #, fuzzy, c-format
 msgid "Failed to connect to `%s' service.\n"
 msgstr "初始化“%s”服务失败。\n"
 
+#: src/fs/gnunet-service-fs_cadet_client.c:484
+msgid "# replies received via cadet"
+msgstr ""
+
+#: src/fs/gnunet-service-fs_cadet_client.c:498
+msgid "# replies received via cadet dropped"
+msgstr ""
+
+#: src/fs/gnunet-service-fs_cadet_server.c:260
+msgid "# Blocks transferred via cadet"
+msgstr ""
+
+#: src/fs/gnunet-service-fs_cadet_server.c:352
+msgid "# queries received via cadet not answered"
+msgstr ""
+
+#: src/fs/gnunet-service-fs_cadet_server.c:432
+msgid "# queries received via cadet"
+msgstr ""
+
+#: src/fs/gnunet-service-fs_cadet_server.c:476
+#, fuzzy
+msgid "# cadet client connections rejected"
+msgstr ""
+"\n"
+"按任意键继续\n"
+
+#: src/fs/gnunet-service-fs_cadet_server.c:482
+#: src/fs/gnunet-service-fs_cadet_server.c:522
+#, fuzzy
+msgid "# cadet connections active"
+msgstr ""
+"\n"
+"按任意键继续\n"
+
 #: src/fs/gnunet-service-fs_cp.c:682
 msgid "# migration stop messages received"
 msgstr ""
@@ -3622,41 +3796,6 @@
 msgid "# client searches updated (merged content seen list)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_mesh_client.c:484
-msgid "# replies received via mesh"
-msgstr ""
-
-#: src/fs/gnunet-service-fs_mesh_client.c:498
-msgid "# replies received via mesh dropped"
-msgstr ""
-
-#: src/fs/gnunet-service-fs_mesh_server.c:260
-msgid "# Blocks transferred via mesh"
-msgstr ""
-
-#: src/fs/gnunet-service-fs_mesh_server.c:352
-msgid "# queries received via mesh not answered"
-msgstr ""
-
-#: src/fs/gnunet-service-fs_mesh_server.c:432
-msgid "# queries received via mesh"
-msgstr ""
-
-#: src/fs/gnunet-service-fs_mesh_server.c:476
-#, fuzzy
-msgid "# mesh client connections rejected"
-msgstr ""
-"\n"
-"按任意键继续\n"
-
-#: src/fs/gnunet-service-fs_mesh_server.c:482
-#: src/fs/gnunet-service-fs_mesh_server.c:522
-#, fuzzy
-msgid "# mesh connections active"
-msgstr ""
-"\n"
-"按任意键继续\n"
-
 #: src/fs/gnunet-service-fs_pe.c:269
 msgid "# average retransmission delay (ms)"
 msgstr ""
@@ -3732,7 +3871,7 @@
 msgstr ""
 
 #: src/fs/gnunet-service-fs_pr.c:1192
-msgid "# Replies received from MESH"
+msgid "# Replies received from CADET"
 msgstr ""
 
 #: src/fs/gnunet-service-fs_pr.c:1244
@@ -3835,7 +3974,7 @@
 msgid "Refusing `%s' request to HTTP server\n"
 msgstr ""
 
-#: src/gns/gnunet-bcd.c:355 src/hostlist/hostlist-server.c:567
+#: src/gns/gnunet-bcd.c:355 src/hostlist/gnunet-daemon-hostlist_server.c:695
 #, c-format
 msgid "Invalid port number %llu.  Exiting.\n"
 msgstr ""
@@ -3987,13 +4126,17 @@
 msgid "This program will import some GNS authorities into your GNS namestore."
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:105 src/hostlist/hostlist-client.c:469
-#: src/hostlist/hostlist-client.c:683 src/hostlist/hostlist-client.c:689
-#: src/hostlist/hostlist-client.c:741 src/hostlist/hostlist-client.c:750
-#: src/hostlist/hostlist-client.c:871 src/hostlist/hostlist-client.c:963
-#: src/hostlist/hostlist-client.c:968
-#: src/transport/plugin_transport_http_client.c:1062
-#: src/transport/plugin_transport_http_client.c:1077
+#: src/gns/gnunet-gns-proxy.c:105
+#: src/hostlist/gnunet-daemon-hostlist_client.c:524
+#: src/hostlist/gnunet-daemon-hostlist_client.c:741
+#: src/hostlist/gnunet-daemon-hostlist_client.c:747
+#: src/hostlist/gnunet-daemon-hostlist_client.c:800
+#: src/hostlist/gnunet-daemon-hostlist_client.c:809
+#: src/hostlist/gnunet-daemon-hostlist_client.c:931
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1026
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1031
+#: src/transport/plugin_transport_http_client.c:1095
+#: src/transport/plugin_transport_http_client.c:1110
 #, c-format
 msgid "%s failed at %s:%d: `%s'\n"
 msgstr ""
@@ -4137,36 +4280,36 @@
 msgid "Failed to connect to the DNS service!\n"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/gns/gnunet-service-gns_resolver.c:816
+#: src/gns/gnunet-service-gns_resolver.c:832
 #, fuzzy
 msgid "Failed to parse DNS response\n"
 msgstr "打开日志文件“%s”失败:%s\n"
 
-#: src/gns/gnunet-service-gns_resolver.c:958
+#: src/gns/gnunet-service-gns_resolver.c:974
 #, c-format
 msgid "Skipping record of unsupported type %d\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns_resolver.c:1317
+#: src/gns/gnunet-service-gns_resolver.c:1333
 #, c-format
 msgid "GNS lookup resulted in DNS name that is too long (`%s')\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns_resolver.c:1817
+#: src/gns/gnunet-service-gns_resolver.c:1831
 msgid "GNS lookup recursion failed (no delegation record found)\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns_resolver.c:1841
+#: src/gns/gnunet-service-gns_resolver.c:1855
 #, fuzzy, c-format
 msgid "Failed to cache GNS resolution: %s\n"
 msgstr "打开日志文件“%s”失败:%s\n"
 
-#: src/gns/gnunet-service-gns_resolver.c:2123
+#: src/gns/gnunet-service-gns_resolver.c:2137
 #, c-format
 msgid "Zone %s was revoked, resolution fails\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns_resolver.c:2272
+#: src/gns/gnunet-service-gns_resolver.c:2286
 #, c-format
 msgid "Hostname `%s' is not well-formed, resolution fails\n"
 msgstr ""
@@ -4285,298 +4428,322 @@
 msgid "Modified %u addresses \n"
 msgstr ""
 
-#: src/hello/hello.c:944
+#: src/hello/hello.c:957
 #, fuzzy
 msgid "Failed to parse HELLO message: missing expiration time\n"
 msgstr "保存配置失败。"
 
-#: src/hello/hello.c:953
+#: src/hello/hello.c:966
 #, fuzzy
 msgid "Failed to parse HELLO message: invalid expiration time\n"
 msgstr "保存配置失败。"
 
-#: src/hello/hello.c:963
+#: src/hello/hello.c:976
 #, fuzzy
 msgid "Failed to parse HELLO message: malformed\n"
 msgstr "打开日志文件“%s”失败:%s\n"
 
-#: src/hello/hello.c:973
+#: src/hello/hello.c:986
 msgid "Failed to parse HELLO message: missing transport plugin\n"
 msgstr ""
 
-#: src/hello/hello.c:990
+#: src/hello/hello.c:1004
 #, c-format
-msgid "Plugin `%s' not found\n"
+msgid "Plugin `%s' not found, skipping address\n"
 msgstr ""
 
-#: src/hello/hello.c:999
+#: src/hello/hello.c:1012
 #, c-format
 msgid "Plugin `%s' does not support URIs yet\n"
 msgstr ""
 
-#: src/hello/hello.c:1018
+#: src/hello/hello.c:1031
 #, fuzzy, c-format
 msgid "Failed to parse `%s' as an address for plugin `%s'\n"
 msgstr "找不到接口“%s”的一个 IP 地址。\n"
 
-#: src/hostlist/gnunet-daemon-hostlist.c:259
+#: src/hello/hello.c:1104
+#, c-format
+msgid "HELLO URI contained %u addresses, added %u addresses\n"
+msgstr ""
+
+#: src/hostlist/gnunet-daemon-hostlist.c:274
 msgid ""
 "None of the functions for the hostlist daemon were enabled.  I have no "
 "reason to run!\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist.c:308
+#: src/hostlist/gnunet-daemon-hostlist.c:323
 msgid "advertise our hostlist to other peers"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist.c:313
+#: src/hostlist/gnunet-daemon-hostlist.c:328
 msgid ""
 "bootstrap using hostlists (it is highly recommended that you always use this "
 "option)"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist.c:316
+#: src/hostlist/gnunet-daemon-hostlist.c:331
 msgid "enable learning about hostlist servers from other peers"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist.c:320
+#: src/hostlist/gnunet-daemon-hostlist.c:335
 msgid "provide a hostlist server"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist.c:335
+#: src/hostlist/gnunet-daemon-hostlist.c:350
 msgid "GNUnet hostlist server and client"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:288
+#: src/hostlist/gnunet-daemon-hostlist_client.c:343
 msgid "# bytes downloaded from hostlist servers"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:309 src/hostlist/hostlist-client.c:339
+#: src/hostlist/gnunet-daemon-hostlist_client.c:364
+#: src/hostlist/gnunet-daemon-hostlist_client.c:394
 msgid "# invalid HELLOs downloaded from hostlist servers"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:312 src/hostlist/hostlist-client.c:342
+#: src/hostlist/gnunet-daemon-hostlist_client.c:367
+#: src/hostlist/gnunet-daemon-hostlist_client.c:397
 #, c-format
 msgid "Invalid `%s' message received from hostlist at `%s'\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:330
+#: src/hostlist/gnunet-daemon-hostlist_client.c:385
 msgid "# valid HELLOs downloaded from hostlist servers"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:592 src/hostlist/hostlist-client.c:1333
+#: src/hostlist/gnunet-daemon-hostlist_client.c:650
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1401
 msgid "# advertised hostlist URIs"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:622
+#: src/hostlist/gnunet-daemon-hostlist_client.c:680
 #, c-format
 msgid "# advertised URI `%s' downloaded"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:664
+#: src/hostlist/gnunet-daemon-hostlist_client.c:722
 #, c-format
 msgid ""
 "Advertised hostlist with URI `%s' could not be downloaded. Advertised URI "
 "gets dismissed.\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:802
+#: src/hostlist/gnunet-daemon-hostlist_client.c:862
 #, c-format
 msgid "Timeout trying to download hostlist from `%s'\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:816
+#: src/hostlist/gnunet-daemon-hostlist_client.c:876
 #, c-format
 msgid "Download limit of %u bytes exceeded, stopping download\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:836
+#: src/hostlist/gnunet-daemon-hostlist_client.c:896
 #, fuzzy, c-format
 msgid "Download of hostlist from `%s' failed: `%s'\n"
 msgstr "打开日志文件“%s”失败:%s\n"
 
-#: src/hostlist/hostlist-client.c:842
+#: src/hostlist/gnunet-daemon-hostlist_client.c:902
 #, c-format
 msgid "Download of hostlist `%s' completed.\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:850
+#: src/hostlist/gnunet-daemon-hostlist_client.c:910
 #, c-format
 msgid "Adding successfully tested hostlist `%s' datastore.\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:903
+#: src/hostlist/gnunet-daemon-hostlist_client.c:963
 #, c-format
 msgid "Bootstrapping using hostlist at `%s'.\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:911
+#: src/hostlist/gnunet-daemon-hostlist_client.c:971
 msgid "# hostlist downloads initiated"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1040 src/hostlist/hostlist-client.c:1506
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1103
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1646
 msgid "# milliseconds between hostlist downloads"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1049
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1112
 #, c-format
 msgid "Have %u/%u connections.  Will consider downloading hostlist in %s\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1109 src/hostlist/hostlist-client.c:1125
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1172
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1188
 msgid "# active connections"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1280
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1347
 #, c-format
 msgid "Loading saved hostlist entries from file `%s' \n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1285
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1352
 #, c-format
 msgid "Hostlist file `%s' does not exist\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1296
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1361
 #, fuzzy, c-format
 msgid "Could not open file `%s' for reading to load hostlists: %s\n"
 msgstr "无法解析“%s”来确定已方的 IP 地址:%s\n"
 
-#: src/hostlist/hostlist-client.c:1329
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1395
 #, c-format
 msgid "%u hostlist URIs loaded from file\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1331
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1398
 msgid "# hostlist URIs read from file"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1376
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1445
 #, fuzzy, c-format
 msgid "Could not open file `%s' for writing to save hostlists: %s\n"
 msgstr "无法解析“%s”来确定已方的 IP 地址:%s\n"
 
-#: src/hostlist/hostlist-client.c:1381
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1450
 #, c-format
 msgid "Writing %u hostlist URIs to `%s'\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1405 src/hostlist/hostlist-client.c:1422
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1474
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1491
 #, c-format
 msgid "Error writing hostlist URIs to file `%s'\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1417
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1486
 msgid "# hostlist URIs written to file"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1471
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1581
+#: src/transport/plugin_transport_http_client.c:1866
+#, c-format
+msgid "Invalid proxy type: `%s', disabling proxy! Check configuration!\n"
+msgstr ""
+
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1611
 msgid "Learning is enabled on this peer\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1483
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1623
 msgid "Learning is not enabled on this peer\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1495
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1635
 #, c-format
 msgid ""
 "Since learning is not enabled on this peer, hostlist file `%s' was removed\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1499
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1639
 #, c-format
 msgid "Hostlist file `%s' could not be removed\n"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:137
+#: src/hostlist/gnunet-daemon-hostlist_server.c:143
 msgid "bytes in hostlist"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:161
+#: src/hostlist/gnunet-daemon-hostlist_server.c:168
 msgid "expired addresses encountered"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:189 src/hostlist/hostlist-server.c:425
-#: src/peerinfo-tool/gnunet-peerinfo.c:350
-#: src/peerinfo-tool/gnunet-peerinfo.c:419
-#: src/peerinfo-tool/gnunet-peerinfo.c:490
+#: src/hostlist/gnunet-daemon-hostlist_server.c:203
+#: src/hostlist/gnunet-daemon-hostlist_server.c:534
+#: src/peerinfo-tool/gnunet-peerinfo.c:361
+#: src/peerinfo-tool/gnunet-peerinfo.c:430
+#: src/peerinfo-tool/gnunet-peerinfo.c:501
 #: src/topology/gnunet-daemon-topology.c:925
 #, c-format
 msgid "Error in communication with PEERINFO service: %s\n"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:210
+#: src/hostlist/gnunet-daemon-hostlist_server.c:227
 msgid "HELLOs without addresses encountered (ignored)"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:224
+#: src/hostlist/gnunet-daemon-hostlist_server.c:243
 msgid "bytes not included in hostlist (size limit)"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:268
+#: src/hostlist/gnunet-daemon-hostlist_server.c:363
 #, c-format
 msgid "Refusing `%s' request to hostlist server\n"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:271
+#: src/hostlist/gnunet-daemon-hostlist_server.c:366
 msgid "hostlist requests refused (not HTTP GET)"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:284
+#: src/hostlist/gnunet-daemon-hostlist_server.c:380
 #, c-format
 msgid "Refusing `%s' request with %llu bytes of upload data\n"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:288
+#: src/hostlist/gnunet-daemon-hostlist_server.c:384
 msgid "hostlist requests refused (upload data)"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:296
+#: src/hostlist/gnunet-daemon-hostlist_server.c:391
 msgid "Could not handle hostlist request since I do not have a response yet\n"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:299
+#: src/hostlist/gnunet-daemon-hostlist_server.c:394
 msgid "hostlist requests refused (not ready)"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:303
+#: src/hostlist/gnunet-daemon-hostlist_server.c:399
 msgid "Received request for our hostlist\n"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:304
+#: src/hostlist/gnunet-daemon-hostlist_server.c:401
 msgid "hostlist requests processed"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:346
+#: src/hostlist/gnunet-daemon-hostlist_server.c:448
 msgid "# hostlist advertisements send"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:390
+#: src/hostlist/gnunet-daemon-hostlist_server.c:496
 msgid "Advertisement message could not be queued by core\n"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:557 src/peerinfo-tool/gnunet-peerinfo.c:639
-#: src/transport/gnunet-service-transport.c:1114
+#: src/hostlist/gnunet-daemon-hostlist_server.c:683
+#: src/peerinfo-tool/gnunet-peerinfo.c:650
+#: src/transport/gnunet-service-transport.c:1136
 msgid "Could not access PEERINFO service.  Exiting.\n"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:576
+#: src/hostlist/gnunet-daemon-hostlist_server.c:707
 #, c-format
 msgid "Hostlist service starts on %s:%llu\n"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:590
+#: src/hostlist/gnunet-daemon-hostlist_server.c:722
 #, c-format
 msgid "Address to obtain hostlist: `%s'\n"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:630
+#: src/hostlist/gnunet-daemon-hostlist_server.c:760
 #, fuzzy, c-format
-msgid "`%s' is not a valid IP address! Ignoring BINDTOIP.\n"
+msgid "`%s' is not a valid IPv4 address! Ignoring BINDTOIPV4.\n"
 msgstr "“%s”不可用。\n"
 
-#: src/hostlist/hostlist-server.c:673
+#: src/hostlist/gnunet-daemon-hostlist_server.c:780
+#, fuzzy, c-format
+msgid "`%s' is not a valid IPv6 address! Ignoring BINDTOIPV6.\n"
+msgstr "“%s”不可用。\n"
+
+#: src/hostlist/gnunet-daemon-hostlist_server.c:820
 #, c-format
 msgid "Could not start hostlist HTTP server on port %u\n"
 msgstr ""
@@ -4668,57 +4835,6 @@
 msgid "Failed to create directory `%s' for storing egos\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/mesh/gnunet-mesh.c:357
-#, fuzzy, c-format
-msgid "Invalid target `%s'\n"
-msgstr "“%s”的参数无效。\n"
-
-#: src/mesh/gnunet-mesh.c:607
-#, fuzzy, c-format
-msgid "Invalid peer ID `%s'\n"
-msgstr "无效条目。\n"
-
-#: src/mesh/gnunet-mesh.c:650
-#, fuzzy, c-format
-msgid "Invalid tunnel owner `%s'\n"
-msgstr "IP 格式无效:“%s”\n"
-
-#: src/mesh/gnunet-mesh.c:716
-msgid "You must NOT give a TARGETwhen using 'request all' options\n"
-msgstr ""
-
-#: src/mesh/gnunet-mesh.c:807
-#, fuzzy
-msgid "provide information about a particular connection"
-msgstr "无法获取有关用户“%s”的信息:%s\n"
-
-#: src/mesh/gnunet-mesh.c:810
-msgid "activate echo mode"
-msgstr ""
-
-#: src/mesh/gnunet-mesh.c:816
-msgid "port to listen to (default; 0)"
-msgstr ""
-
-#: src/mesh/gnunet-mesh.c:819 src/mesh/gnunet-mesh.c:822
-#, fuzzy
-msgid "provide information about all peers"
-msgstr "无法获取有关用户“%s”的信息:%s\n"
-
-#: src/mesh/gnunet-mesh.c:825
-#, fuzzy
-msgid "provide information about a particular tunnel"
-msgstr "无法获取有关用户“%s”的信息:%s\n"
-
-#: src/mesh/gnunet-mesh.c:828
-#, fuzzy
-msgid "provide information about all tunnels"
-msgstr "无法获取有关用户“%s”的信息:%s\n"
-
-#: src/mesh/gnunet-service-mesh_peer.c:390
-msgid "Wrong CORE service\n"
-msgstr ""
-
 #: src/mysql/mysql.c:174
 #, c-format
 msgid "Trying to use file `%s' for MySQL configuration.\n"
@@ -4734,7 +4850,7 @@
 msgid "No records found for `%s'"
 msgstr "运行 %s失败:%s %d\n"
 
-#: src/namecache/gnunet-namecache.c:124 src/namestore/gnunet-namestore.c:397
+#: src/namecache/gnunet-namecache.c:124 src/namestore/gnunet-namestore.c:402
 #, c-format
 msgid "\tCorrupt or unsupported record of type %u\n"
 msgstr ""
@@ -4744,7 +4860,7 @@
 msgid "You must specify which zone should be accessed\n"
 msgstr "您必须指定一个昵称\n"
 
-#: src/namecache/gnunet-namecache.c:195 src/namestore/gnunet-namestore.c:695
+#: src/namecache/gnunet-namecache.c:195 src/namestore/gnunet-namestore.c:783
 #, fuzzy, c-format
 msgid "Invalid public key for reverse lookup `%s'\n"
 msgstr "“%s”的参数无效。\n"
@@ -4754,7 +4870,7 @@
 msgid "You must specify a name\n"
 msgstr "您必须指定一个接收方!\n"
 
-#: src/namecache/gnunet-namecache.c:234 src/namestore/gnunet-namestore.c:931
+#: src/namecache/gnunet-namecache.c:234 src/namestore/gnunet-namestore.c:1020
 msgid "name of the record to add/delete/display"
 msgstr ""
 
@@ -4762,7 +4878,7 @@
 msgid "spezifies the public key of the zone to look in"
 msgstr ""
 
-#: src/namecache/gnunet-namecache.c:248 src/namestore/gnunet-namestore.c:963
+#: src/namecache/gnunet-namecache.c:248 src/namestore/gnunet-namestore.c:1055
 #, fuzzy
 msgid "GNUnet zone manipulation tool"
 msgstr "GNUnet 配置"
@@ -4777,149 +4893,164 @@
 msgid "Failed to create indices\n"
 msgstr "发送消息失败。\n"
 
-#: src/namestore/gnunet-namestore.c:303
+#: src/namestore/gnunet-namestore.c:308
 #, c-format
 msgid "Adding record failed: %s\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:332
+#: src/namestore/gnunet-namestore.c:337
 #, c-format
 msgid "Deleting record failed, record does not exist%s%s\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:339
+#: src/namestore/gnunet-namestore.c:344
 #, c-format
 msgid "Deleting record failed%s%s\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:558
+#: src/namestore/gnunet-namestore.c:567
 #, c-format
+msgid "There are no records under label `%s' that could be deleted.\n"
+msgstr ""
+
+#: src/namestore/gnunet-namestore.c:606
+#, c-format
+msgid ""
+"There are no records under label `%s' that match the request for deletion.\n"
+msgstr ""
+
+#: src/namestore/gnunet-namestore.c:647
+#, c-format
 msgid "No options given\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:569
+#: src/namestore/gnunet-namestore.c:658
 #: src/namestore/gnunet-namestore-fcfsd.c:970
 #, fuzzy
 msgid "Failed to connect to namestore\n"
 msgstr "初始化“%s”服务失败。\n"
 
-#: 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
+#: src/namestore/gnunet-namestore.c:666 src/namestore/gnunet-namestore.c:675
+#: src/namestore/gnunet-namestore.c:692 src/namestore/gnunet-namestore.c:714
+#: src/namestore/gnunet-namestore.c:754
 #, fuzzy, c-format
 msgid "Missing option `%s' for operation `%s'\n"
 msgstr "配置文件“%s”已写入。\n"
 
-#: src/namestore/gnunet-namestore.c:578 src/namestore/gnunet-namestore.c:587
-#: src/namestore/gnunet-namestore.c:604 src/namestore/gnunet-namestore.c:626
+#: src/namestore/gnunet-namestore.c:667 src/namestore/gnunet-namestore.c:676
+#: src/namestore/gnunet-namestore.c:693 src/namestore/gnunet-namestore.c:715
 msgid "add"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:595
+#: src/namestore/gnunet-namestore.c:684
 #, fuzzy, c-format
 msgid "Unsupported type `%s'\n"
 msgstr "未知的命令“%s”。\n"
 
-#: src/namestore/gnunet-namestore.c:615
+#: src/namestore/gnunet-namestore.c:704
 #, c-format
 msgid "Value `%s' invalid for record type `%s'\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:651
+#: src/namestore/gnunet-namestore.c:740
 #, fuzzy, c-format
 msgid "Invalid time format `%s'\n"
 msgstr "IP 格式无效:“%s”\n"
 
-#: src/namestore/gnunet-namestore.c:666
+#: src/namestore/gnunet-namestore.c:755
 msgid "del"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:715
-#: src/peerinfo-tool/gnunet-peerinfo.c:723
+#: src/namestore/gnunet-namestore.c:803
+#: src/peerinfo-tool/gnunet-peerinfo.c:734
 #, fuzzy, c-format
 msgid "Invalid URI `%s'\n"
 msgstr "无效条目。\n"
 
-#: src/namestore/gnunet-namestore.c:750
+#: src/namestore/gnunet-namestore.c:838
 #, fuzzy, c-format
 msgid "Invalid nick `%s'\n"
 msgstr "无效条目。\n"
 
-#: src/namestore/gnunet-namestore.c:790
+#: src/namestore/gnunet-namestore.c:878
 #, c-format
 msgid "Ego `%s' not known to identity service\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:817
+#: src/namestore/gnunet-namestore.c:905
 #, c-format
 msgid "No default ego configured in identity service\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:853
+#: src/namestore/gnunet-namestore.c:941
 #, fuzzy, c-format
 msgid "Identity service is not running\n"
 msgstr "服务已删除。\n"
 
-#: src/namestore/gnunet-namestore.c:865
+#: src/namestore/gnunet-namestore.c:953
 #, fuzzy, c-format
 msgid "Cannot connect to identity service\n"
 msgstr "无法连接到 %s:%u:%s\n"
 
-#: src/namestore/gnunet-namestore.c:913
+#: src/namestore/gnunet-namestore.c:1002
 msgid "add record"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:916
+#: src/namestore/gnunet-namestore.c:1005
 msgid "delete record"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:919
+#: src/namestore/gnunet-namestore.c:1008
 msgid "display records"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:922
+#: src/namestore/gnunet-namestore.c:1011
 msgid ""
 "expiration time for record to use (for adding only), \"never\" is possible"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:925
+#: src/namestore/gnunet-namestore.c:1014
 #, fuzzy
 msgid "set the desired nick name for the zone"
 msgstr "无法获取有关用户“%s”的信息:%s\n"
 
-#: src/namestore/gnunet-namestore.c:928
+#: src/namestore/gnunet-namestore.c:1017
 #, fuzzy
 msgid "monitor changes in the namestore"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/namestore/gnunet-namestore.c:934
+#: src/namestore/gnunet-namestore.c:1023
 #, fuzzy
 msgid "determine our name for the given PKEY"
 msgstr "无法获取有关用户“%s”的信息:%s\n"
 
-#: src/namestore/gnunet-namestore.c:937
+#: src/namestore/gnunet-namestore.c:1026
 msgid "type of the record to add/delete/display"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:940
+#: src/namestore/gnunet-namestore.c:1029
 msgid "URI to import into our zone"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:943
+#: src/namestore/gnunet-namestore.c:1032
 msgid "value of the record to add/delete"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:946
+#: src/namestore/gnunet-namestore.c:1035
 msgid "create or list public record"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:949
+#: src/namestore/gnunet-namestore.c:1038
+msgid "create record that is pending approval (and thus for now inactive)"
+msgstr ""
+
+#: src/namestore/gnunet-namestore.c:1041
 msgid ""
 "create shadow record (only valid if all other records of the same type have "
 "expired"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:952
+#: src/namestore/gnunet-namestore.c:1044
 msgid "name of the ego controlling the zone"
 msgstr ""
 
@@ -5001,57 +5132,61 @@
 msgid "GNUnet NAT traversal test helper daemon"
 msgstr ""
 
-#: src/nat/nat_auto.c:170
+#: src/nat/nat_auto.c:175
 msgid "NAT traversal with ICMP Server timed out.\n"
 msgstr ""
 
-#: src/nat/nat_auto.c:203
+#: src/nat/nat_auto.c:207
 msgid "NAT traversal with ICMP Server succeeded.\n"
 msgstr ""
 
-#: src/nat/nat_auto.c:204
+#: src/nat/nat_auto.c:208
 msgid "NAT traversal with ICMP Server failed.\n"
 msgstr ""
 
-#: src/nat/nat_auto.c:225
+#: src/nat/nat_auto.c:229
 msgid "Testing connection reversal with ICMP server.\n"
 msgstr ""
 
-#: src/nat/nat_auto.c:274
+#: src/nat/nat_auto.c:284
 #, c-format
 msgid "Detected external IP `%s'\n"
 msgstr ""
 
-#: src/nat/nat_auto.c:344
+#: src/nat/nat_auto.c:362
 msgid "This system has a global IPv6 address, setting IPv6 to supported.\n"
 msgstr ""
 
-#: src/nat/nat_auto.c:360
+#: src/nat/nat_auto.c:378
 #, fuzzy, c-format
 msgid "Detected internal network address `%s'.\n"
 msgstr "GNUnet 现在使用 IP 地址 %s。\n"
 
-#: src/nat/nat_auto.c:413
+#: src/nat/nat_auto.c:441
 msgid "upnpc found, enabling its use\n"
 msgstr ""
 
-#: src/nat/nat_auto.c:414
+#: src/nat/nat_auto.c:442
 msgid "upnpc not found\n"
 msgstr ""
 
-#: src/nat/nat_auto.c:447
-msgid "gnunet-helper-nat-server found, testing it\n"
+#: src/nat/nat_auto.c:472
+msgid "test_icmp_server not possible, as we have no public IPv4 address\n"
 msgstr ""
 
-#: src/nat/nat_auto.c:448
+#: src/nat/nat_auto.c:480
+msgid "test_icmp_server not possible, as we are not behind NAT\n"
+msgstr ""
+
+#: src/nat/nat_auto.c:488
 msgid "No working gnunet-helper-nat-server found\n"
 msgstr ""
 
-#: src/nat/nat_auto.c:482
+#: src/nat/nat_auto.c:527
 msgid "gnunet-helper-nat-client found, enabling it\n"
 msgstr ""
 
-#: src/nat/nat_auto.c:483
+#: src/nat/nat_auto.c:528
 msgid "gnunet-helper-nat-client not found or behind NAT, disabling it\n"
 msgstr ""
 
@@ -5065,59 +5200,49 @@
 msgid "Failed to start %s\n"
 msgstr "运行 %s失败:%s %d\n"
 
-#: src/nat/nat.c:1205
+#: src/nat/nat.c:1032
+msgid "Error while running upnp client:\n"
+msgstr ""
+
+#: src/nat/nat.c:1102
+#, fuzzy, c-format
+msgid "Failed to run upnp client for port %u\n"
+msgstr "初始化“%s”服务失败。\n"
+
+#: src/nat/nat.c:1243
 msgid "malformed"
 msgstr ""
 
-#: src/nat/nat.c:1276 src/nat/nat.c:1288
+#: src/nat/nat.c:1297
+msgid ""
+"UPnP enabled in configuration, but UPnP client `upnpc` command not found, "
+"disabling UPnP \n"
+msgstr ""
+
+#: src/nat/nat.c:1324 src/nat/nat.c:1336
 #, c-format
 msgid ""
 "Configuration requires `%s', but binary is not installed properly (SUID bit "
 "not set).  Option disabled.\n"
 msgstr ""
 
-#: src/nat/nat.c:1426
+#: src/nat/nat.c:1474
 msgid "Internal IP address not known, cannot use ICMP NAT traversal method\n"
 msgstr ""
 
-#: src/nat/nat.c:1442
+#: src/nat/nat.c:1490
 #, c-format
 msgid "Running gnunet-helper-nat-client %s %s %u\n"
 msgstr ""
 
-#: src/nat/nat_mini.c:155
-msgid "no valid address was returned by `external-ip'"
-msgstr ""
-
-#: src/nat/nat_mini.c:175
-msgid "`external-ip' command not found"
-msgstr ""
-
-#: src/nat/nat_mini.c:201
+#: src/nat/nat_mini.c:203
 msgid "`external-ip' command not found\n"
 msgstr ""
 
-#: src/nat/nat_mini.c:366
-#, fuzzy
-msgid "Failed to run `upnpc` command"
-msgstr "运行 %s失败:%s %d\n"
-
-#: src/nat/nat_mini.c:512
-msgid "`upnpc' command took too long, process killed"
-msgstr ""
-
-#: src/nat/nat_mini.c:540
-msgid "`upnpc' command failed to establish port mapping"
-msgstr ""
-
-#: src/nat/nat_mini.c:604
+#: src/nat/nat_mini.c:609
 msgid "`upnpc' command not found\n"
 msgstr ""
 
-#: src/nat/nat_mini.c:608
-msgid "`upnpc` command not found"
-msgstr ""
-
 #: src/nat/nat_test.c:351
 msgid "Failed to connect to `gnunet-nat-server'\n"
 msgstr ""
@@ -5127,6 +5252,11 @@
 msgid "Failed to create listen socket bound to `%s' for NAT test: %s\n"
 msgstr ""
 
+#: src/nat/nat_test.c:453
+#, fuzzy
+msgid "NAT test failed to start NAT library\n"
+msgstr "初始化“%s”服务失败。\n"
+
 #: src/nse/gnunet-nse.c:117
 #, fuzzy
 msgid "NSE service is not running\n"
@@ -5229,7 +5359,7 @@
 msgid "aborted due to explicit disconnect request"
 msgstr ""
 
-#: src/peerinfo/peerinfo_api.c:356
+#: src/peerinfo/peerinfo_api.c:356 src/sensor/sensor_api.c:519
 #, fuzzy
 msgid "failed to transmit request (service down?)"
 msgstr "初始化“%s”服务失败。\n"
@@ -5255,90 +5385,95 @@
 msgid "Could not connect to `%s' service.\n"
 msgstr "无法连接到 %s:%u:%s\n"
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:232
+#: src/peerinfo-tool/gnunet-peerinfo.c:233
 #, fuzzy, c-format
 msgid "%sPeer `%s'\n"
 msgstr "运行 %s失败:%s %d\n"
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:239
+#: src/peerinfo-tool/gnunet-peerinfo.c:240
 #, c-format
 msgid "\tExpires: %s \t %s\n"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:428
+#: src/peerinfo-tool/gnunet-peerinfo.c:282
 #, fuzzy, c-format
+msgid "Failure: Cannot convert address to string for peer `%s'\n"
+msgstr "找不到接口“%s”的一个 IP 地址。\n"
+
+#: src/peerinfo-tool/gnunet-peerinfo.c:439
+#, fuzzy, c-format
 msgid "Failure: Did not receive %s\n"
 msgstr "打开日志文件“%s”失败:%s\n"
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:436
+#: src/peerinfo-tool/gnunet-peerinfo.c:447
 #, c-format
 msgid "Failure: Received invalid %s\n"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:445
+#: src/peerinfo-tool/gnunet-peerinfo.c:456
 #, fuzzy, c-format
 msgid "Failed to write HELLO with %u bytes to file `%s'\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:458
+#: src/peerinfo-tool/gnunet-peerinfo.c:469
 #, c-format
 msgid "Wrote %s HELLO containing %u addresses with %u bytes to file `%s'\n"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:522
+#: src/peerinfo-tool/gnunet-peerinfo.c:533
 #, c-format
 msgid "Failure adding HELLO: %s\n"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:633
+#: src/peerinfo-tool/gnunet-peerinfo.c:644
 #, fuzzy, c-format
 msgid "Service `%s' is not running, please start GNUnet\n"
 msgstr "服务已删除。\n"
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:654 src/util/gnunet-scrypt.c:224
+#: src/peerinfo-tool/gnunet-peerinfo.c:665 src/util/gnunet-scrypt.c:224
 #, c-format
 msgid "Loading hostkey from `%s' failed.\n"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:745
+#: src/peerinfo-tool/gnunet-peerinfo.c:756
 #, c-format
 msgid "I am peer `%s'.\n"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:789
+#: src/peerinfo-tool/gnunet-peerinfo.c:800
 msgid "don't resolve host names"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:792
+#: src/peerinfo-tool/gnunet-peerinfo.c:803
 msgid "output only the identity strings"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:795
+#: src/peerinfo-tool/gnunet-peerinfo.c:806
 msgid "include friend-only information"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:798
+#: src/peerinfo-tool/gnunet-peerinfo.c:809
 msgid "output our own identity only"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:801
+#: src/peerinfo-tool/gnunet-peerinfo.c:812
 #, fuzzy
 msgid "list all known peers"
 msgstr "列出所有网络适配器"
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:804
+#: src/peerinfo-tool/gnunet-peerinfo.c:815
 msgid "dump hello to file"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:807
+#: src/peerinfo-tool/gnunet-peerinfo.c:818
 msgid "also output HELLO uri(s)"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:810
+#: src/peerinfo-tool/gnunet-peerinfo.c:821
 msgid "add given HELLO uri to the database"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:821
+#: src/peerinfo-tool/gnunet-peerinfo.c:832
 #, fuzzy
 msgid "Print information about peers."
 msgstr "无法获取有关用户“%s”的信息:%s\n"
@@ -5361,6 +5496,36 @@
 msgid "Failed to load transport plugin for `%s'\n"
 msgstr "解析配置文件“%s”失败\n"
 
+#: src/peerstore/gnunet-peerstore.c:97
+msgid "peerstore"
+msgstr ""
+
+#: src/peerstore/peerstore_api.c:486
+#, fuzzy
+msgid "Error communicating with `PEERSTORE' service."
+msgstr "连接 %s:%u 出错。守护程序在运行吗?\n"
+
+#: src/peerstore/peerstore_api.c:503
+#, fuzzy
+msgid "Received a malformed response from service."
+msgstr "“%s”的参数无效。\n"
+
+#: src/peerstore/plugin_peerstore_sqlite.c:352
+#: src/psycstore/plugin_psycstore_sqlite.c:276
+#, fuzzy, c-format
+msgid ""
+"Error executing SQL query: %s\n"
+"  %s\n"
+msgstr "创建用户出错"
+
+#: src/peerstore/plugin_peerstore_sqlite.c:377
+#: src/psycstore/plugin_psycstore_sqlite.c:253
+#, fuzzy, c-format
+msgid ""
+"Error preparing SQL query: %s\n"
+"  %s\n"
+msgstr "创建用户出错"
+
 #: src/postgres/postgres.c:59
 #, fuzzy, c-format
 msgid "`%s:%s' failed at %s:%d with error: %s"
@@ -5458,20 +5623,6 @@
 msgid "`%s' failed at %s:%d with error: %s (%d)\n"
 msgstr "“%s”于 %s:%d 处失败,错误为:%s\n"
 
-#: src/psycstore/plugin_psycstore_sqlite.c:253
-#, fuzzy, c-format
-msgid ""
-"Error preparing SQL query: %s\n"
-"  %s\n"
-msgstr "创建用户出错"
-
-#: src/psycstore/plugin_psycstore_sqlite.c:276
-#, fuzzy, c-format
-msgid ""
-"Error executing SQL query: %s\n"
-"  %s\n"
-msgstr "创建用户出错"
-
 #: src/psycstore/plugin_psycstore_sqlite.c:1796
 #, fuzzy
 msgid "SQLite database running\n"
@@ -5506,7 +5657,7 @@
 msgstr ""
 
 #: src/pt/gnunet-daemon-pt.c:888
-msgid "# DNS requests dropped (DNS mesh channel down)"
+msgid "# DNS requests dropped (DNS cadet channel down)"
 msgstr ""
 
 #: src/pt/gnunet-daemon-pt.c:896
@@ -5539,7 +5690,7 @@
 msgstr "立即保存配置?"
 
 #: src/regex/gnunet-daemon-regexprofiler.c:380
-msgid "Daemon to announce regular expressions for the peer using mesh."
+msgid "Daemon to announce regular expressions for the peer using cadet."
 msgstr ""
 
 #: src/regex/gnunet-regex-profiler.c:1288
@@ -5742,243 +5893,313 @@
 msgid "Could not open revocation database file!"
 msgstr "无法连接到 %s:%u:%s\n"
 
-#: src/scalarproduct/gnunet-scalarproduct.c:225
+#: src/scalarproduct/gnunet-scalarproduct.c:224
 #, fuzzy
 msgid "You must specify at least one message ID to check!\n"
 msgstr "您必须指定一个昵称\n"
 
-#: src/scalarproduct/gnunet-scalarproduct.c:232
+#: src/scalarproduct/gnunet-scalarproduct.c:231
 msgid "This program needs a session identifier for comparing vectors.\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-scalarproduct.c:239
+#: src/scalarproduct/gnunet-scalarproduct.c:238
 msgid "Please give a session key for --input_key!\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-scalarproduct.c:251
+#: src/scalarproduct/gnunet-scalarproduct.c:250
 #, c-format
 msgid ""
 "Tried to set initiator mode, as peer ID was given. However, `%s' is not a "
 "valid peer identifier.\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-scalarproduct.c:278
-#: src/scalarproduct/gnunet-scalarproduct.c:314
-#, fuzzy, c-format
-msgid "Could not convert `%s' to int32_t.\n"
-msgstr "无法连接到 %s:%u:%s\n"
-
-#: src/scalarproduct/gnunet-scalarproduct.c:286
+#: src/scalarproduct/gnunet-scalarproduct.c:261
 msgid "Need elements to compute the vectorproduct, got none.\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-scalarproduct.c:346
+#: src/scalarproduct/gnunet-scalarproduct.c:283
 #, fuzzy, c-format
-msgid "Could not convert `%s' to integer.\n"
+msgid "Malformed input, could not parse `%s'\n"
+msgstr "解析配置文件“%s”失败\n"
+
+#: src/scalarproduct/gnunet-scalarproduct.c:296
+#, fuzzy, c-format
+msgid "Could not convert `%s' to int64_t.\n"
 msgstr "无法连接到 %s:%u:%s\n"
 
-#: src/scalarproduct/gnunet-scalarproduct.c:407
+#: src/scalarproduct/gnunet-scalarproduct.c:345
 msgid ""
 "A comma separated list of elements to compare as vector with our remote peer."
 msgstr ""
 
-#: src/scalarproduct/gnunet-scalarproduct.c:410
+#: src/scalarproduct/gnunet-scalarproduct.c:348
 msgid ""
-"A comma separated mask to select which elements should actually be compared."
-msgstr ""
-
-#: src/scalarproduct/gnunet-scalarproduct.c:413
-msgid ""
 "[Optional] peer to calculate our scalarproduct with. If this parameter is "
 "not given, the service will wait for a remote peer to compute the request."
 msgstr ""
 
-#: src/scalarproduct/gnunet-scalarproduct.c:416
+#: src/scalarproduct/gnunet-scalarproduct.c:351
 msgid "Transaction ID shared with peer."
 msgstr ""
 
-#: src/scalarproduct/gnunet-scalarproduct.c:425
+#: src/scalarproduct/gnunet-scalarproduct.c:360
 msgid "Calculate the Vectorproduct with a GNUnet peer."
 msgstr ""
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:541
+#: src/scalarproduct/gnunet-service-scalarproduct.c:678
 #, fuzzy, c-format
-msgid "Client (%p) disconnected from us.\n"
+msgid "Client %p disconnected from us.\n"
 msgstr "“%s”已连接到“%s”。\n"
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:613
-#: src/scalarproduct/gnunet-service-scalarproduct.c:702
+#: src/scalarproduct/gnunet-service-scalarproduct.c:748
 #, fuzzy, c-format
 msgid "Could not send message to client (%p)!\n"
 msgstr "找不到接口“%s”的一个 IP 地址。\n"
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:619
+#: src/scalarproduct/gnunet-service-scalarproduct.c:759
 #, c-format
 msgid "Sending session-end notification to client (%p) for session %s\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:712
-#, c-format
-msgid "Sent result to client (%p), this session (%s) has ended!\n"
-msgstr ""
+#: src/scalarproduct/gnunet-service-scalarproduct.c:781
+#: src/scalarproduct/gnunet-service-scalarproduct.c:1459
+#, fuzzy, c-format
+msgid "Successfully created new channel to peer (%s)!\n"
+msgstr "“%s”已连接到“%s”。\n"
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:766
-#: src/scalarproduct/gnunet-service-scalarproduct.c:855
-msgid "Could not send service-response message via mesh!)\n"
-msgstr ""
-
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1028
-#, c-format
-msgid "Failed to communicate with `%s', scalar product calculation aborted.\n"
-msgstr ""
-
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1099
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1208
+#: src/scalarproduct/gnunet-service-scalarproduct.c:818
+#: src/scalarproduct/gnunet-service-scalarproduct.c:1469
+#: src/scalarproduct/gnunet-service-scalarproduct.c:1539
 msgid "Transmitting service request.\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1108
+#: src/scalarproduct/gnunet-service-scalarproduct.c:830
+#: src/scalarproduct/gnunet-service-scalarproduct.c:1481
 #, fuzzy
-msgid "Could not send service-request multipart message to channel!\n"
+msgid "Could not send message to channel!\n"
 msgstr "找不到接口“%s”的一个 IP 地址。\n"
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1147
-#, fuzzy, c-format
-msgid "Successfully created new channel to peer (%s)!\n"
-msgstr "“%s”已连接到“%s”。\n"
-
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1217
+#: src/scalarproduct/gnunet-service-scalarproduct.c:891
+#: src/scalarproduct/gnunet-service-scalarproduct.c:991
 #, fuzzy
-msgid "Could not send message to channel!\n"
+msgid "Could not send service-response message via cadet!)\n"
 msgstr "找不到接口“%s”的一个 IP 地址。\n"
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1274
-msgid "Too short message received from client!\n"
+#: src/scalarproduct/gnunet-service-scalarproduct.c:1442
+#, c-format
+msgid "Sent result to client (%p), this session (%s) has ended!\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1287
-msgid "Invalid message received from client, session information incorrect!\n"
-msgstr ""
+#: src/scalarproduct/gnunet-service-scalarproduct.c:1550
+#, fuzzy
+msgid "Could not send service-request multipart message to channel!\n"
+msgstr "找不到接口“%s”的一个 IP 地址。\n"
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1298
+#: src/scalarproduct/gnunet-service-scalarproduct.c:1579
 #, c-format
 msgid ""
-"Duplicate session information received, cannot create new session with key `"
-"%s'\n"
+"Got client-responder-session with key %s and a matching service-request-"
+"session set, processing.\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1318
+#: src/scalarproduct/gnunet-service-scalarproduct.c:1601
 #, c-format
 msgid ""
-"Got client-request-session with key %s, preparing channel to remote "
-"service.\n"
+"Got client-responder-session with key %s but NO matching service-request-"
+"session set, queuing element for later use.\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1354
+#: src/scalarproduct/gnunet-service-scalarproduct.c:1618
 #, c-format
 msgid "Creating new channel for session with key %s.\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1399
+#: src/scalarproduct/gnunet-service-scalarproduct.c:1777
 #, c-format
 msgid ""
-"Got client-responder-session with key %s and a matching service-request-"
-"session set, processing.\n"
+"Duplicate session information received, can not create new session with key `"
+"%s'\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1409
-#, c-format
-msgid ""
-"Got client-responder-session with key %s but NO matching service-request-"
-"session set, queuing element for later use.\n"
-msgstr ""
-
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1439
+#: src/scalarproduct/gnunet-service-scalarproduct.c:1862
 #, fuzzy, c-format
 msgid "New incoming channel from peer %s.\n"
 msgstr "“%s”已连接到“%s”。\n"
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1471
+#: src/scalarproduct/gnunet-service-scalarproduct.c:1892
 #, c-format
 msgid "Peer disconnected, terminating session %s with peer (%s)\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1672
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1814
+#: src/scalarproduct/gnunet-service-scalarproduct.c:2270
 #, c-format
-msgid "Got session with key %s and a matching element set, processing.\n"
+msgid ""
+"Got message with duplicate session key (`%s'), ignoring service request.\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1681
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1821
+#: src/scalarproduct/gnunet-service-scalarproduct.c:2297
 #, c-format
-msgid "Got session with key %s without a matching element set, queueing.\n"
+msgid "Got session with key %s and a matching element set, processing.\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1771
+#: src/scalarproduct/gnunet-service-scalarproduct.c:2318
 #, c-format
-msgid ""
-"Got message with duplicate session key (`%s'), ignoring service request.\n"
+msgid "Got session with key %s without a matching element set, queueing.\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:2014
+#: src/scalarproduct/gnunet-service-scalarproduct.c:2565
 msgid "Shutting down, initiating cleanup.\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:2100
+#: src/scalarproduct/gnunet-service-scalarproduct.c:2659
 #, fuzzy
-msgid "Connect to MESH failed\n"
+msgid "Connect to CADET failed\n"
 msgstr "“%s”已连接到“%s”。\n"
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:2104
-msgid "Mesh initialized\n"
+#: src/scalarproduct/gnunet-service-scalarproduct.c:2664
+msgid "CADET initialized\n"
 msgstr ""
 
-#: src/scalarproduct/scalarproduct_api.c:246
-msgid "# SUC responder result messages received"
+#: src/secretsharing/gnunet-secretsharing-profiler.c:613
+msgid "dkg start delay"
 msgstr ""
 
-#: src/scalarproduct/scalarproduct_api.c:300
-msgid "# bytes sent to scalarproduct"
+#: src/secretsharing/gnunet-secretsharing-profiler.c:616
+msgid "dkg timeout"
 msgstr ""
 
-#: src/scalarproduct/scalarproduct_api.c:345
-#: src/scalarproduct/scalarproduct_api.c:440
+#: src/secretsharing/gnunet-secretsharing-profiler.c:619
+msgid "threshold"
+msgstr ""
+
+#: src/secretsharing/gnunet-secretsharing-profiler.c:622
+msgid "also profile decryption"
+msgstr ""
+
+#: src/sensor/gnunet-sensor.c:148
 #, fuzzy
-msgid "Failed to connect to the scalarproduct service\n"
-msgstr "初始化“%s”服务失败。\n"
+msgid "Retrieve information about all defined sensors"
+msgstr "无法获取有关用户“%s”的信息:%s\n"
 
-#: src/scalarproduct/scalarproduct_api.c:353
-#: src/scalarproduct/scalarproduct_api.c:448
+#: src/sensor/gnunet-sensor.c:151
 #, fuzzy
-msgid "Failed to send a message to the statistics service\n"
-msgstr "初始化“%s”服务失败。\n"
+msgid "Retrieve information about a single sensor"
+msgstr "无法获取有关用户“%s”的信息:%s\n"
 
-#: src/scalarproduct/scalarproduct_api.c:387
-#: src/scalarproduct/scalarproduct_api.c:485
+#: src/sensor/gnunet-sensor.c:160
+msgid "sensor"
+msgstr ""
+
+#: src/sensor/gnunet-service-sensor.c:367
 #, fuzzy
-msgid "Failed to send a message to the scalarproduct service\n"
-msgstr "初始化“%s”服务失败。\n"
+msgid "Error reading sensor version\n"
+msgstr "创建用户出错"
 
-#: src/secretsharing/gnunet-secretsharing-profiler.c:538
-msgid "dkg start delay"
+#: src/sensor/gnunet-service-sensor.c:373
+msgid "Invalid sensor version number, format should be major.minor\n"
 msgstr ""
 
-#: src/secretsharing/gnunet-secretsharing-profiler.c:541
-msgid "dkg timeout"
+#: src/sensor/gnunet-service-sensor.c:385
+#, fuzzy
+msgid "Error reading sensor category\n"
+msgstr "创建用户出错"
+
+#: src/sensor/gnunet-service-sensor.c:413
+#, fuzzy
+msgid "Error reading sensor run interval\n"
+msgstr "创建用户出错"
+
+#: src/sensor/gnunet-service-sensor.c:419
+#, c-format
+msgid "Sensor run interval too low (%<PRIu64> < %d)\n"
 msgstr ""
 
-#: src/secretsharing/gnunet-secretsharing-profiler.c:544
-msgid "threshold"
+#: src/sensor/gnunet-service-sensor.c:436
+#, fuzzy
+msgid "Error reading sensor source\n"
+msgstr "创建用户出错"
+
+#: src/sensor/gnunet-service-sensor.c:445
+msgid "Error reading sensor gnunet-statistics source information\n"
 msgstr ""
 
-#: src/secretsharing/gnunet-secretsharing-profiler.c:547
-msgid "also profile decryption"
+#: src/sensor/gnunet-service-sensor.c:455
+#, fuzzy
+msgid "Error reading sensor process name\n"
+msgstr "创建用户出错"
+
+#: src/sensor/gnunet-service-sensor.c:464
+msgid "Error reading sensor expected datatype\n"
 msgstr ""
 
+#: src/sensor/gnunet-service-sensor.c:470
+msgid "Invalid expected datatype, gnunet-statistics returns uint64 values\n"
+msgstr ""
+
+#: src/sensor/gnunet-service-sensor.c:498
+#, fuzzy, c-format
+msgid "Failed to access sensor file: %s\n"
+msgstr "打开日志文件“%s”失败:%s\n"
+
+#: src/sensor/gnunet-service-sensor.c:506
+#, fuzzy, c-format
+msgid "Failed to load sensor definition: %s\n"
+msgstr "打开日志文件“%s”失败:%s\n"
+
+#: src/sensor/gnunet-service-sensor.c:559
+#, c-format
+msgid "Sensor `%s' already exists with same or newer version\n"
+msgstr ""
+
+#: src/sensor/gnunet-service-sensor.c:566
+#, c-format
+msgid "Upgrading sensor `%s' to a newer version\n"
+msgstr ""
+
+#: src/sensor/gnunet-service-sensor.c:571
+#, c-format
+msgid ""
+"Error adding new sensor `%s' to global hashmap, this should not happen\n"
+msgstr ""
+
+#: src/sensor/gnunet-service-sensor.c:595
+#, fuzzy, c-format
+msgid "Error loading sensor from file: %s\n"
+msgstr "创建用户出错"
+
+#: src/sensor/gnunet-service-sensor.c:599
+#, c-format
+msgid "Sensor `%s' added to global hashmap\n"
+msgstr ""
+
+#: src/sensor/gnunet-service-sensor.c:635
+#, fuzzy, c-format
+msgid "Reloading sensor definitions from directory `%s'\n"
+msgstr "解析配置文件“%s”失败\n"
+
+#: src/sensor/gnunet-service-sensor.c:640
+#, fuzzy, c-format
+msgid "Loaded %d sensors from directory `%s'\n"
+msgstr "解析配置文件“%s”失败\n"
+
+#: src/sensor/sensor_api.c:345
+#, fuzzy
+msgid "Timeout transmitting iteration request to `SENSOR' service."
+msgstr "初始化“%s”服务失败。\n"
+
+#: src/sensor/sensor_api.c:388
+#, fuzzy
+msgid "Failed to receive response from `SENSOR' service."
+msgstr "“%s”的参数无效。\n"
+
+#: src/sensor/sensor_api.c:431
+#, fuzzy
+msgid "Received invalid message from `SENSOR' service."
+msgstr "“%s”的参数无效。\n"
+
 #: src/set/gnunet-service-set.c:1431
 #, fuzzy
-msgid "Could not connect to mesh service\n"
+msgid "Could not connect to cadet service\n"
 msgstr "无法连接到 %s:%u:%s\n"
 
 #: src/set/gnunet-set-ibf-profiler.c:221
@@ -6179,7 +6400,7 @@
 "content/topology-file-format\n"
 msgstr ""
 
-#: src/testbed/gnunet-daemon-latency-logger.c:325
+#: src/testbed/gnunet-daemon-latency-logger.c:331
 msgid "Daemon to log latency values of connections to neighbours"
 msgstr ""
 
@@ -6539,8 +6760,8 @@
 msgid "# HELLO messages gossipped"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:1290
-msgid "GNUnet topology control (maintaining P2P mesh and F2F constraints)"
+#: src/topology/gnunet-daemon-topology.c:1296
+msgid "GNUnet topology control (maintaining P2P cadet and F2F constraints)"
 msgstr ""
 
 #: src/transport/gnunet-service-transport_blacklist.c:271
@@ -6570,19 +6791,19 @@
 msgid "# bytes payload received"
 msgstr ""
 
-#: src/transport/gnunet-service-transport.c:686
+#: src/transport/gnunet-service-transport.c:708
 #, fuzzy, c-format
 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:733
+#: src/transport/gnunet-service-transport.c:755
 #, 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:1084
+#: src/transport/gnunet-service-transport.c:1106
 #, fuzzy
 msgid "Transport service is lacking key configuration settings. Exiting.\n"
 msgstr "立即保存配置?"
@@ -6633,7 +6854,7 @@
 msgid "Received a request disconnect message for peer `%s'\n"
 msgstr "打开日志文件“%s”失败:%s\n"
 
-#: src/transport/gnunet-service-transport_hello.c:181
+#: src/transport/gnunet-service-transport_hello.c:182
 msgid "# refreshed my HELLO"
 msgstr ""
 
@@ -6642,7 +6863,7 @@
 msgstr ""
 
 #: src/transport/gnunet-service-transport_neighbours.c:1220
-#: src/transport/gnunet-service-transport_neighbours.c:1629
+#: src/transport/gnunet-service-transport_neighbours.c:1635
 msgid "# bytes in message queue for other peers"
 msgstr ""
 
@@ -6654,166 +6875,166 @@
 msgid "# transmission failures for messages to other peers"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1287
+#: src/transport/gnunet-service-transport_neighbours.c:1288
 msgid "# messages timed out while in transport queue"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1343
+#: src/transport/gnunet-service-transport_neighbours.c:1349
 msgid "# keepalives sent"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1376
+#: src/transport/gnunet-service-transport_neighbours.c:1382
 msgid "# KEEPALIVE messages discarded (peer unknown)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1384
+#: src/transport/gnunet-service-transport_neighbours.c:1390
 msgid "# KEEPALIVE messages discarded (no session)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1431
+#: src/transport/gnunet-service-transport_neighbours.c:1437
 msgid "# KEEPALIVE_RESPONSE messages discarded (not connected)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1440
+#: src/transport/gnunet-service-transport_neighbours.c:1446
 msgid "# KEEPALIVE_RESPONSE messages discarded (not expected)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1448
+#: src/transport/gnunet-service-transport_neighbours.c:1454
 msgid "# KEEPALIVE_RESPONSE messages discarded (address changed)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1456
+#: src/transport/gnunet-service-transport_neighbours.c:1462
 msgid "# KEEPALIVE_RESPONSE messages discarded (wrong nonce)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1534
+#: src/transport/gnunet-service-transport_neighbours.c:1540
 msgid "# messages discarded due to lack of neighbour record"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1568
+#: src/transport/gnunet-service-transport_neighbours.c:1574
 msgid "# bandwidth quota violations by other peers"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1584
+#: src/transport/gnunet-service-transport_neighbours.c:1590
 msgid "# ms throttling suggested"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1678
+#: src/transport/gnunet-service-transport_neighbours.c:1685
 #, fuzzy, c-format
 msgid ""
 "Failed to send CONNECT message to peer `%s' using address `%s' session %p\n"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1705
+#: src/transport/gnunet-service-transport_neighbours.c:1712
 msgid "# Failed attempts to switch addresses (failed to send CONNECT CONT)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1751
+#: src/transport/gnunet-service-transport_neighbours.c:1757
 msgid "# SESSION_CONNECT messages sent"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1767
+#: src/transport/gnunet-service-transport_neighbours.c:1773
 #, fuzzy, c-format
 msgid "Failed to transmit CONNECT message via plugin to %s\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1794
+#: src/transport/gnunet-service-transport_neighbours.c:1800
 msgid "# Failed attempts to switch addresses (failed to send CONNECT)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1844
+#: src/transport/gnunet-service-transport_neighbours.c:1849
 #, c-format
 msgid ""
 "Failed to send CONNECT_ACK message to peer `%s' using address `%s' session "
 "%p\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1899
+#: src/transport/gnunet-service-transport_neighbours.c:1904
 msgid "# CONNECT_ACK messages sent"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1914
+#: src/transport/gnunet-service-transport_neighbours.c:1919
 #, fuzzy, c-format
 msgid "Failed to transmit CONNECT_ACK message via plugin to %s\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/transport/gnunet-service-transport_neighbours.c:2192
+#: src/transport/gnunet-service-transport_neighbours.c:2196
 #, fuzzy, c-format
 msgid "Blacklisting disapproved to connect to peer `%s'\n"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/transport/gnunet-service-transport_neighbours.c:2312
+#: src/transport/gnunet-service-transport_neighbours.c:2316
 msgid "# CONNECT messages received"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:2317
+#: src/transport/gnunet-service-transport_neighbours.c:2321
 #, c-format
 msgid "CONNECT request from peer `%s' ignored due impending shutdown\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:2590
+#: src/transport/gnunet-service-transport_neighbours.c:2594
 msgid "# Attempts to switch addresses"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3012
+#: src/transport/gnunet-service-transport_neighbours.c:3016
 #, fuzzy
 msgid "# Failed attempts to switch addresses (no response)"
 msgstr "打开日志文件“%s”失败:%s\n"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3107
+#: src/transport/gnunet-service-transport_neighbours.c:3111
 msgid "# CONNECT_ACK messages received"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3115
+#: src/transport/gnunet-service-transport_neighbours.c:3119
 msgid "# unexpected CONNECT_ACK messages (no peer)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3129
-#: src/transport/gnunet-service-transport_neighbours.c:3164
+#: src/transport/gnunet-service-transport_neighbours.c:3133
+#: src/transport/gnunet-service-transport_neighbours.c:3168
 msgid "# unexpected CONNECT_ACK messages (not ready)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3176
+#: src/transport/gnunet-service-transport_neighbours.c:3180
 msgid "# unexpected CONNECT_ACK messages (waiting on ATS)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3200
+#: src/transport/gnunet-service-transport_neighbours.c:3203
 msgid "# Successful attempts to switch addresses"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3208
+#: src/transport/gnunet-service-transport_neighbours.c:3211
 msgid "# unexpected CONNECT_ACK messages (disconnecting)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3396
+#: src/transport/gnunet-service-transport_neighbours.c:3399
 msgid "# SESSION_ACK messages received"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3424
+#: src/transport/gnunet-service-transport_neighbours.c:3435
 msgid "# unexpected SESSION_ACK messages"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3490
+#: src/transport/gnunet-service-transport_neighbours.c:3509
 msgid "# SET QUOTA messages ignored (no such peer)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3505
+#: src/transport/gnunet-service-transport_neighbours.c:3524
 msgid "# disconnects due to quota of 0"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3545
+#: src/transport/gnunet-service-transport_neighbours.c:3564
 msgid "# disconnect messages ignored (malformed)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3551
+#: src/transport/gnunet-service-transport_neighbours.c:3570
 msgid "# DISCONNECT messages received"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3560
+#: src/transport/gnunet-service-transport_neighbours.c:3579
 msgid "# disconnect messages ignored (timestamp)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3687
+#: src/transport/gnunet-service-transport_neighbours.c:3706
 msgid "# disconnected from peer upon explicit request"
 msgstr ""
 
@@ -6925,33 +7146,58 @@
 msgid "Adding `%s' without addresses for peer `%s'\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:367
+#: src/transport/gnunet-transport.c:388
 #, c-format
 msgid "Transmitted %llu bytes/s (%llu bytes in %s)\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:375
+#: src/transport/gnunet-transport.c:396
 #, c-format
 msgid "Received %llu bytes/s (%llu bytes in %s)\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:415
+#: src/transport/gnunet-transport.c:436
 #, fuzzy, c-format
 msgid "Failed to connect to `%s'\n"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/transport/gnunet-transport.c:428
+#: src/transport/gnunet-transport.c:449
 #, fuzzy, c-format
 msgid "Failed to resolve address for peer `%s'\n"
 msgstr "找不到接口“%s”的一个 IP 地址。\n"
 
-#: src/transport/gnunet-transport.c:438
+#: src/transport/gnunet-transport.c:459
 #, fuzzy
 msgid "Failed to list connections, timeout occured\n"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/transport/gnunet-transport.c:559
+#: src/transport/gnunet-transport.c:483
 #, fuzzy, c-format
+msgid "Configuration for plugin `%s' did not work!\n"
+msgstr "配置文件“%s”已写入。\n"
+
+#: src/transport/gnunet-transport.c:487
+#, fuzzy, c-format
+msgid "Configuration for plugin `%s' did work!\n"
+msgstr "配置文件“%s”已写入。\n"
+
+#: src/transport/gnunet-transport.c:491
+#, fuzzy, c-format
+msgid "Internal NAT error while running test for plugin `%s'\n"
+msgstr "未知错误。\n"
+
+#: src/transport/gnunet-transport.c:495
+#, fuzzy, c-format
+msgid "Failed to start NAT test for plugin `%s'\n"
+msgstr "初始化“%s”服务失败。\n"
+
+#: src/transport/gnunet-transport.c:499
+#, c-format
+msgid "Timeout while waiting for result of NAT test for plugin `%s'\n"
+msgstr ""
+
+#: src/transport/gnunet-transport.c:614
+#, fuzzy, c-format
 msgid ""
 "Peer `%s' %s %s\n"
 "\t%s%s\n"
@@ -6959,152 +7205,177 @@
 "\t%s%s\n"
 msgstr "运行 %s失败:%s %d\n"
 
-#: src/transport/gnunet-transport.c:586
+#: src/transport/gnunet-transport.c:643
 #, fuzzy, c-format
 msgid "Peer `%s' %s `%s' \n"
 msgstr "运行 %s失败:%s %d\n"
 
-#: src/transport/gnunet-transport.c:712
+#: src/transport/gnunet-transport.c:717 src/transport/gnunet-transport.c:1240
+#, fuzzy
+msgid "Monitor disconnected from transport service. Reconnecting.\n"
+msgstr "初始化“%s”服务失败。\n"
+
+#: src/transport/gnunet-transport.c:784
 msgid "No transport plugins configured, peer will never communicate\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:726
+#: src/transport/gnunet-transport.c:798
 #, c-format
 msgid "No port configured for plugin `%s', cannot test it\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:789
+#: src/transport/gnunet-transport.c:823
+#, fuzzy
+msgid "Failed to start resolver!\n"
+msgstr "运行 %s失败:%s %d\n"
+
+#: src/transport/gnunet-transport.c:866
 #, c-format
 msgid "Transmitting %u bytes to %s\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:810
+#: src/transport/gnunet-transport.c:888
 #, fuzzy, c-format
 msgid "Successfully connected to `%s'\n"
 msgstr "“%s”已连接到“%s”。\n"
 
-#: src/transport/gnunet-transport.c:834
+#: src/transport/gnunet-transport.c:912
 #, c-format
 msgid ""
 "Successfully connected to `%s', starting to send benchmark data in %u Kb "
 "blocks\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:865
+#: src/transport/gnunet-transport.c:943
 #, fuzzy, c-format
 msgid "Successfully disconnected from `%s'\n"
 msgstr "“%s”已连接到“%s”。\n"
 
-#: src/transport/gnunet-transport.c:888
+#: src/transport/gnunet-transport.c:966
 #, fuzzy, c-format
 msgid "Disconnected from peer `%s' while benchmarking\n"
 msgstr "“%s”已连接到“%s”。\n"
 
-#: src/transport/gnunet-transport.c:950
+#: src/transport/gnunet-transport.c:988 src/transport/gnunet-transport.c:1009
 #, c-format
+msgid "%24s: %-17s %4s   (%u connections in total)\n"
+msgstr ""
+
+#: src/transport/gnunet-transport.c:989
+#, fuzzy
+msgid "Connected to"
+msgstr "“%s”已连接到“%s”。\n"
+
+#: src/transport/gnunet-transport.c:1010
+#, fuzzy
+msgid "Disconnected from"
+msgstr "“%s”已连接到“%s”。\n"
+
+#: src/transport/gnunet-transport.c:1031
+#, c-format
 msgid "Received %u bytes from %s\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:975
+#: src/transport/gnunet-transport.c:1061
 #, c-format
 msgid "Peer `%s': %s %s in state `%s' until %s\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:986
+#: src/transport/gnunet-transport.c:1072
 #, fuzzy, c-format
 msgid "Peer `%s': %s %s\n"
 msgstr "运行 %s失败:%s %d\n"
 
-#: src/transport/gnunet-transport.c:1197 src/transport/gnunet-transport.c:1222
+#: src/transport/gnunet-transport.c:1300 src/transport/gnunet-transport.c:1325
 #, fuzzy
 msgid "Failed to send connect request to transport service\n"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/transport/gnunet-transport.c:1266
+#: src/transport/gnunet-transport.c:1369
 #, c-format
 msgid ""
 "Multiple operations given. Please choose only one operation: %s, %s, %s, %s, "
 "%s, %s\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1274
+#: src/transport/gnunet-transport.c:1377
 #, c-format
 msgid ""
 "No operation given. Please choose one operation: %s, %s, %s, %s, %s, %s\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1293 src/transport/gnunet-transport.c:1323
-#: src/transport/gnunet-transport.c:1353 src/transport/gnunet-transport.c:1376
-#: src/transport/gnunet-transport.c:1419
+#: src/transport/gnunet-transport.c:1396 src/transport/gnunet-transport.c:1426
+#: src/transport/gnunet-transport.c:1456 src/transport/gnunet-transport.c:1479
+#: src/transport/gnunet-transport.c:1523
 #, fuzzy
 msgid "Failed to connect to transport service\n"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/transport/gnunet-transport.c:1302 src/transport/gnunet-transport.c:1332
-#: src/transport/gnunet-transport.c:1362
+#: src/transport/gnunet-transport.c:1405 src/transport/gnunet-transport.c:1435
+#: src/transport/gnunet-transport.c:1465
 #, fuzzy
 msgid "Failed to send request to transport service\n"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/transport/gnunet-transport.c:1381
+#: src/transport/gnunet-transport.c:1484
 msgid "Starting to receive benchmark data\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1465
+#: src/transport/gnunet-transport.c:1569
 #, fuzzy
 msgid "print information for all peers (instead of only connected peers )"
 msgstr "无法获取有关用户“%s”的信息:%s\n"
 
-#: src/transport/gnunet-transport.c:1468
+#: src/transport/gnunet-transport.c:1572
 msgid "measure how fast we are receiving data from all peers (until CTRL-C)"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1471
+#: src/transport/gnunet-transport.c:1575
 #, fuzzy
 msgid "connect to a peer"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/transport/gnunet-transport.c:1474
+#: src/transport/gnunet-transport.c:1578
 #, fuzzy
 msgid "disconnect to a peer"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/transport/gnunet-transport.c:1477
+#: src/transport/gnunet-transport.c:1581
 #, fuzzy
 msgid "print information for all pending validations "
 msgstr "无法获取有关用户“%s”的信息:%s\n"
 
-#: src/transport/gnunet-transport.c:1480
+#: src/transport/gnunet-transport.c:1584
 #, fuzzy
 msgid "print information for all pending validations continously"
 msgstr "无法获取有关用户“%s”的信息:%s\n"
 
-#: src/transport/gnunet-transport.c:1483
+#: src/transport/gnunet-transport.c:1587
 msgid "provide information about all current connections (once)"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1489
+#: src/transport/gnunet-transport.c:1593
 msgid ""
 "provide information about all connects and disconnect events (continuously)"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1491
+#: src/transport/gnunet-transport.c:1595
 msgid "do not resolve hostnames"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1493
+#: src/transport/gnunet-transport.c:1597
 msgid "peer identity"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1495
+#: src/transport/gnunet-transport.c:1599
 msgid "send data for benchmarking to the other peer (until CTRL-C)"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1498
+#: src/transport/gnunet-transport.c:1602
 msgid "test transport configuration (involves external server)"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1507
+#: src/transport/gnunet-transport.c:1611
 #, fuzzy
 msgid "Direct access to transport service."
 msgstr "初始化“%s”服务失败。\n"
@@ -7165,147 +7436,148 @@
 msgid "# HELLO beacons sent via Bluetooth"
 msgstr ""
 
-#: src/transport/plugin_transport_bluetooth.c:1723
-msgid "Bluetooth address with invalid size encountered\n"
-msgstr ""
-
 #: src/transport/plugin_transport_bluetooth.c:1923
 #, c-format
 msgid "Helper binary `%s' not SUID, cannot run bluetooth transport\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_client.c:1622
+#: src/transport/plugin_transport_http_client.c:1685
 #, c-format
 msgid "Could not initialize curl multi handle, failed to start %s plugin!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_client.c:1697
-#: src/transport/plugin_transport_http_server.c:3007
+#: src/transport/plugin_transport_http_client.c:1760
+#: src/transport/plugin_transport_http_server.c:3031
 #, fuzzy, c-format
 msgid "Shutting down plugin `%s'\n"
 msgstr "未知的命令“%s”。\n"
 
-#: src/transport/plugin_transport_http_client.c:1722
-#: src/transport/plugin_transport_http_server.c:3063
+#: src/transport/plugin_transport_http_client.c:1785
+#: src/transport/plugin_transport_http_server.c:3088
 #, c-format
 msgid "Shutdown for plugin `%s' complete\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_client.c:1750
-#: src/transport/plugin_transport_http_server.c:2907
+#: src/transport/plugin_transport_http_client.c:1819
+#: src/transport/plugin_transport_http_server.c:2931
 #, fuzzy, c-format
 msgid "Maximum number of connections is %u\n"
 msgstr "增加 TCP/IP 的最大连接数"
 
-#: src/transport/plugin_transport_http_server.c:1402
+#: src/transport/plugin_transport_http_server.c:1423
 #, 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:1663
+#: src/transport/plugin_transport_http_server.c:1687
 #, c-format
 msgid "Accepting connection (%u of %u) from `%s'\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:1671
+#: src/transport/plugin_transport_http_server.c:1695
 #, c-format
 msgid ""
 "Server reached maximum number connections (%u), rejecting new connection\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:1958
+#: src/transport/plugin_transport_http_server.c:1982
 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:1982
+#: src/transport/plugin_transport_http_server.c:2006
 #, c-format
 msgid "No usable TLS certificate found and creating one at `%s/%s' failed!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:2405
+#: src/transport/plugin_transport_http_server.c:2429
 #, fuzzy
 msgid "Require valid port number for service in configuration!\n"
 msgstr "保存配置失败。"
 
-#: src/transport/plugin_transport_http_server.c:2437 src/util/service.c:698
+#: src/transport/plugin_transport_http_server.c:2461 src/util/service.c:700
 #, fuzzy, c-format
 msgid "Failed to resolve `%s': %s\n"
 msgstr "打开日志文件“%s”失败:%s\n"
 
-#: src/transport/plugin_transport_http_server.c:2454 src/util/service.c:715
+#: src/transport/plugin_transport_http_server.c:2478 src/util/service.c:719
 #, fuzzy, c-format
 msgid "Failed to find %saddress for `%s'.\n"
 msgstr "找不到接口“%s”的一个 IP 地址。\n"
 
-#: src/transport/plugin_transport_http_server.c:2565
+#: src/transport/plugin_transport_http_server.c:2589
 #, c-format
 msgid "Found %u addresses to report to NAT service\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:2637
+#: src/transport/plugin_transport_http_server.c:2661
 msgid "Disabling IPv6 since it is not supported on this system!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:2730
+#: src/transport/plugin_transport_http_server.c:2754
 #, c-format
 msgid "IPv4 support is %s\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:2744
+#: src/transport/plugin_transport_http_server.c:2768
 #, c-format
 msgid "IPv6 support is %s\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:2751
+#: src/transport/plugin_transport_http_server.c:2775
 msgid "Neither IPv4 nor IPv6 are enabled! Fix in configuration\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:2762
+#: src/transport/plugin_transport_http_server.c:2786
 #, fuzzy
 msgid "Port is required! Fix in configuration\n"
 msgstr ""
 "\n"
 "结束配置。\n"
 
-#: src/transport/plugin_transport_http_server.c:2769
+#: src/transport/plugin_transport_http_server.c:2793
 #, c-format
 msgid "Using port %u\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:2784
+#: src/transport/plugin_transport_http_server.c:2808
 #, c-format
 msgid "Specific IPv4 address `%s' in configuration file is invalid!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:2794
+#: src/transport/plugin_transport_http_server.c:2818
 #, fuzzy, c-format
 msgid "Binding to IPv4 address %s\n"
 msgstr "无效的进程优先级“%s”\n"
 
-#: src/transport/plugin_transport_http_server.c:2815
+#: src/transport/plugin_transport_http_server.c:2839
 #, c-format
 msgid "Specific IPv6 address `%s' in configuration file is invalid!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:2825
+#: src/transport/plugin_transport_http_server.c:2849
 #, fuzzy, c-format
 msgid "Binding to IPv6 address %s\n"
 msgstr "无效的进程优先级“%s”\n"
 
-#: src/transport/plugin_transport_http_server.c:2877
+#: src/transport/plugin_transport_http_server.c:2901
 #, fuzzy, c-format
 msgid "Using external hostname `%s'\n"
 msgstr "卸载 GNUnet 服务"
 
-#: src/transport/plugin_transport_http_server.c:2893
+#: src/transport/plugin_transport_http_server.c:2917
 #, c-format
 msgid "Notifying transport only about hostname `%s'\n"
 msgstr ""
 
+#: src/transport/plugin_transport_http_server.c:3177
+#, fuzzy
+msgid "Unable to compile URL regex\n"
+msgstr "无法初始化 SQLite:%s。\n"
+
 #: src/transport/plugin_transport_smtp.c:223
 #, c-format
 msgid "Received malformed message via %s. Ignored.\n"
@@ -7348,85 +7620,85 @@
 msgid "# bytes dropped by SMTP (outgoing)"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:555
+#: src/transport/plugin_transport_tcp.c:565
 #, c-format
 msgid "Unexpected address length: %u bytes\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:762
-#: src/transport/plugin_transport_tcp.c:928
-#: src/transport/plugin_transport_tcp.c:2005
-#: src/transport/plugin_transport_tcp.c:2558
+#: src/transport/plugin_transport_tcp.c:787
+#: src/transport/plugin_transport_tcp.c:962
+#: src/transport/plugin_transport_tcp.c:2047
+#: src/transport/plugin_transport_tcp.c:2620
 msgid "# TCP sessions active"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:795
-#: src/transport/plugin_transport_tcp.c:921
-#: src/transport/plugin_transport_tcp.c:1009
-#: src/transport/plugin_transport_tcp.c:1056
-#: src/transport/plugin_transport_tcp.c:1219
-#: src/transport/plugin_transport_tcp.c:1237
+#: src/transport/plugin_transport_tcp.c:823
+#: src/transport/plugin_transport_tcp.c:955
+#: src/transport/plugin_transport_tcp.c:1045
+#: src/transport/plugin_transport_tcp.c:1093
+#: src/transport/plugin_transport_tcp.c:1259
+#: src/transport/plugin_transport_tcp.c:1277
 msgid "# bytes currently in TCP buffers"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:798
+#: src/transport/plugin_transport_tcp.c:826
 msgid "# bytes discarded by TCP (disconnect)"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:1012
+#: src/transport/plugin_transport_tcp.c:1048
 msgid "# bytes discarded by TCP (timeout)"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:1059
+#: src/transport/plugin_transport_tcp.c:1096
 msgid "# bytes transmitted via TCP"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:1193
+#: src/transport/plugin_transport_tcp.c:1233
 #, c-format
 msgid "Trying to send with invalid session %p\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:1462
+#: src/transport/plugin_transport_tcp.c:1504
 msgid "# requests to create session with invalid address"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:1567
+#: src/transport/plugin_transport_tcp.c:1609
 msgid "# transport-service disconnect requests for TCP"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2055
+#: src/transport/plugin_transport_tcp.c:2097
 msgid "# TCP WELCOME messages received"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2215
+#: src/transport/plugin_transport_tcp.c:2257
 msgid "# bytes received via TCP"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2279
+#: src/transport/plugin_transport_tcp.c:2321
 msgid "# network-level TCP disconnect events"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2437 src/util/service.c:582
+#: src/transport/plugin_transport_tcp.c:2490 src/util/service.c:582
 #: src/util/service.c:588
 #, c-format
 msgid "Require valid port number for service `%s' in configuration!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2451
+#: src/transport/plugin_transport_tcp.c:2504
 #, fuzzy
 msgid "Failed to start service.\n"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/transport/plugin_transport_tcp.c:2547
+#: src/transport/plugin_transport_tcp.c:2607
 #, c-format
 msgid "TCP transport listening on port %llu\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2551
+#: src/transport/plugin_transport_tcp.c:2611
 msgid "TCP transport not listening on any port (client only)\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2554
+#: src/transport/plugin_transport_tcp.c:2615
 #, c-format
 msgid "TCP transport advertises itself as being on port %llu\n"
 msgstr ""
@@ -7494,12 +7766,12 @@
 msgid "Cannot create path to `%s'\n"
 msgstr "发送消息失败。\n"
 
-#: src/transport/plugin_transport_unix.c:1652
+#: src/transport/plugin_transport_unix.c:1645
 #, fuzzy
 msgid "No UNIXPATH given in configuration!\n"
 msgstr "保存配置失败。"
 
-#: src/transport/plugin_transport_unix.c:1688
+#: src/transport/plugin_transport_unix.c:1681
 #, fuzzy
 msgid "Failed to open UNIX listen socket\n"
 msgstr "打开日志文件“%s”失败:%s\n"
@@ -7560,10 +7832,6 @@
 msgid "# HELLO beacons sent via WLAN"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:1729
-msgid "WLAN address with invalid size encountered\n"
-msgstr ""
-
 #: src/transport/plugin_transport_wlan.c:1929
 #, c-format
 msgid "Helper binary `%s' not SUID, cannot run WLAN transport\n"
@@ -7707,24 +7975,24 @@
 msgid "Syntax error while deserializing in line %u\n"
 msgstr "配置文件“%s”第 %d 行有语法错误。\n"
 
-#: src/util/configuration.c:996
+#: src/util/configuration.c:1023
 #, c-format
 msgid ""
 "Configuration value '%s' for '%s' in section '%s' is not in set of legal "
 "choices\n"
 msgstr ""
 
-#: src/util/configuration.c:1066
+#: src/util/configuration.c:1093
 #, c-format
 msgid "Recursive expansion suspected, aborting $-expansion for term `%s'\n"
 msgstr ""
 
-#: src/util/configuration.c:1098
+#: src/util/configuration.c:1125
 #, fuzzy, c-format
 msgid "Missing closing `%s' in option `%s'\n"
 msgstr "配置文件“%s”已写入。\n"
 
-#: src/util/configuration.c:1172
+#: src/util/configuration.c:1199
 #, c-format
 msgid ""
 "Failed to expand `%s' in `%s' as it is neither found in [PATHS] nor defined "
@@ -7824,7 +8092,7 @@
 msgid "Expected `%s' to be a directory!\n"
 msgstr "“%s”应为目录!\n"
 
-#: src/util/disk.c:1546 src/util/service.c:1318
+#: src/util/disk.c:1546 src/util/service.c:1323
 #, c-format
 msgid "Cannot obtain information about user `%s': %s\n"
 msgstr "无法获取有关用户“%s”的信息:%s\n"
@@ -8147,17 +8415,17 @@
 msgid "Could not determine plugin installation path.\n"
 msgstr "无法确定用户界面定义文件。"
 
-#: src/util/program.c:246 src/util/service.c:1452
+#: src/util/program.c:246 src/util/service.c:1457
 #, fuzzy, c-format
 msgid "Malformed configuration file `%s', exit ...\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/util/program.c:258 src/util/service.c:1467
+#: src/util/program.c:258 src/util/service.c:1472
 #, fuzzy, c-format
 msgid "Could not access configuration file `%s'\n"
 msgstr "找不到接口“%s”的一个 IP 地址。\n"
 
-#: src/util/program.c:263 src/util/service.c:1462
+#: src/util/program.c:263 src/util/service.c:1467
 #, fuzzy
 msgid "Malformed configuration, exit ...\n"
 msgstr "解析配置文件“%s”失败\n"
@@ -8257,52 +8525,52 @@
 msgid "Have neither PORT nor UNIXPATH for service `%s', but one is required\n"
 msgstr ""
 
-#: src/util/service.c:903
+#: src/util/service.c:908
 msgid "Could not access a pre-bound socket, will try to bind myself\n"
 msgstr ""
 
-#: src/util/service.c:952 src/util/service.c:970
+#: src/util/service.c:957 src/util/service.c:975
 #, c-format
 msgid "Specified value for `%s' of service `%s' is invalid\n"
 msgstr ""
 
-#: src/util/service.c:995
+#: src/util/service.c:1000
 #, c-format
 msgid "Could not access pre-bound socket %u, will try to bind myself\n"
 msgstr ""
 
-#: src/util/service.c:1165
+#: src/util/service.c:1170
 #, fuzzy, c-format
 msgid "Failed to start `%s' at `%s'\n"
 msgstr "运行 %s失败:%s %d\n"
 
-#: src/util/service.c:1207
+#: src/util/service.c:1212
 #, c-format
 msgid "Service `%s' runs at %s\n"
 msgstr ""
 
-#: src/util/service.c:1256
+#: src/util/service.c:1261
 msgid "Service process failed to initialize\n"
 msgstr ""
 
-#: src/util/service.c:1260
+#: src/util/service.c:1265
 msgid "Service process could not initialize server function\n"
 msgstr ""
 
-#: src/util/service.c:1264
+#: src/util/service.c:1269
 msgid "Service process failed to report status\n"
 msgstr ""
 
-#: src/util/service.c:1319
+#: src/util/service.c:1324
 msgid "No such user"
 msgstr "无此用户"
 
-#: src/util/service.c:1332
+#: src/util/service.c:1337
 #, c-format
 msgid "Cannot change user/group to `%s': %s\n"
 msgstr "无法更改用户/组为“%s”:%s\n"
 
-#: src/util/service.c:1402
+#: src/util/service.c:1407
 msgid "do daemonize (detach from terminal)"
 msgstr ""
 
@@ -8432,23 +8700,23 @@
 msgstr ""
 
 #: src/vpn/gnunet-service-vpn.c:642
-msgid "# Bytes given to mesh for transmission"
+msgid "# Bytes given to cadet for transmission"
 msgstr ""
 
 #: src/vpn/gnunet-service-vpn.c:680
-msgid "# Bytes dropped in mesh queue (overflow)"
+msgid "# Bytes dropped in cadet queue (overflow)"
 msgstr ""
 
 #: src/vpn/gnunet-service-vpn.c:753
 #, fuzzy
-msgid "# Mesh channels created"
+msgid "# Cadet channels created"
 msgstr ""
 "\n"
 "按任意键继续\n"
 
 #: src/vpn/gnunet-service-vpn.c:784
 #, fuzzy
-msgid "Failed to setup mesh channel!\n"
+msgid "Failed to setup cadet channel!\n"
 msgstr "发送消息失败。\n"
 
 #: src/vpn/gnunet-service-vpn.c:978
@@ -8483,15 +8751,15 @@
 msgstr ""
 
 #: src/vpn/gnunet-service-vpn.c:1706
-msgid "# ICMP packets received from mesh"
+msgid "# ICMP packets received from cadet"
 msgstr ""
 
 #: src/vpn/gnunet-service-vpn.c:2045
-msgid "# UDP packets received from mesh"
+msgid "# UDP packets received from cadet"
 msgstr ""
 
 #: src/vpn/gnunet-service-vpn.c:2200
-msgid "# TCP packets received from mesh"
+msgid "# TCP packets received from cadet"
 msgstr ""
 
 #: src/vpn/gnunet-service-vpn.c:2351
@@ -8510,29 +8778,29 @@
 msgid "Failed to allocate IP address for new destination\n"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:2982
+#: src/vpn/gnunet-service-vpn.c:2987
 #, fuzzy
 msgid "Must specify valid IPv6 address"
 msgstr "“%s”不可用。\n"
 
-#: src/vpn/gnunet-service-vpn.c:3006
+#: src/vpn/gnunet-service-vpn.c:3011
 msgid "Must specify valid IPv6 mask"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:3014
+#: src/vpn/gnunet-service-vpn.c:3019
 msgid "IPv6 support disabled as this system does not support IPv6\n"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:3027
+#: src/vpn/gnunet-service-vpn.c:3032
 #, fuzzy
 msgid "Must specify valid IPv4 address"
 msgstr "“%s”不可用。\n"
 
-#: src/vpn/gnunet-service-vpn.c:3040
+#: src/vpn/gnunet-service-vpn.c:3045
 msgid "Must specify valid IPv4 mask"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:3050
+#: src/vpn/gnunet-service-vpn.c:3055
 msgid "IPv4 support disabled as this system does not support IPv4\n"
 msgstr ""
 
@@ -8619,6 +8887,26 @@
 msgstr ""
 
 #, fuzzy
+#~ msgid "Failed to run `upnpc` command"
+#~ msgstr "运行 %s失败:%s %d\n"
+
+#, fuzzy
+#~ msgid "Could not convert `%s' to integer.\n"
+#~ msgstr "无法连接到 %s:%u:%s\n"
+
+#, fuzzy
+#~ msgid "Failed to connect to the scalarproduct service\n"
+#~ msgstr "初始化“%s”服务失败。\n"
+
+#, fuzzy
+#~ msgid "Failed to send a message to the statistics service\n"
+#~ msgstr "初始化“%s”服务失败。\n"
+
+#, fuzzy
+#~ msgid "Failed to send a message to the scalarproduct service\n"
+#~ msgstr "初始化“%s”服务失败。\n"
+
+#, fuzzy
 #~ msgid "provide information about a particular channel"
 #~ msgstr "无法获取有关用户“%s”的信息:%s\n"
 
@@ -8708,10 +8996,6 @@
 #~ msgstr "无法为守护程序创建用户账户。"
 
 #, fuzzy
-#~ msgid "Unable to initialize resolver!\n"
-#~ msgstr "无法初始化 SQLite:%s。\n"
-
-#, fuzzy
 #~ msgid "Using default zone file `%s'\n"
 #~ msgstr "卸载 GNUnet 服务"
 
@@ -8931,18 +9215,10 @@
 #~ msgstr "保存配置失败。"
 
 #, fuzzy
-#~ msgid "Failed to queue a confirmation receipt\n"
-#~ msgstr "保存配置失败。"
-
-#, fuzzy
 #~ msgid "Failed to queue a leave notification\n"
 #~ msgstr "保存配置失败。"
 
 #, fuzzy
-#~ msgid "Configuration fails to specify `%s' in section `%s'\n"
-#~ msgstr "配置文件“%s”已写入。\n"
-
-#, fuzzy
 #~ msgid "Configuration fails to specify `%s', assuming default value."
 #~ msgstr "配置文件“%s”已写入。\n"
 

Modified: gnunet/src/util/mq.c
===================================================================
--- gnunet/src/util/mq.c        2014-06-04 16:03:17 UTC (rev 33521)
+++ gnunet/src/util/mq.c        2014-06-04 16:38:42 UTC (rev 33522)
@@ -791,6 +791,9 @@
 
   if (NULL != mq->current_envelope)
   {
+    /* we can only discard envelopes that
+     * are not queued! */
+    mq->current_envelope->parent_queue = NULL;
     GNUNET_MQ_discard (mq->current_envelope);
     mq->current_envelope = NULL;
   }




reply via email to

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