-fix misc disting issues

9 files changed, 3675 insertions, 3453 deletions

diff --git a/Makefile.am b/Makefile.am
index d7f4541d6..0fbb50ddc 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -17,7 +17,7 @@ doc_DATA = COPYING README
 ACLOCAL_AMFLAGS = -I m4
 
 ChangeLog:
-        if test -f $(top_srcdir)/.svn/entries; then \
+        if svn info > /dev/null; then \
                 svn log -v --xml -r HEAD:18409 | \
                         xsltproc --stringparam ignore-message-starting "-" \
                                  --stringparam strip-prefix "gnunet" \
diff --git a/po/de.po b/po/de.po
index 7ccce0928..bddca7be8 100644
--- a/po/de.po
+++ b/po/de.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: GNUnet 0.7.0b\n"
 "Report-Msgid-Bugs-To: gnunet-developers@mail.gnu.org\n"
-"POT-Creation-Date: 2015-01-27 19:22+0100\n"
+"POT-Creation-Date: 2015-03-07 12:06+0100\n"
 "PO-Revision-Date: 2006-03-17 21:37+0100\n"
 "Last-Translator: Nils Durner <durner@gnunet.org>\n"
 "Language-Team: German <de@li.org>\n"
@@ -333,150 +333,138 @@ msgstr ""
 msgid "Initiating shutdown as requested by client.\n"
 msgstr ""
 
-#: src/ats/gnunet-ats-solver-eval.c:2810 src/ats/gnunet-ats-solver-eval.c:2851
-#: src/ats/gnunet-service-ats_addresses.c:1635
-#: src/ats/gnunet-service-ats_addresses.c:1683
+#: src/ats/gnunet-ats-solver-eval.c:2778 src/ats/gnunet-ats-solver-eval.c:2819
 #, c-format
 msgid ""
 "Could not load quota for network `%s':  `%s', assigning default bandwidth "
 "%llu\n"
 msgstr ""
 
-#: src/ats/gnunet-ats-solver-eval.c:2828
-#: src/ats/gnunet-service-ats_addresses.c:1653
+#: src/ats/gnunet-ats-solver-eval.c:2796
 #, c-format
 msgid ""
 "No outbound quota configured for network `%s', assigning default bandwidth "
 "%llu\n"
 msgstr ""
 
-#: src/ats/gnunet-ats-solver-eval.c:2869
-#: src/ats/gnunet-service-ats_addresses.c:1701
+#: src/ats/gnunet-ats-solver-eval.c:2837
 #, c-format
 msgid ""
 "No outbound quota configure for network `%s', assigning default bandwidth "
 "%llu\n"
 msgstr ""
 
-#: src/ats/gnunet-ats-solver-eval.c:3434
+#: src/ats/gnunet-ats-solver-eval.c:3290
 #: src/ats-tests/gnunet-solver-eval.c:918
 msgid "solver to use"
 msgstr ""
 
-#: src/ats/gnunet-ats-solver-eval.c:3437
+#: src/ats/gnunet-ats-solver-eval.c:3293
 #: src/ats-tests/gnunet-solver-eval.c:921
 #: src/ats-tests/gnunet-solver-eval.c:924
 msgid "experiment to use"
 msgstr ""
 
-#: src/ats/gnunet-ats-solver-eval.c:3440
+#: src/ats/gnunet-ats-solver-eval.c:3296
 msgid "be verbose"
 msgstr "umfangreiche Meldungen ausgeben"
 
-#: src/ats/gnunet-ats-solver-eval.c:3443
+#: src/ats/gnunet-ats-solver-eval.c:3299
 #, fuzzy
 msgid "print logging"
 msgstr "Collection `%s' begonnen.\n"
 
-#: src/ats/gnunet-ats-solver-eval.c:3446
+#: src/ats/gnunet-ats-solver-eval.c:3302
 msgid "save logging to disk"
 msgstr ""
 
-#: src/ats/gnunet-ats-solver-eval.c:3449
+#: src/ats/gnunet-ats-solver-eval.c:3305
 msgid "disable normalization"
 msgstr ""
 
-#: src/ats/gnunet-service-ats_addresses.c:1644
+#: src/ats/gnunet-service-ats_plugins.c:304
 #, c-format
-msgid "Outbound quota configure for network `%s' is %llu\n"
+msgid ""
+"Could not load %s quota for network `%s':  `%s', assigning default bandwidth "
+"%llu\n"
 msgstr ""
 
-#: src/ats/gnunet-service-ats_addresses.c:1692
+#: src/ats/gnunet-service-ats_plugins.c:314
 #, c-format
-msgid "Inbound quota configured for network `%s' is %llu\n"
+msgid "%s quota configured for network `%s' is %llu\n"
 msgstr ""
 
-#: src/ats/gnunet-service-ats_addresses.c:1895
+#: src/ats/gnunet-service-ats_plugins.c:359
 #, c-format
-msgid "Initializing solver `%s '`%s'\n"
+msgid ""
+"No %s-quota configured for network `%s', assigning default bandwidth %llu\n"
 msgstr ""
 
-#: src/ats/gnunet-service-ats_addresses.c:1901
+#: src/ats/gnunet-service-ats_plugins.c:451
 #, 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:1926
-#, fuzzy
-msgid "Failed to initialize solver!\n"
-msgstr "SQLite Datenbank konnte nicht initialisiert werden: %s.\n"
-
-#: src/ats/plugin_ats_mlp.c:1345
+#: src/ats/plugin_ats_mlp.c:1274
 msgid "Problem size too large, cannot allocate memory!\n"
 msgstr ""
 
-#: src/ats/plugin_ats_mlp.c:1941
+#: src/ats/plugin_ats_mlp.c:1869
 #, 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:1993
-#, c-format
-msgid "Updating address property `%s' for peer `%s' %p not added before\n"
-msgstr ""
+#: src/ats/plugin_ats_mlp.c:1913
+#, fuzzy, c-format
+msgid "Updating address property for peer `%s' %p not added before\n"
+msgstr "Adresse des Knotens `%s' konnte nicht ermittelt werden.\n"
 
-#: src/ats/plugin_ats_mlp.c:2714
+#: src/ats/plugin_ats_mlp.c:2475
 msgid ""
 "MLP solver is not optimizing for anything, changing to feasibility check\n"
 msgstr ""
 
-#: src/ats/plugin_ats_mlp.c:2754 src/ats/plugin_ats_mlp.c:2771
-#: src/ats/plugin_ats_mlp.c:2803 src/ats/plugin_ats_mlp.c:2821
-#: src/ats/plugin_ats_mlp.c:2840 src/ats/plugin_ats_proportional.c:1993
-#: src/ats/plugin_ats_proportional.c:2014 src/ats/plugin_ats_ril.c:2718
-#: src/ats/plugin_ats_ril.c:2735 src/ats/plugin_ats_ril.c:2752
-#: src/ats/plugin_ats_ril.c:2769 src/ats/plugin_ats_ril.c:2786
-#: src/ats/plugin_ats_ril.c:2803 src/ats/plugin_ats_ril.c:2820
-#: src/ats/plugin_ats_ril.c:2837
+#: src/ats/plugin_ats_mlp.c:2515 src/ats/plugin_ats_mlp.c:2532
+#: src/ats/plugin_ats_mlp.c:2564 src/ats/plugin_ats_mlp.c:2582
+#: src/ats/plugin_ats_mlp.c:2601 src/ats/plugin_ats_proportional.c:1140
+#: src/ats/plugin_ats_ril.c:2613 src/ats/plugin_ats_ril.c:2630
+#: src/ats/plugin_ats_ril.c:2647 src/ats/plugin_ats_ril.c:2664
+#: src/ats/plugin_ats_ril.c:2681 src/ats/plugin_ats_ril.c:2698
+#: src/ats/plugin_ats_ril.c:2715 src/ats/plugin_ats_ril.c:2732
 #, fuzzy, c-format
 msgid "Invalid %s configuration %f \n"
 msgstr "Fehler beim Speichern der Konfigurationsdatei `%s':"
 
-#: src/ats/plugin_ats_mlp.c:2927
+#: src/ats/plugin_ats_mlp.c:2670
 #, 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:2936
+#: src/ats/plugin_ats_mlp.c:2679
 #, 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:2947
+#: src/ats/plugin_ats_mlp.c:2689
 #, c-format
 msgid ""
 "Adjusting outbound quota configuration for network `%s'from %llu to %.0f\n"
 msgstr ""
 
-#: src/ats/plugin_ats_mlp.c:2955
+#: src/ats/plugin_ats_mlp.c:2698
 #, c-format
 msgid ""
 "Adjusting inbound quota configuration for network `%s' from %llu to %.0f\n"
 msgstr ""
 
-#: src/ats/plugin_ats_mlp.c:2966
-#, c-format
-msgid "Using default quota configuration for network `%s' (in/out) %llu/%llu\n"
-msgstr ""
-
-#: src/ats/plugin_ats_proportional.c:1852
+#: src/ats/plugin_ats_proportional.c:1163
 #, fuzzy, c-format
-msgid "Invalid network type `%u' `%s': Disconnect!\n"
-msgstr "IP des Hosts `%s' konnte nicht ermittelt werden: %s\n"
+msgid "Invalid %s configuration %f\n"
+msgstr "Fehler beim Speichern der Konfigurationsdatei `%s':"
 
 #: src/ats-tests/ats-testing.c:72
 msgid "Benchmarking done\n"
@@ -511,7 +499,7 @@ msgstr ""
 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:677
+#: src/ats-tests/ats-testing.c:490 src/ats-tests/ats-testing.c:662
 #, fuzzy
 msgid "Initialization failed, shutdown\n"
 msgstr "Initialisierung des Plugin Mechanismuses fehlgeschlagen: %s!\n"
@@ -532,126 +520,126 @@ msgid ""
 "= %u KiB/s\n"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:296
+#: src/ats-tool/gnunet-ats.c:289
 #, c-format
 msgid "%u address resolutions had a timeout\n"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:300
+#: src/ats-tool/gnunet-ats.c:293
 #, c-format
 msgid "ATS returned stat_results for %u addresses\n"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:377
-msgid "active "
-msgstr ""
-
-#: src/ats-tool/gnunet-ats.c:377
-msgid "inactive "
-msgstr ""
-
-#: src/ats-tool/gnunet-ats.c:426
+#: src/ats-tool/gnunet-ats.c:366
 #, 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:543
+#: src/ats-tool/gnunet-ats.c:373
+msgid "active "
+msgstr ""
+
+#: src/ats-tool/gnunet-ats.c:373
+msgid "inactive "
+msgstr ""
+
+#: src/ats-tool/gnunet-ats.c:483
 #, fuzzy, c-format
 msgid "Removed address of peer `%s' with plugin `%s'\n"
 msgstr "Verfügbare(r) Transport(e): %s\n"
 
-#: src/ats-tool/gnunet-ats.c:744
+#: src/ats-tool/gnunet-ats.c:676
 #, c-format
 msgid "Quota for network `%11s' (in/out): %10s / %10s\n"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:776 src/namestore/gnunet-namestore.c:700
-#: src/transport/gnunet-transport.c:1843
+#: src/ats-tool/gnunet-ats.c:708 src/namestore/gnunet-namestore.c:700
+#: src/transport/gnunet-transport.c:1890
 #: src/transport/gnunet-transport-profiler.c:531
 #, fuzzy, c-format
 msgid "Service `%s' is not running\n"
 msgstr "`%s' ist keine Datei.\n"
 
-#: src/ats-tool/gnunet-ats.c:790 src/transport/gnunet-transport.c:1852
+#: src/ats-tool/gnunet-ats.c:722 src/transport/gnunet-transport.c:1899
 #: src/transport/gnunet-transport-profiler.c:549
 #, 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:800
+#: src/ats-tool/gnunet-ats.c:732
 #, c-format
 msgid "Please select one operation : %s or %s or %s or %s or %s\n"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:822 src/ats-tool/gnunet-ats.c:848
-#: src/ats-tool/gnunet-ats.c:876 src/ats-tool/gnunet-ats.c:922
+#: src/ats-tool/gnunet-ats.c:754 src/ats-tool/gnunet-ats.c:780
+#: src/ats-tool/gnunet-ats.c:808 src/ats-tool/gnunet-ats.c:854
 #, fuzzy
 msgid "Cannot connect to ATS service, exiting...\n"
 msgstr "`%s' Dienst konnte nicht initialisiert werden.\n"
 
-#: src/ats-tool/gnunet-ats.c:834 src/ats-tool/gnunet-ats.c:860
+#: src/ats-tool/gnunet-ats.c:766 src/ats-tool/gnunet-ats.c:792
 #, fuzzy
 msgid "Cannot issue request to ATS service, exiting...\n"
 msgstr "`%s' Dienst konnte nicht initialisiert werden.\n"
 
-#: src/ats-tool/gnunet-ats.c:888
+#: src/ats-tool/gnunet-ats.c:820
 #, fuzzy
 msgid "No preference type given!\n"
 msgstr "Informationen über andere GNUnet Knoten ausgeben."
 
-#: src/ats-tool/gnunet-ats.c:895
+#: src/ats-tool/gnunet-ats.c:827
 msgid "No peer given!\n"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:913
+#: src/ats-tool/gnunet-ats.c:845
 msgid "Valid type required\n"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:981
+#: src/ats-tool/gnunet-ats.c:916
 msgid "get list of active addresses currently used"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:983
+#: src/ats-tool/gnunet-ats.c:918
 msgid "get list of all active addresses"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:986
+#: src/ats-tool/gnunet-ats.c:921
 #, 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:988
+#: src/ats-tool/gnunet-ats.c:923
 msgid "monitor mode"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:990
+#: src/ats-tool/gnunet-ats.c:925
 #, fuzzy
 msgid "set preference for the given peer"
 msgstr "Informationen über andere GNUnet Knoten ausgeben."
 
-#: src/ats-tool/gnunet-ats.c:992
+#: src/ats-tool/gnunet-ats.c:927
 msgid "print all configured quotas"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:994
+#: src/ats-tool/gnunet-ats.c:929
 msgid "peer id"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:997
+#: src/ats-tool/gnunet-ats.c:932
 msgid "preference type to set: latency | bandwidth"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:999
+#: src/ats-tool/gnunet-ats.c:934
 msgid "preference value"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:1002
+#: src/ats-tool/gnunet-ats.c:937
 msgid "verbose output (include ATS address properties)"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:1009
+#: src/ats-tool/gnunet-ats.c:944
 #, fuzzy
 msgid "Print information about ATS state"
 msgstr "Informationen über andere GNUnet Knoten ausgeben."
@@ -1263,7 +1251,7 @@ msgstr "Ungültige Kommandozeilen Parameter:\n"
 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:2104
+#: src/core/gnunet-core.c:179 src/transport/gnunet-transport.c:2154
 #, fuzzy
 msgid "provide information about all current connections (continuously)"
 msgstr "Informationen über andere GNUnet Knoten ausgeben."
@@ -1298,150 +1286,150 @@ msgstr "# defragmentierter Nachrichten"
 msgid "# bytes of messages of type %u received"
 msgstr "# Bytes Rauschen empfangen"
 
-#: src/core/gnunet-service-core_kx.c:565
+#: src/core/gnunet-service-core_kx.c:571
 msgid "# bytes encrypted"
 msgstr "# Bytes verschlüsselt"
 
-#: src/core/gnunet-service-core_kx.c:617
+#: src/core/gnunet-service-core_kx.c:630
 msgid "# bytes decrypted"
 msgstr "# Bytes entschlüsselt"
 
-#: src/core/gnunet-service-core_kx.c:703
+#: src/core/gnunet-service-core_kx.c:719
 msgid "# key exchanges initiated"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:747
+#: src/core/gnunet-service-core_kx.c:763
 msgid "# key exchanges stopped"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:848
+#: src/core/gnunet-service-core_kx.c:864
 msgid "# old ephemeral keys ignored"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:855
+#: src/core/gnunet-service-core_kx.c:871
 #, fuzzy
 msgid "# ephemeral keys received"
 msgstr "# verschlüsselter PING Nachrichten empfangen"
 
-#: src/core/gnunet-service-core_kx.c:889
+#: src/core/gnunet-service-core_kx.c:910
 #, 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:900
+#: src/core/gnunet-service-core_kx.c:921
 #, fuzzy
 msgid "# EPHEMERAL_KEY messages received"
 msgstr "# defragmentierter Nachrichten"
 
-#: src/core/gnunet-service-core_kx.c:999
-#: src/transport/gnunet-service-transport_validation.c:1062
+#: src/core/gnunet-service-core_kx.c:1020
+#: src/transport/gnunet-service-transport_validation.c:1053
 #, fuzzy
 msgid "# PING messages received"
 msgstr "# PING Nachrichten erstellt"
 
-#: src/core/gnunet-service-core_kx.c:1007
+#: src/core/gnunet-service-core_kx.c:1028
 #, fuzzy
 msgid "# PING messages dropped (out of order)"
 msgstr "# gap Anfragen verworfen: Kollision in RT"
 
-#: src/core/gnunet-service-core_kx.c:1034
+#: src/core/gnunet-service-core_kx.c:1056
 #, 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:1050
+#: src/core/gnunet-service-core_kx.c:1082
 #, fuzzy
 msgid "# PONG messages created"
 msgstr "# PING Nachrichten erstellt"
 
-#: src/core/gnunet-service-core_kx.c:1077
+#: src/core/gnunet-service-core_kx.c:1111
 #, fuzzy
 msgid "# sessions terminated by timeout"
 msgstr "# Bytes verworfen von TCP (ausgehend)"
 
-#: src/core/gnunet-service-core_kx.c:1088
+#: src/core/gnunet-service-core_kx.c:1124
 #, fuzzy
 msgid "# keepalive messages sent"
 msgstr "# Klartext PING Nachrichten gesendet"
 
-#: src/core/gnunet-service-core_kx.c:1156
-#: src/transport/gnunet-service-transport_validation.c:1406
+#: src/core/gnunet-service-core_kx.c:1195
+#: src/transport/gnunet-service-transport_validation.c:1370
 #, fuzzy
 msgid "# PONG messages received"
 msgstr "# verschlüsselter PONG Nachrichten empfangen"
 
-#: src/core/gnunet-service-core_kx.c:1162
+#: src/core/gnunet-service-core_kx.c:1201
 #, fuzzy
 msgid "# PONG messages dropped (connection down)"
 msgstr "# verschlüsselter PONG Nachrichten empfangen"
 
-#: src/core/gnunet-service-core_kx.c:1167
+#: src/core/gnunet-service-core_kx.c:1206
 #, fuzzy
 msgid "# PONG messages dropped (out of order)"
 msgstr "# gap Anfragen verworfen: Kollision in RT"
 
-#: src/core/gnunet-service-core_kx.c:1197
+#: src/core/gnunet-service-core_kx.c:1236
 #, fuzzy
 msgid "# PONG messages decrypted"
 msgstr "# PING Nachrichten erstellt"
 
-#: src/core/gnunet-service-core_kx.c:1232
+#: src/core/gnunet-service-core_kx.c:1271
 #, fuzzy
 msgid "# session keys confirmed via PONG"
 msgstr "# Knotenankündigungen empfangen"
 
-#: src/core/gnunet-service-core_kx.c:1243
+#: src/core/gnunet-service-core_kx.c:1282
 #, fuzzy
 msgid "# timeouts prevented via PONG"
 msgstr "# Bytes empfangen über TCP"
 
-#: src/core/gnunet-service-core_kx.c:1250
+#: src/core/gnunet-service-core_kx.c:1289
 #, fuzzy
 msgid "# rekey operations confirmed via PONG"
 msgstr "# Knotenankündigungen empfangen"
 
-#: src/core/gnunet-service-core_kx.c:1392
+#: src/core/gnunet-service-core_kx.c:1431
 #, fuzzy
 msgid "# DATA message dropped (out of order)"
 msgstr "# Bytes verworfen von UDP (outgoing)"
 
-#: src/core/gnunet-service-core_kx.c:1399
+#: src/core/gnunet-service-core_kx.c:1438
 #, 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:1402
+#: src/core/gnunet-service-core_kx.c:1441
 #, fuzzy
 msgid "# sessions terminated by key expiration"
 msgstr "# Bytes verworfen von TCP (ausgehend)"
 
-#: src/core/gnunet-service-core_kx.c:1448
-#: src/core/gnunet-service-core_kx.c:1473
+#: src/core/gnunet-service-core_kx.c:1487
+#: src/core/gnunet-service-core_kx.c:1512
 #, fuzzy
 msgid "# bytes dropped (duplicates)"
 msgstr "# Bytes verworfen von UDP (outgoing)"
 
-#: src/core/gnunet-service-core_kx.c:1460
+#: src/core/gnunet-service-core_kx.c:1499
 #, fuzzy
 msgid "# bytes dropped (out of sequence)"
 msgstr "# Bytes verworfen von UDP (outgoing)"
 
-#: src/core/gnunet-service-core_kx.c:1502
+#: src/core/gnunet-service-core_kx.c:1541
 #, fuzzy
 msgid "# bytes dropped (ancient message)"
 msgstr "# Bytes verworfen von UDP (outgoing)"
 
-#: src/core/gnunet-service-core_kx.c:1510
+#: src/core/gnunet-service-core_kx.c:1549
 #, fuzzy
 msgid "# bytes of payload decrypted"
 msgstr "# Bytes entschlüsselt"
 
-#: src/core/gnunet-service-core_kx.c:1545
+#: src/core/gnunet-service-core_kx.c:1584
 #, fuzzy
 msgid "# PAYLOAD dropped (out of order)"
 msgstr "# Bytes verworfen von UDP (outgoing)"
@@ -1469,13 +1457,11 @@ msgstr "Ungültige Nachricht des Typs %u empfangen. Nachricht wird verworfen.\n"
 #: src/core/gnunet-service-core_sessions.c:328
 #: src/dht/gnunet-service-dht_neighbours.c:661
 #: src/dht/gnunet-service-dht_neighbours.c:726
-#: src/fs/gnunet-service-fs_cp.c:629 src/fs/gnunet-service-fs_cp.c:1571
+#: src/fs/gnunet-service-fs_cp.c:645 src/fs/gnunet-service-fs_cp.c:1627
 #: src/topology/gnunet-daemon-topology.c:734
 #: src/topology/gnunet-daemon-topology.c:835
-#: src/transport/gnunet-service-transport_neighbours.c:954
-#: src/transport/gnunet-service-transport_neighbours.c:1180
-#: src/transport/gnunet-service-transport_neighbours.c:3211
-#: src/transport/gnunet-service-transport_neighbours.c:3510
+#: src/transport/gnunet-service-transport_neighbours.c:754
+#: src/transport/gnunet-service-transport_neighbours.c:762
 #, fuzzy
 msgid "# peers connected"
 msgstr "# verbundener Knoten"
@@ -1521,8 +1507,8 @@ msgid "# items stored"
 msgstr "# bytes in der Datenbank"
 
 #: src/datacache/datacache.c:143 src/datacache/datacache.c:150
-#: src/datastore/gnunet-service-datastore.c:1554
-#: src/datastore/gnunet-service-datastore.c:1565
+#: src/datastore/gnunet-service-datastore.c:1557
+#: src/datastore/gnunet-service-datastore.c:1568
 #, fuzzy, c-format
 msgid "No `%s' specified for `%s' in configuration!\n"
 msgstr "In der Konfigurationsdatei wurden keine Anwendungen definiert!\n"
@@ -1571,8 +1557,8 @@ msgstr ""
 #: 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:624
-#: src/include/gnunet_common.h:633 src/scalarproduct/scalarproduct.h:35
+#: src/util/crypto_mpi.c:39 src/include/gnunet_common.h:626
+#: src/include/gnunet_common.h:635 src/scalarproduct/scalarproduct.h:35
 #, c-format
 msgid "`%s' failed at %s:%d with error: %s\n"
 msgstr "`%s' schlug bei %s:%d mit dem Fehler %s fehl\n"
@@ -1679,13 +1665,6 @@ msgstr "# dht Anfragen weitergeleitet"
 msgid "# REMOVE requests executed"
 msgstr "# dht Anfragen weitergeleitet"
 
-#: src/datastore/datastore_api.c:1189
-#, fuzzy
-msgid "Failed to receive response from database.\n"
-msgstr ""
-"\n"
-"Fehler beim Empfangen der Antwort von gnunetd.\n"
-
 #: src/datastore/datastore_api.c:1248
 #, fuzzy
 msgid "# Results received"
@@ -1776,7 +1755,7 @@ msgstr ""
 #: src/datastore/gnunet-service-datastore.c:712
 #: src/datastore/gnunet-service-datastore.c:767
 #: src/datastore/gnunet-service-datastore.c:982
-#: src/datastore/gnunet-service-datastore.c:1526
+#: src/datastore/gnunet-service-datastore.c:1529
 msgid "# reserved"
 msgstr ""
 
@@ -1860,31 +1839,31 @@ msgstr ""
 msgid "Bloomfilter construction complete.\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1559
+#: src/datastore/gnunet-service-datastore.c:1562
 #, fuzzy, c-format
 msgid "# bytes used in file-sharing datastore `%s'"
 msgstr "# bytes erlaubt in der Datenbank"
 
-#: src/datastore/gnunet-service-datastore.c:1570
+#: src/datastore/gnunet-service-datastore.c:1573
 msgid "# quota"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1572
+#: src/datastore/gnunet-service-datastore.c:1575
 msgid "# cache size"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1585
+#: src/datastore/gnunet-service-datastore.c:1588
 #, c-format
 msgid "Could not use specified filename `%s' for bloomfilter.\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1603
-#: src/datastore/gnunet-service-datastore.c:1619
+#: src/datastore/gnunet-service-datastore.c:1606
+#: src/datastore/gnunet-service-datastore.c:1622
 #, fuzzy, c-format
 msgid "Failed to remove bogus bloomfilter file `%s'\n"
 msgstr "Fehler beim Speichern der Konfigurationsdatei `%s':"
 
-#: src/datastore/gnunet-service-datastore.c:1649
+#: src/datastore/gnunet-service-datastore.c:1652
 #, fuzzy
 msgid "Failed to initialize bloomfilter.\n"
 msgstr "SQLite Datenbank konnte nicht initialisiert werden.\n"
@@ -2132,25 +2111,25 @@ msgid "Failed to connect to transport service!\n"
 msgstr "Der Transportdienst auf Port %d konnte nicht gestartet werden.\n"
 
 #: src/dht/gnunet-service-dht_clients.c:417
-#: src/dht/gnunet-service-xdht_clients.c:844
+#: src/dht/gnunet-service-xdht_clients.c:849
 #, fuzzy
 msgid "# GET requests from clients injected"
 msgstr "# Client Trace-Anfragen empfangen"
 
 #: src/dht/gnunet-service-dht_clients.c:513
-#: src/dht/gnunet-service-xdht_clients.c:928
+#: src/dht/gnunet-service-xdht_clients.c:933
 #, 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:993
+#: src/dht/gnunet-service-xdht_clients.c:998
 #, 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:1195
+#: src/dht/gnunet-service-xdht_clients.c:1200
 #, fuzzy
 msgid "# GET STOP requests received from clients"
 msgstr "Empfangene Client-Nachricht ist ungültig.\n"
@@ -2165,27 +2144,27 @@ msgstr ""
 msgid "# Duplicate REPLIES to CLIENT request dropped"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_clients.c:1090
-#: src/dht/gnunet-service-xdht_clients.c:554
+#: src/dht/gnunet-service-dht_clients.c:1098
+#: src/dht/gnunet-service-xdht_clients.c:559
 #, 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:1113
-#: src/dht/gnunet-service-xdht_clients.c:577
+#: src/dht/gnunet-service-dht_clients.c:1121
+#: src/dht/gnunet-service-xdht_clients.c:582
 #, fuzzy
 msgid "# RESULTS queued for clients"
 msgstr "Empfangene Client-Nachricht ist ungültig.\n"
 
-#: src/dht/gnunet-service-dht_clients.c:1167
-#: src/dht/gnunet-service-dht_clients.c:1210
-#: src/dht/gnunet-service-xdht_clients.c:631
-#: src/dht/gnunet-service-xdht_clients.c:674
+#: src/dht/gnunet-service-dht_clients.c:1175
+#: src/dht/gnunet-service-dht_clients.c:1218
+#: src/dht/gnunet-service-xdht_clients.c:636
+#: src/dht/gnunet-service-xdht_clients.c:679
 msgid "# REPLIES ignored for CLIENTS (no match)"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_clients.c:1177
-#: src/dht/gnunet-service-xdht_clients.c:641
+#: src/dht/gnunet-service-dht_clients.c:1185
+#: src/dht/gnunet-service-xdht_clients.c:646
 #, fuzzy
 msgid "Could not pass reply to client, message too big!\n"
 msgstr "'join' Nachricht konnte nicht an gnunetd gesendet werden.\n"
@@ -2201,39 +2180,39 @@ msgstr "# Bytes empfangen über TCP"
 msgid "# ITEMS stored in datacache"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_datacache.c:165
-#: src/dht/gnunet-service-xdht_datacache.c:221
+#: src/dht/gnunet-service-dht_datacache.c:173
+#: src/dht/gnunet-service-xdht_datacache.c:230
 msgid "# Good RESULTS found in datacache"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_datacache.c:176
-#: src/dht/gnunet-service-xdht_datacache.c:244
+#: src/dht/gnunet-service-dht_datacache.c:184
+#: src/dht/gnunet-service-xdht_datacache.c:253
 msgid "# Duplicate RESULTS found in datacache"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_datacache.c:182
-#: src/dht/gnunet-service-xdht_datacache.c:250
+#: src/dht/gnunet-service-dht_datacache.c:190
+#: src/dht/gnunet-service-xdht_datacache.c:259
 msgid "# Invalid RESULTS found in datacache"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_datacache.c:188
-#: src/dht/gnunet-service-xdht_datacache.c:256
+#: src/dht/gnunet-service-dht_datacache.c:196
+#: src/dht/gnunet-service-xdht_datacache.c:265
 msgid "# Irrelevant RESULTS found in datacache"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_datacache.c:200
-#: src/dht/gnunet-service-xdht_datacache.c:268
+#: src/dht/gnunet-service-dht_datacache.c:208
+#: src/dht/gnunet-service-xdht_datacache.c:277
 msgid "# Unsupported RESULTS found in datacache"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_datacache.c:203
-#: src/dht/gnunet-service-xdht_datacache.c:271
+#: src/dht/gnunet-service-dht_datacache.c:211
+#: src/dht/gnunet-service-xdht_datacache.c:280
 #, 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:309
+#: src/dht/gnunet-service-dht_datacache.c:242
+#: src/dht/gnunet-service-xdht_datacache.c:318
 #, fuzzy
 msgid "# GET requests given to datacache"
 msgstr "# Client Trace-Anfragen empfangen"
@@ -2254,7 +2233,7 @@ msgid "# FIND PEER messages initiated"
 msgstr "# PING Nachrichten erstellt"
 
 #: src/dht/gnunet-service-dht_neighbours.c:763
-#: src/dht/gnunet-service-xdht_neighbours.c:6059
+#: src/dht/gnunet-service-xdht_neighbours.c:6060
 #, fuzzy
 msgid "# Queued messages discarded (peer disconnected)"
 msgstr "# defragmentierter Nachrichten"
@@ -2343,40 +2322,40 @@ msgstr "# Client Trace-Anfragen empfangen"
 msgid "# P2P PUT bytes received"
 msgstr "# Client Trace-Anfragen empfangen"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1825
+#: src/dht/gnunet-service-dht_neighbours.c:1826
 msgid "# FIND PEER requests ignored due to Bloomfilter"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1833
+#: src/dht/gnunet-service-dht_neighbours.c:1834
 msgid "# FIND PEER requests ignored due to lack of HELLO"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1928
+#: src/dht/gnunet-service-dht_neighbours.c:1929
 #, fuzzy
 msgid "# P2P GET requests received"
 msgstr "# Client Trace-Anfragen empfangen"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1931
+#: src/dht/gnunet-service-dht_neighbours.c:1932
 #, fuzzy
 msgid "# P2P GET bytes received"
 msgstr "# Client Trace-Anfragen empfangen"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1988
+#: src/dht/gnunet-service-dht_neighbours.c:1997
 #, fuzzy
 msgid "# P2P FIND PEER requests processed"
 msgstr "# Client Trace-Anfragen empfangen"
 
-#: src/dht/gnunet-service-dht_neighbours.c:2002
+#: src/dht/gnunet-service-dht_neighbours.c:2011
 #, fuzzy
 msgid "# P2P GET requests ONLY routed"
 msgstr "# dht Anfragen weitergeleitet"
 
-#: src/dht/gnunet-service-dht_neighbours.c:2087
+#: src/dht/gnunet-service-dht_neighbours.c:2096
 #, fuzzy
 msgid "# P2P RESULTS received"
 msgstr "# Bytes empfangen über TCP"
 
-#: src/dht/gnunet-service-dht_neighbours.c:2090
+#: src/dht/gnunet-service-dht_neighbours.c:2099
 #, fuzzy
 msgid "# P2P RESULT bytes received"
 msgstr "# Bytes empfangen über TCP"
@@ -2386,35 +2365,35 @@ msgstr "# Bytes empfangen über TCP"
 msgid "# Network size estimates received"
 msgstr "# Client Trace-Anfragen empfangen"
 
-#: src/dht/gnunet-service-dht_routing.c:211
+#: src/dht/gnunet-service-dht_routing.c:218
 msgid "# Good REPLIES matched against routing table"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_routing.c:220
+#: src/dht/gnunet-service-dht_routing.c:227
 msgid "# Duplicate REPLIES matched against routing table"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_routing.c:226
+#: src/dht/gnunet-service-dht_routing.c:233
 msgid "# Invalid REPLIES matched against routing table"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_routing.c:232
+#: src/dht/gnunet-service-dht_routing.c:239
 msgid "# Irrelevant REPLIES matched against routing table"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_routing.c:244
+#: src/dht/gnunet-service-dht_routing.c:251
 msgid "# Unsupported REPLIES matched against routing table"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_routing.c:317
+#: src/dht/gnunet-service-dht_routing.c:324
 msgid "# Entries removed from routing table"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_routing.c:399
+#: src/dht/gnunet-service-dht_routing.c:406
 msgid "# Entries added to routing table"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_routing.c:417
+#: src/dht/gnunet-service-dht_routing.c:424
 #, fuzzy
 msgid "# DHT requests combined"
 msgstr "# Client Trace-Anfragen empfangen"
@@ -2480,17 +2459,17 @@ msgid "# FINGERS_COUNT"
 msgstr ""
 
 #: src/dht/gnunet-service-xdht_neighbours.c:3700
-#: src/dht/gnunet-service-xdht_neighbours.c:3937
-#: src/dht/gnunet-service-xdht_neighbours.c:4089
-#: src/dht/gnunet-service-xdht_neighbours.c:4239
-#: src/dht/gnunet-service-xdht_neighbours.c:4420
-#: src/dht/gnunet-service-xdht_neighbours.c:4933
-#: src/dht/gnunet-service-xdht_neighbours.c:5326
-#: src/dht/gnunet-service-xdht_neighbours.c:5419
-#: src/dht/gnunet-service-xdht_neighbours.c:5509
-#: src/dht/gnunet-service-xdht_neighbours.c:5613
-#: src/dht/gnunet-service-xdht_neighbours.c:5757
-#: src/dht/gnunet-service-xdht_neighbours.c:5846
+#: src/dht/gnunet-service-xdht_neighbours.c:3938
+#: src/dht/gnunet-service-xdht_neighbours.c:4090
+#: src/dht/gnunet-service-xdht_neighbours.c:4240
+#: src/dht/gnunet-service-xdht_neighbours.c:4421
+#: src/dht/gnunet-service-xdht_neighbours.c:4934
+#: src/dht/gnunet-service-xdht_neighbours.c:5327
+#: src/dht/gnunet-service-xdht_neighbours.c:5420
+#: src/dht/gnunet-service-xdht_neighbours.c:5510
+#: src/dht/gnunet-service-xdht_neighbours.c:5614
+#: src/dht/gnunet-service-xdht_neighbours.c:5758
+#: src/dht/gnunet-service-xdht_neighbours.c:5847
 #, fuzzy
 msgid "# Bytes received from other peers"
 msgstr "# Bytes des Typs %d empfangen"
@@ -2523,16 +2502,16 @@ msgid ""
 "SUPU %s, %s, %d, trail->prev_hop = %s"
 msgstr ""
 
-#: src/dht/plugin_block_dht.c:138
+#: src/dht/plugin_block_dht.c:142
 #, fuzzy, c-format
 msgid "Block not of type %u\n"
 msgstr "Kein Transport des Typs %d bekannt.\n"
 
-#: src/dht/plugin_block_dht.c:145
+#: src/dht/plugin_block_dht.c:149
 msgid "Size mismatch for block\n"
 msgstr ""
 
-#: src/dht/plugin_block_dht.c:155
+#: src/dht/plugin_block_dht.c:159
 #, c-format
 msgid "Block of type %u is malformed\n"
 msgstr ""
@@ -2885,7 +2864,7 @@ msgid "# acknowledgements sent for fragment"
 msgstr ""
 
 #: src/fragmentation/defragmentation.c:456
-#: src/transport/plugin_transport_wlan.c:1517
+#: src/transport/plugin_transport_wlan.c:1515
 #, fuzzy
 msgid "# fragments received"
 msgstr "# verworfener Nachrichten"
@@ -3689,8 +3668,8 @@ msgid "Option `%s' is required when using option `%s'.\n"
 msgstr "Option `%s' macht keinen Sinn ohne die Option `%s'.\n"
 
 #: src/fs/gnunet-publish.c:837 src/fs/gnunet-publish.c:845
-#: src/transport/gnunet-transport.c:1881 src/transport/gnunet-transport.c:1911
-#: src/transport/gnunet-transport.c:1942
+#: src/transport/gnunet-transport.c:1928 src/transport/gnunet-transport.c:1958
+#: src/transport/gnunet-transport.c:1989
 #, c-format
 msgid "Option `%s' makes no sense without option `%s'.\n"
 msgstr "Option `%s' macht keinen Sinn ohne die Option `%s'.\n"
@@ -3798,21 +3777,21 @@ msgstr ""
 msgid "Search GNUnet for files that were published on GNUnet"
 msgstr ""
 
-#: src/fs/gnunet-service-fs.c:285
+#: src/fs/gnunet-service-fs.c:274
 msgid "# running average P2P latency (ms)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs.c:344 src/fs/gnunet-service-fs.c:607
+#: src/fs/gnunet-service-fs.c:332 src/fs/gnunet-service-fs.c:595
 #, fuzzy
 msgid "# Loopback routes suppressed"
 msgstr "# gap Routing erfolgreich (insgesamt)"
 
-#: src/fs/gnunet-service-fs.c:731
+#: src/fs/gnunet-service-fs.c:719
 #, fuzzy
 msgid "FS service is lacking HOSTKEY configuration setting.  Exiting.\n"
 msgstr "GNUnet Konfiguration"
 
-#: src/fs/gnunet-service-fs.c:757 src/hostlist/gnunet-daemon-hostlist.c:311
+#: src/fs/gnunet-service-fs.c:745 src/hostlist/gnunet-daemon-hostlist.c:311
 #: src/sensordashboard/gnunet-service-sensordashboard.c:864
 #: src/sensordashboard/gnunet-service-sensordashboard.c:872
 #: src/topology/gnunet-daemon-topology.c:1287
@@ -3857,95 +3836,100 @@ msgstr "GNUnet Konfiguration"
 msgid "# cadet connections active"
 msgstr "# verbundener Knoten"
 
-#: src/fs/gnunet-service-fs_cp.c:710
+#: src/fs/gnunet-service-fs_cp.c:726
 #, fuzzy
 msgid "# migration stop messages received"
 msgstr "# verschlüsselter PING Nachrichten empfangen"
 
-#: src/fs/gnunet-service-fs_cp.c:714
+#: src/fs/gnunet-service-fs_cp.c:730
 #, c-format
 msgid "Migration of content to peer `%s' blocked for %s\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:750
+#: src/fs/gnunet-service-fs_cp.c:768
 #, fuzzy
 msgid "# replies transmitted to other peers"
 msgstr "# Bytes des Typs %d übertragen"
 
-#: src/fs/gnunet-service-fs_cp.c:756
+#: src/fs/gnunet-service-fs_cp.c:774
 msgid "# replies dropped"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:781 src/fs/gnunet-service-fs_cp.c:1337
+#: src/fs/gnunet-service-fs_cp.c:799 src/fs/gnunet-service-fs_cp.c:1384
 msgid "# P2P searches active"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:878
+#: src/fs/gnunet-service-fs_cp.c:904
 msgid "# artificial delays introduced (ms)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:934
+#: src/fs/gnunet-service-fs_cp.c:960
 #, fuzzy
 msgid "# replies dropped due to type mismatch"
 msgstr "# gap Anfragen verworfen: Kollision in RT"
 
-#: src/fs/gnunet-service-fs_cp.c:942
+#: src/fs/gnunet-service-fs_cp.c:968
 #, fuzzy
 msgid "# replies received for other peers"
 msgstr "# Bytes des Typs %d empfangen"
 
-#: src/fs/gnunet-service-fs_cp.c:956
+#: src/fs/gnunet-service-fs_cp.c:982
 msgid "# replies dropped due to insufficient cover traffic"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:994
+#: src/fs/gnunet-service-fs_cp.c:1030
 msgid "# P2P searches destroyed due to ultimate reply"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1062
+#: src/fs/gnunet-service-fs_cp.c:1098
 #, fuzzy
 msgid "# requests done for free (low load)"
 msgstr "# gap Anfragen verworfen: Kollision in RT"
 
-#: src/fs/gnunet-service-fs_cp.c:1087
+#: src/fs/gnunet-service-fs_cp.c:1123
 msgid "# request dropped, priority insufficient"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1097
+#: src/fs/gnunet-service-fs_cp.c:1133
 #, fuzzy
 msgid "# requests done for a price (normal load)"
 msgstr "# gap Anfragen verworfen: Kollision in RT"
 
-#: src/fs/gnunet-service-fs_cp.c:1175
+#: src/fs/gnunet-service-fs_cp.c:1210
 msgid "# GET requests received (from other peers)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1209
+#: src/fs/gnunet-service-fs_cp.c:1245
 #, fuzzy
 msgid "# requests dropped due to initiator not being connected"
 msgstr "# gap Anfragen verworfen: Kollision in RT"
 
-#: src/fs/gnunet-service-fs_cp.c:1231
+#: src/fs/gnunet-service-fs_cp.c:1266
 #, fuzzy
 msgid "# requests dropped due to missing reverse route"
 msgstr "# gap Anfragen verworfen: Kollision in RT"
 
-#: src/fs/gnunet-service-fs_cp.c:1282
+#: src/fs/gnunet-service-fs_cp.c:1277
+#, fuzzy
+msgid "# requests dropped due to full reply queue"
+msgstr "# gap Anfragen verworfen: Kollision in RT"
+
+#: src/fs/gnunet-service-fs_cp.c:1329
 #, fuzzy
 msgid "# requests dropped due TTL underflow"
 msgstr "# gap Anfragen verworfen: Kollision in RT"
 
-#: src/fs/gnunet-service-fs_cp.c:1306
+#: src/fs/gnunet-service-fs_cp.c:1353
 #, fuzzy
 msgid "# requests dropped due to higher-TTL request"
 msgstr "# gap Anfragen verworfen: Kollision in RT"
 
-#: src/fs/gnunet-service-fs_cp.c:1335
+#: src/fs/gnunet-service-fs_cp.c:1382
 #, fuzzy
 msgid "# P2P query messages received and processed"
 msgstr "# verschlüsselter PING Nachrichten empfangen"
 
-#: src/fs/gnunet-service-fs_cp.c:1754
+#: src/fs/gnunet-service-fs_cp.c:1821
 #, fuzzy
 msgid "# migration stop messages sent"
 msgstr "# verschlüsselter PING Nachrichten empfangen"
@@ -4064,103 +4048,103 @@ msgstr "# Client Trace-Anfragen empfangen"
 msgid "# Pending requests active"
 msgstr "# Client Trace-Anfragen empfangen"
 
-#: src/fs/gnunet-service-fs_pr.c:814
+#: src/fs/gnunet-service-fs_pr.c:820
 #, fuzzy
 msgid "# replies received and matched"
 msgstr "# Bytes empfangen über TCP"
 
-#: src/fs/gnunet-service-fs_pr.c:844
+#: src/fs/gnunet-service-fs_pr.c:857
 msgid "# duplicate replies discarded (bloomfilter)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:853
+#: src/fs/gnunet-service-fs_pr.c:866
 msgid "# irrelevant replies discarded"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:867
+#: src/fs/gnunet-service-fs_pr.c:881
 #, c-format
 msgid "Unsupported block type %u\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:880
+#: src/fs/gnunet-service-fs_pr.c:898
 msgid "# results found locally"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1003
+#: src/fs/gnunet-service-fs_pr.c:1028
 msgid "# Datastore `PUT' failures"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1031
+#: src/fs/gnunet-service-fs_pr.c:1056
 #, fuzzy
 msgid "# storage requests dropped due to high load"
 msgstr "# gap Anfragen verworfen: Kollision in RT"
 
-#: src/fs/gnunet-service-fs_pr.c:1069
+#: src/fs/gnunet-service-fs_pr.c:1094
 #, fuzzy
 msgid "# Replies received from DHT"
 msgstr "# Bytes empfangen über HTTP"
 
-#: src/fs/gnunet-service-fs_pr.c:1200
+#: src/fs/gnunet-service-fs_pr.c:1226
 #, fuzzy
 msgid "# Replies received from CADET"
 msgstr "# Bytes empfangen über HTTP"
 
-#: src/fs/gnunet-service-fs_pr.c:1252
+#: src/fs/gnunet-service-fs_pr.c:1279
 #, c-format
 msgid "Datastore lookup already took %s!\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1272
+#: src/fs/gnunet-service-fs_pr.c:1299
 #, c-format
 msgid "On-demand lookup already took %s!\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1319
+#: src/fs/gnunet-service-fs_pr.c:1351
 msgid "# Datastore lookups concluded (no results)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1334
+#: src/fs/gnunet-service-fs_pr.c:1366
 msgid "# Datastore lookups concluded (seen all)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1343
+#: src/fs/gnunet-service-fs_pr.c:1375
 msgid "# Datastore lookups aborted (more than MAX_RESULTS)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1358
+#: src/fs/gnunet-service-fs_pr.c:1390
 msgid "# requested DBLOCK or IBLOCK not found"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1372
+#: src/fs/gnunet-service-fs_pr.c:1404
 msgid "# on-demand blocks matched requests"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1385
+#: src/fs/gnunet-service-fs_pr.c:1417
 msgid "# on-demand lookups performed successfully"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1390
+#: src/fs/gnunet-service-fs_pr.c:1422
 msgid "# on-demand lookups failed"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1417 src/fs/gnunet-service-fs_pr.c:1457
-#: src/fs/gnunet-service-fs_pr.c:1620
+#: src/fs/gnunet-service-fs_pr.c:1449 src/fs/gnunet-service-fs_pr.c:1489
+#: src/fs/gnunet-service-fs_pr.c:1657
 msgid "# Datastore lookups concluded (error queueing)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1475
+#: src/fs/gnunet-service-fs_pr.c:1508
 msgid "# Datastore lookups concluded (found last result)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1486
+#: src/fs/gnunet-service-fs_pr.c:1520
 msgid "# Datastore lookups concluded (load too high)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1596
+#: src/fs/gnunet-service-fs_pr.c:1633
 msgid "# Datastore lookups initiated"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1685
+#: src/fs/gnunet-service-fs_pr.c:1722
 #, fuzzy
 msgid "# GAP PUT messages received"
 msgstr "# verschlüsselter PONG Nachrichten empfangen"
@@ -4388,113 +4372,113 @@ msgstr ""
 msgid "%s failed at %s:%d: `%s'\n"
 msgstr "`%s' schlug fehl bei %s:%d mit dem Fehler: `%s'.\n"
 
-#: src/gns/gnunet-gns-proxy.c:833
+#: src/gns/gnunet-gns-proxy.c:842
 #, fuzzy, c-format
 msgid "Unsupported CURL SSL backend %d\n"
 msgstr "Ungültige Nachricht des Typs %u empfangen. Nachricht wird verworfen.\n"
 
-#: src/gns/gnunet-gns-proxy.c:856
+#: src/gns/gnunet-gns-proxy.c:865
 #, fuzzy, c-format
 msgid "Failed to fetch CN from cert: %s\n"
 msgstr "HTTP Anfrage konnte nicht an Host `%s' gesendet werden: %s\n"
 
-#: src/gns/gnunet-gns-proxy.c:879
+#: src/gns/gnunet-gns-proxy.c:888
 #, fuzzy, c-format
 msgid "Failed to initialize DANE: %s\n"
 msgstr "SQLite Datenbank konnte nicht initialisiert werden: %s.\n"
 
-#: src/gns/gnunet-gns-proxy.c:892
+#: src/gns/gnunet-gns-proxy.c:901
 #, fuzzy, c-format
 msgid "Failed to parse DANE record: %s\n"
 msgstr "Fehler beim Senden einer `%s' Anfrage an den SMTP Server.\n"
 
-#: src/gns/gnunet-gns-proxy.c:907
+#: src/gns/gnunet-gns-proxy.c:916
 #, fuzzy, c-format
 msgid "Failed to verify TLS connection using DANE: %s\n"
 msgstr "Fehler beim Speichern der Konfigurationsdatei `%s':"
 
-#: src/gns/gnunet-gns-proxy.c:917
+#: src/gns/gnunet-gns-proxy.c:926
 #, c-format
 msgid "Failed DANE verification failed with GnuTLS verify status code: %u\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:941
+#: src/gns/gnunet-gns-proxy.c:950
 #, c-format
 msgid "SSL certificate subject name (%s) does not match `%s'\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:1086
+#: src/gns/gnunet-gns-proxy.c:1095
 #, c-format
 msgid "Cookie domain `%s' supplied by server is invalid\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:1602
+#: src/gns/gnunet-gns-proxy.c:1630
 #, fuzzy, c-format
 msgid "Unsupported HTTP method `%s'\n"
 msgstr "Ungültige Nachricht des Typs %u empfangen. Nachricht wird verworfen.\n"
 
-#: src/gns/gnunet-gns-proxy.c:1973
+#: src/gns/gnunet-gns-proxy.c:2002
 #, fuzzy, c-format
 msgid "Unable to import private key from file `%s'\n"
 msgstr "Fehler beim Anlegen des Benutzerkontos:"
 
-#: src/gns/gnunet-gns-proxy.c:2003
+#: src/gns/gnunet-gns-proxy.c:2032
 #, fuzzy, c-format
 msgid "Unable to import certificate %s\n"
 msgstr "Fehler beim Speichern der Konfigurationsdatei `%s':"
 
-#: src/gns/gnunet-gns-proxy.c:2177
+#: src/gns/gnunet-gns-proxy.c:2206
 #, fuzzy, c-format
 msgid "Failed to start HTTPS server for `%s'\n"
 msgstr "Fehler beim Starten der Collection.\n"
 
-#: src/gns/gnunet-gns-proxy.c:2196
+#: src/gns/gnunet-gns-proxy.c:2225
 #, fuzzy
 msgid "Failed to pass client to MHD\n"
 msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
 
-#: src/gns/gnunet-gns-proxy.c:2518
+#: src/gns/gnunet-gns-proxy.c:2547
 #, fuzzy, c-format
 msgid "Unsupported socks version %d\n"
 msgstr "Ungültige Nachricht des Typs %u empfangen. Nachricht wird verworfen.\n"
 
-#: src/gns/gnunet-gns-proxy.c:2547
+#: src/gns/gnunet-gns-proxy.c:2576
 #, fuzzy, c-format
 msgid "Unsupported socks command %d\n"
 msgstr "Ungültige Nachricht des Typs %u empfangen. Nachricht wird verworfen.\n"
 
-#: src/gns/gnunet-gns-proxy.c:2565 src/gns/gnunet-gns-proxy.c:2594
+#: src/gns/gnunet-gns-proxy.c:2594 src/gns/gnunet-gns-proxy.c:2623
 msgid "SSL connection to plain IPv4 address requested\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:2645
+#: src/gns/gnunet-gns-proxy.c:2674
 #, fuzzy, c-format
 msgid "Unsupported socks address type %d\n"
 msgstr "Ungültige Nachricht des Typs %u empfangen. Nachricht wird verworfen.\n"
 
-#: src/gns/gnunet-gns-proxy.c:2984
+#: src/gns/gnunet-gns-proxy.c:3013
 msgid "No ego configured for `shorten-zone`\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:3024
+#: src/gns/gnunet-gns-proxy.c:3053
 #, c-format
 msgid "No ego configured for `%s`\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:3086
+#: src/gns/gnunet-gns-proxy.c:3115
 #, fuzzy, c-format
 msgid "Failed to load SSL/TLS key and certificate from `%s'\n"
 msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
 
-#: src/gns/gnunet-gns-proxy.c:3127
+#: src/gns/gnunet-gns-proxy.c:3156
 msgid "listen on specified port (default: 7777)"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:3130
+#: src/gns/gnunet-gns-proxy.c:3159
 msgid "pem file to use as CA"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:3149
+#: src/gns/gnunet-gns-proxy.c:3178
 msgid "GNUnet GNS proxy"
 msgstr ""
 
@@ -4907,7 +4891,7 @@ msgid "# hostlist URIs written to file"
 msgstr ""
 
 #: src/hostlist/gnunet-daemon-hostlist_client.c:1588
-#: src/transport/plugin_transport_http_client.c:2273
+#: src/transport/plugin_transport_http_client.c:2265
 #, c-format
 msgid "Invalid proxy type: `%s', disabling proxy! Check configuration!\n"
 msgstr ""
@@ -5001,7 +4985,7 @@ msgstr ""
 
 #: src/hostlist/gnunet-daemon-hostlist_server.c:747
 #: src/peerinfo-tool/gnunet-peerinfo.c:736
-#: src/transport/gnunet-service-transport.c:1018
+#: src/transport/gnunet-service-transport.c:852
 #, fuzzy
 msgid "Could not access PEERINFO service.  Exiting.\n"
 msgstr "Auf die Namespace Informationen konnte nicht zugegriffen werden.\n"
@@ -5492,130 +5476,130 @@ msgstr ""
 msgid "test_icmp_client not possible, as we have no internal IPv4 address\n"
 msgstr ""
 
-#: src/nat/nat.c:867
+#: src/nat/nat.c:862
 #, c-format
 msgid "gnunet-helper-nat-server generated malformed address `%s'\n"
 msgstr ""
 
-#: src/nat/nat.c:917
+#: src/nat/nat.c:912
 #, fuzzy, c-format
 msgid "Failed to start %s\n"
 msgstr "Fehler beim Starten der Collection.\n"
 
-#: src/nat/nat.c:1032
+#: src/nat/nat.c:1027
 msgid "Error while running upnp client:\n"
 msgstr ""
 
-#: src/nat/nat.c:1102
+#: src/nat/nat.c:1097
 #, 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
+#: src/nat/nat.c:1237
 msgid "malformed"
 msgstr ""
 
-#: src/nat/nat.c:1297
+#: src/nat/nat.c:1291
 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
+#: src/nat/nat.c:1318 src/nat/nat.c:1330
 #, c-format
 msgid ""
 "Configuration requires `%s', but binary is not installed properly (SUID bit "
 "not set).  Option disabled.\n"
 msgstr ""
 
-#: src/nat/nat.c:1474
+#: src/nat/nat.c:1468
 msgid "Internal IP address not known, cannot use ICMP NAT traversal method\n"
 msgstr ""
 
-#: src/nat/nat.c:1490
+#: src/nat/nat.c:1484
 #, c-format
 msgid "Running gnunet-helper-nat-client %s %s %u\n"
 msgstr ""
 
-#: src/nat/nat.c:1575
+#: src/nat/nat.c:1569
 msgid "Operation Successful"
 msgstr ""
 
-#: src/nat/nat.c:1577
+#: src/nat/nat.c:1571
 msgid "Internal Failure (IPC, ...)"
 msgstr ""
 
-#: src/nat/nat.c:1579
+#: src/nat/nat.c:1573
 msgid "Failure in network subsystem, check permissions."
 msgstr ""
 
-#: src/nat/nat.c:1581
+#: src/nat/nat.c:1575
 msgid "Encountered timeout while performing operation"
 msgstr ""
 
-#: src/nat/nat.c:1583
+#: src/nat/nat.c:1577
 msgid "detected that we are offline"
 msgstr ""
 
-#: src/nat/nat.c:1585
+#: src/nat/nat.c:1579
 #, fuzzy
 msgid "`upnpc` command not found"
 msgstr "Kommando `%s' wurde nicht gefunden!\n"
 
-#: src/nat/nat.c:1587
+#: src/nat/nat.c:1581
 #, fuzzy
 msgid "Failed to run `upnpc` command"
 msgstr "Fehler beim Starten der Collection.\n"
 
-#: src/nat/nat.c:1589
+#: src/nat/nat.c:1583
 #, fuzzy
 msgid "`upnpc' command took too long, process killed"
 msgstr "Kommando `%s' wurde nicht gefunden!\n"
 
-#: src/nat/nat.c:1591
+#: src/nat/nat.c:1585
 msgid "`upnpc' command failed to establish port mapping"
 msgstr ""
 
-#: src/nat/nat.c:1593
+#: src/nat/nat.c:1587
 #, fuzzy
 msgid "`external-ip' command not found"
 msgstr "Kommando `%s' wurde nicht gefunden!\n"
 
-#: src/nat/nat.c:1595
+#: src/nat/nat.c:1589
 #, fuzzy
 msgid "Failed to run `external-ip` command"
 msgstr "Fehler beim Starten der Collection.\n"
 
-#: src/nat/nat.c:1597
+#: src/nat/nat.c:1591
 msgid "`external-ip' command output invalid"
 msgstr ""
 
-#: src/nat/nat.c:1599
+#: src/nat/nat.c:1593
 msgid "no valid address was returned by `external-ip'"
 msgstr ""
 
-#: src/nat/nat.c:1601
+#: src/nat/nat.c:1595
 #, fuzzy
 msgid "Could not determine interface with internal/local network address"
 msgstr "Öffentliche IP-Adresse konnte nicht ermittelt werden.\n"
 
-#: src/nat/nat.c:1603
+#: src/nat/nat.c:1597
 msgid "No functioning gnunet-helper-nat-server installation found"
 msgstr ""
 
-#: src/nat/nat.c:1605
+#: src/nat/nat.c:1599
 msgid "NAT test could not be initialized"
 msgstr ""
 
-#: src/nat/nat.c:1607
+#: src/nat/nat.c:1601
 msgid "NAT test timeout reached"
 msgstr ""
 
-#: src/nat/nat.c:1609
+#: src/nat/nat.c:1603
 msgid "could not register NAT"
 msgstr ""
 
-#: src/nat/nat.c:1611
+#: src/nat/nat.c:1605
 msgid "No working gnunet-helper-nat-client installation found"
 msgstr ""
 
@@ -5748,19 +5732,19 @@ msgstr ""
 msgid "failed to transmit request (service down?)"
 msgstr "Fehler beim Senden einer `%s' Anfrage an den SMTP Server.\n"
 
-#: src/peerinfo/peerinfo_api.c:519
+#: src/peerinfo/peerinfo_api.c:518
 #, fuzzy
 msgid "Failed to receive response from `PEERINFO' service."
 msgstr "Fehler beim Empfangen der Antwort von gnunetd auf die `%s' Nachricht\n"
 
-#: src/peerinfo/peerinfo_api.c:563 src/peerinfo/peerinfo_api.c:586
-#: src/peerinfo/peerinfo_api.c:603 src/peerinfo/peerinfo_api.c:616
-#: src/peerinfo/peerinfo_api.c:631
+#: src/peerinfo/peerinfo_api.c:562 src/peerinfo/peerinfo_api.c:585
+#: src/peerinfo/peerinfo_api.c:602 src/peerinfo/peerinfo_api.c:615
+#: src/peerinfo/peerinfo_api.c:630
 #, fuzzy
 msgid "Received invalid message from `PEERINFO' service."
 msgstr "Ungültige `%s' Anfrage von `%s' empfangen.\n"
 
-#: src/peerinfo/peerinfo_api.c:720
+#: src/peerinfo/peerinfo_api.c:719
 #, fuzzy
 msgid "Timeout transmitting iteration request to `PEERINFO' service."
 msgstr "Fehler beim Senden einer `%s' Anfrage an den SMTP Server.\n"
@@ -5858,19 +5842,19 @@ msgid "Print information about peers."
 msgstr "Informationen über andere GNUnet Knoten ausgeben."
 
 #: src/peerinfo-tool/gnunet-peerinfo_plugins.c:105
-#: src/transport/gnunet-service-transport_plugins.c:127
+#: src/transport/gnunet-service-transport_plugins.c:168
 #, fuzzy, c-format
 msgid "Starting transport plugins `%s'\n"
 msgstr "Teste Transport(e) %s\n"
 
 #: src/peerinfo-tool/gnunet-peerinfo_plugins.c:109
-#: src/transport/gnunet-service-transport_plugins.c:132
+#: src/transport/gnunet-service-transport_plugins.c:173
 #, fuzzy, c-format
 msgid "Loading `%s' transport plugin\n"
 msgstr "Teste Transport(e) %s\n"
 
 #: src/peerinfo-tool/gnunet-peerinfo_plugins.c:129
-#: src/transport/gnunet-service-transport_plugins.c:164
+#: src/transport/gnunet-service-transport_plugins.c:208
 #, fuzzy, c-format
 msgid "Failed to load transport plugin for `%s'\n"
 msgstr "Anwendung `%s' konnte nicht initialisiert werden.\n"
@@ -6884,7 +6868,7 @@ msgid ""
 "content/topology-file-format\n"
 msgstr ""
 
-#: src/testbed/gnunet-daemon-latency-logger.c:333
+#: src/testbed/gnunet-daemon-latency-logger.c:323
 msgid "Daemon to log latency values of connections to neighbours"
 msgstr ""
 
@@ -6900,7 +6884,7 @@ msgstr ""
 msgid "Incorrect hostkey file format: %s\n"
 msgstr ""
 
-#: src/testbed/gnunet-daemon-testbed-underlay.c:474
+#: src/testbed/gnunet-daemon-testbed-underlay.c:476
 msgid "Daemon to restrict underlay network in testbed deployments"
 msgstr ""
 
@@ -7237,7 +7221,7 @@ msgid ""
 msgstr ""
 
 #: src/topology/gnunet-daemon-topology.c:1121
-#: src/transport/plugin_transport_wlan.c:1476
+#: src/transport/plugin_transport_wlan.c:1478
 #, fuzzy
 msgid "# HELLO messages received"
 msgstr "# verschlüsselter PONG Nachrichten empfangen"
@@ -7251,49 +7235,46 @@ msgstr "# ausgehender Nachrichten verworfen"
 msgid "GNUnet topology control (maintaining P2P cadet and F2F constraints)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_ats.c:269
-#, fuzzy, c-format
-msgid "Could not obtain a valid network for `%s' %s (%s)\n"
+#: src/transport/gnunet-service-transport_ats.c:136
+msgid "# Addresses given to ATS"
 msgstr ""
-"Es konnte keine IP für das Gerät `%s' unter Verwendung von `%s' ermittelt "
-"werden.\n"
 
-#: src/transport/gnunet-service-transport_blacklist.c:274
+#: src/transport/gnunet-service-transport_blacklist.c:286
 #, fuzzy, c-format
 msgid "Adding blacklisting entry for peer `%s'\n"
 msgstr "Adresse des Knotens `%s' konnte nicht ermittelt werden.\n"
 
-#: src/transport/gnunet-service-transport_blacklist.c:283
+#: src/transport/gnunet-service-transport_blacklist.c:295
 #, c-format
 msgid "Adding blacklisting entry for peer `%s':`%s'\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_blacklist.c:476
-#: src/transport/gnunet-service-transport_blacklist.c:766
+#: src/transport/gnunet-service-transport_blacklist.c:504
+#: src/transport/gnunet-service-transport_blacklist.c:855
 msgid "# disconnects due to blacklist"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_blacklist.c:769
+#: src/transport/gnunet-service-transport_blacklist.c:859
 #, fuzzy, c-format
 msgid "Disallowing connection to peer `%s' on transport %s\n"
 msgstr "Anwendung `%s' konnte nicht initialisiert werden.\n"
 
-#: src/transport/gnunet-service-transport.c:236
+#: src/transport/gnunet-service-transport.c:231
 #, fuzzy
 msgid "# bytes payload discarded due to not connected peer"
 msgstr "# Knotenankündigungen empfangen"
 
-#: src/transport/gnunet-service-transport.c:424
+#: src/transport/gnunet-service-transport.c:385
 #, fuzzy
 msgid "# bytes total received"
 msgstr "# gap Anfragen insgesamt empfangen"
 
-#: src/transport/gnunet-service-transport.c:509
+#: src/transport/gnunet-service-transport.c:480
 #, fuzzy
 msgid "# bytes payload received"
 msgstr "# Bytes entschlüsselt"
 
-#: src/transport/gnunet-service-transport.c:984
+#: src/transport/gnunet-service-transport.c:818
 #, fuzzy
 msgid "Transport service is lacking key configuration settings. Exiting.\n"
 msgstr "GNUnet Konfiguration"
@@ -7303,414 +7284,419 @@ msgstr "GNUnet Konfiguration"
 msgid "# messages dropped due to slow client"
 msgstr "# gap Anfragen verworfen: Kollision in RT"
 
-#: src/transport/gnunet-service-transport_clients.c:774
+#: src/transport/gnunet-service-transport_clients.c:783
 msgid "# bytes payload dropped (other peer was not connected)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_clients.c:813
-#, fuzzy, c-format
-msgid "Blacklist refuses connection attempt to peer `%s'\n"
-msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
-
-#: src/transport/gnunet-service-transport_clients.c:843
+#: src/transport/gnunet-service-transport_clients.c:827
 #, fuzzy
 msgid "# REQUEST CONNECT messages received"
 msgstr "# verschlüsselter PONG Nachrichten empfangen"
 
-#: src/transport/gnunet-service-transport_clients.c:882
+#: src/transport/gnunet-service-transport_clients.c:864
 #, fuzzy
 msgid "# REQUEST DISCONNECT messages received"
 msgstr "# verschlüsselter PONG Nachrichten empfangen"
 
-#: src/transport/gnunet-service-transport_hello.c:182
+#: src/transport/gnunet-service-transport_hello.c:188
 msgid "# refreshed my HELLO"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:769
-#: src/transport/gnunet-service-transport_neighbours.c:846
+#: src/transport/gnunet-service-transport_neighbours.c:839
 #, fuzzy
 msgid "# session creation failed"
 msgstr "# Sitzungsschlüssel akzeptiert"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1134
+#: src/transport/gnunet-service-transport_neighbours.c:1167
 #, fuzzy
 msgid "# DISCONNECT messages sent"
 msgstr "# verschlüsselter PONG Nachrichten empfangen"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1259
-#: src/transport/gnunet-service-transport_neighbours.c:1675
+#: src/transport/gnunet-service-transport_neighbours.c:1303
+#: src/transport/gnunet-service-transport_neighbours.c:1760
 #, fuzzy
 msgid "# bytes in message queue for other peers"
 msgstr "# Bytes ausgehender Nachrichten verworfen"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1264
+#: src/transport/gnunet-service-transport_neighbours.c:1308
 #, fuzzy
 msgid "# messages transmitted to other peers"
 msgstr "# Bytes des Typs %d übertragen"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1269
+#: src/transport/gnunet-service-transport_neighbours.c:1314
 #, fuzzy
 msgid "# transmission failures for messages to other peers"
 msgstr "# Bytes ausgehender Nachrichten verworfen"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1327
+#: src/transport/gnunet-service-transport_neighbours.c:1374
 msgid "# messages timed out while in transport queue"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1388
-#, fuzzy
-msgid "# keepalives sent"
-msgstr "# p2p Trace-Antworten gesendet"
+#: src/transport/gnunet-service-transport_neighbours.c:1450
+msgid "# KEEPALIVES sent"
+msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1421
+#: src/transport/gnunet-service-transport_neighbours.c:1486
 #, fuzzy
 msgid "# KEEPALIVE messages discarded (peer unknown)"
 msgstr "# defragmentierter Nachrichten"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1429
+#: src/transport/gnunet-service-transport_neighbours.c:1494
 #, fuzzy
 msgid "# KEEPALIVE messages discarded (no session)"
 msgstr "# defragmentierter Nachrichten"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1476
+#: src/transport/gnunet-service-transport_neighbours.c:1504
+msgid "# KEEPALIVES received in good order"
+msgstr ""
+
+#: src/transport/gnunet-service-transport_neighbours.c:1549
 #, fuzzy
-msgid "# KEEPALIVE_RESPONSE messages discarded (not connected)"
+msgid "# KEEPALIVE_RESPONSEs discarded (not connected)"
 msgstr "# defragmentierter Nachrichten"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1485
+#: src/transport/gnunet-service-transport_neighbours.c:1558
 #, fuzzy
-msgid "# KEEPALIVE_RESPONSE messages discarded (not expected)"
+msgid "# KEEPALIVE_RESPONSEs discarded (not expected)"
 msgstr "# defragmentierter Nachrichten"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1493
+#: src/transport/gnunet-service-transport_neighbours.c:1566
 #, fuzzy
-msgid "# KEEPALIVE_RESPONSE messages discarded (address changed)"
+msgid "# KEEPALIVE_RESPONSEs discarded (address changed)"
 msgstr "# defragmentierter Nachrichten"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1501
+#: src/transport/gnunet-service-transport_neighbours.c:1575
 #, fuzzy
-msgid "# KEEPALIVE_RESPONSE messages discarded (wrong nonce)"
+msgid "# KEEPALIVE_RESPONSEs discarded (no nonce)"
 msgstr "# defragmentierter Nachrichten"
 
 #: src/transport/gnunet-service-transport_neighbours.c:1580
 #, fuzzy
+msgid "# KEEPALIVE_RESPONSEs discarded (bad nonce)"
+msgstr "# defragmentierter Nachrichten"
+
+#: src/transport/gnunet-service-transport_neighbours.c:1586
+#, fuzzy
+msgid "# KEEPALIVE_RESPONSEs received (OK)"
+msgstr "# defragmentierter Nachrichten"
+
+#: src/transport/gnunet-service-transport_neighbours.c:1657
+#, fuzzy
 msgid "# messages discarded due to lack of neighbour record"
 msgstr "# defragmentierter Nachrichten"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1614
+#: src/transport/gnunet-service-transport_neighbours.c:1691
 #, fuzzy
 msgid "# bandwidth quota violations by other peers"
 msgstr "Verfolgt die Bandbreitennutzung von gnunetd"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1630
+#: src/transport/gnunet-service-transport_neighbours.c:1706
 msgid "# ms throttling suggested"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1726
+#: src/transport/gnunet-service-transport_neighbours.c:1826
 #, fuzzy, c-format
-msgid "Failed to send SYN message to peer `%s' using address `%s' session %p\n"
-msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
+msgid "Failed to send SYN message to peer `%s'\n"
+msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1747
+#: src/transport/gnunet-service-transport_neighbours.c:1846
 #, fuzzy
 msgid "# Failed attempts to switch addresses (failed to send SYN CONT)"
 msgstr "Fehler beim Senden einer `%s' Anfrage an den SMTP Server.\n"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1790
+#: src/transport/gnunet-service-transport_neighbours.c:1885
 #, fuzzy
 msgid "# SYN messages sent"
 msgstr "# verschlüsselter PONG Nachrichten empfangen"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1806
+#: src/transport/gnunet-service-transport_neighbours.c:1902
 #, fuzzy, c-format
-msgid "Failed to transmit SYN message via plugin to %s\n"
+msgid "Failed to transmit SYN message to %s\n"
 msgstr "`%s' Dienst konnte nicht initialisiert werden.\n"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1833
+#: src/transport/gnunet-service-transport_neighbours.c:1932
 #, fuzzy
 msgid "# Failed attempts to switch addresses (failed to send SYN)"
 msgstr "Fehler beim Senden einer `%s' Anfrage an den SMTP Server.\n"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1880
+#: src/transport/gnunet-service-transport_neighbours.c:1997
 #, fuzzy, c-format
-msgid ""
-"Failed to send SYN_ACK message to peer `%s' using address `%s' session %p\n"
+msgid "Failed to send SYN_ACK message to peer `%s' using address `%s'\n"
 msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1930
+#: src/transport/gnunet-service-transport_neighbours.c:2051
 #, fuzzy
 msgid "# SYN_ACK messages sent"
 msgstr "# verschlüsselter PONG Nachrichten empfangen"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1945
+#: src/transport/gnunet-service-transport_neighbours.c:2068
 #, fuzzy, c-format
-msgid "Failed to transmit SYN_ACK message via plugin to %s\n"
+msgid "Failed to transmit SYN_ACK message to %s\n"
 msgstr "`%s' Dienst konnte nicht initialisiert werden.\n"
 
-#: src/transport/gnunet-service-transport_neighbours.c:2235
+#: src/transport/gnunet-service-transport_neighbours.c:2223
 #, 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:2360
+#: src/transport/gnunet-service-transport_neighbours.c:2350
 #, fuzzy
 msgid "# SYN messages received"
 msgstr "# PING Nachrichten erstellt"
 
-#: src/transport/gnunet-service-transport_neighbours.c:2365
+#: src/transport/gnunet-service-transport_neighbours.c:2355
 #, c-format
 msgid "SYN request from peer `%s' ignored due impending shutdown\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:2673
+#: src/transport/gnunet-service-transport_neighbours.c:2715
 msgid "# Attempts to switch addresses"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3079
-#, 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:3176
+#: src/transport/gnunet-service-transport_neighbours.c:3201
 #, fuzzy
 msgid "# SYN_ACK messages received"
 msgstr "# verschlüsselter PONG Nachrichten empfangen"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3184
+#: src/transport/gnunet-service-transport_neighbours.c:3209
 #, fuzzy
 msgid "# unexpected SYN_ACK messages (no peer)"
 msgstr "COUNT Nachrichten versenden"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3198
-#: src/transport/gnunet-service-transport_neighbours.c:3230
+#: src/transport/gnunet-service-transport_neighbours.c:3227
+#: src/transport/gnunet-service-transport_neighbours.c:3251
 #, fuzzy
 msgid "# unexpected SYN_ACK messages (not ready)"
 msgstr "COUNT Nachrichten versenden"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3242
+#: src/transport/gnunet-service-transport_neighbours.c:3263
 #, fuzzy
 msgid "# unexpected SYN_ACK messages (waiting on ATS)"
 msgstr "COUNT Nachrichten versenden"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3262
+#: src/transport/gnunet-service-transport_neighbours.c:3288
 msgid "# Successful attempts to switch addresses"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3270
+#: src/transport/gnunet-service-transport_neighbours.c:3301
 #, fuzzy
 msgid "# unexpected SYN_ACK messages (disconnecting)"
 msgstr "COUNT Nachrichten versenden"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3460
+#: src/transport/gnunet-service-transport_neighbours.c:3495
 #, fuzzy
 msgid "# ACK messages received"
 msgstr "# verschlüsselter PONG Nachrichten empfangen"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3496
+#: src/transport/gnunet-service-transport_neighbours.c:3530
 #, fuzzy
 msgid "# unexpected ACK messages"
 msgstr "# verschlüsselter PONG Nachrichten gesendet"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3566
+#: src/transport/gnunet-service-transport_neighbours.c:3582
 msgid "# SET QUOTA messages ignored (no such peer)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3581
+#: src/transport/gnunet-service-transport_neighbours.c:3597
 msgid "# disconnects due to quota of 0"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3623
+#: src/transport/gnunet-service-transport_neighbours.c:3644
+#, fuzzy
+msgid "# quota messages ignored (malformed)"
+msgstr "# gap Anfragen verworfen: Kollision in RT"
+
+#: src/transport/gnunet-service-transport_neighbours.c:3651
+#, fuzzy
+msgid "# QUOTA messages received"
+msgstr "# verschlüsselter PONG Nachrichten empfangen"
+
+#: src/transport/gnunet-service-transport_neighbours.c:3686
 msgid "# disconnect messages ignored (malformed)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3629
+#: src/transport/gnunet-service-transport_neighbours.c:3693
 #, fuzzy
 msgid "# DISCONNECT messages received"
 msgstr "# verschlüsselter PONG Nachrichten empfangen"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3638
+#: src/transport/gnunet-service-transport_neighbours.c:3704
 msgid "# disconnect messages ignored (timestamp)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3765
+#: src/transport/gnunet-service-transport_neighbours.c:3833
 #, fuzzy
 msgid "# disconnected from peer upon explicit request"
 msgstr "# gap Anfragen verworfen: Kollision in RT"
 
-#: src/transport/gnunet-service-transport_plugins.c:119
+#: src/transport/gnunet-service-transport_plugins.c:158
 msgid "Transport service is lacking NEIGHBOUR_LIMIT option.\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_plugins.c:177
-#: src/transport/gnunet-service-transport_plugins.c:185
-#: src/transport/gnunet-service-transport_plugins.c:193
-#: src/transport/gnunet-service-transport_plugins.c:201
-#: src/transport/gnunet-service-transport_plugins.c:209
-#: src/transport/gnunet-service-transport_plugins.c:217
-#: src/transport/gnunet-service-transport_plugins.c:225
-#: src/transport/gnunet-service-transport_plugins.c:233
-#: src/transport/gnunet-service-transport_plugins.c:241
-#: src/transport/gnunet-service-transport_plugins.c:249
-#: src/transport/gnunet-service-transport_plugins.c:257
+#: src/transport/gnunet-service-transport_plugins.c:223
+#: src/transport/gnunet-service-transport_plugins.c:231
+#: src/transport/gnunet-service-transport_plugins.c:239
+#: src/transport/gnunet-service-transport_plugins.c:247
+#: src/transport/gnunet-service-transport_plugins.c:255
+#: src/transport/gnunet-service-transport_plugins.c:263
+#: src/transport/gnunet-service-transport_plugins.c:271
+#: src/transport/gnunet-service-transport_plugins.c:279
+#: src/transport/gnunet-service-transport_plugins.c:287
+#: src/transport/gnunet-service-transport_plugins.c:295
+#: src/transport/gnunet-service-transport_plugins.c:303
 #, fuzzy, c-format
 msgid "Missing function `%s' in transport plugin for `%s'\n"
 msgstr "Anwendung `%s' konnte nicht initialisiert werden.\n"
 
-#: src/transport/gnunet-service-transport_plugins.c:264
+#: src/transport/gnunet-service-transport_plugins.c:310
 #, fuzzy, c-format
 msgid "Did not load plugin `%s' due to missing functions\n"
 msgstr "Fehler beim Laden des Plugins `%s' bei %s:%d. Plugin wird entladen.\n"
 
-#: src/transport/gnunet-service-transport_validation.c:476
-#: src/transport/gnunet-service-transport_validation.c:656
-#: src/transport/gnunet-service-transport_validation.c:929
-#: src/transport/gnunet-service-transport_validation.c:1532
+#: src/transport/gnunet-service-transport_validation.c:343
+msgid "# Addresses in validation map"
+msgstr ""
+
+#: src/transport/gnunet-service-transport_validation.c:450
+#: src/transport/gnunet-service-transport_validation.c:638
+#: src/transport/gnunet-service-transport_validation.c:927
+#: src/transport/gnunet-service-transport_validation.c:1508
 #, fuzzy
 msgid "# validations running"
 msgstr "sqlite Datenspeicher"
 
-#: src/transport/gnunet-service-transport_validation.c:515
-msgid "# address records discarded"
-msgstr ""
+#: src/transport/gnunet-service-transport_validation.c:493
+#, fuzzy
+msgid "# address records discarded (timeout)"
+msgstr "# Bytes verworfen von TCP (ausgehend)"
 
-#: src/transport/gnunet-service-transport_validation.c:600
-msgid "# validations not attempted (no plugin)"
+#: src/transport/gnunet-service-transport_validation.c:541
+msgid "# address records discarded (blacklist)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:646
+#: src/transport/gnunet-service-transport_validation.c:629
 msgid "# PINGs for address validation sent"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:755
+#: src/transport/gnunet-service-transport_validation.c:711
+msgid "# validations delayed by global throttle"
+msgstr ""
+
+#: src/transport/gnunet-service-transport_validation.c:748
 msgid "# address revalidations started"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1057
+#: src/transport/gnunet-service-transport_validation.c:1048
 #, fuzzy
 msgid "# PING message for different peer received"
 msgstr "# PING Nachrichten erstellt"
 
-#: src/transport/gnunet-service-transport_validation.c:1108
+#: src/transport/gnunet-service-transport_validation.c:1099
 #, c-format
 msgid "Plugin `%s' not available, cannot confirm having this address\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1118
+#: src/transport/gnunet-service-transport_validation.c:1112
 msgid "# failed address checks during validation"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1121
+#: src/transport/gnunet-service-transport_validation.c:1115
 #, c-format
 msgid "Address `%s' is not one of my addresses, not confirming PING\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1129
+#: src/transport/gnunet-service-transport_validation.c:1123
 msgid "# successful address checks during validation"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1141
+#: src/transport/gnunet-service-transport_validation.c:1136
 #, c-format
 msgid ""
 "Not confirming PING from peer `%s' with address `%s' since I cannot confirm "
 "having this address.\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1149
-#, c-format
-msgid "Received a PING message with validation bug from `%s'\n"
-msgstr ""
-
-#: src/transport/gnunet-service-transport_validation.c:1203
+#: src/transport/gnunet-service-transport_validation.c:1191
 #, fuzzy, c-format
 msgid "Failed to create PONG signature for peer `%s'\n"
 msgstr "Namespace `%s' konnte nicht erstellt werden (existiert bereits?).\n"
 
-#: src/transport/gnunet-service-transport_validation.c:1253
+#: src/transport/gnunet-service-transport_validation.c:1242
 msgid "# PONGs unicast via reliable transport"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1262
+#: src/transport/gnunet-service-transport_validation.c:1251
 msgid "# PONGs multicast to all available addresses"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1434
+#: src/transport/gnunet-service-transport_validation.c:1408
 msgid "# PONGs dropped, no matching pending validation"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1450
+#: src/transport/gnunet-service-transport_validation.c:1426
 msgid "# PONGs dropped, signature expired"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1502
+#: src/transport/gnunet-service-transport_validation.c:1478
 msgid "# validations succeeded"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1590
-#, fuzzy, c-format
-msgid "Validation received new %s message for peer `%s' with size %u\n"
-msgstr "GAP hat ungültige Inhalte von `%s' empfangen.\n"
-
-#: src/transport/gnunet-service-transport_validation.c:1597
-#, fuzzy, c-format
-msgid "Adding `%s' without addresses for peer `%s'\n"
-msgstr "Adresse des Knotens `%s' konnte nicht ermittelt werden.\n"
-
-#: src/transport/gnunet-transport.c:578
+#: src/transport/gnunet-transport.c:580
 #, 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:587
+#: src/transport/gnunet-transport.c:589
 #: src/transport/gnunet-transport-profiler.c:274
 #, 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:619
+#: src/transport/gnunet-transport.c:621
 #, 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:634
+#: src/transport/gnunet-transport.c:636
 #, 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:646
+#: src/transport/gnunet-transport.c:648
 #, fuzzy
 msgid "Failed to list connections, timeout occured\n"
 msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden."
 
-#: src/transport/gnunet-transport.c:673 src/transport/gnunet-transport.c:698
+#: src/transport/gnunet-transport.c:675 src/transport/gnunet-transport.c:700
 #, 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:678
+#: src/transport/gnunet-transport.c:680
 #, 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:683
+#: src/transport/gnunet-transport.c:685
 #, 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:688
+#: src/transport/gnunet-transport.c:690
 #, 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:693
+#: src/transport/gnunet-transport.c:695
 #, c-format
 msgid "Timeout while waiting for result of NAT test for plugin `%s'\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:818
+#: src/transport/gnunet-transport.c:820
 #, fuzzy, c-format
 msgid ""
 "Peer `%s' %s %s\n"
@@ -7719,195 +7705,195 @@ msgid ""
 "\t%s%s\n"
 msgstr "Ich bin Peer `%s'.\n"
 
-#: src/transport/gnunet-transport.c:854
+#: src/transport/gnunet-transport.c:855
 #, fuzzy, c-format
 msgid "Peer `%s' %s `%s' \n"
 msgstr "Ich bin Peer `%s'.\n"
 
-#: src/transport/gnunet-transport.c:953 src/transport/gnunet-transport.c:1702
+#: src/transport/gnunet-transport.c:949 src/transport/gnunet-transport.c:1744
 #, 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:1021
+#: src/transport/gnunet-transport.c:1006
 msgid "No transport plugins configured, peer will never communicate\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1035
+#: src/transport/gnunet-transport.c:1020
 #, c-format
 msgid "No port configured for plugin `%s', cannot test it\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1060
+#: src/transport/gnunet-transport.c:1045
 #, fuzzy
 msgid "Failed to start resolver!\n"
 msgstr "Fehler beim Starten der Collection.\n"
 
-#: src/transport/gnunet-transport.c:1106
+#: src/transport/gnunet-transport.c:1091
 #, 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:1129
+#: src/transport/gnunet-transport.c:1114
 #: src/transport/gnunet-transport-profiler.c:406
 #, fuzzy, c-format
 msgid "Successfully connected to `%s'\n"
 msgstr "Zugriff verweigert für `%s' bei %s:%d.\n"
 
-#: src/transport/gnunet-transport.c:1153
+#: src/transport/gnunet-transport.c:1138
 #, c-format
 msgid ""
 "Successfully connected to `%s', starting to send benchmark data in %u Kb "
 "blocks\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1186
+#: src/transport/gnunet-transport.c:1171
 #, fuzzy, c-format
 msgid "Successfully disconnected from `%s'\n"
 msgstr "Zugriff verweigert für `%s' bei %s:%d.\n"
 
-#: src/transport/gnunet-transport.c:1209
+#: src/transport/gnunet-transport.c:1194
 #: src/transport/gnunet-transport-profiler.c:434
 #, fuzzy, c-format
 msgid "Disconnected from peer `%s' while benchmarking\n"
 msgstr "`%s' hat sich mit `%s' verbunden.\n"
 
-#: src/transport/gnunet-transport.c:1234 src/transport/gnunet-transport.c:1260
+#: src/transport/gnunet-transport.c:1219 src/transport/gnunet-transport.c:1245
 #, c-format
 msgid "%24s: %-17s %4s   (%u connections in total)\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1236
+#: src/transport/gnunet-transport.c:1221
 #, fuzzy
 msgid "Connected to"
 msgstr "`%s' hat sich mit `%s' verbunden.\n"
 
-#: src/transport/gnunet-transport.c:1262
+#: src/transport/gnunet-transport.c:1247
 #, fuzzy
 msgid "Disconnected from"
 msgstr "`%s' hat sich mit `%s' verbunden.\n"
 
-#: src/transport/gnunet-transport.c:1286
+#: src/transport/gnunet-transport.c:1271
 #: src/transport/gnunet-transport-profiler.c:458
 #, 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:1318
+#: src/transport/gnunet-transport.c:1311
 #, c-format
 msgid "Peer `%s': %s %s in state `%s' until %s\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1330
+#: src/transport/gnunet-transport.c:1323
 #, fuzzy, c-format
 msgid "Peer `%s': %s %s\n"
 msgstr "Ich bin Peer `%s'.\n"
 
-#: src/transport/gnunet-transport.c:1784
+#: src/transport/gnunet-transport.c:1831
 #: src/transport/gnunet-transport-profiler.c:492
 #, 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:1819
+#: src/transport/gnunet-transport.c:1866
 #, fuzzy
 msgid "Failed to send disconnect request to transport service\n"
 msgstr "Der Transportdienst auf Port %d konnte nicht gestartet werden.\n"
 
-#: src/transport/gnunet-transport.c:1863
+#: src/transport/gnunet-transport.c:1910
 #, c-format
 msgid ""
 "Multiple operations given. Please choose only one operation: %s, %s, %s, %s, "
 "%s, %s %s\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1871
+#: src/transport/gnunet-transport.c:1918
 #, c-format
 msgid ""
 "No operation given. Please choose one operation: %s, %s, %s, %s, %s, %s, %s\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1890 src/transport/gnunet-transport.c:1920
-#: src/transport/gnunet-transport.c:1953 src/transport/gnunet-transport.c:1979
-#: src/transport/gnunet-transport.c:2035
+#: src/transport/gnunet-transport.c:1937 src/transport/gnunet-transport.c:1967
+#: src/transport/gnunet-transport.c:2000 src/transport/gnunet-transport.c:2026
+#: src/transport/gnunet-transport.c:2085
 #: src/transport/gnunet-transport-profiler.c:578
 #, 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:1899 src/transport/gnunet-transport.c:1930
-#: src/transport/gnunet-transport.c:1964
+#: src/transport/gnunet-transport.c:1946 src/transport/gnunet-transport.c:1977
+#: src/transport/gnunet-transport.c:2011
 #, 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:1984
+#: src/transport/gnunet-transport.c:2031
 msgid "Starting to receive benchmark data\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:2083
+#: src/transport/gnunet-transport.c:2133
 #, fuzzy
 msgid "print information for all peers (instead of only connected peers)"
 msgstr "Informationen über andere GNUnet Knoten ausgeben."
 
-#: src/transport/gnunet-transport.c:2086
+#: src/transport/gnunet-transport.c:2136
 msgid "measure how fast we are receiving data from all peers (until CTRL-C)"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:2089
+#: src/transport/gnunet-transport.c:2139
 #, fuzzy
 msgid "connect to a peer"
 msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
 
-#: src/transport/gnunet-transport.c:2092
+#: src/transport/gnunet-transport.c:2142
 #, fuzzy
 msgid "disconnect to a peer"
 msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
 
-#: src/transport/gnunet-transport.c:2095
+#: src/transport/gnunet-transport.c:2145
 #, fuzzy
 msgid "print information for all pending validations "
 msgstr "Informationen über andere GNUnet Knoten ausgeben."
 
-#: src/transport/gnunet-transport.c:2098
+#: src/transport/gnunet-transport.c:2148
 #, fuzzy
 msgid "print information for all pending validations continuously"
 msgstr "Informationen über andere GNUnet Knoten ausgeben."
 
-#: src/transport/gnunet-transport.c:2101
+#: src/transport/gnunet-transport.c:2151
 #, fuzzy
 msgid "provide information about all current connections (once)"
 msgstr "Informationen über andere GNUnet Knoten ausgeben."
 
-#: src/transport/gnunet-transport.c:2107
+#: src/transport/gnunet-transport.c:2157
 #, fuzzy
 msgid ""
 "provide information about all connects and disconnect events (continuously)"
 msgstr "Informationen über andere GNUnet Knoten ausgeben."
 
-#: src/transport/gnunet-transport.c:2110
+#: src/transport/gnunet-transport.c:2160
 #, fuzzy
 msgid "do not resolve hostnames"
 msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
 
-#: src/transport/gnunet-transport.c:2113
+#: src/transport/gnunet-transport.c:2163
 #: src/transport/gnunet-transport-profiler.c:638
 msgid "peer identity"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:2116
+#: src/transport/gnunet-transport.c:2166
 msgid "monitor plugin sessions"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:2119
+#: src/transport/gnunet-transport.c:2169
 msgid "send data for benchmarking to the other peer (until CTRL-C)"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:2122
+#: src/transport/gnunet-transport.c:2172
 msgid "test transport configuration (involves external server)"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:2133
+#: src/transport/gnunet-transport.c:2183
 #: src/transport/gnunet-transport-profiler.c:649
 #, fuzzy
 msgid "Direct access to transport service."
@@ -8007,160 +7993,161 @@ msgstr "Anzahl an Nachrichten, die pro Durchlauf verwendet wird"
 msgid "message size to use"
 msgstr "Nachrichtengröße"
 
-#: src/transport/plugin_transport_http_client.c:1491
-#: src/transport/plugin_transport_http_server.c:2276
-#: src/transport/plugin_transport_http_server.c:3443
-#: src/transport/plugin_transport_tcp.c:2844
-#: src/transport/plugin_transport_tcp.c:2851
+#: src/transport/plugin_transport_http_client.c:1481
+#: src/transport/plugin_transport_http_server.c:2247
+#: src/transport/plugin_transport_http_server.c:3414
+#: src/transport/plugin_transport_tcp.c:2923
+#: src/transport/plugin_transport_tcp.c:2930
 msgid "TCP_STEALTH not supported on this platform.\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_client.c:2114
+#: src/transport/plugin_transport_http_client.c:2106
 #, c-format
 msgid "Could not initialize curl multi handle, failed to start %s plugin!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_client.c:2163
-#: src/transport/plugin_transport_http_server.c:3177
+#: src/transport/plugin_transport_http_client.c:2155
+#: src/transport/plugin_transport_http_server.c:3148
 #, fuzzy, c-format
 msgid "Shutting down plugin `%s'\n"
 msgstr "Teste Transport(e) %s\n"
 
-#: src/transport/plugin_transport_http_client.c:2180
-#: src/transport/plugin_transport_http_server.c:3247
+#: src/transport/plugin_transport_http_client.c:2172
+#: src/transport/plugin_transport_http_server.c:3218
 #, 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:2214
+#: src/transport/plugin_transport_http_client.c:2206
 #, fuzzy, c-format
 msgid "Maximum number of requests is %u\n"
 msgstr "Maximale Anzahl an Chat Clients erreicht.\n"
 
-#: src/transport/plugin_transport_http_server.c:1763
+#: src/transport/plugin_transport_http_server.c:1734
 #, 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:1994
+#: src/transport/plugin_transport_http_server.c:1965
 #, c-format
 msgid "Accepting connection (%u of %u) from `%s'\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:2002
+#: src/transport/plugin_transport_http_server.c:1973
 #, c-format
 msgid ""
 "Server reached maximum number connections (%u), rejecting new connection\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:2152
+#: src/transport/plugin_transport_http_server.c:2123
 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:2175
+#: src/transport/plugin_transport_http_server.c:2146
 #, c-format
 msgid "No usable TLS certificate found and creating one at `%s/%s' failed!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:2302
+#: src/transport/plugin_transport_http_server.c:2273
 msgid "Could not load or create server certificate! Loading plugin failed!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:2611
+#: src/transport/plugin_transport_http_server.c:2582
 #, 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:2645 src/util/service.c:704
+#: src/transport/plugin_transport_http_server.c:2616 src/util/service.c:704
 #, fuzzy, c-format
 msgid "Failed to resolve `%s': %s\n"
 msgstr "Datei wurde als `%s' gespeichert.\n"
 
-#: src/transport/plugin_transport_http_server.c:2663 src/util/service.c:723
+#: src/transport/plugin_transport_http_server.c:2634 src/util/service.c:723
 #, 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:2776
+#: src/transport/plugin_transport_http_server.c:2747
 #, c-format
 msgid "Found %u addresses to report to NAT service\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:2854
+#: src/transport/plugin_transport_http_server.c:2825
+#: src/transport/plugin_transport_udp.c:3332
 msgid "Disabling IPv6 since it is not supported on this system!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:2953
+#: src/transport/plugin_transport_http_server.c:2924
 #, c-format
 msgid "IPv4 support is %s\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:2968
+#: src/transport/plugin_transport_http_server.c:2939
 #, c-format
 msgid "IPv6 support is %s\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:2974
+#: src/transport/plugin_transport_http_server.c:2945
 #, 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:2985
+#: src/transport/plugin_transport_http_server.c:2956
 #, fuzzy
 msgid "Port is required! Fix in configuration\n"
 msgstr " gconfig\tGTK Konfiguration\n"
 
-#: src/transport/plugin_transport_http_server.c:2991
+#: src/transport/plugin_transport_http_server.c:2962
 #, fuzzy, c-format
 msgid "Using port %u\n"
 msgstr "Teste Transport(e) %s\n"
 
-#: src/transport/plugin_transport_http_server.c:3005
+#: src/transport/plugin_transport_http_server.c:2976
 #, 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:3015
+#: src/transport/plugin_transport_http_server.c:2986
 #, fuzzy, c-format
 msgid "Binding to IPv4 address %s\n"
 msgstr "Ungültiger Parameter: `%s'\n"
 
-#: src/transport/plugin_transport_http_server.c:3037
+#: src/transport/plugin_transport_http_server.c:3008
 #, 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:3047
+#: src/transport/plugin_transport_http_server.c:3018
 #, fuzzy, c-format
 msgid "Binding to IPv6 address %s\n"
 msgstr "Ungültiger Parameter: `%s'\n"
 
-#: src/transport/plugin_transport_http_server.c:3110
+#: src/transport/plugin_transport_http_server.c:3081
 #, fuzzy, c-format
 msgid "Using external hostname `%s'\n"
 msgstr "Collection `%s' begonnen.\n"
 
-#: src/transport/plugin_transport_http_server.c:3131
+#: src/transport/plugin_transport_http_server.c:3102
 #, 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:3148
+#: src/transport/plugin_transport_http_server.c:3119
 #, 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:3455
+#: src/transport/plugin_transport_http_server.c:3426
 #, fuzzy
 msgid "Unable to compile URL regex\n"
 msgstr "SQLite Datenbank konnte nicht initialisiert werden: %s.\n"
@@ -8215,238 +8202,259 @@ msgstr "# Bytes gesendet über TCP"
 msgid "# bytes dropped by SMTP (outgoing)"
 msgstr "# Bytes verworfen von TCP (ausgehend)"
 
-#: src/transport/plugin_transport_tcp.c:648
+#: src/transport/plugin_transport_tcp.c:672
 #, c-format
 msgid "Unexpected address length: %u bytes\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:829
-#: src/transport/plugin_transport_tcp.c:1044
-#: src/transport/plugin_transport_tcp.c:2239
-#: src/transport/plugin_transport_tcp.c:2950
+#: src/transport/plugin_transport_tcp.c:855
+#: src/transport/plugin_transport_tcp.c:1081
+#: src/transport/plugin_transport_tcp.c:2251
+#: src/transport/plugin_transport_tcp.c:3042
 #, fuzzy
 msgid "# TCP sessions active"
 msgstr "# Sitzungsschlüssel akzeptiert"
 
-#: src/transport/plugin_transport_tcp.c:870
-#: src/transport/plugin_transport_tcp.c:1027
-#: src/transport/plugin_transport_tcp.c:1146
-#: src/transport/plugin_transport_tcp.c:1214
-#: src/transport/plugin_transport_tcp.c:1312
-#: src/transport/plugin_transport_tcp.c:1336
+#: src/transport/plugin_transport_tcp.c:897
+#: src/transport/plugin_transport_tcp.c:1063
+#: src/transport/plugin_transport_tcp.c:1187
+#: src/transport/plugin_transport_tcp.c:1260
+#: src/transport/plugin_transport_tcp.c:1360
+#: src/transport/plugin_transport_tcp.c:1385
 #, fuzzy
 msgid "# bytes currently in TCP buffers"
 msgstr "# Bytes gesendet über TCP"
 
-#: src/transport/plugin_transport_tcp.c:873
+#: src/transport/plugin_transport_tcp.c:900
 #, fuzzy
 msgid "# bytes discarded by TCP (disconnect)"
 msgstr "# Bytes verworfen von TCP (ausgehend)"
 
-#: src/transport/plugin_transport_tcp.c:1149
+#: src/transport/plugin_transport_tcp.c:1190
 #, fuzzy
 msgid "# bytes discarded by TCP (timeout)"
 msgstr "# Bytes verworfen von TCP (ausgehend)"
 
-#: src/transport/plugin_transport_tcp.c:1218
+#: src/transport/plugin_transport_tcp.c:1264
 #, fuzzy
 msgid "# bytes transmitted via TCP"
 msgstr "# Bytes des Typs %d übertragen"
 
-#: src/transport/plugin_transport_tcp.c:1616
+#: src/transport/plugin_transport_tcp.c:1659
 msgid "# requests to create session with invalid address"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:1782
+#: src/transport/plugin_transport_tcp.c:1827
 msgid "# transport-service disconnect requests for TCP"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2292
+#: src/transport/plugin_transport_tcp.c:2310
 #, fuzzy
 msgid "# TCP WELCOME messages received"
 msgstr "# verschlüsselter PONG Nachrichten empfangen"
 
-#: src/transport/plugin_transport_tcp.c:2470
+#: src/transport/plugin_transport_tcp.c:2501
 msgid "# bytes received via TCP"
 msgstr "# Bytes empfangen über TCP"
 
-#: src/transport/plugin_transport_tcp.c:2542
+#: src/transport/plugin_transport_tcp.c:2552
+#: src/transport/plugin_transport_tcp.c:2610
+#, fuzzy
+msgid "# TCP server connections active"
+msgstr "# verbundener Knoten"
+
+#: src/transport/plugin_transport_tcp.c:2556
+#, fuzzy
+msgid "# TCP server connect events"
+msgstr "# verbundener Knoten"
+
+#: src/transport/plugin_transport_tcp.c:2562
+msgid "TCP connection limit reached, suspending server\n"
+msgstr ""
+
+#: src/transport/plugin_transport_tcp.c:2564
+msgid "# TCP service suspended"
+msgstr ""
+
+#: src/transport/plugin_transport_tcp.c:2604
+msgid "# TCP service resumed"
+msgstr ""
+
+#: src/transport/plugin_transport_tcp.c:2614
 msgid "# network-level TCP disconnect events"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2778 src/util/service.c:584
+#: src/transport/plugin_transport_tcp.c:2857 src/util/service.c:584
 #: src/util/service.c:590
 #, c-format
 msgid "Require valid port number for service `%s' in configuration!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2794
+#: src/transport/plugin_transport_tcp.c:2873
 #, fuzzy
 msgid "Failed to start service.\n"
 msgstr "Fehler beim Starten der Collection.\n"
 
-#: src/transport/plugin_transport_tcp.c:2937
+#: src/transport/plugin_transport_tcp.c:3030
 #, 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:2941
+#: src/transport/plugin_transport_tcp.c:3034
 msgid "TCP transport not listening on any port (client only)\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2945
+#: src/transport/plugin_transport_tcp.c:3038
 #, c-format
 msgid "TCP transport advertises itself as being on port %llu\n"
 msgstr ""
 
-#: src/transport/plugin_transport_udp_broadcasting.c:172
+#: src/transport/plugin_transport_udp_broadcasting.c:170
 #, fuzzy
-msgid "# IPv6 multicast HELLO beacons received via udp"
+msgid "# Multicast HELLO beacons received via UDP"
 msgstr "# verschlüsselter PONG Nachrichten empfangen"
 
-#: src/transport/plugin_transport_udp_broadcasting.c:218
-#, fuzzy
-msgid "# IPv4 broadcast HELLO beacons received via udp"
-msgstr "# verschlüsselter PONG Nachrichten empfangen"
-
-#: src/transport/plugin_transport_udp_broadcasting.c:609
+#: src/transport/plugin_transport_udp_broadcasting.c:548
 msgid ""
 "Disabling HELLO broadcasting due to friend-to-friend only configuration!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_udp_broadcasting.c:632
+#: src/transport/plugin_transport_udp_broadcasting.c:569
 #, c-format
 msgid "Failed to set IPv4 broadcast option for broadcast socket on port %d\n"
 msgstr ""
 
-#: src/transport/plugin_transport_udp.c:1658
-#, c-format
-msgid ""
-"Trying to create session for address of unexpected length %u (should be %u "
-"or %u)\n"
-msgstr ""
-
-#: src/transport/plugin_transport_udp.c:2905
+#: src/transport/plugin_transport_udp.c:3078
 #, c-format
 msgid ""
 "UDP could not transmit message to `%s': Network seems down, please check "
 "your network configuration\n"
 msgstr ""
 
-#: src/transport/plugin_transport_udp.c:2918
+#: src/transport/plugin_transport_udp.c:3092
 msgid ""
 "UDP could not transmit IPv6 message! Please check your network configuration "
 "and disable IPv6 if your connection does not have a global IPv6 address\n"
 msgstr ""
 
-#: src/transport/plugin_transport_udp.c:3271
+#: src/transport/plugin_transport_udp.c:3408
+#: src/transport/plugin_transport_udp.c:3507
 #, fuzzy, c-format
 msgid "Failed to bind UDP socket to %s: %s\n"
 msgstr "Fehler beim Binden an UDP6 Port %d.\n"
 
-#: src/transport/plugin_transport_udp.c:3279
+#: src/transport/plugin_transport_udp.c:3426
+msgid "Disabling IPv4 since it is not supported on this system!\n"
+msgstr ""
+
+#: src/transport/plugin_transport_udp.c:3517
 #, fuzzy
 msgid "Failed to open UDP sockets\n"
 msgstr "Fehler beim Binden an UDP6 Port %d.\n"
 
-#: src/transport/plugin_transport_udp.c:3438
-#, c-format
-msgid "Given `%s' option is out of range: %llu > %u\n"
+#: src/transport/plugin_transport_udp.c:3588
+#: src/transport/plugin_transport_udp.c:3602
+msgid "must be in [0,65535]"
 msgstr ""
 
-#: src/transport/plugin_transport_udp.c:3485
-#, fuzzy, c-format
-msgid "Invalid IPv6 address: `%s'\n"
-msgstr "Ungültiger Parameter: `%s'\n"
+#: src/transport/plugin_transport_udp.c:3634
+#, fuzzy
+msgid "must be valid IPv4 address"
+msgstr "`%s' ist nicht verfügbar."
+
+#: src/transport/plugin_transport_udp.c:3661
+#, fuzzy
+msgid "must be valid IPv6 address"
+msgstr "`%s' ist nicht verfügbar."
 
-#: src/transport/plugin_transport_udp.c:3553
+#: src/transport/plugin_transport_udp.c:3727
 #, fuzzy
-msgid "Failed to create network sockets, plugin failed\n"
+msgid "Failed to create UDP network sockets\n"
 msgstr "Namespace `%s' konnte nicht erstellt werden (existiert bereits?).\n"
 
-#: src/transport/plugin_transport_unix.c:1405
+#: src/transport/plugin_transport_unix.c:1393
 #, fuzzy, c-format
 msgid "Cannot create path to `%s'\n"
 msgstr "Namespace `%s' konnte nicht erstellt werden (existiert bereits?).\n"
 
-#: src/transport/plugin_transport_unix.c:1418
+#: src/transport/plugin_transport_unix.c:1406
 #, fuzzy, c-format
 msgid "Cannot bind to `%s'\n"
 msgstr "`%s' konnte nicht gehashed werden.\n"
 
-#: src/transport/plugin_transport_unix.c:1819
+#: src/transport/plugin_transport_unix.c:1807
 #, fuzzy
 msgid "Failed to open UNIX listen socket\n"
 msgstr "Datei wurde als `%s' gespeichert.\n"
 
-#: src/transport/plugin_transport_wlan.c:733
+#: src/transport/plugin_transport_wlan.c:742
 msgid "# ACKs sent"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:753
+#: src/transport/plugin_transport_wlan.c:762
 #, fuzzy
 msgid "# Messages defragmented"
 msgstr "# defragmentierter Nachrichten"
 
-#: src/transport/plugin_transport_wlan.c:794
-#: src/transport/plugin_transport_wlan.c:881
+#: src/transport/plugin_transport_wlan.c:803
+#: src/transport/plugin_transport_wlan.c:890
 #, fuzzy
 msgid "# Sessions allocated"
 msgstr "# Sitzungsschlüssel akzeptiert"
 
-#: src/transport/plugin_transport_wlan.c:1002
+#: src/transport/plugin_transport_wlan.c:1011
 #, fuzzy
 msgid "# message fragments sent"
 msgstr "# fragmentierter Nachrichten"
 
-#: src/transport/plugin_transport_wlan.c:1031
+#: src/transport/plugin_transport_wlan.c:1040
 #, fuzzy
 msgid "# messages pending (with fragmentation)"
 msgstr "# defragmentierter Nachrichten"
 
-#: src/transport/plugin_transport_wlan.c:1162
-#: src/transport/plugin_transport_wlan.c:1255
-#: src/transport/plugin_transport_wlan.c:2272
+#: src/transport/plugin_transport_wlan.c:1171
+#: src/transport/plugin_transport_wlan.c:1264
+#: src/transport/plugin_transport_wlan.c:2268
 #, fuzzy
 msgid "# MAC endpoints allocated"
 msgstr "# Client Trace-Anfragen empfangen"
 
-#: src/transport/plugin_transport_wlan.c:1530
+#: src/transport/plugin_transport_wlan.c:1528
 #, fuzzy
 msgid "# ACKs received"
 msgstr "# Bytes empfangen über TCP"
 
-#: src/transport/plugin_transport_wlan.c:1599
+#: src/transport/plugin_transport_wlan.c:1597
 #, fuzzy
 msgid "# DATA messages discarded due to CRC32 error"
 msgstr "# defragmentierter Nachrichten"
 
-#: src/transport/plugin_transport_wlan.c:1707
+#: src/transport/plugin_transport_wlan.c:1703
 #, fuzzy
 msgid "# HELLO beacons sent"
 msgstr "# Bytes gesendet über UDP"
 
-#: src/transport/plugin_transport_wlan.c:1824
+#: src/transport/plugin_transport_wlan.c:1820
 #, fuzzy
 msgid "# DATA messages received"
 msgstr "# verschlüsselter PONG Nachrichten empfangen"
 
-#: src/transport/plugin_transport_wlan.c:1858
+#: src/transport/plugin_transport_wlan.c:1854
 #, fuzzy
 msgid "# DATA messages processed"
 msgstr "# verschlüsselter PONG Nachrichten empfangen"
 
-#: src/transport/plugin_transport_wlan.c:2247
+#: src/transport/plugin_transport_wlan.c:2243
 #, c-format
 msgid "Helper binary `%s' not SUID, cannot run WLAN transport\n"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:2269
+#: src/transport/plugin_transport_wlan.c:2265
 #, fuzzy
 msgid "# sessions allocated"
 msgstr "# Sitzungsschlüssel akzeptiert"
 
-#: src/transport/transport_api.c:816
+#: src/transport/transport_api.c:812
 #, fuzzy, c-format
 msgid "Received unexpected message of type %u in %s:%u\n"
 msgstr "Es wurde eine unbekannte Testbed Nachricht des Typs %u empfangen.\n"
@@ -8491,42 +8499,38 @@ msgstr ""
 msgid "Metadata `%s' failed to deserialize"
 msgstr ""
 
-#: src/util/client.c:261 src/util/client.c:858 src/util/service.c:621
+#: src/util/client.c:263 src/util/client.c:889 src/util/service.c:621
 #, c-format
 msgid "UNIXPATH `%s' too long, maximum length is %llu\n"
 msgstr ""
 
-#: src/util/client.c:265 src/util/client.c:863 src/util/service.c:625
+#: src/util/client.c:267 src/util/client.c:894 src/util/service.c:625
 #, fuzzy, c-format
 msgid "Using `%s' instead\n"
 msgstr "%s: Option `%s' ist mehrdeutig\n"
 
-#: src/util/client.c:360
+#: src/util/client.c:362
 #, c-format
 msgid ""
 "Could not determine valid hostname and port for service `%s' from "
 "configuration.\n"
 msgstr ""
 
-#: src/util/client.c:368
+#: src/util/client.c:370
 #, c-format
 msgid "Need a non-empty hostname for service `%s'.\n"
 msgstr ""
 
-#: src/util/client.c:1008
+#: src/util/client.c:1039
 #, fuzzy, c-format
 msgid "Could not connect to service `%s', configuration broken.\n"
 msgstr "Verbindung zu gnunetd konnte nicht hergestellt werden.\n"
 
-#: src/util/client.c:1020
+#: src/util/client.c:1051
 #, fuzzy, c-format
 msgid "Failure to transmit request to service `%s'\n"
 msgstr "Fehler beim Senden einer `%s' Anfrage an den SMTP Server.\n"
 
-#: src/util/client.c:1299
-msgid "Could not submit request, not expecting to receive a response.\n"
-msgstr ""
-
 #: src/util/common_logging.c:254 src/util/common_logging.c:1039
 msgid "DEBUG"
 msgstr "DEBUG"
@@ -8598,49 +8602,33 @@ msgid ""
 "choices\n"
 msgstr ""
 
-#: src/util/configuration.c:1144
+#: src/util/configuration.c:1145
 #, c-format
 msgid "Recursive expansion suspected, aborting $-expansion for term `%s'\n"
 msgstr ""
 
-#: src/util/configuration.c:1176
+#: src/util/configuration.c:1177
 #, fuzzy, c-format
 msgid "Missing closing `%s' in option `%s'\n"
 msgstr "Konfigurationsdatei `%s' wurde erzeugt.\n"
 
-#: src/util/configuration.c:1250
+#: src/util/configuration.c:1251
 #, c-format
 msgid ""
 "Failed to expand `%s' in `%s' as it is neither found in [PATHS] nor defined "
 "as an environmental variable\n"
 msgstr ""
 
-#: src/util/connection.c:423
+#: src/util/connection.c:424
 #, fuzzy, c-format
 msgid "Access denied to `%s'\n"
 msgstr "Zugriff verweigert für `%s' bei %s:%d.\n"
 
-#: src/util/connection.c:438
+#: src/util/connection.c:441
 #, c-format
 msgid "Accepting connection from `%s': %p\n"
 msgstr ""
 
-#: src/util/connection.c:553
-#, fuzzy, c-format
-msgid ""
-"Failed to establish TCP connection to `%s:%u', no further addresses to try.\n"
-msgstr "Fehler beim Aufbauen einer Verbindung mit gnunetd.\n"
-
-#: src/util/connection.c:751 src/util/connection.c:914
-#, fuzzy, c-format
-msgid "Trying to connect to `%s' (%p)\n"
-msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
-
-#: src/util/connection.c:904
-#, fuzzy, c-format
-msgid "Attempt to connect to `%s' failed\n"
-msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
-
 #: src/util/container_bloomfilter.c:531
 #, c-format
 msgid ""
@@ -8648,52 +8636,52 @@ msgid ""
 "%llu)\n"
 msgstr ""
 
-#: src/util/crypto_ecc.c:702 src/util/crypto_ecc.c:740
-#: src/util/crypto_ecc.c:858 src/util/crypto_ecc.c:896
+#: src/util/crypto_ecc.c:731 src/util/crypto_ecc.c:769
+#: src/util/crypto_ecc.c:887 src/util/crypto_ecc.c:925
 #, fuzzy, c-format
 msgid "Could not acquire lock on file `%s': %s...\n"
 msgstr "PID konnte nicht in Datei `%s' geschrieben werden: %s.\n"
 
-#: src/util/crypto_ecc.c:707 src/util/crypto_ecc.c:863
+#: src/util/crypto_ecc.c:736 src/util/crypto_ecc.c:892
 #, fuzzy
 msgid "Creating a new private key.  This may take a while.\n"
 msgstr "Ein neuer Hostkey wird erzeugt (dies kann eine Weile dauern).\n"
 
-#: src/util/crypto_ecc.c:744 src/util/crypto_ecc.c:900
+#: src/util/crypto_ecc.c:773 src/util/crypto_ecc.c:929
 msgid "This may be ok if someone is currently generating a private key.\n"
 msgstr ""
 
-#: src/util/crypto_ecc.c:774 src/util/crypto_ecc.c:930
+#: src/util/crypto_ecc.c:803 src/util/crypto_ecc.c:959
 #, c-format
 msgid ""
 "When trying to read key file `%s' I found %u bytes but I need at least %u.\n"
 msgstr ""
 
-#: src/util/crypto_ecc.c:778 src/util/crypto_ecc.c:934
+#: src/util/crypto_ecc.c:807 src/util/crypto_ecc.c:963
 msgid "This may be ok if someone is currently generating a key.\n"
 msgstr ""
 
-#: src/util/crypto_ecc.c:1016
+#: src/util/crypto_ecc.c:1045
 #, fuzzy
 msgid "Could not load peer's private key\n"
 msgstr "Konfigurationsdatei `%s' konnte nicht geparst werden.\n"
 
-#: src/util/crypto_ecc.c:1120
+#: src/util/crypto_ecc.c:1149
 #, fuzzy, c-format
 msgid "ECC signing failed at %s:%d: %s\n"
 msgstr "`%s' schlug fehl bei %s:%d mit dem Fehler: `%s'.\n"
 
-#: src/util/crypto_ecc.c:1170
+#: src/util/crypto_ecc.c:1199
 #, fuzzy, c-format
 msgid "EdDSA signing failed at %s:%d: %s\n"
 msgstr "`%s' schlug fehl bei %s:%d mit dem Fehler: `%s'.\n"
 
-#: src/util/crypto_ecc.c:1244
+#: src/util/crypto_ecc.c:1273
 #, fuzzy, c-format
 msgid "ECDSA signature verification failed at %s:%d: %s\n"
 msgstr "RSA Signaturüberprüfung fehlgeschlagen bei %s:%d: %s\n"
 
-#: src/util/crypto_ecc.c:1301
+#: src/util/crypto_ecc.c:1330
 #, fuzzy, c-format
 msgid "EdDSA signature verification failed at %s:%d: %s\n"
 msgstr "RSA Signaturüberprüfung fehlgeschlagen bei %s:%d: %s\n"
@@ -8988,17 +8976,17 @@ msgstr ""
 msgid "Perform default-actions for GNUnet URIs"
 msgstr ""
 
-#: src/util/helper.c:338
+#: src/util/helper.c:342
 #, fuzzy, c-format
 msgid "Error reading from `%s': %s\n"
 msgstr "Fehler beim Anlegen des Benutzers"
 
-#: src/util/helper.c:383
+#: src/util/helper.c:388
 #, fuzzy, c-format
 msgid "Failed to parse inbound message from helper `%s'\n"
 msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
 
-#: src/util/helper.c:609
+#: src/util/helper.c:618
 #, fuzzy, c-format
 msgid "Error writing to `%s': %s\n"
 msgstr "Fehler beim Anlegen des Benutzers"
@@ -9008,7 +8996,7 @@ msgstr "Fehler beim Anlegen des Benutzers"
 msgid "Unable to shorten unix path `%s' while keeping name unique\n"
 msgstr ""
 
-#: src/util/network.c:1669 src/util/network.c:1845
+#: src/util/network.c:1681 src/util/network.c:1857
 #, c-format
 msgid ""
 "Fatal internal logic error, process hangs in `%s' (abort with CTRL-C)!\n"
@@ -9095,16 +9083,12 @@ msgstr "GNUnet verwendet nun die IP-Adresse %u.%u.%u.%u.\n"
 msgid "Timeout trying to resolve hostname `%s'.\n"
 msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
 
-#: src/util/resolver_api.c:974
+#: src/util/resolver_api.c:1004
 #, fuzzy, c-format
 msgid "Could not resolve our FQDN : %s\n"
 msgstr "`%s' konnte nicht aufgelöst werden: %s\n"
 
-#: src/util/scheduler.c:812
-msgid "Looks like we're busy waiting...\n"
-msgstr ""
-
-#: src/util/server.c:484
+#: src/util/server.c:483
 #, fuzzy, c-format
 msgid "`%s' failed for port %d (%s).\n"
 msgstr "`%s' fehlgeschlagen für Laufwerk %s: %u\n"
@@ -9119,7 +9103,7 @@ msgstr "`%s' schlug fehl für Port %d: %s. Läuft gnunetd bereits?\n"
 msgid "`%s' failed for `%s': address already in use\n"
 msgstr "`%s' schlug fehl für Port %d: %s. Läuft gnunetd bereits?\n"
 
-#: src/util/server.c:896
+#: src/util/server.c:904
 #, c-format
 msgid ""
 "Processing code for message of type %u did not call "
@@ -9273,63 +9257,63 @@ msgstr " Tage"
 msgid "end of time"
 msgstr ""
 
-#: src/util/strings.c:1192
+#: src/util/strings.c:1226
 msgid "IPv6 address did not start with `['\n"
 msgstr ""
 
-#: src/util/strings.c:1200
+#: src/util/strings.c:1234
 msgid "IPv6 address did contain ':' to separate port number\n"
 msgstr ""
 
-#: src/util/strings.c:1206
+#: src/util/strings.c:1240
 msgid "IPv6 address did contain ']' before ':' to separate port number\n"
 msgstr ""
 
-#: src/util/strings.c:1213
+#: src/util/strings.c:1247
 msgid "IPv6 address did contain a valid port number after the last ':'\n"
 msgstr ""
 
-#: src/util/strings.c:1222
+#: src/util/strings.c:1256
 #, fuzzy, c-format
 msgid "Invalid IPv6 address `%s': %s\n"
 msgstr "Ungültiger Parameter: `%s'\n"
 
-#: src/util/strings.c:1428 src/util/strings.c:1444
+#: src/util/strings.c:1462 src/util/strings.c:1478
 msgid "Port not in range\n"
 msgstr ""
 
-#: src/util/strings.c:1453
+#: src/util/strings.c:1487
 #, fuzzy, c-format
 msgid "Malformed port policy `%s'\n"
 msgstr "Der Transportdienst auf Port %d konnte nicht gestartet werden.\n"
 
-#: src/util/strings.c:1536 src/util/strings.c:1567 src/util/strings.c:1615
-#: src/util/strings.c:1636
+#: src/util/strings.c:1570 src/util/strings.c:1601 src/util/strings.c:1649
+#: src/util/strings.c:1670
 #, c-format
 msgid "Invalid format for IP: `%s'\n"
 msgstr "Ungültiges Format für IP: `%s'\n"
 
-#: src/util/strings.c:1593
+#: src/util/strings.c:1627
 #, c-format
 msgid "Invalid network notation ('/%d' is not legal in IPv4 CIDR)."
 msgstr "Ungültige Netzwerk Notation ('/%d ist nicht gültig in IPv4 CIDR)."
 
-#: src/util/strings.c:1645
+#: src/util/strings.c:1679
 #, fuzzy, c-format
 msgid "Invalid format: `%s'\n"
 msgstr "Ungültiger Parameter: `%s'\n"
 
-#: src/util/strings.c:1697
+#: src/util/strings.c:1731
 #, c-format
 msgid "Invalid network notation (does not end with ';': `%s')\n"
 msgstr "Ungültige Netzwerk Notation (endet nicht mit ';': `%s')\n"
 
-#: src/util/strings.c:1747
+#: src/util/strings.c:1781
 #, fuzzy, c-format
 msgid "Wrong format `%s' for netmask\n"
 msgstr "Falsches Format `%s' für Netzmaske: %s\n"
 
-#: src/util/strings.c:1778
+#: src/util/strings.c:1812
 #, fuzzy, c-format
 msgid "Wrong format `%s' for network\n"
 msgstr "Falsches Format `%s' für Netzwerk: %s\n"
@@ -9518,23 +9502,90 @@ msgstr "# Bytes empfangen über UDP"
 msgid "Setup tunnels via VPN."
 msgstr ""
 
-#: src/include/gnunet_common.h:588 src/include/gnunet_common.h:595
-#: src/include/gnunet_common.h:603
+#: src/include/gnunet_common.h:590 src/include/gnunet_common.h:597
+#: src/include/gnunet_common.h:605
 #, fuzzy, c-format
 msgid "Assertion failed at %s:%d.\n"
 msgstr "Absicherung fehlgeschlagen bei %s:%d.\n"
 
-#: src/include/gnunet_common.h:615
+#: src/include/gnunet_common.h:617
 #, fuzzy, c-format
 msgid "External protocol violation detected at %s:%d.\n"
 msgstr "Absicherung fehlgeschlagen bei %s:%d.\n"
 
-#: src/include/gnunet_common.h:642 src/include/gnunet_common.h:651
+#: src/include/gnunet_common.h:644 src/include/gnunet_common.h:653
 #, fuzzy, c-format
 msgid "`%s' failed on file `%s' at %s:%d with error: %s\n"
 msgstr "`%s' schlug bei Datei `%s' fehl. Ort: %s:%d. Fehler: %s\n"
 
 #, fuzzy
+#~ msgid "Failed to initialize solver!\n"
+#~ msgstr "SQLite Datenbank konnte nicht initialisiert werden: %s.\n"
+
+#, fuzzy
+#~ msgid "Invalid network type `%u' `%s': Disconnect!\n"
+#~ msgstr "IP des Hosts `%s' konnte nicht ermittelt werden: %s\n"
+
+#, fuzzy
+#~ msgid "Failed to receive response from database.\n"
+#~ msgstr ""
+#~ "\n"
+#~ "Fehler beim Empfangen der Antwort von gnunetd.\n"
+
+#, fuzzy
+#~ 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"
+
+#, fuzzy
+#~ msgid "Blacklist refuses connection attempt to peer `%s'\n"
+#~ msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
+
+#, fuzzy
+#~ msgid "# keepalives sent"
+#~ msgstr "# p2p Trace-Antworten gesendet"
+
+#, fuzzy
+#~ msgid ""
+#~ "Failed to send SYN message to peer `%s' using address `%s' session %p\n"
+#~ msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
+
+#, fuzzy
+#~ msgid "# Failed attempts to switch addresses (no response)"
+#~ msgstr "Fehler beim Senden einer `%s' Anfrage an den SMTP Server.\n"
+
+#, fuzzy
+#~ msgid "Validation received new %s message for peer `%s' with size %u\n"
+#~ msgstr "GAP hat ungültige Inhalte von `%s' empfangen.\n"
+
+#, fuzzy
+#~ msgid "Adding `%s' without addresses for peer `%s'\n"
+#~ msgstr "Adresse des Knotens `%s' konnte nicht ermittelt werden.\n"
+
+#, fuzzy
+#~ msgid "# IPv4 broadcast HELLO beacons received via udp"
+#~ msgstr "# verschlüsselter PONG Nachrichten empfangen"
+
+#, fuzzy
+#~ msgid "Invalid IPv6 address: `%s'\n"
+#~ msgstr "Ungültiger Parameter: `%s'\n"
+
+#, fuzzy
+#~ msgid ""
+#~ "Failed to establish TCP connection to `%s:%u', no further addresses to "
+#~ "try.\n"
+#~ msgstr "Fehler beim Aufbauen einer Verbindung mit gnunetd.\n"
+
+#, fuzzy
+#~ msgid "Trying to connect to `%s' (%p)\n"
+#~ msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
+
+#, fuzzy
+#~ msgid "Attempt to connect to `%s' failed\n"
+#~ msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
+
+#, fuzzy
 #~ msgid "# PING without HELLO messages sent"
 #~ msgstr "# Klartext PING Nachrichten gesendet"
 
@@ -10475,10 +10526,6 @@ msgstr "`%s' schlug bei Datei `%s' fehl. Ort: %s:%d. Fehler: %s\n"
 #~ msgstr "`%s' schlug fehl: %s\n"
 
 #, fuzzy
-#~ msgid "# Peers connected"
-#~ msgstr "# verbundener Knoten"
-
-#, fuzzy
 #~ msgid "%s failed for `%s' at %s:%d: `%s'\n"
 #~ msgstr "`%s' schlug fehl bei %s:%d mit dem Fehler: `%s'.\n"
 
diff --git a/po/es.po b/po/es.po
index deadd894e..4e4a5c968 100644
--- a/po/es.po
+++ b/po/es.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnunet 0.9.5a\n"
 "Report-Msgid-Bugs-To: gnunet-developers@mail.gnu.org\n"
-"POT-Creation-Date: 2015-01-27 19:22+0100\n"
+"POT-Creation-Date: 2015-03-07 12:06+0100\n"
 "PO-Revision-Date: 2013-02-23 17:50+0100\n"
 "Last-Translator: Miguel Ángel Arruga Vivas <rosen644835@gmail.com>\n"
 "Language-Team: Spanish <es@li.org>\n"
@@ -351,9 +351,7 @@ msgstr "El servicio «%s» finalizó con estado %s/%d, se reiniciará en %llu ms
 msgid "Initiating shutdown as requested by client.\n"
 msgstr "Iniciando apagado bajo petición del cliente.\n"
 
-#: src/ats/gnunet-ats-solver-eval.c:2810 src/ats/gnunet-ats-solver-eval.c:2851
-#: src/ats/gnunet-service-ats_addresses.c:1635
-#: src/ats/gnunet-service-ats_addresses.c:1683
+#: src/ats/gnunet-ats-solver-eval.c:2778 src/ats/gnunet-ats-solver-eval.c:2819
 #, c-format
 msgid ""
 "Could not load quota for network `%s':  `%s', assigning default bandwidth "
@@ -362,8 +360,7 @@ msgstr ""
 "No se pudieron cargar las cuotas para la red «%s»:  «%s», asignando el ancho "
 "de banda predeterminado %llu\n"
 
-#: src/ats/gnunet-ats-solver-eval.c:2828
-#: src/ats/gnunet-service-ats_addresses.c:1653
+#: src/ats/gnunet-ats-solver-eval.c:2796
 #, c-format
 msgid ""
 "No outbound quota configured for network `%s', assigning default bandwidth "
@@ -372,8 +369,7 @@ msgstr ""
 "No hay configurada una cuota de salida para la red «%s», asignando el ancho "
 "de banda predeterminado %llu\n"
 
-#: src/ats/gnunet-ats-solver-eval.c:2869
-#: src/ats/gnunet-service-ats_addresses.c:1701
+#: src/ats/gnunet-ats-solver-eval.c:2837
 #, c-format
 msgid ""
 "No outbound quota configure for network `%s', assigning default bandwidth "
@@ -382,94 +378,94 @@ msgstr ""
 "No hay configurada una cuota de salida para la red «%s», asignando el ancho "
 "de banda predeterminado %llu\n"
 
-#: src/ats/gnunet-ats-solver-eval.c:3434
+#: src/ats/gnunet-ats-solver-eval.c:3290
 #: src/ats-tests/gnunet-solver-eval.c:918
 #, fuzzy
 msgid "solver to use"
 msgstr "valor a establecer"
 
-#: src/ats/gnunet-ats-solver-eval.c:3437
+#: src/ats/gnunet-ats-solver-eval.c:3293
 #: src/ats-tests/gnunet-solver-eval.c:921
 #: src/ats-tests/gnunet-solver-eval.c:924
 msgid "experiment to use"
 msgstr ""
 
-#: src/ats/gnunet-ats-solver-eval.c:3440
+#: src/ats/gnunet-ats-solver-eval.c:3296
 msgid "be verbose"
 msgstr ""
 
-#: src/ats/gnunet-ats-solver-eval.c:3443
+#: src/ats/gnunet-ats-solver-eval.c:3299
 #, fuzzy
 msgid "print logging"
 msgstr "Iniciando descarga «%s».\n"
 
-#: src/ats/gnunet-ats-solver-eval.c:3446
+#: src/ats/gnunet-ats-solver-eval.c:3302
 msgid "save logging to disk"
 msgstr ""
 
-#: src/ats/gnunet-ats-solver-eval.c:3449
+#: src/ats/gnunet-ats-solver-eval.c:3305
 msgid "disable normalization"
 msgstr ""
 
-# Miguel: "Outbound" lo he traducido como salida en todo el texto.
-#: src/ats/gnunet-service-ats_addresses.c:1644
-#, c-format
-msgid "Outbound quota configure for network `%s' is %llu\n"
-msgstr "La cuota de salida configurada para la red «%s» es %llu\n"
+#: src/ats/gnunet-service-ats_plugins.c:304
+#, fuzzy, c-format
+msgid ""
+"Could not load %s quota for network `%s':  `%s', assigning default bandwidth "
+"%llu\n"
+msgstr ""
+"No se pudieron cargar las cuotas para la red «%s»:  «%s», asignando el ancho "
+"de banda predeterminado %llu\n"
 
 # Miguel: "Inbound" lo he traducido como entrada en todo el texto.
-#: src/ats/gnunet-service-ats_addresses.c:1692
-#, c-format
-msgid "Inbound quota configured for network `%s' is %llu\n"
+#: src/ats/gnunet-service-ats_plugins.c:314
+#, fuzzy, c-format
+msgid "%s quota configured for network `%s' is %llu\n"
 msgstr "La cuota de entrada configurada para la red «%s» es %llu\n"
 
-#: src/ats/gnunet-service-ats_addresses.c:1895
-#, c-format
-msgid "Initializing solver `%s '`%s'\n"
+#: src/ats/gnunet-service-ats_plugins.c:359
+#, fuzzy, c-format
+msgid ""
+"No %s-quota configured for network `%s', assigning default bandwidth %llu\n"
 msgstr ""
+"No hay configurada una cuota de salida para la red «%s», asignando el ancho "
+"de banda predeterminado %llu\n"
 
-#: src/ats/gnunet-service-ats_addresses.c:1901
+#: src/ats/gnunet-service-ats_plugins.c:451
 #, 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:1926
-#, fuzzy
-msgid "Failed to initialize solver!\n"
-msgstr "¡No se puede inicializar el resolvedor!\n"
-
-#: src/ats/plugin_ats_mlp.c:1345
+#: src/ats/plugin_ats_mlp.c:1274
 msgid "Problem size too large, cannot allocate memory!\n"
 msgstr ""
 
-#: src/ats/plugin_ats_mlp.c:1941
+#: src/ats/plugin_ats_mlp.c:1869
 #, 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:1993
-#, c-format
-msgid "Updating address property `%s' for peer `%s' %p not added before\n"
-msgstr ""
+#: src/ats/plugin_ats_mlp.c:1913
+#, fuzzy, c-format
+msgid "Updating address property for peer `%s' %p not added before\n"
+msgstr "Añadiendo «%s» sin direcciones para el par «%s»\n"
 
-#: src/ats/plugin_ats_mlp.c:2714
+#: src/ats/plugin_ats_mlp.c:2475
 msgid ""
 "MLP solver is not optimizing for anything, changing to feasibility check\n"
 msgstr ""
 
-#: src/ats/plugin_ats_mlp.c:2754 src/ats/plugin_ats_mlp.c:2771
-#: src/ats/plugin_ats_mlp.c:2803 src/ats/plugin_ats_mlp.c:2821
-#: src/ats/plugin_ats_mlp.c:2840 src/ats/plugin_ats_proportional.c:1993
-#: src/ats/plugin_ats_proportional.c:2014 src/ats/plugin_ats_ril.c:2718
-#: src/ats/plugin_ats_ril.c:2735 src/ats/plugin_ats_ril.c:2752
-#: src/ats/plugin_ats_ril.c:2769 src/ats/plugin_ats_ril.c:2786
-#: src/ats/plugin_ats_ril.c:2803 src/ats/plugin_ats_ril.c:2820
-#: src/ats/plugin_ats_ril.c:2837
+#: src/ats/plugin_ats_mlp.c:2515 src/ats/plugin_ats_mlp.c:2532
+#: src/ats/plugin_ats_mlp.c:2564 src/ats/plugin_ats_mlp.c:2582
+#: src/ats/plugin_ats_mlp.c:2601 src/ats/plugin_ats_proportional.c:1140
+#: src/ats/plugin_ats_ril.c:2613 src/ats/plugin_ats_ril.c:2630
+#: src/ats/plugin_ats_ril.c:2647 src/ats/plugin_ats_ril.c:2664
+#: src/ats/plugin_ats_ril.c:2681 src/ats/plugin_ats_ril.c:2698
+#: src/ats/plugin_ats_ril.c:2715 src/ats/plugin_ats_ril.c:2732
 #, 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:2927
+#: src/ats/plugin_ats_mlp.c:2670
 #, fuzzy, c-format
 msgid ""
 "Adjusting inconsistent outbound quota configuration for network `%s', is "
@@ -478,7 +474,7 @@ msgstr ""
 "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:2936
+#: src/ats/plugin_ats_mlp.c:2679
 #, fuzzy, c-format
 msgid ""
 "Adjusting inconsistent inbound quota configuration for network `%s', is %llu "
@@ -488,29 +484,23 @@ msgstr ""
 "ancho de banda predeterminado (%llu)\n"
 
 # Miguel: "Outbound" lo he traducido como salida en todo el texto.
-#: src/ats/plugin_ats_mlp.c:2947
+#: src/ats/plugin_ats_mlp.c:2689
 #, 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:2955
+#: src/ats/plugin_ats_mlp.c:2698
 #, 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:2966
-#, 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:1852
+#: src/ats/plugin_ats_proportional.c:1163
 #, fuzzy, c-format
-msgid "Invalid network type `%u' `%s': Disconnect!\n"
-msgstr "No se encontró la IP del host «%s»: %s\n"
+msgid "Invalid %s configuration %f\n"
+msgstr "Se produjo un fallo al cargar la configuración de %s\n"
 
 #: src/ats-tests/ats-testing.c:72
 msgid "Benchmarking done\n"
@@ -545,7 +535,7 @@ msgstr ""
 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:677
+#: src/ats-tests/ats-testing.c:490 src/ats-tests/ats-testing.c:662
 #, fuzzy
 msgid "Initialization failed, shutdown\n"
 msgstr "¡La inicialización del mecanismo de módulos falló: %s!\n"
@@ -570,27 +560,19 @@ msgstr ""
 # Son difíciles de no calcar, puesto que no conozco como expresar
 # el concepto de obtener una dirección a partir de un nombre
 # en castellano sin la palabra resolver. :-)
-#: src/ats-tool/gnunet-ats.c:296
+#: src/ats-tool/gnunet-ats.c:289
 #, c-format
 msgid "%u address resolutions had a timeout\n"
 msgstr "%u resoluciones de dirección pasaron de plazo\n"
 
-#: src/ats-tool/gnunet-ats.c:300
+#: src/ats-tool/gnunet-ats.c:293
 #, fuzzy, c-format
 msgid "ATS returned stat_results for %u addresses\n"
 msgstr "El ATS devolvió resultados para %u direcciones\n"
 
-#: src/ats-tool/gnunet-ats.c:377
-msgid "active "
-msgstr ""
-
-#: src/ats-tool/gnunet-ats.c:377
-msgid "inactive "
-msgstr ""
-
 # 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:426
+#: src/ats-tool/gnunet-ats.c:366
 #, c-format
 msgid ""
 "Peer `%s' plugin `%s', address `%s', `%s' bw out: %u Bytes/s, bw in %u Bytes/"
@@ -599,107 +581,115 @@ msgstr ""
 "Par «%s» módulo «%s», dirección «%s», «%s» subida: %u Bytes/s, bajada %u "
 "Bytes/s, %s\n"
 
-#: src/ats-tool/gnunet-ats.c:543
+#: src/ats-tool/gnunet-ats.c:373
+msgid "active "
+msgstr ""
+
+#: src/ats-tool/gnunet-ats.c:373
+msgid "inactive "
+msgstr ""
+
+#: src/ats-tool/gnunet-ats.c:483
 #, fuzzy, c-format
 msgid "Removed address of peer `%s' with plugin `%s'\n"
 msgstr "Eliminando dirección de transporte «%s»\n"
 
-#: src/ats-tool/gnunet-ats.c:744
+#: src/ats-tool/gnunet-ats.c:676
 #, 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:776 src/namestore/gnunet-namestore.c:700
-#: src/transport/gnunet-transport.c:1843
+#: src/ats-tool/gnunet-ats.c:708 src/namestore/gnunet-namestore.c:700
+#: src/transport/gnunet-transport.c:1890
 #: src/transport/gnunet-transport-profiler.c:531
 #, c-format
 msgid "Service `%s' is not running\n"
 msgstr "El servicio «%s» no está ejecutandose\n"
 
-#: src/ats-tool/gnunet-ats.c:790 src/transport/gnunet-transport.c:1852
+#: src/ats-tool/gnunet-ats.c:722 src/transport/gnunet-transport.c:1899
 #: src/transport/gnunet-transport-profiler.c:549
 #, 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:800
+#: src/ats-tool/gnunet-ats.c:732
 #, 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:822 src/ats-tool/gnunet-ats.c:848
-#: src/ats-tool/gnunet-ats.c:876 src/ats-tool/gnunet-ats.c:922
+#: src/ats-tool/gnunet-ats.c:754 src/ats-tool/gnunet-ats.c:780
+#: src/ats-tool/gnunet-ats.c:808 src/ats-tool/gnunet-ats.c:854
 msgid "Cannot connect to ATS service, exiting...\n"
 msgstr "No se puede conectar al servicio ATS, saliendo...\n"
 
-#: src/ats-tool/gnunet-ats.c:834 src/ats-tool/gnunet-ats.c:860
+#: src/ats-tool/gnunet-ats.c:766 src/ats-tool/gnunet-ats.c:792
 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:888
+#: src/ats-tool/gnunet-ats.c:820
 #, fuzzy
 msgid "No preference type given!\n"
 msgstr "establece las preferencias para el par dado"
 
-#: src/ats-tool/gnunet-ats.c:895
+#: src/ats-tool/gnunet-ats.c:827
 #, fuzzy
 msgid "No peer given!\n"
 msgstr "No se han proporcionado opciones\n"
 
-#: src/ats-tool/gnunet-ats.c:913
+#: src/ats-tool/gnunet-ats.c:845
 #, fuzzy
 msgid "Valid type required\n"
 msgstr "Tipo requerido\n"
 
-#: src/ats-tool/gnunet-ats.c:981
+#: src/ats-tool/gnunet-ats.c:916
 msgid "get list of active addresses currently used"
 msgstr "obtiene una lista de direcciones activas usadas actualmente"
 
-#: src/ats-tool/gnunet-ats.c:983
+#: src/ats-tool/gnunet-ats.c:918
 msgid "get list of all active addresses"
 msgstr "obtiene una lista de todas las direcciones activas"
 
-#: src/ats-tool/gnunet-ats.c:986
+#: src/ats-tool/gnunet-ats.c:921
 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:988
+#: src/ats-tool/gnunet-ats.c:923
 msgid "monitor mode"
 msgstr "modo de monitorización"
 
-#: src/ats-tool/gnunet-ats.c:990
+#: src/ats-tool/gnunet-ats.c:925
 msgid "set preference for the given peer"
 msgstr "establece las preferencias para el par dado"
 
-#: src/ats-tool/gnunet-ats.c:992
+#: src/ats-tool/gnunet-ats.c:927
 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:994
+#: src/ats-tool/gnunet-ats.c:929
 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:997
+#: src/ats-tool/gnunet-ats.c:932
 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:999
+#: src/ats-tool/gnunet-ats.c:934
 msgid "preference value"
 msgstr "valor de preferencia"
 
 # Miguel: ¿Algo menos forzado que "salida prolija"?
-#: src/ats-tool/gnunet-ats.c:1002
+#: src/ats-tool/gnunet-ats.c:937
 msgid "verbose output (include ATS address properties)"
 msgstr "salida prolija (incluye las propiedades de direcciones del ATS)"
 
-#: src/ats-tool/gnunet-ats.c:1009
+#: src/ats-tool/gnunet-ats.c:944
 msgid "Print information about ATS state"
 msgstr "Imprime información acerca del estado del ATS"
 
@@ -1314,7 +1304,7 @@ 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:179 src/transport/gnunet-transport.c:2104
+#: src/core/gnunet-core.c:179 src/transport/gnunet-transport.c:2154
 msgid "provide information about all current connections (continuously)"
 msgstr ""
 "provee información sobre todas las conexiones actuales (de forma continua)"
@@ -1347,54 +1337,54 @@ msgstr "# mensajes descartados (sesión desconectada)"
 msgid "# bytes of messages of type %u received"
 msgstr "# bytes de mensajes del tipo %u recibidos"
 
-#: src/core/gnunet-service-core_kx.c:565
+#: src/core/gnunet-service-core_kx.c:571
 msgid "# bytes encrypted"
 msgstr "# bytes cifrados"
 
-#: src/core/gnunet-service-core_kx.c:617
+#: src/core/gnunet-service-core_kx.c:630
 msgid "# bytes decrypted"
 msgstr "# bytes descifrados"
 
-#: src/core/gnunet-service-core_kx.c:703
+#: src/core/gnunet-service-core_kx.c:719
 msgid "# key exchanges initiated"
 msgstr "# intercambio de claves iniciados"
 
-#: src/core/gnunet-service-core_kx.c:747
+#: src/core/gnunet-service-core_kx.c:763
 msgid "# key exchanges stopped"
 msgstr "# intercambio de claves parados"
 
-#: src/core/gnunet-service-core_kx.c:848
+#: src/core/gnunet-service-core_kx.c:864
 msgid "# old ephemeral keys ignored"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:855
+#: src/core/gnunet-service-core_kx.c:871
 #, fuzzy
 msgid "# ephemeral keys received"
 msgstr "# mapas de tipos recibidos"
 
-#: src/core/gnunet-service-core_kx.c:889
+#: src/core/gnunet-service-core_kx.c:910
 #, 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:900
+#: src/core/gnunet-service-core_kx.c:921
 #, fuzzy
 msgid "# EPHEMERAL_KEY messages received"
 msgstr "# mensajes «SET_KEY» descifrados"
 
-#: src/core/gnunet-service-core_kx.c:999
-#: src/transport/gnunet-service-transport_validation.c:1062
+#: src/core/gnunet-service-core_kx.c:1020
+#: src/transport/gnunet-service-transport_validation.c:1053
 msgid "# PING messages received"
 msgstr "# mensajes PING recibidos"
 
-#: src/core/gnunet-service-core_kx.c:1007
+#: src/core/gnunet-service-core_kx.c:1028
 #, 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:1034
+#: src/core/gnunet-service-core_kx.c:1056
 #, c-format
 msgid ""
 "Received PING from `%s' for different identity: I am `%s', PONG identity: `"
@@ -1403,84 +1393,84 @@ msgstr ""
 "Recibido PING de «%s» para una identidad diferente: Yo soy «%s», identidad "
 "del PONG: «%s»\n"
 
-#: src/core/gnunet-service-core_kx.c:1050
+#: src/core/gnunet-service-core_kx.c:1082
 msgid "# PONG messages created"
 msgstr "# mensajes PONG creados"
 
-#: src/core/gnunet-service-core_kx.c:1077
+#: src/core/gnunet-service-core_kx.c:1111
 msgid "# sessions terminated by timeout"
 msgstr "# sesiones terminadas por plazo de expiración"
 
-#: src/core/gnunet-service-core_kx.c:1088
+#: src/core/gnunet-service-core_kx.c:1124
 msgid "# keepalive messages sent"
 msgstr "# mensajes «keepalive» enviados"
 
-#: src/core/gnunet-service-core_kx.c:1156
-#: src/transport/gnunet-service-transport_validation.c:1406
+#: src/core/gnunet-service-core_kx.c:1195
+#: src/transport/gnunet-service-transport_validation.c:1370
 msgid "# PONG messages received"
 msgstr "# mensajes PONG recibidos"
 
-#: src/core/gnunet-service-core_kx.c:1162
+#: src/core/gnunet-service-core_kx.c:1201
 #, fuzzy
 msgid "# PONG messages dropped (connection down)"
 msgstr "# mensajes PONG recibidos"
 
-#: src/core/gnunet-service-core_kx.c:1167
+#: src/core/gnunet-service-core_kx.c:1206
 #, 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:1197
+#: src/core/gnunet-service-core_kx.c:1236
 msgid "# PONG messages decrypted"
 msgstr "# mensajes PONG descifrados"
 
-#: src/core/gnunet-service-core_kx.c:1232
+#: src/core/gnunet-service-core_kx.c:1271
 msgid "# session keys confirmed via PONG"
 msgstr "# claves de sesión confirmadas vía PONG"
 
-#: src/core/gnunet-service-core_kx.c:1243
+#: src/core/gnunet-service-core_kx.c:1282
 #, fuzzy
 msgid "# timeouts prevented via PONG"
 msgstr "# bytes recibidos vía TCP"
 
-#: src/core/gnunet-service-core_kx.c:1250
+#: src/core/gnunet-service-core_kx.c:1289
 msgid "# rekey operations confirmed via PONG"
 msgstr "# operaciones de cambio de clave confirmadas vía PONG"
 
-#: src/core/gnunet-service-core_kx.c:1392
+#: src/core/gnunet-service-core_kx.c:1431
 #, fuzzy
 msgid "# DATA message dropped (out of order)"
 msgstr "# bytes omitidos (fuera de secuencia)"
 
-#: src/core/gnunet-service-core_kx.c:1399
+#: src/core/gnunet-service-core_kx.c:1438
 #, 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:1402
+#: src/core/gnunet-service-core_kx.c:1441
 #, fuzzy
 msgid "# sessions terminated by key expiration"
 msgstr "# sesiones terminadas por plazo de expiración"
 
-#: src/core/gnunet-service-core_kx.c:1448
-#: src/core/gnunet-service-core_kx.c:1473
+#: src/core/gnunet-service-core_kx.c:1487
+#: src/core/gnunet-service-core_kx.c:1512
 msgid "# bytes dropped (duplicates)"
 msgstr "# bytes omitidos (duplicados)"
 
-#: src/core/gnunet-service-core_kx.c:1460
+#: src/core/gnunet-service-core_kx.c:1499
 msgid "# bytes dropped (out of sequence)"
 msgstr "# bytes omitidos (fuera de secuencia)"
 
-#: src/core/gnunet-service-core_kx.c:1502
+#: src/core/gnunet-service-core_kx.c:1541
 msgid "# bytes dropped (ancient message)"
 msgstr "# bytes omitidos (mensaje antiguo)"
 
-#: src/core/gnunet-service-core_kx.c:1510
+#: src/core/gnunet-service-core_kx.c:1549
 msgid "# bytes of payload decrypted"
 msgstr "# bytes de «payload» descifrados"
 
-#: src/core/gnunet-service-core_kx.c:1545
+#: src/core/gnunet-service-core_kx.c:1584
 #, fuzzy
 msgid "# PAYLOAD dropped (out of order)"
 msgstr "# bytes omitidos (fuera de secuencia)"
@@ -1507,13 +1497,11 @@ msgstr "Mensaje no soportado del tipo %u (%u bytes) recibido del par «%s»\n"
 #: src/core/gnunet-service-core_sessions.c:328
 #: src/dht/gnunet-service-dht_neighbours.c:661
 #: src/dht/gnunet-service-dht_neighbours.c:726
-#: src/fs/gnunet-service-fs_cp.c:629 src/fs/gnunet-service-fs_cp.c:1571
+#: src/fs/gnunet-service-fs_cp.c:645 src/fs/gnunet-service-fs_cp.c:1627
 #: src/topology/gnunet-daemon-topology.c:734
 #: src/topology/gnunet-daemon-topology.c:835
-#: src/transport/gnunet-service-transport_neighbours.c:954
-#: src/transport/gnunet-service-transport_neighbours.c:1180
-#: src/transport/gnunet-service-transport_neighbours.c:3211
-#: src/transport/gnunet-service-transport_neighbours.c:3510
+#: src/transport/gnunet-service-transport_neighbours.c:754
+#: src/transport/gnunet-service-transport_neighbours.c:762
 msgid "# peers connected"
 msgstr "# pares conectados"
 
@@ -1554,8 +1542,8 @@ msgid "# items stored"
 msgstr "# elementos almacenados"
 
 #: src/datacache/datacache.c:143 src/datacache/datacache.c:150
-#: src/datastore/gnunet-service-datastore.c:1554
-#: src/datastore/gnunet-service-datastore.c:1565
+#: src/datastore/gnunet-service-datastore.c:1557
+#: src/datastore/gnunet-service-datastore.c:1568
 #, c-format
 msgid "No `%s' specified for `%s' in configuration!\n"
 msgstr "¡No se ha especificado ningún «%s» para «%s» en la configuración!\n"
@@ -1603,8 +1591,8 @@ msgstr "Caché de datos Postgres ejecutándose\n"
 #: 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:624
-#: src/include/gnunet_common.h:633 src/scalarproduct/scalarproduct.h:35
+#: src/util/crypto_mpi.c:39 src/include/gnunet_common.h:626
+#: src/include/gnunet_common.h:635 src/scalarproduct/scalarproduct.h:35
 #, c-format
 msgid "`%s' failed at %s:%d with error: %s\n"
 msgstr "«%s» falló en %s: %d con el error: %s\n"
@@ -1704,10 +1692,6 @@ msgstr "# peticiones «UPDATE» ejecutadas"
 msgid "# REMOVE requests executed"
 msgstr "# peticiones «REMOVE» ejecutadas"
 
-#: src/datastore/datastore_api.c:1189
-msgid "Failed to receive response from database.\n"
-msgstr "Se produjo un fallo al recibir la respuesta de la base de datos.\n"
-
 #: src/datastore/datastore_api.c:1248
 msgid "# Results received"
 msgstr "# Resultados recibidos"
@@ -1800,7 +1784,7 @@ msgstr "Espacio insuficiente para satisfacer la petición"
 #: src/datastore/gnunet-service-datastore.c:712
 #: src/datastore/gnunet-service-datastore.c:767
 #: src/datastore/gnunet-service-datastore.c:982
-#: src/datastore/gnunet-service-datastore.c:1526
+#: src/datastore/gnunet-service-datastore.c:1529
 msgid "# reserved"
 msgstr "# reservado"
 
@@ -1883,34 +1867,34 @@ msgstr "El módulo no soporta la función «get_keys». Por favor, corríjalo.\n
 msgid "Bloomfilter construction complete.\n"
 msgstr "Construcción de «bloomfilter» completa.\n"
 
-#: src/datastore/gnunet-service-datastore.c:1559
+#: src/datastore/gnunet-service-datastore.c:1562
 #, c-format
 msgid "# bytes used in file-sharing datastore `%s'"
 msgstr "# bytes usados en el almacén de ficheros compartidos «%s»"
 
-#: src/datastore/gnunet-service-datastore.c:1570
+#: src/datastore/gnunet-service-datastore.c:1573
 msgid "# quota"
 msgstr "# cuota"
 
-#: src/datastore/gnunet-service-datastore.c:1572
+#: src/datastore/gnunet-service-datastore.c:1575
 msgid "# cache size"
 msgstr "# tamaño de la caché"
 
-#: src/datastore/gnunet-service-datastore.c:1585
+#: src/datastore/gnunet-service-datastore.c:1588
 #, c-format
 msgid "Could not use specified filename `%s' for bloomfilter.\n"
 msgstr ""
 "No se pudo usar el nombre de fichero especificado «%s» para «bloomfilter».\n"
 
-#: src/datastore/gnunet-service-datastore.c:1603
-#: src/datastore/gnunet-service-datastore.c:1619
+#: src/datastore/gnunet-service-datastore.c:1606
+#: src/datastore/gnunet-service-datastore.c:1622
 #, c-format
 msgid "Failed to remove bogus bloomfilter file `%s'\n"
 msgstr ""
 "Se produjo un fallo al borrar el fichero de configuración defectuoso de "
 "«bloomfilter» «%s»:\n"
 
-#: src/datastore/gnunet-service-datastore.c:1649
+#: src/datastore/gnunet-service-datastore.c:1652
 msgid "Failed to initialize bloomfilter.\n"
 msgstr "Se produjo un fallo al inicializar «bloomfilter».\n"
 
@@ -2158,22 +2142,22 @@ msgid "Failed to connect to transport service!\n"
 msgstr "¡Se produjo un fallo al conectar con el servicio de transporte!\n"
 
 #: src/dht/gnunet-service-dht_clients.c:417
-#: src/dht/gnunet-service-xdht_clients.c:844
+#: src/dht/gnunet-service-xdht_clients.c:849
 msgid "# GET requests from clients injected"
 msgstr "# peticiones «GET» inyectadas de clientes"
 
 #: src/dht/gnunet-service-dht_clients.c:513
-#: src/dht/gnunet-service-xdht_clients.c:928
+#: src/dht/gnunet-service-xdht_clients.c:933
 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:993
+#: src/dht/gnunet-service-xdht_clients.c:998
 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:1195
+#: src/dht/gnunet-service-xdht_clients.c:1200
 msgid "# GET STOP requests received from clients"
 msgstr "# peticiones «GET STOP» recibidas de clientes"
 
@@ -2190,27 +2174,27 @@ msgid "# Duplicate REPLIES to CLIENT request dropped"
 msgstr ""
 "# Peticiones duplicadas de respuestas (REPLIES) a clientes (CLIENT) omitidas"
 
-#: src/dht/gnunet-service-dht_clients.c:1090
-#: src/dht/gnunet-service-xdht_clients.c:554
+#: src/dht/gnunet-service-dht_clients.c:1098
+#: src/dht/gnunet-service-xdht_clients.c:559
 #, 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:1113
-#: src/dht/gnunet-service-xdht_clients.c:577
+#: src/dht/gnunet-service-dht_clients.c:1121
+#: src/dht/gnunet-service-xdht_clients.c:582
 msgid "# RESULTS queued for clients"
 msgstr "# Resultados (RESULTS) encolados para clientes"
 
-#: src/dht/gnunet-service-dht_clients.c:1167
-#: src/dht/gnunet-service-dht_clients.c:1210
-#: src/dht/gnunet-service-xdht_clients.c:631
-#: src/dht/gnunet-service-xdht_clients.c:674
+#: src/dht/gnunet-service-dht_clients.c:1175
+#: src/dht/gnunet-service-dht_clients.c:1218
+#: src/dht/gnunet-service-xdht_clients.c:636
+#: src/dht/gnunet-service-xdht_clients.c:679
 msgid "# REPLIES ignored for CLIENTS (no match)"
 msgstr ""
 "# Respuestas (REPLIES) ignoradas para clientes (CLIENTS) (sin coincidencia)"
 
-#: src/dht/gnunet-service-dht_clients.c:1177
-#: src/dht/gnunet-service-xdht_clients.c:641
+#: src/dht/gnunet-service-dht_clients.c:1185
+#: src/dht/gnunet-service-xdht_clients.c:646
 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"
@@ -2226,39 +2210,39 @@ msgstr "¡Petición %s recibida, pero no tiene caché de datos!\n"
 msgid "# ITEMS stored in datacache"
 msgstr "# Elementos (ITEMS) almacenados en la caché de datos"
 
-#: src/dht/gnunet-service-dht_datacache.c:165
-#: src/dht/gnunet-service-xdht_datacache.c:221
+#: src/dht/gnunet-service-dht_datacache.c:173
+#: src/dht/gnunet-service-xdht_datacache.c:230
 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:244
+#: src/dht/gnunet-service-dht_datacache.c:184
+#: src/dht/gnunet-service-xdht_datacache.c:253
 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:250
+#: src/dht/gnunet-service-dht_datacache.c:190
+#: src/dht/gnunet-service-xdht_datacache.c:259
 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:256
+#: src/dht/gnunet-service-dht_datacache.c:196
+#: src/dht/gnunet-service-xdht_datacache.c:265
 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:268
+#: src/dht/gnunet-service-dht_datacache.c:208
+#: src/dht/gnunet-service-xdht_datacache.c:277
 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:271
+#: src/dht/gnunet-service-dht_datacache.c:211
+#: src/dht/gnunet-service-xdht_datacache.c:280
 #, 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:309
+#: src/dht/gnunet-service-dht_datacache.c:242
+#: src/dht/gnunet-service-xdht_datacache.c:318
 msgid "# GET requests given to datacache"
 msgstr "# Peticiones «GET» realizadas a la caché de datos"
 
@@ -2276,7 +2260,7 @@ msgid "# FIND PEER messages initiated"
 msgstr "# mensajes «FIND PEER» iniciados"
 
 #: src/dht/gnunet-service-dht_neighbours.c:763
-#: src/dht/gnunet-service-xdht_neighbours.c:6059
+#: src/dht/gnunet-service-xdht_neighbours.c:6060
 msgid "# Queued messages discarded (peer disconnected)"
 msgstr "# Mensajes encolados descartados (par desconectado)"
 
@@ -2354,36 +2338,36 @@ msgstr "# Peticiones «PUT» P2P recibidas"
 msgid "# P2P PUT bytes received"
 msgstr "# Peticiones «PUT» P2P recibidas"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1825
+#: src/dht/gnunet-service-dht_neighbours.c:1826
 msgid "# FIND PEER requests ignored due to Bloomfilter"
 msgstr "# Peticiones «FIND PEER» ignoradas debido a «Bloomfilter»"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1833
+#: src/dht/gnunet-service-dht_neighbours.c:1834
 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:1928
+#: src/dht/gnunet-service-dht_neighbours.c:1929
 msgid "# P2P GET requests received"
 msgstr "# Peticiones «GET» P2P recibidas"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1931
+#: src/dht/gnunet-service-dht_neighbours.c:1932
 #, fuzzy
 msgid "# P2P GET bytes received"
 msgstr "# Peticiones «GET» P2P recibidas"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1988
+#: src/dht/gnunet-service-dht_neighbours.c:1997
 msgid "# P2P FIND PEER requests processed"
 msgstr "# Peticiones «FIND PEER» P2P procesadas"
 
-#: src/dht/gnunet-service-dht_neighbours.c:2002
+#: src/dht/gnunet-service-dht_neighbours.c:2011
 msgid "# P2P GET requests ONLY routed"
 msgstr "# Peticiones «GET» P2P SOLAMENTE encaminadas"
 
-#: src/dht/gnunet-service-dht_neighbours.c:2087
+#: src/dht/gnunet-service-dht_neighbours.c:2096
 msgid "# P2P RESULTS received"
 msgstr "# Resultados (RESULTS) P2P recibidos"
 
-#: src/dht/gnunet-service-dht_neighbours.c:2090
+#: src/dht/gnunet-service-dht_neighbours.c:2099
 #, fuzzy
 msgid "# P2P RESULT bytes received"
 msgstr "# Resultados (RESULTS) P2P recibidos"
@@ -2392,41 +2376,41 @@ msgstr "# Resultados (RESULTS) P2P recibidos"
 msgid "# Network size estimates received"
 msgstr "# Estimaciones del tamaño de red recibidas"
 
-#: src/dht/gnunet-service-dht_routing.c:211
+#: src/dht/gnunet-service-dht_routing.c:218
 msgid "# Good REPLIES matched against routing table"
 msgstr ""
 "# Buenas respuestas (REPLIES) encontradas en la tabla de encaminamiento"
 
-#: src/dht/gnunet-service-dht_routing.c:220
+#: src/dht/gnunet-service-dht_routing.c:227
 msgid "# Duplicate REPLIES matched against routing table"
 msgstr ""
 "# Respuestas (REPLIES) duplicadas encontradas en la tabla de encaminamiento"
 
-#: src/dht/gnunet-service-dht_routing.c:226
+#: src/dht/gnunet-service-dht_routing.c:233
 msgid "# Invalid REPLIES matched against routing table"
 msgstr ""
 "# Respuestas (REPLIES) no válidas encontradas en la tabla de encaminamiento"
 
-#: src/dht/gnunet-service-dht_routing.c:232
+#: src/dht/gnunet-service-dht_routing.c:239
 msgid "# Irrelevant REPLIES matched against routing table"
 msgstr ""
 "# Respuestas (REPLIES) irrelevantes encontradas en la tabla de encaminamiento"
 
-#: src/dht/gnunet-service-dht_routing.c:244
+#: src/dht/gnunet-service-dht_routing.c:251
 msgid "# Unsupported REPLIES matched against routing table"
 msgstr ""
 "# Respuestas (REPLIES) no soportadas encontradas en la tabla de "
 "encaminamiento"
 
-#: src/dht/gnunet-service-dht_routing.c:317
+#: src/dht/gnunet-service-dht_routing.c:324
 msgid "# Entries removed from routing table"
 msgstr "# Entradas eliminadas de la tabla de encaminamiento"
 
-#: src/dht/gnunet-service-dht_routing.c:399
+#: src/dht/gnunet-service-dht_routing.c:406
 msgid "# Entries added to routing table"
 msgstr "# Entradas añadidas a la tabla de encaminamiento"
 
-#: src/dht/gnunet-service-dht_routing.c:417
+#: src/dht/gnunet-service-dht_routing.c:424
 msgid "# DHT requests combined"
 msgstr "# Peticiones a la DHT combinadas"
 
@@ -2491,17 +2475,17 @@ msgid "# FINGERS_COUNT"
 msgstr ""
 
 #: src/dht/gnunet-service-xdht_neighbours.c:3700
-#: src/dht/gnunet-service-xdht_neighbours.c:3937
-#: src/dht/gnunet-service-xdht_neighbours.c:4089
-#: src/dht/gnunet-service-xdht_neighbours.c:4239
-#: src/dht/gnunet-service-xdht_neighbours.c:4420
-#: src/dht/gnunet-service-xdht_neighbours.c:4933
-#: src/dht/gnunet-service-xdht_neighbours.c:5326
-#: src/dht/gnunet-service-xdht_neighbours.c:5419
-#: src/dht/gnunet-service-xdht_neighbours.c:5509
-#: src/dht/gnunet-service-xdht_neighbours.c:5613
-#: src/dht/gnunet-service-xdht_neighbours.c:5757
-#: src/dht/gnunet-service-xdht_neighbours.c:5846
+#: src/dht/gnunet-service-xdht_neighbours.c:3938
+#: src/dht/gnunet-service-xdht_neighbours.c:4090
+#: src/dht/gnunet-service-xdht_neighbours.c:4240
+#: src/dht/gnunet-service-xdht_neighbours.c:4421
+#: src/dht/gnunet-service-xdht_neighbours.c:4934
+#: src/dht/gnunet-service-xdht_neighbours.c:5327
+#: src/dht/gnunet-service-xdht_neighbours.c:5420
+#: src/dht/gnunet-service-xdht_neighbours.c:5510
+#: src/dht/gnunet-service-xdht_neighbours.c:5614
+#: src/dht/gnunet-service-xdht_neighbours.c:5758
+#: src/dht/gnunet-service-xdht_neighbours.c:5847
 #, fuzzy
 msgid "# Bytes received from other peers"
 msgstr "# respuestas recibidas de otros pares"
@@ -2534,16 +2518,16 @@ msgid ""
 "SUPU %s, %s, %d, trail->prev_hop = %s"
 msgstr ""
 
-#: src/dht/plugin_block_dht.c:138
+#: src/dht/plugin_block_dht.c:142
 #, c-format
 msgid "Block not of type %u\n"
 msgstr "El bloque no es del tipo %u\n"
 
-#: src/dht/plugin_block_dht.c:145
+#: src/dht/plugin_block_dht.c:149
 msgid "Size mismatch for block\n"
 msgstr "Discrepancias de tamaños para el bloque\n"
 
-#: src/dht/plugin_block_dht.c:155
+#: src/dht/plugin_block_dht.c:159
 #, c-format
 msgid "Block of type %u is malformed\n"
 msgstr "El bloque del tipo %u está mal formado\n"
@@ -2904,7 +2888,7 @@ msgid "# acknowledgements sent for fragment"
 msgstr "# reconocimientos enviados por framentos"
 
 #: src/fragmentation/defragmentation.c:456
-#: src/transport/plugin_transport_wlan.c:1517
+#: src/transport/plugin_transport_wlan.c:1515
 msgid "# fragments received"
 msgstr "# fragmentos recibidos"
 
@@ -3730,8 +3714,8 @@ msgid "Option `%s' is required when using option `%s'.\n"
 msgstr "La opción «%s» es obligatoria cuando se usa la opción «%s».\n"
 
 #: src/fs/gnunet-publish.c:837 src/fs/gnunet-publish.c:845
-#: src/transport/gnunet-transport.c:1881 src/transport/gnunet-transport.c:1911
-#: src/transport/gnunet-transport.c:1942
+#: src/transport/gnunet-transport.c:1928 src/transport/gnunet-transport.c:1958
+#: src/transport/gnunet-transport.c:1989
 #, 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"
@@ -3841,22 +3825,22 @@ msgstr "terminar búsqueda después de «VALUE» resultados encontrados"
 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:285
+#: src/fs/gnunet-service-fs.c:274
 msgid "# running average P2P latency (ms)"
 msgstr "# latencia media de P2P en ejecución (ms)"
 
-#: src/fs/gnunet-service-fs.c:344 src/fs/gnunet-service-fs.c:607
+#: src/fs/gnunet-service-fs.c:332 src/fs/gnunet-service-fs.c:595
 msgid "# Loopback routes suppressed"
 msgstr "# Rutas en bucle local eliminadas"
 
-#: src/fs/gnunet-service-fs.c:731
+#: src/fs/gnunet-service-fs.c:719
 #, fuzzy
 msgid "FS service is lacking HOSTKEY configuration setting.  Exiting.\n"
 msgstr ""
 "Al servicio principal le falta la configuración de la clave de máquina "
 "(HOSTKEY).  Saliendo.\n"
 
-#: src/fs/gnunet-service-fs.c:757 src/hostlist/gnunet-daemon-hostlist.c:311
+#: src/fs/gnunet-service-fs.c:745 src/hostlist/gnunet-daemon-hostlist.c:311
 #: src/sensordashboard/gnunet-service-sensordashboard.c:864
 #: src/sensordashboard/gnunet-service-sensordashboard.c:872
 #: src/topology/gnunet-daemon-topology.c:1287
@@ -3901,84 +3885,89 @@ msgstr "# conexiones de clientes «stream» rechazadas"
 msgid "# cadet connections active"
 msgstr "# conexiones «stream» activas"
 
-#: src/fs/gnunet-service-fs_cp.c:710
+#: src/fs/gnunet-service-fs_cp.c:726
 msgid "# migration stop messages received"
 msgstr "# mensajes de detención de migración recibidos"
 
-#: src/fs/gnunet-service-fs_cp.c:714
+#: src/fs/gnunet-service-fs_cp.c:730
 #, c-format
 msgid "Migration of content to peer `%s' blocked for %s\n"
 msgstr "Migración de contenido al par «%s» bloqueada durante %s\n"
 
-#: src/fs/gnunet-service-fs_cp.c:750
+#: src/fs/gnunet-service-fs_cp.c:768
 msgid "# replies transmitted to other peers"
 msgstr "# respuestas transmitidas a otros pares"
 
-#: src/fs/gnunet-service-fs_cp.c:756
+#: src/fs/gnunet-service-fs_cp.c:774
 msgid "# replies dropped"
 msgstr "# respuestas omitidas"
 
-#: src/fs/gnunet-service-fs_cp.c:781 src/fs/gnunet-service-fs_cp.c:1337
+#: src/fs/gnunet-service-fs_cp.c:799 src/fs/gnunet-service-fs_cp.c:1384
 msgid "# P2P searches active"
 msgstr "# busquedas P2P activas"
 
-#: src/fs/gnunet-service-fs_cp.c:878
+#: src/fs/gnunet-service-fs_cp.c:904
 msgid "# artificial delays introduced (ms)"
 msgstr "# retardos artificiales introducidos (ms)"
 
-#: src/fs/gnunet-service-fs_cp.c:934
+#: src/fs/gnunet-service-fs_cp.c:960
 msgid "# replies dropped due to type mismatch"
 msgstr "# respuestas omitidas debido a incompatibilidad de tipos"
 
-#: src/fs/gnunet-service-fs_cp.c:942
+#: src/fs/gnunet-service-fs_cp.c:968
 msgid "# replies received for other peers"
 msgstr "# respuestas recibidas de otros pares"
 
-#: src/fs/gnunet-service-fs_cp.c:956
+#: src/fs/gnunet-service-fs_cp.c:982
 msgid "# replies dropped due to insufficient cover traffic"
 msgstr "# respuestas omitidas debido a insuficiente tráfico de cobertura"
 
-#: src/fs/gnunet-service-fs_cp.c:994
+#: src/fs/gnunet-service-fs_cp.c:1030
 msgid "# P2P searches destroyed due to ultimate reply"
 msgstr "# búsquedas P2P destruidas debido a respuesta definitiva"
 
-#: src/fs/gnunet-service-fs_cp.c:1062
+#: src/fs/gnunet-service-fs_cp.c:1098
 msgid "# requests done for free (low load)"
 msgstr "# peticiones realizadas gratuitamente (baja carga)"
 
-#: src/fs/gnunet-service-fs_cp.c:1087
+#: src/fs/gnunet-service-fs_cp.c:1123
 msgid "# request dropped, priority insufficient"
 msgstr "# peticiones omitidas, prioridad insuficiente"
 
-#: src/fs/gnunet-service-fs_cp.c:1097
+#: src/fs/gnunet-service-fs_cp.c:1133
 msgid "# requests done for a price (normal load)"
 msgstr "# peticiones realizadas por un precio (carga normal)"
 
-#: src/fs/gnunet-service-fs_cp.c:1175
+#: src/fs/gnunet-service-fs_cp.c:1210
 msgid "# GET requests received (from other peers)"
 msgstr "# peticiones «GET» recibidas (de otros pares)"
 
-#: src/fs/gnunet-service-fs_cp.c:1209
+#: src/fs/gnunet-service-fs_cp.c:1245
 msgid "# requests dropped due to initiator not being connected"
 msgstr "# peticiones omitidas debido a que el iniciador no está conectado"
 
-#: src/fs/gnunet-service-fs_cp.c:1231
+#: src/fs/gnunet-service-fs_cp.c:1266
 msgid "# requests dropped due to missing reverse route"
 msgstr "# peticiones omitidas debido a falta de ruta inversa"
 
-#: src/fs/gnunet-service-fs_cp.c:1282
+#: src/fs/gnunet-service-fs_cp.c:1277
+#, fuzzy
+msgid "# requests dropped due to full reply queue"
+msgstr "# Mensajes P2P omitidos debido a saturación de la cola"
+
+#: src/fs/gnunet-service-fs_cp.c:1329
 msgid "# requests dropped due TTL underflow"
 msgstr "# peticiones omitidas debido a expiración del TTL"
 
-#: src/fs/gnunet-service-fs_cp.c:1306
+#: src/fs/gnunet-service-fs_cp.c:1353
 msgid "# requests dropped due to higher-TTL request"
 msgstr "# peticiones omitidas debido a una petición de mayor TTL"
 
-#: src/fs/gnunet-service-fs_cp.c:1335
+#: src/fs/gnunet-service-fs_cp.c:1382
 msgid "# P2P query messages received and processed"
 msgstr "# mensajes de búsqueda P2P recibidos y procesados"
 
-#: src/fs/gnunet-service-fs_cp.c:1754
+#: src/fs/gnunet-service-fs_cp.c:1821
 msgid "# migration stop messages sent"
 msgstr "# mensajes de detención de migración enviados"
 
@@ -4093,101 +4082,101 @@ msgstr "# Peticiones pendientes creadas"
 msgid "# Pending requests active"
 msgstr "# Peticiones pendientes activas"
 
-#: src/fs/gnunet-service-fs_pr.c:814
+#: src/fs/gnunet-service-fs_pr.c:820
 msgid "# replies received and matched"
 msgstr "# respuestas recibidas y asociadas"
 
-#: src/fs/gnunet-service-fs_pr.c:844
+#: src/fs/gnunet-service-fs_pr.c:857
 msgid "# duplicate replies discarded (bloomfilter)"
 msgstr "# respuestas duplicadas descartadas (bloomfilter)"
 
-#: src/fs/gnunet-service-fs_pr.c:853
+#: src/fs/gnunet-service-fs_pr.c:866
 msgid "# irrelevant replies discarded"
 msgstr "# respuestas irrelevantes descartadas"
 
-#: src/fs/gnunet-service-fs_pr.c:867
+#: src/fs/gnunet-service-fs_pr.c:881
 #, c-format
 msgid "Unsupported block type %u\n"
 msgstr "Tipo de bloque %u no soportado\n"
 
-#: src/fs/gnunet-service-fs_pr.c:880
+#: src/fs/gnunet-service-fs_pr.c:898
 msgid "# results found locally"
 msgstr "# resultados hallados localmente"
 
-#: src/fs/gnunet-service-fs_pr.c:1003
+#: src/fs/gnunet-service-fs_pr.c:1028
 msgid "# Datastore `PUT' failures"
 msgstr "# «PUT» en el almacén de datos fallidos"
 
-#: src/fs/gnunet-service-fs_pr.c:1031
+#: src/fs/gnunet-service-fs_pr.c:1056
 msgid "# storage requests dropped due to high load"
 msgstr "# peticiones de almacenamiento omitidas debido a alta carga"
 
-#: src/fs/gnunet-service-fs_pr.c:1069
+#: src/fs/gnunet-service-fs_pr.c:1094
 msgid "# Replies received from DHT"
 msgstr "# Respuestas recibidas de la DHT"
 
-#: src/fs/gnunet-service-fs_pr.c:1200
+#: src/fs/gnunet-service-fs_pr.c:1226
 #, fuzzy
 msgid "# Replies received from CADET"
 msgstr "# Respuestas recibidas de la DHT"
 
-#: src/fs/gnunet-service-fs_pr.c:1252
+#: src/fs/gnunet-service-fs_pr.c:1279
 #, c-format
 msgid "Datastore lookup already took %s!\n"
 msgstr "¡La búsqueda en el almacén de datos toma %s!\n"
 
-#: src/fs/gnunet-service-fs_pr.c:1272
+#: src/fs/gnunet-service-fs_pr.c:1299
 #, c-format
 msgid "On-demand lookup already took %s!\n"
 msgstr "¡La búsqueda en bajo demanda toma %s!\n"
 
-#: src/fs/gnunet-service-fs_pr.c:1319
+#: src/fs/gnunet-service-fs_pr.c:1351
 msgid "# Datastore lookups concluded (no results)"
 msgstr "# Búsquedas en el almacén de datos finalizadas (sin resultados)"
 
-#: src/fs/gnunet-service-fs_pr.c:1334
+#: src/fs/gnunet-service-fs_pr.c:1366
 msgid "# Datastore lookups concluded (seen all)"
 msgstr "# Búsquedas en el almacén de datos finalizadas (vistos todos)"
 
-#: src/fs/gnunet-service-fs_pr.c:1343
+#: src/fs/gnunet-service-fs_pr.c:1375
 msgid "# Datastore lookups aborted (more than MAX_RESULTS)"
 msgstr "# Búsquedas en el almacén de datos finalizadas (más de «MAX_RESULTS»)"
 
-#: src/fs/gnunet-service-fs_pr.c:1358
+#: src/fs/gnunet-service-fs_pr.c:1390
 msgid "# requested DBLOCK or IBLOCK not found"
 msgstr "# «DBLOCK» o «IBLOCK» pedido no encontrado"
 
-#: src/fs/gnunet-service-fs_pr.c:1372
+#: src/fs/gnunet-service-fs_pr.c:1404
 msgid "# on-demand blocks matched requests"
 msgstr "# peticiones asociadas de bloques bajo demanda"
 
-#: src/fs/gnunet-service-fs_pr.c:1385
+#: src/fs/gnunet-service-fs_pr.c:1417
 msgid "# on-demand lookups performed successfully"
 msgstr "# búsquedas satisfactorias de bloques bajo demanda"
 
-#: src/fs/gnunet-service-fs_pr.c:1390
+#: src/fs/gnunet-service-fs_pr.c:1422
 msgid "# on-demand lookups failed"
 msgstr "# búsquedas fallidas de bloques bajo demanda"
 
-#: src/fs/gnunet-service-fs_pr.c:1417 src/fs/gnunet-service-fs_pr.c:1457
-#: src/fs/gnunet-service-fs_pr.c:1620
+#: src/fs/gnunet-service-fs_pr.c:1449 src/fs/gnunet-service-fs_pr.c:1489
+#: src/fs/gnunet-service-fs_pr.c:1657
 msgid "# Datastore lookups concluded (error queueing)"
 msgstr "# Búsquedas en el almacén de datos finalizadas (error encolando)"
 
-#: src/fs/gnunet-service-fs_pr.c:1475
+#: src/fs/gnunet-service-fs_pr.c:1508
 msgid "# Datastore lookups concluded (found last result)"
 msgstr ""
 "# Búsquedas en el almacén de datos finalizadas (encontrado último resultado)"
 
-#: src/fs/gnunet-service-fs_pr.c:1486
+#: src/fs/gnunet-service-fs_pr.c:1520
 msgid "# Datastore lookups concluded (load too high)"
 msgstr "# Búsquedas en el almacén de datos finalizadas (carga demasiado alta)"
 
-#: src/fs/gnunet-service-fs_pr.c:1596
+#: src/fs/gnunet-service-fs_pr.c:1633
 msgid "# Datastore lookups initiated"
 msgstr "# Búsquedas en el almacén de datos iniciadas"
 
-#: src/fs/gnunet-service-fs_pr.c:1685
+#: src/fs/gnunet-service-fs_pr.c:1722
 msgid "# GAP PUT messages received"
 msgstr "# Mensajes «GAP PUT» recibidos"
 
@@ -4415,114 +4404,114 @@ msgstr ""
 msgid "%s failed at %s:%d: `%s'\n"
 msgstr "%s falló en %s:%d: «%s».\n"
 
-#: src/gns/gnunet-gns-proxy.c:833
+#: src/gns/gnunet-gns-proxy.c:842
 #, fuzzy, c-format
 msgid "Unsupported CURL SSL backend %d\n"
 msgstr "Tipo de bloque %u no soportado\n"
 
-#: src/gns/gnunet-gns-proxy.c:856
+#: src/gns/gnunet-gns-proxy.c:865
 #, fuzzy, c-format
 msgid "Failed to fetch CN from cert: %s\n"
 msgstr "Se produjo un fallo al mandar la petición DNS a %s\n"
 
-#: src/gns/gnunet-gns-proxy.c:879
+#: src/gns/gnunet-gns-proxy.c:888
 #, fuzzy, c-format
 msgid "Failed to initialize DANE: %s\n"
 msgstr "¡No se puede inicializar el resolvedor!\n"
 
-#: src/gns/gnunet-gns-proxy.c:892
+#: src/gns/gnunet-gns-proxy.c:901
 #, fuzzy, c-format
 msgid "Failed to parse DANE record: %s\n"
 msgstr "Se produjo un fallo al procesar la petición DNS.  Omitiendo.\n"
 
-#: src/gns/gnunet-gns-proxy.c:907
+#: src/gns/gnunet-gns-proxy.c:916
 #, fuzzy, c-format
 msgid "Failed to verify TLS connection using DANE: %s\n"
 msgstr "Se produjo un fallo al borrar el fichero de configuración %s\n"
 
-#: src/gns/gnunet-gns-proxy.c:917
+#: src/gns/gnunet-gns-proxy.c:926
 #, c-format
 msgid "Failed DANE verification failed with GnuTLS verify status code: %u\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:941
+#: src/gns/gnunet-gns-proxy.c:950
 #, c-format
 msgid "SSL certificate subject name (%s) does not match `%s'\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:1086
+#: src/gns/gnunet-gns-proxy.c:1095
 #, c-format
 msgid "Cookie domain `%s' supplied by server is invalid\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:1602
+#: src/gns/gnunet-gns-proxy.c:1630
 #, fuzzy, c-format
 msgid "Unsupported HTTP method `%s'\n"
 msgstr "Tipo no soportado «%s»\n"
 
-#: src/gns/gnunet-gns-proxy.c:1973
+#: src/gns/gnunet-gns-proxy.c:2002
 #, c-format
 msgid "Unable to import private key from file `%s'\n"
 msgstr "No se pudo importar la clave privada del fichero «%s»\n"
 
-#: src/gns/gnunet-gns-proxy.c:2003
+#: src/gns/gnunet-gns-proxy.c:2032
 #, c-format
 msgid "Unable to import certificate %s\n"
 msgstr "No se pudo importar el certificado %s\n"
 
-#: src/gns/gnunet-gns-proxy.c:2177
+#: src/gns/gnunet-gns-proxy.c:2206
 #, fuzzy, c-format
 msgid "Failed to start HTTPS server for `%s'\n"
 msgstr "Se produjo un fallo al iniciar el servidor HTTP\n"
 
-#: src/gns/gnunet-gns-proxy.c:2196
+#: src/gns/gnunet-gns-proxy.c:2225
 #, fuzzy
 msgid "Failed to pass client to MHD\n"
 msgstr "Se produjo un fallo al conectar con GNS\n"
 
-#: src/gns/gnunet-gns-proxy.c:2518
+#: src/gns/gnunet-gns-proxy.c:2547
 #, fuzzy, c-format
 msgid "Unsupported socks version %d\n"
 msgstr "Tipo de bloque %u no soportado\n"
 
-#: src/gns/gnunet-gns-proxy.c:2547
+#: src/gns/gnunet-gns-proxy.c:2576
 #, fuzzy, c-format
 msgid "Unsupported socks command %d\n"
 msgstr "Tipo de bloque %u no soportado\n"
 
-#: src/gns/gnunet-gns-proxy.c:2565 src/gns/gnunet-gns-proxy.c:2594
+#: src/gns/gnunet-gns-proxy.c:2594 src/gns/gnunet-gns-proxy.c:2623
 msgid "SSL connection to plain IPv4 address requested\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:2645
+#: src/gns/gnunet-gns-proxy.c:2674
 #, fuzzy, c-format
 msgid "Unsupported socks address type %d\n"
 msgstr "Tipo de bloque %u no soportado\n"
 
-#: src/gns/gnunet-gns-proxy.c:2984
+#: src/gns/gnunet-gns-proxy.c:3013
 msgid "No ego configured for `shorten-zone`\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:3024
+#: src/gns/gnunet-gns-proxy.c:3053
 #, fuzzy, c-format
 msgid "No ego configured for `%s`\n"
 msgstr ""
 "Ningún puerto fue configurado para el módulo «%s», no se puede probar\n"
 
-#: src/gns/gnunet-gns-proxy.c:3086
+#: src/gns/gnunet-gns-proxy.c:3115
 #, fuzzy, c-format
 msgid "Failed to load SSL/TLS key and certificate from `%s'\n"
 msgstr "Se produjo un fallo al leer la lista de amigos de «%s»\n"
 
-#: src/gns/gnunet-gns-proxy.c:3127
+#: src/gns/gnunet-gns-proxy.c:3156
 msgid "listen on specified port (default: 7777)"
 msgstr "escuchar en el puerto especificado (predeterminado: 7777)"
 
-#: src/gns/gnunet-gns-proxy.c:3130
+#: src/gns/gnunet-gns-proxy.c:3159
 msgid "pem file to use as CA"
 msgstr "fichero pem para usar como autoridad de certificación (CA)"
 
-#: src/gns/gnunet-gns-proxy.c:3149
+#: src/gns/gnunet-gns-proxy.c:3178
 msgid "GNUnet GNS proxy"
 msgstr "Proxy GNUnet GNS"
 
@@ -4956,7 +4945,7 @@ msgid "# hostlist URIs written to file"
 msgstr "# URI de listas de máquinas escritas a fichero"
 
 #: src/hostlist/gnunet-daemon-hostlist_client.c:1588
-#: src/transport/plugin_transport_http_client.c:2273
+#: src/transport/plugin_transport_http_client.c:2265
 #, c-format
 msgid "Invalid proxy type: `%s', disabling proxy! Check configuration!\n"
 msgstr ""
@@ -5051,7 +5040,7 @@ msgstr ""
 
 #: src/hostlist/gnunet-daemon-hostlist_server.c:747
 #: src/peerinfo-tool/gnunet-peerinfo.c:736
-#: src/transport/gnunet-service-transport.c:1018
+#: src/transport/gnunet-service-transport.c:852
 msgid "Could not access PEERINFO service.  Exiting.\n"
 msgstr ""
 "No se pudo acceder al servicio de información de pares (PEERINFO).  "
@@ -5549,37 +5538,37 @@ msgstr "No se ha encontrado un «gnunet-helper-nat-server» funcional\n"
 msgid "test_icmp_client not possible, as we have no internal IPv4 address\n"
 msgstr ""
 
-#: src/nat/nat.c:867
+#: src/nat/nat.c:862
 #, c-format
 msgid "gnunet-helper-nat-server generated malformed address `%s'\n"
 msgstr "«gnunet-helper-nat-server» generó la dirección mal formada «%s»\n"
 
-#: src/nat/nat.c:917
+#: src/nat/nat.c:912
 #, c-format
 msgid "Failed to start %s\n"
 msgstr "Se produjo un fallo al arrancar %s\n"
 
-#: src/nat/nat.c:1032
+#: src/nat/nat.c:1027
 msgid "Error while running upnp client:\n"
 msgstr ""
 
-#: src/nat/nat.c:1102
+#: src/nat/nat.c:1097
 #, 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
+#: src/nat/nat.c:1237
 msgid "malformed"
 msgstr "mal formado"
 
-#: src/nat/nat.c:1297
+#: src/nat/nat.c:1291
 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
+#: src/nat/nat.c:1318 src/nat/nat.c:1330
 #, c-format
 msgid ""
 "Configuration requires `%s', but binary is not installed properly (SUID bit "
@@ -5588,98 +5577,98 @@ msgstr ""
 "La configuración requiere «%s», pero el binario no está instalado de forma "
 "correcta (SUID bit no activado).  Opción deshabilitada.\n"
 
-#: src/nat/nat.c:1474
+#: src/nat/nat.c:1468
 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:1490
+#: src/nat/nat.c:1484
 #, 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.c:1575
+#: src/nat/nat.c:1569
 msgid "Operation Successful"
 msgstr ""
 
-#: src/nat/nat.c:1577
+#: src/nat/nat.c:1571
 msgid "Internal Failure (IPC, ...)"
 msgstr ""
 
-#: src/nat/nat.c:1579
+#: src/nat/nat.c:1573
 msgid "Failure in network subsystem, check permissions."
 msgstr ""
 
-#: src/nat/nat.c:1581
+#: src/nat/nat.c:1575
 msgid "Encountered timeout while performing operation"
 msgstr ""
 
-#: src/nat/nat.c:1583
+#: src/nat/nat.c:1577
 msgid "detected that we are offline"
 msgstr ""
 
-#: src/nat/nat.c:1585
+#: src/nat/nat.c:1579
 #, fuzzy
 msgid "`upnpc` command not found"
 msgstr "comando «upnpc» no encontrado\n"
 
-#: src/nat/nat.c:1587
+#: src/nat/nat.c:1581
 #, fuzzy
 msgid "Failed to run `upnpc` command"
 msgstr "Se produjo un fallo al ejecutar «%s»\n"
 
-#: src/nat/nat.c:1589
+#: src/nat/nat.c:1583
 #, fuzzy
 msgid "`upnpc' command took too long, process killed"
 msgstr "comando «upnpc» no encontrado\n"
 
-#: src/nat/nat.c:1591
+#: src/nat/nat.c:1585
 msgid "`upnpc' command failed to establish port mapping"
 msgstr ""
 
-#: src/nat/nat.c:1593
+#: src/nat/nat.c:1587
 #, fuzzy
 msgid "`external-ip' command not found"
 msgstr "comando «external-ip» no encontrado\n"
 
-#: src/nat/nat.c:1595
+#: src/nat/nat.c:1589
 #, fuzzy
 msgid "Failed to run `external-ip` command"
 msgstr "Se produjo un fallo al ejecutar «%s»\n"
 
-#: src/nat/nat.c:1597
+#: src/nat/nat.c:1591
 #, fuzzy
 msgid "`external-ip' command output invalid"
 msgstr "comando «external-ip» no encontrado\n"
 
-#: src/nat/nat.c:1599
+#: src/nat/nat.c:1593
 msgid "no valid address was returned by `external-ip'"
 msgstr ""
 
-#: src/nat/nat.c:1601
+#: src/nat/nat.c:1595
 #, fuzzy
 msgid "Could not determine interface with internal/local network address"
 msgstr "No se pudo determinar la ruta de instalación de los módulos.\n"
 
-#: src/nat/nat.c:1603
+#: src/nat/nat.c:1597
 #, fuzzy
 msgid "No functioning gnunet-helper-nat-server installation found"
 msgstr "No se ha encontrado un «gnunet-helper-nat-server» funcional\n"
 
-#: src/nat/nat.c:1605
+#: src/nat/nat.c:1599
 msgid "NAT test could not be initialized"
 msgstr ""
 
-#: src/nat/nat.c:1607
+#: src/nat/nat.c:1601
 msgid "NAT test timeout reached"
 msgstr ""
 
-#: src/nat/nat.c:1609
+#: src/nat/nat.c:1603
 msgid "could not register NAT"
 msgstr ""
 
-#: src/nat/nat.c:1611
+#: src/nat/nat.c:1605
 #, fuzzy
 msgid "No working gnunet-helper-nat-client installation found"
 msgstr "No se ha encontrado un «gnunet-helper-nat-server» funcional\n"
@@ -5815,19 +5804,19 @@ msgstr ""
 
 # Miguel: "Failed to receive" también aquí está traducido como
 # "no se obtuvo respuesta" por claridad.
-#: src/peerinfo/peerinfo_api.c:519
+#: src/peerinfo/peerinfo_api.c:518
 msgid "Failed to receive response from `PEERINFO' service."
 msgstr ""
 "No se obtuvo respuesta del servicio de información de pares (PEERINFO)."
 
-#: src/peerinfo/peerinfo_api.c:563 src/peerinfo/peerinfo_api.c:586
-#: src/peerinfo/peerinfo_api.c:603 src/peerinfo/peerinfo_api.c:616
-#: src/peerinfo/peerinfo_api.c:631
+#: src/peerinfo/peerinfo_api.c:562 src/peerinfo/peerinfo_api.c:585
+#: src/peerinfo/peerinfo_api.c:602 src/peerinfo/peerinfo_api.c:615
+#: src/peerinfo/peerinfo_api.c:630
 msgid "Received invalid message from `PEERINFO' service."
 msgstr ""
 "Recibido mensaje no válido del servicio de información de pares (PEERINFO)."
 
-#: src/peerinfo/peerinfo_api.c:720
+#: src/peerinfo/peerinfo_api.c:719
 msgid "Timeout transmitting iteration request to `PEERINFO' service."
 msgstr ""
 "Petición de transmisión de iteración de expiración al servicio de "
@@ -5925,19 +5914,19 @@ msgid "Print information about peers."
 msgstr "Imprimir información sobre los pares."
 
 #: src/peerinfo-tool/gnunet-peerinfo_plugins.c:105
-#: src/transport/gnunet-service-transport_plugins.c:127
+#: src/transport/gnunet-service-transport_plugins.c:168
 #, c-format
 msgid "Starting transport plugins `%s'\n"
 msgstr "Iniciando los módulos de transporte «%s»\n"
 
 #: src/peerinfo-tool/gnunet-peerinfo_plugins.c:109
-#: src/transport/gnunet-service-transport_plugins.c:132
+#: src/transport/gnunet-service-transport_plugins.c:173
 #, c-format
 msgid "Loading `%s' transport plugin\n"
 msgstr "Cargando el módulo de transporte «%s»\n"
 
 #: src/peerinfo-tool/gnunet-peerinfo_plugins.c:129
-#: src/transport/gnunet-service-transport_plugins.c:164
+#: src/transport/gnunet-service-transport_plugins.c:208
 #, c-format
 msgid "Failed to load transport plugin for `%s'\n"
 msgstr "Se produjo un fallo al cargar el módulo del transporte para «%s»\n"
@@ -6968,7 +6957,7 @@ msgid ""
 "content/topology-file-format\n"
 msgstr ""
 
-#: src/testbed/gnunet-daemon-latency-logger.c:333
+#: src/testbed/gnunet-daemon-latency-logger.c:323
 msgid "Daemon to log latency values of connections to neighbours"
 msgstr ""
 
@@ -6984,7 +6973,7 @@ msgstr ""
 msgid "Incorrect hostkey file format: %s\n"
 msgstr "El fichero de máquinas no tiene el formato correcto: %s\n"
 
-#: src/testbed/gnunet-daemon-testbed-underlay.c:474
+#: src/testbed/gnunet-daemon-testbed-underlay.c:476
 msgid "Daemon to restrict underlay network in testbed deployments"
 msgstr ""
 
@@ -7341,7 +7330,7 @@ msgstr ""
 "conexiones.\n"
 
 #: src/topology/gnunet-daemon-topology.c:1121
-#: src/transport/plugin_transport_wlan.c:1476
+#: src/transport/plugin_transport_wlan.c:1478
 msgid "# HELLO messages received"
 msgstr "# mensajes «HELLO» recibidos"
 
@@ -7357,45 +7346,44 @@ msgstr ""
 "Control de topología de GNUnet (manteniendo las restricciones del mesh de "
 "P2P y de F2F)"
 
-#: src/transport/gnunet-service-transport_ats.c:269
-#, 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_ats.c:136
+msgid "# Addresses given to ATS"
+msgstr ""
 
-#: src/transport/gnunet-service-transport_blacklist.c:274
+#: src/transport/gnunet-service-transport_blacklist.c:286
 #, fuzzy, c-format
 msgid "Adding blacklisting entry for peer `%s'\n"
 msgstr "Añadiendo «%s» sin direcciones para el par «%s»\n"
 
-#: src/transport/gnunet-service-transport_blacklist.c:283
+#: src/transport/gnunet-service-transport_blacklist.c:295
 #, c-format
 msgid "Adding blacklisting entry for peer `%s':`%s'\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_blacklist.c:476
-#: src/transport/gnunet-service-transport_blacklist.c:766
+#: src/transport/gnunet-service-transport_blacklist.c:504
+#: src/transport/gnunet-service-transport_blacklist.c:855
 msgid "# disconnects due to blacklist"
 msgstr "# desconexiones debido a la lista negra"
 
-#: src/transport/gnunet-service-transport_blacklist.c:769
+#: src/transport/gnunet-service-transport_blacklist.c:859
 #, fuzzy, c-format
 msgid "Disallowing connection to peer `%s' on transport %s\n"
 msgstr "Se produjo un fallo al cargar el módulo del transporte para «%s»\n"
 
-#: src/transport/gnunet-service-transport.c:236
+#: src/transport/gnunet-service-transport.c:231
 #, fuzzy
 msgid "# bytes payload discarded due to not connected peer"
 msgstr "# bytes de «payload» descartados debido a par no conectado"
 
-#: src/transport/gnunet-service-transport.c:424
+#: src/transport/gnunet-service-transport.c:385
 msgid "# bytes total received"
 msgstr "# total de bytes recibidos"
 
-#: src/transport/gnunet-service-transport.c:509
+#: src/transport/gnunet-service-transport.c:480
 msgid "# bytes payload received"
 msgstr "# bytes de «payload» recibidos"
 
-#: src/transport/gnunet-service-transport.c:984
+#: src/transport/gnunet-service-transport.c:818
 #, fuzzy
 msgid "Transport service is lacking key configuration settings. Exiting.\n"
 msgstr ""
@@ -7406,303 +7394,330 @@ msgstr ""
 msgid "# messages dropped due to slow client"
 msgstr "# mensajes omitidos debido a un cliente lento"
 
-#: src/transport/gnunet-service-transport_clients.c:774
+#: src/transport/gnunet-service-transport_clients.c:783
 msgid "# bytes payload dropped (other peer was not connected)"
 msgstr "# bytes de «payload» omitidos (el otro par no estaba conectado)"
 
-#: src/transport/gnunet-service-transport_clients.c:813
-#, fuzzy, c-format
-msgid "Blacklist refuses connection attempt to peer `%s'\n"
-msgstr "Se produjo un fallo al conectar con «%s»\n"
-
-#: src/transport/gnunet-service-transport_clients.c:843
+#: src/transport/gnunet-service-transport_clients.c:827
 msgid "# REQUEST CONNECT messages received"
 msgstr "# mensajes «REQUEST CONNECT» recibidos"
 
-#: src/transport/gnunet-service-transport_clients.c:882
+#: src/transport/gnunet-service-transport_clients.c:864
 #, fuzzy
 msgid "# REQUEST DISCONNECT messages received"
 msgstr "# mensajes «REQUEST CONNECT» recibidos"
 
-#: src/transport/gnunet-service-transport_hello.c:182
+#: src/transport/gnunet-service-transport_hello.c:188
 msgid "# refreshed my HELLO"
 msgstr "# refrescos de mi «HELLO»"
 
-#: src/transport/gnunet-service-transport_neighbours.c:769
-#: src/transport/gnunet-service-transport_neighbours.c:846
+#: src/transport/gnunet-service-transport_neighbours.c:839
 #, fuzzy
 msgid "# session creation failed"
 msgstr "# sesiones wlan creadas"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1134
+#: src/transport/gnunet-service-transport_neighbours.c:1167
 msgid "# DISCONNECT messages sent"
 msgstr "# Mensajes «DISCONNECT» enviados"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1259
-#: src/transport/gnunet-service-transport_neighbours.c:1675
+#: src/transport/gnunet-service-transport_neighbours.c:1303
+#: src/transport/gnunet-service-transport_neighbours.c:1760
 msgid "# bytes in message queue for other peers"
 msgstr "# bytes en la cola de mensajes para otros pares"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1264
+#: src/transport/gnunet-service-transport_neighbours.c:1308
 msgid "# messages transmitted to other peers"
 msgstr "# mensajes transmitidos a otros pares"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1269
+#: src/transport/gnunet-service-transport_neighbours.c:1314
 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:1327
+#: src/transport/gnunet-service-transport_neighbours.c:1374
 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:1388
-msgid "# keepalives sent"
-msgstr "# «keepalives» enviados"
+#: src/transport/gnunet-service-transport_neighbours.c:1450
+msgid "# KEEPALIVES sent"
+msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1421
+#: src/transport/gnunet-service-transport_neighbours.c:1486
 msgid "# KEEPALIVE messages discarded (peer unknown)"
 msgstr "# Mensajes «KEEPALIVE» descartados (par desconocido)"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1429
+#: src/transport/gnunet-service-transport_neighbours.c:1494
 msgid "# KEEPALIVE messages discarded (no session)"
 msgstr "# mensajes «KEEPALIVE» descartados (no hay sesión)"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1476
-msgid "# KEEPALIVE_RESPONSE messages discarded (not connected)"
+#: src/transport/gnunet-service-transport_neighbours.c:1504
+msgid "# KEEPALIVES received in good order"
+msgstr ""
+
+#: src/transport/gnunet-service-transport_neighbours.c:1549
+#, fuzzy
+msgid "# KEEPALIVE_RESPONSEs discarded (not connected)"
 msgstr "# mensajes «KEEPALIVE_RESPONSE» descartados (no conectado)"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1485
-msgid "# KEEPALIVE_RESPONSE messages discarded (not expected)"
+#: src/transport/gnunet-service-transport_neighbours.c:1558
+#, fuzzy
+msgid "# KEEPALIVE_RESPONSEs discarded (not expected)"
 msgstr "# Mensajes «KEEPALIVE_RESPONSE» descartados (no esperado)"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1493
+#: src/transport/gnunet-service-transport_neighbours.c:1566
 #, fuzzy
-msgid "# KEEPALIVE_RESPONSE messages discarded (address changed)"
+msgid "# KEEPALIVE_RESPONSEs discarded (address changed)"
 msgstr "# mensajes «KEEPALIVE_RESPONSE» descartados (no conectado)"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1501
+#: src/transport/gnunet-service-transport_neighbours.c:1575
 #, fuzzy
-msgid "# KEEPALIVE_RESPONSE messages discarded (wrong nonce)"
+msgid "# KEEPALIVE_RESPONSEs discarded (no nonce)"
 msgstr "# mensajes «KEEPALIVE_RESPONSE» descartados (no conectado)"
 
 #: src/transport/gnunet-service-transport_neighbours.c:1580
+#, fuzzy
+msgid "# KEEPALIVE_RESPONSEs discarded (bad nonce)"
+msgstr "# mensajes «KEEPALIVE_RESPONSE» descartados (no conectado)"
+
+#: src/transport/gnunet-service-transport_neighbours.c:1586
+#, fuzzy
+msgid "# KEEPALIVE_RESPONSEs received (OK)"
+msgstr "# mensajes «KEEPALIVE_RESPONSE» descartados (no conectado)"
+
+#: src/transport/gnunet-service-transport_neighbours.c:1657
 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:1614
+#: src/transport/gnunet-service-transport_neighbours.c:1691
 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:1630
+#: src/transport/gnunet-service-transport_neighbours.c:1706
 msgid "# ms throttling suggested"
 msgstr "# ms de impulso sugeridos"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1726
+#: src/transport/gnunet-service-transport_neighbours.c:1826
 #, fuzzy, c-format
-msgid "Failed to send SYN message to peer `%s' using address `%s' session %p\n"
-msgstr "¡Se produjo un fallo al conectar al servicio de estadísticas!\n"
+msgid "Failed to send SYN message to peer `%s'\n"
+msgstr ""
+"Se produjo un fallo al procesar el mensaje interno del programa auxiliar "
+"«%s»\n"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1747
+#: src/transport/gnunet-service-transport_neighbours.c:1846
 #, fuzzy
 msgid "# Failed attempts to switch addresses (failed to send SYN CONT)"
 msgstr "Se produjo un fallo al procesar la petición DNS.  Omitiendo.\n"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1790
+#: src/transport/gnunet-service-transport_neighbours.c:1885
 #, fuzzy
 msgid "# SYN messages sent"
 msgstr "# Mensajes «DISCONNECT» enviados"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1806
+#: src/transport/gnunet-service-transport_neighbours.c:1902
 #, fuzzy, c-format
-msgid "Failed to transmit SYN message via plugin to %s\n"
+msgid "Failed to transmit SYN message to %s\n"
 msgstr "Se produjo un fallo al transmitir un mensaje al servicio «%s».\n"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1833
+#: src/transport/gnunet-service-transport_neighbours.c:1932
 #, fuzzy
 msgid "# Failed attempts to switch addresses (failed to send SYN)"
 msgstr "Se produjo un fallo al procesar la petición DNS.  Omitiendo.\n"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1880
+#: src/transport/gnunet-service-transport_neighbours.c:1997
 #, fuzzy, c-format
-msgid ""
-"Failed to send SYN_ACK message to peer `%s' using address `%s' session %p\n"
+msgid "Failed to send SYN_ACK message to peer `%s' using address `%s'\n"
 msgstr "¡Se produjo un fallo al conectar al servicio de estadísticas!\n"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1930
+#: src/transport/gnunet-service-transport_neighbours.c:2051
 #, fuzzy
 msgid "# SYN_ACK messages sent"
 msgstr "# Mensajes «DISCONNECT» enviados"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1945
+#: src/transport/gnunet-service-transport_neighbours.c:2068
 #, fuzzy, c-format
-msgid "Failed to transmit SYN_ACK message via plugin to %s\n"
+msgid "Failed to transmit SYN_ACK message to %s\n"
 msgstr "Se produjo un fallo al transmitir un mensaje al servicio «%s».\n"
 
-#: src/transport/gnunet-service-transport_neighbours.c:2235
+#: src/transport/gnunet-service-transport_neighbours.c:2223
 #, 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:2360
+#: src/transport/gnunet-service-transport_neighbours.c:2350
 #, fuzzy
 msgid "# SYN messages received"
 msgstr "# mensajes PING recibidos"
 
-#: src/transport/gnunet-service-transport_neighbours.c:2365
+#: src/transport/gnunet-service-transport_neighbours.c:2355
 #, c-format
 msgid "SYN request from peer `%s' ignored due impending shutdown\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:2673
+#: src/transport/gnunet-service-transport_neighbours.c:2715
 msgid "# Attempts to switch addresses"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3079
-#, 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:3176
+#: src/transport/gnunet-service-transport_neighbours.c:3201
 #, fuzzy
 msgid "# SYN_ACK messages received"
 msgstr "# mensajes SET QUOTA recibidos"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3184
+#: src/transport/gnunet-service-transport_neighbours.c:3209
 #, fuzzy
 msgid "# unexpected SYN_ACK messages (no peer)"
 msgstr "# Mensajes «CONNECT_ACK» inesperados (sin par)"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3198
-#: src/transport/gnunet-service-transport_neighbours.c:3230
+#: src/transport/gnunet-service-transport_neighbours.c:3227
+#: src/transport/gnunet-service-transport_neighbours.c:3251
 #, fuzzy
 msgid "# unexpected SYN_ACK messages (not ready)"
 msgstr "# Mensajes «CONNECT_ACK» inesperados (no estaba preparado)"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3242
+#: src/transport/gnunet-service-transport_neighbours.c:3263
 #, fuzzy
 msgid "# unexpected SYN_ACK messages (waiting on ATS)"
 msgstr "# Mensajes «CONNECT_ACK» inesperados (esperando en el ATS)"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3262
+#: src/transport/gnunet-service-transport_neighbours.c:3288
 msgid "# Successful attempts to switch addresses"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3270
+#: src/transport/gnunet-service-transport_neighbours.c:3301
 #, fuzzy
 msgid "# unexpected SYN_ACK messages (disconnecting)"
 msgstr "# Mensajes «CONNECT_ACK» inesperados (desconectando)"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3460
+#: src/transport/gnunet-service-transport_neighbours.c:3495
 #, fuzzy
 msgid "# ACK messages received"
 msgstr "# mensajes «REQUEST CONNECT» recibidos"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3496
+#: src/transport/gnunet-service-transport_neighbours.c:3530
 #, fuzzy
 msgid "# unexpected ACK messages"
 msgstr "# Mensajes «SESSION ACK» inesperados"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3566
+#: src/transport/gnunet-service-transport_neighbours.c:3582
 msgid "# SET QUOTA messages ignored (no such peer)"
 msgstr "# Mensajes «SET QUOTA» ignorados (no existe tal par)"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3581
+#: src/transport/gnunet-service-transport_neighbours.c:3597
 msgid "# disconnects due to quota of 0"
 msgstr "# desconexiones debido a una cuota de 0"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3623
+#: src/transport/gnunet-service-transport_neighbours.c:3644
+#, fuzzy
+msgid "# quota messages ignored (malformed)"
+msgstr "# mensajes de desconexión ignorados (formato antiguo)"
+
+#: src/transport/gnunet-service-transport_neighbours.c:3651
+#, fuzzy
+msgid "# QUOTA messages received"
+msgstr "# Mensajes «GAP PUT» recibidos"
+
+#: src/transport/gnunet-service-transport_neighbours.c:3686
 #, fuzzy
 msgid "# disconnect messages ignored (malformed)"
 msgstr "# mensajes de desconexión ignorados (formato antiguo)"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3629
+#: src/transport/gnunet-service-transport_neighbours.c:3693
 #, fuzzy
 msgid "# DISCONNECT messages received"
 msgstr "# mensajes «REQUEST CONNECT» recibidos"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3638
+#: src/transport/gnunet-service-transport_neighbours.c:3704
 msgid "# disconnect messages ignored (timestamp)"
 msgstr "# mensajes de desconexión ignorados (marca temporal)"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3765
+#: src/transport/gnunet-service-transport_neighbours.c:3833
 msgid "# disconnected from peer upon explicit request"
 msgstr "# desconexiones del par debido a una petición explícita"
 
-#: src/transport/gnunet-service-transport_plugins.c:119
+#: src/transport/gnunet-service-transport_plugins.c:158
 msgid "Transport service is lacking NEIGHBOUR_LIMIT option.\n"
 msgstr "El servicio de transporte carece de la opción «NEIGHBOUR_LIMIT».\n"
 
-#: src/transport/gnunet-service-transport_plugins.c:177
-#: src/transport/gnunet-service-transport_plugins.c:185
-#: src/transport/gnunet-service-transport_plugins.c:193
-#: src/transport/gnunet-service-transport_plugins.c:201
-#: src/transport/gnunet-service-transport_plugins.c:209
-#: src/transport/gnunet-service-transport_plugins.c:217
-#: src/transport/gnunet-service-transport_plugins.c:225
-#: src/transport/gnunet-service-transport_plugins.c:233
-#: src/transport/gnunet-service-transport_plugins.c:241
-#: src/transport/gnunet-service-transport_plugins.c:249
-#: src/transport/gnunet-service-transport_plugins.c:257
+#: src/transport/gnunet-service-transport_plugins.c:223
+#: src/transport/gnunet-service-transport_plugins.c:231
+#: src/transport/gnunet-service-transport_plugins.c:239
+#: src/transport/gnunet-service-transport_plugins.c:247
+#: src/transport/gnunet-service-transport_plugins.c:255
+#: src/transport/gnunet-service-transport_plugins.c:263
+#: src/transport/gnunet-service-transport_plugins.c:271
+#: src/transport/gnunet-service-transport_plugins.c:279
+#: src/transport/gnunet-service-transport_plugins.c:287
+#: src/transport/gnunet-service-transport_plugins.c:295
+#: src/transport/gnunet-service-transport_plugins.c:303
 #, fuzzy, c-format
 msgid "Missing function `%s' in transport plugin for `%s'\n"
 msgstr "Se produjo un fallo al cargar el módulo del transporte para «%s»\n"
 
-#: src/transport/gnunet-service-transport_plugins.c:264
+#: src/transport/gnunet-service-transport_plugins.c:310
 #, fuzzy, c-format
 msgid "Did not load plugin `%s' due to missing functions\n"
 msgstr "Falló al cargar el plugin '%s' en %s:%d. Descargando plugin.\n"
 
-#: src/transport/gnunet-service-transport_validation.c:476
-#: src/transport/gnunet-service-transport_validation.c:656
-#: src/transport/gnunet-service-transport_validation.c:929
-#: src/transport/gnunet-service-transport_validation.c:1532
+#: src/transport/gnunet-service-transport_validation.c:343
+#, fuzzy
+msgid "# Addresses in validation map"
+msgstr "# revalidaciones de direcciones iniciadas"
+
+#: src/transport/gnunet-service-transport_validation.c:450
+#: src/transport/gnunet-service-transport_validation.c:638
+#: src/transport/gnunet-service-transport_validation.c:927
+#: src/transport/gnunet-service-transport_validation.c:1508
 #, fuzzy
 msgid "# validations running"
 msgstr "Base de datos sqlite ejecutándose\n"
 
-#: src/transport/gnunet-service-transport_validation.c:515
-msgid "# address records discarded"
+#: src/transport/gnunet-service-transport_validation.c:493
+#, fuzzy
+msgid "# address records discarded (timeout)"
 msgstr "# registros de direcciones descartados"
 
-#: src/transport/gnunet-service-transport_validation.c:600
-msgid "# validations not attempted (no plugin)"
-msgstr ""
+#: src/transport/gnunet-service-transport_validation.c:541
+#, fuzzy
+msgid "# address records discarded (blacklist)"
+msgstr "# registros de direcciones descartados"
 
-#: src/transport/gnunet-service-transport_validation.c:646
+#: src/transport/gnunet-service-transport_validation.c:629
 #, fuzzy
 msgid "# PINGs for address validation sent"
 msgstr "# revalidaciones de direcciones iniciadas"
 
-#: src/transport/gnunet-service-transport_validation.c:755
+#: src/transport/gnunet-service-transport_validation.c:711
+msgid "# validations delayed by global throttle"
+msgstr ""
+
+#: src/transport/gnunet-service-transport_validation.c:748
 msgid "# address revalidations started"
 msgstr "# revalidaciones de direcciones iniciadas"
 
-#: src/transport/gnunet-service-transport_validation.c:1057
+#: src/transport/gnunet-service-transport_validation.c:1048
 msgid "# PING message for different peer received"
 msgstr "# Mensajes PING recibidos para un par diferente"
 
-#: src/transport/gnunet-service-transport_validation.c:1108
+#: src/transport/gnunet-service-transport_validation.c:1099
 #, fuzzy, c-format
 msgid "Plugin `%s' not available, cannot confirm having this address\n"
 msgstr ""
 "No confirmando el PING con dirección «%s» ya que no puedo confirmar tener "
 "esa dirección.\n"
 
-#: src/transport/gnunet-service-transport_validation.c:1118
+#: src/transport/gnunet-service-transport_validation.c:1112
 msgid "# failed address checks during validation"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1121
+#: src/transport/gnunet-service-transport_validation.c:1115
 #, c-format
 msgid "Address `%s' is not one of my addresses, not confirming PING\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1129
+#: src/transport/gnunet-service-transport_validation.c:1123
 msgid "# successful address checks during validation"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1141
+#: src/transport/gnunet-service-transport_validation.c:1136
 #, fuzzy, c-format
 msgid ""
 "Not confirming PING from peer `%s' with address `%s' since I cannot confirm "
@@ -7711,100 +7726,85 @@ msgstr ""
 "No confirmando el PING con dirección «%s» ya que no puedo confirmar tener "
 "esa dirección.\n"
 
-#: src/transport/gnunet-service-transport_validation.c:1149
-#, c-format
-msgid "Received a PING message with validation bug from `%s'\n"
-msgstr "Recibido un mensaje PING con un error de validación de «%s»\n"
-
-#: src/transport/gnunet-service-transport_validation.c:1203
+#: src/transport/gnunet-service-transport_validation.c:1191
 #, fuzzy, c-format
 msgid "Failed to create PONG signature for peer `%s'\n"
 msgstr "Se produjo un fallo al crear la página para «%s»\n"
 
-#: src/transport/gnunet-service-transport_validation.c:1253
+#: src/transport/gnunet-service-transport_validation.c:1242
 msgid "# PONGs unicast via reliable transport"
 msgstr "# unicast de PONG vía transporte confiable"
 
-#: src/transport/gnunet-service-transport_validation.c:1262
+#: src/transport/gnunet-service-transport_validation.c:1251
 msgid "# PONGs multicast to all available addresses"
 msgstr "# multicast de PONG a todas las direcciones disponibles"
 
-#: src/transport/gnunet-service-transport_validation.c:1434
+#: src/transport/gnunet-service-transport_validation.c:1408
 msgid "# PONGs dropped, no matching pending validation"
 msgstr "# PONG omitidos, no hay una validación pendiente coincidente"
 
-#: src/transport/gnunet-service-transport_validation.c:1450
+#: src/transport/gnunet-service-transport_validation.c:1426
 msgid "# PONGs dropped, signature expired"
 msgstr "# Mensajes PONG omitidos, firma expirada"
 
-#: src/transport/gnunet-service-transport_validation.c:1502
+#: src/transport/gnunet-service-transport_validation.c:1478
 #, fuzzy
 msgid "# validations succeeded"
 msgstr "# revalidaciones de direcciones iniciadas"
 
-#: src/transport/gnunet-service-transport_validation.c:1590
-#, fuzzy, c-format
-msgid "Validation received new %s message for peer `%s' with size %u\n"
-msgstr "Recibido último mensaje para %s\n"
-
-#: src/transport/gnunet-service-transport_validation.c:1597
-#, c-format
-msgid "Adding `%s' without addresses for peer `%s'\n"
-msgstr "Añadiendo «%s» sin direcciones para el par «%s»\n"
-
-#: src/transport/gnunet-transport.c:578
+#: src/transport/gnunet-transport.c:580
 #, 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:587
+#: src/transport/gnunet-transport.c:589
 #: src/transport/gnunet-transport-profiler.c:274
 #, 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:619
+#: src/transport/gnunet-transport.c:621
 #, c-format
 msgid "Failed to connect to `%s'\n"
 msgstr "Se produjo un fallo al conectar con «%s»\n"
 
-#: src/transport/gnunet-transport.c:634
+#: src/transport/gnunet-transport.c:636
 #, 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:646
+#: src/transport/gnunet-transport.c:648
 msgid "Failed to list connections, timeout occured\n"
 msgstr "No se pudieron listar las conexiones, expiró el plazo\n"
 
-#: src/transport/gnunet-transport.c:673 src/transport/gnunet-transport.c:698
+#: src/transport/gnunet-transport.c:675 src/transport/gnunet-transport.c:700
 #, 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:678
+#: src/transport/gnunet-transport.c:680
 #, 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:683
+#: src/transport/gnunet-transport.c:685
 #, 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:688
+#: src/transport/gnunet-transport.c:690
 #, 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:693
+#: src/transport/gnunet-transport.c:695
 #, c-format
 msgid "Timeout while waiting for result of NAT test for plugin `%s'\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:818
+#: src/transport/gnunet-transport.c:820
 #, fuzzy, c-format
 msgid ""
 "Peer `%s' %s %s\n"
@@ -7813,45 +7813,45 @@ msgid ""
 "\t%s%s\n"
 msgstr "Par «%s»: %s %s\n"
 
-#: src/transport/gnunet-transport.c:854
+#: src/transport/gnunet-transport.c:855
 #, fuzzy, c-format
 msgid "Peer `%s' %s `%s' \n"
 msgstr "Par «%s»: %s %s\n"
 
-#: src/transport/gnunet-transport.c:953 src/transport/gnunet-transport.c:1702
+#: src/transport/gnunet-transport.c:949 src/transport/gnunet-transport.c:1744
 #, 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:1021
+#: src/transport/gnunet-transport.c:1006
 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:1035
+#: src/transport/gnunet-transport.c:1020
 #, 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:1060
+#: src/transport/gnunet-transport.c:1045
 #, fuzzy
 msgid "Failed to start resolver!\n"
 msgstr "Se produjo un fallo al arrancar %s\n"
 
-#: src/transport/gnunet-transport.c:1106
+#: src/transport/gnunet-transport.c:1091
 #, c-format
 msgid "Transmitting %u bytes to %s\n"
 msgstr "Transmitiendo %u bytes a %s\n"
 
-#: src/transport/gnunet-transport.c:1129
+#: src/transport/gnunet-transport.c:1114
 #: src/transport/gnunet-transport-profiler.c:406
 #, c-format
 msgid "Successfully connected to `%s'\n"
 msgstr "Conectado satisfactoriamente a «%s»\n"
 
-#: src/transport/gnunet-transport.c:1153
+#: src/transport/gnunet-transport.c:1138
 #, c-format
 msgid ""
 "Successfully connected to `%s', starting to send benchmark data in %u Kb "
@@ -7860,61 +7860,61 @@ msgstr ""
 "Conectado satisfactoriamente a «%s», empezando a mandar datos de prueba en "
 "bloques de %u Kb\n"
 
-#: src/transport/gnunet-transport.c:1186
+#: src/transport/gnunet-transport.c:1171
 #, fuzzy, c-format
 msgid "Successfully disconnected from `%s'\n"
 msgstr "Conectado satisfactoriamente a «%s»\n"
 
-#: src/transport/gnunet-transport.c:1209
+#: src/transport/gnunet-transport.c:1194
 #: src/transport/gnunet-transport-profiler.c:434
 #, c-format
 msgid "Disconnected from peer `%s' while benchmarking\n"
 msgstr "Desconectado del par «%s» mientras probaba\n"
 
-#: src/transport/gnunet-transport.c:1234 src/transport/gnunet-transport.c:1260
+#: src/transport/gnunet-transport.c:1219 src/transport/gnunet-transport.c:1245
 #, 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:1236
+#: src/transport/gnunet-transport.c:1221
 msgid "Connected to"
 msgstr "Conectado a"
 
-#: src/transport/gnunet-transport.c:1262
+#: src/transport/gnunet-transport.c:1247
 msgid "Disconnected from"
 msgstr "Desconectado de"
 
-#: src/transport/gnunet-transport.c:1286
+#: src/transport/gnunet-transport.c:1271
 #: src/transport/gnunet-transport-profiler.c:458
 #, c-format
 msgid "Received %u bytes from %s\n"
 msgstr "Recibidos %u bytes de %s\n"
 
-#: src/transport/gnunet-transport.c:1318
+#: src/transport/gnunet-transport.c:1311
 #, c-format
 msgid "Peer `%s': %s %s in state `%s' until %s\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1330
+#: src/transport/gnunet-transport.c:1323
 #, c-format
 msgid "Peer `%s': %s %s\n"
 msgstr "Par «%s»: %s %s\n"
 
-#: src/transport/gnunet-transport.c:1784
+#: src/transport/gnunet-transport.c:1831
 #: src/transport/gnunet-transport-profiler.c:492
 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:1819
+#: src/transport/gnunet-transport.c:1866
 #, fuzzy
 msgid "Failed to send disconnect 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:1863
+#: src/transport/gnunet-transport.c:1910
 #, fuzzy, c-format
 msgid ""
 "Multiple operations given. Please choose only one operation: %s, %s, %s, %s, "
@@ -7923,7 +7923,7 @@ msgstr ""
 "Múltiples operaciones introducidas. Por favor, seleccione únicamente una "
 "operación: %s, %s, %s, %s, %s, %s\n"
 
-#: src/transport/gnunet-transport.c:1871
+#: src/transport/gnunet-transport.c:1918
 #, fuzzy, c-format
 msgid ""
 "No operation given. Please choose one operation: %s, %s, %s, %s, %s, %s, %s\n"
@@ -7931,86 +7931,86 @@ msgstr ""
 "Ninguna operación introducida. Por favor, seleccione alguna operación: %s, "
 "%s, %s, %s, %s, %s\n"
 
-#: src/transport/gnunet-transport.c:1890 src/transport/gnunet-transport.c:1920
-#: src/transport/gnunet-transport.c:1953 src/transport/gnunet-transport.c:1979
-#: src/transport/gnunet-transport.c:2035
+#: src/transport/gnunet-transport.c:1937 src/transport/gnunet-transport.c:1967
+#: src/transport/gnunet-transport.c:2000 src/transport/gnunet-transport.c:2026
+#: src/transport/gnunet-transport.c:2085
 #: src/transport/gnunet-transport-profiler.c:578
 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:1899 src/transport/gnunet-transport.c:1930
-#: src/transport/gnunet-transport.c:1964
+#: src/transport/gnunet-transport.c:1946 src/transport/gnunet-transport.c:1977
+#: src/transport/gnunet-transport.c:2011
 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:1984
+#: src/transport/gnunet-transport.c:2031
 msgid "Starting to receive benchmark data\n"
 msgstr "Empezando a recibir datos de prueba\n"
 
-#: src/transport/gnunet-transport.c:2083
+#: src/transport/gnunet-transport.c:2133
 #, 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:2086
+#: src/transport/gnunet-transport.c:2136
 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:2089
+#: src/transport/gnunet-transport.c:2139
 msgid "connect to a peer"
 msgstr "conectar a un par"
 
-#: src/transport/gnunet-transport.c:2092
+#: src/transport/gnunet-transport.c:2142
 #, fuzzy
 msgid "disconnect to a peer"
 msgstr "conectar a un par"
 
-#: src/transport/gnunet-transport.c:2095
+#: src/transport/gnunet-transport.c:2145
 #, 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:2098
+#: src/transport/gnunet-transport.c:2148
 #, fuzzy
 msgid "print information for all pending validations continuously"
 msgstr ""
 "provee información sobre todas las conexiones actuales (de forma continua)"
 
-#: src/transport/gnunet-transport.c:2101
+#: src/transport/gnunet-transport.c:2151
 msgid "provide information about all current connections (once)"
 msgstr "provee información sobre todas las conexiones actuales (una vez)"
 
-#: src/transport/gnunet-transport.c:2107
+#: src/transport/gnunet-transport.c:2157
 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:2110
+#: src/transport/gnunet-transport.c:2160
 msgid "do not resolve hostnames"
 msgstr "no resolver nombres de máquinas"
 
-#: src/transport/gnunet-transport.c:2113
+#: src/transport/gnunet-transport.c:2163
 #: src/transport/gnunet-transport-profiler.c:638
 msgid "peer identity"
 msgstr "identidad del par"
 
-#: src/transport/gnunet-transport.c:2116
+#: src/transport/gnunet-transport.c:2166
 #, fuzzy
 msgid "monitor plugin sessions"
 msgstr "# sesiones wlan pendientes"
 
-#: src/transport/gnunet-transport.c:2119
+#: src/transport/gnunet-transport.c:2169
 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:2122
+#: src/transport/gnunet-transport.c:2172
 msgid "test transport configuration (involves external server)"
 msgstr "probar configuración de transporte (requiere un servidor externo)"
 
-#: src/transport/gnunet-transport.c:2133
+#: src/transport/gnunet-transport.c:2183
 #: src/transport/gnunet-transport-profiler.c:649
 msgid "Direct access to transport service."
 msgstr "Acceso directo al servicio de transporte."
@@ -8113,39 +8113,39 @@ msgstr "número de mensajes a usar por iteración"
 msgid "message size to use"
 msgstr "tamaño del mensaje"
 
-#: src/transport/plugin_transport_http_client.c:1491
-#: src/transport/plugin_transport_http_server.c:2276
-#: src/transport/plugin_transport_http_server.c:3443
-#: src/transport/plugin_transport_tcp.c:2844
-#: src/transport/plugin_transport_tcp.c:2851
+#: src/transport/plugin_transport_http_client.c:1481
+#: src/transport/plugin_transport_http_server.c:2247
+#: src/transport/plugin_transport_http_server.c:3414
+#: src/transport/plugin_transport_tcp.c:2923
+#: src/transport/plugin_transport_tcp.c:2930
 msgid "TCP_STEALTH not supported on this platform.\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_client.c:2114
+#: src/transport/plugin_transport_http_client.c:2106
 #, 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:2163
-#: src/transport/plugin_transport_http_server.c:3177
+#: src/transport/plugin_transport_http_client.c:2155
+#: src/transport/plugin_transport_http_server.c:3148
 #, c-format
 msgid "Shutting down plugin `%s'\n"
 msgstr "Finalizando el módulo «%s»\n"
 
-#: src/transport/plugin_transport_http_client.c:2180
-#: src/transport/plugin_transport_http_server.c:3247
+#: src/transport/plugin_transport_http_client.c:2172
+#: src/transport/plugin_transport_http_server.c:3218
 #, 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:2214
+#: src/transport/plugin_transport_http_client.c:2206
 #, fuzzy, c-format
 msgid "Maximum number of requests is %u\n"
 msgstr "El número máximo de conexiones es %u\n"
 
-#: src/transport/plugin_transport_http_server.c:1763
+#: src/transport/plugin_transport_http_server.c:1734
 #, c-format
 msgid ""
 "Access from connection %p (%u of %u) for `%s' `%s' url `%s' with upload data "
@@ -8154,12 +8154,12 @@ msgstr ""
 "Acceso desde la conexión %p (%u de %u) para «%s» «%s» URL «%s» con tamaño de "
 "los datos de subida %u\n"
 
-#: src/transport/plugin_transport_http_server.c:1994
+#: src/transport/plugin_transport_http_server.c:1965
 #, 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:2002
+#: src/transport/plugin_transport_http_server.c:1973
 #, c-format
 msgid ""
 "Server reached maximum number connections (%u), rejecting new connection\n"
@@ -8167,7 +8167,7 @@ msgstr ""
 "El servidor ha alcanzado el número máximo de conexiones (%u), rechazando "
 "nueva conexión\n"
 
-#: src/transport/plugin_transport_http_server.c:2152
+#: src/transport/plugin_transport_http_server.c:2123
 msgid ""
 "Could not create a new TLS certificate, program `gnunet-transport-"
 "certificate-creation' could not be started!\n"
@@ -8175,103 +8175,104 @@ msgstr ""
 "¡No se pudo crear un certificado TLS nuevo, el programa «gnunet-transport-"
 "certificate-creation» no pudo ser iniciado!\n"
 
-#: src/transport/plugin_transport_http_server.c:2175
+#: src/transport/plugin_transport_http_server.c:2146
 #, 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:2302
+#: src/transport/plugin_transport_http_server.c:2273
 msgid "Could not load or create server certificate! Loading plugin failed!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:2611
+#: src/transport/plugin_transport_http_server.c:2582
 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:2645 src/util/service.c:704
+#: src/transport/plugin_transport_http_server.c:2616 src/util/service.c:704
 #, 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:2663 src/util/service.c:723
+#: src/transport/plugin_transport_http_server.c:2634 src/util/service.c:723
 #, 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:2776
+#: src/transport/plugin_transport_http_server.c:2747
 #, 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:2854
+#: src/transport/plugin_transport_http_server.c:2825
+#: src/transport/plugin_transport_udp.c:3332
 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:2953
+#: src/transport/plugin_transport_http_server.c:2924
 #, c-format
 msgid "IPv4 support is %s\n"
 msgstr "El soporte IPv4 es %s\n"
 
-#: src/transport/plugin_transport_http_server.c:2968
+#: src/transport/plugin_transport_http_server.c:2939
 #, c-format
 msgid "IPv6 support is %s\n"
 msgstr "El soporte IPv6 es %s\n"
 
-#: src/transport/plugin_transport_http_server.c:2974
+#: src/transport/plugin_transport_http_server.c:2945
 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:2985
+#: src/transport/plugin_transport_http_server.c:2956
 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:2991
+#: src/transport/plugin_transport_http_server.c:2962
 #, c-format
 msgid "Using port %u\n"
 msgstr "Usando puerto %u\n"
 
-#: src/transport/plugin_transport_http_server.c:3005
+#: src/transport/plugin_transport_http_server.c:2976
 #, 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:3015
+#: src/transport/plugin_transport_http_server.c:2986
 #, 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:3037
+#: src/transport/plugin_transport_http_server.c:3008
 #, 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:3047
+#: src/transport/plugin_transport_http_server.c:3018
 #, 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:3110
+#: src/transport/plugin_transport_http_server.c:3081
 #, c-format
 msgid "Using external hostname `%s'\n"
 msgstr "Usando nombre de máquina externo «%s»\n"
 
-#: src/transport/plugin_transport_http_server.c:3131
+#: src/transport/plugin_transport_http_server.c:3102
 #, 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:3148
+#: src/transport/plugin_transport_http_server.c:3119
 #, 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:3455
+#: src/transport/plugin_transport_http_server.c:3426
 #, fuzzy
 msgid "Unable to compile URL regex\n"
 msgstr "¡Imposible obtener «HELLO» del par!\n"
@@ -8321,60 +8322,83 @@ msgstr "# bytes enviados vía SMTP"
 msgid "# bytes dropped by SMTP (outgoing)"
 msgstr "# bytes omitidos por SMTP (salientes)"
 
-#: src/transport/plugin_transport_tcp.c:648
+#: src/transport/plugin_transport_tcp.c:672
 #, c-format
 msgid "Unexpected address length: %u bytes\n"
 msgstr "Longitud de dirección inesperada: %u bytes\n"
 
-#: src/transport/plugin_transport_tcp.c:829
-#: src/transport/plugin_transport_tcp.c:1044
-#: src/transport/plugin_transport_tcp.c:2239
-#: src/transport/plugin_transport_tcp.c:2950
+#: src/transport/plugin_transport_tcp.c:855
+#: src/transport/plugin_transport_tcp.c:1081
+#: src/transport/plugin_transport_tcp.c:2251
+#: src/transport/plugin_transport_tcp.c:3042
 msgid "# TCP sessions active"
 msgstr "# Sesiones TCP activas"
 
-#: src/transport/plugin_transport_tcp.c:870
-#: src/transport/plugin_transport_tcp.c:1027
-#: src/transport/plugin_transport_tcp.c:1146
-#: src/transport/plugin_transport_tcp.c:1214
-#: src/transport/plugin_transport_tcp.c:1312
-#: src/transport/plugin_transport_tcp.c:1336
+#: src/transport/plugin_transport_tcp.c:897
+#: src/transport/plugin_transport_tcp.c:1063
+#: src/transport/plugin_transport_tcp.c:1187
+#: src/transport/plugin_transport_tcp.c:1260
+#: src/transport/plugin_transport_tcp.c:1360
+#: src/transport/plugin_transport_tcp.c:1385
 msgid "# bytes currently in TCP buffers"
 msgstr "# bytes actualmente en los buffer TCP"
 
-#: src/transport/plugin_transport_tcp.c:873
+#: src/transport/plugin_transport_tcp.c:900
 msgid "# bytes discarded by TCP (disconnect)"
 msgstr "# bytes descartados por TCP (desconectado)"
 
-#: src/transport/plugin_transport_tcp.c:1149
+#: src/transport/plugin_transport_tcp.c:1190
 msgid "# bytes discarded by TCP (timeout)"
 msgstr "# bytes omitidos por TCP (expirados)"
 
-#: src/transport/plugin_transport_tcp.c:1218
+#: src/transport/plugin_transport_tcp.c:1264
 msgid "# bytes transmitted via TCP"
 msgstr "# bytes recibidos vía TCP"
 
-#: src/transport/plugin_transport_tcp.c:1616
+#: src/transport/plugin_transport_tcp.c:1659
 msgid "# requests to create session with invalid address"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:1782
+#: src/transport/plugin_transport_tcp.c:1827
 msgid "# transport-service disconnect requests for TCP"
 msgstr "# peticiones de desconexión del servicio de transporte por TCP"
 
-#: src/transport/plugin_transport_tcp.c:2292
+#: src/transport/plugin_transport_tcp.c:2310
 msgid "# TCP WELCOME messages received"
 msgstr "# Mensajes «WELCOME» TCP recibidos"
 
-#: src/transport/plugin_transport_tcp.c:2470
+#: src/transport/plugin_transport_tcp.c:2501
 msgid "# bytes received via TCP"
 msgstr "# bytes recibidos vía TCP"
 
-#: src/transport/plugin_transport_tcp.c:2542
+#: src/transport/plugin_transport_tcp.c:2552
+#: src/transport/plugin_transport_tcp.c:2610
+#, fuzzy
+msgid "# TCP server connections active"
+msgstr "# conexiones «stream» activas"
+
+#: src/transport/plugin_transport_tcp.c:2556
+#, fuzzy
+msgid "# TCP server connect events"
+msgstr "# Pares conectados"
+
+#: src/transport/plugin_transport_tcp.c:2562
+msgid "TCP connection limit reached, suspending server\n"
+msgstr ""
+
+#: src/transport/plugin_transport_tcp.c:2564
+msgid "# TCP service suspended"
+msgstr ""
+
+#: src/transport/plugin_transport_tcp.c:2604
+msgid "# TCP service resumed"
+msgstr ""
+
+#: src/transport/plugin_transport_tcp.c:2614
 msgid "# network-level TCP disconnect events"
 msgstr "# eventos de desconexión TCP a nivel de red"
 
-#: src/transport/plugin_transport_tcp.c:2778 src/util/service.c:584
+#: src/transport/plugin_transport_tcp.c:2857 src/util/service.c:584
 #: src/util/service.c:590
 #, c-format
 msgid "Require valid port number for service `%s' in configuration!\n"
@@ -8382,52 +8406,42 @@ msgstr ""
 "¡Se requiere un número de puerto válido para el servicio «%s» en la "
 "configuración!\n"
 
-#: src/transport/plugin_transport_tcp.c:2794
+#: src/transport/plugin_transport_tcp.c:2873
 msgid "Failed to start service.\n"
 msgstr "Se produjo un fallo al iniciar el servicio.\n"
 
-#: src/transport/plugin_transport_tcp.c:2937
+#: src/transport/plugin_transport_tcp.c:3030
 #, 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:2941
+#: src/transport/plugin_transport_tcp.c:3034
 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:2945
+#: src/transport/plugin_transport_tcp.c:3038
 #, c-format
 msgid "TCP transport advertises itself as being on port %llu\n"
 msgstr "El transporte TCP anuncia que está en el puerto %llu\n"
 
-#: src/transport/plugin_transport_udp_broadcasting.c:172
-msgid "# IPv6 multicast HELLO beacons received via udp"
+#: src/transport/plugin_transport_udp_broadcasting.c:170
+#, fuzzy
+msgid "# Multicast HELLO beacons received via UDP"
 msgstr "# beacons HELLO multicast IPv6 recibidos vía UDP"
 
-#: src/transport/plugin_transport_udp_broadcasting.c:218
-msgid "# IPv4 broadcast HELLO beacons received via udp"
-msgstr "# beacons HELLO broadcast IPv4 recibidos vía UDP"
-
-#: src/transport/plugin_transport_udp_broadcasting.c:609
+#: src/transport/plugin_transport_udp_broadcasting.c:548
 msgid ""
 "Disabling HELLO broadcasting due to friend-to-friend only configuration!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_udp_broadcasting.c:632
+#: src/transport/plugin_transport_udp_broadcasting.c:569
 #, c-format
 msgid "Failed to set IPv4 broadcast option for broadcast socket on port %d\n"
 msgstr ""
 "Se produjo un fallo al establecer la opción de «broadcast» IPv4 para el "
 "«socket» en el puerto %d\n"
 
-#: src/transport/plugin_transport_udp.c:1658
-#, c-format
-msgid ""
-"Trying to create session for address of unexpected length %u (should be %u "
-"or %u)\n"
-msgstr ""
-
-#: src/transport/plugin_transport_udp.c:2905
+#: src/transport/plugin_transport_udp.c:3078
 #, c-format
 msgid ""
 "UDP could not transmit message to `%s': Network seems down, please check "
@@ -8436,7 +8450,7 @@ msgstr ""
 "UDP no pudo transmitir el mensaje a «%s»: La red parece caída, por favor, "
 "compruebe su configuración de red\n"
 
-#: src/transport/plugin_transport_udp.c:2918
+#: src/transport/plugin_transport_udp.c:3092
 #, fuzzy
 msgid ""
 "UDP could not transmit IPv6 message! Please check your network configuration "
@@ -8446,116 +8460,127 @@ msgstr ""
 "configuración de red y deshabilite IPv6 si su conexión carece de una "
 "dirección IPv6 global\n"
 
-#: src/transport/plugin_transport_udp.c:3271
+#: src/transport/plugin_transport_udp.c:3408
+#: src/transport/plugin_transport_udp.c:3507
 #, fuzzy, c-format
 msgid "Failed to bind UDP socket to %s: %s\n"
 msgstr "Se produjo un fallo al abrir los «sockets» UDP\n"
 
-#: src/transport/plugin_transport_udp.c:3279
+#: src/transport/plugin_transport_udp.c:3426
+#, fuzzy
+msgid "Disabling IPv4 since it is not supported on this system!\n"
+msgstr "¡Deshabilitando IPv6 ya que no está soportado en este sistema!\n"
+
+#: src/transport/plugin_transport_udp.c:3517
 msgid "Failed to open UDP sockets\n"
 msgstr "Se produjo un fallo al abrir los «sockets» UDP\n"
 
-#: src/transport/plugin_transport_udp.c:3438
-#, c-format
-msgid "Given `%s' option is out of range: %llu > %u\n"
-msgstr "La opción «%s» dada está fuera de rango: %llu > %u\n"
+#: src/transport/plugin_transport_udp.c:3588
+#: src/transport/plugin_transport_udp.c:3602
+msgid "must be in [0,65535]"
+msgstr ""
 
-#: src/transport/plugin_transport_udp.c:3485
-#, c-format
-msgid "Invalid IPv6 address: `%s'\n"
-msgstr "Dirección IPv6 no válida: «%s»\n"
+#: src/transport/plugin_transport_udp.c:3634
+#, fuzzy
+msgid "must be valid IPv4 address"
+msgstr "«%s» no es una dirección IP válida.\n"
+
+#: src/transport/plugin_transport_udp.c:3661
+#, fuzzy
+msgid "must be valid IPv6 address"
+msgstr "«%s» no es una dirección IP válida.\n"
 
-#: src/transport/plugin_transport_udp.c:3553
+#: src/transport/plugin_transport_udp.c:3727
 #, fuzzy
-msgid "Failed to create network sockets, plugin failed\n"
+msgid "Failed to create UDP network sockets\n"
 msgstr "Se produjo un fallo al crear una nueva firma"
 
-#: src/transport/plugin_transport_unix.c:1405
+#: src/transport/plugin_transport_unix.c:1393
 #, fuzzy, c-format
 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:1418
+#: src/transport/plugin_transport_unix.c:1406
 #, fuzzy, c-format
 msgid "Cannot bind to `%s'\n"
 msgstr "Imposible hallar el hash de '%s'.\n"
 
-#: src/transport/plugin_transport_unix.c:1819
+#: src/transport/plugin_transport_unix.c:1807
 #, fuzzy
 msgid "Failed to open UNIX listen socket\n"
 msgstr "Se produjo un fallo al abrir los «sockets» UNIX\n"
 
-#: src/transport/plugin_transport_wlan.c:733
+#: src/transport/plugin_transport_wlan.c:742
 #, fuzzy
 msgid "# ACKs sent"
 msgstr "# ACK WLAN enviados"
 
-#: src/transport/plugin_transport_wlan.c:753
+#: src/transport/plugin_transport_wlan.c:762
 #, fuzzy
 msgid "# Messages defragmented"
 msgstr "# mensajes defragmentados"
 
-#: src/transport/plugin_transport_wlan.c:794
-#: src/transport/plugin_transport_wlan.c:881
+#: src/transport/plugin_transport_wlan.c:803
+#: src/transport/plugin_transport_wlan.c:890
 #, fuzzy
 msgid "# Sessions allocated"
 msgstr "# sesiones WLAN alojadas"
 
-#: src/transport/plugin_transport_wlan.c:1002
+#: src/transport/plugin_transport_wlan.c:1011
 #, fuzzy
 msgid "# message fragments sent"
 msgstr "# fragmentos de mensaje WLAN enviados"
 
-#: src/transport/plugin_transport_wlan.c:1031
+#: src/transport/plugin_transport_wlan.c:1040
 #, fuzzy
 msgid "# messages pending (with fragmentation)"
 msgstr "# mensajes WLAN pendientes (con fragmentación)"
 
-#: src/transport/plugin_transport_wlan.c:1162
-#: src/transport/plugin_transport_wlan.c:1255
-#: src/transport/plugin_transport_wlan.c:2272
+#: src/transport/plugin_transport_wlan.c:1171
+#: src/transport/plugin_transport_wlan.c:1264
+#: src/transport/plugin_transport_wlan.c:2268
 #, fuzzy
 msgid "# MAC endpoints allocated"
 msgstr "# MAC de destino WLAN alojadas"
 
-#: src/transport/plugin_transport_wlan.c:1530
+#: src/transport/plugin_transport_wlan.c:1528
 #, fuzzy
 msgid "# ACKs received"
 msgstr "# ACK recibidos vía WLAN"
 
-#: src/transport/plugin_transport_wlan.c:1599
+#: src/transport/plugin_transport_wlan.c:1597
 #, fuzzy
 msgid "# DATA messages discarded due to CRC32 error"
 msgstr "# mensajes DATA WLAN descartados debido a un error en el CRC32"
 
-#: src/transport/plugin_transport_wlan.c:1707
+#: src/transport/plugin_transport_wlan.c:1703
 #, fuzzy
 msgid "# HELLO beacons sent"
 msgstr "# «beacons HELLO» enviados vía WLAN"
 
-#: src/transport/plugin_transport_wlan.c:1824
+#: src/transport/plugin_transport_wlan.c:1820
 #, fuzzy
 msgid "# DATA messages received"
 msgstr "# Mensajes «GAP PUT» recibidos"
 
-#: src/transport/plugin_transport_wlan.c:1858
+#: src/transport/plugin_transport_wlan.c:1854
 #, fuzzy
 msgid "# DATA messages processed"
 msgstr "# mensajes «DATA» WLAN procesados"
 
-#: src/transport/plugin_transport_wlan.c:2247
+#: src/transport/plugin_transport_wlan.c:2243
 #, c-format
 msgid "Helper binary `%s' not SUID, cannot run WLAN transport\n"
 msgstr ""
 "El ejecutable auxiliar «%s» no tiene activado el bit SUID, no se puede "
 "ejecutar el transporte WLAN\n"
 
-#: src/transport/plugin_transport_wlan.c:2269
+#: src/transport/plugin_transport_wlan.c:2265
 #, fuzzy
 msgid "# sessions allocated"
 msgstr "# sesiones WLAN alojadas"
 
-#: src/transport/transport_api.c:816
+#: src/transport/transport_api.c:812
 #, c-format
 msgid "Received unexpected message of type %u in %s:%u\n"
 msgstr "Recibido mensaje inesperado del tipo %u en %s:%u\n"
@@ -8598,18 +8623,18 @@ msgstr "Los metadatos serializados «%s» son mayores de lo permitido (%u>%u)"
 msgid "Metadata `%s' failed to deserialize"
 msgstr "Se produjo un fallo al deserializar los metadatos «%s»"
 
-#: src/util/client.c:261 src/util/client.c:858 src/util/service.c:621
+#: src/util/client.c:263 src/util/client.c:889 src/util/service.c:621
 #, c-format
 msgid "UNIXPATH `%s' too long, maximum length is %llu\n"
 msgstr ""
 "La ruta tipo UNIX «%s» es demasiado larga, la longitud máxima es %llu\n"
 
-#: src/util/client.c:265 src/util/client.c:863 src/util/service.c:625
+#: src/util/client.c:267 src/util/client.c:894 src/util/service.c:625
 #, c-format
 msgid "Using `%s' instead\n"
 msgstr "Usando «%s» en su defecto\n"
 
-#: src/util/client.c:360
+#: src/util/client.c:362
 #, c-format
 msgid ""
 "Could not determine valid hostname and port for service `%s' from "
@@ -8618,27 +8643,21 @@ msgstr ""
 "No se pudo determinar un nombre de máquina y un puerto válidos para el "
 "servicio «%s» a partir de la configuración.\n"
 
-#: src/util/client.c:368
+#: src/util/client.c:370
 #, c-format
 msgid "Need a non-empty hostname for service `%s'.\n"
 msgstr "Se necesita un nombre de máquina no vacío para el servicio «%s».\n"
 
-#: src/util/client.c:1008
+#: src/util/client.c:1039
 #, fuzzy, c-format
 msgid "Could not connect to service `%s', configuration broken.\n"
 msgstr "No se pudo conectar con el servicio «%s», no debe estar corriendo.\n"
 
-#: src/util/client.c:1020
+#: src/util/client.c:1051
 #, c-format
 msgid "Failure to transmit request to service `%s'\n"
 msgstr "Se produjo un fallo al transmitir la petición al servicio «%s»\n"
 
-#: src/util/client.c:1299
-msgid "Could not submit request, not expecting to receive a response.\n"
-msgstr ""
-"No se pudo enviar correctamente la petición, no se espera recibir una "
-"respuesta.\n"
-
 #: src/util/common_logging.c:254 src/util/common_logging.c:1039
 msgid "DEBUG"
 msgstr "DEPURACIÓN"
@@ -8710,51 +8729,33 @@ msgstr ""
 "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:1144
+#: src/util/configuration.c:1145
 #, c-format
 msgid "Recursive expansion suspected, aborting $-expansion for term `%s'\n"
 msgstr ""
 
-#: src/util/configuration.c:1176
+#: src/util/configuration.c:1177
 #, 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:1250
+#: src/util/configuration.c:1251
 #, c-format
 msgid ""
 "Failed to expand `%s' in `%s' as it is neither found in [PATHS] nor defined "
 "as an environmental variable\n"
 msgstr ""
 
-#: src/util/connection.c:423
+#: src/util/connection.c:424
 #, c-format
 msgid "Access denied to `%s'\n"
 msgstr "Acceso denegado a «%s»\n"
 
-#: src/util/connection.c:438
+#: src/util/connection.c:441
 #, c-format
 msgid "Accepting connection from `%s': %p\n"
 msgstr "Aceptando conexión desde «%s»: %p\n"
 
-#: src/util/connection.c:553
-#, c-format
-msgid ""
-"Failed to establish TCP connection to `%s:%u', no further addresses to try.\n"
-msgstr ""
-"Se produjo un fallo al establecer la conexión TCP a «%s:%u», no quedan "
-"direcciones por probar.\n"
-
-#: src/util/connection.c:751 src/util/connection.c:914
-#, c-format
-msgid "Trying to connect to `%s' (%p)\n"
-msgstr "Intentando conectar a «%s» (%p)\n"
-
-#: src/util/connection.c:904
-#, c-format
-msgid "Attempt to connect to `%s' failed\n"
-msgstr "El intento de conectar a «%s» falló\n"
-
 #: src/util/container_bloomfilter.c:531
 #, c-format
 msgid ""
@@ -8764,23 +8765,23 @@ msgstr ""
 "El tamaño del fichero en disco es incorrecto para este «Bloom "
 "filter» (esperado %llu, tiene %llu)\n"
 
-#: src/util/crypto_ecc.c:702 src/util/crypto_ecc.c:740
-#: src/util/crypto_ecc.c:858 src/util/crypto_ecc.c:896
+#: src/util/crypto_ecc.c:731 src/util/crypto_ecc.c:769
+#: src/util/crypto_ecc.c:887 src/util/crypto_ecc.c:925
 #, c-format
 msgid "Could not acquire lock on file `%s': %s...\n"
 msgstr "No se pudo bloquear el fichero «%s»: %s...\n"
 
-#: src/util/crypto_ecc.c:707 src/util/crypto_ecc.c:863
+#: src/util/crypto_ecc.c:736 src/util/crypto_ecc.c:892
 msgid "Creating a new private key.  This may take a while.\n"
 msgstr "Generando una clave privada nueva.  Esto puede tomar un tiempo.\n"
 
-#: src/util/crypto_ecc.c:744 src/util/crypto_ecc.c:900
+#: src/util/crypto_ecc.c:773 src/util/crypto_ecc.c:929
 msgid "This may be ok if someone is currently generating a private key.\n"
 msgstr ""
 "Esto puede estar bien si alguien está actualmente generando una clave "
 "privada.\n"
 
-#: src/util/crypto_ecc.c:774 src/util/crypto_ecc.c:930
+#: src/util/crypto_ecc.c:803 src/util/crypto_ecc.c:959
 #, c-format
 msgid ""
 "When trying to read key file `%s' I found %u bytes but I need at least %u.\n"
@@ -8788,33 +8789,33 @@ msgstr ""
 "Cuando se intentaba leer el fichero de claves «%s» se encontraron %u bytes "
 "pero al menos %u son necesarios.\n"
 
-#: src/util/crypto_ecc.c:778 src/util/crypto_ecc.c:934
+#: src/util/crypto_ecc.c:807 src/util/crypto_ecc.c:963
 msgid "This may be ok if someone is currently generating a key.\n"
 msgstr ""
 "Esto puede ser correcto si alguien está actualmente generando una clave de "
 "máquina.\n"
 
-#: src/util/crypto_ecc.c:1016
+#: src/util/crypto_ecc.c:1045
 #, fuzzy
 msgid "Could not load peer's private key\n"
 msgstr "No se pudo acceder a la clave de máquina.\n"
 
-#: src/util/crypto_ecc.c:1120
+#: src/util/crypto_ecc.c:1149
 #, c-format
 msgid "ECC signing failed at %s:%d: %s\n"
 msgstr "El firmado ECC falló en %s:%d: %s\n"
 
-#: src/util/crypto_ecc.c:1170
+#: src/util/crypto_ecc.c:1199
 #, fuzzy, c-format
 msgid "EdDSA signing failed at %s:%d: %s\n"
 msgstr "El firmado ECC falló en %s:%d: %s\n"
 
-#: src/util/crypto_ecc.c:1244
+#: src/util/crypto_ecc.c:1273
 #, fuzzy, c-format
 msgid "ECDSA signature verification failed at %s:%d: %s\n"
 msgstr "La verificación de la firma RSA fallo en %s:%d: %s\n"
 
-#: src/util/crypto_ecc.c:1301
+#: src/util/crypto_ecc.c:1330
 #, fuzzy, c-format
 msgid "EdDSA signature verification failed at %s:%d: %s\n"
 msgstr "La verificación de la firma RSA fallo en %s:%d: %s\n"
@@ -9108,19 +9109,19 @@ msgstr "No hay un manejador conocido para el subsistema «%s»\n"
 msgid "Perform default-actions for GNUnet URIs"
 msgstr "Realizar las acciones predeterminadas para URI de GNUnet"
 
-#: src/util/helper.c:338
+#: src/util/helper.c:342
 #, c-format
 msgid "Error reading from `%s': %s\n"
 msgstr "Error leyendo de «%s»: %s\n"
 
-#: src/util/helper.c:383
+#: src/util/helper.c:388
 #, c-format
 msgid "Failed to parse inbound message from helper `%s'\n"
 msgstr ""
 "Se produjo un fallo al procesar el mensaje interno del programa auxiliar "
 "«%s»\n"
 
-#: src/util/helper.c:609
+#: src/util/helper.c:618
 #, c-format
 msgid "Error writing to `%s': %s\n"
 msgstr "Error escribiendo a «%s»: %s\n"
@@ -9130,7 +9131,7 @@ msgstr "Error escribiendo a «%s»: %s\n"
 msgid "Unable to shorten unix path `%s' while keeping name unique\n"
 msgstr "Imposible acortar la ruta unix «%s» manteniendo el nombre único\n"
 
-#: src/util/network.c:1669 src/util/network.c:1845
+#: src/util/network.c:1681 src/util/network.c:1857
 #, c-format
 msgid ""
 "Fatal internal logic error, process hangs in `%s' (abort with CTRL-C)!\n"
@@ -9219,17 +9220,13 @@ msgstr "Expiración de plazo intentando resolver la dirección IP «%s».\n"
 msgid "Timeout trying to resolve hostname `%s'.\n"
 msgstr "Expiración de plazo intentando resolver el nombre de máquina «%s».\n"
 
-#: src/util/resolver_api.c:974
+#: src/util/resolver_api.c:1004
 #, c-format
 msgid "Could not resolve our FQDN : %s\n"
 msgstr ""
 "No se pudo resolver nuestro nombre de dominio cualificado (FQDN) : %s\n"
 
-#: src/util/scheduler.c:812
-msgid "Looks like we're busy waiting...\n"
-msgstr "Parece que estamos en espera ocupada...\n"
-
-#: src/util/server.c:484
+#: src/util/server.c:483
 #, c-format
 msgid "`%s' failed for port %d (%s).\n"
 msgstr "«%s» falló para el puerto %d (%s).\n"
@@ -9244,7 +9241,7 @@ msgstr "«%s» falló para el puerto %d (%s): dirección en uso actualmente\n"
 msgid "`%s' failed for `%s': address already in use\n"
 msgstr "«%s» falló para «%.*s»: dirección en uso actualmente\n"
 
-#: src/util/server.c:896
+#: src/util/server.c:904
 #, c-format
 msgid ""
 "Processing code for message of type %u did not call "
@@ -9411,67 +9408,67 @@ msgstr "días"
 msgid "end of time"
 msgstr "fin del plazo"
 
-#: src/util/strings.c:1192
+#: src/util/strings.c:1226
 msgid "IPv6 address did not start with `['\n"
 msgstr "La dirección IPv6 no empezaba con «[»\n"
 
-#: src/util/strings.c:1200
+#: src/util/strings.c:1234
 msgid "IPv6 address did contain ':' to separate port number\n"
 msgstr "La dirección IPv6 contenía «:» para separar el número de puerto\n"
 
-#: src/util/strings.c:1206
+#: src/util/strings.c:1240
 msgid "IPv6 address did contain ']' before ':' to separate port number\n"
 msgstr ""
 "La dirección IPv6 contenía «]» antes de «:» para separar el número de "
 "puerto\n"
 
-#: src/util/strings.c:1213
+#: src/util/strings.c:1247
 msgid "IPv6 address did contain a valid port number after the last ':'\n"
 msgstr ""
 "La dirección IPv6 contenía un número de puerto válido después del último "
 "«:»\n"
 
-#: src/util/strings.c:1222
+#: src/util/strings.c:1256
 #, c-format
 msgid "Invalid IPv6 address `%s': %s\n"
 msgstr "Dirección IPv6 «%s» no válida: %s\n"
 
-#: src/util/strings.c:1428 src/util/strings.c:1444
+#: src/util/strings.c:1462 src/util/strings.c:1478
 msgid "Port not in range\n"
 msgstr ""
 
-#: src/util/strings.c:1453
+#: src/util/strings.c:1487
 #, fuzzy, c-format
 msgid "Malformed port policy `%s'\n"
 msgstr "Se produjo un fallo al iniciar el servicio «%s»\n"
 
-#: src/util/strings.c:1536 src/util/strings.c:1567 src/util/strings.c:1615
-#: src/util/strings.c:1636
+#: src/util/strings.c:1570 src/util/strings.c:1601 src/util/strings.c:1649
+#: src/util/strings.c:1670
 #, c-format
 msgid "Invalid format for IP: `%s'\n"
 msgstr "Formato no válido para la IP: «%s»\n"
 
-#: src/util/strings.c:1593
+#: src/util/strings.c:1627
 #, c-format
 msgid "Invalid network notation ('/%d' is not legal in IPv4 CIDR)."
 msgstr "Notación de red no válida («/%d» no es válido en IPv4 CIDR)."
 
-#: src/util/strings.c:1645
+#: src/util/strings.c:1679
 #, fuzzy, c-format
 msgid "Invalid format: `%s'\n"
 msgstr "Formato de tiempo no válido «%s»\n"
 
-#: src/util/strings.c:1697
+#: src/util/strings.c:1731
 #, c-format
 msgid "Invalid network notation (does not end with ';': `%s')\n"
 msgstr "Notación de red no válida (no termina con «;»: «%s»)\n"
 
-#: src/util/strings.c:1747
+#: src/util/strings.c:1781
 #, c-format
 msgid "Wrong format `%s' for netmask\n"
 msgstr "Formato «%s» erroneo para máscara de red\n"
 
-#: src/util/strings.c:1778
+#: src/util/strings.c:1812
 #, c-format
 msgid "Wrong format `%s' for network\n"
 msgstr "Formato «%s» erroneo para red\n"
@@ -9657,22 +9654,103 @@ msgstr "el servicio es ofrecido vía UDP"
 msgid "Setup tunnels via VPN."
 msgstr "Configurar túneles vía VPN."
 
-#: src/include/gnunet_common.h:588 src/include/gnunet_common.h:595
-#: src/include/gnunet_common.h:603
+#: src/include/gnunet_common.h:590 src/include/gnunet_common.h:597
+#: src/include/gnunet_common.h:605
 #, c-format
 msgid "Assertion failed at %s:%d.\n"
 msgstr "Aserción fallida en %s:%d.\n"
 
-#: src/include/gnunet_common.h:615
+#: src/include/gnunet_common.h:617
 #, c-format
 msgid "External protocol violation detected at %s:%d.\n"
 msgstr "Violación externa del protocolo detectada en %s:%d.\n"
 
-#: src/include/gnunet_common.h:642 src/include/gnunet_common.h:651
+#: src/include/gnunet_common.h:644 src/include/gnunet_common.h:653
 #, c-format
 msgid "`%s' failed on file `%s' at %s:%d with error: %s\n"
 msgstr "«%s» falló en el fichero «%s» en %s:%d con el error: %s\n"
 
+# Miguel: "Outbound" lo he traducido como salida en todo el texto.
+#~ msgid "Outbound quota configure for network `%s' is %llu\n"
+#~ msgstr "La cuota de salida configurada para la red «%s» es %llu\n"
+
+#, fuzzy
+#~ msgid "Failed to initialize solver!\n"
+#~ msgstr "¡No se puede inicializar el resolvedor!\n"
+
+# Miguel: "Outbound" lo he traducido como salida en todo el texto.
+#, fuzzy
+#~ 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"
+
+#, fuzzy
+#~ msgid "Invalid network type `%u' `%s': Disconnect!\n"
+#~ msgstr "No se encontró la IP del host «%s»: %s\n"
+
+#~ msgid "Failed to receive response from database.\n"
+#~ msgstr "Se produjo un fallo al recibir la respuesta de la base de datos.\n"
+
+#, fuzzy
+#~ msgid "Could not obtain a valid network for `%s' %s (%s)\n"
+#~ msgstr "Imposible obtener IP para la interfaz '%s' usando '%s'.\n"
+
+#, fuzzy
+#~ msgid "Blacklist refuses connection attempt to peer `%s'\n"
+#~ msgstr "Se produjo un fallo al conectar con «%s»\n"
+
+#~ msgid "# keepalives sent"
+#~ msgstr "# «keepalives» enviados"
+
+#, fuzzy
+#~ msgid ""
+#~ "Failed to send SYN message to peer `%s' using address `%s' session %p\n"
+#~ msgstr "¡Se produjo un fallo al conectar al servicio de estadísticas!\n"
+
+#, fuzzy
+#~ msgid "# Failed attempts to switch addresses (no response)"
+#~ msgstr "Se produjo un fallo al procesar la petición DNS.  Omitiendo.\n"
+
+#~ msgid "Received a PING message with validation bug from `%s'\n"
+#~ msgstr "Recibido un mensaje PING con un error de validación de «%s»\n"
+
+#, fuzzy
+#~ msgid "Validation received new %s message for peer `%s' with size %u\n"
+#~ msgstr "Recibido último mensaje para %s\n"
+
+#~ msgid "Adding `%s' without addresses for peer `%s'\n"
+#~ msgstr "Añadiendo «%s» sin direcciones para el par «%s»\n"
+
+#~ msgid "# IPv4 broadcast HELLO beacons received via udp"
+#~ msgstr "# beacons HELLO broadcast IPv4 recibidos vía UDP"
+
+#~ msgid "Given `%s' option is out of range: %llu > %u\n"
+#~ msgstr "La opción «%s» dada está fuera de rango: %llu > %u\n"
+
+#~ msgid "Invalid IPv6 address: `%s'\n"
+#~ msgstr "Dirección IPv6 no válida: «%s»\n"
+
+#~ msgid "Could not submit request, not expecting to receive a response.\n"
+#~ msgstr ""
+#~ "No se pudo enviar correctamente la petición, no se espera recibir una "
+#~ "respuesta.\n"
+
+#~ msgid ""
+#~ "Failed to establish TCP connection to `%s:%u', no further addresses to "
+#~ "try.\n"
+#~ msgstr ""
+#~ "Se produjo un fallo al establecer la conexión TCP a «%s:%u», no quedan "
+#~ "direcciones por probar.\n"
+
+#~ msgid "Trying to connect to `%s' (%p)\n"
+#~ msgstr "Intentando conectar a «%s» (%p)\n"
+
+#~ msgid "Attempt to connect to `%s' failed\n"
+#~ msgstr "El intento de conectar a «%s» falló\n"
+
+#~ msgid "Looks like we're busy waiting...\n"
+#~ msgstr "Parece que estamos en espera ocupada...\n"
+
 #~ msgid ""
 #~ "Not transmitting `%s' with `%s', message too big (%u bytes!). This should "
 #~ "not happen.\n"
@@ -10892,9 +10970,6 @@ msgstr "«%s» falló en el fichero «%s» en %s:%d con el error: %s\n"
 #~ msgid "Connected to %s service!\n"
 #~ msgstr "¡Conectado al servicio «%s»!\n"
 
-#~ msgid "# Peers connected"
-#~ msgstr "# Pares conectados"
-
 #~ msgid "Changing DNS reply according to client specifications\n"
 #~ msgstr ""
 #~ "Cambiando la respuesta DNS de acuerdo con las especificaciones del "
diff --git a/po/sv.po b/po/sv.po
index aad6bf80a..5ce1485a8 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: GNUnet 0.7.0b\n"
 "Report-Msgid-Bugs-To: gnunet-developers@mail.gnu.org\n"
-"POT-Creation-Date: 2015-01-27 19:22+0100\n"
+"POT-Creation-Date: 2015-03-07 12:06+0100\n"
 "PO-Revision-Date: 2006-01-21 17:16+0100\n"
 "Last-Translator: Daniel Nylander <po@danielnylander.se>\n"
 "Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n"
@@ -331,150 +331,138 @@ msgstr ""
 msgid "Initiating shutdown as requested by client.\n"
 msgstr ""
 
-#: src/ats/gnunet-ats-solver-eval.c:2810 src/ats/gnunet-ats-solver-eval.c:2851
-#: src/ats/gnunet-service-ats_addresses.c:1635
-#: src/ats/gnunet-service-ats_addresses.c:1683
+#: src/ats/gnunet-ats-solver-eval.c:2778 src/ats/gnunet-ats-solver-eval.c:2819
 #, c-format
 msgid ""
 "Could not load quota for network `%s':  `%s', assigning default bandwidth "
 "%llu\n"
 msgstr ""
 
-#: src/ats/gnunet-ats-solver-eval.c:2828
-#: src/ats/gnunet-service-ats_addresses.c:1653
+#: src/ats/gnunet-ats-solver-eval.c:2796
 #, c-format
 msgid ""
 "No outbound quota configured for network `%s', assigning default bandwidth "
 "%llu\n"
 msgstr ""
 
-#: src/ats/gnunet-ats-solver-eval.c:2869
-#: src/ats/gnunet-service-ats_addresses.c:1701
+#: src/ats/gnunet-ats-solver-eval.c:2837
 #, c-format
 msgid ""
 "No outbound quota configure for network `%s', assigning default bandwidth "
 "%llu\n"
 msgstr ""
 
-#: src/ats/gnunet-ats-solver-eval.c:3434
+#: src/ats/gnunet-ats-solver-eval.c:3290
 #: src/ats-tests/gnunet-solver-eval.c:918
 msgid "solver to use"
 msgstr ""
 
-#: src/ats/gnunet-ats-solver-eval.c:3437
+#: src/ats/gnunet-ats-solver-eval.c:3293
 #: src/ats-tests/gnunet-solver-eval.c:921
 #: src/ats-tests/gnunet-solver-eval.c:924
 msgid "experiment to use"
 msgstr ""
 
-#: src/ats/gnunet-ats-solver-eval.c:3440
+#: src/ats/gnunet-ats-solver-eval.c:3296
 msgid "be verbose"
 msgstr "var informativ"
 
-#: src/ats/gnunet-ats-solver-eval.c:3443
+#: src/ats/gnunet-ats-solver-eval.c:3299
 #, fuzzy
 msgid "print logging"
 msgstr "Startade samling \"%s\".\n"
 
-#: src/ats/gnunet-ats-solver-eval.c:3446
+#: src/ats/gnunet-ats-solver-eval.c:3302
 msgid "save logging to disk"
 msgstr ""
 
-#: src/ats/gnunet-ats-solver-eval.c:3449
+#: src/ats/gnunet-ats-solver-eval.c:3305
 msgid "disable normalization"
 msgstr ""
 
-#: src/ats/gnunet-service-ats_addresses.c:1644
+#: src/ats/gnunet-service-ats_plugins.c:304
 #, c-format
-msgid "Outbound quota configure for network `%s' is %llu\n"
+msgid ""
+"Could not load %s quota for network `%s':  `%s', assigning default bandwidth "
+"%llu\n"
 msgstr ""
 
-#: src/ats/gnunet-service-ats_addresses.c:1692
+#: src/ats/gnunet-service-ats_plugins.c:314
 #, c-format
-msgid "Inbound quota configured for network `%s' is %llu\n"
+msgid "%s quota configured for network `%s' is %llu\n"
 msgstr ""
 
-#: src/ats/gnunet-service-ats_addresses.c:1895
+#: src/ats/gnunet-service-ats_plugins.c:359
 #, c-format
-msgid "Initializing solver `%s '`%s'\n"
+msgid ""
+"No %s-quota configured for network `%s', assigning default bandwidth %llu\n"
 msgstr ""
 
-#: src/ats/gnunet-service-ats_addresses.c:1901
+#: src/ats/gnunet-service-ats_plugins.c:451
 #, fuzzy, c-format
 msgid "Failed to initialize solver `%s'!\n"
 msgstr "Kunde inte initiera SQLite.\n"
 
-#: src/ats/gnunet-service-ats_addresses.c:1926
-#, fuzzy
-msgid "Failed to initialize solver!\n"
-msgstr "Kunde inte initiera SQLite.\n"
-
-#: src/ats/plugin_ats_mlp.c:1345
+#: src/ats/plugin_ats_mlp.c:1274
 msgid "Problem size too large, cannot allocate memory!\n"
 msgstr ""
 
-#: src/ats/plugin_ats_mlp.c:1941
+#: src/ats/plugin_ats_mlp.c:1869
 #, 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:1993
-#, c-format
-msgid "Updating address property `%s' for peer `%s' %p not added before\n"
-msgstr ""
+#: src/ats/plugin_ats_mlp.c:1913
+#, fuzzy, c-format
+msgid "Updating address property for peer `%s' %p not added before\n"
+msgstr "Motpart \"%s\" med pålitlighet %8u och adress \"%s\"\n"
 
-#: src/ats/plugin_ats_mlp.c:2714
+#: src/ats/plugin_ats_mlp.c:2475
 msgid ""
 "MLP solver is not optimizing for anything, changing to feasibility check\n"
 msgstr ""
 
-#: src/ats/plugin_ats_mlp.c:2754 src/ats/plugin_ats_mlp.c:2771
-#: src/ats/plugin_ats_mlp.c:2803 src/ats/plugin_ats_mlp.c:2821
-#: src/ats/plugin_ats_mlp.c:2840 src/ats/plugin_ats_proportional.c:1993
-#: src/ats/plugin_ats_proportional.c:2014 src/ats/plugin_ats_ril.c:2718
-#: src/ats/plugin_ats_ril.c:2735 src/ats/plugin_ats_ril.c:2752
-#: src/ats/plugin_ats_ril.c:2769 src/ats/plugin_ats_ril.c:2786
-#: src/ats/plugin_ats_ril.c:2803 src/ats/plugin_ats_ril.c:2820
-#: src/ats/plugin_ats_ril.c:2837
+#: src/ats/plugin_ats_mlp.c:2515 src/ats/plugin_ats_mlp.c:2532
+#: src/ats/plugin_ats_mlp.c:2564 src/ats/plugin_ats_mlp.c:2582
+#: src/ats/plugin_ats_mlp.c:2601 src/ats/plugin_ats_proportional.c:1140
+#: src/ats/plugin_ats_ril.c:2613 src/ats/plugin_ats_ril.c:2630
+#: src/ats/plugin_ats_ril.c:2647 src/ats/plugin_ats_ril.c:2664
+#: src/ats/plugin_ats_ril.c:2681 src/ats/plugin_ats_ril.c:2698
+#: src/ats/plugin_ats_ril.c:2715 src/ats/plugin_ats_ril.c:2732
 #, fuzzy, c-format
 msgid "Invalid %s configuration %f \n"
 msgstr "Kunde inte spara konfigurationsfil \"%s\":"
 
-#: src/ats/plugin_ats_mlp.c:2927
+#: src/ats/plugin_ats_mlp.c:2670
 #, 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:2936
+#: src/ats/plugin_ats_mlp.c:2679
 #, 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:2947
+#: src/ats/plugin_ats_mlp.c:2689
 #, c-format
 msgid ""
 "Adjusting outbound quota configuration for network `%s'from %llu to %.0f\n"
 msgstr ""
 
-#: src/ats/plugin_ats_mlp.c:2955
+#: src/ats/plugin_ats_mlp.c:2698
 #, c-format
 msgid ""
 "Adjusting inbound quota configuration for network `%s' from %llu to %.0f\n"
 msgstr ""
 
-#: src/ats/plugin_ats_mlp.c:2966
-#, c-format
-msgid "Using default quota configuration for network `%s' (in/out) %llu/%llu\n"
-msgstr ""
-
-#: src/ats/plugin_ats_proportional.c:1852
+#: src/ats/plugin_ats_proportional.c:1163
 #, fuzzy, c-format
-msgid "Invalid network type `%u' `%s': Disconnect!\n"
-msgstr "Kan inte öppna konfigurationsfil \"%s\".\n"
+msgid "Invalid %s configuration %f\n"
+msgstr "Kunde inte spara konfigurationsfil \"%s\":"
 
 #: src/ats-tests/ats-testing.c:72
 msgid "Benchmarking done\n"
@@ -509,7 +497,7 @@ msgstr ""
 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:677
+#: src/ats-tests/ats-testing.c:490 src/ats-tests/ats-testing.c:662
 #, fuzzy
 msgid "Initialization failed, shutdown\n"
 msgstr "Initiering av insticksmekanism misslyckades: %s!\n"
@@ -530,126 +518,126 @@ msgid ""
 "= %u KiB/s\n"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:296
+#: src/ats-tool/gnunet-ats.c:289
 #, c-format
 msgid "%u address resolutions had a timeout\n"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:300
+#: src/ats-tool/gnunet-ats.c:293
 #, c-format
 msgid "ATS returned stat_results for %u addresses\n"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:377
-msgid "active "
-msgstr ""
-
-#: src/ats-tool/gnunet-ats.c:377
-msgid "inactive "
-msgstr ""
-
-#: src/ats-tool/gnunet-ats.c:426
+#: src/ats-tool/gnunet-ats.c:366
 #, 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:543
+#: src/ats-tool/gnunet-ats.c:373
+msgid "active "
+msgstr ""
+
+#: src/ats-tool/gnunet-ats.c:373
+msgid "inactive "
+msgstr ""
+
+#: src/ats-tool/gnunet-ats.c:483
 #, fuzzy, c-format
 msgid "Removed address of peer `%s' with plugin `%s'\n"
 msgstr "Tillgängliga transport(er): %s\n"
 
-#: src/ats-tool/gnunet-ats.c:744
+#: src/ats-tool/gnunet-ats.c:676
 #, c-format
 msgid "Quota for network `%11s' (in/out): %10s / %10s\n"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:776 src/namestore/gnunet-namestore.c:700
-#: src/transport/gnunet-transport.c:1843
+#: src/ats-tool/gnunet-ats.c:708 src/namestore/gnunet-namestore.c:700
+#: src/transport/gnunet-transport.c:1890
 #: src/transport/gnunet-transport-profiler.c:531
 #, fuzzy, c-format
 msgid "Service `%s' is not running\n"
 msgstr "\"%s\" är inte en fil.\n"
 
-#: src/ats-tool/gnunet-ats.c:790 src/transport/gnunet-transport.c:1852
+#: src/ats-tool/gnunet-ats.c:722 src/transport/gnunet-transport.c:1899
 #: src/transport/gnunet-transport-profiler.c:549
 #, 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:800
+#: src/ats-tool/gnunet-ats.c:732
 #, c-format
 msgid "Please select one operation : %s or %s or %s or %s or %s\n"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:822 src/ats-tool/gnunet-ats.c:848
-#: src/ats-tool/gnunet-ats.c:876 src/ats-tool/gnunet-ats.c:922
+#: src/ats-tool/gnunet-ats.c:754 src/ats-tool/gnunet-ats.c:780
+#: src/ats-tool/gnunet-ats.c:808 src/ats-tool/gnunet-ats.c:854
 #, fuzzy
 msgid "Cannot connect to ATS service, exiting...\n"
 msgstr "Misslyckades att initiera tjänsten \"%s\".\n"
 
-#: src/ats-tool/gnunet-ats.c:834 src/ats-tool/gnunet-ats.c:860
+#: src/ats-tool/gnunet-ats.c:766 src/ats-tool/gnunet-ats.c:792
 #, fuzzy
 msgid "Cannot issue request to ATS service, exiting...\n"
 msgstr "Misslyckades att initiera tjänsten \"%s\".\n"
 
-#: src/ats-tool/gnunet-ats.c:888
+#: src/ats-tool/gnunet-ats.c:820
 #, fuzzy
 msgid "No preference type given!\n"
 msgstr "Skriv ut information om GNUnets motparter."
 
-#: src/ats-tool/gnunet-ats.c:895
+#: src/ats-tool/gnunet-ats.c:827
 msgid "No peer given!\n"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:913
+#: src/ats-tool/gnunet-ats.c:845
 msgid "Valid type required\n"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:981
+#: src/ats-tool/gnunet-ats.c:916
 msgid "get list of active addresses currently used"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:983
+#: src/ats-tool/gnunet-ats.c:918
 msgid "get list of all active addresses"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:986
+#: src/ats-tool/gnunet-ats.c:921
 #, 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:988
+#: src/ats-tool/gnunet-ats.c:923
 msgid "monitor mode"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:990
+#: src/ats-tool/gnunet-ats.c:925
 #, fuzzy
 msgid "set preference for the given peer"
 msgstr "Skriv ut information om GNUnets motparter."
 
-#: src/ats-tool/gnunet-ats.c:992
+#: src/ats-tool/gnunet-ats.c:927
 msgid "print all configured quotas"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:994
+#: src/ats-tool/gnunet-ats.c:929
 msgid "peer id"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:997
+#: src/ats-tool/gnunet-ats.c:932
 msgid "preference type to set: latency | bandwidth"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:999
+#: src/ats-tool/gnunet-ats.c:934
 msgid "preference value"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:1002
+#: src/ats-tool/gnunet-ats.c:937
 msgid "verbose output (include ATS address properties)"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:1009
+#: src/ats-tool/gnunet-ats.c:944
 #, fuzzy
 msgid "Print information about ATS state"
 msgstr "Skriv ut information om GNUnets motparter."
@@ -1261,7 +1249,7 @@ msgstr "Ogiltiga kommandoradsargument:\n"
 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:2104
+#: src/core/gnunet-core.c:179 src/transport/gnunet-transport.c:2154
 #, fuzzy
 msgid "provide information about all current connections (continuously)"
 msgstr "Skriv ut information om GNUnets motparter."
@@ -1295,150 +1283,150 @@ msgstr "Nätverksannonsering avstängd i konfigurationen!\n"
 msgid "# bytes of messages of type %u received"
 msgstr "# krypterade PONG-meddelanden mottagna"
 
-#: src/core/gnunet-service-core_kx.c:565
+#: src/core/gnunet-service-core_kx.c:571
 msgid "# bytes encrypted"
 msgstr "# byte krypterade"
 
-#: src/core/gnunet-service-core_kx.c:617
+#: src/core/gnunet-service-core_kx.c:630
 msgid "# bytes decrypted"
 msgstr "# byte dekrypterade"
 
-#: src/core/gnunet-service-core_kx.c:703
+#: src/core/gnunet-service-core_kx.c:719
 msgid "# key exchanges initiated"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:747
+#: src/core/gnunet-service-core_kx.c:763
 msgid "# key exchanges stopped"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:848
+#: src/core/gnunet-service-core_kx.c:864
 msgid "# old ephemeral keys ignored"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:855
+#: src/core/gnunet-service-core_kx.c:871
 #, fuzzy
 msgid "# ephemeral keys received"
 msgstr "# krypterade PONG-meddelanden mottagna"
 
-#: src/core/gnunet-service-core_kx.c:889
+#: src/core/gnunet-service-core_kx.c:910
 #, 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:900
+#: src/core/gnunet-service-core_kx.c:921
 #, fuzzy
 msgid "# EPHEMERAL_KEY messages received"
 msgstr "# PING-meddelanden skapade"
 
-#: src/core/gnunet-service-core_kx.c:999
-#: src/transport/gnunet-service-transport_validation.c:1062
+#: src/core/gnunet-service-core_kx.c:1020
+#: src/transport/gnunet-service-transport_validation.c:1053
 #, fuzzy
 msgid "# PING messages received"
 msgstr "# PING-meddelanden skapade"
 
-#: src/core/gnunet-service-core_kx.c:1007
+#: src/core/gnunet-service-core_kx.c:1028
 #, fuzzy
 msgid "# PING messages dropped (out of order)"
 msgstr "Nätverksannonsering avstängd i konfigurationen!\n"
 
-#: src/core/gnunet-service-core_kx.c:1034
+#: src/core/gnunet-service-core_kx.c:1056
 #, 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:1050
+#: src/core/gnunet-service-core_kx.c:1082
 #, fuzzy
 msgid "# PONG messages created"
 msgstr "# PING-meddelanden skapade"
 
-#: src/core/gnunet-service-core_kx.c:1077
+#: src/core/gnunet-service-core_kx.c:1111
 #, fuzzy
 msgid "# sessions terminated by timeout"
 msgstr "# byte kastade via TCP (utgående)"
 
-#: src/core/gnunet-service-core_kx.c:1088
+#: src/core/gnunet-service-core_kx.c:1124
 #, fuzzy
 msgid "# keepalive messages sent"
 msgstr "# PING-meddelanden i klartext skickade"
 
-#: src/core/gnunet-service-core_kx.c:1156
-#: src/transport/gnunet-service-transport_validation.c:1406
+#: src/core/gnunet-service-core_kx.c:1195
+#: src/transport/gnunet-service-transport_validation.c:1370
 #, fuzzy
 msgid "# PONG messages received"
 msgstr "# krypterade PONG-meddelanden mottagna"
 
-#: src/core/gnunet-service-core_kx.c:1162
+#: src/core/gnunet-service-core_kx.c:1201
 #, fuzzy
 msgid "# PONG messages dropped (connection down)"
 msgstr "# krypterade PONG-meddelanden mottagna"
 
-#: src/core/gnunet-service-core_kx.c:1167
+#: src/core/gnunet-service-core_kx.c:1206
 #, fuzzy
 msgid "# PONG messages dropped (out of order)"
 msgstr "Nätverksannonsering avstängd i konfigurationen!\n"
 
-#: src/core/gnunet-service-core_kx.c:1197
+#: src/core/gnunet-service-core_kx.c:1236
 #, fuzzy
 msgid "# PONG messages decrypted"
 msgstr "# PING-meddelanden skapade"
 
-#: src/core/gnunet-service-core_kx.c:1232
+#: src/core/gnunet-service-core_kx.c:1271
 #, fuzzy
 msgid "# session keys confirmed via PONG"
 msgstr "# sessionnycklar vägrade"
 
-#: src/core/gnunet-service-core_kx.c:1243
+#: src/core/gnunet-service-core_kx.c:1282
 #, fuzzy
 msgid "# timeouts prevented via PONG"
 msgstr "# byte mottogs via TCP"
 
-#: src/core/gnunet-service-core_kx.c:1250
+#: src/core/gnunet-service-core_kx.c:1289
 #, fuzzy
 msgid "# rekey operations confirmed via PONG"
 msgstr "# sessionnycklar vägrade"
 
-#: src/core/gnunet-service-core_kx.c:1392
+#: src/core/gnunet-service-core_kx.c:1431
 #, fuzzy
 msgid "# DATA message dropped (out of order)"
 msgstr "# byte kastade via UDP (utgående)"
 
-#: src/core/gnunet-service-core_kx.c:1399
+#: src/core/gnunet-service-core_kx.c:1438
 #, 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:1402
+#: src/core/gnunet-service-core_kx.c:1441
 #, fuzzy
 msgid "# sessions terminated by key expiration"
 msgstr "# byte kastade via TCP (utgående)"
 
-#: src/core/gnunet-service-core_kx.c:1448
-#: src/core/gnunet-service-core_kx.c:1473
+#: src/core/gnunet-service-core_kx.c:1487
+#: src/core/gnunet-service-core_kx.c:1512
 #, fuzzy
 msgid "# bytes dropped (duplicates)"
 msgstr "# byte kastade via UDP (utgående)"
 
-#: src/core/gnunet-service-core_kx.c:1460
+#: src/core/gnunet-service-core_kx.c:1499
 #, fuzzy
 msgid "# bytes dropped (out of sequence)"
 msgstr "# byte kastade via UDP (utgående)"
 
-#: src/core/gnunet-service-core_kx.c:1502
+#: src/core/gnunet-service-core_kx.c:1541
 #, fuzzy
 msgid "# bytes dropped (ancient message)"
 msgstr "# byte kastade via UDP (utgående)"
 
-#: src/core/gnunet-service-core_kx.c:1510
+#: src/core/gnunet-service-core_kx.c:1549
 #, fuzzy
 msgid "# bytes of payload decrypted"
 msgstr "# byte dekrypterade"
 
-#: src/core/gnunet-service-core_kx.c:1545
+#: src/core/gnunet-service-core_kx.c:1584
 #, fuzzy
 msgid "# PAYLOAD dropped (out of order)"
 msgstr "# byte kastade via UDP (utgående)"
@@ -1466,13 +1454,11 @@ msgstr ""
 #: src/core/gnunet-service-core_sessions.c:328
 #: src/dht/gnunet-service-dht_neighbours.c:661
 #: src/dht/gnunet-service-dht_neighbours.c:726
-#: src/fs/gnunet-service-fs_cp.c:629 src/fs/gnunet-service-fs_cp.c:1571
+#: src/fs/gnunet-service-fs_cp.c:645 src/fs/gnunet-service-fs_cp.c:1627
 #: src/topology/gnunet-daemon-topology.c:734
 #: src/topology/gnunet-daemon-topology.c:835
-#: src/transport/gnunet-service-transport_neighbours.c:954
-#: src/transport/gnunet-service-transport_neighbours.c:1180
-#: src/transport/gnunet-service-transport_neighbours.c:3211
-#: src/transport/gnunet-service-transport_neighbours.c:3510
+#: src/transport/gnunet-service-transport_neighbours.c:754
+#: src/transport/gnunet-service-transport_neighbours.c:762
 #, fuzzy
 msgid "# peers connected"
 msgstr "# av anslutna parter"
@@ -1517,8 +1503,8 @@ msgid "# items stored"
 msgstr "# byte krypterade"
 
 #: src/datacache/datacache.c:143 src/datacache/datacache.c:150
-#: src/datastore/gnunet-service-datastore.c:1554
-#: src/datastore/gnunet-service-datastore.c:1565
+#: src/datastore/gnunet-service-datastore.c:1557
+#: src/datastore/gnunet-service-datastore.c:1568
 #, fuzzy, c-format
 msgid "No `%s' specified for `%s' in configuration!\n"
 msgstr "Inga applikationer definierade i konfiguration!\n"
@@ -1566,8 +1552,8 @@ msgstr ""
 #: 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:624
-#: src/include/gnunet_common.h:633 src/scalarproduct/scalarproduct.h:35
+#: src/util/crypto_mpi.c:39 src/include/gnunet_common.h:626
+#: src/include/gnunet_common.h:635 src/scalarproduct/scalarproduct.h:35
 #, c-format
 msgid "`%s' failed at %s:%d with error: %s\n"
 msgstr "\"%s\" misslyckades vid %s:%d med fel: %s\n"
@@ -1668,11 +1654,6 @@ msgstr ""
 msgid "# REMOVE requests executed"
 msgstr ""
 
-#: src/datastore/datastore_api.c:1189
-#, fuzzy
-msgid "Failed to receive response from database.\n"
-msgstr "Misslyckades att ta emot svar till \"%s\" meddelande från gnunetd\n"
-
 #: src/datastore/datastore_api.c:1248
 #, fuzzy
 msgid "# Results received"
@@ -1761,7 +1742,7 @@ msgstr ""
 #: src/datastore/gnunet-service-datastore.c:712
 #: src/datastore/gnunet-service-datastore.c:767
 #: src/datastore/gnunet-service-datastore.c:982
-#: src/datastore/gnunet-service-datastore.c:1526
+#: src/datastore/gnunet-service-datastore.c:1529
 msgid "# reserved"
 msgstr ""
 
@@ -1843,31 +1824,31 @@ msgstr ""
 msgid "Bloomfilter construction complete.\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1559
+#: src/datastore/gnunet-service-datastore.c:1562
 #, fuzzy, c-format
 msgid "# bytes used in file-sharing datastore `%s'"
 msgstr "# byte krypterade"
 
-#: src/datastore/gnunet-service-datastore.c:1570
+#: src/datastore/gnunet-service-datastore.c:1573
 msgid "# quota"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1572
+#: src/datastore/gnunet-service-datastore.c:1575
 msgid "# cache size"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1585
+#: src/datastore/gnunet-service-datastore.c:1588
 #, c-format
 msgid "Could not use specified filename `%s' for bloomfilter.\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1603
-#: src/datastore/gnunet-service-datastore.c:1619
+#: src/datastore/gnunet-service-datastore.c:1606
+#: src/datastore/gnunet-service-datastore.c:1622
 #, fuzzy, c-format
 msgid "Failed to remove bogus bloomfilter file `%s'\n"
 msgstr "Kunde inte spara konfigurationsfil \"%s\":"
 
-#: src/datastore/gnunet-service-datastore.c:1649
+#: src/datastore/gnunet-service-datastore.c:1652
 #, fuzzy
 msgid "Failed to initialize bloomfilter.\n"
 msgstr "Misslyckades att initiera tjänsten \"%s\".\n"
@@ -2110,25 +2091,25 @@ msgid "Failed to connect to transport service!\n"
 msgstr "Misslyckades att ansluta till gnunetd.\n"
 
 #: src/dht/gnunet-service-dht_clients.c:417
-#: src/dht/gnunet-service-xdht_clients.c:844
+#: src/dht/gnunet-service-xdht_clients.c:849
 #, fuzzy
 msgid "# GET requests from clients injected"
 msgstr "# byte mottogs via TCP"
 
 #: src/dht/gnunet-service-dht_clients.c:513
-#: src/dht/gnunet-service-xdht_clients.c:928
+#: src/dht/gnunet-service-xdht_clients.c:933
 #, 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:993
+#: src/dht/gnunet-service-xdht_clients.c:998
 #, 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:1195
+#: src/dht/gnunet-service-xdht_clients.c:1200
 #, fuzzy
 msgid "# GET STOP requests received from clients"
 msgstr "Meddelande mottaget från klient är ogiltig.\n"
@@ -2143,27 +2124,27 @@ msgstr ""
 msgid "# Duplicate REPLIES to CLIENT request dropped"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_clients.c:1090
-#: src/dht/gnunet-service-xdht_clients.c:554
+#: src/dht/gnunet-service-dht_clients.c:1098
+#: src/dht/gnunet-service-xdht_clients.c:559
 #, c-format
 msgid "Unsupported block type (%u) in request!\n"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_clients.c:1113
-#: src/dht/gnunet-service-xdht_clients.c:577
+#: src/dht/gnunet-service-dht_clients.c:1121
+#: src/dht/gnunet-service-xdht_clients.c:582
 #, fuzzy
 msgid "# RESULTS queued for clients"
 msgstr "Meddelande mottaget från klient är ogiltig.\n"
 
-#: src/dht/gnunet-service-dht_clients.c:1167
-#: src/dht/gnunet-service-dht_clients.c:1210
-#: src/dht/gnunet-service-xdht_clients.c:631
-#: src/dht/gnunet-service-xdht_clients.c:674
+#: src/dht/gnunet-service-dht_clients.c:1175
+#: src/dht/gnunet-service-dht_clients.c:1218
+#: src/dht/gnunet-service-xdht_clients.c:636
+#: src/dht/gnunet-service-xdht_clients.c:679
 msgid "# REPLIES ignored for CLIENTS (no match)"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_clients.c:1177
-#: src/dht/gnunet-service-xdht_clients.c:641
+#: src/dht/gnunet-service-dht_clients.c:1185
+#: src/dht/gnunet-service-xdht_clients.c:646
 #, fuzzy
 msgid "Could not pass reply to client, message too big!\n"
 msgstr "Kunde inte skicka meddelande till gnunetd\n"
@@ -2179,39 +2160,39 @@ msgstr "# byte mottagna av typen %d"
 msgid "# ITEMS stored in datacache"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_datacache.c:165
-#: src/dht/gnunet-service-xdht_datacache.c:221
+#: src/dht/gnunet-service-dht_datacache.c:173
+#: src/dht/gnunet-service-xdht_datacache.c:230
 msgid "# Good RESULTS found in datacache"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_datacache.c:176
-#: src/dht/gnunet-service-xdht_datacache.c:244
+#: src/dht/gnunet-service-dht_datacache.c:184
+#: src/dht/gnunet-service-xdht_datacache.c:253
 msgid "# Duplicate RESULTS found in datacache"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_datacache.c:182
-#: src/dht/gnunet-service-xdht_datacache.c:250
+#: src/dht/gnunet-service-dht_datacache.c:190
+#: src/dht/gnunet-service-xdht_datacache.c:259
 msgid "# Invalid RESULTS found in datacache"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_datacache.c:188
-#: src/dht/gnunet-service-xdht_datacache.c:256
+#: src/dht/gnunet-service-dht_datacache.c:196
+#: src/dht/gnunet-service-xdht_datacache.c:265
 msgid "# Irrelevant RESULTS found in datacache"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_datacache.c:200
-#: src/dht/gnunet-service-xdht_datacache.c:268
+#: src/dht/gnunet-service-dht_datacache.c:208
+#: src/dht/gnunet-service-xdht_datacache.c:277
 msgid "# Unsupported RESULTS found in datacache"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_datacache.c:203
-#: src/dht/gnunet-service-xdht_datacache.c:271
+#: src/dht/gnunet-service-dht_datacache.c:211
+#: src/dht/gnunet-service-xdht_datacache.c:280
 #, 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:309
+#: src/dht/gnunet-service-dht_datacache.c:242
+#: src/dht/gnunet-service-xdht_datacache.c:318
 #, fuzzy
 msgid "# GET requests given to datacache"
 msgstr "# byte mottogs via TCP"
@@ -2232,7 +2213,7 @@ msgid "# FIND PEER messages initiated"
 msgstr "# PING-meddelanden skapade"
 
 #: src/dht/gnunet-service-dht_neighbours.c:763
-#: src/dht/gnunet-service-xdht_neighbours.c:6059
+#: src/dht/gnunet-service-xdht_neighbours.c:6060
 #, fuzzy
 msgid "# Queued messages discarded (peer disconnected)"
 msgstr "Nätverksannonsering avstängd i konfigurationen!\n"
@@ -2319,40 +2300,40 @@ msgstr "# byte mottogs via TCP"
 msgid "# P2P PUT bytes received"
 msgstr "# byte mottogs via TCP"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1825
+#: src/dht/gnunet-service-dht_neighbours.c:1826
 msgid "# FIND PEER requests ignored due to Bloomfilter"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1833
+#: src/dht/gnunet-service-dht_neighbours.c:1834
 msgid "# FIND PEER requests ignored due to lack of HELLO"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1928
+#: src/dht/gnunet-service-dht_neighbours.c:1929
 #, fuzzy
 msgid "# P2P GET requests received"
 msgstr "# byte mottogs via TCP"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1931
+#: src/dht/gnunet-service-dht_neighbours.c:1932
 #, fuzzy
 msgid "# P2P GET bytes received"
 msgstr "# byte mottogs via TCP"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1988
+#: src/dht/gnunet-service-dht_neighbours.c:1997
 #, fuzzy
 msgid "# P2P FIND PEER requests processed"
 msgstr "# byte mottogs via TCP"
 
-#: src/dht/gnunet-service-dht_neighbours.c:2002
+#: src/dht/gnunet-service-dht_neighbours.c:2011
 #, fuzzy
 msgid "# P2P GET requests ONLY routed"
 msgstr "# byte mottogs via TCP"
 
-#: src/dht/gnunet-service-dht_neighbours.c:2087
+#: src/dht/gnunet-service-dht_neighbours.c:2096
 #, fuzzy
 msgid "# P2P RESULTS received"
 msgstr "# krypterade PONG-meddelanden mottagna"
 
-#: src/dht/gnunet-service-dht_neighbours.c:2090
+#: src/dht/gnunet-service-dht_neighbours.c:2099
 #, fuzzy
 msgid "# P2P RESULT bytes received"
 msgstr "# krypterade PONG-meddelanden mottagna"
@@ -2362,35 +2343,35 @@ msgstr "# krypterade PONG-meddelanden mottagna"
 msgid "# Network size estimates received"
 msgstr "# byte mottogs via TCP"
 
-#: src/dht/gnunet-service-dht_routing.c:211
+#: src/dht/gnunet-service-dht_routing.c:218
 msgid "# Good REPLIES matched against routing table"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_routing.c:220
+#: src/dht/gnunet-service-dht_routing.c:227
 msgid "# Duplicate REPLIES matched against routing table"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_routing.c:226
+#: src/dht/gnunet-service-dht_routing.c:233
 msgid "# Invalid REPLIES matched against routing table"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_routing.c:232
+#: src/dht/gnunet-service-dht_routing.c:239
 msgid "# Irrelevant REPLIES matched against routing table"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_routing.c:244
+#: src/dht/gnunet-service-dht_routing.c:251
 msgid "# Unsupported REPLIES matched against routing table"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_routing.c:317
+#: src/dht/gnunet-service-dht_routing.c:324
 msgid "# Entries removed from routing table"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_routing.c:399
+#: src/dht/gnunet-service-dht_routing.c:406
 msgid "# Entries added to routing table"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_routing.c:417
+#: src/dht/gnunet-service-dht_routing.c:424
 #, fuzzy
 msgid "# DHT requests combined"
 msgstr "# byte mottogs via TCP"
@@ -2456,17 +2437,17 @@ msgid "# FINGERS_COUNT"
 msgstr ""
 
 #: src/dht/gnunet-service-xdht_neighbours.c:3700
-#: src/dht/gnunet-service-xdht_neighbours.c:3937
-#: src/dht/gnunet-service-xdht_neighbours.c:4089
-#: src/dht/gnunet-service-xdht_neighbours.c:4239
-#: src/dht/gnunet-service-xdht_neighbours.c:4420
-#: src/dht/gnunet-service-xdht_neighbours.c:4933
-#: src/dht/gnunet-service-xdht_neighbours.c:5326
-#: src/dht/gnunet-service-xdht_neighbours.c:5419
-#: src/dht/gnunet-service-xdht_neighbours.c:5509
-#: src/dht/gnunet-service-xdht_neighbours.c:5613
-#: src/dht/gnunet-service-xdht_neighbours.c:5757
-#: src/dht/gnunet-service-xdht_neighbours.c:5846
+#: src/dht/gnunet-service-xdht_neighbours.c:3938
+#: src/dht/gnunet-service-xdht_neighbours.c:4090
+#: src/dht/gnunet-service-xdht_neighbours.c:4240
+#: src/dht/gnunet-service-xdht_neighbours.c:4421
+#: src/dht/gnunet-service-xdht_neighbours.c:4934
+#: src/dht/gnunet-service-xdht_neighbours.c:5327
+#: src/dht/gnunet-service-xdht_neighbours.c:5420
+#: src/dht/gnunet-service-xdht_neighbours.c:5510
+#: src/dht/gnunet-service-xdht_neighbours.c:5614
+#: src/dht/gnunet-service-xdht_neighbours.c:5758
+#: src/dht/gnunet-service-xdht_neighbours.c:5847
 #, fuzzy
 msgid "# Bytes received from other peers"
 msgstr "# byte mottagna av typen %d"
@@ -2499,16 +2480,16 @@ msgid ""
 "SUPU %s, %s, %d, trail->prev_hop = %s"
 msgstr ""
 
-#: src/dht/plugin_block_dht.c:138
+#: src/dht/plugin_block_dht.c:142
 #, fuzzy, c-format
 msgid "Block not of type %u\n"
 msgstr "Ingen transport av typ %d är känd.\n"
 
-#: src/dht/plugin_block_dht.c:145
+#: src/dht/plugin_block_dht.c:149
 msgid "Size mismatch for block\n"
 msgstr ""
 
-#: src/dht/plugin_block_dht.c:155
+#: src/dht/plugin_block_dht.c:159
 #, c-format
 msgid "Block of type %u is malformed\n"
 msgstr ""
@@ -2861,7 +2842,7 @@ msgid "# acknowledgements sent for fragment"
 msgstr ""
 
 #: src/fragmentation/defragmentation.c:456
-#: src/transport/plugin_transport_wlan.c:1517
+#: src/transport/plugin_transport_wlan.c:1515
 #, fuzzy
 msgid "# fragments received"
 msgstr "# byte mottogs via TCP"
@@ -3662,8 +3643,8 @@ msgid "Option `%s' is required when using option `%s'.\n"
 msgstr "Kommando \"%s\" kräver ett argument (\"%s\").\n"
 
 #: src/fs/gnunet-publish.c:837 src/fs/gnunet-publish.c:845
-#: src/transport/gnunet-transport.c:1881 src/transport/gnunet-transport.c:1911
-#: src/transport/gnunet-transport.c:1942
+#: src/transport/gnunet-transport.c:1928 src/transport/gnunet-transport.c:1958
+#: src/transport/gnunet-transport.c:1989
 #, c-format
 msgid "Option `%s' makes no sense without option `%s'.\n"
 msgstr ""
@@ -3757,20 +3738,20 @@ msgstr ""
 msgid "Search GNUnet for files that were published on GNUnet"
 msgstr ""
 
-#: src/fs/gnunet-service-fs.c:285
+#: src/fs/gnunet-service-fs.c:274
 msgid "# running average P2P latency (ms)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs.c:344 src/fs/gnunet-service-fs.c:607
+#: src/fs/gnunet-service-fs.c:332 src/fs/gnunet-service-fs.c:595
 msgid "# Loopback routes suppressed"
 msgstr ""
 
-#: src/fs/gnunet-service-fs.c:731
+#: src/fs/gnunet-service-fs.c:719
 #, fuzzy
 msgid "FS service is lacking HOSTKEY configuration setting.  Exiting.\n"
 msgstr "GNUnet-konfiguration"
 
-#: src/fs/gnunet-service-fs.c:757 src/hostlist/gnunet-daemon-hostlist.c:311
+#: src/fs/gnunet-service-fs.c:745 src/hostlist/gnunet-daemon-hostlist.c:311
 #: src/sensordashboard/gnunet-service-sensordashboard.c:864
 #: src/sensordashboard/gnunet-service-sensordashboard.c:872
 #: src/topology/gnunet-daemon-topology.c:1287
@@ -3815,89 +3796,94 @@ msgstr "Nätverksanslutning"
 msgid "# cadet connections active"
 msgstr "Nätverksanslutning"
 
-#: src/fs/gnunet-service-fs_cp.c:710
+#: src/fs/gnunet-service-fs_cp.c:726
 #, fuzzy
 msgid "# migration stop messages received"
 msgstr "# krypterade PONG-meddelanden mottagna"
 
-#: src/fs/gnunet-service-fs_cp.c:714
+#: src/fs/gnunet-service-fs_cp.c:730
 #, c-format
 msgid "Migration of content to peer `%s' blocked for %s\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:750
+#: src/fs/gnunet-service-fs_cp.c:768
 #, fuzzy
 msgid "# replies transmitted to other peers"
 msgstr "# byte skickade av typen %d"
 
-#: src/fs/gnunet-service-fs_cp.c:756
+#: src/fs/gnunet-service-fs_cp.c:774
 msgid "# replies dropped"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:781 src/fs/gnunet-service-fs_cp.c:1337
+#: src/fs/gnunet-service-fs_cp.c:799 src/fs/gnunet-service-fs_cp.c:1384
 msgid "# P2P searches active"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:878
+#: src/fs/gnunet-service-fs_cp.c:904
 msgid "# artificial delays introduced (ms)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:934
+#: src/fs/gnunet-service-fs_cp.c:960
 #, fuzzy
 msgid "# replies dropped due to type mismatch"
 msgstr "# byte mottagna av typen %d"
 
-#: src/fs/gnunet-service-fs_cp.c:942
+#: src/fs/gnunet-service-fs_cp.c:968
 #, fuzzy
 msgid "# replies received for other peers"
 msgstr "# byte mottagna av typen %d"
 
-#: src/fs/gnunet-service-fs_cp.c:956
+#: src/fs/gnunet-service-fs_cp.c:982
 msgid "# replies dropped due to insufficient cover traffic"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:994
+#: src/fs/gnunet-service-fs_cp.c:1030
 msgid "# P2P searches destroyed due to ultimate reply"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1062
+#: src/fs/gnunet-service-fs_cp.c:1098
 msgid "# requests done for free (low load)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1087
+#: src/fs/gnunet-service-fs_cp.c:1123
 msgid "# request dropped, priority insufficient"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1097
+#: src/fs/gnunet-service-fs_cp.c:1133
 msgid "# requests done for a price (normal load)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1175
+#: src/fs/gnunet-service-fs_cp.c:1210
 msgid "# GET requests received (from other peers)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1209
+#: src/fs/gnunet-service-fs_cp.c:1245
 msgid "# requests dropped due to initiator not being connected"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1231
+#: src/fs/gnunet-service-fs_cp.c:1266
 msgid "# requests dropped due to missing reverse route"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1282
+#: src/fs/gnunet-service-fs_cp.c:1277
+#, fuzzy
+msgid "# requests dropped due to full reply queue"
+msgstr "Nätverksannonsering avstängd i konfigurationen!\n"
+
+#: src/fs/gnunet-service-fs_cp.c:1329
 msgid "# requests dropped due TTL underflow"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1306
+#: src/fs/gnunet-service-fs_cp.c:1353
 msgid "# requests dropped due to higher-TTL request"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1335
+#: src/fs/gnunet-service-fs_cp.c:1382
 #, fuzzy
 msgid "# P2P query messages received and processed"
 msgstr "# krypterade PONG-meddelanden mottagna"
 
-#: src/fs/gnunet-service-fs_cp.c:1754
+#: src/fs/gnunet-service-fs_cp.c:1821
 #, fuzzy
 msgid "# migration stop messages sent"
 msgstr "# krypterade PONG-meddelanden mottagna"
@@ -4014,103 +4000,103 @@ msgstr "# byte mottogs via TCP"
 msgid "# Pending requests active"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:814
+#: src/fs/gnunet-service-fs_pr.c:820
 #, fuzzy
 msgid "# replies received and matched"
 msgstr "# byte mottagna av typen %d"
 
-#: src/fs/gnunet-service-fs_pr.c:844
+#: src/fs/gnunet-service-fs_pr.c:857
 msgid "# duplicate replies discarded (bloomfilter)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:853
+#: src/fs/gnunet-service-fs_pr.c:866
 msgid "# irrelevant replies discarded"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:867
+#: src/fs/gnunet-service-fs_pr.c:881
 #, c-format
 msgid "Unsupported block type %u\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:880
+#: src/fs/gnunet-service-fs_pr.c:898
 msgid "# results found locally"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1003
+#: src/fs/gnunet-service-fs_pr.c:1028
 msgid "# Datastore `PUT' failures"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1031
+#: src/fs/gnunet-service-fs_pr.c:1056
 #, fuzzy
 msgid "# storage requests dropped due to high load"
 msgstr "Nätverksannonsering avstängd i konfigurationen!\n"
 
-#: src/fs/gnunet-service-fs_pr.c:1069
+#: src/fs/gnunet-service-fs_pr.c:1094
 #, fuzzy
 msgid "# Replies received from DHT"
 msgstr "# byte mottagna via HTTP"
 
-#: src/fs/gnunet-service-fs_pr.c:1200
+#: src/fs/gnunet-service-fs_pr.c:1226
 #, fuzzy
 msgid "# Replies received from CADET"
 msgstr "# byte mottagna via HTTP"
 
-#: src/fs/gnunet-service-fs_pr.c:1252
+#: src/fs/gnunet-service-fs_pr.c:1279
 #, c-format
 msgid "Datastore lookup already took %s!\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1272
+#: src/fs/gnunet-service-fs_pr.c:1299
 #, c-format
 msgid "On-demand lookup already took %s!\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1319
+#: src/fs/gnunet-service-fs_pr.c:1351
 msgid "# Datastore lookups concluded (no results)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1334
+#: src/fs/gnunet-service-fs_pr.c:1366
 msgid "# Datastore lookups concluded (seen all)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1343
+#: src/fs/gnunet-service-fs_pr.c:1375
 msgid "# Datastore lookups aborted (more than MAX_RESULTS)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1358
+#: src/fs/gnunet-service-fs_pr.c:1390
 msgid "# requested DBLOCK or IBLOCK not found"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1372
+#: src/fs/gnunet-service-fs_pr.c:1404
 msgid "# on-demand blocks matched requests"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1385
+#: src/fs/gnunet-service-fs_pr.c:1417
 msgid "# on-demand lookups performed successfully"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1390
+#: src/fs/gnunet-service-fs_pr.c:1422
 msgid "# on-demand lookups failed"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1417 src/fs/gnunet-service-fs_pr.c:1457
-#: src/fs/gnunet-service-fs_pr.c:1620
+#: src/fs/gnunet-service-fs_pr.c:1449 src/fs/gnunet-service-fs_pr.c:1489
+#: src/fs/gnunet-service-fs_pr.c:1657
 msgid "# Datastore lookups concluded (error queueing)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1475
+#: src/fs/gnunet-service-fs_pr.c:1508
 msgid "# Datastore lookups concluded (found last result)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1486
+#: src/fs/gnunet-service-fs_pr.c:1520
 msgid "# Datastore lookups concluded (load too high)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1596
+#: src/fs/gnunet-service-fs_pr.c:1633
 msgid "# Datastore lookups initiated"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1685
+#: src/fs/gnunet-service-fs_pr.c:1722
 #, fuzzy
 msgid "# GAP PUT messages received"
 msgstr "# krypterade PONG-meddelanden mottagna"
@@ -4338,113 +4324,113 @@ msgstr ""
 msgid "%s failed at %s:%d: `%s'\n"
 msgstr "\"%s\" misslyckades vid %s:%d med fel: \"%s\".\n"
 
-#: src/gns/gnunet-gns-proxy.c:833
+#: src/gns/gnunet-gns-proxy.c:842
 #, fuzzy, c-format
 msgid "Unsupported CURL SSL backend %d\n"
 msgstr "Kommando \"%s\" stöds ej.  Avbryter.\n"
 
-#: src/gns/gnunet-gns-proxy.c:856
+#: src/gns/gnunet-gns-proxy.c:865
 #, fuzzy, c-format
 msgid "Failed to fetch CN from cert: %s\n"
 msgstr "Misslyckades att skicka HTTP-begäran till värd \"%s\": %s\n"
 
-#: src/gns/gnunet-gns-proxy.c:879
+#: src/gns/gnunet-gns-proxy.c:888
 #, fuzzy, c-format
 msgid "Failed to initialize DANE: %s\n"
 msgstr "Kunde inte initiera SQLite.\n"
 
-#: src/gns/gnunet-gns-proxy.c:892
+#: src/gns/gnunet-gns-proxy.c:901
 #, fuzzy, c-format
 msgid "Failed to parse DANE record: %s\n"
 msgstr "Misslyckades att skicka HTTP-begäran till värd \"%s\": %s\n"
 
-#: src/gns/gnunet-gns-proxy.c:907
+#: src/gns/gnunet-gns-proxy.c:916
 #, fuzzy, c-format
 msgid "Failed to verify TLS connection using DANE: %s\n"
 msgstr "Kunde inte spara konfigurationsfil \"%s\":"
 
-#: src/gns/gnunet-gns-proxy.c:917
+#: src/gns/gnunet-gns-proxy.c:926
 #, c-format
 msgid "Failed DANE verification failed with GnuTLS verify status code: %u\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:941
+#: src/gns/gnunet-gns-proxy.c:950
 #, c-format
 msgid "SSL certificate subject name (%s) does not match `%s'\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:1086
+#: src/gns/gnunet-gns-proxy.c:1095
 #, c-format
 msgid "Cookie domain `%s' supplied by server is invalid\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:1602
+#: src/gns/gnunet-gns-proxy.c:1630
 #, fuzzy, c-format
 msgid "Unsupported HTTP method `%s'\n"
 msgstr "Kommando \"%s\" stöds ej.  Avbryter.\n"
 
-#: src/gns/gnunet-gns-proxy.c:1973
+#: src/gns/gnunet-gns-proxy.c:2002
 #, fuzzy, c-format
 msgid "Unable to import private key from file `%s'\n"
 msgstr "Kunde inte skapa användarkonto:"
 
-#: src/gns/gnunet-gns-proxy.c:2003
+#: src/gns/gnunet-gns-proxy.c:2032
 #, fuzzy, c-format
 msgid "Unable to import certificate %s\n"
 msgstr "Kunde inte spara konfigurationsfil \"%s\":"
 
-#: src/gns/gnunet-gns-proxy.c:2177
+#: src/gns/gnunet-gns-proxy.c:2206
 #, fuzzy, c-format
 msgid "Failed to start HTTPS server for `%s'\n"
 msgstr "Misslyckades att starta samling.\n"
 
-#: src/gns/gnunet-gns-proxy.c:2196
+#: src/gns/gnunet-gns-proxy.c:2225
 #, fuzzy
 msgid "Failed to pass client to MHD\n"
 msgstr "Misslyckades att ansluta till gnunetd.\n"
 
-#: src/gns/gnunet-gns-proxy.c:2518
+#: src/gns/gnunet-gns-proxy.c:2547
 #, fuzzy, c-format
 msgid "Unsupported socks version %d\n"
 msgstr "Kommando \"%s\" stöds ej.  Avbryter.\n"
 
-#: src/gns/gnunet-gns-proxy.c:2547
+#: src/gns/gnunet-gns-proxy.c:2576
 #, fuzzy, c-format
 msgid "Unsupported socks command %d\n"
 msgstr "Kommando \"%s\" stöds ej.  Avbryter.\n"
 
-#: src/gns/gnunet-gns-proxy.c:2565 src/gns/gnunet-gns-proxy.c:2594
+#: src/gns/gnunet-gns-proxy.c:2594 src/gns/gnunet-gns-proxy.c:2623
 msgid "SSL connection to plain IPv4 address requested\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:2645
+#: src/gns/gnunet-gns-proxy.c:2674
 #, fuzzy, c-format
 msgid "Unsupported socks address type %d\n"
 msgstr "Kommando \"%s\" stöds ej.  Avbryter.\n"
 
-#: src/gns/gnunet-gns-proxy.c:2984
+#: src/gns/gnunet-gns-proxy.c:3013
 msgid "No ego configured for `shorten-zone`\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:3024
+#: src/gns/gnunet-gns-proxy.c:3053
 #, c-format
 msgid "No ego configured for `%s`\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:3086
+#: src/gns/gnunet-gns-proxy.c:3115
 #, fuzzy, c-format
 msgid "Failed to load SSL/TLS key and certificate from `%s'\n"
 msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 
-#: src/gns/gnunet-gns-proxy.c:3127
+#: src/gns/gnunet-gns-proxy.c:3156
 msgid "listen on specified port (default: 7777)"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:3130
+#: src/gns/gnunet-gns-proxy.c:3159
 msgid "pem file to use as CA"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:3149
+#: src/gns/gnunet-gns-proxy.c:3178
 msgid "GNUnet GNS proxy"
 msgstr ""
 
@@ -4852,7 +4838,7 @@ msgid "# hostlist URIs written to file"
 msgstr ""
 
 #: src/hostlist/gnunet-daemon-hostlist_client.c:1588
-#: src/transport/plugin_transport_http_client.c:2273
+#: src/transport/plugin_transport_http_client.c:2265
 #, c-format
 msgid "Invalid proxy type: `%s', disabling proxy! Check configuration!\n"
 msgstr ""
@@ -4941,7 +4927,7 @@ msgstr ""
 
 #: src/hostlist/gnunet-daemon-hostlist_server.c:747
 #: src/peerinfo-tool/gnunet-peerinfo.c:736
-#: src/transport/gnunet-service-transport.c:1018
+#: src/transport/gnunet-service-transport.c:852
 #, fuzzy
 msgid "Could not access PEERINFO service.  Exiting.\n"
 msgstr "Kunde inte komma åt namnrymdsinformation.\n"
@@ -5433,130 +5419,130 @@ msgstr ""
 msgid "test_icmp_client not possible, as we have no internal IPv4 address\n"
 msgstr ""
 
-#: src/nat/nat.c:867
+#: src/nat/nat.c:862
 #, c-format
 msgid "gnunet-helper-nat-server generated malformed address `%s'\n"
 msgstr ""
 
-#: src/nat/nat.c:917
+#: src/nat/nat.c:912
 #, fuzzy, c-format
 msgid "Failed to start %s\n"
 msgstr "Misslyckades att starta samling.\n"
 
-#: src/nat/nat.c:1032
+#: src/nat/nat.c:1027
 msgid "Error while running upnp client:\n"
 msgstr ""
 
-#: src/nat/nat.c:1102
+#: src/nat/nat.c:1097
 #, 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
+#: src/nat/nat.c:1237
 msgid "malformed"
 msgstr ""
 
-#: src/nat/nat.c:1297
+#: src/nat/nat.c:1291
 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
+#: src/nat/nat.c:1318 src/nat/nat.c:1330
 #, c-format
 msgid ""
 "Configuration requires `%s', but binary is not installed properly (SUID bit "
 "not set).  Option disabled.\n"
 msgstr ""
 
-#: src/nat/nat.c:1474
+#: src/nat/nat.c:1468
 msgid "Internal IP address not known, cannot use ICMP NAT traversal method\n"
 msgstr ""
 
-#: src/nat/nat.c:1490
+#: src/nat/nat.c:1484
 #, c-format
 msgid "Running gnunet-helper-nat-client %s %s %u\n"
 msgstr ""
 
-#: src/nat/nat.c:1575
+#: src/nat/nat.c:1569
 msgid "Operation Successful"
 msgstr ""
 
-#: src/nat/nat.c:1577
+#: src/nat/nat.c:1571
 msgid "Internal Failure (IPC, ...)"
 msgstr ""
 
-#: src/nat/nat.c:1579
+#: src/nat/nat.c:1573
 msgid "Failure in network subsystem, check permissions."
 msgstr ""
 
-#: src/nat/nat.c:1581
+#: src/nat/nat.c:1575
 msgid "Encountered timeout while performing operation"
 msgstr ""
 
-#: src/nat/nat.c:1583
+#: src/nat/nat.c:1577
 msgid "detected that we are offline"
 msgstr ""
 
-#: src/nat/nat.c:1585
+#: src/nat/nat.c:1579
 #, fuzzy
 msgid "`upnpc` command not found"
 msgstr "Kommando \"%s\" hittades inte!\n"
 
-#: src/nat/nat.c:1587
+#: src/nat/nat.c:1581
 #, fuzzy
 msgid "Failed to run `upnpc` command"
 msgstr "Misslyckades att starta samling.\n"
 
-#: src/nat/nat.c:1589
+#: src/nat/nat.c:1583
 #, fuzzy
 msgid "`upnpc' command took too long, process killed"
 msgstr "Kommando \"%s\" hittades inte!\n"
 
-#: src/nat/nat.c:1591
+#: src/nat/nat.c:1585
 msgid "`upnpc' command failed to establish port mapping"
 msgstr ""
 
-#: src/nat/nat.c:1593
+#: src/nat/nat.c:1587
 #, fuzzy
 msgid "`external-ip' command not found"
 msgstr "Kommando \"%s\" hittades inte!\n"
 
-#: src/nat/nat.c:1595
+#: src/nat/nat.c:1589
 #, fuzzy
 msgid "Failed to run `external-ip` command"
 msgstr "Misslyckades att starta samling.\n"
 
-#: src/nat/nat.c:1597
+#: src/nat/nat.c:1591
 msgid "`external-ip' command output invalid"
 msgstr ""
 
-#: src/nat/nat.c:1599
+#: src/nat/nat.c:1593
 msgid "no valid address was returned by `external-ip'"
 msgstr ""
 
-#: src/nat/nat.c:1601
+#: src/nat/nat.c:1595
 #, fuzzy
 msgid "Could not determine interface with internal/local network address"
 msgstr "Kunde inte fastställa min publika IPv6-adress.\n"
 
-#: src/nat/nat.c:1603
+#: src/nat/nat.c:1597
 msgid "No functioning gnunet-helper-nat-server installation found"
 msgstr ""
 
-#: src/nat/nat.c:1605
+#: src/nat/nat.c:1599
 msgid "NAT test could not be initialized"
 msgstr ""
 
-#: src/nat/nat.c:1607
+#: src/nat/nat.c:1601
 msgid "NAT test timeout reached"
 msgstr ""
 
-#: src/nat/nat.c:1609
+#: src/nat/nat.c:1603
 msgid "could not register NAT"
 msgstr ""
 
-#: src/nat/nat.c:1611
+#: src/nat/nat.c:1605
 msgid "No working gnunet-helper-nat-client installation found"
 msgstr ""
 
@@ -5687,19 +5673,19 @@ msgstr ""
 msgid "failed to transmit request (service down?)"
 msgstr "Misslyckades att skicka HTTP-begäran till värd \"%s\": %s\n"
 
-#: src/peerinfo/peerinfo_api.c:519
+#: src/peerinfo/peerinfo_api.c:518
 #, fuzzy
 msgid "Failed to receive response from `PEERINFO' service."
 msgstr "Misslyckades att ta emot svar till \"%s\" meddelande från gnunetd\n"
 
-#: src/peerinfo/peerinfo_api.c:563 src/peerinfo/peerinfo_api.c:586
-#: src/peerinfo/peerinfo_api.c:603 src/peerinfo/peerinfo_api.c:616
-#: src/peerinfo/peerinfo_api.c:631
+#: src/peerinfo/peerinfo_api.c:562 src/peerinfo/peerinfo_api.c:585
+#: src/peerinfo/peerinfo_api.c:602 src/peerinfo/peerinfo_api.c:615
+#: src/peerinfo/peerinfo_api.c:630
 #, fuzzy
 msgid "Received invalid message from `PEERINFO' service."
 msgstr "mottog ogiltigt \"%s\" meddelande: %s.\n"
 
-#: src/peerinfo/peerinfo_api.c:720
+#: src/peerinfo/peerinfo_api.c:719
 #, fuzzy
 msgid "Timeout transmitting iteration request to `PEERINFO' service."
 msgstr "Misslyckades att initiera tjänsten \"%s\".\n"
@@ -5797,19 +5783,19 @@ msgid "Print information about peers."
 msgstr "Skriv ut information om GNUnets motparter."
 
 #: src/peerinfo-tool/gnunet-peerinfo_plugins.c:105
-#: src/transport/gnunet-service-transport_plugins.c:127
+#: src/transport/gnunet-service-transport_plugins.c:168
 #, fuzzy, c-format
 msgid "Starting transport plugins `%s'\n"
 msgstr "Testar transport(er) %s\n"
 
 #: src/peerinfo-tool/gnunet-peerinfo_plugins.c:109
-#: src/transport/gnunet-service-transport_plugins.c:132
+#: src/transport/gnunet-service-transport_plugins.c:173
 #, fuzzy, c-format
 msgid "Loading `%s' transport plugin\n"
 msgstr "Testar transport(er) %s\n"
 
 #: src/peerinfo-tool/gnunet-peerinfo_plugins.c:129
-#: src/transport/gnunet-service-transport_plugins.c:164
+#: src/transport/gnunet-service-transport_plugins.c:208
 #, fuzzy, c-format
 msgid "Failed to load transport plugin for `%s'\n"
 msgstr "Kunde inte slå upp \"%s\": %s\n"
@@ -6819,7 +6805,7 @@ msgid ""
 "content/topology-file-format\n"
 msgstr ""
 
-#: src/testbed/gnunet-daemon-latency-logger.c:333
+#: src/testbed/gnunet-daemon-latency-logger.c:323
 msgid "Daemon to log latency values of connections to neighbours"
 msgstr ""
 
@@ -6835,7 +6821,7 @@ msgstr ""
 msgid "Incorrect hostkey file format: %s\n"
 msgstr ""
 
-#: src/testbed/gnunet-daemon-testbed-underlay.c:474
+#: src/testbed/gnunet-daemon-testbed-underlay.c:476
 msgid "Daemon to restrict underlay network in testbed deployments"
 msgstr ""
 
@@ -7167,7 +7153,7 @@ msgid ""
 msgstr ""
 
 #: src/topology/gnunet-daemon-topology.c:1121
-#: src/transport/plugin_transport_wlan.c:1476
+#: src/transport/plugin_transport_wlan.c:1478
 #, fuzzy
 msgid "# HELLO messages received"
 msgstr "# krypterade PONG-meddelanden mottagna"
@@ -7180,47 +7166,46 @@ msgstr ""
 msgid "GNUnet topology control (maintaining P2P cadet and F2F constraints)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_ats.c:269
-#, 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_ats.c:136
+msgid "# Addresses given to ATS"
+msgstr ""
 
-#: src/transport/gnunet-service-transport_blacklist.c:274
+#: src/transport/gnunet-service-transport_blacklist.c:286
 #, fuzzy, c-format
 msgid "Adding blacklisting entry for peer `%s'\n"
 msgstr "Motpart \"%s\" med pålitlighet %8u och adress \"%s\"\n"
 
-#: src/transport/gnunet-service-transport_blacklist.c:283
+#: src/transport/gnunet-service-transport_blacklist.c:295
 #, c-format
 msgid "Adding blacklisting entry for peer `%s':`%s'\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_blacklist.c:476
-#: src/transport/gnunet-service-transport_blacklist.c:766
+#: src/transport/gnunet-service-transport_blacklist.c:504
+#: src/transport/gnunet-service-transport_blacklist.c:855
 msgid "# disconnects due to blacklist"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_blacklist.c:769
+#: src/transport/gnunet-service-transport_blacklist.c:859
 #, fuzzy, c-format
 msgid "Disallowing connection to peer `%s' on transport %s\n"
 msgstr "Kunde inte slå upp \"%s\": %s\n"
 
-#: src/transport/gnunet-service-transport.c:236
+#: src/transport/gnunet-service-transport.c:231
 #, fuzzy
 msgid "# bytes payload discarded due to not connected peer"
 msgstr "Nätverksannonsering avstängd i konfigurationen!\n"
 
-#: src/transport/gnunet-service-transport.c:424
+#: src/transport/gnunet-service-transport.c:385
 #, fuzzy
 msgid "# bytes total received"
 msgstr "# byte krypterade"
 
-#: src/transport/gnunet-service-transport.c:509
+#: src/transport/gnunet-service-transport.c:480
 #, fuzzy
 msgid "# bytes payload received"
 msgstr "# byte dekrypterade"
 
-#: src/transport/gnunet-service-transport.c:984
+#: src/transport/gnunet-service-transport.c:818
 #, fuzzy
 msgid "Transport service is lacking key configuration settings. Exiting.\n"
 msgstr "GNUnet-konfiguration"
@@ -7229,407 +7214,412 @@ msgstr "GNUnet-konfiguration"
 msgid "# messages dropped due to slow client"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_clients.c:774
+#: src/transport/gnunet-service-transport_clients.c:783
 msgid "# bytes payload dropped (other peer was not connected)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_clients.c:813
-#, fuzzy, c-format
-msgid "Blacklist refuses connection attempt to peer `%s'\n"
-msgstr "Misslyckades att ansluta till gnunetd.\n"
-
-#: src/transport/gnunet-service-transport_clients.c:843
+#: src/transport/gnunet-service-transport_clients.c:827
 #, fuzzy
 msgid "# REQUEST CONNECT messages received"
 msgstr "# krypterade PONG-meddelanden mottagna"
 
-#: src/transport/gnunet-service-transport_clients.c:882
+#: src/transport/gnunet-service-transport_clients.c:864
 #, fuzzy
 msgid "# REQUEST DISCONNECT messages received"
 msgstr "# krypterade PONG-meddelanden mottagna"
 
-#: src/transport/gnunet-service-transport_hello.c:182
+#: src/transport/gnunet-service-transport_hello.c:188
 msgid "# refreshed my HELLO"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:769
-#: src/transport/gnunet-service-transport_neighbours.c:846
+#: src/transport/gnunet-service-transport_neighbours.c:839
 #, fuzzy
 msgid "# session creation failed"
 msgstr "# sessionsnycklar accepterade"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1134
+#: src/transport/gnunet-service-transport_neighbours.c:1167
 #, fuzzy
 msgid "# DISCONNECT messages sent"
 msgstr "# krypterade PONG-meddelanden mottagna"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1259
-#: src/transport/gnunet-service-transport_neighbours.c:1675
+#: src/transport/gnunet-service-transport_neighbours.c:1303
+#: src/transport/gnunet-service-transport_neighbours.c:1760
 msgid "# bytes in message queue for other peers"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1264
+#: src/transport/gnunet-service-transport_neighbours.c:1308
 #, fuzzy
 msgid "# messages transmitted to other peers"
 msgstr "# byte skickade av typen %d"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1269
+#: src/transport/gnunet-service-transport_neighbours.c:1314
 #, fuzzy
 msgid "# transmission failures for messages to other peers"
 msgstr "# byte skickade av typen %d"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1327
+#: src/transport/gnunet-service-transport_neighbours.c:1374
 msgid "# messages timed out while in transport queue"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1388
-#, fuzzy
-msgid "# keepalives sent"
-msgstr "# sessionsnycklar skickade"
+#: src/transport/gnunet-service-transport_neighbours.c:1450
+msgid "# KEEPALIVES sent"
+msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1421
+#: src/transport/gnunet-service-transport_neighbours.c:1486
 #, fuzzy
 msgid "# KEEPALIVE messages discarded (peer unknown)"
 msgstr "Nätverksannonsering avstängd i konfigurationen!\n"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1429
+#: src/transport/gnunet-service-transport_neighbours.c:1494
 #, fuzzy
 msgid "# KEEPALIVE messages discarded (no session)"
 msgstr "Nätverksannonsering avstängd i konfigurationen!\n"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1476
+#: src/transport/gnunet-service-transport_neighbours.c:1504
+msgid "# KEEPALIVES received in good order"
+msgstr ""
+
+#: src/transport/gnunet-service-transport_neighbours.c:1549
 #, fuzzy
-msgid "# KEEPALIVE_RESPONSE messages discarded (not connected)"
+msgid "# KEEPALIVE_RESPONSEs discarded (not connected)"
 msgstr "Nätverksannonsering avstängd i konfigurationen!\n"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1485
+#: src/transport/gnunet-service-transport_neighbours.c:1558
 #, fuzzy
-msgid "# KEEPALIVE_RESPONSE messages discarded (not expected)"
+msgid "# KEEPALIVE_RESPONSEs discarded (not expected)"
 msgstr "Nätverksannonsering avstängd i konfigurationen!\n"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1493
+#: src/transport/gnunet-service-transport_neighbours.c:1566
 #, fuzzy
-msgid "# KEEPALIVE_RESPONSE messages discarded (address changed)"
+msgid "# KEEPALIVE_RESPONSEs discarded (address changed)"
 msgstr "Nätverksannonsering avstängd i konfigurationen!\n"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1501
+#: src/transport/gnunet-service-transport_neighbours.c:1575
 #, fuzzy
-msgid "# KEEPALIVE_RESPONSE messages discarded (wrong nonce)"
+msgid "# KEEPALIVE_RESPONSEs discarded (no nonce)"
 msgstr "Nätverksannonsering avstängd i konfigurationen!\n"
 
 #: src/transport/gnunet-service-transport_neighbours.c:1580
 #, fuzzy
+msgid "# KEEPALIVE_RESPONSEs discarded (bad nonce)"
+msgstr "Nätverksannonsering avstängd i konfigurationen!\n"
+
+#: src/transport/gnunet-service-transport_neighbours.c:1586
+#, fuzzy
+msgid "# KEEPALIVE_RESPONSEs received (OK)"
+msgstr "Nätverksannonsering avstängd i konfigurationen!\n"
+
+#: src/transport/gnunet-service-transport_neighbours.c:1657
+#, 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:1614
+#: src/transport/gnunet-service-transport_neighbours.c:1691
 msgid "# bandwidth quota violations by other peers"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1630
+#: src/transport/gnunet-service-transport_neighbours.c:1706
 msgid "# ms throttling suggested"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1726
+#: src/transport/gnunet-service-transport_neighbours.c:1826
 #, fuzzy, c-format
-msgid "Failed to send SYN message to peer `%s' using address `%s' session %p\n"
-msgstr "Misslyckades att ansluta till gnunetd.\n"
+msgid "Failed to send SYN message to peer `%s'\n"
+msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1747
+#: src/transport/gnunet-service-transport_neighbours.c:1846
 #, fuzzy
 msgid "# Failed attempts to switch addresses (failed to send SYN CONT)"
 msgstr "Misslyckades att skicka HTTP-begäran till värd \"%s\": %s\n"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1790
+#: src/transport/gnunet-service-transport_neighbours.c:1885
 #, fuzzy
 msgid "# SYN messages sent"
 msgstr "# krypterade PONG-meddelanden mottagna"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1806
+#: src/transport/gnunet-service-transport_neighbours.c:1902
 #, fuzzy, c-format
-msgid "Failed to transmit SYN message via plugin to %s\n"
+msgid "Failed to transmit SYN message to %s\n"
 msgstr "Misslyckades att initiera tjänsten \"%s\".\n"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1833
+#: src/transport/gnunet-service-transport_neighbours.c:1932
 #, fuzzy
 msgid "# Failed attempts to switch addresses (failed to send SYN)"
 msgstr "Misslyckades att skicka HTTP-begäran till värd \"%s\": %s\n"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1880
+#: src/transport/gnunet-service-transport_neighbours.c:1997
 #, fuzzy, c-format
-msgid ""
-"Failed to send SYN_ACK message to peer `%s' using address `%s' session %p\n"
+msgid "Failed to send SYN_ACK message to peer `%s' using address `%s'\n"
 msgstr "Misslyckades att ansluta till gnunetd.\n"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1930
+#: src/transport/gnunet-service-transport_neighbours.c:2051
 #, fuzzy
 msgid "# SYN_ACK messages sent"
 msgstr "# krypterade PONG-meddelanden mottagna"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1945
+#: src/transport/gnunet-service-transport_neighbours.c:2068
 #, fuzzy, c-format
-msgid "Failed to transmit SYN_ACK message via plugin to %s\n"
+msgid "Failed to transmit SYN_ACK message to %s\n"
 msgstr "Misslyckades att initiera tjänsten \"%s\".\n"
 
-#: src/transport/gnunet-service-transport_neighbours.c:2235
+#: src/transport/gnunet-service-transport_neighbours.c:2223
 #, 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:2360
+#: src/transport/gnunet-service-transport_neighbours.c:2350
 #, fuzzy
 msgid "# SYN messages received"
 msgstr "# PING-meddelanden skapade"
 
-#: src/transport/gnunet-service-transport_neighbours.c:2365
+#: src/transport/gnunet-service-transport_neighbours.c:2355
 #, c-format
 msgid "SYN request from peer `%s' ignored due impending shutdown\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:2673
+#: src/transport/gnunet-service-transport_neighbours.c:2715
 msgid "# Attempts to switch addresses"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3079
-#, 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:3176
+#: src/transport/gnunet-service-transport_neighbours.c:3201
 #, fuzzy
 msgid "# SYN_ACK messages received"
 msgstr "# krypterade PONG-meddelanden mottagna"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3184
+#: src/transport/gnunet-service-transport_neighbours.c:3209
 #, fuzzy
 msgid "# unexpected SYN_ACK messages (no peer)"
 msgstr "skicka ANTAL meddelanden"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3198
-#: src/transport/gnunet-service-transport_neighbours.c:3230
+#: src/transport/gnunet-service-transport_neighbours.c:3227
+#: src/transport/gnunet-service-transport_neighbours.c:3251
 #, fuzzy
 msgid "# unexpected SYN_ACK messages (not ready)"
 msgstr "skicka ANTAL meddelanden"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3242
+#: src/transport/gnunet-service-transport_neighbours.c:3263
 #, fuzzy
 msgid "# unexpected SYN_ACK messages (waiting on ATS)"
 msgstr "skicka ANTAL meddelanden"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3262
+#: src/transport/gnunet-service-transport_neighbours.c:3288
 msgid "# Successful attempts to switch addresses"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3270
+#: src/transport/gnunet-service-transport_neighbours.c:3301
 #, fuzzy
 msgid "# unexpected SYN_ACK messages (disconnecting)"
 msgstr "skicka ANTAL meddelanden"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3460
+#: src/transport/gnunet-service-transport_neighbours.c:3495
 #, fuzzy
 msgid "# ACK messages received"
 msgstr "# krypterade PONG-meddelanden mottagna"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3496
+#: src/transport/gnunet-service-transport_neighbours.c:3530
 #, fuzzy
 msgid "# unexpected ACK messages"
 msgstr "# krypterade PONG-meddelanden skickade"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3566
+#: src/transport/gnunet-service-transport_neighbours.c:3582
 msgid "# SET QUOTA messages ignored (no such peer)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3581
+#: src/transport/gnunet-service-transport_neighbours.c:3597
 msgid "# disconnects due to quota of 0"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3623
+#: src/transport/gnunet-service-transport_neighbours.c:3644
+#, fuzzy
+msgid "# quota messages ignored (malformed)"
+msgstr "# byte mottogs via TCP"
+
+#: src/transport/gnunet-service-transport_neighbours.c:3651
+#, fuzzy
+msgid "# QUOTA messages received"
+msgstr "# krypterade PONG-meddelanden mottagna"
+
+#: src/transport/gnunet-service-transport_neighbours.c:3686
 msgid "# disconnect messages ignored (malformed)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3629
+#: src/transport/gnunet-service-transport_neighbours.c:3693
 #, fuzzy
 msgid "# DISCONNECT messages received"
 msgstr "# krypterade PONG-meddelanden mottagna"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3638
+#: src/transport/gnunet-service-transport_neighbours.c:3704
 msgid "# disconnect messages ignored (timestamp)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3765
+#: src/transport/gnunet-service-transport_neighbours.c:3833
 #, fuzzy
 msgid "# disconnected from peer upon explicit request"
 msgstr "# av anslutna parter"
 
-#: src/transport/gnunet-service-transport_plugins.c:119
+#: src/transport/gnunet-service-transport_plugins.c:158
 msgid "Transport service is lacking NEIGHBOUR_LIMIT option.\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_plugins.c:177
-#: src/transport/gnunet-service-transport_plugins.c:185
-#: src/transport/gnunet-service-transport_plugins.c:193
-#: src/transport/gnunet-service-transport_plugins.c:201
-#: src/transport/gnunet-service-transport_plugins.c:209
-#: src/transport/gnunet-service-transport_plugins.c:217
-#: src/transport/gnunet-service-transport_plugins.c:225
-#: src/transport/gnunet-service-transport_plugins.c:233
-#: src/transport/gnunet-service-transport_plugins.c:241
-#: src/transport/gnunet-service-transport_plugins.c:249
-#: src/transport/gnunet-service-transport_plugins.c:257
+#: src/transport/gnunet-service-transport_plugins.c:223
+#: src/transport/gnunet-service-transport_plugins.c:231
+#: src/transport/gnunet-service-transport_plugins.c:239
+#: src/transport/gnunet-service-transport_plugins.c:247
+#: src/transport/gnunet-service-transport_plugins.c:255
+#: src/transport/gnunet-service-transport_plugins.c:263
+#: src/transport/gnunet-service-transport_plugins.c:271
+#: src/transport/gnunet-service-transport_plugins.c:279
+#: src/transport/gnunet-service-transport_plugins.c:287
+#: src/transport/gnunet-service-transport_plugins.c:295
+#: src/transport/gnunet-service-transport_plugins.c:303
 #, fuzzy, c-format
 msgid "Missing function `%s' in transport plugin for `%s'\n"
 msgstr "Kunde inte slå upp \"%s\": %s\n"
 
-#: src/transport/gnunet-service-transport_plugins.c:264
+#: src/transport/gnunet-service-transport_plugins.c:310
 #, c-format
 msgid "Did not load plugin `%s' due to missing functions\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:476
-#: src/transport/gnunet-service-transport_validation.c:656
-#: src/transport/gnunet-service-transport_validation.c:929
-#: src/transport/gnunet-service-transport_validation.c:1532
-msgid "# validations running"
+#: src/transport/gnunet-service-transport_validation.c:343
+msgid "# Addresses in validation map"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:515
-msgid "# address records discarded"
+#: src/transport/gnunet-service-transport_validation.c:450
+#: src/transport/gnunet-service-transport_validation.c:638
+#: src/transport/gnunet-service-transport_validation.c:927
+#: src/transport/gnunet-service-transport_validation.c:1508
+msgid "# validations running"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:600
-msgid "# validations not attempted (no plugin)"
+#: src/transport/gnunet-service-transport_validation.c:493
+#, fuzzy
+msgid "# address records discarded (timeout)"
+msgstr "# byte kastade via TCP (utgående)"
+
+#: src/transport/gnunet-service-transport_validation.c:541
+msgid "# address records discarded (blacklist)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:646
+#: src/transport/gnunet-service-transport_validation.c:629
 msgid "# PINGs for address validation sent"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:755
+#: src/transport/gnunet-service-transport_validation.c:711
+msgid "# validations delayed by global throttle"
+msgstr ""
+
+#: src/transport/gnunet-service-transport_validation.c:748
 msgid "# address revalidations started"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1057
+#: src/transport/gnunet-service-transport_validation.c:1048
 #, fuzzy
 msgid "# PING message for different peer received"
 msgstr "# PING-meddelanden skapade"
 
-#: src/transport/gnunet-service-transport_validation.c:1108
+#: src/transport/gnunet-service-transport_validation.c:1099
 #, c-format
 msgid "Plugin `%s' not available, cannot confirm having this address\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1118
+#: src/transport/gnunet-service-transport_validation.c:1112
 msgid "# failed address checks during validation"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1121
+#: src/transport/gnunet-service-transport_validation.c:1115
 #, c-format
 msgid "Address `%s' is not one of my addresses, not confirming PING\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1129
+#: src/transport/gnunet-service-transport_validation.c:1123
 msgid "# successful address checks during validation"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1141
+#: src/transport/gnunet-service-transport_validation.c:1136
 #, c-format
 msgid ""
 "Not confirming PING from peer `%s' with address `%s' since I cannot confirm "
 "having this address.\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1149
-#, c-format
-msgid "Received a PING message with validation bug from `%s'\n"
-msgstr ""
-
-#: src/transport/gnunet-service-transport_validation.c:1203
+#: src/transport/gnunet-service-transport_validation.c:1191
 #, fuzzy, c-format
 msgid "Failed to create PONG signature for peer `%s'\n"
 msgstr "Kunde inte skapa namnrymd \"%s\" (existerar?).\n"
 
-#: src/transport/gnunet-service-transport_validation.c:1253
+#: src/transport/gnunet-service-transport_validation.c:1242
 msgid "# PONGs unicast via reliable transport"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1262
+#: src/transport/gnunet-service-transport_validation.c:1251
 msgid "# PONGs multicast to all available addresses"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1434
+#: src/transport/gnunet-service-transport_validation.c:1408
 msgid "# PONGs dropped, no matching pending validation"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1450
+#: src/transport/gnunet-service-transport_validation.c:1426
 msgid "# PONGs dropped, signature expired"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1502
+#: src/transport/gnunet-service-transport_validation.c:1478
 msgid "# validations succeeded"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1590
-#, fuzzy, c-format
-msgid "Validation received new %s message for peer `%s' with size %u\n"
-msgstr "Mottog ogiltigt \"%s\" meddelande från \"%s\".\n"
-
-#: src/transport/gnunet-service-transport_validation.c:1597
-#, fuzzy, c-format
-msgid "Adding `%s' without addresses for peer `%s'\n"
-msgstr "Motpart \"%s\" med pålitlighet %8u och adress \"%s\"\n"
-
-#: src/transport/gnunet-transport.c:578
+#: src/transport/gnunet-transport.c:580
 #, 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:587
+#: src/transport/gnunet-transport.c:589
 #: src/transport/gnunet-transport-profiler.c:274
 #, c-format
 msgid "Received %llu bytes/s (%llu bytes in %s)\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:619
+#: src/transport/gnunet-transport.c:621
 #, fuzzy, c-format
 msgid "Failed to connect to `%s'\n"
 msgstr "Misslyckades att ansluta till gnunetd.\n"
 
-#: src/transport/gnunet-transport.c:634
+#: src/transport/gnunet-transport.c:636
 #, 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:646
+#: src/transport/gnunet-transport.c:648
 #, fuzzy
 msgid "Failed to list connections, timeout occured\n"
 msgstr "Misslyckades att ansluta till gnunetd.\n"
 
-#: src/transport/gnunet-transport.c:673 src/transport/gnunet-transport.c:698
+#: src/transport/gnunet-transport.c:675 src/transport/gnunet-transport.c:700
 #, fuzzy, c-format
 msgid "Configuration for plugin `%s' did not work!\n"
 msgstr "Konfigurationsfil \"%s\" skapad.\n"
 
-#: src/transport/gnunet-transport.c:678
+#: src/transport/gnunet-transport.c:680
 #, fuzzy, c-format
 msgid "Configuration for plugin `%s' did work!\n"
 msgstr "Konfigurationsfil \"%s\" skapad.\n"
 
-#: src/transport/gnunet-transport.c:683
+#: src/transport/gnunet-transport.c:685
 #, 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:688
+#: src/transport/gnunet-transport.c:690
 #, fuzzy, c-format
 msgid "Failed to start NAT test for plugin `%s'\n"
 msgstr "Misslyckades att starta samling.\n"
 
-#: src/transport/gnunet-transport.c:693
+#: src/transport/gnunet-transport.c:695
 #, c-format
 msgid "Timeout while waiting for result of NAT test for plugin `%s'\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:818
+#: src/transport/gnunet-transport.c:820
 #, fuzzy, c-format
 msgid ""
 "Peer `%s' %s %s\n"
@@ -7638,195 +7628,195 @@ msgid ""
 "\t%s%s\n"
 msgstr "Jag är ändpunkt \"%s\".\n"
 
-#: src/transport/gnunet-transport.c:854
+#: src/transport/gnunet-transport.c:855
 #, fuzzy, c-format
 msgid "Peer `%s' %s `%s' \n"
 msgstr "Jag är ändpunkt \"%s\".\n"
 
-#: src/transport/gnunet-transport.c:953 src/transport/gnunet-transport.c:1702
+#: src/transport/gnunet-transport.c:949 src/transport/gnunet-transport.c:1744
 #, fuzzy
 msgid "Monitor disconnected from transport service. Reconnecting.\n"
 msgstr "Misslyckades att ansluta till gnunetd.\n"
 
-#: src/transport/gnunet-transport.c:1021
+#: src/transport/gnunet-transport.c:1006
 msgid "No transport plugins configured, peer will never communicate\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1035
+#: src/transport/gnunet-transport.c:1020
 #, c-format
 msgid "No port configured for plugin `%s', cannot test it\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1060
+#: src/transport/gnunet-transport.c:1045
 #, fuzzy
 msgid "Failed to start resolver!\n"
 msgstr "Misslyckades att starta samling.\n"
 
-#: src/transport/gnunet-transport.c:1106
+#: src/transport/gnunet-transport.c:1091
 #, 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:1129
+#: src/transport/gnunet-transport.c:1114
 #: src/transport/gnunet-transport-profiler.c:406
 #, fuzzy, c-format
 msgid "Successfully connected to `%s'\n"
 msgstr "Åtkomst nekad för \"%s\" vid %s:%d.\n"
 
-#: src/transport/gnunet-transport.c:1153
+#: src/transport/gnunet-transport.c:1138
 #, c-format
 msgid ""
 "Successfully connected to `%s', starting to send benchmark data in %u Kb "
 "blocks\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1186
+#: src/transport/gnunet-transport.c:1171
 #, fuzzy, c-format
 msgid "Successfully disconnected from `%s'\n"
 msgstr "Åtkomst nekad för \"%s\" vid %s:%d.\n"
 
-#: src/transport/gnunet-transport.c:1209
+#: src/transport/gnunet-transport.c:1194
 #: src/transport/gnunet-transport-profiler.c:434
 #, fuzzy, c-format
 msgid "Disconnected from peer `%s' while benchmarking\n"
 msgstr "\"%s\" ansluten till \"%s\".\n"
 
-#: src/transport/gnunet-transport.c:1234 src/transport/gnunet-transport.c:1260
+#: src/transport/gnunet-transport.c:1219 src/transport/gnunet-transport.c:1245
 #, c-format
 msgid "%24s: %-17s %4s   (%u connections in total)\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1236
+#: src/transport/gnunet-transport.c:1221
 #, fuzzy
 msgid "Connected to"
 msgstr "\"%s\" ansluten till \"%s\".\n"
 
-#: src/transport/gnunet-transport.c:1262
+#: src/transport/gnunet-transport.c:1247
 #, fuzzy
 msgid "Disconnected from"
 msgstr "\"%s\" ansluten till \"%s\".\n"
 
-#: src/transport/gnunet-transport.c:1286
+#: src/transport/gnunet-transport.c:1271
 #: src/transport/gnunet-transport-profiler.c:458
 #, c-format
 msgid "Received %u bytes from %s\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1318
+#: src/transport/gnunet-transport.c:1311
 #, c-format
 msgid "Peer `%s': %s %s in state `%s' until %s\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1330
+#: src/transport/gnunet-transport.c:1323
 #, fuzzy, c-format
 msgid "Peer `%s': %s %s\n"
 msgstr "Jag är ändpunkt \"%s\".\n"
 
-#: src/transport/gnunet-transport.c:1784
+#: src/transport/gnunet-transport.c:1831
 #: src/transport/gnunet-transport-profiler.c:492
 #, fuzzy
 msgid "Failed to send connect request to transport service\n"
 msgstr "Misslyckades att ansluta till gnunetd.\n"
 
-#: src/transport/gnunet-transport.c:1819
+#: src/transport/gnunet-transport.c:1866
 #, fuzzy
 msgid "Failed to send disconnect request to transport service\n"
 msgstr "Misslyckades att ansluta till gnunetd.\n"
 
-#: src/transport/gnunet-transport.c:1863
+#: src/transport/gnunet-transport.c:1910
 #, c-format
 msgid ""
 "Multiple operations given. Please choose only one operation: %s, %s, %s, %s, "
 "%s, %s %s\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1871
+#: src/transport/gnunet-transport.c:1918
 #, c-format
 msgid ""
 "No operation given. Please choose one operation: %s, %s, %s, %s, %s, %s, %s\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1890 src/transport/gnunet-transport.c:1920
-#: src/transport/gnunet-transport.c:1953 src/transport/gnunet-transport.c:1979
-#: src/transport/gnunet-transport.c:2035
+#: src/transport/gnunet-transport.c:1937 src/transport/gnunet-transport.c:1967
+#: src/transport/gnunet-transport.c:2000 src/transport/gnunet-transport.c:2026
+#: src/transport/gnunet-transport.c:2085
 #: src/transport/gnunet-transport-profiler.c:578
 #, fuzzy
 msgid "Failed to connect to transport service\n"
 msgstr "Misslyckades att ansluta till gnunetd.\n"
 
-#: src/transport/gnunet-transport.c:1899 src/transport/gnunet-transport.c:1930
-#: src/transport/gnunet-transport.c:1964
+#: src/transport/gnunet-transport.c:1946 src/transport/gnunet-transport.c:1977
+#: src/transport/gnunet-transport.c:2011
 #, fuzzy
 msgid "Failed to send request to transport service\n"
 msgstr "Misslyckades att ansluta till gnunetd.\n"
 
-#: src/transport/gnunet-transport.c:1984
+#: src/transport/gnunet-transport.c:2031
 msgid "Starting to receive benchmark data\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:2083
+#: src/transport/gnunet-transport.c:2133
 #, fuzzy
 msgid "print information for all peers (instead of only connected peers)"
 msgstr "Skriv ut information om GNUnets motparter."
 
-#: src/transport/gnunet-transport.c:2086
+#: src/transport/gnunet-transport.c:2136
 msgid "measure how fast we are receiving data from all peers (until CTRL-C)"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:2089
+#: src/transport/gnunet-transport.c:2139
 #, fuzzy
 msgid "connect to a peer"
 msgstr "Misslyckades att ansluta till gnunetd.\n"
 
-#: src/transport/gnunet-transport.c:2092
+#: src/transport/gnunet-transport.c:2142
 #, fuzzy
 msgid "disconnect to a peer"
 msgstr "Misslyckades att ansluta till gnunetd.\n"
 
-#: src/transport/gnunet-transport.c:2095
+#: src/transport/gnunet-transport.c:2145
 #, fuzzy
 msgid "print information for all pending validations "
 msgstr "Skriv ut information om GNUnets motparter."
 
-#: src/transport/gnunet-transport.c:2098
+#: src/transport/gnunet-transport.c:2148
 #, fuzzy
 msgid "print information for all pending validations continuously"
 msgstr "Skriv ut information om GNUnets motparter."
 
-#: src/transport/gnunet-transport.c:2101
+#: src/transport/gnunet-transport.c:2151
 #, fuzzy
 msgid "provide information about all current connections (once)"
 msgstr "Skriv ut information om GNUnets motparter."
 
-#: src/transport/gnunet-transport.c:2107
+#: src/transport/gnunet-transport.c:2157
 #, fuzzy
 msgid ""
 "provide information about all connects and disconnect events (continuously)"
 msgstr "Skriv ut information om GNUnets motparter."
 
-#: src/transport/gnunet-transport.c:2110
+#: src/transport/gnunet-transport.c:2160
 #, fuzzy
 msgid "do not resolve hostnames"
 msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 
-#: src/transport/gnunet-transport.c:2113
+#: src/transport/gnunet-transport.c:2163
 #: src/transport/gnunet-transport-profiler.c:638
 msgid "peer identity"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:2116
+#: src/transport/gnunet-transport.c:2166
 msgid "monitor plugin sessions"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:2119
+#: src/transport/gnunet-transport.c:2169
 msgid "send data for benchmarking to the other peer (until CTRL-C)"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:2122
+#: src/transport/gnunet-transport.c:2172
 msgid "test transport configuration (involves external server)"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:2133
+#: src/transport/gnunet-transport.c:2183
 #: src/transport/gnunet-transport-profiler.c:649
 #, fuzzy
 msgid "Direct access to transport service."
@@ -7926,158 +7916,159 @@ msgstr "antal meddelanden att använda per iteration"
 msgid "message size to use"
 msgstr "meddelandestorlek"
 
-#: src/transport/plugin_transport_http_client.c:1491
-#: src/transport/plugin_transport_http_server.c:2276
-#: src/transport/plugin_transport_http_server.c:3443
-#: src/transport/plugin_transport_tcp.c:2844
-#: src/transport/plugin_transport_tcp.c:2851
+#: src/transport/plugin_transport_http_client.c:1481
+#: src/transport/plugin_transport_http_server.c:2247
+#: src/transport/plugin_transport_http_server.c:3414
+#: src/transport/plugin_transport_tcp.c:2923
+#: src/transport/plugin_transport_tcp.c:2930
 msgid "TCP_STEALTH not supported on this platform.\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_client.c:2114
+#: src/transport/plugin_transport_http_client.c:2106
 #, c-format
 msgid "Could not initialize curl multi handle, failed to start %s plugin!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_client.c:2163
-#: src/transport/plugin_transport_http_server.c:3177
+#: src/transport/plugin_transport_http_client.c:2155
+#: src/transport/plugin_transport_http_server.c:3148
 #, fuzzy, c-format
 msgid "Shutting down plugin `%s'\n"
 msgstr "Testar transport(er) %s\n"
 
-#: src/transport/plugin_transport_http_client.c:2180
-#: src/transport/plugin_transport_http_server.c:3247
+#: src/transport/plugin_transport_http_client.c:2172
+#: src/transport/plugin_transport_http_server.c:3218
 #, 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:2214
+#: src/transport/plugin_transport_http_client.c:2206
 #, fuzzy, c-format
 msgid "Maximum number of requests is %u\n"
 msgstr "Maximalt antal chattklienter uppnått.\n"
 
-#: src/transport/plugin_transport_http_server.c:1763
+#: src/transport/plugin_transport_http_server.c:1734
 #, 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:1994
+#: src/transport/plugin_transport_http_server.c:1965
 #, c-format
 msgid "Accepting connection (%u of %u) from `%s'\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:2002
+#: src/transport/plugin_transport_http_server.c:1973
 #, c-format
 msgid ""
 "Server reached maximum number connections (%u), rejecting new connection\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:2152
+#: src/transport/plugin_transport_http_server.c:2123
 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:2175
+#: src/transport/plugin_transport_http_server.c:2146
 #, c-format
 msgid "No usable TLS certificate found and creating one at `%s/%s' failed!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:2302
+#: src/transport/plugin_transport_http_server.c:2273
 msgid "Could not load or create server certificate! Loading plugin failed!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:2611
+#: src/transport/plugin_transport_http_server.c:2582
 #, 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:2645 src/util/service.c:704
+#: src/transport/plugin_transport_http_server.c:2616 src/util/service.c:704
 #, fuzzy, c-format
 msgid "Failed to resolve `%s': %s\n"
 msgstr "Misslyckades att leverera \"%s\" meddelande.\n"
 
-#: src/transport/plugin_transport_http_server.c:2663 src/util/service.c:723
+#: src/transport/plugin_transport_http_server.c:2634 src/util/service.c:723
 #, 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:2776
+#: src/transport/plugin_transport_http_server.c:2747
 #, c-format
 msgid "Found %u addresses to report to NAT service\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:2854
+#: src/transport/plugin_transport_http_server.c:2825
+#: src/transport/plugin_transport_udp.c:3332
 msgid "Disabling IPv6 since it is not supported on this system!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:2953
+#: src/transport/plugin_transport_http_server.c:2924
 #, c-format
 msgid "IPv4 support is %s\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:2968
+#: src/transport/plugin_transport_http_server.c:2939
 #, c-format
 msgid "IPv6 support is %s\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:2974
+#: src/transport/plugin_transport_http_server.c:2945
 msgid "Neither IPv4 nor IPv6 are enabled! Fix in configuration\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:2985
+#: src/transport/plugin_transport_http_server.c:2956
 #, fuzzy
 msgid "Port is required! Fix in configuration\n"
 msgstr " gconfig\tGTK-konfiguration\n"
 
-#: src/transport/plugin_transport_http_server.c:2991
+#: src/transport/plugin_transport_http_server.c:2962
 #, fuzzy, c-format
 msgid "Using port %u\n"
 msgstr "Testar transport(er) %s\n"
 
-#: src/transport/plugin_transport_http_server.c:3005
+#: src/transport/plugin_transport_http_server.c:2976
 #, 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:3015
+#: src/transport/plugin_transport_http_server.c:2986
 #, fuzzy, c-format
 msgid "Binding to IPv4 address %s\n"
 msgstr "Ogiltigt svar på \"%s\".\n"
 
-#: src/transport/plugin_transport_http_server.c:3037
+#: src/transport/plugin_transport_http_server.c:3008
 #, 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:3047
+#: src/transport/plugin_transport_http_server.c:3018
 #, fuzzy, c-format
 msgid "Binding to IPv6 address %s\n"
 msgstr "Ogiltigt svar på \"%s\".\n"
 
-#: src/transport/plugin_transport_http_server.c:3110
+#: src/transport/plugin_transport_http_server.c:3081
 #, fuzzy, c-format
 msgid "Using external hostname `%s'\n"
 msgstr "Startade samling \"%s\".\n"
 
-#: src/transport/plugin_transport_http_server.c:3131
+#: src/transport/plugin_transport_http_server.c:3102
 #, 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:3148
+#: src/transport/plugin_transport_http_server.c:3119
 #, 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:3455
+#: src/transport/plugin_transport_http_server.c:3426
 #, fuzzy
 msgid "Unable to compile URL regex\n"
 msgstr "Kunde inte initiera SQLite.\n"
@@ -8130,238 +8121,259 @@ msgstr "# byte skickades via TCP"
 msgid "# bytes dropped by SMTP (outgoing)"
 msgstr "# byte kastade via TCP (utgående)"
 
-#: src/transport/plugin_transport_tcp.c:648
+#: src/transport/plugin_transport_tcp.c:672
 #, c-format
 msgid "Unexpected address length: %u bytes\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:829
-#: src/transport/plugin_transport_tcp.c:1044
-#: src/transport/plugin_transport_tcp.c:2239
-#: src/transport/plugin_transport_tcp.c:2950
+#: src/transport/plugin_transport_tcp.c:855
+#: src/transport/plugin_transport_tcp.c:1081
+#: src/transport/plugin_transport_tcp.c:2251
+#: src/transport/plugin_transport_tcp.c:3042
 #, fuzzy
 msgid "# TCP sessions active"
 msgstr "# sessionsnycklar accepterade"
 
-#: src/transport/plugin_transport_tcp.c:870
-#: src/transport/plugin_transport_tcp.c:1027
-#: src/transport/plugin_transport_tcp.c:1146
-#: src/transport/plugin_transport_tcp.c:1214
-#: src/transport/plugin_transport_tcp.c:1312
-#: src/transport/plugin_transport_tcp.c:1336
+#: src/transport/plugin_transport_tcp.c:897
+#: src/transport/plugin_transport_tcp.c:1063
+#: src/transport/plugin_transport_tcp.c:1187
+#: src/transport/plugin_transport_tcp.c:1260
+#: src/transport/plugin_transport_tcp.c:1360
+#: src/transport/plugin_transport_tcp.c:1385
 #, fuzzy
 msgid "# bytes currently in TCP buffers"
 msgstr "# byte skickades via TCP"
 
-#: src/transport/plugin_transport_tcp.c:873
+#: src/transport/plugin_transport_tcp.c:900
 #, fuzzy
 msgid "# bytes discarded by TCP (disconnect)"
 msgstr "# byte kastade via TCP (utgående)"
 
-#: src/transport/plugin_transport_tcp.c:1149
+#: src/transport/plugin_transport_tcp.c:1190
 #, fuzzy
 msgid "# bytes discarded by TCP (timeout)"
 msgstr "# byte kastade via TCP (utgående)"
 
-#: src/transport/plugin_transport_tcp.c:1218
+#: src/transport/plugin_transport_tcp.c:1264
 #, fuzzy
 msgid "# bytes transmitted via TCP"
 msgstr "# byte skickade av typen %d"
 
-#: src/transport/plugin_transport_tcp.c:1616
+#: src/transport/plugin_transport_tcp.c:1659
 msgid "# requests to create session with invalid address"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:1782
+#: src/transport/plugin_transport_tcp.c:1827
 msgid "# transport-service disconnect requests for TCP"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2292
+#: src/transport/plugin_transport_tcp.c:2310
 #, fuzzy
 msgid "# TCP WELCOME messages received"
 msgstr "# krypterade PONG-meddelanden mottagna"
 
-#: src/transport/plugin_transport_tcp.c:2470
+#: src/transport/plugin_transport_tcp.c:2501
 msgid "# bytes received via TCP"
 msgstr "# byte mottogs via TCP"
 
-#: src/transport/plugin_transport_tcp.c:2542
+#: src/transport/plugin_transport_tcp.c:2552
+#: src/transport/plugin_transport_tcp.c:2610
+#, fuzzy
+msgid "# TCP server connections active"
+msgstr "Nätverksanslutning"
+
+#: src/transport/plugin_transport_tcp.c:2556
+#, fuzzy
+msgid "# TCP server connect events"
+msgstr "# av anslutna parter"
+
+#: src/transport/plugin_transport_tcp.c:2562
+msgid "TCP connection limit reached, suspending server\n"
+msgstr ""
+
+#: src/transport/plugin_transport_tcp.c:2564
+msgid "# TCP service suspended"
+msgstr ""
+
+#: src/transport/plugin_transport_tcp.c:2604
+msgid "# TCP service resumed"
+msgstr ""
+
+#: src/transport/plugin_transport_tcp.c:2614
 msgid "# network-level TCP disconnect events"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2778 src/util/service.c:584
+#: src/transport/plugin_transport_tcp.c:2857 src/util/service.c:584
 #: src/util/service.c:590
 #, c-format
 msgid "Require valid port number for service `%s' in configuration!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2794
+#: src/transport/plugin_transport_tcp.c:2873
 #, fuzzy
 msgid "Failed to start service.\n"
 msgstr "Misslyckades att starta samling.\n"
 
-#: src/transport/plugin_transport_tcp.c:2937
+#: src/transport/plugin_transport_tcp.c:3030
 #, c-format
 msgid "TCP transport listening on port %llu\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2941
+#: src/transport/plugin_transport_tcp.c:3034
 msgid "TCP transport not listening on any port (client only)\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2945
+#: src/transport/plugin_transport_tcp.c:3038
 #, c-format
 msgid "TCP transport advertises itself as being on port %llu\n"
 msgstr ""
 
-#: src/transport/plugin_transport_udp_broadcasting.c:172
-#, fuzzy
-msgid "# IPv6 multicast HELLO beacons received via udp"
-msgstr "# krypterade PONG-meddelanden mottagna"
-
-#: src/transport/plugin_transport_udp_broadcasting.c:218
+#: src/transport/plugin_transport_udp_broadcasting.c:170
 #, fuzzy
-msgid "# IPv4 broadcast HELLO beacons received via udp"
+msgid "# Multicast HELLO beacons received via UDP"
 msgstr "# krypterade PONG-meddelanden mottagna"
 
-#: src/transport/plugin_transport_udp_broadcasting.c:609
+#: src/transport/plugin_transport_udp_broadcasting.c:548
 msgid ""
 "Disabling HELLO broadcasting due to friend-to-friend only configuration!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_udp_broadcasting.c:632
+#: src/transport/plugin_transport_udp_broadcasting.c:569
 #, c-format
 msgid "Failed to set IPv4 broadcast option for broadcast socket on port %d\n"
 msgstr ""
 
-#: src/transport/plugin_transport_udp.c:1658
-#, c-format
-msgid ""
-"Trying to create session for address of unexpected length %u (should be %u "
-"or %u)\n"
-msgstr ""
-
-#: src/transport/plugin_transport_udp.c:2905
+#: src/transport/plugin_transport_udp.c:3078
 #, c-format
 msgid ""
 "UDP could not transmit message to `%s': Network seems down, please check "
 "your network configuration\n"
 msgstr ""
 
-#: src/transport/plugin_transport_udp.c:2918
+#: src/transport/plugin_transport_udp.c:3092
 msgid ""
 "UDP could not transmit IPv6 message! Please check your network configuration "
 "and disable IPv6 if your connection does not have a global IPv6 address\n"
 msgstr ""
 
-#: src/transport/plugin_transport_udp.c:3271
+#: src/transport/plugin_transport_udp.c:3408
+#: src/transport/plugin_transport_udp.c:3507
 #, fuzzy, c-format
 msgid "Failed to bind UDP socket to %s: %s\n"
 msgstr "Misslyckades att binda till UDP6-port %d.\n"
 
-#: src/transport/plugin_transport_udp.c:3279
+#: src/transport/plugin_transport_udp.c:3426
+msgid "Disabling IPv4 since it is not supported on this system!\n"
+msgstr ""
+
+#: src/transport/plugin_transport_udp.c:3517
 #, fuzzy
 msgid "Failed to open UDP sockets\n"
 msgstr "Misslyckades att binda till UDP6-port %d.\n"
 
-#: src/transport/plugin_transport_udp.c:3438
-#, c-format
-msgid "Given `%s' option is out of range: %llu > %u\n"
+#: src/transport/plugin_transport_udp.c:3588
+#: src/transport/plugin_transport_udp.c:3602
+msgid "must be in [0,65535]"
 msgstr ""
 
-#: src/transport/plugin_transport_udp.c:3485
-#, fuzzy, c-format
-msgid "Invalid IPv6 address: `%s'\n"
-msgstr "Ogiltigt svar på \"%s\".\n"
+#: src/transport/plugin_transport_udp.c:3634
+#, fuzzy
+msgid "must be valid IPv4 address"
+msgstr "\"%s\" är inte tillgänglig."
+
+#: src/transport/plugin_transport_udp.c:3661
+#, fuzzy
+msgid "must be valid IPv6 address"
+msgstr "\"%s\" är inte tillgänglig."
 
-#: src/transport/plugin_transport_udp.c:3553
+#: src/transport/plugin_transport_udp.c:3727
 #, fuzzy
-msgid "Failed to create network sockets, plugin failed\n"
+msgid "Failed to create UDP network sockets\n"
 msgstr "Kunde inte skapa namnrymd \"%s\" (existerar?).\n"
 
-#: src/transport/plugin_transport_unix.c:1405
+#: src/transport/plugin_transport_unix.c:1393
 #, fuzzy, c-format
 msgid "Cannot create path to `%s'\n"
 msgstr "Kunde inte skapa namnrymd \"%s\" (existerar?).\n"
 
-#: src/transport/plugin_transport_unix.c:1418
+#: src/transport/plugin_transport_unix.c:1406
 #, fuzzy, c-format
 msgid "Cannot bind to `%s'\n"
 msgstr "Kunde inte skapa namnrymd \"%s\" (existerar?).\n"
 
-#: src/transport/plugin_transport_unix.c:1819
+#: src/transport/plugin_transport_unix.c:1807
 #, fuzzy
 msgid "Failed to open UNIX listen socket\n"
 msgstr "Misslyckades att leverera \"%s\" meddelande.\n"
 
-#: src/transport/plugin_transport_wlan.c:733
+#: src/transport/plugin_transport_wlan.c:742
 msgid "# ACKs sent"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:753
+#: src/transport/plugin_transport_wlan.c:762
 #, fuzzy
 msgid "# Messages defragmented"
 msgstr "# PING-meddelanden skapade"
 
-#: src/transport/plugin_transport_wlan.c:794
-#: src/transport/plugin_transport_wlan.c:881
+#: src/transport/plugin_transport_wlan.c:803
+#: src/transport/plugin_transport_wlan.c:890
 #, fuzzy
 msgid "# Sessions allocated"
 msgstr "# sessionsnycklar accepterade"
 
-#: src/transport/plugin_transport_wlan.c:1002
+#: src/transport/plugin_transport_wlan.c:1011
 #, fuzzy
 msgid "# message fragments sent"
 msgstr "# byte mottogs via TCP"
 
-#: src/transport/plugin_transport_wlan.c:1031
+#: src/transport/plugin_transport_wlan.c:1040
 #, fuzzy
 msgid "# messages pending (with fragmentation)"
 msgstr "# byte mottogs via TCP"
 
-#: src/transport/plugin_transport_wlan.c:1162
-#: src/transport/plugin_transport_wlan.c:1255
-#: src/transport/plugin_transport_wlan.c:2272
+#: src/transport/plugin_transport_wlan.c:1171
+#: src/transport/plugin_transport_wlan.c:1264
+#: src/transport/plugin_transport_wlan.c:2268
 #, fuzzy
 msgid "# MAC endpoints allocated"
 msgstr "# byte mottogs via TCP"
 
-#: src/transport/plugin_transport_wlan.c:1530
+#: src/transport/plugin_transport_wlan.c:1528
 #, fuzzy
 msgid "# ACKs received"
 msgstr "# byte mottogs via TCP"
 
-#: src/transport/plugin_transport_wlan.c:1599
+#: src/transport/plugin_transport_wlan.c:1597
 #, fuzzy
 msgid "# DATA messages discarded due to CRC32 error"
 msgstr "Nätverksannonsering avstängd i konfigurationen!\n"
 
-#: src/transport/plugin_transport_wlan.c:1707
+#: src/transport/plugin_transport_wlan.c:1703
 #, fuzzy
 msgid "# HELLO beacons sent"
 msgstr "# byte skickade via UDP"
 
-#: src/transport/plugin_transport_wlan.c:1824
+#: src/transport/plugin_transport_wlan.c:1820
 #, fuzzy
 msgid "# DATA messages received"
 msgstr "# krypterade PONG-meddelanden mottagna"
 
-#: src/transport/plugin_transport_wlan.c:1858
+#: src/transport/plugin_transport_wlan.c:1854
 #, fuzzy
 msgid "# DATA messages processed"
 msgstr "# krypterade PONG-meddelanden mottagna"
 
-#: src/transport/plugin_transport_wlan.c:2247
+#: src/transport/plugin_transport_wlan.c:2243
 #, c-format
 msgid "Helper binary `%s' not SUID, cannot run WLAN transport\n"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:2269
+#: src/transport/plugin_transport_wlan.c:2265
 #, fuzzy
 msgid "# sessions allocated"
 msgstr "# sessionsnycklar accepterade"
 
-#: src/transport/transport_api.c:816
+#: src/transport/transport_api.c:812
 #, fuzzy, c-format
 msgid "Received unexpected message of type %u in %s:%u\n"
 msgstr "Mottog skadat meddelande från motpart \"%s\"i %s:%d.\n"
@@ -8406,42 +8418,38 @@ msgstr ""
 msgid "Metadata `%s' failed to deserialize"
 msgstr ""
 
-#: src/util/client.c:261 src/util/client.c:858 src/util/service.c:621
+#: src/util/client.c:263 src/util/client.c:889 src/util/service.c:621
 #, c-format
 msgid "UNIXPATH `%s' too long, maximum length is %llu\n"
 msgstr ""
 
-#: src/util/client.c:265 src/util/client.c:863 src/util/service.c:625
+#: src/util/client.c:267 src/util/client.c:894 src/util/service.c:625
 #, fuzzy, c-format
 msgid "Using `%s' instead\n"
 msgstr "%s: flagga \"%s\" är tvetydig\n"
 
-#: src/util/client.c:360
+#: src/util/client.c:362
 #, c-format
 msgid ""
 "Could not determine valid hostname and port for service `%s' from "
 "configuration.\n"
 msgstr ""
 
-#: src/util/client.c:368
+#: src/util/client.c:370
 #, c-format
 msgid "Need a non-empty hostname for service `%s'.\n"
 msgstr ""
 
-#: src/util/client.c:1008
+#: src/util/client.c:1039
 #, fuzzy, c-format
 msgid "Could not connect to service `%s', configuration broken.\n"
 msgstr "Kunde inte ansluta till gnunetd.\n"
 
-#: src/util/client.c:1020
+#: src/util/client.c:1051
 #, fuzzy, c-format
 msgid "Failure to transmit request to service `%s'\n"
 msgstr "Misslyckades att skicka HTTP-begäran till värd \"%s\": %s\n"
 
-#: src/util/client.c:1299
-msgid "Could not submit request, not expecting to receive a response.\n"
-msgstr ""
-
 #: src/util/common_logging.c:254 src/util/common_logging.c:1039
 msgid "DEBUG"
 msgstr "FELSÖKNING"
@@ -8507,49 +8515,33 @@ msgid ""
 "choices\n"
 msgstr ""
 
-#: src/util/configuration.c:1144
+#: src/util/configuration.c:1145
 #, c-format
 msgid "Recursive expansion suspected, aborting $-expansion for term `%s'\n"
 msgstr ""
 
-#: src/util/configuration.c:1176
+#: src/util/configuration.c:1177
 #, fuzzy, c-format
 msgid "Missing closing `%s' in option `%s'\n"
 msgstr "Konfigurationsfil \"%s\" skapad.\n"
 
-#: src/util/configuration.c:1250
+#: src/util/configuration.c:1251
 #, c-format
 msgid ""
 "Failed to expand `%s' in `%s' as it is neither found in [PATHS] nor defined "
 "as an environmental variable\n"
 msgstr ""
 
-#: src/util/connection.c:423
+#: src/util/connection.c:424
 #, fuzzy, c-format
 msgid "Access denied to `%s'\n"
 msgstr "Åtkomst nekad för \"%s\" vid %s:%d.\n"
 
-#: src/util/connection.c:438
+#: src/util/connection.c:441
 #, c-format
 msgid "Accepting connection from `%s': %p\n"
 msgstr ""
 
-#: src/util/connection.c:553
-#, fuzzy, c-format
-msgid ""
-"Failed to establish TCP connection to `%s:%u', no further addresses to try.\n"
-msgstr "Misslyckades att starta samling.\n"
-
-#: src/util/connection.c:751 src/util/connection.c:914
-#, fuzzy, c-format
-msgid "Trying to connect to `%s' (%p)\n"
-msgstr "Kan inte ansluta till %u.%u.%u.%u:%u: %s\n"
-
-#: src/util/connection.c:904
-#, fuzzy, c-format
-msgid "Attempt to connect to `%s' failed\n"
-msgstr " Anslutning misslyckades\n"
-
 #: src/util/container_bloomfilter.c:531
 #, c-format
 msgid ""
@@ -8557,52 +8549,52 @@ msgid ""
 "%llu)\n"
 msgstr ""
 
-#: src/util/crypto_ecc.c:702 src/util/crypto_ecc.c:740
-#: src/util/crypto_ecc.c:858 src/util/crypto_ecc.c:896
+#: src/util/crypto_ecc.c:731 src/util/crypto_ecc.c:769
+#: src/util/crypto_ecc.c:887 src/util/crypto_ecc.c:925
 #, fuzzy, c-format
 msgid "Could not acquire lock on file `%s': %s...\n"
 msgstr "Kunde inte slå upp \"%s\": %s\n"
 
-#: src/util/crypto_ecc.c:707 src/util/crypto_ecc.c:863
+#: src/util/crypto_ecc.c:736 src/util/crypto_ecc.c:892
 #, fuzzy
 msgid "Creating a new private key.  This may take a while.\n"
 msgstr "Skapar ny värdnyckel (det här kan ta en stund).\n"
 
-#: src/util/crypto_ecc.c:744 src/util/crypto_ecc.c:900
+#: src/util/crypto_ecc.c:773 src/util/crypto_ecc.c:929
 msgid "This may be ok if someone is currently generating a private key.\n"
 msgstr ""
 
-#: src/util/crypto_ecc.c:774 src/util/crypto_ecc.c:930
+#: src/util/crypto_ecc.c:803 src/util/crypto_ecc.c:959
 #, c-format
 msgid ""
 "When trying to read key file `%s' I found %u bytes but I need at least %u.\n"
 msgstr ""
 
-#: src/util/crypto_ecc.c:778 src/util/crypto_ecc.c:934
+#: src/util/crypto_ecc.c:807 src/util/crypto_ecc.c:963
 msgid "This may be ok if someone is currently generating a key.\n"
 msgstr ""
 
-#: src/util/crypto_ecc.c:1016
+#: src/util/crypto_ecc.c:1045
 #, fuzzy
 msgid "Could not load peer's private key\n"
 msgstr "Kunde inte tolka konfigurationsfil \"%s\".\n"
 
-#: src/util/crypto_ecc.c:1120
+#: src/util/crypto_ecc.c:1149
 #, fuzzy, c-format
 msgid "ECC signing failed at %s:%d: %s\n"
 msgstr "\"%s\" misslyckades vid %s:%d med fel: \"%s\".\n"
 
-#: src/util/crypto_ecc.c:1170
+#: src/util/crypto_ecc.c:1199
 #, fuzzy, c-format
 msgid "EdDSA signing failed at %s:%d: %s\n"
 msgstr "\"%s\" misslyckades vid %s:%d med fel: \"%s\".\n"
 
-#: src/util/crypto_ecc.c:1244
+#: src/util/crypto_ecc.c:1273
 #, fuzzy, c-format
 msgid "ECDSA signature verification failed at %s:%d: %s\n"
 msgstr "\"%s\" misslyckades vid %s:%d med fel: \"%s\".\n"
 
-#: src/util/crypto_ecc.c:1301
+#: src/util/crypto_ecc.c:1330
 #, fuzzy, c-format
 msgid "EdDSA signature verification failed at %s:%d: %s\n"
 msgstr "\"%s\" misslyckades vid %s:%d med fel: \"%s\".\n"
@@ -8896,17 +8888,17 @@ msgstr ""
 msgid "Perform default-actions for GNUnet URIs"
 msgstr ""
 
-#: src/util/helper.c:338
+#: src/util/helper.c:342
 #, fuzzy, c-format
 msgid "Error reading from `%s': %s\n"
 msgstr "Fel vid skapandet av användare"
 
-#: src/util/helper.c:383
+#: src/util/helper.c:388
 #, fuzzy, c-format
 msgid "Failed to parse inbound message from helper `%s'\n"
 msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 
-#: src/util/helper.c:609
+#: src/util/helper.c:618
 #, fuzzy, c-format
 msgid "Error writing to `%s': %s\n"
 msgstr "Fel vid skapandet av användare"
@@ -8916,7 +8908,7 @@ msgstr "Fel vid skapandet av användare"
 msgid "Unable to shorten unix path `%s' while keeping name unique\n"
 msgstr ""
 
-#: src/util/network.c:1669 src/util/network.c:1845
+#: src/util/network.c:1681 src/util/network.c:1857
 #, c-format
 msgid ""
 "Fatal internal logic error, process hangs in `%s' (abort with CTRL-C)!\n"
@@ -9003,17 +8995,13 @@ msgstr ""
 msgid "Timeout trying to resolve hostname `%s'.\n"
 msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 
-#: src/util/resolver_api.c:974
+#: src/util/resolver_api.c:1004
 #, fuzzy, c-format
 msgid "Could not resolve our FQDN : %s\n"
 msgstr "Kunde inte slå upp \"%s\": %s\n"
 
-#: src/util/scheduler.c:812
-msgid "Looks like we're busy waiting...\n"
-msgstr ""
-
 # drive = hard drive ?
-#: src/util/server.c:484
+#: src/util/server.c:483
 #, fuzzy, c-format
 msgid "`%s' failed for port %d (%s).\n"
 msgstr "\"%s\" misslyckades för enhet %s: %u\n"
@@ -9028,7 +9016,7 @@ msgstr "\"%s\" misslyckades för port %d: %s. Körs verkligen gnunetd?\n"
 msgid "`%s' failed for `%s': address already in use\n"
 msgstr "\"%s\" misslyckades för port %d: %s. Körs verkligen gnunetd?\n"
 
-#: src/util/server.c:896
+#: src/util/server.c:904
 #, c-format
 msgid ""
 "Processing code for message of type %u did not call "
@@ -9182,63 +9170,63 @@ msgstr " dagar"
 msgid "end of time"
 msgstr ""
 
-#: src/util/strings.c:1192
+#: src/util/strings.c:1226
 msgid "IPv6 address did not start with `['\n"
 msgstr ""
 
-#: src/util/strings.c:1200
+#: src/util/strings.c:1234
 msgid "IPv6 address did contain ':' to separate port number\n"
 msgstr ""
 
-#: src/util/strings.c:1206
+#: src/util/strings.c:1240
 msgid "IPv6 address did contain ']' before ':' to separate port number\n"
 msgstr ""
 
-#: src/util/strings.c:1213
+#: src/util/strings.c:1247
 msgid "IPv6 address did contain a valid port number after the last ':'\n"
 msgstr ""
 
-#: src/util/strings.c:1222
+#: src/util/strings.c:1256
 #, fuzzy, c-format
 msgid "Invalid IPv6 address `%s': %s\n"
 msgstr "Ogiltigt svar på \"%s\".\n"
 
-#: src/util/strings.c:1428 src/util/strings.c:1444
+#: src/util/strings.c:1462 src/util/strings.c:1478
 msgid "Port not in range\n"
 msgstr ""
 
-#: src/util/strings.c:1453
+#: src/util/strings.c:1487
 #, fuzzy, c-format
 msgid "Malformed port policy `%s'\n"
 msgstr "Misslyckades att starta samling.\n"
 
-#: src/util/strings.c:1536 src/util/strings.c:1567 src/util/strings.c:1615
-#: src/util/strings.c:1636
+#: src/util/strings.c:1570 src/util/strings.c:1601 src/util/strings.c:1649
+#: src/util/strings.c:1670
 #, c-format
 msgid "Invalid format for IP: `%s'\n"
 msgstr "Ogiltigt format för IP: \"%s\"\n"
 
-#: src/util/strings.c:1593
+#: src/util/strings.c:1627
 #, c-format
 msgid "Invalid network notation ('/%d' is not legal in IPv4 CIDR)."
 msgstr "Ogiltig nätverksnotation (\"/%d\" är inte giltig i IPv4 CIDR)."
 
-#: src/util/strings.c:1645
+#: src/util/strings.c:1679
 #, fuzzy, c-format
 msgid "Invalid format: `%s'\n"
 msgstr "Ogiltigt format för IP: \"%s\"\n"
 
-#: src/util/strings.c:1697
+#: src/util/strings.c:1731
 #, c-format
 msgid "Invalid network notation (does not end with ';': `%s')\n"
 msgstr "Ogiltig nätverksnotation (slutar inte med \";\": \"%s\")\n"
 
-#: src/util/strings.c:1747
+#: src/util/strings.c:1781
 #, fuzzy, c-format
 msgid "Wrong format `%s' for netmask\n"
 msgstr "Fel format \"%s\" för nätmask: %s\n"
 
-#: src/util/strings.c:1778
+#: src/util/strings.c:1812
 #, fuzzy, c-format
 msgid "Wrong format `%s' for network\n"
 msgstr "Fel format \"%s\" för nätverk: %s\n"
@@ -9426,23 +9414,86 @@ msgstr "# byte mottagna via UDP"
 msgid "Setup tunnels via VPN."
 msgstr ""
 
-#: src/include/gnunet_common.h:588 src/include/gnunet_common.h:595
-#: src/include/gnunet_common.h:603
+#: src/include/gnunet_common.h:590 src/include/gnunet_common.h:597
+#: src/include/gnunet_common.h:605
 #, fuzzy, c-format
 msgid "Assertion failed at %s:%d.\n"
 msgstr "\"%s\" misslyckades vid %s:%d med fel: \"%s\".\n"
 
-#: src/include/gnunet_common.h:615
+#: src/include/gnunet_common.h:617
 #, c-format
 msgid "External protocol violation detected at %s:%d.\n"
 msgstr ""
 
-#: src/include/gnunet_common.h:642 src/include/gnunet_common.h:651
+#: src/include/gnunet_common.h:644 src/include/gnunet_common.h:653
 #, c-format
 msgid "`%s' failed on file `%s' at %s:%d with error: %s\n"
 msgstr "\"%s\" misslyckades för fil \"%s\" vid %s:%d med fel: %s\n"
 
 #, fuzzy
+#~ msgid "Failed to initialize solver!\n"
+#~ msgstr "Kunde inte initiera SQLite.\n"
+
+#, fuzzy
+#~ msgid "Invalid network type `%u' `%s': Disconnect!\n"
+#~ msgstr "Kan inte öppna konfigurationsfil \"%s\".\n"
+
+#, fuzzy
+#~ msgid "Failed to receive response from database.\n"
+#~ msgstr "Misslyckades att ta emot svar till \"%s\" meddelande från gnunetd\n"
+
+#, fuzzy
+#~ msgid "Could not obtain a valid network for `%s' %s (%s)\n"
+#~ msgstr "Kunde inte köra \"%s\": %s\n"
+
+#, fuzzy
+#~ msgid "Blacklist refuses connection attempt to peer `%s'\n"
+#~ msgstr "Misslyckades att ansluta till gnunetd.\n"
+
+#, fuzzy
+#~ msgid "# keepalives sent"
+#~ msgstr "# sessionsnycklar skickade"
+
+#, fuzzy
+#~ msgid ""
+#~ "Failed to send SYN message to peer `%s' using address `%s' session %p\n"
+#~ msgstr "Misslyckades att ansluta till gnunetd.\n"
+
+#, fuzzy
+#~ msgid "# Failed attempts to switch addresses (no response)"
+#~ msgstr "Misslyckades att skicka HTTP-begäran till värd \"%s\": %s\n"
+
+#, fuzzy
+#~ msgid "Validation received new %s message for peer `%s' with size %u\n"
+#~ msgstr "Mottog ogiltigt \"%s\" meddelande från \"%s\".\n"
+
+#, fuzzy
+#~ msgid "Adding `%s' without addresses for peer `%s'\n"
+#~ msgstr "Motpart \"%s\" med pålitlighet %8u och adress \"%s\"\n"
+
+#, fuzzy
+#~ msgid "# IPv4 broadcast HELLO beacons received via udp"
+#~ msgstr "# krypterade PONG-meddelanden mottagna"
+
+#, fuzzy
+#~ msgid "Invalid IPv6 address: `%s'\n"
+#~ msgstr "Ogiltigt svar på \"%s\".\n"
+
+#, fuzzy
+#~ msgid ""
+#~ "Failed to establish TCP connection to `%s:%u', no further addresses to "
+#~ "try.\n"
+#~ msgstr "Misslyckades att starta samling.\n"
+
+#, fuzzy
+#~ msgid "Trying to connect to `%s' (%p)\n"
+#~ msgstr "Kan inte ansluta till %u.%u.%u.%u:%u: %s\n"
+
+#, fuzzy
+#~ msgid "Attempt to connect to `%s' failed\n"
+#~ msgstr " Anslutning misslyckades\n"
+
+#, fuzzy
 #~ msgid "# PING without HELLO messages sent"
 #~ msgstr "# PING-meddelanden i klartext skickade"
 
@@ -10256,10 +10307,6 @@ msgstr "\"%s\" misslyckades för fil \"%s\" vid %s:%d med fel: %s\n"
 #~ msgstr "\"%s\" %s misslyckades: %s\n"
 
 #, fuzzy
-#~ msgid "# Peers connected"
-#~ msgstr "# av anslutna parter"
-
-#, fuzzy
 #~ msgid "%s failed for `%s' at %s:%d: `%s'\n"
 #~ msgstr "\"%s\" misslyckades vid %s:%d med fel: \"%s\".\n"
 
diff --git a/po/vi.po b/po/vi.po
index cd61e1cff..f0bed951a 100644
--- a/po/vi.po
+++ b/po/vi.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnunet 0.8.0a\n"
 "Report-Msgid-Bugs-To: gnunet-developers@mail.gnu.org\n"
-"POT-Creation-Date: 2015-01-27 19:22+0100\n"
+"POT-Creation-Date: 2015-03-07 12:06+0100\n"
 "PO-Revision-Date: 2008-09-10 22:05+0930\n"
 "Last-Translator: Clytie Siddall <clytie@riverland.net.au>\n"
 "Language-Team: Vietnamese <vi-VN@googlegroups.com>\n"
@@ -337,150 +337,138 @@ msgstr ""
 msgid "Initiating shutdown as requested by client.\n"
 msgstr ""
 
-#: src/ats/gnunet-ats-solver-eval.c:2810 src/ats/gnunet-ats-solver-eval.c:2851
-#: src/ats/gnunet-service-ats_addresses.c:1635
-#: src/ats/gnunet-service-ats_addresses.c:1683
+#: src/ats/gnunet-ats-solver-eval.c:2778 src/ats/gnunet-ats-solver-eval.c:2819
 #, c-format
 msgid ""
 "Could not load quota for network `%s':  `%s', assigning default bandwidth "
 "%llu\n"
 msgstr ""
 
-#: src/ats/gnunet-ats-solver-eval.c:2828
-#: src/ats/gnunet-service-ats_addresses.c:1653
+#: src/ats/gnunet-ats-solver-eval.c:2796
 #, c-format
 msgid ""
 "No outbound quota configured for network `%s', assigning default bandwidth "
 "%llu\n"
 msgstr ""
 
-#: src/ats/gnunet-ats-solver-eval.c:2869
-#: src/ats/gnunet-service-ats_addresses.c:1701
+#: src/ats/gnunet-ats-solver-eval.c:2837
 #, c-format
 msgid ""
 "No outbound quota configure for network `%s', assigning default bandwidth "
 "%llu\n"
 msgstr ""
 
-#: src/ats/gnunet-ats-solver-eval.c:3434
+#: src/ats/gnunet-ats-solver-eval.c:3290
 #: src/ats-tests/gnunet-solver-eval.c:918
 msgid "solver to use"
 msgstr ""
 
-#: src/ats/gnunet-ats-solver-eval.c:3437
+#: src/ats/gnunet-ats-solver-eval.c:3293
 #: src/ats-tests/gnunet-solver-eval.c:921
 #: src/ats-tests/gnunet-solver-eval.c:924
 msgid "experiment to use"
 msgstr ""
 
-#: src/ats/gnunet-ats-solver-eval.c:3440
+#: src/ats/gnunet-ats-solver-eval.c:3296
 msgid "be verbose"
 msgstr "xuất chi tiết"
 
-#: src/ats/gnunet-ats-solver-eval.c:3443
+#: src/ats/gnunet-ats-solver-eval.c:3299
 #, fuzzy
 msgid "print logging"
 msgstr "Theo dõi"
 
-#: src/ats/gnunet-ats-solver-eval.c:3446
+#: src/ats/gnunet-ats-solver-eval.c:3302
 msgid "save logging to disk"
 msgstr ""
 
-#: src/ats/gnunet-ats-solver-eval.c:3449
+#: src/ats/gnunet-ats-solver-eval.c:3305
 msgid "disable normalization"
 msgstr ""
 
-#: src/ats/gnunet-service-ats_addresses.c:1644
+#: src/ats/gnunet-service-ats_plugins.c:304
 #, c-format
-msgid "Outbound quota configure for network `%s' is %llu\n"
+msgid ""
+"Could not load %s quota for network `%s':  `%s', assigning default bandwidth "
+"%llu\n"
 msgstr ""
 
-#: src/ats/gnunet-service-ats_addresses.c:1692
+#: src/ats/gnunet-service-ats_plugins.c:314
 #, c-format
-msgid "Inbound quota configured for network `%s' is %llu\n"
+msgid "%s quota configured for network `%s' is %llu\n"
 msgstr ""
 
-#: src/ats/gnunet-service-ats_addresses.c:1895
+#: src/ats/gnunet-service-ats_plugins.c:359
 #, c-format
-msgid "Initializing solver `%s '`%s'\n"
+msgid ""
+"No %s-quota configured for network `%s', assigning default bandwidth %llu\n"
 msgstr ""
 
-#: src/ats/gnunet-service-ats_addresses.c:1901
+#: src/ats/gnunet-service-ats_plugins.c:451
 #, 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:1926
-#, fuzzy
-msgid "Failed to initialize solver!\n"
-msgstr "Không thể sơ khởi SQLite: %s.\n"
-
-#: src/ats/plugin_ats_mlp.c:1345
+#: src/ats/plugin_ats_mlp.c:1274
 msgid "Problem size too large, cannot allocate memory!\n"
 msgstr ""
 
-#: src/ats/plugin_ats_mlp.c:1941
+#: src/ats/plugin_ats_mlp.c:1869
 #, 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:1993
-#, c-format
-msgid "Updating address property `%s' for peer `%s' %p not added before\n"
-msgstr ""
+#: src/ats/plugin_ats_mlp.c:1913
+#, fuzzy, c-format
+msgid "Updating address property for peer `%s' %p not added before\n"
+msgstr "Không thể lấy địa chỉ của đồng đẳng « %s ».\n"
 
-#: src/ats/plugin_ats_mlp.c:2714
+#: src/ats/plugin_ats_mlp.c:2475
 msgid ""
 "MLP solver is not optimizing for anything, changing to feasibility check\n"
 msgstr ""
 
-#: src/ats/plugin_ats_mlp.c:2754 src/ats/plugin_ats_mlp.c:2771
-#: src/ats/plugin_ats_mlp.c:2803 src/ats/plugin_ats_mlp.c:2821
-#: src/ats/plugin_ats_mlp.c:2840 src/ats/plugin_ats_proportional.c:1993
-#: src/ats/plugin_ats_proportional.c:2014 src/ats/plugin_ats_ril.c:2718
-#: src/ats/plugin_ats_ril.c:2735 src/ats/plugin_ats_ril.c:2752
-#: src/ats/plugin_ats_ril.c:2769 src/ats/plugin_ats_ril.c:2786
-#: src/ats/plugin_ats_ril.c:2803 src/ats/plugin_ats_ril.c:2820
-#: src/ats/plugin_ats_ril.c:2837
+#: src/ats/plugin_ats_mlp.c:2515 src/ats/plugin_ats_mlp.c:2532
+#: src/ats/plugin_ats_mlp.c:2564 src/ats/plugin_ats_mlp.c:2582
+#: src/ats/plugin_ats_mlp.c:2601 src/ats/plugin_ats_proportional.c:1140
+#: src/ats/plugin_ats_ril.c:2613 src/ats/plugin_ats_ril.c:2630
+#: src/ats/plugin_ats_ril.c:2647 src/ats/plugin_ats_ril.c:2664
+#: src/ats/plugin_ats_ril.c:2681 src/ats/plugin_ats_ril.c:2698
+#: src/ats/plugin_ats_ril.c:2715 src/ats/plugin_ats_ril.c:2732
 #, 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:2927
+#: src/ats/plugin_ats_mlp.c:2670
 #, 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:2936
+#: src/ats/plugin_ats_mlp.c:2679
 #, 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:2947
+#: src/ats/plugin_ats_mlp.c:2689
 #, c-format
 msgid ""
 "Adjusting outbound quota configuration for network `%s'from %llu to %.0f\n"
 msgstr ""
 
-#: src/ats/plugin_ats_mlp.c:2955
+#: src/ats/plugin_ats_mlp.c:2698
 #, c-format
 msgid ""
 "Adjusting inbound quota configuration for network `%s' from %llu to %.0f\n"
 msgstr ""
 
-#: src/ats/plugin_ats_mlp.c:2966
-#, c-format
-msgid "Using default quota configuration for network `%s' (in/out) %llu/%llu\n"
-msgstr ""
-
-#: src/ats/plugin_ats_proportional.c:1852
+#: src/ats/plugin_ats_proportional.c:1163
 #, 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"
+msgid "Invalid %s configuration %f\n"
+msgstr "Không th�� lưu t���p tin c���u h��nh « %s »:"
 
 #: src/ats-tests/ats-testing.c:72
 msgid "Benchmarking done\n"
@@ -515,7 +503,7 @@ msgstr ""
 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:677
+#: src/ats-tests/ats-testing.c:490 src/ats-tests/ats-testing.c:662
 #, fuzzy
 msgid "Initialization failed, shutdown\n"
 msgstr "Lỗi sơ khởi cơ chế phần bổ sung: %s\n"
@@ -537,127 +525,127 @@ msgid ""
 "= %u KiB/s\n"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:296
+#: src/ats-tool/gnunet-ats.c:289
 #, c-format
 msgid "%u address resolutions had a timeout\n"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:300
+#: src/ats-tool/gnunet-ats.c:293
 #, c-format
 msgid "ATS returned stat_results for %u addresses\n"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:377
-msgid "active "
-msgstr ""
-
-#: src/ats-tool/gnunet-ats.c:377
-msgid "inactive "
-msgstr ""
-
-#: src/ats-tool/gnunet-ats.c:426
+#: src/ats-tool/gnunet-ats.c:366
 #, 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:543
+#: src/ats-tool/gnunet-ats.c:373
+msgid "active "
+msgstr ""
+
+#: src/ats-tool/gnunet-ats.c:373
+msgid "inactive "
+msgstr ""
+
+#: src/ats-tool/gnunet-ats.c:483
 #, fuzzy, c-format
 msgid "Removed address of peer `%s' with plugin `%s'\n"
 msgstr "Đã nạp truyền tải « %s »\n"
 
-#: src/ats-tool/gnunet-ats.c:744
+#: src/ats-tool/gnunet-ats.c:676
 #, c-format
 msgid "Quota for network `%11s' (in/out): %10s / %10s\n"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:776 src/namestore/gnunet-namestore.c:700
-#: src/transport/gnunet-transport.c:1843
+#: src/ats-tool/gnunet-ats.c:708 src/namestore/gnunet-namestore.c:700
+#: src/transport/gnunet-transport.c:1890
 #: src/transport/gnunet-transport-profiler.c:531
 #, 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:790 src/transport/gnunet-transport.c:1852
+#: src/ats-tool/gnunet-ats.c:722 src/transport/gnunet-transport.c:1899
 #: src/transport/gnunet-transport-profiler.c:549
 #, 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:800
+#: src/ats-tool/gnunet-ats.c:732
 #, c-format
 msgid "Please select one operation : %s or %s or %s or %s or %s\n"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:822 src/ats-tool/gnunet-ats.c:848
-#: src/ats-tool/gnunet-ats.c:876 src/ats-tool/gnunet-ats.c:922
+#: src/ats-tool/gnunet-ats.c:754 src/ats-tool/gnunet-ats.c:780
+#: src/ats-tool/gnunet-ats.c:808 src/ats-tool/gnunet-ats.c:854
 #, fuzzy
 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:834 src/ats-tool/gnunet-ats.c:860
+#: src/ats-tool/gnunet-ats.c:766 src/ats-tool/gnunet-ats.c:792
 #, fuzzy
 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:888
+#: src/ats-tool/gnunet-ats.c:820
 #, fuzzy
 msgid "No preference type given!\n"
 msgstr "In ra thông tin về các đồng đẳng GNUnet."
 
-#: src/ats-tool/gnunet-ats.c:895
+#: src/ats-tool/gnunet-ats.c:827
 #, fuzzy
 msgid "No peer given!\n"
 msgstr "chưa đưa ra tên"
 
-#: src/ats-tool/gnunet-ats.c:913
+#: src/ats-tool/gnunet-ats.c:845
 msgid "Valid type required\n"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:981
+#: src/ats-tool/gnunet-ats.c:916
 msgid "get list of active addresses currently used"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:983
+#: src/ats-tool/gnunet-ats.c:918
 msgid "get list of all active addresses"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:986
+#: src/ats-tool/gnunet-ats.c:921
 #, 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:988
+#: src/ats-tool/gnunet-ats.c:923
 msgid "monitor mode"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:990
+#: src/ats-tool/gnunet-ats.c:925
 #, 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:992
+#: src/ats-tool/gnunet-ats.c:927
 msgid "print all configured quotas"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:994
+#: src/ats-tool/gnunet-ats.c:929
 msgid "peer id"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:997
+#: src/ats-tool/gnunet-ats.c:932
 msgid "preference type to set: latency | bandwidth"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:999
+#: src/ats-tool/gnunet-ats.c:934
 msgid "preference value"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:1002
+#: src/ats-tool/gnunet-ats.c:937
 msgid "verbose output (include ATS address properties)"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:1009
+#: src/ats-tool/gnunet-ats.c:944
 #, fuzzy
 msgid "Print information about ATS state"
 msgstr "In ra thông tin về các đồng đẳng GNUnet."
@@ -1266,7 +1254,7 @@ msgstr "Đối số không hợp lệ cho « %s ».\n"
 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:2104
+#: src/core/gnunet-core.c:179 src/transport/gnunet-transport.c:2154
 #, fuzzy
 msgid "provide information about all current connections (continuously)"
 msgstr "In ra thông tin về các đồng đẳng GNUnet."
@@ -1301,150 +1289,150 @@ msgstr "# các thông báo được chắp liền"
 msgid "# bytes of messages of type %u received"
 msgstr "# các byte nhiễu được nhận"
 
-#: src/core/gnunet-service-core_kx.c:565
+#: src/core/gnunet-service-core_kx.c:571
 msgid "# bytes encrypted"
 msgstr "# các byte đã mã hoá"
 
-#: src/core/gnunet-service-core_kx.c:617
+#: src/core/gnunet-service-core_kx.c:630
 msgid "# bytes decrypted"
 msgstr "# các byte đã giải mã"
 
-#: src/core/gnunet-service-core_kx.c:703
+#: src/core/gnunet-service-core_kx.c:719
 msgid "# key exchanges initiated"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:747
+#: src/core/gnunet-service-core_kx.c:763
 msgid "# key exchanges stopped"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:848
+#: src/core/gnunet-service-core_kx.c:864
 msgid "# old ephemeral keys ignored"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:855
+#: src/core/gnunet-service-core_kx.c:871
 #, 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:889
+#: src/core/gnunet-service-core_kx.c:910
 #, 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:900
+#: src/core/gnunet-service-core_kx.c:921
 #, 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:999
-#: src/transport/gnunet-service-transport_validation.c:1062
+#: src/core/gnunet-service-core_kx.c:1020
+#: src/transport/gnunet-service-transport_validation.c:1053
 #, fuzzy
 msgid "# PING messages received"
 msgstr "# các thông báo PING được tạo"
 
-#: src/core/gnunet-service-core_kx.c:1007
+#: src/core/gnunet-service-core_kx.c:1028
 #, 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:1034
+#: src/core/gnunet-service-core_kx.c:1056
 #, 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:1050
+#: src/core/gnunet-service-core_kx.c:1082
 #, fuzzy
 msgid "# PONG messages created"
 msgstr "# các thông báo PING được tạo"
 
-#: src/core/gnunet-service-core_kx.c:1077
+#: src/core/gnunet-service-core_kx.c:1111
 #, 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:1088
+#: src/core/gnunet-service-core_kx.c:1124
 #, 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:1156
-#: src/transport/gnunet-service-transport_validation.c:1406
+#: src/core/gnunet-service-core_kx.c:1195
+#: src/transport/gnunet-service-transport_validation.c:1370
 #, 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:1162
+#: src/core/gnunet-service-core_kx.c:1201
 #, 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:1167
+#: src/core/gnunet-service-core_kx.c:1206
 #, 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:1197
+#: src/core/gnunet-service-core_kx.c:1236
 #, fuzzy
 msgid "# PONG messages decrypted"
 msgstr "# các thông báo PING được tạo"
 
-#: src/core/gnunet-service-core_kx.c:1232
+#: src/core/gnunet-service-core_kx.c:1271
 #, 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:1243
+#: src/core/gnunet-service-core_kx.c:1282
 #, fuzzy
 msgid "# timeouts prevented via PONG"
 msgstr "# các byte đã nhận qua TCP"
 
-#: src/core/gnunet-service-core_kx.c:1250
+#: src/core/gnunet-service-core_kx.c:1289
 #, 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:1392
+#: src/core/gnunet-service-core_kx.c:1431
 #, 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:1399
+#: src/core/gnunet-service-core_kx.c:1438
 #, 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:1402
+#: src/core/gnunet-service-core_kx.c:1441
 #, 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:1448
-#: src/core/gnunet-service-core_kx.c:1473
+#: src/core/gnunet-service-core_kx.c:1487
+#: src/core/gnunet-service-core_kx.c:1512
 #, fuzzy
 msgid "# bytes dropped (duplicates)"
 msgstr "# các byte loại bỏ bởi UDP (đi ra)"
 
-#: src/core/gnunet-service-core_kx.c:1460
+#: src/core/gnunet-service-core_kx.c:1499
 #, 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:1502
+#: src/core/gnunet-service-core_kx.c:1541
 #, 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:1510
+#: src/core/gnunet-service-core_kx.c:1549
 #, fuzzy
 msgid "# bytes of payload decrypted"
 msgstr "# các byte đã giải mã"
 
-#: src/core/gnunet-service-core_kx.c:1545
+#: src/core/gnunet-service-core_kx.c:1584
 #, fuzzy
 msgid "# PAYLOAD dropped (out of order)"
 msgstr "# các byte loại bỏ bởi UDP (đi ra)"
@@ -1472,13 +1460,11 @@ msgstr ""
 #: src/core/gnunet-service-core_sessions.c:328
 #: src/dht/gnunet-service-dht_neighbours.c:661
 #: src/dht/gnunet-service-dht_neighbours.c:726
-#: src/fs/gnunet-service-fs_cp.c:629 src/fs/gnunet-service-fs_cp.c:1571
+#: src/fs/gnunet-service-fs_cp.c:645 src/fs/gnunet-service-fs_cp.c:1627
 #: src/topology/gnunet-daemon-topology.c:734
 #: src/topology/gnunet-daemon-topology.c:835
-#: src/transport/gnunet-service-transport_neighbours.c:954
-#: src/transport/gnunet-service-transport_neighbours.c:1180
-#: src/transport/gnunet-service-transport_neighbours.c:3211
-#: src/transport/gnunet-service-transport_neighbours.c:3510
+#: src/transport/gnunet-service-transport_neighbours.c:754
+#: src/transport/gnunet-service-transport_neighbours.c:762
 #, fuzzy
 msgid "# peers connected"
 msgstr "# của các đồng đẳng đã kết nối"
@@ -1524,8 +1510,8 @@ msgid "# items stored"
 msgstr "# các byte trong kho dữ liệu"
 
 #: src/datacache/datacache.c:143 src/datacache/datacache.c:150
-#: src/datastore/gnunet-service-datastore.c:1554
-#: src/datastore/gnunet-service-datastore.c:1565
+#: src/datastore/gnunet-service-datastore.c:1557
+#: src/datastore/gnunet-service-datastore.c:1568
 #, c-format
 msgid "No `%s' specified for `%s' in configuration!\n"
 msgstr ""
@@ -1574,8 +1560,8 @@ msgstr ""
 #: 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:624
-#: src/include/gnunet_common.h:633 src/scalarproduct/scalarproduct.h:35
+#: src/util/crypto_mpi.c:39 src/include/gnunet_common.h:626
+#: src/include/gnunet_common.h:635 src/scalarproduct/scalarproduct.h:35
 #, 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"
@@ -1682,13 +1668,6 @@ msgstr "# các yêu cầu dht được định tuyến"
 msgid "# REMOVE requests executed"
 msgstr "# các yêu cầu dht được định tuyến"
 
-#: src/datastore/datastore_api.c:1189
-#, fuzzy
-msgid "Failed to receive response from database.\n"
-msgstr ""
-"\n"
-"Không nhận được đáp ứng từ gnunetd.\n"
-
 #: src/datastore/datastore_api.c:1248
 #, fuzzy
 msgid "# Results received"
@@ -1778,7 +1757,7 @@ msgstr ""
 #: src/datastore/gnunet-service-datastore.c:712
 #: src/datastore/gnunet-service-datastore.c:767
 #: src/datastore/gnunet-service-datastore.c:982
-#: src/datastore/gnunet-service-datastore.c:1526
+#: src/datastore/gnunet-service-datastore.c:1529
 msgid "# reserved"
 msgstr ""
 
@@ -1862,31 +1841,31 @@ msgstr ""
 msgid "Bloomfilter construction complete.\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1559
+#: src/datastore/gnunet-service-datastore.c:1562
 #, fuzzy, c-format
 msgid "# bytes used in file-sharing datastore `%s'"
 msgstr "# các byte được phép trong kho dữ liệu"
 
-#: src/datastore/gnunet-service-datastore.c:1570
+#: src/datastore/gnunet-service-datastore.c:1573
 msgid "# quota"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1572
+#: src/datastore/gnunet-service-datastore.c:1575
 msgid "# cache size"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1585
+#: src/datastore/gnunet-service-datastore.c:1588
 #, c-format
 msgid "Could not use specified filename `%s' for bloomfilter.\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1603
-#: src/datastore/gnunet-service-datastore.c:1619
+#: src/datastore/gnunet-service-datastore.c:1606
+#: src/datastore/gnunet-service-datastore.c:1622
 #, fuzzy, c-format
 msgid "Failed to remove bogus bloomfilter file `%s'\n"
 msgstr "Không thể lưu tập tin cấu hình « %s »:"
 
-#: src/datastore/gnunet-service-datastore.c:1649
+#: src/datastore/gnunet-service-datastore.c:1652
 #, fuzzy
 msgid "Failed to initialize bloomfilter.\n"
 msgstr "Lỗi sơ khởi dịch vụ « %s ».\n"
@@ -2134,25 +2113,25 @@ msgid "Failed to connect to transport service!\n"
 msgstr "Lỗi kết nối đến gnunetd.\n"
 
 #: src/dht/gnunet-service-dht_clients.c:417
-#: src/dht/gnunet-service-xdht_clients.c:844
+#: src/dht/gnunet-service-xdht_clients.c:849
 #, fuzzy
 msgid "# GET requests from clients injected"
 msgstr "# các yêu cầu get (lấy) dht được nhận"
 
 #: src/dht/gnunet-service-dht_clients.c:513
-#: src/dht/gnunet-service-xdht_clients.c:928
+#: src/dht/gnunet-service-xdht_clients.c:933
 #, 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:993
+#: src/dht/gnunet-service-xdht_clients.c:998
 #, 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:1195
+#: src/dht/gnunet-service-xdht_clients.c:1200
 #, fuzzy
 msgid "# GET STOP requests received from clients"
 msgstr "# các yêu cầu get (lấy) dht được nhận"
@@ -2167,26 +2146,26 @@ msgstr ""
 msgid "# Duplicate REPLIES to CLIENT request dropped"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_clients.c:1090
-#: src/dht/gnunet-service-xdht_clients.c:554
+#: src/dht/gnunet-service-dht_clients.c:1098
+#: src/dht/gnunet-service-xdht_clients.c:559
 #, c-format
 msgid "Unsupported block type (%u) in request!\n"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_clients.c:1113
-#: src/dht/gnunet-service-xdht_clients.c:577
+#: src/dht/gnunet-service-dht_clients.c:1121
+#: src/dht/gnunet-service-xdht_clients.c:582
 msgid "# RESULTS queued for clients"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_clients.c:1167
-#: src/dht/gnunet-service-dht_clients.c:1210
-#: src/dht/gnunet-service-xdht_clients.c:631
-#: src/dht/gnunet-service-xdht_clients.c:674
+#: src/dht/gnunet-service-dht_clients.c:1175
+#: src/dht/gnunet-service-dht_clients.c:1218
+#: src/dht/gnunet-service-xdht_clients.c:636
+#: src/dht/gnunet-service-xdht_clients.c:679
 msgid "# REPLIES ignored for CLIENTS (no match)"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_clients.c:1177
-#: src/dht/gnunet-service-xdht_clients.c:641
+#: src/dht/gnunet-service-dht_clients.c:1185
+#: src/dht/gnunet-service-xdht_clients.c:646
 msgid "Could not pass reply to client, message too big!\n"
 msgstr ""
 
@@ -2201,39 +2180,39 @@ msgstr "# các byte kiểu %d được nhận"
 msgid "# ITEMS stored in datacache"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_datacache.c:165
-#: src/dht/gnunet-service-xdht_datacache.c:221
+#: src/dht/gnunet-service-dht_datacache.c:173
+#: src/dht/gnunet-service-xdht_datacache.c:230
 msgid "# Good RESULTS found in datacache"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_datacache.c:176
-#: src/dht/gnunet-service-xdht_datacache.c:244
+#: src/dht/gnunet-service-dht_datacache.c:184
+#: src/dht/gnunet-service-xdht_datacache.c:253
 msgid "# Duplicate RESULTS found in datacache"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_datacache.c:182
-#: src/dht/gnunet-service-xdht_datacache.c:250
+#: src/dht/gnunet-service-dht_datacache.c:190
+#: src/dht/gnunet-service-xdht_datacache.c:259
 msgid "# Invalid RESULTS found in datacache"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_datacache.c:188
-#: src/dht/gnunet-service-xdht_datacache.c:256
+#: src/dht/gnunet-service-dht_datacache.c:196
+#: src/dht/gnunet-service-xdht_datacache.c:265
 msgid "# Irrelevant RESULTS found in datacache"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_datacache.c:200
-#: src/dht/gnunet-service-xdht_datacache.c:268
+#: src/dht/gnunet-service-dht_datacache.c:208
+#: src/dht/gnunet-service-xdht_datacache.c:277
 msgid "# Unsupported RESULTS found in datacache"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_datacache.c:203
-#: src/dht/gnunet-service-xdht_datacache.c:271
+#: src/dht/gnunet-service-dht_datacache.c:211
+#: src/dht/gnunet-service-xdht_datacache.c:280
 #, 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:309
+#: src/dht/gnunet-service-dht_datacache.c:242
+#: src/dht/gnunet-service-xdht_datacache.c:318
 #, fuzzy
 msgid "# GET requests given to datacache"
 msgstr "# các yêu cầu get (lấy) dht được nhận"
@@ -2254,7 +2233,7 @@ msgid "# FIND PEER messages initiated"
 msgstr "# các thông báo PING được tạo"
 
 #: src/dht/gnunet-service-dht_neighbours.c:763
-#: src/dht/gnunet-service-xdht_neighbours.c:6059
+#: src/dht/gnunet-service-xdht_neighbours.c:6060
 #, fuzzy
 msgid "# Queued messages discarded (peer disconnected)"
 msgstr "# các thông báo được chắp liền"
@@ -2343,41 +2322,41 @@ msgstr "# các yêu cầu get (lấy) dht được nhận"
 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:1825
+#: src/dht/gnunet-service-dht_neighbours.c:1826
 #, 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:1833
+#: src/dht/gnunet-service-dht_neighbours.c:1834
 msgid "# FIND PEER requests ignored due to lack of HELLO"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1928
+#: src/dht/gnunet-service-dht_neighbours.c:1929
 #, 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:1931
+#: src/dht/gnunet-service-dht_neighbours.c:1932
 #, 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:1988
+#: src/dht/gnunet-service-dht_neighbours.c:1997
 #, 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:2002
+#: src/dht/gnunet-service-dht_neighbours.c:2011
 #, 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:2087
+#: src/dht/gnunet-service-dht_neighbours.c:2096
 #, fuzzy
 msgid "# P2P RESULTS received"
 msgstr "# Tín hiệu HTTP PUT được nhận"
 
-#: src/dht/gnunet-service-dht_neighbours.c:2090
+#: src/dht/gnunet-service-dht_neighbours.c:2099
 #, fuzzy
 msgid "# P2P RESULT bytes received"
 msgstr "# Tín hiệu HTTP PUT được nhận"
@@ -2387,35 +2366,35 @@ msgstr "# Tín hiệu HTTP PUT được nhận"
 msgid "# Network size estimates received"
 msgstr "# các yêu cầu get (lấy) dht được nhận"
 
-#: src/dht/gnunet-service-dht_routing.c:211
+#: src/dht/gnunet-service-dht_routing.c:218
 msgid "# Good REPLIES matched against routing table"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_routing.c:220
+#: src/dht/gnunet-service-dht_routing.c:227
 msgid "# Duplicate REPLIES matched against routing table"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_routing.c:226
+#: src/dht/gnunet-service-dht_routing.c:233
 msgid "# Invalid REPLIES matched against routing table"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_routing.c:232
+#: src/dht/gnunet-service-dht_routing.c:239
 msgid "# Irrelevant REPLIES matched against routing table"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_routing.c:244
+#: src/dht/gnunet-service-dht_routing.c:251
 msgid "# Unsupported REPLIES matched against routing table"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_routing.c:317
+#: src/dht/gnunet-service-dht_routing.c:324
 msgid "# Entries removed from routing table"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_routing.c:399
+#: src/dht/gnunet-service-dht_routing.c:406
 msgid "# Entries added to routing table"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_routing.c:417
+#: src/dht/gnunet-service-dht_routing.c:424
 #, fuzzy
 msgid "# DHT requests combined"
 msgstr "# các yêu cầu get (lấy) dht được nhận"
@@ -2481,17 +2460,17 @@ msgid "# FINGERS_COUNT"
 msgstr ""
 
 #: src/dht/gnunet-service-xdht_neighbours.c:3700
-#: src/dht/gnunet-service-xdht_neighbours.c:3937
-#: src/dht/gnunet-service-xdht_neighbours.c:4089
-#: src/dht/gnunet-service-xdht_neighbours.c:4239
-#: src/dht/gnunet-service-xdht_neighbours.c:4420
-#: src/dht/gnunet-service-xdht_neighbours.c:4933
-#: src/dht/gnunet-service-xdht_neighbours.c:5326
-#: src/dht/gnunet-service-xdht_neighbours.c:5419
-#: src/dht/gnunet-service-xdht_neighbours.c:5509
-#: src/dht/gnunet-service-xdht_neighbours.c:5613
-#: src/dht/gnunet-service-xdht_neighbours.c:5757
-#: src/dht/gnunet-service-xdht_neighbours.c:5846
+#: src/dht/gnunet-service-xdht_neighbours.c:3938
+#: src/dht/gnunet-service-xdht_neighbours.c:4090
+#: src/dht/gnunet-service-xdht_neighbours.c:4240
+#: src/dht/gnunet-service-xdht_neighbours.c:4421
+#: src/dht/gnunet-service-xdht_neighbours.c:4934
+#: src/dht/gnunet-service-xdht_neighbours.c:5327
+#: src/dht/gnunet-service-xdht_neighbours.c:5420
+#: src/dht/gnunet-service-xdht_neighbours.c:5510
+#: src/dht/gnunet-service-xdht_neighbours.c:5614
+#: src/dht/gnunet-service-xdht_neighbours.c:5758
+#: src/dht/gnunet-service-xdht_neighbours.c:5847
 #, fuzzy
 msgid "# Bytes received from other peers"
 msgstr "# các byte kiểu %d được nhận"
@@ -2524,16 +2503,16 @@ msgid ""
 "SUPU %s, %s, %d, trail->prev_hop = %s"
 msgstr ""
 
-#: src/dht/plugin_block_dht.c:138
+#: src/dht/plugin_block_dht.c:142
 #, fuzzy, c-format
 msgid "Block not of type %u\n"
 msgstr "Không biết truyền tải nào kiểu %d.\n"
 
-#: src/dht/plugin_block_dht.c:145
+#: src/dht/plugin_block_dht.c:149
 msgid "Size mismatch for block\n"
 msgstr ""
 
-#: src/dht/plugin_block_dht.c:155
+#: src/dht/plugin_block_dht.c:159
 #, c-format
 msgid "Block of type %u is malformed\n"
 msgstr ""
@@ -2886,7 +2865,7 @@ msgid "# acknowledgements sent for fragment"
 msgstr ""
 
 #: src/fragmentation/defragmentation.c:456
-#: src/transport/plugin_transport_wlan.c:1517
+#: src/transport/plugin_transport_wlan.c:1515
 #, fuzzy
 msgid "# fragments received"
 msgstr "# các mảnh bị loại bỏ"
@@ -3684,8 +3663,8 @@ msgid "Option `%s' is required when using option `%s'.\n"
 msgstr "Tùy chọn « %s » cần thiết khi dùng tùy chọn « %s ».\n"
 
 #: src/fs/gnunet-publish.c:837 src/fs/gnunet-publish.c:845
-#: src/transport/gnunet-transport.c:1881 src/transport/gnunet-transport.c:1911
-#: src/transport/gnunet-transport.c:1942
+#: src/transport/gnunet-transport.c:1928 src/transport/gnunet-transport.c:1958
+#: src/transport/gnunet-transport.c:1989
 #, 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"
@@ -3794,21 +3773,21 @@ msgstr ""
 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:285
+#: src/fs/gnunet-service-fs.c:274
 msgid "# running average P2P latency (ms)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs.c:344 src/fs/gnunet-service-fs.c:607
+#: src/fs/gnunet-service-fs.c:332 src/fs/gnunet-service-fs.c:595
 #, 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:731
+#: src/fs/gnunet-service-fs.c:719
 #, fuzzy
 msgid "FS service is lacking HOSTKEY configuration setting.  Exiting.\n"
 msgstr "Lưu cấu hình ngay bây giờ không?"
 
-#: src/fs/gnunet-service-fs.c:757 src/hostlist/gnunet-daemon-hostlist.c:311
+#: src/fs/gnunet-service-fs.c:745 src/hostlist/gnunet-daemon-hostlist.c:311
 #: src/sensordashboard/gnunet-service-sensordashboard.c:864
 #: src/sensordashboard/gnunet-service-sensordashboard.c:872
 #: src/topology/gnunet-daemon-topology.c:1287
@@ -3853,96 +3832,101 @@ msgstr "# các kết nối dht"
 msgid "# cadet connections active"
 msgstr "# các kết nối dht"
 
-#: src/fs/gnunet-service-fs_cp.c:710
+#: src/fs/gnunet-service-fs_cp.c:726
 #, fuzzy
 msgid "# migration stop messages received"
 msgstr "# các thông báo phát hiện dht được nhận"
 
-#: src/fs/gnunet-service-fs_cp.c:714
+#: src/fs/gnunet-service-fs_cp.c:730
 #, c-format
 msgid "Migration of content to peer `%s' blocked for %s\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:750
+#: src/fs/gnunet-service-fs_cp.c:768
 #, fuzzy
 msgid "# replies transmitted to other peers"
 msgstr "# các byte kiểu %d được gửi "
 
-#: src/fs/gnunet-service-fs_cp.c:756
+#: src/fs/gnunet-service-fs_cp.c:774
 #, fuzzy
 msgid "# replies dropped"
 msgstr "# các đáp ứng dht được định tuyến"
 
-#: src/fs/gnunet-service-fs_cp.c:781 src/fs/gnunet-service-fs_cp.c:1337
+#: src/fs/gnunet-service-fs_cp.c:799 src/fs/gnunet-service-fs_cp.c:1384
 msgid "# P2P searches active"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:878
+#: src/fs/gnunet-service-fs_cp.c:904
 msgid "# artificial delays introduced (ms)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:934
+#: src/fs/gnunet-service-fs_cp.c:960
 #, fuzzy
 msgid "# replies dropped due to type mismatch"
 msgstr "# các yêu cầu lỗ hổng bị bỏ do trọng tải"
 
-#: src/fs/gnunet-service-fs_cp.c:942
+#: src/fs/gnunet-service-fs_cp.c:968
 #, fuzzy
 msgid "# replies received for other peers"
 msgstr "# các byte kiểu %d được nhận"
 
-#: src/fs/gnunet-service-fs_cp.c:956
+#: src/fs/gnunet-service-fs_cp.c:982
 msgid "# replies dropped due to insufficient cover traffic"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:994
+#: src/fs/gnunet-service-fs_cp.c:1030
 msgid "# P2P searches destroyed due to ultimate reply"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1062
+#: src/fs/gnunet-service-fs_cp.c:1098
 #, fuzzy
 msgid "# requests done for free (low load)"
 msgstr "# các yêu cầu lỗ hổng bị bỏ do trọng tải"
 
-#: src/fs/gnunet-service-fs_cp.c:1087
+#: src/fs/gnunet-service-fs_cp.c:1123
 msgid "# request dropped, priority insufficient"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1097
+#: src/fs/gnunet-service-fs_cp.c:1133
 #, fuzzy
 msgid "# requests done for a price (normal load)"
 msgstr "# các yêu cầu lỗ hổng bị bỏ do trọng tải"
 
-#: src/fs/gnunet-service-fs_cp.c:1175
+#: src/fs/gnunet-service-fs_cp.c:1210
 msgid "# GET requests received (from other peers)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1209
+#: src/fs/gnunet-service-fs_cp.c:1245
 #, fuzzy
 msgid "# requests dropped due to initiator not being connected"
 msgstr "# các yêu cầu lỗ hổng bị bỏ do trọng tải"
 
-#: src/fs/gnunet-service-fs_cp.c:1231
+#: src/fs/gnunet-service-fs_cp.c:1266
 #, fuzzy
 msgid "# requests dropped due to missing reverse route"
 msgstr "# các yêu cầu lỗ hổng bị bỏ do trọng tải"
 
-#: src/fs/gnunet-service-fs_cp.c:1282
+#: src/fs/gnunet-service-fs_cp.c:1277
+#, fuzzy
+msgid "# requests dropped due to full reply queue"
+msgstr "# các yêu cầu lỗ hổng bị bỏ do trọng tải"
+
+#: src/fs/gnunet-service-fs_cp.c:1329
 #, fuzzy
 msgid "# requests dropped due TTL underflow"
 msgstr "# các yêu cầu lỗ hổng bị bỏ do trọng tải"
 
-#: src/fs/gnunet-service-fs_cp.c:1306
+#: src/fs/gnunet-service-fs_cp.c:1353
 #, fuzzy
 msgid "# requests dropped due to higher-TTL request"
 msgstr "# các yêu cầu lỗ hổng bị bỏ do trọng tải"
 
-#: src/fs/gnunet-service-fs_cp.c:1335
+#: src/fs/gnunet-service-fs_cp.c:1382
 #, fuzzy
 msgid "# P2P query messages received and processed"
 msgstr "# các thông báo phát hiện dht được nhận"
 
-#: src/fs/gnunet-service-fs_cp.c:1754
+#: src/fs/gnunet-service-fs_cp.c:1821
 #, fuzzy
 msgid "# migration stop messages sent"
 msgstr "# các thông báo phát hiện dht được nhận"
@@ -4061,104 +4045,104 @@ msgstr "# các yêu cầu get (lấy) dht được nhận"
 msgid "# Pending requests active"
 msgstr "# các yêu cầu get (lấy) dht được nhận"
 
-#: src/fs/gnunet-service-fs_pr.c:814
+#: src/fs/gnunet-service-fs_pr.c:820
 #, fuzzy
 msgid "# replies received and matched"
 msgstr "# các byte kiểu %d được nhận"
 
-#: src/fs/gnunet-service-fs_pr.c:844
+#: src/fs/gnunet-service-fs_pr.c:857
 msgid "# duplicate replies discarded (bloomfilter)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:853
+#: src/fs/gnunet-service-fs_pr.c:866
 msgid "# irrelevant replies discarded"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:867
+#: src/fs/gnunet-service-fs_pr.c:881
 #, c-format
 msgid "Unsupported block type %u\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:880
+#: src/fs/gnunet-service-fs_pr.c:898
 #, fuzzy
 msgid "# results found locally"
 msgstr "# nội dung lỗ hổng được tìm cục bộ"
 
-#: src/fs/gnunet-service-fs_pr.c:1003
+#: src/fs/gnunet-service-fs_pr.c:1028
 msgid "# Datastore `PUT' failures"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1031
+#: src/fs/gnunet-service-fs_pr.c:1056
 #, fuzzy
 msgid "# storage requests dropped due to high load"
 msgstr "# các yêu cầu lỗ hổng bị bỏ do trọng tải"
 
-#: src/fs/gnunet-service-fs_pr.c:1069
+#: src/fs/gnunet-service-fs_pr.c:1094
 #, fuzzy
 msgid "# Replies received from DHT"
 msgstr "# các byte đã nhận qua HTTP"
 
-#: src/fs/gnunet-service-fs_pr.c:1200
+#: src/fs/gnunet-service-fs_pr.c:1226
 #, fuzzy
 msgid "# Replies received from CADET"
 msgstr "# các byte đã nhận qua HTTP"
 
-#: src/fs/gnunet-service-fs_pr.c:1252
+#: src/fs/gnunet-service-fs_pr.c:1279
 #, c-format
 msgid "Datastore lookup already took %s!\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1272
+#: src/fs/gnunet-service-fs_pr.c:1299
 #, c-format
 msgid "On-demand lookup already took %s!\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1319
+#: src/fs/gnunet-service-fs_pr.c:1351
 msgid "# Datastore lookups concluded (no results)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1334
+#: src/fs/gnunet-service-fs_pr.c:1366
 msgid "# Datastore lookups concluded (seen all)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1343
+#: src/fs/gnunet-service-fs_pr.c:1375
 msgid "# Datastore lookups aborted (more than MAX_RESULTS)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1358
+#: src/fs/gnunet-service-fs_pr.c:1390
 msgid "# requested DBLOCK or IBLOCK not found"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1372
+#: src/fs/gnunet-service-fs_pr.c:1404
 msgid "# on-demand blocks matched requests"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1385
+#: src/fs/gnunet-service-fs_pr.c:1417
 msgid "# on-demand lookups performed successfully"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1390
+#: src/fs/gnunet-service-fs_pr.c:1422
 msgid "# on-demand lookups failed"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1417 src/fs/gnunet-service-fs_pr.c:1457
-#: src/fs/gnunet-service-fs_pr.c:1620
+#: src/fs/gnunet-service-fs_pr.c:1449 src/fs/gnunet-service-fs_pr.c:1489
+#: src/fs/gnunet-service-fs_pr.c:1657
 msgid "# Datastore lookups concluded (error queueing)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1475
+#: src/fs/gnunet-service-fs_pr.c:1508
 msgid "# Datastore lookups concluded (found last result)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1486
+#: src/fs/gnunet-service-fs_pr.c:1520
 msgid "# Datastore lookups concluded (load too high)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1596
+#: src/fs/gnunet-service-fs_pr.c:1633
 msgid "# Datastore lookups initiated"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1685
+#: src/fs/gnunet-service-fs_pr.c:1722
 #, fuzzy
 msgid "# GAP PUT messages received"
 msgstr "# các thông báo PONG đã mật mã được nhận"
@@ -4388,113 +4372,113 @@ msgstr ""
 msgid "%s failed at %s:%d: `%s'\n"
 msgstr "%s bị lỗi tại %s:%d: « %s »\n"
 
-#: src/gns/gnunet-gns-proxy.c:833
+#: src/gns/gnunet-gns-proxy.c:842
 #, fuzzy, c-format
 msgid "Unsupported CURL SSL backend %d\n"
 msgstr "Lệnh không được hỗ trợ « %s ». Đang hủy bỏ.\n"
 
-#: src/gns/gnunet-gns-proxy.c:856
+#: src/gns/gnunet-gns-proxy.c:865
 #, fuzzy, c-format
 msgid "Failed to fetch CN from cert: %s\n"
 msgstr "Lỗi mở tập tin ghi sự kiện « %s »: %s\n"
 
-#: src/gns/gnunet-gns-proxy.c:879
+#: src/gns/gnunet-gns-proxy.c:888
 #, fuzzy, c-format
 msgid "Failed to initialize DANE: %s\n"
 msgstr "Không thể sơ khởi SQLite: %s.\n"
 
-#: src/gns/gnunet-gns-proxy.c:892
+#: src/gns/gnunet-gns-proxy.c:901
 #, fuzzy, c-format
 msgid "Failed to parse DANE record: %s\n"
 msgstr "Lỗi mở tập tin ghi sự kiện « %s »: %s\n"
 
-#: src/gns/gnunet-gns-proxy.c:907
+#: src/gns/gnunet-gns-proxy.c:916
 #, fuzzy, c-format
 msgid "Failed to verify TLS connection using DANE: %s\n"
 msgstr "Không thể lưu tập tin cấu hình « %s »:"
 
-#: src/gns/gnunet-gns-proxy.c:917
+#: src/gns/gnunet-gns-proxy.c:926
 #, c-format
 msgid "Failed DANE verification failed with GnuTLS verify status code: %u\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:941
+#: src/gns/gnunet-gns-proxy.c:950
 #, c-format
 msgid "SSL certificate subject name (%s) does not match `%s'\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:1086
+#: src/gns/gnunet-gns-proxy.c:1095
 #, c-format
 msgid "Cookie domain `%s' supplied by server is invalid\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:1602
+#: src/gns/gnunet-gns-proxy.c:1630
 #, fuzzy, c-format
 msgid "Unsupported HTTP method `%s'\n"
 msgstr "Lệnh không được hỗ trợ « %s ». Đang hủy bỏ.\n"
 
-#: src/gns/gnunet-gns-proxy.c:1973
+#: src/gns/gnunet-gns-proxy.c:2002
 #, fuzzy, c-format
 msgid "Unable to import private key from file `%s'\n"
 msgstr "Không thể tạo tài khoản người dùng:"
 
-#: src/gns/gnunet-gns-proxy.c:2003
+#: src/gns/gnunet-gns-proxy.c:2032
 #, fuzzy, c-format
 msgid "Unable to import certificate %s\n"
 msgstr "Không thể lưu tập tin cấu hình « %s »:"
 
-#: src/gns/gnunet-gns-proxy.c:2177
+#: src/gns/gnunet-gns-proxy.c:2206
 #, fuzzy, c-format
 msgid "Failed to start HTTPS server for `%s'\n"
 msgstr "Lỗi bắt đầu thu thập.\n"
 
-#: src/gns/gnunet-gns-proxy.c:2196
+#: src/gns/gnunet-gns-proxy.c:2225
 #, fuzzy
 msgid "Failed to pass client to MHD\n"
 msgstr "Lỗi kết nối đến gnunetd.\n"
 
-#: src/gns/gnunet-gns-proxy.c:2518
+#: src/gns/gnunet-gns-proxy.c:2547
 #, fuzzy, c-format
 msgid "Unsupported socks version %d\n"
 msgstr "Lệnh không được hỗ trợ « %s ». Đang hủy bỏ.\n"
 
-#: src/gns/gnunet-gns-proxy.c:2547
+#: src/gns/gnunet-gns-proxy.c:2576
 #, fuzzy, c-format
 msgid "Unsupported socks command %d\n"
 msgstr "Lệnh không được hỗ trợ « %s ». Đang hủy bỏ.\n"
 
-#: src/gns/gnunet-gns-proxy.c:2565 src/gns/gnunet-gns-proxy.c:2594
+#: src/gns/gnunet-gns-proxy.c:2594 src/gns/gnunet-gns-proxy.c:2623
 msgid "SSL connection to plain IPv4 address requested\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:2645
+#: src/gns/gnunet-gns-proxy.c:2674
 #, fuzzy, c-format
 msgid "Unsupported socks address type %d\n"
 msgstr "Lệnh không được hỗ trợ « %s ». Đang hủy bỏ.\n"
 
-#: src/gns/gnunet-gns-proxy.c:2984
+#: src/gns/gnunet-gns-proxy.c:3013
 msgid "No ego configured for `shorten-zone`\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:3024
+#: src/gns/gnunet-gns-proxy.c:3053
 #, c-format
 msgid "No ego configured for `%s`\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:3086
+#: src/gns/gnunet-gns-proxy.c:3115
 #, fuzzy, c-format
 msgid "Failed to load SSL/TLS key and certificate from `%s'\n"
 msgstr "Lỗi đọc danh sách bạn bè từ « %s »\n"
 
-#: src/gns/gnunet-gns-proxy.c:3127
+#: src/gns/gnunet-gns-proxy.c:3156
 msgid "listen on specified port (default: 7777)"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:3130
+#: src/gns/gnunet-gns-proxy.c:3159
 msgid "pem file to use as CA"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:3149
+#: src/gns/gnunet-gns-proxy.c:3178
 msgid "GNUnet GNS proxy"
 msgstr ""
 
@@ -4909,7 +4893,7 @@ msgid "# hostlist URIs written to file"
 msgstr "# các byte danh sách máy được trả về"
 
 #: src/hostlist/gnunet-daemon-hostlist_client.c:1588
-#: src/transport/plugin_transport_http_client.c:2273
+#: src/transport/plugin_transport_http_client.c:2265
 #, c-format
 msgid "Invalid proxy type: `%s', disabling proxy! Check configuration!\n"
 msgstr ""
@@ -5004,7 +4988,7 @@ msgstr ""
 
 #: src/hostlist/gnunet-daemon-hostlist_server.c:747
 #: src/peerinfo-tool/gnunet-peerinfo.c:736
-#: src/transport/gnunet-service-transport.c:1018
+#: src/transport/gnunet-service-transport.c:852
 #, 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"
@@ -5488,127 +5472,127 @@ msgstr ""
 msgid "test_icmp_client not possible, as we have no internal IPv4 address\n"
 msgstr ""
 
-#: src/nat/nat.c:867
+#: src/nat/nat.c:862
 #, c-format
 msgid "gnunet-helper-nat-server generated malformed address `%s'\n"
 msgstr ""
 
-#: src/nat/nat.c:917
+#: src/nat/nat.c:912
 #, fuzzy, c-format
 msgid "Failed to start %s\n"
 msgstr "Lỗi bắt đầu thu thập.\n"
 
-#: src/nat/nat.c:1032
+#: src/nat/nat.c:1027
 msgid "Error while running upnp client:\n"
 msgstr ""
 
-#: src/nat/nat.c:1102
+#: src/nat/nat.c:1097
 #, 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
+#: src/nat/nat.c:1237
 msgid "malformed"
 msgstr ""
 
-#: src/nat/nat.c:1297
+#: src/nat/nat.c:1291
 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
+#: src/nat/nat.c:1318 src/nat/nat.c:1330
 #, c-format
 msgid ""
 "Configuration requires `%s', but binary is not installed properly (SUID bit "
 "not set).  Option disabled.\n"
 msgstr ""
 
-#: src/nat/nat.c:1474
+#: src/nat/nat.c:1468
 msgid "Internal IP address not known, cannot use ICMP NAT traversal method\n"
 msgstr ""
 
-#: src/nat/nat.c:1490
+#: src/nat/nat.c:1484
 #, c-format
 msgid "Running gnunet-helper-nat-client %s %s %u\n"
 msgstr ""
 
-#: src/nat/nat.c:1575
+#: src/nat/nat.c:1569
 msgid "Operation Successful"
 msgstr ""
 
-#: src/nat/nat.c:1577
+#: src/nat/nat.c:1571
 msgid "Internal Failure (IPC, ...)"
 msgstr ""
 
-#: src/nat/nat.c:1579
+#: src/nat/nat.c:1573
 msgid "Failure in network subsystem, check permissions."
 msgstr ""
 
-#: src/nat/nat.c:1581
+#: src/nat/nat.c:1575
 msgid "Encountered timeout while performing operation"
 msgstr ""
 
-#: src/nat/nat.c:1583
+#: src/nat/nat.c:1577
 msgid "detected that we are offline"
 msgstr ""
 
-#: src/nat/nat.c:1585
+#: src/nat/nat.c:1579
 msgid "`upnpc` command not found"
 msgstr ""
 
-#: src/nat/nat.c:1587
+#: src/nat/nat.c:1581
 #, fuzzy
 msgid "Failed to run `upnpc` command"
 msgstr "Lỗi bắt đầu thu thập.\n"
 
-#: src/nat/nat.c:1589
+#: src/nat/nat.c:1583
 msgid "`upnpc' command took too long, process killed"
 msgstr ""
 
-#: src/nat/nat.c:1591
+#: src/nat/nat.c:1585
 msgid "`upnpc' command failed to establish port mapping"
 msgstr ""
 
-#: src/nat/nat.c:1593
+#: src/nat/nat.c:1587
 msgid "`external-ip' command not found"
 msgstr ""
 
-#: src/nat/nat.c:1595
+#: src/nat/nat.c:1589
 #, fuzzy
 msgid "Failed to run `external-ip` command"
 msgstr "Lỗi bắt đầu thu thập.\n"
 
-#: src/nat/nat.c:1597
+#: src/nat/nat.c:1591
 msgid "`external-ip' command output invalid"
 msgstr ""
 
-#: src/nat/nat.c:1599
+#: src/nat/nat.c:1593
 msgid "no valid address was returned by `external-ip'"
 msgstr ""
 
-#: src/nat/nat.c:1601
+#: src/nat/nat.c:1595
 #, fuzzy
 msgid "Could not determine interface with internal/local network address"
 msgstr "Không thể truy cập đến thông tin về không gian tên.\n"
 
-#: src/nat/nat.c:1603
+#: src/nat/nat.c:1597
 msgid "No functioning gnunet-helper-nat-server installation found"
 msgstr ""
 
-#: src/nat/nat.c:1605
+#: src/nat/nat.c:1599
 msgid "NAT test could not be initialized"
 msgstr ""
 
-#: src/nat/nat.c:1607
+#: src/nat/nat.c:1601
 msgid "NAT test timeout reached"
 msgstr ""
 
-#: src/nat/nat.c:1609
+#: src/nat/nat.c:1603
 msgid "could not register NAT"
 msgstr ""
 
-#: src/nat/nat.c:1611
+#: src/nat/nat.c:1605
 msgid "No working gnunet-helper-nat-client installation found"
 msgstr ""
 
@@ -5742,23 +5726,23 @@ msgstr ""
 msgid "failed to transmit request (service down?)"
 msgstr "Lỗi đọc danh sách bạn bè từ « %s »\n"
 
-#: src/peerinfo/peerinfo_api.c:519
+#: src/peerinfo/peerinfo_api.c:518
 #, fuzzy
 msgid "Failed to receive response from `PEERINFO' service."
 msgstr ""
 "\n"
 "Không nhận được đáp ứng từ gnunetd.\n"
 
-#: src/peerinfo/peerinfo_api.c:563 src/peerinfo/peerinfo_api.c:586
-#: src/peerinfo/peerinfo_api.c:603 src/peerinfo/peerinfo_api.c:616
-#: src/peerinfo/peerinfo_api.c:631
+#: src/peerinfo/peerinfo_api.c:562 src/peerinfo/peerinfo_api.c:585
+#: src/peerinfo/peerinfo_api.c:602 src/peerinfo/peerinfo_api.c:615
+#: src/peerinfo/peerinfo_api.c:630
 #, fuzzy
 msgid "Received invalid message from `PEERINFO' service."
 msgstr ""
 "\n"
 "Không nhận được đáp ứng từ gnunetd.\n"
 
-#: src/peerinfo/peerinfo_api.c:720
+#: src/peerinfo/peerinfo_api.c:719
 #, fuzzy
 msgid "Timeout transmitting iteration request to `PEERINFO' service."
 msgstr "Lỗi sơ khởi dịch vụ « %s ».\n"
@@ -5857,19 +5841,19 @@ msgid "Print information about peers."
 msgstr "In ra thông tin về các đồng đẳng GNUnet."
 
 #: src/peerinfo-tool/gnunet-peerinfo_plugins.c:105
-#: src/transport/gnunet-service-transport_plugins.c:127
+#: src/transport/gnunet-service-transport_plugins.c:168
 #, fuzzy, c-format
 msgid "Starting transport plugins `%s'\n"
 msgstr "Đang nạp các truyền tải « %s »\n"
 
 #: src/peerinfo-tool/gnunet-peerinfo_plugins.c:109
-#: src/transport/gnunet-service-transport_plugins.c:132
+#: src/transport/gnunet-service-transport_plugins.c:173
 #, fuzzy, c-format
 msgid "Loading `%s' transport plugin\n"
 msgstr "Đang nạp các truyền tải « %s »\n"
 
 #: src/peerinfo-tool/gnunet-peerinfo_plugins.c:129
-#: src/transport/gnunet-service-transport_plugins.c:164
+#: src/transport/gnunet-service-transport_plugins.c:208
 #, fuzzy, c-format
 msgid "Failed to load transport plugin for `%s'\n"
 msgstr "Không thể nạp phần bổ sung truyền tải « %s »\n"
@@ -6881,7 +6865,7 @@ msgid ""
 "content/topology-file-format\n"
 msgstr ""
 
-#: src/testbed/gnunet-daemon-latency-logger.c:333
+#: src/testbed/gnunet-daemon-latency-logger.c:323
 msgid "Daemon to log latency values of connections to neighbours"
 msgstr ""
 
@@ -6897,7 +6881,7 @@ msgstr ""
 msgid "Incorrect hostkey file format: %s\n"
 msgstr ""
 
-#: src/testbed/gnunet-daemon-testbed-underlay.c:474
+#: src/testbed/gnunet-daemon-testbed-underlay.c:476
 msgid "Daemon to restrict underlay network in testbed deployments"
 msgstr ""
 
@@ -7234,7 +7218,7 @@ msgid ""
 msgstr "Cần thiết nhiều kết nối bạn bè hơn tổng số kết nối đích.\n"
 
 #: src/topology/gnunet-daemon-topology.c:1121
-#: src/transport/plugin_transport_wlan.c:1476
+#: src/transport/plugin_transport_wlan.c:1478
 #, fuzzy
 msgid "# HELLO messages received"
 msgstr "# các thông báo PONG đã mật mã được nhận"
@@ -7248,47 +7232,46 @@ msgstr "# các thông báo gửi đi bị loại bỏ"
 msgid "GNUnet topology control (maintaining P2P cadet and F2F constraints)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_ats.c:269
-#, 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_ats.c:136
+msgid "# Addresses given to ATS"
+msgstr ""
 
-#: src/transport/gnunet-service-transport_blacklist.c:274
+#: src/transport/gnunet-service-transport_blacklist.c:286
 #, fuzzy, c-format
 msgid "Adding blacklisting entry for peer `%s'\n"
 msgstr "Không thể lấy địa chỉ của đồng đẳng « %s ».\n"
 
-#: src/transport/gnunet-service-transport_blacklist.c:283
+#: src/transport/gnunet-service-transport_blacklist.c:295
 #, c-format
 msgid "Adding blacklisting entry for peer `%s':`%s'\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_blacklist.c:476
-#: src/transport/gnunet-service-transport_blacklist.c:766
+#: src/transport/gnunet-service-transport_blacklist.c:504
+#: src/transport/gnunet-service-transport_blacklist.c:855
 msgid "# disconnects due to blacklist"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_blacklist.c:769
+#: src/transport/gnunet-service-transport_blacklist.c:859
 #, fuzzy, c-format
 msgid "Disallowing connection to peer `%s' on transport %s\n"
 msgstr "Không thể nạp phần bổ sung truyền tải « %s »\n"
 
-#: src/transport/gnunet-service-transport.c:236
+#: src/transport/gnunet-service-transport.c:231
 #, fuzzy
 msgid "# bytes payload discarded due to not connected peer"
 msgstr "# Các quảng cáo đồng đẳng bị hủy do trọng tải"
 
-#: src/transport/gnunet-service-transport.c:424
+#: src/transport/gnunet-service-transport.c:385
 #, fuzzy
 msgid "# bytes total received"
 msgstr "# tổng số nội dung lỗ hổng được nhận"
 
-#: src/transport/gnunet-service-transport.c:509
+#: src/transport/gnunet-service-transport.c:480
 #, fuzzy
 msgid "# bytes payload received"
 msgstr "# các byte đã giải mã"
 
-#: src/transport/gnunet-service-transport.c:984
+#: src/transport/gnunet-service-transport.c:818
 #, fuzzy
 msgid "Transport service is lacking key configuration settings. Exiting.\n"
 msgstr "Lưu cấu hình ngay bây giờ không?"
@@ -7298,410 +7281,415 @@ msgstr "Lưu cấu hình ngay bây giờ không?"
 msgid "# messages dropped due to slow client"
 msgstr "# các yêu cầu lỗ hổng bị bỏ do trọng tải"
 
-#: src/transport/gnunet-service-transport_clients.c:774
+#: src/transport/gnunet-service-transport_clients.c:783
 msgid "# bytes payload dropped (other peer was not connected)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_clients.c:813
-#, fuzzy, c-format
-msgid "Blacklist refuses connection attempt to peer `%s'\n"
-msgstr "Lỗi kết nối đến gnunetd.\n"
-
-#: src/transport/gnunet-service-transport_clients.c:843
+#: src/transport/gnunet-service-transport_clients.c:827
 #, fuzzy
 msgid "# REQUEST CONNECT messages received"
 msgstr "# các thông báo PONG đã mật mã được nhận"
 
-#: src/transport/gnunet-service-transport_clients.c:882
+#: src/transport/gnunet-service-transport_clients.c:864
 #, fuzzy
 msgid "# REQUEST DISCONNECT messages received"
 msgstr "# các thông báo PONG đã mật mã được nhận"
 
-#: src/transport/gnunet-service-transport_hello.c:182
+#: src/transport/gnunet-service-transport_hello.c:188
 msgid "# refreshed my HELLO"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:769
-#: src/transport/gnunet-service-transport_neighbours.c:846
+#: src/transport/gnunet-service-transport_neighbours.c:839
 #, fuzzy
 msgid "# session creation failed"
 msgstr "# các khoá phiên chạy được chấp nhận"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1134
+#: src/transport/gnunet-service-transport_neighbours.c:1167
 #, fuzzy
 msgid "# DISCONNECT messages sent"
 msgstr "# các thông báo PONG đã mật mã được nhận"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1259
-#: src/transport/gnunet-service-transport_neighbours.c:1675
+#: src/transport/gnunet-service-transport_neighbours.c:1303
+#: src/transport/gnunet-service-transport_neighbours.c:1760
 #, fuzzy
 msgid "# bytes in message queue for other peers"
 msgstr "# các byte thông báo gửi đi bị loại bỏ"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1264
+#: src/transport/gnunet-service-transport_neighbours.c:1308
 #, fuzzy
 msgid "# messages transmitted to other peers"
 msgstr "# các byte kiểu %d được gửi "
 
-#: src/transport/gnunet-service-transport_neighbours.c:1269
+#: src/transport/gnunet-service-transport_neighbours.c:1314
 #, fuzzy
 msgid "# transmission failures for messages to other peers"
 msgstr "# các byte thông báo gửi đi bị loại bỏ"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1327
+#: src/transport/gnunet-service-transport_neighbours.c:1374
 msgid "# messages timed out while in transport queue"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1388
-#, fuzzy
-msgid "# keepalives sent"
-msgstr "# các khoá phiên chạy được gửi"
+#: src/transport/gnunet-service-transport_neighbours.c:1450
+msgid "# KEEPALIVES sent"
+msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1421
+#: src/transport/gnunet-service-transport_neighbours.c:1486
 #, 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:1429
+#: src/transport/gnunet-service-transport_neighbours.c:1494
 #, 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:1476
+#: src/transport/gnunet-service-transport_neighbours.c:1504
+msgid "# KEEPALIVES received in good order"
+msgstr ""
+
+#: src/transport/gnunet-service-transport_neighbours.c:1549
 #, fuzzy
-msgid "# KEEPALIVE_RESPONSE messages discarded (not connected)"
+msgid "# KEEPALIVE_RESPONSEs discarded (not connected)"
 msgstr "# các thông báo được chắp liền"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1485
+#: src/transport/gnunet-service-transport_neighbours.c:1558
 #, fuzzy
-msgid "# KEEPALIVE_RESPONSE messages discarded (not expected)"
+msgid "# KEEPALIVE_RESPONSEs discarded (not expected)"
 msgstr "# các thông báo được chắp liền"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1493
+#: src/transport/gnunet-service-transport_neighbours.c:1566
 #, fuzzy
-msgid "# KEEPALIVE_RESPONSE messages discarded (address changed)"
+msgid "# KEEPALIVE_RESPONSEs discarded (address changed)"
 msgstr "# các thông báo được chắp liền"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1501
+#: src/transport/gnunet-service-transport_neighbours.c:1575
 #, fuzzy
-msgid "# KEEPALIVE_RESPONSE messages discarded (wrong nonce)"
+msgid "# KEEPALIVE_RESPONSEs discarded (no nonce)"
 msgstr "# các thông báo được chắp liền"
 
 #: src/transport/gnunet-service-transport_neighbours.c:1580
 #, fuzzy
+msgid "# KEEPALIVE_RESPONSEs discarded (bad nonce)"
+msgstr "# các thông báo được chắp liền"
+
+#: src/transport/gnunet-service-transport_neighbours.c:1586
+#, fuzzy
+msgid "# KEEPALIVE_RESPONSEs received (OK)"
+msgstr "# các thông báo được chắp liền"
+
+#: src/transport/gnunet-service-transport_neighbours.c:1657
+#, 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:1614
+#: src/transport/gnunet-service-transport_neighbours.c:1691
 #, 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:1630
+#: src/transport/gnunet-service-transport_neighbours.c:1706
 msgid "# ms throttling suggested"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1726
+#: src/transport/gnunet-service-transport_neighbours.c:1826
 #, fuzzy, c-format
-msgid "Failed to send SYN message to peer `%s' using address `%s' session %p\n"
-msgstr "Lỗi k���t nối đ��n gnunetd.\n"
+msgid "Failed to send SYN message to peer `%s'\n"
+msgstr "Lỗi đ���c danh sách b��n bè từ « %s »\n"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1747
+#: src/transport/gnunet-service-transport_neighbours.c:1846
 #, fuzzy
 msgid "# Failed attempts to switch addresses (failed to send SYN CONT)"
 msgstr "Lỗi mở tập tin ghi sự kiện « %s »: %s\n"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1790
+#: src/transport/gnunet-service-transport_neighbours.c:1885
 #, fuzzy
 msgid "# SYN messages sent"
 msgstr "# các thông báo PONG đã mật mã được nhận"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1806
+#: src/transport/gnunet-service-transport_neighbours.c:1902
 #, fuzzy, c-format
-msgid "Failed to transmit SYN message via plugin to %s\n"
+msgid "Failed to transmit SYN message to %s\n"
 msgstr "Lỗi sơ khởi dịch vụ « %s ».\n"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1833
+#: src/transport/gnunet-service-transport_neighbours.c:1932
 #, fuzzy
 msgid "# Failed attempts to switch addresses (failed to send SYN)"
 msgstr "Lỗi mở tập tin ghi sự kiện « %s »: %s\n"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1880
+#: src/transport/gnunet-service-transport_neighbours.c:1997
 #, fuzzy, c-format
-msgid ""
-"Failed to send SYN_ACK message to peer `%s' using address `%s' session %p\n"
+msgid "Failed to send SYN_ACK message to peer `%s' using address `%s'\n"
 msgstr "Lỗi kết nối đến gnunetd.\n"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1930
+#: src/transport/gnunet-service-transport_neighbours.c:2051
 #, fuzzy
 msgid "# SYN_ACK messages sent"
 msgstr "# các thông báo PONG đã mật mã được nhận"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1945
+#: src/transport/gnunet-service-transport_neighbours.c:2068
 #, fuzzy, c-format
-msgid "Failed to transmit SYN_ACK message via plugin to %s\n"
+msgid "Failed to transmit SYN_ACK message to %s\n"
 msgstr "Lỗi sơ khởi dịch vụ « %s ».\n"
 
-#: src/transport/gnunet-service-transport_neighbours.c:2235
+#: src/transport/gnunet-service-transport_neighbours.c:2223
 #, 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:2360
+#: src/transport/gnunet-service-transport_neighbours.c:2350
 #, fuzzy
 msgid "# SYN messages received"
 msgstr "# các thông báo PING được tạo"
 
-#: src/transport/gnunet-service-transport_neighbours.c:2365
+#: src/transport/gnunet-service-transport_neighbours.c:2355
 #, c-format
 msgid "SYN request from peer `%s' ignored due impending shutdown\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:2673
+#: src/transport/gnunet-service-transport_neighbours.c:2715
 msgid "# Attempts to switch addresses"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3079
-#, 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:3176
+#: src/transport/gnunet-service-transport_neighbours.c:3201
 #, fuzzy
 msgid "# SYN_ACK messages received"
 msgstr "# các thông báo PONG đã mật mã được nhận"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3184
+#: src/transport/gnunet-service-transport_neighbours.c:3209
 #, fuzzy
 msgid "# unexpected SYN_ACK messages (no peer)"
 msgstr "gửi ĐẾM thông báo"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3198
-#: src/transport/gnunet-service-transport_neighbours.c:3230
+#: src/transport/gnunet-service-transport_neighbours.c:3227
+#: src/transport/gnunet-service-transport_neighbours.c:3251
 #, fuzzy
 msgid "# unexpected SYN_ACK messages (not ready)"
 msgstr "gửi ĐẾM thông báo"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3242
+#: src/transport/gnunet-service-transport_neighbours.c:3263
 #, fuzzy
 msgid "# unexpected SYN_ACK messages (waiting on ATS)"
 msgstr "gửi ĐẾM thông báo"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3262
+#: src/transport/gnunet-service-transport_neighbours.c:3288
 msgid "# Successful attempts to switch addresses"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3270
+#: src/transport/gnunet-service-transport_neighbours.c:3301
 #, fuzzy
 msgid "# unexpected SYN_ACK messages (disconnecting)"
 msgstr "gửi ĐẾM thông báo"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3460
+#: src/transport/gnunet-service-transport_neighbours.c:3495
 #, fuzzy
 msgid "# ACK messages received"
 msgstr "# các thông báo PONG đã mật mã được nhận"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3496
+#: src/transport/gnunet-service-transport_neighbours.c:3530
 #, fuzzy
 msgid "# unexpected ACK messages"
 msgstr "# các thông báo PONG đã mật mã được gửi"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3566
+#: src/transport/gnunet-service-transport_neighbours.c:3582
 msgid "# SET QUOTA messages ignored (no such peer)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3581
+#: src/transport/gnunet-service-transport_neighbours.c:3597
 msgid "# disconnects due to quota of 0"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3623
+#: src/transport/gnunet-service-transport_neighbours.c:3644
+#, fuzzy
+msgid "# quota messages ignored (malformed)"
+msgstr "# các yêu cầu lỗ hổng bị bỏ do trọng tải"
+
+#: src/transport/gnunet-service-transport_neighbours.c:3651
+#, fuzzy
+msgid "# QUOTA messages received"
+msgstr "# các thông báo PONG đã mật mã được nhận"
+
+#: src/transport/gnunet-service-transport_neighbours.c:3686
 msgid "# disconnect messages ignored (malformed)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3629
+#: src/transport/gnunet-service-transport_neighbours.c:3693
 #, 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:3638
+#: src/transport/gnunet-service-transport_neighbours.c:3704
 msgid "# disconnect messages ignored (timestamp)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3765
+#: src/transport/gnunet-service-transport_neighbours.c:3833
 #, 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"
 
-#: src/transport/gnunet-service-transport_plugins.c:119
+#: src/transport/gnunet-service-transport_plugins.c:158
 msgid "Transport service is lacking NEIGHBOUR_LIMIT option.\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_plugins.c:177
-#: src/transport/gnunet-service-transport_plugins.c:185
-#: src/transport/gnunet-service-transport_plugins.c:193
-#: src/transport/gnunet-service-transport_plugins.c:201
-#: src/transport/gnunet-service-transport_plugins.c:209
-#: src/transport/gnunet-service-transport_plugins.c:217
-#: src/transport/gnunet-service-transport_plugins.c:225
-#: src/transport/gnunet-service-transport_plugins.c:233
-#: src/transport/gnunet-service-transport_plugins.c:241
-#: src/transport/gnunet-service-transport_plugins.c:249
-#: src/transport/gnunet-service-transport_plugins.c:257
+#: src/transport/gnunet-service-transport_plugins.c:223
+#: src/transport/gnunet-service-transport_plugins.c:231
+#: src/transport/gnunet-service-transport_plugins.c:239
+#: src/transport/gnunet-service-transport_plugins.c:247
+#: src/transport/gnunet-service-transport_plugins.c:255
+#: src/transport/gnunet-service-transport_plugins.c:263
+#: src/transport/gnunet-service-transport_plugins.c:271
+#: src/transport/gnunet-service-transport_plugins.c:279
+#: src/transport/gnunet-service-transport_plugins.c:287
+#: src/transport/gnunet-service-transport_plugins.c:295
+#: src/transport/gnunet-service-transport_plugins.c:303
 #, fuzzy, c-format
 msgid "Missing function `%s' in transport plugin for `%s'\n"
 msgstr "Không thể nạp phần bổ sung truyền tải « %s »\n"
 
-#: src/transport/gnunet-service-transport_plugins.c:264
+#: src/transport/gnunet-service-transport_plugins.c:310
 #, fuzzy, c-format
 msgid "Did not load plugin `%s' due to missing functions\n"
 msgstr "Lỗi nạp phần bổ sung « %s » tại %s:%d. Đang hủy nạp phần bổ sung.\n"
 
-#: src/transport/gnunet-service-transport_validation.c:476
-#: src/transport/gnunet-service-transport_validation.c:656
-#: src/transport/gnunet-service-transport_validation.c:929
-#: src/transport/gnunet-service-transport_validation.c:1532
+#: src/transport/gnunet-service-transport_validation.c:343
+msgid "# Addresses in validation map"
+msgstr ""
+
+#: src/transport/gnunet-service-transport_validation.c:450
+#: src/transport/gnunet-service-transport_validation.c:638
+#: src/transport/gnunet-service-transport_validation.c:927
+#: src/transport/gnunet-service-transport_validation.c:1508
 #, fuzzy
 msgid "# validations running"
 msgstr "kho dữ liệu sqlite"
 
-#: src/transport/gnunet-service-transport_validation.c:515
-msgid "# address records discarded"
-msgstr ""
+#: src/transport/gnunet-service-transport_validation.c:493
+#, fuzzy
+msgid "# address records discarded (timeout)"
+msgstr "# các byte loại đi bởi TCP (đi ra)"
 
-#: src/transport/gnunet-service-transport_validation.c:600
-msgid "# validations not attempted (no plugin)"
+#: src/transport/gnunet-service-transport_validation.c:541
+msgid "# address records discarded (blacklist)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:646
+#: src/transport/gnunet-service-transport_validation.c:629
 msgid "# PINGs for address validation sent"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:755
+#: src/transport/gnunet-service-transport_validation.c:711
+msgid "# validations delayed by global throttle"
+msgstr ""
+
+#: src/transport/gnunet-service-transport_validation.c:748
 msgid "# address revalidations started"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1057
+#: src/transport/gnunet-service-transport_validation.c:1048
 #, fuzzy
 msgid "# PING message for different peer received"
 msgstr "# các thông báo PING được tạo"
 
-#: src/transport/gnunet-service-transport_validation.c:1108
+#: src/transport/gnunet-service-transport_validation.c:1099
 #, c-format
 msgid "Plugin `%s' not available, cannot confirm having this address\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1118
+#: src/transport/gnunet-service-transport_validation.c:1112
 msgid "# failed address checks during validation"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1121
+#: src/transport/gnunet-service-transport_validation.c:1115
 #, c-format
 msgid "Address `%s' is not one of my addresses, not confirming PING\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1129
+#: src/transport/gnunet-service-transport_validation.c:1123
 msgid "# successful address checks during validation"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1141
+#: src/transport/gnunet-service-transport_validation.c:1136
 #, c-format
 msgid ""
 "Not confirming PING from peer `%s' with address `%s' since I cannot confirm "
 "having this address.\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1149
-#, c-format
-msgid "Received a PING message with validation bug from `%s'\n"
-msgstr ""
-
-#: src/transport/gnunet-service-transport_validation.c:1203
+#: src/transport/gnunet-service-transport_validation.c:1191
 #, fuzzy, c-format
 msgid "Failed to create PONG signature for peer `%s'\n"
 msgstr "Không thể tạo miền tên.\n"
 
-#: src/transport/gnunet-service-transport_validation.c:1253
+#: src/transport/gnunet-service-transport_validation.c:1242
 msgid "# PONGs unicast via reliable transport"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1262
+#: src/transport/gnunet-service-transport_validation.c:1251
 msgid "# PONGs multicast to all available addresses"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1434
+#: src/transport/gnunet-service-transport_validation.c:1408
 msgid "# PONGs dropped, no matching pending validation"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1450
+#: src/transport/gnunet-service-transport_validation.c:1426
 msgid "# PONGs dropped, signature expired"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1502
+#: src/transport/gnunet-service-transport_validation.c:1478
 msgid "# validations succeeded"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1590
-#, fuzzy, c-format
-msgid "Validation received new %s message for peer `%s' with size %u\n"
-msgstr "Nhận yêu cầu định tuyến\n"
-
-#: src/transport/gnunet-service-transport_validation.c:1597
-#, fuzzy, c-format
-msgid "Adding `%s' without addresses for peer `%s'\n"
-msgstr "Không thể lấy địa chỉ của đồng đẳng « %s ».\n"
-
-#: src/transport/gnunet-transport.c:578
+#: src/transport/gnunet-transport.c:580
 #, 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:587
+#: src/transport/gnunet-transport.c:589
 #: src/transport/gnunet-transport-profiler.c:274
 #, 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:619
+#: src/transport/gnunet-transport.c:621
 #, 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:634
+#: src/transport/gnunet-transport.c:636
 #, 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:646
+#: src/transport/gnunet-transport.c:648
 #, 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:673 src/transport/gnunet-transport.c:698
+#: src/transport/gnunet-transport.c:675 src/transport/gnunet-transport.c:700
 #, 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:678
+#: src/transport/gnunet-transport.c:680
 #, 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:683
+#: src/transport/gnunet-transport.c:685
 #, 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:688
+#: src/transport/gnunet-transport.c:690
 #, 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:693
+#: src/transport/gnunet-transport.c:695
 #, c-format
 msgid "Timeout while waiting for result of NAT test for plugin `%s'\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:818
+#: src/transport/gnunet-transport.c:820
 #, fuzzy, c-format
 msgid ""
 "Peer `%s' %s %s\n"
@@ -7710,195 +7698,195 @@ msgid ""
 "\t%s%s\n"
 msgstr "Tôi là đồng đẳng « %s ».\n"
 
-#: src/transport/gnunet-transport.c:854
+#: src/transport/gnunet-transport.c:855
 #, fuzzy, c-format
 msgid "Peer `%s' %s `%s' \n"
 msgstr "Tôi là đồng đẳng « %s ».\n"
 
-#: src/transport/gnunet-transport.c:953 src/transport/gnunet-transport.c:1702
+#: src/transport/gnunet-transport.c:949 src/transport/gnunet-transport.c:1744
 #, fuzzy
 msgid "Monitor disconnected from transport service. Reconnecting.\n"
 msgstr "Lỗi kết nối đến gnunetd.\n"
 
-#: src/transport/gnunet-transport.c:1021
+#: src/transport/gnunet-transport.c:1006
 msgid "No transport plugins configured, peer will never communicate\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1035
+#: src/transport/gnunet-transport.c:1020
 #, c-format
 msgid "No port configured for plugin `%s', cannot test it\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1060
+#: src/transport/gnunet-transport.c:1045
 #, fuzzy
 msgid "Failed to start resolver!\n"
 msgstr "Lỗi bắt đầu thu thập.\n"
 
-#: src/transport/gnunet-transport.c:1106
+#: src/transport/gnunet-transport.c:1091
 #, 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:1129
+#: src/transport/gnunet-transport.c:1114
 #: src/transport/gnunet-transport-profiler.c:406
 #, fuzzy, c-format
 msgid "Successfully connected to `%s'\n"
 msgstr "Không đủ quyền cho « %s ».\n"
 
-#: src/transport/gnunet-transport.c:1153
+#: src/transport/gnunet-transport.c:1138
 #, c-format
 msgid ""
 "Successfully connected to `%s', starting to send benchmark data in %u Kb "
 "blocks\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1186
+#: src/transport/gnunet-transport.c:1171
 #, fuzzy, c-format
 msgid "Successfully disconnected from `%s'\n"
 msgstr "Không đủ quyền cho « %s ».\n"
 
-#: src/transport/gnunet-transport.c:1209
+#: src/transport/gnunet-transport.c:1194
 #: src/transport/gnunet-transport-profiler.c:434
 #, 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:1234 src/transport/gnunet-transport.c:1260
+#: src/transport/gnunet-transport.c:1219 src/transport/gnunet-transport.c:1245
 #, c-format
 msgid "%24s: %-17s %4s   (%u connections in total)\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1236
+#: src/transport/gnunet-transport.c:1221
 #, fuzzy
 msgid "Connected to"
 msgstr "« %s » được kết nối tới « %s ».\n"
 
-#: src/transport/gnunet-transport.c:1262
+#: src/transport/gnunet-transport.c:1247
 #, fuzzy
 msgid "Disconnected from"
 msgstr "« %.*s » được kết nối tới « %.*s ».\n"
 
-#: src/transport/gnunet-transport.c:1286
+#: src/transport/gnunet-transport.c:1271
 #: src/transport/gnunet-transport-profiler.c:458
 #, 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:1318
+#: src/transport/gnunet-transport.c:1311
 #, c-format
 msgid "Peer `%s': %s %s in state `%s' until %s\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1330
+#: src/transport/gnunet-transport.c:1323
 #, fuzzy, c-format
 msgid "Peer `%s': %s %s\n"
 msgstr "Tôi là đồng đẳng « %s ».\n"
 
-#: src/transport/gnunet-transport.c:1784
+#: src/transport/gnunet-transport.c:1831
 #: src/transport/gnunet-transport-profiler.c:492
 #, 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:1819
+#: src/transport/gnunet-transport.c:1866
 #, fuzzy
 msgid "Failed to send disconnect request to transport service\n"
 msgstr "Lỗi kết nối đến gnunetd.\n"
 
-#: src/transport/gnunet-transport.c:1863
+#: src/transport/gnunet-transport.c:1910
 #, c-format
 msgid ""
 "Multiple operations given. Please choose only one operation: %s, %s, %s, %s, "
 "%s, %s %s\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1871
+#: src/transport/gnunet-transport.c:1918
 #, c-format
 msgid ""
 "No operation given. Please choose one operation: %s, %s, %s, %s, %s, %s, %s\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1890 src/transport/gnunet-transport.c:1920
-#: src/transport/gnunet-transport.c:1953 src/transport/gnunet-transport.c:1979
-#: src/transport/gnunet-transport.c:2035
+#: src/transport/gnunet-transport.c:1937 src/transport/gnunet-transport.c:1967
+#: src/transport/gnunet-transport.c:2000 src/transport/gnunet-transport.c:2026
+#: src/transport/gnunet-transport.c:2085
 #: src/transport/gnunet-transport-profiler.c:578
 #, fuzzy
 msgid "Failed to connect to transport service\n"
 msgstr "Lỗi kết nối đến gnunetd.\n"
 
-#: src/transport/gnunet-transport.c:1899 src/transport/gnunet-transport.c:1930
-#: src/transport/gnunet-transport.c:1964
+#: src/transport/gnunet-transport.c:1946 src/transport/gnunet-transport.c:1977
+#: src/transport/gnunet-transport.c:2011
 #, 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:1984
+#: src/transport/gnunet-transport.c:2031
 msgid "Starting to receive benchmark data\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:2083
+#: src/transport/gnunet-transport.c:2133
 #, 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:2086
+#: src/transport/gnunet-transport.c:2136
 msgid "measure how fast we are receiving data from all peers (until CTRL-C)"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:2089
+#: src/transport/gnunet-transport.c:2139
 #, fuzzy
 msgid "connect to a peer"
 msgstr "Lỗi kết nối đến gnunetd.\n"
 
-#: src/transport/gnunet-transport.c:2092
+#: src/transport/gnunet-transport.c:2142
 #, fuzzy
 msgid "disconnect to a peer"
 msgstr "Lỗi kết nối đến gnunetd.\n"
 
-#: src/transport/gnunet-transport.c:2095
+#: src/transport/gnunet-transport.c:2145
 #, 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:2098
+#: src/transport/gnunet-transport.c:2148
 #, fuzzy
 msgid "print information for all pending validations continuously"
 msgstr "In ra thông tin về các đồng đẳng GNUnet."
 
-#: src/transport/gnunet-transport.c:2101
+#: src/transport/gnunet-transport.c:2151
 #, 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:2107
+#: src/transport/gnunet-transport.c:2157
 #, 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:2110
+#: src/transport/gnunet-transport.c:2160
 #, fuzzy
 msgid "do not resolve hostnames"
 msgstr "không quyết định các tên máy"
 
-#: src/transport/gnunet-transport.c:2113
+#: src/transport/gnunet-transport.c:2163
 #: src/transport/gnunet-transport-profiler.c:638
 msgid "peer identity"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:2116
+#: src/transport/gnunet-transport.c:2166
 msgid "monitor plugin sessions"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:2119
+#: src/transport/gnunet-transport.c:2169
 msgid "send data for benchmarking to the other peer (until CTRL-C)"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:2122
+#: src/transport/gnunet-transport.c:2172
 msgid "test transport configuration (involves external server)"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:2133
+#: src/transport/gnunet-transport.c:2183
 #: src/transport/gnunet-transport-profiler.c:649
 #, fuzzy
 msgid "Direct access to transport service."
@@ -7998,155 +7986,156 @@ msgstr "số tin nhắn cần dùng mỗi lần lặp"
 msgid "message size to use"
 msgstr "kích cỡ tin nhắn"
 
-#: src/transport/plugin_transport_http_client.c:1491
-#: src/transport/plugin_transport_http_server.c:2276
-#: src/transport/plugin_transport_http_server.c:3443
-#: src/transport/plugin_transport_tcp.c:2844
-#: src/transport/plugin_transport_tcp.c:2851
+#: src/transport/plugin_transport_http_client.c:1481
+#: src/transport/plugin_transport_http_server.c:2247
+#: src/transport/plugin_transport_http_server.c:3414
+#: src/transport/plugin_transport_tcp.c:2923
+#: src/transport/plugin_transport_tcp.c:2930
 msgid "TCP_STEALTH not supported on this platform.\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_client.c:2114
+#: src/transport/plugin_transport_http_client.c:2106
 #, c-format
 msgid "Could not initialize curl multi handle, failed to start %s plugin!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_client.c:2163
-#: src/transport/plugin_transport_http_server.c:3177
+#: src/transport/plugin_transport_http_client.c:2155
+#: src/transport/plugin_transport_http_server.c:3148
 #, 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:2180
-#: src/transport/plugin_transport_http_server.c:3247
+#: src/transport/plugin_transport_http_client.c:2172
+#: src/transport/plugin_transport_http_server.c:3218
 #, 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:2214
+#: src/transport/plugin_transport_http_client.c:2206
 #, fuzzy, c-format
 msgid "Maximum number of requests 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:1763
+#: src/transport/plugin_transport_http_server.c:1734
 #, 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:1994
+#: src/transport/plugin_transport_http_server.c:1965
 #, c-format
 msgid "Accepting connection (%u of %u) from `%s'\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:2002
+#: src/transport/plugin_transport_http_server.c:1973
 #, c-format
 msgid ""
 "Server reached maximum number connections (%u), rejecting new connection\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:2152
+#: src/transport/plugin_transport_http_server.c:2123
 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:2175
+#: src/transport/plugin_transport_http_server.c:2146
 #, c-format
 msgid "No usable TLS certificate found and creating one at `%s/%s' failed!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:2302
+#: src/transport/plugin_transport_http_server.c:2273
 msgid "Could not load or create server certificate! Loading plugin failed!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:2611
+#: src/transport/plugin_transport_http_server.c:2582
 #, 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:2645 src/util/service.c:704
+#: src/transport/plugin_transport_http_server.c:2616 src/util/service.c:704
 #, 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:2663 src/util/service.c:723
+#: src/transport/plugin_transport_http_server.c:2634 src/util/service.c:723
 #, 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:2776
+#: src/transport/plugin_transport_http_server.c:2747
 #, c-format
 msgid "Found %u addresses to report to NAT service\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:2854
+#: src/transport/plugin_transport_http_server.c:2825
+#: src/transport/plugin_transport_udp.c:3332
 msgid "Disabling IPv6 since it is not supported on this system!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:2953
+#: src/transport/plugin_transport_http_server.c:2924
 #, c-format
 msgid "IPv4 support is %s\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:2968
+#: src/transport/plugin_transport_http_server.c:2939
 #, c-format
 msgid "IPv6 support is %s\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:2974
+#: src/transport/plugin_transport_http_server.c:2945
 msgid "Neither IPv4 nor IPv6 are enabled! Fix in configuration\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:2985
+#: src/transport/plugin_transport_http_server.c:2956
 #, 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:2991
+#: src/transport/plugin_transport_http_server.c:2962
 #, 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:3005
+#: src/transport/plugin_transport_http_server.c:2976
 #, 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:3015
+#: src/transport/plugin_transport_http_server.c:2986
 #, 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:3037
+#: src/transport/plugin_transport_http_server.c:3008
 #, 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:3047
+#: src/transport/plugin_transport_http_server.c:3018
 #, 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:3110
+#: src/transport/plugin_transport_http_server.c:3081
 #, 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:3131
+#: src/transport/plugin_transport_http_server.c:3102
 #, 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:3148
+#: src/transport/plugin_transport_http_server.c:3119
 #, 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:3455
+#: src/transport/plugin_transport_http_server.c:3426
 #, fuzzy
 msgid "Unable to compile URL regex\n"
 msgstr "Không thể sơ khởi SQLite: %s.\n"
@@ -8193,238 +8182,259 @@ msgstr "# các byte đã gửi qua SMTP"
 msgid "# bytes dropped by SMTP (outgoing)"
 msgstr "# các byte loại đi bởi SMTP (đi ra)"
 
-#: src/transport/plugin_transport_tcp.c:648
+#: src/transport/plugin_transport_tcp.c:672
 #, 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:829
-#: src/transport/plugin_transport_tcp.c:1044
-#: src/transport/plugin_transport_tcp.c:2239
-#: src/transport/plugin_transport_tcp.c:2950
+#: src/transport/plugin_transport_tcp.c:855
+#: src/transport/plugin_transport_tcp.c:1081
+#: src/transport/plugin_transport_tcp.c:2251
+#: src/transport/plugin_transport_tcp.c:3042
 #, fuzzy
 msgid "# TCP sessions active"
 msgstr "# các khoá phiên chạy được chấp nhận"
 
-#: src/transport/plugin_transport_tcp.c:870
-#: src/transport/plugin_transport_tcp.c:1027
-#: src/transport/plugin_transport_tcp.c:1146
-#: src/transport/plugin_transport_tcp.c:1214
-#: src/transport/plugin_transport_tcp.c:1312
-#: src/transport/plugin_transport_tcp.c:1336
+#: src/transport/plugin_transport_tcp.c:897
+#: src/transport/plugin_transport_tcp.c:1063
+#: src/transport/plugin_transport_tcp.c:1187
+#: src/transport/plugin_transport_tcp.c:1260
+#: src/transport/plugin_transport_tcp.c:1360
+#: src/transport/plugin_transport_tcp.c:1385
 #, fuzzy
 msgid "# bytes currently in TCP buffers"
 msgstr "# các byte đã gừi qua TCP"
 
-#: src/transport/plugin_transport_tcp.c:873
+#: src/transport/plugin_transport_tcp.c:900
 #, 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:1149
+#: src/transport/plugin_transport_tcp.c:1190
 #, 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:1218
+#: src/transport/plugin_transport_tcp.c:1264
 #, fuzzy
 msgid "# bytes transmitted via TCP"
 msgstr "# các byte được gửi"
 
-#: src/transport/plugin_transport_tcp.c:1616
+#: src/transport/plugin_transport_tcp.c:1659
 msgid "# requests to create session with invalid address"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:1782
+#: src/transport/plugin_transport_tcp.c:1827
 msgid "# transport-service disconnect requests for TCP"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2292
+#: src/transport/plugin_transport_tcp.c:2310
 #, 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:2470
+#: src/transport/plugin_transport_tcp.c:2501
 msgid "# bytes received via TCP"
 msgstr "# các byte đã nhận qua TCP"
 
-#: src/transport/plugin_transport_tcp.c:2542
+#: src/transport/plugin_transport_tcp.c:2552
+#: src/transport/plugin_transport_tcp.c:2610
+#, fuzzy
+msgid "# TCP server connections active"
+msgstr "# các kết nối dht"
+
+#: src/transport/plugin_transport_tcp.c:2556
+#, fuzzy
+msgid "# TCP server connect events"
+msgstr "# của các đồng đẳng đã kết nối"
+
+#: src/transport/plugin_transport_tcp.c:2562
+msgid "TCP connection limit reached, suspending server\n"
+msgstr ""
+
+#: src/transport/plugin_transport_tcp.c:2564
+msgid "# TCP service suspended"
+msgstr ""
+
+#: src/transport/plugin_transport_tcp.c:2604
+msgid "# TCP service resumed"
+msgstr ""
+
+#: src/transport/plugin_transport_tcp.c:2614
 msgid "# network-level TCP disconnect events"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2778 src/util/service.c:584
+#: src/transport/plugin_transport_tcp.c:2857 src/util/service.c:584
 #: src/util/service.c:590
 #, c-format
 msgid "Require valid port number for service `%s' in configuration!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2794
+#: src/transport/plugin_transport_tcp.c:2873
 #, fuzzy
 msgid "Failed to start service.\n"
 msgstr "Lỗi bắt đầu thu thập.\n"
 
-#: src/transport/plugin_transport_tcp.c:2937
+#: src/transport/plugin_transport_tcp.c:3030
 #, c-format
 msgid "TCP transport listening on port %llu\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2941
+#: src/transport/plugin_transport_tcp.c:3034
 msgid "TCP transport not listening on any port (client only)\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2945
+#: src/transport/plugin_transport_tcp.c:3038
 #, c-format
 msgid "TCP transport advertises itself as being on port %llu\n"
 msgstr ""
 
-#: src/transport/plugin_transport_udp_broadcasting.c:172
-#, fuzzy
-msgid "# IPv6 multicast HELLO beacons received via udp"
-msgstr "# các thông báo PONG đã mật mã được nhận"
-
-#: src/transport/plugin_transport_udp_broadcasting.c:218
+#: src/transport/plugin_transport_udp_broadcasting.c:170
 #, fuzzy
-msgid "# IPv4 broadcast HELLO beacons received via udp"
+msgid "# Multicast HELLO beacons received via UDP"
 msgstr "# các thông báo PONG đã mật mã được nhận"
 
-#: src/transport/plugin_transport_udp_broadcasting.c:609
+#: src/transport/plugin_transport_udp_broadcasting.c:548
 msgid ""
 "Disabling HELLO broadcasting due to friend-to-friend only configuration!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_udp_broadcasting.c:632
+#: src/transport/plugin_transport_udp_broadcasting.c:569
 #, c-format
 msgid "Failed to set IPv4 broadcast option for broadcast socket on port %d\n"
 msgstr ""
 
-#: src/transport/plugin_transport_udp.c:1658
-#, c-format
-msgid ""
-"Trying to create session for address of unexpected length %u (should be %u "
-"or %u)\n"
-msgstr ""
-
-#: src/transport/plugin_transport_udp.c:2905
+#: src/transport/plugin_transport_udp.c:3078
 #, c-format
 msgid ""
 "UDP could not transmit message to `%s': Network seems down, please check "
 "your network configuration\n"
 msgstr ""
 
-#: src/transport/plugin_transport_udp.c:2918
+#: src/transport/plugin_transport_udp.c:3092
 msgid ""
 "UDP could not transmit IPv6 message! Please check your network configuration "
 "and disable IPv6 if your connection does not have a global IPv6 address\n"
 msgstr ""
 
-#: src/transport/plugin_transport_udp.c:3271
+#: src/transport/plugin_transport_udp.c:3408
+#: src/transport/plugin_transport_udp.c:3507
 #, fuzzy, c-format
 msgid "Failed to bind UDP socket to %s: %s\n"
 msgstr "Lỗi mở tập tin ghi sự kiện « %s »: %s\n"
 
-#: src/transport/plugin_transport_udp.c:3279
+#: src/transport/plugin_transport_udp.c:3426
+msgid "Disabling IPv4 since it is not supported on this system!\n"
+msgstr ""
+
+#: src/transport/plugin_transport_udp.c:3517
 #, fuzzy
 msgid "Failed to open UDP sockets\n"
 msgstr "Lỗi mở tập tin ghi sự kiện « %s »: %s\n"
 
-#: src/transport/plugin_transport_udp.c:3438
-#, c-format
-msgid "Given `%s' option is out of range: %llu > %u\n"
+#: src/transport/plugin_transport_udp.c:3588
+#: src/transport/plugin_transport_udp.c:3602
+msgid "must be in [0,65535]"
 msgstr ""
 
-#: src/transport/plugin_transport_udp.c:3485
-#, fuzzy, c-format
-msgid "Invalid IPv6 address: `%s'\n"
-msgstr "Mức ưu tiên tiến trình không hợp lê « %s ».\n"
+#: src/transport/plugin_transport_udp.c:3634
+#, fuzzy
+msgid "must be valid IPv4 address"
+msgstr "« %s » không sẵn sàng.\n"
+
+#: src/transport/plugin_transport_udp.c:3661
+#, fuzzy
+msgid "must be valid IPv6 address"
+msgstr "« %s » không sẵn sàng.\n"
 
-#: src/transport/plugin_transport_udp.c:3553
+#: src/transport/plugin_transport_udp.c:3727
 #, fuzzy
-msgid "Failed to create network sockets, plugin failed\n"
+msgid "Failed to create UDP network sockets\n"
 msgstr "Không thể tạo miền tên.\n"
 
-#: src/transport/plugin_transport_unix.c:1405
+#: src/transport/plugin_transport_unix.c:1393
 #, fuzzy, c-format
 msgid "Cannot create path to `%s'\n"
 msgstr "Không thể tạo miền tên.\n"
 
-#: src/transport/plugin_transport_unix.c:1418
+#: src/transport/plugin_transport_unix.c:1406
 #, fuzzy, c-format
 msgid "Cannot bind to `%s'\n"
 msgstr "Không thể tạo mẫu duy nhất đại diện cho « %s ».\n"
 
-#: src/transport/plugin_transport_unix.c:1819
+#: src/transport/plugin_transport_unix.c:1807
 #, fuzzy
 msgid "Failed to open UNIX listen socket\n"
 msgstr "Lỗi mở tập tin ghi sự kiện « %s »: %s\n"
 
-#: src/transport/plugin_transport_wlan.c:733
+#: src/transport/plugin_transport_wlan.c:742
 msgid "# ACKs sent"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:753
+#: src/transport/plugin_transport_wlan.c:762
 #, fuzzy
 msgid "# Messages defragmented"
 msgstr "# các thông báo được chắp liền"
 
-#: src/transport/plugin_transport_wlan.c:794
-#: src/transport/plugin_transport_wlan.c:881
+#: src/transport/plugin_transport_wlan.c:803
+#: src/transport/plugin_transport_wlan.c:890
 #, fuzzy
 msgid "# Sessions allocated"
 msgstr "# các khoá phiên chạy được chấp nhận"
 
-#: src/transport/plugin_transport_wlan.c:1002
+#: src/transport/plugin_transport_wlan.c:1011
 #, fuzzy
 msgid "# message fragments sent"
 msgstr "# các thông báo bị tế phân"
 
-#: src/transport/plugin_transport_wlan.c:1031
+#: src/transport/plugin_transport_wlan.c:1040
 #, fuzzy
 msgid "# messages pending (with fragmentation)"
 msgstr "# các thông báo được chắp liền"
 
-#: src/transport/plugin_transport_wlan.c:1162
-#: src/transport/plugin_transport_wlan.c:1255
-#: src/transport/plugin_transport_wlan.c:2272
+#: src/transport/plugin_transport_wlan.c:1171
+#: src/transport/plugin_transport_wlan.c:1264
+#: src/transport/plugin_transport_wlan.c:2268
 #, fuzzy
 msgid "# MAC endpoints allocated"
 msgstr "# các yêu cầu get (lấy) dht được nhận"
 
-#: src/transport/plugin_transport_wlan.c:1530
+#: src/transport/plugin_transport_wlan.c:1528
 #, fuzzy
 msgid "# ACKs received"
 msgstr "# các byte đã nhận qua TCP"
 
-#: src/transport/plugin_transport_wlan.c:1599
+#: src/transport/plugin_transport_wlan.c:1597
 #, fuzzy
 msgid "# DATA messages discarded due to CRC32 error"
 msgstr "# các thông báo được chắp liền"
 
-#: src/transport/plugin_transport_wlan.c:1707
+#: src/transport/plugin_transport_wlan.c:1703
 #, fuzzy
 msgid "# HELLO beacons sent"
 msgstr "# các byte đã gửi qua UDP"
 
-#: src/transport/plugin_transport_wlan.c:1824
+#: src/transport/plugin_transport_wlan.c:1820
 #, fuzzy
 msgid "# DATA messages received"
 msgstr "# các thông báo PONG đã mật mã được nhận"
 
-#: src/transport/plugin_transport_wlan.c:1858
+#: src/transport/plugin_transport_wlan.c:1854
 #, fuzzy
 msgid "# DATA messages processed"
 msgstr "# các thông báo PONG đã mật mã được nhận"
 
-#: src/transport/plugin_transport_wlan.c:2247
+#: src/transport/plugin_transport_wlan.c:2243
 #, c-format
 msgid "Helper binary `%s' not SUID, cannot run WLAN transport\n"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:2269
+#: src/transport/plugin_transport_wlan.c:2265
 #, fuzzy
 msgid "# sessions allocated"
 msgstr "# các khoá phiên chạy được chấp nhận"
 
-#: src/transport/transport_api.c:816
+#: src/transport/transport_api.c:812
 #, fuzzy, c-format
 msgid "Received unexpected message of type %u in %s:%u\n"
 msgstr "Nhận được thông báo bị hỏng từ đồng đẳng « %s » trong %s:%d.\n"
@@ -8468,42 +8478,38 @@ msgstr ""
 msgid "Metadata `%s' failed to deserialize"
 msgstr ""
 
-#: src/util/client.c:261 src/util/client.c:858 src/util/service.c:621
+#: src/util/client.c:263 src/util/client.c:889 src/util/service.c:621
 #, c-format
 msgid "UNIXPATH `%s' too long, maximum length is %llu\n"
 msgstr ""
 
-#: src/util/client.c:265 src/util/client.c:863 src/util/service.c:625
+#: src/util/client.c:267 src/util/client.c:894 src/util/service.c:625
 #, fuzzy, c-format
 msgid "Using `%s' instead\n"
 msgstr "%s: tùy chọn « %s » là mơ hồ\n"
 
-#: src/util/client.c:360
+#: src/util/client.c:362
 #, c-format
 msgid ""
 "Could not determine valid hostname and port for service `%s' from "
 "configuration.\n"
 msgstr ""
 
-#: src/util/client.c:368
+#: src/util/client.c:370
 #, c-format
 msgid "Need a non-empty hostname for service `%s'.\n"
 msgstr ""
 
-#: src/util/client.c:1008
+#: src/util/client.c:1039
 #, fuzzy, c-format
 msgid "Could not connect to service `%s', configuration broken.\n"
 msgstr "Không thể kết nối tới %s:%u: %s\n"
 
-#: src/util/client.c:1020
+#: src/util/client.c:1051
 #, fuzzy, c-format
 msgid "Failure to transmit request to service `%s'\n"
 msgstr "Lỗi đọc danh sách bạn bè từ « %s »\n"
 
-#: src/util/client.c:1299
-msgid "Could not submit request, not expecting to receive a response.\n"
-msgstr ""
-
 #: src/util/common_logging.c:254 src/util/common_logging.c:1039
 msgid "DEBUG"
 msgstr "GỠ LỖI"
@@ -8573,49 +8579,33 @@ msgstr ""
 "Giá trị cấu hình « %s » cho « %s » trong phần « %s » không phải nằm trong "
 "tập hợp các sự chọn được phép\n"
 
-#: src/util/configuration.c:1144
+#: src/util/configuration.c:1145
 #, c-format
 msgid "Recursive expansion suspected, aborting $-expansion for term `%s'\n"
 msgstr ""
 
-#: src/util/configuration.c:1176
+#: src/util/configuration.c:1177
 #, 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:1250
+#: src/util/configuration.c:1251
 #, c-format
 msgid ""
 "Failed to expand `%s' in `%s' as it is neither found in [PATHS] nor defined "
 "as an environmental variable\n"
 msgstr ""
 
-#: src/util/connection.c:423
+#: src/util/connection.c:424
 #, fuzzy, c-format
 msgid "Access denied to `%s'\n"
 msgstr "Không đủ quyền cho « %s ».\n"
 
-#: src/util/connection.c:438
+#: src/util/connection.c:441
 #, c-format
 msgid "Accepting connection from `%s': %p\n"
 msgstr ""
 
-#: src/util/connection.c:553
-#, fuzzy, c-format
-msgid ""
-"Failed to establish TCP connection to `%s:%u', no further addresses to try.\n"
-msgstr "Lỗi thiết lập kết nối với đồng đẳng.\n"
-
-#: src/util/connection.c:751 src/util/connection.c:914
-#, fuzzy, c-format
-msgid "Trying to connect to `%s' (%p)\n"
-msgstr "Không thể kết nối tới %s:%u: %s\n"
-
-#: src/util/connection.c:904
-#, fuzzy, c-format
-msgid "Attempt to connect to `%s' failed\n"
-msgstr " Lỗi kết nối\n"
-
 #: src/util/container_bloomfilter.c:531
 #, c-format
 msgid ""
@@ -8623,52 +8613,52 @@ msgid ""
 "%llu)\n"
 msgstr ""
 
-#: src/util/crypto_ecc.c:702 src/util/crypto_ecc.c:740
-#: src/util/crypto_ecc.c:858 src/util/crypto_ecc.c:896
+#: src/util/crypto_ecc.c:731 src/util/crypto_ecc.c:769
+#: src/util/crypto_ecc.c:887 src/util/crypto_ecc.c:925
 #, fuzzy, c-format
 msgid "Could not acquire lock on file `%s': %s...\n"
 msgstr "Lỗi mở tập tin theo dõi « %s »: %s\n"
 
-#: src/util/crypto_ecc.c:707 src/util/crypto_ecc.c:863
+#: src/util/crypto_ecc.c:736 src/util/crypto_ecc.c:892
 #, fuzzy
 msgid "Creating a new private key.  This may take a while.\n"
 msgstr "Đang tạo khoá máy mới (có thể hơi lâu).\n"
 
-#: src/util/crypto_ecc.c:744 src/util/crypto_ecc.c:900
+#: src/util/crypto_ecc.c:773 src/util/crypto_ecc.c:929
 msgid "This may be ok if someone is currently generating a private key.\n"
 msgstr ""
 
-#: src/util/crypto_ecc.c:774 src/util/crypto_ecc.c:930
+#: src/util/crypto_ecc.c:803 src/util/crypto_ecc.c:959
 #, c-format
 msgid ""
 "When trying to read key file `%s' I found %u bytes but I need at least %u.\n"
 msgstr ""
 
-#: src/util/crypto_ecc.c:778 src/util/crypto_ecc.c:934
+#: src/util/crypto_ecc.c:807 src/util/crypto_ecc.c:963
 msgid "This may be ok if someone is currently generating a key.\n"
 msgstr ""
 
-#: src/util/crypto_ecc.c:1016
+#: src/util/crypto_ecc.c:1045
 #, fuzzy
 msgid "Could not load peer's private key\n"
 msgstr "Không thể truy cập đến tập tin gnunet-directory « %s »\n"
 
-#: src/util/crypto_ecc.c:1120
+#: src/util/crypto_ecc.c:1149
 #, fuzzy, c-format
 msgid "ECC signing failed at %s:%d: %s\n"
 msgstr "%s bị lỗi tại %s:%d: « %s »\n"
 
-#: src/util/crypto_ecc.c:1170
+#: src/util/crypto_ecc.c:1199
 #, fuzzy, c-format
 msgid "EdDSA signing failed at %s:%d: %s\n"
 msgstr "%s bị lỗi tại %s:%d: « %s »\n"
 
-#: src/util/crypto_ecc.c:1244
+#: src/util/crypto_ecc.c:1273
 #, fuzzy, c-format
 msgid "ECDSA signature verification failed at %s:%d: %s\n"
 msgstr "Lỗi thẩm tra chữ ký RSA tại %s:%d: %s\n"
 
-#: src/util/crypto_ecc.c:1301
+#: src/util/crypto_ecc.c:1330
 #, fuzzy, c-format
 msgid "EdDSA signature verification failed at %s:%d: %s\n"
 msgstr "Lỗi thẩm tra chữ ký RSA tại %s:%d: %s\n"
@@ -8962,17 +8952,17 @@ msgstr ""
 msgid "Perform default-actions for GNUnet URIs"
 msgstr ""
 
-#: src/util/helper.c:338
+#: src/util/helper.c:342
 #, fuzzy, c-format
 msgid "Error reading from `%s': %s\n"
 msgstr "Gặp lỗi khi tạo người dùng"
 
-#: src/util/helper.c:383
+#: src/util/helper.c:388
 #, fuzzy, c-format
 msgid "Failed to parse inbound message from helper `%s'\n"
 msgstr "Lỗi đọc danh sách bạn bè từ « %s »\n"
 
-#: src/util/helper.c:609
+#: src/util/helper.c:618
 #, fuzzy, c-format
 msgid "Error writing to `%s': %s\n"
 msgstr "Gặp lỗi khi tạo người dùng"
@@ -8982,7 +8972,7 @@ msgstr "Gặp lỗi khi tạo người dùng"
 msgid "Unable to shorten unix path `%s' while keeping name unique\n"
 msgstr ""
 
-#: src/util/network.c:1669 src/util/network.c:1845
+#: src/util/network.c:1681 src/util/network.c:1857
 #, c-format
 msgid ""
 "Fatal internal logic error, process hangs in `%s' (abort with CTRL-C)!\n"
@@ -9066,16 +9056,12 @@ msgstr "GNUnet bây giờ sử dụng địa chỉ IP %s.\n"
 msgid "Timeout trying to resolve hostname `%s'.\n"
 msgstr "không quyết định các tên máy"
 
-#: src/util/resolver_api.c:974
+#: src/util/resolver_api.c:1004
 #, fuzzy, c-format
 msgid "Could not resolve our FQDN : %s\n"
 msgstr "Không thể giải quyết « %s » (%s): %s\n"
 
-#: src/util/scheduler.c:812
-msgid "Looks like we're busy waiting...\n"
-msgstr ""
-
-#: src/util/server.c:484
+#: src/util/server.c:483
 #, fuzzy, c-format
 msgid "`%s' failed for port %d (%s).\n"
 msgstr "« %s » thất bại cho ổ đĩa « %s »: %u\n"
@@ -9090,7 +9076,7 @@ msgstr "« %s » bị lỗi cho cổng %d. Trình gnunetd có chạy chưa?\n"
 msgid "`%s' failed for `%s': address already in use\n"
 msgstr "« %s » bị lỗi cho cổng %d. Trình gnunetd có chạy chưa?\n"
 
-#: src/util/server.c:896
+#: src/util/server.c:904
 #, c-format
 msgid ""
 "Processing code for message of type %u did not call "
@@ -9245,63 +9231,63 @@ msgstr " ngày"
 msgid "end of time"
 msgstr ""
 
-#: src/util/strings.c:1192
+#: src/util/strings.c:1226
 msgid "IPv6 address did not start with `['\n"
 msgstr ""
 
-#: src/util/strings.c:1200
+#: src/util/strings.c:1234
 msgid "IPv6 address did contain ':' to separate port number\n"
 msgstr ""
 
-#: src/util/strings.c:1206
+#: src/util/strings.c:1240
 msgid "IPv6 address did contain ']' before ':' to separate port number\n"
 msgstr ""
 
-#: src/util/strings.c:1213
+#: src/util/strings.c:1247
 msgid "IPv6 address did contain a valid port number after the last ':'\n"
 msgstr ""
 
-#: src/util/strings.c:1222
+#: src/util/strings.c:1256
 #, fuzzy, c-format
 msgid "Invalid IPv6 address `%s': %s\n"
 msgstr "Mức ưu tiên tiến trình không hợp lê « %s ».\n"
 
-#: src/util/strings.c:1428 src/util/strings.c:1444
+#: src/util/strings.c:1462 src/util/strings.c:1478
 msgid "Port not in range\n"
 msgstr ""
 
-#: src/util/strings.c:1453
+#: src/util/strings.c:1487
 #, fuzzy, c-format
 msgid "Malformed port policy `%s'\n"
 msgstr "Lỗi bắt đầu thu thập.\n"
 
-#: src/util/strings.c:1536 src/util/strings.c:1567 src/util/strings.c:1615
-#: src/util/strings.c:1636
+#: src/util/strings.c:1570 src/util/strings.c:1601 src/util/strings.c:1649
+#: src/util/strings.c:1670
 #, c-format
 msgid "Invalid format for IP: `%s'\n"
 msgstr "Địa chỉ IP định dạng sai: %s\n"
 
-#: src/util/strings.c:1593
+#: src/util/strings.c:1627
 #, c-format
 msgid "Invalid network notation ('/%d' is not legal in IPv4 CIDR)."
 msgstr "Ký hiệu mạng sai (« /%d » không hợp lệ trong CIDR IPv4)."
 
-#: src/util/strings.c:1645
+#: src/util/strings.c:1679
 #, fuzzy, c-format
 msgid "Invalid format: `%s'\n"
 msgstr "Địa chỉ IP định dạng sai: %s\n"
 
-#: src/util/strings.c:1697
+#: src/util/strings.c:1731
 #, c-format
 msgid "Invalid network notation (does not end with ';': `%s')\n"
 msgstr "Ký hiệu mạng sai (không kết thúc với « ; »: « %s »)\n"
 
-#: src/util/strings.c:1747
+#: src/util/strings.c:1781
 #, fuzzy, c-format
 msgid "Wrong format `%s' for netmask\n"
 msgstr "Mặt nạ mạng có định dạng sai « %s »: %s\n"
 
-#: src/util/strings.c:1778
+#: src/util/strings.c:1812
 #, fuzzy, c-format
 msgid "Wrong format `%s' for network\n"
 msgstr "Mạng có định dạng sai « %s »: %s\n"
@@ -9489,23 +9475,88 @@ msgstr "# các byte đã nhận qua UDP"
 msgid "Setup tunnels via VPN."
 msgstr ""
 
-#: src/include/gnunet_common.h:588 src/include/gnunet_common.h:595
-#: src/include/gnunet_common.h:603
+#: src/include/gnunet_common.h:590 src/include/gnunet_common.h:597
+#: src/include/gnunet_common.h:605
 #, fuzzy, c-format
 msgid "Assertion failed at %s:%d.\n"
 msgstr "Lỗi nội bộ : khẳng định không thành công tại %s:%d.\n"
 
-#: src/include/gnunet_common.h:615
+#: src/include/gnunet_common.h:617
 #, fuzzy, c-format
 msgid "External protocol violation detected at %s:%d.\n"
 msgstr "Lỗi nội bộ : khẳng định không thành công tại %s:%d.\n"
 
-#: src/include/gnunet_common.h:642 src/include/gnunet_common.h:651
+#: src/include/gnunet_common.h:644 src/include/gnunet_common.h:653
 #, c-format
 msgid "`%s' failed on file `%s' at %s:%d with error: %s\n"
 msgstr "« %s » thất bại ở tập tin « %s » tại %s:%d với lỗi: %s\n"
 
 #, fuzzy
+#~ msgid "Failed to initialize solver!\n"
+#~ msgstr "Không thể sơ khởi SQLite: %s.\n"
+
+#, fuzzy
+#~ 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"
+
+#, fuzzy
+#~ msgid "Failed to receive response from database.\n"
+#~ msgstr ""
+#~ "\n"
+#~ "Không nhận được đáp ứng từ gnunetd.\n"
+
+#, fuzzy
+#~ 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"
+
+#, fuzzy
+#~ msgid "Blacklist refuses connection attempt to peer `%s'\n"
+#~ msgstr "Lỗi kết nối đến gnunetd.\n"
+
+#, fuzzy
+#~ msgid "# keepalives sent"
+#~ msgstr "# các khoá phiên chạy được gửi"
+
+#, fuzzy
+#~ msgid ""
+#~ "Failed to send SYN message to peer `%s' using address `%s' session %p\n"
+#~ msgstr "Lỗi kết nối đến gnunetd.\n"
+
+#, fuzzy
+#~ msgid "# Failed attempts to switch addresses (no response)"
+#~ msgstr "Lỗi mở tập tin ghi sự kiện « %s »: %s\n"
+
+#, fuzzy
+#~ msgid "Validation received new %s message for peer `%s' with size %u\n"
+#~ msgstr "Nhận yêu cầu định tuyến\n"
+
+#, fuzzy
+#~ msgid "Adding `%s' without addresses for peer `%s'\n"
+#~ msgstr "Không thể lấy địa chỉ của đồng đẳng « %s ».\n"
+
+#, fuzzy
+#~ msgid "# IPv4 broadcast HELLO beacons received via udp"
+#~ msgstr "# các thông báo PONG đã mật mã được nhận"
+
+#, fuzzy
+#~ msgid "Invalid IPv6 address: `%s'\n"
+#~ msgstr "Mức ưu tiên tiến trình không hợp lê « %s ».\n"
+
+#, fuzzy
+#~ msgid ""
+#~ "Failed to establish TCP connection to `%s:%u', no further addresses to "
+#~ "try.\n"
+#~ msgstr "Lỗi thiết lập kết nối với đồng đẳng.\n"
+
+#, fuzzy
+#~ msgid "Trying to connect to `%s' (%p)\n"
+#~ msgstr "Không thể kết nối tới %s:%u: %s\n"
+
+#, fuzzy
+#~ msgid "Attempt to connect to `%s' failed\n"
+#~ msgstr " Lỗi kết nối\n"
+
+#, fuzzy
 #~ msgid "# PING without HELLO messages sent"
 #~ msgstr "# các thông báo PONG nhập thô được gửi"
 
@@ -10497,10 +10548,6 @@ msgstr "« %s » thất bại ở tập tin « %s » tại %s:%d với lỗi: %s
 #~ msgstr "SMTP: « %s » bị lỗi: %s\n"
 
 #, fuzzy
-#~ msgid "# Peers connected"
-#~ msgstr "# của các đồng đẳng đã kết nối"
-
-#, fuzzy
 #~ msgid "%s failed for `%s' at %s:%d: `%s'\n"
 #~ msgstr "%s bị lỗi tại %s:%d: « %s »\n"
 
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 465647608..e436be704 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnunet-0.8.1\n"
 "Report-Msgid-Bugs-To: gnunet-developers@mail.gnu.org\n"
-"POT-Creation-Date: 2015-01-27 19:22+0100\n"
+"POT-Creation-Date: 2015-03-07 12:06+0100\n"
 "PO-Revision-Date: 2011-07-09 12:12+0800\n"
 "Last-Translator: Wylmer Wang <wantinghard@gmail.com>\n"
 "Language-Team: Chinese (simplified) <i18n-zh@googlegroups.com>\n"
@@ -330,150 +330,138 @@ msgstr ""
 msgid "Initiating shutdown as requested by client.\n"
 msgstr ""
 
-#: src/ats/gnunet-ats-solver-eval.c:2810 src/ats/gnunet-ats-solver-eval.c:2851
-#: src/ats/gnunet-service-ats_addresses.c:1635
-#: src/ats/gnunet-service-ats_addresses.c:1683
+#: src/ats/gnunet-ats-solver-eval.c:2778 src/ats/gnunet-ats-solver-eval.c:2819
 #, c-format
 msgid ""
 "Could not load quota for network `%s':  `%s', assigning default bandwidth "
 "%llu\n"
 msgstr ""
 
-#: src/ats/gnunet-ats-solver-eval.c:2828
-#: src/ats/gnunet-service-ats_addresses.c:1653
+#: src/ats/gnunet-ats-solver-eval.c:2796
 #, c-format
 msgid ""
 "No outbound quota configured for network `%s', assigning default bandwidth "
 "%llu\n"
 msgstr ""
 
-#: src/ats/gnunet-ats-solver-eval.c:2869
-#: src/ats/gnunet-service-ats_addresses.c:1701
+#: src/ats/gnunet-ats-solver-eval.c:2837
 #, c-format
 msgid ""
 "No outbound quota configure for network `%s', assigning default bandwidth "
 "%llu\n"
 msgstr ""
 
-#: src/ats/gnunet-ats-solver-eval.c:3434
+#: src/ats/gnunet-ats-solver-eval.c:3290
 #: src/ats-tests/gnunet-solver-eval.c:918
 msgid "solver to use"
 msgstr ""
 
-#: src/ats/gnunet-ats-solver-eval.c:3437
+#: src/ats/gnunet-ats-solver-eval.c:3293
 #: src/ats-tests/gnunet-solver-eval.c:921
 #: src/ats-tests/gnunet-solver-eval.c:924
 msgid "experiment to use"
 msgstr ""
 
-#: src/ats/gnunet-ats-solver-eval.c:3440
+#: src/ats/gnunet-ats-solver-eval.c:3296
 msgid "be verbose"
 msgstr ""
 
-#: src/ats/gnunet-ats-solver-eval.c:3443
+#: src/ats/gnunet-ats-solver-eval.c:3299
 #, fuzzy
 msgid "print logging"
 msgstr "未知的命令“%s”。\n"
 
-#: src/ats/gnunet-ats-solver-eval.c:3446
+#: src/ats/gnunet-ats-solver-eval.c:3302
 msgid "save logging to disk"
 msgstr ""
 
-#: src/ats/gnunet-ats-solver-eval.c:3449
+#: src/ats/gnunet-ats-solver-eval.c:3305
 msgid "disable normalization"
 msgstr ""
 
-#: src/ats/gnunet-service-ats_addresses.c:1644
+#: src/ats/gnunet-service-ats_plugins.c:304
 #, c-format
-msgid "Outbound quota configure for network `%s' is %llu\n"
+msgid ""
+"Could not load %s quota for network `%s':  `%s', assigning default bandwidth "
+"%llu\n"
 msgstr ""
 
-#: src/ats/gnunet-service-ats_addresses.c:1692
+#: src/ats/gnunet-service-ats_plugins.c:314
 #, c-format
-msgid "Inbound quota configured for network `%s' is %llu\n"
+msgid "%s quota configured for network `%s' is %llu\n"
 msgstr ""
 
-#: src/ats/gnunet-service-ats_addresses.c:1895
+#: src/ats/gnunet-service-ats_plugins.c:359
 #, c-format
-msgid "Initializing solver `%s '`%s'\n"
+msgid ""
+"No %s-quota configured for network `%s', assigning default bandwidth %llu\n"
 msgstr ""
 
-#: src/ats/gnunet-service-ats_addresses.c:1901
+#: src/ats/gnunet-service-ats_plugins.c:451
 #, fuzzy, c-format
 msgid "Failed to initialize solver `%s'!\n"
 msgstr "无法初始化 SQLite：%s。\n"
 
-#: src/ats/gnunet-service-ats_addresses.c:1926
-#, fuzzy
-msgid "Failed to initialize solver!\n"
-msgstr "无法初始化 SQLite：%s。\n"
-
-#: src/ats/plugin_ats_mlp.c:1345
+#: src/ats/plugin_ats_mlp.c:1274
 msgid "Problem size too large, cannot allocate memory!\n"
 msgstr ""
 
-#: src/ats/plugin_ats_mlp.c:1941
+#: src/ats/plugin_ats_mlp.c:1869
 #, c-format
 msgid "Adding address for peer `%s' multiple times\n"
 msgstr ""
 
-#: src/ats/plugin_ats_mlp.c:1993
+#: src/ats/plugin_ats_mlp.c:1913
 #, c-format
-msgid "Updating address property `%s' for peer `%s' %p not added before\n"
+msgid "Updating address property for peer `%s' %p not added before\n"
 msgstr ""
 
-#: src/ats/plugin_ats_mlp.c:2714
+#: src/ats/plugin_ats_mlp.c:2475
 msgid ""
 "MLP solver is not optimizing for anything, changing to feasibility check\n"
 msgstr ""
 
-#: src/ats/plugin_ats_mlp.c:2754 src/ats/plugin_ats_mlp.c:2771
-#: src/ats/plugin_ats_mlp.c:2803 src/ats/plugin_ats_mlp.c:2821
-#: src/ats/plugin_ats_mlp.c:2840 src/ats/plugin_ats_proportional.c:1993
-#: src/ats/plugin_ats_proportional.c:2014 src/ats/plugin_ats_ril.c:2718
-#: src/ats/plugin_ats_ril.c:2735 src/ats/plugin_ats_ril.c:2752
-#: src/ats/plugin_ats_ril.c:2769 src/ats/plugin_ats_ril.c:2786
-#: src/ats/plugin_ats_ril.c:2803 src/ats/plugin_ats_ril.c:2820
-#: src/ats/plugin_ats_ril.c:2837
+#: src/ats/plugin_ats_mlp.c:2515 src/ats/plugin_ats_mlp.c:2532
+#: src/ats/plugin_ats_mlp.c:2564 src/ats/plugin_ats_mlp.c:2582
+#: src/ats/plugin_ats_mlp.c:2601 src/ats/plugin_ats_proportional.c:1140
+#: src/ats/plugin_ats_ril.c:2613 src/ats/plugin_ats_ril.c:2630
+#: src/ats/plugin_ats_ril.c:2647 src/ats/plugin_ats_ril.c:2664
+#: src/ats/plugin_ats_ril.c:2681 src/ats/plugin_ats_ril.c:2698
+#: src/ats/plugin_ats_ril.c:2715 src/ats/plugin_ats_ril.c:2732
 #, fuzzy, c-format
 msgid "Invalid %s configuration %f \n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/ats/plugin_ats_mlp.c:2927
+#: src/ats/plugin_ats_mlp.c:2670
 #, 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:2936
+#: src/ats/plugin_ats_mlp.c:2679
 #, 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:2947
+#: src/ats/plugin_ats_mlp.c:2689
 #, c-format
 msgid ""
 "Adjusting outbound quota configuration for network `%s'from %llu to %.0f\n"
 msgstr ""
 
-#: src/ats/plugin_ats_mlp.c:2955
+#: src/ats/plugin_ats_mlp.c:2698
 #, c-format
 msgid ""
 "Adjusting inbound quota configuration for network `%s' from %llu to %.0f\n"
 msgstr ""
 
-#: src/ats/plugin_ats_mlp.c:2966
-#, c-format
-msgid "Using default quota configuration for network `%s' (in/out) %llu/%llu\n"
-msgstr ""
-
-#: src/ats/plugin_ats_proportional.c:1852
+#: src/ats/plugin_ats_proportional.c:1163
 #, fuzzy, c-format
-msgid "Invalid network type `%u' `%s': Disconnect!\n"
-msgstr "�����到���机“%s”的 IP：%s\n"
+msgid "Invalid %s configuration %f\n"
+msgstr "解�����置文��“%s”失败\n"
 
 #: src/ats-tests/ats-testing.c:72
 msgid "Benchmarking done\n"
@@ -508,7 +496,7 @@ msgstr ""
 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:677
+#: src/ats-tests/ats-testing.c:490 src/ats-tests/ats-testing.c:662
 #, fuzzy
 msgid "Initialization failed, shutdown\n"
 msgstr "插件机构初始化失败：%s！\n"
@@ -529,126 +517,126 @@ msgid ""
 "= %u KiB/s\n"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:296
+#: src/ats-tool/gnunet-ats.c:289
 #, c-format
 msgid "%u address resolutions had a timeout\n"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:300
+#: src/ats-tool/gnunet-ats.c:293
 #, c-format
 msgid "ATS returned stat_results for %u addresses\n"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:377
-msgid "active "
-msgstr ""
-
-#: src/ats-tool/gnunet-ats.c:377
-msgid "inactive "
-msgstr ""
-
-#: src/ats-tool/gnunet-ats.c:426
+#: src/ats-tool/gnunet-ats.c:366
 #, 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:543
+#: src/ats-tool/gnunet-ats.c:373
+msgid "active "
+msgstr ""
+
+#: src/ats-tool/gnunet-ats.c:373
+msgid "inactive "
+msgstr ""
+
+#: src/ats-tool/gnunet-ats.c:483
 #, c-format
 msgid "Removed address of peer `%s' with plugin `%s'\n"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:744
+#: src/ats-tool/gnunet-ats.c:676
 #, c-format
 msgid "Quota for network `%11s' (in/out): %10s / %10s\n"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:776 src/namestore/gnunet-namestore.c:700
-#: src/transport/gnunet-transport.c:1843
+#: src/ats-tool/gnunet-ats.c:708 src/namestore/gnunet-namestore.c:700
+#: src/transport/gnunet-transport.c:1890
 #: src/transport/gnunet-transport-profiler.c:531
 #, fuzzy, c-format
 msgid "Service `%s' is not running\n"
 msgstr "服务已删除。\n"
 
-#: src/ats-tool/gnunet-ats.c:790 src/transport/gnunet-transport.c:1852
+#: src/ats-tool/gnunet-ats.c:722 src/transport/gnunet-transport.c:1899
 #: src/transport/gnunet-transport-profiler.c:549
 #, fuzzy, c-format
 msgid "Failed to parse peer identity `%s'\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/ats-tool/gnunet-ats.c:800
+#: src/ats-tool/gnunet-ats.c:732
 #, c-format
 msgid "Please select one operation : %s or %s or %s or %s or %s\n"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:822 src/ats-tool/gnunet-ats.c:848
-#: src/ats-tool/gnunet-ats.c:876 src/ats-tool/gnunet-ats.c:922
+#: src/ats-tool/gnunet-ats.c:754 src/ats-tool/gnunet-ats.c:780
+#: src/ats-tool/gnunet-ats.c:808 src/ats-tool/gnunet-ats.c:854
 #, fuzzy
 msgid "Cannot connect to ATS service, exiting...\n"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/ats-tool/gnunet-ats.c:834 src/ats-tool/gnunet-ats.c:860
+#: src/ats-tool/gnunet-ats.c:766 src/ats-tool/gnunet-ats.c:792
 #, fuzzy
 msgid "Cannot issue request to ATS service, exiting...\n"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/ats-tool/gnunet-ats.c:888
+#: src/ats-tool/gnunet-ats.c:820
 #, fuzzy
 msgid "No preference type given!\n"
 msgstr "无法获取有关用户“%s”的信息：%s\n"
 
-#: src/ats-tool/gnunet-ats.c:895
+#: src/ats-tool/gnunet-ats.c:827
 msgid "No peer given!\n"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:913
+#: src/ats-tool/gnunet-ats.c:845
 msgid "Valid type required\n"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:981
+#: src/ats-tool/gnunet-ats.c:916
 msgid "get list of active addresses currently used"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:983
+#: src/ats-tool/gnunet-ats.c:918
 msgid "get list of all active addresses"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:986
+#: src/ats-tool/gnunet-ats.c:921
 #, fuzzy
 msgid "do not resolve IP addresses to hostnames"
 msgstr "GNUnet 现在使用 IP 地址 %s。\n"
 
-#: src/ats-tool/gnunet-ats.c:988
+#: src/ats-tool/gnunet-ats.c:923
 msgid "monitor mode"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:990
+#: src/ats-tool/gnunet-ats.c:925
 #, fuzzy
 msgid "set preference for the given peer"
 msgstr "无法获取有关用户“%s”的信息：%s\n"
 
-#: src/ats-tool/gnunet-ats.c:992
+#: src/ats-tool/gnunet-ats.c:927
 msgid "print all configured quotas"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:994
+#: src/ats-tool/gnunet-ats.c:929
 msgid "peer id"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:997
+#: src/ats-tool/gnunet-ats.c:932
 msgid "preference type to set: latency | bandwidth"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:999
+#: src/ats-tool/gnunet-ats.c:934
 msgid "preference value"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:1002
+#: src/ats-tool/gnunet-ats.c:937
 msgid "verbose output (include ATS address properties)"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:1009
+#: src/ats-tool/gnunet-ats.c:944
 #, fuzzy
 msgid "Print information about ATS state"
 msgstr "无法获取有关用户“%s”的信息：%s\n"
@@ -1251,7 +1239,7 @@ msgstr "“%s”的参数无效。\n"
 msgid "Failed to connect to CORE service!\n"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/core/gnunet-core.c:179 src/transport/gnunet-transport.c:2104
+#: src/core/gnunet-core.c:179 src/transport/gnunet-transport.c:2154
 msgid "provide information about all current connections (continuously)"
 msgstr ""
 
@@ -1282,130 +1270,130 @@ msgstr ""
 msgid "# bytes of messages of type %u received"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:565
+#: src/core/gnunet-service-core_kx.c:571
 msgid "# bytes encrypted"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:617
+#: src/core/gnunet-service-core_kx.c:630
 msgid "# bytes decrypted"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:703
+#: src/core/gnunet-service-core_kx.c:719
 msgid "# key exchanges initiated"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:747
+#: src/core/gnunet-service-core_kx.c:763
 msgid "# key exchanges stopped"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:848
+#: src/core/gnunet-service-core_kx.c:864
 msgid "# old ephemeral keys ignored"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:855
+#: src/core/gnunet-service-core_kx.c:871
 msgid "# ephemeral keys received"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:889
+#: src/core/gnunet-service-core_kx.c:910
 #, 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:900
+#: src/core/gnunet-service-core_kx.c:921
 msgid "# EPHEMERAL_KEY messages received"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:999
-#: src/transport/gnunet-service-transport_validation.c:1062
+#: src/core/gnunet-service-core_kx.c:1020
+#: src/transport/gnunet-service-transport_validation.c:1053
 msgid "# PING messages received"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1007
+#: src/core/gnunet-service-core_kx.c:1028
 msgid "# PING messages dropped (out of order)"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1034
+#: src/core/gnunet-service-core_kx.c:1056
 #, 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:1050
+#: src/core/gnunet-service-core_kx.c:1082
 msgid "# PONG messages created"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1077
+#: src/core/gnunet-service-core_kx.c:1111
 msgid "# sessions terminated by timeout"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1088
+#: src/core/gnunet-service-core_kx.c:1124
 msgid "# keepalive messages sent"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1156
-#: src/transport/gnunet-service-transport_validation.c:1406
+#: src/core/gnunet-service-core_kx.c:1195
+#: src/transport/gnunet-service-transport_validation.c:1370
 msgid "# PONG messages received"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1162
+#: src/core/gnunet-service-core_kx.c:1201
 msgid "# PONG messages dropped (connection down)"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1167
+#: src/core/gnunet-service-core_kx.c:1206
 msgid "# PONG messages dropped (out of order)"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1197
+#: src/core/gnunet-service-core_kx.c:1236
 msgid "# PONG messages decrypted"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1232
+#: src/core/gnunet-service-core_kx.c:1271
 msgid "# session keys confirmed via PONG"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1243
+#: src/core/gnunet-service-core_kx.c:1282
 msgid "# timeouts prevented via PONG"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1250
+#: src/core/gnunet-service-core_kx.c:1289
 msgid "# rekey operations confirmed via PONG"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1392
+#: src/core/gnunet-service-core_kx.c:1431
 msgid "# DATA message dropped (out of order)"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1399
+#: src/core/gnunet-service-core_kx.c:1438
 #, 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:1402
+#: src/core/gnunet-service-core_kx.c:1441
 msgid "# sessions terminated by key expiration"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1448
-#: src/core/gnunet-service-core_kx.c:1473
+#: src/core/gnunet-service-core_kx.c:1487
+#: src/core/gnunet-service-core_kx.c:1512
 msgid "# bytes dropped (duplicates)"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1460
+#: src/core/gnunet-service-core_kx.c:1499
 msgid "# bytes dropped (out of sequence)"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1502
+#: src/core/gnunet-service-core_kx.c:1541
 msgid "# bytes dropped (ancient message)"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1510
+#: src/core/gnunet-service-core_kx.c:1549
 msgid "# bytes of payload decrypted"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1545
+#: src/core/gnunet-service-core_kx.c:1584
 msgid "# PAYLOAD dropped (out of order)"
 msgstr ""
 
@@ -1431,13 +1419,11 @@ msgstr ""
 #: src/core/gnunet-service-core_sessions.c:328
 #: src/dht/gnunet-service-dht_neighbours.c:661
 #: src/dht/gnunet-service-dht_neighbours.c:726
-#: src/fs/gnunet-service-fs_cp.c:629 src/fs/gnunet-service-fs_cp.c:1571
+#: src/fs/gnunet-service-fs_cp.c:645 src/fs/gnunet-service-fs_cp.c:1627
 #: src/topology/gnunet-daemon-topology.c:734
 #: src/topology/gnunet-daemon-topology.c:835
-#: src/transport/gnunet-service-transport_neighbours.c:954
-#: src/transport/gnunet-service-transport_neighbours.c:1180
-#: src/transport/gnunet-service-transport_neighbours.c:3211
-#: src/transport/gnunet-service-transport_neighbours.c:3510
+#: src/transport/gnunet-service-transport_neighbours.c:754
+#: src/transport/gnunet-service-transport_neighbours.c:762
 msgid "# peers connected"
 msgstr ""
 
@@ -1478,8 +1464,8 @@ msgid "# items stored"
 msgstr ""
 
 #: src/datacache/datacache.c:143 src/datacache/datacache.c:150
-#: src/datastore/gnunet-service-datastore.c:1554
-#: src/datastore/gnunet-service-datastore.c:1565
+#: src/datastore/gnunet-service-datastore.c:1557
+#: src/datastore/gnunet-service-datastore.c:1568
 #, c-format
 msgid "No `%s' specified for `%s' in configuration!\n"
 msgstr ""
@@ -1527,8 +1513,8 @@ msgstr ""
 #: 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:624
-#: src/include/gnunet_common.h:633 src/scalarproduct/scalarproduct.h:35
+#: src/util/crypto_mpi.c:39 src/include/gnunet_common.h:626
+#: src/include/gnunet_common.h:635 src/scalarproduct/scalarproduct.h:35
 #, fuzzy, c-format
 msgid "`%s' failed at %s:%d with error: %s\n"
 msgstr "“%s”于 %s:%d 处失败，错误为：%s\n"
@@ -1621,10 +1607,6 @@ msgstr ""
 msgid "# REMOVE requests executed"
 msgstr ""
 
-#: src/datastore/datastore_api.c:1189
-msgid "Failed to receive response from database.\n"
-msgstr ""
-
 #: src/datastore/datastore_api.c:1248
 msgid "# Results received"
 msgstr ""
@@ -1711,7 +1693,7 @@ msgstr ""
 #: src/datastore/gnunet-service-datastore.c:712
 #: src/datastore/gnunet-service-datastore.c:767
 #: src/datastore/gnunet-service-datastore.c:982
-#: src/datastore/gnunet-service-datastore.c:1526
+#: src/datastore/gnunet-service-datastore.c:1529
 msgid "# reserved"
 msgstr ""
 
@@ -1789,31 +1771,31 @@ msgstr ""
 msgid "Bloomfilter construction complete.\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1559
+#: src/datastore/gnunet-service-datastore.c:1562
 #, c-format
 msgid "# bytes used in file-sharing datastore `%s'"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1570
+#: src/datastore/gnunet-service-datastore.c:1573
 msgid "# quota"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1572
+#: src/datastore/gnunet-service-datastore.c:1575
 msgid "# cache size"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1585
+#: src/datastore/gnunet-service-datastore.c:1588
 #, c-format
 msgid "Could not use specified filename `%s' for bloomfilter.\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1603
-#: src/datastore/gnunet-service-datastore.c:1619
+#: src/datastore/gnunet-service-datastore.c:1606
+#: src/datastore/gnunet-service-datastore.c:1622
 #, fuzzy, c-format
 msgid "Failed to remove bogus bloomfilter file `%s'\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/datastore/gnunet-service-datastore.c:1649
+#: src/datastore/gnunet-service-datastore.c:1652
 #, fuzzy
 msgid "Failed to initialize bloomfilter.\n"
 msgstr "初始化“%s”服务失败。\n"
@@ -2057,22 +2039,22 @@ msgid "Failed to connect to transport service!\n"
 msgstr "初始化“%s”服务失败。\n"
 
 #: src/dht/gnunet-service-dht_clients.c:417
-#: src/dht/gnunet-service-xdht_clients.c:844
+#: src/dht/gnunet-service-xdht_clients.c:849
 msgid "# GET requests from clients injected"
 msgstr ""
 
 #: src/dht/gnunet-service-dht_clients.c:513
-#: src/dht/gnunet-service-xdht_clients.c:928
+#: src/dht/gnunet-service-xdht_clients.c:933
 msgid "# PUT requests received from clients"
 msgstr ""
 
 #: src/dht/gnunet-service-dht_clients.c:597
-#: src/dht/gnunet-service-xdht_clients.c:993
+#: src/dht/gnunet-service-xdht_clients.c:998
 msgid "# GET requests received from clients"
 msgstr ""
 
 #: src/dht/gnunet-service-dht_clients.c:798
-#: src/dht/gnunet-service-xdht_clients.c:1195
+#: src/dht/gnunet-service-xdht_clients.c:1200
 msgid "# GET STOP requests received from clients"
 msgstr ""
 
@@ -2086,26 +2068,26 @@ msgstr ""
 msgid "# Duplicate REPLIES to CLIENT request dropped"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_clients.c:1090
-#: src/dht/gnunet-service-xdht_clients.c:554
+#: src/dht/gnunet-service-dht_clients.c:1098
+#: src/dht/gnunet-service-xdht_clients.c:559
 #, c-format
 msgid "Unsupported block type (%u) in request!\n"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_clients.c:1113
-#: src/dht/gnunet-service-xdht_clients.c:577
+#: src/dht/gnunet-service-dht_clients.c:1121
+#: src/dht/gnunet-service-xdht_clients.c:582
 msgid "# RESULTS queued for clients"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_clients.c:1167
-#: src/dht/gnunet-service-dht_clients.c:1210
-#: src/dht/gnunet-service-xdht_clients.c:631
-#: src/dht/gnunet-service-xdht_clients.c:674
+#: src/dht/gnunet-service-dht_clients.c:1175
+#: src/dht/gnunet-service-dht_clients.c:1218
+#: src/dht/gnunet-service-xdht_clients.c:636
+#: src/dht/gnunet-service-xdht_clients.c:679
 msgid "# REPLIES ignored for CLIENTS (no match)"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_clients.c:1177
-#: src/dht/gnunet-service-xdht_clients.c:641
+#: src/dht/gnunet-service-dht_clients.c:1185
+#: src/dht/gnunet-service-xdht_clients.c:646
 msgid "Could not pass reply to client, message too big!\n"
 msgstr ""
 
@@ -2120,39 +2102,39 @@ msgstr ""
 msgid "# ITEMS stored in datacache"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_datacache.c:165
-#: src/dht/gnunet-service-xdht_datacache.c:221
+#: src/dht/gnunet-service-dht_datacache.c:173
+#: src/dht/gnunet-service-xdht_datacache.c:230
 msgid "# Good RESULTS found in datacache"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_datacache.c:176
-#: src/dht/gnunet-service-xdht_datacache.c:244
+#: src/dht/gnunet-service-dht_datacache.c:184
+#: src/dht/gnunet-service-xdht_datacache.c:253
 msgid "# Duplicate RESULTS found in datacache"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_datacache.c:182
-#: src/dht/gnunet-service-xdht_datacache.c:250
+#: src/dht/gnunet-service-dht_datacache.c:190
+#: src/dht/gnunet-service-xdht_datacache.c:259
 msgid "# Invalid RESULTS found in datacache"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_datacache.c:188
-#: src/dht/gnunet-service-xdht_datacache.c:256
+#: src/dht/gnunet-service-dht_datacache.c:196
+#: src/dht/gnunet-service-xdht_datacache.c:265
 msgid "# Irrelevant RESULTS found in datacache"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_datacache.c:200
-#: src/dht/gnunet-service-xdht_datacache.c:268
+#: src/dht/gnunet-service-dht_datacache.c:208
+#: src/dht/gnunet-service-xdht_datacache.c:277
 msgid "# Unsupported RESULTS found in datacache"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_datacache.c:203
-#: src/dht/gnunet-service-xdht_datacache.c:271
+#: src/dht/gnunet-service-dht_datacache.c:211
+#: src/dht/gnunet-service-xdht_datacache.c:280
 #, 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:309
+#: src/dht/gnunet-service-dht_datacache.c:242
+#: src/dht/gnunet-service-xdht_datacache.c:318
 msgid "# GET requests given to datacache"
 msgstr ""
 
@@ -2170,7 +2152,7 @@ msgid "# FIND PEER messages initiated"
 msgstr ""
 
 #: src/dht/gnunet-service-dht_neighbours.c:763
-#: src/dht/gnunet-service-xdht_neighbours.c:6059
+#: src/dht/gnunet-service-xdht_neighbours.c:6060
 msgid "# Queued messages discarded (peer disconnected)"
 msgstr ""
 
@@ -2245,35 +2227,35 @@ msgstr ""
 msgid "# P2P PUT bytes received"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1825
+#: src/dht/gnunet-service-dht_neighbours.c:1826
 msgid "# FIND PEER requests ignored due to Bloomfilter"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1833
+#: src/dht/gnunet-service-dht_neighbours.c:1834
 msgid "# FIND PEER requests ignored due to lack of HELLO"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1928
+#: src/dht/gnunet-service-dht_neighbours.c:1929
 msgid "# P2P GET requests received"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1931
+#: src/dht/gnunet-service-dht_neighbours.c:1932
 msgid "# P2P GET bytes received"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1988
+#: src/dht/gnunet-service-dht_neighbours.c:1997
 msgid "# P2P FIND PEER requests processed"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:2002
+#: src/dht/gnunet-service-dht_neighbours.c:2011
 msgid "# P2P GET requests ONLY routed"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:2087
+#: src/dht/gnunet-service-dht_neighbours.c:2096
 msgid "# P2P RESULTS received"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:2090
+#: src/dht/gnunet-service-dht_neighbours.c:2099
 msgid "# P2P RESULT bytes received"
 msgstr ""
 
@@ -2281,35 +2263,35 @@ msgstr ""
 msgid "# Network size estimates received"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_routing.c:211
+#: src/dht/gnunet-service-dht_routing.c:218
 msgid "# Good REPLIES matched against routing table"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_routing.c:220
+#: src/dht/gnunet-service-dht_routing.c:227
 msgid "# Duplicate REPLIES matched against routing table"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_routing.c:226
+#: src/dht/gnunet-service-dht_routing.c:233
 msgid "# Invalid REPLIES matched against routing table"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_routing.c:232
+#: src/dht/gnunet-service-dht_routing.c:239
 msgid "# Irrelevant REPLIES matched against routing table"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_routing.c:244
+#: src/dht/gnunet-service-dht_routing.c:251
 msgid "# Unsupported REPLIES matched against routing table"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_routing.c:317
+#: src/dht/gnunet-service-dht_routing.c:324
 msgid "# Entries removed from routing table"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_routing.c:399
+#: src/dht/gnunet-service-dht_routing.c:406
 msgid "# Entries added to routing table"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_routing.c:417
+#: src/dht/gnunet-service-dht_routing.c:424
 msgid "# DHT requests combined"
 msgstr ""
 
@@ -2374,17 +2356,17 @@ msgid "# FINGERS_COUNT"
 msgstr ""
 
 #: src/dht/gnunet-service-xdht_neighbours.c:3700
-#: src/dht/gnunet-service-xdht_neighbours.c:3937
-#: src/dht/gnunet-service-xdht_neighbours.c:4089
-#: src/dht/gnunet-service-xdht_neighbours.c:4239
-#: src/dht/gnunet-service-xdht_neighbours.c:4420
-#: src/dht/gnunet-service-xdht_neighbours.c:4933
-#: src/dht/gnunet-service-xdht_neighbours.c:5326
-#: src/dht/gnunet-service-xdht_neighbours.c:5419
-#: src/dht/gnunet-service-xdht_neighbours.c:5509
-#: src/dht/gnunet-service-xdht_neighbours.c:5613
-#: src/dht/gnunet-service-xdht_neighbours.c:5757
-#: src/dht/gnunet-service-xdht_neighbours.c:5846
+#: src/dht/gnunet-service-xdht_neighbours.c:3938
+#: src/dht/gnunet-service-xdht_neighbours.c:4090
+#: src/dht/gnunet-service-xdht_neighbours.c:4240
+#: src/dht/gnunet-service-xdht_neighbours.c:4421
+#: src/dht/gnunet-service-xdht_neighbours.c:4934
+#: src/dht/gnunet-service-xdht_neighbours.c:5327
+#: src/dht/gnunet-service-xdht_neighbours.c:5420
+#: src/dht/gnunet-service-xdht_neighbours.c:5510
+#: src/dht/gnunet-service-xdht_neighbours.c:5614
+#: src/dht/gnunet-service-xdht_neighbours.c:5758
+#: src/dht/gnunet-service-xdht_neighbours.c:5847
 msgid "# Bytes received from other peers"
 msgstr ""
 
@@ -2416,16 +2398,16 @@ msgid ""
 "SUPU %s, %s, %d, trail->prev_hop = %s"
 msgstr ""
 
-#: src/dht/plugin_block_dht.c:138
+#: src/dht/plugin_block_dht.c:142
 #, c-format
 msgid "Block not of type %u\n"
 msgstr ""
 
-#: src/dht/plugin_block_dht.c:145
+#: src/dht/plugin_block_dht.c:149
 msgid "Size mismatch for block\n"
 msgstr ""
 
-#: src/dht/plugin_block_dht.c:155
+#: src/dht/plugin_block_dht.c:159
 #, c-format
 msgid "Block of type %u is malformed\n"
 msgstr ""
@@ -2765,7 +2747,7 @@ msgid "# acknowledgements sent for fragment"
 msgstr ""
 
 #: src/fragmentation/defragmentation.c:456
-#: src/transport/plugin_transport_wlan.c:1517
+#: src/transport/plugin_transport_wlan.c:1515
 msgid "# fragments received"
 msgstr ""
 
@@ -3541,8 +3523,8 @@ msgid "Option `%s' is required when using option `%s'.\n"
 msgstr ""
 
 #: src/fs/gnunet-publish.c:837 src/fs/gnunet-publish.c:845
-#: src/transport/gnunet-transport.c:1881 src/transport/gnunet-transport.c:1911
-#: src/transport/gnunet-transport.c:1942
+#: src/transport/gnunet-transport.c:1928 src/transport/gnunet-transport.c:1958
+#: src/transport/gnunet-transport.c:1989
 #, c-format
 msgid "Option `%s' makes no sense without option `%s'.\n"
 msgstr ""
@@ -3634,20 +3616,20 @@ msgstr ""
 msgid "Search GNUnet for files that were published on GNUnet"
 msgstr ""
 
-#: src/fs/gnunet-service-fs.c:285
+#: src/fs/gnunet-service-fs.c:274
 msgid "# running average P2P latency (ms)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs.c:344 src/fs/gnunet-service-fs.c:607
+#: src/fs/gnunet-service-fs.c:332 src/fs/gnunet-service-fs.c:595
 msgid "# Loopback routes suppressed"
 msgstr ""
 
-#: src/fs/gnunet-service-fs.c:731
+#: src/fs/gnunet-service-fs.c:719
 #, fuzzy
 msgid "FS service is lacking HOSTKEY configuration setting.  Exiting.\n"
 msgstr "立即保存配置？"
 
-#: src/fs/gnunet-service-fs.c:757 src/hostlist/gnunet-daemon-hostlist.c:311
+#: src/fs/gnunet-service-fs.c:745 src/hostlist/gnunet-daemon-hostlist.c:311
 #: src/sensordashboard/gnunet-service-sensordashboard.c:864
 #: src/sensordashboard/gnunet-service-sensordashboard.c:872
 #: src/topology/gnunet-daemon-topology.c:1287
@@ -3691,84 +3673,88 @@ msgstr ""
 "\n"
 "按任意键继续\n"
 
-#: src/fs/gnunet-service-fs_cp.c:710
+#: src/fs/gnunet-service-fs_cp.c:726
 msgid "# migration stop messages received"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:714
+#: src/fs/gnunet-service-fs_cp.c:730
 #, c-format
 msgid "Migration of content to peer `%s' blocked for %s\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:750
+#: src/fs/gnunet-service-fs_cp.c:768
 msgid "# replies transmitted to other peers"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:756
+#: src/fs/gnunet-service-fs_cp.c:774
 msgid "# replies dropped"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:781 src/fs/gnunet-service-fs_cp.c:1337
+#: src/fs/gnunet-service-fs_cp.c:799 src/fs/gnunet-service-fs_cp.c:1384
 msgid "# P2P searches active"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:878
+#: src/fs/gnunet-service-fs_cp.c:904
 msgid "# artificial delays introduced (ms)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:934
+#: src/fs/gnunet-service-fs_cp.c:960
 msgid "# replies dropped due to type mismatch"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:942
+#: src/fs/gnunet-service-fs_cp.c:968
 msgid "# replies received for other peers"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:956
+#: src/fs/gnunet-service-fs_cp.c:982
 msgid "# replies dropped due to insufficient cover traffic"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:994
+#: src/fs/gnunet-service-fs_cp.c:1030
 msgid "# P2P searches destroyed due to ultimate reply"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1062
+#: src/fs/gnunet-service-fs_cp.c:1098
 msgid "# requests done for free (low load)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1087
+#: src/fs/gnunet-service-fs_cp.c:1123
 msgid "# request dropped, priority insufficient"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1097
+#: src/fs/gnunet-service-fs_cp.c:1133
 msgid "# requests done for a price (normal load)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1175
+#: src/fs/gnunet-service-fs_cp.c:1210
 msgid "# GET requests received (from other peers)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1209
+#: src/fs/gnunet-service-fs_cp.c:1245
 msgid "# requests dropped due to initiator not being connected"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1231
+#: src/fs/gnunet-service-fs_cp.c:1266
 msgid "# requests dropped due to missing reverse route"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1282
+#: src/fs/gnunet-service-fs_cp.c:1277
+msgid "# requests dropped due to full reply queue"
+msgstr ""
+
+#: src/fs/gnunet-service-fs_cp.c:1329
 msgid "# requests dropped due TTL underflow"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1306
+#: src/fs/gnunet-service-fs_cp.c:1353
 msgid "# requests dropped due to higher-TTL request"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1335
+#: src/fs/gnunet-service-fs_cp.c:1382
 msgid "# P2P query messages received and processed"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1754
+#: src/fs/gnunet-service-fs_cp.c:1821
 msgid "# migration stop messages sent"
 msgstr ""
 
@@ -3875,99 +3861,99 @@ msgstr ""
 msgid "# Pending requests active"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:814
+#: src/fs/gnunet-service-fs_pr.c:820
 msgid "# replies received and matched"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:844
+#: src/fs/gnunet-service-fs_pr.c:857
 msgid "# duplicate replies discarded (bloomfilter)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:853
+#: src/fs/gnunet-service-fs_pr.c:866
 msgid "# irrelevant replies discarded"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:867
+#: src/fs/gnunet-service-fs_pr.c:881
 #, c-format
 msgid "Unsupported block type %u\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:880
+#: src/fs/gnunet-service-fs_pr.c:898
 msgid "# results found locally"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1003
+#: src/fs/gnunet-service-fs_pr.c:1028
 msgid "# Datastore `PUT' failures"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1031
+#: src/fs/gnunet-service-fs_pr.c:1056
 msgid "# storage requests dropped due to high load"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1069
+#: src/fs/gnunet-service-fs_pr.c:1094
 msgid "# Replies received from DHT"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1200
+#: src/fs/gnunet-service-fs_pr.c:1226
 msgid "# Replies received from CADET"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1252
+#: src/fs/gnunet-service-fs_pr.c:1279
 #, c-format
 msgid "Datastore lookup already took %s!\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1272
+#: src/fs/gnunet-service-fs_pr.c:1299
 #, c-format
 msgid "On-demand lookup already took %s!\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1319
+#: src/fs/gnunet-service-fs_pr.c:1351
 msgid "# Datastore lookups concluded (no results)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1334
+#: src/fs/gnunet-service-fs_pr.c:1366
 msgid "# Datastore lookups concluded (seen all)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1343
+#: src/fs/gnunet-service-fs_pr.c:1375
 msgid "# Datastore lookups aborted (more than MAX_RESULTS)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1358
+#: src/fs/gnunet-service-fs_pr.c:1390
 msgid "# requested DBLOCK or IBLOCK not found"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1372
+#: src/fs/gnunet-service-fs_pr.c:1404
 msgid "# on-demand blocks matched requests"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1385
+#: src/fs/gnunet-service-fs_pr.c:1417
 msgid "# on-demand lookups performed successfully"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1390
+#: src/fs/gnunet-service-fs_pr.c:1422
 msgid "# on-demand lookups failed"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1417 src/fs/gnunet-service-fs_pr.c:1457
-#: src/fs/gnunet-service-fs_pr.c:1620
+#: src/fs/gnunet-service-fs_pr.c:1449 src/fs/gnunet-service-fs_pr.c:1489
+#: src/fs/gnunet-service-fs_pr.c:1657
 msgid "# Datastore lookups concluded (error queueing)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1475
+#: src/fs/gnunet-service-fs_pr.c:1508
 msgid "# Datastore lookups concluded (found last result)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1486
+#: src/fs/gnunet-service-fs_pr.c:1520
 msgid "# Datastore lookups concluded (load too high)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1596
+#: src/fs/gnunet-service-fs_pr.c:1633
 msgid "# Datastore lookups initiated"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1685
+#: src/fs/gnunet-service-fs_pr.c:1722
 msgid "# GAP PUT messages received"
 msgstr ""
 
@@ -4184,113 +4170,113 @@ msgstr ""
 msgid "%s failed at %s:%d: `%s'\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:833
+#: src/gns/gnunet-gns-proxy.c:842
 #, fuzzy, c-format
 msgid "Unsupported CURL SSL backend %d\n"
 msgstr "未知的命令“%s”。\n"
 
-#: src/gns/gnunet-gns-proxy.c:856
+#: src/gns/gnunet-gns-proxy.c:865
 #, fuzzy, c-format
 msgid "Failed to fetch CN from cert: %s\n"
 msgstr "打开日志文件“%s”失败：%s\n"
 
-#: src/gns/gnunet-gns-proxy.c:879
+#: src/gns/gnunet-gns-proxy.c:888
 #, fuzzy, c-format
 msgid "Failed to initialize DANE: %s\n"
 msgstr "无法初始化 SQLite：%s。\n"
 
-#: src/gns/gnunet-gns-proxy.c:892
+#: src/gns/gnunet-gns-proxy.c:901
 #, fuzzy, c-format
 msgid "Failed to parse DANE record: %s\n"
 msgstr "打开日志文件“%s”失败：%s\n"
 
-#: src/gns/gnunet-gns-proxy.c:907
+#: src/gns/gnunet-gns-proxy.c:916
 #, fuzzy, c-format
 msgid "Failed to verify TLS connection using DANE: %s\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/gns/gnunet-gns-proxy.c:917
+#: src/gns/gnunet-gns-proxy.c:926
 #, c-format
 msgid "Failed DANE verification failed with GnuTLS verify status code: %u\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:941
+#: src/gns/gnunet-gns-proxy.c:950
 #, c-format
 msgid "SSL certificate subject name (%s) does not match `%s'\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:1086
+#: src/gns/gnunet-gns-proxy.c:1095
 #, c-format
 msgid "Cookie domain `%s' supplied by server is invalid\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:1602
+#: src/gns/gnunet-gns-proxy.c:1630
 #, fuzzy, c-format
 msgid "Unsupported HTTP method `%s'\n"
 msgstr "未知的命令“%s”。\n"
 
-#: src/gns/gnunet-gns-proxy.c:1973
+#: src/gns/gnunet-gns-proxy.c:2002
 #, fuzzy, c-format
 msgid "Unable to import private key from file `%s'\n"
 msgstr "无法创建用户账户："
 
-#: src/gns/gnunet-gns-proxy.c:2003
+#: src/gns/gnunet-gns-proxy.c:2032
 #, fuzzy, c-format
 msgid "Unable to import certificate %s\n"
 msgstr "无法保存配置文件“%s”："
 
-#: src/gns/gnunet-gns-proxy.c:2177
+#: src/gns/gnunet-gns-proxy.c:2206
 #, fuzzy, c-format
 msgid "Failed to start HTTPS server for `%s'\n"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/gns/gnunet-gns-proxy.c:2196
+#: src/gns/gnunet-gns-proxy.c:2225
 #, fuzzy
 msgid "Failed to pass client to MHD\n"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/gns/gnunet-gns-proxy.c:2518
+#: src/gns/gnunet-gns-proxy.c:2547
 #, fuzzy, c-format
 msgid "Unsupported socks version %d\n"
 msgstr "未知的命令“%s”。\n"
 
-#: src/gns/gnunet-gns-proxy.c:2547
+#: src/gns/gnunet-gns-proxy.c:2576
 #, fuzzy, c-format
 msgid "Unsupported socks command %d\n"
 msgstr "未知的命令“%s”。\n"
 
-#: src/gns/gnunet-gns-proxy.c:2565 src/gns/gnunet-gns-proxy.c:2594
+#: src/gns/gnunet-gns-proxy.c:2594 src/gns/gnunet-gns-proxy.c:2623
 msgid "SSL connection to plain IPv4 address requested\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:2645
+#: src/gns/gnunet-gns-proxy.c:2674
 #, fuzzy, c-format
 msgid "Unsupported socks address type %d\n"
 msgstr "未知的命令“%s”。\n"
 
-#: src/gns/gnunet-gns-proxy.c:2984
+#: src/gns/gnunet-gns-proxy.c:3013
 msgid "No ego configured for `shorten-zone`\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:3024
+#: src/gns/gnunet-gns-proxy.c:3053
 #, c-format
 msgid "No ego configured for `%s`\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:3086
+#: src/gns/gnunet-gns-proxy.c:3115
 #, fuzzy, c-format
 msgid "Failed to load SSL/TLS key and certificate from `%s'\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/gns/gnunet-gns-proxy.c:3127
+#: src/gns/gnunet-gns-proxy.c:3156
 msgid "listen on specified port (default: 7777)"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:3130
+#: src/gns/gnunet-gns-proxy.c:3159
 msgid "pem file to use as CA"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:3149
+#: src/gns/gnunet-gns-proxy.c:3178
 msgid "GNUnet GNS proxy"
 msgstr ""
 
@@ -4694,7 +4680,7 @@ msgid "# hostlist URIs written to file"
 msgstr ""
 
 #: src/hostlist/gnunet-daemon-hostlist_client.c:1588
-#: src/transport/plugin_transport_http_client.c:2273
+#: src/transport/plugin_transport_http_client.c:2265
 #, c-format
 msgid "Invalid proxy type: `%s', disabling proxy! Check configuration!\n"
 msgstr ""
@@ -4782,7 +4768,7 @@ msgstr ""
 
 #: src/hostlist/gnunet-daemon-hostlist_server.c:747
 #: src/peerinfo-tool/gnunet-peerinfo.c:736
-#: src/transport/gnunet-service-transport.c:1018
+#: src/transport/gnunet-service-transport.c:852
 msgid "Could not access PEERINFO service.  Exiting.\n"
 msgstr ""
 
@@ -5263,127 +5249,127 @@ msgstr ""
 msgid "test_icmp_client not possible, as we have no internal IPv4 address\n"
 msgstr ""
 
-#: src/nat/nat.c:867
+#: src/nat/nat.c:862
 #, c-format
 msgid "gnunet-helper-nat-server generated malformed address `%s'\n"
 msgstr ""
 
-#: src/nat/nat.c:917
+#: src/nat/nat.c:912
 #, fuzzy, c-format
 msgid "Failed to start %s\n"
 msgstr "运行 %s失败：%s %d\n"
 
-#: src/nat/nat.c:1032
+#: src/nat/nat.c:1027
 msgid "Error while running upnp client:\n"
 msgstr ""
 
-#: src/nat/nat.c:1102
+#: src/nat/nat.c:1097
 #, fuzzy, c-format
 msgid "Failed to run upnp client for port %u\n"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/nat/nat.c:1243
+#: src/nat/nat.c:1237
 msgid "malformed"
 msgstr ""
 
-#: src/nat/nat.c:1297
+#: src/nat/nat.c:1291
 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
+#: src/nat/nat.c:1318 src/nat/nat.c:1330
 #, c-format
 msgid ""
 "Configuration requires `%s', but binary is not installed properly (SUID bit "
 "not set).  Option disabled.\n"
 msgstr ""
 
-#: src/nat/nat.c:1474
+#: src/nat/nat.c:1468
 msgid "Internal IP address not known, cannot use ICMP NAT traversal method\n"
 msgstr ""
 
-#: src/nat/nat.c:1490
+#: src/nat/nat.c:1484
 #, c-format
 msgid "Running gnunet-helper-nat-client %s %s %u\n"
 msgstr ""
 
-#: src/nat/nat.c:1575
+#: src/nat/nat.c:1569
 msgid "Operation Successful"
 msgstr ""
 
-#: src/nat/nat.c:1577
+#: src/nat/nat.c:1571
 msgid "Internal Failure (IPC, ...)"
 msgstr ""
 
-#: src/nat/nat.c:1579
+#: src/nat/nat.c:1573
 msgid "Failure in network subsystem, check permissions."
 msgstr ""
 
-#: src/nat/nat.c:1581
+#: src/nat/nat.c:1575
 msgid "Encountered timeout while performing operation"
 msgstr ""
 
-#: src/nat/nat.c:1583
+#: src/nat/nat.c:1577
 msgid "detected that we are offline"
 msgstr ""
 
-#: src/nat/nat.c:1585
+#: src/nat/nat.c:1579
 msgid "`upnpc` command not found"
 msgstr ""
 
-#: src/nat/nat.c:1587
+#: src/nat/nat.c:1581
 #, fuzzy
 msgid "Failed to run `upnpc` command"
 msgstr "运行 %s失败：%s %d\n"
 
-#: src/nat/nat.c:1589
+#: src/nat/nat.c:1583
 msgid "`upnpc' command took too long, process killed"
 msgstr ""
 
-#: src/nat/nat.c:1591
+#: src/nat/nat.c:1585
 msgid "`upnpc' command failed to establish port mapping"
 msgstr ""
 
-#: src/nat/nat.c:1593
+#: src/nat/nat.c:1587
 msgid "`external-ip' command not found"
 msgstr ""
 
-#: src/nat/nat.c:1595
+#: src/nat/nat.c:1589
 #, fuzzy
 msgid "Failed to run `external-ip` command"
 msgstr "运行 %s失败：%s %d\n"
 
-#: src/nat/nat.c:1597
+#: src/nat/nat.c:1591
 msgid "`external-ip' command output invalid"
 msgstr ""
 
-#: src/nat/nat.c:1599
+#: src/nat/nat.c:1593
 msgid "no valid address was returned by `external-ip'"
 msgstr ""
 
-#: src/nat/nat.c:1601
+#: src/nat/nat.c:1595
 #, fuzzy
 msgid "Could not determine interface with internal/local network address"
 msgstr "无法确定用户界面定义文件。"
 
-#: src/nat/nat.c:1603
+#: src/nat/nat.c:1597
 msgid "No functioning gnunet-helper-nat-server installation found"
 msgstr ""
 
-#: src/nat/nat.c:1605
+#: src/nat/nat.c:1599
 msgid "NAT test could not be initialized"
 msgstr ""
 
-#: src/nat/nat.c:1607
+#: src/nat/nat.c:1601
 msgid "NAT test timeout reached"
 msgstr ""
 
-#: src/nat/nat.c:1609
+#: src/nat/nat.c:1603
 msgid "could not register NAT"
 msgstr ""
 
-#: src/nat/nat.c:1611
+#: src/nat/nat.c:1605
 msgid "No working gnunet-helper-nat-client installation found"
 msgstr ""
 
@@ -5512,18 +5498,18 @@ msgstr ""
 msgid "failed to transmit request (service down?)"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/peerinfo/peerinfo_api.c:519
+#: src/peerinfo/peerinfo_api.c:518
 msgid "Failed to receive response from `PEERINFO' service."
 msgstr ""
 
-#: src/peerinfo/peerinfo_api.c:563 src/peerinfo/peerinfo_api.c:586
-#: src/peerinfo/peerinfo_api.c:603 src/peerinfo/peerinfo_api.c:616
-#: src/peerinfo/peerinfo_api.c:631
+#: src/peerinfo/peerinfo_api.c:562 src/peerinfo/peerinfo_api.c:585
+#: src/peerinfo/peerinfo_api.c:602 src/peerinfo/peerinfo_api.c:615
+#: src/peerinfo/peerinfo_api.c:630
 #, fuzzy
 msgid "Received invalid message from `PEERINFO' service."
 msgstr "“%s”的参数无效。\n"
 
-#: src/peerinfo/peerinfo_api.c:720
+#: src/peerinfo/peerinfo_api.c:719
 #, fuzzy
 msgid "Timeout transmitting iteration request to `PEERINFO' service."
 msgstr "初始化“%s”服务失败。\n"
@@ -5622,19 +5608,19 @@ msgid "Print information about peers."
 msgstr "无法获取有关用户“%s”的信息：%s\n"
 
 #: src/peerinfo-tool/gnunet-peerinfo_plugins.c:105
-#: src/transport/gnunet-service-transport_plugins.c:127
+#: src/transport/gnunet-service-transport_plugins.c:168
 #, c-format
 msgid "Starting transport plugins `%s'\n"
 msgstr ""
 
 #: src/peerinfo-tool/gnunet-peerinfo_plugins.c:109
-#: src/transport/gnunet-service-transport_plugins.c:132
+#: src/transport/gnunet-service-transport_plugins.c:173
 #, c-format
 msgid "Loading `%s' transport plugin\n"
 msgstr ""
 
 #: src/peerinfo-tool/gnunet-peerinfo_plugins.c:129
-#: src/transport/gnunet-service-transport_plugins.c:164
+#: src/transport/gnunet-service-transport_plugins.c:208
 #, fuzzy, c-format
 msgid "Failed to load transport plugin for `%s'\n"
 msgstr "解析配置文件“%s”失败\n"
@@ -6628,7 +6614,7 @@ msgid ""
 "content/topology-file-format\n"
 msgstr ""
 
-#: src/testbed/gnunet-daemon-latency-logger.c:333
+#: src/testbed/gnunet-daemon-latency-logger.c:323
 msgid "Daemon to log latency values of connections to neighbours"
 msgstr ""
 
@@ -6644,7 +6630,7 @@ msgstr ""
 msgid "Incorrect hostkey file format: %s\n"
 msgstr ""
 
-#: src/testbed/gnunet-daemon-testbed-underlay.c:474
+#: src/testbed/gnunet-daemon-testbed-underlay.c:476
 msgid "Daemon to restrict underlay network in testbed deployments"
 msgstr ""
 
@@ -6976,7 +6962,7 @@ msgid ""
 msgstr ""
 
 #: src/topology/gnunet-daemon-topology.c:1121
-#: src/transport/plugin_transport_wlan.c:1476
+#: src/transport/plugin_transport_wlan.c:1478
 msgid "# HELLO messages received"
 msgstr ""
 
@@ -6988,44 +6974,43 @@ msgstr ""
 msgid "GNUnet topology control (maintaining P2P cadet and F2F constraints)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_ats.c:269
-#, 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_ats.c:136
+msgid "# Addresses given to ATS"
+msgstr ""
 
-#: src/transport/gnunet-service-transport_blacklist.c:274
+#: src/transport/gnunet-service-transport_blacklist.c:286
 #, fuzzy, c-format
 msgid "Adding blacklisting entry for peer `%s'\n"
 msgstr "卸载 GNUnet 服务"
 
-#: src/transport/gnunet-service-transport_blacklist.c:283
+#: src/transport/gnunet-service-transport_blacklist.c:295
 #, c-format
 msgid "Adding blacklisting entry for peer `%s':`%s'\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_blacklist.c:476
-#: src/transport/gnunet-service-transport_blacklist.c:766
+#: src/transport/gnunet-service-transport_blacklist.c:504
+#: src/transport/gnunet-service-transport_blacklist.c:855
 msgid "# disconnects due to blacklist"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_blacklist.c:769
+#: src/transport/gnunet-service-transport_blacklist.c:859
 #, fuzzy, c-format
 msgid "Disallowing connection to peer `%s' on transport %s\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/transport/gnunet-service-transport.c:236
+#: src/transport/gnunet-service-transport.c:231
 msgid "# bytes payload discarded due to not connected peer"
 msgstr ""
 
-#: src/transport/gnunet-service-transport.c:424
+#: src/transport/gnunet-service-transport.c:385
 msgid "# bytes total received"
 msgstr ""
 
-#: src/transport/gnunet-service-transport.c:509
+#: src/transport/gnunet-service-transport.c:480
 msgid "# bytes payload received"
 msgstr ""
 
-#: src/transport/gnunet-service-transport.c:984
+#: src/transport/gnunet-service-transport.c:818
 #, fuzzy
 msgid "Transport service is lacking key configuration settings. Exiting.\n"
 msgstr "立即保存配置？"
@@ -7034,382 +7019,383 @@ msgstr "立即保存配置？"
 msgid "# messages dropped due to slow client"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_clients.c:774
+#: src/transport/gnunet-service-transport_clients.c:783
 msgid "# bytes payload dropped (other peer was not connected)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_clients.c:813
-#, fuzzy, c-format
-msgid "Blacklist refuses connection attempt to peer `%s'\n"
-msgstr "初始化“%s”服务失败。\n"
-
-#: src/transport/gnunet-service-transport_clients.c:843
+#: src/transport/gnunet-service-transport_clients.c:827
 msgid "# REQUEST CONNECT messages received"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_clients.c:882
+#: src/transport/gnunet-service-transport_clients.c:864
 msgid "# REQUEST DISCONNECT messages received"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_hello.c:182
+#: src/transport/gnunet-service-transport_hello.c:188
 msgid "# refreshed my HELLO"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:769
-#: src/transport/gnunet-service-transport_neighbours.c:846
+#: src/transport/gnunet-service-transport_neighbours.c:839
 msgid "# session creation failed"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1134
+#: src/transport/gnunet-service-transport_neighbours.c:1167
 msgid "# DISCONNECT messages sent"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1259
-#: src/transport/gnunet-service-transport_neighbours.c:1675
+#: src/transport/gnunet-service-transport_neighbours.c:1303
+#: src/transport/gnunet-service-transport_neighbours.c:1760
 msgid "# bytes in message queue for other peers"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1264
+#: src/transport/gnunet-service-transport_neighbours.c:1308
 msgid "# messages transmitted to other peers"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1269
+#: src/transport/gnunet-service-transport_neighbours.c:1314
 msgid "# transmission failures for messages to other peers"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1327
+#: src/transport/gnunet-service-transport_neighbours.c:1374
 msgid "# messages timed out while in transport queue"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1388
-msgid "# keepalives sent"
+#: src/transport/gnunet-service-transport_neighbours.c:1450
+msgid "# KEEPALIVES sent"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1421
+#: src/transport/gnunet-service-transport_neighbours.c:1486
 msgid "# KEEPALIVE messages discarded (peer unknown)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1429
+#: src/transport/gnunet-service-transport_neighbours.c:1494
 msgid "# KEEPALIVE messages discarded (no session)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1476
-msgid "# KEEPALIVE_RESPONSE messages discarded (not connected)"
+#: src/transport/gnunet-service-transport_neighbours.c:1504
+msgid "# KEEPALIVES received in good order"
+msgstr ""
+
+#: src/transport/gnunet-service-transport_neighbours.c:1549
+msgid "# KEEPALIVE_RESPONSEs discarded (not connected)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1485
-msgid "# KEEPALIVE_RESPONSE messages discarded (not expected)"
+#: src/transport/gnunet-service-transport_neighbours.c:1558
+msgid "# KEEPALIVE_RESPONSEs discarded (not expected)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1493
-msgid "# KEEPALIVE_RESPONSE messages discarded (address changed)"
+#: src/transport/gnunet-service-transport_neighbours.c:1566
+msgid "# KEEPALIVE_RESPONSEs discarded (address changed)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1501
-msgid "# KEEPALIVE_RESPONSE messages discarded (wrong nonce)"
+#: src/transport/gnunet-service-transport_neighbours.c:1575
+msgid "# KEEPALIVE_RESPONSEs discarded (no nonce)"
 msgstr ""
 
 #: src/transport/gnunet-service-transport_neighbours.c:1580
+msgid "# KEEPALIVE_RESPONSEs discarded (bad nonce)"
+msgstr ""
+
+#: src/transport/gnunet-service-transport_neighbours.c:1586
+msgid "# KEEPALIVE_RESPONSEs received (OK)"
+msgstr ""
+
+#: src/transport/gnunet-service-transport_neighbours.c:1657
 msgid "# messages discarded due to lack of neighbour record"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1614
+#: src/transport/gnunet-service-transport_neighbours.c:1691
 msgid "# bandwidth quota violations by other peers"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1630
+#: src/transport/gnunet-service-transport_neighbours.c:1706
 msgid "# ms throttling suggested"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1726
+#: src/transport/gnunet-service-transport_neighbours.c:1826
 #, fuzzy, c-format
-msgid "Failed to send SYN message to peer `%s' using address `%s' session %p\n"
-msgstr "��������“%s”服������败。\n"
+msgid "Failed to send SYN message to peer `%s'\n"
+msgstr "打���日������件“%s”失败：%s\n"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1747
+#: src/transport/gnunet-service-transport_neighbours.c:1846
 #, fuzzy
 msgid "# Failed attempts to switch addresses (failed to send SYN CONT)"
 msgstr "打开日志文件“%s”失败：%s\n"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1790
+#: src/transport/gnunet-service-transport_neighbours.c:1885
 #, fuzzy
 msgid "# SYN messages sent"
 msgstr "消息尺寸"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1806
+#: src/transport/gnunet-service-transport_neighbours.c:1902
 #, fuzzy, c-format
-msgid "Failed to transmit SYN message via plugin to %s\n"
+msgid "Failed to transmit SYN message to %s\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1833
+#: src/transport/gnunet-service-transport_neighbours.c:1932
 #, fuzzy
 msgid "# Failed attempts to switch addresses (failed to send SYN)"
 msgstr "打开日志文件“%s”失败：%s\n"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1880
+#: src/transport/gnunet-service-transport_neighbours.c:1997
 #, fuzzy, c-format
-msgid ""
-"Failed to send SYN_ACK message to peer `%s' using address `%s' session %p\n"
+msgid "Failed to send SYN_ACK message to peer `%s' using address `%s'\n"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1930
+#: src/transport/gnunet-service-transport_neighbours.c:2051
 msgid "# SYN_ACK messages sent"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1945
+#: src/transport/gnunet-service-transport_neighbours.c:2068
 #, fuzzy, c-format
-msgid "Failed to transmit SYN_ACK message via plugin to %s\n"
+msgid "Failed to transmit SYN_ACK message to %s\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/transport/gnunet-service-transport_neighbours.c:2235
+#: src/transport/gnunet-service-transport_neighbours.c:2223
 #, fuzzy, c-format
 msgid "Blacklisting disapproved to connect to peer `%s'\n"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/transport/gnunet-service-transport_neighbours.c:2360
+#: src/transport/gnunet-service-transport_neighbours.c:2350
 msgid "# SYN messages received"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:2365
+#: src/transport/gnunet-service-transport_neighbours.c:2355
 #, c-format
 msgid "SYN request from peer `%s' ignored due impending shutdown\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:2673
+#: src/transport/gnunet-service-transport_neighbours.c:2715
 msgid "# Attempts to switch addresses"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3079
-#, fuzzy
-msgid "# Failed attempts to switch addresses (no response)"
-msgstr "打开日志文件“%s”失败：%s\n"
-
-#: src/transport/gnunet-service-transport_neighbours.c:3176
+#: src/transport/gnunet-service-transport_neighbours.c:3201
 msgid "# SYN_ACK messages received"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3184
+#: src/transport/gnunet-service-transport_neighbours.c:3209
 msgid "# unexpected SYN_ACK messages (no peer)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3198
-#: src/transport/gnunet-service-transport_neighbours.c:3230
+#: src/transport/gnunet-service-transport_neighbours.c:3227
+#: src/transport/gnunet-service-transport_neighbours.c:3251
 msgid "# unexpected SYN_ACK messages (not ready)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3242
+#: src/transport/gnunet-service-transport_neighbours.c:3263
 msgid "# unexpected SYN_ACK messages (waiting on ATS)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3262
+#: src/transport/gnunet-service-transport_neighbours.c:3288
 msgid "# Successful attempts to switch addresses"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3270
+#: src/transport/gnunet-service-transport_neighbours.c:3301
 msgid "# unexpected SYN_ACK messages (disconnecting)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3460
+#: src/transport/gnunet-service-transport_neighbours.c:3495
 msgid "# ACK messages received"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3496
+#: src/transport/gnunet-service-transport_neighbours.c:3530
 msgid "# unexpected ACK messages"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3566
+#: src/transport/gnunet-service-transport_neighbours.c:3582
 msgid "# SET QUOTA messages ignored (no such peer)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3581
+#: src/transport/gnunet-service-transport_neighbours.c:3597
 msgid "# disconnects due to quota of 0"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3623
+#: src/transport/gnunet-service-transport_neighbours.c:3644
+msgid "# quota messages ignored (malformed)"
+msgstr ""
+
+#: src/transport/gnunet-service-transport_neighbours.c:3651
+msgid "# QUOTA messages received"
+msgstr ""
+
+#: src/transport/gnunet-service-transport_neighbours.c:3686
 msgid "# disconnect messages ignored (malformed)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3629
+#: src/transport/gnunet-service-transport_neighbours.c:3693
 msgid "# DISCONNECT messages received"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3638
+#: src/transport/gnunet-service-transport_neighbours.c:3704
 msgid "# disconnect messages ignored (timestamp)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3765
+#: src/transport/gnunet-service-transport_neighbours.c:3833
 msgid "# disconnected from peer upon explicit request"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_plugins.c:119
+#: src/transport/gnunet-service-transport_plugins.c:158
 msgid "Transport service is lacking NEIGHBOUR_LIMIT option.\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_plugins.c:177
-#: src/transport/gnunet-service-transport_plugins.c:185
-#: src/transport/gnunet-service-transport_plugins.c:193
-#: src/transport/gnunet-service-transport_plugins.c:201
-#: src/transport/gnunet-service-transport_plugins.c:209
-#: src/transport/gnunet-service-transport_plugins.c:217
-#: src/transport/gnunet-service-transport_plugins.c:225
-#: src/transport/gnunet-service-transport_plugins.c:233
-#: src/transport/gnunet-service-transport_plugins.c:241
-#: src/transport/gnunet-service-transport_plugins.c:249
-#: src/transport/gnunet-service-transport_plugins.c:257
+#: src/transport/gnunet-service-transport_plugins.c:223
+#: src/transport/gnunet-service-transport_plugins.c:231
+#: src/transport/gnunet-service-transport_plugins.c:239
+#: src/transport/gnunet-service-transport_plugins.c:247
+#: src/transport/gnunet-service-transport_plugins.c:255
+#: src/transport/gnunet-service-transport_plugins.c:263
+#: src/transport/gnunet-service-transport_plugins.c:271
+#: src/transport/gnunet-service-transport_plugins.c:279
+#: src/transport/gnunet-service-transport_plugins.c:287
+#: src/transport/gnunet-service-transport_plugins.c:295
+#: src/transport/gnunet-service-transport_plugins.c:303
 #, fuzzy, c-format
 msgid "Missing function `%s' in transport plugin for `%s'\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/transport/gnunet-service-transport_plugins.c:264
+#: src/transport/gnunet-service-transport_plugins.c:310
 #, c-format
 msgid "Did not load plugin `%s' due to missing functions\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:476
-#: src/transport/gnunet-service-transport_validation.c:656
-#: src/transport/gnunet-service-transport_validation.c:929
-#: src/transport/gnunet-service-transport_validation.c:1532
+#: src/transport/gnunet-service-transport_validation.c:343
+msgid "# Addresses in validation map"
+msgstr ""
+
+#: src/transport/gnunet-service-transport_validation.c:450
+#: src/transport/gnunet-service-transport_validation.c:638
+#: src/transport/gnunet-service-transport_validation.c:927
+#: src/transport/gnunet-service-transport_validation.c:1508
 #, fuzzy
 msgid "# validations running"
 msgstr "sqlite 数据仓库"
 
-#: src/transport/gnunet-service-transport_validation.c:515
-msgid "# address records discarded"
+#: src/transport/gnunet-service-transport_validation.c:493
+msgid "# address records discarded (timeout)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:600
-msgid "# validations not attempted (no plugin)"
+#: src/transport/gnunet-service-transport_validation.c:541
+msgid "# address records discarded (blacklist)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:646
+#: src/transport/gnunet-service-transport_validation.c:629
 msgid "# PINGs for address validation sent"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:755
+#: src/transport/gnunet-service-transport_validation.c:711
+msgid "# validations delayed by global throttle"
+msgstr ""
+
+#: src/transport/gnunet-service-transport_validation.c:748
 msgid "# address revalidations started"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1057
+#: src/transport/gnunet-service-transport_validation.c:1048
 msgid "# PING message for different peer received"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1108
+#: src/transport/gnunet-service-transport_validation.c:1099
 #, c-format
 msgid "Plugin `%s' not available, cannot confirm having this address\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1118
+#: src/transport/gnunet-service-transport_validation.c:1112
 msgid "# failed address checks during validation"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1121
+#: src/transport/gnunet-service-transport_validation.c:1115
 #, c-format
 msgid "Address `%s' is not one of my addresses, not confirming PING\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1129
+#: src/transport/gnunet-service-transport_validation.c:1123
 msgid "# successful address checks during validation"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1141
+#: src/transport/gnunet-service-transport_validation.c:1136
 #, c-format
 msgid ""
 "Not confirming PING from peer `%s' with address `%s' since I cannot confirm "
 "having this address.\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1149
-#, c-format
-msgid "Received a PING message with validation bug from `%s'\n"
-msgstr ""
-
-#: src/transport/gnunet-service-transport_validation.c:1203
+#: src/transport/gnunet-service-transport_validation.c:1191
 #, fuzzy, c-format
 msgid "Failed to create PONG signature for peer `%s'\n"
 msgstr "发送消息失败。\n"
 
-#: src/transport/gnunet-service-transport_validation.c:1253
+#: src/transport/gnunet-service-transport_validation.c:1242
 msgid "# PONGs unicast via reliable transport"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1262
+#: src/transport/gnunet-service-transport_validation.c:1251
 msgid "# PONGs multicast to all available addresses"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1434
+#: src/transport/gnunet-service-transport_validation.c:1408
 msgid "# PONGs dropped, no matching pending validation"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1450
+#: src/transport/gnunet-service-transport_validation.c:1426
 msgid "# PONGs dropped, signature expired"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1502
+#: src/transport/gnunet-service-transport_validation.c:1478
 msgid "# validations succeeded"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1590
-#, c-format
-msgid "Validation received new %s message for peer `%s' with size %u\n"
-msgstr ""
-
-#: src/transport/gnunet-service-transport_validation.c:1597
-#, c-format
-msgid "Adding `%s' without addresses for peer `%s'\n"
-msgstr ""
-
-#: src/transport/gnunet-transport.c:578
+#: src/transport/gnunet-transport.c:580
 #, c-format
 msgid "Transmitted %llu bytes/s (%llu bytes in %s)\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:587
+#: src/transport/gnunet-transport.c:589
 #: src/transport/gnunet-transport-profiler.c:274
 #, c-format
 msgid "Received %llu bytes/s (%llu bytes in %s)\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:619
+#: src/transport/gnunet-transport.c:621
 #, fuzzy, c-format
 msgid "Failed to connect to `%s'\n"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/transport/gnunet-transport.c:634
+#: src/transport/gnunet-transport.c:636
 #, fuzzy, c-format
 msgid "Failed to resolve address for peer `%s'\n"
 msgstr "找不到接口“%s”的一个 IP 地址。\n"
 
-#: src/transport/gnunet-transport.c:646
+#: src/transport/gnunet-transport.c:648
 #, fuzzy
 msgid "Failed to list connections, timeout occured\n"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/transport/gnunet-transport.c:673 src/transport/gnunet-transport.c:698
+#: src/transport/gnunet-transport.c:675 src/transport/gnunet-transport.c:700
 #, fuzzy, c-format
 msgid "Configuration for plugin `%s' did not work!\n"
 msgstr "配置文件“%s”已写入。\n"
 
-#: src/transport/gnunet-transport.c:678
+#: src/transport/gnunet-transport.c:680
 #, fuzzy, c-format
 msgid "Configuration for plugin `%s' did work!\n"
 msgstr "配置文件“%s”已写入。\n"
 
-#: src/transport/gnunet-transport.c:683
+#: src/transport/gnunet-transport.c:685
 #, fuzzy, c-format
 msgid "Internal NAT error while running test for plugin `%s'\n"
 msgstr "未知错误。\n"
 
-#: src/transport/gnunet-transport.c:688
+#: src/transport/gnunet-transport.c:690
 #, fuzzy, c-format
 msgid "Failed to start NAT test for plugin `%s'\n"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/transport/gnunet-transport.c:693
+#: src/transport/gnunet-transport.c:695
 #, c-format
 msgid "Timeout while waiting for result of NAT test for plugin `%s'\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:818
+#: src/transport/gnunet-transport.c:820
 #, fuzzy, c-format
 msgid ""
 "Peer `%s' %s %s\n"
@@ -7418,192 +7404,192 @@ msgid ""
 "\t%s%s\n"
 msgstr "运行 %s失败：%s %d\n"
 
-#: src/transport/gnunet-transport.c:854
+#: src/transport/gnunet-transport.c:855
 #, fuzzy, c-format
 msgid "Peer `%s' %s `%s' \n"
 msgstr "运行 %s失败：%s %d\n"
 
-#: src/transport/gnunet-transport.c:953 src/transport/gnunet-transport.c:1702
+#: src/transport/gnunet-transport.c:949 src/transport/gnunet-transport.c:1744
 #, fuzzy
 msgid "Monitor disconnected from transport service. Reconnecting.\n"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/transport/gnunet-transport.c:1021
+#: src/transport/gnunet-transport.c:1006
 msgid "No transport plugins configured, peer will never communicate\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1035
+#: src/transport/gnunet-transport.c:1020
 #, c-format
 msgid "No port configured for plugin `%s', cannot test it\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1060
+#: src/transport/gnunet-transport.c:1045
 #, fuzzy
 msgid "Failed to start resolver!\n"
 msgstr "运行 %s失败：%s %d\n"
 
-#: src/transport/gnunet-transport.c:1106
+#: src/transport/gnunet-transport.c:1091
 #, c-format
 msgid "Transmitting %u bytes to %s\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1129
+#: src/transport/gnunet-transport.c:1114
 #: src/transport/gnunet-transport-profiler.c:406
 #, fuzzy, c-format
 msgid "Successfully connected to `%s'\n"
 msgstr "“%s”已连接到“%s”。\n"
 
-#: src/transport/gnunet-transport.c:1153
+#: src/transport/gnunet-transport.c:1138
 #, c-format
 msgid ""
 "Successfully connected to `%s', starting to send benchmark data in %u Kb "
 "blocks\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1186
+#: src/transport/gnunet-transport.c:1171
 #, fuzzy, c-format
 msgid "Successfully disconnected from `%s'\n"
 msgstr "“%s”已连接到“%s”。\n"
 
-#: src/transport/gnunet-transport.c:1209
+#: src/transport/gnunet-transport.c:1194
 #: src/transport/gnunet-transport-profiler.c:434
 #, fuzzy, c-format
 msgid "Disconnected from peer `%s' while benchmarking\n"
 msgstr "“%s”已连接到“%s”。\n"
 
-#: src/transport/gnunet-transport.c:1234 src/transport/gnunet-transport.c:1260
+#: src/transport/gnunet-transport.c:1219 src/transport/gnunet-transport.c:1245
 #, c-format
 msgid "%24s: %-17s %4s   (%u connections in total)\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1236
+#: src/transport/gnunet-transport.c:1221
 #, fuzzy
 msgid "Connected to"
 msgstr "“%s”已连接到“%s”。\n"
 
-#: src/transport/gnunet-transport.c:1262
+#: src/transport/gnunet-transport.c:1247
 #, fuzzy
 msgid "Disconnected from"
 msgstr "“%s”已连接到“%s”。\n"
 
-#: src/transport/gnunet-transport.c:1286
+#: src/transport/gnunet-transport.c:1271
 #: src/transport/gnunet-transport-profiler.c:458
 #, c-format
 msgid "Received %u bytes from %s\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1318
+#: src/transport/gnunet-transport.c:1311
 #, c-format
 msgid "Peer `%s': %s %s in state `%s' until %s\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1330
+#: src/transport/gnunet-transport.c:1323
 #, fuzzy, c-format
 msgid "Peer `%s': %s %s\n"
 msgstr "运行 %s失败：%s %d\n"
 
-#: src/transport/gnunet-transport.c:1784
+#: src/transport/gnunet-transport.c:1831
 #: src/transport/gnunet-transport-profiler.c:492
 #, fuzzy
 msgid "Failed to send connect request to transport service\n"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/transport/gnunet-transport.c:1819
+#: src/transport/gnunet-transport.c:1866
 #, fuzzy
 msgid "Failed to send disconnect request to transport service\n"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/transport/gnunet-transport.c:1863
+#: src/transport/gnunet-transport.c:1910
 #, c-format
 msgid ""
 "Multiple operations given. Please choose only one operation: %s, %s, %s, %s, "
 "%s, %s %s\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1871
+#: src/transport/gnunet-transport.c:1918
 #, c-format
 msgid ""
 "No operation given. Please choose one operation: %s, %s, %s, %s, %s, %s, %s\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1890 src/transport/gnunet-transport.c:1920
-#: src/transport/gnunet-transport.c:1953 src/transport/gnunet-transport.c:1979
-#: src/transport/gnunet-transport.c:2035
+#: src/transport/gnunet-transport.c:1937 src/transport/gnunet-transport.c:1967
+#: src/transport/gnunet-transport.c:2000 src/transport/gnunet-transport.c:2026
+#: src/transport/gnunet-transport.c:2085
 #: src/transport/gnunet-transport-profiler.c:578
 #, fuzzy
 msgid "Failed to connect to transport service\n"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/transport/gnunet-transport.c:1899 src/transport/gnunet-transport.c:1930
-#: src/transport/gnunet-transport.c:1964
+#: src/transport/gnunet-transport.c:1946 src/transport/gnunet-transport.c:1977
+#: src/transport/gnunet-transport.c:2011
 #, fuzzy
 msgid "Failed to send request to transport service\n"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/transport/gnunet-transport.c:1984
+#: src/transport/gnunet-transport.c:2031
 msgid "Starting to receive benchmark data\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:2083
+#: src/transport/gnunet-transport.c:2133
 #, fuzzy
 msgid "print information for all peers (instead of only connected peers)"
 msgstr "无法获取有关用户“%s”的信息：%s\n"
 
-#: src/transport/gnunet-transport.c:2086
+#: src/transport/gnunet-transport.c:2136
 msgid "measure how fast we are receiving data from all peers (until CTRL-C)"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:2089
+#: src/transport/gnunet-transport.c:2139
 #, fuzzy
 msgid "connect to a peer"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/transport/gnunet-transport.c:2092
+#: src/transport/gnunet-transport.c:2142
 #, fuzzy
 msgid "disconnect to a peer"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/transport/gnunet-transport.c:2095
+#: src/transport/gnunet-transport.c:2145
 #, fuzzy
 msgid "print information for all pending validations "
 msgstr "无法获取有关用户“%s”的信息：%s\n"
 
-#: src/transport/gnunet-transport.c:2098
+#: src/transport/gnunet-transport.c:2148
 #, fuzzy
 msgid "print information for all pending validations continuously"
 msgstr "无法获取有关用户“%s”的信息：%s\n"
 
-#: src/transport/gnunet-transport.c:2101
+#: src/transport/gnunet-transport.c:2151
 msgid "provide information about all current connections (once)"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:2107
+#: src/transport/gnunet-transport.c:2157
 msgid ""
 "provide information about all connects and disconnect events (continuously)"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:2110
+#: src/transport/gnunet-transport.c:2160
 msgid "do not resolve hostnames"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:2113
+#: src/transport/gnunet-transport.c:2163
 #: src/transport/gnunet-transport-profiler.c:638
 msgid "peer identity"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:2116
+#: src/transport/gnunet-transport.c:2166
 msgid "monitor plugin sessions"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:2119
+#: src/transport/gnunet-transport.c:2169
 msgid "send data for benchmarking to the other peer (until CTRL-C)"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:2122
+#: src/transport/gnunet-transport.c:2172
 msgid "test transport configuration (involves external server)"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:2133
+#: src/transport/gnunet-transport.c:2183
 #: src/transport/gnunet-transport-profiler.c:649
 #, fuzzy
 msgid "Direct access to transport service."
@@ -7701,155 +7687,156 @@ msgstr "每次迭代所使用的消息数量"
 msgid "message size to use"
 msgstr "消息尺寸"
 
-#: src/transport/plugin_transport_http_client.c:1491
-#: src/transport/plugin_transport_http_server.c:2276
-#: src/transport/plugin_transport_http_server.c:3443
-#: src/transport/plugin_transport_tcp.c:2844
-#: src/transport/plugin_transport_tcp.c:2851
+#: src/transport/plugin_transport_http_client.c:1481
+#: src/transport/plugin_transport_http_server.c:2247
+#: src/transport/plugin_transport_http_server.c:3414
+#: src/transport/plugin_transport_tcp.c:2923
+#: src/transport/plugin_transport_tcp.c:2930
 msgid "TCP_STEALTH not supported on this platform.\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_client.c:2114
+#: src/transport/plugin_transport_http_client.c:2106
 #, c-format
 msgid "Could not initialize curl multi handle, failed to start %s plugin!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_client.c:2163
-#: src/transport/plugin_transport_http_server.c:3177
+#: src/transport/plugin_transport_http_client.c:2155
+#: src/transport/plugin_transport_http_server.c:3148
 #, fuzzy, c-format
 msgid "Shutting down plugin `%s'\n"
 msgstr "未知的命令“%s”。\n"
 
-#: src/transport/plugin_transport_http_client.c:2180
-#: src/transport/plugin_transport_http_server.c:3247
+#: src/transport/plugin_transport_http_client.c:2172
+#: src/transport/plugin_transport_http_server.c:3218
 #, c-format
 msgid "Shutdown for plugin `%s' complete\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_client.c:2214
+#: src/transport/plugin_transport_http_client.c:2206
 #, fuzzy, c-format
 msgid "Maximum number of requests is %u\n"
 msgstr "增加 TCP/IP 的最大连接数"
 
-#: src/transport/plugin_transport_http_server.c:1763
+#: src/transport/plugin_transport_http_server.c:1734
 #, 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:1994
+#: src/transport/plugin_transport_http_server.c:1965
 #, c-format
 msgid "Accepting connection (%u of %u) from `%s'\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:2002
+#: src/transport/plugin_transport_http_server.c:1973
 #, c-format
 msgid ""
 "Server reached maximum number connections (%u), rejecting new connection\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:2152
+#: src/transport/plugin_transport_http_server.c:2123
 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:2175
+#: src/transport/plugin_transport_http_server.c:2146
 #, c-format
 msgid "No usable TLS certificate found and creating one at `%s/%s' failed!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:2302
+#: src/transport/plugin_transport_http_server.c:2273
 msgid "Could not load or create server certificate! Loading plugin failed!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:2611
+#: src/transport/plugin_transport_http_server.c:2582
 #, fuzzy
 msgid "Require valid port number for service in configuration!\n"
 msgstr "保存配置失败。"
 
-#: src/transport/plugin_transport_http_server.c:2645 src/util/service.c:704
+#: src/transport/plugin_transport_http_server.c:2616 src/util/service.c:704
 #, fuzzy, c-format
 msgid "Failed to resolve `%s': %s\n"
 msgstr "打开日志文件“%s”失败：%s\n"
 
-#: src/transport/plugin_transport_http_server.c:2663 src/util/service.c:723
+#: src/transport/plugin_transport_http_server.c:2634 src/util/service.c:723
 #, fuzzy, c-format
 msgid "Failed to find %saddress for `%s'.\n"
 msgstr "找不到接口“%s”的一个 IP 地址。\n"
 
-#: src/transport/plugin_transport_http_server.c:2776
+#: src/transport/plugin_transport_http_server.c:2747
 #, c-format
 msgid "Found %u addresses to report to NAT service\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:2854
+#: src/transport/plugin_transport_http_server.c:2825
+#: src/transport/plugin_transport_udp.c:3332
 msgid "Disabling IPv6 since it is not supported on this system!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:2953
+#: src/transport/plugin_transport_http_server.c:2924
 #, c-format
 msgid "IPv4 support is %s\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:2968
+#: src/transport/plugin_transport_http_server.c:2939
 #, c-format
 msgid "IPv6 support is %s\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:2974
+#: src/transport/plugin_transport_http_server.c:2945
 msgid "Neither IPv4 nor IPv6 are enabled! Fix in configuration\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:2985
+#: src/transport/plugin_transport_http_server.c:2956
 #, fuzzy
 msgid "Port is required! Fix in configuration\n"
 msgstr ""
 "\n"
 "结束配置。\n"
 
-#: src/transport/plugin_transport_http_server.c:2991
+#: src/transport/plugin_transport_http_server.c:2962
 #, c-format
 msgid "Using port %u\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:3005
+#: src/transport/plugin_transport_http_server.c:2976
 #, c-format
 msgid "Specific IPv4 address `%s' in configuration file is invalid!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:3015
+#: src/transport/plugin_transport_http_server.c:2986
 #, fuzzy, c-format
 msgid "Binding to IPv4 address %s\n"
 msgstr "无效的进程优先级“%s”\n"
 
-#: src/transport/plugin_transport_http_server.c:3037
+#: src/transport/plugin_transport_http_server.c:3008
 #, c-format
 msgid "Specific IPv6 address `%s' in configuration file is invalid!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:3047
+#: src/transport/plugin_transport_http_server.c:3018
 #, fuzzy, c-format
 msgid "Binding to IPv6 address %s\n"
 msgstr "无效的进程优先级“%s”\n"
 
-#: src/transport/plugin_transport_http_server.c:3110
+#: src/transport/plugin_transport_http_server.c:3081
 #, fuzzy, c-format
 msgid "Using external hostname `%s'\n"
 msgstr "卸载 GNUnet 服务"
 
-#: src/transport/plugin_transport_http_server.c:3131
+#: src/transport/plugin_transport_http_server.c:3102
 #, c-format
 msgid "Notifying transport only about hostname `%s'\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:3148
+#: src/transport/plugin_transport_http_server.c:3119
 #, fuzzy, c-format
 msgid "Maximum number of connections is %u\n"
 msgstr "增加 TCP/IP 的最大连接数"
 
-#: src/transport/plugin_transport_http_server.c:3455
+#: src/transport/plugin_transport_http_server.c:3426
 #, fuzzy
 msgid "Unable to compile URL regex\n"
 msgstr "无法初始化 SQLite：%s。\n"
@@ -7896,220 +7883,246 @@ msgstr ""
 msgid "# bytes dropped by SMTP (outgoing)"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:648
+#: src/transport/plugin_transport_tcp.c:672
 #, c-format
 msgid "Unexpected address length: %u bytes\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:829
-#: src/transport/plugin_transport_tcp.c:1044
-#: src/transport/plugin_transport_tcp.c:2239
-#: src/transport/plugin_transport_tcp.c:2950
+#: src/transport/plugin_transport_tcp.c:855
+#: src/transport/plugin_transport_tcp.c:1081
+#: src/transport/plugin_transport_tcp.c:2251
+#: src/transport/plugin_transport_tcp.c:3042
 msgid "# TCP sessions active"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:870
-#: src/transport/plugin_transport_tcp.c:1027
-#: src/transport/plugin_transport_tcp.c:1146
-#: src/transport/plugin_transport_tcp.c:1214
-#: src/transport/plugin_transport_tcp.c:1312
-#: src/transport/plugin_transport_tcp.c:1336
+#: src/transport/plugin_transport_tcp.c:897
+#: src/transport/plugin_transport_tcp.c:1063
+#: src/transport/plugin_transport_tcp.c:1187
+#: src/transport/plugin_transport_tcp.c:1260
+#: src/transport/plugin_transport_tcp.c:1360
+#: src/transport/plugin_transport_tcp.c:1385
 msgid "# bytes currently in TCP buffers"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:873
+#: src/transport/plugin_transport_tcp.c:900
 msgid "# bytes discarded by TCP (disconnect)"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:1149
+#: src/transport/plugin_transport_tcp.c:1190
 msgid "# bytes discarded by TCP (timeout)"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:1218
+#: src/transport/plugin_transport_tcp.c:1264
 msgid "# bytes transmitted via TCP"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:1616
+#: src/transport/plugin_transport_tcp.c:1659
 msgid "# requests to create session with invalid address"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:1782
+#: src/transport/plugin_transport_tcp.c:1827
 msgid "# transport-service disconnect requests for TCP"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2292
+#: src/transport/plugin_transport_tcp.c:2310
 msgid "# TCP WELCOME messages received"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2470
+#: src/transport/plugin_transport_tcp.c:2501
 msgid "# bytes received via TCP"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2542
+#: src/transport/plugin_transport_tcp.c:2552
+#: src/transport/plugin_transport_tcp.c:2610
+#, fuzzy
+msgid "# TCP server connections active"
+msgstr ""
+"\n"
+"按任意键继续\n"
+
+#: src/transport/plugin_transport_tcp.c:2556
+#, fuzzy
+msgid "# TCP server connect events"
+msgstr ""
+"\n"
+"按任意键继续\n"
+
+#: src/transport/plugin_transport_tcp.c:2562
+msgid "TCP connection limit reached, suspending server\n"
+msgstr ""
+
+#: src/transport/plugin_transport_tcp.c:2564
+msgid "# TCP service suspended"
+msgstr ""
+
+#: src/transport/plugin_transport_tcp.c:2604
+msgid "# TCP service resumed"
+msgstr ""
+
+#: src/transport/plugin_transport_tcp.c:2614
 msgid "# network-level TCP disconnect events"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2778 src/util/service.c:584
+#: src/transport/plugin_transport_tcp.c:2857 src/util/service.c:584
 #: src/util/service.c:590
 #, c-format
 msgid "Require valid port number for service `%s' in configuration!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2794
+#: src/transport/plugin_transport_tcp.c:2873
 #, fuzzy
 msgid "Failed to start service.\n"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/transport/plugin_transport_tcp.c:2937
+#: src/transport/plugin_transport_tcp.c:3030
 #, c-format
 msgid "TCP transport listening on port %llu\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2941
+#: src/transport/plugin_transport_tcp.c:3034
 msgid "TCP transport not listening on any port (client only)\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2945
+#: src/transport/plugin_transport_tcp.c:3038
 #, c-format
 msgid "TCP transport advertises itself as being on port %llu\n"
 msgstr ""
 
-#: src/transport/plugin_transport_udp_broadcasting.c:172
-msgid "# IPv6 multicast HELLO beacons received via udp"
-msgstr ""
-
-#: src/transport/plugin_transport_udp_broadcasting.c:218
-msgid "# IPv4 broadcast HELLO beacons received via udp"
+#: src/transport/plugin_transport_udp_broadcasting.c:170
+msgid "# Multicast HELLO beacons received via UDP"
 msgstr ""
 
-#: src/transport/plugin_transport_udp_broadcasting.c:609
+#: src/transport/plugin_transport_udp_broadcasting.c:548
 msgid ""
 "Disabling HELLO broadcasting due to friend-to-friend only configuration!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_udp_broadcasting.c:632
+#: src/transport/plugin_transport_udp_broadcasting.c:569
 #, c-format
 msgid "Failed to set IPv4 broadcast option for broadcast socket on port %d\n"
 msgstr ""
 
-#: src/transport/plugin_transport_udp.c:1658
-#, c-format
-msgid ""
-"Trying to create session for address of unexpected length %u (should be %u "
-"or %u)\n"
-msgstr ""
-
-#: src/transport/plugin_transport_udp.c:2905
+#: src/transport/plugin_transport_udp.c:3078
 #, c-format
 msgid ""
 "UDP could not transmit message to `%s': Network seems down, please check "
 "your network configuration\n"
 msgstr ""
 
-#: src/transport/plugin_transport_udp.c:2918
+#: src/transport/plugin_transport_udp.c:3092
 msgid ""
 "UDP could not transmit IPv6 message! Please check your network configuration "
 "and disable IPv6 if your connection does not have a global IPv6 address\n"
 msgstr ""
 
-#: src/transport/plugin_transport_udp.c:3271
+#: src/transport/plugin_transport_udp.c:3408
+#: src/transport/plugin_transport_udp.c:3507
 #, fuzzy, c-format
 msgid "Failed to bind UDP socket to %s: %s\n"
 msgstr "打开日志文件“%s”失败：%s\n"
 
-#: src/transport/plugin_transport_udp.c:3279
+#: src/transport/plugin_transport_udp.c:3426
+msgid "Disabling IPv4 since it is not supported on this system!\n"
+msgstr ""
+
+#: src/transport/plugin_transport_udp.c:3517
 #, fuzzy
 msgid "Failed to open UDP sockets\n"
 msgstr "打开日志文件“%s”失败：%s\n"
 
-#: src/transport/plugin_transport_udp.c:3438
-#, c-format
-msgid "Given `%s' option is out of range: %llu > %u\n"
+#: src/transport/plugin_transport_udp.c:3588
+#: src/transport/plugin_transport_udp.c:3602
+msgid "must be in [0,65535]"
 msgstr ""
 
-#: src/transport/plugin_transport_udp.c:3485
-#, fuzzy, c-format
-msgid "Invalid IPv6 address: `%s'\n"
-msgstr "无效的进程优先级“%s”\n"
+#: src/transport/plugin_transport_udp.c:3634
+#, fuzzy
+msgid "must be valid IPv4 address"
+msgstr "“%s”不可用。\n"
 
-#: src/transport/plugin_transport_udp.c:3553
+#: src/transport/plugin_transport_udp.c:3661
 #, fuzzy
-msgid "Failed to create network sockets, plugin failed\n"
+msgid "must be valid IPv6 address"
+msgstr "“%s”不可用。\n"
+
+#: src/transport/plugin_transport_udp.c:3727
+#, fuzzy
+msgid "Failed to create UDP network sockets\n"
 msgstr "发送消息失败。\n"
 
-#: src/transport/plugin_transport_unix.c:1405
+#: src/transport/plugin_transport_unix.c:1393
 #, fuzzy, c-format
 msgid "Cannot create path to `%s'\n"
 msgstr "发送消息失败。\n"
 
-#: src/transport/plugin_transport_unix.c:1418
+#: src/transport/plugin_transport_unix.c:1406
 #, fuzzy, c-format
 msgid "Cannot bind to `%s'\n"
 msgstr "发送消息失败。\n"
 
-#: src/transport/plugin_transport_unix.c:1819
+#: src/transport/plugin_transport_unix.c:1807
 #, fuzzy
 msgid "Failed to open UNIX listen socket\n"
 msgstr "打开日志文件“%s”失败：%s\n"
 
-#: src/transport/plugin_transport_wlan.c:733
+#: src/transport/plugin_transport_wlan.c:742
 msgid "# ACKs sent"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:753
+#: src/transport/plugin_transport_wlan.c:762
 msgid "# Messages defragmented"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:794
-#: src/transport/plugin_transport_wlan.c:881
+#: src/transport/plugin_transport_wlan.c:803
+#: src/transport/plugin_transport_wlan.c:890
 msgid "# Sessions allocated"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:1002
+#: src/transport/plugin_transport_wlan.c:1011
 #, fuzzy
 msgid "# message fragments sent"
 msgstr "打开日志文件“%s”失败：%s\n"
 
-#: src/transport/plugin_transport_wlan.c:1031
+#: src/transport/plugin_transport_wlan.c:1040
 msgid "# messages pending (with fragmentation)"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:1162
-#: src/transport/plugin_transport_wlan.c:1255
-#: src/transport/plugin_transport_wlan.c:2272
+#: src/transport/plugin_transport_wlan.c:1171
+#: src/transport/plugin_transport_wlan.c:1264
+#: src/transport/plugin_transport_wlan.c:2268
 msgid "# MAC endpoints allocated"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:1530
+#: src/transport/plugin_transport_wlan.c:1528
 msgid "# ACKs received"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:1599
+#: src/transport/plugin_transport_wlan.c:1597
 msgid "# DATA messages discarded due to CRC32 error"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:1707
+#: src/transport/plugin_transport_wlan.c:1703
 msgid "# HELLO beacons sent"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:1824
+#: src/transport/plugin_transport_wlan.c:1820
 msgid "# DATA messages received"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:1858
+#: src/transport/plugin_transport_wlan.c:1854
 msgid "# DATA messages processed"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:2247
+#: src/transport/plugin_transport_wlan.c:2243
 #, c-format
 msgid "Helper binary `%s' not SUID, cannot run WLAN transport\n"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:2269
+#: src/transport/plugin_transport_wlan.c:2265
 msgid "# sessions allocated"
 msgstr ""
 
-#: src/transport/transport_api.c:816
+#: src/transport/transport_api.c:812
 #, c-format
 msgid "Received unexpected message of type %u in %s:%u\n"
 msgstr ""
@@ -8153,42 +8166,38 @@ msgstr ""
 msgid "Metadata `%s' failed to deserialize"
 msgstr ""
 
-#: src/util/client.c:261 src/util/client.c:858 src/util/service.c:621
+#: src/util/client.c:263 src/util/client.c:889 src/util/service.c:621
 #, c-format
 msgid "UNIXPATH `%s' too long, maximum length is %llu\n"
 msgstr ""
 
-#: src/util/client.c:265 src/util/client.c:863 src/util/service.c:625
+#: src/util/client.c:267 src/util/client.c:894 src/util/service.c:625
 #, fuzzy, c-format
 msgid "Using `%s' instead\n"
 msgstr "%s：选项“%s”有歧义\n"
 
-#: src/util/client.c:360
+#: src/util/client.c:362
 #, c-format
 msgid ""
 "Could not determine valid hostname and port for service `%s' from "
 "configuration.\n"
 msgstr ""
 
-#: src/util/client.c:368
+#: src/util/client.c:370
 #, c-format
 msgid "Need a non-empty hostname for service `%s'.\n"
 msgstr ""
 
-#: src/util/client.c:1008
+#: src/util/client.c:1039
 #, fuzzy, c-format
 msgid "Could not connect to service `%s', configuration broken.\n"
 msgstr "无法连接到 %s:%u：%s\n"
 
-#: src/util/client.c:1020
+#: src/util/client.c:1051
 #, c-format
 msgid "Failure to transmit request to service `%s'\n"
 msgstr ""
 
-#: src/util/client.c:1299
-msgid "Could not submit request, not expecting to receive a response.\n"
-msgstr ""
-
 #: src/util/common_logging.c:254 src/util/common_logging.c:1039
 msgid "DEBUG"
 msgstr "调试"
@@ -8254,49 +8263,33 @@ msgid ""
 "choices\n"
 msgstr ""
 
-#: src/util/configuration.c:1144
+#: src/util/configuration.c:1145
 #, c-format
 msgid "Recursive expansion suspected, aborting $-expansion for term `%s'\n"
 msgstr ""
 
-#: src/util/configuration.c:1176
+#: src/util/configuration.c:1177
 #, fuzzy, c-format
 msgid "Missing closing `%s' in option `%s'\n"
 msgstr "配置文件“%s”已写入。\n"
 
-#: src/util/configuration.c:1250
+#: src/util/configuration.c:1251
 #, c-format
 msgid ""
 "Failed to expand `%s' in `%s' as it is neither found in [PATHS] nor defined "
 "as an environmental variable\n"
 msgstr ""
 
-#: src/util/connection.c:423
+#: src/util/connection.c:424
 #, fuzzy, c-format
 msgid "Access denied to `%s'\n"
 msgstr "“%s”已连接到“%s”。\n"
 
-#: src/util/connection.c:438
+#: src/util/connection.c:441
 #, c-format
 msgid "Accepting connection from `%s': %p\n"
 msgstr ""
 
-#: src/util/connection.c:553
-#, c-format
-msgid ""
-"Failed to establish TCP connection to `%s:%u', no further addresses to try.\n"
-msgstr ""
-
-#: src/util/connection.c:751 src/util/connection.c:914
-#, fuzzy, c-format
-msgid "Trying to connect to `%s' (%p)\n"
-msgstr "无法连接到 %s:%u：%s\n"
-
-#: src/util/connection.c:904
-#, c-format
-msgid "Attempt to connect to `%s' failed\n"
-msgstr ""
-
 #: src/util/container_bloomfilter.c:531
 #, c-format
 msgid ""
@@ -8304,52 +8297,52 @@ msgid ""
 "%llu)\n"
 msgstr ""
 
-#: src/util/crypto_ecc.c:702 src/util/crypto_ecc.c:740
-#: src/util/crypto_ecc.c:858 src/util/crypto_ecc.c:896
+#: src/util/crypto_ecc.c:731 src/util/crypto_ecc.c:769
+#: src/util/crypto_ecc.c:887 src/util/crypto_ecc.c:925
 #, fuzzy, c-format
 msgid "Could not acquire lock on file `%s': %s...\n"
 msgstr "无法解析“%s”(%s)：%s\n"
 
-#: src/util/crypto_ecc.c:707 src/util/crypto_ecc.c:863
+#: src/util/crypto_ecc.c:736 src/util/crypto_ecc.c:892
 #, fuzzy
 msgid "Creating a new private key.  This may take a while.\n"
 msgstr "正在启动数据仓库转换(可能需要一段时间)。\n"
 
-#: src/util/crypto_ecc.c:744 src/util/crypto_ecc.c:900
+#: src/util/crypto_ecc.c:773 src/util/crypto_ecc.c:929
 msgid "This may be ok if someone is currently generating a private key.\n"
 msgstr ""
 
-#: src/util/crypto_ecc.c:774 src/util/crypto_ecc.c:930
+#: src/util/crypto_ecc.c:803 src/util/crypto_ecc.c:959
 #, c-format
 msgid ""
 "When trying to read key file `%s' I found %u bytes but I need at least %u.\n"
 msgstr ""
 
-#: src/util/crypto_ecc.c:778 src/util/crypto_ecc.c:934
+#: src/util/crypto_ecc.c:807 src/util/crypto_ecc.c:963
 msgid "This may be ok if someone is currently generating a key.\n"
 msgstr ""
 
-#: src/util/crypto_ecc.c:1016
+#: src/util/crypto_ecc.c:1045
 #, fuzzy
 msgid "Could not load peer's private key\n"
 msgstr "找不到接口“%s”的一个 IP 地址。\n"
 
-#: src/util/crypto_ecc.c:1120
+#: src/util/crypto_ecc.c:1149
 #, fuzzy, c-format
 msgid "ECC signing failed at %s:%d: %s\n"
 msgstr "对驱动器“%2$s”的“%1$s”操作失败：%3$u\n"
 
-#: src/util/crypto_ecc.c:1170
+#: src/util/crypto_ecc.c:1199
 #, fuzzy, c-format
 msgid "EdDSA signing failed at %s:%d: %s\n"
 msgstr "对驱动器“%2$s”的“%1$s”操作失败：%3$u\n"
 
-#: src/util/crypto_ecc.c:1244
+#: src/util/crypto_ecc.c:1273
 #, fuzzy, c-format
 msgid "ECDSA signature verification failed at %s:%d: %s\n"
 msgstr "对驱动器“%2$s”的“%1$s”操作失败：%3$u\n"
 
-#: src/util/crypto_ecc.c:1301
+#: src/util/crypto_ecc.c:1330
 #, fuzzy, c-format
 msgid "EdDSA signature verification failed at %s:%d: %s\n"
 msgstr "对驱动器“%2$s”的“%1$s”操作失败：%3$u\n"
@@ -8640,17 +8633,17 @@ msgstr ""
 msgid "Perform default-actions for GNUnet URIs"
 msgstr ""
 
-#: src/util/helper.c:338
+#: src/util/helper.c:342
 #, fuzzy, c-format
 msgid "Error reading from `%s': %s\n"
 msgstr "创建用户出错"
 
-#: src/util/helper.c:383
+#: src/util/helper.c:388
 #, fuzzy, c-format
 msgid "Failed to parse inbound message from helper `%s'\n"
 msgstr "打开日志文件“%s”失败：%s\n"
 
-#: src/util/helper.c:609
+#: src/util/helper.c:618
 #, fuzzy, c-format
 msgid "Error writing to `%s': %s\n"
 msgstr "创建用户出错"
@@ -8660,7 +8653,7 @@ msgstr "创建用户出错"
 msgid "Unable to shorten unix path `%s' while keeping name unique\n"
 msgstr ""
 
-#: src/util/network.c:1669 src/util/network.c:1845
+#: src/util/network.c:1681 src/util/network.c:1857
 #, c-format
 msgid ""
 "Fatal internal logic error, process hangs in `%s' (abort with CTRL-C)!\n"
@@ -8744,16 +8737,12 @@ msgstr "GNUnet 现在使用 IP 地址 %s。\n"
 msgid "Timeout trying to resolve hostname `%s'.\n"
 msgstr ""
 
-#: src/util/resolver_api.c:974
+#: src/util/resolver_api.c:1004
 #, fuzzy, c-format
 msgid "Could not resolve our FQDN : %s\n"
 msgstr "无法解析“%s”(%s)：%s\n"
 
-#: src/util/scheduler.c:812
-msgid "Looks like we're busy waiting...\n"
-msgstr ""
-
-#: src/util/server.c:484
+#: src/util/server.c:483
 #, fuzzy, c-format
 msgid "`%s' failed for port %d (%s).\n"
 msgstr "对驱动器“%2$s”的“%1$s”操作失败：%3$u\n"
@@ -8768,7 +8757,7 @@ msgstr ""
 msgid "`%s' failed for `%s': address already in use\n"
 msgstr "对驱动器“%2$s”的“%1$s”操作失败：%3$u\n"
 
-#: src/util/server.c:896
+#: src/util/server.c:904
 #, c-format
 msgid ""
 "Processing code for message of type %u did not call "
@@ -8922,63 +8911,63 @@ msgstr " 天"
 msgid "end of time"
 msgstr ""
 
-#: src/util/strings.c:1192
+#: src/util/strings.c:1226
 msgid "IPv6 address did not start with `['\n"
 msgstr ""
 
-#: src/util/strings.c:1200
+#: src/util/strings.c:1234
 msgid "IPv6 address did contain ':' to separate port number\n"
 msgstr ""
 
-#: src/util/strings.c:1206
+#: src/util/strings.c:1240
 msgid "IPv6 address did contain ']' before ':' to separate port number\n"
 msgstr ""
 
-#: src/util/strings.c:1213
+#: src/util/strings.c:1247
 msgid "IPv6 address did contain a valid port number after the last ':'\n"
 msgstr ""
 
-#: src/util/strings.c:1222
+#: src/util/strings.c:1256
 #, fuzzy, c-format
 msgid "Invalid IPv6 address `%s': %s\n"
 msgstr "无效的进程优先级“%s”\n"
 
-#: src/util/strings.c:1428 src/util/strings.c:1444
+#: src/util/strings.c:1462 src/util/strings.c:1478
 msgid "Port not in range\n"
 msgstr ""
 
-#: src/util/strings.c:1453
+#: src/util/strings.c:1487
 #, fuzzy, c-format
 msgid "Malformed port policy `%s'\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/util/strings.c:1536 src/util/strings.c:1567 src/util/strings.c:1615
-#: src/util/strings.c:1636
+#: src/util/strings.c:1570 src/util/strings.c:1601 src/util/strings.c:1649
+#: src/util/strings.c:1670
 #, c-format
 msgid "Invalid format for IP: `%s'\n"
 msgstr "IP 格式无效：“%s”\n"
 
-#: src/util/strings.c:1593
+#: src/util/strings.c:1627
 #, c-format
 msgid "Invalid network notation ('/%d' is not legal in IPv4 CIDR)."
 msgstr "网络表示法无效(“/%d” 在 IPv4 CIDR 中是非法的)。"
 
-#: src/util/strings.c:1645
+#: src/util/strings.c:1679
 #, fuzzy, c-format
 msgid "Invalid format: `%s'\n"
 msgstr "IP 格式无效：“%s”\n"
 
-#: src/util/strings.c:1697
+#: src/util/strings.c:1731
 #, c-format
 msgid "Invalid network notation (does not end with ';': `%s')\n"
 msgstr "无效的网络表示法(没有以“;”结尾：“%s”)\n"
 
-#: src/util/strings.c:1747
+#: src/util/strings.c:1781
 #, c-format
 msgid "Wrong format `%s' for netmask\n"
 msgstr "网络掩码的格式“%s”错误\n"
 
-#: src/util/strings.c:1778
+#: src/util/strings.c:1812
 #, c-format
 msgid "Wrong format `%s' for network\n"
 msgstr "网络的格式“%s”错误\n"
@@ -9158,23 +9147,56 @@ msgstr ""
 msgid "Setup tunnels via VPN."
 msgstr ""
 
-#: src/include/gnunet_common.h:588 src/include/gnunet_common.h:595
-#: src/include/gnunet_common.h:603
+#: src/include/gnunet_common.h:590 src/include/gnunet_common.h:597
+#: src/include/gnunet_common.h:605
 #, c-format
 msgid "Assertion failed at %s:%d.\n"
 msgstr ""
 
-#: src/include/gnunet_common.h:615
+#: src/include/gnunet_common.h:617
 #, c-format
 msgid "External protocol violation detected at %s:%d.\n"
 msgstr ""
 
-#: src/include/gnunet_common.h:642 src/include/gnunet_common.h:651
+#: src/include/gnunet_common.h:644 src/include/gnunet_common.h:653
 #, c-format
 msgid "`%s' failed on file `%s' at %s:%d with error: %s\n"
 msgstr ""
 
 #, fuzzy
+#~ msgid "Failed to initialize solver!\n"
+#~ msgstr "无法初始化 SQLite：%s。\n"
+
+#, fuzzy
+#~ msgid "Invalid network type `%u' `%s': Disconnect!\n"
+#~ msgstr "找不到主机“%s”的 IP：%s\n"
+
+#, fuzzy
+#~ msgid "Could not obtain a valid network for `%s' %s (%s)\n"
+#~ msgstr "无法利用“%2$s”获取接口“%1$s”的 IP。\n"
+
+#, fuzzy
+#~ msgid "Blacklist refuses connection attempt to peer `%s'\n"
+#~ msgstr "初始化“%s”服务失败。\n"
+
+#, fuzzy
+#~ msgid ""
+#~ "Failed to send SYN message to peer `%s' using address `%s' session %p\n"
+#~ msgstr "初始化“%s”服务失败。\n"
+
+#, fuzzy
+#~ msgid "# Failed attempts to switch addresses (no response)"
+#~ msgstr "打开日志文件“%s”失败：%s\n"
+
+#, fuzzy
+#~ msgid "Invalid IPv6 address: `%s'\n"
+#~ msgstr "无效的进程优先级“%s”\n"
+
+#, fuzzy
+#~ msgid "Trying to connect to `%s' (%p)\n"
+#~ msgstr "无法连接到 %s:%u：%s\n"
+
+#, fuzzy
 #~ msgid "Configuration for plugin `%s' is working!\n"
 #~ msgstr "配置文件“%s”已写入。\n"
 
@@ -9689,12 +9711,6 @@ msgstr ""
 #~ msgstr "“%s”说：%s\n"
 
 #, fuzzy
-#~ msgid "# Peers connected"
-#~ msgstr ""
-#~ "\n"
-#~ "按任意键继续\n"
-
-#, fuzzy
 #~ msgid "Unable to initialize Postgres with configuration `%s': %s"
 #~ msgstr "无法保存配置文件“%s”："
 
diff --git a/src/fs/Makefile.am b/src/fs/Makefile.am
index 6d2c076e4..8ac42c18d 100644
--- a/src/fs/Makefile.am
+++ b/src/fs/Makefile.am
@@ -513,29 +513,27 @@ test_gnunet_fs_idx.py: test_gnunet_fs_idx.py.in Makefile
 
 
 EXTRA_DIST = \
-  test_fs_defaults.conf \
   fs_test_lib_data.conf \
+  perf_gnunet_service_fs_p2p.conf \
   test_fs_data.conf \
+  test_fs_defaults.conf \
   test_fs_download_data.conf \
   test_fs_download_indexed.conf \
-  test_fs_download_cadet.conf \
   test_fs_file_information_data.conf \
-  fs_test_lib_data.conf \
   test_fs_list_indexed_data.conf \
   test_fs_namespace_data.conf \
   test_fs_publish_data.conf \
   test_fs_search_data.conf \
   test_fs_unindex_data.conf \
-  test_gnunet_service_fs_migration_data.conf \
-  test_gnunet_service_fs_p2p_cadet.conf \
   test_gnunet_fs_idx_data.conf \
   test_gnunet_fs_psd_data.conf \
   test_gnunet_fs_rec_data.conf \
-  perf_gnunet_service_fs_p2p.conf \
   test_gnunet_fs_rec_data.tgz \
   test_gnunet_fs_psd.py.in \
   test_gnunet_fs_rec.py.in \
   test_gnunet_fs_idx.py.in \
+  test_gnunet_service_fs_migration_data.conf \
+  test_gnunet_service_fs_p2p_cadet.conf \
   test_pseudonym_data.conf \
   $(bin_SCRIPTS)
 
diff --git a/src/scalarproduct/Makefile.am b/src/scalarproduct/Makefile.am
index fdc0f4074..15e4373f0 100644
--- a/src/scalarproduct/Makefile.am
+++ b/src/scalarproduct/Makefile.am
@@ -48,7 +48,7 @@ gnunet_service_scalarproduct_alice_LDADD = \
 
 gnunet_service_scalarproduct_bob_SOURCES = \
   gnunet-service-scalarproduct.h \
-  gnunet-service-scalarproduct_bob.c gnunet-service-scalarproduct_bob.h
+  gnunet-service-scalarproduct_bob.c
 gnunet_service_scalarproduct_bob_LDADD = \
   $(top_builddir)/src/util/libgnunetutil.la \
   $(top_builddir)/src/cadet/libgnunetcadet.la \
diff --git a/src/transport/Makefile.am b/src/transport/Makefile.am
index 289fcd4c0..80fb7ca76 100644
--- a/src/transport/Makefile.am
+++ b/src/transport/Makefile.am
@@ -1332,14 +1332,6 @@ test_transport_api_reliability_wlan_peer1.conf\
 test_transport_api_reliability_wlan_peer2.conf\
 test_transport_api_reliability_bluetooth_peer1.conf\
 test_transport_api_reliability_bluetooth_peer2.conf\
-test_transport_test_transport_address_switch_http_peer1.conf\
-test_transport_test_transport_address_switch_http_peer2.conf\
-test_transport_test_transport_address_switch_https_peer1.conf\
-test_transport_test_transport_address_switch_https_peer2.conf\
-test_transport_test_transport_address_switch_udp_peer1.conf\
-test_transport_test_transport_address_switch_udp_peer2.conf\
-test_transport_test_transport_address_switch_tcp_peer1.conf\
-test_transport_test_transport_address_switch_tcp_peer2.conf\
 test_transport_api_wlan_peer1.conf\
 test_transport_api_wlan_peer2.conf\
 test_transport_api_bluetooth_peer1.conf\