gnunet-svn
[Top][All Lists]
Advanced

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

[GNUnet-SVN] r34875 - gnunet/po


From: gnunet
Subject: [GNUnet-SVN] r34875 - gnunet/po
Date: Sat, 10 Jan 2015 19:56:41 +0100

Author: grothoff
Date: 2015-01-10 19:56:41 +0100 (Sat, 10 Jan 2015)
New Revision: 34875

Modified:
   gnunet/po/POTFILES.in
   gnunet/po/de.po
   gnunet/po/es.po
   gnunet/po/sv.po
   gnunet/po/vi.po
   gnunet/po/zh_CN.po
Log:
-.po update

Modified: gnunet/po/POTFILES.in
===================================================================
--- gnunet/po/POTFILES.in       2015-01-10 01:26:04 UTC (rev 34874)
+++ gnunet/po/POTFILES.in       2015-01-10 18:56:41 UTC (rev 34875)
@@ -256,6 +256,7 @@
 src/revocation/revocation_api.c
 src/rps/gnunet-rps.c
 src/rps/gnunet-service-rps.c
+src/rps/gnunet-service-rps_sampler.c
 src/rps/rps_api.c
 src/scalarproduct/gnunet-scalarproduct.c
 src/scalarproduct/gnunet-service-scalarproduct_alice.c
@@ -388,6 +389,7 @@
 src/util/crypto_mpi.c
 src/util/crypto_paillier.c
 src/util/crypto_random.c
+src/util/crypto_rsa.c
 src/util/crypto_symmetric.c
 src/util/disk.c
 src/util/getopt.c

Modified: gnunet/po/de.po
===================================================================
--- gnunet/po/de.po     2015-01-10 01:26:04 UTC (rev 34874)
+++ gnunet/po/de.po     2015-01-10 18:56:41 UTC (rev 34875)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: GNUnet 0.7.0b\n"
 "Report-Msgid-Bugs-To: address@hidden"
-"POT-Creation-Date: 2014-12-09 00:23+0100\n"
+"POT-Creation-Date: 2015-01-01 22:23+0100\n"
 "PO-Revision-Date: 2006-03-17 21:37+0100\n"
 "Last-Translator: Nils Durner <address@hidden>\n"
 "Language-Team: German <address@hidden>\n"
@@ -291,76 +291,51 @@
 msgid "ARM now monitors connections to service `%s' at `%s'\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:831
+#: src/arm/gnunet-service-arm.c:835
 #, fuzzy, c-format
 msgid "Preparing to stop `%s'\n"
 msgstr "Collection `%s' begonnen.\n"
 
-#: src/arm/gnunet-service-arm.c:1100
+#: src/arm/gnunet-service-arm.c:1105
 #, fuzzy, c-format
 msgid "Restarting service `%s'.\n"
 msgstr "Collection `%s' begonnen.\n"
 
-#: src/arm/gnunet-service-arm.c:1193
+#: src/arm/gnunet-service-arm.c:1199
 msgid "exit"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:1198
+#: src/arm/gnunet-service-arm.c:1204
 msgid "signal"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:1203
+#: src/arm/gnunet-service-arm.c:1209
 #, fuzzy
 msgid "unknown"
 msgstr "Unbekannter Fehler"
 
-#: src/arm/gnunet-service-arm.c:1209
+#: src/arm/gnunet-service-arm.c:1215
 #, fuzzy, c-format
 msgid "Service `%s' took %s to terminate\n"
 msgstr "Dienst gelöscht.\n"
 
-#: src/arm/gnunet-service-arm.c:1231
+#: src/arm/gnunet-service-arm.c:1237
 #, c-format
 msgid "Service `%s' terminated normally, will restart at any time\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:1246
+#: src/arm/gnunet-service-arm.c:1252
 #, c-format
 msgid "Service `%s' terminated with status %s/%d, will restart in %s\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:1500
-#, fuzzy, c-format
-msgid "Starting default services `%s'\n"
-msgstr "Collection `%s' begonnen.\n"
-
-#: src/arm/gnunet-service-arm.c:1511
-#, c-format
-msgid "Default service `%s' not configured correctly!\n"
-msgstr ""
-
-#: src/arm/gnunet-service-arm.c:1524
-msgid ""
-"No default services configured, GNUnet will not really start right now.\n"
-msgstr ""
-
 #: src/arm/mockup-service.c:41
 msgid "Initiating shutdown as requested by client.\n"
 msgstr ""
 
-#: src/ats/ats_api_performance.c:485
-#, fuzzy, c-format
-msgid "Received %s message\n"
-msgstr "ungültige `%s' Nachricht empfangen\n"
-
-#: src/ats/ats_api_performance.c:528
-#, fuzzy, c-format
-msgid "Received last message for %s \n"
-msgstr "GAP hat ungültige Inhalte von `%s' empfangen.\n"
-
 #: src/ats/gnunet-ats-solver-eval.c:2804 src/ats/gnunet-ats-solver-eval.c:2838
-#: src/ats/gnunet-service-ats_addresses.c:1781
-#: src/ats/gnunet-service-ats_addresses.c:1825
+#: src/ats/gnunet-service-ats_addresses.c:1789
+#: src/ats/gnunet-service-ats_addresses.c:1833
 #, c-format
 msgid ""
 "Could not load quota for network `%s':  `%s', assigning default bandwidth "
@@ -368,13 +343,13 @@
 msgstr ""
 
 #: src/ats/gnunet-ats-solver-eval.c:2810
-#: src/ats/gnunet-service-ats_addresses.c:1788
+#: src/ats/gnunet-service-ats_addresses.c:1796
 #, c-format
 msgid "Outbound quota configure for network `%s' is %llu\n"
 msgstr ""
 
 #: src/ats/gnunet-ats-solver-eval.c:2817
-#: src/ats/gnunet-service-ats_addresses.c:1796
+#: src/ats/gnunet-service-ats_addresses.c:1804
 #, c-format
 msgid ""
 "No outbound quota configured for network `%s', assigning default bandwidth "
@@ -382,13 +357,13 @@
 msgstr ""
 
 #: src/ats/gnunet-ats-solver-eval.c:2844
-#: src/ats/gnunet-service-ats_addresses.c:1832
+#: src/ats/gnunet-service-ats_addresses.c:1840
 #, c-format
 msgid "Inbound quota configured for network `%s' is %llu\n"
 msgstr ""
 
 #: src/ats/gnunet-ats-solver-eval.c:2851
-#: src/ats/gnunet-service-ats_addresses.c:1840
+#: src/ats/gnunet-service-ats_addresses.c:1848
 #, c-format
 msgid ""
 "No outbound quota configure for network `%s', assigning default bandwidth "
@@ -423,22 +398,22 @@
 msgid "disable normalization"
 msgstr ""
 
-#: src/ats/gnunet-service-ats_addresses.c:2039
+#: src/ats/gnunet-service-ats_addresses.c:2051
 #, c-format
 msgid "Initializing solver `%s '`%s'\n"
 msgstr ""
 
-#: src/ats/gnunet-service-ats_addresses.c:2042
+#: src/ats/gnunet-service-ats_addresses.c:2057
 #, 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:2065
+#: src/ats/gnunet-service-ats_addresses.c:2082
 #, fuzzy
 msgid "Failed to initialize solver!\n"
 msgstr "SQLite Datenbank konnte nicht initialisiert werden: %s.\n"
 
-#: src/ats/plugin_ats_mlp.c:1344
+#: src/ats/plugin_ats_mlp.c:1345
 msgid "Problem size too large, cannot allocate memory!\n"
 msgstr ""
 
@@ -447,19 +422,19 @@
 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:1988
+#: 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:2704
+#: src/ats/plugin_ats_mlp.c:2714
 msgid ""
 "MLP solver is not optimizing for anything, changing to feasibility check\n"
 msgstr ""
 
-#: src/ats/plugin_ats_mlp.c:2744 src/ats/plugin_ats_mlp.c:2761
-#: src/ats/plugin_ats_mlp.c:2793 src/ats/plugin_ats_mlp.c:2811
-#: src/ats/plugin_ats_mlp.c:2830 src/ats/plugin_ats_proportional.c:1989
+#: 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:1989
 #: src/ats/plugin_ats_proportional.c:2010 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
@@ -469,33 +444,33 @@
 msgid "Invalid %s configuration %f \n"
 msgstr "Fehler beim Speichern der Konfigurationsdatei `%s':"
 
-#: src/ats/plugin_ats_mlp.c:2917
+#: src/ats/plugin_ats_mlp.c:2927
 #, 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:2926
+#: src/ats/plugin_ats_mlp.c:2936
 #, 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:2937
+#: src/ats/plugin_ats_mlp.c:2947
 #, c-format
 msgid ""
 "Adjusting outbound quota configuration for network `%s'from %llu to %.0f\n"
 msgstr ""
 
-#: src/ats/plugin_ats_mlp.c:2945
+#: src/ats/plugin_ats_mlp.c:2955
 #, c-format
 msgid ""
 "Adjusting inbound quota configuration for network `%s' from %llu to %.0f\n"
 msgstr ""
 
-#: src/ats/plugin_ats_mlp.c:2956
+#: src/ats/plugin_ats_mlp.c:2966
 #, c-format
 msgid "Using default quota configuration for network `%s' (in/out) %llu/%llu\n"
 msgstr ""
@@ -543,11 +518,11 @@
 msgid "Initialization failed, shutdown\n"
 msgstr "Initialisierung des Plugin Mechanismuses fehlgeschlagen: %s!\n"
 
-#: src/ats-tests/ats-testing-log.c:842
+#: src/ats-tests/ats-testing-log.c:846
 msgid "Stop logging\n"
 msgstr ""
 
-#: src/ats-tests/ats-testing-log.c:893
+#: src/ats-tests/ats-testing-log.c:897
 #, fuzzy, c-format
 msgid "Start logging `%s'\n"
 msgstr "Collection `%s' begonnen.\n"
@@ -589,96 +564,96 @@
 msgid "Removed address of peer `%s' with plugin `%s'\n"
 msgstr "Verfügbare(r) Transport(e): %s\n"
 
-#: src/ats-tool/gnunet-ats.c:747
+#: src/ats-tool/gnunet-ats.c:746
 #, c-format
 msgid "Quota for network `%11s' (in/out): %10s / %10s\n"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:779 src/namestore/gnunet-namestore.c:700
-#: src/transport/gnunet-transport.c:1855
+#: src/ats-tool/gnunet-ats.c:778 src/namestore/gnunet-namestore.c:700
+#: src/transport/gnunet-transport.c:1853
 #: 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:793 src/transport/gnunet-transport.c:1864
+#: src/ats-tool/gnunet-ats.c:792 src/transport/gnunet-transport.c:1862
 #: 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:803
+#: src/ats-tool/gnunet-ats.c:802
 #, c-format
 msgid "Please select one operation : %s or %s or %s or %s or %s\n"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:825 src/ats-tool/gnunet-ats.c:851
-#: src/ats-tool/gnunet-ats.c:879 src/ats-tool/gnunet-ats.c:925
+#: src/ats-tool/gnunet-ats.c:824 src/ats-tool/gnunet-ats.c:850
+#: src/ats-tool/gnunet-ats.c:878 src/ats-tool/gnunet-ats.c:924
 #, fuzzy
 msgid "Cannot connect to ATS service, exiting...\n"
 msgstr "`%s' Dienst konnte nicht initialisiert werden.\n"
 
-#: src/ats-tool/gnunet-ats.c:837 src/ats-tool/gnunet-ats.c:863
+#: src/ats-tool/gnunet-ats.c:836 src/ats-tool/gnunet-ats.c:862
 #, fuzzy
 msgid "Cannot issue request to ATS service, exiting...\n"
 msgstr "`%s' Dienst konnte nicht initialisiert werden.\n"
 
-#: src/ats-tool/gnunet-ats.c:891
+#: src/ats-tool/gnunet-ats.c:890
 #, fuzzy
 msgid "No preference type given!\n"
 msgstr "Informationen über andere GNUnet Knoten ausgeben."
 
-#: src/ats-tool/gnunet-ats.c:898
+#: src/ats-tool/gnunet-ats.c:897
 msgid "No peer given!\n"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:916
+#: src/ats-tool/gnunet-ats.c:915
 msgid "Valid type required\n"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:984
+#: src/ats-tool/gnunet-ats.c:983
 msgid "get list of active addresses currently used"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:986
+#: src/ats-tool/gnunet-ats.c:985
 msgid "get list of all active addresses"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:989
+#: src/ats-tool/gnunet-ats.c:988
 #, 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:991
+#: src/ats-tool/gnunet-ats.c:990
 msgid "monitor mode"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:993
+#: src/ats-tool/gnunet-ats.c:992
 #, fuzzy
 msgid "set preference for the given peer"
 msgstr "Informationen über andere GNUnet Knoten ausgeben."
 
-#: src/ats-tool/gnunet-ats.c:995
+#: src/ats-tool/gnunet-ats.c:994
 msgid "print all configured quotas"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:997
+#: src/ats-tool/gnunet-ats.c:996
 msgid "peer id"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:1000
+#: src/ats-tool/gnunet-ats.c:999
 msgid "preference type to set: latency | bandwidth"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:1002
+#: src/ats-tool/gnunet-ats.c:1001
 msgid "preference value"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:1005
+#: src/ats-tool/gnunet-ats.c:1004
 msgid "verbose output (include ATS address properties)"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:1012
+#: src/ats-tool/gnunet-ats.c:1011
 #, fuzzy
 msgid "Print information about ATS state"
 msgstr "Informationen über andere GNUnet Knoten ausgeben."
@@ -739,7 +714,7 @@
 msgid "provide information about all tunnels"
 msgstr "Informationen über andere GNUnet Knoten ausgeben."
 
-#: src/cadet/gnunet-service-cadet_peer.c:496
+#: src/cadet/gnunet-service-cadet_peer.c:502
 msgid "Wrong CORE service\n"
 msgstr ""
 
@@ -1234,7 +1209,7 @@
 msgid "Could not start playback audio helper.\n"
 msgstr "Anwendung `%s' konnte nicht initialisiert werden.\n"
 
-#: src/core/core_api.c:768
+#: src/core/core_api.c:787
 msgid "Client was disconnected from core service, trying to reconnect.\n"
 msgstr ""
 
@@ -1280,18 +1255,17 @@
 msgid "%24s: %-30s %4s (timeout in %6s)\n"
 msgstr ""
 
-#: src/core/gnunet-core.c:146 src/peerinfo-tool/gnunet-peerinfo.c:761
+#: src/core/gnunet-core.c:146 src/peerinfo-tool/gnunet-peerinfo.c:786
 #, fuzzy, c-format
 msgid "Invalid command line argument `%s'\n"
 msgstr "Ungültige Kommandozeilen Parameter:\n"
 
 #: src/core/gnunet-core.c:157
-#: src/experimentation/gnunet-daemon-experimentation_nodes.c:1104
 #, fuzzy
 msgid "Failed to connect to CORE service!\n"
 msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
 
-#: src/core/gnunet-core.c:179 src/transport/gnunet-transport.c:2115
+#: src/core/gnunet-core.c:179 src/transport/gnunet-transport.c:2114
 #, fuzzy
 msgid "provide information about all current connections (continuously)"
 msgstr "Informationen über andere GNUnet Knoten ausgeben."
@@ -1311,17 +1285,17 @@
 msgid "Core service of `%4s' ready.\n"
 msgstr ""
 
-#: src/core/gnunet-service-core_clients.c:372
+#: src/core/gnunet-service-core_clients.c:375
 #, fuzzy
 msgid "# send requests dropped (disconnected)"
 msgstr "# gap Anfragen verworfen: Kollision in RT"
 
-#: src/core/gnunet-service-core_clients.c:483
+#: src/core/gnunet-service-core_clients.c:490
 #, fuzzy
 msgid "# messages discarded (session disconnected)"
 msgstr "# defragmentierter Nachrichten"
 
-#: src/core/gnunet-service-core_clients.c:529
+#: src/core/gnunet-service-core_clients.c:536
 #, fuzzy, c-format
 msgid "# bytes of messages of type %u received"
 msgstr "# Bytes Rauschen empfangen"
@@ -1342,134 +1316,134 @@
 msgid "# key exchanges stopped"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:847
+#: src/core/gnunet-service-core_kx.c:848
 msgid "# old ephemeral keys ignored"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:854
+#: src/core/gnunet-service-core_kx.c:855
 #, fuzzy
 msgid "# ephemeral keys received"
 msgstr "# verschlüsselter PING Nachrichten empfangen"
 
-#: src/core/gnunet-service-core_kx.c:888
+#: src/core/gnunet-service-core_kx.c:889
 #, 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:899
+#: src/core/gnunet-service-core_kx.c:900
 #, fuzzy
 msgid "# EPHEMERAL_KEY messages received"
 msgstr "# defragmentierter Nachrichten"
 
-#: src/core/gnunet-service-core_kx.c:998
+#: src/core/gnunet-service-core_kx.c:999
 #: src/transport/gnunet-service-transport_validation.c:1016
 #, fuzzy
 msgid "# PING messages received"
 msgstr "# PING Nachrichten erstellt"
 
-#: src/core/gnunet-service-core_kx.c:1006
+#: src/core/gnunet-service-core_kx.c:1007
 #, fuzzy
 msgid "# PING messages dropped (out of order)"
 msgstr "# gap Anfragen verworfen: Kollision in RT"
 
-#: src/core/gnunet-service-core_kx.c:1033
+#: src/core/gnunet-service-core_kx.c:1034
 #, 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:1049
+#: src/core/gnunet-service-core_kx.c:1050
 #, fuzzy
 msgid "# PONG messages created"
 msgstr "# PING Nachrichten erstellt"
 
-#: src/core/gnunet-service-core_kx.c:1075
+#: src/core/gnunet-service-core_kx.c:1077
 #, fuzzy
 msgid "# sessions terminated by timeout"
 msgstr "# Bytes verworfen von TCP (ausgehend)"
 
-#: src/core/gnunet-service-core_kx.c:1086
+#: src/core/gnunet-service-core_kx.c:1088
 #, fuzzy
 msgid "# keepalive messages sent"
 msgstr "# Klartext PING Nachrichten gesendet"
 
-#: src/core/gnunet-service-core_kx.c:1153
+#: src/core/gnunet-service-core_kx.c:1156
 #: src/transport/gnunet-service-transport_validation.c:1359
 #, fuzzy
 msgid "# PONG messages received"
 msgstr "# verschlüsselter PONG Nachrichten empfangen"
 
-#: src/core/gnunet-service-core_kx.c:1159
+#: src/core/gnunet-service-core_kx.c:1162
 #, fuzzy
 msgid "# PONG messages dropped (connection down)"
 msgstr "# verschlüsselter PONG Nachrichten empfangen"
 
-#: src/core/gnunet-service-core_kx.c:1164
+#: src/core/gnunet-service-core_kx.c:1167
 #, fuzzy
 msgid "# PONG messages dropped (out of order)"
 msgstr "# gap Anfragen verworfen: Kollision in RT"
 
-#: src/core/gnunet-service-core_kx.c:1194
+#: src/core/gnunet-service-core_kx.c:1197
 #, fuzzy
 msgid "# PONG messages decrypted"
 msgstr "# PING Nachrichten erstellt"
 
-#: src/core/gnunet-service-core_kx.c:1229
+#: src/core/gnunet-service-core_kx.c:1232
 #, fuzzy
 msgid "# session keys confirmed via PONG"
 msgstr "# Knotenankündigungen empfangen"
 
-#: src/core/gnunet-service-core_kx.c:1240
+#: src/core/gnunet-service-core_kx.c:1243
 #, fuzzy
 msgid "# timeouts prevented via PONG"
 msgstr "# Bytes empfangen über TCP"
 
-#: src/core/gnunet-service-core_kx.c:1247
+#: src/core/gnunet-service-core_kx.c:1250
 #, fuzzy
 msgid "# rekey operations confirmed via PONG"
 msgstr "# Knotenankündigungen empfangen"
 
-#: src/core/gnunet-service-core_kx.c:1386
+#: src/core/gnunet-service-core_kx.c:1392
 #, fuzzy
 msgid "# DATA message dropped (out of order)"
 msgstr "# Bytes verworfen von UDP (outgoing)"
 
-#: src/core/gnunet-service-core_kx.c:1393
+#: src/core/gnunet-service-core_kx.c:1399
 #, 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:1396
+#: src/core/gnunet-service-core_kx.c:1402
 #, fuzzy
 msgid "# sessions terminated by key expiration"
 msgstr "# Bytes verworfen von TCP (ausgehend)"
 
-#: src/core/gnunet-service-core_kx.c:1442
-#: src/core/gnunet-service-core_kx.c:1467
+#: src/core/gnunet-service-core_kx.c:1448
+#: src/core/gnunet-service-core_kx.c:1473
 #, fuzzy
 msgid "# bytes dropped (duplicates)"
 msgstr "# Bytes verworfen von UDP (outgoing)"
 
-#: src/core/gnunet-service-core_kx.c:1454
+#: src/core/gnunet-service-core_kx.c:1460
 #, fuzzy
 msgid "# bytes dropped (out of sequence)"
 msgstr "# Bytes verworfen von UDP (outgoing)"
 
-#: src/core/gnunet-service-core_kx.c:1496
+#: src/core/gnunet-service-core_kx.c:1502
 #, fuzzy
 msgid "# bytes dropped (ancient message)"
 msgstr "# Bytes verworfen von UDP (outgoing)"
 
-#: src/core/gnunet-service-core_kx.c:1504
+#: src/core/gnunet-service-core_kx.c:1510
 #, fuzzy
 msgid "# bytes of payload decrypted"
 msgstr "# Bytes entschlüsselt"
 
-#: src/core/gnunet-service-core_kx.c:1539
+#: src/core/gnunet-service-core_kx.c:1545
 #, fuzzy
 msgid "# PAYLOAD dropped (out of order)"
 msgstr "# Bytes verworfen von UDP (outgoing)"
@@ -1480,7 +1454,7 @@
 msgstr "# Knotenankündigungen empfangen"
 
 #: src/core/gnunet-service-core_neighbours.c:184
-#: src/core/gnunet-service-core_neighbours.c:335
+#: src/core/gnunet-service-core_neighbours.c:342
 msgid "# neighbour entries allocated"
 msgstr ""
 
@@ -1488,22 +1462,22 @@
 msgid "# encrypted bytes given to transport"
 msgstr ""
 
-#: src/core/gnunet-service-core_neighbours.c:418
+#: src/core/gnunet-service-core_neighbours.c:425
 #, fuzzy, c-format
 msgid "Unsupported message of type %u (%u bytes) received from peer `%s'\n"
 msgstr "Ungültige Nachricht des Typs %u empfangen. Nachricht wird verworfen.\n"
 
 #: src/core/gnunet-service-core_sessions.c:245
 #: src/core/gnunet-service-core_sessions.c:328
-#: src/dht/gnunet-service-dht_neighbours.c:662
-#: src/dht/gnunet-service-dht_neighbours.c:727
-#: src/fs/gnunet-service-fs_cp.c:618 src/fs/gnunet-service-fs_cp.c:1517
+#: 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/topology/gnunet-daemon-topology.c:734
 #: src/topology/gnunet-daemon-topology.c:835
-#: src/transport/gnunet-service-transport_neighbours.c:917
-#: src/transport/gnunet-service-transport_neighbours.c:1141
-#: src/transport/gnunet-service-transport_neighbours.c:3177
-#: src/transport/gnunet-service-transport_neighbours.c:3491
+#: src/transport/gnunet-service-transport_neighbours.c:921
+#: src/transport/gnunet-service-transport_neighbours.c:1145
+#: src/transport/gnunet-service-transport_neighbours.c:3181
+#: src/transport/gnunet-service-transport_neighbours.c:3495
 #, fuzzy
 msgid "# peers connected"
 msgstr "# verbundener Knoten"
@@ -1538,7 +1512,7 @@
 msgstr ""
 
 #: src/datacache/datacache.c:115 src/datacache/datacache.c:266
-#: src/datastore/gnunet-service-datastore.c:838
+#: src/datastore/gnunet-service-datastore.c:855
 #, fuzzy
 msgid "# bytes stored"
 msgstr "# bytes in der Datenbank"
@@ -1549,8 +1523,8 @@
 msgstr "# bytes in der Datenbank"
 
 #: src/datacache/datacache.c:143 src/datacache/datacache.c:150
-#: src/datastore/gnunet-service-datastore.c:1487
-#: src/datastore/gnunet-service-datastore.c:1498
+#: src/datastore/gnunet-service-datastore.c:1553
+#: src/datastore/gnunet-service-datastore.c:1564
 #, fuzzy, c-format
 msgid "No `%s' specified for `%s' in configuration!\n"
 msgstr "In der Konfigurationsdatei wurden keine Anwendungen definiert!\n"
@@ -1754,163 +1728,169 @@
 msgstr ""
 "Einen Wert aus der Konfigurationsdatei auf der Standardausgabe ausgeben"
 
-#: src/datastore/gnunet-service-datastore.c:351
+#: src/datastore/gnunet-service-datastore.c:365
 #, fuzzy
 msgid "# bytes expired"
 msgstr "# Bytes empfangen über TCP"
 
-#: src/datastore/gnunet-service-datastore.c:425
+#: src/datastore/gnunet-service-datastore.c:439
 msgid "# bytes purged (low-priority)"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:483
+#: src/datastore/gnunet-service-datastore.c:497
 #: src/gns/gnunet-gns-helper-service-w32.c:223
 msgid "Transmission to client failed!\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:514
+#: src/datastore/gnunet-service-datastore.c:528
 #: src/gns/gnunet-gns-helper-service-w32.c:262
 msgid "Shutdown in progress, aborting transmission.\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:630
+#: src/datastore/gnunet-service-datastore.c:643
 msgid "# results found"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:673
+#: src/datastore/gnunet-service-datastore.c:686
 #, c-format
 msgid ""
 "Insufficient space (%llu bytes are available) to satisfy `%s' request for "
 "%llu bytes\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:684
+#: src/datastore/gnunet-service-datastore.c:697
 #, c-format
 msgid ""
 "The requested amount (%llu bytes) is larger than the cache size (%llu "
 "bytes)\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:688
+#: src/datastore/gnunet-service-datastore.c:701
 msgid ""
 "Insufficient space to satisfy request and requested amount is larger than "
 "cache size"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:694
+#: src/datastore/gnunet-service-datastore.c:707
 msgid "Insufficient space to satisfy request"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:699
-#: src/datastore/gnunet-service-datastore.c:751
-#: src/datastore/gnunet-service-datastore.c:964
-#: src/datastore/gnunet-service-datastore.c:1421
+#: 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:1525
 msgid "# reserved"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:764
+#: src/datastore/gnunet-service-datastore.c:780
 msgid "Could not find matching reservation"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:850
+#: src/datastore/gnunet-service-datastore.c:867
 #, c-format
 msgid "Need %llu bytes more space (%llu allowed, using %llu)\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1010
+#: src/datastore/gnunet-service-datastore.c:1029
 #, fuzzy
 msgid "# GET requests received"
 msgstr "# Client Trace-Anfragen empfangen"
 
-#: src/datastore/gnunet-service-datastore.c:1022
+#: src/datastore/gnunet-service-datastore.c:1041
 msgid "# requests filtered by bloomfilter"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1050
+#: src/datastore/gnunet-service-datastore.c:1069
 #, fuzzy
 msgid "# UPDATE requests received"
 msgstr "# Client Trace-Anfragen empfangen"
 
-#: src/datastore/gnunet-service-datastore.c:1080
+#: src/datastore/gnunet-service-datastore.c:1099
 #, fuzzy
 msgid "# GET REPLICATION requests received"
 msgstr "# Client Trace-Anfragen empfangen"
 
-#: src/datastore/gnunet-service-datastore.c:1113
+#: src/datastore/gnunet-service-datastore.c:1132
 #, fuzzy
 msgid "# GET ZERO ANONYMITY requests received"
 msgstr "# Client Trace-Anfragen empfangen"
 
-#: src/datastore/gnunet-service-datastore.c:1138
+#: src/datastore/gnunet-service-datastore.c:1157
 #, fuzzy
 msgid "Content not found"
 msgstr "Kommando `%s' wurde nicht gefunden!\n"
 
-#: src/datastore/gnunet-service-datastore.c:1146
+#: src/datastore/gnunet-service-datastore.c:1165
 msgid "# bytes removed (explicit request)"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1178
+#: src/datastore/gnunet-service-datastore.c:1197
 #, fuzzy
 msgid "# REMOVE requests received"
 msgstr "# Client Trace-Anfragen empfangen"
 
-#: src/datastore/gnunet-service-datastore.c:1220
+#: src/datastore/gnunet-service-datastore.c:1241
 #, c-format
-msgid "Datastore payload inaccurate (%lld < %lld).  Trying to fix.\n"
+msgid ""
+"Datastore payload must have been inaccurate (%lld < %lld). Recomputing it.\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1281
+#: src/datastore/gnunet-service-datastore.c:1246
 #, c-format
+msgid "New payload: %lld\n"
+msgstr ""
+
+#: src/datastore/gnunet-service-datastore.c:1299
+#, c-format
 msgid "Loading `%s' datastore plugin\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1290
+#: src/datastore/gnunet-service-datastore.c:1310
 #, fuzzy, c-format
 msgid "Failed to load datastore plugin for `%s'\n"
 msgstr "Anwendung `%s' konnte nicht initialisiert werden.\n"
 
-#: src/datastore/gnunet-service-datastore.c:1492
+#: src/datastore/gnunet-service-datastore.c:1412
+msgid "Rebuilding bloomfilter.  Please be patient.\n"
+msgstr ""
+
+#: src/datastore/gnunet-service-datastore.c:1419
+msgid "Plugin does not support get_keys function. Please fix!\n"
+msgstr ""
+
+#: src/datastore/gnunet-service-datastore.c:1422
+msgid "Bloomfilter construction complete.\n"
+msgstr ""
+
+#: src/datastore/gnunet-service-datastore.c:1558
 #, fuzzy, c-format
 msgid "# bytes used in file-sharing datastore `%s'"
 msgstr "# bytes erlaubt in der Datenbank"
 
-#: src/datastore/gnunet-service-datastore.c:1503
+#: src/datastore/gnunet-service-datastore.c:1569
 msgid "# quota"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1505
+#: src/datastore/gnunet-service-datastore.c:1571
 msgid "# cache size"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1518
+#: src/datastore/gnunet-service-datastore.c:1584
 #, c-format
 msgid "Could not use specified filename `%s' for bloomfilter.\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1536
-#: src/datastore/gnunet-service-datastore.c:1552
+#: src/datastore/gnunet-service-datastore.c:1602
+#: src/datastore/gnunet-service-datastore.c:1618
 #, 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:1582
+#: src/datastore/gnunet-service-datastore.c:1648
 #, fuzzy
 msgid "Failed to initialize bloomfilter.\n"
 msgstr "SQLite Datenbank konnte nicht initialisiert werden.\n"
 
-#: src/datastore/gnunet-service-datastore.c:1611
-msgid "Rebuilding bloomfilter.  Please be patient.\n"
-msgstr ""
-
-#: src/datastore/gnunet-service-datastore.c:1616
-msgid "Plugin does not support get_keys function. Please fix!\n"
-msgstr ""
-
-#: src/datastore/gnunet-service-datastore.c:1619
-msgid "Bloomfilter construction complete.\n"
-msgstr ""
-
 #: src/datastore/plugin_datastore_heap.c:820
 #, fuzzy
 msgid "Heap database running\n"
@@ -1954,7 +1934,7 @@
 #: src/datastore/plugin_datastore_sqlite.c:255
 #: src/namecache/plugin_namecache_sqlite.c:193
 #: src/namestore/plugin_namestore_sqlite.c:204
-#: src/peerstore/plugin_peerstore_sqlite.c:458
+#: src/peerstore/plugin_peerstore_sqlite.c:479
 #: src/psycstore/plugin_psycstore_sqlite.c:329
 #, c-format
 msgid "Unable to initialize SQLite: %s.\n"
@@ -2034,8 +2014,8 @@
 msgstr ""
 
 #: src/dht/gnunet-dht-get.c:204 src/dht/gnunet-dht-monitor.c:271
-#: src/dht/gnunet-dht-put.c:213 src/fs/gnunet-auto-share.c:753
-#: src/fs/gnunet-download.c:328 src/fs/gnunet-publish.c:939
+#: src/dht/gnunet-dht-put.c:213 src/fs/gnunet-auto-share.c:755
+#: src/fs/gnunet-download.c:328 src/fs/gnunet-publish.c:941
 #: src/fs/gnunet-search.c:301 src/fs/gnunet-unindex.c:168
 #: src/nse/gnunet-nse-profiler.c:873
 msgid "be verbose (print progress information)"
@@ -2053,49 +2033,49 @@
 msgid "Prints all packets that go through the DHT."
 msgstr ""
 
-#: src/dht/gnunet_dht_profiler.c:1392
+#: src/dht/gnunet_dht_profiler.c:1393
 #: src/testbed/gnunet-testbed-profiler.c:267
 #, fuzzy, c-format
 msgid "Exiting as the number of peers is %u\n"
 msgstr "Maximale Anzahl an Chat Clients erreicht.\n"
 
-#: src/dht/gnunet_dht_profiler.c:1417
+#: src/dht/gnunet_dht_profiler.c:1418
 #, fuzzy
 msgid "number of peers to start"
 msgstr "Anzahl an Durchläufen"
 
-#: src/dht/gnunet_dht_profiler.c:1420
+#: src/dht/gnunet_dht_profiler.c:1421
 msgid ""
 "maximum number of times we try to search for successor circle formation (0 "
 "for R5N)"
 msgstr ""
 
-#: src/dht/gnunet_dht_profiler.c:1423 src/nse/gnunet-nse-profiler.c:864
+#: src/dht/gnunet_dht_profiler.c:1424 src/nse/gnunet-nse-profiler.c:864
 #: src/testbed/gnunet-testbed-profiler.c:306
 msgid "name of the file with the login information for the testbed"
 msgstr ""
 
-#: src/dht/gnunet_dht_profiler.c:1426
+#: src/dht/gnunet_dht_profiler.c:1427
 msgid "delay between rounds for collecting statistics (default: 30 sec)"
 msgstr ""
 
-#: src/dht/gnunet_dht_profiler.c:1429
+#: src/dht/gnunet_dht_profiler.c:1430
 msgid "delay to start doing PUTs (default: 1 sec)"
 msgstr ""
 
-#: src/dht/gnunet_dht_profiler.c:1432
+#: src/dht/gnunet_dht_profiler.c:1433
 msgid "delay to start doing GETs (default: 5 min)"
 msgstr ""
 
-#: src/dht/gnunet_dht_profiler.c:1435
+#: src/dht/gnunet_dht_profiler.c:1436
 msgid "replication degree for DHT PUTs"
 msgstr ""
 
-#: src/dht/gnunet_dht_profiler.c:1438
+#: src/dht/gnunet_dht_profiler.c:1439
 msgid "timeout for DHT PUT and GET requests (default: 1 min)"
 msgstr ""
 
-#: src/dht/gnunet_dht_profiler.c:1456
+#: src/dht/gnunet_dht_profiler.c:1457
 #, fuzzy
 msgid "Measure quality and performance of the DHT service."
 msgstr "Auf den Dienst konnte nicht zugegriffen werden"
@@ -2266,133 +2246,139 @@
 msgid "# HELLOs obtained from peerinfo"
 msgstr "Empfangene Client-Nachricht ist ungültig.\n"
 
-#: src/dht/gnunet-service-dht_neighbours.c:516
+#: src/dht/gnunet-service-dht_neighbours.c:515
 msgid "# Preference updates given to core"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:610
+#: src/dht/gnunet-service-dht_neighbours.c:609
 #, fuzzy
 msgid "# FIND PEER messages initiated"
 msgstr "# PING Nachrichten erstellt"
 
-#: src/dht/gnunet-service-dht_neighbours.c:764
-#: src/dht/gnunet-service-xdht_neighbours.c:6055
+#: src/dht/gnunet-service-dht_neighbours.c:763
+#: src/dht/gnunet-service-xdht_neighbours.c:6059
 #, fuzzy
 msgid "# Queued messages discarded (peer disconnected)"
 msgstr "# defragmentierter Nachrichten"
 
-#: src/dht/gnunet-service-dht_neighbours.c:819
-#: src/dht/gnunet-service-xdht_neighbours.c:1012
+#: src/dht/gnunet-service-dht_neighbours.c:793
+#: src/dht/gnunet-service-xdht_neighbours.c:987
 #, fuzzy
+msgid "# Messages dropped (CORE timeout)"
+msgstr "# gap Anfragen verworfen: Kollision in RT"
+
+#: src/dht/gnunet-service-dht_neighbours.c:823
+#: src/dht/gnunet-service-xdht_neighbours.c:1019
+#, fuzzy
 msgid "# Bytes transmitted to other peers"
 msgstr "# Bytes des Typs %d übertragen"
 
-#: src/dht/gnunet-service-dht_neighbours.c:857
+#: src/dht/gnunet-service-dht_neighbours.c:861
 #, fuzzy
 msgid "# Bytes of bandwidth requested from core"
 msgstr "# Client Trace-Anfragen empfangen"
 
-#: src/dht/gnunet-service-dht_neighbours.c:889
+#: src/dht/gnunet-service-dht_neighbours.c:893
 #, fuzzy
 msgid "# requests TTL-dropped"
 msgstr "# Client Trace-Anfragen empfangen"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1093
-#: src/dht/gnunet-service-dht_neighbours.c:1130
+#: src/dht/gnunet-service-dht_neighbours.c:1097
+#: src/dht/gnunet-service-dht_neighbours.c:1134
 msgid "# Peers excluded from routing due to Bloomfilter"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1108
-#: src/dht/gnunet-service-dht_neighbours.c:1145
+#: src/dht/gnunet-service-dht_neighbours.c:1112
+#: src/dht/gnunet-service-dht_neighbours.c:1149
 #, fuzzy
 msgid "# Peer selection failed"
 msgstr " Verbindung fehlgeschlagen\n"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1289
+#: src/dht/gnunet-service-dht_neighbours.c:1293
 #, fuzzy
 msgid "# PUT requests routed"
 msgstr "# dht Anfragen weitergeleitet"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1318
+#: src/dht/gnunet-service-dht_neighbours.c:1322
 #, fuzzy
 msgid "# PUT messages queued for transmission"
 msgstr "# PING Nachrichten erstellt"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1328
-#: src/dht/gnunet-service-dht_neighbours.c:1452
-#: src/dht/gnunet-service-dht_neighbours.c:1557
-#: src/dht/gnunet-service-xdht_neighbours.c:1121
-#: src/dht/gnunet-service-xdht_neighbours.c:1190
-#: src/dht/gnunet-service-xdht_neighbours.c:1240
-#: src/dht/gnunet-service-xdht_neighbours.c:1304
-#: src/dht/gnunet-service-xdht_neighbours.c:1371
-#: src/dht/gnunet-service-xdht_neighbours.c:1433
-#: src/dht/gnunet-service-xdht_neighbours.c:1495
-#: src/dht/gnunet-service-xdht_neighbours.c:1557
-#: src/dht/gnunet-service-xdht_neighbours.c:1617
+#: src/dht/gnunet-service-dht_neighbours.c:1332
+#: src/dht/gnunet-service-dht_neighbours.c:1456
+#: src/dht/gnunet-service-dht_neighbours.c:1561
+#: src/dht/gnunet-service-xdht_neighbours.c:1129
+#: src/dht/gnunet-service-xdht_neighbours.c:1198
+#: src/dht/gnunet-service-xdht_neighbours.c:1248
+#: src/dht/gnunet-service-xdht_neighbours.c:1312
+#: src/dht/gnunet-service-xdht_neighbours.c:1379
+#: src/dht/gnunet-service-xdht_neighbours.c:1441
+#: src/dht/gnunet-service-xdht_neighbours.c:1503
+#: src/dht/gnunet-service-xdht_neighbours.c:1565
+#: src/dht/gnunet-service-xdht_neighbours.c:1625
 #, fuzzy
 msgid "# P2P messages dropped due to full queue"
 msgstr "# gap Anfragen verworfen: Kollision in RT"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1414
+#: src/dht/gnunet-service-dht_neighbours.c:1418
 #, fuzzy
 msgid "# GET requests routed"
 msgstr "# dht Anfragen weitergeleitet"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1441
+#: src/dht/gnunet-service-dht_neighbours.c:1445
 #, fuzzy
 msgid "# GET messages queued for transmission"
 msgstr "# PING Nachrichten erstellt"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1564
+#: src/dht/gnunet-service-dht_neighbours.c:1568
 #, fuzzy
 msgid "# RESULT messages queued for transmission"
 msgstr "# PING Nachrichten erstellt"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1651
+#: src/dht/gnunet-service-dht_neighbours.c:1655
 #, fuzzy
 msgid "# P2P PUT requests received"
 msgstr "# Client Trace-Anfragen empfangen"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1654
+#: src/dht/gnunet-service-dht_neighbours.c:1658
 #, fuzzy
 msgid "# P2P PUT bytes received"
 msgstr "# Client Trace-Anfragen empfangen"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1821
+#: src/dht/gnunet-service-dht_neighbours.c:1825
 msgid "# FIND PEER requests ignored due to Bloomfilter"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1829
+#: src/dht/gnunet-service-dht_neighbours.c:1833
 msgid "# FIND PEER requests ignored due to lack of HELLO"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1924
+#: src/dht/gnunet-service-dht_neighbours.c:1928
 #, fuzzy
 msgid "# P2P GET requests received"
 msgstr "# Client Trace-Anfragen empfangen"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1927
+#: src/dht/gnunet-service-dht_neighbours.c:1931
 #, fuzzy
 msgid "# P2P GET bytes received"
 msgstr "# Client Trace-Anfragen empfangen"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1984
+#: src/dht/gnunet-service-dht_neighbours.c:1988
 #, fuzzy
 msgid "# P2P FIND PEER requests processed"
 msgstr "# Client Trace-Anfragen empfangen"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1998
+#: src/dht/gnunet-service-dht_neighbours.c:2002
 #, fuzzy
 msgid "# P2P GET requests ONLY routed"
 msgstr "# dht Anfragen weitergeleitet"
 
-#: src/dht/gnunet-service-dht_neighbours.c:2083
+#: src/dht/gnunet-service-dht_neighbours.c:2087
 #, fuzzy
 msgid "# P2P RESULTS received"
 msgstr "# Bytes empfangen über TCP"
 
-#: src/dht/gnunet-service-dht_neighbours.c:2086
+#: src/dht/gnunet-service-dht_neighbours.c:2090
 #, fuzzy
 msgid "# P2P RESULT bytes received"
 msgstr "# Bytes empfangen über TCP"
@@ -2435,78 +2421,78 @@
 msgid "# DHT requests combined"
 msgstr "# Client Trace-Anfragen empfangen"
 
-#: src/dht/gnunet-service-xdht_neighbours.c:1824
+#: src/dht/gnunet-service-xdht_neighbours.c:1832
 #, c-format
 msgid ""
 "\n"
 "SUPU %s, %s, %d,trail_length = %d"
 msgstr ""
 
-#: src/dht/gnunet-service-xdht_neighbours.c:1829
+#: src/dht/gnunet-service-xdht_neighbours.c:1837
 #, c-format
 msgid ""
 "\n"
 "SUPU %s, %s, %d,trail[%d]=%s"
 msgstr ""
 
-#: src/dht/gnunet-service-xdht_neighbours.c:1849
+#: src/dht/gnunet-service-xdht_neighbours.c:1857
 #, c-format
 msgid ""
 "\n"
 "SUPU************  FRIEND_PEERMAP of %s"
 msgstr ""
 
-#: src/dht/gnunet-service-xdht_neighbours.c:1859
+#: src/dht/gnunet-service-xdht_neighbours.c:1867
 #, c-format
 msgid ""
 "\n"
 "SUPU %s, %s, %d, friend = %s, friend->trails_count = %d"
 msgstr ""
 
-#: src/dht/gnunet-service-xdht_neighbours.c:1880
+#: src/dht/gnunet-service-xdht_neighbours.c:1888
 #, c-format
 msgid ""
 "\n"
 "SUPU************  FINGER_TABLE of %s"
 msgstr ""
 
-#: src/dht/gnunet-service-xdht_neighbours.c:1889
+#: src/dht/gnunet-service-xdht_neighbours.c:1897
 #, c-format
 msgid ""
 "\n"
 "SUPU %s, %s, %d, finger_table[%d] = %s, trails_count = %d"
 msgstr ""
 
-#: src/dht/gnunet-service-xdht_neighbours.c:1896
+#: src/dht/gnunet-service-xdht_neighbours.c:1904
 #, c-format
 msgid ""
 "\n"
 "SUPU %s, %s, %d, trail_id[%d]=%s"
 msgstr ""
 
-#: src/dht/gnunet-service-xdht_neighbours.c:1902
+#: src/dht/gnunet-service-xdht_neighbours.c:1910
 #, c-format
 msgid ""
 "\n"
 "SUPU %s, %s, %d,trail[%d] = %s "
 msgstr ""
 
-#: src/dht/gnunet-service-xdht_neighbours.c:3551
+#: src/dht/gnunet-service-xdht_neighbours.c:3559
 msgid "# FINGERS_COUNT"
 msgstr ""
 
-#: src/dht/gnunet-service-xdht_neighbours.c:3692
-#: src/dht/gnunet-service-xdht_neighbours.c:3930
-#: src/dht/gnunet-service-xdht_neighbours.c:4083
-#: src/dht/gnunet-service-xdht_neighbours.c:4233
-#: src/dht/gnunet-service-xdht_neighbours.c:4414
-#: src/dht/gnunet-service-xdht_neighbours.c:4929
-#: src/dht/gnunet-service-xdht_neighbours.c:5323
-#: src/dht/gnunet-service-xdht_neighbours.c:5416
-#: src/dht/gnunet-service-xdht_neighbours.c:5505
-#: src/dht/gnunet-service-xdht_neighbours.c:5609
-#: src/dht/gnunet-service-xdht_neighbours.c:5753
-#: src/dht/gnunet-service-xdht_neighbours.c:5842
+#: 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
 #, fuzzy
 msgid "# Bytes received from other peers"
 msgstr "# Bytes des Typs %d empfangen"
@@ -2896,132 +2882,6 @@
 msgid "Daemon to run to provide an IP exit node for the VPN"
 msgstr ""
 
-#: src/experimentation/gnunet-daemon-experimentation.c:55
-msgid "Experimentation daemon shutting down ...\n"
-msgstr ""
-
-#: src/experimentation/gnunet-daemon-experimentation.c:77
-msgid "Experimentation daemon starting ...\n"
-msgstr ""
-
-#: src/experimentation/gnunet-daemon-experimentation.c:83
-#, fuzzy
-msgid "Failed to create statistics!\n"
-msgstr "Namespace `%s' konnte nicht erstellt werden (existiert bereits?).\n"
-
-#: src/experimentation/gnunet-daemon-experimentation.c:120
-msgid "GNUnet experimentation daemon"
-msgstr ""
-
-#: src/experimentation/gnunet-daemon-experimentation_experiments.c:241
-#, c-format
-msgid "Experiment `%s': Experiment signature is invalid\n"
-msgstr ""
-
-#: src/experimentation/gnunet-daemon-experimentation_experiments.c:250
-#, c-format
-msgid ""
-"Adding experiment `%s' running from `%s' to `%s' every %llu sec. for %llu "
-"sec. \n"
-msgstr ""
-
-#: src/experimentation/gnunet-daemon-experimentation_experiments.c:303
-#, c-format
-msgid "Experiment `%s': Issuer missing\n"
-msgstr ""
-
-#: src/experimentation/gnunet-daemon-experimentation_experiments.c:312
-#, c-format
-msgid "Experiment `%s': Issuer invalid\n"
-msgstr ""
-
-#: src/experimentation/gnunet-daemon-experimentation_experiments.c:320
-#, c-format
-msgid "Experiment `%s': Issuer not accepted!\n"
-msgstr ""
-
-#: src/experimentation/gnunet-daemon-experimentation_experiments.c:330
-#, c-format
-msgid "Experiment `%s': Version missing or invalid \n"
-msgstr ""
-
-#: src/experimentation/gnunet-daemon-experimentation_experiments.c:339
-#, c-format
-msgid "Experiment `%s': Required capabilities missing \n"
-msgstr ""
-
-#: src/experimentation/gnunet-daemon-experimentation_experiments.c:345
-#, c-format
-msgid "Experiment `%s': Required capabilities invalid \n"
-msgstr ""
-
-#: src/experimentation/gnunet-daemon-experimentation_experiments.c:390
-#, fuzzy, c-format
-msgid "Failed to parse file `%s'\n"
-msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
-
-#: src/experimentation/gnunet-daemon-experimentation_experiments.c:420
-#: src/experimentation/gnunet-daemon-experimentation_experiments.c:452
-msgid ""
-"No valid experiment issuers configured! Set value to public keys of issuers! "
-"Exiting.\n"
-msgstr ""
-
-#: src/experimentation/gnunet-daemon-experimentation_experiments.c:435
-#, fuzzy
-msgid "Invalid value for public key\n"
-msgstr "Ungültiger Parameter: `%s'\n"
-
-#: src/experimentation/gnunet-daemon-experimentation_experiments.c:473
-#, fuzzy, c-format
-msgid "Cannot read experiments file `%s'\n"
-msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
-
-#: src/experimentation/gnunet-daemon-experimentation_nodes.c:221
-#, c-format
-msgid "Cannot send message to peer `%s' for experiment `%s'\n"
-msgstr ""
-
-#: src/experimentation/gnunet-daemon-experimentation_nodes.c:309
-#, c-format
-msgid "Sending experimentation request to peer %s\n"
-msgstr ""
-
-#: src/experimentation/gnunet-daemon-experimentation_nodes.c:453
-#, c-format
-msgid "Added peer `%s' as active node\n"
-msgstr ""
-
-#: src/experimentation/gnunet-daemon-experimentation_nodes.c:891
-#, fuzzy, c-format
-msgid "Connected to peer %s\n"
-msgstr "`%s' hat sich mit `%s' verbunden.\n"
-
-#: src/experimentation/gnunet-daemon-experimentation_nodes.c:921
-#, fuzzy, c-format
-msgid "Disconnected from peer %s\n"
-msgstr "`%s' hat sich mit `%s' verbunden.\n"
-
-#: src/experimentation/gnunet-daemon-experimentation_scheduler.c:108
-#, c-format
-msgid "Peer `%s' did not respond to request for experiment `%s'\n"
-msgstr ""
-
-#: src/experimentation/gnunet-daemon-experimentation_scheduler.c:143
-#, fuzzy, c-format
-msgid "Starting inbound experiment `%s' with peer `%s'\n"
-msgstr "Collection `%s' begonnen.\n"
-
-#: src/experimentation/gnunet-daemon-experimentation_scheduler.c:276
-#, fuzzy, c-format
-msgid "Starting outbound experiment `%s' with peer `%s'\n"
-msgstr "Collection `%s' begonnen.\n"
-
-#: src/experimentation/gnunet-daemon-experimentation_scheduler.c:294
-#, fuzzy, c-format
-msgid "Received %s message from peer %s for experiment `%s'\n"
-msgstr "GAP hat ungültige Inhalte von `%s' empfangen.\n"
-
 #: src/fragmentation/defragmentation.c:270
 msgid "# acknowledgements sent for fragment"
 msgstr ""
@@ -3078,71 +2938,71 @@
 msgid "# fragmentation transmissions completed"
 msgstr "# Klartext PONG Nachrichten empfangen"
 
-#: src/fs/fs_api.c:474
+#: src/fs/fs_api.c:484
 #, fuzzy, c-format
 msgid "Could not open file `%s': %s"
 msgstr "Datei wurde als `%s' gespeichert.\n"
 
-#: src/fs/fs_api.c:485
+#: src/fs/fs_api.c:495
 #, fuzzy, c-format
 msgid "Could not read file `%s': %s"
 msgstr "Datei wurde als `%s' gespeichert.\n"
 
-#: src/fs/fs_api.c:493
+#: src/fs/fs_api.c:503
 #, c-format
 msgid "Short read reading from file `%s'!"
 msgstr ""
 
-#: src/fs/fs_api.c:1101
+#: src/fs/fs_api.c:1111
 #, fuzzy, c-format
 msgid "Failed to resume publishing information `%s': %s\n"
 msgstr "Datei wurde als `%s' gespeichert.\n"
 
-#: src/fs/fs_api.c:1621
+#: src/fs/fs_api.c:1631
 #, c-format
 msgid "Failure while resuming publishing operation `%s': %s\n"
 msgstr ""
 
-#: src/fs/fs_api.c:1635
+#: src/fs/fs_api.c:1645
 #, fuzzy, c-format
 msgid "Failed to resume publishing operation `%s': %s\n"
 msgstr "Datei wurde als `%s' gespeichert.\n"
 
-#: src/fs/fs_api.c:2293
+#: src/fs/fs_api.c:2303
 #, c-format
 msgid "Failure while resuming unindexing operation `%s': %s\n"
 msgstr ""
 
-#: src/fs/fs_api.c:2303
+#: src/fs/fs_api.c:2313
 #, fuzzy, c-format
 msgid "Failed to resume unindexing operation `%s': %s\n"
 msgstr "Datei wurde als `%s' gespeichert.\n"
 
-#: src/fs/fs_api.c:2431 src/fs/fs_api.c:2679
+#: src/fs/fs_api.c:2441 src/fs/fs_api.c:2689
 #, fuzzy, c-format
 msgid "Failed to resume sub-download `%s': %s\n"
 msgstr "Datei wurde als `%s' gespeichert.\n"
 
-#: src/fs/fs_api.c:2449
+#: src/fs/fs_api.c:2459
 #, fuzzy, c-format
 msgid "Failed to resume sub-search `%s': %s\n"
 msgstr "Datei wurde als `%s' gespeichert.\n"
 
-#: src/fs/fs_api.c:2464 src/fs/fs_api.c:2483 src/fs/fs_api.c:2975
+#: src/fs/fs_api.c:2474 src/fs/fs_api.c:2493 src/fs/fs_api.c:2985
 #, c-format
 msgid "Failure while resuming search operation `%s': %s\n"
 msgstr ""
 
-#: src/fs/fs_api.c:2669
+#: src/fs/fs_api.c:2679
 #, c-format
 msgid "Failed to resume sub-download `%s': could not open file `%s'\n"
 msgstr ""
 
-#: src/fs/fs_api.c:2918
+#: src/fs/fs_api.c:2928
 msgid "Could not resume running search, will resume as paused search\n"
 msgstr ""
 
-#: src/fs/fs_api.c:3013
+#: src/fs/fs_api.c:3023
 #, c-format
 msgid "Failure while resuming download operation `%s': %s\n"
 msgstr ""
@@ -3264,7 +3124,7 @@
 "Fehler beim Uploaden der Datei: %s\n"
 
 #: src/fs/fs_publish.c:683 src/fs/fs_publish.c:700 src/fs/fs_publish.c:739
-#: src/fs/fs_publish.c:760 src/fs/fs_publish.c:784 src/fs/fs_publish.c:934
+#: src/fs/fs_publish.c:760 src/fs/fs_publish.c:784 src/fs/fs_publish.c:1034
 #, fuzzy, c-format
 msgid "Can not index file `%s': %s.  Will try to insert instead.\n"
 msgstr "Indizieren der Datei `%s' schlug fehl.  Versuch Datei einzufügen...\n"
@@ -3296,29 +3156,33 @@
 msgid "Failed to get file identifiers for `%s'\n"
 msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
 
-#: src/fs/fs_publish.c:878
+#: src/fs/fs_publish.c:873 src/fs/fs_publish.c:914
+msgid "Can not create LOC URI. Will continue with CHK instead.\n"
+msgstr ""
+
+#: src/fs/fs_publish.c:988
 #, fuzzy, c-format
 msgid "Recursive upload failed at `%s': %s"
 msgstr "`%s' schlug fehl bei %s:%d mit dem Fehler: `%s'.\n"
 
-#: src/fs/fs_publish.c:884
+#: src/fs/fs_publish.c:996
 #, fuzzy, c-format
 msgid "Recursive upload failed: %s"
 msgstr ""
 "\n"
 "Fehler beim Uploaden der Datei: %s\n"
 
-#: src/fs/fs_publish.c:936
+#: src/fs/fs_publish.c:1036
 #, fuzzy
 msgid "needs to be an actual file"
 msgstr "`%s' ist keine normale Datei.\n"
 
-#: src/fs/fs_publish.c:1172
+#: src/fs/fs_publish.c:1272
 #, c-format
 msgid "Insufficient space for publishing: %s"
 msgstr ""
 
-#: src/fs/fs_publish.c:1263
+#: src/fs/fs_publish.c:1363
 #, c-format
 msgid "Reserving space for %u entries and %llu bytes for publication\n"
 msgstr ""
@@ -3333,12 +3197,12 @@
 msgid "Internal error."
 msgstr "Unbekannter Fehler.\n"
 
-#: src/fs/fs_search.c:778 src/fs/fs_search.c:848
+#: src/fs/fs_search.c:812 src/fs/fs_search.c:882
 #, fuzzy, c-format
 msgid "Failed to parse URI `%s': %s\n"
 msgstr "Datei `%s' hat URI: %s\n"
 
-#: src/fs/fs_search.c:907
+#: src/fs/fs_search.c:941
 #, c-format
 msgid "Got result with unknown block type `%d', ignoring"
 msgstr ""
@@ -3480,79 +3344,69 @@
 msgid "Unrecognized URI type"
 msgstr ""
 
-#: src/fs/fs_uri.c:865
-#, fuzzy
-msgid "Lacking key configuration settings.\n"
-msgstr "GNUnet Konfiguration"
-
-#: src/fs/fs_uri.c:871
-#, fuzzy, c-format
-msgid "Could not access hostkey file `%s'.\n"
-msgstr "Konfigurationsdatei `%s' konnte nicht geparst werden.\n"
-
-#: src/fs/fs_uri.c:1056 src/fs/fs_uri.c:1083
+#: src/fs/fs_uri.c:1043 src/fs/fs_uri.c:1070
 msgid "No keywords specified!\n"
 msgstr "Keine Schlüsselwörter angegeben!\n"
 
-#: src/fs/fs_uri.c:1089
+#: src/fs/fs_uri.c:1076
 msgid "Number of double-quotes not balanced!\n"
 msgstr ""
 
-#: src/fs/gnunet-auto-share.c:236
+#: src/fs/gnunet-auto-share.c:237
 #, fuzzy, c-format
 msgid "Failed to load state: %s\n"
 msgstr "Fehler beim Starten der Collection.\n"
 
-#: src/fs/gnunet-auto-share.c:289 src/fs/gnunet-auto-share.c:299
-#: src/fs/gnunet-auto-share.c:309
+#: src/fs/gnunet-auto-share.c:290 src/fs/gnunet-auto-share.c:300
+#: src/fs/gnunet-auto-share.c:310
 #, fuzzy, c-format
 msgid "Failed to save state to file %s\n"
 msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
 
-#: src/fs/gnunet-auto-share.c:401
+#: src/fs/gnunet-auto-share.c:402
 #, c-format
 msgid "Publication of `%s' done\n"
 msgstr ""
 
-#: src/fs/gnunet-auto-share.c:488
+#: src/fs/gnunet-auto-share.c:490
 #, fuzzy, c-format
 msgid "Publishing `%s'\n"
 msgstr ""
 "\n"
 "Fehler beim Uploaden der Datei: %s\n"
 
-#: src/fs/gnunet-auto-share.c:497
+#: src/fs/gnunet-auto-share.c:499
 #, fuzzy, c-format
 msgid "Failed to run `%s'\n"
 msgstr "Fehler beim Starten der Collection.\n"
 
-#: src/fs/gnunet-auto-share.c:686
+#: src/fs/gnunet-auto-share.c:688
 #, fuzzy, c-format
 msgid ""
 "You must specify one and only one directory name for automatic publication.\n"
 msgstr "Sie dürfen nur eine Datei zum Deindizieren angeben.\n"
 
-#: src/fs/gnunet-auto-share.c:737 src/fs/gnunet-publish.c:886
+#: src/fs/gnunet-auto-share.c:739 src/fs/gnunet-publish.c:888
 msgid "set the desired LEVEL of sender-anonymity"
 msgstr "Gewünschten Grad an Sender-Anonymität festlegen"
 
-#: src/fs/gnunet-auto-share.c:741 src/fs/gnunet-publish.c:890
+#: src/fs/gnunet-auto-share.c:743 src/fs/gnunet-publish.c:892
 msgid "disable adding the creation time to the metadata of the uploaded file"
 msgstr ""
 
-#: src/fs/gnunet-auto-share.c:744 src/fs/gnunet-publish.c:893
+#: src/fs/gnunet-auto-share.c:746 src/fs/gnunet-publish.c:895
 msgid "do not use libextractor to add keywords or metadata"
 msgstr ""
 
-#: src/fs/gnunet-auto-share.c:747 src/fs/gnunet-publish.c:917
+#: src/fs/gnunet-auto-share.c:749 src/fs/gnunet-publish.c:919
 msgid "specify the priority of the content"
 msgstr "Die Priorität des Inhalts angeben"
 
-#: src/fs/gnunet-auto-share.c:750 src/fs/gnunet-publish.c:924
+#: src/fs/gnunet-auto-share.c:752 src/fs/gnunet-publish.c:926
 msgid "set the desired replication LEVEL"
 msgstr ""
 
-#: src/fs/gnunet-auto-share.c:770
+#: src/fs/gnunet-auto-share.c:772
 msgid "Automatically publish files from a directory on GNUnet"
 msgstr ""
 
@@ -3633,7 +3487,7 @@
 msgid "You need to specify a URI argument.\n"
 msgstr "Sie müssen einen Empfänger angeben!\n"
 
-#: src/fs/gnunet-download.c:240 src/fs/gnunet-publish.c:712
+#: src/fs/gnunet-download.c:240 src/fs/gnunet-publish.c:714
 #, fuzzy, c-format
 msgid "Failed to parse URI: %s\n"
 msgstr "Datei `%s' hat URI: %s\n"
@@ -3646,7 +3500,7 @@
 msgid "Target filename must be specified.\n"
 msgstr ""
 
-#: src/fs/gnunet-download.c:268 src/fs/gnunet-publish.c:856
+#: src/fs/gnunet-download.c:268 src/fs/gnunet-publish.c:858
 #: src/fs/gnunet-search.c:250 src/fs/gnunet-unindex.c:140
 #, fuzzy, c-format
 msgid "Could not initialize `%s' subsystem.\n"
@@ -3751,94 +3605,94 @@
 msgid "Keywords for file `%s' (%s)\n"
 msgstr "Schlüsselwörter für Datei `%s':\n"
 
-#: src/fs/gnunet-publish.c:572
+#: src/fs/gnunet-publish.c:574
 #, fuzzy
 msgid "Could not publish\n"
 msgstr "`%s' konnte nicht aufgelöst werden: %s\n"
 
-#: src/fs/gnunet-publish.c:597
+#: src/fs/gnunet-publish.c:599
 #, fuzzy
 msgid "Could not start publishing.\n"
 msgstr "Anwendung `%s' konnte nicht initialisiert werden.\n"
 
-#: src/fs/gnunet-publish.c:631
+#: src/fs/gnunet-publish.c:633
 #, fuzzy, c-format
 msgid "Scanning directory `%s'.\n"
 msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
 
-#: src/fs/gnunet-publish.c:635
+#: src/fs/gnunet-publish.c:637
 #, fuzzy, c-format
 msgid "Scanning file `%s'.\n"
 msgstr "Collection `%s' begonnen.\n"
 
-#: src/fs/gnunet-publish.c:641
+#: src/fs/gnunet-publish.c:643
 #, c-format
 msgid "There was trouble processing file `%s', skipping it.\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:648
+#: src/fs/gnunet-publish.c:650
 #, fuzzy
 msgid "Preprocessing complete.\n"
 msgstr "GNUnet wurde erfolgreich heruntergefahren.\n"
 
-#: src/fs/gnunet-publish.c:653
+#: src/fs/gnunet-publish.c:655
 #, fuzzy, c-format
 msgid "Extracting meta data from file `%s' complete.\n"
 msgstr "Daten des Moduls `%s' werden aktualisiert\n"
 
-#: src/fs/gnunet-publish.c:660
+#: src/fs/gnunet-publish.c:662
 msgid "Meta data extraction has finished.\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:669
+#: src/fs/gnunet-publish.c:671
 #, fuzzy
 msgid "Internal error scanning directory.\n"
 msgstr "=\tFehler beim Lesen des Verzeichnisses.\n"
 
-#: src/fs/gnunet-publish.c:701
+#: src/fs/gnunet-publish.c:703
 #, fuzzy, c-format
 msgid "Selected pseudonym `%s' unknown\n"
 msgstr "Namespace `%s' hat das Rating %d.\n"
 
-#: src/fs/gnunet-publish.c:733
+#: src/fs/gnunet-publish.c:735
 #, fuzzy, c-format
 msgid "Failed to access `%s': %s\n"
 msgstr "Datei wurde als `%s' gespeichert.\n"
 
-#: src/fs/gnunet-publish.c:747
+#: src/fs/gnunet-publish.c:749
 msgid ""
 "Failed to start meta directory scanner.  Is gnunet-helper-publish-fs "
 "installed?\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:803
+#: src/fs/gnunet-publish.c:805
 #, c-format
 msgid "Cannot extract metadata from a URI!\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:810
+#: src/fs/gnunet-publish.c:812
 #, c-format
 msgid "You must specify one and only one filename for insertion.\n"
 msgstr "Sie dürfen nur eine Datei zum Deindizieren angeben.\n"
 
-#: src/fs/gnunet-publish.c:816
+#: src/fs/gnunet-publish.c:818
 #, fuzzy, c-format
 msgid "You must NOT specify an URI and a filename.\n"
 msgstr "Sie müssen einen Empfänger angeben!\n"
 
-#: src/fs/gnunet-publish.c:824 src/vpn/gnunet-vpn.c:209
+#: src/fs/gnunet-publish.c:826 src/vpn/gnunet-vpn.c:209
 #, fuzzy, c-format
 msgid "Option `%s' is required when using option `%s'.\n"
 msgstr "Option `%s' macht keinen Sinn ohne die Option `%s'.\n"
 
-#: src/fs/gnunet-publish.c:835 src/fs/gnunet-publish.c:843
-#: src/transport/gnunet-transport.c:1893 src/transport/gnunet-transport.c:1923
-#: src/transport/gnunet-transport.c:1953
+#: src/fs/gnunet-publish.c:837 src/fs/gnunet-publish.c:845
+#: src/transport/gnunet-transport.c:1891 src/transport/gnunet-transport.c:1921
+#: src/transport/gnunet-transport.c:1952
 #, c-format
 msgid "Option `%s' makes no sense without option `%s'.\n"
 msgstr "Option `%s' macht keinen Sinn ohne die Option `%s'.\n"
 
-#: src/fs/gnunet-publish.c:897
+#: src/fs/gnunet-publish.c:899
 msgid ""
 "print list of extracted keywords that would be used, but do not perform "
 "upload"
@@ -3846,7 +3700,7 @@
 "Liste der extrahierten Schlüsselworte, die verwendet werden würden, "
 "ausgeben, aber keinen Upload durchführen"
 
-#: src/fs/gnunet-publish.c:901
+#: src/fs/gnunet-publish.c:903
 msgid ""
 "add an additional keyword for the top-level file or directory (this option "
 "can be specified multiple times)"
@@ -3854,13 +3708,13 @@
 "Ein zusätzliches Schlüsselwort für die Datei oder das Verzeichnis auf der "
 "obersten Ebene hinzufügen (diese Option kann mehrmals angegeben werden)"
 
-#: src/fs/gnunet-publish.c:905
+#: src/fs/gnunet-publish.c:907
 msgid "set the meta-data for the given TYPE to the given VALUE"
 msgstr ""
 "Die Meta-Daten des angegebenen Typs TYPE auf den angegebenen Wert VALUE "
 "setzen"
 
-#: src/fs/gnunet-publish.c:908
+#: src/fs/gnunet-publish.c:910
 msgid ""
 "do not index, perform full insertion (stores entire file in encrypted form "
 "in GNUnet database)"
@@ -3868,7 +3722,7 @@
 "Nicht indizieren, sondern komplett einfügen (speichert die gesamte Datei in "
 "verschlüsselter Form in der GNUnet Datenbank)"
 
-#: src/fs/gnunet-publish.c:913
+#: src/fs/gnunet-publish.c:915
 msgid ""
 "specify ID of an updated version to be published in the future (for "
 "namespace insertions only)"
@@ -3876,32 +3730,32 @@
 "ID einer aktualisierten Version angeben, die in der Zukunft veröffentlich "
 "werden soll. (nur für das Einfügen in Namespaces)"
 
-#: src/fs/gnunet-publish.c:921
+#: src/fs/gnunet-publish.c:923
 msgid "publish the files under the pseudonym NAME (place file into namespace)"
 msgstr ""
 "Die Datei unter dem Pseudonym NAME veröffentlichen (platziert die Datei in "
 "einem Namespace)"
 
-#: src/fs/gnunet-publish.c:927
+#: src/fs/gnunet-publish.c:929
 msgid ""
 "only simulate the process but do not do any actual publishing (useful to "
 "compute URIs)"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:931
+#: src/fs/gnunet-publish.c:933
 msgid ""
 "set the ID of this version of the publication (for namespace insertions only)"
 msgstr ""
 "die ID dieser Version der Veröffentlichung setzen (nur für das Einfügen in "
 "Namespaces)"
 
-#: src/fs/gnunet-publish.c:935
+#: src/fs/gnunet-publish.c:937
 msgid ""
 "URI to be published (can be used instead of passing a file to add keywords "
 "to the file with the respective URI)"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:951
+#: src/fs/gnunet-publish.c:953
 msgid "Publish a file or directory on GNUnet"
 msgstr ""
 
@@ -3941,18 +3795,23 @@
 msgid "Search GNUnet for files that were published on GNUnet"
 msgstr ""
 
-#: src/fs/gnunet-service-fs.c:277
+#: src/fs/gnunet-service-fs.c:285
 msgid "# running average P2P latency (ms)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs.c:332 src/fs/gnunet-service-fs.c:540
+#: src/fs/gnunet-service-fs.c:344 src/fs/gnunet-service-fs.c:607
 #, fuzzy
 msgid "# Loopback routes suppressed"
 msgstr "# gap Routing erfolgreich (insgesamt)"
 
-#: src/fs/gnunet-service-fs.c:650 src/hostlist/gnunet-daemon-hostlist.c:303
-#: src/sensordashboard/gnunet-service-sensordashboard.c:854
-#: src/sensordashboard/gnunet-service-sensordashboard.c:862
+#: src/fs/gnunet-service-fs.c:731
+#, 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/sensordashboard/gnunet-service-sensordashboard.c:864
+#: src/sensordashboard/gnunet-service-sensordashboard.c:872
 #: src/topology/gnunet-daemon-topology.c:1287
 #: src/topology/gnunet-daemon-topology.c:1294
 #, fuzzy, c-format
@@ -3995,95 +3854,95 @@
 msgid "# cadet connections active"
 msgstr "# verbundener Knoten"
 
-#: src/fs/gnunet-service-fs_cp.c:698
+#: src/fs/gnunet-service-fs_cp.c:710
 #, fuzzy
 msgid "# migration stop messages received"
 msgstr "# verschlüsselter PING Nachrichten empfangen"
 
-#: src/fs/gnunet-service-fs_cp.c:702
+#: src/fs/gnunet-service-fs_cp.c:714
 #, c-format
 msgid "Migration of content to peer `%s' blocked for %s\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:737
+#: src/fs/gnunet-service-fs_cp.c:750
 #, fuzzy
 msgid "# replies transmitted to other peers"
 msgstr "# Bytes des Typs %d übertragen"
 
-#: src/fs/gnunet-service-fs_cp.c:743
+#: src/fs/gnunet-service-fs_cp.c:756
 msgid "# replies dropped"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:768 src/fs/gnunet-service-fs_cp.c:1317
+#: src/fs/gnunet-service-fs_cp.c:781 src/fs/gnunet-service-fs_cp.c:1337
 msgid "# P2P searches active"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:861
+#: src/fs/gnunet-service-fs_cp.c:878
 msgid "# artificial delays introduced (ms)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:914
+#: src/fs/gnunet-service-fs_cp.c:934
 #, fuzzy
 msgid "# replies dropped due to type mismatch"
 msgstr "# gap Anfragen verworfen: Kollision in RT"
 
-#: src/fs/gnunet-service-fs_cp.c:922
+#: src/fs/gnunet-service-fs_cp.c:942
 #, fuzzy
 msgid "# replies received for other peers"
 msgstr "# Bytes des Typs %d empfangen"
 
-#: src/fs/gnunet-service-fs_cp.c:936
+#: src/fs/gnunet-service-fs_cp.c:956
 msgid "# replies dropped due to insufficient cover traffic"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:974
+#: src/fs/gnunet-service-fs_cp.c:994
 msgid "# P2P searches destroyed due to ultimate reply"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1042
+#: src/fs/gnunet-service-fs_cp.c:1062
 #, fuzzy
 msgid "# requests done for free (low load)"
 msgstr "# gap Anfragen verworfen: Kollision in RT"
 
-#: src/fs/gnunet-service-fs_cp.c:1067
+#: src/fs/gnunet-service-fs_cp.c:1087
 msgid "# request dropped, priority insufficient"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1077
+#: src/fs/gnunet-service-fs_cp.c:1097
 #, fuzzy
 msgid "# requests done for a price (normal load)"
 msgstr "# gap Anfragen verworfen: Kollision in RT"
 
-#: src/fs/gnunet-service-fs_cp.c:1155
+#: src/fs/gnunet-service-fs_cp.c:1175
 msgid "# GET requests received (from other peers)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1189
+#: src/fs/gnunet-service-fs_cp.c:1209
 #, fuzzy
 msgid "# requests dropped due to initiator not being connected"
 msgstr "# gap Anfragen verworfen: Kollision in RT"
 
-#: src/fs/gnunet-service-fs_cp.c:1211
+#: src/fs/gnunet-service-fs_cp.c:1231
 #, fuzzy
 msgid "# requests dropped due to missing reverse route"
 msgstr "# gap Anfragen verworfen: Kollision in RT"
 
-#: src/fs/gnunet-service-fs_cp.c:1262
+#: src/fs/gnunet-service-fs_cp.c:1282
 #, fuzzy
 msgid "# requests dropped due TTL underflow"
 msgstr "# gap Anfragen verworfen: Kollision in RT"
 
-#: src/fs/gnunet-service-fs_cp.c:1286
+#: src/fs/gnunet-service-fs_cp.c:1306
 #, fuzzy
 msgid "# requests dropped due to higher-TTL request"
 msgstr "# gap Anfragen verworfen: Kollision in RT"
 
-#: src/fs/gnunet-service-fs_cp.c:1315
+#: src/fs/gnunet-service-fs_cp.c:1335
 #, fuzzy
 msgid "# P2P query messages received and processed"
 msgstr "# verschlüsselter PING Nachrichten empfangen"
 
-#: src/fs/gnunet-service-fs_cp.c:1691
+#: src/fs/gnunet-service-fs_cp.c:1754
 #, fuzzy
 msgid "# migration stop messages sent"
 msgstr "# verschlüsselter PING Nachrichten empfangen"
@@ -4135,22 +3994,22 @@
 msgid "Indexed file `%s' changed at offset %llu\n"
 msgstr "Indizierung der Daten schlug an Position %i fehl.\n"
 
-#: src/fs/gnunet-service-fs_lc.c:202 src/fs/gnunet-service-fs_lc.c:370
+#: src/fs/gnunet-service-fs_lc.c:201 src/fs/gnunet-service-fs_lc.c:371
 #, fuzzy
 msgid "# client searches active"
 msgstr "# gap Anfragen insgesamt empfangen"
 
-#: src/fs/gnunet-service-fs_lc.c:258
+#: src/fs/gnunet-service-fs_lc.c:259
 #, fuzzy
 msgid "# replies received for local clients"
 msgstr "# gap Anfragen insgesamt empfangen"
 
-#: src/fs/gnunet-service-fs_lc.c:329
+#: src/fs/gnunet-service-fs_lc.c:330
 #, fuzzy
 msgid "# client searches received"
 msgstr "# gap Anfragen insgesamt empfangen"
 
-#: src/fs/gnunet-service-fs_lc.c:364
+#: src/fs/gnunet-service-fs_lc.c:365
 msgid "# client searches updated (merged content seen list)"
 msgstr ""
 
@@ -4224,86 +4083,86 @@
 msgid "# results found locally"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1001
+#: src/fs/gnunet-service-fs_pr.c:1003
 msgid "# Datastore `PUT' failures"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1029
+#: src/fs/gnunet-service-fs_pr.c:1031
 #, fuzzy
 msgid "# storage requests dropped due to high load"
 msgstr "# gap Anfragen verworfen: Kollision in RT"
 
-#: src/fs/gnunet-service-fs_pr.c:1064
+#: src/fs/gnunet-service-fs_pr.c:1069
 #, fuzzy
 msgid "# Replies received from DHT"
 msgstr "# Bytes empfangen über HTTP"
 
-#: src/fs/gnunet-service-fs_pr.c:1192
+#: src/fs/gnunet-service-fs_pr.c:1200
 #, fuzzy
 msgid "# Replies received from CADET"
 msgstr "# Bytes empfangen über HTTP"
 
-#: src/fs/gnunet-service-fs_pr.c:1244
+#: src/fs/gnunet-service-fs_pr.c:1252
 #, c-format
 msgid "Datastore lookup already took %s!\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1264
+#: src/fs/gnunet-service-fs_pr.c:1272
 #, c-format
 msgid "On-demand lookup already took %s!\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1311
+#: src/fs/gnunet-service-fs_pr.c:1319
 msgid "# Datastore lookups concluded (no results)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1326
+#: src/fs/gnunet-service-fs_pr.c:1334
 msgid "# Datastore lookups concluded (seen all)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1335
+#: src/fs/gnunet-service-fs_pr.c:1343
 msgid "# Datastore lookups aborted (more than MAX_RESULTS)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1350
+#: src/fs/gnunet-service-fs_pr.c:1358
 msgid "# requested DBLOCK or IBLOCK not found"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1364
+#: src/fs/gnunet-service-fs_pr.c:1372
 msgid "# on-demand blocks matched requests"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1377
+#: src/fs/gnunet-service-fs_pr.c:1385
 msgid "# on-demand lookups performed successfully"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1382
+#: src/fs/gnunet-service-fs_pr.c:1390
 msgid "# on-demand lookups failed"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1409 src/fs/gnunet-service-fs_pr.c:1449
-#: src/fs/gnunet-service-fs_pr.c:1612
+#: src/fs/gnunet-service-fs_pr.c:1417 src/fs/gnunet-service-fs_pr.c:1457
+#: src/fs/gnunet-service-fs_pr.c:1620
 msgid "# Datastore lookups concluded (error queueing)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1467
+#: src/fs/gnunet-service-fs_pr.c:1475
 msgid "# Datastore lookups concluded (found last result)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1478
+#: src/fs/gnunet-service-fs_pr.c:1486
 msgid "# Datastore lookups concluded (load too high)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1588
+#: src/fs/gnunet-service-fs_pr.c:1596
 msgid "# Datastore lookups initiated"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1673
+#: src/fs/gnunet-service-fs_pr.c:1685
 #, fuzzy
 msgid "# GAP PUT messages received"
 msgstr "# verschlüsselter PONG Nachrichten empfangen"
 
-#: src/fs/gnunet-service-fs_push.c:631
+#: src/fs/gnunet-service-fs_push.c:672
 msgid "time required, content pushing disabled"
 msgstr ""
 
@@ -4348,7 +4207,7 @@
 msgid "Refusing `%s' request to HTTP server\n"
 msgstr "Fehler beim Senden einer `%s' Anfrage an den SMTP Server.\n"
 
-#: src/gns/gnunet-bcd.c:355 src/hostlist/gnunet-daemon-hostlist_server.c:696
+#: src/gns/gnunet-bcd.c:355 src/hostlist/gnunet-daemon-hostlist_server.c:759
 #, fuzzy, c-format
 msgid "Invalid port number %llu.  Exiting.\n"
 msgstr "Ungültige Parameter. Abbruch.\n"
@@ -4371,61 +4230,61 @@
 msgid "GNUnet HTTP server to create business cards"
 msgstr ""
 
-#: src/gns/gnunet-dns2gns.c:228
+#: src/gns/gnunet-dns2gns.c:234
 #, fuzzy
 msgid "Failed to pack DNS response into UDP packet!\n"
 msgstr "Fehler beim Senden einer `%s' Anfrage an den SMTP Server.\n"
 
-#: src/gns/gnunet-dns2gns.c:400
+#: src/gns/gnunet-dns2gns.c:406
 #, fuzzy, c-format
 msgid "Cannot parse DNS request from %s\n"
 msgstr "Fehler beim Senden einer `%s' Anfrage an den SMTP Server.\n"
 
-#: src/gns/gnunet-dns2gns.c:416
+#: src/gns/gnunet-dns2gns.c:422
 #, fuzzy, c-format
 msgid "Received malformed DNS request from %s\n"
 msgstr "GAP hat ungültige Inhalte von `%s' empfangen.\n"
 
-#: src/gns/gnunet-dns2gns.c:424
+#: src/gns/gnunet-dns2gns.c:430
 #, fuzzy, c-format
 msgid "Received unsupported DNS request from %s\n"
 msgstr "GAP hat ungültige Inhalte von `%s' empfangen.\n"
 
-#: src/gns/gnunet-dns2gns.c:701
+#: src/gns/gnunet-dns2gns.c:708
 msgid "No ego configured for `dns2gns` subsystem\n"
 msgstr ""
 
-#: src/gns/gnunet-dns2gns.c:727
+#: src/gns/gnunet-dns2gns.c:734
 #, fuzzy
 msgid "No DNS server specified!\n"
 msgstr "Keine Schlüsselwörter angegeben!\n"
 
-#: src/gns/gnunet-dns2gns.c:749
+#: src/gns/gnunet-dns2gns.c:756
 #, fuzzy
 msgid "No valid GNS zone specified!\n"
 msgstr "Keine Schlüsselwörter angegeben!\n"
 
-#: src/gns/gnunet-dns2gns.c:770
+#: src/gns/gnunet-dns2gns.c:777
 msgid "IP of recursive DNS resolver to use (required)"
 msgstr ""
 
-#: src/gns/gnunet-dns2gns.c:773
+#: src/gns/gnunet-dns2gns.c:780
 msgid "Authoritative FCFS suffix to use (optional); default: fcfs.zkey.eu"
 msgstr ""
 
-#: src/gns/gnunet-dns2gns.c:776
+#: src/gns/gnunet-dns2gns.c:783
 msgid "Authoritative DNS suffix to use (optional); default: zkey.eu"
 msgstr ""
 
-#: src/gns/gnunet-dns2gns.c:779
+#: src/gns/gnunet-dns2gns.c:786
 msgid "UDP port to listen on for inbound DNS requests; default: 53"
 msgstr ""
 
-#: src/gns/gnunet-dns2gns.c:782
+#: src/gns/gnunet-dns2gns.c:789
 msgid "Public key of the GNS zone to use (overrides default)"
 msgstr ""
 
-#: src/gns/gnunet-dns2gns.c:795
+#: src/gns/gnunet-dns2gns.c:802
 msgid "GNUnet DNS-to-GNS proxy (a DNS server)"
 msgstr ""
 
@@ -4886,25 +4745,25 @@
 "reason to run!\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist.c:323
+#: src/hostlist/gnunet-daemon-hostlist.c:331
 msgid "advertise our hostlist to other peers"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist.c:328
+#: src/hostlist/gnunet-daemon-hostlist.c:336
 msgid ""
 "bootstrap using hostlists (it is highly recommended that you always use this "
 "option)"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist.c:331
+#: src/hostlist/gnunet-daemon-hostlist.c:339
 msgid "enable learning about hostlist servers from other peers"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist.c:335
+#: src/hostlist/gnunet-daemon-hostlist.c:343
 msgid "provide a hostlist server"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist.c:350
+#: src/hostlist/gnunet-daemon-hostlist.c:359
 msgid "GNUnet hostlist server and client"
 msgstr ""
 
@@ -4930,7 +4789,7 @@
 msgstr "# Hellos per HTTP heruntergeladen"
 
 #: src/hostlist/gnunet-daemon-hostlist_client.c:650
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1401
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1402
 msgid "# advertised hostlist URIs"
 msgstr ""
 
@@ -4985,7 +4844,7 @@
 msgstr ""
 
 #: src/hostlist/gnunet-daemon-hostlist_client.c:1103
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1646
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1655
 msgid "# milliseconds between hostlist downloads"
 msgstr ""
 
@@ -5000,27 +4859,27 @@
 msgid "# active connections"
 msgstr "GNUnet Konfiguration"
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1347
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1348
 #, fuzzy, c-format
 msgid "Loading saved hostlist entries from file `%s' \n"
 msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1352
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1353
 #, fuzzy, c-format
 msgid "Hostlist file `%s' does not exist\n"
 msgstr "Sitzungsschlüssel von Knoten `%s' konnte nicht überprüft werden.\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1361
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1362
 #, fuzzy, c-format
 msgid "Could not open file `%s' for reading to load hostlists: %s\n"
 msgstr "Datei wurde als `%s' gespeichert.\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1395
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1396
 #, c-format
 msgid "%u hostlist URIs loaded from file\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1398
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1399
 msgid "# hostlist URIs read from file"
 msgstr ""
 
@@ -5029,158 +4888,152 @@
 msgid "Could not open file `%s' for writing to save hostlists: %s\n"
 msgstr "Datei wurde als `%s' gespeichert.\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1450
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1452
 #, fuzzy, c-format
 msgid "Writing %u hostlist URIs to `%s'\n"
 msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1474
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1491
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1476
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1493
 #, c-format
 msgid "Error writing hostlist URIs to file `%s'\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1486
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1488
 msgid "# hostlist URIs written to file"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1581
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1588
 #: src/transport/plugin_transport_http_client.c:2274
 #, c-format
 msgid "Invalid proxy type: `%s', disabling proxy! Check configuration!\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1611
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1617
 msgid "Learning is enabled on this peer\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1623
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1630
 msgid "Learning is not enabled on this peer\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1635
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1641
 #, c-format
 msgid ""
 "Since learning is not enabled on this peer, hostlist file `%s' was removed\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1639
-#, fuzzy, c-format
-msgid "Hostlist file `%s' could not be removed\n"
-msgstr "Sitzungsschlüssel von Knoten `%s' konnte nicht überprüft werden.\n"
-
-#: src/hostlist/gnunet-daemon-hostlist_server.c:165
+#: src/hostlist/gnunet-daemon-hostlist_server.c:181
 #, fuzzy
 msgid "bytes in hostlist"
 msgstr "# bytes in der Datenbank"
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:190
+#: src/hostlist/gnunet-daemon-hostlist_server.c:206
 msgid "expired addresses encountered"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:225
-#: src/hostlist/gnunet-daemon-hostlist_server.c:535
-#: src/peerinfo-tool/gnunet-peerinfo.c:367
-#: src/peerinfo-tool/gnunet-peerinfo.c:452
-#: src/peerinfo-tool/gnunet-peerinfo.c:535
+#: src/hostlist/gnunet-daemon-hostlist_server.c:241
+#: src/hostlist/gnunet-daemon-hostlist_server.c:590
+#: src/peerinfo-tool/gnunet-peerinfo.c:382
+#: src/peerinfo-tool/gnunet-peerinfo.c:531
 #: src/topology/gnunet-daemon-topology.c:952
 #, fuzzy, c-format
 msgid "Error in communication with PEERINFO service: %s\n"
 msgstr "Informationen über andere GNUnet Knoten ausgeben."
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:249
+#: src/hostlist/gnunet-daemon-hostlist_server.c:265
 msgid "HELLOs without addresses encountered (ignored)"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:265
+#: src/hostlist/gnunet-daemon-hostlist_server.c:282
 msgid "bytes not included in hostlist (size limit)"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:365
+#: src/hostlist/gnunet-daemon-hostlist_server.c:386
 #, fuzzy, c-format
 msgid "Refusing `%s' request to hostlist server\n"
 msgstr "Fehler beim Senden einer `%s' Anfrage an den SMTP Server.\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:368
+#: src/hostlist/gnunet-daemon-hostlist_server.c:389
 #, fuzzy
 msgid "hostlist requests refused (not HTTP GET)"
 msgstr "# Client Trace-Anfragen empfangen"
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:382
+#: src/hostlist/gnunet-daemon-hostlist_server.c:403
 #, c-format
 msgid "Refusing `%s' request with %llu bytes of upload data\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:386
+#: src/hostlist/gnunet-daemon-hostlist_server.c:407
 #, fuzzy
 msgid "hostlist requests refused (upload data)"
 msgstr "# Client Trace-Anfragen empfangen"
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:393
+#: src/hostlist/gnunet-daemon-hostlist_server.c:414
 msgid "Could not handle hostlist request since I do not have a response yet\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:396
+#: src/hostlist/gnunet-daemon-hostlist_server.c:417
 #, fuzzy
 msgid "hostlist requests refused (not ready)"
 msgstr "# Client Trace-Anfragen empfangen"
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:401
+#: src/hostlist/gnunet-daemon-hostlist_server.c:422
 msgid "Received request for our hostlist\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:403
+#: src/hostlist/gnunet-daemon-hostlist_server.c:424
 #, fuzzy
 msgid "hostlist requests processed"
 msgstr "# Client Trace-Anfragen empfangen"
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:449
+#: src/hostlist/gnunet-daemon-hostlist_server.c:485
 #, fuzzy
 msgid "# hostlist advertisements send"
 msgstr "# Bekanntmachungen von anderen übertragen"
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:497
+#: src/hostlist/gnunet-daemon-hostlist_server.c:535
 msgid "Advertisement message could not be queued by core\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:684
-#: src/peerinfo-tool/gnunet-peerinfo.c:696
+#: src/hostlist/gnunet-daemon-hostlist_server.c:747
+#: src/peerinfo-tool/gnunet-peerinfo.c:736
 #: src/transport/gnunet-service-transport.c:1127
 #, fuzzy
 msgid "Could not access PEERINFO service.  Exiting.\n"
 msgstr "Auf die Namespace Informationen konnte nicht zugegriffen werden.\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:708
+#: src/hostlist/gnunet-daemon-hostlist_server.c:771
 #, c-format
 msgid "Hostlist service starts on %s:%llu\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:723
+#: src/hostlist/gnunet-daemon-hostlist_server.c:786
 #, fuzzy, c-format
 msgid "Address to obtain hostlist: `%s'\n"
 msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:736
+#: src/hostlist/gnunet-daemon-hostlist_server.c:799
 #, fuzzy
 msgid "BINDTOIP does not a valid IPv4 address! Ignoring BINDTOIPV4.\n"
 msgstr "`%s' ist nicht verfügbar."
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:749
+#: src/hostlist/gnunet-daemon-hostlist_server.c:812
 #, fuzzy
 msgid "BINDTOIP does not a valid IPv4 address! Ignoring BINDTOIPV6.\n"
 msgstr "`%s' ist nicht verfügbar."
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:770
+#: src/hostlist/gnunet-daemon-hostlist_server.c:833
 #, fuzzy, c-format
 msgid "`%s' is not a valid IPv4 address! Ignoring BINDTOIPV4.\n"
 msgstr "`%s' ist nicht verfügbar."
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:790
+#: src/hostlist/gnunet-daemon-hostlist_server.c:853
 #, fuzzy, c-format
 msgid "`%s' is not a valid IPv6 address! Ignoring BINDTOIPV6.\n"
 msgstr "`%s' ist nicht verfügbar."
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:830
+#: src/hostlist/gnunet-daemon-hostlist_server.c:893
 #, fuzzy, c-format
 msgid "Could not start hostlist HTTP server on port %u\n"
 msgstr "Der Transportdienst auf Port %d konnte nicht gestartet werden.\n"
@@ -5418,7 +5271,7 @@
 msgstr ""
 
 #: src/namestore/gnunet-namestore.c:868
-#: src/peerinfo-tool/gnunet-peerinfo.c:792
+#: src/peerinfo-tool/gnunet-peerinfo.c:817
 #, fuzzy, c-format
 msgid "Invalid URI `%s'\n"
 msgstr "Ungültiger Parameter: `%s'\n"
@@ -5826,8 +5679,8 @@
 msgid "Measure quality and performance of the NSE service."
 msgstr "Auf den Dienst konnte nicht zugegriffen werden"
 
-#: src/nse/gnunet-service-nse.c:1517
-#: src/revocation/gnunet-service-revocation.c:798 src/util/gnunet-scrypt.c:248
+#: src/nse/gnunet-service-nse.c:1537
+#: src/revocation/gnunet-service-revocation.c:798 src/util/gnunet-scrypt.c:260
 msgid "Value is too large.\n"
 msgstr ""
 
@@ -5914,94 +5767,89 @@
 msgid "Could not connect to `%s' service.\n"
 msgstr "Verbindung zu gnunetd konnte nicht hergestellt werden.\n"
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:230
+#: src/peerinfo-tool/gnunet-peerinfo.c:245
 #, fuzzy, c-format
 msgid "%sPeer `%s'\n"
 msgstr "Ich bin Peer `%s'.\n"
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:237
+#: src/peerinfo-tool/gnunet-peerinfo.c:252
 #, c-format
 msgid "\tExpires: %s \t %s\n"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:286
+#: src/peerinfo-tool/gnunet-peerinfo.c:301
 #, fuzzy, c-format
 msgid "Failure: Cannot convert address to string for peer `%s'\n"
 msgstr "Fehler beim Binden an UDP Port %d.\n"
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:462
+#: src/peerinfo-tool/gnunet-peerinfo.c:463
 #, fuzzy, c-format
-msgid "Failure: Did not receive %s\n"
-msgstr "Datei wurde als `%s' gespeichert.\n"
-
-#: src/peerinfo-tool/gnunet-peerinfo.c:471
-#, fuzzy, c-format
 msgid "Failure: Received invalid %s\n"
 msgstr "ungültige `%s' Nachricht empfangen: %s.\n"
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:483
+#: src/peerinfo-tool/gnunet-peerinfo.c:477
 #, fuzzy, c-format
 msgid "Failed to write HELLO with %u bytes to file `%s'\n"
 msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:502
+#: src/peerinfo-tool/gnunet-peerinfo.c:496
 #, c-format
 msgid "Wrote %s HELLO containing %u addresses with %u bytes to file `%s'\n"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:570
+#: src/peerinfo-tool/gnunet-peerinfo.c:566
 #, fuzzy, c-format
 msgid "Failure adding HELLO: %s\n"
 msgstr "Fehler bei %s:%d.\n"
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:687
+#: src/peerinfo-tool/gnunet-peerinfo.c:695
 #, fuzzy, c-format
+msgid "Failed to get my own HELLO from this peer!\n"
+msgstr "Statistiken über den Netzwerkverkehr konnten nicht ermittelt werden.\n"
+
+#: src/peerinfo-tool/gnunet-peerinfo.c:727
+#, fuzzy, c-format
 msgid "Service `%s' is not running, please start GNUnet\n"
 msgstr "`%s' ist keine Datei.\n"
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:718 src/util/gnunet-scrypt.c:224
-#, fuzzy, c-format
-msgid "Loading hostkey from `%s' failed.\n"
-msgstr "Das Parsen des Hello von `%s' schlug fehl.\n"
-
-#: src/peerinfo-tool/gnunet-peerinfo.c:816
+#: src/peerinfo-tool/gnunet-peerinfo.c:841
 #, c-format
 msgid "I am peer `%s'.\n"
 msgstr "Ich bin Peer `%s'.\n"
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:865
+#: src/peerinfo-tool/gnunet-peerinfo.c:882
 msgid "don't resolve host names"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:868
+#: src/peerinfo-tool/gnunet-peerinfo.c:885
 msgid "output only the identity strings"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:871
+#: src/peerinfo-tool/gnunet-peerinfo.c:888
 msgid "include friend-only information"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:874
+#: src/peerinfo-tool/gnunet-peerinfo.c:891
 msgid "output our own identity only"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:877
+#: src/peerinfo-tool/gnunet-peerinfo.c:894
 msgid "list all known peers"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:880
+#: src/peerinfo-tool/gnunet-peerinfo.c:897
 msgid "dump hello to file"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:883
+#: src/peerinfo-tool/gnunet-peerinfo.c:900
 msgid "also output HELLO uri(s)"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:886
+#: src/peerinfo-tool/gnunet-peerinfo.c:903
 msgid "add given HELLO uri to the database"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:900
+#: src/peerinfo-tool/gnunet-peerinfo.c:917
 #, fuzzy
 msgid "Print information about peers."
 msgstr "Informationen über andere GNUnet Knoten ausgeben."
@@ -6028,72 +5876,76 @@
 msgid "peerstore"
 msgstr ""
 
-#: src/peerstore/gnunet-service-peerstore.c:343
+#: src/peerstore/gnunet-service-peerstore.c:384
 #, fuzzy
 msgid "Malformed iterate request.\n"
 msgstr "Fehler beim Speichern der Konfigurationsdatei `%s':"
 
-#: src/peerstore/gnunet-service-peerstore.c:350
+#: src/peerstore/gnunet-service-peerstore.c:391
 msgid "Sub system not supplied in client iterate request.\n"
 msgstr ""
 
-#: src/peerstore/gnunet-service-peerstore.c:399
+#: src/peerstore/gnunet-service-peerstore.c:451
 #, fuzzy
 msgid "Malformed store request from client\n"
 msgstr "Fehler beim Senden einer `%s' Anfrage an den SMTP Server.\n"
 
-#: src/peerstore/gnunet-service-peerstore.c:407
+#: src/peerstore/gnunet-service-peerstore.c:459
 msgid "Full key not supplied in client store request\n"
 msgstr ""
 
-#: src/peerstore/gnunet-service-peerstore.c:427
+#: src/peerstore/gnunet-service-peerstore.c:478
 #, fuzzy
-msgid "Failed to store requested value, sqlite database error."
+msgid "Failed to store requested value, database error."
 msgstr "Fehler beim Senden einer `%s' Anfrage an den SMTP Server.\n"
 
-#: src/peerstore/gnunet-service-peerstore.c:509
+#: src/peerstore/gnunet-service-peerstore.c:557
 msgid "No database backend configured\n"
 msgstr ""
 
-#: src/peerstore/gnunet-service-peerstore.c:520
+#: src/peerstore/gnunet-service-peerstore.c:568
 #, fuzzy, c-format
 msgid "Could not load database backend `%s'\n"
 msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
 
-#: src/peerstore/peerstore_api.c:299 src/sensor/sensor_api.c:179
+#: src/peerstore/peerstore_api.c:329 src/sensor/sensor_api.c:179
 #, c-format
 msgid "Received an error notification from MQ of type: %d\n"
 msgstr ""
 
-#: src/peerstore/peerstore_api.c:370
+#: src/peerstore/peerstore_api.c:375
+msgid "timeout"
+msgstr ""
+
+#: src/peerstore/peerstore_api.c:402
 msgid "Iteration canceled due to reconnection."
 msgstr ""
 
-#: src/peerstore/peerstore_api.c:635
+#: src/peerstore/peerstore_api.c:681
 #, fuzzy
 msgid "Unexpected iteration response, this should not happen.\n"
 msgstr "Ausgabeformat ist unbekannt, dies sollte nicht passieren.\n"
 
-#: src/peerstore/peerstore_api.c:646
+#: src/peerstore/peerstore_api.c:692
 #, fuzzy
 msgid "Error communicating with `PEERSTORE' service."
 msgstr "Informationen über andere GNUnet Knoten ausgeben."
 
-#: src/peerstore/peerstore_api.c:665
+#: src/peerstore/peerstore_api.c:711
 #, fuzzy
 msgid "Received a malformed response from service."
 msgstr "GAP hat ungültige Inhalte von `%s' empfangen.\n"
 
-#: src/peerstore/peerstore_api.c:804
+#: src/peerstore/peerstore_api.c:821
 msgid ""
 "Problem receiving a watch response, no way to determine which request.\n"
 msgstr ""
 
-#: src/peerstore/peerstore_api.c:815
+#: src/peerstore/peerstore_api.c:833
 msgid "Received a watch result for a non existing watch.\n"
 msgstr ""
 
-#: src/peerstore/plugin_peerstore_sqlite.c:377
+#: src/peerstore/plugin_peerstore_sqlite.c:398
 #: src/psycstore/plugin_psycstore_sqlite.c:286
 #, fuzzy, c-format
 msgid ""
@@ -6101,7 +5953,7 @@
 "  %s\n"
 msgstr "Fehler beim Anlegen des Benutzers"
 
-#: src/peerstore/plugin_peerstore_sqlite.c:401
+#: src/peerstore/plugin_peerstore_sqlite.c:422
 #: src/psycstore/plugin_psycstore_sqlite.c:263
 #, fuzzy, c-format
 msgid ""
@@ -6109,7 +5961,7 @@
 "  %s\n"
 msgstr "Fehler beim Anlegen des Benutzers"
 
-#: src/peerstore/plugin_peerstore_sqlite.c:483
+#: src/peerstore/plugin_peerstore_sqlite.c:504
 #, fuzzy, c-format
 msgid "Unable to create indices: %s.\n"
 msgstr "Namespace `%s' konnte nicht erstellt werden (existiert bereits?).\n"
@@ -6211,7 +6063,7 @@
 msgid "`%s' failed at %s:%d with error: %s (%d)\n"
 msgstr "`%s' schlug bei %s:%d mit dem Fehler %s fehl\n"
 
-#: src/psycstore/plugin_psycstore_sqlite.c:1933
+#: src/psycstore/plugin_psycstore_sqlite.c:1932
 #, fuzzy
 msgid "SQLite database running\n"
 msgstr "sqlite Datenspeicher"
@@ -6493,61 +6345,70 @@
 msgid "rps"
 msgstr ""
 
-#: src/scalarproduct/gnunet-scalarproduct.c:222
+#: src/scalarproduct/gnunet-scalarproduct.c:221
 #, fuzzy
 msgid "You must specify at least one message ID to check!\n"
 msgstr "Sie müssen eine Liste von Dateien zum Einfügen angeben.\n"
 
-#: src/scalarproduct/gnunet-scalarproduct.c:229
+#: src/scalarproduct/gnunet-scalarproduct.c:228
 msgid "This program needs a session identifier for comparing vectors.\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-scalarproduct.c:242
+#: src/scalarproduct/gnunet-scalarproduct.c:241
 #, c-format
 msgid ""
 "Tried to set initiator mode, as peer ID was given. However, `%s' is not a "
 "valid peer identifier.\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-scalarproduct.c:253
-msgid "Need elements to compute the vectorproduct, got none.\n"
+#: src/scalarproduct/gnunet-scalarproduct.c:259
+msgid "Need elements to compute the scalarproduct, got none.\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-scalarproduct.c:275
+#: src/scalarproduct/gnunet-scalarproduct.c:281
 #, fuzzy, c-format
 msgid "Malformed input, could not parse `%s'\n"
 msgstr "Der Transportdienst auf Port %d konnte nicht gestartet werden.\n"
 
-#: src/scalarproduct/gnunet-scalarproduct.c:294
+#: src/scalarproduct/gnunet-scalarproduct.c:299
 #, fuzzy, c-format
 msgid "Could not convert `%s' to int64_t.\n"
 msgstr "Verbindung zu gnunetd konnte nicht hergestellt werden.\n"
 
-#: src/scalarproduct/gnunet-scalarproduct.c:344
+#: src/scalarproduct/gnunet-scalarproduct.c:326
+#, c-format
+msgid "Failed to initiate computation, were all keys unique?\n"
+msgstr ""
+
+#: src/scalarproduct/gnunet-scalarproduct.c:350
 msgid ""
 "A comma separated list of elements to compare as vector with our remote peer."
 msgstr ""
 
-#: src/scalarproduct/gnunet-scalarproduct.c:347
+#: src/scalarproduct/gnunet-scalarproduct.c:353
 msgid ""
 "[Optional] peer to calculate our scalarproduct with. If this parameter is "
 "not given, the service will wait for a remote peer to compute the request."
 msgstr ""
 
-#: src/scalarproduct/gnunet-scalarproduct.c:350
+#: src/scalarproduct/gnunet-scalarproduct.c:356
 msgid "Transaction ID shared with peer."
 msgstr ""
 
-#: src/scalarproduct/gnunet-scalarproduct.c:359
+#: src/scalarproduct/gnunet-scalarproduct.c:365
 msgid "Calculate the Vectorproduct with a GNUnet peer."
 msgstr ""
 
-#: src/scalarproduct/gnunet-service-scalarproduct_alice.c:1418
-#: src/scalarproduct/gnunet-service-scalarproduct_bob.c:1529
+#: src/scalarproduct/gnunet-service-scalarproduct_alice.c:1419
+#: src/scalarproduct/gnunet-service-scalarproduct_bob.c:1564
 #, fuzzy
 msgid "Connect to CADET failed\n"
 msgstr " Verbindung fehlgeschlagen (Bug?)\n"
 
+#: src/scalarproduct/scalarproduct_api.c:296
+msgid "Keys given to SCALARPRODUCT not unique!\n"
+msgstr ""
+
 #: src/secretsharing/gnunet-secretsharing-profiler.c:613
 msgid "dkg start delay"
 msgstr ""
@@ -6587,54 +6448,54 @@
 msgid "sensor"
 msgstr ""
 
-#: src/sensor/gnunet-sensor-profiler.c:728
+#: src/sensor/gnunet-sensor-profiler.c:729
 msgid "Invalid or missing number of peers. Set at least 2 peers.\n"
 msgstr ""
 
-#: src/sensor/gnunet-sensor-profiler.c:735
+#: src/sensor/gnunet-sensor-profiler.c:736
 #, fuzzy
 msgid "Missing or invalid topology file.\n"
 msgstr "Ungültiger Parameter: `%s'\n"
 
-#: src/sensor/gnunet-sensor-profiler.c:781
+#: src/sensor/gnunet-sensor-profiler.c:782
 #, fuzzy
 msgid "Number of peers to run"
 msgstr "Anzahl an Durchläufen"
 
-#: src/sensor/gnunet-sensor-profiler.c:783
+#: src/sensor/gnunet-sensor-profiler.c:784
 msgid "Path to topology file"
 msgstr ""
 
-#: src/sensor/gnunet-sensor-profiler.c:786
+#: src/sensor/gnunet-sensor-profiler.c:787
 msgid "Change the interval of running sensors to given value"
 msgstr ""
 
-#: src/sensor/gnunet-sensor-profiler.c:789
+#: src/sensor/gnunet-sensor-profiler.c:790
 #, fuzzy
 msgid "Number of peers to simulate anomalies on"
 msgstr "Anzahl an Durchläufen"
 
-#: src/sensor/gnunet-sensor-profiler.c:796
+#: src/sensor/gnunet-sensor-profiler.c:797
 #, fuzzy
 msgid "Profiler for sensor service"
 msgstr "Fehler beim Anlegen des Benutzers"
 
-#: src/sensor/gnunet-service-sensor_analysis.c:202
+#: src/sensor/gnunet-service-sensor_analysis.c:204
 #, fuzzy
 msgid "Received an invalid sensor value."
 msgstr "Ungültige Anfrage `%s' empfangen (falsche Tabelle)\n"
 
-#: src/sensor/gnunet-service-sensor_analysis.c:293
+#: src/sensor/gnunet-service-sensor_analysis.c:295
 #, fuzzy
 msgid "Analysis model not defined in configuration.\n"
 msgstr "Knoten `%s' konnte nicht in der Routing Tabelle gefunden werden!\n"
 
-#: src/sensor/gnunet-service-sensor_analysis.c:302
+#: src/sensor/gnunet-service-sensor_analysis.c:304
 #, fuzzy, c-format
 msgid "Could not load analysis model `%s'.\n"
 msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
 
-#: src/sensor/gnunet-service-sensor_analysis.c:310
+#: src/sensor/gnunet-service-sensor_analysis.c:312
 #, fuzzy
 msgid "Could not connect to peerstore service.\n"
 msgstr "Verbindung zu gnunetd konnte nicht hergestellt werden.\n"
@@ -6677,33 +6538,33 @@
 msgid "Failed to create pow and signature block.\n"
 msgstr "Namespace `%s' konnte nicht erstellt werden (existiert bereits?).\n"
 
-#: src/sensor/gnunet-service-sensor_reporting.c:1044
+#: src/sensor/gnunet-service-sensor_reporting.c:1046
 #, c-format
 msgid "PEERSTORE error: %s.\n"
 msgstr ""
 
-#: src/sensor/gnunet-service-sensor_reporting.c:1149
-#: src/sensor/gnunet-service-sensor_reporting.c:1407
+#: src/sensor/gnunet-service-sensor_reporting.c:1151
+#: src/sensor/gnunet-service-sensor_reporting.c:1409
 #, fuzzy
 msgid "Failed to connect to CORE service.\n"
 msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
 
-#: src/sensor/gnunet-service-sensor_reporting.c:1156
+#: src/sensor/gnunet-service-sensor_reporting.c:1158
 msgid "Peer identity received from CORE init doesn't match ours.\n"
 msgstr ""
 
-#: src/sensor/gnunet-service-sensor_reporting.c:1396
+#: src/sensor/gnunet-service-sensor_reporting.c:1398
 #, fuzzy
 msgid "Failed to connect to peerstore service.\n"
 msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
 
-#: src/sensor/gnunet-service-sensor_reporting.c:1417
+#: src/sensor/gnunet-service-sensor_reporting.c:1419
 #: src/sensor/gnunet-service-sensor_update.c:781
 #, fuzzy
 msgid "Failed to connect to CADET service.\n"
 msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
 
-#: src/sensor/gnunet-service-sensor_reporting.c:1424
+#: src/sensor/gnunet-service-sensor_reporting.c:1426
 #, fuzzy
 msgid "Failed to load my private key.\n"
 msgstr "Fehler beim Starten der Collection.\n"
@@ -6814,30 +6675,30 @@
 "\n"
 "Fehler beim Uploaden der Datei: %s\n"
 
-#: src/set/gnunet-service-set.c:1529
+#: src/set/gnunet-service-set.c:1531
 #, fuzzy
 msgid "Could not connect to cadet service\n"
 msgstr "Verbindung zu gnunetd konnte nicht hergestellt werden.\n"
 
-#: src/set/gnunet-set-ibf-profiler.c:221
+#: src/set/gnunet-set-ibf-profiler.c:237
 #, fuzzy
 msgid "number of element in set A-B"
 msgstr "Anzahl an Durchläufen"
 
-#: src/set/gnunet-set-ibf-profiler.c:224
+#: src/set/gnunet-set-ibf-profiler.c:240
 #, fuzzy
 msgid "number of element in set B-A"
 msgstr "Anzahl an Durchläufen"
 
-#: src/set/gnunet-set-ibf-profiler.c:227
+#: src/set/gnunet-set-ibf-profiler.c:243
 msgid "number of common elements in A and B"
 msgstr ""
 
-#: src/set/gnunet-set-ibf-profiler.c:230
+#: src/set/gnunet-set-ibf-profiler.c:246
 msgid "hash num"
 msgstr ""
 
-#: src/set/gnunet-set-ibf-profiler.c:233
+#: src/set/gnunet-set-ibf-profiler.c:249
 msgid "ibf size"
 msgstr ""
 
@@ -6845,93 +6706,93 @@
 msgid "oeration to execute"
 msgstr ""
 
-#: src/statistics/gnunet-service-statistics.c:280
+#: src/statistics/gnunet-service-statistics.c:323
 #, fuzzy, c-format
 msgid "Loading %llu bytes of statistics from `%s'\n"
 msgstr "Dateien aus dem GNUnet herunterladen."
 
-#: src/statistics/gnunet-service-statistics.c:346
+#: src/statistics/gnunet-service-statistics.c:434
 #, fuzzy, c-format
 msgid "Wrote %llu bytes of statistics to `%s'\n"
 msgstr "Dateien aus dem GNUnet herunterladen."
 
-#: src/statistics/gnunet-statistics.c:140
+#: src/statistics/gnunet-statistics.c:145
 #, fuzzy
 msgid "Failed to obtain statistics.\n"
 msgstr "Statistiken über den Netzwerkverkehr konnten nicht ermittelt werden.\n"
 
-#: src/statistics/gnunet-statistics.c:142
+#: src/statistics/gnunet-statistics.c:148
 #, fuzzy, c-format
 msgid "Failed to obtain statistics from host `%s:%llu'\n"
 msgstr "Statistiken über den Netzwerkverkehr konnten nicht ermittelt werden.\n"
 
-#: src/statistics/gnunet-statistics.c:189
+#: src/statistics/gnunet-statistics.c:198
 msgid "Missing argument: subsystem \n"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:195
+#: src/statistics/gnunet-statistics.c:204
 msgid "Missing argument: name\n"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:226
+#: src/statistics/gnunet-statistics.c:235
 #, c-format
 msgid "No subsystem or name given\n"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:234
+#: src/statistics/gnunet-statistics.c:243
 #, fuzzy, c-format
 msgid "Failed to initialize watch routine\n"
 msgstr "SQLite Datenbank konnte nicht initialisiert werden.\n"
 
-#: src/statistics/gnunet-statistics.c:261
+#: src/statistics/gnunet-statistics.c:269
 #, fuzzy, c-format
 msgid "Trying to connect to remote host, but service `%s' is not running\n"
 msgstr "Verbindung zu gnunetd konnte nicht hergestellt werden.\n"
 
-#: src/statistics/gnunet-statistics.c:269
+#: src/statistics/gnunet-statistics.c:282
 #, fuzzy, c-format
 msgid "A port is required to connect to host `%s'\n"
 msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
 
-#: src/statistics/gnunet-statistics.c:276
+#: src/statistics/gnunet-statistics.c:290
 #, c-format
 msgid "A port has to be between 1 and 65535 to connect to host `%s'\n"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:308
+#: src/statistics/gnunet-statistics.c:323
 #, fuzzy, c-format
 msgid "Invalid argument `%s'\n"
 msgstr "Ungültiger Parameter: `%s'\n"
 
-#: src/statistics/gnunet-statistics.c:334
+#: src/statistics/gnunet-statistics.c:349
 msgid "limit output to statistics for the given NAME"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:337
+#: src/statistics/gnunet-statistics.c:352
 msgid "make the value being set persistent"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:340
+#: src/statistics/gnunet-statistics.c:355
 msgid "limit output to the given SUBSYSTEM"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:343
+#: src/statistics/gnunet-statistics.c:358
 msgid "just print the statistics value"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:346
+#: src/statistics/gnunet-statistics.c:361
 msgid "watch value continuously"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:349
+#: src/statistics/gnunet-statistics.c:364
 msgid "connect to remote host"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:352
+#: src/statistics/gnunet-statistics.c:367
 msgid "port for remote host"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:364
+#: src/statistics/gnunet-statistics.c:379
 msgid "Print statistics about GNUnet operations."
 msgstr "Statistiken der GNUnet Aktivitäten ausgeben."
 
@@ -6948,54 +6809,55 @@
 "might have been lost!\n"
 msgstr ""
 
-#: src/testbed/generate-underlay-topology.c:223
-msgid "Need atleast 2 arguments\n"
-msgstr ""
+#: src/testbed/generate-underlay-topology.c:225
+#, fuzzy
+msgid "Need at least 2 arguments\n"
+msgstr "Sie müssen einen Empfänger angeben!\n"
 
-#: src/testbed/generate-underlay-topology.c:228
+#: src/testbed/generate-underlay-topology.c:230
 msgid "Database filename missing\n"
 msgstr ""
 
-#: src/testbed/generate-underlay-topology.c:235
+#: src/testbed/generate-underlay-topology.c:237
 msgid "Topology string missing\n"
 msgstr ""
 
-#: src/testbed/generate-underlay-topology.c:240
+#: src/testbed/generate-underlay-topology.c:242
 #, fuzzy, c-format
 msgid "Invalid topology: %s\n"
 msgstr "Ungültiger Parameter: `%s'\n"
 
-#: src/testbed/generate-underlay-topology.c:253
+#: src/testbed/generate-underlay-topology.c:255
 #, c-format
 msgid "An argument is missing for given topology `%s'\n"
 msgstr ""
 
-#: src/testbed/generate-underlay-topology.c:259
+#: src/testbed/generate-underlay-topology.c:261
 #, fuzzy, c-format
 msgid "Invalid argument `%s' given as topology argument\n"
 msgstr "Ungültiger Parameter: `%s'\n"
 
-#: src/testbed/generate-underlay-topology.c:267
+#: src/testbed/generate-underlay-topology.c:269
 #, c-format
 msgid "Filename argument missing for topology `%s'\n"
 msgstr ""
 
-#: src/testbed/generate-underlay-topology.c:281
+#: src/testbed/generate-underlay-topology.c:283
 #, c-format
 msgid "Second argument for topology `%s' is missing\n"
 msgstr ""
 
-#: src/testbed/generate-underlay-topology.c:287
+#: src/testbed/generate-underlay-topology.c:289
 #, fuzzy, c-format
 msgid "Invalid argument `%s'; expecting unsigned int\n"
 msgstr "Ungültiger Parameter für `%s' bei %s:%d.\n"
 
-#: src/testbed/generate-underlay-topology.c:336
+#: src/testbed/generate-underlay-topology.c:338
 #: src/testbed/gnunet-testbed-profiler.c:293
 msgid "create COUNT number of peers"
 msgstr ""
 
-#: src/testbed/generate-underlay-topology.c:345
+#: src/testbed/generate-underlay-topology.c:347
 msgid ""
 "Generates SQLite3 database representing a given underlay topology.\n"
 "Usage: gnunet-underlay-topology [OPTIONS] db-filename TOPO [TOPOOPTS]\n"
@@ -7386,21 +7248,26 @@
 msgid "GNUnet topology control (maintaining P2P cadet and F2F constraints)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_blacklist.c:271
+#: src/transport/gnunet-service-transport_blacklist.c:274
 #, 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:279
+#: src/transport/gnunet-service-transport_blacklist.c:283
 #, c-format
 msgid "Adding blacklisting entry for peer `%s':`%s'\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_blacklist.c:465
-#: src/transport/gnunet-service-transport_blacklist.c:748
+#: src/transport/gnunet-service-transport_blacklist.c:476
+#: src/transport/gnunet-service-transport_blacklist.c:766
 msgid "# disconnects due to blacklist"
 msgstr ""
 
+#: src/transport/gnunet-service-transport_blacklist.c:769
+#, 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:220
 #, fuzzy
 msgid "# bytes payload discarded due to not connected peer"
@@ -7435,260 +7302,235 @@
 msgid "Transport service is lacking key configuration settings. Exiting.\n"
 msgstr "GNUnet Konfiguration"
 
-#: src/transport/gnunet-service-transport_clients.c:463
-#, c-format
-msgid "Dropping message of type %u and size %u, have %u/%u messages pending\n"
-msgstr ""
-
-#: src/transport/gnunet-service-transport_clients.c:470
+#: src/transport/gnunet-service-transport_clients.c:481
 #, fuzzy
 msgid "# messages dropped due to slow client"
 msgstr "# gap Anfragen verworfen: Kollision in RT"
 
-#: src/transport/gnunet-service-transport_clients.c:630
-#, c-format
-msgid "Rejecting control connection from peer `%s', which is not me!\n"
-msgstr ""
-
-#: src/transport/gnunet-service-transport_clients.c:771
+#: src/transport/gnunet-service-transport_clients.c:774
 msgid "# bytes payload dropped (other peer was not connected)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_clients.c:804
+#: 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:810
-#, fuzzy, c-format
-msgid "Blacklist allows connection attempt to peer `%s'\n"
-msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
-
-#: src/transport/gnunet-service-transport_clients.c:836
+#: src/transport/gnunet-service-transport_clients.c:843
 #, fuzzy
 msgid "# REQUEST CONNECT messages received"
 msgstr "# verschlüsselter PONG Nachrichten empfangen"
 
-#: src/transport/gnunet-service-transport_clients.c:850
-#, fuzzy, c-format
-msgid "Received a request connect message for peer `%s'\n"
-msgstr "GAP hat ungültige Inhalte von `%s' empfangen.\n"
-
-#: src/transport/gnunet-service-transport_clients.c:861
+#: src/transport/gnunet-service-transport_clients.c:882
 #, fuzzy
 msgid "# REQUEST DISCONNECT messages received"
 msgstr "# verschlüsselter PONG Nachrichten empfangen"
 
-#: src/transport/gnunet-service-transport_clients.c:875
-#, fuzzy, c-format
-msgid "Received a request disconnect message for peer `%s'\n"
-msgstr "GAP hat ungültige Inhalte von `%s' empfangen.\n"
-
 #: src/transport/gnunet-service-transport_hello.c:182
 msgid "# refreshed my HELLO"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1095
+#: src/transport/gnunet-service-transport_neighbours.c:1099
 #, fuzzy
 msgid "# DISCONNECT messages sent"
 msgstr "# verschlüsselter PONG Nachrichten empfangen"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1220
-#: src/transport/gnunet-service-transport_neighbours.c:1635
+#: src/transport/gnunet-service-transport_neighbours.c:1224
+#: src/transport/gnunet-service-transport_neighbours.c:1639
 #, fuzzy
 msgid "# bytes in message queue for other peers"
 msgstr "# Bytes ausgehender Nachrichten verworfen"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1225
+#: src/transport/gnunet-service-transport_neighbours.c:1229
 #, fuzzy
 msgid "# messages transmitted to other peers"
 msgstr "# Bytes des Typs %d übertragen"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1230
+#: src/transport/gnunet-service-transport_neighbours.c:1234
 #, fuzzy
 msgid "# transmission failures for messages to other peers"
 msgstr "# Bytes ausgehender Nachrichten verworfen"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1288
+#: src/transport/gnunet-service-transport_neighbours.c:1292
 msgid "# messages timed out while in transport queue"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1349
+#: src/transport/gnunet-service-transport_neighbours.c:1353
 #, fuzzy
 msgid "# keepalives sent"
 msgstr "# p2p Trace-Antworten gesendet"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1382
+#: src/transport/gnunet-service-transport_neighbours.c:1386
 #, fuzzy
 msgid "# KEEPALIVE messages discarded (peer unknown)"
 msgstr "# defragmentierter Nachrichten"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1390
+#: src/transport/gnunet-service-transport_neighbours.c:1394
 #, fuzzy
 msgid "# KEEPALIVE messages discarded (no session)"
 msgstr "# defragmentierter Nachrichten"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1437
+#: src/transport/gnunet-service-transport_neighbours.c:1441
 #, fuzzy
 msgid "# KEEPALIVE_RESPONSE messages discarded (not connected)"
 msgstr "# defragmentierter Nachrichten"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1446
+#: src/transport/gnunet-service-transport_neighbours.c:1450
 #, fuzzy
 msgid "# KEEPALIVE_RESPONSE messages discarded (not expected)"
 msgstr "# defragmentierter Nachrichten"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1454
+#: src/transport/gnunet-service-transport_neighbours.c:1458
 #, fuzzy
 msgid "# KEEPALIVE_RESPONSE messages discarded (address changed)"
 msgstr "# defragmentierter Nachrichten"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1462
+#: src/transport/gnunet-service-transport_neighbours.c:1466
 #, fuzzy
 msgid "# KEEPALIVE_RESPONSE messages discarded (wrong nonce)"
 msgstr "# defragmentierter Nachrichten"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1540
+#: src/transport/gnunet-service-transport_neighbours.c:1544
 #, fuzzy
 msgid "# messages discarded due to lack of neighbour record"
 msgstr "# defragmentierter Nachrichten"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1574
+#: src/transport/gnunet-service-transport_neighbours.c:1578
 #, fuzzy
 msgid "# bandwidth quota violations by other peers"
 msgstr "Verfolgt die Bandbreitennutzung von gnunetd"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1590
+#: src/transport/gnunet-service-transport_neighbours.c:1594
 msgid "# ms throttling suggested"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1685
+#: src/transport/gnunet-service-transport_neighbours.c:1689
 #, 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"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1712
+#: src/transport/gnunet-service-transport_neighbours.c:1716
 #, 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:1757
+#: src/transport/gnunet-service-transport_neighbours.c:1761
 #, fuzzy
 msgid "# SYN messages sent"
 msgstr "# verschlüsselter PONG Nachrichten empfangen"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1773
+#: src/transport/gnunet-service-transport_neighbours.c:1777
 #, fuzzy, c-format
 msgid "Failed to transmit SYN message via plugin to %s\n"
 msgstr "`%s' Dienst konnte nicht initialisiert werden.\n"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1800
+#: src/transport/gnunet-service-transport_neighbours.c:1804
 #, 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:1849
+#: src/transport/gnunet-service-transport_neighbours.c:1853
 #, fuzzy, c-format
 msgid ""
 "Failed to send SYN_ACK message to peer `%s' using address `%s' session %p\n"
 msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1904
+#: src/transport/gnunet-service-transport_neighbours.c:1908
 #, fuzzy
 msgid "# SYN_ACK messages sent"
 msgstr "# verschlüsselter PONG Nachrichten empfangen"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1919
+#: src/transport/gnunet-service-transport_neighbours.c:1923
 #, fuzzy, c-format
 msgid "Failed to transmit SYN_ACK message via plugin to %s\n"
 msgstr "`%s' Dienst konnte nicht initialisiert werden.\n"
 
-#: src/transport/gnunet-service-transport_neighbours.c:2199
+#: src/transport/gnunet-service-transport_neighbours.c:2203
 #, 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:2324
+#: src/transport/gnunet-service-transport_neighbours.c:2328
 #, fuzzy
 msgid "# SYN messages received"
 msgstr "# PING Nachrichten erstellt"
 
-#: src/transport/gnunet-service-transport_neighbours.c:2329
+#: src/transport/gnunet-service-transport_neighbours.c:2333
 #, c-format
 msgid "SYN request from peer `%s' ignored due impending shutdown\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:2626
+#: src/transport/gnunet-service-transport_neighbours.c:2630
 msgid "# Attempts to switch addresses"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3047
+#: src/transport/gnunet-service-transport_neighbours.c:3051
 #, 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:3142
+#: src/transport/gnunet-service-transport_neighbours.c:3146
 #, fuzzy
 msgid "# SYN_ACK messages received"
 msgstr "# verschlüsselter PONG Nachrichten empfangen"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3150
+#: src/transport/gnunet-service-transport_neighbours.c:3154
 #, fuzzy
 msgid "# unexpected SYN_ACK messages (no peer)"
 msgstr "COUNT Nachrichten versenden"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3164
-#: src/transport/gnunet-service-transport_neighbours.c:3199
+#: src/transport/gnunet-service-transport_neighbours.c:3168
+#: src/transport/gnunet-service-transport_neighbours.c:3203
 #, fuzzy
 msgid "# unexpected SYN_ACK messages (not ready)"
 msgstr "COUNT Nachrichten versenden"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3211
+#: src/transport/gnunet-service-transport_neighbours.c:3215
 #, fuzzy
 msgid "# unexpected SYN_ACK messages (waiting on ATS)"
 msgstr "COUNT Nachrichten versenden"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3234
+#: src/transport/gnunet-service-transport_neighbours.c:3238
 msgid "# Successful attempts to switch addresses"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3242
+#: src/transport/gnunet-service-transport_neighbours.c:3246
 #, fuzzy
 msgid "# unexpected SYN_ACK messages (disconnecting)"
 msgstr "COUNT Nachrichten versenden"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3441
+#: src/transport/gnunet-service-transport_neighbours.c:3445
 #, fuzzy
 msgid "# ACK messages received"
 msgstr "# verschlüsselter PONG Nachrichten empfangen"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3477
+#: src/transport/gnunet-service-transport_neighbours.c:3481
 #, fuzzy
 msgid "# unexpected ACK messages"
 msgstr "# verschlüsselter PONG Nachrichten gesendet"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3551
+#: src/transport/gnunet-service-transport_neighbours.c:3555
 msgid "# SET QUOTA messages ignored (no such peer)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3566
+#: src/transport/gnunet-service-transport_neighbours.c:3570
 msgid "# disconnects due to quota of 0"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3611
+#: src/transport/gnunet-service-transport_neighbours.c:3615
 msgid "# disconnect messages ignored (malformed)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3617
+#: src/transport/gnunet-service-transport_neighbours.c:3621
 #, fuzzy
 msgid "# DISCONNECT messages received"
 msgstr "# verschlüsselter PONG Nachrichten empfangen"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3626
+#: src/transport/gnunet-service-transport_neighbours.c:3630
 msgid "# disconnect messages ignored (timestamp)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3753
+#: src/transport/gnunet-service-transport_neighbours.c:3757
 #, fuzzy
 msgid "# disconnected from peer upon explicit request"
 msgstr "# gap Anfragen verworfen: Kollision in RT"
@@ -7803,69 +7645,69 @@
 msgid "Adding `%s' without addresses for peer `%s'\n"
 msgstr "Adresse des Knotens `%s' konnte nicht ermittelt werden.\n"
 
-#: src/transport/gnunet-transport.c:573
+#: src/transport/gnunet-transport.c:578
 #, 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:582
+#: src/transport/gnunet-transport.c:587
 #: 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:614
+#: src/transport/gnunet-transport.c:619
 #, 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:629
+#: src/transport/gnunet-transport.c:634
 #, 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:641
+#: src/transport/gnunet-transport.c:646
 #, fuzzy
 msgid "Failed to list connections, timeout occured\n"
 msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden."
 
-#: src/transport/gnunet-transport.c:668 src/transport/gnunet-transport.c:698
+#: src/transport/gnunet-transport.c:673 src/transport/gnunet-transport.c:703
 #, 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:673
+#: src/transport/gnunet-transport.c:678
 #, 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:678
+#: src/transport/gnunet-transport.c:683
 #, 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:683
+#: src/transport/gnunet-transport.c:688
 #, 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:688
+#: src/transport/gnunet-transport.c:693
 #, c-format
 msgid "Timeout while waiting for result of NAT test for plugin `%s'\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:704
+#: src/transport/gnunet-transport.c:709
 #, fuzzy, c-format
 msgid "Configuration for plugin `%s' is working!\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:823
+#: src/transport/gnunet-transport.c:828
 #, fuzzy, c-format
 msgid ""
 "Peer `%s' %s %s\n"
@@ -7874,91 +7716,91 @@
 "\t%s%s\n"
 msgstr "Ich bin Peer `%s'.\n"
 
-#: src/transport/gnunet-transport.c:859
+#: src/transport/gnunet-transport.c:864
 #, fuzzy, c-format
 msgid "Peer `%s' %s `%s' \n"
 msgstr "Ich bin Peer `%s'.\n"
 
-#: src/transport/gnunet-transport.c:958 src/transport/gnunet-transport.c:1707
+#: src/transport/gnunet-transport.c:963 src/transport/gnunet-transport.c:1712
 #, 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:1026
+#: src/transport/gnunet-transport.c:1031
 msgid "No transport plugins configured, peer will never communicate\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1040
+#: src/transport/gnunet-transport.c:1045
 #, c-format
 msgid "No port configured for plugin `%s', cannot test it\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1065
+#: src/transport/gnunet-transport.c:1070
 #, fuzzy
 msgid "Failed to start resolver!\n"
 msgstr "Fehler beim Starten der Collection.\n"
 
-#: src/transport/gnunet-transport.c:1111
+#: src/transport/gnunet-transport.c:1116
 #, 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:1134
+#: src/transport/gnunet-transport.c:1139
 #: 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:1158
+#: src/transport/gnunet-transport.c:1163
 #, c-format
 msgid ""
 "Successfully connected to `%s', starting to send benchmark data in %u Kb "
 "blocks\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1191
+#: src/transport/gnunet-transport.c:1196
 #, fuzzy, c-format
 msgid "Successfully disconnected from `%s'\n"
 msgstr "Zugriff verweigert für `%s' bei %s:%d.\n"
 
-#: src/transport/gnunet-transport.c:1214
+#: src/transport/gnunet-transport.c:1219
 #: 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:1239 src/transport/gnunet-transport.c:1265
+#: src/transport/gnunet-transport.c:1244 src/transport/gnunet-transport.c:1270
 #, c-format
 msgid "%24s: %-17s %4s   (%u connections in total)\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1241
+#: src/transport/gnunet-transport.c:1246
 #, fuzzy
 msgid "Connected to"
 msgstr "`%s' hat sich mit `%s' verbunden.\n"
 
-#: src/transport/gnunet-transport.c:1267
+#: src/transport/gnunet-transport.c:1272
 #, fuzzy
 msgid "Disconnected from"
 msgstr "`%s' hat sich mit `%s' verbunden.\n"
 
-#: src/transport/gnunet-transport.c:1291
+#: src/transport/gnunet-transport.c:1296
 #: 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:1323
+#: src/transport/gnunet-transport.c:1328
 #, c-format
 msgid "Peer `%s': %s %s in state `%s' until %s\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1335
+#: src/transport/gnunet-transport.c:1340
 #, fuzzy, c-format
 msgid "Peer `%s': %s %s\n"
 msgstr "Ich bin Peer `%s'.\n"
 
-#: src/transport/gnunet-transport.c:1792
+#: src/transport/gnunet-transport.c:1794
 #: src/transport/gnunet-transport-profiler.c:492
 #, fuzzy
 msgid "Failed to send connect request to transport service\n"
@@ -7969,100 +7811,100 @@
 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:1875
+#: src/transport/gnunet-transport.c:1873
 #, 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:1883
+#: src/transport/gnunet-transport.c:1881
 #, c-format
 msgid ""
 "No operation given. Please choose one operation: %s, %s, %s, %s, %s, %s, %s\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1902 src/transport/gnunet-transport.c:1932
-#: src/transport/gnunet-transport.c:1964 src/transport/gnunet-transport.c:1990
-#: src/transport/gnunet-transport.c:2046
+#: src/transport/gnunet-transport.c:1900 src/transport/gnunet-transport.c:1930
+#: src/transport/gnunet-transport.c:1963 src/transport/gnunet-transport.c:1989
+#: src/transport/gnunet-transport.c:2045
 #: 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:1911 src/transport/gnunet-transport.c:1941
-#: src/transport/gnunet-transport.c:1975
+#: src/transport/gnunet-transport.c:1909 src/transport/gnunet-transport.c:1940
+#: src/transport/gnunet-transport.c:1974
 #, 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:1995
+#: src/transport/gnunet-transport.c:1994
 msgid "Starting to receive benchmark data\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:2094
+#: src/transport/gnunet-transport.c:2093
 #, fuzzy
 msgid "print information for all peers (instead of only connected peers)"
 msgstr "Informationen über andere GNUnet Knoten ausgeben."
 
-#: src/transport/gnunet-transport.c:2097
+#: src/transport/gnunet-transport.c:2096
 msgid "measure how fast we are receiving data from all peers (until CTRL-C)"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:2100
+#: src/transport/gnunet-transport.c:2099
 #, fuzzy
 msgid "connect to a peer"
 msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
 
-#: src/transport/gnunet-transport.c:2103
+#: src/transport/gnunet-transport.c:2102
 #, fuzzy
 msgid "disconnect to a peer"
 msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
 
-#: src/transport/gnunet-transport.c:2106
+#: src/transport/gnunet-transport.c:2105
 #, fuzzy
 msgid "print information for all pending validations "
 msgstr "Informationen über andere GNUnet Knoten ausgeben."
 
-#: src/transport/gnunet-transport.c:2109
+#: src/transport/gnunet-transport.c:2108
 #, fuzzy
 msgid "print information for all pending validations continuously"
 msgstr "Informationen über andere GNUnet Knoten ausgeben."
 
-#: src/transport/gnunet-transport.c:2112
+#: src/transport/gnunet-transport.c:2111
 #, fuzzy
 msgid "provide information about all current connections (once)"
 msgstr "Informationen über andere GNUnet Knoten ausgeben."
 
-#: src/transport/gnunet-transport.c:2118
+#: src/transport/gnunet-transport.c:2117
 #, fuzzy
 msgid ""
 "provide information about all connects and disconnect events (continuously)"
 msgstr "Informationen über andere GNUnet Knoten ausgeben."
 
-#: src/transport/gnunet-transport.c:2121
+#: src/transport/gnunet-transport.c:2120
 #, fuzzy
 msgid "do not resolve hostnames"
 msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
 
-#: src/transport/gnunet-transport.c:2124
+#: src/transport/gnunet-transport.c:2123
 #: src/transport/gnunet-transport-profiler.c:638
 msgid "peer identity"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:2127
+#: src/transport/gnunet-transport.c:2126
 msgid "monitor plugin sessions"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:2130
+#: src/transport/gnunet-transport.c:2129
 msgid "send data for benchmarking to the other peer (until CTRL-C)"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:2133
+#: src/transport/gnunet-transport.c:2132
 msgid "test transport configuration (involves external server)"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:2144
+#: src/transport/gnunet-transport.c:2143
 #: src/transport/gnunet-transport-profiler.c:649
 #, fuzzy
 msgid "Direct access to transport service."
@@ -8163,8 +8005,8 @@
 msgstr "Nachrichtengröße"
 
 #: src/transport/plugin_transport_http_client.c:1491
-#: src/transport/plugin_transport_http_server.c:2271
-#: src/transport/plugin_transport_http_server.c:3436
+#: src/transport/plugin_transport_http_server.c:2274
+#: src/transport/plugin_transport_http_server.c:3441
 #: src/transport/plugin_transport_tcp.c:2826
 #: src/transport/plugin_transport_tcp.c:2833
 msgid "TCP_STEALTH not supported on this platform.\n"
@@ -8176,13 +8018,13 @@
 msgstr ""
 
 #: src/transport/plugin_transport_http_client.c:2164
-#: src/transport/plugin_transport_http_server.c:3170
+#: src/transport/plugin_transport_http_server.c:3175
 #, fuzzy, c-format
 msgid "Shutting down plugin `%s'\n"
 msgstr "Teste Transport(e) %s\n"
 
 #: src/transport/plugin_transport_http_client.c:2181
-#: src/transport/plugin_transport_http_server.c:3240
+#: src/transport/plugin_transport_http_server.c:3245
 #, fuzzy, c-format
 msgid "Shutdown for plugin `%s' complete\n"
 msgstr ""
@@ -8223,99 +8065,99 @@
 msgid "No usable TLS certificate found and creating one at `%s/%s' failed!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:2297
+#: src/transport/plugin_transport_http_server.c:2300
 msgid "Could not load or create server certificate! Loading plugin failed!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:2604
+#: src/transport/plugin_transport_http_server.c:2609
 #, 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:2638 src/util/service.c:700
+#: src/transport/plugin_transport_http_server.c:2643 src/util/service.c:703
 #, fuzzy, c-format
 msgid "Failed to resolve `%s': %s\n"
 msgstr "Datei wurde als `%s' gespeichert.\n"
 
-#: src/transport/plugin_transport_http_server.c:2656 src/util/service.c:719
+#: src/transport/plugin_transport_http_server.c:2661 src/util/service.c:722
 #, 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:2769
+#: src/transport/plugin_transport_http_server.c:2774
 #, c-format
 msgid "Found %u addresses to report to NAT service\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:2847
+#: src/transport/plugin_transport_http_server.c:2852
 msgid "Disabling IPv6 since it is not supported on this system!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:2946
+#: src/transport/plugin_transport_http_server.c:2951
 #, c-format
 msgid "IPv4 support is %s\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:2961
+#: src/transport/plugin_transport_http_server.c:2966
 #, c-format
 msgid "IPv6 support is %s\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:2967
+#: src/transport/plugin_transport_http_server.c:2972
 #, 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:2978
+#: src/transport/plugin_transport_http_server.c:2983
 #, fuzzy
 msgid "Port is required! Fix in configuration\n"
 msgstr " gconfig\tGTK Konfiguration\n"
 
-#: src/transport/plugin_transport_http_server.c:2984
+#: src/transport/plugin_transport_http_server.c:2989
 #, fuzzy, c-format
 msgid "Using port %u\n"
 msgstr "Teste Transport(e) %s\n"
 
-#: src/transport/plugin_transport_http_server.c:2998
+#: src/transport/plugin_transport_http_server.c:3003
 #, 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:3008
+#: src/transport/plugin_transport_http_server.c:3013
 #, fuzzy, c-format
 msgid "Binding to IPv4 address %s\n"
 msgstr "Ungültiger Parameter: `%s'\n"
 
-#: src/transport/plugin_transport_http_server.c:3030
+#: src/transport/plugin_transport_http_server.c:3035
 #, 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:3040
+#: src/transport/plugin_transport_http_server.c:3045
 #, fuzzy, c-format
 msgid "Binding to IPv6 address %s\n"
 msgstr "Ungültiger Parameter: `%s'\n"
 
-#: src/transport/plugin_transport_http_server.c:3103
+#: src/transport/plugin_transport_http_server.c:3108
 #, fuzzy, c-format
 msgid "Using external hostname `%s'\n"
 msgstr "Collection `%s' begonnen.\n"
 
-#: src/transport/plugin_transport_http_server.c:3124
+#: src/transport/plugin_transport_http_server.c:3129
 #, 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:3141
+#: src/transport/plugin_transport_http_server.c:3146
 #, 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:3448
+#: src/transport/plugin_transport_http_server.c:3453
 #, fuzzy
 msgid "Unable to compile URL regex\n"
 msgstr "SQLite Datenbank konnte nicht initialisiert werden: %s.\n"
@@ -8429,8 +8271,8 @@
 msgid "# network-level TCP disconnect events"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2760 src/util/service.c:582
-#: src/util/service.c:588
+#: src/transport/plugin_transport_tcp.c:2760 src/util/service.c:585
+#: src/util/service.c:591
 #, c-format
 msgid "Require valid port number for service `%s' in configuration!\n"
 msgstr ""
@@ -8481,55 +8323,55 @@
 "or %u)\n"
 msgstr ""
 
-#: src/transport/plugin_transport_udp.c:2881
+#: src/transport/plugin_transport_udp.c:2888
 #, 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:2894
+#: src/transport/plugin_transport_udp.c:2901
 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:3247
+#: src/transport/plugin_transport_udp.c:3254
 #, 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:3255
+#: src/transport/plugin_transport_udp.c:3262
 #, fuzzy
 msgid "Failed to open UDP sockets\n"
 msgstr "Fehler beim Binden an UDP6 Port %d.\n"
 
-#: src/transport/plugin_transport_udp.c:3414
+#: src/transport/plugin_transport_udp.c:3421
 #, c-format
 msgid "Given `%s' option is out of range: %llu > %u\n"
 msgstr ""
 
-#: src/transport/plugin_transport_udp.c:3461
+#: src/transport/plugin_transport_udp.c:3468
 #, fuzzy, c-format
 msgid "Invalid IPv6 address: `%s'\n"
 msgstr "Ungültiger Parameter: `%s'\n"
 
-#: src/transport/plugin_transport_udp.c:3529
+#: src/transport/plugin_transport_udp.c:3536
 #, fuzzy
 msgid "Failed to create network sockets, plugin failed\n"
 msgstr "Namespace `%s' konnte nicht erstellt werden (existiert bereits?).\n"
 
-#: src/transport/plugin_transport_unix.c:1403
+#: src/transport/plugin_transport_unix.c:1402
 #, 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:1416
+#: src/transport/plugin_transport_unix.c:1415
 #, fuzzy, c-format
 msgid "Cannot bind to `%s'\n"
 msgstr "`%s' konnte nicht gehashed werden.\n"
 
-#: src/transport/plugin_transport_unix.c:1817
+#: src/transport/plugin_transport_unix.c:1816
 #, fuzzy
 msgid "Failed to open UNIX listen socket\n"
 msgstr "Datei wurde als `%s' gespeichert.\n"
@@ -8601,7 +8443,7 @@
 msgid "# sessions allocated"
 msgstr "# Sitzungsschlüssel akzeptiert"
 
-#: src/transport/transport_api.c:767
+#: src/transport/transport_api.c:816
 #, 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"
@@ -8646,12 +8488,12 @@
 msgid "Metadata `%s' failed to deserialize"
 msgstr ""
 
-#: src/util/client.c:261 src/util/client.c:858 src/util/service.c:619
+#: src/util/client.c:261 src/util/client.c:858 src/util/service.c:622
 #, 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:623
+#: src/util/client.c:265 src/util/client.c:863 src/util/service.c:626
 #, fuzzy, c-format
 msgid "Using `%s' instead\n"
 msgstr "%s: Option `%s' ist mehrdeutig\n"
@@ -8678,7 +8520,7 @@
 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:1303
+#: src/util/client.c:1299
 msgid "Could not submit request, not expecting to receive a response.\n"
 msgstr ""
 
@@ -8746,24 +8588,24 @@
 msgid "Syntax error while deserializing in line %u\n"
 msgstr "Syntaxfehler in Konfigurationsdatei `%s' in Zeile %d.\n"
 
-#: src/util/configuration.c:1023
+#: src/util/configuration.c:1025
 #, c-format
 msgid ""
 "Configuration value '%s' for '%s' in section '%s' is not in set of legal "
 "choices\n"
 msgstr ""
 
-#: src/util/configuration.c:1093
+#: src/util/configuration.c:1095
 #, c-format
 msgid "Recursive expansion suspected, aborting $-expansion for term `%s'\n"
 msgstr ""
 
-#: src/util/configuration.c:1125
+#: src/util/configuration.c:1127
 #, fuzzy, c-format
 msgid "Missing closing `%s' in option `%s'\n"
 msgstr "Konfigurationsdatei `%s' wurde erzeugt.\n"
 
-#: src/util/configuration.c:1199
+#: src/util/configuration.c:1201
 #, c-format
 msgid ""
 "Failed to expand `%s' in `%s' as it is neither found in [PATHS] nor defined "
@@ -8864,7 +8706,7 @@
 msgid "Expected `%s' to be a directory!\n"
 msgstr "`%s' erwartet, dass `%s' ein Verzeichnis ist!\n"
 
-#: src/util/disk.c:1564 src/util/service.c:1323
+#: src/util/disk.c:1564 src/util/service.c:1327
 #, fuzzy, c-format
 msgid "Cannot obtain information about user `%s': %s\n"
 msgstr "Fehler beim Speichern der Konfigurationsdatei: `%s': %s.\n"
@@ -9066,23 +8908,28 @@
 msgid "Use build-in GNUnet stub resolver"
 msgstr ""
 
-#: src/util/gnunet-scrypt.c:279
+#: src/util/gnunet-scrypt.c:233
+#, fuzzy, c-format
+msgid "Loading hostkey from `%s' failed.\n"
+msgstr "Das Parsen des Hello von `%s' schlug fehl.\n"
+
+#: src/util/gnunet-scrypt.c:294
 msgid "number of bits to require for the proof of work"
 msgstr ""
 
-#: src/util/gnunet-scrypt.c:282
+#: src/util/gnunet-scrypt.c:297
 msgid "file with private key, otherwise default is used"
 msgstr ""
 
-#: src/util/gnunet-scrypt.c:285
+#: src/util/gnunet-scrypt.c:300
 msgid "file with proof of work, otherwise default is used"
 msgstr ""
 
-#: src/util/gnunet-scrypt.c:288
+#: src/util/gnunet-scrypt.c:303
 msgid "time to wait between calculations"
 msgstr ""
 
-#: src/util/gnunet-scrypt.c:299
+#: src/util/gnunet-scrypt.c:315
 #, fuzzy
 msgid "Manipulate GNUnet proof of work files"
 msgstr ""
@@ -9138,12 +8985,12 @@
 msgid "Error writing to `%s': %s\n"
 msgstr "Fehler beim Anlegen des Benutzers"
 
-#: src/util/network.c:134
+#: src/util/network.c:137
 #, c-format
 msgid "Unable to shorten unix path `%s' while keeping name unique\n"
 msgstr ""
 
-#: src/util/network.c:1361 src/util/network.c:1486
+#: src/util/network.c:1640 src/util/network.c:1797
 #, c-format
 msgid ""
 "Fatal internal logic error, process hangs in `%s' (abort with CTRL-C)!\n"
@@ -9192,17 +9039,17 @@
 msgid "Could not determine plugin installation path.\n"
 msgstr "Öffentliche IP-Adresse konnte nicht ermittelt werden.\n"
 
-#: src/util/program.c:246 src/util/service.c:1457
+#: src/util/program.c:246 src/util/service.c:1461
 #, fuzzy, c-format
 msgid "Malformed configuration file `%s', exit ...\n"
 msgstr "Fehler beim Speichern der Konfigurationsdatei `%s':"
 
-#: src/util/program.c:258 src/util/service.c:1472
+#: src/util/program.c:258 src/util/service.c:1476
 #, fuzzy, c-format
 msgid "Could not access configuration file `%s'\n"
 msgstr "Konfigurationsdatei `%s' konnte nicht geparst werden.\n"
 
-#: src/util/program.c:263 src/util/service.c:1467
+#: src/util/program.c:263 src/util/service.c:1471
 #, fuzzy
 msgid "Malformed configuration, exit ...\n"
 msgstr "Fehler beim Speichern der Konfigurationsdatei `%s':"
@@ -9235,15 +9082,10 @@
 msgid "Could not resolve our FQDN : %s\n"
 msgstr "`%s' konnte nicht aufgelöst werden: %s\n"
 
-#: src/util/scheduler.c:813
+#: src/util/scheduler.c:812
 msgid "Looks like we're busy waiting...\n"
 msgstr ""
 
-#: src/util/scheduler.c:948
-#, c-format
-msgid "Attempt to cancel dead task %llu!\n"
-msgstr ""
-
 #: src/util/server.c:484
 #, fuzzy, c-format
 msgid "`%s' failed for port %d (%s).\n"
@@ -9259,7 +9101,7 @@
 msgid "`%s' failed for `%s': address already in use\n"
 msgstr "`%s' schlug fehl für Port %d: %s. Läuft gnunetd bereits?\n"
 
-#: src/util/server.c:894
+#: src/util/server.c:896
 #, c-format
 msgid ""
 "Processing code for message of type %u did not call "
@@ -9276,80 +9118,80 @@
 msgid "Access from `%s' denied to service `%s'\n"
 msgstr ""
 
-#: src/util/service.c:409
+#: src/util/service.c:410
 #, c-format
 msgid "Could not parse IPv4 network specification `%s' for `%s:%s'\n"
 msgstr ""
 
-#: src/util/service.c:446
+#: src/util/service.c:448
 #, c-format
 msgid "Could not parse IPv6 network specification `%s' for `%s:%s'\n"
 msgstr ""
 
-#: src/util/service.c:563
+#: src/util/service.c:566
 #, c-format
 msgid ""
 "Disabling IPv6 support for service `%s', failed to create IPv6 socket: %s\n"
 msgstr ""
 
-#: src/util/service.c:653
+#: src/util/service.c:656
 #, c-format
 msgid ""
 "Disabling UNIX domain socket support for service `%s', failed to create UNIX "
 "domain socket: %s\n"
 msgstr ""
 
-#: src/util/service.c:669
+#: src/util/service.c:672
 #, c-format
 msgid "Have neither PORT nor UNIXPATH for service `%s', but one is required\n"
 msgstr ""
 
-#: src/util/service.c:908
+#: src/util/service.c:911
 msgid "Could not access a pre-bound socket, will try to bind myself\n"
 msgstr ""
 
-#: src/util/service.c:957 src/util/service.c:975
+#: src/util/service.c:960 src/util/service.c:978
 #, c-format
 msgid "Specified value for `%s' of service `%s' is invalid\n"
 msgstr ""
 
-#: src/util/service.c:1000
+#: src/util/service.c:1003
 #, c-format
 msgid "Could not access pre-bound socket %u, will try to bind myself\n"
 msgstr ""
 
-#: src/util/service.c:1170
+#: src/util/service.c:1174
 #, fuzzy, c-format
 msgid "Failed to start `%s' at `%s'\n"
 msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
 
-#: src/util/service.c:1212
+#: src/util/service.c:1216
 #, fuzzy, c-format
 msgid "Service `%s' runs at %s\n"
 msgstr "Knoten `%s' mit Vertrauen %8u und Adresse `%s'\n"
 
-#: src/util/service.c:1261
+#: src/util/service.c:1265
 msgid "Service process failed to initialize\n"
 msgstr ""
 
-#: src/util/service.c:1265
+#: src/util/service.c:1269
 msgid "Service process could not initialize server function\n"
 msgstr ""
 
-#: src/util/service.c:1269
+#: src/util/service.c:1273
 msgid "Service process failed to report status\n"
 msgstr ""
 
-#: src/util/service.c:1324
+#: src/util/service.c:1328
 msgid "No such user"
 msgstr ""
 
-#: src/util/service.c:1337
+#: src/util/service.c:1341
 #, c-format
 msgid "Cannot change user/group to `%s': %s\n"
 msgstr "Benutzer/Gruppe kann nicht zu `%s' gewechselt werden: %s\n"
 
-#: src/util/service.c:1407
+#: src/util/service.c:1411
 msgid "do daemonize (detach from terminal)"
 msgstr ""
 
@@ -9675,6 +9517,82 @@
 msgstr "`%s' schlug bei Datei `%s' fehl. Ort: %s:%d. Fehler: %s\n"
 
 #, fuzzy
+#~ msgid "Starting default services `%s'\n"
+#~ msgstr "Collection `%s' begonnen.\n"
+
+#, fuzzy
+#~ msgid "Received %s message\n"
+#~ msgstr "ungültige `%s' Nachricht empfangen\n"
+
+#, fuzzy
+#~ msgid "Received last message for %s \n"
+#~ msgstr "GAP hat ungültige Inhalte von `%s' empfangen.\n"
+
+#, fuzzy
+#~ msgid "Failed to create statistics!\n"
+#~ msgstr "Namespace `%s' konnte nicht erstellt werden (existiert bereits?).\n"
+
+#, fuzzy
+#~ msgid "Failed to parse file `%s'\n"
+#~ msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
+
+#, fuzzy
+#~ msgid "Invalid value for public key\n"
+#~ msgstr "Ungültiger Parameter: `%s'\n"
+
+#, fuzzy
+#~ msgid "Cannot read experiments file `%s'\n"
+#~ msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
+
+#, fuzzy
+#~ msgid "Connected to peer %s\n"
+#~ msgstr "`%s' hat sich mit `%s' verbunden.\n"
+
+#, fuzzy
+#~ msgid "Disconnected from peer %s\n"
+#~ msgstr "`%s' hat sich mit `%s' verbunden.\n"
+
+#, fuzzy
+#~ msgid "Starting inbound experiment `%s' with peer `%s'\n"
+#~ msgstr "Collection `%s' begonnen.\n"
+
+#, fuzzy
+#~ msgid "Starting outbound experiment `%s' with peer `%s'\n"
+#~ msgstr "Collection `%s' begonnen.\n"
+
+#, fuzzy
+#~ msgid "Received %s message from peer %s for experiment `%s'\n"
+#~ msgstr "GAP hat ungültige Inhalte von `%s' empfangen.\n"
+
+#, fuzzy
+#~ msgid "Lacking key configuration settings.\n"
+#~ msgstr "GNUnet Konfiguration"
+
+#, fuzzy
+#~ msgid "Could not access hostkey file `%s'.\n"
+#~ msgstr "Konfigurationsdatei `%s' konnte nicht geparst werden.\n"
+
+#, fuzzy
+#~ msgid "Hostlist file `%s' could not be removed\n"
+#~ msgstr "Sitzungsschlüssel von Knoten `%s' konnte nicht überprüft werden.\n"
+
+#, fuzzy
+#~ msgid "Failure: Did not receive %s\n"
+#~ msgstr "Datei wurde als `%s' gespeichert.\n"
+
+#, fuzzy
+#~ msgid "Blacklist allows connection attempt to peer `%s'\n"
+#~ msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
+
+#, fuzzy
+#~ msgid "Received a request connect message for peer `%s'\n"
+#~ msgstr "GAP hat ungültige Inhalte von `%s' empfangen.\n"
+
+#, fuzzy
+#~ msgid "Received a request disconnect message for peer `%s'\n"
+#~ msgstr "GAP hat ungültige Inhalte von `%s' empfangen.\n"
+
+#, fuzzy
 #~ msgid "Client %p disconnected from us.\n"
 #~ msgstr "`%s' hat sich mit `%s' verbunden.\n"
 

Modified: gnunet/po/es.po
===================================================================
--- gnunet/po/es.po     2015-01-10 01:26:04 UTC (rev 34874)
+++ gnunet/po/es.po     2015-01-10 18:56:41 UTC (rev 34875)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: gnunet 0.9.5a\n"
 "Report-Msgid-Bugs-To: address@hidden"
-"POT-Creation-Date: 2014-12-09 00:23+0100\n"
+"POT-Creation-Date: 2015-01-01 22:23+0100\n"
 "PO-Revision-Date: 2013-02-23 17:50+0100\n"
 "Last-Translator: Miguel Ángel Arruga Vivas <address@hidden>\n"
 "Language-Team: Spanish <address@hidden>\n"
@@ -310,81 +310,50 @@
 msgid "ARM now monitors connections to service `%s' at `%s'\n"
 msgstr "El ARM ahora gestiona las conexiones del servicio «%s» en «%s»\n"
 
-#: src/arm/gnunet-service-arm.c:831
+#: src/arm/gnunet-service-arm.c:835
 #, c-format
 msgid "Preparing to stop `%s'\n"
 msgstr "Preparando para parar «%s»\n"
 
-#: src/arm/gnunet-service-arm.c:1100
+#: src/arm/gnunet-service-arm.c:1105
 #, c-format
 msgid "Restarting service `%s'.\n"
 msgstr "Reiniciando el servicio «%s»\n"
 
-#: src/arm/gnunet-service-arm.c:1193
+#: src/arm/gnunet-service-arm.c:1199
 msgid "exit"
 msgstr "salida"
 
-#: src/arm/gnunet-service-arm.c:1198
+#: src/arm/gnunet-service-arm.c:1204
 msgid "signal"
 msgstr "señal"
 
-#: src/arm/gnunet-service-arm.c:1203
+#: src/arm/gnunet-service-arm.c:1209
 msgid "unknown"
 msgstr "desconocido"
 
-#: src/arm/gnunet-service-arm.c:1209
+#: src/arm/gnunet-service-arm.c:1215
 #, c-format
 msgid "Service `%s' took %s to terminate\n"
 msgstr "El servicio «%s» tardó %s en finalizar\n"
 
-#: src/arm/gnunet-service-arm.c:1231
+#: src/arm/gnunet-service-arm.c:1237
 #, fuzzy, c-format
 msgid "Service `%s' terminated normally, will restart at any time\n"
 msgstr "El servicio «%s» finalizó con estado %s/%d, se reiniciará en %llu ms\n"
 
-#: src/arm/gnunet-service-arm.c:1246
+#: src/arm/gnunet-service-arm.c:1252
 #, fuzzy, c-format
 msgid "Service `%s' terminated with status %s/%d, will restart in %s\n"
 msgstr "El servicio «%s» finalizó con estado %s/%d, se reiniciará en %llu ms\n"
 
-#: src/arm/gnunet-service-arm.c:1500
-#, c-format
-msgid "Starting default services `%s'\n"
-msgstr "Iniciando servicios predeterminados «%s»\n"
-
-# Miguel: He traducido "default" por "predeterminado", la locución
-# "por defecto" no tiene sentido en sitios como este y he tratado
-# de ser consistente.
-#: src/arm/gnunet-service-arm.c:1511
-#, c-format
-msgid "Default service `%s' not configured correctly!\n"
-msgstr "¡El servicio predeterminado «%s» no está configurado correctamente!\n"
-
-# Miguel: ¿No hay servicios -> no hay ningún servicio?
-#: src/arm/gnunet-service-arm.c:1524
-msgid ""
-"No default services configured, GNUnet will not really start right now.\n"
-msgstr ""
-"No hay servicios predeterminados configurados, GNUnet no va a iniciarse "
-"realmente ahora.\n"
-
 #: src/arm/mockup-service.c:41
 msgid "Initiating shutdown as requested by client.\n"
 msgstr "Iniciando apagado bajo petición del cliente.\n"
 
-#: src/ats/ats_api_performance.c:485
-#, c-format
-msgid "Received %s message\n"
-msgstr "Recibido mensaje %s\n"
-
-#: src/ats/ats_api_performance.c:528
-#, c-format
-msgid "Received last message for %s \n"
-msgstr "Recibido último mensaje para %s\n"
-
 #: src/ats/gnunet-ats-solver-eval.c:2804 src/ats/gnunet-ats-solver-eval.c:2838
-#: src/ats/gnunet-service-ats_addresses.c:1781
-#: src/ats/gnunet-service-ats_addresses.c:1825
+#: src/ats/gnunet-service-ats_addresses.c:1789
+#: src/ats/gnunet-service-ats_addresses.c:1833
 #, c-format
 msgid ""
 "Could not load quota for network `%s':  `%s', assigning default bandwidth "
@@ -395,13 +364,13 @@
 
 # Miguel: "Outbound" lo he traducido como salida en todo el texto.
 #: src/ats/gnunet-ats-solver-eval.c:2810
-#: src/ats/gnunet-service-ats_addresses.c:1788
+#: src/ats/gnunet-service-ats_addresses.c:1796
 #, c-format
 msgid "Outbound quota configure for network `%s' is %llu\n"
 msgstr "La cuota de salida configurada para la red «%s» es %llu\n"
 
 #: src/ats/gnunet-ats-solver-eval.c:2817
-#: src/ats/gnunet-service-ats_addresses.c:1796
+#: src/ats/gnunet-service-ats_addresses.c:1804
 #, c-format
 msgid ""
 "No outbound quota configured for network `%s', assigning default bandwidth "
@@ -412,13 +381,13 @@
 
 # Miguel: "Inbound" lo he traducido como entrada en todo el texto.
 #: src/ats/gnunet-ats-solver-eval.c:2844
-#: src/ats/gnunet-service-ats_addresses.c:1832
+#: src/ats/gnunet-service-ats_addresses.c:1840
 #, c-format
 msgid "Inbound quota configured for network `%s' is %llu\n"
 msgstr "La cuota de entrada configurada para la red «%s» es %llu\n"
 
 #: src/ats/gnunet-ats-solver-eval.c:2851
-#: src/ats/gnunet-service-ats_addresses.c:1840
+#: src/ats/gnunet-service-ats_addresses.c:1848
 #, c-format
 msgid ""
 "No outbound quota configure for network `%s', assigning default bandwidth "
@@ -456,22 +425,22 @@
 msgid "disable normalization"
 msgstr ""
 
-#: src/ats/gnunet-service-ats_addresses.c:2039
+#: src/ats/gnunet-service-ats_addresses.c:2051
 #, c-format
 msgid "Initializing solver `%s '`%s'\n"
 msgstr ""
 
-#: src/ats/gnunet-service-ats_addresses.c:2042
+#: src/ats/gnunet-service-ats_addresses.c:2057
 #, 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:2065
+#: src/ats/gnunet-service-ats_addresses.c:2082
 #, fuzzy
 msgid "Failed to initialize solver!\n"
 msgstr "¡No se puede inicializar el resolvedor!\n"
 
-#: src/ats/plugin_ats_mlp.c:1344
+#: src/ats/plugin_ats_mlp.c:1345
 msgid "Problem size too large, cannot allocate memory!\n"
 msgstr ""
 
@@ -480,19 +449,19 @@
 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:1988
+#: 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:2704
+#: src/ats/plugin_ats_mlp.c:2714
 msgid ""
 "MLP solver is not optimizing for anything, changing to feasibility check\n"
 msgstr ""
 
-#: src/ats/plugin_ats_mlp.c:2744 src/ats/plugin_ats_mlp.c:2761
-#: src/ats/plugin_ats_mlp.c:2793 src/ats/plugin_ats_mlp.c:2811
-#: src/ats/plugin_ats_mlp.c:2830 src/ats/plugin_ats_proportional.c:1989
+#: 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:1989
 #: src/ats/plugin_ats_proportional.c:2010 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
@@ -502,7 +471,7 @@
 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:2917
+#: src/ats/plugin_ats_mlp.c:2927
 #, fuzzy, c-format
 msgid ""
 "Adjusting inconsistent outbound quota configuration for network `%s', is "
@@ -511,7 +480,7 @@
 "No hay configurada una cuota de salida para la red «%s», asignando el ancho "
 "de banda predeterminado %llu\n"
 
-#: src/ats/plugin_ats_mlp.c:2926
+#: src/ats/plugin_ats_mlp.c:2936
 #, fuzzy, c-format
 msgid ""
 "Adjusting inconsistent inbound quota configuration for network `%s', is %llu "
@@ -521,21 +490,21 @@
 "ancho de banda predeterminado (%llu)\n"
 
 # Miguel: "Outbound" lo he traducido como salida en todo el texto.
-#: src/ats/plugin_ats_mlp.c:2937
+#: src/ats/plugin_ats_mlp.c:2947
 #, 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:2945
+#: src/ats/plugin_ats_mlp.c:2955
 #, 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:2956
+#: 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"
@@ -583,11 +552,11 @@
 msgid "Initialization failed, shutdown\n"
 msgstr "¡La inicialización del mecanismo de módulos falló: %s!\n"
 
-#: src/ats-tests/ats-testing-log.c:842
+#: src/ats-tests/ats-testing-log.c:846
 msgid "Stop logging\n"
 msgstr ""
 
-#: src/ats-tests/ats-testing-log.c:893
+#: src/ats-tests/ats-testing-log.c:897
 #, fuzzy, c-format
 msgid "Start logging `%s'\n"
 msgstr "Iniciando descarga «%s».\n"
@@ -637,102 +606,102 @@
 msgid "Removed address of peer `%s' with plugin `%s'\n"
 msgstr "Eliminando dirección de transporte «%s»\n"
 
-#: src/ats-tool/gnunet-ats.c:747
+#: src/ats-tool/gnunet-ats.c:746
 #, 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:779 src/namestore/gnunet-namestore.c:700
-#: src/transport/gnunet-transport.c:1855
+#: src/ats-tool/gnunet-ats.c:778 src/namestore/gnunet-namestore.c:700
+#: src/transport/gnunet-transport.c:1853
 #: 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:793 src/transport/gnunet-transport.c:1864
+#: src/ats-tool/gnunet-ats.c:792 src/transport/gnunet-transport.c:1862
 #: 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:803
+#: src/ats-tool/gnunet-ats.c:802
 #, 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:825 src/ats-tool/gnunet-ats.c:851
-#: src/ats-tool/gnunet-ats.c:879 src/ats-tool/gnunet-ats.c:925
+#: src/ats-tool/gnunet-ats.c:824 src/ats-tool/gnunet-ats.c:850
+#: src/ats-tool/gnunet-ats.c:878 src/ats-tool/gnunet-ats.c:924
 msgid "Cannot connect to ATS service, exiting...\n"
 msgstr "No se puede conectar al servicio ATS, saliendo...\n"
 
-#: src/ats-tool/gnunet-ats.c:837 src/ats-tool/gnunet-ats.c:863
+#: src/ats-tool/gnunet-ats.c:836 src/ats-tool/gnunet-ats.c:862
 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:891
+#: src/ats-tool/gnunet-ats.c:890
 #, fuzzy
 msgid "No preference type given!\n"
 msgstr "establece las preferencias para el par dado"
 
-#: src/ats-tool/gnunet-ats.c:898
+#: src/ats-tool/gnunet-ats.c:897
 #, fuzzy
 msgid "No peer given!\n"
 msgstr "No se han proporcionado opciones\n"
 
-#: src/ats-tool/gnunet-ats.c:916
+#: src/ats-tool/gnunet-ats.c:915
 #, fuzzy
 msgid "Valid type required\n"
 msgstr "Tipo requerido\n"
 
-#: src/ats-tool/gnunet-ats.c:984
+#: src/ats-tool/gnunet-ats.c:983
 msgid "get list of active addresses currently used"
 msgstr "obtiene una lista de direcciones activas usadas actualmente"
 
-#: src/ats-tool/gnunet-ats.c:986
+#: src/ats-tool/gnunet-ats.c:985
 msgid "get list of all active addresses"
 msgstr "obtiene una lista de todas las direcciones activas"
 
-#: src/ats-tool/gnunet-ats.c:989
+#: src/ats-tool/gnunet-ats.c:988
 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:991
+#: src/ats-tool/gnunet-ats.c:990
 msgid "monitor mode"
 msgstr "modo de monitorización"
 
-#: src/ats-tool/gnunet-ats.c:993
+#: src/ats-tool/gnunet-ats.c:992
 msgid "set preference for the given peer"
 msgstr "establece las preferencias para el par dado"
 
-#: src/ats-tool/gnunet-ats.c:995
+#: src/ats-tool/gnunet-ats.c:994
 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:997
+#: src/ats-tool/gnunet-ats.c:996
 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:1000
+#: src/ats-tool/gnunet-ats.c:999
 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:1002
+#: src/ats-tool/gnunet-ats.c:1001
 msgid "preference value"
 msgstr "valor de preferencia"
 
 # Miguel: ¿Algo menos forzado que "salida prolija"?
-#: src/ats-tool/gnunet-ats.c:1005
+#: src/ats-tool/gnunet-ats.c:1004
 msgid "verbose output (include ATS address properties)"
 msgstr "salida prolija (incluye las propiedades de direcciones del ATS)"
 
-#: src/ats-tool/gnunet-ats.c:1012
+#: src/ats-tool/gnunet-ats.c:1011
 msgid "Print information about ATS state"
 msgstr "Imprime información acerca del estado del ATS"
 
@@ -791,7 +760,7 @@
 msgid "provide information about all tunnels"
 msgstr "proveer información acerca de un túnel en particular"
 
-#: src/cadet/gnunet-service-cadet_peer.c:496
+#: src/cadet/gnunet-service-cadet_peer.c:502
 msgid "Wrong CORE service\n"
 msgstr "Servicio principal (CORE) erróneo\n"
 
@@ -1287,7 +1256,7 @@
 msgid "Could not start playback audio helper.\n"
 msgstr "No se pudo empezar a publicar.\n"
 
-#: src/core/core_api.c:768
+#: src/core/core_api.c:787
 msgid "Client was disconnected from core service, trying to reconnect.\n"
 msgstr ""
 "El cliente se desconectó del servicio principal, tratando de reconectar.\n"
@@ -1336,19 +1305,18 @@
 msgid "%24s: %-30s %4s (timeout in %6s)\n"
 msgstr "%24s: %-17s %4s   (%u conexiones en total)\n"
 
-#: src/core/gnunet-core.c:146 src/peerinfo-tool/gnunet-peerinfo.c:761
+#: src/core/gnunet-core.c:146 src/peerinfo-tool/gnunet-peerinfo.c:786
 #, c-format
 msgid "Invalid command line argument `%s'\n"
 msgstr "Parámetro no válido «%s» en la línea de comandos\n"
 
 #: src/core/gnunet-core.c:157
-#: src/experimentation/gnunet-daemon-experimentation_nodes.c:1104
 #, fuzzy
 msgid "Failed to connect to CORE service!\n"
 msgstr "¡Se produjo un fallo al conectar con el servicio DHT!\n"
 
 # Miguel: ¿Quizá continuamente fuese mejor?
-#: src/core/gnunet-core.c:179 src/transport/gnunet-transport.c:2115
+#: src/core/gnunet-core.c:179 src/transport/gnunet-transport.c:2114
 msgid "provide information about all current connections (continuously)"
 msgstr ""
 "provee información sobre todas las conexiones actuales (de forma continua)"
@@ -1368,15 +1336,15 @@
 msgid "Core service of `%4s' ready.\n"
 msgstr "El servicio principal de «%4s» está listo.\n"
 
-#: src/core/gnunet-service-core_clients.c:372
+#: src/core/gnunet-service-core_clients.c:375
 msgid "# send requests dropped (disconnected)"
 msgstr "# peticiones de envío descartadas (desconectado)"
 
-#: src/core/gnunet-service-core_clients.c:483
+#: src/core/gnunet-service-core_clients.c:490
 msgid "# messages discarded (session disconnected)"
 msgstr "# mensajes descartados (sesión desconectada)"
 
-#: src/core/gnunet-service-core_clients.c:529
+#: src/core/gnunet-service-core_clients.c:536
 #, c-format
 msgid "# bytes of messages of type %u received"
 msgstr "# bytes de mensajes del tipo %u recibidos"
@@ -1397,38 +1365,38 @@
 msgid "# key exchanges stopped"
 msgstr "# intercambio de claves parados"
 
-#: src/core/gnunet-service-core_kx.c:847
+#: src/core/gnunet-service-core_kx.c:848
 msgid "# old ephemeral keys ignored"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:854
+#: src/core/gnunet-service-core_kx.c:855
 #, fuzzy
 msgid "# ephemeral keys received"
 msgstr "# mapas de tipos recibidos"
 
-#: src/core/gnunet-service-core_kx.c:888
+#: src/core/gnunet-service-core_kx.c:889
 #, 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:899
+#: src/core/gnunet-service-core_kx.c:900
 #, fuzzy
 msgid "# EPHEMERAL_KEY messages received"
 msgstr "# mensajes «SET_KEY» descifrados"
 
-#: src/core/gnunet-service-core_kx.c:998
+#: src/core/gnunet-service-core_kx.c:999
 #: src/transport/gnunet-service-transport_validation.c:1016
 msgid "# PING messages received"
 msgstr "# mensajes PING recibidos"
 
-#: src/core/gnunet-service-core_kx.c:1006
+#: src/core/gnunet-service-core_kx.c:1007
 #, 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:1033
+#: src/core/gnunet-service-core_kx.c:1034
 #, c-format
 msgid ""
 "Received PING from `%s' for different identity: I am `%s', PONG identity: `"
@@ -1437,84 +1405,84 @@
 "Recibido PING de «%s» para una identidad diferente: Yo soy «%s», identidad "
 "del PONG: «%s»\n"
 
-#: src/core/gnunet-service-core_kx.c:1049
+#: src/core/gnunet-service-core_kx.c:1050
 msgid "# PONG messages created"
 msgstr "# mensajes PONG creados"
 
-#: src/core/gnunet-service-core_kx.c:1075
+#: src/core/gnunet-service-core_kx.c:1077
 msgid "# sessions terminated by timeout"
 msgstr "# sesiones terminadas por plazo de expiración"
 
-#: src/core/gnunet-service-core_kx.c:1086
+#: src/core/gnunet-service-core_kx.c:1088
 msgid "# keepalive messages sent"
 msgstr "# mensajes «keepalive» enviados"
 
-#: src/core/gnunet-service-core_kx.c:1153
+#: src/core/gnunet-service-core_kx.c:1156
 #: src/transport/gnunet-service-transport_validation.c:1359
 msgid "# PONG messages received"
 msgstr "# mensajes PONG recibidos"
 
-#: src/core/gnunet-service-core_kx.c:1159
+#: src/core/gnunet-service-core_kx.c:1162
 #, fuzzy
 msgid "# PONG messages dropped (connection down)"
 msgstr "# mensajes PONG recibidos"
 
-#: src/core/gnunet-service-core_kx.c:1164
+#: src/core/gnunet-service-core_kx.c:1167
 #, 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:1194
+#: src/core/gnunet-service-core_kx.c:1197
 msgid "# PONG messages decrypted"
 msgstr "# mensajes PONG descifrados"
 
-#: src/core/gnunet-service-core_kx.c:1229
+#: src/core/gnunet-service-core_kx.c:1232
 msgid "# session keys confirmed via PONG"
 msgstr "# claves de sesión confirmadas vía PONG"
 
-#: src/core/gnunet-service-core_kx.c:1240
+#: src/core/gnunet-service-core_kx.c:1243
 #, fuzzy
 msgid "# timeouts prevented via PONG"
 msgstr "# bytes recibidos vía TCP"
 
-#: src/core/gnunet-service-core_kx.c:1247
+#: src/core/gnunet-service-core_kx.c:1250
 msgid "# rekey operations confirmed via PONG"
 msgstr "# operaciones de cambio de clave confirmadas vía PONG"
 
-#: src/core/gnunet-service-core_kx.c:1386
+#: src/core/gnunet-service-core_kx.c:1392
 #, fuzzy
 msgid "# DATA message dropped (out of order)"
 msgstr "# bytes omitidos (fuera de secuencia)"
 
-#: src/core/gnunet-service-core_kx.c:1393
+#: src/core/gnunet-service-core_kx.c:1399
 #, 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:1396
+#: src/core/gnunet-service-core_kx.c:1402
 #, fuzzy
 msgid "# sessions terminated by key expiration"
 msgstr "# sesiones terminadas por plazo de expiración"
 
-#: src/core/gnunet-service-core_kx.c:1442
-#: src/core/gnunet-service-core_kx.c:1467
+#: src/core/gnunet-service-core_kx.c:1448
+#: src/core/gnunet-service-core_kx.c:1473
 msgid "# bytes dropped (duplicates)"
 msgstr "# bytes omitidos (duplicados)"
 
-#: src/core/gnunet-service-core_kx.c:1454
+#: src/core/gnunet-service-core_kx.c:1460
 msgid "# bytes dropped (out of sequence)"
 msgstr "# bytes omitidos (fuera de secuencia)"
 
-#: src/core/gnunet-service-core_kx.c:1496
+#: src/core/gnunet-service-core_kx.c:1502
 msgid "# bytes dropped (ancient message)"
 msgstr "# bytes omitidos (mensaje antiguo)"
 
-#: src/core/gnunet-service-core_kx.c:1504
+#: src/core/gnunet-service-core_kx.c:1510
 msgid "# bytes of payload decrypted"
 msgstr "# bytes de «payload» descifrados"
 
-#: src/core/gnunet-service-core_kx.c:1539
+#: src/core/gnunet-service-core_kx.c:1545
 #, fuzzy
 msgid "# PAYLOAD dropped (out of order)"
 msgstr "# bytes omitidos (fuera de secuencia)"
@@ -1524,7 +1492,7 @@
 msgstr "# sesiones terminadas por desconexión de transporte"
 
 #: src/core/gnunet-service-core_neighbours.c:184
-#: src/core/gnunet-service-core_neighbours.c:335
+#: src/core/gnunet-service-core_neighbours.c:342
 msgid "# neighbour entries allocated"
 msgstr "# entradas de vecinos alojadas"
 
@@ -1532,22 +1500,22 @@
 msgid "# encrypted bytes given to transport"
 msgstr "# bytes cifrados dados al transporte"
 
-#: src/core/gnunet-service-core_neighbours.c:418
+#: src/core/gnunet-service-core_neighbours.c:425
 #, c-format
 msgid "Unsupported message of type %u (%u bytes) received from peer `%s'\n"
 msgstr "Mensaje no soportado del tipo %u (%u bytes) recibido del par «%s»\n"
 
 #: src/core/gnunet-service-core_sessions.c:245
 #: src/core/gnunet-service-core_sessions.c:328
-#: src/dht/gnunet-service-dht_neighbours.c:662
-#: src/dht/gnunet-service-dht_neighbours.c:727
-#: src/fs/gnunet-service-fs_cp.c:618 src/fs/gnunet-service-fs_cp.c:1517
+#: 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/topology/gnunet-daemon-topology.c:734
 #: src/topology/gnunet-daemon-topology.c:835
-#: src/transport/gnunet-service-transport_neighbours.c:917
-#: src/transport/gnunet-service-transport_neighbours.c:1141
-#: src/transport/gnunet-service-transport_neighbours.c:3177
-#: src/transport/gnunet-service-transport_neighbours.c:3491
+#: src/transport/gnunet-service-transport_neighbours.c:921
+#: src/transport/gnunet-service-transport_neighbours.c:1145
+#: src/transport/gnunet-service-transport_neighbours.c:3181
+#: src/transport/gnunet-service-transport_neighbours.c:3495
 msgid "# peers connected"
 msgstr "# pares conectados"
 
@@ -1579,7 +1547,7 @@
 msgstr "# actualizaciones de mi mapa de tipos"
 
 #: src/datacache/datacache.c:115 src/datacache/datacache.c:266
-#: src/datastore/gnunet-service-datastore.c:838
+#: src/datastore/gnunet-service-datastore.c:855
 msgid "# bytes stored"
 msgstr "# bytes almacenados"
 
@@ -1588,8 +1556,8 @@
 msgstr "# elementos almacenados"
 
 #: src/datacache/datacache.c:143 src/datacache/datacache.c:150
-#: src/datastore/gnunet-service-datastore.c:1487
-#: src/datastore/gnunet-service-datastore.c:1498
+#: src/datastore/gnunet-service-datastore.c:1553
+#: src/datastore/gnunet-service-datastore.c:1564
 #, 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"
@@ -1779,29 +1747,29 @@
 msgid "Manipulate GNUnet datastore"
 msgstr "Manipular ficheros de configuración de GNUnet"
 
-#: src/datastore/gnunet-service-datastore.c:351
+#: src/datastore/gnunet-service-datastore.c:365
 msgid "# bytes expired"
 msgstr "# bytes expirados"
 
-#: src/datastore/gnunet-service-datastore.c:425
+#: src/datastore/gnunet-service-datastore.c:439
 msgid "# bytes purged (low-priority)"
 msgstr "# bytes purgados (baja prioridad)"
 
-#: src/datastore/gnunet-service-datastore.c:483
+#: src/datastore/gnunet-service-datastore.c:497
 #: src/gns/gnunet-gns-helper-service-w32.c:223
 msgid "Transmission to client failed!\n"
 msgstr "¡La transmisión con el cliente ha fallado!\n"
 
-#: src/datastore/gnunet-service-datastore.c:514
+#: src/datastore/gnunet-service-datastore.c:528
 #: src/gns/gnunet-gns-helper-service-w32.c:262
 msgid "Shutdown in progress, aborting transmission.\n"
 msgstr "Apagado en proceso, abortando transmisión.\n"
 
-#: src/datastore/gnunet-service-datastore.c:630
+#: src/datastore/gnunet-service-datastore.c:643
 msgid "# results found"
 msgstr "# resultados encontrados"
 
-#: src/datastore/gnunet-service-datastore.c:673
+#: src/datastore/gnunet-service-datastore.c:686
 #, c-format
 msgid ""
 "Insufficient space (%llu bytes are available) to satisfy `%s' request for "
@@ -1810,7 +1778,7 @@
 "Espacio insuficiente (%llu bytes están disponibles) para satisfacer la "
 "petición «%s» de %llu bytes\n"
 
-#: src/datastore/gnunet-service-datastore.c:684
+#: src/datastore/gnunet-service-datastore.c:697
 #, c-format
 msgid ""
 "The requested amount (%llu bytes) is larger than the cache size (%llu "
@@ -1819,7 +1787,7 @@
 "La cantidad solicitada (%llu bytes) es mayor que el tamaño de la caché (%llu "
 "bytes)\n"
 
-#: src/datastore/gnunet-service-datastore.c:688
+#: src/datastore/gnunet-service-datastore.c:701
 msgid ""
 "Insufficient space to satisfy request and requested amount is larger than "
 "cache size"
@@ -1827,121 +1795,127 @@
 "Espacio insuficiente para satisfacer la petición y la cantidad pedida es "
 "mayor que el tamaño de la caché"
 
-#: src/datastore/gnunet-service-datastore.c:694
+#: src/datastore/gnunet-service-datastore.c:707
 msgid "Insufficient space to satisfy request"
 msgstr "Espacio insuficiente para satisfacer la petición"
 
-#: src/datastore/gnunet-service-datastore.c:699
-#: src/datastore/gnunet-service-datastore.c:751
-#: src/datastore/gnunet-service-datastore.c:964
-#: src/datastore/gnunet-service-datastore.c:1421
+#: 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:1525
 msgid "# reserved"
 msgstr "# reservado"
 
-#: src/datastore/gnunet-service-datastore.c:764
+#: src/datastore/gnunet-service-datastore.c:780
 msgid "Could not find matching reservation"
 msgstr "No se pudo encontrar una reserva coincidente"
 
-#: src/datastore/gnunet-service-datastore.c:850
+#: src/datastore/gnunet-service-datastore.c:867
 #, c-format
 msgid "Need %llu bytes more space (%llu allowed, using %llu)\n"
 msgstr ""
 "Se necesitan %llu bytes más de espacio (%llu permitidos, usando %llu)\n"
 
-#: src/datastore/gnunet-service-datastore.c:1010
+#: src/datastore/gnunet-service-datastore.c:1029
 msgid "# GET requests received"
 msgstr "# peticiones «GET» recibidas"
 
-#: src/datastore/gnunet-service-datastore.c:1022
+#: src/datastore/gnunet-service-datastore.c:1041
 msgid "# requests filtered by bloomfilter"
 msgstr "# peticiones filtradas por el «bloomfilter»"
 
-#: src/datastore/gnunet-service-datastore.c:1050
+#: src/datastore/gnunet-service-datastore.c:1069
 msgid "# UPDATE requests received"
 msgstr "# peticiones «UPDATE» recibidas"
 
-#: src/datastore/gnunet-service-datastore.c:1080
+#: src/datastore/gnunet-service-datastore.c:1099
 msgid "# GET REPLICATION requests received"
 msgstr "# peticiones «GET REPLICATION» recibidas"
 
-#: src/datastore/gnunet-service-datastore.c:1113
+#: src/datastore/gnunet-service-datastore.c:1132
 msgid "# GET ZERO ANONYMITY requests received"
 msgstr "# peticiones «GET ZERO ANONYMITY» recibidas"
 
-#: src/datastore/gnunet-service-datastore.c:1138
+#: src/datastore/gnunet-service-datastore.c:1157
 msgid "Content not found"
 msgstr "Contenido no encontrado"
 
-#: src/datastore/gnunet-service-datastore.c:1146
+#: src/datastore/gnunet-service-datastore.c:1165
 msgid "# bytes removed (explicit request)"
 msgstr "# bytes eliminados (petición explícita)"
 
-#: src/datastore/gnunet-service-datastore.c:1178
+#: src/datastore/gnunet-service-datastore.c:1197
 msgid "# REMOVE requests received"
 msgstr "# peticiones «REMOVE» recibidas"
 
 # Miguel: ¿Cómo traducir «payload»? ¿Código cargado?
-#: src/datastore/gnunet-service-datastore.c:1220
-#, c-format
-msgid "Datastore payload inaccurate (%lld < %lld).  Trying to fix.\n"
+#: src/datastore/gnunet-service-datastore.c:1241
+#, fuzzy, c-format
+msgid ""
+"Datastore payload must have been inaccurate (%lld < %lld). Recomputing it.\n"
 msgstr ""
 "El «payload» del almacén de datos es impreciso (%lld < %lld).  Intentando "
 "repararlo.\n"
 
-#: src/datastore/gnunet-service-datastore.c:1281
+#: src/datastore/gnunet-service-datastore.c:1246
 #, c-format
+msgid "New payload: %lld\n"
+msgstr ""
+
+#: src/datastore/gnunet-service-datastore.c:1299
+#, c-format
 msgid "Loading `%s' datastore plugin\n"
 msgstr "Cargando el módulo del almacén de datos «%s»\n"
 
-#: src/datastore/gnunet-service-datastore.c:1290
+#: src/datastore/gnunet-service-datastore.c:1310
 #, c-format
 msgid "Failed to load datastore plugin for `%s'\n"
 msgstr ""
 "Se produjo un fallo al inicializar el módulo del almacén de datos para «%s»\n"
 
-#: src/datastore/gnunet-service-datastore.c:1492
+#: src/datastore/gnunet-service-datastore.c:1412
+msgid "Rebuilding bloomfilter.  Please be patient.\n"
+msgstr "Reconstruyendo «bloomfilter».  Por favor, tenga paciencia.\n"
+
+#: src/datastore/gnunet-service-datastore.c:1419
+msgid "Plugin does not support get_keys function. Please fix!\n"
+msgstr "El módulo no soporta la función «get_keys». Por favor, corríjalo.\n"
+
+#: src/datastore/gnunet-service-datastore.c:1422
+msgid "Bloomfilter construction complete.\n"
+msgstr "Construcción de «bloomfilter» completa.\n"
+
+#: src/datastore/gnunet-service-datastore.c:1558
 #, 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:1503
+#: src/datastore/gnunet-service-datastore.c:1569
 msgid "# quota"
 msgstr "# cuota"
 
-#: src/datastore/gnunet-service-datastore.c:1505
+#: src/datastore/gnunet-service-datastore.c:1571
 msgid "# cache size"
 msgstr "# tamaño de la caché"
 
-#: src/datastore/gnunet-service-datastore.c:1518
+#: src/datastore/gnunet-service-datastore.c:1584
 #, 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:1536
-#: src/datastore/gnunet-service-datastore.c:1552
+#: src/datastore/gnunet-service-datastore.c:1602
+#: src/datastore/gnunet-service-datastore.c:1618
 #, 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:1582
+#: src/datastore/gnunet-service-datastore.c:1648
 msgid "Failed to initialize bloomfilter.\n"
 msgstr "Se produjo un fallo al inicializar «bloomfilter».\n"
 
-#: src/datastore/gnunet-service-datastore.c:1611
-msgid "Rebuilding bloomfilter.  Please be patient.\n"
-msgstr "Reconstruyendo «bloomfilter».  Por favor, tenga paciencia.\n"
-
-#: src/datastore/gnunet-service-datastore.c:1616
-msgid "Plugin does not support get_keys function. Please fix!\n"
-msgstr "El módulo no soporta la función «get_keys». Por favor, corríjalo.\n"
-
-#: src/datastore/gnunet-service-datastore.c:1619
-msgid "Bloomfilter construction complete.\n"
-msgstr "Construcción de «bloomfilter» completa.\n"
-
 #: src/datastore/plugin_datastore_heap.c:820
 msgid "Heap database running\n"
 msgstr "Base de datos de montículo ejecutándose\n"
@@ -1981,7 +1955,7 @@
 #: src/datastore/plugin_datastore_sqlite.c:255
 #: src/namecache/plugin_namecache_sqlite.c:193
 #: src/namestore/plugin_namestore_sqlite.c:204
-#: src/peerstore/plugin_peerstore_sqlite.c:458
+#: src/peerstore/plugin_peerstore_sqlite.c:479
 #: src/psycstore/plugin_psycstore_sqlite.c:329
 #, c-format
 msgid "Unable to initialize SQLite: %s.\n"
@@ -2065,8 +2039,8 @@
 msgstr "opción para usar el demultiplexado de la DHT siempre"
 
 #: src/dht/gnunet-dht-get.c:204 src/dht/gnunet-dht-monitor.c:271
-#: src/dht/gnunet-dht-put.c:213 src/fs/gnunet-auto-share.c:753
-#: src/fs/gnunet-download.c:328 src/fs/gnunet-publish.c:939
+#: src/dht/gnunet-dht-put.c:213 src/fs/gnunet-auto-share.c:755
+#: src/fs/gnunet-download.c:328 src/fs/gnunet-publish.c:941
 #: src/fs/gnunet-search.c:301 src/fs/gnunet-unindex.c:168
 #: src/nse/gnunet-nse-profiler.c:873
 msgid "be verbose (print progress information)"
@@ -2085,50 +2059,50 @@
 msgid "Prints all packets that go through the DHT."
 msgstr "Imprime todos los paquetes que pasan por la DHT."
 
-#: src/dht/gnunet_dht_profiler.c:1392
+#: src/dht/gnunet_dht_profiler.c:1393
 #: src/testbed/gnunet-testbed-profiler.c:267
 #, fuzzy, c-format
 msgid "Exiting as the number of peers is %u\n"
 msgstr "El número máximo de conexiones es %u\n"
 
-#: src/dht/gnunet_dht_profiler.c:1417
+#: src/dht/gnunet_dht_profiler.c:1418
 msgid "number of peers to start"
 msgstr "número de pares para empezar"
 
-#: src/dht/gnunet_dht_profiler.c:1420
+#: src/dht/gnunet_dht_profiler.c:1421
 msgid ""
 "maximum number of times we try to search for successor circle formation (0 "
 "for R5N)"
 msgstr ""
 
-#: src/dht/gnunet_dht_profiler.c:1423 src/nse/gnunet-nse-profiler.c:864
+#: src/dht/gnunet_dht_profiler.c:1424 src/nse/gnunet-nse-profiler.c:864
 #: src/testbed/gnunet-testbed-profiler.c:306
 msgid "name of the file with the login information for the testbed"
 msgstr ""
 "nombre del fichero con la información de acceso usada para la batería de "
 "pruebas"
 
-#: src/dht/gnunet_dht_profiler.c:1426
+#: src/dht/gnunet_dht_profiler.c:1427
 msgid "delay between rounds for collecting statistics (default: 30 sec)"
 msgstr ""
 
-#: src/dht/gnunet_dht_profiler.c:1429
+#: src/dht/gnunet_dht_profiler.c:1430
 msgid "delay to start doing PUTs (default: 1 sec)"
 msgstr ""
 
-#: src/dht/gnunet_dht_profiler.c:1432
+#: src/dht/gnunet_dht_profiler.c:1433
 msgid "delay to start doing GETs (default: 5 min)"
 msgstr ""
 
-#: src/dht/gnunet_dht_profiler.c:1435
+#: src/dht/gnunet_dht_profiler.c:1436
 msgid "replication degree for DHT PUTs"
 msgstr ""
 
-#: src/dht/gnunet_dht_profiler.c:1438
+#: src/dht/gnunet_dht_profiler.c:1439
 msgid "timeout for DHT PUT and GET requests (default: 1 min)"
 msgstr ""
 
-#: src/dht/gnunet_dht_profiler.c:1456
+#: src/dht/gnunet_dht_profiler.c:1457
 #, fuzzy
 msgid "Measure quality and performance of the DHT service."
 msgstr "Medir la calidad y rendimiento del servicio NSE."
@@ -2295,117 +2269,123 @@
 msgid "# HELLOs obtained from peerinfo"
 msgstr "# «HELLO» obtenidos de «peerinfo»"
 
-#: src/dht/gnunet-service-dht_neighbours.c:516
+#: src/dht/gnunet-service-dht_neighbours.c:515
 msgid "# Preference updates given to core"
 msgstr "# Actualizaciones de preferencias dadas al servicio principal"
 
-#: src/dht/gnunet-service-dht_neighbours.c:610
+#: src/dht/gnunet-service-dht_neighbours.c:609
 msgid "# FIND PEER messages initiated"
 msgstr "# mensajes «FIND PEER» iniciados"
 
-#: src/dht/gnunet-service-dht_neighbours.c:764
-#: src/dht/gnunet-service-xdht_neighbours.c:6055
+#: src/dht/gnunet-service-dht_neighbours.c:763
+#: src/dht/gnunet-service-xdht_neighbours.c:6059
 msgid "# Queued messages discarded (peer disconnected)"
 msgstr "# Mensajes encolados descartados (par desconectado)"
 
-#: src/dht/gnunet-service-dht_neighbours.c:819
-#: src/dht/gnunet-service-xdht_neighbours.c:1012
+#: src/dht/gnunet-service-dht_neighbours.c:793
+#: src/dht/gnunet-service-xdht_neighbours.c:987
+#, fuzzy
+msgid "# Messages dropped (CORE timeout)"
+msgstr "# Peticiones DNS omitidas (expiradas)"
+
+#: src/dht/gnunet-service-dht_neighbours.c:823
+#: src/dht/gnunet-service-xdht_neighbours.c:1019
 msgid "# Bytes transmitted to other peers"
 msgstr "# Bytes transmitidos a otros pares"
 
-#: src/dht/gnunet-service-dht_neighbours.c:857
+#: src/dht/gnunet-service-dht_neighbours.c:861
 msgid "# Bytes of bandwidth requested from core"
 msgstr "# Bytes de ancho de banda solicitados por el servicio principal"
 
-#: src/dht/gnunet-service-dht_neighbours.c:889
+#: src/dht/gnunet-service-dht_neighbours.c:893
 #, fuzzy
 msgid "# requests TTL-dropped"
 msgstr "# peticiones unidas"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1093
-#: src/dht/gnunet-service-dht_neighbours.c:1130
+#: src/dht/gnunet-service-dht_neighbours.c:1097
+#: src/dht/gnunet-service-dht_neighbours.c:1134
 msgid "# Peers excluded from routing due to Bloomfilter"
 msgstr "# Pares excluidos del encaminado debido a «Bloomfilter»"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1108
-#: src/dht/gnunet-service-dht_neighbours.c:1145
+#: src/dht/gnunet-service-dht_neighbours.c:1112
+#: src/dht/gnunet-service-dht_neighbours.c:1149
 msgid "# Peer selection failed"
 msgstr "# Selecciones de pares fallidas"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1289
+#: src/dht/gnunet-service-dht_neighbours.c:1293
 msgid "# PUT requests routed"
 msgstr "# Peticiones «PUT» encaminadas"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1318
+#: src/dht/gnunet-service-dht_neighbours.c:1322
 msgid "# PUT messages queued for transmission"
 msgstr "# mensajes «PUT» encolados para transmisión"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1328
-#: src/dht/gnunet-service-dht_neighbours.c:1452
-#: src/dht/gnunet-service-dht_neighbours.c:1557
-#: src/dht/gnunet-service-xdht_neighbours.c:1121
-#: src/dht/gnunet-service-xdht_neighbours.c:1190
-#: src/dht/gnunet-service-xdht_neighbours.c:1240
-#: src/dht/gnunet-service-xdht_neighbours.c:1304
-#: src/dht/gnunet-service-xdht_neighbours.c:1371
-#: src/dht/gnunet-service-xdht_neighbours.c:1433
-#: src/dht/gnunet-service-xdht_neighbours.c:1495
-#: src/dht/gnunet-service-xdht_neighbours.c:1557
-#: src/dht/gnunet-service-xdht_neighbours.c:1617
+#: src/dht/gnunet-service-dht_neighbours.c:1332
+#: src/dht/gnunet-service-dht_neighbours.c:1456
+#: src/dht/gnunet-service-dht_neighbours.c:1561
+#: src/dht/gnunet-service-xdht_neighbours.c:1129
+#: src/dht/gnunet-service-xdht_neighbours.c:1198
+#: src/dht/gnunet-service-xdht_neighbours.c:1248
+#: src/dht/gnunet-service-xdht_neighbours.c:1312
+#: src/dht/gnunet-service-xdht_neighbours.c:1379
+#: src/dht/gnunet-service-xdht_neighbours.c:1441
+#: src/dht/gnunet-service-xdht_neighbours.c:1503
+#: src/dht/gnunet-service-xdht_neighbours.c:1565
+#: src/dht/gnunet-service-xdht_neighbours.c:1625
 msgid "# P2P messages dropped due to full queue"
 msgstr "# Mensajes P2P omitidos debido a saturación de la cola"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1414
+#: src/dht/gnunet-service-dht_neighbours.c:1418
 msgid "# GET requests routed"
 msgstr "# Peticiones «GET» encaminadas"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1441
+#: src/dht/gnunet-service-dht_neighbours.c:1445
 msgid "# GET messages queued for transmission"
 msgstr "# Mensajes «GET» encolados para transmisión"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1564
+#: src/dht/gnunet-service-dht_neighbours.c:1568
 msgid "# RESULT messages queued for transmission"
 msgstr "# Mensajes «RESULT» encolados para transmisión"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1651
+#: src/dht/gnunet-service-dht_neighbours.c:1655
 msgid "# P2P PUT requests received"
 msgstr "# Peticiones «PUT» P2P recibidas"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1654
+#: src/dht/gnunet-service-dht_neighbours.c:1658
 #, fuzzy
 msgid "# P2P PUT bytes received"
 msgstr "# Peticiones «PUT» P2P recibidas"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1821
+#: src/dht/gnunet-service-dht_neighbours.c:1825
 msgid "# FIND PEER requests ignored due to Bloomfilter"
 msgstr "# Peticiones «FIND PEER» ignoradas debido a «Bloomfilter»"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1829
+#: src/dht/gnunet-service-dht_neighbours.c:1833
 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:1924
+#: src/dht/gnunet-service-dht_neighbours.c:1928
 msgid "# P2P GET requests received"
 msgstr "# Peticiones «GET» P2P recibidas"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1927
+#: src/dht/gnunet-service-dht_neighbours.c:1931
 #, fuzzy
 msgid "# P2P GET bytes received"
 msgstr "# Peticiones «GET» P2P recibidas"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1984
+#: src/dht/gnunet-service-dht_neighbours.c:1988
 msgid "# P2P FIND PEER requests processed"
 msgstr "# Peticiones «FIND PEER» P2P procesadas"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1998
+#: src/dht/gnunet-service-dht_neighbours.c:2002
 msgid "# P2P GET requests ONLY routed"
 msgstr "# Peticiones «GET» P2P SOLAMENTE encaminadas"
 
-#: src/dht/gnunet-service-dht_neighbours.c:2083
+#: src/dht/gnunet-service-dht_neighbours.c:2087
 msgid "# P2P RESULTS received"
 msgstr "# Resultados (RESULTS) P2P recibidos"
 
-#: src/dht/gnunet-service-dht_neighbours.c:2086
+#: src/dht/gnunet-service-dht_neighbours.c:2090
 #, fuzzy
 msgid "# P2P RESULT bytes received"
 msgstr "# Resultados (RESULTS) P2P recibidos"
@@ -2452,78 +2432,78 @@
 msgid "# DHT requests combined"
 msgstr "# Peticiones a la DHT combinadas"
 
-#: src/dht/gnunet-service-xdht_neighbours.c:1824
+#: src/dht/gnunet-service-xdht_neighbours.c:1832
 #, c-format
 msgid ""
 "\n"
 "SUPU %s, %s, %d,trail_length = %d"
 msgstr ""
 
-#: src/dht/gnunet-service-xdht_neighbours.c:1829
+#: src/dht/gnunet-service-xdht_neighbours.c:1837
 #, c-format
 msgid ""
 "\n"
 "SUPU %s, %s, %d,trail[%d]=%s"
 msgstr ""
 
-#: src/dht/gnunet-service-xdht_neighbours.c:1849
+#: src/dht/gnunet-service-xdht_neighbours.c:1857
 #, c-format
 msgid ""
 "\n"
 "SUPU************  FRIEND_PEERMAP of %s"
 msgstr ""
 
-#: src/dht/gnunet-service-xdht_neighbours.c:1859
+#: src/dht/gnunet-service-xdht_neighbours.c:1867
 #, c-format
 msgid ""
 "\n"
 "SUPU %s, %s, %d, friend = %s, friend->trails_count = %d"
 msgstr ""
 
-#: src/dht/gnunet-service-xdht_neighbours.c:1880
+#: src/dht/gnunet-service-xdht_neighbours.c:1888
 #, c-format
 msgid ""
 "\n"
 "SUPU************  FINGER_TABLE of %s"
 msgstr ""
 
-#: src/dht/gnunet-service-xdht_neighbours.c:1889
+#: src/dht/gnunet-service-xdht_neighbours.c:1897
 #, c-format
 msgid ""
 "\n"
 "SUPU %s, %s, %d, finger_table[%d] = %s, trails_count = %d"
 msgstr ""
 
-#: src/dht/gnunet-service-xdht_neighbours.c:1896
+#: src/dht/gnunet-service-xdht_neighbours.c:1904
 #, c-format
 msgid ""
 "\n"
 "SUPU %s, %s, %d, trail_id[%d]=%s"
 msgstr ""
 
-#: src/dht/gnunet-service-xdht_neighbours.c:1902
+#: src/dht/gnunet-service-xdht_neighbours.c:1910
 #, c-format
 msgid ""
 "\n"
 "SUPU %s, %s, %d,trail[%d] = %s "
 msgstr ""
 
-#: src/dht/gnunet-service-xdht_neighbours.c:3551
+#: src/dht/gnunet-service-xdht_neighbours.c:3559
 msgid "# FINGERS_COUNT"
 msgstr ""
 
-#: src/dht/gnunet-service-xdht_neighbours.c:3692
-#: src/dht/gnunet-service-xdht_neighbours.c:3930
-#: src/dht/gnunet-service-xdht_neighbours.c:4083
-#: src/dht/gnunet-service-xdht_neighbours.c:4233
-#: src/dht/gnunet-service-xdht_neighbours.c:4414
-#: src/dht/gnunet-service-xdht_neighbours.c:4929
-#: src/dht/gnunet-service-xdht_neighbours.c:5323
-#: src/dht/gnunet-service-xdht_neighbours.c:5416
-#: src/dht/gnunet-service-xdht_neighbours.c:5505
-#: src/dht/gnunet-service-xdht_neighbours.c:5609
-#: src/dht/gnunet-service-xdht_neighbours.c:5753
-#: src/dht/gnunet-service-xdht_neighbours.c:5842
+#: 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
 #, fuzzy
 msgid "# Bytes received from other peers"
 msgstr "# respuestas recibidas de otros pares"
@@ -2921,132 +2901,6 @@
 msgid "Daemon to run to provide an IP exit node for the VPN"
 msgstr "Demonio a ejecutar para obtener un nodo de salida IP para la VPN"
 
-#: src/experimentation/gnunet-daemon-experimentation.c:55
-msgid "Experimentation daemon shutting down ...\n"
-msgstr ""
-
-#: src/experimentation/gnunet-daemon-experimentation.c:77
-msgid "Experimentation daemon starting ...\n"
-msgstr ""
-
-#: src/experimentation/gnunet-daemon-experimentation.c:83
-#, fuzzy
-msgid "Failed to create statistics!\n"
-msgstr "Se produjo un fallo al crear los índices\n"
-
-#: src/experimentation/gnunet-daemon-experimentation.c:120
-msgid "GNUnet experimentation daemon"
-msgstr ""
-
-#: src/experimentation/gnunet-daemon-experimentation_experiments.c:241
-#, c-format
-msgid "Experiment `%s': Experiment signature is invalid\n"
-msgstr ""
-
-#: src/experimentation/gnunet-daemon-experimentation_experiments.c:250
-#, c-format
-msgid ""
-"Adding experiment `%s' running from `%s' to `%s' every %llu sec. for %llu "
-"sec. \n"
-msgstr ""
-
-#: src/experimentation/gnunet-daemon-experimentation_experiments.c:303
-#, c-format
-msgid "Experiment `%s': Issuer missing\n"
-msgstr ""
-
-#: src/experimentation/gnunet-daemon-experimentation_experiments.c:312
-#, c-format
-msgid "Experiment `%s': Issuer invalid\n"
-msgstr ""
-
-#: src/experimentation/gnunet-daemon-experimentation_experiments.c:320
-#, c-format
-msgid "Experiment `%s': Issuer not accepted!\n"
-msgstr ""
-
-#: src/experimentation/gnunet-daemon-experimentation_experiments.c:330
-#, c-format
-msgid "Experiment `%s': Version missing or invalid \n"
-msgstr ""
-
-#: src/experimentation/gnunet-daemon-experimentation_experiments.c:339
-#, c-format
-msgid "Experiment `%s': Required capabilities missing \n"
-msgstr ""
-
-#: src/experimentation/gnunet-daemon-experimentation_experiments.c:345
-#, c-format
-msgid "Experiment `%s': Required capabilities invalid \n"
-msgstr ""
-
-#: src/experimentation/gnunet-daemon-experimentation_experiments.c:390
-#, fuzzy, c-format
-msgid "Failed to parse file `%s'\n"
-msgstr "Se produjo un fallo al procesar «HELLO» en el fichero «%s»\n"
-
-#: src/experimentation/gnunet-daemon-experimentation_experiments.c:420
-#: src/experimentation/gnunet-daemon-experimentation_experiments.c:452
-msgid ""
-"No valid experiment issuers configured! Set value to public keys of issuers! "
-"Exiting.\n"
-msgstr ""
-
-#: src/experimentation/gnunet-daemon-experimentation_experiments.c:435
-#, fuzzy
-msgid "Invalid value for public key\n"
-msgstr "Parámetro no válido «%s»\n"
-
-#: src/experimentation/gnunet-daemon-experimentation_experiments.c:473
-#, fuzzy, c-format
-msgid "Cannot read experiments file `%s'\n"
-msgstr "No se pudo leer la lista de amigos «%s»\n"
-
-#: src/experimentation/gnunet-daemon-experimentation_nodes.c:221
-#, c-format
-msgid "Cannot send message to peer `%s' for experiment `%s'\n"
-msgstr ""
-
-#: src/experimentation/gnunet-daemon-experimentation_nodes.c:309
-#, c-format
-msgid "Sending experimentation request to peer %s\n"
-msgstr ""
-
-#: src/experimentation/gnunet-daemon-experimentation_nodes.c:453
-#, c-format
-msgid "Added peer `%s' as active node\n"
-msgstr ""
-
-#: src/experimentation/gnunet-daemon-experimentation_nodes.c:891
-#, fuzzy, c-format
-msgid "Connected to peer %s\n"
-msgstr "Conectado a %s.\n"
-
-#: src/experimentation/gnunet-daemon-experimentation_nodes.c:921
-#, fuzzy, c-format
-msgid "Disconnected from peer %s\n"
-msgstr "Desconectado de %s\n"
-
-#: src/experimentation/gnunet-daemon-experimentation_scheduler.c:108
-#, c-format
-msgid "Peer `%s' did not respond to request for experiment `%s'\n"
-msgstr ""
-
-#: src/experimentation/gnunet-daemon-experimentation_scheduler.c:143
-#, fuzzy, c-format
-msgid "Starting inbound experiment `%s' with peer `%s'\n"
-msgstr "Iniciando el servicio %s para el par «%4s»\n"
-
-#: src/experimentation/gnunet-daemon-experimentation_scheduler.c:276
-#, fuzzy, c-format
-msgid "Starting outbound experiment `%s' with peer `%s'\n"
-msgstr "Iniciando el servicio %s para el par «%4s»\n"
-
-#: src/experimentation/gnunet-daemon-experimentation_scheduler.c:294
-#, fuzzy, c-format
-msgid "Received %s message from peer %s for experiment `%s'\n"
-msgstr "Recibido último mensaje para %s\n"
-
 #: src/fragmentation/defragmentation.c:270
 msgid "# acknowledgements sent for fragment"
 msgstr "# reconocimientos enviados por framentos"
@@ -3096,79 +2950,79 @@
 msgid "# fragmentation transmissions completed"
 msgstr "# transmisiones de fragmentos completadas"
 
-#: src/fs/fs_api.c:474
+#: src/fs/fs_api.c:484
 #, c-format
 msgid "Could not open file `%s': %s"
 msgstr "No se pudo abrir el fichero «%s»: %s"
 
-#: src/fs/fs_api.c:485
+#: src/fs/fs_api.c:495
 #, c-format
 msgid "Could not read file `%s': %s"
 msgstr "No se pudo leer el fichero «%s»: %s"
 
 # Short read??
-#: src/fs/fs_api.c:493
+#: src/fs/fs_api.c:503
 #, c-format
 msgid "Short read reading from file `%s'!"
 msgstr "¡Lectura corta leyendo del fichero «%s»!"
 
-#: src/fs/fs_api.c:1101
+#: src/fs/fs_api.c:1111
 #, c-format
 msgid "Failed to resume publishing information `%s': %s\n"
 msgstr "Se produjo un fallo al retomar la operación de publicación «%s»: %s\n"
 
-#: src/fs/fs_api.c:1621
+#: src/fs/fs_api.c:1631
 #, c-format
 msgid "Failure while resuming publishing operation `%s': %s\n"
 msgstr "Fallo mientras se reiniciaba la operación de publicación «%s»: %s\n"
 
-#: src/fs/fs_api.c:1635
+#: src/fs/fs_api.c:1645
 #, c-format
 msgid "Failed to resume publishing operation `%s': %s\n"
 msgstr "Se produjo un fallo al retomar la operación de publicación «%s»: %s\n"
 
-#: src/fs/fs_api.c:2293
+#: src/fs/fs_api.c:2303
 #, c-format
 msgid "Failure while resuming unindexing operation `%s': %s\n"
 msgstr ""
 "Se produjo un fallo mientras se retomaba la operación de publicación «%s»: "
 "%s\n"
 
-#: src/fs/fs_api.c:2303
+#: src/fs/fs_api.c:2313
 #, c-format
 msgid "Failed to resume unindexing operation `%s': %s\n"
 msgstr "Se produjo un fallo al retomar la operación de desindexado «%s»: %s\n"
 
-#: src/fs/fs_api.c:2431 src/fs/fs_api.c:2679
+#: src/fs/fs_api.c:2441 src/fs/fs_api.c:2689
 #, c-format
 msgid "Failed to resume sub-download `%s': %s\n"
 msgstr "Se produjo un fallo al retomar la sub-descarga «%s»: %s\n"
 
-#: src/fs/fs_api.c:2449
+#: src/fs/fs_api.c:2459
 #, c-format
 msgid "Failed to resume sub-search `%s': %s\n"
 msgstr "Se produjo un fallo al retomar la sub-búsqueda «%s»: %s\n"
 
-#: src/fs/fs_api.c:2464 src/fs/fs_api.c:2483 src/fs/fs_api.c:2975
+#: src/fs/fs_api.c:2474 src/fs/fs_api.c:2493 src/fs/fs_api.c:2985
 #, c-format
 msgid "Failure while resuming search operation `%s': %s\n"
 msgstr ""
 "Se produjo un fallo mientras se retomaba la operación de búsqueda «%s»: %s\n"
 
-#: src/fs/fs_api.c:2669
+#: src/fs/fs_api.c:2679
 #, c-format
 msgid "Failed to resume sub-download `%s': could not open file `%s'\n"
 msgstr ""
 "Se produjo un fallo al retomar la sub-descarga «%s»: no se pudo abrir el "
 "fichero «%s»\n"
 
-#: src/fs/fs_api.c:2918
+#: src/fs/fs_api.c:2928
 msgid "Could not resume running search, will resume as paused search\n"
 msgstr ""
 "No se pudo retomar la búsqueda en ejecución, se retomará como una búsqueda "
 "en pausa\n"
 
-#: src/fs/fs_api.c:3013
+#: src/fs/fs_api.c:3023
 #, c-format
 msgid "Failure while resuming download operation `%s': %s\n"
 msgstr ""
@@ -3304,7 +3158,7 @@
 msgstr "Publicación fallida: %s"
 
 #: src/fs/fs_publish.c:683 src/fs/fs_publish.c:700 src/fs/fs_publish.c:739
-#: src/fs/fs_publish.c:760 src/fs/fs_publish.c:784 src/fs/fs_publish.c:934
+#: src/fs/fs_publish.c:760 src/fs/fs_publish.c:784 src/fs/fs_publish.c:1034
 #, c-format
 msgid "Can not index file `%s': %s.  Will try to insert instead.\n"
 msgstr "No se pudo indexar el fichero «%s»: %s.  Se intentará insertar.\n"
@@ -3337,26 +3191,30 @@
 msgstr ""
 "Se produjo un fallo al obtener los identificadores de fichero para «%s»\n"
 
-#: src/fs/fs_publish.c:878
+#: src/fs/fs_publish.c:873 src/fs/fs_publish.c:914
+msgid "Can not create LOC URI. Will continue with CHK instead.\n"
+msgstr ""
+
+#: src/fs/fs_publish.c:988
 #, c-format
 msgid "Recursive upload failed at `%s': %s"
 msgstr "La subida recursiva falló en «%s»: %s"
 
-#: src/fs/fs_publish.c:884
+#: src/fs/fs_publish.c:996
 #, c-format
 msgid "Recursive upload failed: %s"
 msgstr "Subida recursiva fallida: %s"
 
-#: src/fs/fs_publish.c:936
+#: src/fs/fs_publish.c:1036
 msgid "needs to be an actual file"
 msgstr "tiene que ser un fichero de verdad"
 
-#: src/fs/fs_publish.c:1172
+#: src/fs/fs_publish.c:1272
 #, c-format
 msgid "Insufficient space for publishing: %s"
 msgstr "Espacio insuficiente para publicar: %s"
 
-#: src/fs/fs_publish.c:1263
+#: src/fs/fs_publish.c:1363
 #, c-format
 msgid "Reserving space for %u entries and %llu bytes for publication\n"
 msgstr "Reservando espacio para %u entradas y %llu bytes para publicación\n"
@@ -3369,12 +3227,12 @@
 msgid "Internal error."
 msgstr "Error interno."
 
-#: src/fs/fs_search.c:778 src/fs/fs_search.c:848
+#: src/fs/fs_search.c:812 src/fs/fs_search.c:882
 #, fuzzy, c-format
 msgid "Failed to parse URI `%s': %s\n"
 msgstr "Se produjo un fallo al procesar la URI: %s\n"
 
-#: src/fs/fs_search.c:907
+#: src/fs/fs_search.c:941
 #, c-format
 msgid "Got result with unknown block type `%d', ignoring"
 msgstr ""
@@ -3526,50 +3384,41 @@
 msgid "Unrecognized URI type"
 msgstr "Tipo de URI no reconocido"
 
-#: src/fs/fs_uri.c:865
-msgid "Lacking key configuration settings.\n"
-msgstr "Falta configuración sobre las opciones de claves.\n"
-
-#: src/fs/fs_uri.c:871
-#, c-format
-msgid "Could not access hostkey file `%s'.\n"
-msgstr "No se pudo acceder al fichero de clave de máquina «%s».\n"
-
-#: src/fs/fs_uri.c:1056 src/fs/fs_uri.c:1083
+#: src/fs/fs_uri.c:1043 src/fs/fs_uri.c:1070
 msgid "No keywords specified!\n"
 msgstr "¡Ninguna palabra clave especificada!\n"
 
-#: src/fs/fs_uri.c:1089
+#: src/fs/fs_uri.c:1076
 msgid "Number of double-quotes not balanced!\n"
 msgstr "¡Número de comillas dobles no balanceado!\n"
 
-#: src/fs/gnunet-auto-share.c:236
+#: src/fs/gnunet-auto-share.c:237
 #, c-format
 msgid "Failed to load state: %s\n"
 msgstr "Se produjo un fallo al cargar el estado: %s\n"
 
-#: src/fs/gnunet-auto-share.c:289 src/fs/gnunet-auto-share.c:299
-#: src/fs/gnunet-auto-share.c:309
+#: src/fs/gnunet-auto-share.c:290 src/fs/gnunet-auto-share.c:300
+#: src/fs/gnunet-auto-share.c:310
 #, c-format
 msgid "Failed to save state to file %s\n"
 msgstr "Se produjo un fallo al guardar el estado en el fichero %s\n"
 
-#: src/fs/gnunet-auto-share.c:401
+#: src/fs/gnunet-auto-share.c:402
 #, c-format
 msgid "Publication of `%s' done\n"
 msgstr "Publicación de «%s» finalizada\n"
 
-#: src/fs/gnunet-auto-share.c:488
+#: src/fs/gnunet-auto-share.c:490
 #, c-format
 msgid "Publishing `%s'\n"
 msgstr "Publicando «%s»\n"
 
-#: src/fs/gnunet-auto-share.c:497
+#: src/fs/gnunet-auto-share.c:499
 #, c-format
 msgid "Failed to run `%s'\n"
 msgstr "Se produjo un fallo al ejecutar «%s»\n"
 
-#: src/fs/gnunet-auto-share.c:686
+#: src/fs/gnunet-auto-share.c:688
 #, c-format
 msgid ""
 "You must specify one and only one directory name for automatic publication.\n"
@@ -3577,28 +3426,28 @@
 "Debes especificar uno y solo un nombre de directorio para publicación "
 "automática.\n"
 
-#: src/fs/gnunet-auto-share.c:737 src/fs/gnunet-publish.c:886
+#: src/fs/gnunet-auto-share.c:739 src/fs/gnunet-publish.c:888
 msgid "set the desired LEVEL of sender-anonymity"
 msgstr "establece el nivel LEVEL deseado de anonimato del emisor"
 
-#: src/fs/gnunet-auto-share.c:741 src/fs/gnunet-publish.c:890
+#: src/fs/gnunet-auto-share.c:743 src/fs/gnunet-publish.c:892
 msgid "disable adding the creation time to the metadata of the uploaded file"
 msgstr ""
 "deshabilitar añadir tiempo de creación a los metadatos del fichero subido"
 
-#: src/fs/gnunet-auto-share.c:744 src/fs/gnunet-publish.c:893
+#: src/fs/gnunet-auto-share.c:746 src/fs/gnunet-publish.c:895
 msgid "do not use libextractor to add keywords or metadata"
 msgstr "no usar libextractor para añadir palabras clave o metadatos"
 
-#: src/fs/gnunet-auto-share.c:747 src/fs/gnunet-publish.c:917
+#: src/fs/gnunet-auto-share.c:749 src/fs/gnunet-publish.c:919
 msgid "specify the priority of the content"
 msgstr "especificar la prioridad del contenido"
 
-#: src/fs/gnunet-auto-share.c:750 src/fs/gnunet-publish.c:924
+#: src/fs/gnunet-auto-share.c:752 src/fs/gnunet-publish.c:926
 msgid "set the desired replication LEVEL"
 msgstr "establece el nivel LEVEL deseado de replicación"
 
-#: src/fs/gnunet-auto-share.c:770
+#: src/fs/gnunet-auto-share.c:772
 msgid "Automatically publish files from a directory on GNUnet"
 msgstr "Publicar automáticamente ficheros de un directorio en GNUnet"
 
@@ -3677,7 +3526,7 @@
 msgid "You need to specify a URI argument.\n"
 msgstr "Tiene que especificar una URI como parámetro.\n"
 
-#: src/fs/gnunet-download.c:240 src/fs/gnunet-publish.c:712
+#: src/fs/gnunet-download.c:240 src/fs/gnunet-publish.c:714
 #, c-format
 msgid "Failed to parse URI: %s\n"
 msgstr "Se produjo un fallo al procesar la URI: %s\n"
@@ -3690,7 +3539,7 @@
 msgid "Target filename must be specified.\n"
 msgstr "El nombre de fichero de destino debe ser especificado.\n"
 
-#: src/fs/gnunet-download.c:268 src/fs/gnunet-publish.c:856
+#: src/fs/gnunet-download.c:268 src/fs/gnunet-publish.c:858
 #: src/fs/gnunet-search.c:250 src/fs/gnunet-unindex.c:140
 #, c-format
 msgid "Could not initialize `%s' subsystem.\n"
@@ -3799,57 +3648,57 @@
 msgid "Keywords for file `%s' (%s)\n"
 msgstr "Palabras clave para el fichero «%s» (%s)\n"
 
-#: src/fs/gnunet-publish.c:572
+#: src/fs/gnunet-publish.c:574
 msgid "Could not publish\n"
 msgstr "No se pudo publicar\n"
 
-#: src/fs/gnunet-publish.c:597
+#: src/fs/gnunet-publish.c:599
 msgid "Could not start publishing.\n"
 msgstr "No se pudo empezar a publicar.\n"
 
-#: src/fs/gnunet-publish.c:631
+#: src/fs/gnunet-publish.c:633
 #, c-format
 msgid "Scanning directory `%s'.\n"
 msgstr "Escaneando directorio «%s».\n"
 
-#: src/fs/gnunet-publish.c:635
+#: src/fs/gnunet-publish.c:637
 #, c-format
 msgid "Scanning file `%s'.\n"
 msgstr "Escaneando fichero «%s».\n"
 
-#: src/fs/gnunet-publish.c:641
+#: src/fs/gnunet-publish.c:643
 #, c-format
 msgid "There was trouble processing file `%s', skipping it.\n"
 msgstr "Hubo un problema procesando el fichero «%s», omitiéndolo.\n"
 
-#: src/fs/gnunet-publish.c:648
+#: src/fs/gnunet-publish.c:650
 msgid "Preprocessing complete.\n"
 msgstr "Preprocesado completo.\n"
 
-#: src/fs/gnunet-publish.c:653
+#: src/fs/gnunet-publish.c:655
 #, c-format
 msgid "Extracting meta data from file `%s' complete.\n"
 msgstr "Extracción de metadatos del fichero «%s» completa.\n"
 
-#: src/fs/gnunet-publish.c:660
+#: src/fs/gnunet-publish.c:662
 msgid "Meta data extraction has finished.\n"
 msgstr "La extracción de metadatos ha finalizado.\n"
 
-#: src/fs/gnunet-publish.c:669
+#: src/fs/gnunet-publish.c:671
 msgid "Internal error scanning directory.\n"
 msgstr "Error interno escaneando directorio.\n"
 
-#: src/fs/gnunet-publish.c:701
+#: src/fs/gnunet-publish.c:703
 #, fuzzy, c-format
 msgid "Selected pseudonym `%s' unknown\n"
 msgstr "Espacio de nombres «%s» desconocido.\n"
 
-#: src/fs/gnunet-publish.c:733
+#: src/fs/gnunet-publish.c:735
 #, c-format
 msgid "Failed to access `%s': %s\n"
 msgstr "Se produjo un fallo al acceder «%s»: %s\n"
 
-#: src/fs/gnunet-publish.c:747
+#: src/fs/gnunet-publish.c:749
 msgid ""
 "Failed to start meta directory scanner.  Is gnunet-helper-publish-fs "
 "installed?\n"
@@ -3857,34 +3706,34 @@
 "Se produjo un fallo al iniciar el meta-escáner de directorios.  ¿Está "
 "«gnunet-helper-publish-fs» instalado?\n"
 
-#: src/fs/gnunet-publish.c:803
+#: src/fs/gnunet-publish.c:805
 #, c-format
 msgid "Cannot extract metadata from a URI!\n"
 msgstr "¡No se pueden extraer metadatos de una URI!\n"
 
-#: src/fs/gnunet-publish.c:810
+#: src/fs/gnunet-publish.c:812
 #, c-format
 msgid "You must specify one and only one filename for insertion.\n"
 msgstr "Se debe especificar uno y solo un nombre de fichero para insertar.\n"
 
-#: src/fs/gnunet-publish.c:816
+#: src/fs/gnunet-publish.c:818
 #, c-format
 msgid "You must NOT specify an URI and a filename.\n"
 msgstr "No se puede especificar una URI y un nombre de fichero.\n"
 
-#: src/fs/gnunet-publish.c:824 src/vpn/gnunet-vpn.c:209
+#: src/fs/gnunet-publish.c:826 src/vpn/gnunet-vpn.c:209
 #, c-format
 msgid "Option `%s' is required when using option `%s'.\n"
 msgstr "La opción «%s» es obligatoria cuando se usa la opción «%s».\n"
 
-#: src/fs/gnunet-publish.c:835 src/fs/gnunet-publish.c:843
-#: src/transport/gnunet-transport.c:1893 src/transport/gnunet-transport.c:1923
-#: src/transport/gnunet-transport.c:1953
+#: src/fs/gnunet-publish.c:837 src/fs/gnunet-publish.c:845
+#: src/transport/gnunet-transport.c:1891 src/transport/gnunet-transport.c:1921
+#: src/transport/gnunet-transport.c:1952
 #, c-format
 msgid "Option `%s' makes no sense without option `%s'.\n"
 msgstr "La opción «%s» no tiene sentido sin la opción «%s».\n"
 
-#: src/fs/gnunet-publish.c:897
+#: src/fs/gnunet-publish.c:899
 msgid ""
 "print list of extracted keywords that would be used, but do not perform "
 "upload"
@@ -3892,7 +3741,7 @@
 "imprimir una lista de las palabras clave extraídas que podrían ser usadas, "
 "pero sin realizar la subida"
 
-#: src/fs/gnunet-publish.c:901
+#: src/fs/gnunet-publish.c:903
 msgid ""
 "add an additional keyword for the top-level file or directory (this option "
 "can be specified multiple times)"
@@ -3900,11 +3749,11 @@
 "añadir una palabra clave adicional para el fichero del nivel más alto o el "
 "directorio (esta opción puede ser especificada varias veces)"
 
-#: src/fs/gnunet-publish.c:905
+#: src/fs/gnunet-publish.c:907
 msgid "set the meta-data for the given TYPE to the given VALUE"
 msgstr "establece los metadatos para el tipo TYPE dado al valor VALUE dado"
 
-#: src/fs/gnunet-publish.c:908
+#: src/fs/gnunet-publish.c:910
 msgid ""
 "do not index, perform full insertion (stores entire file in encrypted form "
 "in GNUnet database)"
@@ -3912,7 +3761,7 @@
 "no indexar, hacer inserciones totales (almacena el fichero entero de forma "
 "cifrada en la base de datos de GNUnet)"
 
-#: src/fs/gnunet-publish.c:913
+#: src/fs/gnunet-publish.c:915
 msgid ""
 "specify ID of an updated version to be published in the future (for "
 "namespace insertions only)"
@@ -3920,13 +3769,13 @@
 "especificar la ID de una versión actualizada para ser publicada en el futuro "
 "(para inserciones en el espacio de nombres únicamente)"
 
-#: src/fs/gnunet-publish.c:921
+#: src/fs/gnunet-publish.c:923
 msgid "publish the files under the pseudonym NAME (place file into namespace)"
 msgstr ""
 "publicar los ficheros bajo el seudónimo NAME (coloca el fichero en el "
 "espacio)"
 
-#: src/fs/gnunet-publish.c:927
+#: src/fs/gnunet-publish.c:929
 msgid ""
 "only simulate the process but do not do any actual publishing (useful to "
 "compute URIs)"
@@ -3934,14 +3783,14 @@
 "únicamente simular el proceso pero no publicar nada realmente (útil para "
 "calcular URI)"
 
-#: src/fs/gnunet-publish.c:931
+#: src/fs/gnunet-publish.c:933
 msgid ""
 "set the ID of this version of the publication (for namespace insertions only)"
 msgstr ""
 "establece la ID de esta versión de la publicación (para inserciones en el "
 "espacio únicamente)"
 
-#: src/fs/gnunet-publish.c:935
+#: src/fs/gnunet-publish.c:937
 msgid ""
 "URI to be published (can be used instead of passing a file to add keywords "
 "to the file with the respective URI)"
@@ -3949,7 +3798,7 @@
 "URI a ser publicada (puede ser usado en vez de pasar un fichero para añadir "
 "claves con el fichero con la URI respectiva)"
 
-#: src/fs/gnunet-publish.c:951
+#: src/fs/gnunet-publish.c:953
 msgid "Publish a file or directory on GNUnet"
 msgstr "Publicar un fichero o un directorio en GNUnet"
 
@@ -3989,17 +3838,24 @@
 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:277
+#: src/fs/gnunet-service-fs.c:285
 msgid "# running average P2P latency (ms)"
 msgstr "# latencia media de P2P en ejecución (ms)"
 
-#: src/fs/gnunet-service-fs.c:332 src/fs/gnunet-service-fs.c:540
+#: src/fs/gnunet-service-fs.c:344 src/fs/gnunet-service-fs.c:607
 msgid "# Loopback routes suppressed"
 msgstr "# Rutas en bucle local eliminadas"
 
-#: src/fs/gnunet-service-fs.c:650 src/hostlist/gnunet-daemon-hostlist.c:303
-#: src/sensordashboard/gnunet-service-sensordashboard.c:854
-#: src/sensordashboard/gnunet-service-sensordashboard.c:862
+#: src/fs/gnunet-service-fs.c:731
+#, 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/sensordashboard/gnunet-service-sensordashboard.c:864
+#: src/sensordashboard/gnunet-service-sensordashboard.c:872
 #: src/topology/gnunet-daemon-topology.c:1287
 #: src/topology/gnunet-daemon-topology.c:1294
 #, c-format
@@ -4042,84 +3898,84 @@
 msgid "# cadet connections active"
 msgstr "# conexiones «stream» activas"
 
-#: src/fs/gnunet-service-fs_cp.c:698
+#: src/fs/gnunet-service-fs_cp.c:710
 msgid "# migration stop messages received"
 msgstr "# mensajes de detención de migración recibidos"
 
-#: src/fs/gnunet-service-fs_cp.c:702
+#: src/fs/gnunet-service-fs_cp.c:714
 #, 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:737
+#: src/fs/gnunet-service-fs_cp.c:750
 msgid "# replies transmitted to other peers"
 msgstr "# respuestas transmitidas a otros pares"
 
-#: src/fs/gnunet-service-fs_cp.c:743
+#: src/fs/gnunet-service-fs_cp.c:756
 msgid "# replies dropped"
 msgstr "# respuestas omitidas"
 
-#: src/fs/gnunet-service-fs_cp.c:768 src/fs/gnunet-service-fs_cp.c:1317
+#: src/fs/gnunet-service-fs_cp.c:781 src/fs/gnunet-service-fs_cp.c:1337
 msgid "# P2P searches active"
 msgstr "# busquedas P2P activas"
 
-#: src/fs/gnunet-service-fs_cp.c:861
+#: src/fs/gnunet-service-fs_cp.c:878
 msgid "# artificial delays introduced (ms)"
 msgstr "# retardos artificiales introducidos (ms)"
 
-#: src/fs/gnunet-service-fs_cp.c:914
+#: src/fs/gnunet-service-fs_cp.c:934
 msgid "# replies dropped due to type mismatch"
 msgstr "# respuestas omitidas debido a incompatibilidad de tipos"
 
-#: src/fs/gnunet-service-fs_cp.c:922
+#: src/fs/gnunet-service-fs_cp.c:942
 msgid "# replies received for other peers"
 msgstr "# respuestas recibidas de otros pares"
 
-#: src/fs/gnunet-service-fs_cp.c:936
+#: src/fs/gnunet-service-fs_cp.c:956
 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:974
+#: src/fs/gnunet-service-fs_cp.c:994
 msgid "# P2P searches destroyed due to ultimate reply"
 msgstr "# búsquedas P2P destruidas debido a respuesta definitiva"
 
-#: src/fs/gnunet-service-fs_cp.c:1042
+#: src/fs/gnunet-service-fs_cp.c:1062
 msgid "# requests done for free (low load)"
 msgstr "# peticiones realizadas gratuitamente (baja carga)"
 
-#: src/fs/gnunet-service-fs_cp.c:1067
+#: src/fs/gnunet-service-fs_cp.c:1087
 msgid "# request dropped, priority insufficient"
 msgstr "# peticiones omitidas, prioridad insuficiente"
 
-#: src/fs/gnunet-service-fs_cp.c:1077
+#: src/fs/gnunet-service-fs_cp.c:1097
 msgid "# requests done for a price (normal load)"
 msgstr "# peticiones realizadas por un precio (carga normal)"
 
-#: src/fs/gnunet-service-fs_cp.c:1155
+#: src/fs/gnunet-service-fs_cp.c:1175
 msgid "# GET requests received (from other peers)"
 msgstr "# peticiones «GET» recibidas (de otros pares)"
 
-#: src/fs/gnunet-service-fs_cp.c:1189
+#: src/fs/gnunet-service-fs_cp.c:1209
 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:1211
+#: src/fs/gnunet-service-fs_cp.c:1231
 msgid "# requests dropped due to missing reverse route"
 msgstr "# peticiones omitidas debido a falta de ruta inversa"
 
-#: src/fs/gnunet-service-fs_cp.c:1262
+#: src/fs/gnunet-service-fs_cp.c:1282
 msgid "# requests dropped due TTL underflow"
 msgstr "# peticiones omitidas debido a expiración del TTL"
 
-#: src/fs/gnunet-service-fs_cp.c:1286
+#: src/fs/gnunet-service-fs_cp.c:1306
 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:1315
+#: src/fs/gnunet-service-fs_cp.c:1335
 msgid "# P2P query messages received and processed"
 msgstr "# mensajes de búsqueda P2P recibidos y procesados"
 
-#: src/fs/gnunet-service-fs_cp.c:1691
+#: src/fs/gnunet-service-fs_cp.c:1754
 msgid "# migration stop messages sent"
 msgstr "# mensajes de detención de migración enviados"
 
@@ -4174,19 +4030,19 @@
 msgid "Indexed file `%s' changed at offset %llu\n"
 msgstr "El fichero indexado «%s» ha cambiado en el desplazamiento %llu\n"
 
-#: src/fs/gnunet-service-fs_lc.c:202 src/fs/gnunet-service-fs_lc.c:370
+#: src/fs/gnunet-service-fs_lc.c:201 src/fs/gnunet-service-fs_lc.c:371
 msgid "# client searches active"
 msgstr "# búsquedas de clientes activas"
 
-#: src/fs/gnunet-service-fs_lc.c:258
+#: src/fs/gnunet-service-fs_lc.c:259
 msgid "# replies received for local clients"
 msgstr "# respuestas recibidas de clientes locales"
 
-#: src/fs/gnunet-service-fs_lc.c:329
+#: src/fs/gnunet-service-fs_lc.c:330
 msgid "# client searches received"
 msgstr "# búsquedas de clientes recibidas"
 
-#: src/fs/gnunet-service-fs_lc.c:364
+#: src/fs/gnunet-service-fs_lc.c:365
 msgid "# client searches updated (merged content seen list)"
 msgstr ""
 "# búsquedas de clientes actualizadas (contenido unido visto en la lista)"
@@ -4255,84 +4111,84 @@
 msgid "# results found locally"
 msgstr "# resultados hallados localmente"
 
-#: src/fs/gnunet-service-fs_pr.c:1001
+#: src/fs/gnunet-service-fs_pr.c:1003
 msgid "# Datastore `PUT' failures"
 msgstr "# «PUT» en el almacén de datos fallidos"
 
-#: src/fs/gnunet-service-fs_pr.c:1029
+#: src/fs/gnunet-service-fs_pr.c:1031
 msgid "# storage requests dropped due to high load"
 msgstr "# peticiones de almacenamiento omitidas debido a alta carga"
 
-#: src/fs/gnunet-service-fs_pr.c:1064
+#: src/fs/gnunet-service-fs_pr.c:1069
 msgid "# Replies received from DHT"
 msgstr "# Respuestas recibidas de la DHT"
 
-#: src/fs/gnunet-service-fs_pr.c:1192
+#: src/fs/gnunet-service-fs_pr.c:1200
 #, fuzzy
 msgid "# Replies received from CADET"
 msgstr "# Respuestas recibidas de la DHT"
 
-#: src/fs/gnunet-service-fs_pr.c:1244
+#: src/fs/gnunet-service-fs_pr.c:1252
 #, 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:1264
+#: src/fs/gnunet-service-fs_pr.c:1272
 #, 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:1311
+#: src/fs/gnunet-service-fs_pr.c:1319
 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:1326
+#: src/fs/gnunet-service-fs_pr.c:1334
 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:1335
+#: src/fs/gnunet-service-fs_pr.c:1343
 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:1350
+#: src/fs/gnunet-service-fs_pr.c:1358
 msgid "# requested DBLOCK or IBLOCK not found"
 msgstr "# «DBLOCK» o «IBLOCK» pedido no encontrado"
 
-#: src/fs/gnunet-service-fs_pr.c:1364
+#: src/fs/gnunet-service-fs_pr.c:1372
 msgid "# on-demand blocks matched requests"
 msgstr "# peticiones asociadas de bloques bajo demanda"
 
-#: src/fs/gnunet-service-fs_pr.c:1377
+#: src/fs/gnunet-service-fs_pr.c:1385
 msgid "# on-demand lookups performed successfully"
 msgstr "# búsquedas satisfactorias de bloques bajo demanda"
 
-#: src/fs/gnunet-service-fs_pr.c:1382
+#: src/fs/gnunet-service-fs_pr.c:1390
 msgid "# on-demand lookups failed"
 msgstr "# búsquedas fallidas de bloques bajo demanda"
 
-#: src/fs/gnunet-service-fs_pr.c:1409 src/fs/gnunet-service-fs_pr.c:1449
-#: src/fs/gnunet-service-fs_pr.c:1612
+#: src/fs/gnunet-service-fs_pr.c:1417 src/fs/gnunet-service-fs_pr.c:1457
+#: src/fs/gnunet-service-fs_pr.c:1620
 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:1467
+#: src/fs/gnunet-service-fs_pr.c:1475
 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:1478
+#: src/fs/gnunet-service-fs_pr.c:1486
 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:1588
+#: src/fs/gnunet-service-fs_pr.c:1596
 msgid "# Datastore lookups initiated"
 msgstr "# Búsquedas en el almacén de datos iniciadas"
 
-#: src/fs/gnunet-service-fs_pr.c:1673
+#: src/fs/gnunet-service-fs_pr.c:1685
 msgid "# GAP PUT messages received"
 msgstr "# Mensajes «GAP PUT» recibidos"
 
-#: src/fs/gnunet-service-fs_push.c:631
+#: src/fs/gnunet-service-fs_push.c:672
 msgid "time required, content pushing disabled"
 msgstr "se requiere tiempo, publicación de contenido deshabilitada"
 
@@ -4375,7 +4231,7 @@
 msgid "Refusing `%s' request to HTTP server\n"
 msgstr "Rechazando petición «%s» al servidor de listas de máquinas\n"
 
-#: src/gns/gnunet-bcd.c:355 src/hostlist/gnunet-daemon-hostlist_server.c:696
+#: src/gns/gnunet-bcd.c:355 src/hostlist/gnunet-daemon-hostlist_server.c:759
 #, c-format
 msgid "Invalid port number %llu.  Exiting.\n"
 msgstr "Número de puerto %llu no válido.  Saliendo.\n"
@@ -4399,64 +4255,64 @@
 msgid "GNUnet HTTP server to create business cards"
 msgstr ""
 
-#: src/gns/gnunet-dns2gns.c:228
+#: src/gns/gnunet-dns2gns.c:234
 msgid "Failed to pack DNS response into UDP packet!\n"
 msgstr ""
 "¡Se produjo un fallo al empaquetar una respuesta DNS en un paquete UDP!\n"
 
-#: src/gns/gnunet-dns2gns.c:400
+#: src/gns/gnunet-dns2gns.c:406
 #, c-format
 msgid "Cannot parse DNS request from %s\n"
 msgstr "No se puede procesar la petición DNS de %s\n"
 
-#: src/gns/gnunet-dns2gns.c:416
+#: src/gns/gnunet-dns2gns.c:422
 #, c-format
 msgid "Received malformed DNS request from %s\n"
 msgstr "Recibida petición DNS mal formada de %s\n"
 
-#: src/gns/gnunet-dns2gns.c:424
+#: src/gns/gnunet-dns2gns.c:430
 #, c-format
 msgid "Received unsupported DNS request from %s\n"
 msgstr "Recibida petición DNS no soportada de %s\n"
 
-#: src/gns/gnunet-dns2gns.c:701
+#: src/gns/gnunet-dns2gns.c:708
 msgid "No ego configured for `dns2gns` subsystem\n"
 msgstr ""
 
-#: src/gns/gnunet-dns2gns.c:727
+#: src/gns/gnunet-dns2gns.c:734
 #, fuzzy
 msgid "No DNS server specified!\n"
 msgstr "¡Ninguna palabra clave especificada!\n"
 
-#: src/gns/gnunet-dns2gns.c:749
+#: src/gns/gnunet-dns2gns.c:756
 #, fuzzy
 msgid "No valid GNS zone specified!\n"
 msgstr "¡Ninguna palabra clave especificada!\n"
 
-#: src/gns/gnunet-dns2gns.c:770
+#: src/gns/gnunet-dns2gns.c:777
 msgid "IP of recursive DNS resolver to use (required)"
 msgstr "IP del resolvedor recursivo DNS a usar (requerido)"
 
-#: src/gns/gnunet-dns2gns.c:773
+#: src/gns/gnunet-dns2gns.c:780
 msgid "Authoritative FCFS suffix to use (optional); default: fcfs.zkey.eu"
 msgstr ""
 "Sufijo FCFS autoritativo a usar (opcional); predeterminado: fcfs.zkey.eu"
 
-#: src/gns/gnunet-dns2gns.c:776
+#: src/gns/gnunet-dns2gns.c:783
 msgid "Authoritative DNS suffix to use (optional); default: zkey.eu"
 msgstr "Sufijo DNS autoritativo a usar (opcional); predeterminado: zkey.eu"
 
-#: src/gns/gnunet-dns2gns.c:779
+#: src/gns/gnunet-dns2gns.c:786
 msgid "UDP port to listen on for inbound DNS requests; default: 53"
 msgstr ""
 "Puerto UDP en el que escuchar para peticiones DNS entrantes; predeterminado: "
 "53"
 
-#: src/gns/gnunet-dns2gns.c:782
+#: src/gns/gnunet-dns2gns.c:789
 msgid "Public key of the GNS zone to use (overrides default)"
 msgstr ""
 
-#: src/gns/gnunet-dns2gns.c:795
+#: src/gns/gnunet-dns2gns.c:802
 msgid "GNUnet DNS-to-GNS proxy (a DNS server)"
 msgstr "Pasarela GNUnet DNS-a-GNS (un servidor DNS)"
 
@@ -4934,11 +4790,11 @@
 "Ninguna de las funciones para el demonio de listas de máquinas fue "
 "activada.  ¡No tengo razón para ejecutarme!\n"
 
-#: src/hostlist/gnunet-daemon-hostlist.c:323
+#: src/hostlist/gnunet-daemon-hostlist.c:331
 msgid "advertise our hostlist to other peers"
 msgstr "anuncia nuestra lista de máquinas a otros pares"
 
-#: src/hostlist/gnunet-daemon-hostlist.c:328
+#: src/hostlist/gnunet-daemon-hostlist.c:336
 msgid ""
 "bootstrap using hostlists (it is highly recommended that you always use this "
 "option)"
@@ -4946,16 +4802,16 @@
 "realizar inicialización usando listas de máquinas (es altamente recomendable "
 "que siempre se use esta opción)"
 
-#: src/hostlist/gnunet-daemon-hostlist.c:331
+#: src/hostlist/gnunet-daemon-hostlist.c:339
 msgid "enable learning about hostlist servers from other peers"
 msgstr ""
 "habilitar aprendizaje de servidores de listas de máquinas de otros pares"
 
-#: src/hostlist/gnunet-daemon-hostlist.c:335
+#: src/hostlist/gnunet-daemon-hostlist.c:343
 msgid "provide a hostlist server"
 msgstr "proveer un servidor de listas de máquinas"
 
-#: src/hostlist/gnunet-daemon-hostlist.c:350
+#: src/hostlist/gnunet-daemon-hostlist.c:359
 msgid "GNUnet hostlist server and client"
 msgstr "Servidor y cliente GNUnet de listas de máquinas"
 
@@ -4979,7 +4835,7 @@
 msgstr "# «HELLO» válidos descargados de servidores de listas de máquinas"
 
 #: src/hostlist/gnunet-daemon-hostlist_client.c:650
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1401
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1402
 msgid "# advertised hostlist URIs"
 msgstr "# URI de listas de máquinas anunciadas"
 
@@ -5033,7 +4889,7 @@
 msgstr "# descargas de listas de máquinas iniciadas"
 
 #: src/hostlist/gnunet-daemon-hostlist_client.c:1103
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1646
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1655
 msgid "# milliseconds between hostlist downloads"
 msgstr "# milisegundos entre descargas de listas de máquinas"
 
@@ -5048,29 +4904,29 @@
 msgid "# active connections"
 msgstr "# conexiones activas"
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1347
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1348
 #, c-format
 msgid "Loading saved hostlist entries from file `%s' \n"
 msgstr "Cargando entradas guardadas de listas de máquinas del fichero «%s»\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1352
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1353
 #, c-format
 msgid "Hostlist file `%s' does not exist\n"
 msgstr "El fichero de listas de máquinas «%s» no existe\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1361
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1362
 #, c-format
 msgid "Could not open file `%s' for reading to load hostlists: %s\n"
 msgstr ""
 "No se pudo abrir el fichero «%s» en modo lectura para cargar las listas de "
 "máquinas: %s\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1395
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1396
 #, c-format
 msgid "%u hostlist URIs loaded from file\n"
 msgstr "%u URI de listas de máquinas cargadas del fichero\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1398
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1399
 msgid "# hostlist URIs read from file"
 msgstr "# URI de listas de máquinas leídas de fichero"
 
@@ -5081,36 +4937,36 @@
 "No se pudo abrir el fichero «%s» en modo escritura para almacenar las listas "
 "de máquinas: %s\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1450
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1452
 #, c-format
 msgid "Writing %u hostlist URIs to `%s'\n"
 msgstr "Escribiendo %u URI de listas de máquinas a «%s»\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1474
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1491
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1476
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1493
 #, c-format
 msgid "Error writing hostlist URIs to file `%s'\n"
 msgstr "Error escribiendo URI de listas de máquinas al fichero «%s»\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1486
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1488
 msgid "# hostlist URIs written to file"
 msgstr "# URI de listas de máquinas escritas a fichero"
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1581
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1588
 #: src/transport/plugin_transport_http_client.c:2274
 #, c-format
 msgid "Invalid proxy type: `%s', disabling proxy! Check configuration!\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1611
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1617
 msgid "Learning is enabled on this peer\n"
 msgstr "El aprendizaje está habilitado en este par\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1623
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1630
 msgid "Learning is not enabled on this peer\n"
 msgstr "El aprendizaje no está habilitado en este par\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1635
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1641
 #, c-format
 msgid ""
 "Since learning is not enabled on this peer, hostlist file `%s' was removed\n"
@@ -5118,24 +4974,18 @@
 "La lista de máquinas «%s» fue eliminada puesto que el aprendizaje no está "
 "habilitado en este par\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1639
-#, c-format
-msgid "Hostlist file `%s' could not be removed\n"
-msgstr "El fichero de listas de máquinas «%s» no pudo ser eliminado\n"
-
-#: src/hostlist/gnunet-daemon-hostlist_server.c:165
+#: src/hostlist/gnunet-daemon-hostlist_server.c:181
 msgid "bytes in hostlist"
 msgstr "bytes en la lista de máquinas"
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:190
+#: src/hostlist/gnunet-daemon-hostlist_server.c:206
 msgid "expired addresses encountered"
 msgstr "direcciones expiradas encontradas"
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:225
-#: src/hostlist/gnunet-daemon-hostlist_server.c:535
-#: src/peerinfo-tool/gnunet-peerinfo.c:367
-#: src/peerinfo-tool/gnunet-peerinfo.c:452
-#: src/peerinfo-tool/gnunet-peerinfo.c:535
+#: src/hostlist/gnunet-daemon-hostlist_server.c:241
+#: src/hostlist/gnunet-daemon-hostlist_server.c:590
+#: src/peerinfo-tool/gnunet-peerinfo.c:382
+#: src/peerinfo-tool/gnunet-peerinfo.c:531
 #: src/topology/gnunet-daemon-topology.c:952
 #, c-format
 msgid "Error in communication with PEERINFO service: %s\n"
@@ -5143,98 +4993,98 @@
 "Error en la comunicación con el servicio de información de pares (PEERINFO): "
 "%s\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:249
+#: src/hostlist/gnunet-daemon-hostlist_server.c:265
 msgid "HELLOs without addresses encountered (ignored)"
 msgstr "«HELLO» sin dirección encontrados (ignorados)"
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:265
+#: src/hostlist/gnunet-daemon-hostlist_server.c:282
 msgid "bytes not included in hostlist (size limit)"
 msgstr "bytes no incluidos en la lista de máquinas (límite de tamaño)"
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:365
+#: src/hostlist/gnunet-daemon-hostlist_server.c:386
 #, c-format
 msgid "Refusing `%s' request to hostlist server\n"
 msgstr "Rechazando petición «%s» al servidor de listas de máquinas\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:368
+#: src/hostlist/gnunet-daemon-hostlist_server.c:389
 msgid "hostlist requests refused (not HTTP GET)"
 msgstr "Peticiones de listas de máquinas rechazadas (no HTTP GET)"
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:382
+#: src/hostlist/gnunet-daemon-hostlist_server.c:403
 #, c-format
 msgid "Refusing `%s' request with %llu bytes of upload data\n"
 msgstr "Rechazando petición «%s» con %llu bytes de datos de subida\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:386
+#: src/hostlist/gnunet-daemon-hostlist_server.c:407
 msgid "hostlist requests refused (upload data)"
 msgstr "Peticiones de listas de máquinas rechazadas (datos de subida)"
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:393
+#: src/hostlist/gnunet-daemon-hostlist_server.c:414
 msgid "Could not handle hostlist request since I do not have a response yet\n"
 msgstr ""
 "No se pudo manejar una petición de lista de máquinas debido a que no hay una "
 "respuesta todavía\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:396
+#: src/hostlist/gnunet-daemon-hostlist_server.c:417
 msgid "hostlist requests refused (not ready)"
 msgstr "Peticiones de listas de máquinas rechazadas (no preparados)"
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:401
+#: src/hostlist/gnunet-daemon-hostlist_server.c:422
 msgid "Received request for our hostlist\n"
 msgstr "Peticiones recibidas de nuestra lista de máquinas\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:403
+#: src/hostlist/gnunet-daemon-hostlist_server.c:424
 msgid "hostlist requests processed"
 msgstr "Peticiones de lista de máquinas procesadas"
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:449
+#: src/hostlist/gnunet-daemon-hostlist_server.c:485
 msgid "# hostlist advertisements send"
 msgstr "# anuncios de listas de máquinas enviados"
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:497
+#: src/hostlist/gnunet-daemon-hostlist_server.c:535
 msgid "Advertisement message could not be queued by core\n"
 msgstr ""
 "Los mensajes de anuncio no pudieron encolarse por el servicio principal\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:684
-#: src/peerinfo-tool/gnunet-peerinfo.c:696
+#: src/hostlist/gnunet-daemon-hostlist_server.c:747
+#: src/peerinfo-tool/gnunet-peerinfo.c:736
 #: src/transport/gnunet-service-transport.c:1127
 msgid "Could not access PEERINFO service.  Exiting.\n"
 msgstr ""
 "No se pudo acceder al servicio de información de pares (PEERINFO).  "
 "Saliendo.\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:708
+#: src/hostlist/gnunet-daemon-hostlist_server.c:771
 #, c-format
 msgid "Hostlist service starts on %s:%llu\n"
 msgstr "Servicio de listas de máquinas arranca en %s:%llu\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:723
+#: src/hostlist/gnunet-daemon-hostlist_server.c:786
 #, c-format
 msgid "Address to obtain hostlist: `%s'\n"
 msgstr "Dirección para obtener la lista de máquinas: «%s»\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:736
+#: src/hostlist/gnunet-daemon-hostlist_server.c:799
 #, fuzzy
 msgid "BINDTOIP does not a valid IPv4 address! Ignoring BINDTOIPV4.\n"
 msgstr "¡«%s» no es una dirección IP válida! Ignorando «BINDTOIP».\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:749
+#: src/hostlist/gnunet-daemon-hostlist_server.c:812
 #, fuzzy
 msgid "BINDTOIP does not a valid IPv4 address! Ignoring BINDTOIPV6.\n"
 msgstr "¡«%s» no es una dirección IP válida! Ignorando «BINDTOIP».\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:770
+#: src/hostlist/gnunet-daemon-hostlist_server.c:833
 #, fuzzy, c-format
 msgid "`%s' is not a valid IPv4 address! Ignoring BINDTOIPV4.\n"
 msgstr "¡«%s» no es una dirección IP válida! Ignorando «BINDTOIP».\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:790
+#: src/hostlist/gnunet-daemon-hostlist_server.c:853
 #, fuzzy, c-format
 msgid "`%s' is not a valid IPv6 address! Ignoring BINDTOIPV6.\n"
 msgstr "¡«%s» no es una dirección IP válida! Ignorando «BINDTOIP».\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:830
+#: src/hostlist/gnunet-daemon-hostlist_server.c:893
 #, c-format
 msgid "Could not start hostlist HTTP server on port %u\n"
 msgstr ""
@@ -5472,7 +5322,7 @@
 msgstr "borrar"
 
 #: src/namestore/gnunet-namestore.c:868
-#: src/peerinfo-tool/gnunet-peerinfo.c:792
+#: src/peerinfo-tool/gnunet-peerinfo.c:817
 #, c-format
 msgid "Invalid URI `%s'\n"
 msgstr "URI no válida: «%s»\n"
@@ -5894,8 +5744,8 @@
 msgid "Measure quality and performance of the NSE service."
 msgstr "Medir la calidad y rendimiento del servicio NSE."
 
-#: src/nse/gnunet-service-nse.c:1517
-#: src/revocation/gnunet-service-revocation.c:798 src/util/gnunet-scrypt.c:248
+#: src/nse/gnunet-service-nse.c:1537
+#: src/revocation/gnunet-service-revocation.c:798 src/util/gnunet-scrypt.c:260
 msgid "Value is too large.\n"
 msgstr ""
 
@@ -5985,94 +5835,89 @@
 msgid "Could not connect to `%s' service.\n"
 msgstr "No se pudo conectar al servicio %s.\n"
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:230
+#: src/peerinfo-tool/gnunet-peerinfo.c:245
 #, fuzzy, c-format
 msgid "%sPeer `%s'\n"
 msgstr "Par «%s»\n"
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:237
+#: src/peerinfo-tool/gnunet-peerinfo.c:252
 #, c-format
 msgid "\tExpires: %s \t %s\n"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:286
+#: src/peerinfo-tool/gnunet-peerinfo.c:301
 #, fuzzy, c-format
 msgid "Failure: Cannot convert address to string for peer `%s'\n"
 msgstr "Se produjo un fallo al resolver la dirección para el par «%s»\n"
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:462
+#: src/peerinfo-tool/gnunet-peerinfo.c:463
 #, fuzzy, c-format
-msgid "Failure: Did not receive %s\n"
-msgstr "Se produjo un fallo al resolver «%s»: %s\n"
-
-#: src/peerinfo-tool/gnunet-peerinfo.c:471
-#, fuzzy, c-format
 msgid "Failure: Received invalid %s\n"
 msgstr "recibido mensaje '%s' no válido: %s.\n"
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:483
+#: src/peerinfo-tool/gnunet-peerinfo.c:477
 #, fuzzy, c-format
 msgid "Failed to write HELLO with %u bytes to file `%s'\n"
 msgstr "Se produjo un fallo al procesar «HELLO» en el fichero «%s»\n"
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:502
+#: src/peerinfo-tool/gnunet-peerinfo.c:496
 #, c-format
 msgid "Wrote %s HELLO containing %u addresses with %u bytes to file `%s'\n"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:570
+#: src/peerinfo-tool/gnunet-peerinfo.c:566
 #, c-format
 msgid "Failure adding HELLO: %s\n"
 msgstr "Fallo añadiendo «HELLO»: %s\n"
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:687
+#: src/peerinfo-tool/gnunet-peerinfo.c:695
 #, fuzzy, c-format
+msgid "Failed to get my own HELLO from this peer!\n"
+msgstr "¡Se produjo un fallo al obtener la clave de máquina!\n"
+
+#: src/peerinfo-tool/gnunet-peerinfo.c:727
+#, fuzzy, c-format
 msgid "Service `%s' is not running, please start GNUnet\n"
 msgstr "El servicio «%s» no está ejecutandose\n"
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:718 src/util/gnunet-scrypt.c:224
+#: src/peerinfo-tool/gnunet-peerinfo.c:841
 #, c-format
-msgid "Loading hostkey from `%s' failed.\n"
-msgstr "La carga de la clave de la máquina desde «%s» ha fallado.\n"
-
-#: src/peerinfo-tool/gnunet-peerinfo.c:816
-#, c-format
 msgid "I am peer `%s'.\n"
 msgstr "Yo soy el par «%s».\n"
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:865
+#: src/peerinfo-tool/gnunet-peerinfo.c:882
 msgid "don't resolve host names"
 msgstr "no resolver nombres de máquina"
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:868
+#: src/peerinfo-tool/gnunet-peerinfo.c:885
 msgid "output only the identity strings"
 msgstr "mostrar únicamente las cadenas de identidad"
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:871
+#: src/peerinfo-tool/gnunet-peerinfo.c:888
 msgid "include friend-only information"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:874
+#: src/peerinfo-tool/gnunet-peerinfo.c:891
 msgid "output our own identity only"
 msgstr "muestra únicamente nuestra propia identidad"
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:877
+#: src/peerinfo-tool/gnunet-peerinfo.c:894
 msgid "list all known peers"
 msgstr "mostrar todos los pares conocidos"
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:880
+#: src/peerinfo-tool/gnunet-peerinfo.c:897
 msgid "dump hello to file"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:883
+#: src/peerinfo-tool/gnunet-peerinfo.c:900
 msgid "also output HELLO uri(s)"
 msgstr "también mostrar las URI de «HELLO»"
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:886
+#: src/peerinfo-tool/gnunet-peerinfo.c:903
 msgid "add given HELLO uri to the database"
 msgstr "añade la URI de «HELLO» dada a la base de datos"
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:900
+#: src/peerinfo-tool/gnunet-peerinfo.c:917
 msgid "Print information about peers."
 msgstr "Imprimir información sobre los pares."
 
@@ -6098,81 +5943,85 @@
 msgid "peerstore"
 msgstr ""
 
-#: src/peerstore/gnunet-service-peerstore.c:343
+#: src/peerstore/gnunet-service-peerstore.c:384
 #, fuzzy
 msgid "Malformed iterate request.\n"
 msgstr "Se produjo un fallo al borrar el fichero de configuración %s\n"
 
-#: src/peerstore/gnunet-service-peerstore.c:350
+#: src/peerstore/gnunet-service-peerstore.c:391
 msgid "Sub system not supplied in client iterate request.\n"
 msgstr ""
 
 # Miguel: "shutdown request" se refiere a finalizar el
 # que hace de cliente.
-#: src/peerstore/gnunet-service-peerstore.c:399
+#: src/peerstore/gnunet-service-peerstore.c:451
 #, fuzzy
 msgid "Malformed store request from client\n"
 msgstr ""
 "Se produjo un fallo al transmitir una petición de apagado al cliente.\n"
 
-#: src/peerstore/gnunet-service-peerstore.c:407
+#: src/peerstore/gnunet-service-peerstore.c:459
 msgid "Full key not supplied in client store request\n"
 msgstr ""
 
 # Miguel: "Drop" en bases de datos es eliminar una tabla
 # del modelo.
-#: src/peerstore/gnunet-service-peerstore.c:427
+#: src/peerstore/gnunet-service-peerstore.c:478
 #, fuzzy
-msgid "Failed to store requested value, sqlite database error."
+msgid "Failed to store requested value, database error."
 msgstr ""
 "Se produjo un fallo al transmitir la petición de eliminación a la base de "
 "datos.\n"
 
-#: src/peerstore/gnunet-service-peerstore.c:509
+#: src/peerstore/gnunet-service-peerstore.c:557
 #, fuzzy
 msgid "No database backend configured\n"
 msgstr "No hay nombre de máquina externo configurado\n"
 
-#: src/peerstore/gnunet-service-peerstore.c:520
+#: src/peerstore/gnunet-service-peerstore.c:568
 #, fuzzy, c-format
 msgid "Could not load database backend `%s'\n"
 msgstr "No se pudo leer el fichero de la lista negra «%s»\n"
 
-#: src/peerstore/peerstore_api.c:299 src/sensor/sensor_api.c:179
+#: src/peerstore/peerstore_api.c:329 src/sensor/sensor_api.c:179
 #, c-format
 msgid "Received an error notification from MQ of type: %d\n"
 msgstr ""
 
-#: src/peerstore/peerstore_api.c:370
+#: src/peerstore/peerstore_api.c:375
+msgid "timeout"
+msgstr ""
+
+#: src/peerstore/peerstore_api.c:402
 msgid "Iteration canceled due to reconnection."
 msgstr ""
 
-#: src/peerstore/peerstore_api.c:635
+#: src/peerstore/peerstore_api.c:681
 #, fuzzy
 msgid "Unexpected iteration response, this should not happen.\n"
 msgstr "El formato de salida es desconocido, ésto no debería pasar.\n"
 
 # Miguel: ¿Conectar y conexión?
-#: src/peerstore/peerstore_api.c:646
+#: src/peerstore/peerstore_api.c:692
 #, fuzzy
 msgid "Error communicating with `PEERSTORE' service."
 msgstr "Error al comunicar con el servicio ARM.\n"
 
-#: src/peerstore/peerstore_api.c:665
+#: src/peerstore/peerstore_api.c:711
 #, fuzzy
 msgid "Received a malformed response from service."
 msgstr "Recibida petición DNS mal formada de %s\n"
 
-#: src/peerstore/peerstore_api.c:804
+#: src/peerstore/peerstore_api.c:821
 msgid ""
 "Problem receiving a watch response, no way to determine which request.\n"
 msgstr ""
 
-#: src/peerstore/peerstore_api.c:815
+#: src/peerstore/peerstore_api.c:833
 msgid "Received a watch result for a non existing watch.\n"
 msgstr ""
 
-#: src/peerstore/plugin_peerstore_sqlite.c:377
+#: src/peerstore/plugin_peerstore_sqlite.c:398
 #: src/psycstore/plugin_psycstore_sqlite.c:286
 #, fuzzy, c-format
 msgid ""
@@ -6180,7 +6029,7 @@
 "  %s\n"
 msgstr "Error abriendo fichero «%s»: %s\n"
 
-#: src/peerstore/plugin_peerstore_sqlite.c:401
+#: src/peerstore/plugin_peerstore_sqlite.c:422
 #: src/psycstore/plugin_psycstore_sqlite.c:263
 #, fuzzy, c-format
 msgid ""
@@ -6188,7 +6037,7 @@
 "  %s\n"
 msgstr "Error leyendo de «%s»: %s\n"
 
-#: src/peerstore/plugin_peerstore_sqlite.c:483
+#: src/peerstore/plugin_peerstore_sqlite.c:504
 #, fuzzy, c-format
 msgid "Unable to create indices: %s.\n"
 msgstr "Se produjo un fallo al crear los índices\n"
@@ -6290,7 +6139,7 @@
 msgid "`%s' failed at %s:%d with error: %s (%d)\n"
 msgstr "«%s» falló en %s: %d con el error: %s\n"
 
-#: src/psycstore/plugin_psycstore_sqlite.c:1933
+#: src/psycstore/plugin_psycstore_sqlite.c:1932
 #, fuzzy
 msgid "SQLite database running\n"
 msgstr "Base de datos sqlite ejecutándose\n"
@@ -6573,61 +6422,70 @@
 msgid "rps"
 msgstr ""
 
-#: src/scalarproduct/gnunet-scalarproduct.c:222
+#: src/scalarproduct/gnunet-scalarproduct.c:221
 #, fuzzy
 msgid "You must specify at least one message ID to check!\n"
 msgstr "Debes especificar un fichero a inspeccionar.\n"
 
-#: src/scalarproduct/gnunet-scalarproduct.c:229
+#: src/scalarproduct/gnunet-scalarproduct.c:228
 msgid "This program needs a session identifier for comparing vectors.\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-scalarproduct.c:242
+#: src/scalarproduct/gnunet-scalarproduct.c:241
 #, c-format
 msgid ""
 "Tried to set initiator mode, as peer ID was given. However, `%s' is not a "
 "valid peer identifier.\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-scalarproduct.c:253
-msgid "Need elements to compute the vectorproduct, got none.\n"
+#: src/scalarproduct/gnunet-scalarproduct.c:259
+msgid "Need elements to compute the scalarproduct, got none.\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-scalarproduct.c:275
+#: src/scalarproduct/gnunet-scalarproduct.c:281
 #, fuzzy, c-format
 msgid "Malformed input, could not parse `%s'\n"
 msgstr "Se produjo un fallo al iniciar el servicio «%s»\n"
 
-#: src/scalarproduct/gnunet-scalarproduct.c:294
+#: src/scalarproduct/gnunet-scalarproduct.c:299
 #, fuzzy, c-format
 msgid "Could not convert `%s' to int64_t.\n"
 msgstr "No se pudo conectar al servicio %s.\n"
 
-#: src/scalarproduct/gnunet-scalarproduct.c:344
+#: src/scalarproduct/gnunet-scalarproduct.c:326
+#, c-format
+msgid "Failed to initiate computation, were all keys unique?\n"
+msgstr ""
+
+#: src/scalarproduct/gnunet-scalarproduct.c:350
 msgid ""
 "A comma separated list of elements to compare as vector with our remote peer."
 msgstr ""
 
-#: src/scalarproduct/gnunet-scalarproduct.c:347
+#: src/scalarproduct/gnunet-scalarproduct.c:353
 msgid ""
 "[Optional] peer to calculate our scalarproduct with. If this parameter is "
 "not given, the service will wait for a remote peer to compute the request."
 msgstr ""
 
-#: src/scalarproduct/gnunet-scalarproduct.c:350
+#: src/scalarproduct/gnunet-scalarproduct.c:356
 msgid "Transaction ID shared with peer."
 msgstr ""
 
-#: src/scalarproduct/gnunet-scalarproduct.c:359
+#: src/scalarproduct/gnunet-scalarproduct.c:365
 msgid "Calculate the Vectorproduct with a GNUnet peer."
 msgstr ""
 
-#: src/scalarproduct/gnunet-service-scalarproduct_alice.c:1418
-#: src/scalarproduct/gnunet-service-scalarproduct_bob.c:1529
+#: src/scalarproduct/gnunet-service-scalarproduct_alice.c:1419
+#: src/scalarproduct/gnunet-service-scalarproduct_bob.c:1564
 #, fuzzy
 msgid "Connect to CADET failed\n"
 msgstr "Conexión fallida (¿bug?)\n"
 
+#: src/scalarproduct/scalarproduct_api.c:296
+msgid "Keys given to SCALARPRODUCT not unique!\n"
+msgstr ""
+
 #: src/secretsharing/gnunet-secretsharing-profiler.c:613
 msgid "dkg start delay"
 msgstr ""
@@ -6669,54 +6527,54 @@
 msgid "sensor"
 msgstr ""
 
-#: src/sensor/gnunet-sensor-profiler.c:728
+#: src/sensor/gnunet-sensor-profiler.c:729
 msgid "Invalid or missing number of peers. Set at least 2 peers.\n"
 msgstr ""
 
-#: src/sensor/gnunet-sensor-profiler.c:735
+#: src/sensor/gnunet-sensor-profiler.c:736
 #, fuzzy
 msgid "Missing or invalid topology file.\n"
 msgstr "Parámetro no válido «%s»\n"
 
-#: src/sensor/gnunet-sensor-profiler.c:781
+#: src/sensor/gnunet-sensor-profiler.c:782
 #, fuzzy
 msgid "Number of peers to run"
 msgstr "número de pares para empezar"
 
-#: src/sensor/gnunet-sensor-profiler.c:783
+#: src/sensor/gnunet-sensor-profiler.c:784
 msgid "Path to topology file"
 msgstr ""
 
-#: src/sensor/gnunet-sensor-profiler.c:786
+#: src/sensor/gnunet-sensor-profiler.c:787
 msgid "Change the interval of running sensors to given value"
 msgstr ""
 
-#: src/sensor/gnunet-sensor-profiler.c:789
+#: src/sensor/gnunet-sensor-profiler.c:790
 #, fuzzy
 msgid "Number of peers to simulate anomalies on"
 msgstr "número de pares para empezar"
 
-#: src/sensor/gnunet-sensor-profiler.c:796
+#: src/sensor/gnunet-sensor-profiler.c:797
 #, fuzzy
 msgid "Profiler for sensor service"
 msgstr "Perfilador para expresiones regulares."
 
-#: src/sensor/gnunet-service-sensor_analysis.c:202
+#: src/sensor/gnunet-service-sensor_analysis.c:204
 #, fuzzy
 msgid "Received an invalid sensor value."
 msgstr "Recibida petición '%s' no válida (tabla errónea)\n"
 
-#: src/sensor/gnunet-service-sensor_analysis.c:293
+#: src/sensor/gnunet-service-sensor_analysis.c:295
 #, fuzzy
 msgid "Analysis model not defined in configuration.\n"
 msgstr "No se pudo encontrar la opción «%s:%s» en la configuración.\n"
 
-#: src/sensor/gnunet-service-sensor_analysis.c:302
+#: src/sensor/gnunet-service-sensor_analysis.c:304
 #, fuzzy, c-format
 msgid "Could not load analysis model `%s'.\n"
 msgstr "No se pudo leer el fichero de la lista negra «%s»\n"
 
-#: src/sensor/gnunet-service-sensor_analysis.c:310
+#: src/sensor/gnunet-service-sensor_analysis.c:312
 #, fuzzy
 msgid "Could not connect to peerstore service.\n"
 msgstr "No se pudo conectar al servicio %s.\n"
@@ -6759,33 +6617,33 @@
 msgid "Failed to create pow and signature block.\n"
 msgstr "Se produjo un fallo al crear una nueva firma"
 
-#: src/sensor/gnunet-service-sensor_reporting.c:1044
+#: src/sensor/gnunet-service-sensor_reporting.c:1046
 #, c-format
 msgid "PEERSTORE error: %s.\n"
 msgstr ""
 
-#: src/sensor/gnunet-service-sensor_reporting.c:1149
-#: src/sensor/gnunet-service-sensor_reporting.c:1407
+#: src/sensor/gnunet-service-sensor_reporting.c:1151
+#: src/sensor/gnunet-service-sensor_reporting.c:1409
 #, fuzzy
 msgid "Failed to connect to CORE service.\n"
 msgstr "¡Se produjo un fallo al conectar con el servicio DHT!\n"
 
-#: src/sensor/gnunet-service-sensor_reporting.c:1156
+#: src/sensor/gnunet-service-sensor_reporting.c:1158
 msgid "Peer identity received from CORE init doesn't match ours.\n"
 msgstr ""
 
-#: src/sensor/gnunet-service-sensor_reporting.c:1396
+#: src/sensor/gnunet-service-sensor_reporting.c:1398
 #, fuzzy
 msgid "Failed to connect to peerstore service.\n"
 msgstr "Se produjo un fallo al conectar con el servicio de almacenamiento"
 
-#: src/sensor/gnunet-service-sensor_reporting.c:1417
+#: src/sensor/gnunet-service-sensor_reporting.c:1419
 #: src/sensor/gnunet-service-sensor_update.c:781
 #, fuzzy
 msgid "Failed to connect to CADET service.\n"
 msgstr "¡Se produjo un fallo al conectar con el servicio DHT!\n"
 
-#: src/sensor/gnunet-service-sensor_reporting.c:1424
+#: src/sensor/gnunet-service-sensor_reporting.c:1426
 #, fuzzy
 msgid "Failed to load my private key.\n"
 msgstr "Se produjo un fallo al cargar el estado: %s\n"
@@ -6898,31 +6756,31 @@
 "\n"
 "Error subiendo el fichero %s\n"
 
-#: src/set/gnunet-service-set.c:1529
+#: src/set/gnunet-service-set.c:1531
 #, fuzzy
 msgid "Could not connect to cadet service\n"
 msgstr "¡No se pudo conectar al servicio %s!\n"
 
 # Miguel: Conjunto resta.
-#: src/set/gnunet-set-ibf-profiler.c:221
+#: src/set/gnunet-set-ibf-profiler.c:237
 msgid "number of element in set A-B"
 msgstr "número de elementos en el conjunto A-B"
 
-#: src/set/gnunet-set-ibf-profiler.c:224
+#: src/set/gnunet-set-ibf-profiler.c:240
 msgid "number of element in set B-A"
 msgstr "número de elementos en el conjunto B-A"
 
 # Miguel: Conjunto unión.
-#: src/set/gnunet-set-ibf-profiler.c:227
+#: src/set/gnunet-set-ibf-profiler.c:243
 msgid "number of common elements in A and B"
 msgstr "número de elementos comunes en A y B"
 
 # Miguel: "hash" me tiene un poco frito. ¿Existe alguna traducción buena?
-#: src/set/gnunet-set-ibf-profiler.c:230
+#: src/set/gnunet-set-ibf-profiler.c:246
 msgid "hash num"
 msgstr "número de hash"
 
-#: src/set/gnunet-set-ibf-profiler.c:233
+#: src/set/gnunet-set-ibf-profiler.c:249
 msgid "ibf size"
 msgstr "tamaño ibf"
 
@@ -6930,95 +6788,95 @@
 msgid "oeration to execute"
 msgstr ""
 
-#: src/statistics/gnunet-service-statistics.c:280
+#: src/statistics/gnunet-service-statistics.c:323
 #, c-format
 msgid "Loading %llu bytes of statistics from `%s'\n"
 msgstr "Cargando %llu bytes de estadísticas de «%s»\n"
 
-#: src/statistics/gnunet-service-statistics.c:346
+#: src/statistics/gnunet-service-statistics.c:434
 #, c-format
 msgid "Wrote %llu bytes of statistics to `%s'\n"
 msgstr "Escritos %llu bytes de estadísticas a «%s»\n"
 
-#: src/statistics/gnunet-statistics.c:140
+#: src/statistics/gnunet-statistics.c:145
 msgid "Failed to obtain statistics.\n"
 msgstr "Se produjo un fallo al obtener las estadísticas.\n"
 
-#: src/statistics/gnunet-statistics.c:142
+#: src/statistics/gnunet-statistics.c:148
 #, c-format
 msgid "Failed to obtain statistics from host `%s:%llu'\n"
 msgstr ""
 "Se produjo un fallo al obtener las estadísticas de la máquina «%s:%llu»\n"
 
-#: src/statistics/gnunet-statistics.c:189
+#: src/statistics/gnunet-statistics.c:198
 msgid "Missing argument: subsystem \n"
 msgstr "Falta el parámetro: subsistema\n"
 
-#: src/statistics/gnunet-statistics.c:195
+#: src/statistics/gnunet-statistics.c:204
 msgid "Missing argument: name\n"
 msgstr "Falta el argumento: nombre\n"
 
-#: src/statistics/gnunet-statistics.c:226
+#: src/statistics/gnunet-statistics.c:235
 #, c-format
 msgid "No subsystem or name given\n"
 msgstr "No se proporcionó un subsistema o un nombre\n"
 
-#: src/statistics/gnunet-statistics.c:234
+#: src/statistics/gnunet-statistics.c:243
 #, c-format
 msgid "Failed to initialize watch routine\n"
 msgstr "Se produjo un fallo al inicializar la rutina de visualización\n"
 
-#: src/statistics/gnunet-statistics.c:261
+#: src/statistics/gnunet-statistics.c:269
 #, c-format
 msgid "Trying to connect to remote host, but service `%s' is not running\n"
 msgstr ""
 "Intentando conectar con máquina remota, pero el servicio «%s» no se está "
 "ejecutando\n"
 
-#: src/statistics/gnunet-statistics.c:269
+#: src/statistics/gnunet-statistics.c:282
 #, c-format
 msgid "A port is required to connect to host `%s'\n"
 msgstr "Se necesita un puerto para conectar con la máquina «%s»\n"
 
-#: src/statistics/gnunet-statistics.c:276
+#: src/statistics/gnunet-statistics.c:290
 #, c-format
 msgid "A port has to be between 1 and 65535 to connect to host `%s'\n"
 msgstr "Un puerto debe estar entre 1 y 65534 para conectar a la máquina «%s»\n"
 
-#: src/statistics/gnunet-statistics.c:308
+#: src/statistics/gnunet-statistics.c:323
 #, c-format
 msgid "Invalid argument `%s'\n"
 msgstr "Parámetro no válido «%s»\n"
 
-#: src/statistics/gnunet-statistics.c:334
+#: src/statistics/gnunet-statistics.c:349
 msgid "limit output to statistics for the given NAME"
 msgstr "limita la salida de estadísticas para el nombre (NAME) dado"
 
-#: src/statistics/gnunet-statistics.c:337
+#: src/statistics/gnunet-statistics.c:352
 msgid "make the value being set persistent"
 msgstr "hacer el valor persistente"
 
-#: src/statistics/gnunet-statistics.c:340
+#: src/statistics/gnunet-statistics.c:355
 msgid "limit output to the given SUBSYSTEM"
 msgstr "límite de salida para el subsistema (SUBSYSTEM) dado"
 
-#: src/statistics/gnunet-statistics.c:343
+#: src/statistics/gnunet-statistics.c:358
 msgid "just print the statistics value"
 msgstr "imprime el valor de las estadísticas"
 
-#: src/statistics/gnunet-statistics.c:346
+#: src/statistics/gnunet-statistics.c:361
 msgid "watch value continuously"
 msgstr "visualiza el valor continuamente"
 
-#: src/statistics/gnunet-statistics.c:349
+#: src/statistics/gnunet-statistics.c:364
 msgid "connect to remote host"
 msgstr "conectar a equipo remoto"
 
-#: src/statistics/gnunet-statistics.c:352
+#: src/statistics/gnunet-statistics.c:367
 msgid "port for remote host"
 msgstr "puerto del equipo remoto"
 
-#: src/statistics/gnunet-statistics.c:364
+#: src/statistics/gnunet-statistics.c:379
 msgid "Print statistics about GNUnet operations."
 msgstr "Imprime estadísticas acerca de las operaciones de GNUnet."
 
@@ -7034,55 +6892,56 @@
 "¡No se ha recibido el reconocimiento del servicio de estadísticas, algunas "
 "estadísticas se pueden haber perdido!\n"
 
-#: src/testbed/generate-underlay-topology.c:223
-msgid "Need atleast 2 arguments\n"
-msgstr ""
+#: src/testbed/generate-underlay-topology.c:225
+#, fuzzy
+msgid "Need at least 2 arguments\n"
+msgstr "Tiene que especificar una URI como parámetro.\n"
 
-#: src/testbed/generate-underlay-topology.c:228
+#: src/testbed/generate-underlay-topology.c:230
 msgid "Database filename missing\n"
 msgstr ""
 
-#: src/testbed/generate-underlay-topology.c:235
+#: src/testbed/generate-underlay-topology.c:237
 #, fuzzy
 msgid "Topology string missing\n"
 msgstr "falta una opción"
 
-#: src/testbed/generate-underlay-topology.c:240
+#: src/testbed/generate-underlay-topology.c:242
 #, fuzzy, c-format
 msgid "Invalid topology: %s\n"
 msgstr "Parámetro no válido «%s»\n"
 
-#: src/testbed/generate-underlay-topology.c:253
+#: src/testbed/generate-underlay-topology.c:255
 #, c-format
 msgid "An argument is missing for given topology `%s'\n"
 msgstr ""
 
-#: src/testbed/generate-underlay-topology.c:259
+#: src/testbed/generate-underlay-topology.c:261
 #, fuzzy, c-format
 msgid "Invalid argument `%s' given as topology argument\n"
 msgstr "Parámetro no válido «%s»\n"
 
-#: src/testbed/generate-underlay-topology.c:267
+#: src/testbed/generate-underlay-topology.c:269
 #, fuzzy, c-format
 msgid "Filename argument missing for topology `%s'\n"
 msgstr "¡Falló mientras se esperaba la configuración topológica!\n"
 
-#: src/testbed/generate-underlay-topology.c:281
+#: src/testbed/generate-underlay-topology.c:283
 #, c-format
 msgid "Second argument for topology `%s' is missing\n"
 msgstr ""
 
-#: src/testbed/generate-underlay-topology.c:287
+#: src/testbed/generate-underlay-topology.c:289
 #, fuzzy, c-format
 msgid "Invalid argument `%s'; expecting unsigned int\n"
 msgstr "Argumento no válido para '%s' en %s:%d.\n"
 
-#: src/testbed/generate-underlay-topology.c:336
+#: src/testbed/generate-underlay-topology.c:338
 #: src/testbed/gnunet-testbed-profiler.c:293
 msgid "create COUNT number of peers"
 msgstr "crea «COUNT» número de pares"
 
-#: src/testbed/generate-underlay-topology.c:345
+#: src/testbed/generate-underlay-topology.c:347
 msgid ""
 "Generates SQLite3 database representing a given underlay topology.\n"
 "Usage: gnunet-underlay-topology [OPTIONS] db-filename TOPO [TOPOOPTS]\n"
@@ -7495,21 +7354,26 @@
 "Control de topología de GNUnet (manteniendo las restricciones del mesh de "
 "P2P y de F2F)"
 
-#: src/transport/gnunet-service-transport_blacklist.c:271
+#: src/transport/gnunet-service-transport_blacklist.c:274
 #, 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:279
+#: src/transport/gnunet-service-transport_blacklist.c:283
 #, c-format
 msgid "Adding blacklisting entry for peer `%s':`%s'\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_blacklist.c:465
-#: src/transport/gnunet-service-transport_blacklist.c:748
+#: src/transport/gnunet-service-transport_blacklist.c:476
+#: src/transport/gnunet-service-transport_blacklist.c:766
 msgid "# disconnects due to blacklist"
 msgstr "# desconexiones debido a la lista negra"
 
+#: src/transport/gnunet-service-transport_blacklist.c:769
+#, 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:220
 #, fuzzy
 msgid "# bytes payload discarded due to not connected peer"
@@ -7542,250 +7406,224 @@
 "El servicio de transporte carece de opciones de configuración de clave.  "
 "Saliendo.\n"
 
-#: src/transport/gnunet-service-transport_clients.c:463
-#, c-format
-msgid "Dropping message of type %u and size %u, have %u/%u messages pending\n"
-msgstr ""
-"Mensaje omitido de tipo %u y tamaño %u, hay %u/%u mensajes pendientes\n"
-
-#: src/transport/gnunet-service-transport_clients.c:470
+#: src/transport/gnunet-service-transport_clients.c:481
 msgid "# messages dropped due to slow client"
 msgstr "# mensajes omitidos debido a un cliente lento"
 
-#: src/transport/gnunet-service-transport_clients.c:630
-#, c-format
-msgid "Rejecting control connection from peer `%s', which is not me!\n"
-msgstr "¡Rechazando conexión de control del par «%s», que no soy yo!\n"
-
-#: src/transport/gnunet-service-transport_clients.c:771
+#: src/transport/gnunet-service-transport_clients.c:774
 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:804
+#: 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:810
-#, fuzzy, c-format
-msgid "Blacklist allows connection attempt to peer `%s'\n"
-msgstr "Se produjo un fallo al conectar con «%s»\n"
-
-#: src/transport/gnunet-service-transport_clients.c:836
+#: src/transport/gnunet-service-transport_clients.c:843
 msgid "# REQUEST CONNECT messages received"
 msgstr "# mensajes «REQUEST CONNECT» recibidos"
 
-#: src/transport/gnunet-service-transport_clients.c:850
-#, fuzzy, c-format
-msgid "Received a request connect message for peer `%s'\n"
-msgstr "Recibido último mensaje para %s\n"
-
-#: src/transport/gnunet-service-transport_clients.c:861
+#: src/transport/gnunet-service-transport_clients.c:882
 #, fuzzy
 msgid "# REQUEST DISCONNECT messages received"
 msgstr "# mensajes «REQUEST CONNECT» recibidos"
 
-#: src/transport/gnunet-service-transport_clients.c:875
-#, fuzzy, c-format
-msgid "Received a request disconnect message for peer `%s'\n"
-msgstr "Recibido último mensaje para %s\n"
-
 #: src/transport/gnunet-service-transport_hello.c:182
 msgid "# refreshed my HELLO"
 msgstr "# refrescos de mi «HELLO»"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1095
+#: src/transport/gnunet-service-transport_neighbours.c:1099
 msgid "# DISCONNECT messages sent"
 msgstr "# Mensajes «DISCONNECT» enviados"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1220
-#: src/transport/gnunet-service-transport_neighbours.c:1635
+#: src/transport/gnunet-service-transport_neighbours.c:1224
+#: src/transport/gnunet-service-transport_neighbours.c:1639
 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:1225
+#: src/transport/gnunet-service-transport_neighbours.c:1229
 msgid "# messages transmitted to other peers"
 msgstr "# mensajes transmitidos a otros pares"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1230
+#: src/transport/gnunet-service-transport_neighbours.c:1234
 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:1288
+#: src/transport/gnunet-service-transport_neighbours.c:1292
 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:1349
+#: src/transport/gnunet-service-transport_neighbours.c:1353
 msgid "# keepalives sent"
 msgstr "# «keepalives» enviados"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1382
+#: src/transport/gnunet-service-transport_neighbours.c:1386
 msgid "# KEEPALIVE messages discarded (peer unknown)"
 msgstr "# Mensajes «KEEPALIVE» descartados (par desconocido)"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1390
+#: src/transport/gnunet-service-transport_neighbours.c:1394
 msgid "# KEEPALIVE messages discarded (no session)"
 msgstr "# mensajes «KEEPALIVE» descartados (no hay sesión)"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1437
+#: src/transport/gnunet-service-transport_neighbours.c:1441
 msgid "# KEEPALIVE_RESPONSE messages discarded (not connected)"
 msgstr "# mensajes «KEEPALIVE_RESPONSE» descartados (no conectado)"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1446
+#: src/transport/gnunet-service-transport_neighbours.c:1450
 msgid "# KEEPALIVE_RESPONSE messages discarded (not expected)"
 msgstr "# Mensajes «KEEPALIVE_RESPONSE» descartados (no esperado)"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1454
+#: src/transport/gnunet-service-transport_neighbours.c:1458
 #, fuzzy
 msgid "# KEEPALIVE_RESPONSE messages discarded (address changed)"
 msgstr "# mensajes «KEEPALIVE_RESPONSE» descartados (no conectado)"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1462
+#: src/transport/gnunet-service-transport_neighbours.c:1466
 #, fuzzy
 msgid "# KEEPALIVE_RESPONSE messages discarded (wrong nonce)"
 msgstr "# mensajes «KEEPALIVE_RESPONSE» descartados (no conectado)"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1540
+#: src/transport/gnunet-service-transport_neighbours.c:1544
 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:1574
+#: src/transport/gnunet-service-transport_neighbours.c:1578
 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:1590
+#: src/transport/gnunet-service-transport_neighbours.c:1594
 msgid "# ms throttling suggested"
 msgstr "# ms de impulso sugeridos"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1685
+#: src/transport/gnunet-service-transport_neighbours.c:1689
 #, 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"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1712
+#: src/transport/gnunet-service-transport_neighbours.c:1716
 #, 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:1757
+#: src/transport/gnunet-service-transport_neighbours.c:1761
 #, fuzzy
 msgid "# SYN messages sent"
 msgstr "# Mensajes «DISCONNECT» enviados"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1773
+#: src/transport/gnunet-service-transport_neighbours.c:1777
 #, fuzzy, c-format
 msgid "Failed to transmit SYN message via plugin to %s\n"
 msgstr "Se produjo un fallo al transmitir un mensaje al servicio «%s».\n"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1800
+#: src/transport/gnunet-service-transport_neighbours.c:1804
 #, 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:1849
+#: src/transport/gnunet-service-transport_neighbours.c:1853
 #, fuzzy, c-format
 msgid ""
 "Failed to send SYN_ACK message to peer `%s' using address `%s' session %p\n"
 msgstr "¡Se produjo un fallo al conectar al servicio de estadísticas!\n"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1904
+#: src/transport/gnunet-service-transport_neighbours.c:1908
 #, fuzzy
 msgid "# SYN_ACK messages sent"
 msgstr "# Mensajes «DISCONNECT» enviados"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1919
+#: src/transport/gnunet-service-transport_neighbours.c:1923
 #, fuzzy, c-format
 msgid "Failed to transmit SYN_ACK message via plugin to %s\n"
 msgstr "Se produjo un fallo al transmitir un mensaje al servicio «%s».\n"
 
-#: src/transport/gnunet-service-transport_neighbours.c:2199
+#: src/transport/gnunet-service-transport_neighbours.c:2203
 #, 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:2324
+#: src/transport/gnunet-service-transport_neighbours.c:2328
 #, fuzzy
 msgid "# SYN messages received"
 msgstr "# mensajes PING recibidos"
 
-#: src/transport/gnunet-service-transport_neighbours.c:2329
+#: src/transport/gnunet-service-transport_neighbours.c:2333
 #, c-format
 msgid "SYN request from peer `%s' ignored due impending shutdown\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:2626
+#: src/transport/gnunet-service-transport_neighbours.c:2630
 msgid "# Attempts to switch addresses"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3047
+#: src/transport/gnunet-service-transport_neighbours.c:3051
 #, 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:3142
+#: src/transport/gnunet-service-transport_neighbours.c:3146
 #, fuzzy
 msgid "# SYN_ACK messages received"
 msgstr "# mensajes SET QUOTA recibidos"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3150
+#: src/transport/gnunet-service-transport_neighbours.c:3154
 #, fuzzy
 msgid "# unexpected SYN_ACK messages (no peer)"
 msgstr "# Mensajes «CONNECT_ACK» inesperados (sin par)"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3164
-#: src/transport/gnunet-service-transport_neighbours.c:3199
+#: src/transport/gnunet-service-transport_neighbours.c:3168
+#: src/transport/gnunet-service-transport_neighbours.c:3203
 #, fuzzy
 msgid "# unexpected SYN_ACK messages (not ready)"
 msgstr "# Mensajes «CONNECT_ACK» inesperados (no estaba preparado)"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3211
+#: src/transport/gnunet-service-transport_neighbours.c:3215
 #, 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:3234
+#: src/transport/gnunet-service-transport_neighbours.c:3238
 msgid "# Successful attempts to switch addresses"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3242
+#: src/transport/gnunet-service-transport_neighbours.c:3246
 #, fuzzy
 msgid "# unexpected SYN_ACK messages (disconnecting)"
 msgstr "# Mensajes «CONNECT_ACK» inesperados (desconectando)"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3441
+#: src/transport/gnunet-service-transport_neighbours.c:3445
 #, fuzzy
 msgid "# ACK messages received"
 msgstr "# mensajes «REQUEST CONNECT» recibidos"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3477
+#: src/transport/gnunet-service-transport_neighbours.c:3481
 #, fuzzy
 msgid "# unexpected ACK messages"
 msgstr "# Mensajes «SESSION ACK» inesperados"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3551
+#: src/transport/gnunet-service-transport_neighbours.c:3555
 msgid "# SET QUOTA messages ignored (no such peer)"
 msgstr "# Mensajes «SET QUOTA» ignorados (no existe tal par)"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3566
+#: src/transport/gnunet-service-transport_neighbours.c:3570
 msgid "# disconnects due to quota of 0"
 msgstr "# desconexiones debido a una cuota de 0"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3611
+#: src/transport/gnunet-service-transport_neighbours.c:3615
 #, fuzzy
 msgid "# disconnect messages ignored (malformed)"
 msgstr "# mensajes de desconexión ignorados (formato antiguo)"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3617
+#: src/transport/gnunet-service-transport_neighbours.c:3621
 #, fuzzy
 msgid "# DISCONNECT messages received"
 msgstr "# mensajes «REQUEST CONNECT» recibidos"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3626
+#: src/transport/gnunet-service-transport_neighbours.c:3630
 msgid "# disconnect messages ignored (timestamp)"
 msgstr "# mensajes de desconexión ignorados (marca temporal)"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3753
+#: src/transport/gnunet-service-transport_neighbours.c:3757
 msgid "# disconnected from peer upon explicit request"
 msgstr "# desconexiones del par debido a una petición explícita"
 
@@ -7903,64 +7741,64 @@
 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:573
+#: src/transport/gnunet-transport.c:578
 #, 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:582
+#: src/transport/gnunet-transport.c:587
 #: 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:614
+#: src/transport/gnunet-transport.c:619
 #, c-format
 msgid "Failed to connect to `%s'\n"
 msgstr "Se produjo un fallo al conectar con «%s»\n"
 
-#: src/transport/gnunet-transport.c:629
+#: src/transport/gnunet-transport.c:634
 #, 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:641
+#: src/transport/gnunet-transport.c:646
 msgid "Failed to list connections, timeout occured\n"
 msgstr "No se pudieron listar las conexiones, expiró el plazo\n"
 
-#: src/transport/gnunet-transport.c:668 src/transport/gnunet-transport.c:698
+#: src/transport/gnunet-transport.c:673 src/transport/gnunet-transport.c:703
 #, 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:673
+#: src/transport/gnunet-transport.c:678
 #, 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:678
+#: src/transport/gnunet-transport.c:683
 #, 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:683
+#: src/transport/gnunet-transport.c:688
 #, 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:688
+#: src/transport/gnunet-transport.c:693
 #, c-format
 msgid "Timeout while waiting for result of NAT test for plugin `%s'\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:704
+#: src/transport/gnunet-transport.c:709
 #, fuzzy, c-format
 msgid "Configuration for plugin `%s' is working!\n"
 msgstr "El fichero de configuración debe especificar «%s» en la sección «%s»\n"
 
-#: src/transport/gnunet-transport.c:823
+#: src/transport/gnunet-transport.c:828
 #, fuzzy, c-format
 msgid ""
 "Peer `%s' %s %s\n"
@@ -7969,45 +7807,45 @@
 "\t%s%s\n"
 msgstr "Par «%s»: %s %s\n"
 
-#: src/transport/gnunet-transport.c:859
+#: src/transport/gnunet-transport.c:864
 #, fuzzy, c-format
 msgid "Peer `%s' %s `%s' \n"
 msgstr "Par «%s»: %s %s\n"
 
-#: src/transport/gnunet-transport.c:958 src/transport/gnunet-transport.c:1707
+#: src/transport/gnunet-transport.c:963 src/transport/gnunet-transport.c:1712
 #, 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:1026
+#: src/transport/gnunet-transport.c:1031
 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:1040
+#: src/transport/gnunet-transport.c:1045
 #, 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:1065
+#: src/transport/gnunet-transport.c:1070
 #, fuzzy
 msgid "Failed to start resolver!\n"
 msgstr "Se produjo un fallo al arrancar %s\n"
 
-#: src/transport/gnunet-transport.c:1111
+#: src/transport/gnunet-transport.c:1116
 #, c-format
 msgid "Transmitting %u bytes to %s\n"
 msgstr "Transmitiendo %u bytes a %s\n"
 
-#: src/transport/gnunet-transport.c:1134
+#: src/transport/gnunet-transport.c:1139
 #: 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:1158
+#: src/transport/gnunet-transport.c:1163
 #, c-format
 msgid ""
 "Successfully connected to `%s', starting to send benchmark data in %u Kb "
@@ -8016,47 +7854,47 @@
 "Conectado satisfactoriamente a «%s», empezando a mandar datos de prueba en "
 "bloques de %u Kb\n"
 
-#: src/transport/gnunet-transport.c:1191
+#: src/transport/gnunet-transport.c:1196
 #, fuzzy, c-format
 msgid "Successfully disconnected from `%s'\n"
 msgstr "Conectado satisfactoriamente a «%s»\n"
 
-#: src/transport/gnunet-transport.c:1214
+#: src/transport/gnunet-transport.c:1219
 #: 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:1239 src/transport/gnunet-transport.c:1265
+#: src/transport/gnunet-transport.c:1244 src/transport/gnunet-transport.c:1270
 #, 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:1241
+#: src/transport/gnunet-transport.c:1246
 msgid "Connected to"
 msgstr "Conectado a"
 
-#: src/transport/gnunet-transport.c:1267
+#: src/transport/gnunet-transport.c:1272
 msgid "Disconnected from"
 msgstr "Desconectado de"
 
-#: src/transport/gnunet-transport.c:1291
+#: src/transport/gnunet-transport.c:1296
 #: 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:1323
+#: src/transport/gnunet-transport.c:1328
 #, c-format
 msgid "Peer `%s': %s %s in state `%s' until %s\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1335
+#: src/transport/gnunet-transport.c:1340
 #, c-format
 msgid "Peer `%s': %s %s\n"
 msgstr "Par «%s»: %s %s\n"
 
-#: src/transport/gnunet-transport.c:1792
+#: src/transport/gnunet-transport.c:1794
 #: src/transport/gnunet-transport-profiler.c:492
 msgid "Failed to send connect request to transport service\n"
 msgstr ""
@@ -8070,7 +7908,7 @@
 "Se produjo un fallo al enviar una petición de conexión al servicio de "
 "transporte\n"
 
-#: src/transport/gnunet-transport.c:1875
+#: src/transport/gnunet-transport.c:1873
 #, fuzzy, c-format
 msgid ""
 "Multiple operations given. Please choose only one operation: %s, %s, %s, %s, "
@@ -8079,7 +7917,7 @@
 "Múltiples operaciones introducidas. Por favor, seleccione únicamente una "
 "operación: %s, %s, %s, %s, %s, %s\n"
 
-#: src/transport/gnunet-transport.c:1883
+#: src/transport/gnunet-transport.c:1881
 #, fuzzy, c-format
 msgid ""
 "No operation given. Please choose one operation: %s, %s, %s, %s, %s, %s, %s\n"
@@ -8087,86 +7925,86 @@
 "Ninguna operación introducida. Por favor, seleccione alguna operación: %s, "
 "%s, %s, %s, %s, %s\n"
 
-#: src/transport/gnunet-transport.c:1902 src/transport/gnunet-transport.c:1932
-#: src/transport/gnunet-transport.c:1964 src/transport/gnunet-transport.c:1990
-#: src/transport/gnunet-transport.c:2046
+#: src/transport/gnunet-transport.c:1900 src/transport/gnunet-transport.c:1930
+#: src/transport/gnunet-transport.c:1963 src/transport/gnunet-transport.c:1989
+#: src/transport/gnunet-transport.c:2045
 #: 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:1911 src/transport/gnunet-transport.c:1941
-#: src/transport/gnunet-transport.c:1975
+#: src/transport/gnunet-transport.c:1909 src/transport/gnunet-transport.c:1940
+#: src/transport/gnunet-transport.c:1974
 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:1995
+#: src/transport/gnunet-transport.c:1994
 msgid "Starting to receive benchmark data\n"
 msgstr "Empezando a recibir datos de prueba\n"
 
-#: src/transport/gnunet-transport.c:2094
+#: src/transport/gnunet-transport.c:2093
 #, 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:2097
+#: src/transport/gnunet-transport.c:2096
 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:2100
+#: src/transport/gnunet-transport.c:2099
 msgid "connect to a peer"
 msgstr "conectar a un par"
 
-#: src/transport/gnunet-transport.c:2103
+#: src/transport/gnunet-transport.c:2102
 #, fuzzy
 msgid "disconnect to a peer"
 msgstr "conectar a un par"
 
-#: src/transport/gnunet-transport.c:2106
+#: src/transport/gnunet-transport.c:2105
 #, 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:2109
+#: src/transport/gnunet-transport.c:2108
 #, 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:2112
+#: src/transport/gnunet-transport.c:2111
 msgid "provide information about all current connections (once)"
 msgstr "provee información sobre todas las conexiones actuales (una vez)"
 
-#: src/transport/gnunet-transport.c:2118
+#: src/transport/gnunet-transport.c:2117
 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:2121
+#: src/transport/gnunet-transport.c:2120
 msgid "do not resolve hostnames"
 msgstr "no resolver nombres de máquinas"
 
-#: src/transport/gnunet-transport.c:2124
+#: src/transport/gnunet-transport.c:2123
 #: src/transport/gnunet-transport-profiler.c:638
 msgid "peer identity"
 msgstr "identidad del par"
 
-#: src/transport/gnunet-transport.c:2127
+#: src/transport/gnunet-transport.c:2126
 #, fuzzy
 msgid "monitor plugin sessions"
 msgstr "# sesiones wlan pendientes"
 
-#: src/transport/gnunet-transport.c:2130
+#: src/transport/gnunet-transport.c:2129
 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:2133
+#: src/transport/gnunet-transport.c:2132
 msgid "test transport configuration (involves external server)"
 msgstr "probar configuración de transporte (requiere un servidor externo)"
 
-#: src/transport/gnunet-transport.c:2144
+#: src/transport/gnunet-transport.c:2143
 #: src/transport/gnunet-transport-profiler.c:649
 msgid "Direct access to transport service."
 msgstr "Acceso directo al servicio de transporte."
@@ -8270,8 +8108,8 @@
 msgstr "tamaño del mensaje"
 
 #: src/transport/plugin_transport_http_client.c:1491
-#: src/transport/plugin_transport_http_server.c:2271
-#: src/transport/plugin_transport_http_server.c:3436
+#: src/transport/plugin_transport_http_server.c:2274
+#: src/transport/plugin_transport_http_server.c:3441
 #: src/transport/plugin_transport_tcp.c:2826
 #: src/transport/plugin_transport_tcp.c:2833
 msgid "TCP_STEALTH not supported on this platform.\n"
@@ -8285,13 +8123,13 @@
 "módulo %s!\n"
 
 #: src/transport/plugin_transport_http_client.c:2164
-#: src/transport/plugin_transport_http_server.c:3170
+#: src/transport/plugin_transport_http_server.c:3175
 #, c-format
 msgid "Shutting down plugin `%s'\n"
 msgstr "Finalizando el módulo «%s»\n"
 
 #: src/transport/plugin_transport_http_client.c:2181
-#: src/transport/plugin_transport_http_server.c:3240
+#: src/transport/plugin_transport_http_server.c:3245
 #, c-format
 msgid "Shutdown for plugin `%s' complete\n"
 msgstr "Finalización del módulo «%s» completa\n"
@@ -8338,96 +8176,96 @@
 "¡No se encontró ningún certificado TLS útil y se produjo un fallo al crear "
 "uno!\n"
 
-#: src/transport/plugin_transport_http_server.c:2297
+#: src/transport/plugin_transport_http_server.c:2300
 msgid "Could not load or create server certificate! Loading plugin failed!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:2604
+#: src/transport/plugin_transport_http_server.c:2609
 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:2638 src/util/service.c:700
+#: src/transport/plugin_transport_http_server.c:2643 src/util/service.c:703
 #, 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:2656 src/util/service.c:719
+#: src/transport/plugin_transport_http_server.c:2661 src/util/service.c:722
 #, 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:2769
+#: src/transport/plugin_transport_http_server.c:2774
 #, 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:2847
+#: src/transport/plugin_transport_http_server.c:2852
 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:2946
+#: src/transport/plugin_transport_http_server.c:2951
 #, c-format
 msgid "IPv4 support is %s\n"
 msgstr "El soporte IPv4 es %s\n"
 
-#: src/transport/plugin_transport_http_server.c:2961
+#: src/transport/plugin_transport_http_server.c:2966
 #, c-format
 msgid "IPv6 support is %s\n"
 msgstr "El soporte IPv6 es %s\n"
 
-#: src/transport/plugin_transport_http_server.c:2967
+#: src/transport/plugin_transport_http_server.c:2972
 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:2978
+#: src/transport/plugin_transport_http_server.c:2983
 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:2984
+#: src/transport/plugin_transport_http_server.c:2989
 #, c-format
 msgid "Using port %u\n"
 msgstr "Usando puerto %u\n"
 
-#: src/transport/plugin_transport_http_server.c:2998
+#: src/transport/plugin_transport_http_server.c:3003
 #, 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:3008
+#: src/transport/plugin_transport_http_server.c:3013
 #, 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:3030
+#: src/transport/plugin_transport_http_server.c:3035
 #, 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:3040
+#: src/transport/plugin_transport_http_server.c:3045
 #, 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:3103
+#: src/transport/plugin_transport_http_server.c:3108
 #, c-format
 msgid "Using external hostname `%s'\n"
 msgstr "Usando nombre de máquina externo «%s»\n"
 
-#: src/transport/plugin_transport_http_server.c:3124
+#: src/transport/plugin_transport_http_server.c:3129
 #, 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:3141
+#: src/transport/plugin_transport_http_server.c:3146
 #, 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:3448
+#: src/transport/plugin_transport_http_server.c:3453
 #, fuzzy
 msgid "Unable to compile URL regex\n"
 msgstr "¡Imposible obtener «HELLO» del par!\n"
@@ -8530,8 +8368,8 @@
 msgid "# network-level TCP disconnect events"
 msgstr "# eventos de desconexión TCP a nivel de red"
 
-#: src/transport/plugin_transport_tcp.c:2760 src/util/service.c:582
-#: src/util/service.c:588
+#: src/transport/plugin_transport_tcp.c:2760 src/util/service.c:585
+#: src/util/service.c:591
 #, c-format
 msgid "Require valid port number for service `%s' in configuration!\n"
 msgstr ""
@@ -8583,7 +8421,7 @@
 "or %u)\n"
 msgstr ""
 
-#: src/transport/plugin_transport_udp.c:2881
+#: src/transport/plugin_transport_udp.c:2888
 #, c-format
 msgid ""
 "UDP could not transmit message to `%s': Network seems down, please check "
@@ -8592,7 +8430,7 @@
 "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:2894
+#: src/transport/plugin_transport_udp.c:2901
 #, fuzzy
 msgid ""
 "UDP could not transmit IPv6 message! Please check your network configuration "
@@ -8602,41 +8440,41 @@
 "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:3247
+#: src/transport/plugin_transport_udp.c:3254
 #, 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:3255
+#: src/transport/plugin_transport_udp.c:3262
 msgid "Failed to open UDP sockets\n"
 msgstr "Se produjo un fallo al abrir los «sockets» UDP\n"
 
-#: src/transport/plugin_transport_udp.c:3414
+#: src/transport/plugin_transport_udp.c:3421
 #, 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:3461
+#: src/transport/plugin_transport_udp.c:3468
 #, c-format
 msgid "Invalid IPv6 address: `%s'\n"
 msgstr "Dirección IPv6 no válida: «%s»\n"
 
-#: src/transport/plugin_transport_udp.c:3529
+#: src/transport/plugin_transport_udp.c:3536
 #, fuzzy
 msgid "Failed to create network sockets, plugin failed\n"
 msgstr "Se produjo un fallo al crear una nueva firma"
 
-#: src/transport/plugin_transport_unix.c:1403
+#: src/transport/plugin_transport_unix.c:1402
 #, 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:1416
+#: src/transport/plugin_transport_unix.c:1415
 #, fuzzy, c-format
 msgid "Cannot bind to `%s'\n"
 msgstr "Imposible hallar el hash de '%s'.\n"
 
-#: src/transport/plugin_transport_unix.c:1817
+#: src/transport/plugin_transport_unix.c:1816
 #, fuzzy
 msgid "Failed to open UNIX listen socket\n"
 msgstr "Se produjo un fallo al abrir los «sockets» UNIX\n"
@@ -8711,7 +8549,7 @@
 msgid "# sessions allocated"
 msgstr "# sesiones WLAN alojadas"
 
-#: src/transport/transport_api.c:767
+#: src/transport/transport_api.c:816
 #, c-format
 msgid "Received unexpected message of type %u in %s:%u\n"
 msgstr "Recibido mensaje inesperado del tipo %u en %s:%u\n"
@@ -8754,13 +8592,13 @@
 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:619
+#: src/util/client.c:261 src/util/client.c:858 src/util/service.c:622
 #, 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:623
+#: src/util/client.c:265 src/util/client.c:863 src/util/service.c:626
 #, c-format
 msgid "Using `%s' instead\n"
 msgstr "Usando «%s» en su defecto\n"
@@ -8789,7 +8627,7 @@
 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:1303
+#: 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 "
@@ -8857,7 +8695,7 @@
 msgid "Syntax error while deserializing in line %u\n"
 msgstr "Error de sintaxis en la línea %u mientras se deserializaba\n"
 
-#: src/util/configuration.c:1023
+#: src/util/configuration.c:1025
 #, c-format
 msgid ""
 "Configuration value '%s' for '%s' in section '%s' is not in set of legal "
@@ -8866,17 +8704,17 @@
 "El valor de configuración «%s» para «%s» de la sección «%s» no está dentro "
 "de las opciones legales\n"
 
-#: src/util/configuration.c:1093
+#: src/util/configuration.c:1095
 #, c-format
 msgid "Recursive expansion suspected, aborting $-expansion for term `%s'\n"
 msgstr ""
 
-#: src/util/configuration.c:1125
+#: src/util/configuration.c:1127
 #, 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:1199
+#: src/util/configuration.c:1201
 #, c-format
 msgid ""
 "Failed to expand `%s' in `%s' as it is neither found in [PATHS] nor defined "
@@ -8985,7 +8823,7 @@
 msgid "Expected `%s' to be a directory!\n"
 msgstr "¡Se esperaba que «%s» fuera un directorio!\n"
 
-#: src/util/disk.c:1564 src/util/service.c:1323
+#: src/util/disk.c:1564 src/util/service.c:1327
 #, c-format
 msgid "Cannot obtain information about user `%s': %s\n"
 msgstr "No se pudo obtener información acerca del usuario «%s»: %s\n"
@@ -9188,23 +9026,28 @@
 msgid "Use build-in GNUnet stub resolver"
 msgstr "Utilizar el resolvedor interno para pruebas de GNUnet"
 
-#: src/util/gnunet-scrypt.c:279
+#: src/util/gnunet-scrypt.c:233
+#, c-format
+msgid "Loading hostkey from `%s' failed.\n"
+msgstr "La carga de la clave de la máquina desde «%s» ha fallado.\n"
+
+#: src/util/gnunet-scrypt.c:294
 msgid "number of bits to require for the proof of work"
 msgstr ""
 
-#: src/util/gnunet-scrypt.c:282
+#: src/util/gnunet-scrypt.c:297
 msgid "file with private key, otherwise default is used"
 msgstr ""
 
-#: src/util/gnunet-scrypt.c:285
+#: src/util/gnunet-scrypt.c:300
 msgid "file with proof of work, otherwise default is used"
 msgstr ""
 
-#: src/util/gnunet-scrypt.c:288
+#: src/util/gnunet-scrypt.c:303
 msgid "time to wait between calculations"
 msgstr ""
 
-#: src/util/gnunet-scrypt.c:299
+#: src/util/gnunet-scrypt.c:315
 #, fuzzy
 msgid "Manipulate GNUnet proof of work files"
 msgstr "Manipular los ficheros de clave privada ECC de GNUnet"
@@ -9261,12 +9104,12 @@
 msgid "Error writing to `%s': %s\n"
 msgstr "Error escribiendo a «%s»: %s\n"
 
-#: src/util/network.c:134
+#: src/util/network.c:137
 #, c-format
 msgid "Unable to shorten unix path `%s' while keeping name unique\n"
 msgstr "Imposible acortar la ruta unix «%s» manteniendo el nombre único\n"
 
-#: src/util/network.c:1361 src/util/network.c:1486
+#: src/util/network.c:1640 src/util/network.c:1797
 #, c-format
 msgid ""
 "Fatal internal logic error, process hangs in `%s' (abort with CTRL-C)!\n"
@@ -9317,17 +9160,17 @@
 msgid "Could not determine plugin installation path.\n"
 msgstr "No se pudo determinar la ruta de instalación de los módulos.\n"
 
-#: src/util/program.c:246 src/util/service.c:1457
+#: src/util/program.c:246 src/util/service.c:1461
 #, fuzzy, c-format
 msgid "Malformed configuration file `%s', exit ...\n"
 msgstr "Se produjo un fallo al borrar el fichero de configuración %s\n"
 
-#: src/util/program.c:258 src/util/service.c:1472
+#: src/util/program.c:258 src/util/service.c:1476
 #, c-format
 msgid "Could not access configuration file `%s'\n"
 msgstr "No se pudo acceder al fichero de configuración «%s»\n"
 
-#: src/util/program.c:263 src/util/service.c:1467
+#: src/util/program.c:263 src/util/service.c:1471
 #, fuzzy
 msgid "Malformed configuration, exit ...\n"
 msgstr "Se produjo un fallo al borrar el fichero de configuración %s\n"
@@ -9361,15 +9204,10 @@
 msgstr ""
 "No se pudo resolver nuestro nombre de dominio cualificado (FQDN) : %s\n"
 
-#: src/util/scheduler.c:813
+#: src/util/scheduler.c:812
 msgid "Looks like we're busy waiting...\n"
 msgstr "Parece que estamos en espera ocupada...\n"
 
-#: src/util/scheduler.c:948
-#, c-format
-msgid "Attempt to cancel dead task %llu!\n"
-msgstr "¡Intento de cancelar la tarea muerta %llu!\n"
-
 #: src/util/server.c:484
 #, c-format
 msgid "`%s' failed for port %d (%s).\n"
@@ -9385,7 +9223,7 @@
 msgid "`%s' failed for `%s': address already in use\n"
 msgstr "«%s» falló para «%.*s»: dirección en uso actualmente\n"
 
-#: src/util/server.c:894
+#: src/util/server.c:896
 #, c-format
 msgid ""
 "Processing code for message of type %u did not call "
@@ -9404,17 +9242,17 @@
 msgid "Access from `%s' denied to service `%s'\n"
 msgstr "Acceso denegado desde «%s» al servicio «%s»\n"
 
-#: src/util/service.c:409
+#: src/util/service.c:410
 #, c-format
 msgid "Could not parse IPv4 network specification `%s' for `%s:%s'\n"
 msgstr "No se pudo procesar la especificación de red IPv4 «%s» para «%s:%s»\n"
 
-#: src/util/service.c:446
+#: src/util/service.c:448
 #, c-format
 msgid "Could not parse IPv6 network specification `%s' for `%s:%s'\n"
 msgstr "No se pudo procesar la especificación de red IPv6 «%s» para «%s:%s»\n"
 
-#: src/util/service.c:563
+#: src/util/service.c:566
 #, c-format
 msgid ""
 "Disabling IPv6 support for service `%s', failed to create IPv6 socket: %s\n"
@@ -9422,7 +9260,7 @@
 "Deshabilitando el soporte para IPv6 para el servicio «%s», se produjo un "
 "fallo al crear un «socket» IPv6: %s\n"
 
-#: src/util/service.c:653
+#: src/util/service.c:656
 #, c-format
 msgid ""
 "Disabling UNIX domain socket support for service `%s', failed to create UNIX "
@@ -9431,64 +9269,64 @@
 "Deshabilitando el soporte de dominio de «sockets» UNIX para el servicio "
 "«%s», no se pudo crear un «socket» UNIX: %s\n"
 
-#: src/util/service.c:669
+#: src/util/service.c:672
 #, c-format
 msgid "Have neither PORT nor UNIXPATH for service `%s', but one is required\n"
 msgstr ""
 "No hay ni puerto (PORT) ni ruta unix (UNIXPATH) para el servicio «%s», pero "
 "uno es necesario\n"
 
-#: src/util/service.c:908
+#: src/util/service.c:911
 msgid "Could not access a pre-bound socket, will try to bind myself\n"
 msgstr ""
 "No se pudo acceder a un «socket» pre-ascociado, lo intentaré asociar yo "
 "mismo\n"
 
-#: src/util/service.c:957 src/util/service.c:975
+#: src/util/service.c:960 src/util/service.c:978
 #, c-format
 msgid "Specified value for `%s' of service `%s' is invalid\n"
 msgstr "El valor especificado «%s» para el servicio «%s» no es válido\n"
 
-#: src/util/service.c:1000
+#: src/util/service.c:1003
 #, c-format
 msgid "Could not access pre-bound socket %u, will try to bind myself\n"
 msgstr ""
 "No se pudo acceder al «socket» pre-ascociado %u, lo intentaré asociar yo "
 "mismo\n"
 
-#: src/util/service.c:1170
+#: src/util/service.c:1174
 #, c-format
 msgid "Failed to start `%s' at `%s'\n"
 msgstr "Se produjo un fallo al inciar «%s» en «%s»\n"
 
-#: src/util/service.c:1212
+#: src/util/service.c:1216
 #, c-format
 msgid "Service `%s' runs at %s\n"
 msgstr "El servicio «%s» se ejecuta en %s\n"
 
-#: src/util/service.c:1261
+#: src/util/service.c:1265
 msgid "Service process failed to initialize\n"
 msgstr "No se pudo inicializar el proceso del servicio\n"
 
-#: src/util/service.c:1265
+#: src/util/service.c:1269
 msgid "Service process could not initialize server function\n"
 msgstr ""
 "No se pudo inicializar la función del servidor en el proceso del servicio\n"
 
-#: src/util/service.c:1269
+#: src/util/service.c:1273
 msgid "Service process failed to report status\n"
 msgstr "El proceso del servicio no devolvió un estado\n"
 
-#: src/util/service.c:1324
+#: src/util/service.c:1328
 msgid "No such user"
 msgstr "No existe tal usuario"
 
-#: src/util/service.c:1337
+#: src/util/service.c:1341
 #, c-format
 msgid "Cannot change user/group to `%s': %s\n"
 msgstr "Imposible cambiar el usuario/grupo a «%s»: %s\n"
 
-#: src/util/service.c:1407
+#: src/util/service.c:1411
 msgid "do daemonize (detach from terminal)"
 msgstr "demonizar (desasociar del terminal)"
 
@@ -9814,6 +9652,101 @@
 msgid "`%s' failed on file `%s' at %s:%d with error: %s\n"
 msgstr "«%s» falló en el fichero «%s» en %s:%d con el error: %s\n"
 
+#~ msgid "Starting default services `%s'\n"
+#~ msgstr "Iniciando servicios predeterminados «%s»\n"
+
+# Miguel: He traducido "default" por "predeterminado", la locución
+# "por defecto" no tiene sentido en sitios como este y he tratado
+# de ser consistente.
+#~ msgid "Default service `%s' not configured correctly!\n"
+#~ msgstr ""
+#~ "¡El servicio predeterminado «%s» no está configurado correctamente!\n"
+
+# Miguel: ¿No hay servicios -> no hay ningún servicio?
+#~ msgid ""
+#~ "No default services configured, GNUnet will not really start right now.\n"
+#~ msgstr ""
+#~ "No hay servicios predeterminados configurados, GNUnet no va a iniciarse "
+#~ "realmente ahora.\n"
+
+#~ msgid "Received %s message\n"
+#~ msgstr "Recibido mensaje %s\n"
+
+#~ msgid "Received last message for %s \n"
+#~ msgstr "Recibido último mensaje para %s\n"
+
+#, fuzzy
+#~ msgid "Failed to create statistics!\n"
+#~ msgstr "Se produjo un fallo al crear los índices\n"
+
+#, fuzzy
+#~ msgid "Failed to parse file `%s'\n"
+#~ msgstr "Se produjo un fallo al procesar «HELLO» en el fichero «%s»\n"
+
+#, fuzzy
+#~ msgid "Invalid value for public key\n"
+#~ msgstr "Parámetro no válido «%s»\n"
+
+#, fuzzy
+#~ msgid "Cannot read experiments file `%s'\n"
+#~ msgstr "No se pudo leer la lista de amigos «%s»\n"
+
+#, fuzzy
+#~ msgid "Connected to peer %s\n"
+#~ msgstr "Conectado a %s.\n"
+
+#, fuzzy
+#~ msgid "Disconnected from peer %s\n"
+#~ msgstr "Desconectado de %s\n"
+
+#, fuzzy
+#~ msgid "Starting inbound experiment `%s' with peer `%s'\n"
+#~ msgstr "Iniciando el servicio %s para el par «%4s»\n"
+
+#, fuzzy
+#~ msgid "Starting outbound experiment `%s' with peer `%s'\n"
+#~ msgstr "Iniciando el servicio %s para el par «%4s»\n"
+
+#, fuzzy
+#~ msgid "Received %s message from peer %s for experiment `%s'\n"
+#~ msgstr "Recibido último mensaje para %s\n"
+
+#~ msgid "Lacking key configuration settings.\n"
+#~ msgstr "Falta configuración sobre las opciones de claves.\n"
+
+#~ msgid "Could not access hostkey file `%s'.\n"
+#~ msgstr "No se pudo acceder al fichero de clave de máquina «%s».\n"
+
+#~ msgid "Hostlist file `%s' could not be removed\n"
+#~ msgstr "El fichero de listas de máquinas «%s» no pudo ser eliminado\n"
+
+#, fuzzy
+#~ msgid "Failure: Did not receive %s\n"
+#~ msgstr "Se produjo un fallo al resolver «%s»: %s\n"
+
+#~ msgid ""
+#~ "Dropping message of type %u and size %u, have %u/%u messages pending\n"
+#~ msgstr ""
+#~ "Mensaje omitido de tipo %u y tamaño %u, hay %u/%u mensajes pendientes\n"
+
+#~ msgid "Rejecting control connection from peer `%s', which is not me!\n"
+#~ msgstr "¡Rechazando conexión de control del par «%s», que no soy yo!\n"
+
+#, fuzzy
+#~ msgid "Blacklist allows connection attempt to peer `%s'\n"
+#~ msgstr "Se produjo un fallo al conectar con «%s»\n"
+
+#, fuzzy
+#~ msgid "Received a request connect message for peer `%s'\n"
+#~ msgstr "Recibido último mensaje para %s\n"
+
+#, fuzzy
+#~ msgid "Received a request disconnect message for peer `%s'\n"
+#~ msgstr "Recibido último mensaje para %s\n"
+
+#~ msgid "Attempt to cancel dead task %llu!\n"
+#~ msgstr "¡Intento de cancelar la tarea muerta %llu!\n"
+
 #~ msgid "NAT traversal with ICMP Server timed out.\n"
 #~ msgstr "Recorrido NAT con servidor ICMP expirado.\n"
 

Modified: gnunet/po/sv.po
===================================================================
--- gnunet/po/sv.po     2015-01-10 01:26:04 UTC (rev 34874)
+++ gnunet/po/sv.po     2015-01-10 18:56:41 UTC (rev 34875)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: GNUnet 0.7.0b\n"
 "Report-Msgid-Bugs-To: address@hidden"
-"POT-Creation-Date: 2014-12-09 00:23+0100\n"
+"POT-Creation-Date: 2015-01-01 22:23+0100\n"
 "PO-Revision-Date: 2006-01-21 17:16+0100\n"
 "Last-Translator: Daniel Nylander <address@hidden>\n"
 "Language-Team: Swedish <address@hidden>\n"
@@ -289,76 +289,51 @@
 msgid "ARM now monitors connections to service `%s' at `%s'\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:831
+#: src/arm/gnunet-service-arm.c:835
 #, fuzzy, c-format
 msgid "Preparing to stop `%s'\n"
 msgstr "Startade samling \"%s\".\n"
 
-#: src/arm/gnunet-service-arm.c:1100
+#: src/arm/gnunet-service-arm.c:1105
 #, fuzzy, c-format
 msgid "Restarting service `%s'.\n"
 msgstr "Startade samling \"%s\".\n"
 
-#: src/arm/gnunet-service-arm.c:1193
+#: src/arm/gnunet-service-arm.c:1199
 msgid "exit"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:1198
+#: src/arm/gnunet-service-arm.c:1204
 msgid "signal"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:1203
+#: src/arm/gnunet-service-arm.c:1209
 #, fuzzy
 msgid "unknown"
 msgstr "Okänt fel"
 
-#: src/arm/gnunet-service-arm.c:1209
+#: src/arm/gnunet-service-arm.c:1215
 #, fuzzy, c-format
 msgid "Service `%s' took %s to terminate\n"
 msgstr "Tjänst borttagen.\n"
 
-#: src/arm/gnunet-service-arm.c:1231
+#: src/arm/gnunet-service-arm.c:1237
 #, c-format
 msgid "Service `%s' terminated normally, will restart at any time\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:1246
+#: src/arm/gnunet-service-arm.c:1252
 #, c-format
 msgid "Service `%s' terminated with status %s/%d, will restart in %s\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:1500
-#, fuzzy, c-format
-msgid "Starting default services `%s'\n"
-msgstr "Startade samling \"%s\".\n"
-
-#: src/arm/gnunet-service-arm.c:1511
-#, c-format
-msgid "Default service `%s' not configured correctly!\n"
-msgstr ""
-
-#: src/arm/gnunet-service-arm.c:1524
-msgid ""
-"No default services configured, GNUnet will not really start right now.\n"
-msgstr ""
-
 #: src/arm/mockup-service.c:41
 msgid "Initiating shutdown as requested by client.\n"
 msgstr ""
 
-#: src/ats/ats_api_performance.c:485
-#, fuzzy, c-format
-msgid "Received %s message\n"
-msgstr "mottog ogiltigt \"%s\" meddelande\n"
-
-#: src/ats/ats_api_performance.c:528
-#, fuzzy, c-format
-msgid "Received last message for %s \n"
-msgstr "Mottog ogiltigt \"%s\" meddelande från \"%s\".\n"
-
 #: src/ats/gnunet-ats-solver-eval.c:2804 src/ats/gnunet-ats-solver-eval.c:2838
-#: src/ats/gnunet-service-ats_addresses.c:1781
-#: src/ats/gnunet-service-ats_addresses.c:1825
+#: src/ats/gnunet-service-ats_addresses.c:1789
+#: src/ats/gnunet-service-ats_addresses.c:1833
 #, c-format
 msgid ""
 "Could not load quota for network `%s':  `%s', assigning default bandwidth "
@@ -366,13 +341,13 @@
 msgstr ""
 
 #: src/ats/gnunet-ats-solver-eval.c:2810
-#: src/ats/gnunet-service-ats_addresses.c:1788
+#: src/ats/gnunet-service-ats_addresses.c:1796
 #, c-format
 msgid "Outbound quota configure for network `%s' is %llu\n"
 msgstr ""
 
 #: src/ats/gnunet-ats-solver-eval.c:2817
-#: src/ats/gnunet-service-ats_addresses.c:1796
+#: src/ats/gnunet-service-ats_addresses.c:1804
 #, c-format
 msgid ""
 "No outbound quota configured for network `%s', assigning default bandwidth "
@@ -380,13 +355,13 @@
 msgstr ""
 
 #: src/ats/gnunet-ats-solver-eval.c:2844
-#: src/ats/gnunet-service-ats_addresses.c:1832
+#: src/ats/gnunet-service-ats_addresses.c:1840
 #, c-format
 msgid "Inbound quota configured for network `%s' is %llu\n"
 msgstr ""
 
 #: src/ats/gnunet-ats-solver-eval.c:2851
-#: src/ats/gnunet-service-ats_addresses.c:1840
+#: src/ats/gnunet-service-ats_addresses.c:1848
 #, c-format
 msgid ""
 "No outbound quota configure for network `%s', assigning default bandwidth "
@@ -421,22 +396,22 @@
 msgid "disable normalization"
 msgstr ""
 
-#: src/ats/gnunet-service-ats_addresses.c:2039
+#: src/ats/gnunet-service-ats_addresses.c:2051
 #, c-format
 msgid "Initializing solver `%s '`%s'\n"
 msgstr ""
 
-#: src/ats/gnunet-service-ats_addresses.c:2042
+#: src/ats/gnunet-service-ats_addresses.c:2057
 #, fuzzy, c-format
 msgid "Failed to initialize solver `%s'!\n"
 msgstr "Kunde inte initiera SQLite.\n"
 
-#: src/ats/gnunet-service-ats_addresses.c:2065
+#: src/ats/gnunet-service-ats_addresses.c:2082
 #, fuzzy
 msgid "Failed to initialize solver!\n"
 msgstr "Kunde inte initiera SQLite.\n"
 
-#: src/ats/plugin_ats_mlp.c:1344
+#: src/ats/plugin_ats_mlp.c:1345
 msgid "Problem size too large, cannot allocate memory!\n"
 msgstr ""
 
@@ -445,19 +420,19 @@
 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:1988
+#: 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:2704
+#: src/ats/plugin_ats_mlp.c:2714
 msgid ""
 "MLP solver is not optimizing for anything, changing to feasibility check\n"
 msgstr ""
 
-#: src/ats/plugin_ats_mlp.c:2744 src/ats/plugin_ats_mlp.c:2761
-#: src/ats/plugin_ats_mlp.c:2793 src/ats/plugin_ats_mlp.c:2811
-#: src/ats/plugin_ats_mlp.c:2830 src/ats/plugin_ats_proportional.c:1989
+#: 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:1989
 #: src/ats/plugin_ats_proportional.c:2010 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
@@ -467,33 +442,33 @@
 msgid "Invalid %s configuration %f \n"
 msgstr "Kunde inte spara konfigurationsfil \"%s\":"
 
-#: src/ats/plugin_ats_mlp.c:2917
+#: src/ats/plugin_ats_mlp.c:2927
 #, 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:2926
+#: src/ats/plugin_ats_mlp.c:2936
 #, 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:2937
+#: src/ats/plugin_ats_mlp.c:2947
 #, c-format
 msgid ""
 "Adjusting outbound quota configuration for network `%s'from %llu to %.0f\n"
 msgstr ""
 
-#: src/ats/plugin_ats_mlp.c:2945
+#: src/ats/plugin_ats_mlp.c:2955
 #, c-format
 msgid ""
 "Adjusting inbound quota configuration for network `%s' from %llu to %.0f\n"
 msgstr ""
 
-#: src/ats/plugin_ats_mlp.c:2956
+#: src/ats/plugin_ats_mlp.c:2966
 #, c-format
 msgid "Using default quota configuration for network `%s' (in/out) %llu/%llu\n"
 msgstr ""
@@ -541,11 +516,11 @@
 msgid "Initialization failed, shutdown\n"
 msgstr "Initiering av insticksmekanism misslyckades: %s!\n"
 
-#: src/ats-tests/ats-testing-log.c:842
+#: src/ats-tests/ats-testing-log.c:846
 msgid "Stop logging\n"
 msgstr ""
 
-#: src/ats-tests/ats-testing-log.c:893
+#: src/ats-tests/ats-testing-log.c:897
 #, fuzzy, c-format
 msgid "Start logging `%s'\n"
 msgstr "Startade samling \"%s\".\n"
@@ -587,96 +562,96 @@
 msgid "Removed address of peer `%s' with plugin `%s'\n"
 msgstr "Tillgängliga transport(er): %s\n"
 
-#: src/ats-tool/gnunet-ats.c:747
+#: src/ats-tool/gnunet-ats.c:746
 #, c-format
 msgid "Quota for network `%11s' (in/out): %10s / %10s\n"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:779 src/namestore/gnunet-namestore.c:700
-#: src/transport/gnunet-transport.c:1855
+#: src/ats-tool/gnunet-ats.c:778 src/namestore/gnunet-namestore.c:700
+#: src/transport/gnunet-transport.c:1853
 #: 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:793 src/transport/gnunet-transport.c:1864
+#: src/ats-tool/gnunet-ats.c:792 src/transport/gnunet-transport.c:1862
 #: 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:803
+#: src/ats-tool/gnunet-ats.c:802
 #, c-format
 msgid "Please select one operation : %s or %s or %s or %s or %s\n"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:825 src/ats-tool/gnunet-ats.c:851
-#: src/ats-tool/gnunet-ats.c:879 src/ats-tool/gnunet-ats.c:925
+#: src/ats-tool/gnunet-ats.c:824 src/ats-tool/gnunet-ats.c:850
+#: src/ats-tool/gnunet-ats.c:878 src/ats-tool/gnunet-ats.c:924
 #, fuzzy
 msgid "Cannot connect to ATS service, exiting...\n"
 msgstr "Misslyckades att initiera tjänsten \"%s\".\n"
 
-#: src/ats-tool/gnunet-ats.c:837 src/ats-tool/gnunet-ats.c:863
+#: src/ats-tool/gnunet-ats.c:836 src/ats-tool/gnunet-ats.c:862
 #, fuzzy
 msgid "Cannot issue request to ATS service, exiting...\n"
 msgstr "Misslyckades att initiera tjänsten \"%s\".\n"
 
-#: src/ats-tool/gnunet-ats.c:891
+#: src/ats-tool/gnunet-ats.c:890
 #, fuzzy
 msgid "No preference type given!\n"
 msgstr "Skriv ut information om GNUnets motparter."
 
-#: src/ats-tool/gnunet-ats.c:898
+#: src/ats-tool/gnunet-ats.c:897
 msgid "No peer given!\n"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:916
+#: src/ats-tool/gnunet-ats.c:915
 msgid "Valid type required\n"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:984
+#: src/ats-tool/gnunet-ats.c:983
 msgid "get list of active addresses currently used"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:986
+#: src/ats-tool/gnunet-ats.c:985
 msgid "get list of all active addresses"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:989
+#: src/ats-tool/gnunet-ats.c:988
 #, 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:991
+#: src/ats-tool/gnunet-ats.c:990
 msgid "monitor mode"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:993
+#: src/ats-tool/gnunet-ats.c:992
 #, fuzzy
 msgid "set preference for the given peer"
 msgstr "Skriv ut information om GNUnets motparter."
 
-#: src/ats-tool/gnunet-ats.c:995
+#: src/ats-tool/gnunet-ats.c:994
 msgid "print all configured quotas"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:997
+#: src/ats-tool/gnunet-ats.c:996
 msgid "peer id"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:1000
+#: src/ats-tool/gnunet-ats.c:999
 msgid "preference type to set: latency | bandwidth"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:1002
+#: src/ats-tool/gnunet-ats.c:1001
 msgid "preference value"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:1005
+#: src/ats-tool/gnunet-ats.c:1004
 msgid "verbose output (include ATS address properties)"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:1012
+#: src/ats-tool/gnunet-ats.c:1011
 #, fuzzy
 msgid "Print information about ATS state"
 msgstr "Skriv ut information om GNUnets motparter."
@@ -737,7 +712,7 @@
 msgid "provide information about all tunnels"
 msgstr "Skriv ut information om GNUnets motparter."
 
-#: src/cadet/gnunet-service-cadet_peer.c:496
+#: src/cadet/gnunet-service-cadet_peer.c:502
 msgid "Wrong CORE service\n"
 msgstr ""
 
@@ -1232,7 +1207,7 @@
 msgid "Could not start playback audio helper.\n"
 msgstr "Kunde inte slå upp \"%s\": %s\n"
 
-#: src/core/core_api.c:768
+#: src/core/core_api.c:787
 msgid "Client was disconnected from core service, trying to reconnect.\n"
 msgstr ""
 
@@ -1278,18 +1253,17 @@
 msgid "%24s: %-30s %4s (timeout in %6s)\n"
 msgstr ""
 
-#: src/core/gnunet-core.c:146 src/peerinfo-tool/gnunet-peerinfo.c:761
+#: src/core/gnunet-core.c:146 src/peerinfo-tool/gnunet-peerinfo.c:786
 #, fuzzy, c-format
 msgid "Invalid command line argument `%s'\n"
 msgstr "Ogiltiga kommandoradsargument:\n"
 
 #: src/core/gnunet-core.c:157
-#: src/experimentation/gnunet-daemon-experimentation_nodes.c:1104
 #, fuzzy
 msgid "Failed to connect to CORE service!\n"
 msgstr "Misslyckades att ansluta till gnunetd.\n"
 
-#: src/core/gnunet-core.c:179 src/transport/gnunet-transport.c:2115
+#: src/core/gnunet-core.c:179 src/transport/gnunet-transport.c:2114
 #, fuzzy
 msgid "provide information about all current connections (continuously)"
 msgstr "Skriv ut information om GNUnets motparter."
@@ -1309,16 +1283,16 @@
 msgid "Core service of `%4s' ready.\n"
 msgstr ""
 
-#: src/core/gnunet-service-core_clients.c:372
+#: src/core/gnunet-service-core_clients.c:375
 msgid "# send requests dropped (disconnected)"
 msgstr ""
 
-#: src/core/gnunet-service-core_clients.c:483
+#: src/core/gnunet-service-core_clients.c:490
 #, fuzzy
 msgid "# messages discarded (session disconnected)"
 msgstr "Nätverksannonsering avstängd i konfigurationen!\n"
 
-#: src/core/gnunet-service-core_clients.c:529
+#: src/core/gnunet-service-core_clients.c:536
 #, fuzzy, c-format
 msgid "# bytes of messages of type %u received"
 msgstr "# krypterade PONG-meddelanden mottagna"
@@ -1339,134 +1313,134 @@
 msgid "# key exchanges stopped"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:847
+#: src/core/gnunet-service-core_kx.c:848
 msgid "# old ephemeral keys ignored"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:854
+#: src/core/gnunet-service-core_kx.c:855
 #, fuzzy
 msgid "# ephemeral keys received"
 msgstr "# krypterade PONG-meddelanden mottagna"
 
-#: src/core/gnunet-service-core_kx.c:888
+#: src/core/gnunet-service-core_kx.c:889
 #, 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:899
+#: src/core/gnunet-service-core_kx.c:900
 #, fuzzy
 msgid "# EPHEMERAL_KEY messages received"
 msgstr "# PING-meddelanden skapade"
 
-#: src/core/gnunet-service-core_kx.c:998
+#: src/core/gnunet-service-core_kx.c:999
 #: src/transport/gnunet-service-transport_validation.c:1016
 #, fuzzy
 msgid "# PING messages received"
 msgstr "# PING-meddelanden skapade"
 
-#: src/core/gnunet-service-core_kx.c:1006
+#: src/core/gnunet-service-core_kx.c:1007
 #, fuzzy
 msgid "# PING messages dropped (out of order)"
 msgstr "Nätverksannonsering avstängd i konfigurationen!\n"
 
-#: src/core/gnunet-service-core_kx.c:1033
+#: src/core/gnunet-service-core_kx.c:1034
 #, 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:1049
+#: src/core/gnunet-service-core_kx.c:1050
 #, fuzzy
 msgid "# PONG messages created"
 msgstr "# PING-meddelanden skapade"
 
-#: src/core/gnunet-service-core_kx.c:1075
+#: src/core/gnunet-service-core_kx.c:1077
 #, fuzzy
 msgid "# sessions terminated by timeout"
 msgstr "# byte kastade via TCP (utgående)"
 
-#: src/core/gnunet-service-core_kx.c:1086
+#: src/core/gnunet-service-core_kx.c:1088
 #, fuzzy
 msgid "# keepalive messages sent"
 msgstr "# PING-meddelanden i klartext skickade"
 
-#: src/core/gnunet-service-core_kx.c:1153
+#: src/core/gnunet-service-core_kx.c:1156
 #: src/transport/gnunet-service-transport_validation.c:1359
 #, fuzzy
 msgid "# PONG messages received"
 msgstr "# krypterade PONG-meddelanden mottagna"
 
-#: src/core/gnunet-service-core_kx.c:1159
+#: src/core/gnunet-service-core_kx.c:1162
 #, fuzzy
 msgid "# PONG messages dropped (connection down)"
 msgstr "# krypterade PONG-meddelanden mottagna"
 
-#: src/core/gnunet-service-core_kx.c:1164
+#: src/core/gnunet-service-core_kx.c:1167
 #, fuzzy
 msgid "# PONG messages dropped (out of order)"
 msgstr "Nätverksannonsering avstängd i konfigurationen!\n"
 
-#: src/core/gnunet-service-core_kx.c:1194
+#: src/core/gnunet-service-core_kx.c:1197
 #, fuzzy
 msgid "# PONG messages decrypted"
 msgstr "# PING-meddelanden skapade"
 
-#: src/core/gnunet-service-core_kx.c:1229
+#: src/core/gnunet-service-core_kx.c:1232
 #, fuzzy
 msgid "# session keys confirmed via PONG"
 msgstr "# sessionnycklar vägrade"
 
-#: src/core/gnunet-service-core_kx.c:1240
+#: src/core/gnunet-service-core_kx.c:1243
 #, fuzzy
 msgid "# timeouts prevented via PONG"
 msgstr "# byte mottogs via TCP"
 
-#: src/core/gnunet-service-core_kx.c:1247
+#: src/core/gnunet-service-core_kx.c:1250
 #, fuzzy
 msgid "# rekey operations confirmed via PONG"
 msgstr "# sessionnycklar vägrade"
 
-#: src/core/gnunet-service-core_kx.c:1386
+#: src/core/gnunet-service-core_kx.c:1392
 #, fuzzy
 msgid "# DATA message dropped (out of order)"
 msgstr "# byte kastade via UDP (utgående)"
 
-#: src/core/gnunet-service-core_kx.c:1393
+#: src/core/gnunet-service-core_kx.c:1399
 #, 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:1396
+#: src/core/gnunet-service-core_kx.c:1402
 #, fuzzy
 msgid "# sessions terminated by key expiration"
 msgstr "# byte kastade via TCP (utgående)"
 
-#: src/core/gnunet-service-core_kx.c:1442
-#: src/core/gnunet-service-core_kx.c:1467
+#: src/core/gnunet-service-core_kx.c:1448
+#: src/core/gnunet-service-core_kx.c:1473
 #, fuzzy
 msgid "# bytes dropped (duplicates)"
 msgstr "# byte kastade via UDP (utgående)"
 
-#: src/core/gnunet-service-core_kx.c:1454
+#: src/core/gnunet-service-core_kx.c:1460
 #, fuzzy
 msgid "# bytes dropped (out of sequence)"
 msgstr "# byte kastade via UDP (utgående)"
 
-#: src/core/gnunet-service-core_kx.c:1496
+#: src/core/gnunet-service-core_kx.c:1502
 #, fuzzy
 msgid "# bytes dropped (ancient message)"
 msgstr "# byte kastade via UDP (utgående)"
 
-#: src/core/gnunet-service-core_kx.c:1504
+#: src/core/gnunet-service-core_kx.c:1510
 #, fuzzy
 msgid "# bytes of payload decrypted"
 msgstr "# byte dekrypterade"
 
-#: src/core/gnunet-service-core_kx.c:1539
+#: src/core/gnunet-service-core_kx.c:1545
 #, fuzzy
 msgid "# PAYLOAD dropped (out of order)"
 msgstr "# byte kastade via UDP (utgående)"
@@ -1477,7 +1451,7 @@
 msgstr "Nätverksannonsering avstängd i konfigurationen!\n"
 
 #: src/core/gnunet-service-core_neighbours.c:184
-#: src/core/gnunet-service-core_neighbours.c:335
+#: src/core/gnunet-service-core_neighbours.c:342
 msgid "# neighbour entries allocated"
 msgstr ""
 
@@ -1485,22 +1459,22 @@
 msgid "# encrypted bytes given to transport"
 msgstr ""
 
-#: src/core/gnunet-service-core_neighbours.c:418
+#: src/core/gnunet-service-core_neighbours.c:425
 #, c-format
 msgid "Unsupported message of type %u (%u bytes) received from peer `%s'\n"
 msgstr ""
 
 #: src/core/gnunet-service-core_sessions.c:245
 #: src/core/gnunet-service-core_sessions.c:328
-#: src/dht/gnunet-service-dht_neighbours.c:662
-#: src/dht/gnunet-service-dht_neighbours.c:727
-#: src/fs/gnunet-service-fs_cp.c:618 src/fs/gnunet-service-fs_cp.c:1517
+#: 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/topology/gnunet-daemon-topology.c:734
 #: src/topology/gnunet-daemon-topology.c:835
-#: src/transport/gnunet-service-transport_neighbours.c:917
-#: src/transport/gnunet-service-transport_neighbours.c:1141
-#: src/transport/gnunet-service-transport_neighbours.c:3177
-#: src/transport/gnunet-service-transport_neighbours.c:3491
+#: src/transport/gnunet-service-transport_neighbours.c:921
+#: src/transport/gnunet-service-transport_neighbours.c:1145
+#: src/transport/gnunet-service-transport_neighbours.c:3181
+#: src/transport/gnunet-service-transport_neighbours.c:3495
 #, fuzzy
 msgid "# peers connected"
 msgstr "# av anslutna parter"
@@ -1534,7 +1508,7 @@
 msgstr ""
 
 #: src/datacache/datacache.c:115 src/datacache/datacache.c:266
-#: src/datastore/gnunet-service-datastore.c:838
+#: src/datastore/gnunet-service-datastore.c:855
 #, fuzzy
 msgid "# bytes stored"
 msgstr "# byte krypterade"
@@ -1545,8 +1519,8 @@
 msgstr "# byte krypterade"
 
 #: src/datacache/datacache.c:143 src/datacache/datacache.c:150
-#: src/datastore/gnunet-service-datastore.c:1487
-#: src/datastore/gnunet-service-datastore.c:1498
+#: src/datastore/gnunet-service-datastore.c:1553
+#: src/datastore/gnunet-service-datastore.c:1564
 #, fuzzy, c-format
 msgid "No `%s' specified for `%s' in configuration!\n"
 msgstr "Inga applikationer definierade i konfiguration!\n"
@@ -1739,161 +1713,167 @@
 msgid "Manipulate GNUnet datastore"
 msgstr "skriv ut ett värde från konfigurationsfilen till standard ut"
 
-#: src/datastore/gnunet-service-datastore.c:351
+#: src/datastore/gnunet-service-datastore.c:365
 #, fuzzy
 msgid "# bytes expired"
 msgstr "# byte mottogs via TCP"
 
-#: src/datastore/gnunet-service-datastore.c:425
+#: src/datastore/gnunet-service-datastore.c:439
 msgid "# bytes purged (low-priority)"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:483
+#: src/datastore/gnunet-service-datastore.c:497
 #: src/gns/gnunet-gns-helper-service-w32.c:223
 msgid "Transmission to client failed!\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:514
+#: src/datastore/gnunet-service-datastore.c:528
 #: src/gns/gnunet-gns-helper-service-w32.c:262
 msgid "Shutdown in progress, aborting transmission.\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:630
+#: src/datastore/gnunet-service-datastore.c:643
 msgid "# results found"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:673
+#: src/datastore/gnunet-service-datastore.c:686
 #, c-format
 msgid ""
 "Insufficient space (%llu bytes are available) to satisfy `%s' request for "
 "%llu bytes\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:684
+#: src/datastore/gnunet-service-datastore.c:697
 #, c-format
 msgid ""
 "The requested amount (%llu bytes) is larger than the cache size (%llu "
 "bytes)\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:688
+#: src/datastore/gnunet-service-datastore.c:701
 msgid ""
 "Insufficient space to satisfy request and requested amount is larger than "
 "cache size"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:694
+#: src/datastore/gnunet-service-datastore.c:707
 msgid "Insufficient space to satisfy request"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:699
-#: src/datastore/gnunet-service-datastore.c:751
-#: src/datastore/gnunet-service-datastore.c:964
-#: src/datastore/gnunet-service-datastore.c:1421
+#: 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:1525
 msgid "# reserved"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:764
+#: src/datastore/gnunet-service-datastore.c:780
 msgid "Could not find matching reservation"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:850
+#: src/datastore/gnunet-service-datastore.c:867
 #, c-format
 msgid "Need %llu bytes more space (%llu allowed, using %llu)\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1010
+#: src/datastore/gnunet-service-datastore.c:1029
 #, fuzzy
 msgid "# GET requests received"
 msgstr "# byte mottogs via TCP"
 
-#: src/datastore/gnunet-service-datastore.c:1022
+#: src/datastore/gnunet-service-datastore.c:1041
 msgid "# requests filtered by bloomfilter"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1050
+#: src/datastore/gnunet-service-datastore.c:1069
 #, fuzzy
 msgid "# UPDATE requests received"
 msgstr "# byte mottogs via TCP"
 
-#: src/datastore/gnunet-service-datastore.c:1080
+#: src/datastore/gnunet-service-datastore.c:1099
 msgid "# GET REPLICATION requests received"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1113
+#: src/datastore/gnunet-service-datastore.c:1132
 msgid "# GET ZERO ANONYMITY requests received"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1138
+#: src/datastore/gnunet-service-datastore.c:1157
 #, fuzzy
 msgid "Content not found"
 msgstr "Kommando \"%s\" hittades inte!\n"
 
-#: src/datastore/gnunet-service-datastore.c:1146
+#: src/datastore/gnunet-service-datastore.c:1165
 msgid "# bytes removed (explicit request)"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1178
+#: src/datastore/gnunet-service-datastore.c:1197
 #, fuzzy
 msgid "# REMOVE requests received"
 msgstr "# byte mottogs via TCP"
 
-#: src/datastore/gnunet-service-datastore.c:1220
+#: src/datastore/gnunet-service-datastore.c:1241
 #, c-format
-msgid "Datastore payload inaccurate (%lld < %lld).  Trying to fix.\n"
+msgid ""
+"Datastore payload must have been inaccurate (%lld < %lld). Recomputing it.\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1281
+#: src/datastore/gnunet-service-datastore.c:1246
 #, c-format
+msgid "New payload: %lld\n"
+msgstr ""
+
+#: src/datastore/gnunet-service-datastore.c:1299
+#, c-format
 msgid "Loading `%s' datastore plugin\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1290
+#: src/datastore/gnunet-service-datastore.c:1310
 #, fuzzy, c-format
 msgid "Failed to load datastore plugin for `%s'\n"
 msgstr "Kunde inte slå upp \"%s\": %s\n"
 
-#: src/datastore/gnunet-service-datastore.c:1492
+#: src/datastore/gnunet-service-datastore.c:1412
+msgid "Rebuilding bloomfilter.  Please be patient.\n"
+msgstr ""
+
+#: src/datastore/gnunet-service-datastore.c:1419
+msgid "Plugin does not support get_keys function. Please fix!\n"
+msgstr ""
+
+#: src/datastore/gnunet-service-datastore.c:1422
+msgid "Bloomfilter construction complete.\n"
+msgstr ""
+
+#: src/datastore/gnunet-service-datastore.c:1558
 #, fuzzy, c-format
 msgid "# bytes used in file-sharing datastore `%s'"
 msgstr "# byte krypterade"
 
-#: src/datastore/gnunet-service-datastore.c:1503
+#: src/datastore/gnunet-service-datastore.c:1569
 msgid "# quota"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1505
+#: src/datastore/gnunet-service-datastore.c:1571
 msgid "# cache size"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1518
+#: src/datastore/gnunet-service-datastore.c:1584
 #, c-format
 msgid "Could not use specified filename `%s' for bloomfilter.\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1536
-#: src/datastore/gnunet-service-datastore.c:1552
+#: src/datastore/gnunet-service-datastore.c:1602
+#: src/datastore/gnunet-service-datastore.c:1618
 #, fuzzy, c-format
 msgid "Failed to remove bogus bloomfilter file `%s'\n"
 msgstr "Kunde inte spara konfigurationsfil \"%s\":"
 
-#: src/datastore/gnunet-service-datastore.c:1582
+#: src/datastore/gnunet-service-datastore.c:1648
 #, fuzzy
 msgid "Failed to initialize bloomfilter.\n"
 msgstr "Misslyckades att initiera tjänsten \"%s\".\n"
 
-#: src/datastore/gnunet-service-datastore.c:1611
-msgid "Rebuilding bloomfilter.  Please be patient.\n"
-msgstr ""
-
-#: src/datastore/gnunet-service-datastore.c:1616
-msgid "Plugin does not support get_keys function. Please fix!\n"
-msgstr ""
-
-#: src/datastore/gnunet-service-datastore.c:1619
-msgid "Bloomfilter construction complete.\n"
-msgstr ""
-
 #: src/datastore/plugin_datastore_heap.c:820
 msgid "Heap database running\n"
 msgstr ""
@@ -1934,7 +1914,7 @@
 #: src/datastore/plugin_datastore_sqlite.c:255
 #: src/namecache/plugin_namecache_sqlite.c:193
 #: src/namestore/plugin_namestore_sqlite.c:204
-#: src/peerstore/plugin_peerstore_sqlite.c:458
+#: src/peerstore/plugin_peerstore_sqlite.c:479
 #: src/psycstore/plugin_psycstore_sqlite.c:329
 #, fuzzy, c-format
 msgid "Unable to initialize SQLite: %s.\n"
@@ -2012,8 +1992,8 @@
 msgstr ""
 
 #: src/dht/gnunet-dht-get.c:204 src/dht/gnunet-dht-monitor.c:271
-#: src/dht/gnunet-dht-put.c:213 src/fs/gnunet-auto-share.c:753
-#: src/fs/gnunet-download.c:328 src/fs/gnunet-publish.c:939
+#: src/dht/gnunet-dht-put.c:213 src/fs/gnunet-auto-share.c:755
+#: src/fs/gnunet-download.c:328 src/fs/gnunet-publish.c:941
 #: src/fs/gnunet-search.c:301 src/fs/gnunet-unindex.c:168
 #: src/nse/gnunet-nse-profiler.c:873
 msgid "be verbose (print progress information)"
@@ -2031,49 +2011,49 @@
 msgid "Prints all packets that go through the DHT."
 msgstr ""
 
-#: src/dht/gnunet_dht_profiler.c:1392
+#: src/dht/gnunet_dht_profiler.c:1393
 #: src/testbed/gnunet-testbed-profiler.c:267
 #, fuzzy, c-format
 msgid "Exiting as the number of peers is %u\n"
 msgstr "Maximalt antal chattklienter uppnått.\n"
 
-#: src/dht/gnunet_dht_profiler.c:1417
+#: src/dht/gnunet_dht_profiler.c:1418
 #, fuzzy
 msgid "number of peers to start"
 msgstr "antal iterationer"
 
-#: src/dht/gnunet_dht_profiler.c:1420
+#: src/dht/gnunet_dht_profiler.c:1421
 msgid ""
 "maximum number of times we try to search for successor circle formation (0 "
 "for R5N)"
 msgstr ""
 
-#: src/dht/gnunet_dht_profiler.c:1423 src/nse/gnunet-nse-profiler.c:864
+#: src/dht/gnunet_dht_profiler.c:1424 src/nse/gnunet-nse-profiler.c:864
 #: src/testbed/gnunet-testbed-profiler.c:306
 msgid "name of the file with the login information for the testbed"
 msgstr ""
 
-#: src/dht/gnunet_dht_profiler.c:1426
+#: src/dht/gnunet_dht_profiler.c:1427
 msgid "delay between rounds for collecting statistics (default: 30 sec)"
 msgstr ""
 
-#: src/dht/gnunet_dht_profiler.c:1429
+#: src/dht/gnunet_dht_profiler.c:1430
 msgid "delay to start doing PUTs (default: 1 sec)"
 msgstr ""
 
-#: src/dht/gnunet_dht_profiler.c:1432
+#: src/dht/gnunet_dht_profiler.c:1433
 msgid "delay to start doing GETs (default: 5 min)"
 msgstr ""
 
-#: src/dht/gnunet_dht_profiler.c:1435
+#: src/dht/gnunet_dht_profiler.c:1436
 msgid "replication degree for DHT PUTs"
 msgstr ""
 
-#: src/dht/gnunet_dht_profiler.c:1438
+#: src/dht/gnunet_dht_profiler.c:1439
 msgid "timeout for DHT PUT and GET requests (default: 1 min)"
 msgstr ""
 
-#: src/dht/gnunet_dht_profiler.c:1456
+#: src/dht/gnunet_dht_profiler.c:1457
 #, fuzzy
 msgid "Measure quality and performance of the DHT service."
 msgstr "Kan inte tillgå tjänsten"
@@ -2244,131 +2224,137 @@
 msgid "# HELLOs obtained from peerinfo"
 msgstr "Meddelande mottaget från klient är ogiltig.\n"
 
-#: src/dht/gnunet-service-dht_neighbours.c:516
+#: src/dht/gnunet-service-dht_neighbours.c:515
 msgid "# Preference updates given to core"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:610
+#: src/dht/gnunet-service-dht_neighbours.c:609
 #, fuzzy
 msgid "# FIND PEER messages initiated"
 msgstr "# PING-meddelanden skapade"
 
-#: src/dht/gnunet-service-dht_neighbours.c:764
-#: src/dht/gnunet-service-xdht_neighbours.c:6055
+#: src/dht/gnunet-service-dht_neighbours.c:763
+#: src/dht/gnunet-service-xdht_neighbours.c:6059
 #, fuzzy
 msgid "# Queued messages discarded (peer disconnected)"
 msgstr "Nätverksannonsering avstängd i konfigurationen!\n"
 
-#: src/dht/gnunet-service-dht_neighbours.c:819
-#: src/dht/gnunet-service-xdht_neighbours.c:1012
+#: src/dht/gnunet-service-dht_neighbours.c:793
+#: src/dht/gnunet-service-xdht_neighbours.c:987
 #, fuzzy
+msgid "# Messages dropped (CORE timeout)"
+msgstr "Nätverksannonsering avstängd i konfigurationen!\n"
+
+#: src/dht/gnunet-service-dht_neighbours.c:823
+#: src/dht/gnunet-service-xdht_neighbours.c:1019
+#, fuzzy
 msgid "# Bytes transmitted to other peers"
 msgstr "# byte skickade av typen %d"
 
-#: src/dht/gnunet-service-dht_neighbours.c:857
+#: src/dht/gnunet-service-dht_neighbours.c:861
 msgid "# Bytes of bandwidth requested from core"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:889
+#: src/dht/gnunet-service-dht_neighbours.c:893
 #, fuzzy
 msgid "# requests TTL-dropped"
 msgstr "# byte mottogs via TCP"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1093
-#: src/dht/gnunet-service-dht_neighbours.c:1130
+#: src/dht/gnunet-service-dht_neighbours.c:1097
+#: src/dht/gnunet-service-dht_neighbours.c:1134
 msgid "# Peers excluded from routing due to Bloomfilter"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1108
-#: src/dht/gnunet-service-dht_neighbours.c:1145
+#: src/dht/gnunet-service-dht_neighbours.c:1112
+#: src/dht/gnunet-service-dht_neighbours.c:1149
 msgid "# Peer selection failed"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1289
+#: src/dht/gnunet-service-dht_neighbours.c:1293
 #, fuzzy
 msgid "# PUT requests routed"
 msgstr "# byte mottogs via TCP"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1318
+#: src/dht/gnunet-service-dht_neighbours.c:1322
 #, fuzzy
 msgid "# PUT messages queued for transmission"
 msgstr "# PING-meddelanden skapade"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1328
-#: src/dht/gnunet-service-dht_neighbours.c:1452
-#: src/dht/gnunet-service-dht_neighbours.c:1557
-#: src/dht/gnunet-service-xdht_neighbours.c:1121
-#: src/dht/gnunet-service-xdht_neighbours.c:1190
-#: src/dht/gnunet-service-xdht_neighbours.c:1240
-#: src/dht/gnunet-service-xdht_neighbours.c:1304
-#: src/dht/gnunet-service-xdht_neighbours.c:1371
-#: src/dht/gnunet-service-xdht_neighbours.c:1433
-#: src/dht/gnunet-service-xdht_neighbours.c:1495
-#: src/dht/gnunet-service-xdht_neighbours.c:1557
-#: src/dht/gnunet-service-xdht_neighbours.c:1617
+#: src/dht/gnunet-service-dht_neighbours.c:1332
+#: src/dht/gnunet-service-dht_neighbours.c:1456
+#: src/dht/gnunet-service-dht_neighbours.c:1561
+#: src/dht/gnunet-service-xdht_neighbours.c:1129
+#: src/dht/gnunet-service-xdht_neighbours.c:1198
+#: src/dht/gnunet-service-xdht_neighbours.c:1248
+#: src/dht/gnunet-service-xdht_neighbours.c:1312
+#: src/dht/gnunet-service-xdht_neighbours.c:1379
+#: src/dht/gnunet-service-xdht_neighbours.c:1441
+#: src/dht/gnunet-service-xdht_neighbours.c:1503
+#: src/dht/gnunet-service-xdht_neighbours.c:1565
+#: src/dht/gnunet-service-xdht_neighbours.c:1625
 #, fuzzy
 msgid "# P2P messages dropped due to full queue"
 msgstr "Nätverksannonsering avstängd i konfigurationen!\n"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1414
+#: src/dht/gnunet-service-dht_neighbours.c:1418
 #, fuzzy
 msgid "# GET requests routed"
 msgstr "# byte mottogs via TCP"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1441
+#: src/dht/gnunet-service-dht_neighbours.c:1445
 #, fuzzy
 msgid "# GET messages queued for transmission"
 msgstr "# PING-meddelanden skapade"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1564
+#: src/dht/gnunet-service-dht_neighbours.c:1568
 #, fuzzy
 msgid "# RESULT messages queued for transmission"
 msgstr "# PING-meddelanden skapade"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1651
+#: src/dht/gnunet-service-dht_neighbours.c:1655
 #, fuzzy
 msgid "# P2P PUT requests received"
 msgstr "# byte mottogs via TCP"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1654
+#: src/dht/gnunet-service-dht_neighbours.c:1658
 #, fuzzy
 msgid "# P2P PUT bytes received"
 msgstr "# byte mottogs via TCP"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1821
+#: src/dht/gnunet-service-dht_neighbours.c:1825
 msgid "# FIND PEER requests ignored due to Bloomfilter"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1829
+#: src/dht/gnunet-service-dht_neighbours.c:1833
 msgid "# FIND PEER requests ignored due to lack of HELLO"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1924
+#: src/dht/gnunet-service-dht_neighbours.c:1928
 #, fuzzy
 msgid "# P2P GET requests received"
 msgstr "# byte mottogs via TCP"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1927
+#: src/dht/gnunet-service-dht_neighbours.c:1931
 #, fuzzy
 msgid "# P2P GET bytes received"
 msgstr "# byte mottogs via TCP"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1984
+#: src/dht/gnunet-service-dht_neighbours.c:1988
 #, fuzzy
 msgid "# P2P FIND PEER requests processed"
 msgstr "# byte mottogs via TCP"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1998
+#: src/dht/gnunet-service-dht_neighbours.c:2002
 #, fuzzy
 msgid "# P2P GET requests ONLY routed"
 msgstr "# byte mottogs via TCP"
 
-#: src/dht/gnunet-service-dht_neighbours.c:2083
+#: src/dht/gnunet-service-dht_neighbours.c:2087
 #, fuzzy
 msgid "# P2P RESULTS received"
 msgstr "# krypterade PONG-meddelanden mottagna"
 
-#: src/dht/gnunet-service-dht_neighbours.c:2086
+#: src/dht/gnunet-service-dht_neighbours.c:2090
 #, fuzzy
 msgid "# P2P RESULT bytes received"
 msgstr "# krypterade PONG-meddelanden mottagna"
@@ -2411,78 +2397,78 @@
 msgid "# DHT requests combined"
 msgstr "# byte mottogs via TCP"
 
-#: src/dht/gnunet-service-xdht_neighbours.c:1824
+#: src/dht/gnunet-service-xdht_neighbours.c:1832
 #, c-format
 msgid ""
 "\n"
 "SUPU %s, %s, %d,trail_length = %d"
 msgstr ""
 
-#: src/dht/gnunet-service-xdht_neighbours.c:1829
+#: src/dht/gnunet-service-xdht_neighbours.c:1837
 #, c-format
 msgid ""
 "\n"
 "SUPU %s, %s, %d,trail[%d]=%s"
 msgstr ""
 
-#: src/dht/gnunet-service-xdht_neighbours.c:1849
+#: src/dht/gnunet-service-xdht_neighbours.c:1857
 #, c-format
 msgid ""
 "\n"
 "SUPU************  FRIEND_PEERMAP of %s"
 msgstr ""
 
-#: src/dht/gnunet-service-xdht_neighbours.c:1859
+#: src/dht/gnunet-service-xdht_neighbours.c:1867
 #, c-format
 msgid ""
 "\n"
 "SUPU %s, %s, %d, friend = %s, friend->trails_count = %d"
 msgstr ""
 
-#: src/dht/gnunet-service-xdht_neighbours.c:1880
+#: src/dht/gnunet-service-xdht_neighbours.c:1888
 #, c-format
 msgid ""
 "\n"
 "SUPU************  FINGER_TABLE of %s"
 msgstr ""
 
-#: src/dht/gnunet-service-xdht_neighbours.c:1889
+#: src/dht/gnunet-service-xdht_neighbours.c:1897
 #, c-format
 msgid ""
 "\n"
 "SUPU %s, %s, %d, finger_table[%d] = %s, trails_count = %d"
 msgstr ""
 
-#: src/dht/gnunet-service-xdht_neighbours.c:1896
+#: src/dht/gnunet-service-xdht_neighbours.c:1904
 #, c-format
 msgid ""
 "\n"
 "SUPU %s, %s, %d, trail_id[%d]=%s"
 msgstr ""
 
-#: src/dht/gnunet-service-xdht_neighbours.c:1902
+#: src/dht/gnunet-service-xdht_neighbours.c:1910
 #, c-format
 msgid ""
 "\n"
 "SUPU %s, %s, %d,trail[%d] = %s "
 msgstr ""
 
-#: src/dht/gnunet-service-xdht_neighbours.c:3551
+#: src/dht/gnunet-service-xdht_neighbours.c:3559
 msgid "# FINGERS_COUNT"
 msgstr ""
 
-#: src/dht/gnunet-service-xdht_neighbours.c:3692
-#: src/dht/gnunet-service-xdht_neighbours.c:3930
-#: src/dht/gnunet-service-xdht_neighbours.c:4083
-#: src/dht/gnunet-service-xdht_neighbours.c:4233
-#: src/dht/gnunet-service-xdht_neighbours.c:4414
-#: src/dht/gnunet-service-xdht_neighbours.c:4929
-#: src/dht/gnunet-service-xdht_neighbours.c:5323
-#: src/dht/gnunet-service-xdht_neighbours.c:5416
-#: src/dht/gnunet-service-xdht_neighbours.c:5505
-#: src/dht/gnunet-service-xdht_neighbours.c:5609
-#: src/dht/gnunet-service-xdht_neighbours.c:5753
-#: src/dht/gnunet-service-xdht_neighbours.c:5842
+#: 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
 #, fuzzy
 msgid "# Bytes received from other peers"
 msgstr "# byte mottagna av typen %d"
@@ -2872,132 +2858,6 @@
 msgid "Daemon to run to provide an IP exit node for the VPN"
 msgstr ""
 
-#: src/experimentation/gnunet-daemon-experimentation.c:55
-msgid "Experimentation daemon shutting down ...\n"
-msgstr ""
-
-#: src/experimentation/gnunet-daemon-experimentation.c:77
-msgid "Experimentation daemon starting ...\n"
-msgstr ""
-
-#: src/experimentation/gnunet-daemon-experimentation.c:83
-#, fuzzy
-msgid "Failed to create statistics!\n"
-msgstr "Kunde inte skapa namnrymd \"%s\" (existerar?).\n"
-
-#: src/experimentation/gnunet-daemon-experimentation.c:120
-msgid "GNUnet experimentation daemon"
-msgstr ""
-
-#: src/experimentation/gnunet-daemon-experimentation_experiments.c:241
-#, c-format
-msgid "Experiment `%s': Experiment signature is invalid\n"
-msgstr ""
-
-#: src/experimentation/gnunet-daemon-experimentation_experiments.c:250
-#, c-format
-msgid ""
-"Adding experiment `%s' running from `%s' to `%s' every %llu sec. for %llu "
-"sec. \n"
-msgstr ""
-
-#: src/experimentation/gnunet-daemon-experimentation_experiments.c:303
-#, c-format
-msgid "Experiment `%s': Issuer missing\n"
-msgstr ""
-
-#: src/experimentation/gnunet-daemon-experimentation_experiments.c:312
-#, c-format
-msgid "Experiment `%s': Issuer invalid\n"
-msgstr ""
-
-#: src/experimentation/gnunet-daemon-experimentation_experiments.c:320
-#, c-format
-msgid "Experiment `%s': Issuer not accepted!\n"
-msgstr ""
-
-#: src/experimentation/gnunet-daemon-experimentation_experiments.c:330
-#, c-format
-msgid "Experiment `%s': Version missing or invalid \n"
-msgstr ""
-
-#: src/experimentation/gnunet-daemon-experimentation_experiments.c:339
-#, c-format
-msgid "Experiment `%s': Required capabilities missing \n"
-msgstr ""
-
-#: src/experimentation/gnunet-daemon-experimentation_experiments.c:345
-#, c-format
-msgid "Experiment `%s': Required capabilities invalid \n"
-msgstr ""
-
-#: src/experimentation/gnunet-daemon-experimentation_experiments.c:390
-#, fuzzy, c-format
-msgid "Failed to parse file `%s'\n"
-msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
-
-#: src/experimentation/gnunet-daemon-experimentation_experiments.c:420
-#: src/experimentation/gnunet-daemon-experimentation_experiments.c:452
-msgid ""
-"No valid experiment issuers configured! Set value to public keys of issuers! "
-"Exiting.\n"
-msgstr ""
-
-#: src/experimentation/gnunet-daemon-experimentation_experiments.c:435
-#, fuzzy
-msgid "Invalid value for public key\n"
-msgstr "Ogiltigt argument: \"%s\"\n"
-
-#: src/experimentation/gnunet-daemon-experimentation_experiments.c:473
-#, fuzzy, c-format
-msgid "Cannot read experiments file `%s'\n"
-msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
-
-#: src/experimentation/gnunet-daemon-experimentation_nodes.c:221
-#, c-format
-msgid "Cannot send message to peer `%s' for experiment `%s'\n"
-msgstr ""
-
-#: src/experimentation/gnunet-daemon-experimentation_nodes.c:309
-#, c-format
-msgid "Sending experimentation request to peer %s\n"
-msgstr ""
-
-#: src/experimentation/gnunet-daemon-experimentation_nodes.c:453
-#, c-format
-msgid "Added peer `%s' as active node\n"
-msgstr ""
-
-#: src/experimentation/gnunet-daemon-experimentation_nodes.c:891
-#, fuzzy, c-format
-msgid "Connected to peer %s\n"
-msgstr "\"%s\" ansluten till \"%s\".\n"
-
-#: src/experimentation/gnunet-daemon-experimentation_nodes.c:921
-#, fuzzy, c-format
-msgid "Disconnected from peer %s\n"
-msgstr "\"%s\" ansluten till \"%s\".\n"
-
-#: src/experimentation/gnunet-daemon-experimentation_scheduler.c:108
-#, c-format
-msgid "Peer `%s' did not respond to request for experiment `%s'\n"
-msgstr ""
-
-#: src/experimentation/gnunet-daemon-experimentation_scheduler.c:143
-#, fuzzy, c-format
-msgid "Starting inbound experiment `%s' with peer `%s'\n"
-msgstr "Startade samling \"%s\".\n"
-
-#: src/experimentation/gnunet-daemon-experimentation_scheduler.c:276
-#, fuzzy, c-format
-msgid "Starting outbound experiment `%s' with peer `%s'\n"
-msgstr "Startade samling \"%s\".\n"
-
-#: src/experimentation/gnunet-daemon-experimentation_scheduler.c:294
-#, fuzzy, c-format
-msgid "Received %s message from peer %s for experiment `%s'\n"
-msgstr "Mottog ogiltigt \"%s\" meddelande från \"%s\".\n"
-
 #: src/fragmentation/defragmentation.c:270
 msgid "# acknowledgements sent for fragment"
 msgstr ""
@@ -3053,71 +2913,71 @@
 msgid "# fragmentation transmissions completed"
 msgstr "# klartext PONG-meddelanden mottagna"
 
-#: src/fs/fs_api.c:474
+#: src/fs/fs_api.c:484
 #, fuzzy, c-format
 msgid "Could not open file `%s': %s"
 msgstr "Kunde inte slå upp \"%s\": %s\n"
 
-#: src/fs/fs_api.c:485
+#: src/fs/fs_api.c:495
 #, fuzzy, c-format
 msgid "Could not read file `%s': %s"
 msgstr "Kunde inte slå upp \"%s\": %s\n"
 
-#: src/fs/fs_api.c:493
+#: src/fs/fs_api.c:503
 #, c-format
 msgid "Short read reading from file `%s'!"
 msgstr ""
 
-#: src/fs/fs_api.c:1101
+#: src/fs/fs_api.c:1111
 #, fuzzy, c-format
 msgid "Failed to resume publishing information `%s': %s\n"
 msgstr "Misslyckades att leverera \"%s\" meddelande.\n"
 
-#: src/fs/fs_api.c:1621
+#: src/fs/fs_api.c:1631
 #, c-format
 msgid "Failure while resuming publishing operation `%s': %s\n"
 msgstr ""
 
-#: src/fs/fs_api.c:1635
+#: src/fs/fs_api.c:1645
 #, fuzzy, c-format
 msgid "Failed to resume publishing operation `%s': %s\n"
 msgstr "Misslyckades att leverera \"%s\" meddelande.\n"
 
-#: src/fs/fs_api.c:2293
+#: src/fs/fs_api.c:2303
 #, c-format
 msgid "Failure while resuming unindexing operation `%s': %s\n"
 msgstr ""
 
-#: src/fs/fs_api.c:2303
+#: src/fs/fs_api.c:2313
 #, fuzzy, c-format
 msgid "Failed to resume unindexing operation `%s': %s\n"
 msgstr "Misslyckades att leverera \"%s\" meddelande.\n"
 
-#: src/fs/fs_api.c:2431 src/fs/fs_api.c:2679
+#: src/fs/fs_api.c:2441 src/fs/fs_api.c:2689
 #, fuzzy, c-format
 msgid "Failed to resume sub-download `%s': %s\n"
 msgstr "Misslyckades att leverera \"%s\" meddelande.\n"
 
-#: src/fs/fs_api.c:2449
+#: src/fs/fs_api.c:2459
 #, fuzzy, c-format
 msgid "Failed to resume sub-search `%s': %s\n"
 msgstr "Misslyckades att leverera \"%s\" meddelande.\n"
 
-#: src/fs/fs_api.c:2464 src/fs/fs_api.c:2483 src/fs/fs_api.c:2975
+#: src/fs/fs_api.c:2474 src/fs/fs_api.c:2493 src/fs/fs_api.c:2985
 #, c-format
 msgid "Failure while resuming search operation `%s': %s\n"
 msgstr ""
 
-#: src/fs/fs_api.c:2669
+#: src/fs/fs_api.c:2679
 #, c-format
 msgid "Failed to resume sub-download `%s': could not open file `%s'\n"
 msgstr ""
 
-#: src/fs/fs_api.c:2918
+#: src/fs/fs_api.c:2928
 msgid "Could not resume running search, will resume as paused search\n"
 msgstr ""
 
-#: src/fs/fs_api.c:3013
+#: src/fs/fs_api.c:3023
 #, c-format
 msgid "Failure while resuming download operation `%s': %s\n"
 msgstr ""
@@ -3238,7 +3098,7 @@
 "Fel vid uppladdning av fil: %s\n"
 
 #: src/fs/fs_publish.c:683 src/fs/fs_publish.c:700 src/fs/fs_publish.c:739
-#: src/fs/fs_publish.c:760 src/fs/fs_publish.c:784 src/fs/fs_publish.c:934
+#: src/fs/fs_publish.c:760 src/fs/fs_publish.c:784 src/fs/fs_publish.c:1034
 #, fuzzy, c-format
 msgid "Can not index file `%s': %s.  Will try to insert instead.\n"
 msgstr "Indexering av fil \"%s\" misslyckades. Försöker att infoga fil...\n"
@@ -3270,28 +3130,32 @@
 msgid "Failed to get file identifiers for `%s'\n"
 msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 
-#: src/fs/fs_publish.c:878
+#: src/fs/fs_publish.c:873 src/fs/fs_publish.c:914
+msgid "Can not create LOC URI. Will continue with CHK instead.\n"
+msgstr ""
+
+#: src/fs/fs_publish.c:988
 #, fuzzy, c-format
 msgid "Recursive upload failed at `%s': %s"
 msgstr "\"%s\" misslyckades vid %s:%d med fel: \"%s\".\n"
 
-#: src/fs/fs_publish.c:884
+#: src/fs/fs_publish.c:996
 #, fuzzy, c-format
 msgid "Recursive upload failed: %s"
 msgstr ""
 "\n"
 "Fel vid uppladdning av fil: %s\n"
 
-#: src/fs/fs_publish.c:936
+#: src/fs/fs_publish.c:1036
 msgid "needs to be an actual file"
 msgstr ""
 
-#: src/fs/fs_publish.c:1172
+#: src/fs/fs_publish.c:1272
 #, c-format
 msgid "Insufficient space for publishing: %s"
 msgstr ""
 
-#: src/fs/fs_publish.c:1263
+#: src/fs/fs_publish.c:1363
 #, c-format
 msgid "Reserving space for %u entries and %llu bytes for publication\n"
 msgstr ""
@@ -3306,12 +3170,12 @@
 msgid "Internal error."
 msgstr "Okänt fel.\n"
 
-#: src/fs/fs_search.c:778 src/fs/fs_search.c:848
+#: src/fs/fs_search.c:812 src/fs/fs_search.c:882
 #, fuzzy, c-format
 msgid "Failed to parse URI `%s': %s\n"
 msgstr "Fil \"%s\" har URI: %s\n"
 
-#: src/fs/fs_search.c:907
+#: src/fs/fs_search.c:941
 #, c-format
 msgid "Got result with unknown block type `%d', ignoring"
 msgstr ""
@@ -3453,79 +3317,69 @@
 msgid "Unrecognized URI type"
 msgstr ""
 
-#: src/fs/fs_uri.c:865
-#, fuzzy
-msgid "Lacking key configuration settings.\n"
-msgstr "GNUnet-konfiguration"
-
-#: src/fs/fs_uri.c:871
-#, fuzzy, c-format
-msgid "Could not access hostkey file `%s'.\n"
-msgstr "Kunde inte tolka konfigurationsfil \"%s\".\n"
-
-#: src/fs/fs_uri.c:1056 src/fs/fs_uri.c:1083
+#: src/fs/fs_uri.c:1043 src/fs/fs_uri.c:1070
 msgid "No keywords specified!\n"
 msgstr "Inga nyckelord angivna!\n"
 
-#: src/fs/fs_uri.c:1089
+#: src/fs/fs_uri.c:1076
 msgid "Number of double-quotes not balanced!\n"
 msgstr ""
 
-#: src/fs/gnunet-auto-share.c:236
+#: src/fs/gnunet-auto-share.c:237
 #, fuzzy, c-format
 msgid "Failed to load state: %s\n"
 msgstr "Misslyckades att starta samling.\n"
 
-#: src/fs/gnunet-auto-share.c:289 src/fs/gnunet-auto-share.c:299
-#: src/fs/gnunet-auto-share.c:309
+#: src/fs/gnunet-auto-share.c:290 src/fs/gnunet-auto-share.c:300
+#: src/fs/gnunet-auto-share.c:310
 #, fuzzy, c-format
 msgid "Failed to save state to file %s\n"
 msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 
-#: src/fs/gnunet-auto-share.c:401
+#: src/fs/gnunet-auto-share.c:402
 #, c-format
 msgid "Publication of `%s' done\n"
 msgstr ""
 
-#: src/fs/gnunet-auto-share.c:488
+#: src/fs/gnunet-auto-share.c:490
 #, fuzzy, c-format
 msgid "Publishing `%s'\n"
 msgstr ""
 "\n"
 "Fel vid uppladdning av fil: %s\n"
 
-#: src/fs/gnunet-auto-share.c:497
+#: src/fs/gnunet-auto-share.c:499
 #, fuzzy, c-format
 msgid "Failed to run `%s'\n"
 msgstr "Misslyckades att starta samling.\n"
 
-#: src/fs/gnunet-auto-share.c:686
+#: src/fs/gnunet-auto-share.c:688
 #, fuzzy, c-format
 msgid ""
 "You must specify one and only one directory name for automatic publication.\n"
 msgstr "Du måste ange en och endast en fil att avindexera.\n"
 
-#: src/fs/gnunet-auto-share.c:737 src/fs/gnunet-publish.c:886
+#: src/fs/gnunet-auto-share.c:739 src/fs/gnunet-publish.c:888
 msgid "set the desired LEVEL of sender-anonymity"
 msgstr ""
 
-#: src/fs/gnunet-auto-share.c:741 src/fs/gnunet-publish.c:890
+#: src/fs/gnunet-auto-share.c:743 src/fs/gnunet-publish.c:892
 msgid "disable adding the creation time to the metadata of the uploaded file"
 msgstr ""
 
-#: src/fs/gnunet-auto-share.c:744 src/fs/gnunet-publish.c:893
+#: src/fs/gnunet-auto-share.c:746 src/fs/gnunet-publish.c:895
 msgid "do not use libextractor to add keywords or metadata"
 msgstr ""
 
-#: src/fs/gnunet-auto-share.c:747 src/fs/gnunet-publish.c:917
+#: src/fs/gnunet-auto-share.c:749 src/fs/gnunet-publish.c:919
 msgid "specify the priority of the content"
 msgstr "ange prioritet för innehållet"
 
-#: src/fs/gnunet-auto-share.c:750 src/fs/gnunet-publish.c:924
+#: src/fs/gnunet-auto-share.c:752 src/fs/gnunet-publish.c:926
 msgid "set the desired replication LEVEL"
 msgstr ""
 
-#: src/fs/gnunet-auto-share.c:770
+#: src/fs/gnunet-auto-share.c:772
 msgid "Automatically publish files from a directory on GNUnet"
 msgstr ""
 
@@ -3606,7 +3460,7 @@
 msgid "You need to specify a URI argument.\n"
 msgstr "Du måste ange en och endast en fil att avindexera.\n"
 
-#: src/fs/gnunet-download.c:240 src/fs/gnunet-publish.c:712
+#: src/fs/gnunet-download.c:240 src/fs/gnunet-publish.c:714
 #, fuzzy, c-format
 msgid "Failed to parse URI: %s\n"
 msgstr "Fil \"%s\" har URI: %s\n"
@@ -3619,7 +3473,7 @@
 msgid "Target filename must be specified.\n"
 msgstr ""
 
-#: src/fs/gnunet-download.c:268 src/fs/gnunet-publish.c:856
+#: src/fs/gnunet-download.c:268 src/fs/gnunet-publish.c:858
 #: src/fs/gnunet-search.c:250 src/fs/gnunet-unindex.c:140
 #, fuzzy, c-format
 msgid "Could not initialize `%s' subsystem.\n"
@@ -3724,143 +3578,143 @@
 msgid "Keywords for file `%s' (%s)\n"
 msgstr "Nyckelord för fil \"%s\":\n"
 
-#: src/fs/gnunet-publish.c:572
+#: src/fs/gnunet-publish.c:574
 #, fuzzy
 msgid "Could not publish\n"
 msgstr "Kunde inte köra \"%s\": %s\n"
 
-#: src/fs/gnunet-publish.c:597
+#: src/fs/gnunet-publish.c:599
 #, fuzzy
 msgid "Could not start publishing.\n"
 msgstr "Kunde inte slå upp \"%s\": %s\n"
 
-#: src/fs/gnunet-publish.c:631
+#: src/fs/gnunet-publish.c:633
 #, fuzzy, c-format
 msgid "Scanning directory `%s'.\n"
 msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 
-#: src/fs/gnunet-publish.c:635
+#: src/fs/gnunet-publish.c:637
 #, fuzzy, c-format
 msgid "Scanning file `%s'.\n"
 msgstr "Startade samling \"%s\".\n"
 
-#: src/fs/gnunet-publish.c:641
+#: src/fs/gnunet-publish.c:643
 #, c-format
 msgid "There was trouble processing file `%s', skipping it.\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:648
+#: src/fs/gnunet-publish.c:650
 #, fuzzy
 msgid "Preprocessing complete.\n"
 msgstr "Nedstängning klar.\n"
 
-#: src/fs/gnunet-publish.c:653
+#: src/fs/gnunet-publish.c:655
 #, fuzzy, c-format
 msgid "Extracting meta data from file `%s' complete.\n"
 msgstr "Uppdaterar data för modul \"%s\"\n"
 
-#: src/fs/gnunet-publish.c:660
+#: src/fs/gnunet-publish.c:662
 msgid "Meta data extraction has finished.\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:669
+#: src/fs/gnunet-publish.c:671
 #, fuzzy
 msgid "Internal error scanning directory.\n"
 msgstr "=\tFel vid läsning av katalog.\n"
 
-#: src/fs/gnunet-publish.c:701
+#: src/fs/gnunet-publish.c:703
 #, fuzzy, c-format
 msgid "Selected pseudonym `%s' unknown\n"
 msgstr "Namnrymd \"%s\" skapad(rot: %s).\n"
 
-#: src/fs/gnunet-publish.c:733
+#: src/fs/gnunet-publish.c:735
 #, fuzzy, c-format
 msgid "Failed to access `%s': %s\n"
 msgstr "Misslyckades att leverera \"%s\" meddelande.\n"
 
-#: src/fs/gnunet-publish.c:747
+#: src/fs/gnunet-publish.c:749
 msgid ""
 "Failed to start meta directory scanner.  Is gnunet-helper-publish-fs "
 "installed?\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:803
+#: src/fs/gnunet-publish.c:805
 #, c-format
 msgid "Cannot extract metadata from a URI!\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:810
+#: src/fs/gnunet-publish.c:812
 #, fuzzy, c-format
 msgid "You must specify one and only one filename for insertion.\n"
 msgstr "Du måste ange en och endast en fil att avindexera.\n"
 
-#: src/fs/gnunet-publish.c:816
+#: src/fs/gnunet-publish.c:818
 #, fuzzy, c-format
 msgid "You must NOT specify an URI and a filename.\n"
 msgstr "Du måste ange en och endast en fil att avindexera.\n"
 
-#: src/fs/gnunet-publish.c:824 src/vpn/gnunet-vpn.c:209
+#: src/fs/gnunet-publish.c:826 src/vpn/gnunet-vpn.c:209
 #, fuzzy, c-format
 msgid "Option `%s' is required when using option `%s'.\n"
 msgstr "Kommando \"%s\" kräver ett argument (\"%s\").\n"
 
-#: src/fs/gnunet-publish.c:835 src/fs/gnunet-publish.c:843
-#: src/transport/gnunet-transport.c:1893 src/transport/gnunet-transport.c:1923
-#: src/transport/gnunet-transport.c:1953
+#: src/fs/gnunet-publish.c:837 src/fs/gnunet-publish.c:845
+#: src/transport/gnunet-transport.c:1891 src/transport/gnunet-transport.c:1921
+#: src/transport/gnunet-transport.c:1952
 #, c-format
 msgid "Option `%s' makes no sense without option `%s'.\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:897
+#: src/fs/gnunet-publish.c:899
 msgid ""
 "print list of extracted keywords that would be used, but do not perform "
 "upload"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:901
+#: src/fs/gnunet-publish.c:903
 msgid ""
 "add an additional keyword for the top-level file or directory (this option "
 "can be specified multiple times)"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:905
+#: src/fs/gnunet-publish.c:907
 msgid "set the meta-data for the given TYPE to the given VALUE"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:908
+#: src/fs/gnunet-publish.c:910
 msgid ""
 "do not index, perform full insertion (stores entire file in encrypted form "
 "in GNUnet database)"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:913
+#: src/fs/gnunet-publish.c:915
 msgid ""
 "specify ID of an updated version to be published in the future (for "
 "namespace insertions only)"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:921
+#: src/fs/gnunet-publish.c:923
 msgid "publish the files under the pseudonym NAME (place file into namespace)"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:927
+#: src/fs/gnunet-publish.c:929
 msgid ""
 "only simulate the process but do not do any actual publishing (useful to "
 "compute URIs)"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:931
+#: src/fs/gnunet-publish.c:933
 msgid ""
 "set the ID of this version of the publication (for namespace insertions only)"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:935
+#: src/fs/gnunet-publish.c:937
 msgid ""
 "URI to be published (can be used instead of passing a file to add keywords "
 "to the file with the respective URI)"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:951
+#: src/fs/gnunet-publish.c:953
 msgid "Publish a file or directory on GNUnet"
 msgstr ""
 
@@ -3900,17 +3754,22 @@
 msgid "Search GNUnet for files that were published on GNUnet"
 msgstr ""
 
-#: src/fs/gnunet-service-fs.c:277
+#: src/fs/gnunet-service-fs.c:285
 msgid "# running average P2P latency (ms)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs.c:332 src/fs/gnunet-service-fs.c:540
+#: src/fs/gnunet-service-fs.c:344 src/fs/gnunet-service-fs.c:607
 msgid "# Loopback routes suppressed"
 msgstr ""
 
-#: src/fs/gnunet-service-fs.c:650 src/hostlist/gnunet-daemon-hostlist.c:303
-#: src/sensordashboard/gnunet-service-sensordashboard.c:854
-#: src/sensordashboard/gnunet-service-sensordashboard.c:862
+#: src/fs/gnunet-service-fs.c:731
+#, 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/sensordashboard/gnunet-service-sensordashboard.c:864
+#: src/sensordashboard/gnunet-service-sensordashboard.c:872
 #: src/topology/gnunet-daemon-topology.c:1287
 #: src/topology/gnunet-daemon-topology.c:1294
 #, fuzzy, c-format
@@ -3953,89 +3812,89 @@
 msgid "# cadet connections active"
 msgstr "Nätverksanslutning"
 
-#: src/fs/gnunet-service-fs_cp.c:698
+#: src/fs/gnunet-service-fs_cp.c:710
 #, fuzzy
 msgid "# migration stop messages received"
 msgstr "# krypterade PONG-meddelanden mottagna"
 
-#: src/fs/gnunet-service-fs_cp.c:702
+#: src/fs/gnunet-service-fs_cp.c:714
 #, c-format
 msgid "Migration of content to peer `%s' blocked for %s\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:737
+#: src/fs/gnunet-service-fs_cp.c:750
 #, fuzzy
 msgid "# replies transmitted to other peers"
 msgstr "# byte skickade av typen %d"
 
-#: src/fs/gnunet-service-fs_cp.c:743
+#: src/fs/gnunet-service-fs_cp.c:756
 msgid "# replies dropped"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:768 src/fs/gnunet-service-fs_cp.c:1317
+#: src/fs/gnunet-service-fs_cp.c:781 src/fs/gnunet-service-fs_cp.c:1337
 msgid "# P2P searches active"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:861
+#: src/fs/gnunet-service-fs_cp.c:878
 msgid "# artificial delays introduced (ms)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:914
+#: src/fs/gnunet-service-fs_cp.c:934
 #, fuzzy
 msgid "# replies dropped due to type mismatch"
 msgstr "# byte mottagna av typen %d"
 
-#: src/fs/gnunet-service-fs_cp.c:922
+#: src/fs/gnunet-service-fs_cp.c:942
 #, fuzzy
 msgid "# replies received for other peers"
 msgstr "# byte mottagna av typen %d"
 
-#: src/fs/gnunet-service-fs_cp.c:936
+#: src/fs/gnunet-service-fs_cp.c:956
 msgid "# replies dropped due to insufficient cover traffic"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:974
+#: src/fs/gnunet-service-fs_cp.c:994
 msgid "# P2P searches destroyed due to ultimate reply"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1042
+#: src/fs/gnunet-service-fs_cp.c:1062
 msgid "# requests done for free (low load)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1067
+#: src/fs/gnunet-service-fs_cp.c:1087
 msgid "# request dropped, priority insufficient"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1077
+#: src/fs/gnunet-service-fs_cp.c:1097
 msgid "# requests done for a price (normal load)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1155
+#: src/fs/gnunet-service-fs_cp.c:1175
 msgid "# GET requests received (from other peers)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1189
+#: src/fs/gnunet-service-fs_cp.c:1209
 msgid "# requests dropped due to initiator not being connected"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1211
+#: src/fs/gnunet-service-fs_cp.c:1231
 msgid "# requests dropped due to missing reverse route"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1262
+#: src/fs/gnunet-service-fs_cp.c:1282
 msgid "# requests dropped due TTL underflow"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1286
+#: src/fs/gnunet-service-fs_cp.c:1306
 msgid "# requests dropped due to higher-TTL request"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1315
+#: src/fs/gnunet-service-fs_cp.c:1335
 #, fuzzy
 msgid "# P2P query messages received and processed"
 msgstr "# krypterade PONG-meddelanden mottagna"
 
-#: src/fs/gnunet-service-fs_cp.c:1691
+#: src/fs/gnunet-service-fs_cp.c:1754
 #, fuzzy
 msgid "# migration stop messages sent"
 msgstr "# krypterade PONG-meddelanden mottagna"
@@ -4087,22 +3946,22 @@
 msgid "Indexed file `%s' changed at offset %llu\n"
 msgstr "Indexering av data misslyckades vid position %i.\n"
 
-#: src/fs/gnunet-service-fs_lc.c:202 src/fs/gnunet-service-fs_lc.c:370
+#: src/fs/gnunet-service-fs_lc.c:201 src/fs/gnunet-service-fs_lc.c:371
 #, fuzzy
 msgid "# client searches active"
 msgstr "# klartext PONG-meddelanden mottagna"
 
-#: src/fs/gnunet-service-fs_lc.c:258
+#: src/fs/gnunet-service-fs_lc.c:259
 #, fuzzy
 msgid "# replies received for local clients"
 msgstr "Meddelande mottaget från klient är ogiltig.\n"
 
-#: src/fs/gnunet-service-fs_lc.c:329
+#: src/fs/gnunet-service-fs_lc.c:330
 #, fuzzy
 msgid "# client searches received"
 msgstr "# klartext PONG-meddelanden mottagna"
 
-#: src/fs/gnunet-service-fs_lc.c:364
+#: src/fs/gnunet-service-fs_lc.c:365
 msgid "# client searches updated (merged content seen list)"
 msgstr ""
 
@@ -4174,86 +4033,86 @@
 msgid "# results found locally"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1001
+#: src/fs/gnunet-service-fs_pr.c:1003
 msgid "# Datastore `PUT' failures"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1029
+#: src/fs/gnunet-service-fs_pr.c:1031
 #, fuzzy
 msgid "# storage requests dropped due to high load"
 msgstr "Nätverksannonsering avstängd i konfigurationen!\n"
 
-#: src/fs/gnunet-service-fs_pr.c:1064
+#: src/fs/gnunet-service-fs_pr.c:1069
 #, fuzzy
 msgid "# Replies received from DHT"
 msgstr "# byte mottagna via HTTP"
 
-#: src/fs/gnunet-service-fs_pr.c:1192
+#: src/fs/gnunet-service-fs_pr.c:1200
 #, fuzzy
 msgid "# Replies received from CADET"
 msgstr "# byte mottagna via HTTP"
 
-#: src/fs/gnunet-service-fs_pr.c:1244
+#: src/fs/gnunet-service-fs_pr.c:1252
 #, c-format
 msgid "Datastore lookup already took %s!\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1264
+#: src/fs/gnunet-service-fs_pr.c:1272
 #, c-format
 msgid "On-demand lookup already took %s!\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1311
+#: src/fs/gnunet-service-fs_pr.c:1319
 msgid "# Datastore lookups concluded (no results)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1326
+#: src/fs/gnunet-service-fs_pr.c:1334
 msgid "# Datastore lookups concluded (seen all)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1335
+#: src/fs/gnunet-service-fs_pr.c:1343
 msgid "# Datastore lookups aborted (more than MAX_RESULTS)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1350
+#: src/fs/gnunet-service-fs_pr.c:1358
 msgid "# requested DBLOCK or IBLOCK not found"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1364
+#: src/fs/gnunet-service-fs_pr.c:1372
 msgid "# on-demand blocks matched requests"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1377
+#: src/fs/gnunet-service-fs_pr.c:1385
 msgid "# on-demand lookups performed successfully"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1382
+#: src/fs/gnunet-service-fs_pr.c:1390
 msgid "# on-demand lookups failed"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1409 src/fs/gnunet-service-fs_pr.c:1449
-#: src/fs/gnunet-service-fs_pr.c:1612
+#: src/fs/gnunet-service-fs_pr.c:1417 src/fs/gnunet-service-fs_pr.c:1457
+#: src/fs/gnunet-service-fs_pr.c:1620
 msgid "# Datastore lookups concluded (error queueing)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1467
+#: src/fs/gnunet-service-fs_pr.c:1475
 msgid "# Datastore lookups concluded (found last result)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1478
+#: src/fs/gnunet-service-fs_pr.c:1486
 msgid "# Datastore lookups concluded (load too high)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1588
+#: src/fs/gnunet-service-fs_pr.c:1596
 msgid "# Datastore lookups initiated"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1673
+#: src/fs/gnunet-service-fs_pr.c:1685
 #, fuzzy
 msgid "# GAP PUT messages received"
 msgstr "# krypterade PONG-meddelanden mottagna"
 
-#: src/fs/gnunet-service-fs_push.c:631
+#: src/fs/gnunet-service-fs_push.c:672
 msgid "time required, content pushing disabled"
 msgstr ""
 
@@ -4298,7 +4157,7 @@
 msgid "Refusing `%s' request to HTTP server\n"
 msgstr ""
 
-#: src/gns/gnunet-bcd.c:355 src/hostlist/gnunet-daemon-hostlist_server.c:696
+#: src/gns/gnunet-bcd.c:355 src/hostlist/gnunet-daemon-hostlist_server.c:759
 #, fuzzy, c-format
 msgid "Invalid port number %llu.  Exiting.\n"
 msgstr "Ogiltiga argument. Avslutar.\n"
@@ -4321,61 +4180,61 @@
 msgid "GNUnet HTTP server to create business cards"
 msgstr ""
 
-#: src/gns/gnunet-dns2gns.c:228
+#: src/gns/gnunet-dns2gns.c:234
 #, fuzzy
 msgid "Failed to pack DNS response into UDP packet!\n"
 msgstr "Misslyckades att skicka HTTP-begäran till värd \"%s\": %s\n"
 
-#: src/gns/gnunet-dns2gns.c:400
+#: src/gns/gnunet-dns2gns.c:406
 #, fuzzy, c-format
 msgid "Cannot parse DNS request from %s\n"
 msgstr "Misslyckades att skicka HTTP-begäran till värd \"%s\": %s\n"
 
-#: src/gns/gnunet-dns2gns.c:416
+#: src/gns/gnunet-dns2gns.c:422
 #, fuzzy, c-format
 msgid "Received malformed DNS request from %s\n"
 msgstr "Mottog ogiltig \"%s\" begäran (storlek %d)\n"
 
-#: src/gns/gnunet-dns2gns.c:424
+#: src/gns/gnunet-dns2gns.c:430
 #, fuzzy, c-format
 msgid "Received unsupported DNS request from %s\n"
 msgstr "Mottog okänd typ av begäran %d vid %s:%d\n"
 
-#: src/gns/gnunet-dns2gns.c:701
+#: src/gns/gnunet-dns2gns.c:708
 msgid "No ego configured for `dns2gns` subsystem\n"
 msgstr ""
 
-#: src/gns/gnunet-dns2gns.c:727
+#: src/gns/gnunet-dns2gns.c:734
 #, fuzzy
 msgid "No DNS server specified!\n"
 msgstr "Inga nyckelord angivna!\n"
 
-#: src/gns/gnunet-dns2gns.c:749
+#: src/gns/gnunet-dns2gns.c:756
 #, fuzzy
 msgid "No valid GNS zone specified!\n"
 msgstr "Inga nyckelord angivna!\n"
 
-#: src/gns/gnunet-dns2gns.c:770
+#: src/gns/gnunet-dns2gns.c:777
 msgid "IP of recursive DNS resolver to use (required)"
 msgstr ""
 
-#: src/gns/gnunet-dns2gns.c:773
+#: src/gns/gnunet-dns2gns.c:780
 msgid "Authoritative FCFS suffix to use (optional); default: fcfs.zkey.eu"
 msgstr ""
 
-#: src/gns/gnunet-dns2gns.c:776
+#: src/gns/gnunet-dns2gns.c:783
 msgid "Authoritative DNS suffix to use (optional); default: zkey.eu"
 msgstr ""
 
-#: src/gns/gnunet-dns2gns.c:779
+#: src/gns/gnunet-dns2gns.c:786
 msgid "UDP port to listen on for inbound DNS requests; default: 53"
 msgstr ""
 
-#: src/gns/gnunet-dns2gns.c:782
+#: src/gns/gnunet-dns2gns.c:789
 msgid "Public key of the GNS zone to use (overrides default)"
 msgstr ""
 
-#: src/gns/gnunet-dns2gns.c:795
+#: src/gns/gnunet-dns2gns.c:802
 msgid "GNUnet DNS-to-GNS proxy (a DNS server)"
 msgstr ""
 
@@ -4835,25 +4694,25 @@
 "reason to run!\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist.c:323
+#: src/hostlist/gnunet-daemon-hostlist.c:331
 msgid "advertise our hostlist to other peers"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist.c:328
+#: src/hostlist/gnunet-daemon-hostlist.c:336
 msgid ""
 "bootstrap using hostlists (it is highly recommended that you always use this "
 "option)"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist.c:331
+#: src/hostlist/gnunet-daemon-hostlist.c:339
 msgid "enable learning about hostlist servers from other peers"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist.c:335
+#: src/hostlist/gnunet-daemon-hostlist.c:343
 msgid "provide a hostlist server"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist.c:350
+#: src/hostlist/gnunet-daemon-hostlist.c:359
 msgid "GNUnet hostlist server and client"
 msgstr ""
 
@@ -4877,7 +4736,7 @@
 msgstr ""
 
 #: src/hostlist/gnunet-daemon-hostlist_client.c:650
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1401
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1402
 msgid "# advertised hostlist URIs"
 msgstr ""
 
@@ -4930,7 +4789,7 @@
 msgstr ""
 
 #: src/hostlist/gnunet-daemon-hostlist_client.c:1103
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1646
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1655
 msgid "# milliseconds between hostlist downloads"
 msgstr ""
 
@@ -4945,27 +4804,27 @@
 msgid "# active connections"
 msgstr "Nätverksanslutning"
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1347
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1348
 #, fuzzy, c-format
 msgid "Loading saved hostlist entries from file `%s' \n"
 msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1352
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1353
 #, fuzzy, c-format
 msgid "Hostlist file `%s' does not exist\n"
 msgstr "antal meddelanden att använda per iteration"
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1361
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1362
 #, fuzzy, c-format
 msgid "Could not open file `%s' for reading to load hostlists: %s\n"
 msgstr "Kunde inte slå upp \"%s\": %s\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1395
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1396
 #, c-format
 msgid "%u hostlist URIs loaded from file\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1398
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1399
 msgid "# hostlist URIs read from file"
 msgstr ""
 
@@ -4974,153 +4833,147 @@
 msgid "Could not open file `%s' for writing to save hostlists: %s\n"
 msgstr "Kunde inte slå upp \"%s\": %s\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1450
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1452
 #, fuzzy, c-format
 msgid "Writing %u hostlist URIs to `%s'\n"
 msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1474
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1491
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1476
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1493
 #, c-format
 msgid "Error writing hostlist URIs to file `%s'\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1486
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1488
 msgid "# hostlist URIs written to file"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1581
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1588
 #: src/transport/plugin_transport_http_client.c:2274
 #, c-format
 msgid "Invalid proxy type: `%s', disabling proxy! Check configuration!\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1611
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1617
 msgid "Learning is enabled on this peer\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1623
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1630
 msgid "Learning is not enabled on this peer\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1635
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1641
 #, c-format
 msgid ""
 "Since learning is not enabled on this peer, hostlist file `%s' was removed\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1639
-#, c-format
-msgid "Hostlist file `%s' could not be removed\n"
-msgstr ""
-
-#: src/hostlist/gnunet-daemon-hostlist_server.c:165
+#: src/hostlist/gnunet-daemon-hostlist_server.c:181
 #, fuzzy
 msgid "bytes in hostlist"
 msgstr "# byte krypterade"
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:190
+#: src/hostlist/gnunet-daemon-hostlist_server.c:206
 msgid "expired addresses encountered"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:225
-#: src/hostlist/gnunet-daemon-hostlist_server.c:535
-#: src/peerinfo-tool/gnunet-peerinfo.c:367
-#: src/peerinfo-tool/gnunet-peerinfo.c:452
-#: src/peerinfo-tool/gnunet-peerinfo.c:535
+#: src/hostlist/gnunet-daemon-hostlist_server.c:241
+#: src/hostlist/gnunet-daemon-hostlist_server.c:590
+#: src/peerinfo-tool/gnunet-peerinfo.c:382
+#: src/peerinfo-tool/gnunet-peerinfo.c:531
 #: src/topology/gnunet-daemon-topology.c:952
 #, fuzzy, c-format
 msgid "Error in communication with PEERINFO service: %s\n"
 msgstr "Skriv ut information om GNUnets motparter."
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:249
+#: src/hostlist/gnunet-daemon-hostlist_server.c:265
 msgid "HELLOs without addresses encountered (ignored)"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:265
+#: src/hostlist/gnunet-daemon-hostlist_server.c:282
 msgid "bytes not included in hostlist (size limit)"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:365
+#: src/hostlist/gnunet-daemon-hostlist_server.c:386
 #, c-format
 msgid "Refusing `%s' request to hostlist server\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:368
+#: src/hostlist/gnunet-daemon-hostlist_server.c:389
 msgid "hostlist requests refused (not HTTP GET)"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:382
+#: src/hostlist/gnunet-daemon-hostlist_server.c:403
 #, c-format
 msgid "Refusing `%s' request with %llu bytes of upload data\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:386
+#: src/hostlist/gnunet-daemon-hostlist_server.c:407
 msgid "hostlist requests refused (upload data)"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:393
+#: src/hostlist/gnunet-daemon-hostlist_server.c:414
 msgid "Could not handle hostlist request since I do not have a response yet\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:396
+#: src/hostlist/gnunet-daemon-hostlist_server.c:417
 msgid "hostlist requests refused (not ready)"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:401
+#: src/hostlist/gnunet-daemon-hostlist_server.c:422
 msgid "Received request for our hostlist\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:403
+#: src/hostlist/gnunet-daemon-hostlist_server.c:424
 msgid "hostlist requests processed"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:449
+#: src/hostlist/gnunet-daemon-hostlist_server.c:485
 msgid "# hostlist advertisements send"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:497
+#: src/hostlist/gnunet-daemon-hostlist_server.c:535
 msgid "Advertisement message could not be queued by core\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:684
-#: src/peerinfo-tool/gnunet-peerinfo.c:696
+#: src/hostlist/gnunet-daemon-hostlist_server.c:747
+#: src/peerinfo-tool/gnunet-peerinfo.c:736
 #: src/transport/gnunet-service-transport.c:1127
 #, fuzzy
 msgid "Could not access PEERINFO service.  Exiting.\n"
 msgstr "Kunde inte komma åt namnrymdsinformation.\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:708
+#: src/hostlist/gnunet-daemon-hostlist_server.c:771
 #, c-format
 msgid "Hostlist service starts on %s:%llu\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:723
+#: src/hostlist/gnunet-daemon-hostlist_server.c:786
 #, fuzzy, c-format
 msgid "Address to obtain hostlist: `%s'\n"
 msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:736
+#: src/hostlist/gnunet-daemon-hostlist_server.c:799
 #, fuzzy
 msgid "BINDTOIP does not a valid IPv4 address! Ignoring BINDTOIPV4.\n"
 msgstr "\"%s\" är inte tillgänglig."
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:749
+#: src/hostlist/gnunet-daemon-hostlist_server.c:812
 #, fuzzy
 msgid "BINDTOIP does not a valid IPv4 address! Ignoring BINDTOIPV6.\n"
 msgstr "\"%s\" är inte tillgänglig."
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:770
+#: src/hostlist/gnunet-daemon-hostlist_server.c:833
 #, fuzzy, c-format
 msgid "`%s' is not a valid IPv4 address! Ignoring BINDTOIPV4.\n"
 msgstr "\"%s\" är inte tillgänglig."
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:790
+#: src/hostlist/gnunet-daemon-hostlist_server.c:853
 #, fuzzy, c-format
 msgid "`%s' is not a valid IPv6 address! Ignoring BINDTOIPV6.\n"
 msgstr "\"%s\" är inte tillgänglig."
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:830
+#: src/hostlist/gnunet-daemon-hostlist_server.c:893
 #, c-format
 msgid "Could not start hostlist HTTP server on port %u\n"
 msgstr ""
@@ -5358,7 +5211,7 @@
 msgstr ""
 
 #: src/namestore/gnunet-namestore.c:868
-#: src/peerinfo-tool/gnunet-peerinfo.c:792
+#: src/peerinfo-tool/gnunet-peerinfo.c:817
 #, fuzzy, c-format
 msgid "Invalid URI `%s'\n"
 msgstr "Ogiltiga argument: "
@@ -5767,8 +5620,8 @@
 msgid "Measure quality and performance of the NSE service."
 msgstr "Kan inte tillgå tjänsten"
 
-#: src/nse/gnunet-service-nse.c:1517
-#: src/revocation/gnunet-service-revocation.c:798 src/util/gnunet-scrypt.c:248
+#: src/nse/gnunet-service-nse.c:1537
+#: src/revocation/gnunet-service-revocation.c:798 src/util/gnunet-scrypt.c:260
 msgid "Value is too large.\n"
 msgstr ""
 
@@ -5853,94 +5706,89 @@
 msgid "Could not connect to `%s' service.\n"
 msgstr "Kunde inte ansluta till gnunetd.\n"
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:230
+#: src/peerinfo-tool/gnunet-peerinfo.c:245
 #, fuzzy, c-format
 msgid "%sPeer `%s'\n"
 msgstr "Jag är ändpunkt \"%s\".\n"
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:237
+#: src/peerinfo-tool/gnunet-peerinfo.c:252
 #, c-format
 msgid "\tExpires: %s \t %s\n"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:286
+#: src/peerinfo-tool/gnunet-peerinfo.c:301
 #, fuzzy, c-format
 msgid "Failure: Cannot convert address to string for peer `%s'\n"
 msgstr "Misslyckades att binda till UDP-port %d.\n"
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:462
-#, fuzzy, c-format
-msgid "Failure: Did not receive %s\n"
-msgstr "Misslyckades att leverera \"%s\" meddelande.\n"
-
-#: src/peerinfo-tool/gnunet-peerinfo.c:471
+#: src/peerinfo-tool/gnunet-peerinfo.c:463
 #, c-format
 msgid "Failure: Received invalid %s\n"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:483
+#: src/peerinfo-tool/gnunet-peerinfo.c:477
 #, fuzzy, c-format
 msgid "Failed to write HELLO with %u bytes to file `%s'\n"
 msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:502
+#: src/peerinfo-tool/gnunet-peerinfo.c:496
 #, c-format
 msgid "Wrote %s HELLO containing %u addresses with %u bytes to file `%s'\n"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:570
+#: src/peerinfo-tool/gnunet-peerinfo.c:566
 #, c-format
 msgid "Failure adding HELLO: %s\n"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:687
+#: src/peerinfo-tool/gnunet-peerinfo.c:695
 #, fuzzy, c-format
+msgid "Failed to get my own HELLO from this peer!\n"
+msgstr "Kunde inte skapa värdnyckel!\n"
+
+#: src/peerinfo-tool/gnunet-peerinfo.c:727
+#, fuzzy, c-format
 msgid "Service `%s' is not running, please start GNUnet\n"
 msgstr "\"%s\" är inte en fil.\n"
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:718 src/util/gnunet-scrypt.c:224
-#, fuzzy, c-format
-msgid "Loading hostkey from `%s' failed.\n"
-msgstr "Tolkning av HTTP-svar för URL \"%s\" misslyckades.\n"
-
-#: src/peerinfo-tool/gnunet-peerinfo.c:816
+#: src/peerinfo-tool/gnunet-peerinfo.c:841
 #, c-format
 msgid "I am peer `%s'.\n"
 msgstr "Jag är ändpunkt \"%s\".\n"
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:865
+#: src/peerinfo-tool/gnunet-peerinfo.c:882
 msgid "don't resolve host names"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:868
+#: src/peerinfo-tool/gnunet-peerinfo.c:885
 msgid "output only the identity strings"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:871
+#: src/peerinfo-tool/gnunet-peerinfo.c:888
 msgid "include friend-only information"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:874
+#: src/peerinfo-tool/gnunet-peerinfo.c:891
 msgid "output our own identity only"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:877
+#: src/peerinfo-tool/gnunet-peerinfo.c:894
 msgid "list all known peers"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:880
+#: src/peerinfo-tool/gnunet-peerinfo.c:897
 msgid "dump hello to file"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:883
+#: src/peerinfo-tool/gnunet-peerinfo.c:900
 msgid "also output HELLO uri(s)"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:886
+#: src/peerinfo-tool/gnunet-peerinfo.c:903
 msgid "add given HELLO uri to the database"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:900
+#: src/peerinfo-tool/gnunet-peerinfo.c:917
 #, fuzzy
 msgid "Print information about peers."
 msgstr "Skriv ut information om GNUnets motparter."
@@ -5967,72 +5815,76 @@
 msgid "peerstore"
 msgstr ""
 
-#: src/peerstore/gnunet-service-peerstore.c:343
+#: src/peerstore/gnunet-service-peerstore.c:384
 #, fuzzy
 msgid "Malformed iterate request.\n"
 msgstr "Kunde inte spara konfigurationsfil \"%s\":"
 
-#: src/peerstore/gnunet-service-peerstore.c:350
+#: src/peerstore/gnunet-service-peerstore.c:391
 msgid "Sub system not supplied in client iterate request.\n"
 msgstr ""
 
-#: src/peerstore/gnunet-service-peerstore.c:399
+#: src/peerstore/gnunet-service-peerstore.c:451
 #, fuzzy
 msgid "Malformed store request from client\n"
 msgstr "Mottog ogiltig \"%s\" begäran (storlek %d)\n"
 
-#: src/peerstore/gnunet-service-peerstore.c:407
+#: src/peerstore/gnunet-service-peerstore.c:459
 msgid "Full key not supplied in client store request\n"
 msgstr ""
 
-#: src/peerstore/gnunet-service-peerstore.c:427
+#: src/peerstore/gnunet-service-peerstore.c:478
 #, fuzzy
-msgid "Failed to store requested value, sqlite database error."
+msgid "Failed to store requested value, database error."
 msgstr "Misslyckades att skicka HTTP-begäran till värd \"%s\": %s\n"
 
-#: src/peerstore/gnunet-service-peerstore.c:509
+#: src/peerstore/gnunet-service-peerstore.c:557
 msgid "No database backend configured\n"
 msgstr ""
 
-#: src/peerstore/gnunet-service-peerstore.c:520
+#: src/peerstore/gnunet-service-peerstore.c:568
 #, fuzzy, c-format
 msgid "Could not load database backend `%s'\n"
 msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 
-#: src/peerstore/peerstore_api.c:299 src/sensor/sensor_api.c:179
+#: src/peerstore/peerstore_api.c:329 src/sensor/sensor_api.c:179
 #, c-format
 msgid "Received an error notification from MQ of type: %d\n"
 msgstr ""
 
-#: src/peerstore/peerstore_api.c:370
+#: src/peerstore/peerstore_api.c:375
+msgid "timeout"
+msgstr ""
+
+#: src/peerstore/peerstore_api.c:402
 msgid "Iteration canceled due to reconnection."
 msgstr ""
 
-#: src/peerstore/peerstore_api.c:635
+#: src/peerstore/peerstore_api.c:681
 #, fuzzy
 msgid "Unexpected iteration response, this should not happen.\n"
 msgstr "Utdataformat är inte känt, detta bör inte hända.\n"
 
-#: src/peerstore/peerstore_api.c:646
+#: src/peerstore/peerstore_api.c:692
 #, fuzzy
 msgid "Error communicating with `PEERSTORE' service."
 msgstr "Skriv ut information om GNUnets motparter."
 
-#: src/peerstore/peerstore_api.c:665
+#: src/peerstore/peerstore_api.c:711
 #, fuzzy
 msgid "Received a malformed response from service."
 msgstr "Mottog ogiltig \"%s\" begäran (storlek %d)\n"
 
-#: src/peerstore/peerstore_api.c:804
+#: src/peerstore/peerstore_api.c:821
 msgid ""
 "Problem receiving a watch response, no way to determine which request.\n"
 msgstr ""
 
-#: src/peerstore/peerstore_api.c:815
+#: src/peerstore/peerstore_api.c:833
 msgid "Received a watch result for a non existing watch.\n"
 msgstr ""
 
-#: src/peerstore/plugin_peerstore_sqlite.c:377
+#: src/peerstore/plugin_peerstore_sqlite.c:398
 #: src/psycstore/plugin_psycstore_sqlite.c:286
 #, fuzzy, c-format
 msgid ""
@@ -6040,7 +5892,7 @@
 "  %s\n"
 msgstr "Fel vid skapandet av användare"
 
-#: src/peerstore/plugin_peerstore_sqlite.c:401
+#: src/peerstore/plugin_peerstore_sqlite.c:422
 #: src/psycstore/plugin_psycstore_sqlite.c:263
 #, fuzzy, c-format
 msgid ""
@@ -6048,7 +5900,7 @@
 "  %s\n"
 msgstr "Fel vid skapandet av användare"
 
-#: src/peerstore/plugin_peerstore_sqlite.c:483
+#: src/peerstore/plugin_peerstore_sqlite.c:504
 #, fuzzy, c-format
 msgid "Unable to create indices: %s.\n"
 msgstr "Kunde inte skapa namnrymd \"%s\" (existerar?).\n"
@@ -6150,7 +6002,7 @@
 msgid "`%s' failed at %s:%d with error: %s (%d)\n"
 msgstr "\"%s\" misslyckades vid %s:%d med fel: %s\n"
 
-#: src/psycstore/plugin_psycstore_sqlite.c:1933
+#: src/psycstore/plugin_psycstore_sqlite.c:1932
 msgid "SQLite database running\n"
 msgstr ""
 
@@ -6432,61 +6284,70 @@
 msgid "rps"
 msgstr ""
 
-#: src/scalarproduct/gnunet-scalarproduct.c:222
+#: src/scalarproduct/gnunet-scalarproduct.c:221
 #, fuzzy
 msgid "You must specify at least one message ID to check!\n"
 msgstr "Du måste ange en lista av filer att lägga in.\n"
 
-#: src/scalarproduct/gnunet-scalarproduct.c:229
+#: src/scalarproduct/gnunet-scalarproduct.c:228
 msgid "This program needs a session identifier for comparing vectors.\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-scalarproduct.c:242
+#: src/scalarproduct/gnunet-scalarproduct.c:241
 #, c-format
 msgid ""
 "Tried to set initiator mode, as peer ID was given. However, `%s' is not a "
 "valid peer identifier.\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-scalarproduct.c:253
-msgid "Need elements to compute the vectorproduct, got none.\n"
+#: src/scalarproduct/gnunet-scalarproduct.c:259
+msgid "Need elements to compute the scalarproduct, got none.\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-scalarproduct.c:275
+#: src/scalarproduct/gnunet-scalarproduct.c:281
 #, fuzzy, c-format
 msgid "Malformed input, could not parse `%s'\n"
 msgstr "Misslyckades att starta samling.\n"
 
-#: src/scalarproduct/gnunet-scalarproduct.c:294
+#: src/scalarproduct/gnunet-scalarproduct.c:299
 #, fuzzy, c-format
 msgid "Could not convert `%s' to int64_t.\n"
 msgstr "Kunde inte ansluta till gnunetd.\n"
 
-#: src/scalarproduct/gnunet-scalarproduct.c:344
+#: src/scalarproduct/gnunet-scalarproduct.c:326
+#, c-format
+msgid "Failed to initiate computation, were all keys unique?\n"
+msgstr ""
+
+#: src/scalarproduct/gnunet-scalarproduct.c:350
 msgid ""
 "A comma separated list of elements to compare as vector with our remote peer."
 msgstr ""
 
-#: src/scalarproduct/gnunet-scalarproduct.c:347
+#: src/scalarproduct/gnunet-scalarproduct.c:353
 msgid ""
 "[Optional] peer to calculate our scalarproduct with. If this parameter is "
 "not given, the service will wait for a remote peer to compute the request."
 msgstr ""
 
-#: src/scalarproduct/gnunet-scalarproduct.c:350
+#: src/scalarproduct/gnunet-scalarproduct.c:356
 msgid "Transaction ID shared with peer."
 msgstr ""
 
-#: src/scalarproduct/gnunet-scalarproduct.c:359
+#: src/scalarproduct/gnunet-scalarproduct.c:365
 msgid "Calculate the Vectorproduct with a GNUnet peer."
 msgstr ""
 
-#: src/scalarproduct/gnunet-service-scalarproduct_alice.c:1418
-#: src/scalarproduct/gnunet-service-scalarproduct_bob.c:1529
+#: src/scalarproduct/gnunet-service-scalarproduct_alice.c:1419
+#: src/scalarproduct/gnunet-service-scalarproduct_bob.c:1564
 #, fuzzy
 msgid "Connect to CADET failed\n"
 msgstr " Anslutning misslyckades (fel?)\n"
 
+#: src/scalarproduct/scalarproduct_api.c:296
+msgid "Keys given to SCALARPRODUCT not unique!\n"
+msgstr ""
+
 #: src/secretsharing/gnunet-secretsharing-profiler.c:613
 msgid "dkg start delay"
 msgstr ""
@@ -6526,54 +6387,54 @@
 msgid "sensor"
 msgstr ""
 
-#: src/sensor/gnunet-sensor-profiler.c:728
+#: src/sensor/gnunet-sensor-profiler.c:729
 msgid "Invalid or missing number of peers. Set at least 2 peers.\n"
 msgstr ""
 
-#: src/sensor/gnunet-sensor-profiler.c:735
+#: src/sensor/gnunet-sensor-profiler.c:736
 #, fuzzy
 msgid "Missing or invalid topology file.\n"
 msgstr "Ogiltigt argument: \"%s\"\n"
 
-#: src/sensor/gnunet-sensor-profiler.c:781
+#: src/sensor/gnunet-sensor-profiler.c:782
 #, fuzzy
 msgid "Number of peers to run"
 msgstr "antal iterationer"
 
-#: src/sensor/gnunet-sensor-profiler.c:783
+#: src/sensor/gnunet-sensor-profiler.c:784
 msgid "Path to topology file"
 msgstr ""
 
-#: src/sensor/gnunet-sensor-profiler.c:786
+#: src/sensor/gnunet-sensor-profiler.c:787
 msgid "Change the interval of running sensors to given value"
 msgstr ""
 
-#: src/sensor/gnunet-sensor-profiler.c:789
+#: src/sensor/gnunet-sensor-profiler.c:790
 #, fuzzy
 msgid "Number of peers to simulate anomalies on"
 msgstr "antal iterationer"
 
-#: src/sensor/gnunet-sensor-profiler.c:796
+#: src/sensor/gnunet-sensor-profiler.c:797
 #, fuzzy
 msgid "Profiler for sensor service"
 msgstr "Fel vid skapandet av användare"
 
-#: src/sensor/gnunet-service-sensor_analysis.c:202
+#: src/sensor/gnunet-service-sensor_analysis.c:204
 #, fuzzy
 msgid "Received an invalid sensor value."
 msgstr "Mottog ogiltig \"%s\" begäran (fel tabell)\n"
 
-#: src/sensor/gnunet-service-sensor_analysis.c:293
+#: src/sensor/gnunet-service-sensor_analysis.c:295
 #, fuzzy
 msgid "Analysis model not defined in configuration.\n"
 msgstr "Kunde inte hitta motpart \"%s\" i routingtabell!\n"
 
-#: src/sensor/gnunet-service-sensor_analysis.c:302
+#: src/sensor/gnunet-service-sensor_analysis.c:304
 #, fuzzy, c-format
 msgid "Could not load analysis model `%s'.\n"
 msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 
-#: src/sensor/gnunet-service-sensor_analysis.c:310
+#: src/sensor/gnunet-service-sensor_analysis.c:312
 #, fuzzy
 msgid "Could not connect to peerstore service.\n"
 msgstr "Kunde inte ansluta till gnunetd.\n"
@@ -6614,33 +6475,33 @@
 msgid "Failed to create pow and signature block.\n"
 msgstr "Kunde inte skapa namnrymd \"%s\" (existerar?).\n"
 
-#: src/sensor/gnunet-service-sensor_reporting.c:1044
+#: src/sensor/gnunet-service-sensor_reporting.c:1046
 #, c-format
 msgid "PEERSTORE error: %s.\n"
 msgstr ""
 
-#: src/sensor/gnunet-service-sensor_reporting.c:1149
-#: src/sensor/gnunet-service-sensor_reporting.c:1407
+#: src/sensor/gnunet-service-sensor_reporting.c:1151
+#: src/sensor/gnunet-service-sensor_reporting.c:1409
 #, fuzzy
 msgid "Failed to connect to CORE service.\n"
 msgstr "Misslyckades att ansluta till gnunetd.\n"
 
-#: src/sensor/gnunet-service-sensor_reporting.c:1156
+#: src/sensor/gnunet-service-sensor_reporting.c:1158
 msgid "Peer identity received from CORE init doesn't match ours.\n"
 msgstr ""
 
-#: src/sensor/gnunet-service-sensor_reporting.c:1396
+#: src/sensor/gnunet-service-sensor_reporting.c:1398
 #, fuzzy
 msgid "Failed to connect to peerstore service.\n"
 msgstr "Misslyckades att ansluta till gnunetd.\n"
 
-#: src/sensor/gnunet-service-sensor_reporting.c:1417
+#: src/sensor/gnunet-service-sensor_reporting.c:1419
 #: src/sensor/gnunet-service-sensor_update.c:781
 #, fuzzy
 msgid "Failed to connect to CADET service.\n"
 msgstr "Misslyckades att ansluta till gnunetd.\n"
 
-#: src/sensor/gnunet-service-sensor_reporting.c:1424
+#: src/sensor/gnunet-service-sensor_reporting.c:1426
 #, fuzzy
 msgid "Failed to load my private key.\n"
 msgstr "Misslyckades att starta samling.\n"
@@ -6751,30 +6612,30 @@
 "\n"
 "Fel vid uppladdning av fil: %s\n"
 
-#: src/set/gnunet-service-set.c:1529
+#: src/set/gnunet-service-set.c:1531
 #, fuzzy
 msgid "Could not connect to cadet service\n"
 msgstr "Kunde inte ansluta till gnunetd.\n"
 
-#: src/set/gnunet-set-ibf-profiler.c:221
+#: src/set/gnunet-set-ibf-profiler.c:237
 #, fuzzy
 msgid "number of element in set A-B"
 msgstr "antal iterationer"
 
-#: src/set/gnunet-set-ibf-profiler.c:224
+#: src/set/gnunet-set-ibf-profiler.c:240
 #, fuzzy
 msgid "number of element in set B-A"
 msgstr "antal iterationer"
 
-#: src/set/gnunet-set-ibf-profiler.c:227
+#: src/set/gnunet-set-ibf-profiler.c:243
 msgid "number of common elements in A and B"
 msgstr ""
 
-#: src/set/gnunet-set-ibf-profiler.c:230
+#: src/set/gnunet-set-ibf-profiler.c:246
 msgid "hash num"
 msgstr ""
 
-#: src/set/gnunet-set-ibf-profiler.c:233
+#: src/set/gnunet-set-ibf-profiler.c:249
 msgid "ibf size"
 msgstr ""
 
@@ -6782,93 +6643,93 @@
 msgid "oeration to execute"
 msgstr ""
 
-#: src/statistics/gnunet-service-statistics.c:280
+#: src/statistics/gnunet-service-statistics.c:323
 #, fuzzy, c-format
 msgid "Loading %llu bytes of statistics from `%s'\n"
 msgstr "Ladda ner filer från GNUnet."
 
-#: src/statistics/gnunet-service-statistics.c:346
+#: src/statistics/gnunet-service-statistics.c:434
 #, fuzzy, c-format
 msgid "Wrote %llu bytes of statistics to `%s'\n"
 msgstr "Ladda ner filer från GNUnet."
 
-#: src/statistics/gnunet-statistics.c:140
+#: src/statistics/gnunet-statistics.c:145
 #, fuzzy
 msgid "Failed to obtain statistics.\n"
 msgstr "Misslyckades att binda till UDP-port %d.\n"
 
-#: src/statistics/gnunet-statistics.c:142
+#: src/statistics/gnunet-statistics.c:148
 #, fuzzy, c-format
 msgid "Failed to obtain statistics from host `%s:%llu'\n"
 msgstr "Misslyckades att binda till UDP-port %d.\n"
 
-#: src/statistics/gnunet-statistics.c:189
+#: src/statistics/gnunet-statistics.c:198
 msgid "Missing argument: subsystem \n"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:195
+#: src/statistics/gnunet-statistics.c:204
 msgid "Missing argument: name\n"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:226
+#: src/statistics/gnunet-statistics.c:235
 #, c-format
 msgid "No subsystem or name given\n"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:234
+#: src/statistics/gnunet-statistics.c:243
 #, fuzzy, c-format
 msgid "Failed to initialize watch routine\n"
 msgstr "Misslyckades att initiera tjänsten \"%s\".\n"
 
-#: src/statistics/gnunet-statistics.c:261
+#: src/statistics/gnunet-statistics.c:269
 #, fuzzy, c-format
 msgid "Trying to connect to remote host, but service `%s' is not running\n"
 msgstr "Kunde inte ansluta till gnunetd.\n"
 
-#: src/statistics/gnunet-statistics.c:269
+#: src/statistics/gnunet-statistics.c:282
 #, fuzzy, c-format
 msgid "A port is required to connect to host `%s'\n"
 msgstr "Kan inte ansluta till %u.%u.%u.%u:%u: %s\n"
 
-#: src/statistics/gnunet-statistics.c:276
+#: src/statistics/gnunet-statistics.c:290
 #, c-format
 msgid "A port has to be between 1 and 65535 to connect to host `%s'\n"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:308
+#: src/statistics/gnunet-statistics.c:323
 #, fuzzy, c-format
 msgid "Invalid argument `%s'\n"
 msgstr "Ogiltigt argument: \"%s\"\n"
 
-#: src/statistics/gnunet-statistics.c:334
+#: src/statistics/gnunet-statistics.c:349
 msgid "limit output to statistics for the given NAME"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:337
+#: src/statistics/gnunet-statistics.c:352
 msgid "make the value being set persistent"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:340
+#: src/statistics/gnunet-statistics.c:355
 msgid "limit output to the given SUBSYSTEM"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:343
+#: src/statistics/gnunet-statistics.c:358
 msgid "just print the statistics value"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:346
+#: src/statistics/gnunet-statistics.c:361
 msgid "watch value continuously"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:349
+#: src/statistics/gnunet-statistics.c:364
 msgid "connect to remote host"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:352
+#: src/statistics/gnunet-statistics.c:367
 msgid "port for remote host"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:364
+#: src/statistics/gnunet-statistics.c:379
 msgid "Print statistics about GNUnet operations."
 msgstr "Skriv ut statistik om GNUnet-operationer."
 
@@ -6883,54 +6744,55 @@
 "might have been lost!\n"
 msgstr ""
 
-#: src/testbed/generate-underlay-topology.c:223
-msgid "Need atleast 2 arguments\n"
-msgstr ""
+#: src/testbed/generate-underlay-topology.c:225
+#, fuzzy
+msgid "Need at least 2 arguments\n"
+msgstr "Du måste ange en och endast en fil att avindexera.\n"
 
-#: src/testbed/generate-underlay-topology.c:228
+#: src/testbed/generate-underlay-topology.c:230
 msgid "Database filename missing\n"
 msgstr ""
 
-#: src/testbed/generate-underlay-topology.c:235
+#: src/testbed/generate-underlay-topology.c:237
 msgid "Topology string missing\n"
 msgstr ""
 
-#: src/testbed/generate-underlay-topology.c:240
+#: src/testbed/generate-underlay-topology.c:242
 #, fuzzy, c-format
 msgid "Invalid topology: %s\n"
 msgstr "Ogiltigt argument: \"%s\"\n"
 
-#: src/testbed/generate-underlay-topology.c:253
+#: src/testbed/generate-underlay-topology.c:255
 #, c-format
 msgid "An argument is missing for given topology `%s'\n"
 msgstr ""
 
-#: src/testbed/generate-underlay-topology.c:259
+#: src/testbed/generate-underlay-topology.c:261
 #, fuzzy, c-format
 msgid "Invalid argument `%s' given as topology argument\n"
 msgstr "Ogiltigt argument: \"%s\"\n"
 
-#: src/testbed/generate-underlay-topology.c:267
+#: src/testbed/generate-underlay-topology.c:269
 #, c-format
 msgid "Filename argument missing for topology `%s'\n"
 msgstr ""
 
-#: src/testbed/generate-underlay-topology.c:281
+#: src/testbed/generate-underlay-topology.c:283
 #, c-format
 msgid "Second argument for topology `%s' is missing\n"
 msgstr ""
 
-#: src/testbed/generate-underlay-topology.c:287
+#: src/testbed/generate-underlay-topology.c:289
 #, fuzzy, c-format
 msgid "Invalid argument `%s'; expecting unsigned int\n"
 msgstr "Ogiltigt argument: \"%s\"\n"
 
-#: src/testbed/generate-underlay-topology.c:336
+#: src/testbed/generate-underlay-topology.c:338
 #: src/testbed/gnunet-testbed-profiler.c:293
 msgid "create COUNT number of peers"
 msgstr ""
 
-#: src/testbed/generate-underlay-topology.c:345
+#: src/testbed/generate-underlay-topology.c:347
 msgid ""
 "Generates SQLite3 database representing a given underlay topology.\n"
 "Usage: gnunet-underlay-topology [OPTIONS] db-filename TOPO [TOPOOPTS]\n"
@@ -7315,21 +7177,26 @@
 msgid "GNUnet topology control (maintaining P2P cadet and F2F constraints)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_blacklist.c:271
+#: src/transport/gnunet-service-transport_blacklist.c:274
 #, 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:279
+#: src/transport/gnunet-service-transport_blacklist.c:283
 #, c-format
 msgid "Adding blacklisting entry for peer `%s':`%s'\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_blacklist.c:465
-#: src/transport/gnunet-service-transport_blacklist.c:748
+#: src/transport/gnunet-service-transport_blacklist.c:476
+#: src/transport/gnunet-service-transport_blacklist.c:766
 msgid "# disconnects due to blacklist"
 msgstr ""
 
+#: src/transport/gnunet-service-transport_blacklist.c:769
+#, 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:220
 #, fuzzy
 msgid "# bytes payload discarded due to not connected peer"
@@ -7362,257 +7229,232 @@
 msgid "Transport service is lacking key configuration settings. Exiting.\n"
 msgstr "GNUnet-konfiguration"
 
-#: src/transport/gnunet-service-transport_clients.c:463
-#, c-format
-msgid "Dropping message of type %u and size %u, have %u/%u messages pending\n"
-msgstr ""
-
-#: src/transport/gnunet-service-transport_clients.c:470
+#: src/transport/gnunet-service-transport_clients.c:481
 msgid "# messages dropped due to slow client"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_clients.c:630
-#, c-format
-msgid "Rejecting control connection from peer `%s', which is not me!\n"
-msgstr ""
-
-#: src/transport/gnunet-service-transport_clients.c:771
+#: src/transport/gnunet-service-transport_clients.c:774
 msgid "# bytes payload dropped (other peer was not connected)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_clients.c:804
+#: 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:810
-#, fuzzy, c-format
-msgid "Blacklist allows connection attempt to peer `%s'\n"
-msgstr "Misslyckades att ansluta till gnunetd.\n"
-
-#: src/transport/gnunet-service-transport_clients.c:836
+#: src/transport/gnunet-service-transport_clients.c:843
 #, fuzzy
 msgid "# REQUEST CONNECT messages received"
 msgstr "# krypterade PONG-meddelanden mottagna"
 
-#: src/transport/gnunet-service-transport_clients.c:850
-#, fuzzy, c-format
-msgid "Received a request connect message for peer `%s'\n"
-msgstr "Mottog ogiltigt \"%s\" meddelande från \"%s\".\n"
-
-#: src/transport/gnunet-service-transport_clients.c:861
+#: src/transport/gnunet-service-transport_clients.c:882
 #, fuzzy
 msgid "# REQUEST DISCONNECT messages received"
 msgstr "# krypterade PONG-meddelanden mottagna"
 
-#: src/transport/gnunet-service-transport_clients.c:875
-#, fuzzy, c-format
-msgid "Received a request disconnect message for peer `%s'\n"
-msgstr "Mottog ogiltigt \"%s\" meddelande från \"%s\".\n"
-
 #: src/transport/gnunet-service-transport_hello.c:182
 msgid "# refreshed my HELLO"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1095
+#: src/transport/gnunet-service-transport_neighbours.c:1099
 #, fuzzy
 msgid "# DISCONNECT messages sent"
 msgstr "# krypterade PONG-meddelanden mottagna"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1220
-#: src/transport/gnunet-service-transport_neighbours.c:1635
+#: src/transport/gnunet-service-transport_neighbours.c:1224
+#: src/transport/gnunet-service-transport_neighbours.c:1639
 msgid "# bytes in message queue for other peers"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1225
+#: src/transport/gnunet-service-transport_neighbours.c:1229
 #, fuzzy
 msgid "# messages transmitted to other peers"
 msgstr "# byte skickade av typen %d"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1230
+#: src/transport/gnunet-service-transport_neighbours.c:1234
 #, fuzzy
 msgid "# transmission failures for messages to other peers"
 msgstr "# byte skickade av typen %d"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1288
+#: src/transport/gnunet-service-transport_neighbours.c:1292
 msgid "# messages timed out while in transport queue"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1349
+#: src/transport/gnunet-service-transport_neighbours.c:1353
 #, fuzzy
 msgid "# keepalives sent"
 msgstr "# sessionsnycklar skickade"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1382
+#: src/transport/gnunet-service-transport_neighbours.c:1386
 #, fuzzy
 msgid "# KEEPALIVE messages discarded (peer unknown)"
 msgstr "Nätverksannonsering avstängd i konfigurationen!\n"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1390
+#: src/transport/gnunet-service-transport_neighbours.c:1394
 #, fuzzy
 msgid "# KEEPALIVE messages discarded (no session)"
 msgstr "Nätverksannonsering avstängd i konfigurationen!\n"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1437
+#: src/transport/gnunet-service-transport_neighbours.c:1441
 #, fuzzy
 msgid "# KEEPALIVE_RESPONSE messages discarded (not connected)"
 msgstr "Nätverksannonsering avstängd i konfigurationen!\n"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1446
+#: src/transport/gnunet-service-transport_neighbours.c:1450
 #, fuzzy
 msgid "# KEEPALIVE_RESPONSE messages discarded (not expected)"
 msgstr "Nätverksannonsering avstängd i konfigurationen!\n"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1454
+#: src/transport/gnunet-service-transport_neighbours.c:1458
 #, fuzzy
 msgid "# KEEPALIVE_RESPONSE messages discarded (address changed)"
 msgstr "Nätverksannonsering avstängd i konfigurationen!\n"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1462
+#: src/transport/gnunet-service-transport_neighbours.c:1466
 #, fuzzy
 msgid "# KEEPALIVE_RESPONSE messages discarded (wrong nonce)"
 msgstr "Nätverksannonsering avstängd i konfigurationen!\n"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1540
+#: src/transport/gnunet-service-transport_neighbours.c:1544
 #, 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:1574
+#: src/transport/gnunet-service-transport_neighbours.c:1578
 msgid "# bandwidth quota violations by other peers"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1590
+#: src/transport/gnunet-service-transport_neighbours.c:1594
 msgid "# ms throttling suggested"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1685
+#: src/transport/gnunet-service-transport_neighbours.c:1689
 #, 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"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1712
+#: src/transport/gnunet-service-transport_neighbours.c:1716
 #, 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:1757
+#: src/transport/gnunet-service-transport_neighbours.c:1761
 #, fuzzy
 msgid "# SYN messages sent"
 msgstr "# krypterade PONG-meddelanden mottagna"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1773
+#: src/transport/gnunet-service-transport_neighbours.c:1777
 #, fuzzy, c-format
 msgid "Failed to transmit SYN message via plugin to %s\n"
 msgstr "Misslyckades att initiera tjänsten \"%s\".\n"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1800
+#: src/transport/gnunet-service-transport_neighbours.c:1804
 #, 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:1849
+#: src/transport/gnunet-service-transport_neighbours.c:1853
 #, fuzzy, c-format
 msgid ""
 "Failed to send SYN_ACK message to peer `%s' using address `%s' session %p\n"
 msgstr "Misslyckades att ansluta till gnunetd.\n"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1904
+#: src/transport/gnunet-service-transport_neighbours.c:1908
 #, fuzzy
 msgid "# SYN_ACK messages sent"
 msgstr "# krypterade PONG-meddelanden mottagna"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1919
+#: src/transport/gnunet-service-transport_neighbours.c:1923
 #, fuzzy, c-format
 msgid "Failed to transmit SYN_ACK message via plugin to %s\n"
 msgstr "Misslyckades att initiera tjänsten \"%s\".\n"
 
-#: src/transport/gnunet-service-transport_neighbours.c:2199
+#: src/transport/gnunet-service-transport_neighbours.c:2203
 #, 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:2324
+#: src/transport/gnunet-service-transport_neighbours.c:2328
 #, fuzzy
 msgid "# SYN messages received"
 msgstr "# PING-meddelanden skapade"
 
-#: src/transport/gnunet-service-transport_neighbours.c:2329
+#: src/transport/gnunet-service-transport_neighbours.c:2333
 #, c-format
 msgid "SYN request from peer `%s' ignored due impending shutdown\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:2626
+#: src/transport/gnunet-service-transport_neighbours.c:2630
 msgid "# Attempts to switch addresses"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3047
+#: src/transport/gnunet-service-transport_neighbours.c:3051
 #, 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:3142
+#: src/transport/gnunet-service-transport_neighbours.c:3146
 #, fuzzy
 msgid "# SYN_ACK messages received"
 msgstr "# krypterade PONG-meddelanden mottagna"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3150
+#: src/transport/gnunet-service-transport_neighbours.c:3154
 #, fuzzy
 msgid "# unexpected SYN_ACK messages (no peer)"
 msgstr "skicka ANTAL meddelanden"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3164
-#: src/transport/gnunet-service-transport_neighbours.c:3199
+#: src/transport/gnunet-service-transport_neighbours.c:3168
+#: src/transport/gnunet-service-transport_neighbours.c:3203
 #, fuzzy
 msgid "# unexpected SYN_ACK messages (not ready)"
 msgstr "skicka ANTAL meddelanden"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3211
+#: src/transport/gnunet-service-transport_neighbours.c:3215
 #, fuzzy
 msgid "# unexpected SYN_ACK messages (waiting on ATS)"
 msgstr "skicka ANTAL meddelanden"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3234
+#: src/transport/gnunet-service-transport_neighbours.c:3238
 msgid "# Successful attempts to switch addresses"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3242
+#: src/transport/gnunet-service-transport_neighbours.c:3246
 #, fuzzy
 msgid "# unexpected SYN_ACK messages (disconnecting)"
 msgstr "skicka ANTAL meddelanden"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3441
+#: src/transport/gnunet-service-transport_neighbours.c:3445
 #, fuzzy
 msgid "# ACK messages received"
 msgstr "# krypterade PONG-meddelanden mottagna"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3477
+#: src/transport/gnunet-service-transport_neighbours.c:3481
 #, fuzzy
 msgid "# unexpected ACK messages"
 msgstr "# krypterade PONG-meddelanden skickade"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3551
+#: src/transport/gnunet-service-transport_neighbours.c:3555
 msgid "# SET QUOTA messages ignored (no such peer)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3566
+#: src/transport/gnunet-service-transport_neighbours.c:3570
 msgid "# disconnects due to quota of 0"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3611
+#: src/transport/gnunet-service-transport_neighbours.c:3615
 msgid "# disconnect messages ignored (malformed)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3617
+#: src/transport/gnunet-service-transport_neighbours.c:3621
 #, fuzzy
 msgid "# DISCONNECT messages received"
 msgstr "# krypterade PONG-meddelanden mottagna"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3626
+#: src/transport/gnunet-service-transport_neighbours.c:3630
 msgid "# disconnect messages ignored (timestamp)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3753
+#: src/transport/gnunet-service-transport_neighbours.c:3757
 #, fuzzy
 msgid "# disconnected from peer upon explicit request"
 msgstr "# av anslutna parter"
@@ -7727,63 +7569,63 @@
 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:573
+#: src/transport/gnunet-transport.c:578
 #, 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:582
+#: src/transport/gnunet-transport.c:587
 #: 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:614
+#: src/transport/gnunet-transport.c:619
 #, fuzzy, c-format
 msgid "Failed to connect to `%s'\n"
 msgstr "Misslyckades att ansluta till gnunetd.\n"
 
-#: src/transport/gnunet-transport.c:629
+#: src/transport/gnunet-transport.c:634
 #, 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:641
+#: src/transport/gnunet-transport.c:646
 #, fuzzy
 msgid "Failed to list connections, timeout occured\n"
 msgstr "Misslyckades att ansluta till gnunetd.\n"
 
-#: src/transport/gnunet-transport.c:668 src/transport/gnunet-transport.c:698
+#: src/transport/gnunet-transport.c:673 src/transport/gnunet-transport.c:703
 #, fuzzy, c-format
 msgid "Configuration for plugin `%s' did not work!\n"
 msgstr "Konfigurationsfil \"%s\" skapad.\n"
 
-#: src/transport/gnunet-transport.c:673
+#: src/transport/gnunet-transport.c:678
 #, fuzzy, c-format
 msgid "Configuration for plugin `%s' did work!\n"
 msgstr "Konfigurationsfil \"%s\" skapad.\n"
 
-#: src/transport/gnunet-transport.c:678
+#: src/transport/gnunet-transport.c:683
 #, 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:683
+#: src/transport/gnunet-transport.c:688
 #, fuzzy, c-format
 msgid "Failed to start NAT test for plugin `%s'\n"
 msgstr "Misslyckades att starta samling.\n"
 
-#: src/transport/gnunet-transport.c:688
+#: src/transport/gnunet-transport.c:693
 #, c-format
 msgid "Timeout while waiting for result of NAT test for plugin `%s'\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:704
+#: src/transport/gnunet-transport.c:709
 #, fuzzy, c-format
 msgid "Configuration for plugin `%s' is working!\n"
 msgstr "Konfigurationsfil \"%s\" skapad.\n"
 
-#: src/transport/gnunet-transport.c:823
+#: src/transport/gnunet-transport.c:828
 #, fuzzy, c-format
 msgid ""
 "Peer `%s' %s %s\n"
@@ -7792,91 +7634,91 @@
 "\t%s%s\n"
 msgstr "Jag är ändpunkt \"%s\".\n"
 
-#: src/transport/gnunet-transport.c:859
+#: src/transport/gnunet-transport.c:864
 #, fuzzy, c-format
 msgid "Peer `%s' %s `%s' \n"
 msgstr "Jag är ändpunkt \"%s\".\n"
 
-#: src/transport/gnunet-transport.c:958 src/transport/gnunet-transport.c:1707
+#: src/transport/gnunet-transport.c:963 src/transport/gnunet-transport.c:1712
 #, fuzzy
 msgid "Monitor disconnected from transport service. Reconnecting.\n"
 msgstr "Misslyckades att ansluta till gnunetd.\n"
 
-#: src/transport/gnunet-transport.c:1026
+#: src/transport/gnunet-transport.c:1031
 msgid "No transport plugins configured, peer will never communicate\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1040
+#: src/transport/gnunet-transport.c:1045
 #, c-format
 msgid "No port configured for plugin `%s', cannot test it\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1065
+#: src/transport/gnunet-transport.c:1070
 #, fuzzy
 msgid "Failed to start resolver!\n"
 msgstr "Misslyckades att starta samling.\n"
 
-#: src/transport/gnunet-transport.c:1111
+#: src/transport/gnunet-transport.c:1116
 #, 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:1134
+#: src/transport/gnunet-transport.c:1139
 #: 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:1158
+#: src/transport/gnunet-transport.c:1163
 #, c-format
 msgid ""
 "Successfully connected to `%s', starting to send benchmark data in %u Kb "
 "blocks\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1191
+#: src/transport/gnunet-transport.c:1196
 #, fuzzy, c-format
 msgid "Successfully disconnected from `%s'\n"
 msgstr "Åtkomst nekad för \"%s\" vid %s:%d.\n"
 
-#: src/transport/gnunet-transport.c:1214
+#: src/transport/gnunet-transport.c:1219
 #: 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:1239 src/transport/gnunet-transport.c:1265
+#: src/transport/gnunet-transport.c:1244 src/transport/gnunet-transport.c:1270
 #, c-format
 msgid "%24s: %-17s %4s   (%u connections in total)\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1241
+#: src/transport/gnunet-transport.c:1246
 #, fuzzy
 msgid "Connected to"
 msgstr "\"%s\" ansluten till \"%s\".\n"
 
-#: src/transport/gnunet-transport.c:1267
+#: src/transport/gnunet-transport.c:1272
 #, fuzzy
 msgid "Disconnected from"
 msgstr "\"%s\" ansluten till \"%s\".\n"
 
-#: src/transport/gnunet-transport.c:1291
+#: src/transport/gnunet-transport.c:1296
 #: src/transport/gnunet-transport-profiler.c:458
 #, c-format
 msgid "Received %u bytes from %s\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1323
+#: src/transport/gnunet-transport.c:1328
 #, c-format
 msgid "Peer `%s': %s %s in state `%s' until %s\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1335
+#: src/transport/gnunet-transport.c:1340
 #, fuzzy, c-format
 msgid "Peer `%s': %s %s\n"
 msgstr "Jag är ändpunkt \"%s\".\n"
 
-#: src/transport/gnunet-transport.c:1792
+#: src/transport/gnunet-transport.c:1794
 #: src/transport/gnunet-transport-profiler.c:492
 #, fuzzy
 msgid "Failed to send connect request to transport service\n"
@@ -7887,100 +7729,100 @@
 msgid "Failed to send disconnect request to transport service\n"
 msgstr "Misslyckades att ansluta till gnunetd.\n"
 
-#: src/transport/gnunet-transport.c:1875
+#: src/transport/gnunet-transport.c:1873
 #, 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:1883
+#: src/transport/gnunet-transport.c:1881
 #, c-format
 msgid ""
 "No operation given. Please choose one operation: %s, %s, %s, %s, %s, %s, %s\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1902 src/transport/gnunet-transport.c:1932
-#: src/transport/gnunet-transport.c:1964 src/transport/gnunet-transport.c:1990
-#: src/transport/gnunet-transport.c:2046
+#: src/transport/gnunet-transport.c:1900 src/transport/gnunet-transport.c:1930
+#: src/transport/gnunet-transport.c:1963 src/transport/gnunet-transport.c:1989
+#: src/transport/gnunet-transport.c:2045
 #: 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:1911 src/transport/gnunet-transport.c:1941
-#: src/transport/gnunet-transport.c:1975
+#: src/transport/gnunet-transport.c:1909 src/transport/gnunet-transport.c:1940
+#: src/transport/gnunet-transport.c:1974
 #, fuzzy
 msgid "Failed to send request to transport service\n"
 msgstr "Misslyckades att ansluta till gnunetd.\n"
 
-#: src/transport/gnunet-transport.c:1995
+#: src/transport/gnunet-transport.c:1994
 msgid "Starting to receive benchmark data\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:2094
+#: src/transport/gnunet-transport.c:2093
 #, fuzzy
 msgid "print information for all peers (instead of only connected peers)"
 msgstr "Skriv ut information om GNUnets motparter."
 
-#: src/transport/gnunet-transport.c:2097
+#: src/transport/gnunet-transport.c:2096
 msgid "measure how fast we are receiving data from all peers (until CTRL-C)"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:2100
+#: src/transport/gnunet-transport.c:2099
 #, fuzzy
 msgid "connect to a peer"
 msgstr "Misslyckades att ansluta till gnunetd.\n"
 
-#: src/transport/gnunet-transport.c:2103
+#: src/transport/gnunet-transport.c:2102
 #, fuzzy
 msgid "disconnect to a peer"
 msgstr "Misslyckades att ansluta till gnunetd.\n"
 
-#: src/transport/gnunet-transport.c:2106
+#: src/transport/gnunet-transport.c:2105
 #, fuzzy
 msgid "print information for all pending validations "
 msgstr "Skriv ut information om GNUnets motparter."
 
-#: src/transport/gnunet-transport.c:2109
+#: src/transport/gnunet-transport.c:2108
 #, fuzzy
 msgid "print information for all pending validations continuously"
 msgstr "Skriv ut information om GNUnets motparter."
 
-#: src/transport/gnunet-transport.c:2112
+#: src/transport/gnunet-transport.c:2111
 #, fuzzy
 msgid "provide information about all current connections (once)"
 msgstr "Skriv ut information om GNUnets motparter."
 
-#: src/transport/gnunet-transport.c:2118
+#: src/transport/gnunet-transport.c:2117
 #, fuzzy
 msgid ""
 "provide information about all connects and disconnect events (continuously)"
 msgstr "Skriv ut information om GNUnets motparter."
 
-#: src/transport/gnunet-transport.c:2121
+#: src/transport/gnunet-transport.c:2120
 #, fuzzy
 msgid "do not resolve hostnames"
 msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 
-#: src/transport/gnunet-transport.c:2124
+#: src/transport/gnunet-transport.c:2123
 #: src/transport/gnunet-transport-profiler.c:638
 msgid "peer identity"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:2127
+#: src/transport/gnunet-transport.c:2126
 msgid "monitor plugin sessions"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:2130
+#: src/transport/gnunet-transport.c:2129
 msgid "send data for benchmarking to the other peer (until CTRL-C)"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:2133
+#: src/transport/gnunet-transport.c:2132
 msgid "test transport configuration (involves external server)"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:2144
+#: src/transport/gnunet-transport.c:2143
 #: src/transport/gnunet-transport-profiler.c:649
 #, fuzzy
 msgid "Direct access to transport service."
@@ -8081,8 +7923,8 @@
 msgstr "meddelandestorlek"
 
 #: src/transport/plugin_transport_http_client.c:1491
-#: src/transport/plugin_transport_http_server.c:2271
-#: src/transport/plugin_transport_http_server.c:3436
+#: src/transport/plugin_transport_http_server.c:2274
+#: src/transport/plugin_transport_http_server.c:3441
 #: src/transport/plugin_transport_tcp.c:2826
 #: src/transport/plugin_transport_tcp.c:2833
 msgid "TCP_STEALTH not supported on this platform.\n"
@@ -8094,13 +7936,13 @@
 msgstr ""
 
 #: src/transport/plugin_transport_http_client.c:2164
-#: src/transport/plugin_transport_http_server.c:3170
+#: src/transport/plugin_transport_http_server.c:3175
 #, fuzzy, c-format
 msgid "Shutting down plugin `%s'\n"
 msgstr "Testar transport(er) %s\n"
 
 #: src/transport/plugin_transport_http_client.c:2181
-#: src/transport/plugin_transport_http_server.c:3240
+#: src/transport/plugin_transport_http_server.c:3245
 #, fuzzy, c-format
 msgid "Shutdown for plugin `%s' complete\n"
 msgstr ""
@@ -8140,98 +7982,98 @@
 msgid "No usable TLS certificate found and creating one at `%s/%s' failed!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:2297
+#: src/transport/plugin_transport_http_server.c:2300
 msgid "Could not load or create server certificate! Loading plugin failed!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:2604
+#: src/transport/plugin_transport_http_server.c:2609
 #, 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:2638 src/util/service.c:700
+#: src/transport/plugin_transport_http_server.c:2643 src/util/service.c:703
 #, fuzzy, c-format
 msgid "Failed to resolve `%s': %s\n"
 msgstr "Misslyckades att leverera \"%s\" meddelande.\n"
 
-#: src/transport/plugin_transport_http_server.c:2656 src/util/service.c:719
+#: src/transport/plugin_transport_http_server.c:2661 src/util/service.c:722
 #, 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:2769
+#: src/transport/plugin_transport_http_server.c:2774
 #, c-format
 msgid "Found %u addresses to report to NAT service\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:2847
+#: src/transport/plugin_transport_http_server.c:2852
 msgid "Disabling IPv6 since it is not supported on this system!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:2946
+#: src/transport/plugin_transport_http_server.c:2951
 #, c-format
 msgid "IPv4 support is %s\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:2961
+#: src/transport/plugin_transport_http_server.c:2966
 #, c-format
 msgid "IPv6 support is %s\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:2967
+#: src/transport/plugin_transport_http_server.c:2972
 msgid "Neither IPv4 nor IPv6 are enabled! Fix in configuration\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:2978
+#: src/transport/plugin_transport_http_server.c:2983
 #, fuzzy
 msgid "Port is required! Fix in configuration\n"
 msgstr " gconfig\tGTK-konfiguration\n"
 
-#: src/transport/plugin_transport_http_server.c:2984
+#: src/transport/plugin_transport_http_server.c:2989
 #, fuzzy, c-format
 msgid "Using port %u\n"
 msgstr "Testar transport(er) %s\n"
 
-#: src/transport/plugin_transport_http_server.c:2998
+#: src/transport/plugin_transport_http_server.c:3003
 #, 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:3008
+#: src/transport/plugin_transport_http_server.c:3013
 #, fuzzy, c-format
 msgid "Binding to IPv4 address %s\n"
 msgstr "Ogiltigt svar på \"%s\".\n"
 
-#: src/transport/plugin_transport_http_server.c:3030
+#: src/transport/plugin_transport_http_server.c:3035
 #, 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:3040
+#: src/transport/plugin_transport_http_server.c:3045
 #, fuzzy, c-format
 msgid "Binding to IPv6 address %s\n"
 msgstr "Ogiltigt svar på \"%s\".\n"
 
-#: src/transport/plugin_transport_http_server.c:3103
+#: src/transport/plugin_transport_http_server.c:3108
 #, fuzzy, c-format
 msgid "Using external hostname `%s'\n"
 msgstr "Startade samling \"%s\".\n"
 
-#: src/transport/plugin_transport_http_server.c:3124
+#: src/transport/plugin_transport_http_server.c:3129
 #, 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:3141
+#: src/transport/plugin_transport_http_server.c:3146
 #, 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:3448
+#: src/transport/plugin_transport_http_server.c:3453
 #, fuzzy
 msgid "Unable to compile URL regex\n"
 msgstr "Kunde inte initiera SQLite.\n"
@@ -8343,8 +8185,8 @@
 msgid "# network-level TCP disconnect events"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2760 src/util/service.c:582
-#: src/util/service.c:588
+#: src/transport/plugin_transport_tcp.c:2760 src/util/service.c:585
+#: src/util/service.c:591
 #, c-format
 msgid "Require valid port number for service `%s' in configuration!\n"
 msgstr ""
@@ -8395,55 +8237,55 @@
 "or %u)\n"
 msgstr ""
 
-#: src/transport/plugin_transport_udp.c:2881
+#: src/transport/plugin_transport_udp.c:2888
 #, 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:2894
+#: src/transport/plugin_transport_udp.c:2901
 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:3247
+#: src/transport/plugin_transport_udp.c:3254
 #, 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:3255
+#: src/transport/plugin_transport_udp.c:3262
 #, fuzzy
 msgid "Failed to open UDP sockets\n"
 msgstr "Misslyckades att binda till UDP6-port %d.\n"
 
-#: src/transport/plugin_transport_udp.c:3414
+#: src/transport/plugin_transport_udp.c:3421
 #, c-format
 msgid "Given `%s' option is out of range: %llu > %u\n"
 msgstr ""
 
-#: src/transport/plugin_transport_udp.c:3461
+#: src/transport/plugin_transport_udp.c:3468
 #, fuzzy, c-format
 msgid "Invalid IPv6 address: `%s'\n"
 msgstr "Ogiltigt svar på \"%s\".\n"
 
-#: src/transport/plugin_transport_udp.c:3529
+#: src/transport/plugin_transport_udp.c:3536
 #, fuzzy
 msgid "Failed to create network sockets, plugin failed\n"
 msgstr "Kunde inte skapa namnrymd \"%s\" (existerar?).\n"
 
-#: src/transport/plugin_transport_unix.c:1403
+#: src/transport/plugin_transport_unix.c:1402
 #, fuzzy, c-format
 msgid "Cannot create path to `%s'\n"
 msgstr "Kunde inte skapa namnrymd \"%s\" (existerar?).\n"
 
-#: src/transport/plugin_transport_unix.c:1416
+#: src/transport/plugin_transport_unix.c:1415
 #, fuzzy, c-format
 msgid "Cannot bind to `%s'\n"
 msgstr "Kunde inte skapa namnrymd \"%s\" (existerar?).\n"
 
-#: src/transport/plugin_transport_unix.c:1817
+#: src/transport/plugin_transport_unix.c:1816
 #, fuzzy
 msgid "Failed to open UNIX listen socket\n"
 msgstr "Misslyckades att leverera \"%s\" meddelande.\n"
@@ -8515,7 +8357,7 @@
 msgid "# sessions allocated"
 msgstr "# sessionsnycklar accepterade"
 
-#: src/transport/transport_api.c:767
+#: src/transport/transport_api.c:816
 #, 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"
@@ -8560,12 +8402,12 @@
 msgid "Metadata `%s' failed to deserialize"
 msgstr ""
 
-#: src/util/client.c:261 src/util/client.c:858 src/util/service.c:619
+#: src/util/client.c:261 src/util/client.c:858 src/util/service.c:622
 #, 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:623
+#: src/util/client.c:265 src/util/client.c:863 src/util/service.c:626
 #, fuzzy, c-format
 msgid "Using `%s' instead\n"
 msgstr "%s: flagga \"%s\" är tvetydig\n"
@@ -8592,7 +8434,7 @@
 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:1303
+#: src/util/client.c:1299
 msgid "Could not submit request, not expecting to receive a response.\n"
 msgstr ""
 
@@ -8654,24 +8496,24 @@
 msgid "Syntax error while deserializing in line %u\n"
 msgstr "Syntaxfel i konfigurationsfil \"%s\" på rad %d.\n"
 
-#: src/util/configuration.c:1023
+#: src/util/configuration.c:1025
 #, c-format
 msgid ""
 "Configuration value '%s' for '%s' in section '%s' is not in set of legal "
 "choices\n"
 msgstr ""
 
-#: src/util/configuration.c:1093
+#: src/util/configuration.c:1095
 #, c-format
 msgid "Recursive expansion suspected, aborting $-expansion for term `%s'\n"
 msgstr ""
 
-#: src/util/configuration.c:1125
+#: src/util/configuration.c:1127
 #, fuzzy, c-format
 msgid "Missing closing `%s' in option `%s'\n"
 msgstr "Konfigurationsfil \"%s\" skapad.\n"
 
-#: src/util/configuration.c:1199
+#: src/util/configuration.c:1201
 #, c-format
 msgid ""
 "Failed to expand `%s' in `%s' as it is neither found in [PATHS] nor defined "
@@ -8771,7 +8613,7 @@
 msgid "Expected `%s' to be a directory!\n"
 msgstr "\"%s\" förväntade att \"%s\" skulle vara en katalog!\n"
 
-#: src/util/disk.c:1564 src/util/service.c:1323
+#: src/util/disk.c:1564 src/util/service.c:1327
 #, fuzzy, c-format
 msgid "Cannot obtain information about user `%s': %s\n"
 msgstr "Kan inte öppna konfigurationsfil \"%s\".\n"
@@ -8974,23 +8816,28 @@
 msgid "Use build-in GNUnet stub resolver"
 msgstr ""
 
-#: src/util/gnunet-scrypt.c:279
+#: src/util/gnunet-scrypt.c:233
+#, fuzzy, c-format
+msgid "Loading hostkey from `%s' failed.\n"
+msgstr "Tolkning av HTTP-svar för URL \"%s\" misslyckades.\n"
+
+#: src/util/gnunet-scrypt.c:294
 msgid "number of bits to require for the proof of work"
 msgstr ""
 
-#: src/util/gnunet-scrypt.c:282
+#: src/util/gnunet-scrypt.c:297
 msgid "file with private key, otherwise default is used"
 msgstr ""
 
-#: src/util/gnunet-scrypt.c:285
+#: src/util/gnunet-scrypt.c:300
 msgid "file with proof of work, otherwise default is used"
 msgstr ""
 
-#: src/util/gnunet-scrypt.c:288
+#: src/util/gnunet-scrypt.c:303
 msgid "time to wait between calculations"
 msgstr ""
 
-#: src/util/gnunet-scrypt.c:299
+#: src/util/gnunet-scrypt.c:315
 #, fuzzy
 msgid "Manipulate GNUnet proof of work files"
 msgstr "skriv ut ett värde från konfigurationsfilen till standard ut"
@@ -9045,12 +8892,12 @@
 msgid "Error writing to `%s': %s\n"
 msgstr "Fel vid skapandet av användare"
 
-#: src/util/network.c:134
+#: src/util/network.c:137
 #, c-format
 msgid "Unable to shorten unix path `%s' while keeping name unique\n"
 msgstr ""
 
-#: src/util/network.c:1361 src/util/network.c:1486
+#: src/util/network.c:1640 src/util/network.c:1797
 #, c-format
 msgid ""
 "Fatal internal logic error, process hangs in `%s' (abort with CTRL-C)!\n"
@@ -9099,17 +8946,17 @@
 msgid "Could not determine plugin installation path.\n"
 msgstr "Kunde inte fastställa min publika IPv6-adress.\n"
 
-#: src/util/program.c:246 src/util/service.c:1457
+#: src/util/program.c:246 src/util/service.c:1461
 #, fuzzy, c-format
 msgid "Malformed configuration file `%s', exit ...\n"
 msgstr "Kunde inte spara konfigurationsfil \"%s\":"
 
-#: src/util/program.c:258 src/util/service.c:1472
+#: src/util/program.c:258 src/util/service.c:1476
 #, fuzzy, c-format
 msgid "Could not access configuration file `%s'\n"
 msgstr "Kunde inte tolka konfigurationsfil \"%s\".\n"
 
-#: src/util/program.c:263 src/util/service.c:1467
+#: src/util/program.c:263 src/util/service.c:1471
 #, fuzzy
 msgid "Malformed configuration, exit ...\n"
 msgstr "Kunde inte spara konfigurationsfil \"%s\":"
@@ -9142,15 +8989,10 @@
 msgid "Could not resolve our FQDN : %s\n"
 msgstr "Kunde inte slå upp \"%s\": %s\n"
 
-#: src/util/scheduler.c:813
+#: src/util/scheduler.c:812
 msgid "Looks like we're busy waiting...\n"
 msgstr ""
 
-#: src/util/scheduler.c:948
-#, c-format
-msgid "Attempt to cancel dead task %llu!\n"
-msgstr ""
-
 # drive = hard drive ?
 #: src/util/server.c:484
 #, fuzzy, c-format
@@ -9167,7 +9009,7 @@
 msgid "`%s' failed for `%s': address already in use\n"
 msgstr "\"%s\" misslyckades för port %d: %s. Körs verkligen gnunetd?\n"
 
-#: src/util/server.c:894
+#: src/util/server.c:896
 #, c-format
 msgid ""
 "Processing code for message of type %u did not call "
@@ -9184,80 +9026,80 @@
 msgid "Access from `%s' denied to service `%s'\n"
 msgstr ""
 
-#: src/util/service.c:409
+#: src/util/service.c:410
 #, c-format
 msgid "Could not parse IPv4 network specification `%s' for `%s:%s'\n"
 msgstr ""
 
-#: src/util/service.c:446
+#: src/util/service.c:448
 #, c-format
 msgid "Could not parse IPv6 network specification `%s' for `%s:%s'\n"
 msgstr ""
 
-#: src/util/service.c:563
+#: src/util/service.c:566
 #, c-format
 msgid ""
 "Disabling IPv6 support for service `%s', failed to create IPv6 socket: %s\n"
 msgstr ""
 
-#: src/util/service.c:653
+#: src/util/service.c:656
 #, c-format
 msgid ""
 "Disabling UNIX domain socket support for service `%s', failed to create UNIX "
 "domain socket: %s\n"
 msgstr ""
 
-#: src/util/service.c:669
+#: src/util/service.c:672
 #, c-format
 msgid "Have neither PORT nor UNIXPATH for service `%s', but one is required\n"
 msgstr ""
 
-#: src/util/service.c:908
+#: src/util/service.c:911
 msgid "Could not access a pre-bound socket, will try to bind myself\n"
 msgstr ""
 
-#: src/util/service.c:957 src/util/service.c:975
+#: src/util/service.c:960 src/util/service.c:978
 #, c-format
 msgid "Specified value for `%s' of service `%s' is invalid\n"
 msgstr ""
 
-#: src/util/service.c:1000
+#: src/util/service.c:1003
 #, c-format
 msgid "Could not access pre-bound socket %u, will try to bind myself\n"
 msgstr ""
 
-#: src/util/service.c:1170
+#: src/util/service.c:1174
 #, fuzzy, c-format
 msgid "Failed to start `%s' at `%s'\n"
 msgstr "Fel vid %s:%d.\n"
 
-#: src/util/service.c:1212
+#: src/util/service.c:1216
 #, fuzzy, c-format
 msgid "Service `%s' runs at %s\n"
 msgstr "Motpart \"%s\" med pålitlighet %8u och adress \"%s\"\n"
 
-#: src/util/service.c:1261
+#: src/util/service.c:1265
 msgid "Service process failed to initialize\n"
 msgstr ""
 
-#: src/util/service.c:1265
+#: src/util/service.c:1269
 msgid "Service process could not initialize server function\n"
 msgstr ""
 
-#: src/util/service.c:1269
+#: src/util/service.c:1273
 msgid "Service process failed to report status\n"
 msgstr ""
 
-#: src/util/service.c:1324
+#: src/util/service.c:1328
 msgid "No such user"
 msgstr ""
 
-#: src/util/service.c:1337
+#: src/util/service.c:1341
 #, c-format
 msgid "Cannot change user/group to `%s': %s\n"
 msgstr "Kan inte ändra användare/grupp till \"%s\": %s\n"
 
-#: src/util/service.c:1407
+#: src/util/service.c:1411
 msgid "do daemonize (detach from terminal)"
 msgstr ""
 
@@ -9582,6 +9424,78 @@
 msgstr "\"%s\" misslyckades för fil \"%s\" vid %s:%d med fel: %s\n"
 
 #, fuzzy
+#~ msgid "Starting default services `%s'\n"
+#~ msgstr "Startade samling \"%s\".\n"
+
+#, fuzzy
+#~ msgid "Received %s message\n"
+#~ msgstr "mottog ogiltigt \"%s\" meddelande\n"
+
+#, fuzzy
+#~ msgid "Received last message for %s \n"
+#~ msgstr "Mottog ogiltigt \"%s\" meddelande från \"%s\".\n"
+
+#, fuzzy
+#~ msgid "Failed to create statistics!\n"
+#~ msgstr "Kunde inte skapa namnrymd \"%s\" (existerar?).\n"
+
+#, fuzzy
+#~ msgid "Failed to parse file `%s'\n"
+#~ msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
+
+#, fuzzy
+#~ msgid "Invalid value for public key\n"
+#~ msgstr "Ogiltigt argument: \"%s\"\n"
+
+#, fuzzy
+#~ msgid "Cannot read experiments file `%s'\n"
+#~ msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
+
+#, fuzzy
+#~ msgid "Connected to peer %s\n"
+#~ msgstr "\"%s\" ansluten till \"%s\".\n"
+
+#, fuzzy
+#~ msgid "Disconnected from peer %s\n"
+#~ msgstr "\"%s\" ansluten till \"%s\".\n"
+
+#, fuzzy
+#~ msgid "Starting inbound experiment `%s' with peer `%s'\n"
+#~ msgstr "Startade samling \"%s\".\n"
+
+#, fuzzy
+#~ msgid "Starting outbound experiment `%s' with peer `%s'\n"
+#~ msgstr "Startade samling \"%s\".\n"
+
+#, fuzzy
+#~ msgid "Received %s message from peer %s for experiment `%s'\n"
+#~ msgstr "Mottog ogiltigt \"%s\" meddelande från \"%s\".\n"
+
+#, fuzzy
+#~ msgid "Lacking key configuration settings.\n"
+#~ msgstr "GNUnet-konfiguration"
+
+#, fuzzy
+#~ msgid "Could not access hostkey file `%s'.\n"
+#~ msgstr "Kunde inte tolka konfigurationsfil \"%s\".\n"
+
+#, fuzzy
+#~ msgid "Failure: Did not receive %s\n"
+#~ msgstr "Misslyckades att leverera \"%s\" meddelande.\n"
+
+#, fuzzy
+#~ msgid "Blacklist allows connection attempt to peer `%s'\n"
+#~ msgstr "Misslyckades att ansluta till gnunetd.\n"
+
+#, fuzzy
+#~ msgid "Received a request connect message for peer `%s'\n"
+#~ msgstr "Mottog ogiltigt \"%s\" meddelande från \"%s\".\n"
+
+#, fuzzy
+#~ msgid "Received a request disconnect message for peer `%s'\n"
+#~ msgstr "Mottog ogiltigt \"%s\" meddelande från \"%s\".\n"
+
+#, fuzzy
 #~ msgid "Client %p disconnected from us.\n"
 #~ msgstr "\"%s\" ansluten till \"%s\".\n"
 

Modified: gnunet/po/vi.po
===================================================================
--- gnunet/po/vi.po     2015-01-10 01:26:04 UTC (rev 34874)
+++ gnunet/po/vi.po     2015-01-10 18:56:41 UTC (rev 34875)
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: gnunet 0.8.0a\n"
 "Report-Msgid-Bugs-To: address@hidden"
-"POT-Creation-Date: 2014-12-09 00:23+0100\n"
+"POT-Creation-Date: 2015-01-01 22:23+0100\n"
 "PO-Revision-Date: 2008-09-10 22:05+0930\n"
 "Last-Translator: Clytie Siddall <address@hidden>\n"
 "Language-Team: Vietnamese <address@hidden>\n"
@@ -295,76 +295,51 @@
 msgid "ARM now monitors connections to service `%s' at `%s'\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:831
+#: src/arm/gnunet-service-arm.c:835
 #, fuzzy, c-format
 msgid "Preparing to stop `%s'\n"
 msgstr "Đang bắt đầu tài lên « %s ».\n"
 
-#: src/arm/gnunet-service-arm.c:1100
+#: src/arm/gnunet-service-arm.c:1105
 #, fuzzy, c-format
 msgid "Restarting service `%s'.\n"
 msgstr "Đang nạp và khởi động dùng « %s ».\n"
 
-#: src/arm/gnunet-service-arm.c:1193
+#: src/arm/gnunet-service-arm.c:1199
 msgid "exit"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:1198
+#: src/arm/gnunet-service-arm.c:1204
 msgid "signal"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:1203
+#: src/arm/gnunet-service-arm.c:1209
 #, fuzzy
 msgid "unknown"
 msgstr "Lỗi không rõ"
 
-#: src/arm/gnunet-service-arm.c:1209
+#: src/arm/gnunet-service-arm.c:1215
 #, fuzzy, c-format
 msgid "Service `%s' took %s to terminate\n"
 msgstr "Dịch vụ đã bị xoá.\n"
 
-#: src/arm/gnunet-service-arm.c:1231
+#: src/arm/gnunet-service-arm.c:1237
 #, c-format
 msgid "Service `%s' terminated normally, will restart at any time\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:1246
+#: src/arm/gnunet-service-arm.c:1252
 #, c-format
 msgid "Service `%s' terminated with status %s/%d, will restart in %s\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:1500
-#, fuzzy, c-format
-msgid "Starting default services `%s'\n"
-msgstr "Đang bắt đầu tài về « %s »\n"
-
-#: src/arm/gnunet-service-arm.c:1511
-#, c-format
-msgid "Default service `%s' not configured correctly!\n"
-msgstr ""
-
-#: src/arm/gnunet-service-arm.c:1524
-msgid ""
-"No default services configured, GNUnet will not really start right now.\n"
-msgstr ""
-
 #: src/arm/mockup-service.c:41
 msgid "Initiating shutdown as requested by client.\n"
 msgstr ""
 
-#: src/ats/ats_api_performance.c:485
-#, fuzzy, c-format
-msgid "Received %s message\n"
-msgstr "Nhận yêu cầu định tuyến\n"
-
-#: src/ats/ats_api_performance.c:528
-#, fuzzy, c-format
-msgid "Received last message for %s \n"
-msgstr "Nhận yêu cầu định tuyến\n"
-
 #: src/ats/gnunet-ats-solver-eval.c:2804 src/ats/gnunet-ats-solver-eval.c:2838
-#: src/ats/gnunet-service-ats_addresses.c:1781
-#: src/ats/gnunet-service-ats_addresses.c:1825
+#: src/ats/gnunet-service-ats_addresses.c:1789
+#: src/ats/gnunet-service-ats_addresses.c:1833
 #, c-format
 msgid ""
 "Could not load quota for network `%s':  `%s', assigning default bandwidth "
@@ -372,13 +347,13 @@
 msgstr ""
 
 #: src/ats/gnunet-ats-solver-eval.c:2810
-#: src/ats/gnunet-service-ats_addresses.c:1788
+#: src/ats/gnunet-service-ats_addresses.c:1796
 #, c-format
 msgid "Outbound quota configure for network `%s' is %llu\n"
 msgstr ""
 
 #: src/ats/gnunet-ats-solver-eval.c:2817
-#: src/ats/gnunet-service-ats_addresses.c:1796
+#: src/ats/gnunet-service-ats_addresses.c:1804
 #, c-format
 msgid ""
 "No outbound quota configured for network `%s', assigning default bandwidth "
@@ -386,13 +361,13 @@
 msgstr ""
 
 #: src/ats/gnunet-ats-solver-eval.c:2844
-#: src/ats/gnunet-service-ats_addresses.c:1832
+#: src/ats/gnunet-service-ats_addresses.c:1840
 #, c-format
 msgid "Inbound quota configured for network `%s' is %llu\n"
 msgstr ""
 
 #: src/ats/gnunet-ats-solver-eval.c:2851
-#: src/ats/gnunet-service-ats_addresses.c:1840
+#: src/ats/gnunet-service-ats_addresses.c:1848
 #, c-format
 msgid ""
 "No outbound quota configure for network `%s', assigning default bandwidth "
@@ -427,22 +402,22 @@
 msgid "disable normalization"
 msgstr ""
 
-#: src/ats/gnunet-service-ats_addresses.c:2039
+#: src/ats/gnunet-service-ats_addresses.c:2051
 #, c-format
 msgid "Initializing solver `%s '`%s'\n"
 msgstr ""
 
-#: src/ats/gnunet-service-ats_addresses.c:2042
+#: src/ats/gnunet-service-ats_addresses.c:2057
 #, 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:2065
+#: src/ats/gnunet-service-ats_addresses.c:2082
 #, fuzzy
 msgid "Failed to initialize solver!\n"
 msgstr "Không thể sơ khởi SQLite: %s.\n"
 
-#: src/ats/plugin_ats_mlp.c:1344
+#: src/ats/plugin_ats_mlp.c:1345
 msgid "Problem size too large, cannot allocate memory!\n"
 msgstr ""
 
@@ -451,19 +426,19 @@
 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:1988
+#: 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:2704
+#: src/ats/plugin_ats_mlp.c:2714
 msgid ""
 "MLP solver is not optimizing for anything, changing to feasibility check\n"
 msgstr ""
 
-#: src/ats/plugin_ats_mlp.c:2744 src/ats/plugin_ats_mlp.c:2761
-#: src/ats/plugin_ats_mlp.c:2793 src/ats/plugin_ats_mlp.c:2811
-#: src/ats/plugin_ats_mlp.c:2830 src/ats/plugin_ats_proportional.c:1989
+#: 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:1989
 #: src/ats/plugin_ats_proportional.c:2010 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
@@ -473,33 +448,33 @@
 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:2917
+#: src/ats/plugin_ats_mlp.c:2927
 #, 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:2926
+#: src/ats/plugin_ats_mlp.c:2936
 #, 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:2937
+#: src/ats/plugin_ats_mlp.c:2947
 #, c-format
 msgid ""
 "Adjusting outbound quota configuration for network `%s'from %llu to %.0f\n"
 msgstr ""
 
-#: src/ats/plugin_ats_mlp.c:2945
+#: src/ats/plugin_ats_mlp.c:2955
 #, c-format
 msgid ""
 "Adjusting inbound quota configuration for network `%s' from %llu to %.0f\n"
 msgstr ""
 
-#: src/ats/plugin_ats_mlp.c:2956
+#: src/ats/plugin_ats_mlp.c:2966
 #, c-format
 msgid "Using default quota configuration for network `%s' (in/out) %llu/%llu\n"
 msgstr ""
@@ -547,12 +522,12 @@
 msgid "Initialization failed, shutdown\n"
 msgstr "Lỗi sơ khởi cơ chế phần bổ sung: %s\n"
 
-#: src/ats-tests/ats-testing-log.c:842
+#: src/ats-tests/ats-testing-log.c:846
 #, fuzzy
 msgid "Stop logging\n"
 msgstr "Theo dõi"
 
-#: src/ats-tests/ats-testing-log.c:893
+#: src/ats-tests/ats-testing-log.c:897
 #, fuzzy, c-format
 msgid "Start logging `%s'\n"
 msgstr "Đang bắt đầu tài về « %s »\n"
@@ -594,97 +569,97 @@
 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:747
+#: src/ats-tool/gnunet-ats.c:746
 #, c-format
 msgid "Quota for network `%11s' (in/out): %10s / %10s\n"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:779 src/namestore/gnunet-namestore.c:700
-#: src/transport/gnunet-transport.c:1855
+#: src/ats-tool/gnunet-ats.c:778 src/namestore/gnunet-namestore.c:700
+#: src/transport/gnunet-transport.c:1853
 #: 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:793 src/transport/gnunet-transport.c:1864
+#: src/ats-tool/gnunet-ats.c:792 src/transport/gnunet-transport.c:1862
 #: 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:803
+#: src/ats-tool/gnunet-ats.c:802
 #, c-format
 msgid "Please select one operation : %s or %s or %s or %s or %s\n"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:825 src/ats-tool/gnunet-ats.c:851
-#: src/ats-tool/gnunet-ats.c:879 src/ats-tool/gnunet-ats.c:925
+#: src/ats-tool/gnunet-ats.c:824 src/ats-tool/gnunet-ats.c:850
+#: src/ats-tool/gnunet-ats.c:878 src/ats-tool/gnunet-ats.c:924
 #, 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:837 src/ats-tool/gnunet-ats.c:863
+#: src/ats-tool/gnunet-ats.c:836 src/ats-tool/gnunet-ats.c:862
 #, 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:891
+#: src/ats-tool/gnunet-ats.c:890
 #, 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:898
+#: src/ats-tool/gnunet-ats.c:897
 #, fuzzy
 msgid "No peer given!\n"
 msgstr "chưa đưa ra tên"
 
-#: src/ats-tool/gnunet-ats.c:916
+#: src/ats-tool/gnunet-ats.c:915
 msgid "Valid type required\n"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:984
+#: src/ats-tool/gnunet-ats.c:983
 msgid "get list of active addresses currently used"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:986
+#: src/ats-tool/gnunet-ats.c:985
 msgid "get list of all active addresses"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:989
+#: src/ats-tool/gnunet-ats.c:988
 #, 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:991
+#: src/ats-tool/gnunet-ats.c:990
 msgid "monitor mode"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:993
+#: src/ats-tool/gnunet-ats.c:992
 #, 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:995
+#: src/ats-tool/gnunet-ats.c:994
 msgid "print all configured quotas"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:997
+#: src/ats-tool/gnunet-ats.c:996
 msgid "peer id"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:1000
+#: src/ats-tool/gnunet-ats.c:999
 msgid "preference type to set: latency | bandwidth"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:1002
+#: src/ats-tool/gnunet-ats.c:1001
 msgid "preference value"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:1005
+#: src/ats-tool/gnunet-ats.c:1004
 msgid "verbose output (include ATS address properties)"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:1012
+#: src/ats-tool/gnunet-ats.c:1011
 #, fuzzy
 msgid "Print information about ATS state"
 msgstr "In ra thông tin về các đồng đẳng GNUnet."
@@ -745,7 +720,7 @@
 msgid "provide information about all tunnels"
 msgstr "In ra thông tin về các đồng đẳng GNUnet."
 
-#: src/cadet/gnunet-service-cadet_peer.c:496
+#: src/cadet/gnunet-service-cadet_peer.c:502
 msgid "Wrong CORE service\n"
 msgstr ""
 
@@ -1237,7 +1212,7 @@
 msgid "Could not start playback audio helper.\n"
 msgstr "Không thể nạp phần bổ sung truyền tải « %s »\n"
 
-#: src/core/core_api.c:768
+#: src/core/core_api.c:787
 msgid "Client was disconnected from core service, trying to reconnect.\n"
 msgstr ""
 
@@ -1283,18 +1258,17 @@
 msgid "%24s: %-30s %4s (timeout in %6s)\n"
 msgstr ""
 
-#: src/core/gnunet-core.c:146 src/peerinfo-tool/gnunet-peerinfo.c:761
+#: src/core/gnunet-core.c:146 src/peerinfo-tool/gnunet-peerinfo.c:786
 #, fuzzy, c-format
 msgid "Invalid command line argument `%s'\n"
 msgstr "Đối số không hợp lệ cho « %s ».\n"
 
 #: src/core/gnunet-core.c:157
-#: src/experimentation/gnunet-daemon-experimentation_nodes.c:1104
 #, fuzzy
 msgid "Failed to connect to CORE service!\n"
 msgstr "Lỗi kết nối đến gnunetd.\n"
 
-#: src/core/gnunet-core.c:179 src/transport/gnunet-transport.c:2115
+#: src/core/gnunet-core.c:179 src/transport/gnunet-transport.c:2114
 #, fuzzy
 msgid "provide information about all current connections (continuously)"
 msgstr "In ra thông tin về các đồng đẳng GNUnet."
@@ -1314,17 +1288,17 @@
 msgid "Core service of `%4s' ready.\n"
 msgstr ""
 
-#: src/core/gnunet-service-core_clients.c:372
+#: src/core/gnunet-service-core_clients.c:375
 #, fuzzy
 msgid "# send requests dropped (disconnected)"
 msgstr "# các yêu cầu lỗ hổng bị bỏ do trọng tải"
 
-#: src/core/gnunet-service-core_clients.c:483
+#: src/core/gnunet-service-core_clients.c:490
 #, fuzzy
 msgid "# messages discarded (session disconnected)"
 msgstr "# các thông báo được chắp liền"
 
-#: src/core/gnunet-service-core_clients.c:529
+#: src/core/gnunet-service-core_clients.c:536
 #, fuzzy, c-format
 msgid "# bytes of messages of type %u received"
 msgstr "# các byte nhiễu được nhận"
@@ -1345,134 +1319,134 @@
 msgid "# key exchanges stopped"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:847
+#: src/core/gnunet-service-core_kx.c:848
 msgid "# old ephemeral keys ignored"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:854
+#: src/core/gnunet-service-core_kx.c:855
 #, 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:888
+#: src/core/gnunet-service-core_kx.c:889
 #, 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:899
+#: src/core/gnunet-service-core_kx.c:900
 #, 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:998
+#: src/core/gnunet-service-core_kx.c:999
 #: src/transport/gnunet-service-transport_validation.c:1016
 #, fuzzy
 msgid "# PING messages received"
 msgstr "# các thông báo PING được tạo"
 
-#: src/core/gnunet-service-core_kx.c:1006
+#: src/core/gnunet-service-core_kx.c:1007
 #, 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:1033
+#: src/core/gnunet-service-core_kx.c:1034
 #, 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:1049
+#: src/core/gnunet-service-core_kx.c:1050
 #, fuzzy
 msgid "# PONG messages created"
 msgstr "# các thông báo PING được tạo"
 
-#: src/core/gnunet-service-core_kx.c:1075
+#: src/core/gnunet-service-core_kx.c:1077
 #, 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:1086
+#: src/core/gnunet-service-core_kx.c:1088
 #, 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:1153
+#: src/core/gnunet-service-core_kx.c:1156
 #: src/transport/gnunet-service-transport_validation.c:1359
 #, 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:1159
+#: src/core/gnunet-service-core_kx.c:1162
 #, 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:1164
+#: src/core/gnunet-service-core_kx.c:1167
 #, 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:1194
+#: src/core/gnunet-service-core_kx.c:1197
 #, fuzzy
 msgid "# PONG messages decrypted"
 msgstr "# các thông báo PING được tạo"
 
-#: src/core/gnunet-service-core_kx.c:1229
+#: src/core/gnunet-service-core_kx.c:1232
 #, 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:1240
+#: src/core/gnunet-service-core_kx.c:1243
 #, fuzzy
 msgid "# timeouts prevented via PONG"
 msgstr "# các byte đã nhận qua TCP"
 
-#: src/core/gnunet-service-core_kx.c:1247
+#: src/core/gnunet-service-core_kx.c:1250
 #, 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:1386
+#: src/core/gnunet-service-core_kx.c:1392
 #, 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:1393
+#: src/core/gnunet-service-core_kx.c:1399
 #, 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:1396
+#: src/core/gnunet-service-core_kx.c:1402
 #, 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:1442
-#: src/core/gnunet-service-core_kx.c:1467
+#: src/core/gnunet-service-core_kx.c:1448
+#: src/core/gnunet-service-core_kx.c:1473
 #, fuzzy
 msgid "# bytes dropped (duplicates)"
 msgstr "# các byte loại bỏ bởi UDP (đi ra)"
 
-#: src/core/gnunet-service-core_kx.c:1454
+#: src/core/gnunet-service-core_kx.c:1460
 #, 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:1496
+#: src/core/gnunet-service-core_kx.c:1502
 #, 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:1504
+#: src/core/gnunet-service-core_kx.c:1510
 #, fuzzy
 msgid "# bytes of payload decrypted"
 msgstr "# các byte đã giải mã"
 
-#: src/core/gnunet-service-core_kx.c:1539
+#: src/core/gnunet-service-core_kx.c:1545
 #, fuzzy
 msgid "# PAYLOAD dropped (out of order)"
 msgstr "# các byte loại bỏ bởi UDP (đi ra)"
@@ -1483,7 +1457,7 @@
 msgstr "# Các quảng cáo đồng đẳng bị hủy do trọng tải"
 
 #: src/core/gnunet-service-core_neighbours.c:184
-#: src/core/gnunet-service-core_neighbours.c:335
+#: src/core/gnunet-service-core_neighbours.c:342
 msgid "# neighbour entries allocated"
 msgstr ""
 
@@ -1491,22 +1465,22 @@
 msgid "# encrypted bytes given to transport"
 msgstr ""
 
-#: src/core/gnunet-service-core_neighbours.c:418
+#: src/core/gnunet-service-core_neighbours.c:425
 #, c-format
 msgid "Unsupported message of type %u (%u bytes) received from peer `%s'\n"
 msgstr ""
 
 #: src/core/gnunet-service-core_sessions.c:245
 #: src/core/gnunet-service-core_sessions.c:328
-#: src/dht/gnunet-service-dht_neighbours.c:662
-#: src/dht/gnunet-service-dht_neighbours.c:727
-#: src/fs/gnunet-service-fs_cp.c:618 src/fs/gnunet-service-fs_cp.c:1517
+#: 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/topology/gnunet-daemon-topology.c:734
 #: src/topology/gnunet-daemon-topology.c:835
-#: src/transport/gnunet-service-transport_neighbours.c:917
-#: src/transport/gnunet-service-transport_neighbours.c:1141
-#: src/transport/gnunet-service-transport_neighbours.c:3177
-#: src/transport/gnunet-service-transport_neighbours.c:3491
+#: src/transport/gnunet-service-transport_neighbours.c:921
+#: src/transport/gnunet-service-transport_neighbours.c:1145
+#: src/transport/gnunet-service-transport_neighbours.c:3181
+#: src/transport/gnunet-service-transport_neighbours.c:3495
 #, fuzzy
 msgid "# peers connected"
 msgstr "# của các đồng đẳng đã kết nối"
@@ -1541,7 +1515,7 @@
 msgstr ""
 
 #: src/datacache/datacache.c:115 src/datacache/datacache.c:266
-#: src/datastore/gnunet-service-datastore.c:838
+#: src/datastore/gnunet-service-datastore.c:855
 #, fuzzy
 msgid "# bytes stored"
 msgstr "# các byte trong kho dữ liệu"
@@ -1552,8 +1526,8 @@
 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:1487
-#: src/datastore/gnunet-service-datastore.c:1498
+#: src/datastore/gnunet-service-datastore.c:1553
+#: src/datastore/gnunet-service-datastore.c:1564
 #, c-format
 msgid "No `%s' specified for `%s' in configuration!\n"
 msgstr ""
@@ -1756,163 +1730,169 @@
 msgid "Manipulate GNUnet datastore"
 msgstr "cập nhật một giá trị trong tập tin cấu hình"
 
-#: src/datastore/gnunet-service-datastore.c:351
+#: src/datastore/gnunet-service-datastore.c:365
 #, fuzzy
 msgid "# bytes expired"
 msgstr "# các byte được nhận"
 
-#: src/datastore/gnunet-service-datastore.c:425
+#: src/datastore/gnunet-service-datastore.c:439
 msgid "# bytes purged (low-priority)"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:483
+#: src/datastore/gnunet-service-datastore.c:497
 #: src/gns/gnunet-gns-helper-service-w32.c:223
 msgid "Transmission to client failed!\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:514
+#: src/datastore/gnunet-service-datastore.c:528
 #: src/gns/gnunet-gns-helper-service-w32.c:262
 msgid "Shutdown in progress, aborting transmission.\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:630
+#: src/datastore/gnunet-service-datastore.c:643
 msgid "# results found"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:673
+#: src/datastore/gnunet-service-datastore.c:686
 #, c-format
 msgid ""
 "Insufficient space (%llu bytes are available) to satisfy `%s' request for "
 "%llu bytes\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:684
+#: src/datastore/gnunet-service-datastore.c:697
 #, c-format
 msgid ""
 "The requested amount (%llu bytes) is larger than the cache size (%llu "
 "bytes)\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:688
+#: src/datastore/gnunet-service-datastore.c:701
 msgid ""
 "Insufficient space to satisfy request and requested amount is larger than "
 "cache size"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:694
+#: src/datastore/gnunet-service-datastore.c:707
 msgid "Insufficient space to satisfy request"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:699
-#: src/datastore/gnunet-service-datastore.c:751
-#: src/datastore/gnunet-service-datastore.c:964
-#: src/datastore/gnunet-service-datastore.c:1421
+#: 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:1525
 msgid "# reserved"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:764
+#: src/datastore/gnunet-service-datastore.c:780
 msgid "Could not find matching reservation"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:850
+#: src/datastore/gnunet-service-datastore.c:867
 #, c-format
 msgid "Need %llu bytes more space (%llu allowed, using %llu)\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1010
+#: src/datastore/gnunet-service-datastore.c:1029
 #, fuzzy
 msgid "# GET requests received"
 msgstr "# các yêu cầu get (lấy) dht được nhận"
 
-#: src/datastore/gnunet-service-datastore.c:1022
+#: src/datastore/gnunet-service-datastore.c:1041
 #, fuzzy
 msgid "# requests filtered by bloomfilter"
 msgstr "# các yêu cầu được lọc theo bộ lọc bloom"
 
-#: src/datastore/gnunet-service-datastore.c:1050
+#: src/datastore/gnunet-service-datastore.c:1069
 #, fuzzy
 msgid "# UPDATE requests received"
 msgstr "# các yêu cầu get (lấy) dht được nhận"
 
-#: src/datastore/gnunet-service-datastore.c:1080
+#: src/datastore/gnunet-service-datastore.c:1099
 #, fuzzy
 msgid "# GET REPLICATION requests received"
 msgstr "# các yêu cầu get (lấy) dht được nhận"
 
-#: src/datastore/gnunet-service-datastore.c:1113
+#: src/datastore/gnunet-service-datastore.c:1132
 #, fuzzy
 msgid "# GET ZERO ANONYMITY requests received"
 msgstr "# các yêu cầu get (lấy) dht được nhận"
 
-#: src/datastore/gnunet-service-datastore.c:1138
+#: src/datastore/gnunet-service-datastore.c:1157
 msgid "Content not found"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1146
+#: src/datastore/gnunet-service-datastore.c:1165
 msgid "# bytes removed (explicit request)"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1178
+#: src/datastore/gnunet-service-datastore.c:1197
 #, fuzzy
 msgid "# REMOVE requests received"
 msgstr "# các yêu cầu get (lấy) dht được nhận"
 
-#: src/datastore/gnunet-service-datastore.c:1220
+#: src/datastore/gnunet-service-datastore.c:1241
 #, c-format
-msgid "Datastore payload inaccurate (%lld < %lld).  Trying to fix.\n"
+msgid ""
+"Datastore payload must have been inaccurate (%lld < %lld). Recomputing it.\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1281
+#: src/datastore/gnunet-service-datastore.c:1246
 #, c-format
+msgid "New payload: %lld\n"
+msgstr ""
+
+#: src/datastore/gnunet-service-datastore.c:1299
+#, c-format
 msgid "Loading `%s' datastore plugin\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1290
+#: src/datastore/gnunet-service-datastore.c:1310
 #, fuzzy, c-format
 msgid "Failed to load datastore plugin for `%s'\n"
 msgstr "Không thể nạp phần bổ sung truyền tải « %s »\n"
 
-#: src/datastore/gnunet-service-datastore.c:1492
+#: src/datastore/gnunet-service-datastore.c:1412
+msgid "Rebuilding bloomfilter.  Please be patient.\n"
+msgstr ""
+
+#: src/datastore/gnunet-service-datastore.c:1419
+msgid "Plugin does not support get_keys function. Please fix!\n"
+msgstr ""
+
+#: src/datastore/gnunet-service-datastore.c:1422
+msgid "Bloomfilter construction complete.\n"
+msgstr ""
+
+#: src/datastore/gnunet-service-datastore.c:1558
 #, 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:1503
+#: src/datastore/gnunet-service-datastore.c:1569
 msgid "# quota"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1505
+#: src/datastore/gnunet-service-datastore.c:1571
 msgid "# cache size"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1518
+#: src/datastore/gnunet-service-datastore.c:1584
 #, c-format
 msgid "Could not use specified filename `%s' for bloomfilter.\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1536
-#: src/datastore/gnunet-service-datastore.c:1552
+#: src/datastore/gnunet-service-datastore.c:1602
+#: src/datastore/gnunet-service-datastore.c:1618
 #, 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:1582
+#: src/datastore/gnunet-service-datastore.c:1648
 #, fuzzy
 msgid "Failed to initialize bloomfilter.\n"
 msgstr "Lỗi sơ khởi dịch vụ « %s ».\n"
 
-#: src/datastore/gnunet-service-datastore.c:1611
-msgid "Rebuilding bloomfilter.  Please be patient.\n"
-msgstr ""
-
-#: src/datastore/gnunet-service-datastore.c:1616
-msgid "Plugin does not support get_keys function. Please fix!\n"
-msgstr ""
-
-#: src/datastore/gnunet-service-datastore.c:1619
-msgid "Bloomfilter construction complete.\n"
-msgstr ""
-
 #: src/datastore/plugin_datastore_heap.c:820
 #, fuzzy
 msgid "Heap database running\n"
@@ -1956,7 +1936,7 @@
 #: src/datastore/plugin_datastore_sqlite.c:255
 #: src/namecache/plugin_namecache_sqlite.c:193
 #: src/namestore/plugin_namestore_sqlite.c:204
-#: src/peerstore/plugin_peerstore_sqlite.c:458
+#: src/peerstore/plugin_peerstore_sqlite.c:479
 #: src/psycstore/plugin_psycstore_sqlite.c:329
 #, c-format
 msgid "Unable to initialize SQLite: %s.\n"
@@ -2036,8 +2016,8 @@
 msgstr ""
 
 #: src/dht/gnunet-dht-get.c:204 src/dht/gnunet-dht-monitor.c:271
-#: src/dht/gnunet-dht-put.c:213 src/fs/gnunet-auto-share.c:753
-#: src/fs/gnunet-download.c:328 src/fs/gnunet-publish.c:939
+#: src/dht/gnunet-dht-put.c:213 src/fs/gnunet-auto-share.c:755
+#: src/fs/gnunet-download.c:328 src/fs/gnunet-publish.c:941
 #: src/fs/gnunet-search.c:301 src/fs/gnunet-unindex.c:168
 #: src/nse/gnunet-nse-profiler.c:873
 msgid "be verbose (print progress information)"
@@ -2055,49 +2035,49 @@
 msgid "Prints all packets that go through the DHT."
 msgstr ""
 
-#: src/dht/gnunet_dht_profiler.c:1392
+#: src/dht/gnunet_dht_profiler.c:1393
 #: src/testbed/gnunet-testbed-profiler.c:267
 #, fuzzy, c-format
 msgid "Exiting as the number of peers is %u\n"
 msgstr "tăng sổ tối đa các kết nối TCP/IP"
 
-#: src/dht/gnunet_dht_profiler.c:1417
+#: src/dht/gnunet_dht_profiler.c:1418
 #, fuzzy
 msgid "number of peers to start"
 msgstr "số lần lặp lại"
 
-#: src/dht/gnunet_dht_profiler.c:1420
+#: src/dht/gnunet_dht_profiler.c:1421
 msgid ""
 "maximum number of times we try to search for successor circle formation (0 "
 "for R5N)"
 msgstr ""
 
-#: src/dht/gnunet_dht_profiler.c:1423 src/nse/gnunet-nse-profiler.c:864
+#: src/dht/gnunet_dht_profiler.c:1424 src/nse/gnunet-nse-profiler.c:864
 #: src/testbed/gnunet-testbed-profiler.c:306
 msgid "name of the file with the login information for the testbed"
 msgstr ""
 
-#: src/dht/gnunet_dht_profiler.c:1426
+#: src/dht/gnunet_dht_profiler.c:1427
 msgid "delay between rounds for collecting statistics (default: 30 sec)"
 msgstr ""
 
-#: src/dht/gnunet_dht_profiler.c:1429
+#: src/dht/gnunet_dht_profiler.c:1430
 msgid "delay to start doing PUTs (default: 1 sec)"
 msgstr ""
 
-#: src/dht/gnunet_dht_profiler.c:1432
+#: src/dht/gnunet_dht_profiler.c:1433
 msgid "delay to start doing GETs (default: 5 min)"
 msgstr ""
 
-#: src/dht/gnunet_dht_profiler.c:1435
+#: src/dht/gnunet_dht_profiler.c:1436
 msgid "replication degree for DHT PUTs"
 msgstr ""
 
-#: src/dht/gnunet_dht_profiler.c:1438
+#: src/dht/gnunet_dht_profiler.c:1439
 msgid "timeout for DHT PUT and GET requests (default: 1 min)"
 msgstr ""
 
-#: src/dht/gnunet_dht_profiler.c:1456
+#: src/dht/gnunet_dht_profiler.c:1457
 #, fuzzy
 msgid "Measure quality and performance of the DHT service."
 msgstr "Không thể truy cập đến dịch vụ"
@@ -2266,134 +2246,140 @@
 msgid "# HELLOs obtained from peerinfo"
 msgstr "Nhận được thông báo « %s » sai từ đồng đẳng « %s ».\n"
 
-#: src/dht/gnunet-service-dht_neighbours.c:516
+#: src/dht/gnunet-service-dht_neighbours.c:515
 msgid "# Preference updates given to core"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:610
+#: src/dht/gnunet-service-dht_neighbours.c:609
 #, fuzzy
 msgid "# FIND PEER messages initiated"
 msgstr "# các thông báo PING được tạo"
 
-#: src/dht/gnunet-service-dht_neighbours.c:764
-#: src/dht/gnunet-service-xdht_neighbours.c:6055
+#: src/dht/gnunet-service-dht_neighbours.c:763
+#: src/dht/gnunet-service-xdht_neighbours.c:6059
 #, fuzzy
 msgid "# Queued messages discarded (peer disconnected)"
 msgstr "# các thông báo được chắp liền"
 
-#: src/dht/gnunet-service-dht_neighbours.c:819
-#: src/dht/gnunet-service-xdht_neighbours.c:1012
+#: src/dht/gnunet-service-dht_neighbours.c:793
+#: src/dht/gnunet-service-xdht_neighbours.c:987
 #, fuzzy
+msgid "# Messages dropped (CORE timeout)"
+msgstr "# các yêu cầu lỗ hổng bị bỏ do trọng tải"
+
+#: src/dht/gnunet-service-dht_neighbours.c:823
+#: src/dht/gnunet-service-xdht_neighbours.c:1019
+#, fuzzy
 msgid "# Bytes transmitted to other peers"
 msgstr "# các byte kiểu %d được gửi "
 
-#: src/dht/gnunet-service-dht_neighbours.c:857
+#: src/dht/gnunet-service-dht_neighbours.c:861
 #, fuzzy
 msgid "# Bytes of bandwidth requested from core"
 msgstr "# các yêu cầu máy/trình khách lỗ hổng được phun vào"
 
-#: src/dht/gnunet-service-dht_neighbours.c:889
+#: src/dht/gnunet-service-dht_neighbours.c:893
 #, fuzzy
 msgid "# requests TTL-dropped"
 msgstr "# các yêu cầu get (lấy) dht được nhận"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1093
-#: src/dht/gnunet-service-dht_neighbours.c:1130
+#: src/dht/gnunet-service-dht_neighbours.c:1097
+#: src/dht/gnunet-service-dht_neighbours.c:1134
 msgid "# Peers excluded from routing due to Bloomfilter"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1108
-#: src/dht/gnunet-service-dht_neighbours.c:1145
+#: src/dht/gnunet-service-dht_neighbours.c:1112
+#: src/dht/gnunet-service-dht_neighbours.c:1149
 #, fuzzy
 msgid "# Peer selection failed"
 msgstr "# các cuộc gọi HTTP select (lựa chọn)"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1289
+#: src/dht/gnunet-service-dht_neighbours.c:1293
 #, fuzzy
 msgid "# PUT requests routed"
 msgstr "# các yêu cầu dht được định tuyến"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1318
+#: src/dht/gnunet-service-dht_neighbours.c:1322
 #, fuzzy
 msgid "# PUT messages queued for transmission"
 msgstr "# các thông báo PING được tạo"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1328
-#: src/dht/gnunet-service-dht_neighbours.c:1452
-#: src/dht/gnunet-service-dht_neighbours.c:1557
-#: src/dht/gnunet-service-xdht_neighbours.c:1121
-#: src/dht/gnunet-service-xdht_neighbours.c:1190
-#: src/dht/gnunet-service-xdht_neighbours.c:1240
-#: src/dht/gnunet-service-xdht_neighbours.c:1304
-#: src/dht/gnunet-service-xdht_neighbours.c:1371
-#: src/dht/gnunet-service-xdht_neighbours.c:1433
-#: src/dht/gnunet-service-xdht_neighbours.c:1495
-#: src/dht/gnunet-service-xdht_neighbours.c:1557
-#: src/dht/gnunet-service-xdht_neighbours.c:1617
+#: src/dht/gnunet-service-dht_neighbours.c:1332
+#: src/dht/gnunet-service-dht_neighbours.c:1456
+#: src/dht/gnunet-service-dht_neighbours.c:1561
+#: src/dht/gnunet-service-xdht_neighbours.c:1129
+#: src/dht/gnunet-service-xdht_neighbours.c:1198
+#: src/dht/gnunet-service-xdht_neighbours.c:1248
+#: src/dht/gnunet-service-xdht_neighbours.c:1312
+#: src/dht/gnunet-service-xdht_neighbours.c:1379
+#: src/dht/gnunet-service-xdht_neighbours.c:1441
+#: src/dht/gnunet-service-xdht_neighbours.c:1503
+#: src/dht/gnunet-service-xdht_neighbours.c:1565
+#: src/dht/gnunet-service-xdht_neighbours.c:1625
 #, fuzzy
 msgid "# P2P messages dropped due to full queue"
 msgstr "# các yêu cầu lỗ hổng bị bỏ do trọng tải"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1414
+#: src/dht/gnunet-service-dht_neighbours.c:1418
 #, fuzzy
 msgid "# GET requests routed"
 msgstr "# các yêu cầu dht được định tuyến"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1441
+#: src/dht/gnunet-service-dht_neighbours.c:1445
 #, fuzzy
 msgid "# GET messages queued for transmission"
 msgstr "# các thông báo PING được tạo"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1564
+#: src/dht/gnunet-service-dht_neighbours.c:1568
 #, fuzzy
 msgid "# RESULT messages queued for transmission"
 msgstr "# các thông báo PING được tạo"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1651
+#: src/dht/gnunet-service-dht_neighbours.c:1655
 #, fuzzy
 msgid "# P2P PUT requests received"
 msgstr "# các yêu cầu get (lấy) dht được nhận"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1654
+#: src/dht/gnunet-service-dht_neighbours.c:1658
 #, fuzzy
 msgid "# P2P PUT bytes received"
 msgstr "# các yêu cầu get (lấy) dht được nhận"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1821
+#: src/dht/gnunet-service-dht_neighbours.c:1825
 #, 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:1829
+#: src/dht/gnunet-service-dht_neighbours.c:1833
 msgid "# FIND PEER requests ignored due to lack of HELLO"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1924
+#: src/dht/gnunet-service-dht_neighbours.c:1928
 #, 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:1927
+#: src/dht/gnunet-service-dht_neighbours.c:1931
 #, 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:1984
+#: src/dht/gnunet-service-dht_neighbours.c:1988
 #, 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:1998
+#: src/dht/gnunet-service-dht_neighbours.c:2002
 #, 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:2083
+#: src/dht/gnunet-service-dht_neighbours.c:2087
 #, fuzzy
 msgid "# P2P RESULTS received"
 msgstr "# Tín hiệu HTTP PUT được nhận"
 
-#: src/dht/gnunet-service-dht_neighbours.c:2086
+#: src/dht/gnunet-service-dht_neighbours.c:2090
 #, fuzzy
 msgid "# P2P RESULT bytes received"
 msgstr "# Tín hiệu HTTP PUT được nhận"
@@ -2436,78 +2422,78 @@
 msgid "# DHT requests combined"
 msgstr "# các yêu cầu get (lấy) dht được nhận"
 
-#: src/dht/gnunet-service-xdht_neighbours.c:1824
+#: src/dht/gnunet-service-xdht_neighbours.c:1832
 #, c-format
 msgid ""
 "\n"
 "SUPU %s, %s, %d,trail_length = %d"
 msgstr ""
 
-#: src/dht/gnunet-service-xdht_neighbours.c:1829
+#: src/dht/gnunet-service-xdht_neighbours.c:1837
 #, c-format
 msgid ""
 "\n"
 "SUPU %s, %s, %d,trail[%d]=%s"
 msgstr ""
 
-#: src/dht/gnunet-service-xdht_neighbours.c:1849
+#: src/dht/gnunet-service-xdht_neighbours.c:1857
 #, c-format
 msgid ""
 "\n"
 "SUPU************  FRIEND_PEERMAP of %s"
 msgstr ""
 
-#: src/dht/gnunet-service-xdht_neighbours.c:1859
+#: src/dht/gnunet-service-xdht_neighbours.c:1867
 #, c-format
 msgid ""
 "\n"
 "SUPU %s, %s, %d, friend = %s, friend->trails_count = %d"
 msgstr ""
 
-#: src/dht/gnunet-service-xdht_neighbours.c:1880
+#: src/dht/gnunet-service-xdht_neighbours.c:1888
 #, c-format
 msgid ""
 "\n"
 "SUPU************  FINGER_TABLE of %s"
 msgstr ""
 
-#: src/dht/gnunet-service-xdht_neighbours.c:1889
+#: src/dht/gnunet-service-xdht_neighbours.c:1897
 #, c-format
 msgid ""
 "\n"
 "SUPU %s, %s, %d, finger_table[%d] = %s, trails_count = %d"
 msgstr ""
 
-#: src/dht/gnunet-service-xdht_neighbours.c:1896
+#: src/dht/gnunet-service-xdht_neighbours.c:1904
 #, c-format
 msgid ""
 "\n"
 "SUPU %s, %s, %d, trail_id[%d]=%s"
 msgstr ""
 
-#: src/dht/gnunet-service-xdht_neighbours.c:1902
+#: src/dht/gnunet-service-xdht_neighbours.c:1910
 #, c-format
 msgid ""
 "\n"
 "SUPU %s, %s, %d,trail[%d] = %s "
 msgstr ""
 
-#: src/dht/gnunet-service-xdht_neighbours.c:3551
+#: src/dht/gnunet-service-xdht_neighbours.c:3559
 msgid "# FINGERS_COUNT"
 msgstr ""
 
-#: src/dht/gnunet-service-xdht_neighbours.c:3692
-#: src/dht/gnunet-service-xdht_neighbours.c:3930
-#: src/dht/gnunet-service-xdht_neighbours.c:4083
-#: src/dht/gnunet-service-xdht_neighbours.c:4233
-#: src/dht/gnunet-service-xdht_neighbours.c:4414
-#: src/dht/gnunet-service-xdht_neighbours.c:4929
-#: src/dht/gnunet-service-xdht_neighbours.c:5323
-#: src/dht/gnunet-service-xdht_neighbours.c:5416
-#: src/dht/gnunet-service-xdht_neighbours.c:5505
-#: src/dht/gnunet-service-xdht_neighbours.c:5609
-#: src/dht/gnunet-service-xdht_neighbours.c:5753
-#: src/dht/gnunet-service-xdht_neighbours.c:5842
+#: 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
 #, fuzzy
 msgid "# Bytes received from other peers"
 msgstr "# các byte kiểu %d được nhận"
@@ -2897,132 +2883,6 @@
 msgid "Daemon to run to provide an IP exit node for the VPN"
 msgstr ""
 
-#: src/experimentation/gnunet-daemon-experimentation.c:55
-msgid "Experimentation daemon shutting down ...\n"
-msgstr ""
-
-#: src/experimentation/gnunet-daemon-experimentation.c:77
-msgid "Experimentation daemon starting ...\n"
-msgstr ""
-
-#: src/experimentation/gnunet-daemon-experimentation.c:83
-#, fuzzy
-msgid "Failed to create statistics!\n"
-msgstr "Không thể tạo miền tên.\n"
-
-#: src/experimentation/gnunet-daemon-experimentation.c:120
-msgid "GNUnet experimentation daemon"
-msgstr ""
-
-#: src/experimentation/gnunet-daemon-experimentation_experiments.c:241
-#, c-format
-msgid "Experiment `%s': Experiment signature is invalid\n"
-msgstr ""
-
-#: src/experimentation/gnunet-daemon-experimentation_experiments.c:250
-#, c-format
-msgid ""
-"Adding experiment `%s' running from `%s' to `%s' every %llu sec. for %llu "
-"sec. \n"
-msgstr ""
-
-#: src/experimentation/gnunet-daemon-experimentation_experiments.c:303
-#, c-format
-msgid "Experiment `%s': Issuer missing\n"
-msgstr ""
-
-#: src/experimentation/gnunet-daemon-experimentation_experiments.c:312
-#, c-format
-msgid "Experiment `%s': Issuer invalid\n"
-msgstr ""
-
-#: src/experimentation/gnunet-daemon-experimentation_experiments.c:320
-#, c-format
-msgid "Experiment `%s': Issuer not accepted!\n"
-msgstr ""
-
-#: src/experimentation/gnunet-daemon-experimentation_experiments.c:330
-#, c-format
-msgid "Experiment `%s': Version missing or invalid \n"
-msgstr ""
-
-#: src/experimentation/gnunet-daemon-experimentation_experiments.c:339
-#, c-format
-msgid "Experiment `%s': Required capabilities missing \n"
-msgstr ""
-
-#: src/experimentation/gnunet-daemon-experimentation_experiments.c:345
-#, c-format
-msgid "Experiment `%s': Required capabilities invalid \n"
-msgstr ""
-
-#: src/experimentation/gnunet-daemon-experimentation_experiments.c:390
-#, fuzzy, c-format
-msgid "Failed to parse file `%s'\n"
-msgstr "Lỗi đọc danh sách bạn bè từ « %s »\n"
-
-#: src/experimentation/gnunet-daemon-experimentation_experiments.c:420
-#: src/experimentation/gnunet-daemon-experimentation_experiments.c:452
-msgid ""
-"No valid experiment issuers configured! Set value to public keys of issuers! "
-"Exiting.\n"
-msgstr ""
-
-#: src/experimentation/gnunet-daemon-experimentation_experiments.c:435
-#, fuzzy
-msgid "Invalid value for public key\n"
-msgstr "Đối số không hợp lệ cho « %s ».\n"
-
-#: src/experimentation/gnunet-daemon-experimentation_experiments.c:473
-#, fuzzy, c-format
-msgid "Cannot read experiments file `%s'\n"
-msgstr "Không thể đọc danh sách bạn bè « %s »\n"
-
-#: src/experimentation/gnunet-daemon-experimentation_nodes.c:221
-#, c-format
-msgid "Cannot send message to peer `%s' for experiment `%s'\n"
-msgstr ""
-
-#: src/experimentation/gnunet-daemon-experimentation_nodes.c:309
-#, c-format
-msgid "Sending experimentation request to peer %s\n"
-msgstr ""
-
-#: src/experimentation/gnunet-daemon-experimentation_nodes.c:453
-#, c-format
-msgid "Added peer `%s' as active node\n"
-msgstr ""
-
-#: src/experimentation/gnunet-daemon-experimentation_nodes.c:891
-#, fuzzy, c-format
-msgid "Connected to peer %s\n"
-msgstr "« %s » được kết nối tới « %s ».\n"
-
-#: src/experimentation/gnunet-daemon-experimentation_nodes.c:921
-#, fuzzy, c-format
-msgid "Disconnected from peer %s\n"
-msgstr "« %.*s » được kết nối tới « %.*s ».\n"
-
-#: src/experimentation/gnunet-daemon-experimentation_scheduler.c:108
-#, c-format
-msgid "Peer `%s' did not respond to request for experiment `%s'\n"
-msgstr ""
-
-#: src/experimentation/gnunet-daemon-experimentation_scheduler.c:143
-#, fuzzy, c-format
-msgid "Starting inbound experiment `%s' with peer `%s'\n"
-msgstr "Đang bắt đầu tài về « %s »\n"
-
-#: src/experimentation/gnunet-daemon-experimentation_scheduler.c:276
-#, fuzzy, c-format
-msgid "Starting outbound experiment `%s' with peer `%s'\n"
-msgstr "Đang bắt đầu tài về « %s »\n"
-
-#: src/experimentation/gnunet-daemon-experimentation_scheduler.c:294
-#, fuzzy, c-format
-msgid "Received %s message from peer %s for experiment `%s'\n"
-msgstr "Nhận yêu cầu định tuyến\n"
-
 #: src/fragmentation/defragmentation.c:270
 msgid "# acknowledgements sent for fragment"
 msgstr ""
@@ -3079,71 +2939,71 @@
 msgid "# fragmentation transmissions completed"
 msgstr "# các sự truyền PONG bị lỗi"
 
-#: src/fs/fs_api.c:474
+#: src/fs/fs_api.c:484
 #, fuzzy, c-format
 msgid "Could not open file `%s': %s"
 msgstr "Lỗi mở tập tin theo dõi « %s »: %s\n"
 
-#: src/fs/fs_api.c:485
+#: src/fs/fs_api.c:495
 #, fuzzy, c-format
 msgid "Could not read file `%s': %s"
 msgstr "Lỗi mở tập tin theo dõi « %s »: %s\n"
 
-#: src/fs/fs_api.c:493
+#: src/fs/fs_api.c:503
 #, c-format
 msgid "Short read reading from file `%s'!"
 msgstr ""
 
-#: src/fs/fs_api.c:1101
+#: src/fs/fs_api.c:1111
 #, fuzzy, c-format
 msgid "Failed to resume publishing information `%s': %s\n"
 msgstr "Lỗi mở tập tin ghi sự kiện « %s »: %s\n"
 
-#: src/fs/fs_api.c:1621
+#: src/fs/fs_api.c:1631
 #, c-format
 msgid "Failure while resuming publishing operation `%s': %s\n"
 msgstr ""
 
-#: src/fs/fs_api.c:1635
+#: src/fs/fs_api.c:1645
 #, fuzzy, c-format
 msgid "Failed to resume publishing operation `%s': %s\n"
 msgstr "Lỗi mở tập tin ghi sự kiện « %s »: %s\n"
 
-#: src/fs/fs_api.c:2293
+#: src/fs/fs_api.c:2303
 #, c-format
 msgid "Failure while resuming unindexing operation `%s': %s\n"
 msgstr ""
 
-#: src/fs/fs_api.c:2303
+#: src/fs/fs_api.c:2313
 #, fuzzy, c-format
 msgid "Failed to resume unindexing operation `%s': %s\n"
 msgstr "Lỗi mở tập tin ghi sự kiện « %s »: %s\n"
 
-#: src/fs/fs_api.c:2431 src/fs/fs_api.c:2679
+#: src/fs/fs_api.c:2441 src/fs/fs_api.c:2689
 #, fuzzy, c-format
 msgid "Failed to resume sub-download `%s': %s\n"
 msgstr "Lỗi mở tập tin ghi sự kiện « %s »: %s\n"
 
-#: src/fs/fs_api.c:2449
+#: src/fs/fs_api.c:2459
 #, fuzzy, c-format
 msgid "Failed to resume sub-search `%s': %s\n"
 msgstr "Lỗi mở tập tin ghi sự kiện « %s »: %s\n"
 
-#: src/fs/fs_api.c:2464 src/fs/fs_api.c:2483 src/fs/fs_api.c:2975
+#: src/fs/fs_api.c:2474 src/fs/fs_api.c:2493 src/fs/fs_api.c:2985
 #, c-format
 msgid "Failure while resuming search operation `%s': %s\n"
 msgstr ""
 
-#: src/fs/fs_api.c:2669
+#: src/fs/fs_api.c:2679
 #, c-format
 msgid "Failed to resume sub-download `%s': could not open file `%s'\n"
 msgstr ""
 
-#: src/fs/fs_api.c:2918
+#: src/fs/fs_api.c:2928
 msgid "Could not resume running search, will resume as paused search\n"
 msgstr ""
 
-#: src/fs/fs_api.c:3013
+#: src/fs/fs_api.c:3023
 #, c-format
 msgid "Failure while resuming download operation `%s': %s\n"
 msgstr ""
@@ -3264,7 +3124,7 @@
 msgstr "Gặp lỗi khi tải lên tập tin: %s\n"
 
 #: src/fs/fs_publish.c:683 src/fs/fs_publish.c:700 src/fs/fs_publish.c:739
-#: src/fs/fs_publish.c:760 src/fs/fs_publish.c:784 src/fs/fs_publish.c:934
+#: src/fs/fs_publish.c:760 src/fs/fs_publish.c:784 src/fs/fs_publish.c:1034
 #, fuzzy, c-format
 msgid "Can not index file `%s': %s.  Will try to insert instead.\n"
 msgstr "Lỗi đánh chỉ mục tập tin « %s ». Đề nghị: thử chèn tập tin.\n"
@@ -3296,26 +3156,30 @@
 msgid "Failed to get file identifiers for `%s'\n"
 msgstr "Lỗi đọc danh sách bạn bè từ « %s »\n"
 
-#: src/fs/fs_publish.c:878
+#: src/fs/fs_publish.c:873 src/fs/fs_publish.c:914
+msgid "Can not create LOC URI. Will continue with CHK instead.\n"
+msgstr ""
+
+#: src/fs/fs_publish.c:988
 #, fuzzy, c-format
 msgid "Recursive upload failed at `%s': %s"
 msgstr "%s bị lỗi tại %s:%d: « %s »\n"
 
-#: src/fs/fs_publish.c:884
+#: src/fs/fs_publish.c:996
 #, fuzzy, c-format
 msgid "Recursive upload failed: %s"
 msgstr "Gặp lỗi khi tải lên tập tin: %s\n"
 
-#: src/fs/fs_publish.c:936
+#: src/fs/fs_publish.c:1036
 msgid "needs to be an actual file"
 msgstr ""
 
-#: src/fs/fs_publish.c:1172
+#: src/fs/fs_publish.c:1272
 #, fuzzy, c-format
 msgid "Insufficient space for publishing: %s"
 msgstr "Không đủ quyền truy cập cho « %s »: %s\n"
 
-#: src/fs/fs_publish.c:1263
+#: src/fs/fs_publish.c:1363
 #, c-format
 msgid "Reserving space for %u entries and %llu bytes for publication\n"
 msgstr ""
@@ -3330,12 +3194,12 @@
 msgid "Internal error."
 msgstr "Lỗi VR."
 
-#: src/fs/fs_search.c:778 src/fs/fs_search.c:848
+#: src/fs/fs_search.c:812 src/fs/fs_search.c:882
 #, fuzzy, c-format
 msgid "Failed to parse URI `%s': %s\n"
 msgstr "Tập tin « %s » có URI: %s\n"
 
-#: src/fs/fs_search.c:907
+#: src/fs/fs_search.c:941
 #, c-format
 msgid "Got result with unknown block type `%d', ignoring"
 msgstr ""
@@ -3474,77 +3338,67 @@
 msgid "Unrecognized URI type"
 msgstr ""
 
-#: src/fs/fs_uri.c:865
-#, fuzzy
-msgid "Lacking key configuration settings.\n"
-msgstr "Lưu cấu hình ngay bây giờ không?"
-
-#: src/fs/fs_uri.c:871
-#, fuzzy, c-format
-msgid "Could not access hostkey file `%s'.\n"
-msgstr "Không thể truy cập đến tập tin gnunet-directory « %s »\n"
-
-#: src/fs/fs_uri.c:1056 src/fs/fs_uri.c:1083
+#: src/fs/fs_uri.c:1043 src/fs/fs_uri.c:1070
 msgid "No keywords specified!\n"
 msgstr "Chưa ghi rõ từ khoá.\n"
 
-#: src/fs/fs_uri.c:1089
+#: src/fs/fs_uri.c:1076
 msgid "Number of double-quotes not balanced!\n"
 msgstr "Có dấu nháy kép thừa hay thiếu.\n"
 
-#: src/fs/gnunet-auto-share.c:236
+#: src/fs/gnunet-auto-share.c:237
 #, fuzzy, c-format
 msgid "Failed to load state: %s\n"
 msgstr "Lỗi bắt đầu thu thập.\n"
 
-#: src/fs/gnunet-auto-share.c:289 src/fs/gnunet-auto-share.c:299
-#: src/fs/gnunet-auto-share.c:309
+#: src/fs/gnunet-auto-share.c:290 src/fs/gnunet-auto-share.c:300
+#: src/fs/gnunet-auto-share.c:310
 #, fuzzy, c-format
 msgid "Failed to save state to file %s\n"
 msgstr "Lỗi đọc danh sách bạn bè từ « %s »\n"
 
-#: src/fs/gnunet-auto-share.c:401
+#: src/fs/gnunet-auto-share.c:402
 #, c-format
 msgid "Publication of `%s' done\n"
 msgstr ""
 
-#: src/fs/gnunet-auto-share.c:488
+#: src/fs/gnunet-auto-share.c:490
 #, fuzzy, c-format
 msgid "Publishing `%s'\n"
 msgstr "Gặp lỗi khi tải lên tập tin: %s\n"
 
-#: src/fs/gnunet-auto-share.c:497
+#: src/fs/gnunet-auto-share.c:499
 #, fuzzy, c-format
 msgid "Failed to run `%s'\n"
 msgstr "Lỗi bắt đầu thu thập.\n"
 
-#: src/fs/gnunet-auto-share.c:686
+#: src/fs/gnunet-auto-share.c:688
 #, fuzzy, c-format
 msgid ""
 "You must specify one and only one directory name for automatic publication.\n"
 msgstr "Phải ghi rõ chỉ một tên tập tin để chèn.\n"
 
-#: src/fs/gnunet-auto-share.c:737 src/fs/gnunet-publish.c:886
+#: src/fs/gnunet-auto-share.c:739 src/fs/gnunet-publish.c:888
 msgid "set the desired LEVEL of sender-anonymity"
 msgstr "đặt CẤP mong muốn của tình trạng nặc danh của người gửi"
 
-#: src/fs/gnunet-auto-share.c:741 src/fs/gnunet-publish.c:890
+#: src/fs/gnunet-auto-share.c:743 src/fs/gnunet-publish.c:892
 msgid "disable adding the creation time to the metadata of the uploaded file"
 msgstr "tắt thêm giờ tạo vào siêu dữ liệu của tập tin đã tải lên"
 
-#: src/fs/gnunet-auto-share.c:744 src/fs/gnunet-publish.c:893
+#: src/fs/gnunet-auto-share.c:746 src/fs/gnunet-publish.c:895
 msgid "do not use libextractor to add keywords or metadata"
 msgstr ""
 
-#: src/fs/gnunet-auto-share.c:747 src/fs/gnunet-publish.c:917
+#: src/fs/gnunet-auto-share.c:749 src/fs/gnunet-publish.c:919
 msgid "specify the priority of the content"
 msgstr "xác định mức ưu tiên của nội dung"
 
-#: src/fs/gnunet-auto-share.c:750 src/fs/gnunet-publish.c:924
+#: src/fs/gnunet-auto-share.c:752 src/fs/gnunet-publish.c:926
 msgid "set the desired replication LEVEL"
 msgstr ""
 
-#: src/fs/gnunet-auto-share.c:770
+#: src/fs/gnunet-auto-share.c:772
 #, fuzzy
 msgid "Automatically publish files from a directory on GNUnet"
 msgstr "Tự động chia sẻ một thư mục."
@@ -3626,7 +3480,7 @@
 msgid "You need to specify a URI argument.\n"
 msgstr "KHÔNG cho phép ghi rõ cả hai địa chỉ URI và tên tập tin.\n"
 
-#: src/fs/gnunet-download.c:240 src/fs/gnunet-publish.c:712
+#: src/fs/gnunet-download.c:240 src/fs/gnunet-publish.c:714
 #, fuzzy, c-format
 msgid "Failed to parse URI: %s\n"
 msgstr "Tập tin « %s » có URI: %s\n"
@@ -3639,7 +3493,7 @@
 msgid "Target filename must be specified.\n"
 msgstr ""
 
-#: src/fs/gnunet-download.c:268 src/fs/gnunet-publish.c:856
+#: src/fs/gnunet-download.c:268 src/fs/gnunet-publish.c:858
 #: src/fs/gnunet-search.c:250 src/fs/gnunet-unindex.c:140
 #, fuzzy, c-format
 msgid "Could not initialize `%s' subsystem.\n"
@@ -3747,93 +3601,93 @@
 msgid "Keywords for file `%s' (%s)\n"
 msgstr "Từ khoá cho tập tin « %s »:\n"
 
-#: src/fs/gnunet-publish.c:572
+#: src/fs/gnunet-publish.c:574
 #, fuzzy
 msgid "Could not publish\n"
 msgstr "Không thể truy cập đến « %s »: %s\n"
 
-#: src/fs/gnunet-publish.c:597
+#: src/fs/gnunet-publish.c:599
 #, fuzzy
 msgid "Could not start publishing.\n"
 msgstr "Không thể nạp phần bổ sung truyền tải « %s »\n"
 
-#: src/fs/gnunet-publish.c:631
+#: src/fs/gnunet-publish.c:633
 #, fuzzy, c-format
 msgid "Scanning directory `%s'.\n"
 msgstr "Lỗi đọc danh sách bạn bè từ « %s »\n"
 
-#: src/fs/gnunet-publish.c:635
+#: src/fs/gnunet-publish.c:637
 #, fuzzy, c-format
 msgid "Scanning file `%s'.\n"
 msgstr "Đang bắt đầu tài về « %s »\n"
 
-#: src/fs/gnunet-publish.c:641
+#: src/fs/gnunet-publish.c:643
 #, c-format
 msgid "There was trouble processing file `%s', skipping it.\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:648
+#: src/fs/gnunet-publish.c:650
 msgid "Preprocessing complete.\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:653
+#: src/fs/gnunet-publish.c:655
 #, fuzzy, c-format
 msgid "Extracting meta data from file `%s' complete.\n"
 msgstr "Đang cập nhật dữ liệu cho mô-đun « %s »\n"
 
-#: src/fs/gnunet-publish.c:660
+#: src/fs/gnunet-publish.c:662
 msgid "Meta data extraction has finished.\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:669
+#: src/fs/gnunet-publish.c:671
 #, fuzzy
 msgid "Internal error scanning directory.\n"
 msgstr "=\tLỗi đọc thư mục.\n"
 
-#: src/fs/gnunet-publish.c:701
+#: src/fs/gnunet-publish.c:703
 #, fuzzy, c-format
 msgid "Selected pseudonym `%s' unknown\n"
 msgstr "Không gian tên « %s » có đánh giá %d.\n"
 
-#: src/fs/gnunet-publish.c:733
+#: src/fs/gnunet-publish.c:735
 #, fuzzy, c-format
 msgid "Failed to access `%s': %s\n"
 msgstr "Lỗi mở tập tin ghi sự kiện « %s »: %s\n"
 
-#: src/fs/gnunet-publish.c:747
+#: src/fs/gnunet-publish.c:749
 msgid ""
 "Failed to start meta directory scanner.  Is gnunet-helper-publish-fs "
 "installed?\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:803
+#: src/fs/gnunet-publish.c:805
 #, c-format
 msgid "Cannot extract metadata from a URI!\n"
 msgstr "Không thể trích siêu dữ liệu ra một địa chỉ URI.\n"
 
-#: src/fs/gnunet-publish.c:810
+#: src/fs/gnunet-publish.c:812
 #, c-format
 msgid "You must specify one and only one filename for insertion.\n"
 msgstr "Phải ghi rõ chỉ một tên tập tin để chèn.\n"
 
-#: src/fs/gnunet-publish.c:816
+#: src/fs/gnunet-publish.c:818
 #, c-format
 msgid "You must NOT specify an URI and a filename.\n"
 msgstr "KHÔNG cho phép ghi rõ cả hai địa chỉ URI và tên tập tin.\n"
 
-#: src/fs/gnunet-publish.c:824 src/vpn/gnunet-vpn.c:209
+#: src/fs/gnunet-publish.c:826 src/vpn/gnunet-vpn.c:209
 #, c-format
 msgid "Option `%s' is required when using option `%s'.\n"
 msgstr "Tùy chọn « %s » cần thiết khi dùng tùy chọn « %s ».\n"
 
-#: src/fs/gnunet-publish.c:835 src/fs/gnunet-publish.c:843
-#: src/transport/gnunet-transport.c:1893 src/transport/gnunet-transport.c:1923
-#: src/transport/gnunet-transport.c:1953
+#: src/fs/gnunet-publish.c:837 src/fs/gnunet-publish.c:845
+#: src/transport/gnunet-transport.c:1891 src/transport/gnunet-transport.c:1921
+#: src/transport/gnunet-transport.c:1952
 #, c-format
 msgid "Option `%s' makes no sense without option `%s'.\n"
 msgstr "Tùy chọn « %s » không có nghĩa khi không có tùy chọn « %s ».\n"
 
-#: src/fs/gnunet-publish.c:897
+#: src/fs/gnunet-publish.c:899
 msgid ""
 "print list of extracted keywords that would be used, but do not perform "
 "upload"
@@ -3841,7 +3695,7 @@
 "in ra danh sách các từ khóa đã giải phóng cần sử dụng, nhưng không thực hiện "
 "tải lên"
 
-#: src/fs/gnunet-publish.c:901
+#: src/fs/gnunet-publish.c:903
 msgid ""
 "add an additional keyword for the top-level file or directory (this option "
 "can be specified multiple times)"
@@ -3849,11 +3703,11 @@
 "thêm một từ khoá bổ sung cho tập tin hoặc thư mục ở cấp đầu (có thể chỉ ra "
 "tùy chọn này nhiều lần)"
 
-#: src/fs/gnunet-publish.c:905
+#: src/fs/gnunet-publish.c:907
 msgid "set the meta-data for the given TYPE to the given VALUE"
 msgstr "đặt siêu dữ liệu cho KIỂU đưa ra thành GIÁ_TRỊ chỉ ra"
 
-#: src/fs/gnunet-publish.c:908
+#: src/fs/gnunet-publish.c:910
 msgid ""
 "do not index, perform full insertion (stores entire file in encrypted form "
 "in GNUnet database)"
@@ -3861,7 +3715,7 @@
 "không đánh chỉ mục, thực hiện việc chèn đầy đủ (chứa toàn bộ tập tin ở dạng "
 "mã hóa trong cơ sở dữ liệu GNUnet)"
 
-#: src/fs/gnunet-publish.c:913
+#: src/fs/gnunet-publish.c:915
 msgid ""
 "specify ID of an updated version to be published in the future (for "
 "namespace insertions only)"
@@ -3869,12 +3723,12 @@
 "chỉ ra mã số của một phiên bản đã cập nhật để công bố trong tương lai (chỉ "
 "cho sự chèn không gian tên)"
 
-#: src/fs/gnunet-publish.c:921
+#: src/fs/gnunet-publish.c:923
 msgid "publish the files under the pseudonym NAME (place file into namespace)"
 msgstr ""
 "công bố các tập tin dưới biệt hiệu TÊN (đặt tập tin vào không gian tên)"
 
-#: src/fs/gnunet-publish.c:927
+#: src/fs/gnunet-publish.c:929
 #, fuzzy
 msgid ""
 "only simulate the process but do not do any actual publishing (useful to "
@@ -3882,13 +3736,13 @@
 msgstr ""
 "chỉ mô phỏng tiến trình, không thật công bố (có ích để tính địa chỉ URI)"
 
-#: src/fs/gnunet-publish.c:931
+#: src/fs/gnunet-publish.c:933
 msgid ""
 "set the ID of this version of the publication (for namespace insertions only)"
 msgstr ""
 "đặt mã số của phiên bản này của sự công bố (chỉ cho chèn không gian tên)"
 
-#: src/fs/gnunet-publish.c:935
+#: src/fs/gnunet-publish.c:937
 msgid ""
 "URI to be published (can be used instead of passing a file to add keywords "
 "to the file with the respective URI)"
@@ -3896,7 +3750,7 @@
 "Địa chỉ URI cần công bố (có thể được dùng thay vào gửi một tập tin để thêm "
 "từ khoá vào tập tin có địa chỉ URI tương ứng)"
 
-#: src/fs/gnunet-publish.c:951
+#: src/fs/gnunet-publish.c:953
 msgid "Publish a file or directory on GNUnet"
 msgstr ""
 
@@ -3937,18 +3791,23 @@
 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:277
+#: src/fs/gnunet-service-fs.c:285
 msgid "# running average P2P latency (ms)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs.c:332 src/fs/gnunet-service-fs.c:540
+#: src/fs/gnunet-service-fs.c:344 src/fs/gnunet-service-fs.c:607
 #, 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:650 src/hostlist/gnunet-daemon-hostlist.c:303
-#: src/sensordashboard/gnunet-service-sensordashboard.c:854
-#: src/sensordashboard/gnunet-service-sensordashboard.c:862
+#: src/fs/gnunet-service-fs.c:731
+#, 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/sensordashboard/gnunet-service-sensordashboard.c:864
+#: src/sensordashboard/gnunet-service-sensordashboard.c:872
 #: src/topology/gnunet-daemon-topology.c:1287
 #: src/topology/gnunet-daemon-topology.c:1294
 #, fuzzy, c-format
@@ -3991,96 +3850,96 @@
 msgid "# cadet connections active"
 msgstr "# các kết nối dht"
 
-#: src/fs/gnunet-service-fs_cp.c:698
+#: src/fs/gnunet-service-fs_cp.c:710
 #, 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:702
+#: src/fs/gnunet-service-fs_cp.c:714
 #, c-format
 msgid "Migration of content to peer `%s' blocked for %s\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:737
+#: src/fs/gnunet-service-fs_cp.c:750
 #, fuzzy
 msgid "# replies transmitted to other peers"
 msgstr "# các byte kiểu %d được gửi "
 
-#: src/fs/gnunet-service-fs_cp.c:743
+#: src/fs/gnunet-service-fs_cp.c:756
 #, fuzzy
 msgid "# replies dropped"
 msgstr "# các đáp ứng dht được định tuyến"
 
-#: src/fs/gnunet-service-fs_cp.c:768 src/fs/gnunet-service-fs_cp.c:1317
+#: src/fs/gnunet-service-fs_cp.c:781 src/fs/gnunet-service-fs_cp.c:1337
 msgid "# P2P searches active"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:861
+#: src/fs/gnunet-service-fs_cp.c:878
 msgid "# artificial delays introduced (ms)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:914
+#: src/fs/gnunet-service-fs_cp.c:934
 #, 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:922
+#: src/fs/gnunet-service-fs_cp.c:942
 #, fuzzy
 msgid "# replies received for other peers"
 msgstr "# các byte kiểu %d được nhận"
 
-#: src/fs/gnunet-service-fs_cp.c:936
+#: src/fs/gnunet-service-fs_cp.c:956
 msgid "# replies dropped due to insufficient cover traffic"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:974
+#: src/fs/gnunet-service-fs_cp.c:994
 msgid "# P2P searches destroyed due to ultimate reply"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1042
+#: src/fs/gnunet-service-fs_cp.c:1062
 #, 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:1067
+#: src/fs/gnunet-service-fs_cp.c:1087
 msgid "# request dropped, priority insufficient"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1077
+#: src/fs/gnunet-service-fs_cp.c:1097
 #, 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:1155
+#: src/fs/gnunet-service-fs_cp.c:1175
 msgid "# GET requests received (from other peers)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1189
+#: src/fs/gnunet-service-fs_cp.c:1209
 #, 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:1211
+#: src/fs/gnunet-service-fs_cp.c:1231
 #, 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:1262
+#: src/fs/gnunet-service-fs_cp.c:1282
 #, 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:1286
+#: src/fs/gnunet-service-fs_cp.c:1306
 #, 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:1315
+#: src/fs/gnunet-service-fs_cp.c:1335
 #, 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:1691
+#: src/fs/gnunet-service-fs_cp.c:1754
 #, fuzzy
 msgid "# migration stop messages sent"
 msgstr "# các thông báo phát hiện dht được nhận"
@@ -4131,22 +3990,22 @@
 msgid "Indexed file `%s' changed at offset %llu\n"
 msgstr "Đánh chỉ mục dữ liệu của tập tin « %s » bị lỗi tại vị tri %llu.\n"
 
-#: src/fs/gnunet-service-fs_lc.c:202 src/fs/gnunet-service-fs_lc.c:370
+#: src/fs/gnunet-service-fs_lc.c:201 src/fs/gnunet-service-fs_lc.c:371
 #, fuzzy
 msgid "# client searches active"
 msgstr "# các yêu cầu khách lỗ hổng được nhận"
 
-#: src/fs/gnunet-service-fs_lc.c:258
+#: src/fs/gnunet-service-fs_lc.c:259
 #, fuzzy
 msgid "# replies received for local clients"
 msgstr "# các đáp ứng lỗ hổng được gửi cho trình/máy khách"
 
-#: src/fs/gnunet-service-fs_lc.c:329
+#: src/fs/gnunet-service-fs_lc.c:330
 #, fuzzy
 msgid "# client searches received"
 msgstr "# các yêu cầu khách lỗ hổng được nhận"
 
-#: src/fs/gnunet-service-fs_lc.c:364
+#: src/fs/gnunet-service-fs_lc.c:365
 msgid "# client searches updated (merged content seen list)"
 msgstr ""
 
@@ -4222,86 +4081,86 @@
 msgid "# results found locally"
 msgstr "# nội dung lỗ hổng được tìm cục bộ"
 
-#: src/fs/gnunet-service-fs_pr.c:1001
+#: src/fs/gnunet-service-fs_pr.c:1003
 msgid "# Datastore `PUT' failures"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1029
+#: src/fs/gnunet-service-fs_pr.c:1031
 #, 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:1064
+#: src/fs/gnunet-service-fs_pr.c:1069
 #, fuzzy
 msgid "# Replies received from DHT"
 msgstr "# các byte đã nhận qua HTTP"
 
-#: src/fs/gnunet-service-fs_pr.c:1192
+#: src/fs/gnunet-service-fs_pr.c:1200
 #, fuzzy
 msgid "# Replies received from CADET"
 msgstr "# các byte đã nhận qua HTTP"
 
-#: src/fs/gnunet-service-fs_pr.c:1244
+#: src/fs/gnunet-service-fs_pr.c:1252
 #, c-format
 msgid "Datastore lookup already took %s!\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1264
+#: src/fs/gnunet-service-fs_pr.c:1272
 #, c-format
 msgid "On-demand lookup already took %s!\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1311
+#: src/fs/gnunet-service-fs_pr.c:1319
 msgid "# Datastore lookups concluded (no results)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1326
+#: src/fs/gnunet-service-fs_pr.c:1334
 msgid "# Datastore lookups concluded (seen all)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1335
+#: src/fs/gnunet-service-fs_pr.c:1343
 msgid "# Datastore lookups aborted (more than MAX_RESULTS)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1350
+#: src/fs/gnunet-service-fs_pr.c:1358
 msgid "# requested DBLOCK or IBLOCK not found"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1364
+#: src/fs/gnunet-service-fs_pr.c:1372
 msgid "# on-demand blocks matched requests"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1377
+#: src/fs/gnunet-service-fs_pr.c:1385
 msgid "# on-demand lookups performed successfully"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1382
+#: src/fs/gnunet-service-fs_pr.c:1390
 msgid "# on-demand lookups failed"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1409 src/fs/gnunet-service-fs_pr.c:1449
-#: src/fs/gnunet-service-fs_pr.c:1612
+#: src/fs/gnunet-service-fs_pr.c:1417 src/fs/gnunet-service-fs_pr.c:1457
+#: src/fs/gnunet-service-fs_pr.c:1620
 msgid "# Datastore lookups concluded (error queueing)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1467
+#: src/fs/gnunet-service-fs_pr.c:1475
 msgid "# Datastore lookups concluded (found last result)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1478
+#: src/fs/gnunet-service-fs_pr.c:1486
 msgid "# Datastore lookups concluded (load too high)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1588
+#: src/fs/gnunet-service-fs_pr.c:1596
 msgid "# Datastore lookups initiated"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1673
+#: src/fs/gnunet-service-fs_pr.c:1685
 #, fuzzy
 msgid "# GAP PUT messages received"
 msgstr "# các thông báo PONG đã mật mã được nhận"
 
-#: src/fs/gnunet-service-fs_push.c:631
+#: src/fs/gnunet-service-fs_push.c:672
 msgid "time required, content pushing disabled"
 msgstr ""
 
@@ -4348,7 +4207,7 @@
 msgid "Refusing `%s' request to HTTP server\n"
 msgstr "trình phục vụ danh sách máy HTTP hợp nhất"
 
-#: src/gns/gnunet-bcd.c:355 src/hostlist/gnunet-daemon-hostlist_server.c:696
+#: src/gns/gnunet-bcd.c:355 src/hostlist/gnunet-daemon-hostlist_server.c:759
 #, c-format
 msgid "Invalid port number %llu.  Exiting.\n"
 msgstr ""
@@ -4371,61 +4230,61 @@
 msgid "GNUnet HTTP server to create business cards"
 msgstr ""
 
-#: src/gns/gnunet-dns2gns.c:228
+#: src/gns/gnunet-dns2gns.c:234
 #, fuzzy
 msgid "Failed to pack DNS response into UDP packet!\n"
 msgstr "Lỗi mở tập tin ghi sự kiện « %s »: %s\n"
 
-#: src/gns/gnunet-dns2gns.c:400
+#: src/gns/gnunet-dns2gns.c:406
 #, c-format
 msgid "Cannot parse DNS request from %s\n"
 msgstr ""
 
-#: src/gns/gnunet-dns2gns.c:416
+#: src/gns/gnunet-dns2gns.c:422
 #, fuzzy, c-format
 msgid "Received malformed DNS request from %s\n"
 msgstr "Nhận yêu cầu định tuyến\n"
 
-#: src/gns/gnunet-dns2gns.c:424
+#: src/gns/gnunet-dns2gns.c:430
 #, fuzzy, c-format
 msgid "Received unsupported DNS request from %s\n"
 msgstr "Nhận yêu cầu định tuyến\n"
 
-#: src/gns/gnunet-dns2gns.c:701
+#: src/gns/gnunet-dns2gns.c:708
 msgid "No ego configured for `dns2gns` subsystem\n"
 msgstr ""
 
-#: src/gns/gnunet-dns2gns.c:727
+#: src/gns/gnunet-dns2gns.c:734
 #, fuzzy
 msgid "No DNS server specified!\n"
 msgstr "Chưa ghi rõ từ khoá.\n"
 
-#: src/gns/gnunet-dns2gns.c:749
+#: src/gns/gnunet-dns2gns.c:756
 #, fuzzy
 msgid "No valid GNS zone specified!\n"
 msgstr "Chưa ghi rõ từ khoá.\n"
 
-#: src/gns/gnunet-dns2gns.c:770
+#: src/gns/gnunet-dns2gns.c:777
 msgid "IP of recursive DNS resolver to use (required)"
 msgstr ""
 
-#: src/gns/gnunet-dns2gns.c:773
+#: src/gns/gnunet-dns2gns.c:780
 msgid "Authoritative FCFS suffix to use (optional); default: fcfs.zkey.eu"
 msgstr ""
 
-#: src/gns/gnunet-dns2gns.c:776
+#: src/gns/gnunet-dns2gns.c:783
 msgid "Authoritative DNS suffix to use (optional); default: zkey.eu"
 msgstr ""
 
-#: src/gns/gnunet-dns2gns.c:779
+#: src/gns/gnunet-dns2gns.c:786
 msgid "UDP port to listen on for inbound DNS requests; default: 53"
 msgstr ""
 
-#: src/gns/gnunet-dns2gns.c:782
+#: src/gns/gnunet-dns2gns.c:789
 msgid "Public key of the GNS zone to use (overrides default)"
 msgstr ""
 
-#: src/gns/gnunet-dns2gns.c:795
+#: src/gns/gnunet-dns2gns.c:802
 msgid "GNUnet DNS-to-GNS proxy (a DNS server)"
 msgstr ""
 
@@ -4886,28 +4745,28 @@
 "reason to run!\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist.c:323
+#: src/hostlist/gnunet-daemon-hostlist.c:331
 #, fuzzy
 msgid "advertise our hostlist to other peers"
 msgstr "Tắt quảng cáo máy này cho đồng đẳng khác"
 
-#: src/hostlist/gnunet-daemon-hostlist.c:328
+#: src/hostlist/gnunet-daemon-hostlist.c:336
 msgid ""
 "bootstrap using hostlists (it is highly recommended that you always use this "
 "option)"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist.c:331
+#: src/hostlist/gnunet-daemon-hostlist.c:339
 #, fuzzy
 msgid "enable learning about hostlist servers from other peers"
 msgstr "Tắt quảng cáo máy này cho đồng đẳng khác"
 
-#: src/hostlist/gnunet-daemon-hostlist.c:335
+#: src/hostlist/gnunet-daemon-hostlist.c:343
 #, fuzzy
 msgid "provide a hostlist server"
 msgstr "trình phục vụ danh sách máy HTTP hợp nhất"
 
-#: src/hostlist/gnunet-daemon-hostlist.c:350
+#: src/hostlist/gnunet-daemon-hostlist.c:359
 msgid "GNUnet hostlist server and client"
 msgstr ""
 
@@ -4934,7 +4793,7 @@
 msgstr "# các HELLO tải xuống qua HTTP"
 
 #: src/hostlist/gnunet-daemon-hostlist_client.c:650
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1401
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1402
 msgid "# advertised hostlist URIs"
 msgstr ""
 
@@ -4985,7 +4844,7 @@
 msgstr ""
 
 #: src/hostlist/gnunet-daemon-hostlist_client.c:1103
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1646
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1655
 msgid "# milliseconds between hostlist downloads"
 msgstr ""
 
@@ -5000,27 +4859,27 @@
 msgid "# active connections"
 msgstr "# các kết nối dht"
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1347
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1348
 #, fuzzy, c-format
 msgid "Loading saved hostlist entries from file `%s' \n"
 msgstr "Đang thử tải danh sách các máy xuống « %s »\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1352
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1353
 #, fuzzy, c-format
 msgid "Hostlist file `%s' does not exist\n"
 msgstr "Khoá phiên chạy từ đồng đẳng « %s » không thể được thẩm tra.\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1361
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1362
 #, fuzzy, c-format
 msgid "Could not open file `%s' for reading to load hostlists: %s\n"
 msgstr "Lỗi mở tập tin theo dõi « %s »: %s\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1395
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1396
 #, c-format
 msgid "%u hostlist URIs loaded from file\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1398
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1399
 #, fuzzy
 msgid "# hostlist URIs read from file"
 msgstr "# các byte danh sách máy được trả về"
@@ -5030,160 +4889,154 @@
 msgid "Could not open file `%s' for writing to save hostlists: %s\n"
 msgstr "Lỗi mở tập tin theo dõi « %s »: %s\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1450
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1452
 #, fuzzy, c-format
 msgid "Writing %u hostlist URIs to `%s'\n"
 msgstr "Đang thử tải danh sách các máy xuống « %s »\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1474
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1491
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1476
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1493
 #, c-format
 msgid "Error writing hostlist URIs to file `%s'\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1486
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1488
 #, fuzzy
 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:1581
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1588
 #: src/transport/plugin_transport_http_client.c:2274
 #, c-format
 msgid "Invalid proxy type: `%s', disabling proxy! Check configuration!\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1611
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1617
 msgid "Learning is enabled on this peer\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1623
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1630
 msgid "Learning is not enabled on this peer\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1635
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1641
 #, c-format
 msgid ""
 "Since learning is not enabled on this peer, hostlist file `%s' was removed\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1639
-#, fuzzy, c-format
-msgid "Hostlist file `%s' could not be removed\n"
-msgstr "Khoá phiên chạy từ đồng đẳng « %s » không thể được thẩm tra.\n"
-
-#: src/hostlist/gnunet-daemon-hostlist_server.c:165
+#: src/hostlist/gnunet-daemon-hostlist_server.c:181
 #, fuzzy
 msgid "bytes in hostlist"
 msgstr "# các byte trong kho dữ liệu"
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:190
+#: src/hostlist/gnunet-daemon-hostlist_server.c:206
 msgid "expired addresses encountered"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:225
-#: src/hostlist/gnunet-daemon-hostlist_server.c:535
-#: src/peerinfo-tool/gnunet-peerinfo.c:367
-#: src/peerinfo-tool/gnunet-peerinfo.c:452
-#: src/peerinfo-tool/gnunet-peerinfo.c:535
+#: src/hostlist/gnunet-daemon-hostlist_server.c:241
+#: src/hostlist/gnunet-daemon-hostlist_server.c:590
+#: src/peerinfo-tool/gnunet-peerinfo.c:382
+#: src/peerinfo-tool/gnunet-peerinfo.c:531
 #: src/topology/gnunet-daemon-topology.c:952
 #, fuzzy, c-format
 msgid "Error in communication with PEERINFO service: %s\n"
 msgstr "Cổng để liên lạc với giao diện người dùng GNUnet"
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:249
+#: src/hostlist/gnunet-daemon-hostlist_server.c:265
 msgid "HELLOs without addresses encountered (ignored)"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:265
+#: src/hostlist/gnunet-daemon-hostlist_server.c:282
 msgid "bytes not included in hostlist (size limit)"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:365
+#: src/hostlist/gnunet-daemon-hostlist_server.c:386
 #, fuzzy, c-format
 msgid "Refusing `%s' request to hostlist server\n"
 msgstr "trình phục vụ danh sách máy HTTP hợp nhất"
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:368
+#: src/hostlist/gnunet-daemon-hostlist_server.c:389
 #, fuzzy
 msgid "hostlist requests refused (not HTTP GET)"
 msgstr "# các yêu cầu danh sách máy được nhận"
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:382
+#: src/hostlist/gnunet-daemon-hostlist_server.c:403
 #, c-format
 msgid "Refusing `%s' request with %llu bytes of upload data\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:386
+#: src/hostlist/gnunet-daemon-hostlist_server.c:407
 #, fuzzy
 msgid "hostlist requests refused (upload data)"
 msgstr "# các yêu cầu danh sách máy được nhận"
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:393
+#: src/hostlist/gnunet-daemon-hostlist_server.c:414
 msgid "Could not handle hostlist request since I do not have a response yet\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:396
+#: src/hostlist/gnunet-daemon-hostlist_server.c:417
 #, fuzzy
 msgid "hostlist requests refused (not ready)"
 msgstr "# các yêu cầu danh sách máy được nhận"
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:401
+#: src/hostlist/gnunet-daemon-hostlist_server.c:422
 #, fuzzy
 msgid "Received request for our hostlist\n"
 msgstr "Nhận yêu cầu định tuyến\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:403
+#: src/hostlist/gnunet-daemon-hostlist_server.c:424
 #, fuzzy
 msgid "hostlist requests processed"
 msgstr "# các yêu cầu danh sách máy được nhận"
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:449
+#: src/hostlist/gnunet-daemon-hostlist_server.c:485
 #, fuzzy
 msgid "# hostlist advertisements send"
 msgstr "# Các quảng cáo ngoại được chuyển tiếp"
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:497
+#: src/hostlist/gnunet-daemon-hostlist_server.c:535
 msgid "Advertisement message could not be queued by core\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:684
-#: src/peerinfo-tool/gnunet-peerinfo.c:696
+#: src/hostlist/gnunet-daemon-hostlist_server.c:747
+#: src/peerinfo-tool/gnunet-peerinfo.c:736
 #: src/transport/gnunet-service-transport.c:1127
 #, fuzzy
 msgid "Could not access PEERINFO service.  Exiting.\n"
 msgstr "Không thể truy cập đến thông tin về không gian tên.\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:708
+#: src/hostlist/gnunet-daemon-hostlist_server.c:771
 #, c-format
 msgid "Hostlist service starts on %s:%llu\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:723
+#: src/hostlist/gnunet-daemon-hostlist_server.c:786
 #, fuzzy, c-format
 msgid "Address to obtain hostlist: `%s'\n"
 msgstr "Đang thử tải danh sách các máy xuống « %s »\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:736
+#: src/hostlist/gnunet-daemon-hostlist_server.c:799
 #, fuzzy
 msgid "BINDTOIP does not a valid IPv4 address! Ignoring BINDTOIPV4.\n"
 msgstr "« %s » không sẵn sàng.\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:749
+#: src/hostlist/gnunet-daemon-hostlist_server.c:812
 #, fuzzy
 msgid "BINDTOIP does not a valid IPv4 address! Ignoring BINDTOIPV6.\n"
 msgstr "« %s » không sẵn sàng.\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:770
+#: src/hostlist/gnunet-daemon-hostlist_server.c:833
 #, fuzzy, c-format
 msgid "`%s' is not a valid IPv4 address! Ignoring BINDTOIPV4.\n"
 msgstr "« %s » không sẵn sàng.\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:790
+#: src/hostlist/gnunet-daemon-hostlist_server.c:853
 #, fuzzy, c-format
 msgid "`%s' is not a valid IPv6 address! Ignoring BINDTOIPV6.\n"
 msgstr "« %s » không sẵn sàng.\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:830
+#: src/hostlist/gnunet-daemon-hostlist_server.c:893
 #, fuzzy, c-format
 msgid "Could not start hostlist HTTP server on port %u\n"
 msgstr "Cổng cho trình phục vụ HTTP danh sách máy chủ thống nhất"
@@ -5415,7 +5268,7 @@
 msgstr ""
 
 #: src/namestore/gnunet-namestore.c:868
-#: src/peerinfo-tool/gnunet-peerinfo.c:792
+#: src/peerinfo-tool/gnunet-peerinfo.c:817
 #, fuzzy, c-format
 msgid "Invalid URI `%s'\n"
 msgstr "Dữ liệu nhập không hợp lệ.\n"
@@ -5819,8 +5672,8 @@
 msgid "Measure quality and performance of the NSE service."
 msgstr "Không thể truy cập đến dịch vụ"
 
-#: src/nse/gnunet-service-nse.c:1517
-#: src/revocation/gnunet-service-revocation.c:798 src/util/gnunet-scrypt.c:248
+#: src/nse/gnunet-service-nse.c:1537
+#: src/revocation/gnunet-service-revocation.c:798 src/util/gnunet-scrypt.c:260
 #, fuzzy
 msgid "Value is too large.\n"
 msgstr "Giá trị không nằm trong phạm vi được phép."
@@ -5912,95 +5765,90 @@
 msgid "Could not connect to `%s' service.\n"
 msgstr "Không thể kết nối tới %s:%u: %s\n"
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:230
+#: src/peerinfo-tool/gnunet-peerinfo.c:245
 #, fuzzy, c-format
 msgid "%sPeer `%s'\n"
 msgstr "Tôi là đồng đẳng « %s ».\n"
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:237
+#: src/peerinfo-tool/gnunet-peerinfo.c:252
 #, c-format
 msgid "\tExpires: %s \t %s\n"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:286
+#: src/peerinfo-tool/gnunet-peerinfo.c:301
 #, fuzzy, c-format
 msgid "Failure: Cannot convert address to string for peer `%s'\n"
 msgstr "Lỗi đóng kết đến cổng %s %d.\n"
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:462
-#, fuzzy, c-format
-msgid "Failure: Did not receive %s\n"
-msgstr "Lỗi mở tập tin ghi sự kiện « %s »: %s\n"
-
-#: src/peerinfo-tool/gnunet-peerinfo.c:471
+#: src/peerinfo-tool/gnunet-peerinfo.c:463
 #, c-format
 msgid "Failure: Received invalid %s\n"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:483
+#: src/peerinfo-tool/gnunet-peerinfo.c:477
 #, fuzzy, c-format
 msgid "Failed to write HELLO with %u bytes to file `%s'\n"
 msgstr "Lỗi đọc danh sách bạn bè từ « %s »\n"
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:502
+#: src/peerinfo-tool/gnunet-peerinfo.c:496
 #, c-format
 msgid "Wrote %s HELLO containing %u addresses with %u bytes to file `%s'\n"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:570
+#: src/peerinfo-tool/gnunet-peerinfo.c:566
 #, c-format
 msgid "Failure adding HELLO: %s\n"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:687
+#: src/peerinfo-tool/gnunet-peerinfo.c:695
 #, fuzzy, c-format
+msgid "Failed to get my own HELLO from this peer!\n"
+msgstr "Lỗi lấy thông kê về truyền tải.\n"
+
+#: src/peerinfo-tool/gnunet-peerinfo.c:727
+#, fuzzy, c-format
 msgid "Service `%s' is not running, please start GNUnet\n"
 msgstr "« %s » không phải là một tập tin.\n"
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:718 src/util/gnunet-scrypt.c:224
+#: src/peerinfo-tool/gnunet-peerinfo.c:841
 #, c-format
-msgid "Loading hostkey from `%s' failed.\n"
-msgstr ""
-
-#: src/peerinfo-tool/gnunet-peerinfo.c:816
-#, c-format
 msgid "I am peer `%s'.\n"
 msgstr "Tôi là đồng đẳng « %s ».\n"
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:865
+#: src/peerinfo-tool/gnunet-peerinfo.c:882
 msgid "don't resolve host names"
 msgstr "không quyết định các tên máy"
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:868
+#: src/peerinfo-tool/gnunet-peerinfo.c:885
 msgid "output only the identity strings"
 msgstr "chỉ xuất những chuỗi nhận diện"
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:871
+#: src/peerinfo-tool/gnunet-peerinfo.c:888
 msgid "include friend-only information"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:874
+#: src/peerinfo-tool/gnunet-peerinfo.c:891
 msgid "output our own identity only"
 msgstr "chỉ xuất nhận diện mình"
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:877
+#: src/peerinfo-tool/gnunet-peerinfo.c:894
 #, fuzzy
 msgid "list all known peers"
 msgstr "liệt kê mọi bộ tiếp hợp mạng"
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:880
+#: src/peerinfo-tool/gnunet-peerinfo.c:897
 msgid "dump hello to file"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:883
+#: src/peerinfo-tool/gnunet-peerinfo.c:900
 msgid "also output HELLO uri(s)"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:886
+#: src/peerinfo-tool/gnunet-peerinfo.c:903
 msgid "add given HELLO uri to the database"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:900
+#: src/peerinfo-tool/gnunet-peerinfo.c:917
 #, fuzzy
 msgid "Print information about peers."
 msgstr "In ra thông tin về các đồng đẳng GNUnet."
@@ -6027,74 +5875,78 @@
 msgid "peerstore"
 msgstr ""
 
-#: src/peerstore/gnunet-service-peerstore.c:343
+#: src/peerstore/gnunet-service-peerstore.c:384
 #, fuzzy
 msgid "Malformed iterate request.\n"
 msgstr "Không thể lưu tập tin cấu hình « %s »:"
 
-#: src/peerstore/gnunet-service-peerstore.c:350
+#: src/peerstore/gnunet-service-peerstore.c:391
 msgid "Sub system not supplied in client iterate request.\n"
 msgstr ""
 
-#: src/peerstore/gnunet-service-peerstore.c:399
+#: src/peerstore/gnunet-service-peerstore.c:451
 #, fuzzy
 msgid "Malformed store request from client\n"
 msgstr "Nhận yêu cầu định tuyến\n"
 
-#: src/peerstore/gnunet-service-peerstore.c:407
+#: src/peerstore/gnunet-service-peerstore.c:459
 msgid "Full key not supplied in client store request\n"
 msgstr ""
 
-#: src/peerstore/gnunet-service-peerstore.c:427
+#: src/peerstore/gnunet-service-peerstore.c:478
 #, fuzzy
-msgid "Failed to store requested value, sqlite database error."
+msgid "Failed to store requested value, database error."
 msgstr ""
 "\n"
 "Không nhận được đáp ứng từ gnunetd.\n"
 
-#: src/peerstore/gnunet-service-peerstore.c:509
+#: src/peerstore/gnunet-service-peerstore.c:557
 msgid "No database backend configured\n"
 msgstr ""
 
-#: src/peerstore/gnunet-service-peerstore.c:520
+#: src/peerstore/gnunet-service-peerstore.c:568
 #, fuzzy, c-format
 msgid "Could not load database backend `%s'\n"
 msgstr "Không thể đọc danh sách bạn bè « %s »\n"
 
-#: src/peerstore/peerstore_api.c:299 src/sensor/sensor_api.c:179
+#: src/peerstore/peerstore_api.c:329 src/sensor/sensor_api.c:179
 #, c-format
 msgid "Received an error notification from MQ of type: %d\n"
 msgstr ""
 
-#: src/peerstore/peerstore_api.c:370
+#: src/peerstore/peerstore_api.c:375
+msgid "timeout"
+msgstr ""
+
+#: src/peerstore/peerstore_api.c:402
 msgid "Iteration canceled due to reconnection."
 msgstr ""
 
-#: src/peerstore/peerstore_api.c:635
+#: src/peerstore/peerstore_api.c:681
 #, fuzzy
 msgid "Unexpected iteration response, this should not happen.\n"
 msgstr "Định dạng kết xuất không rõ, điều này không nên xảy ra.\n"
 
-#: src/peerstore/peerstore_api.c:646
+#: src/peerstore/peerstore_api.c:692
 #, fuzzy
 msgid "Error communicating with `PEERSTORE' service."
 msgstr "Cổng để liên lạc với giao diện người dùng GNUnet"
 
-#: src/peerstore/peerstore_api.c:665
+#: src/peerstore/peerstore_api.c:711
 #, fuzzy
 msgid "Received a malformed response from service."
 msgstr "Nhận yêu cầu định tuyến\n"
 
-#: src/peerstore/peerstore_api.c:804
+#: src/peerstore/peerstore_api.c:821
 msgid ""
 "Problem receiving a watch response, no way to determine which request.\n"
 msgstr ""
 
-#: src/peerstore/peerstore_api.c:815
+#: src/peerstore/peerstore_api.c:833
 msgid "Received a watch result for a non existing watch.\n"
 msgstr ""
 
-#: src/peerstore/plugin_peerstore_sqlite.c:377
+#: src/peerstore/plugin_peerstore_sqlite.c:398
 #: src/psycstore/plugin_psycstore_sqlite.c:286
 #, fuzzy, c-format
 msgid ""
@@ -6102,7 +5954,7 @@
 "  %s\n"
 msgstr "Gặp lỗi khi tạo người dùng"
 
-#: src/peerstore/plugin_peerstore_sqlite.c:401
+#: src/peerstore/plugin_peerstore_sqlite.c:422
 #: src/psycstore/plugin_psycstore_sqlite.c:263
 #, fuzzy, c-format
 msgid ""
@@ -6110,7 +5962,7 @@
 "  %s\n"
 msgstr "Gặp lỗi khi tạo người dùng"
 
-#: src/peerstore/plugin_peerstore_sqlite.c:483
+#: src/peerstore/plugin_peerstore_sqlite.c:504
 #, fuzzy, c-format
 msgid "Unable to create indices: %s.\n"
 msgstr "Không thể tạo miền tên.\n"
@@ -6212,7 +6064,7 @@
 msgid "`%s' failed at %s:%d with error: %s (%d)\n"
 msgstr "« %s » bị lỗi tại %s:%d với lỗi: %s\n"
 
-#: src/psycstore/plugin_psycstore_sqlite.c:1933
+#: src/psycstore/plugin_psycstore_sqlite.c:1932
 #, fuzzy
 msgid "SQLite database running\n"
 msgstr "kho dữ liệu sqlite"
@@ -6493,61 +6345,70 @@
 msgid "rps"
 msgstr ""
 
-#: src/scalarproduct/gnunet-scalarproduct.c:222
+#: src/scalarproduct/gnunet-scalarproduct.c:221
 #, fuzzy
 msgid "You must specify at least one message ID to check!\n"
 msgstr "Phải ghi rõ chỉ một tên tập tin để chèn.\n"
 
-#: src/scalarproduct/gnunet-scalarproduct.c:229
+#: src/scalarproduct/gnunet-scalarproduct.c:228
 msgid "This program needs a session identifier for comparing vectors.\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-scalarproduct.c:242
+#: src/scalarproduct/gnunet-scalarproduct.c:241
 #, c-format
 msgid ""
 "Tried to set initiator mode, as peer ID was given. However, `%s' is not a "
 "valid peer identifier.\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-scalarproduct.c:253
-msgid "Need elements to compute the vectorproduct, got none.\n"
+#: src/scalarproduct/gnunet-scalarproduct.c:259
+msgid "Need elements to compute the scalarproduct, got none.\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-scalarproduct.c:275
+#: src/scalarproduct/gnunet-scalarproduct.c:281
 #, fuzzy, c-format
 msgid "Malformed input, could not parse `%s'\n"
 msgstr "Lỗi bắt đầu thu thập.\n"
 
-#: src/scalarproduct/gnunet-scalarproduct.c:294
+#: src/scalarproduct/gnunet-scalarproduct.c:299
 #, fuzzy, c-format
 msgid "Could not convert `%s' to int64_t.\n"
 msgstr "Không thể kết nối tới %s:%u: %s\n"
 
-#: src/scalarproduct/gnunet-scalarproduct.c:344
+#: src/scalarproduct/gnunet-scalarproduct.c:326
+#, c-format
+msgid "Failed to initiate computation, were all keys unique?\n"
+msgstr ""
+
+#: src/scalarproduct/gnunet-scalarproduct.c:350
 msgid ""
 "A comma separated list of elements to compare as vector with our remote peer."
 msgstr ""
 
-#: src/scalarproduct/gnunet-scalarproduct.c:347
+#: src/scalarproduct/gnunet-scalarproduct.c:353
 msgid ""
 "[Optional] peer to calculate our scalarproduct with. If this parameter is "
 "not given, the service will wait for a remote peer to compute the request."
 msgstr ""
 
-#: src/scalarproduct/gnunet-scalarproduct.c:350
+#: src/scalarproduct/gnunet-scalarproduct.c:356
 msgid "Transaction ID shared with peer."
 msgstr ""
 
-#: src/scalarproduct/gnunet-scalarproduct.c:359
+#: src/scalarproduct/gnunet-scalarproduct.c:365
 msgid "Calculate the Vectorproduct with a GNUnet peer."
 msgstr ""
 
-#: src/scalarproduct/gnunet-service-scalarproduct_alice.c:1418
-#: src/scalarproduct/gnunet-service-scalarproduct_bob.c:1529
+#: src/scalarproduct/gnunet-service-scalarproduct_alice.c:1419
+#: src/scalarproduct/gnunet-service-scalarproduct_bob.c:1564
 #, fuzzy
 msgid "Connect to CADET failed\n"
 msgstr " Không kết nối được (lỗi ?)\n"
 
+#: src/scalarproduct/scalarproduct_api.c:296
+msgid "Keys given to SCALARPRODUCT not unique!\n"
+msgstr ""
+
 #: src/secretsharing/gnunet-secretsharing-profiler.c:613
 msgid "dkg start delay"
 msgstr ""
@@ -6587,54 +6448,54 @@
 msgid "sensor"
 msgstr ""
 
-#: src/sensor/gnunet-sensor-profiler.c:728
+#: src/sensor/gnunet-sensor-profiler.c:729
 msgid "Invalid or missing number of peers. Set at least 2 peers.\n"
 msgstr ""
 
-#: src/sensor/gnunet-sensor-profiler.c:735
+#: src/sensor/gnunet-sensor-profiler.c:736
 #, fuzzy
 msgid "Missing or invalid topology file.\n"
 msgstr "Đối số không hợp lệ cho « %s ».\n"
 
-#: src/sensor/gnunet-sensor-profiler.c:781
+#: src/sensor/gnunet-sensor-profiler.c:782
 #, fuzzy
 msgid "Number of peers to run"
 msgstr "số lần lặp lại"
 
-#: src/sensor/gnunet-sensor-profiler.c:783
+#: src/sensor/gnunet-sensor-profiler.c:784
 msgid "Path to topology file"
 msgstr ""
 
-#: src/sensor/gnunet-sensor-profiler.c:786
+#: src/sensor/gnunet-sensor-profiler.c:787
 msgid "Change the interval of running sensors to given value"
 msgstr ""
 
-#: src/sensor/gnunet-sensor-profiler.c:789
+#: src/sensor/gnunet-sensor-profiler.c:790
 #, fuzzy
 msgid "Number of peers to simulate anomalies on"
 msgstr "số lần lặp lại"
 
-#: src/sensor/gnunet-sensor-profiler.c:796
+#: src/sensor/gnunet-sensor-profiler.c:797
 #, fuzzy
 msgid "Profiler for sensor service"
 msgstr "Gặp lỗi khi tạo người dùng"
 
-#: src/sensor/gnunet-service-sensor_analysis.c:202
+#: src/sensor/gnunet-service-sensor_analysis.c:204
 #, fuzzy
 msgid "Received an invalid sensor value."
 msgstr "Nhận yêu cầu định tuyến\n"
 
-#: src/sensor/gnunet-service-sensor_analysis.c:293
+#: src/sensor/gnunet-service-sensor_analysis.c:295
 #, fuzzy
 msgid "Analysis model not defined in configuration.\n"
 msgstr "Không tìm thấy phương pháp « %s%s » trong thư viện « %s ».\n"
 
-#: src/sensor/gnunet-service-sensor_analysis.c:302
+#: src/sensor/gnunet-service-sensor_analysis.c:304
 #, fuzzy, c-format
 msgid "Could not load analysis model `%s'.\n"
 msgstr "Không thể đọc danh sách bạn bè « %s »\n"
 
-#: src/sensor/gnunet-service-sensor_analysis.c:310
+#: src/sensor/gnunet-service-sensor_analysis.c:312
 #, fuzzy
 msgid "Could not connect to peerstore service.\n"
 msgstr "Không thể kết nối tới %s:%u: %s\n"
@@ -6676,33 +6537,33 @@
 msgid "Failed to create pow and signature block.\n"
 msgstr "Không thể tạo miền tên.\n"
 
-#: src/sensor/gnunet-service-sensor_reporting.c:1044
+#: src/sensor/gnunet-service-sensor_reporting.c:1046
 #, c-format
 msgid "PEERSTORE error: %s.\n"
 msgstr ""
 
-#: src/sensor/gnunet-service-sensor_reporting.c:1149
-#: src/sensor/gnunet-service-sensor_reporting.c:1407
+#: src/sensor/gnunet-service-sensor_reporting.c:1151
+#: src/sensor/gnunet-service-sensor_reporting.c:1409
 #, fuzzy
 msgid "Failed to connect to CORE service.\n"
 msgstr "Lỗi kết nối đến gnunetd.\n"
 
-#: src/sensor/gnunet-service-sensor_reporting.c:1156
+#: src/sensor/gnunet-service-sensor_reporting.c:1158
 msgid "Peer identity received from CORE init doesn't match ours.\n"
 msgstr ""
 
-#: src/sensor/gnunet-service-sensor_reporting.c:1396
+#: src/sensor/gnunet-service-sensor_reporting.c:1398
 #, fuzzy
 msgid "Failed to connect to peerstore service.\n"
 msgstr "Không kết nối được đến trình nền gnunetd."
 
-#: src/sensor/gnunet-service-sensor_reporting.c:1417
+#: src/sensor/gnunet-service-sensor_reporting.c:1419
 #: src/sensor/gnunet-service-sensor_update.c:781
 #, fuzzy
 msgid "Failed to connect to CADET service.\n"
 msgstr "Lỗi kết nối đến gnunetd.\n"
 
-#: src/sensor/gnunet-service-sensor_reporting.c:1424
+#: src/sensor/gnunet-service-sensor_reporting.c:1426
 #, fuzzy
 msgid "Failed to load my private key.\n"
 msgstr "Lỗi bắt đầu thu thập.\n"
@@ -6813,30 +6674,30 @@
 "\n"
 "Gặp lỗi khi tải lên tập tin: %s"
 
-#: src/set/gnunet-service-set.c:1529
+#: src/set/gnunet-service-set.c:1531
 #, fuzzy
 msgid "Could not connect to cadet service\n"
 msgstr "Không thể kết nối tới %s:%u: %s\n"
 
-#: src/set/gnunet-set-ibf-profiler.c:221
+#: src/set/gnunet-set-ibf-profiler.c:237
 #, fuzzy
 msgid "number of element in set A-B"
 msgstr "số lần lặp lại"
 
-#: src/set/gnunet-set-ibf-profiler.c:224
+#: src/set/gnunet-set-ibf-profiler.c:240
 #, fuzzy
 msgid "number of element in set B-A"
 msgstr "số lần lặp lại"
 
-#: src/set/gnunet-set-ibf-profiler.c:227
+#: src/set/gnunet-set-ibf-profiler.c:243
 msgid "number of common elements in A and B"
 msgstr ""
 
-#: src/set/gnunet-set-ibf-profiler.c:230
+#: src/set/gnunet-set-ibf-profiler.c:246
 msgid "hash num"
 msgstr ""
 
-#: src/set/gnunet-set-ibf-profiler.c:233
+#: src/set/gnunet-set-ibf-profiler.c:249
 msgid "ibf size"
 msgstr ""
 
@@ -6844,93 +6705,93 @@
 msgid "oeration to execute"
 msgstr ""
 
-#: src/statistics/gnunet-service-statistics.c:280
+#: src/statistics/gnunet-service-statistics.c:323
 #, fuzzy, c-format
 msgid "Loading %llu bytes of statistics from `%s'\n"
 msgstr "Đã tải %llu byte xuống « %s ».\n"
 
-#: src/statistics/gnunet-service-statistics.c:346
+#: src/statistics/gnunet-service-statistics.c:434
 #, fuzzy, c-format
 msgid "Wrote %llu bytes of statistics to `%s'\n"
 msgstr "Đã tải %llu byte xuống « %s ».\n"
 
-#: src/statistics/gnunet-statistics.c:140
+#: src/statistics/gnunet-statistics.c:145
 #, fuzzy
 msgid "Failed to obtain statistics.\n"
 msgstr "Lỗi lấy thông kê về truyền tải.\n"
 
-#: src/statistics/gnunet-statistics.c:142
+#: src/statistics/gnunet-statistics.c:148
 #, fuzzy, c-format
 msgid "Failed to obtain statistics from host `%s:%llu'\n"
 msgstr "Lỗi lấy thông kê về truyền tải.\n"
 
-#: src/statistics/gnunet-statistics.c:189
+#: src/statistics/gnunet-statistics.c:198
 msgid "Missing argument: subsystem \n"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:195
+#: src/statistics/gnunet-statistics.c:204
 msgid "Missing argument: name\n"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:226
+#: src/statistics/gnunet-statistics.c:235
 #, fuzzy, c-format
 msgid "No subsystem or name given\n"
 msgstr "chưa đưa ra tên"
 
-#: src/statistics/gnunet-statistics.c:234
+#: src/statistics/gnunet-statistics.c:243
 #, fuzzy, c-format
 msgid "Failed to initialize watch routine\n"
 msgstr "Lỗi sơ khởi dịch vụ « %s ».\n"
 
-#: src/statistics/gnunet-statistics.c:261
+#: src/statistics/gnunet-statistics.c:269
 #, fuzzy, c-format
 msgid "Trying to connect to remote host, but service `%s' is not running\n"
 msgstr "Lỗi sơ khởi dịch vụ « %s ».\n"
 
-#: src/statistics/gnunet-statistics.c:269
+#: src/statistics/gnunet-statistics.c:282
 #, fuzzy, c-format
 msgid "A port is required to connect to host `%s'\n"
 msgstr "Không thể kết nối tới %s:%u: %s\n"
 
-#: src/statistics/gnunet-statistics.c:276
+#: src/statistics/gnunet-statistics.c:290
 #, c-format
 msgid "A port has to be between 1 and 65535 to connect to host `%s'\n"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:308
+#: src/statistics/gnunet-statistics.c:323
 #, fuzzy, c-format
 msgid "Invalid argument `%s'\n"
 msgstr "Đối số không hợp lệ cho « %s ».\n"
 
-#: src/statistics/gnunet-statistics.c:334
+#: src/statistics/gnunet-statistics.c:349
 msgid "limit output to statistics for the given NAME"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:337
+#: src/statistics/gnunet-statistics.c:352
 msgid "make the value being set persistent"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:340
+#: src/statistics/gnunet-statistics.c:355
 msgid "limit output to the given SUBSYSTEM"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:343
+#: src/statistics/gnunet-statistics.c:358
 msgid "just print the statistics value"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:346
+#: src/statistics/gnunet-statistics.c:361
 msgid "watch value continuously"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:349
+#: src/statistics/gnunet-statistics.c:364
 msgid "connect to remote host"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:352
+#: src/statistics/gnunet-statistics.c:367
 msgid "port for remote host"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:364
+#: src/statistics/gnunet-statistics.c:379
 msgid "Print statistics about GNUnet operations."
 msgstr "In ra thống kê về các thao tác GNUnet."
 
@@ -6945,54 +6806,55 @@
 "might have been lost!\n"
 msgstr ""
 
-#: src/testbed/generate-underlay-topology.c:223
-msgid "Need atleast 2 arguments\n"
-msgstr ""
+#: src/testbed/generate-underlay-topology.c:225
+#, fuzzy
+msgid "Need at least 2 arguments\n"
+msgstr "KHÔNG cho phép ghi rõ cả hai địa chỉ URI và tên tập tin.\n"
 
-#: src/testbed/generate-underlay-topology.c:228
+#: src/testbed/generate-underlay-topology.c:230
 msgid "Database filename missing\n"
 msgstr ""
 
-#: src/testbed/generate-underlay-topology.c:235
+#: src/testbed/generate-underlay-topology.c:237
 msgid "Topology string missing\n"
 msgstr ""
 
-#: src/testbed/generate-underlay-topology.c:240
+#: src/testbed/generate-underlay-topology.c:242
 #, fuzzy, c-format
 msgid "Invalid topology: %s\n"
 msgstr "Đối số không hợp lệ cho « %s ».\n"
 
-#: src/testbed/generate-underlay-topology.c:253
+#: src/testbed/generate-underlay-topology.c:255
 #, c-format
 msgid "An argument is missing for given topology `%s'\n"
 msgstr ""
 
-#: src/testbed/generate-underlay-topology.c:259
+#: src/testbed/generate-underlay-topology.c:261
 #, fuzzy, c-format
 msgid "Invalid argument `%s' given as topology argument\n"
 msgstr "Đối số không hợp lệ cho « %s ».\n"
 
-#: src/testbed/generate-underlay-topology.c:267
+#: src/testbed/generate-underlay-topology.c:269
 #, c-format
 msgid "Filename argument missing for topology `%s'\n"
 msgstr ""
 
-#: src/testbed/generate-underlay-topology.c:281
+#: src/testbed/generate-underlay-topology.c:283
 #, c-format
 msgid "Second argument for topology `%s' is missing\n"
 msgstr ""
 
-#: src/testbed/generate-underlay-topology.c:287
+#: src/testbed/generate-underlay-topology.c:289
 #, fuzzy, c-format
 msgid "Invalid argument `%s'; expecting unsigned int\n"
 msgstr "Đối số không hợp lệ cho « %s ».\n"
 
-#: src/testbed/generate-underlay-topology.c:336
+#: src/testbed/generate-underlay-topology.c:338
 #: src/testbed/gnunet-testbed-profiler.c:293
 msgid "create COUNT number of peers"
 msgstr ""
 
-#: src/testbed/generate-underlay-topology.c:345
+#: src/testbed/generate-underlay-topology.c:347
 msgid ""
 "Generates SQLite3 database representing a given underlay topology.\n"
 "Usage: gnunet-underlay-topology [OPTIONS] db-filename TOPO [TOPOOPTS]\n"
@@ -7383,21 +7245,26 @@
 msgid "GNUnet topology control (maintaining P2P cadet and F2F constraints)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_blacklist.c:271
+#: src/transport/gnunet-service-transport_blacklist.c:274
 #, 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:279
+#: src/transport/gnunet-service-transport_blacklist.c:283
 #, c-format
 msgid "Adding blacklisting entry for peer `%s':`%s'\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_blacklist.c:465
-#: src/transport/gnunet-service-transport_blacklist.c:748
+#: src/transport/gnunet-service-transport_blacklist.c:476
+#: src/transport/gnunet-service-transport_blacklist.c:766
 msgid "# disconnects due to blacklist"
 msgstr ""
 
+#: src/transport/gnunet-service-transport_blacklist.c:769
+#, 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:220
 #, fuzzy
 msgid "# bytes payload discarded due to not connected peer"
@@ -7430,260 +7297,235 @@
 msgid "Transport service is lacking key configuration settings. Exiting.\n"
 msgstr "Lưu cấu hình ngay bây giờ không?"
 
-#: src/transport/gnunet-service-transport_clients.c:463
-#, c-format
-msgid "Dropping message of type %u and size %u, have %u/%u messages pending\n"
-msgstr ""
-
-#: src/transport/gnunet-service-transport_clients.c:470
+#: src/transport/gnunet-service-transport_clients.c:481
 #, fuzzy
 msgid "# messages dropped due to slow client"
 msgstr "# các yêu cầu lỗ hổng bị bỏ do trọng tải"
 
-#: src/transport/gnunet-service-transport_clients.c:630
-#, c-format
-msgid "Rejecting control connection from peer `%s', which is not me!\n"
-msgstr ""
-
-#: src/transport/gnunet-service-transport_clients.c:771
+#: src/transport/gnunet-service-transport_clients.c:774
 msgid "# bytes payload dropped (other peer was not connected)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_clients.c:804
+#: 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:810
-#, fuzzy, c-format
-msgid "Blacklist allows connection attempt to peer `%s'\n"
-msgstr "Lỗi kết nối đến gnunetd.\n"
-
-#: src/transport/gnunet-service-transport_clients.c:836
+#: src/transport/gnunet-service-transport_clients.c:843
 #, 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:850
-#, fuzzy, c-format
-msgid "Received a request connect message for peer `%s'\n"
-msgstr "Nhận yêu cầu định tuyến\n"
-
-#: src/transport/gnunet-service-transport_clients.c:861
+#: src/transport/gnunet-service-transport_clients.c:882
 #, 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_clients.c:875
-#, fuzzy, c-format
-msgid "Received a request disconnect message for peer `%s'\n"
-msgstr "Nhận yêu cầu định tuyến\n"
-
 #: src/transport/gnunet-service-transport_hello.c:182
 msgid "# refreshed my HELLO"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1095
+#: src/transport/gnunet-service-transport_neighbours.c:1099
 #, 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:1220
-#: src/transport/gnunet-service-transport_neighbours.c:1635
+#: src/transport/gnunet-service-transport_neighbours.c:1224
+#: src/transport/gnunet-service-transport_neighbours.c:1639
 #, 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:1225
+#: src/transport/gnunet-service-transport_neighbours.c:1229
 #, fuzzy
 msgid "# messages transmitted to other peers"
 msgstr "# các byte kiểu %d được gửi "
 
-#: src/transport/gnunet-service-transport_neighbours.c:1230
+#: src/transport/gnunet-service-transport_neighbours.c:1234
 #, 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:1288
+#: src/transport/gnunet-service-transport_neighbours.c:1292
 msgid "# messages timed out while in transport queue"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1349
+#: src/transport/gnunet-service-transport_neighbours.c:1353
 #, fuzzy
 msgid "# keepalives sent"
 msgstr "# các khoá phiên chạy được gửi"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1382
+#: src/transport/gnunet-service-transport_neighbours.c:1386
 #, 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:1390
+#: src/transport/gnunet-service-transport_neighbours.c:1394
 #, 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:1437
+#: src/transport/gnunet-service-transport_neighbours.c:1441
 #, fuzzy
 msgid "# KEEPALIVE_RESPONSE messages discarded (not connected)"
 msgstr "# các thông báo được chắp liền"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1446
+#: src/transport/gnunet-service-transport_neighbours.c:1450
 #, fuzzy
 msgid "# KEEPALIVE_RESPONSE messages discarded (not expected)"
 msgstr "# các thông báo được chắp liền"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1454
+#: src/transport/gnunet-service-transport_neighbours.c:1458
 #, fuzzy
 msgid "# KEEPALIVE_RESPONSE messages discarded (address changed)"
 msgstr "# các thông báo được chắp liền"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1462
+#: src/transport/gnunet-service-transport_neighbours.c:1466
 #, fuzzy
 msgid "# KEEPALIVE_RESPONSE messages discarded (wrong nonce)"
 msgstr "# các thông báo được chắp liền"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1540
+#: src/transport/gnunet-service-transport_neighbours.c:1544
 #, 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:1574
+#: src/transport/gnunet-service-transport_neighbours.c:1578
 #, 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:1590
+#: src/transport/gnunet-service-transport_neighbours.c:1594
 msgid "# ms throttling suggested"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1685
+#: src/transport/gnunet-service-transport_neighbours.c:1689
 #, 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"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1712
+#: src/transport/gnunet-service-transport_neighbours.c:1716
 #, 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:1757
+#: src/transport/gnunet-service-transport_neighbours.c:1761
 #, 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:1773
+#: src/transport/gnunet-service-transport_neighbours.c:1777
 #, fuzzy, c-format
 msgid "Failed to transmit SYN message via plugin to %s\n"
 msgstr "Lỗi sơ khởi dịch vụ « %s ».\n"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1800
+#: src/transport/gnunet-service-transport_neighbours.c:1804
 #, 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:1849
+#: src/transport/gnunet-service-transport_neighbours.c:1853
 #, fuzzy, c-format
 msgid ""
 "Failed to send SYN_ACK message to peer `%s' using address `%s' session %p\n"
 msgstr "Lỗi kết nối đến gnunetd.\n"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1904
+#: src/transport/gnunet-service-transport_neighbours.c:1908
 #, 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:1919
+#: src/transport/gnunet-service-transport_neighbours.c:1923
 #, fuzzy, c-format
 msgid "Failed to transmit SYN_ACK message via plugin to %s\n"
 msgstr "Lỗi sơ khởi dịch vụ « %s ».\n"
 
-#: src/transport/gnunet-service-transport_neighbours.c:2199
+#: src/transport/gnunet-service-transport_neighbours.c:2203
 #, 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:2324
+#: src/transport/gnunet-service-transport_neighbours.c:2328
 #, fuzzy
 msgid "# SYN messages received"
 msgstr "# các thông báo PING được tạo"
 
-#: src/transport/gnunet-service-transport_neighbours.c:2329
+#: src/transport/gnunet-service-transport_neighbours.c:2333
 #, c-format
 msgid "SYN request from peer `%s' ignored due impending shutdown\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:2626
+#: src/transport/gnunet-service-transport_neighbours.c:2630
 msgid "# Attempts to switch addresses"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3047
+#: src/transport/gnunet-service-transport_neighbours.c:3051
 #, 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:3142
+#: src/transport/gnunet-service-transport_neighbours.c:3146
 #, 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:3150
+#: src/transport/gnunet-service-transport_neighbours.c:3154
 #, fuzzy
 msgid "# unexpected SYN_ACK messages (no peer)"
 msgstr "gửi ĐẾM thông báo"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3164
-#: src/transport/gnunet-service-transport_neighbours.c:3199
+#: src/transport/gnunet-service-transport_neighbours.c:3168
+#: src/transport/gnunet-service-transport_neighbours.c:3203
 #, fuzzy
 msgid "# unexpected SYN_ACK messages (not ready)"
 msgstr "gửi ĐẾM thông báo"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3211
+#: src/transport/gnunet-service-transport_neighbours.c:3215
 #, fuzzy
 msgid "# unexpected SYN_ACK messages (waiting on ATS)"
 msgstr "gửi ĐẾM thông báo"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3234
+#: src/transport/gnunet-service-transport_neighbours.c:3238
 msgid "# Successful attempts to switch addresses"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3242
+#: src/transport/gnunet-service-transport_neighbours.c:3246
 #, fuzzy
 msgid "# unexpected SYN_ACK messages (disconnecting)"
 msgstr "gửi ĐẾM thông báo"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3441
+#: src/transport/gnunet-service-transport_neighbours.c:3445
 #, 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:3477
+#: src/transport/gnunet-service-transport_neighbours.c:3481
 #, 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:3551
+#: src/transport/gnunet-service-transport_neighbours.c:3555
 msgid "# SET QUOTA messages ignored (no such peer)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3566
+#: src/transport/gnunet-service-transport_neighbours.c:3570
 msgid "# disconnects due to quota of 0"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3611
+#: src/transport/gnunet-service-transport_neighbours.c:3615
 msgid "# disconnect messages ignored (malformed)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3617
+#: src/transport/gnunet-service-transport_neighbours.c:3621
 #, 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:3626
+#: src/transport/gnunet-service-transport_neighbours.c:3630
 msgid "# disconnect messages ignored (timestamp)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3753
+#: src/transport/gnunet-service-transport_neighbours.c:3757
 #, 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"
@@ -7798,63 +7640,63 @@
 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:573
+#: src/transport/gnunet-transport.c:578
 #, 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:582
+#: src/transport/gnunet-transport.c:587
 #: 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:614
+#: src/transport/gnunet-transport.c:619
 #, 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:629
+#: src/transport/gnunet-transport.c:634
 #, 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:641
+#: src/transport/gnunet-transport.c:646
 #, 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:668 src/transport/gnunet-transport.c:698
+#: src/transport/gnunet-transport.c:673 src/transport/gnunet-transport.c:703
 #, 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:673
+#: src/transport/gnunet-transport.c:678
 #, 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:678
+#: src/transport/gnunet-transport.c:683
 #, 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:683
+#: src/transport/gnunet-transport.c:688
 #, 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:688
+#: src/transport/gnunet-transport.c:693
 #, c-format
 msgid "Timeout while waiting for result of NAT test for plugin `%s'\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:704
+#: src/transport/gnunet-transport.c:709
 #, fuzzy, c-format
 msgid "Configuration for plugin `%s' is working!\n"
 msgstr "Tập tin cấu hình « %s » đã được ghi.\n"
 
-#: src/transport/gnunet-transport.c:823
+#: src/transport/gnunet-transport.c:828
 #, fuzzy, c-format
 msgid ""
 "Peer `%s' %s %s\n"
@@ -7863,91 +7705,91 @@
 "\t%s%s\n"
 msgstr "Tôi là đồng đẳng « %s ».\n"
 
-#: src/transport/gnunet-transport.c:859
+#: src/transport/gnunet-transport.c:864
 #, fuzzy, c-format
 msgid "Peer `%s' %s `%s' \n"
 msgstr "Tôi là đồng đẳng « %s ».\n"
 
-#: src/transport/gnunet-transport.c:958 src/transport/gnunet-transport.c:1707
+#: src/transport/gnunet-transport.c:963 src/transport/gnunet-transport.c:1712
 #, fuzzy
 msgid "Monitor disconnected from transport service. Reconnecting.\n"
 msgstr "Lỗi kết nối đến gnunetd.\n"
 
-#: src/transport/gnunet-transport.c:1026
+#: src/transport/gnunet-transport.c:1031
 msgid "No transport plugins configured, peer will never communicate\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1040
+#: src/transport/gnunet-transport.c:1045
 #, c-format
 msgid "No port configured for plugin `%s', cannot test it\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1065
+#: src/transport/gnunet-transport.c:1070
 #, fuzzy
 msgid "Failed to start resolver!\n"
 msgstr "Lỗi bắt đầu thu thập.\n"
 
-#: src/transport/gnunet-transport.c:1111
+#: src/transport/gnunet-transport.c:1116
 #, 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:1134
+#: src/transport/gnunet-transport.c:1139
 #: 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:1158
+#: src/transport/gnunet-transport.c:1163
 #, c-format
 msgid ""
 "Successfully connected to `%s', starting to send benchmark data in %u Kb "
 "blocks\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1191
+#: src/transport/gnunet-transport.c:1196
 #, fuzzy, c-format
 msgid "Successfully disconnected from `%s'\n"
 msgstr "Không đủ quyền cho « %s ».\n"
 
-#: src/transport/gnunet-transport.c:1214
+#: src/transport/gnunet-transport.c:1219
 #: 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:1239 src/transport/gnunet-transport.c:1265
+#: src/transport/gnunet-transport.c:1244 src/transport/gnunet-transport.c:1270
 #, c-format
 msgid "%24s: %-17s %4s   (%u connections in total)\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1241
+#: src/transport/gnunet-transport.c:1246
 #, fuzzy
 msgid "Connected to"
 msgstr "« %s » được kết nối tới « %s ».\n"
 
-#: src/transport/gnunet-transport.c:1267
+#: src/transport/gnunet-transport.c:1272
 #, fuzzy
 msgid "Disconnected from"
 msgstr "« %.*s » được kết nối tới « %.*s ».\n"
 
-#: src/transport/gnunet-transport.c:1291
+#: src/transport/gnunet-transport.c:1296
 #: 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:1323
+#: src/transport/gnunet-transport.c:1328
 #, c-format
 msgid "Peer `%s': %s %s in state `%s' until %s\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1335
+#: src/transport/gnunet-transport.c:1340
 #, fuzzy, c-format
 msgid "Peer `%s': %s %s\n"
 msgstr "Tôi là đồng đẳng « %s ».\n"
 
-#: src/transport/gnunet-transport.c:1792
+#: src/transport/gnunet-transport.c:1794
 #: src/transport/gnunet-transport-profiler.c:492
 #, fuzzy
 msgid "Failed to send connect request to transport service\n"
@@ -7958,100 +7800,100 @@
 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:1875
+#: src/transport/gnunet-transport.c:1873
 #, 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:1883
+#: src/transport/gnunet-transport.c:1881
 #, c-format
 msgid ""
 "No operation given. Please choose one operation: %s, %s, %s, %s, %s, %s, %s\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1902 src/transport/gnunet-transport.c:1932
-#: src/transport/gnunet-transport.c:1964 src/transport/gnunet-transport.c:1990
-#: src/transport/gnunet-transport.c:2046
+#: src/transport/gnunet-transport.c:1900 src/transport/gnunet-transport.c:1930
+#: src/transport/gnunet-transport.c:1963 src/transport/gnunet-transport.c:1989
+#: src/transport/gnunet-transport.c:2045
 #: 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:1911 src/transport/gnunet-transport.c:1941
-#: src/transport/gnunet-transport.c:1975
+#: src/transport/gnunet-transport.c:1909 src/transport/gnunet-transport.c:1940
+#: src/transport/gnunet-transport.c:1974
 #, 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:1995
+#: src/transport/gnunet-transport.c:1994
 msgid "Starting to receive benchmark data\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:2094
+#: src/transport/gnunet-transport.c:2093
 #, 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:2097
+#: src/transport/gnunet-transport.c:2096
 msgid "measure how fast we are receiving data from all peers (until CTRL-C)"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:2100
+#: src/transport/gnunet-transport.c:2099
 #, fuzzy
 msgid "connect to a peer"
 msgstr "Lỗi kết nối đến gnunetd.\n"
 
-#: src/transport/gnunet-transport.c:2103
+#: src/transport/gnunet-transport.c:2102
 #, fuzzy
 msgid "disconnect to a peer"
 msgstr "Lỗi kết nối đến gnunetd.\n"
 
-#: src/transport/gnunet-transport.c:2106
+#: src/transport/gnunet-transport.c:2105
 #, 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:2109
+#: src/transport/gnunet-transport.c:2108
 #, 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:2112
+#: src/transport/gnunet-transport.c:2111
 #, 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:2118
+#: src/transport/gnunet-transport.c:2117
 #, 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:2121
+#: src/transport/gnunet-transport.c:2120
 #, fuzzy
 msgid "do not resolve hostnames"
 msgstr "không quyết định các tên máy"
 
-#: src/transport/gnunet-transport.c:2124
+#: src/transport/gnunet-transport.c:2123
 #: src/transport/gnunet-transport-profiler.c:638
 msgid "peer identity"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:2127
+#: src/transport/gnunet-transport.c:2126
 msgid "monitor plugin sessions"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:2130
+#: src/transport/gnunet-transport.c:2129
 msgid "send data for benchmarking to the other peer (until CTRL-C)"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:2133
+#: src/transport/gnunet-transport.c:2132
 msgid "test transport configuration (involves external server)"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:2144
+#: src/transport/gnunet-transport.c:2143
 #: src/transport/gnunet-transport-profiler.c:649
 #, fuzzy
 msgid "Direct access to transport service."
@@ -8152,8 +7994,8 @@
 msgstr "kích cỡ tin nhắn"
 
 #: src/transport/plugin_transport_http_client.c:1491
-#: src/transport/plugin_transport_http_server.c:2271
-#: src/transport/plugin_transport_http_server.c:3436
+#: src/transport/plugin_transport_http_server.c:2274
+#: src/transport/plugin_transport_http_server.c:3441
 #: src/transport/plugin_transport_tcp.c:2826
 #: src/transport/plugin_transport_tcp.c:2833
 msgid "TCP_STEALTH not supported on this platform.\n"
@@ -8165,13 +8007,13 @@
 msgstr ""
 
 #: src/transport/plugin_transport_http_client.c:2164
-#: src/transport/plugin_transport_http_server.c:3170
+#: src/transport/plugin_transport_http_server.c:3175
 #, 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:2181
-#: src/transport/plugin_transport_http_server.c:3240
+#: src/transport/plugin_transport_http_server.c:3245
 #, 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"
@@ -8210,96 +8052,96 @@
 msgid "No usable TLS certificate found and creating one at `%s/%s' failed!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:2297
+#: src/transport/plugin_transport_http_server.c:2300
 msgid "Could not load or create server certificate! Loading plugin failed!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:2604
+#: src/transport/plugin_transport_http_server.c:2609
 #, 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:2638 src/util/service.c:700
+#: src/transport/plugin_transport_http_server.c:2643 src/util/service.c:703
 #, 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:2656 src/util/service.c:719
+#: src/transport/plugin_transport_http_server.c:2661 src/util/service.c:722
 #, 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:2769
+#: src/transport/plugin_transport_http_server.c:2774
 #, c-format
 msgid "Found %u addresses to report to NAT service\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:2847
+#: src/transport/plugin_transport_http_server.c:2852
 msgid "Disabling IPv6 since it is not supported on this system!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:2946
+#: src/transport/plugin_transport_http_server.c:2951
 #, c-format
 msgid "IPv4 support is %s\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:2961
+#: src/transport/plugin_transport_http_server.c:2966
 #, c-format
 msgid "IPv6 support is %s\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:2967
+#: src/transport/plugin_transport_http_server.c:2972
 msgid "Neither IPv4 nor IPv6 are enabled! Fix in configuration\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:2978
+#: src/transport/plugin_transport_http_server.c:2983
 #, 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:2984
+#: src/transport/plugin_transport_http_server.c:2989
 #, 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:2998
+#: src/transport/plugin_transport_http_server.c:3003
 #, 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:3008
+#: src/transport/plugin_transport_http_server.c:3013
 #, 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:3030
+#: src/transport/plugin_transport_http_server.c:3035
 #, 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:3040
+#: src/transport/plugin_transport_http_server.c:3045
 #, 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:3103
+#: src/transport/plugin_transport_http_server.c:3108
 #, 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:3124
+#: src/transport/plugin_transport_http_server.c:3129
 #, 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:3141
+#: src/transport/plugin_transport_http_server.c:3146
 #, 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:3448
+#: src/transport/plugin_transport_http_server.c:3453
 #, fuzzy
 msgid "Unable to compile URL regex\n"
 msgstr "Không thể sơ khởi SQLite: %s.\n"
@@ -8405,8 +8247,8 @@
 msgid "# network-level TCP disconnect events"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2760 src/util/service.c:582
-#: src/util/service.c:588
+#: src/transport/plugin_transport_tcp.c:2760 src/util/service.c:585
+#: src/util/service.c:591
 #, c-format
 msgid "Require valid port number for service `%s' in configuration!\n"
 msgstr ""
@@ -8457,55 +8299,55 @@
 "or %u)\n"
 msgstr ""
 
-#: src/transport/plugin_transport_udp.c:2881
+#: src/transport/plugin_transport_udp.c:2888
 #, 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:2894
+#: src/transport/plugin_transport_udp.c:2901
 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:3247
+#: src/transport/plugin_transport_udp.c:3254
 #, 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:3255
+#: src/transport/plugin_transport_udp.c:3262
 #, 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:3414
+#: src/transport/plugin_transport_udp.c:3421
 #, c-format
 msgid "Given `%s' option is out of range: %llu > %u\n"
 msgstr ""
 
-#: src/transport/plugin_transport_udp.c:3461
+#: src/transport/plugin_transport_udp.c:3468
 #, 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:3529
+#: src/transport/plugin_transport_udp.c:3536
 #, fuzzy
 msgid "Failed to create network sockets, plugin failed\n"
 msgstr "Không thể tạo miền tên.\n"
 
-#: src/transport/plugin_transport_unix.c:1403
+#: src/transport/plugin_transport_unix.c:1402
 #, 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:1416
+#: src/transport/plugin_transport_unix.c:1415
 #, 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:1817
+#: src/transport/plugin_transport_unix.c:1816
 #, fuzzy
 msgid "Failed to open UNIX listen socket\n"
 msgstr "Lỗi mở tập tin ghi sự kiện « %s »: %s\n"
@@ -8577,7 +8419,7 @@
 msgid "# sessions allocated"
 msgstr "# các khoá phiên chạy được chấp nhận"
 
-#: src/transport/transport_api.c:767
+#: src/transport/transport_api.c:816
 #, 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"
@@ -8621,12 +8463,12 @@
 msgid "Metadata `%s' failed to deserialize"
 msgstr ""
 
-#: src/util/client.c:261 src/util/client.c:858 src/util/service.c:619
+#: src/util/client.c:261 src/util/client.c:858 src/util/service.c:622
 #, 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:623
+#: src/util/client.c:265 src/util/client.c:863 src/util/service.c:626
 #, fuzzy, c-format
 msgid "Using `%s' instead\n"
 msgstr "%s: tùy chọn « %s » là mơ hồ\n"
@@ -8653,7 +8495,7 @@
 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:1303
+#: src/util/client.c:1299
 msgid "Could not submit request, not expecting to receive a response.\n"
 msgstr ""
 
@@ -8717,7 +8559,7 @@
 msgid "Syntax error while deserializing in line %u\n"
 msgstr "Gặp lỗi cú pháp trong tập tin cấu hình « %s » tại dòng %d.\n"
 
-#: src/util/configuration.c:1023
+#: src/util/configuration.c:1025
 #, c-format
 msgid ""
 "Configuration value '%s' for '%s' in section '%s' is not in set of legal "
@@ -8726,17 +8568,17 @@
 "Giá trị cấu hình « %s » cho « %s » trong phần « %s » không phải nằm trong "
 "tập hợp các sự chọn được phép\n"
 
-#: src/util/configuration.c:1093
+#: src/util/configuration.c:1095
 #, c-format
 msgid "Recursive expansion suspected, aborting $-expansion for term `%s'\n"
 msgstr ""
 
-#: src/util/configuration.c:1125
+#: src/util/configuration.c:1127
 #, 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:1199
+#: src/util/configuration.c:1201
 #, c-format
 msgid ""
 "Failed to expand `%s' in `%s' as it is neither found in [PATHS] nor defined "
@@ -8836,7 +8678,7 @@
 msgid "Expected `%s' to be a directory!\n"
 msgstr "Mong đợi « %s » là một thư mục.\n"
 
-#: src/util/disk.c:1564 src/util/service.c:1323
+#: src/util/disk.c:1564 src/util/service.c:1327
 #, c-format
 msgid "Cannot obtain information about user `%s': %s\n"
 msgstr "Không thể lấy thông tin về người dùng « %s »: %s\n"
@@ -9039,23 +8881,28 @@
 msgid "Use build-in GNUnet stub resolver"
 msgstr ""
 
-#: src/util/gnunet-scrypt.c:279
+#: src/util/gnunet-scrypt.c:233
+#, c-format
+msgid "Loading hostkey from `%s' failed.\n"
+msgstr ""
+
+#: src/util/gnunet-scrypt.c:294
 msgid "number of bits to require for the proof of work"
 msgstr ""
 
-#: src/util/gnunet-scrypt.c:282
+#: src/util/gnunet-scrypt.c:297
 msgid "file with private key, otherwise default is used"
 msgstr ""
 
-#: src/util/gnunet-scrypt.c:285
+#: src/util/gnunet-scrypt.c:300
 msgid "file with proof of work, otherwise default is used"
 msgstr ""
 
-#: src/util/gnunet-scrypt.c:288
+#: src/util/gnunet-scrypt.c:303
 msgid "time to wait between calculations"
 msgstr ""
 
-#: src/util/gnunet-scrypt.c:299
+#: src/util/gnunet-scrypt.c:315
 #, fuzzy
 msgid "Manipulate GNUnet proof of work files"
 msgstr "cập nhật một giá trị trong tập tin cấu hình"
@@ -9110,12 +8957,12 @@
 msgid "Error writing to `%s': %s\n"
 msgstr "Gặp lỗi khi tạo người dùng"
 
-#: src/util/network.c:134
+#: src/util/network.c:137
 #, c-format
 msgid "Unable to shorten unix path `%s' while keeping name unique\n"
 msgstr ""
 
-#: src/util/network.c:1361 src/util/network.c:1486
+#: src/util/network.c:1640 src/util/network.c:1797
 #, c-format
 msgid ""
 "Fatal internal logic error, process hangs in `%s' (abort with CTRL-C)!\n"
@@ -9163,17 +9010,17 @@
 msgid "Could not determine plugin installation path.\n"
 msgstr "Không thể truy cập đến thông tin về không gian tên.\n"
 
-#: src/util/program.c:246 src/util/service.c:1457
+#: src/util/program.c:246 src/util/service.c:1461
 #, fuzzy, c-format
 msgid "Malformed configuration file `%s', exit ...\n"
 msgstr "Không thể lưu tập tin cấu hình « %s »:"
 
-#: src/util/program.c:258 src/util/service.c:1472
+#: src/util/program.c:258 src/util/service.c:1476
 #, fuzzy, c-format
 msgid "Could not access configuration file `%s'\n"
 msgstr "Không thể truy cập đến tập tin gnunet-directory « %s »\n"
 
-#: src/util/program.c:263 src/util/service.c:1467
+#: src/util/program.c:263 src/util/service.c:1471
 #, fuzzy
 msgid "Malformed configuration, exit ...\n"
 msgstr "Không thể lưu tập tin cấu hình « %s »:"
@@ -9204,15 +9051,10 @@
 msgid "Could not resolve our FQDN : %s\n"
 msgstr "Không thể giải quyết « %s » (%s): %s\n"
 
-#: src/util/scheduler.c:813
+#: src/util/scheduler.c:812
 msgid "Looks like we're busy waiting...\n"
 msgstr ""
 
-#: src/util/scheduler.c:948
-#, c-format
-msgid "Attempt to cancel dead task %llu!\n"
-msgstr ""
-
 #: src/util/server.c:484
 #, fuzzy, c-format
 msgid "`%s' failed for port %d (%s).\n"
@@ -9228,7 +9070,7 @@
 msgid "`%s' failed for `%s': address already in use\n"
 msgstr "« %s » bị lỗi cho cổng %d. Trình gnunetd có chạy chưa?\n"
 
-#: src/util/server.c:894
+#: src/util/server.c:896
 #, c-format
 msgid ""
 "Processing code for message of type %u did not call "
@@ -9245,80 +9087,80 @@
 msgid "Access from `%s' denied to service `%s'\n"
 msgstr ""
 
-#: src/util/service.c:409
+#: src/util/service.c:410
 #, c-format
 msgid "Could not parse IPv4 network specification `%s' for `%s:%s'\n"
 msgstr ""
 
-#: src/util/service.c:446
+#: src/util/service.c:448
 #, c-format
 msgid "Could not parse IPv6 network specification `%s' for `%s:%s'\n"
 msgstr ""
 
-#: src/util/service.c:563
+#: src/util/service.c:566
 #, c-format
 msgid ""
 "Disabling IPv6 support for service `%s', failed to create IPv6 socket: %s\n"
 msgstr ""
 
-#: src/util/service.c:653
+#: src/util/service.c:656
 #, c-format
 msgid ""
 "Disabling UNIX domain socket support for service `%s', failed to create UNIX "
 "domain socket: %s\n"
 msgstr ""
 
-#: src/util/service.c:669
+#: src/util/service.c:672
 #, c-format
 msgid "Have neither PORT nor UNIXPATH for service `%s', but one is required\n"
 msgstr ""
 
-#: src/util/service.c:908
+#: src/util/service.c:911
 msgid "Could not access a pre-bound socket, will try to bind myself\n"
 msgstr ""
 
-#: src/util/service.c:957 src/util/service.c:975
+#: src/util/service.c:960 src/util/service.c:978
 #, c-format
 msgid "Specified value for `%s' of service `%s' is invalid\n"
 msgstr ""
 
-#: src/util/service.c:1000
+#: src/util/service.c:1003
 #, c-format
 msgid "Could not access pre-bound socket %u, will try to bind myself\n"
 msgstr ""
 
-#: src/util/service.c:1170
+#: src/util/service.c:1174
 #, fuzzy, c-format
 msgid "Failed to start `%s' at `%s'\n"
 msgstr "Lỗi chạy %s: %s %d\n"
 
-#: src/util/service.c:1212
+#: src/util/service.c:1216
 #, fuzzy, c-format
 msgid "Service `%s' runs at %s\n"
 msgstr "Đồng đẳng « %s » có mức tin cậy %8u\n"
 
-#: src/util/service.c:1261
+#: src/util/service.c:1265
 msgid "Service process failed to initialize\n"
 msgstr ""
 
-#: src/util/service.c:1265
+#: src/util/service.c:1269
 msgid "Service process could not initialize server function\n"
 msgstr ""
 
-#: src/util/service.c:1269
+#: src/util/service.c:1273
 msgid "Service process failed to report status\n"
 msgstr ""
 
-#: src/util/service.c:1324
+#: src/util/service.c:1328
 msgid "No such user"
 msgstr "Không có người dùng như vậy"
 
-#: src/util/service.c:1337
+#: src/util/service.c:1341
 #, c-format
 msgid "Cannot change user/group to `%s': %s\n"
 msgstr "Không thể thay đổi người dùng/nhóm thành « %s »: %s\n"
 
-#: src/util/service.c:1407
+#: src/util/service.c:1411
 msgid "do daemonize (detach from terminal)"
 msgstr ""
 
@@ -9644,6 +9486,82 @@
 msgstr "« %s » thất bại ở tập tin « %s » tại %s:%d với lỗi: %s\n"
 
 #, fuzzy
+#~ msgid "Starting default services `%s'\n"
+#~ msgstr "Đang bắt đầu tài về « %s »\n"
+
+#, fuzzy
+#~ msgid "Received %s message\n"
+#~ msgstr "Nhận yêu cầu định tuyến\n"
+
+#, fuzzy
+#~ msgid "Received last message for %s \n"
+#~ msgstr "Nhận yêu cầu định tuyến\n"
+
+#, fuzzy
+#~ msgid "Failed to create statistics!\n"
+#~ msgstr "Không thể tạo miền tên.\n"
+
+#, fuzzy
+#~ msgid "Failed to parse file `%s'\n"
+#~ msgstr "Lỗi đọc danh sách bạn bè từ « %s »\n"
+
+#, fuzzy
+#~ msgid "Invalid value for public key\n"
+#~ msgstr "Đối số không hợp lệ cho « %s ».\n"
+
+#, fuzzy
+#~ msgid "Cannot read experiments file `%s'\n"
+#~ msgstr "Không thể đọc danh sách bạn bè « %s »\n"
+
+#, fuzzy
+#~ msgid "Connected to peer %s\n"
+#~ msgstr "« %s » được kết nối tới « %s ».\n"
+
+#, fuzzy
+#~ msgid "Disconnected from peer %s\n"
+#~ msgstr "« %.*s » được kết nối tới « %.*s ».\n"
+
+#, fuzzy
+#~ msgid "Starting inbound experiment `%s' with peer `%s'\n"
+#~ msgstr "Đang bắt đầu tài về « %s »\n"
+
+#, fuzzy
+#~ msgid "Starting outbound experiment `%s' with peer `%s'\n"
+#~ msgstr "Đang bắt đầu tài về « %s »\n"
+
+#, fuzzy
+#~ msgid "Received %s message from peer %s for experiment `%s'\n"
+#~ msgstr "Nhận yêu cầu định tuyến\n"
+
+#, fuzzy
+#~ msgid "Lacking key configuration settings.\n"
+#~ msgstr "Lưu cấu hình ngay bây giờ không?"
+
+#, fuzzy
+#~ msgid "Could not access hostkey file `%s'.\n"
+#~ msgstr "Không thể truy cập đến tập tin gnunet-directory « %s »\n"
+
+#, fuzzy
+#~ msgid "Hostlist file `%s' could not be removed\n"
+#~ msgstr "Khoá phiên chạy từ đồng đẳng « %s » không thể được thẩm tra.\n"
+
+#, fuzzy
+#~ msgid "Failure: Did not receive %s\n"
+#~ msgstr "Lỗi mở tập tin ghi sự kiện « %s »: %s\n"
+
+#, fuzzy
+#~ msgid "Blacklist allows connection attempt to peer `%s'\n"
+#~ msgstr "Lỗi kết nối đến gnunetd.\n"
+
+#, fuzzy
+#~ msgid "Received a request connect message for peer `%s'\n"
+#~ msgstr "Nhận yêu cầu định tuyến\n"
+
+#, fuzzy
+#~ msgid "Received a request disconnect message for peer `%s'\n"
+#~ msgstr "Nhận yêu cầu định tuyến\n"
+
+#, fuzzy
 #~ msgid "Client %p disconnected from us.\n"
 #~ msgstr "« %.*s » được kết nối tới « %.*s ».\n"
 
@@ -13779,8 +13697,8 @@
 #~ "insert sử dụng libextractor để trích các từ khoá khỏi tập tin. "
 #~ "libextractor cũng có thể mở rộng động để quản lý định dạng tập tin bổ "
 #~ "sung. Muốn sử dụng bộ trích bên ngoài tập hợp mặc định thì ghi rõ ở đây "
-#~ "những thư viện trích bổ sung. Định dạng là « [[-]tên_thư_viện[:"
-#~ "[-]tên_thư_viện]*] ».\n"
+#~ "những thư viện trích bổ sung. Định dạng là « [[-]tên_thư_viện[:[-]"
+#~ "tên_thư_viện]*] ».\n"
 #~ "\n"
 #~ "Mặc định là dùng tên tập tin, và ngắt từ lớn ở dấu cách, dấu gạch dưới v."
 #~ "v. Đây nên ổn cho phần lớn người dùng. Dấu gạch nối « - » đằng trước một "

Modified: gnunet/po/zh_CN.po
===================================================================
--- gnunet/po/zh_CN.po  2015-01-10 01:26:04 UTC (rev 34874)
+++ gnunet/po/zh_CN.po  2015-01-10 18:56:41 UTC (rev 34875)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: gnunet-0.8.1\n"
 "Report-Msgid-Bugs-To: address@hidden"
-"POT-Creation-Date: 2014-12-09 00:23+0100\n"
+"POT-Creation-Date: 2015-01-01 22:23+0100\n"
 "PO-Revision-Date: 2011-07-09 12:12+0800\n"
 "Last-Translator: Wylmer Wang <address@hidden>\n"
 "Language-Team: Chinese (simplified) <address@hidden>\n"
@@ -288,76 +288,51 @@
 msgid "ARM now monitors connections to service `%s' at `%s'\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:831
+#: src/arm/gnunet-service-arm.c:835
 #, c-format
 msgid "Preparing to stop `%s'\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:1100
+#: src/arm/gnunet-service-arm.c:1105
 #, c-format
 msgid "Restarting service `%s'.\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:1193
+#: src/arm/gnunet-service-arm.c:1199
 msgid "exit"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:1198
+#: src/arm/gnunet-service-arm.c:1204
 msgid "signal"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:1203
+#: src/arm/gnunet-service-arm.c:1209
 #, fuzzy
 msgid "unknown"
 msgstr "未知错误"
 
-#: src/arm/gnunet-service-arm.c:1209
+#: src/arm/gnunet-service-arm.c:1215
 #, fuzzy, c-format
 msgid "Service `%s' took %s to terminate\n"
 msgstr "服务已删除。\n"
 
-#: src/arm/gnunet-service-arm.c:1231
+#: src/arm/gnunet-service-arm.c:1237
 #, c-format
 msgid "Service `%s' terminated normally, will restart at any time\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:1246
+#: src/arm/gnunet-service-arm.c:1252
 #, c-format
 msgid "Service `%s' terminated with status %s/%d, will restart in %s\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:1500
-#, fuzzy, c-format
-msgid "Starting default services `%s'\n"
-msgstr "卸载 GNUnet 服务"
-
-#: src/arm/gnunet-service-arm.c:1511
-#, c-format
-msgid "Default service `%s' not configured correctly!\n"
-msgstr ""
-
-#: src/arm/gnunet-service-arm.c:1524
-msgid ""
-"No default services configured, GNUnet will not really start right now.\n"
-msgstr ""
-
 #: src/arm/mockup-service.c:41
 msgid "Initiating shutdown as requested by client.\n"
 msgstr ""
 
-#: src/ats/ats_api_performance.c:485
-#, c-format
-msgid "Received %s message\n"
-msgstr ""
-
-#: src/ats/ats_api_performance.c:528
-#, c-format
-msgid "Received last message for %s \n"
-msgstr ""
-
 #: src/ats/gnunet-ats-solver-eval.c:2804 src/ats/gnunet-ats-solver-eval.c:2838
-#: src/ats/gnunet-service-ats_addresses.c:1781
-#: src/ats/gnunet-service-ats_addresses.c:1825
+#: src/ats/gnunet-service-ats_addresses.c:1789
+#: src/ats/gnunet-service-ats_addresses.c:1833
 #, c-format
 msgid ""
 "Could not load quota for network `%s':  `%s', assigning default bandwidth "
@@ -365,13 +340,13 @@
 msgstr ""
 
 #: src/ats/gnunet-ats-solver-eval.c:2810
-#: src/ats/gnunet-service-ats_addresses.c:1788
+#: src/ats/gnunet-service-ats_addresses.c:1796
 #, c-format
 msgid "Outbound quota configure for network `%s' is %llu\n"
 msgstr ""
 
 #: src/ats/gnunet-ats-solver-eval.c:2817
-#: src/ats/gnunet-service-ats_addresses.c:1796
+#: src/ats/gnunet-service-ats_addresses.c:1804
 #, c-format
 msgid ""
 "No outbound quota configured for network `%s', assigning default bandwidth "
@@ -379,13 +354,13 @@
 msgstr ""
 
 #: src/ats/gnunet-ats-solver-eval.c:2844
-#: src/ats/gnunet-service-ats_addresses.c:1832
+#: src/ats/gnunet-service-ats_addresses.c:1840
 #, c-format
 msgid "Inbound quota configured for network `%s' is %llu\n"
 msgstr ""
 
 #: src/ats/gnunet-ats-solver-eval.c:2851
-#: src/ats/gnunet-service-ats_addresses.c:1840
+#: src/ats/gnunet-service-ats_addresses.c:1848
 #, c-format
 msgid ""
 "No outbound quota configure for network `%s', assigning default bandwidth "
@@ -420,22 +395,22 @@
 msgid "disable normalization"
 msgstr ""
 
-#: src/ats/gnunet-service-ats_addresses.c:2039
+#: src/ats/gnunet-service-ats_addresses.c:2051
 #, c-format
 msgid "Initializing solver `%s '`%s'\n"
 msgstr ""
 
-#: src/ats/gnunet-service-ats_addresses.c:2042
+#: src/ats/gnunet-service-ats_addresses.c:2057
 #, fuzzy, c-format
 msgid "Failed to initialize solver `%s'!\n"
 msgstr "无法初始化 SQLite:%s。\n"
 
-#: src/ats/gnunet-service-ats_addresses.c:2065
+#: src/ats/gnunet-service-ats_addresses.c:2082
 #, fuzzy
 msgid "Failed to initialize solver!\n"
 msgstr "无法初始化 SQLite:%s。\n"
 
-#: src/ats/plugin_ats_mlp.c:1344
+#: src/ats/plugin_ats_mlp.c:1345
 msgid "Problem size too large, cannot allocate memory!\n"
 msgstr ""
 
@@ -444,19 +419,19 @@
 msgid "Adding address for peer `%s' multiple times\n"
 msgstr ""
 
-#: src/ats/plugin_ats_mlp.c:1988
+#: 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:2704
+#: src/ats/plugin_ats_mlp.c:2714
 msgid ""
 "MLP solver is not optimizing for anything, changing to feasibility check\n"
 msgstr ""
 
-#: src/ats/plugin_ats_mlp.c:2744 src/ats/plugin_ats_mlp.c:2761
-#: src/ats/plugin_ats_mlp.c:2793 src/ats/plugin_ats_mlp.c:2811
-#: src/ats/plugin_ats_mlp.c:2830 src/ats/plugin_ats_proportional.c:1989
+#: 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:1989
 #: src/ats/plugin_ats_proportional.c:2010 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
@@ -466,33 +441,33 @@
 msgid "Invalid %s configuration %f \n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/ats/plugin_ats_mlp.c:2917
+#: src/ats/plugin_ats_mlp.c:2927
 #, 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:2926
+#: src/ats/plugin_ats_mlp.c:2936
 #, 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:2937
+#: src/ats/plugin_ats_mlp.c:2947
 #, c-format
 msgid ""
 "Adjusting outbound quota configuration for network `%s'from %llu to %.0f\n"
 msgstr ""
 
-#: src/ats/plugin_ats_mlp.c:2945
+#: src/ats/plugin_ats_mlp.c:2955
 #, c-format
 msgid ""
 "Adjusting inbound quota configuration for network `%s' from %llu to %.0f\n"
 msgstr ""
 
-#: src/ats/plugin_ats_mlp.c:2956
+#: src/ats/plugin_ats_mlp.c:2966
 #, c-format
 msgid "Using default quota configuration for network `%s' (in/out) %llu/%llu\n"
 msgstr ""
@@ -540,11 +515,11 @@
 msgid "Initialization failed, shutdown\n"
 msgstr "插件机构初始化失败:%s!\n"
 
-#: src/ats-tests/ats-testing-log.c:842
+#: src/ats-tests/ats-testing-log.c:846
 msgid "Stop logging\n"
 msgstr ""
 
-#: src/ats-tests/ats-testing-log.c:893
+#: src/ats-tests/ats-testing-log.c:897
 #, fuzzy, c-format
 msgid "Start logging `%s'\n"
 msgstr "未知的命令“%s”。\n"
@@ -586,96 +561,96 @@
 msgid "Removed address of peer `%s' with plugin `%s'\n"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:747
+#: src/ats-tool/gnunet-ats.c:746
 #, c-format
 msgid "Quota for network `%11s' (in/out): %10s / %10s\n"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:779 src/namestore/gnunet-namestore.c:700
-#: src/transport/gnunet-transport.c:1855
+#: src/ats-tool/gnunet-ats.c:778 src/namestore/gnunet-namestore.c:700
+#: src/transport/gnunet-transport.c:1853
 #: 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:793 src/transport/gnunet-transport.c:1864
+#: src/ats-tool/gnunet-ats.c:792 src/transport/gnunet-transport.c:1862
 #: 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:803
+#: src/ats-tool/gnunet-ats.c:802
 #, c-format
 msgid "Please select one operation : %s or %s or %s or %s or %s\n"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:825 src/ats-tool/gnunet-ats.c:851
-#: src/ats-tool/gnunet-ats.c:879 src/ats-tool/gnunet-ats.c:925
+#: src/ats-tool/gnunet-ats.c:824 src/ats-tool/gnunet-ats.c:850
+#: src/ats-tool/gnunet-ats.c:878 src/ats-tool/gnunet-ats.c:924
 #, fuzzy
 msgid "Cannot connect to ATS service, exiting...\n"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/ats-tool/gnunet-ats.c:837 src/ats-tool/gnunet-ats.c:863
+#: src/ats-tool/gnunet-ats.c:836 src/ats-tool/gnunet-ats.c:862
 #, fuzzy
 msgid "Cannot issue request to ATS service, exiting...\n"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/ats-tool/gnunet-ats.c:891
+#: src/ats-tool/gnunet-ats.c:890
 #, fuzzy
 msgid "No preference type given!\n"
 msgstr "无法获取有关用户“%s”的信息:%s\n"
 
-#: src/ats-tool/gnunet-ats.c:898
+#: src/ats-tool/gnunet-ats.c:897
 msgid "No peer given!\n"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:916
+#: src/ats-tool/gnunet-ats.c:915
 msgid "Valid type required\n"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:984
+#: src/ats-tool/gnunet-ats.c:983
 msgid "get list of active addresses currently used"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:986
+#: src/ats-tool/gnunet-ats.c:985
 msgid "get list of all active addresses"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:989
+#: src/ats-tool/gnunet-ats.c:988
 #, fuzzy
 msgid "do not resolve IP addresses to hostnames"
 msgstr "GNUnet 现在使用 IP 地址 %s。\n"
 
-#: src/ats-tool/gnunet-ats.c:991
+#: src/ats-tool/gnunet-ats.c:990
 msgid "monitor mode"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:993
+#: src/ats-tool/gnunet-ats.c:992
 #, fuzzy
 msgid "set preference for the given peer"
 msgstr "无法获取有关用户“%s”的信息:%s\n"
 
-#: src/ats-tool/gnunet-ats.c:995
+#: src/ats-tool/gnunet-ats.c:994
 msgid "print all configured quotas"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:997
+#: src/ats-tool/gnunet-ats.c:996
 msgid "peer id"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:1000
+#: src/ats-tool/gnunet-ats.c:999
 msgid "preference type to set: latency | bandwidth"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:1002
+#: src/ats-tool/gnunet-ats.c:1001
 msgid "preference value"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:1005
+#: src/ats-tool/gnunet-ats.c:1004
 msgid "verbose output (include ATS address properties)"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:1012
+#: src/ats-tool/gnunet-ats.c:1011
 #, fuzzy
 msgid "Print information about ATS state"
 msgstr "无法获取有关用户“%s”的信息:%s\n"
@@ -736,7 +711,7 @@
 msgid "provide information about all tunnels"
 msgstr "无法获取有关用户“%s”的信息:%s\n"
 
-#: src/cadet/gnunet-service-cadet_peer.c:496
+#: src/cadet/gnunet-service-cadet_peer.c:502
 msgid "Wrong CORE service\n"
 msgstr ""
 
@@ -1221,7 +1196,7 @@
 msgid "Could not start playback audio helper.\n"
 msgstr ""
 
-#: src/core/core_api.c:768
+#: src/core/core_api.c:787
 msgid "Client was disconnected from core service, trying to reconnect.\n"
 msgstr ""
 
@@ -1268,18 +1243,17 @@
 msgid "%24s: %-30s %4s (timeout in %6s)\n"
 msgstr ""
 
-#: src/core/gnunet-core.c:146 src/peerinfo-tool/gnunet-peerinfo.c:761
+#: src/core/gnunet-core.c:146 src/peerinfo-tool/gnunet-peerinfo.c:786
 #, fuzzy, c-format
 msgid "Invalid command line argument `%s'\n"
 msgstr "“%s”的参数无效。\n"
 
 #: src/core/gnunet-core.c:157
-#: src/experimentation/gnunet-daemon-experimentation_nodes.c:1104
 #, fuzzy
 msgid "Failed to connect to CORE service!\n"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/core/gnunet-core.c:179 src/transport/gnunet-transport.c:2115
+#: src/core/gnunet-core.c:179 src/transport/gnunet-transport.c:2114
 msgid "provide information about all current connections (continuously)"
 msgstr ""
 
@@ -1297,15 +1271,15 @@
 msgid "Core service of `%4s' ready.\n"
 msgstr ""
 
-#: src/core/gnunet-service-core_clients.c:372
+#: src/core/gnunet-service-core_clients.c:375
 msgid "# send requests dropped (disconnected)"
 msgstr ""
 
-#: src/core/gnunet-service-core_clients.c:483
+#: src/core/gnunet-service-core_clients.c:490
 msgid "# messages discarded (session disconnected)"
 msgstr ""
 
-#: src/core/gnunet-service-core_clients.c:529
+#: src/core/gnunet-service-core_clients.c:536
 #, c-format
 msgid "# bytes of messages of type %u received"
 msgstr ""
@@ -1326,114 +1300,114 @@
 msgid "# key exchanges stopped"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:847
+#: src/core/gnunet-service-core_kx.c:848
 msgid "# old ephemeral keys ignored"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:854
+#: src/core/gnunet-service-core_kx.c:855
 msgid "# ephemeral keys received"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:888
+#: src/core/gnunet-service-core_kx.c:889
 #, 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:899
+#: src/core/gnunet-service-core_kx.c:900
 msgid "# EPHEMERAL_KEY messages received"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:998
+#: src/core/gnunet-service-core_kx.c:999
 #: src/transport/gnunet-service-transport_validation.c:1016
 msgid "# PING messages received"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1006
+#: src/core/gnunet-service-core_kx.c:1007
 msgid "# PING messages dropped (out of order)"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1033
+#: src/core/gnunet-service-core_kx.c:1034
 #, 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:1049
+#: src/core/gnunet-service-core_kx.c:1050
 msgid "# PONG messages created"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1075
+#: src/core/gnunet-service-core_kx.c:1077
 msgid "# sessions terminated by timeout"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1086
+#: src/core/gnunet-service-core_kx.c:1088
 msgid "# keepalive messages sent"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1153
+#: src/core/gnunet-service-core_kx.c:1156
 #: src/transport/gnunet-service-transport_validation.c:1359
 msgid "# PONG messages received"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1159
+#: src/core/gnunet-service-core_kx.c:1162
 msgid "# PONG messages dropped (connection down)"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1164
+#: src/core/gnunet-service-core_kx.c:1167
 msgid "# PONG messages dropped (out of order)"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1194
+#: src/core/gnunet-service-core_kx.c:1197
 msgid "# PONG messages decrypted"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1229
+#: src/core/gnunet-service-core_kx.c:1232
 msgid "# session keys confirmed via PONG"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1240
+#: src/core/gnunet-service-core_kx.c:1243
 msgid "# timeouts prevented via PONG"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1247
+#: src/core/gnunet-service-core_kx.c:1250
 msgid "# rekey operations confirmed via PONG"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1386
+#: src/core/gnunet-service-core_kx.c:1392
 msgid "# DATA message dropped (out of order)"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1393
+#: src/core/gnunet-service-core_kx.c:1399
 #, 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:1396
+#: src/core/gnunet-service-core_kx.c:1402
 msgid "# sessions terminated by key expiration"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1442
-#: src/core/gnunet-service-core_kx.c:1467
+#: src/core/gnunet-service-core_kx.c:1448
+#: src/core/gnunet-service-core_kx.c:1473
 msgid "# bytes dropped (duplicates)"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1454
+#: src/core/gnunet-service-core_kx.c:1460
 msgid "# bytes dropped (out of sequence)"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1496
+#: src/core/gnunet-service-core_kx.c:1502
 msgid "# bytes dropped (ancient message)"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1504
+#: src/core/gnunet-service-core_kx.c:1510
 msgid "# bytes of payload decrypted"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1539
+#: src/core/gnunet-service-core_kx.c:1545
 msgid "# PAYLOAD dropped (out of order)"
 msgstr ""
 
@@ -1442,7 +1416,7 @@
 msgstr ""
 
 #: src/core/gnunet-service-core_neighbours.c:184
-#: src/core/gnunet-service-core_neighbours.c:335
+#: src/core/gnunet-service-core_neighbours.c:342
 msgid "# neighbour entries allocated"
 msgstr ""
 
@@ -1450,22 +1424,22 @@
 msgid "# encrypted bytes given to transport"
 msgstr ""
 
-#: src/core/gnunet-service-core_neighbours.c:418
+#: src/core/gnunet-service-core_neighbours.c:425
 #, c-format
 msgid "Unsupported message of type %u (%u bytes) received from peer `%s'\n"
 msgstr ""
 
 #: src/core/gnunet-service-core_sessions.c:245
 #: src/core/gnunet-service-core_sessions.c:328
-#: src/dht/gnunet-service-dht_neighbours.c:662
-#: src/dht/gnunet-service-dht_neighbours.c:727
-#: src/fs/gnunet-service-fs_cp.c:618 src/fs/gnunet-service-fs_cp.c:1517
+#: 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/topology/gnunet-daemon-topology.c:734
 #: src/topology/gnunet-daemon-topology.c:835
-#: src/transport/gnunet-service-transport_neighbours.c:917
-#: src/transport/gnunet-service-transport_neighbours.c:1141
-#: src/transport/gnunet-service-transport_neighbours.c:3177
-#: src/transport/gnunet-service-transport_neighbours.c:3491
+#: src/transport/gnunet-service-transport_neighbours.c:921
+#: src/transport/gnunet-service-transport_neighbours.c:1145
+#: src/transport/gnunet-service-transport_neighbours.c:3181
+#: src/transport/gnunet-service-transport_neighbours.c:3495
 msgid "# peers connected"
 msgstr ""
 
@@ -1497,7 +1471,7 @@
 msgstr ""
 
 #: src/datacache/datacache.c:115 src/datacache/datacache.c:266
-#: src/datastore/gnunet-service-datastore.c:838
+#: src/datastore/gnunet-service-datastore.c:855
 msgid "# bytes stored"
 msgstr ""
 
@@ -1506,8 +1480,8 @@
 msgstr ""
 
 #: src/datacache/datacache.c:143 src/datacache/datacache.c:150
-#: src/datastore/gnunet-service-datastore.c:1487
-#: src/datastore/gnunet-service-datastore.c:1498
+#: src/datastore/gnunet-service-datastore.c:1553
+#: src/datastore/gnunet-service-datastore.c:1564
 #, c-format
 msgid "No `%s' specified for `%s' in configuration!\n"
 msgstr ""
@@ -1690,156 +1664,162 @@
 msgid "Manipulate GNUnet datastore"
 msgstr "更改配置文件中的一个值"
 
-#: src/datastore/gnunet-service-datastore.c:351
+#: src/datastore/gnunet-service-datastore.c:365
 msgid "# bytes expired"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:425
+#: src/datastore/gnunet-service-datastore.c:439
 msgid "# bytes purged (low-priority)"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:483
+#: src/datastore/gnunet-service-datastore.c:497
 #: src/gns/gnunet-gns-helper-service-w32.c:223
 msgid "Transmission to client failed!\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:514
+#: src/datastore/gnunet-service-datastore.c:528
 #: src/gns/gnunet-gns-helper-service-w32.c:262
 msgid "Shutdown in progress, aborting transmission.\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:630
+#: src/datastore/gnunet-service-datastore.c:643
 msgid "# results found"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:673
+#: src/datastore/gnunet-service-datastore.c:686
 #, c-format
 msgid ""
 "Insufficient space (%llu bytes are available) to satisfy `%s' request for "
 "%llu bytes\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:684
+#: src/datastore/gnunet-service-datastore.c:697
 #, c-format
 msgid ""
 "The requested amount (%llu bytes) is larger than the cache size (%llu "
 "bytes)\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:688
+#: src/datastore/gnunet-service-datastore.c:701
 msgid ""
 "Insufficient space to satisfy request and requested amount is larger than "
 "cache size"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:694
+#: src/datastore/gnunet-service-datastore.c:707
 msgid "Insufficient space to satisfy request"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:699
-#: src/datastore/gnunet-service-datastore.c:751
-#: src/datastore/gnunet-service-datastore.c:964
-#: src/datastore/gnunet-service-datastore.c:1421
+#: 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:1525
 msgid "# reserved"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:764
+#: src/datastore/gnunet-service-datastore.c:780
 msgid "Could not find matching reservation"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:850
+#: src/datastore/gnunet-service-datastore.c:867
 #, c-format
 msgid "Need %llu bytes more space (%llu allowed, using %llu)\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1010
+#: src/datastore/gnunet-service-datastore.c:1029
 msgid "# GET requests received"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1022
+#: src/datastore/gnunet-service-datastore.c:1041
 msgid "# requests filtered by bloomfilter"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1050
+#: src/datastore/gnunet-service-datastore.c:1069
 msgid "# UPDATE requests received"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1080
+#: src/datastore/gnunet-service-datastore.c:1099
 msgid "# GET REPLICATION requests received"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1113
+#: src/datastore/gnunet-service-datastore.c:1132
 msgid "# GET ZERO ANONYMITY requests received"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1138
+#: src/datastore/gnunet-service-datastore.c:1157
 msgid "Content not found"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1146
+#: src/datastore/gnunet-service-datastore.c:1165
 msgid "# bytes removed (explicit request)"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1178
+#: src/datastore/gnunet-service-datastore.c:1197
 msgid "# REMOVE requests received"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1220
+#: src/datastore/gnunet-service-datastore.c:1241
 #, c-format
-msgid "Datastore payload inaccurate (%lld < %lld).  Trying to fix.\n"
+msgid ""
+"Datastore payload must have been inaccurate (%lld < %lld). Recomputing it.\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1281
+#: src/datastore/gnunet-service-datastore.c:1246
 #, c-format
+msgid "New payload: %lld\n"
+msgstr ""
+
+#: src/datastore/gnunet-service-datastore.c:1299
+#, c-format
 msgid "Loading `%s' datastore plugin\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1290
+#: src/datastore/gnunet-service-datastore.c:1310
 #, fuzzy, c-format
 msgid "Failed to load datastore plugin for `%s'\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/datastore/gnunet-service-datastore.c:1492
+#: src/datastore/gnunet-service-datastore.c:1412
+msgid "Rebuilding bloomfilter.  Please be patient.\n"
+msgstr ""
+
+#: src/datastore/gnunet-service-datastore.c:1419
+msgid "Plugin does not support get_keys function. Please fix!\n"
+msgstr ""
+
+#: src/datastore/gnunet-service-datastore.c:1422
+msgid "Bloomfilter construction complete.\n"
+msgstr ""
+
+#: src/datastore/gnunet-service-datastore.c:1558
 #, c-format
 msgid "# bytes used in file-sharing datastore `%s'"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1503
+#: src/datastore/gnunet-service-datastore.c:1569
 msgid "# quota"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1505
+#: src/datastore/gnunet-service-datastore.c:1571
 msgid "# cache size"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1518
+#: src/datastore/gnunet-service-datastore.c:1584
 #, c-format
 msgid "Could not use specified filename `%s' for bloomfilter.\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1536
-#: src/datastore/gnunet-service-datastore.c:1552
+#: src/datastore/gnunet-service-datastore.c:1602
+#: src/datastore/gnunet-service-datastore.c:1618
 #, fuzzy, c-format
 msgid "Failed to remove bogus bloomfilter file `%s'\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/datastore/gnunet-service-datastore.c:1582
+#: src/datastore/gnunet-service-datastore.c:1648
 #, fuzzy
 msgid "Failed to initialize bloomfilter.\n"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/datastore/gnunet-service-datastore.c:1611
-msgid "Rebuilding bloomfilter.  Please be patient.\n"
-msgstr ""
-
-#: src/datastore/gnunet-service-datastore.c:1616
-msgid "Plugin does not support get_keys function. Please fix!\n"
-msgstr ""
-
-#: src/datastore/gnunet-service-datastore.c:1619
-msgid "Bloomfilter construction complete.\n"
-msgstr ""
-
 #: src/datastore/plugin_datastore_heap.c:820
 #, fuzzy
 msgid "Heap database running\n"
@@ -1881,7 +1861,7 @@
 #: src/datastore/plugin_datastore_sqlite.c:255
 #: src/namecache/plugin_namecache_sqlite.c:193
 #: src/namestore/plugin_namestore_sqlite.c:204
-#: src/peerstore/plugin_peerstore_sqlite.c:458
+#: src/peerstore/plugin_peerstore_sqlite.c:479
 #: src/psycstore/plugin_psycstore_sqlite.c:329
 #, c-format
 msgid "Unable to initialize SQLite: %s.\n"
@@ -1961,8 +1941,8 @@
 msgstr ""
 
 #: src/dht/gnunet-dht-get.c:204 src/dht/gnunet-dht-monitor.c:271
-#: src/dht/gnunet-dht-put.c:213 src/fs/gnunet-auto-share.c:753
-#: src/fs/gnunet-download.c:328 src/fs/gnunet-publish.c:939
+#: src/dht/gnunet-dht-put.c:213 src/fs/gnunet-auto-share.c:755
+#: src/fs/gnunet-download.c:328 src/fs/gnunet-publish.c:941
 #: src/fs/gnunet-search.c:301 src/fs/gnunet-unindex.c:168
 #: src/nse/gnunet-nse-profiler.c:873
 msgid "be verbose (print progress information)"
@@ -1980,49 +1960,49 @@
 msgid "Prints all packets that go through the DHT."
 msgstr ""
 
-#: src/dht/gnunet_dht_profiler.c:1392
+#: src/dht/gnunet_dht_profiler.c:1393
 #: src/testbed/gnunet-testbed-profiler.c:267
 #, fuzzy, c-format
 msgid "Exiting as the number of peers is %u\n"
 msgstr "增加 TCP/IP 的最大连接数"
 
-#: src/dht/gnunet_dht_profiler.c:1417
+#: src/dht/gnunet_dht_profiler.c:1418
 #, fuzzy
 msgid "number of peers to start"
 msgstr "迭代次数"
 
-#: src/dht/gnunet_dht_profiler.c:1420
+#: src/dht/gnunet_dht_profiler.c:1421
 msgid ""
 "maximum number of times we try to search for successor circle formation (0 "
 "for R5N)"
 msgstr ""
 
-#: src/dht/gnunet_dht_profiler.c:1423 src/nse/gnunet-nse-profiler.c:864
+#: src/dht/gnunet_dht_profiler.c:1424 src/nse/gnunet-nse-profiler.c:864
 #: src/testbed/gnunet-testbed-profiler.c:306
 msgid "name of the file with the login information for the testbed"
 msgstr ""
 
-#: src/dht/gnunet_dht_profiler.c:1426
+#: src/dht/gnunet_dht_profiler.c:1427
 msgid "delay between rounds for collecting statistics (default: 30 sec)"
 msgstr ""
 
-#: src/dht/gnunet_dht_profiler.c:1429
+#: src/dht/gnunet_dht_profiler.c:1430
 msgid "delay to start doing PUTs (default: 1 sec)"
 msgstr ""
 
-#: src/dht/gnunet_dht_profiler.c:1432
+#: src/dht/gnunet_dht_profiler.c:1433
 msgid "delay to start doing GETs (default: 5 min)"
 msgstr ""
 
-#: src/dht/gnunet_dht_profiler.c:1435
+#: src/dht/gnunet_dht_profiler.c:1436
 msgid "replication degree for DHT PUTs"
 msgstr ""
 
-#: src/dht/gnunet_dht_profiler.c:1438
+#: src/dht/gnunet_dht_profiler.c:1439
 msgid "timeout for DHT PUT and GET requests (default: 1 min)"
 msgstr ""
 
-#: src/dht/gnunet_dht_profiler.c:1456
+#: src/dht/gnunet_dht_profiler.c:1457
 #, fuzzy
 msgid "Measure quality and performance of the DHT service."
 msgstr "无法访问该服务"
@@ -2183,114 +2163,119 @@
 msgid "# HELLOs obtained from peerinfo"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:516
+#: src/dht/gnunet-service-dht_neighbours.c:515
 msgid "# Preference updates given to core"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:610
+#: src/dht/gnunet-service-dht_neighbours.c:609
 msgid "# FIND PEER messages initiated"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:764
-#: src/dht/gnunet-service-xdht_neighbours.c:6055
+#: src/dht/gnunet-service-dht_neighbours.c:763
+#: src/dht/gnunet-service-xdht_neighbours.c:6059
 msgid "# Queued messages discarded (peer disconnected)"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:819
-#: src/dht/gnunet-service-xdht_neighbours.c:1012
+#: src/dht/gnunet-service-dht_neighbours.c:793
+#: src/dht/gnunet-service-xdht_neighbours.c:987
+msgid "# Messages dropped (CORE timeout)"
+msgstr ""
+
+#: src/dht/gnunet-service-dht_neighbours.c:823
+#: src/dht/gnunet-service-xdht_neighbours.c:1019
 msgid "# Bytes transmitted to other peers"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:857
+#: src/dht/gnunet-service-dht_neighbours.c:861
 msgid "# Bytes of bandwidth requested from core"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:889
+#: src/dht/gnunet-service-dht_neighbours.c:893
 msgid "# requests TTL-dropped"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1093
-#: src/dht/gnunet-service-dht_neighbours.c:1130
+#: src/dht/gnunet-service-dht_neighbours.c:1097
+#: src/dht/gnunet-service-dht_neighbours.c:1134
 msgid "# Peers excluded from routing due to Bloomfilter"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1108
-#: src/dht/gnunet-service-dht_neighbours.c:1145
+#: src/dht/gnunet-service-dht_neighbours.c:1112
+#: src/dht/gnunet-service-dht_neighbours.c:1149
 msgid "# Peer selection failed"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1289
+#: src/dht/gnunet-service-dht_neighbours.c:1293
 msgid "# PUT requests routed"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1318
+#: src/dht/gnunet-service-dht_neighbours.c:1322
 msgid "# PUT messages queued for transmission"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1328
-#: src/dht/gnunet-service-dht_neighbours.c:1452
-#: src/dht/gnunet-service-dht_neighbours.c:1557
-#: src/dht/gnunet-service-xdht_neighbours.c:1121
-#: src/dht/gnunet-service-xdht_neighbours.c:1190
-#: src/dht/gnunet-service-xdht_neighbours.c:1240
-#: src/dht/gnunet-service-xdht_neighbours.c:1304
-#: src/dht/gnunet-service-xdht_neighbours.c:1371
-#: src/dht/gnunet-service-xdht_neighbours.c:1433
-#: src/dht/gnunet-service-xdht_neighbours.c:1495
-#: src/dht/gnunet-service-xdht_neighbours.c:1557
-#: src/dht/gnunet-service-xdht_neighbours.c:1617
+#: src/dht/gnunet-service-dht_neighbours.c:1332
+#: src/dht/gnunet-service-dht_neighbours.c:1456
+#: src/dht/gnunet-service-dht_neighbours.c:1561
+#: src/dht/gnunet-service-xdht_neighbours.c:1129
+#: src/dht/gnunet-service-xdht_neighbours.c:1198
+#: src/dht/gnunet-service-xdht_neighbours.c:1248
+#: src/dht/gnunet-service-xdht_neighbours.c:1312
+#: src/dht/gnunet-service-xdht_neighbours.c:1379
+#: src/dht/gnunet-service-xdht_neighbours.c:1441
+#: src/dht/gnunet-service-xdht_neighbours.c:1503
+#: src/dht/gnunet-service-xdht_neighbours.c:1565
+#: src/dht/gnunet-service-xdht_neighbours.c:1625
 msgid "# P2P messages dropped due to full queue"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1414
+#: src/dht/gnunet-service-dht_neighbours.c:1418
 msgid "# GET requests routed"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1441
+#: src/dht/gnunet-service-dht_neighbours.c:1445
 msgid "# GET messages queued for transmission"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1564
+#: src/dht/gnunet-service-dht_neighbours.c:1568
 msgid "# RESULT messages queued for transmission"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1651
+#: src/dht/gnunet-service-dht_neighbours.c:1655
 msgid "# P2P PUT requests received"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1654
+#: src/dht/gnunet-service-dht_neighbours.c:1658
 msgid "# P2P PUT bytes received"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1821
+#: src/dht/gnunet-service-dht_neighbours.c:1825
 msgid "# FIND PEER requests ignored due to Bloomfilter"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1829
+#: src/dht/gnunet-service-dht_neighbours.c:1833
 msgid "# FIND PEER requests ignored due to lack of HELLO"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1924
+#: src/dht/gnunet-service-dht_neighbours.c:1928
 msgid "# P2P GET requests received"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1927
+#: src/dht/gnunet-service-dht_neighbours.c:1931
 msgid "# P2P GET bytes received"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1984
+#: src/dht/gnunet-service-dht_neighbours.c:1988
 msgid "# P2P FIND PEER requests processed"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1998
+#: src/dht/gnunet-service-dht_neighbours.c:2002
 msgid "# P2P GET requests ONLY routed"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:2083
+#: src/dht/gnunet-service-dht_neighbours.c:2087
 msgid "# P2P RESULTS received"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:2086
+#: src/dht/gnunet-service-dht_neighbours.c:2090
 msgid "# P2P RESULT bytes received"
 msgstr ""
 
@@ -2330,78 +2315,78 @@
 msgid "# DHT requests combined"
 msgstr ""
 
-#: src/dht/gnunet-service-xdht_neighbours.c:1824
+#: src/dht/gnunet-service-xdht_neighbours.c:1832
 #, c-format
 msgid ""
 "\n"
 "SUPU %s, %s, %d,trail_length = %d"
 msgstr ""
 
-#: src/dht/gnunet-service-xdht_neighbours.c:1829
+#: src/dht/gnunet-service-xdht_neighbours.c:1837
 #, c-format
 msgid ""
 "\n"
 "SUPU %s, %s, %d,trail[%d]=%s"
 msgstr ""
 
-#: src/dht/gnunet-service-xdht_neighbours.c:1849
+#: src/dht/gnunet-service-xdht_neighbours.c:1857
 #, c-format
 msgid ""
 "\n"
 "SUPU************  FRIEND_PEERMAP of %s"
 msgstr ""
 
-#: src/dht/gnunet-service-xdht_neighbours.c:1859
+#: src/dht/gnunet-service-xdht_neighbours.c:1867
 #, c-format
 msgid ""
 "\n"
 "SUPU %s, %s, %d, friend = %s, friend->trails_count = %d"
 msgstr ""
 
-#: src/dht/gnunet-service-xdht_neighbours.c:1880
+#: src/dht/gnunet-service-xdht_neighbours.c:1888
 #, c-format
 msgid ""
 "\n"
 "SUPU************  FINGER_TABLE of %s"
 msgstr ""
 
-#: src/dht/gnunet-service-xdht_neighbours.c:1889
+#: src/dht/gnunet-service-xdht_neighbours.c:1897
 #, c-format
 msgid ""
 "\n"
 "SUPU %s, %s, %d, finger_table[%d] = %s, trails_count = %d"
 msgstr ""
 
-#: src/dht/gnunet-service-xdht_neighbours.c:1896
+#: src/dht/gnunet-service-xdht_neighbours.c:1904
 #, c-format
 msgid ""
 "\n"
 "SUPU %s, %s, %d, trail_id[%d]=%s"
 msgstr ""
 
-#: src/dht/gnunet-service-xdht_neighbours.c:1902
+#: src/dht/gnunet-service-xdht_neighbours.c:1910
 #, c-format
 msgid ""
 "\n"
 "SUPU %s, %s, %d,trail[%d] = %s "
 msgstr ""
 
-#: src/dht/gnunet-service-xdht_neighbours.c:3551
+#: src/dht/gnunet-service-xdht_neighbours.c:3559
 msgid "# FINGERS_COUNT"
 msgstr ""
 
-#: src/dht/gnunet-service-xdht_neighbours.c:3692
-#: src/dht/gnunet-service-xdht_neighbours.c:3930
-#: src/dht/gnunet-service-xdht_neighbours.c:4083
-#: src/dht/gnunet-service-xdht_neighbours.c:4233
-#: src/dht/gnunet-service-xdht_neighbours.c:4414
-#: src/dht/gnunet-service-xdht_neighbours.c:4929
-#: src/dht/gnunet-service-xdht_neighbours.c:5323
-#: src/dht/gnunet-service-xdht_neighbours.c:5416
-#: src/dht/gnunet-service-xdht_neighbours.c:5505
-#: src/dht/gnunet-service-xdht_neighbours.c:5609
-#: src/dht/gnunet-service-xdht_neighbours.c:5753
-#: src/dht/gnunet-service-xdht_neighbours.c:5842
+#: 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
 msgid "# Bytes received from other peers"
 msgstr ""
 
@@ -2777,132 +2762,6 @@
 msgid "Daemon to run to provide an IP exit node for the VPN"
 msgstr ""
 
-#: src/experimentation/gnunet-daemon-experimentation.c:55
-msgid "Experimentation daemon shutting down ...\n"
-msgstr ""
-
-#: src/experimentation/gnunet-daemon-experimentation.c:77
-msgid "Experimentation daemon starting ...\n"
-msgstr ""
-
-#: src/experimentation/gnunet-daemon-experimentation.c:83
-#, fuzzy
-msgid "Failed to create statistics!\n"
-msgstr "发送消息失败。\n"
-
-#: src/experimentation/gnunet-daemon-experimentation.c:120
-msgid "GNUnet experimentation daemon"
-msgstr ""
-
-#: src/experimentation/gnunet-daemon-experimentation_experiments.c:241
-#, c-format
-msgid "Experiment `%s': Experiment signature is invalid\n"
-msgstr ""
-
-#: src/experimentation/gnunet-daemon-experimentation_experiments.c:250
-#, c-format
-msgid ""
-"Adding experiment `%s' running from `%s' to `%s' every %llu sec. for %llu "
-"sec. \n"
-msgstr ""
-
-#: src/experimentation/gnunet-daemon-experimentation_experiments.c:303
-#, c-format
-msgid "Experiment `%s': Issuer missing\n"
-msgstr ""
-
-#: src/experimentation/gnunet-daemon-experimentation_experiments.c:312
-#, c-format
-msgid "Experiment `%s': Issuer invalid\n"
-msgstr ""
-
-#: src/experimentation/gnunet-daemon-experimentation_experiments.c:320
-#, c-format
-msgid "Experiment `%s': Issuer not accepted!\n"
-msgstr ""
-
-#: src/experimentation/gnunet-daemon-experimentation_experiments.c:330
-#, c-format
-msgid "Experiment `%s': Version missing or invalid \n"
-msgstr ""
-
-#: src/experimentation/gnunet-daemon-experimentation_experiments.c:339
-#, c-format
-msgid "Experiment `%s': Required capabilities missing \n"
-msgstr ""
-
-#: src/experimentation/gnunet-daemon-experimentation_experiments.c:345
-#, c-format
-msgid "Experiment `%s': Required capabilities invalid \n"
-msgstr ""
-
-#: src/experimentation/gnunet-daemon-experimentation_experiments.c:390
-#, fuzzy, c-format
-msgid "Failed to parse file `%s'\n"
-msgstr "解析配置文件“%s”失败\n"
-
-#: src/experimentation/gnunet-daemon-experimentation_experiments.c:420
-#: src/experimentation/gnunet-daemon-experimentation_experiments.c:452
-msgid ""
-"No valid experiment issuers configured! Set value to public keys of issuers! "
-"Exiting.\n"
-msgstr ""
-
-#: src/experimentation/gnunet-daemon-experimentation_experiments.c:435
-#, fuzzy
-msgid "Invalid value for public key\n"
-msgstr "“%s”的参数无效。\n"
-
-#: src/experimentation/gnunet-daemon-experimentation_experiments.c:473
-#, fuzzy, c-format
-msgid "Cannot read experiments file `%s'\n"
-msgstr "无法解析“%s”(%s):%s\n"
-
-#: src/experimentation/gnunet-daemon-experimentation_nodes.c:221
-#, c-format
-msgid "Cannot send message to peer `%s' for experiment `%s'\n"
-msgstr ""
-
-#: src/experimentation/gnunet-daemon-experimentation_nodes.c:309
-#, c-format
-msgid "Sending experimentation request to peer %s\n"
-msgstr ""
-
-#: src/experimentation/gnunet-daemon-experimentation_nodes.c:453
-#, c-format
-msgid "Added peer `%s' as active node\n"
-msgstr ""
-
-#: src/experimentation/gnunet-daemon-experimentation_nodes.c:891
-#, fuzzy, c-format
-msgid "Connected to peer %s\n"
-msgstr "“%s”已连接到“%s”。\n"
-
-#: src/experimentation/gnunet-daemon-experimentation_nodes.c:921
-#, fuzzy, c-format
-msgid "Disconnected from peer %s\n"
-msgstr "“%s”已连接到“%s”。\n"
-
-#: src/experimentation/gnunet-daemon-experimentation_scheduler.c:108
-#, c-format
-msgid "Peer `%s' did not respond to request for experiment `%s'\n"
-msgstr ""
-
-#: src/experimentation/gnunet-daemon-experimentation_scheduler.c:143
-#, c-format
-msgid "Starting inbound experiment `%s' with peer `%s'\n"
-msgstr ""
-
-#: src/experimentation/gnunet-daemon-experimentation_scheduler.c:276
-#, c-format
-msgid "Starting outbound experiment `%s' with peer `%s'\n"
-msgstr ""
-
-#: src/experimentation/gnunet-daemon-experimentation_scheduler.c:294
-#, c-format
-msgid "Received %s message from peer %s for experiment `%s'\n"
-msgstr ""
-
 #: src/fragmentation/defragmentation.c:270
 msgid "# acknowledgements sent for fragment"
 msgstr ""
@@ -2952,71 +2811,71 @@
 msgid "# fragmentation transmissions completed"
 msgstr ""
 
-#: src/fs/fs_api.c:474
+#: src/fs/fs_api.c:484
 #, fuzzy, c-format
 msgid "Could not open file `%s': %s"
 msgstr "打开日志文件“%s”失败:%s\n"
 
-#: src/fs/fs_api.c:485
+#: src/fs/fs_api.c:495
 #, fuzzy, c-format
 msgid "Could not read file `%s': %s"
 msgstr "无法解析“%s”(%s):%s\n"
 
-#: src/fs/fs_api.c:493
+#: src/fs/fs_api.c:503
 #, c-format
 msgid "Short read reading from file `%s'!"
 msgstr ""
 
-#: src/fs/fs_api.c:1101
+#: src/fs/fs_api.c:1111
 #, fuzzy, c-format
 msgid "Failed to resume publishing information `%s': %s\n"
 msgstr "打开日志文件“%s”失败:%s\n"
 
-#: src/fs/fs_api.c:1621
+#: src/fs/fs_api.c:1631
 #, c-format
 msgid "Failure while resuming publishing operation `%s': %s\n"
 msgstr ""
 
-#: src/fs/fs_api.c:1635
+#: src/fs/fs_api.c:1645
 #, fuzzy, c-format
 msgid "Failed to resume publishing operation `%s': %s\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/fs/fs_api.c:2293
+#: src/fs/fs_api.c:2303
 #, c-format
 msgid "Failure while resuming unindexing operation `%s': %s\n"
 msgstr ""
 
-#: src/fs/fs_api.c:2303
+#: src/fs/fs_api.c:2313
 #, fuzzy, c-format
 msgid "Failed to resume unindexing operation `%s': %s\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/fs/fs_api.c:2431 src/fs/fs_api.c:2679
+#: src/fs/fs_api.c:2441 src/fs/fs_api.c:2689
 #, fuzzy, c-format
 msgid "Failed to resume sub-download `%s': %s\n"
 msgstr "打开日志文件“%s”失败:%s\n"
 
-#: src/fs/fs_api.c:2449
+#: src/fs/fs_api.c:2459
 #, fuzzy, c-format
 msgid "Failed to resume sub-search `%s': %s\n"
 msgstr "打开日志文件“%s”失败:%s\n"
 
-#: src/fs/fs_api.c:2464 src/fs/fs_api.c:2483 src/fs/fs_api.c:2975
+#: src/fs/fs_api.c:2474 src/fs/fs_api.c:2493 src/fs/fs_api.c:2985
 #, c-format
 msgid "Failure while resuming search operation `%s': %s\n"
 msgstr ""
 
-#: src/fs/fs_api.c:2669
+#: src/fs/fs_api.c:2679
 #, fuzzy, c-format
 msgid "Failed to resume sub-download `%s': could not open file `%s'\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/fs/fs_api.c:2918
+#: src/fs/fs_api.c:2928
 msgid "Could not resume running search, will resume as paused search\n"
 msgstr ""
 
-#: src/fs/fs_api.c:3013
+#: src/fs/fs_api.c:3023
 #, c-format
 msgid "Failure while resuming download operation `%s': %s\n"
 msgstr ""
@@ -3133,7 +2992,7 @@
 msgstr ""
 
 #: src/fs/fs_publish.c:683 src/fs/fs_publish.c:700 src/fs/fs_publish.c:739
-#: src/fs/fs_publish.c:760 src/fs/fs_publish.c:784 src/fs/fs_publish.c:934
+#: src/fs/fs_publish.c:760 src/fs/fs_publish.c:784 src/fs/fs_publish.c:1034
 #, c-format
 msgid "Can not index file `%s': %s.  Will try to insert instead.\n"
 msgstr ""
@@ -3164,26 +3023,30 @@
 msgid "Failed to get file identifiers for `%s'\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/fs/fs_publish.c:878
+#: src/fs/fs_publish.c:873 src/fs/fs_publish.c:914
+msgid "Can not create LOC URI. Will continue with CHK instead.\n"
+msgstr ""
+
+#: src/fs/fs_publish.c:988
 #, c-format
 msgid "Recursive upload failed at `%s': %s"
 msgstr ""
 
-#: src/fs/fs_publish.c:884
+#: src/fs/fs_publish.c:996
 #, c-format
 msgid "Recursive upload failed: %s"
 msgstr ""
 
-#: src/fs/fs_publish.c:936
+#: src/fs/fs_publish.c:1036
 msgid "needs to be an actual file"
 msgstr ""
 
-#: src/fs/fs_publish.c:1172
+#: src/fs/fs_publish.c:1272
 #, c-format
 msgid "Insufficient space for publishing: %s"
 msgstr ""
 
-#: src/fs/fs_publish.c:1263
+#: src/fs/fs_publish.c:1363
 #, c-format
 msgid "Reserving space for %u entries and %llu bytes for publication\n"
 msgstr ""
@@ -3197,12 +3060,12 @@
 msgid "Internal error."
 msgstr "未知错误。\n"
 
-#: src/fs/fs_search.c:778 src/fs/fs_search.c:848
+#: src/fs/fs_search.c:812 src/fs/fs_search.c:882
 #, fuzzy, c-format
 msgid "Failed to parse URI `%s': %s\n"
 msgstr "运行 %s失败:%s %d\n"
 
-#: src/fs/fs_search.c:907
+#: src/fs/fs_search.c:941
 #, c-format
 msgid "Got result with unknown block type `%d', ignoring"
 msgstr ""
@@ -3339,77 +3202,67 @@
 msgid "Unrecognized URI type"
 msgstr ""
 
-#: src/fs/fs_uri.c:865
-#, fuzzy
-msgid "Lacking key configuration settings.\n"
-msgstr "立即保存配置?"
-
-#: src/fs/fs_uri.c:871
-#, fuzzy, c-format
-msgid "Could not access hostkey file `%s'.\n"
-msgstr "找不到接口“%s”的一个 IP 地址。\n"
-
-#: src/fs/fs_uri.c:1056 src/fs/fs_uri.c:1083
+#: src/fs/fs_uri.c:1043 src/fs/fs_uri.c:1070
 msgid "No keywords specified!\n"
 msgstr ""
 
-#: src/fs/fs_uri.c:1089
+#: src/fs/fs_uri.c:1076
 msgid "Number of double-quotes not balanced!\n"
 msgstr ""
 
-#: src/fs/gnunet-auto-share.c:236
+#: src/fs/gnunet-auto-share.c:237
 #, fuzzy, c-format
 msgid "Failed to load state: %s\n"
 msgstr "运行 %s失败:%s %d\n"
 
-#: src/fs/gnunet-auto-share.c:289 src/fs/gnunet-auto-share.c:299
-#: src/fs/gnunet-auto-share.c:309
+#: src/fs/gnunet-auto-share.c:290 src/fs/gnunet-auto-share.c:300
+#: src/fs/gnunet-auto-share.c:310
 #, fuzzy, c-format
 msgid "Failed to save state to file %s\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/fs/gnunet-auto-share.c:401
+#: src/fs/gnunet-auto-share.c:402
 #, c-format
 msgid "Publication of `%s' done\n"
 msgstr ""
 
-#: src/fs/gnunet-auto-share.c:488
+#: src/fs/gnunet-auto-share.c:490
 #, c-format
 msgid "Publishing `%s'\n"
 msgstr ""
 
-#: src/fs/gnunet-auto-share.c:497
+#: src/fs/gnunet-auto-share.c:499
 #, fuzzy, c-format
 msgid "Failed to run `%s'\n"
 msgstr "运行 %s失败:%s %d\n"
 
-#: src/fs/gnunet-auto-share.c:686
+#: src/fs/gnunet-auto-share.c:688
 #, c-format
 msgid ""
 "You must specify one and only one directory name for automatic publication.\n"
 msgstr ""
 
-#: src/fs/gnunet-auto-share.c:737 src/fs/gnunet-publish.c:886
+#: src/fs/gnunet-auto-share.c:739 src/fs/gnunet-publish.c:888
 msgid "set the desired LEVEL of sender-anonymity"
 msgstr ""
 
-#: src/fs/gnunet-auto-share.c:741 src/fs/gnunet-publish.c:890
+#: src/fs/gnunet-auto-share.c:743 src/fs/gnunet-publish.c:892
 msgid "disable adding the creation time to the metadata of the uploaded file"
 msgstr ""
 
-#: src/fs/gnunet-auto-share.c:744 src/fs/gnunet-publish.c:893
+#: src/fs/gnunet-auto-share.c:746 src/fs/gnunet-publish.c:895
 msgid "do not use libextractor to add keywords or metadata"
 msgstr ""
 
-#: src/fs/gnunet-auto-share.c:747 src/fs/gnunet-publish.c:917
+#: src/fs/gnunet-auto-share.c:749 src/fs/gnunet-publish.c:919
 msgid "specify the priority of the content"
 msgstr ""
 
-#: src/fs/gnunet-auto-share.c:750 src/fs/gnunet-publish.c:924
+#: src/fs/gnunet-auto-share.c:752 src/fs/gnunet-publish.c:926
 msgid "set the desired replication LEVEL"
 msgstr ""
 
-#: src/fs/gnunet-auto-share.c:770
+#: src/fs/gnunet-auto-share.c:772
 msgid "Automatically publish files from a directory on GNUnet"
 msgstr ""
 
@@ -3490,7 +3343,7 @@
 msgid "You need to specify a URI argument.\n"
 msgstr "您必须指定一个昵称\n"
 
-#: src/fs/gnunet-download.c:240 src/fs/gnunet-publish.c:712
+#: src/fs/gnunet-download.c:240 src/fs/gnunet-publish.c:714
 #, fuzzy, c-format
 msgid "Failed to parse URI: %s\n"
 msgstr "运行 %s失败:%s %d\n"
@@ -3503,7 +3356,7 @@
 msgid "Target filename must be specified.\n"
 msgstr ""
 
-#: src/fs/gnunet-download.c:268 src/fs/gnunet-publish.c:856
+#: src/fs/gnunet-download.c:268 src/fs/gnunet-publish.c:858
 #: src/fs/gnunet-search.c:250 src/fs/gnunet-unindex.c:140
 #, fuzzy, c-format
 msgid "Could not initialize `%s' subsystem.\n"
@@ -3606,141 +3459,141 @@
 msgid "Keywords for file `%s' (%s)\n"
 msgstr "无法解析“%s”(%s):%s\n"
 
-#: src/fs/gnunet-publish.c:572
+#: src/fs/gnunet-publish.c:574
 #, fuzzy
 msgid "Could not publish\n"
 msgstr "无法解析“%s”(%s):%s\n"
 
-#: src/fs/gnunet-publish.c:597
+#: src/fs/gnunet-publish.c:599
 msgid "Could not start publishing.\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:631
+#: src/fs/gnunet-publish.c:633
 #, fuzzy, c-format
 msgid "Scanning directory `%s'.\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/fs/gnunet-publish.c:635
+#: src/fs/gnunet-publish.c:637
 #, fuzzy, c-format
 msgid "Scanning file `%s'.\n"
 msgstr "未知的命令“%s”。\n"
 
-#: src/fs/gnunet-publish.c:641
+#: src/fs/gnunet-publish.c:643
 #, c-format
 msgid "There was trouble processing file `%s', skipping it.\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:648
+#: src/fs/gnunet-publish.c:650
 msgid "Preprocessing complete.\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:653
+#: src/fs/gnunet-publish.c:655
 #, fuzzy, c-format
 msgid "Extracting meta data from file `%s' complete.\n"
 msgstr "打开日志文件“%s”失败:%s\n"
 
-#: src/fs/gnunet-publish.c:660
+#: src/fs/gnunet-publish.c:662
 msgid "Meta data extraction has finished.\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:669
+#: src/fs/gnunet-publish.c:671
 #, fuzzy
 msgid "Internal error scanning directory.\n"
 msgstr "未知错误。\n"
 
-#: src/fs/gnunet-publish.c:701
+#: src/fs/gnunet-publish.c:703
 #, c-format
 msgid "Selected pseudonym `%s' unknown\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:733
+#: src/fs/gnunet-publish.c:735
 #, fuzzy, c-format
 msgid "Failed to access `%s': %s\n"
 msgstr "打开日志文件“%s”失败:%s\n"
 
-#: src/fs/gnunet-publish.c:747
+#: src/fs/gnunet-publish.c:749
 msgid ""
 "Failed to start meta directory scanner.  Is gnunet-helper-publish-fs "
 "installed?\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:803
+#: src/fs/gnunet-publish.c:805
 #, c-format
 msgid "Cannot extract metadata from a URI!\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:810
+#: src/fs/gnunet-publish.c:812
 #, c-format
 msgid "You must specify one and only one filename for insertion.\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:816
+#: src/fs/gnunet-publish.c:818
 #, c-format
 msgid "You must NOT specify an URI and a filename.\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:824 src/vpn/gnunet-vpn.c:209
+#: src/fs/gnunet-publish.c:826 src/vpn/gnunet-vpn.c:209
 #, c-format
 msgid "Option `%s' is required when using option `%s'.\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:835 src/fs/gnunet-publish.c:843
-#: src/transport/gnunet-transport.c:1893 src/transport/gnunet-transport.c:1923
-#: src/transport/gnunet-transport.c:1953
+#: src/fs/gnunet-publish.c:837 src/fs/gnunet-publish.c:845
+#: src/transport/gnunet-transport.c:1891 src/transport/gnunet-transport.c:1921
+#: src/transport/gnunet-transport.c:1952
 #, c-format
 msgid "Option `%s' makes no sense without option `%s'.\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:897
+#: src/fs/gnunet-publish.c:899
 msgid ""
 "print list of extracted keywords that would be used, but do not perform "
 "upload"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:901
+#: src/fs/gnunet-publish.c:903
 msgid ""
 "add an additional keyword for the top-level file or directory (this option "
 "can be specified multiple times)"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:905
+#: src/fs/gnunet-publish.c:907
 msgid "set the meta-data for the given TYPE to the given VALUE"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:908
+#: src/fs/gnunet-publish.c:910
 msgid ""
 "do not index, perform full insertion (stores entire file in encrypted form "
 "in GNUnet database)"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:913
+#: src/fs/gnunet-publish.c:915
 msgid ""
 "specify ID of an updated version to be published in the future (for "
 "namespace insertions only)"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:921
+#: src/fs/gnunet-publish.c:923
 msgid "publish the files under the pseudonym NAME (place file into namespace)"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:927
+#: src/fs/gnunet-publish.c:929
 msgid ""
 "only simulate the process but do not do any actual publishing (useful to "
 "compute URIs)"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:931
+#: src/fs/gnunet-publish.c:933
 msgid ""
 "set the ID of this version of the publication (for namespace insertions only)"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:935
+#: src/fs/gnunet-publish.c:937
 msgid ""
 "URI to be published (can be used instead of passing a file to add keywords "
 "to the file with the respective URI)"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:951
+#: src/fs/gnunet-publish.c:953
 msgid "Publish a file or directory on GNUnet"
 msgstr ""
 
@@ -3778,17 +3631,22 @@
 msgid "Search GNUnet for files that were published on GNUnet"
 msgstr ""
 
-#: src/fs/gnunet-service-fs.c:277
+#: src/fs/gnunet-service-fs.c:285
 msgid "# running average P2P latency (ms)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs.c:332 src/fs/gnunet-service-fs.c:540
+#: src/fs/gnunet-service-fs.c:344 src/fs/gnunet-service-fs.c:607
 msgid "# Loopback routes suppressed"
 msgstr ""
 
-#: src/fs/gnunet-service-fs.c:650 src/hostlist/gnunet-daemon-hostlist.c:303
-#: src/sensordashboard/gnunet-service-sensordashboard.c:854
-#: src/sensordashboard/gnunet-service-sensordashboard.c:862
+#: src/fs/gnunet-service-fs.c:731
+#, 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/sensordashboard/gnunet-service-sensordashboard.c:864
+#: src/sensordashboard/gnunet-service-sensordashboard.c:872
 #: src/topology/gnunet-daemon-topology.c:1287
 #: src/topology/gnunet-daemon-topology.c:1294
 #, fuzzy, c-format
@@ -3830,84 +3688,84 @@
 "\n"
 "按任意键继续\n"
 
-#: src/fs/gnunet-service-fs_cp.c:698
+#: src/fs/gnunet-service-fs_cp.c:710
 msgid "# migration stop messages received"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:702
+#: src/fs/gnunet-service-fs_cp.c:714
 #, c-format
 msgid "Migration of content to peer `%s' blocked for %s\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:737
+#: src/fs/gnunet-service-fs_cp.c:750
 msgid "# replies transmitted to other peers"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:743
+#: src/fs/gnunet-service-fs_cp.c:756
 msgid "# replies dropped"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:768 src/fs/gnunet-service-fs_cp.c:1317
+#: src/fs/gnunet-service-fs_cp.c:781 src/fs/gnunet-service-fs_cp.c:1337
 msgid "# P2P searches active"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:861
+#: src/fs/gnunet-service-fs_cp.c:878
 msgid "# artificial delays introduced (ms)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:914
+#: src/fs/gnunet-service-fs_cp.c:934
 msgid "# replies dropped due to type mismatch"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:922
+#: src/fs/gnunet-service-fs_cp.c:942
 msgid "# replies received for other peers"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:936
+#: src/fs/gnunet-service-fs_cp.c:956
 msgid "# replies dropped due to insufficient cover traffic"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:974
+#: src/fs/gnunet-service-fs_cp.c:994
 msgid "# P2P searches destroyed due to ultimate reply"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1042
+#: src/fs/gnunet-service-fs_cp.c:1062
 msgid "# requests done for free (low load)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1067
+#: src/fs/gnunet-service-fs_cp.c:1087
 msgid "# request dropped, priority insufficient"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1077
+#: src/fs/gnunet-service-fs_cp.c:1097
 msgid "# requests done for a price (normal load)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1155
+#: src/fs/gnunet-service-fs_cp.c:1175
 msgid "# GET requests received (from other peers)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1189
+#: src/fs/gnunet-service-fs_cp.c:1209
 msgid "# requests dropped due to initiator not being connected"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1211
+#: src/fs/gnunet-service-fs_cp.c:1231
 msgid "# requests dropped due to missing reverse route"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1262
+#: src/fs/gnunet-service-fs_cp.c:1282
 msgid "# requests dropped due TTL underflow"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1286
+#: src/fs/gnunet-service-fs_cp.c:1306
 msgid "# requests dropped due to higher-TTL request"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1315
+#: src/fs/gnunet-service-fs_cp.c:1335
 msgid "# P2P query messages received and processed"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1691
+#: src/fs/gnunet-service-fs_cp.c:1754
 msgid "# migration stop messages sent"
 msgstr ""
 
@@ -3957,19 +3815,19 @@
 msgid "Indexed file `%s' changed at offset %llu\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_lc.c:202 src/fs/gnunet-service-fs_lc.c:370
+#: src/fs/gnunet-service-fs_lc.c:201 src/fs/gnunet-service-fs_lc.c:371
 msgid "# client searches active"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_lc.c:258
+#: src/fs/gnunet-service-fs_lc.c:259
 msgid "# replies received for local clients"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_lc.c:329
+#: src/fs/gnunet-service-fs_lc.c:330
 msgid "# client searches received"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_lc.c:364
+#: src/fs/gnunet-service-fs_lc.c:365
 msgid "# client searches updated (merged content seen list)"
 msgstr ""
 
@@ -4035,82 +3893,82 @@
 msgid "# results found locally"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1001
+#: src/fs/gnunet-service-fs_pr.c:1003
 msgid "# Datastore `PUT' failures"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1029
+#: src/fs/gnunet-service-fs_pr.c:1031
 msgid "# storage requests dropped due to high load"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1064
+#: src/fs/gnunet-service-fs_pr.c:1069
 msgid "# Replies received from DHT"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1192
+#: src/fs/gnunet-service-fs_pr.c:1200
 msgid "# Replies received from CADET"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1244
+#: src/fs/gnunet-service-fs_pr.c:1252
 #, c-format
 msgid "Datastore lookup already took %s!\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1264
+#: src/fs/gnunet-service-fs_pr.c:1272
 #, c-format
 msgid "On-demand lookup already took %s!\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1311
+#: src/fs/gnunet-service-fs_pr.c:1319
 msgid "# Datastore lookups concluded (no results)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1326
+#: src/fs/gnunet-service-fs_pr.c:1334
 msgid "# Datastore lookups concluded (seen all)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1335
+#: src/fs/gnunet-service-fs_pr.c:1343
 msgid "# Datastore lookups aborted (more than MAX_RESULTS)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1350
+#: src/fs/gnunet-service-fs_pr.c:1358
 msgid "# requested DBLOCK or IBLOCK not found"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1364
+#: src/fs/gnunet-service-fs_pr.c:1372
 msgid "# on-demand blocks matched requests"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1377
+#: src/fs/gnunet-service-fs_pr.c:1385
 msgid "# on-demand lookups performed successfully"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1382
+#: src/fs/gnunet-service-fs_pr.c:1390
 msgid "# on-demand lookups failed"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1409 src/fs/gnunet-service-fs_pr.c:1449
-#: src/fs/gnunet-service-fs_pr.c:1612
+#: src/fs/gnunet-service-fs_pr.c:1417 src/fs/gnunet-service-fs_pr.c:1457
+#: src/fs/gnunet-service-fs_pr.c:1620
 msgid "# Datastore lookups concluded (error queueing)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1467
+#: src/fs/gnunet-service-fs_pr.c:1475
 msgid "# Datastore lookups concluded (found last result)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1478
+#: src/fs/gnunet-service-fs_pr.c:1486
 msgid "# Datastore lookups concluded (load too high)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1588
+#: src/fs/gnunet-service-fs_pr.c:1596
 msgid "# Datastore lookups initiated"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1673
+#: src/fs/gnunet-service-fs_pr.c:1685
 msgid "# GAP PUT messages received"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_push.c:631
+#: src/fs/gnunet-service-fs_push.c:672
 msgid "time required, content pushing disabled"
 msgstr ""
 
@@ -4151,7 +4009,7 @@
 msgid "Refusing `%s' request to HTTP server\n"
 msgstr ""
 
-#: src/gns/gnunet-bcd.c:355 src/hostlist/gnunet-daemon-hostlist_server.c:696
+#: src/gns/gnunet-bcd.c:355 src/hostlist/gnunet-daemon-hostlist_server.c:759
 #, c-format
 msgid "Invalid port number %llu.  Exiting.\n"
 msgstr ""
@@ -4174,59 +4032,59 @@
 msgid "GNUnet HTTP server to create business cards"
 msgstr ""
 
-#: src/gns/gnunet-dns2gns.c:228
+#: src/gns/gnunet-dns2gns.c:234
 #, fuzzy
 msgid "Failed to pack DNS response into UDP packet!\n"
 msgstr "打开日志文件“%s”失败:%s\n"
 
-#: src/gns/gnunet-dns2gns.c:400
+#: src/gns/gnunet-dns2gns.c:406
 #, c-format
 msgid "Cannot parse DNS request from %s\n"
 msgstr ""
 
-#: src/gns/gnunet-dns2gns.c:416
+#: src/gns/gnunet-dns2gns.c:422
 #, c-format
 msgid "Received malformed DNS request from %s\n"
 msgstr ""
 
-#: src/gns/gnunet-dns2gns.c:424
+#: src/gns/gnunet-dns2gns.c:430
 #, c-format
 msgid "Received unsupported DNS request from %s\n"
 msgstr ""
 
-#: src/gns/gnunet-dns2gns.c:701
+#: src/gns/gnunet-dns2gns.c:708
 msgid "No ego configured for `dns2gns` subsystem\n"
 msgstr ""
 
-#: src/gns/gnunet-dns2gns.c:727
+#: src/gns/gnunet-dns2gns.c:734
 msgid "No DNS server specified!\n"
 msgstr ""
 
-#: src/gns/gnunet-dns2gns.c:749
+#: src/gns/gnunet-dns2gns.c:756
 msgid "No valid GNS zone specified!\n"
 msgstr ""
 
-#: src/gns/gnunet-dns2gns.c:770
+#: src/gns/gnunet-dns2gns.c:777
 msgid "IP of recursive DNS resolver to use (required)"
 msgstr ""
 
-#: src/gns/gnunet-dns2gns.c:773
+#: src/gns/gnunet-dns2gns.c:780
 msgid "Authoritative FCFS suffix to use (optional); default: fcfs.zkey.eu"
 msgstr ""
 
-#: src/gns/gnunet-dns2gns.c:776
+#: src/gns/gnunet-dns2gns.c:783
 msgid "Authoritative DNS suffix to use (optional); default: zkey.eu"
 msgstr ""
 
-#: src/gns/gnunet-dns2gns.c:779
+#: src/gns/gnunet-dns2gns.c:786
 msgid "UDP port to listen on for inbound DNS requests; default: 53"
 msgstr ""
 
-#: src/gns/gnunet-dns2gns.c:782
+#: src/gns/gnunet-dns2gns.c:789
 msgid "Public key of the GNS zone to use (overrides default)"
 msgstr ""
 
-#: src/gns/gnunet-dns2gns.c:795
+#: src/gns/gnunet-dns2gns.c:802
 msgid "GNUnet DNS-to-GNS proxy (a DNS server)"
 msgstr ""
 
@@ -4681,25 +4539,25 @@
 "reason to run!\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist.c:323
+#: src/hostlist/gnunet-daemon-hostlist.c:331
 msgid "advertise our hostlist to other peers"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist.c:328
+#: src/hostlist/gnunet-daemon-hostlist.c:336
 msgid ""
 "bootstrap using hostlists (it is highly recommended that you always use this "
 "option)"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist.c:331
+#: src/hostlist/gnunet-daemon-hostlist.c:339
 msgid "enable learning about hostlist servers from other peers"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist.c:335
+#: src/hostlist/gnunet-daemon-hostlist.c:343
 msgid "provide a hostlist server"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist.c:350
+#: src/hostlist/gnunet-daemon-hostlist.c:359
 msgid "GNUnet hostlist server and client"
 msgstr ""
 
@@ -4723,7 +4581,7 @@
 msgstr ""
 
 #: src/hostlist/gnunet-daemon-hostlist_client.c:650
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1401
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1402
 msgid "# advertised hostlist URIs"
 msgstr ""
 
@@ -4774,7 +4632,7 @@
 msgstr ""
 
 #: src/hostlist/gnunet-daemon-hostlist_client.c:1103
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1646
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1655
 msgid "# milliseconds between hostlist downloads"
 msgstr ""
 
@@ -4788,27 +4646,27 @@
 msgid "# active connections"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1347
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1348
 #, c-format
 msgid "Loading saved hostlist entries from file `%s' \n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1352
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1353
 #, c-format
 msgid "Hostlist file `%s' does not exist\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1361
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1362
 #, fuzzy, c-format
 msgid "Could not open file `%s' for reading to load hostlists: %s\n"
 msgstr "无法解析“%s”来确定已方的 IP 地址:%s\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1395
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1396
 #, c-format
 msgid "%u hostlist URIs loaded from file\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1398
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1399
 msgid "# hostlist URIs read from file"
 msgstr ""
 
@@ -4817,151 +4675,145 @@
 msgid "Could not open file `%s' for writing to save hostlists: %s\n"
 msgstr "无法解析“%s”来确定已方的 IP 地址:%s\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1450
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1452
 #, c-format
 msgid "Writing %u hostlist URIs to `%s'\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1474
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1491
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1476
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1493
 #, c-format
 msgid "Error writing hostlist URIs to file `%s'\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1486
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1488
 msgid "# hostlist URIs written to file"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1581
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1588
 #: src/transport/plugin_transport_http_client.c:2274
 #, c-format
 msgid "Invalid proxy type: `%s', disabling proxy! Check configuration!\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1611
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1617
 msgid "Learning is enabled on this peer\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1623
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1630
 msgid "Learning is not enabled on this peer\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1635
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1641
 #, c-format
 msgid ""
 "Since learning is not enabled on this peer, hostlist file `%s' was removed\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1639
-#, c-format
-msgid "Hostlist file `%s' could not be removed\n"
-msgstr ""
-
-#: src/hostlist/gnunet-daemon-hostlist_server.c:165
+#: src/hostlist/gnunet-daemon-hostlist_server.c:181
 msgid "bytes in hostlist"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:190
+#: src/hostlist/gnunet-daemon-hostlist_server.c:206
 msgid "expired addresses encountered"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:225
-#: src/hostlist/gnunet-daemon-hostlist_server.c:535
-#: src/peerinfo-tool/gnunet-peerinfo.c:367
-#: src/peerinfo-tool/gnunet-peerinfo.c:452
-#: src/peerinfo-tool/gnunet-peerinfo.c:535
+#: src/hostlist/gnunet-daemon-hostlist_server.c:241
+#: src/hostlist/gnunet-daemon-hostlist_server.c:590
+#: src/peerinfo-tool/gnunet-peerinfo.c:382
+#: src/peerinfo-tool/gnunet-peerinfo.c:531
 #: src/topology/gnunet-daemon-topology.c:952
 #, c-format
 msgid "Error in communication with PEERINFO service: %s\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:249
+#: src/hostlist/gnunet-daemon-hostlist_server.c:265
 msgid "HELLOs without addresses encountered (ignored)"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:265
+#: src/hostlist/gnunet-daemon-hostlist_server.c:282
 msgid "bytes not included in hostlist (size limit)"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:365
+#: src/hostlist/gnunet-daemon-hostlist_server.c:386
 #, c-format
 msgid "Refusing `%s' request to hostlist server\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:368
+#: src/hostlist/gnunet-daemon-hostlist_server.c:389
 msgid "hostlist requests refused (not HTTP GET)"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:382
+#: src/hostlist/gnunet-daemon-hostlist_server.c:403
 #, c-format
 msgid "Refusing `%s' request with %llu bytes of upload data\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:386
+#: src/hostlist/gnunet-daemon-hostlist_server.c:407
 msgid "hostlist requests refused (upload data)"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:393
+#: src/hostlist/gnunet-daemon-hostlist_server.c:414
 msgid "Could not handle hostlist request since I do not have a response yet\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:396
+#: src/hostlist/gnunet-daemon-hostlist_server.c:417
 msgid "hostlist requests refused (not ready)"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:401
+#: src/hostlist/gnunet-daemon-hostlist_server.c:422
 msgid "Received request for our hostlist\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:403
+#: src/hostlist/gnunet-daemon-hostlist_server.c:424
 msgid "hostlist requests processed"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:449
+#: src/hostlist/gnunet-daemon-hostlist_server.c:485
 msgid "# hostlist advertisements send"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:497
+#: src/hostlist/gnunet-daemon-hostlist_server.c:535
 msgid "Advertisement message could not be queued by core\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:684
-#: src/peerinfo-tool/gnunet-peerinfo.c:696
+#: src/hostlist/gnunet-daemon-hostlist_server.c:747
+#: src/peerinfo-tool/gnunet-peerinfo.c:736
 #: src/transport/gnunet-service-transport.c:1127
 msgid "Could not access PEERINFO service.  Exiting.\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:708
+#: src/hostlist/gnunet-daemon-hostlist_server.c:771
 #, c-format
 msgid "Hostlist service starts on %s:%llu\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:723
+#: src/hostlist/gnunet-daemon-hostlist_server.c:786
 #, c-format
 msgid "Address to obtain hostlist: `%s'\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:736
+#: src/hostlist/gnunet-daemon-hostlist_server.c:799
 #, fuzzy
 msgid "BINDTOIP does not a valid IPv4 address! Ignoring BINDTOIPV4.\n"
 msgstr "“%s”不可用。\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:749
+#: src/hostlist/gnunet-daemon-hostlist_server.c:812
 #, fuzzy
 msgid "BINDTOIP does not a valid IPv4 address! Ignoring BINDTOIPV6.\n"
 msgstr "“%s”不可用。\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:770
+#: src/hostlist/gnunet-daemon-hostlist_server.c:833
 #, fuzzy, c-format
 msgid "`%s' is not a valid IPv4 address! Ignoring BINDTOIPV4.\n"
 msgstr "“%s”不可用。\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:790
+#: src/hostlist/gnunet-daemon-hostlist_server.c:853
 #, fuzzy, c-format
 msgid "`%s' is not a valid IPv6 address! Ignoring BINDTOIPV6.\n"
 msgstr "“%s”不可用。\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:830
+#: src/hostlist/gnunet-daemon-hostlist_server.c:893
 #, c-format
 msgid "Could not start hostlist HTTP server on port %u\n"
 msgstr ""
@@ -5192,7 +5044,7 @@
 msgstr ""
 
 #: src/namestore/gnunet-namestore.c:868
-#: src/peerinfo-tool/gnunet-peerinfo.c:792
+#: src/peerinfo-tool/gnunet-peerinfo.c:817
 #, fuzzy, c-format
 msgid "Invalid URI `%s'\n"
 msgstr "无效条目。\n"
@@ -5592,8 +5444,8 @@
 msgid "Measure quality and performance of the NSE service."
 msgstr "无法访问该服务"
 
-#: src/nse/gnunet-service-nse.c:1517
-#: src/revocation/gnunet-service-revocation.c:798 src/util/gnunet-scrypt.c:248
+#: src/nse/gnunet-service-nse.c:1537
+#: src/revocation/gnunet-service-revocation.c:798 src/util/gnunet-scrypt.c:260
 #, fuzzy
 msgid "Value is too large.\n"
 msgstr "值不在合法范围内。"
@@ -5678,95 +5530,90 @@
 msgid "Could not connect to `%s' service.\n"
 msgstr "无法连接到 %s:%u:%s\n"
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:230
+#: src/peerinfo-tool/gnunet-peerinfo.c:245
 #, fuzzy, c-format
 msgid "%sPeer `%s'\n"
 msgstr "运行 %s失败:%s %d\n"
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:237
+#: src/peerinfo-tool/gnunet-peerinfo.c:252
 #, c-format
 msgid "\tExpires: %s \t %s\n"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:286
+#: src/peerinfo-tool/gnunet-peerinfo.c:301
 #, fuzzy, c-format
 msgid "Failure: Cannot convert address to string for peer `%s'\n"
 msgstr "找不到接口“%s”的一个 IP 地址。\n"
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:462
-#, fuzzy, c-format
-msgid "Failure: Did not receive %s\n"
-msgstr "打开日志文件“%s”失败:%s\n"
-
-#: src/peerinfo-tool/gnunet-peerinfo.c:471
+#: src/peerinfo-tool/gnunet-peerinfo.c:463
 #, c-format
 msgid "Failure: Received invalid %s\n"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:483
+#: src/peerinfo-tool/gnunet-peerinfo.c:477
 #, fuzzy, c-format
 msgid "Failed to write HELLO with %u bytes to file `%s'\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:502
+#: src/peerinfo-tool/gnunet-peerinfo.c:496
 #, c-format
 msgid "Wrote %s HELLO containing %u addresses with %u bytes to file `%s'\n"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:570
+#: src/peerinfo-tool/gnunet-peerinfo.c:566
 #, c-format
 msgid "Failure adding HELLO: %s\n"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:687
+#: src/peerinfo-tool/gnunet-peerinfo.c:695
 #, fuzzy, c-format
+msgid "Failed to get my own HELLO from this peer!\n"
+msgstr "发送消息失败。\n"
+
+#: src/peerinfo-tool/gnunet-peerinfo.c:727
+#, fuzzy, c-format
 msgid "Service `%s' is not running, please start GNUnet\n"
 msgstr "服务已删除。\n"
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:718 src/util/gnunet-scrypt.c:224
+#: src/peerinfo-tool/gnunet-peerinfo.c:841
 #, c-format
-msgid "Loading hostkey from `%s' failed.\n"
-msgstr ""
-
-#: src/peerinfo-tool/gnunet-peerinfo.c:816
-#, c-format
 msgid "I am peer `%s'.\n"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:865
+#: src/peerinfo-tool/gnunet-peerinfo.c:882
 msgid "don't resolve host names"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:868
+#: src/peerinfo-tool/gnunet-peerinfo.c:885
 msgid "output only the identity strings"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:871
+#: src/peerinfo-tool/gnunet-peerinfo.c:888
 msgid "include friend-only information"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:874
+#: src/peerinfo-tool/gnunet-peerinfo.c:891
 msgid "output our own identity only"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:877
+#: src/peerinfo-tool/gnunet-peerinfo.c:894
 #, fuzzy
 msgid "list all known peers"
 msgstr "列出所有网络适配器"
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:880
+#: src/peerinfo-tool/gnunet-peerinfo.c:897
 msgid "dump hello to file"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:883
+#: src/peerinfo-tool/gnunet-peerinfo.c:900
 msgid "also output HELLO uri(s)"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:886
+#: src/peerinfo-tool/gnunet-peerinfo.c:903
 msgid "add given HELLO uri to the database"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:900
+#: src/peerinfo-tool/gnunet-peerinfo.c:917
 #, fuzzy
 msgid "Print information about peers."
 msgstr "无法获取有关用户“%s”的信息:%s\n"
@@ -5793,71 +5640,76 @@
 msgid "peerstore"
 msgstr ""
 
-#: src/peerstore/gnunet-service-peerstore.c:343
+#: src/peerstore/gnunet-service-peerstore.c:384
 #, fuzzy
 msgid "Malformed iterate request.\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/peerstore/gnunet-service-peerstore.c:350
+#: src/peerstore/gnunet-service-peerstore.c:391
 msgid "Sub system not supplied in client iterate request.\n"
 msgstr ""
 
-#: src/peerstore/gnunet-service-peerstore.c:399
+#: src/peerstore/gnunet-service-peerstore.c:451
 #, fuzzy
 msgid "Malformed store request from client\n"
 msgstr "找不到接口“%s”的一个 IP 地址。\n"
 
-#: src/peerstore/gnunet-service-peerstore.c:407
+#: src/peerstore/gnunet-service-peerstore.c:459
 msgid "Full key not supplied in client store request\n"
 msgstr ""
 
-#: src/peerstore/gnunet-service-peerstore.c:427
-msgid "Failed to store requested value, sqlite database error."
-msgstr ""
+#: src/peerstore/gnunet-service-peerstore.c:478
+#, fuzzy
+msgid "Failed to store requested value, database error."
+msgstr "发送消息失败。\n"
 
-#: src/peerstore/gnunet-service-peerstore.c:509
+#: src/peerstore/gnunet-service-peerstore.c:557
 msgid "No database backend configured\n"
 msgstr ""
 
-#: src/peerstore/gnunet-service-peerstore.c:520
+#: src/peerstore/gnunet-service-peerstore.c:568
 #, fuzzy, c-format
 msgid "Could not load database backend `%s'\n"
 msgstr "无法解析“%s”(%s):%s\n"
 
-#: src/peerstore/peerstore_api.c:299 src/sensor/sensor_api.c:179
+#: src/peerstore/peerstore_api.c:329 src/sensor/sensor_api.c:179
 #, c-format
 msgid "Received an error notification from MQ of type: %d\n"
 msgstr ""
 
-#: src/peerstore/peerstore_api.c:370
+#: src/peerstore/peerstore_api.c:375
+msgid "timeout"
+msgstr ""
+
+#: src/peerstore/peerstore_api.c:402
 msgid "Iteration canceled due to reconnection."
 msgstr ""
 
-#: src/peerstore/peerstore_api.c:635
+#: src/peerstore/peerstore_api.c:681
 #, fuzzy
 msgid "Unexpected iteration response, this should not happen.\n"
 msgstr "输出格式未知,不应出现这种情况。\n"
 
-#: src/peerstore/peerstore_api.c:646
+#: src/peerstore/peerstore_api.c:692
 #, fuzzy
 msgid "Error communicating with `PEERSTORE' service."
 msgstr "连接 %s:%u 出错。守护程序在运行吗?\n"
 
-#: src/peerstore/peerstore_api.c:665
+#: src/peerstore/peerstore_api.c:711
 #, fuzzy
 msgid "Received a malformed response from service."
 msgstr "“%s”的参数无效。\n"
 
-#: src/peerstore/peerstore_api.c:804
+#: src/peerstore/peerstore_api.c:821
 msgid ""
 "Problem receiving a watch response, no way to determine which request.\n"
 msgstr ""
 
-#: src/peerstore/peerstore_api.c:815
+#: src/peerstore/peerstore_api.c:833
 msgid "Received a watch result for a non existing watch.\n"
 msgstr ""
 
-#: src/peerstore/plugin_peerstore_sqlite.c:377
+#: src/peerstore/plugin_peerstore_sqlite.c:398
 #: src/psycstore/plugin_psycstore_sqlite.c:286
 #, fuzzy, c-format
 msgid ""
@@ -5865,7 +5717,7 @@
 "  %s\n"
 msgstr "创建用户出错"
 
-#: src/peerstore/plugin_peerstore_sqlite.c:401
+#: src/peerstore/plugin_peerstore_sqlite.c:422
 #: src/psycstore/plugin_psycstore_sqlite.c:263
 #, fuzzy, c-format
 msgid ""
@@ -5873,7 +5725,7 @@
 "  %s\n"
 msgstr "创建用户出错"
 
-#: src/peerstore/plugin_peerstore_sqlite.c:483
+#: src/peerstore/plugin_peerstore_sqlite.c:504
 #, fuzzy, c-format
 msgid "Unable to create indices: %s.\n"
 msgstr "发送消息失败。\n"
@@ -5975,7 +5827,7 @@
 msgid "`%s' failed at %s:%d with error: %s (%d)\n"
 msgstr "“%s”于 %s:%d 处失败,错误为:%s\n"
 
-#: src/psycstore/plugin_psycstore_sqlite.c:1933
+#: src/psycstore/plugin_psycstore_sqlite.c:1932
 #, fuzzy
 msgid "SQLite database running\n"
 msgstr "sqlite 数据仓库"
@@ -6246,61 +6098,70 @@
 msgid "rps"
 msgstr ""
 
-#: src/scalarproduct/gnunet-scalarproduct.c:222
+#: src/scalarproduct/gnunet-scalarproduct.c:221
 #, fuzzy
 msgid "You must specify at least one message ID to check!\n"
 msgstr "您必须指定一个昵称\n"
 
-#: src/scalarproduct/gnunet-scalarproduct.c:229
+#: src/scalarproduct/gnunet-scalarproduct.c:228
 msgid "This program needs a session identifier for comparing vectors.\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-scalarproduct.c:242
+#: src/scalarproduct/gnunet-scalarproduct.c:241
 #, c-format
 msgid ""
 "Tried to set initiator mode, as peer ID was given. However, `%s' is not a "
 "valid peer identifier.\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-scalarproduct.c:253
-msgid "Need elements to compute the vectorproduct, got none.\n"
+#: src/scalarproduct/gnunet-scalarproduct.c:259
+msgid "Need elements to compute the scalarproduct, got none.\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-scalarproduct.c:275
+#: src/scalarproduct/gnunet-scalarproduct.c:281
 #, fuzzy, c-format
 msgid "Malformed input, could not parse `%s'\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/scalarproduct/gnunet-scalarproduct.c:294
+#: src/scalarproduct/gnunet-scalarproduct.c:299
 #, fuzzy, c-format
 msgid "Could not convert `%s' to int64_t.\n"
 msgstr "无法连接到 %s:%u:%s\n"
 
-#: src/scalarproduct/gnunet-scalarproduct.c:344
+#: src/scalarproduct/gnunet-scalarproduct.c:326
+#, c-format
+msgid "Failed to initiate computation, were all keys unique?\n"
+msgstr ""
+
+#: src/scalarproduct/gnunet-scalarproduct.c:350
 msgid ""
 "A comma separated list of elements to compare as vector with our remote peer."
 msgstr ""
 
-#: src/scalarproduct/gnunet-scalarproduct.c:347
+#: src/scalarproduct/gnunet-scalarproduct.c:353
 msgid ""
 "[Optional] peer to calculate our scalarproduct with. If this parameter is "
 "not given, the service will wait for a remote peer to compute the request."
 msgstr ""
 
-#: src/scalarproduct/gnunet-scalarproduct.c:350
+#: src/scalarproduct/gnunet-scalarproduct.c:356
 msgid "Transaction ID shared with peer."
 msgstr ""
 
-#: src/scalarproduct/gnunet-scalarproduct.c:359
+#: src/scalarproduct/gnunet-scalarproduct.c:365
 msgid "Calculate the Vectorproduct with a GNUnet peer."
 msgstr ""
 
-#: src/scalarproduct/gnunet-service-scalarproduct_alice.c:1418
-#: src/scalarproduct/gnunet-service-scalarproduct_bob.c:1529
+#: src/scalarproduct/gnunet-service-scalarproduct_alice.c:1419
+#: src/scalarproduct/gnunet-service-scalarproduct_bob.c:1564
 #, fuzzy
 msgid "Connect to CADET failed\n"
 msgstr "“%s”已连接到“%s”。\n"
 
+#: src/scalarproduct/scalarproduct_api.c:296
+msgid "Keys given to SCALARPRODUCT not unique!\n"
+msgstr ""
+
 #: src/secretsharing/gnunet-secretsharing-profiler.c:613
 msgid "dkg start delay"
 msgstr ""
@@ -6340,54 +6201,54 @@
 msgid "sensor"
 msgstr ""
 
-#: src/sensor/gnunet-sensor-profiler.c:728
+#: src/sensor/gnunet-sensor-profiler.c:729
 msgid "Invalid or missing number of peers. Set at least 2 peers.\n"
 msgstr ""
 
-#: src/sensor/gnunet-sensor-profiler.c:735
+#: src/sensor/gnunet-sensor-profiler.c:736
 #, fuzzy
 msgid "Missing or invalid topology file.\n"
 msgstr "“%s”的参数无效。\n"
 
-#: src/sensor/gnunet-sensor-profiler.c:781
+#: src/sensor/gnunet-sensor-profiler.c:782
 #, fuzzy
 msgid "Number of peers to run"
 msgstr "迭代次数"
 
-#: src/sensor/gnunet-sensor-profiler.c:783
+#: src/sensor/gnunet-sensor-profiler.c:784
 msgid "Path to topology file"
 msgstr ""
 
-#: src/sensor/gnunet-sensor-profiler.c:786
+#: src/sensor/gnunet-sensor-profiler.c:787
 msgid "Change the interval of running sensors to given value"
 msgstr ""
 
-#: src/sensor/gnunet-sensor-profiler.c:789
+#: src/sensor/gnunet-sensor-profiler.c:790
 #, fuzzy
 msgid "Number of peers to simulate anomalies on"
 msgstr "迭代次数"
 
-#: src/sensor/gnunet-sensor-profiler.c:796
+#: src/sensor/gnunet-sensor-profiler.c:797
 #, fuzzy
 msgid "Profiler for sensor service"
 msgstr "创建用户出错"
 
-#: src/sensor/gnunet-service-sensor_analysis.c:202
+#: src/sensor/gnunet-service-sensor_analysis.c:204
 #, fuzzy
 msgid "Received an invalid sensor value."
 msgstr "“%s”的参数无效。\n"
 
-#: src/sensor/gnunet-service-sensor_analysis.c:293
+#: src/sensor/gnunet-service-sensor_analysis.c:295
 #, fuzzy
 msgid "Analysis model not defined in configuration.\n"
 msgstr "找不到主机“%s”的 IP:%s\n"
 
-#: src/sensor/gnunet-service-sensor_analysis.c:302
+#: src/sensor/gnunet-service-sensor_analysis.c:304
 #, fuzzy, c-format
 msgid "Could not load analysis model `%s'.\n"
 msgstr "找不到接口“%s”的一个 IP 地址。\n"
 
-#: src/sensor/gnunet-service-sensor_analysis.c:310
+#: src/sensor/gnunet-service-sensor_analysis.c:312
 #, fuzzy
 msgid "Could not connect to peerstore service.\n"
 msgstr "无法连接到 %s:%u:%s\n"
@@ -6428,33 +6289,33 @@
 msgid "Failed to create pow and signature block.\n"
 msgstr "发送消息失败。\n"
 
-#: src/sensor/gnunet-service-sensor_reporting.c:1044
+#: src/sensor/gnunet-service-sensor_reporting.c:1046
 #, c-format
 msgid "PEERSTORE error: %s.\n"
 msgstr ""
 
-#: src/sensor/gnunet-service-sensor_reporting.c:1149
-#: src/sensor/gnunet-service-sensor_reporting.c:1407
+#: src/sensor/gnunet-service-sensor_reporting.c:1151
+#: src/sensor/gnunet-service-sensor_reporting.c:1409
 #, fuzzy
 msgid "Failed to connect to CORE service.\n"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/sensor/gnunet-service-sensor_reporting.c:1156
+#: src/sensor/gnunet-service-sensor_reporting.c:1158
 msgid "Peer identity received from CORE init doesn't match ours.\n"
 msgstr ""
 
-#: src/sensor/gnunet-service-sensor_reporting.c:1396
+#: src/sensor/gnunet-service-sensor_reporting.c:1398
 #, fuzzy
 msgid "Failed to connect to peerstore service.\n"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/sensor/gnunet-service-sensor_reporting.c:1417
+#: src/sensor/gnunet-service-sensor_reporting.c:1419
 #: src/sensor/gnunet-service-sensor_update.c:781
 #, fuzzy
 msgid "Failed to connect to CADET service.\n"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/sensor/gnunet-service-sensor_reporting.c:1424
+#: src/sensor/gnunet-service-sensor_reporting.c:1426
 #, fuzzy
 msgid "Failed to load my private key.\n"
 msgstr "运行 %s失败:%s %d\n"
@@ -6560,30 +6421,30 @@
 msgid "Error loading sensor from file: %s\n"
 msgstr "创建用户出错"
 
-#: src/set/gnunet-service-set.c:1529
+#: src/set/gnunet-service-set.c:1531
 #, fuzzy
 msgid "Could not connect to cadet service\n"
 msgstr "无法连接到 %s:%u:%s\n"
 
-#: src/set/gnunet-set-ibf-profiler.c:221
+#: src/set/gnunet-set-ibf-profiler.c:237
 #, fuzzy
 msgid "number of element in set A-B"
 msgstr "迭代次数"
 
-#: src/set/gnunet-set-ibf-profiler.c:224
+#: src/set/gnunet-set-ibf-profiler.c:240
 #, fuzzy
 msgid "number of element in set B-A"
 msgstr "迭代次数"
 
-#: src/set/gnunet-set-ibf-profiler.c:227
+#: src/set/gnunet-set-ibf-profiler.c:243
 msgid "number of common elements in A and B"
 msgstr ""
 
-#: src/set/gnunet-set-ibf-profiler.c:230
+#: src/set/gnunet-set-ibf-profiler.c:246
 msgid "hash num"
 msgstr ""
 
-#: src/set/gnunet-set-ibf-profiler.c:233
+#: src/set/gnunet-set-ibf-profiler.c:249
 msgid "ibf size"
 msgstr ""
 
@@ -6591,93 +6452,93 @@
 msgid "oeration to execute"
 msgstr ""
 
-#: src/statistics/gnunet-service-statistics.c:280
+#: src/statistics/gnunet-service-statistics.c:323
 #, c-format
 msgid "Loading %llu bytes of statistics from `%s'\n"
 msgstr ""
 
-#: src/statistics/gnunet-service-statistics.c:346
+#: src/statistics/gnunet-service-statistics.c:434
 #, c-format
 msgid "Wrote %llu bytes of statistics to `%s'\n"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:140
+#: src/statistics/gnunet-statistics.c:145
 #, fuzzy
 msgid "Failed to obtain statistics.\n"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/statistics/gnunet-statistics.c:142
+#: src/statistics/gnunet-statistics.c:148
 #, fuzzy, c-format
 msgid "Failed to obtain statistics from host `%s:%llu'\n"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/statistics/gnunet-statistics.c:189
+#: src/statistics/gnunet-statistics.c:198
 msgid "Missing argument: subsystem \n"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:195
+#: src/statistics/gnunet-statistics.c:204
 msgid "Missing argument: name\n"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:226
+#: src/statistics/gnunet-statistics.c:235
 #, c-format
 msgid "No subsystem or name given\n"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:234
+#: src/statistics/gnunet-statistics.c:243
 #, fuzzy, c-format
 msgid "Failed to initialize watch routine\n"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/statistics/gnunet-statistics.c:261
+#: src/statistics/gnunet-statistics.c:269
 #, fuzzy, c-format
 msgid "Trying to connect to remote host, but service `%s' is not running\n"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/statistics/gnunet-statistics.c:269
+#: src/statistics/gnunet-statistics.c:282
 #, fuzzy, c-format
 msgid "A port is required to connect to host `%s'\n"
 msgstr "无法连接到 %s:%u:%s\n"
 
-#: src/statistics/gnunet-statistics.c:276
+#: src/statistics/gnunet-statistics.c:290
 #, c-format
 msgid "A port has to be between 1 and 65535 to connect to host `%s'\n"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:308
+#: src/statistics/gnunet-statistics.c:323
 #, fuzzy, c-format
 msgid "Invalid argument `%s'\n"
 msgstr "“%s”的参数无效。\n"
 
-#: src/statistics/gnunet-statistics.c:334
+#: src/statistics/gnunet-statistics.c:349
 msgid "limit output to statistics for the given NAME"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:337
+#: src/statistics/gnunet-statistics.c:352
 msgid "make the value being set persistent"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:340
+#: src/statistics/gnunet-statistics.c:355
 msgid "limit output to the given SUBSYSTEM"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:343
+#: src/statistics/gnunet-statistics.c:358
 msgid "just print the statistics value"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:346
+#: src/statistics/gnunet-statistics.c:361
 msgid "watch value continuously"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:349
+#: src/statistics/gnunet-statistics.c:364
 msgid "connect to remote host"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:352
+#: src/statistics/gnunet-statistics.c:367
 msgid "port for remote host"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:364
+#: src/statistics/gnunet-statistics.c:379
 msgid "Print statistics about GNUnet operations."
 msgstr ""
 
@@ -6692,54 +6553,55 @@
 "might have been lost!\n"
 msgstr ""
 
-#: src/testbed/generate-underlay-topology.c:223
-msgid "Need atleast 2 arguments\n"
-msgstr ""
+#: src/testbed/generate-underlay-topology.c:225
+#, fuzzy
+msgid "Need at least 2 arguments\n"
+msgstr "您必须指定一个昵称\n"
 
-#: src/testbed/generate-underlay-topology.c:228
+#: src/testbed/generate-underlay-topology.c:230
 msgid "Database filename missing\n"
 msgstr ""
 
-#: src/testbed/generate-underlay-topology.c:235
+#: src/testbed/generate-underlay-topology.c:237
 msgid "Topology string missing\n"
 msgstr ""
 
-#: src/testbed/generate-underlay-topology.c:240
+#: src/testbed/generate-underlay-topology.c:242
 #, fuzzy, c-format
 msgid "Invalid topology: %s\n"
 msgstr "“%s”的参数无效。\n"
 
-#: src/testbed/generate-underlay-topology.c:253
+#: src/testbed/generate-underlay-topology.c:255
 #, c-format
 msgid "An argument is missing for given topology `%s'\n"
 msgstr ""
 
-#: src/testbed/generate-underlay-topology.c:259
+#: src/testbed/generate-underlay-topology.c:261
 #, fuzzy, c-format
 msgid "Invalid argument `%s' given as topology argument\n"
 msgstr "“%s”的参数无效。\n"
 
-#: src/testbed/generate-underlay-topology.c:267
+#: src/testbed/generate-underlay-topology.c:269
 #, c-format
 msgid "Filename argument missing for topology `%s'\n"
 msgstr ""
 
-#: src/testbed/generate-underlay-topology.c:281
+#: src/testbed/generate-underlay-topology.c:283
 #, c-format
 msgid "Second argument for topology `%s' is missing\n"
 msgstr ""
 
-#: src/testbed/generate-underlay-topology.c:287
+#: src/testbed/generate-underlay-topology.c:289
 #, fuzzy, c-format
 msgid "Invalid argument `%s'; expecting unsigned int\n"
 msgstr "“%s”的参数无效。\n"
 
-#: src/testbed/generate-underlay-topology.c:336
+#: src/testbed/generate-underlay-topology.c:338
 #: src/testbed/gnunet-testbed-profiler.c:293
 msgid "create COUNT number of peers"
 msgstr ""
 
-#: src/testbed/generate-underlay-topology.c:345
+#: src/testbed/generate-underlay-topology.c:347
 msgid ""
 "Generates SQLite3 database representing a given underlay topology.\n"
 "Usage: gnunet-underlay-topology [OPTIONS] db-filename TOPO [TOPOOPTS]\n"
@@ -7123,21 +6985,26 @@
 msgid "GNUnet topology control (maintaining P2P cadet and F2F constraints)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_blacklist.c:271
+#: src/transport/gnunet-service-transport_blacklist.c:274
 #, fuzzy, c-format
 msgid "Adding blacklisting entry for peer `%s'\n"
 msgstr "卸载 GNUnet 服务"
 
-#: src/transport/gnunet-service-transport_blacklist.c:279
+#: src/transport/gnunet-service-transport_blacklist.c:283
 #, c-format
 msgid "Adding blacklisting entry for peer `%s':`%s'\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_blacklist.c:465
-#: src/transport/gnunet-service-transport_blacklist.c:748
+#: src/transport/gnunet-service-transport_blacklist.c:476
+#: src/transport/gnunet-service-transport_blacklist.c:766
 msgid "# disconnects due to blacklist"
 msgstr ""
 
+#: src/transport/gnunet-service-transport_blacklist.c:769
+#, fuzzy, c-format
+msgid "Disallowing connection to peer `%s' on transport %s\n"
+msgstr "解析配置文件“%s”失败\n"
+
 #: src/transport/gnunet-service-transport.c:220
 msgid "# bytes payload discarded due to not connected peer"
 msgstr ""
@@ -7167,234 +7034,209 @@
 msgid "Transport service is lacking key configuration settings. Exiting.\n"
 msgstr "立即保存配置?"
 
-#: src/transport/gnunet-service-transport_clients.c:463
-#, c-format
-msgid "Dropping message of type %u and size %u, have %u/%u messages pending\n"
-msgstr ""
-
-#: src/transport/gnunet-service-transport_clients.c:470
+#: src/transport/gnunet-service-transport_clients.c:481
 msgid "# messages dropped due to slow client"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_clients.c:630
-#, c-format
-msgid "Rejecting control connection from peer `%s', which is not me!\n"
-msgstr ""
-
-#: src/transport/gnunet-service-transport_clients.c:771
+#: src/transport/gnunet-service-transport_clients.c:774
 msgid "# bytes payload dropped (other peer was not connected)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_clients.c:804
+#: 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:810
-#, fuzzy, c-format
-msgid "Blacklist allows connection attempt to peer `%s'\n"
-msgstr "初始化“%s”服务失败。\n"
-
-#: src/transport/gnunet-service-transport_clients.c:836
+#: src/transport/gnunet-service-transport_clients.c:843
 msgid "# REQUEST CONNECT messages received"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_clients.c:850
-#, fuzzy, c-format
-msgid "Received a request connect message for peer `%s'\n"
-msgstr "找不到接口“%s”的一个 IP 地址。\n"
-
-#: src/transport/gnunet-service-transport_clients.c:861
+#: src/transport/gnunet-service-transport_clients.c:882
 msgid "# REQUEST DISCONNECT messages received"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_clients.c:875
-#, fuzzy, c-format
-msgid "Received a request disconnect message for peer `%s'\n"
-msgstr "打开日志文件“%s”失败:%s\n"
-
 #: src/transport/gnunet-service-transport_hello.c:182
 msgid "# refreshed my HELLO"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1095
+#: src/transport/gnunet-service-transport_neighbours.c:1099
 msgid "# DISCONNECT messages sent"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1220
-#: src/transport/gnunet-service-transport_neighbours.c:1635
+#: src/transport/gnunet-service-transport_neighbours.c:1224
+#: src/transport/gnunet-service-transport_neighbours.c:1639
 msgid "# bytes in message queue for other peers"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1225
+#: src/transport/gnunet-service-transport_neighbours.c:1229
 msgid "# messages transmitted to other peers"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1230
+#: src/transport/gnunet-service-transport_neighbours.c:1234
 msgid "# transmission failures for messages to other peers"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1288
+#: src/transport/gnunet-service-transport_neighbours.c:1292
 msgid "# messages timed out while in transport queue"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1349
+#: src/transport/gnunet-service-transport_neighbours.c:1353
 msgid "# keepalives sent"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1382
+#: src/transport/gnunet-service-transport_neighbours.c:1386
 msgid "# KEEPALIVE messages discarded (peer unknown)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1390
+#: src/transport/gnunet-service-transport_neighbours.c:1394
 msgid "# KEEPALIVE messages discarded (no session)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1437
+#: src/transport/gnunet-service-transport_neighbours.c:1441
 msgid "# KEEPALIVE_RESPONSE messages discarded (not connected)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1446
+#: src/transport/gnunet-service-transport_neighbours.c:1450
 msgid "# KEEPALIVE_RESPONSE messages discarded (not expected)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1454
+#: src/transport/gnunet-service-transport_neighbours.c:1458
 msgid "# KEEPALIVE_RESPONSE messages discarded (address changed)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1462
+#: src/transport/gnunet-service-transport_neighbours.c:1466
 msgid "# KEEPALIVE_RESPONSE messages discarded (wrong nonce)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1540
+#: src/transport/gnunet-service-transport_neighbours.c:1544
 msgid "# messages discarded due to lack of neighbour record"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1574
+#: src/transport/gnunet-service-transport_neighbours.c:1578
 msgid "# bandwidth quota violations by other peers"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1590
+#: src/transport/gnunet-service-transport_neighbours.c:1594
 msgid "# ms throttling suggested"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1685
+#: src/transport/gnunet-service-transport_neighbours.c:1689
 #, fuzzy, c-format
 msgid "Failed to send SYN message to peer `%s' using address `%s' session %p\n"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1712
+#: src/transport/gnunet-service-transport_neighbours.c:1716
 #, fuzzy
 msgid "# Failed attempts to switch addresses (failed to send SYN CONT)"
 msgstr "打开日志文件“%s”失败:%s\n"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1757
+#: src/transport/gnunet-service-transport_neighbours.c:1761
 #, fuzzy
 msgid "# SYN messages sent"
 msgstr "消息尺寸"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1773
+#: src/transport/gnunet-service-transport_neighbours.c:1777
 #, fuzzy, c-format
 msgid "Failed to transmit SYN message via plugin to %s\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1800
+#: src/transport/gnunet-service-transport_neighbours.c:1804
 #, fuzzy
 msgid "# Failed attempts to switch addresses (failed to send SYN)"
 msgstr "打开日志文件“%s”失败:%s\n"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1849
+#: src/transport/gnunet-service-transport_neighbours.c:1853
 #, fuzzy, c-format
 msgid ""
 "Failed to send SYN_ACK message to peer `%s' using address `%s' session %p\n"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1904
+#: src/transport/gnunet-service-transport_neighbours.c:1908
 msgid "# SYN_ACK messages sent"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1919
+#: src/transport/gnunet-service-transport_neighbours.c:1923
 #, fuzzy, c-format
 msgid "Failed to transmit SYN_ACK message via plugin to %s\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/transport/gnunet-service-transport_neighbours.c:2199
+#: src/transport/gnunet-service-transport_neighbours.c:2203
 #, fuzzy, c-format
 msgid "Blacklisting disapproved to connect to peer `%s'\n"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/transport/gnunet-service-transport_neighbours.c:2324
+#: src/transport/gnunet-service-transport_neighbours.c:2328
 msgid "# SYN messages received"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:2329
+#: src/transport/gnunet-service-transport_neighbours.c:2333
 #, c-format
 msgid "SYN request from peer `%s' ignored due impending shutdown\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:2626
+#: src/transport/gnunet-service-transport_neighbours.c:2630
 msgid "# Attempts to switch addresses"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3047
+#: src/transport/gnunet-service-transport_neighbours.c:3051
 #, fuzzy
 msgid "# Failed attempts to switch addresses (no response)"
 msgstr "打开日志文件“%s”失败:%s\n"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3142
+#: src/transport/gnunet-service-transport_neighbours.c:3146
 msgid "# SYN_ACK messages received"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3150
+#: src/transport/gnunet-service-transport_neighbours.c:3154
 msgid "# unexpected SYN_ACK messages (no peer)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3164
-#: src/transport/gnunet-service-transport_neighbours.c:3199
+#: src/transport/gnunet-service-transport_neighbours.c:3168
+#: src/transport/gnunet-service-transport_neighbours.c:3203
 msgid "# unexpected SYN_ACK messages (not ready)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3211
+#: src/transport/gnunet-service-transport_neighbours.c:3215
 msgid "# unexpected SYN_ACK messages (waiting on ATS)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3234
+#: src/transport/gnunet-service-transport_neighbours.c:3238
 msgid "# Successful attempts to switch addresses"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3242
+#: src/transport/gnunet-service-transport_neighbours.c:3246
 msgid "# unexpected SYN_ACK messages (disconnecting)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3441
+#: src/transport/gnunet-service-transport_neighbours.c:3445
 msgid "# ACK messages received"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3477
+#: src/transport/gnunet-service-transport_neighbours.c:3481
 msgid "# unexpected ACK messages"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3551
+#: src/transport/gnunet-service-transport_neighbours.c:3555
 msgid "# SET QUOTA messages ignored (no such peer)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3566
+#: src/transport/gnunet-service-transport_neighbours.c:3570
 msgid "# disconnects due to quota of 0"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3611
+#: src/transport/gnunet-service-transport_neighbours.c:3615
 msgid "# disconnect messages ignored (malformed)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3617
+#: src/transport/gnunet-service-transport_neighbours.c:3621
 msgid "# DISCONNECT messages received"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3626
+#: src/transport/gnunet-service-transport_neighbours.c:3630
 msgid "# disconnect messages ignored (timestamp)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3753
+#: src/transport/gnunet-service-transport_neighbours.c:3757
 msgid "# disconnected from peer upon explicit request"
 msgstr ""
 
@@ -7506,63 +7348,63 @@
 msgid "Adding `%s' without addresses for peer `%s'\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:573
+#: src/transport/gnunet-transport.c:578
 #, c-format
 msgid "Transmitted %llu bytes/s (%llu bytes in %s)\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:582
+#: src/transport/gnunet-transport.c:587
 #: 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:614
+#: src/transport/gnunet-transport.c:619
 #, fuzzy, c-format
 msgid "Failed to connect to `%s'\n"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/transport/gnunet-transport.c:629
+#: src/transport/gnunet-transport.c:634
 #, fuzzy, c-format
 msgid "Failed to resolve address for peer `%s'\n"
 msgstr "找不到接口“%s”的一个 IP 地址。\n"
 
-#: src/transport/gnunet-transport.c:641
+#: src/transport/gnunet-transport.c:646
 #, fuzzy
 msgid "Failed to list connections, timeout occured\n"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/transport/gnunet-transport.c:668 src/transport/gnunet-transport.c:698
+#: src/transport/gnunet-transport.c:673 src/transport/gnunet-transport.c:703
 #, fuzzy, c-format
 msgid "Configuration for plugin `%s' did not work!\n"
 msgstr "配置文件“%s”已写入。\n"
 
-#: src/transport/gnunet-transport.c:673
+#: src/transport/gnunet-transport.c:678
 #, fuzzy, c-format
 msgid "Configuration for plugin `%s' did work!\n"
 msgstr "配置文件“%s”已写入。\n"
 
-#: src/transport/gnunet-transport.c:678
+#: src/transport/gnunet-transport.c:683
 #, fuzzy, c-format
 msgid "Internal NAT error while running test for plugin `%s'\n"
 msgstr "未知错误。\n"
 
-#: src/transport/gnunet-transport.c:683
+#: src/transport/gnunet-transport.c:688
 #, fuzzy, c-format
 msgid "Failed to start NAT test for plugin `%s'\n"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/transport/gnunet-transport.c:688
+#: src/transport/gnunet-transport.c:693
 #, c-format
 msgid "Timeout while waiting for result of NAT test for plugin `%s'\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:704
+#: src/transport/gnunet-transport.c:709
 #, fuzzy, c-format
 msgid "Configuration for plugin `%s' is working!\n"
 msgstr "配置文件“%s”已写入。\n"
 
-#: src/transport/gnunet-transport.c:823
+#: src/transport/gnunet-transport.c:828
 #, fuzzy, c-format
 msgid ""
 "Peer `%s' %s %s\n"
@@ -7571,91 +7413,91 @@
 "\t%s%s\n"
 msgstr "运行 %s失败:%s %d\n"
 
-#: src/transport/gnunet-transport.c:859
+#: src/transport/gnunet-transport.c:864
 #, fuzzy, c-format
 msgid "Peer `%s' %s `%s' \n"
 msgstr "运行 %s失败:%s %d\n"
 
-#: src/transport/gnunet-transport.c:958 src/transport/gnunet-transport.c:1707
+#: src/transport/gnunet-transport.c:963 src/transport/gnunet-transport.c:1712
 #, fuzzy
 msgid "Monitor disconnected from transport service. Reconnecting.\n"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/transport/gnunet-transport.c:1026
+#: src/transport/gnunet-transport.c:1031
 msgid "No transport plugins configured, peer will never communicate\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1040
+#: src/transport/gnunet-transport.c:1045
 #, c-format
 msgid "No port configured for plugin `%s', cannot test it\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1065
+#: src/transport/gnunet-transport.c:1070
 #, fuzzy
 msgid "Failed to start resolver!\n"
 msgstr "运行 %s失败:%s %d\n"
 
-#: src/transport/gnunet-transport.c:1111
+#: src/transport/gnunet-transport.c:1116
 #, c-format
 msgid "Transmitting %u bytes to %s\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1134
+#: src/transport/gnunet-transport.c:1139
 #: 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:1158
+#: src/transport/gnunet-transport.c:1163
 #, c-format
 msgid ""
 "Successfully connected to `%s', starting to send benchmark data in %u Kb "
 "blocks\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1191
+#: src/transport/gnunet-transport.c:1196
 #, fuzzy, c-format
 msgid "Successfully disconnected from `%s'\n"
 msgstr "“%s”已连接到“%s”。\n"
 
-#: src/transport/gnunet-transport.c:1214
+#: src/transport/gnunet-transport.c:1219
 #: 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:1239 src/transport/gnunet-transport.c:1265
+#: src/transport/gnunet-transport.c:1244 src/transport/gnunet-transport.c:1270
 #, c-format
 msgid "%24s: %-17s %4s   (%u connections in total)\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1241
+#: src/transport/gnunet-transport.c:1246
 #, fuzzy
 msgid "Connected to"
 msgstr "“%s”已连接到“%s”。\n"
 
-#: src/transport/gnunet-transport.c:1267
+#: src/transport/gnunet-transport.c:1272
 #, fuzzy
 msgid "Disconnected from"
 msgstr "“%s”已连接到“%s”。\n"
 
-#: src/transport/gnunet-transport.c:1291
+#: src/transport/gnunet-transport.c:1296
 #: src/transport/gnunet-transport-profiler.c:458
 #, c-format
 msgid "Received %u bytes from %s\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1323
+#: src/transport/gnunet-transport.c:1328
 #, c-format
 msgid "Peer `%s': %s %s in state `%s' until %s\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1335
+#: src/transport/gnunet-transport.c:1340
 #, fuzzy, c-format
 msgid "Peer `%s': %s %s\n"
 msgstr "运行 %s失败:%s %d\n"
 
-#: src/transport/gnunet-transport.c:1792
+#: src/transport/gnunet-transport.c:1794
 #: src/transport/gnunet-transport-profiler.c:492
 #, fuzzy
 msgid "Failed to send connect request to transport service\n"
@@ -7666,97 +7508,97 @@
 msgid "Failed to send disconnect request to transport service\n"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/transport/gnunet-transport.c:1875
+#: src/transport/gnunet-transport.c:1873
 #, 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:1883
+#: src/transport/gnunet-transport.c:1881
 #, c-format
 msgid ""
 "No operation given. Please choose one operation: %s, %s, %s, %s, %s, %s, %s\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1902 src/transport/gnunet-transport.c:1932
-#: src/transport/gnunet-transport.c:1964 src/transport/gnunet-transport.c:1990
-#: src/transport/gnunet-transport.c:2046
+#: src/transport/gnunet-transport.c:1900 src/transport/gnunet-transport.c:1930
+#: src/transport/gnunet-transport.c:1963 src/transport/gnunet-transport.c:1989
+#: src/transport/gnunet-transport.c:2045
 #: src/transport/gnunet-transport-profiler.c:578
 #, fuzzy
 msgid "Failed to connect to transport service\n"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/transport/gnunet-transport.c:1911 src/transport/gnunet-transport.c:1941
-#: src/transport/gnunet-transport.c:1975
+#: src/transport/gnunet-transport.c:1909 src/transport/gnunet-transport.c:1940
+#: src/transport/gnunet-transport.c:1974
 #, fuzzy
 msgid "Failed to send request to transport service\n"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/transport/gnunet-transport.c:1995
+#: src/transport/gnunet-transport.c:1994
 msgid "Starting to receive benchmark data\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:2094
+#: src/transport/gnunet-transport.c:2093
 #, fuzzy
 msgid "print information for all peers (instead of only connected peers)"
 msgstr "无法获取有关用户“%s”的信息:%s\n"
 
-#: src/transport/gnunet-transport.c:2097
+#: src/transport/gnunet-transport.c:2096
 msgid "measure how fast we are receiving data from all peers (until CTRL-C)"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:2100
+#: src/transport/gnunet-transport.c:2099
 #, fuzzy
 msgid "connect to a peer"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/transport/gnunet-transport.c:2103
+#: src/transport/gnunet-transport.c:2102
 #, fuzzy
 msgid "disconnect to a peer"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/transport/gnunet-transport.c:2106
+#: src/transport/gnunet-transport.c:2105
 #, fuzzy
 msgid "print information for all pending validations "
 msgstr "无法获取有关用户“%s”的信息:%s\n"
 
-#: src/transport/gnunet-transport.c:2109
+#: src/transport/gnunet-transport.c:2108
 #, fuzzy
 msgid "print information for all pending validations continuously"
 msgstr "无法获取有关用户“%s”的信息:%s\n"
 
-#: src/transport/gnunet-transport.c:2112
+#: src/transport/gnunet-transport.c:2111
 msgid "provide information about all current connections (once)"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:2118
+#: src/transport/gnunet-transport.c:2117
 msgid ""
 "provide information about all connects and disconnect events (continuously)"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:2121
+#: src/transport/gnunet-transport.c:2120
 msgid "do not resolve hostnames"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:2124
+#: src/transport/gnunet-transport.c:2123
 #: src/transport/gnunet-transport-profiler.c:638
 msgid "peer identity"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:2127
+#: src/transport/gnunet-transport.c:2126
 msgid "monitor plugin sessions"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:2130
+#: src/transport/gnunet-transport.c:2129
 msgid "send data for benchmarking to the other peer (until CTRL-C)"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:2133
+#: src/transport/gnunet-transport.c:2132
 msgid "test transport configuration (involves external server)"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:2144
+#: src/transport/gnunet-transport.c:2143
 #: src/transport/gnunet-transport-profiler.c:649
 #, fuzzy
 msgid "Direct access to transport service."
@@ -7855,8 +7697,8 @@
 msgstr "消息尺寸"
 
 #: src/transport/plugin_transport_http_client.c:1491
-#: src/transport/plugin_transport_http_server.c:2271
-#: src/transport/plugin_transport_http_server.c:3436
+#: src/transport/plugin_transport_http_server.c:2274
+#: src/transport/plugin_transport_http_server.c:3441
 #: src/transport/plugin_transport_tcp.c:2826
 #: src/transport/plugin_transport_tcp.c:2833
 msgid "TCP_STEALTH not supported on this platform.\n"
@@ -7868,13 +7710,13 @@
 msgstr ""
 
 #: src/transport/plugin_transport_http_client.c:2164
-#: src/transport/plugin_transport_http_server.c:3170
+#: src/transport/plugin_transport_http_server.c:3175
 #, fuzzy, c-format
 msgid "Shutting down plugin `%s'\n"
 msgstr "未知的命令“%s”。\n"
 
 #: src/transport/plugin_transport_http_client.c:2181
-#: src/transport/plugin_transport_http_server.c:3240
+#: src/transport/plugin_transport_http_server.c:3245
 #, c-format
 msgid "Shutdown for plugin `%s' complete\n"
 msgstr ""
@@ -7913,96 +7755,96 @@
 msgid "No usable TLS certificate found and creating one at `%s/%s' failed!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:2297
+#: src/transport/plugin_transport_http_server.c:2300
 msgid "Could not load or create server certificate! Loading plugin failed!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:2604
+#: src/transport/plugin_transport_http_server.c:2609
 #, fuzzy
 msgid "Require valid port number for service in configuration!\n"
 msgstr "保存配置失败。"
 
-#: src/transport/plugin_transport_http_server.c:2638 src/util/service.c:700
+#: src/transport/plugin_transport_http_server.c:2643 src/util/service.c:703
 #, fuzzy, c-format
 msgid "Failed to resolve `%s': %s\n"
 msgstr "打开日志文件“%s”失败:%s\n"
 
-#: src/transport/plugin_transport_http_server.c:2656 src/util/service.c:719
+#: src/transport/plugin_transport_http_server.c:2661 src/util/service.c:722
 #, fuzzy, c-format
 msgid "Failed to find %saddress for `%s'.\n"
 msgstr "找不到接口“%s”的一个 IP 地址。\n"
 
-#: src/transport/plugin_transport_http_server.c:2769
+#: src/transport/plugin_transport_http_server.c:2774
 #, c-format
 msgid "Found %u addresses to report to NAT service\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:2847
+#: src/transport/plugin_transport_http_server.c:2852
 msgid "Disabling IPv6 since it is not supported on this system!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:2946
+#: src/transport/plugin_transport_http_server.c:2951
 #, c-format
 msgid "IPv4 support is %s\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:2961
+#: src/transport/plugin_transport_http_server.c:2966
 #, c-format
 msgid "IPv6 support is %s\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:2967
+#: src/transport/plugin_transport_http_server.c:2972
 msgid "Neither IPv4 nor IPv6 are enabled! Fix in configuration\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:2978
+#: src/transport/plugin_transport_http_server.c:2983
 #, fuzzy
 msgid "Port is required! Fix in configuration\n"
 msgstr ""
 "\n"
 "结束配置。\n"
 
-#: src/transport/plugin_transport_http_server.c:2984
+#: src/transport/plugin_transport_http_server.c:2989
 #, c-format
 msgid "Using port %u\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:2998
+#: src/transport/plugin_transport_http_server.c:3003
 #, c-format
 msgid "Specific IPv4 address `%s' in configuration file is invalid!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:3008
+#: src/transport/plugin_transport_http_server.c:3013
 #, fuzzy, c-format
 msgid "Binding to IPv4 address %s\n"
 msgstr "无效的进程优先级“%s”\n"
 
-#: src/transport/plugin_transport_http_server.c:3030
+#: src/transport/plugin_transport_http_server.c:3035
 #, c-format
 msgid "Specific IPv6 address `%s' in configuration file is invalid!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:3040
+#: src/transport/plugin_transport_http_server.c:3045
 #, fuzzy, c-format
 msgid "Binding to IPv6 address %s\n"
 msgstr "无效的进程优先级“%s”\n"
 
-#: src/transport/plugin_transport_http_server.c:3103
+#: src/transport/plugin_transport_http_server.c:3108
 #, fuzzy, c-format
 msgid "Using external hostname `%s'\n"
 msgstr "卸载 GNUnet 服务"
 
-#: src/transport/plugin_transport_http_server.c:3124
+#: src/transport/plugin_transport_http_server.c:3129
 #, c-format
 msgid "Notifying transport only about hostname `%s'\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:3141
+#: src/transport/plugin_transport_http_server.c:3146
 #, fuzzy, c-format
 msgid "Maximum number of connections is %u\n"
 msgstr "增加 TCP/IP 的最大连接数"
 
-#: src/transport/plugin_transport_http_server.c:3448
+#: src/transport/plugin_transport_http_server.c:3453
 #, fuzzy
 msgid "Unable to compile URL regex\n"
 msgstr "无法初始化 SQLite:%s。\n"
@@ -8102,8 +7944,8 @@
 msgid "# network-level TCP disconnect events"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2760 src/util/service.c:582
-#: src/util/service.c:588
+#: src/transport/plugin_transport_tcp.c:2760 src/util/service.c:585
+#: src/util/service.c:591
 #, c-format
 msgid "Require valid port number for service `%s' in configuration!\n"
 msgstr ""
@@ -8152,55 +7994,55 @@
 "or %u)\n"
 msgstr ""
 
-#: src/transport/plugin_transport_udp.c:2881
+#: src/transport/plugin_transport_udp.c:2888
 #, 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:2894
+#: src/transport/plugin_transport_udp.c:2901
 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:3247
+#: src/transport/plugin_transport_udp.c:3254
 #, fuzzy, c-format
 msgid "Failed to bind UDP socket to %s: %s\n"
 msgstr "打开日志文件“%s”失败:%s\n"
 
-#: src/transport/plugin_transport_udp.c:3255
+#: src/transport/plugin_transport_udp.c:3262
 #, fuzzy
 msgid "Failed to open UDP sockets\n"
 msgstr "打开日志文件“%s”失败:%s\n"
 
-#: src/transport/plugin_transport_udp.c:3414
+#: src/transport/plugin_transport_udp.c:3421
 #, c-format
 msgid "Given `%s' option is out of range: %llu > %u\n"
 msgstr ""
 
-#: src/transport/plugin_transport_udp.c:3461
+#: src/transport/plugin_transport_udp.c:3468
 #, fuzzy, c-format
 msgid "Invalid IPv6 address: `%s'\n"
 msgstr "无效的进程优先级“%s”\n"
 
-#: src/transport/plugin_transport_udp.c:3529
+#: src/transport/plugin_transport_udp.c:3536
 #, fuzzy
 msgid "Failed to create network sockets, plugin failed\n"
 msgstr "发送消息失败。\n"
 
-#: src/transport/plugin_transport_unix.c:1403
+#: src/transport/plugin_transport_unix.c:1402
 #, fuzzy, c-format
 msgid "Cannot create path to `%s'\n"
 msgstr "发送消息失败。\n"
 
-#: src/transport/plugin_transport_unix.c:1416
+#: src/transport/plugin_transport_unix.c:1415
 #, fuzzy, c-format
 msgid "Cannot bind to `%s'\n"
 msgstr "发送消息失败。\n"
 
-#: src/transport/plugin_transport_unix.c:1817
+#: src/transport/plugin_transport_unix.c:1816
 #, fuzzy
 msgid "Failed to open UNIX listen socket\n"
 msgstr "打开日志文件“%s”失败:%s\n"
@@ -8262,7 +8104,7 @@
 msgid "# sessions allocated"
 msgstr ""
 
-#: src/transport/transport_api.c:767
+#: src/transport/transport_api.c:816
 #, c-format
 msgid "Received unexpected message of type %u in %s:%u\n"
 msgstr ""
@@ -8306,12 +8148,12 @@
 msgid "Metadata `%s' failed to deserialize"
 msgstr ""
 
-#: src/util/client.c:261 src/util/client.c:858 src/util/service.c:619
+#: src/util/client.c:261 src/util/client.c:858 src/util/service.c:622
 #, 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:623
+#: src/util/client.c:265 src/util/client.c:863 src/util/service.c:626
 #, fuzzy, c-format
 msgid "Using `%s' instead\n"
 msgstr "%s:选项“%s”有歧义\n"
@@ -8338,7 +8180,7 @@
 msgid "Failure to transmit request to service `%s'\n"
 msgstr ""
 
-#: src/util/client.c:1303
+#: src/util/client.c:1299
 msgid "Could not submit request, not expecting to receive a response.\n"
 msgstr ""
 
@@ -8400,24 +8242,24 @@
 msgid "Syntax error while deserializing in line %u\n"
 msgstr "配置文件“%s”第 %d 行有语法错误。\n"
 
-#: src/util/configuration.c:1023
+#: src/util/configuration.c:1025
 #, c-format
 msgid ""
 "Configuration value '%s' for '%s' in section '%s' is not in set of legal "
 "choices\n"
 msgstr ""
 
-#: src/util/configuration.c:1093
+#: src/util/configuration.c:1095
 #, c-format
 msgid "Recursive expansion suspected, aborting $-expansion for term `%s'\n"
 msgstr ""
 
-#: src/util/configuration.c:1125
+#: src/util/configuration.c:1127
 #, fuzzy, c-format
 msgid "Missing closing `%s' in option `%s'\n"
 msgstr "配置文件“%s”已写入。\n"
 
-#: src/util/configuration.c:1199
+#: src/util/configuration.c:1201
 #, c-format
 msgid ""
 "Failed to expand `%s' in `%s' as it is neither found in [PATHS] nor defined "
@@ -8517,7 +8359,7 @@
 msgid "Expected `%s' to be a directory!\n"
 msgstr "“%s”应为目录!\n"
 
-#: src/util/disk.c:1564 src/util/service.c:1323
+#: src/util/disk.c:1564 src/util/service.c:1327
 #, c-format
 msgid "Cannot obtain information about user `%s': %s\n"
 msgstr "无法获取有关用户“%s”的信息:%s\n"
@@ -8717,23 +8559,28 @@
 msgid "Use build-in GNUnet stub resolver"
 msgstr ""
 
-#: src/util/gnunet-scrypt.c:279
+#: src/util/gnunet-scrypt.c:233
+#, c-format
+msgid "Loading hostkey from `%s' failed.\n"
+msgstr ""
+
+#: src/util/gnunet-scrypt.c:294
 msgid "number of bits to require for the proof of work"
 msgstr ""
 
-#: src/util/gnunet-scrypt.c:282
+#: src/util/gnunet-scrypt.c:297
 msgid "file with private key, otherwise default is used"
 msgstr ""
 
-#: src/util/gnunet-scrypt.c:285
+#: src/util/gnunet-scrypt.c:300
 msgid "file with proof of work, otherwise default is used"
 msgstr ""
 
-#: src/util/gnunet-scrypt.c:288
+#: src/util/gnunet-scrypt.c:303
 msgid "time to wait between calculations"
 msgstr ""
 
-#: src/util/gnunet-scrypt.c:299
+#: src/util/gnunet-scrypt.c:315
 #, fuzzy
 msgid "Manipulate GNUnet proof of work files"
 msgstr "更改配置文件中的一个值"
@@ -8788,12 +8635,12 @@
 msgid "Error writing to `%s': %s\n"
 msgstr "创建用户出错"
 
-#: src/util/network.c:134
+#: src/util/network.c:137
 #, c-format
 msgid "Unable to shorten unix path `%s' while keeping name unique\n"
 msgstr ""
 
-#: src/util/network.c:1361 src/util/network.c:1486
+#: src/util/network.c:1640 src/util/network.c:1797
 #, c-format
 msgid ""
 "Fatal internal logic error, process hangs in `%s' (abort with CTRL-C)!\n"
@@ -8841,17 +8688,17 @@
 msgid "Could not determine plugin installation path.\n"
 msgstr "无法确定用户界面定义文件。"
 
-#: src/util/program.c:246 src/util/service.c:1457
+#: src/util/program.c:246 src/util/service.c:1461
 #, fuzzy, c-format
 msgid "Malformed configuration file `%s', exit ...\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/util/program.c:258 src/util/service.c:1472
+#: src/util/program.c:258 src/util/service.c:1476
 #, fuzzy, c-format
 msgid "Could not access configuration file `%s'\n"
 msgstr "找不到接口“%s”的一个 IP 地址。\n"
 
-#: src/util/program.c:263 src/util/service.c:1467
+#: src/util/program.c:263 src/util/service.c:1471
 #, fuzzy
 msgid "Malformed configuration, exit ...\n"
 msgstr "解析配置文件“%s”失败\n"
@@ -8882,15 +8729,10 @@
 msgid "Could not resolve our FQDN : %s\n"
 msgstr "无法解析“%s”(%s):%s\n"
 
-#: src/util/scheduler.c:813
+#: src/util/scheduler.c:812
 msgid "Looks like we're busy waiting...\n"
 msgstr ""
 
-#: src/util/scheduler.c:948
-#, c-format
-msgid "Attempt to cancel dead task %llu!\n"
-msgstr ""
-
 #: src/util/server.c:484
 #, fuzzy, c-format
 msgid "`%s' failed for port %d (%s).\n"
@@ -8906,7 +8748,7 @@
 msgid "`%s' failed for `%s': address already in use\n"
 msgstr "对驱动器“%2$s”的“%1$s”操作失败:%3$u\n"
 
-#: src/util/server.c:894
+#: src/util/server.c:896
 #, c-format
 msgid ""
 "Processing code for message of type %u did not call "
@@ -8923,80 +8765,80 @@
 msgid "Access from `%s' denied to service `%s'\n"
 msgstr ""
 
-#: src/util/service.c:409
+#: src/util/service.c:410
 #, c-format
 msgid "Could not parse IPv4 network specification `%s' for `%s:%s'\n"
 msgstr ""
 
-#: src/util/service.c:446
+#: src/util/service.c:448
 #, c-format
 msgid "Could not parse IPv6 network specification `%s' for `%s:%s'\n"
 msgstr ""
 
-#: src/util/service.c:563
+#: src/util/service.c:566
 #, c-format
 msgid ""
 "Disabling IPv6 support for service `%s', failed to create IPv6 socket: %s\n"
 msgstr ""
 
-#: src/util/service.c:653
+#: src/util/service.c:656
 #, c-format
 msgid ""
 "Disabling UNIX domain socket support for service `%s', failed to create UNIX "
 "domain socket: %s\n"
 msgstr ""
 
-#: src/util/service.c:669
+#: src/util/service.c:672
 #, c-format
 msgid "Have neither PORT nor UNIXPATH for service `%s', but one is required\n"
 msgstr ""
 
-#: src/util/service.c:908
+#: src/util/service.c:911
 msgid "Could not access a pre-bound socket, will try to bind myself\n"
 msgstr ""
 
-#: src/util/service.c:957 src/util/service.c:975
+#: src/util/service.c:960 src/util/service.c:978
 #, c-format
 msgid "Specified value for `%s' of service `%s' is invalid\n"
 msgstr ""
 
-#: src/util/service.c:1000
+#: src/util/service.c:1003
 #, c-format
 msgid "Could not access pre-bound socket %u, will try to bind myself\n"
 msgstr ""
 
-#: src/util/service.c:1170
+#: src/util/service.c:1174
 #, fuzzy, c-format
 msgid "Failed to start `%s' at `%s'\n"
 msgstr "运行 %s失败:%s %d\n"
 
-#: src/util/service.c:1212
+#: src/util/service.c:1216
 #, c-format
 msgid "Service `%s' runs at %s\n"
 msgstr ""
 
-#: src/util/service.c:1261
+#: src/util/service.c:1265
 msgid "Service process failed to initialize\n"
 msgstr ""
 
-#: src/util/service.c:1265
+#: src/util/service.c:1269
 msgid "Service process could not initialize server function\n"
 msgstr ""
 
-#: src/util/service.c:1269
+#: src/util/service.c:1273
 msgid "Service process failed to report status\n"
 msgstr ""
 
-#: src/util/service.c:1324
+#: src/util/service.c:1328
 msgid "No such user"
 msgstr "无此用户"
 
-#: src/util/service.c:1337
+#: src/util/service.c:1341
 #, c-format
 msgid "Cannot change user/group to `%s': %s\n"
 msgstr "无法更改用户/组为“%s”:%s\n"
 
-#: src/util/service.c:1407
+#: src/util/service.c:1411
 msgid "do daemonize (detach from terminal)"
 msgstr ""
 
@@ -9313,6 +9155,58 @@
 msgstr ""
 
 #, fuzzy
+#~ msgid "Starting default services `%s'\n"
+#~ msgstr "卸载 GNUnet 服务"
+
+#, fuzzy
+#~ msgid "Failed to create statistics!\n"
+#~ msgstr "发送消息失败。\n"
+
+#, fuzzy
+#~ msgid "Failed to parse file `%s'\n"
+#~ msgstr "解析配置文件“%s”失败\n"
+
+#, fuzzy
+#~ msgid "Invalid value for public key\n"
+#~ msgstr "“%s”的参数无效。\n"
+
+#, fuzzy
+#~ msgid "Cannot read experiments file `%s'\n"
+#~ msgstr "无法解析“%s”(%s):%s\n"
+
+#, fuzzy
+#~ msgid "Connected to peer %s\n"
+#~ msgstr "“%s”已连接到“%s”。\n"
+
+#, fuzzy
+#~ msgid "Disconnected from peer %s\n"
+#~ msgstr "“%s”已连接到“%s”。\n"
+
+#, fuzzy
+#~ msgid "Lacking key configuration settings.\n"
+#~ msgstr "立即保存配置?"
+
+#, fuzzy
+#~ msgid "Could not access hostkey file `%s'.\n"
+#~ msgstr "找不到接口“%s”的一个 IP 地址。\n"
+
+#, fuzzy
+#~ msgid "Failure: Did not receive %s\n"
+#~ msgstr "打开日志文件“%s”失败:%s\n"
+
+#, fuzzy
+#~ msgid "Blacklist allows connection attempt to peer `%s'\n"
+#~ msgstr "初始化“%s”服务失败。\n"
+
+#, fuzzy
+#~ msgid "Received a request connect message for peer `%s'\n"
+#~ msgstr "找不到接口“%s”的一个 IP 地址。\n"
+
+#, fuzzy
+#~ msgid "Received a request disconnect message for peer `%s'\n"
+#~ msgstr "打开日志文件“%s”失败:%s\n"
+
+#, fuzzy
 #~ msgid "Client %p disconnected from us.\n"
 #~ msgstr "“%s”已连接到“%s”。\n"
 




reply via email to

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