gnunet-svn
[Top][All Lists]
Advanced

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

[GNUnet-SVN] r18269 - gnunet/po


From: gnunet
Subject: [GNUnet-SVN] r18269 - gnunet/po
Date: Wed, 23 Nov 2011 11:05:21 +0100

Author: grothoff
Date: 2011-11-23 11:05:21 +0100 (Wed, 23 Nov 2011)
New Revision: 18269

Modified:
   gnunet/po/de.gmo
   gnunet/po/de.po
   gnunet/po/es.gmo
   gnunet/po/es.po
   gnunet/po/gnunet.pot
   gnunet/po/sv.gmo
   gnunet/po/sv.po
   gnunet/po/vi.gmo
   gnunet/po/vi.po
   gnunet/po/zh_CN.po
Log:
automated gettext updates to PO files from 'make dist'

Modified: gnunet/po/de.gmo
===================================================================
(Binary files differ)

Modified: gnunet/po/de.po
===================================================================
--- gnunet/po/de.po     2011-11-23 10:05:05 UTC (rev 18268)
+++ gnunet/po/de.po     2011-11-23 10:05:21 UTC (rev 18269)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: GNUnet 0.7.0b\n"
 "Report-Msgid-Bugs-To: address@hidden"
-"POT-Creation-Date: 2011-11-03 13:55+0100\n"
+"POT-Creation-Date: 2011-11-23 11:01+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"
@@ -30,8 +30,8 @@
 #: src/datacache/plugin_datacache_mysql.c:517
 #: src/datacache/plugin_datacache_mysql.c:526
 #: src/datacache/plugin_datacache_mysql.c:598
-#: src/datacache/plugin_datacache_mysql.c:614 src/include/gnunet_common.h:380
-#: src/include/gnunet_common.h:387
+#: src/datacache/plugin_datacache_mysql.c:614 src/include/gnunet_common.h:389
+#: src/include/gnunet_common.h:396
 #, c-format
 msgid "`%s' failed at %s:%d with error: %s\n"
 msgstr "`%s' schlug bei %s:%d mit dem Fehler %s fehl\n"
@@ -51,28 +51,28 @@
 msgid "Unable to initialize SQLite: %s.\n"
 msgstr "SQLite Datenbank konnte nicht initialisiert werden: %s.\n"
 
-#: src/datastore/plugin_datastore_sqlite.c:420
-#: src/datacache/plugin_datacache_sqlite.c:471
+#: src/datastore/plugin_datastore_sqlite.c:414
+#: src/datacache/plugin_datacache_sqlite.c:457
 msgid "Tried to close sqlite without finalizing all prepared statements.\n"
 msgstr ""
 
-#: src/datastore/plugin_datastore_sqlite.c:677
+#: src/datastore/plugin_datastore_sqlite.c:671
 #, fuzzy
 msgid "Invalid data in database.  Trying to fix (by deletion).\n"
 msgstr "Ungültige Daten in %s. Korrektur wird versucht (durch Löschung).\n"
 
-#: src/datastore/plugin_datastore_sqlite.c:1130
+#: src/datastore/plugin_datastore_sqlite.c:1124
 msgid "sqlite version to old to determine size, assuming zero\n"
 msgstr ""
 
-#: src/datastore/plugin_datastore_sqlite.c:1149
+#: src/datastore/plugin_datastore_sqlite.c:1143
 #, c-format
 msgid ""
 "Using sqlite page utilization to estimate payload (%llu pages of size %llu "
 "bytes)\n"
 msgstr ""
 
-#: src/datastore/plugin_datastore_sqlite.c:1188
+#: src/datastore/plugin_datastore_sqlite.c:1182
 #, fuzzy
 msgid "Sqlite database running\n"
 msgstr "sqlite Datenspeicher"
@@ -295,8 +295,8 @@
 msgid "Could not find matching reservation"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:824 src/datacache/datacache.c:119
-#: src/datacache/datacache.c:250
+#: src/datastore/gnunet-service-datastore.c:824 src/datacache/datacache.c:118
+#: src/datacache/datacache.c:248
 #, fuzzy
 msgid "# bytes stored"
 msgstr "# bytes in der Datenbank"
@@ -350,8 +350,8 @@
 msgstr ""
 
 #: src/datastore/gnunet-service-datastore.c:1295
-#: src/datastore/gnunet-service-datastore.c:1486 src/datacache/datacache.c:145
-#: src/datacache/datacache.c:152
+#: src/datastore/gnunet-service-datastore.c:1486 src/datacache/datacache.c:144
+#: src/datacache/datacache.c:151
 #, fuzzy, c-format
 msgid "No `%s' specified for `%s' in configuration!\n"
 msgstr "In der Konfigurationsdatei wurden keine Anwendungen definiert!\n"
@@ -384,22 +384,17 @@
 msgid "Failed to initialize bloomfilter.\n"
 msgstr "SQLite Datenbank konnte nicht initialisiert werden.\n"
 
-#: src/core/gnunet-service-core_sessions.c:204
+#: src/core/gnunet-service-core_sessions.c:210
 #: src/core/gnunet-service-core_sessions.c:275
 msgid "# entries in session map"
 msgstr ""
 
-#: src/core/gnunet-service-core_sessions.c:236
+#: src/core/gnunet-service-core_sessions.c:240
 #, fuzzy
 msgid "# type map refreshes sent"
 msgstr "# p2p Trace-Antworten gesendet"
 
-#: src/core/gnunet-service-core_sessions.c:360
-#, fuzzy
-msgid "# send requests dropped (disconnected)"
-msgstr "# gap Anfragen verworfen: Kollision in RT"
-
-#: src/core/gnunet-service-core_sessions.c:427
+#: src/core/gnunet-service-core_sessions.c:416
 msgid "# messages discarded (expired prior to transmission)"
 msgstr ""
 
@@ -410,13 +405,13 @@
 msgstr "Ich bin Peer `%s'.\n"
 
 #: src/core/gnunet-core-list-connections.c:167
-#: src/peerinfo-tool/gnunet-peerinfo.c:200
+#: src/peerinfo-tool/gnunet-peerinfo.c:199
 #, fuzzy, c-format
 msgid "Invalid command line argument `%s'\n"
 msgstr "Ungültige Kommandozeilen Parameter:\n"
 
 #: src/core/gnunet-core-list-connections.c:188
-#: src/peerinfo-tool/gnunet-peerinfo.c:258
+#: src/peerinfo-tool/gnunet-peerinfo.c:257
 msgid "don't resolve host names"
 msgstr ""
 
@@ -425,46 +420,51 @@
 msgid "Print information about connected peers."
 msgstr "Informationen über andere GNUnet Knoten ausgeben."
 
-#: src/core/gnunet-service-core_clients.c:452
+#: src/core/gnunet-service-core_clients.c:357
 #, fuzzy
+msgid "# send requests dropped (disconnected)"
+msgstr "# gap Anfragen verworfen: Kollision in RT"
+
+#: src/core/gnunet-service-core_clients.c:462
+#, fuzzy
 msgid "# messages discarded (session disconnected)"
 msgstr "# defragmentierter Nachrichten"
 
-#: src/core/gnunet-service-core_clients.c:796
+#: src/core/gnunet-service-core_clients.c:791
 #, fuzzy, c-format
 msgid "# bytes of messages of type %u received"
 msgstr "# Bytes Rauschen empfangen"
 
-#: src/core/gnunet-service-core.c:101
+#: src/core/gnunet-service-core.c:99
 #, c-format
 msgid "Core service of `%4s' ready.\n"
 msgstr ""
 
-#: src/core/gnunet-service-core_typemap.c:111
-#: src/core/gnunet-service-core_typemap.c:124
+#: src/core/gnunet-service-core_typemap.c:110
+#: src/core/gnunet-service-core_typemap.c:121
 #, fuzzy
 msgid "# type maps received"
 msgstr "# verschlüsselter PING Nachrichten empfangen"
 
-#: src/core/gnunet-service-core_typemap.c:156
+#: src/core/gnunet-service-core_typemap.c:151
 msgid "# updates to my type map"
 msgstr ""
 
-#: src/core/gnunet-service-core_neighbours.c:162
+#: src/core/gnunet-service-core_neighbours.c:163
 #, fuzzy
 msgid "# sessions terminated by transport disconnect"
 msgstr "# Knotenankündigungen empfangen"
 
-#: src/core/gnunet-service-core_neighbours.c:179
+#: src/core/gnunet-service-core_neighbours.c:180
 #: src/core/gnunet-service-core_neighbours.c:343
 msgid "# neighbour entries allocated"
 msgstr ""
 
-#: src/core/gnunet-service-core_neighbours.c:251
+#: src/core/gnunet-service-core_neighbours.c:252
 msgid "# encrypted bytes given to transport"
 msgstr ""
 
-#: src/core/gnunet-service-core_neighbours.c:432
+#: src/core/gnunet-service-core_neighbours.c:430
 #, fuzzy, c-format
 msgid "Unsupported message of type %u received.\n"
 msgstr "Ungültige Nachricht des Typs %u empfangen. Nachricht wird verworfen.\n"
@@ -477,8 +477,8 @@
 msgid "# bytes decrypted"
 msgstr "# Bytes entschlüsselt"
 
-#: src/core/gnunet-service-core_kx.c:602 src/dv/gnunet-service-dv.c:3000
-#: src/hostlist/hostlist-server.c:439 src/peerinfo-tool/gnunet-peerinfo.c:157
+#: src/core/gnunet-service-core_kx.c:602 src/dv/gnunet-service-dv.c:3002
+#: src/hostlist/hostlist-server.c:436 src/peerinfo-tool/gnunet-peerinfo.c:156
 #, fuzzy, c-format
 msgid "Error in communication with PEERINFO service\n"
 msgstr "Informationen über andere GNUnet Knoten ausgeben."
@@ -487,120 +487,120 @@
 msgid "# Delayed connecting due to lack of public key"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:669
+#: src/core/gnunet-service-core_kx.c:668
 msgid "# key exchanges initiated"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:693
+#: src/core/gnunet-service-core_kx.c:689
 msgid "# key exchanges stopped"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:746
+#: src/core/gnunet-service-core_kx.c:741
 #, fuzzy
 msgid "# session keys received"
 msgstr "# Sitzungsschlüssel abgelehnt"
 
-#: src/core/gnunet-service-core_kx.c:764
+#: src/core/gnunet-service-core_kx.c:760
 #, fuzzy, c-format
 msgid "`%s' is for `%s', not for me.  Ignoring.\n"
 msgstr "Größe der `%s' Nachricht ist zu kurz. Nachricht wird ignoriert.\n"
 
-#: src/core/gnunet-service-core_kx.c:803
+#: src/core/gnunet-service-core_kx.c:798
 #, fuzzy
 msgid "# SET_KEY messages decrypted"
 msgstr "# defragmentierter Nachrichten"
 
-#: src/core/gnunet-service-core_kx.c:884
-#: src/transport/gnunet-service-transport_validation.c:601
+#: src/core/gnunet-service-core_kx.c:878
+#: src/transport/gnunet-service-transport_validation.c:781
 #, fuzzy
 msgid "# PING messages received"
 msgstr "# PING Nachrichten erstellt"
 
-#: src/core/gnunet-service-core_kx.c:918
+#: src/core/gnunet-service-core_kx.c:912
 #, 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:941
+#: src/core/gnunet-service-core_kx.c:933
 #, fuzzy
 msgid "# PONG messages created"
 msgstr "# PING Nachrichten erstellt"
 
-#: src/core/gnunet-service-core_kx.c:1029
+#: src/core/gnunet-service-core_kx.c:1021
 #, fuzzy
 msgid "# sessions terminated by timeout"
 msgstr "# Bytes verworfen von TCP (ausgehend)"
 
-#: src/core/gnunet-service-core_kx.c:1042
+#: src/core/gnunet-service-core_kx.c:1032
 #, fuzzy
 msgid "# keepalive messages sent"
 msgstr "# Klartext PING Nachrichten gesendet"
 
-#: src/core/gnunet-service-core_kx.c:1098
-#: src/transport/gnunet-service-transport_validation.c:934
+#: src/core/gnunet-service-core_kx.c:1090
+#: src/transport/gnunet-service-transport_validation.c:991
 #, fuzzy
 msgid "# PONG messages received"
 msgstr "# verschlüsselter PONG Nachrichten empfangen"
 
-#: src/core/gnunet-service-core_kx.c:1128
+#: src/core/gnunet-service-core_kx.c:1120
 #, fuzzy
 msgid "# PONG messages decrypted"
 msgstr "# PING Nachrichten erstellt"
 
-#: src/core/gnunet-service-core_kx.c:1161
+#: src/core/gnunet-service-core_kx.c:1152
 #, fuzzy
 msgid "# session keys confirmed via PONG"
 msgstr "# Knotenankündigungen empfangen"
 
-#: src/core/gnunet-service-core_kx.c:1224
+#: src/core/gnunet-service-core_kx.c:1216
 #, fuzzy
 msgid "# SET_KEY and PING messages created"
 msgstr "# PING Nachrichten erstellt"
 
-#: src/core/gnunet-service-core_kx.c:1372
+#: src/core/gnunet-service-core_kx.c:1357
 msgid "# failed to decrypt message (no session key)"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1416
-#: src/core/gnunet-service-core_kx.c:1441
+#: src/core/gnunet-service-core_kx.c:1399
+#: src/core/gnunet-service-core_kx.c:1424
 #, fuzzy
 msgid "# bytes dropped (duplicates)"
 msgstr "# Bytes verworfen von UDP (outgoing)"
 
-#: src/core/gnunet-service-core_kx.c:1428
+#: src/core/gnunet-service-core_kx.c:1411
 #, fuzzy
 msgid "# bytes dropped (out of sequence)"
 msgstr "# Bytes verworfen von UDP (outgoing)"
 
-#: src/core/gnunet-service-core_kx.c:1465
+#: src/core/gnunet-service-core_kx.c:1448
 #, fuzzy, c-format
 msgid "Message received far too old (%llu ms). Content ignored.\n"
 msgstr "Empfangene Client-Nachricht ist ungültig.\n"
 
-#: src/core/gnunet-service-core_kx.c:1469
+#: src/core/gnunet-service-core_kx.c:1452
 #, fuzzy
 msgid "# bytes dropped (ancient message)"
 msgstr "# Bytes verworfen von UDP (outgoing)"
 
-#: src/core/gnunet-service-core_kx.c:1477
+#: src/core/gnunet-service-core_kx.c:1460
 #, fuzzy
 msgid "# bytes of payload decrypted"
 msgstr "# Bytes entschlüsselt"
 
-#: src/core/gnunet-service-core_kx.c:1541
+#: src/core/gnunet-service-core_kx.c:1521
 #, fuzzy
 msgid "Core service is lacking HOSTKEY configuration setting.  Exiting.\n"
 msgstr "GNUnet Konfiguration"
 
-#: src/core/gnunet-service-core_kx.c:1549
+#: src/core/gnunet-service-core_kx.c:1529
 msgid "Core service could not access hostkey.  Exiting.\n"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1559
-#: src/transport/gnunet-service-transport.c:540
-#: src/hostlist/hostlist-server.c:558 src/peerinfo-tool/gnunet-peerinfo.c:208
+#: src/core/gnunet-service-core_kx.c:1539
+#: src/transport/gnunet-service-transport.c:537
+#: src/hostlist/hostlist-server.c:555 src/peerinfo-tool/gnunet-peerinfo.c:207
 #, fuzzy, c-format
 msgid "Could not access PEERINFO service.  Exiting.\n"
 msgstr "Auf die Namespace Informationen konnte nicht zugegriffen werden.\n"
@@ -609,11 +609,11 @@
 msgid "Client was disconnected from core service, trying to reconnect.\n"
 msgstr ""
 
-#: src/vpn/gnunet-daemon-exit.c:1499
+#: src/vpn/gnunet-daemon-exit.c:1513
 msgid "Daemon to run to provide an IP exit node for the VPN"
 msgstr ""
 
-#: src/vpn/gnunet-daemon-vpn.c:1287
+#: src/vpn/gnunet-daemon-vpn.c:1294
 #, fuzzy
 msgid "help text"
 msgstr "Hilfetext für -t"
@@ -626,51 +626,51 @@
 "Parameter, die für lange Optionen zwingend sind, sind auch für kurze "
 "Optionen zwingend.\n"
 
-#: src/util/getopt_helpers.c:258 src/util/getopt_helpers.c:287
+#: src/util/getopt_helpers.c:255 src/util/getopt_helpers.c:283
 #, c-format
 msgid "You must pass a number to the `%s' option.\n"
 msgstr "Sie müssen für die Option `%s' zusätzlich eine Zahl angeben.\n"
 
-#: src/util/common_logging.c:242 src/util/common_logging.c:838
+#: src/util/common_logging.c:239 src/util/common_logging.c:861
 msgid "DEBUG"
 msgstr "DEBUG"
 
-#: src/util/common_logging.c:244 src/util/common_logging.c:836
+#: src/util/common_logging.c:241 src/util/common_logging.c:859
 msgid "INFO"
 msgstr "INFO"
 
-#: src/util/common_logging.c:246 src/util/common_logging.c:834
+#: src/util/common_logging.c:243 src/util/common_logging.c:857
 msgid "WARNING"
 msgstr "WARNUNG"
 
-#: src/util/common_logging.c:248 src/util/common_logging.c:832
+#: src/util/common_logging.c:245 src/util/common_logging.c:855
 msgid "ERROR"
 msgstr "FEHLER"
 
-#: src/util/common_logging.c:250 src/util/common_logging.c:840
+#: src/util/common_logging.c:247 src/util/common_logging.c:863
 msgid "NONE"
 msgstr ""
 
-#: src/util/common_logging.c:554
+#: src/util/common_logging.c:579
 #, fuzzy, c-format
 msgid "Failed to create or access directory for log file `%s'\n"
 msgstr "Konfigurationsdatei `%s' konnte nicht geparst werden.\n"
 
-#: src/util/common_logging.c:672
+#: src/util/common_logging.c:696
 #, c-format
 msgid "Message `%.*s' repeated %u times in the last %s\n"
 msgstr ""
 
-#: src/util/common_logging.c:841
+#: src/util/common_logging.c:864
 msgid "INVALID"
 msgstr ""
 
-#: src/util/common_logging.c:923
+#: src/util/common_logging.c:946
 #, fuzzy
 msgid "unknown address"
 msgstr "Unbekannter Fehler"
 
-#: src/util/common_logging.c:961
+#: src/util/common_logging.c:984
 #, fuzzy
 msgid "invalid address"
 msgstr "Ungültige Parameter: "
@@ -691,24 +691,29 @@
 msgid "`%s' failed for library `%s' with error: %s\n"
 msgstr "`%s' fehlgeschlagen für die Bibliothek `%s'. Ort: %s:%d. Fehler: %s\n"
 
-#: src/util/configuration.c:249
+#: src/util/plugin.c:349
+#, fuzzy
+msgid "Could not determine plugin installation path.\n"
+msgstr "Öffentliche IP-Adresse konnte nicht ermittelt werden.\n"
+
+#: src/util/configuration.c:245
 #, fuzzy, c-format
 msgid "Syntax error in configuration file `%s' at line %u.\n"
 msgstr "Syntaxfehler in Konfigurationsdatei `%s' in Zeile %d.\n"
 
-#: src/util/configuration.c:812
+#: src/util/configuration.c:817
 #, c-format
 msgid ""
 "Configuration value '%s' for '%s' in section '%s' is not in set of legal "
 "choices\n"
 msgstr ""
 
-#: src/util/getopt.c:670
+#: src/util/getopt.c:672
 #, c-format
 msgid "%s: option `%s' is ambiguous\n"
 msgstr "%s: Option `%s' ist mehrdeutig\n"
 
-#: src/util/getopt.c:695
+#: src/util/getopt.c:696
 #, c-format
 msgid "%s: option `--%s' does not allow an argument\n"
 msgstr "%s: Option '--%s' erlaubt keinen Parameter\n"
@@ -718,109 +723,109 @@
 msgid "%s: option `%c%s' does not allow an argument\n"
 msgstr "%s: Option '%c%s' erlaubt keinen Parameter\n"
 
-#: src/util/getopt.c:720 src/util/getopt.c:889
+#: src/util/getopt.c:718 src/util/getopt.c:886
 #, c-format
 msgid "%s: option `%s' requires an argument\n"
 msgstr "%s: Option `%s' benötigt einen Parameter\n"
 
-#: src/util/getopt.c:749
+#: src/util/getopt.c:747
 #, c-format
 msgid "%s: unrecognized option `--%s'\n"
 msgstr "%s: unbekannte Option '--%s'\n"
 
-#: src/util/getopt.c:753
+#: src/util/getopt.c:751
 #, c-format
 msgid "%s: unrecognized option `%c%s'\n"
 msgstr "%s: unbekannte Option '%c%s'\n"
 
-#: src/util/getopt.c:778
+#: src/util/getopt.c:776
 #, c-format
 msgid "%s: illegal option -- %c\n"
 msgstr "%s: unerlaubte Option -- %c\n"
 
-#: src/util/getopt.c:780
+#: src/util/getopt.c:778
 #, c-format
 msgid "%s: invalid option -- %c\n"
 msgstr "%s: ungültige Option -- %c\n"
 
-#: src/util/getopt.c:808 src/util/getopt.c:938
+#: src/util/getopt.c:806 src/util/getopt.c:934
 #, c-format
 msgid "%s: option requires an argument -- %c\n"
 msgstr "%s: Option benötigt einen Parameter -- %c\n"
 
-#: src/util/getopt.c:856
+#: src/util/getopt.c:854
 #, c-format
 msgid "%s: option `-W %s' is ambiguous\n"
 msgstr "%s: Option '-W %s' ist mehrdeutig\n"
 
-#: src/util/getopt.c:874
+#: src/util/getopt.c:872
 #, c-format
 msgid "%s: option `-W %s' does not allow an argument\n"
 msgstr "%s: Option '-W %s' erlaubt keinen Parameter\n"
 
-#: src/util/getopt.c:1042
+#: src/util/getopt.c:1038
 #, c-format
 msgid "Use --help to get a list of options.\n"
 msgstr "Verwenden Sie --help, um eine Liste der Optionen zu erhalten.\n"
 
-#: src/util/scheduler.c:863
+#: src/util/scheduler.c:860
 msgid "Looks like we're busy waiting...\n"
 msgstr ""
 
-#: src/util/scheduler.c:994
+#: src/util/scheduler.c:990
 #, c-format
 msgid "Attempt to cancel dead task %llu!\n"
 msgstr ""
 
-#: src/util/connection.c:462
+#: src/util/connection.c:461
 #, fuzzy, c-format
 msgid "Access denied to `%s'\n"
 msgstr "Zugriff verweigert für `%s' bei %s:%d.\n"
 
-#: src/util/connection.c:477
+#: src/util/connection.c:476
 #, c-format
 msgid "Accepting connection from `%s': %p\n"
 msgstr ""
 
-#: src/util/connection.c:646
+#: src/util/connection.c:642
 #, fuzzy, c-format
 msgid ""
 "Failed to establish TCP connection to `%s:%u', no further addresses to try.\n"
 msgstr "Fehler beim Aufbauen einer Verbindung mit gnunetd.\n"
 
-#: src/util/connection.c:858 src/util/connection.c:1034
+#: src/util/connection.c:852 src/util/connection.c:1025
 #, fuzzy, c-format
 msgid "Trying to connect to `%s' (%p)\n"
 msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
 
-#: src/util/connection.c:869
+#: src/util/connection.c:862
 #, fuzzy, c-format
 msgid "Failed to connect to `%s' (%p)\n"
 msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
 
-#: src/util/connection.c:1024
+#: src/util/connection.c:1015
 #, fuzzy, c-format
 msgid "Attempt to connect to `%s' failed\n"
 msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
 
-#: src/util/connection.c:1540
+#: src/util/connection.c:1528
 #, c-format
 msgid ""
 "Could not satisfy pending transmission request, socket closed or connect "
 "failed (%p).\n"
 msgstr ""
 
-#: src/util/connection.c:1576
+#: src/util/connection.c:1564
 #, fuzzy, c-format
 msgid "Failed to send to `%s': %s\n"
 msgstr "Datei wurde als `%s' gespeichert.\n"
 
-#: src/util/signal.c:81
+#: src/util/signal.c:80
 #, fuzzy, c-format
 msgid "signal (%d, %p) returned %d.\n"
 msgstr "Aufruf von `%s' gibt %d zurück.\n"
 
-#: src/util/network.c:1204
+#: src/util/network.c:1197
 #, c-format
 msgid ""
 "Fatal internal logic error, process hangs in `%s' (abort with CTRL-C)!\n"
@@ -833,96 +838,80 @@
 "variable.\n"
 msgstr ""
 
-#: src/util/os_installation.c:481
+#: src/util/os_installation.c:477
 #, fuzzy, c-format
 msgid "Could not find binary `%s' in PATH!\n"
 msgstr "Knoten `%s' konnte nicht in der Routing Tabelle gefunden werden!\n"
 
-#: src/util/os_installation.c:486
+#: src/util/os_installation.c:483
 #, fuzzy, c-format
 msgid "stat (%s) failed: %s\n"
 msgstr "`%s' schlug fehl: %s\n"
 
-#: src/util/strings.c:144
+#: src/util/strings.c:143
 msgid "b"
 msgstr "b"
 
-#: src/util/strings.c:150
-msgid "KiB"
-msgstr ""
-
-#: src/util/strings.c:154
-msgid "MiB"
-msgstr ""
-
-#: src/util/strings.c:158
-msgid "GiB"
-msgstr ""
-
-#: src/util/strings.c:162
-msgid "TiB"
-msgstr ""
-
-#: src/util/strings.c:198
+#: src/util/strings.c:355
 #, c-format
 msgid "Character set requested was `%s'\n"
 msgstr ""
 
-#: src/util/strings.c:276
+#: src/util/strings.c:433
 msgid "Failed to expand `$HOME': environment variable `HOME' not set"
 msgstr ""
 
-#: src/util/strings.c:368
+#: src/util/strings.c:525
 msgid "ms"
 msgstr "ms"
 
-#: src/util/strings.c:373
+#: src/util/strings.c:530
 msgid "eternity"
 msgstr ""
 
-#: src/util/strings.c:377
+#: src/util/strings.c:534
 msgid "s"
 msgstr "s"
 
-#: src/util/strings.c:381
+#: src/util/strings.c:538
 msgid "m"
 msgstr "m"
 
-#: src/util/strings.c:385
+#: src/util/strings.c:542
 msgid "h"
 msgstr "h"
 
-#: src/util/strings.c:389
+#: src/util/strings.c:546
 msgid " days"
 msgstr " Tage"
 
-#: src/util/strings.c:413
+#: src/util/strings.c:570
 msgid "end of time"
 msgstr ""
 
-#: src/util/server.c:392
+#: src/util/server.c:388
 #, fuzzy, c-format
 msgid "`%s' failed for port %d (%s).\n"
 msgstr "`%s' fehlgeschlagen für Laufwerk %s: %u\n"
 
-#: src/util/server.c:400
+#: src/util/server.c:397
 #, fuzzy, c-format
 msgid "`%s' failed for port %d (%s): address already in use\n"
 msgstr "`%s' schlug fehl für Port %d: %s. Läuft gnunetd bereits?\n"
 
-#: src/util/server.c:405
+#: src/util/server.c:402
 #, fuzzy, c-format
 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:623
+#: src/util/server.c:617
 #, c-format
 msgid ""
 "Processing code for message of type %u did not call "
 "GNUNET_SERVER_receive_done after %llums\n"
 msgstr ""
 
-#: src/util/crypto_random.c:240
+#: src/util/crypto_random.c:239
 #, c-format
 msgid "Starting `%s' process to generate entropy\n"
 msgstr ""
@@ -933,157 +922,157 @@
 msgstr ""
 "libgcrypt hat nicht die erwartete Version (Version %s wird vorausgesetzt).\n"
 
-#: src/util/disk.c:435
+#: src/util/disk.c:434
 #, fuzzy, c-format
 msgid "`%s' failed for drive `%s': %u\n"
 msgstr "`%s' fehlgeschlagen für Laufwerk %s: %u\n"
 
-#: src/util/disk.c:838
+#: src/util/disk.c:834
 #, fuzzy, c-format
 msgid "Expected `%s' to be a directory!\n"
 msgstr "`%s' erwartet, dass `%s' ein Verzeichnis ist!\n"
 
-#: src/util/disk.c:1189 src/util/service.c:1473
+#: src/util/disk.c:1186 src/util/service.c:1452
 #, fuzzy, c-format
 msgid "Cannot obtain information about user `%s': %s\n"
 msgstr "Fehler beim Speichern der Konfigurationsdatei: `%s': %s.\n"
 
-#: src/util/disk.c:1497
+#: src/util/disk.c:1491
 #, fuzzy, c-format
 msgid "No `%s' specified for service `%s' in configuration.\n"
 msgstr "In der Konfigurationsdatei wurden keine Anwendungen definiert!\n"
 
-#: src/util/service.c:118 src/util/service.c:144 src/util/service.c:188
-#: src/util/service.c:209 src/util/service.c:216
+#: src/util/service.c:117 src/util/service.c:143 src/util/service.c:186
+#: src/util/service.c:207 src/util/service.c:214
 #, c-format
 msgid "Invalid format for IP: `%s'\n"
 msgstr "Ungültiges Format für IP: `%s'\n"
 
-#: src/util/service.c:171
+#: src/util/service.c:170
 #, c-format
 msgid "Invalid network notation ('/%d' is not legal in IPv4 CIDR)."
 msgstr "Ungültige Netzwerk Notation ('/%d ist nicht gültig in IPv4 CIDR)."
 
-#: src/util/service.c:265
+#: src/util/service.c:263
 #, c-format
 msgid "Invalid network notation (does not end with ';': `%s')\n"
 msgstr "Ungültige Netzwerk Notation (endet nicht mit ';': `%s')\n"
 
-#: src/util/service.c:301
+#: src/util/service.c:296
 #, fuzzy, c-format
 msgid "Wrong format `%s' for netmask\n"
 msgstr "Falsches Format `%s' für Netzmaske: %s\n"
 
-#: src/util/service.c:332
+#: src/util/service.c:326
 #, fuzzy, c-format
 msgid "Wrong format `%s' for network\n"
 msgstr "Falsches Format `%s' für Netzwerk: %s\n"
 
-#: src/util/service.c:638
+#: src/util/service.c:629
 #, c-format
 msgid "Access denied to UID %d / GID %d\n"
 msgstr ""
 
-#: src/util/service.c:643
+#: src/util/service.c:634
 #, fuzzy, c-format
 msgid "Unknown address family %d\n"
 msgstr "Unbekannte Operation `%s'\n"
 
-#: src/util/service.c:650
+#: src/util/service.c:641
 #, c-format
 msgid "Access from `%s' denied to service `%s'\n"
 msgstr ""
 
-#: src/util/service.c:694
+#: src/util/service.c:685
 #, c-format
 msgid "Could not parse IPv4 network specification `%s' for `%s:%s'\n"
 msgstr ""
 
-#: src/util/service.c:723
+#: src/util/service.c:713
 #, c-format
 msgid "Could not parse IPv6 network specification `%s' for `%s:%s'\n"
 msgstr ""
 
-#: src/util/service.c:841
+#: src/util/service.c:830
 #, c-format
 msgid ""
 "Disabling IPv6 support for service `%s', failed to create IPv6 socket: %s\n"
 msgstr ""
 
-#: src/util/service.c:862 src/transport/plugin_transport_tcp.c:1939
+#: src/util/service.c:850 src/transport/plugin_transport_tcp.c:1935
 #, c-format
 msgid "Require valid port number for service `%s' in configuration!\n"
 msgstr ""
 
-#: src/util/service.c:893 src/util/client.c:712
+#: src/util/service.c:880 src/util/client.c:707
 #, c-format
 msgid "UNIXPATH `%s' too long, maximum length is %llu\n"
 msgstr ""
 
-#: src/util/service.c:913
+#: src/util/service.c:900
 #, c-format
 msgid ""
 "Disabling UNIX domain socket support for service `%s', failed to create UNIX "
 "domain socket: %s\n"
 msgstr ""
 
-#: src/util/service.c:930
+#: src/util/service.c:917
 #, c-format
 msgid "Have neither PORT nor UNIXPATH for service `%s', but one is required\n"
 msgstr ""
 
-#: src/util/service.c:960 src/transport/plugin_transport_http.c:903
+#: src/util/service.c:947 src/transport/plugin_transport_http.c:993
 #, fuzzy, c-format
 msgid "Failed to resolve `%s': %s\n"
 msgstr "Datei wurde als `%s' gespeichert.\n"
 
-#: src/util/service.c:978 src/transport/plugin_transport_http.c:920
+#: src/util/service.c:964 src/transport/plugin_transport_http.c:1010
 #, fuzzy, c-format
 msgid "Failed to find %saddress for `%s'.\n"
 msgstr "Fehler beim Binden an UDP Port %d.\n"
 
-#: src/util/service.c:1135 src/util/service.c:1153
+#: src/util/service.c:1120 src/util/service.c:1138
 #, c-format
 msgid "Specified value for `%s' of service `%s' is invalid\n"
 msgstr ""
 
-#: src/util/service.c:1181
+#: src/util/service.c:1165
 #, c-format
 msgid "Could not access pre-bound socket %u, will try to bind myself\n"
 msgstr ""
 
-#: src/util/service.c:1333
+#: src/util/service.c:1314
 #, 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:1366
+#: src/util/service.c:1347
 #, fuzzy, c-format
 msgid "Service `%s' runs at %s\n"
 msgstr "Knoten `%s' mit Vertrauen %8u und Adresse `%s'\n"
 
-#: src/util/service.c:1414
+#: src/util/service.c:1393
 msgid "Service process failed to initialize\n"
 msgstr ""
 
-#: src/util/service.c:1418
+#: src/util/service.c:1397
 msgid "Service process could not initialize server function\n"
 msgstr ""
 
-#: src/util/service.c:1422
+#: src/util/service.c:1401
 msgid "Service process failed to report status\n"
 msgstr ""
 
-#: src/util/service.c:1474
+#: src/util/service.c:1453
 msgid "No such user"
 msgstr ""
 
-#: src/util/service.c:1488
+#: src/util/service.c:1466
 #, 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:1551
+#: src/util/service.c:1529
 msgid "do daemonize (detach from terminal)"
 msgstr ""
 
@@ -1091,7 +1080,7 @@
 msgid "Test GNUnet DNS resolver code."
 msgstr ""
 
-#: src/util/os_priority.c:117
+#: src/util/os_priority.c:114
 #, c-format
 msgid "Not installing a handler because $%s=%s\n"
 msgstr ""
@@ -1109,215 +1098,215 @@
 "Sie müssen für `%s' in der Sektion `%s' der Konfigurationsdatei eine "
 "positive Zahl angeben.\n"
 
-#: src/util/resolver_api.c:356
+#: src/util/resolver_api.c:358
 #, fuzzy, c-format
 msgid "Timeout trying to resolve IP address `%s'.\n"
 msgstr "GNUnet verwendet nun die IP-Adresse %u.%u.%u.%u.\n"
 
-#: src/util/resolver_api.c:360
+#: src/util/resolver_api.c:362
 #, fuzzy, c-format
 msgid "Timeout trying to resolve hostname `%s'.\n"
 msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
 
-#: src/util/resolver_api.c:428
+#: src/util/resolver_api.c:430
 #, c-format
 msgid "Resolver returns `%s' for IP `%s'.\n"
 msgstr ""
 
-#: src/util/resolver_api.c:793
+#: src/util/resolver_api.c:791
 #, c-format
 msgid "Resolver returns `%s'.\n"
 msgstr ""
 
-#: src/util/resolver_api.c:877
+#: src/util/resolver_api.c:875
 #, c-format
 msgid "Resolving our FQDN `%s'\n"
 msgstr ""
 
-#: src/util/resolver_api.c:882
+#: src/util/resolver_api.c:880
 #, fuzzy, c-format
 msgid "Could not resolve our FQDN : %s\n"
 msgstr "`%s' konnte nicht aufgelöst werden: %s\n"
 
-#: src/util/resolver_api.c:914
+#: src/util/resolver_api.c:912
 #, c-format
 msgid "Resolving our hostname `%s'\n"
 msgstr ""
 
-#: src/util/pseudonym.c:269
+#: src/util/pseudonym.c:266
 #, fuzzy, c-format
 msgid "Failed to parse metadata about pseudonym from file `%s': %s\n"
 msgstr "Fehler beim Parsen der Gerätedaten von `%s' bei %s:%d.\n"
 
-#: src/util/pseudonym.c:333
+#: src/util/pseudonym.c:330
 #, fuzzy
 msgid "no-name"
 msgstr "Name anzeigen"
 
-#: src/util/gnunet-service-resolver.c:262
+#: src/util/gnunet-service-resolver.c:261
 #, fuzzy, c-format
 msgid "Could not resolve `%s' (%s): %s\n"
 msgstr "`%s' konnte nicht aufgelöst werden: %s\n"
 
-#: src/util/gnunet-service-resolver.c:318
-#: src/util/gnunet-service-resolver.c:363
+#: src/util/gnunet-service-resolver.c:317
+#: src/util/gnunet-service-resolver.c:362
 #, c-format
 msgid "Could not find IP of host `%s': %s\n"
 msgstr "IP des Hosts `%s' konnte nicht ermittelt werden: %s\n"
 
-#: src/util/gnunet-service-resolver.c:462
+#: src/util/gnunet-service-resolver.c:460
 #, c-format
 msgid "Resolver asked to look up `%s'.\n"
 msgstr ""
 
-#: src/util/gnunet-service-resolver.c:509
+#: src/util/gnunet-service-resolver.c:508
 #, c-format
 msgid "Resolver asked to look up IP address `%s'.\n"
 msgstr ""
 
-#: src/util/bio.c:137 src/util/bio.c:143
+#: src/util/bio.c:136 src/util/bio.c:142
 #, fuzzy, c-format
 msgid "Error reading `%s': %s"
 msgstr "Fehler beim Anlegen des Benutzers"
 
-#: src/util/bio.c:144
+#: src/util/bio.c:143
 #, fuzzy
 msgid "End of file"
 msgstr "Eine Konfigurationsdatei laden"
 
-#: src/util/bio.c:196
+#: src/util/bio.c:195
 #, c-format
 msgid "Error reading length of string `%s'"
 msgstr ""
 
-#: src/util/bio.c:208
+#: src/util/bio.c:205
 #, c-format
 msgid "String `%s' longer than allowed (%u > %u)"
 msgstr ""
 
-#: src/util/bio.c:254
+#: src/util/bio.c:250
 #, c-format
 msgid "Serialized metadata `%s' larger than allowed (%u>%u)"
 msgstr ""
 
-#: src/util/bio.c:268
+#: src/util/bio.c:264
 #, c-format
 msgid "Metadata `%s' failed to deserialize"
 msgstr ""
 
-#: src/util/client.c:303
+#: src/util/client.c:301
 #, c-format
 msgid ""
 "Could not determine valid hostname and port for service `%s' from "
 "configuration.\n"
 msgstr ""
 
-#: src/util/client.c:311
+#: src/util/client.c:309
 #, c-format
 msgid "Need a non-empty hostname for service `%s'.\n"
 msgstr ""
 
-#: src/util/client.c:652
+#: src/util/client.c:647
 msgid "Failure to transmit TEST request.\n"
 msgstr ""
 
-#: src/util/client.c:857
+#: src/util/client.c:849
 #, fuzzy, c-format
 msgid "Could not connect to service `%s', must not be running.\n"
 msgstr "Verbindung zu gnunetd konnte nicht hergestellt werden.\n"
 
-#: src/util/client.c:874
+#: src/util/client.c:865
 #, fuzzy, c-format
 msgid "Failure to transmit request to service `%s'\n"
 msgstr "Fehler beim Senden einer `%s' Anfrage an den SMTP Server.\n"
 
-#: src/util/client.c:1143
+#: src/util/client.c:1133
 msgid "Could not submit request, not expecting to receive a response.\n"
 msgstr ""
 
-#: src/util/crypto_rsa.c:624 src/util/crypto_rsa.c:672
+#: src/util/crypto_rsa.c:616 src/util/crypto_rsa.c:663
 #, fuzzy, c-format
 msgid "Could not aquire lock on file `%s': %s...\n"
 msgstr "PID konnte nicht in Datei `%s' geschrieben werden: %s.\n"
 
-#: src/util/crypto_rsa.c:629
+#: src/util/crypto_rsa.c:621
 #, fuzzy
 msgid "Creating a new private key.  This may take a while.\n"
 msgstr "Ein neuer Hostkey wird erzeugt (dies kann eine Weile dauern).\n"
 
-#: src/util/crypto_rsa.c:648
+#: src/util/crypto_rsa.c:639
 #, c-format
 msgid "I am host `%s'.  Stored new private key in `%s'.\n"
 msgstr ""
 
-#: src/util/crypto_rsa.c:676 src/util/crypto_rsa.c:714
+#: src/util/crypto_rsa.c:667 src/util/crypto_rsa.c:703
 msgid "This may be ok if someone is currently generating a hostkey.\n"
 msgstr ""
 
-#: src/util/crypto_rsa.c:709
+#: src/util/crypto_rsa.c:698
 #, c-format
 msgid ""
 "When trying to read hostkey file `%s' I found %u bytes but I need at least "
 "%u.\n"
 msgstr ""
 
-#: src/util/crypto_rsa.c:730
+#: src/util/crypto_rsa.c:718
 #, fuzzy, c-format
 msgid "File `%s' does not contain a valid private key.  Deleting it.\n"
 msgstr "Die Datei `%s' enthält kein Pseudonym.\n"
 
-#: src/util/crypto_rsa.c:748
+#: src/util/crypto_rsa.c:736
 #, fuzzy, c-format
 msgid "I am host `%s'.  Read private key from `%s'.\n"
 msgstr "Aufruf von `%s' mit Schlüssel `%s'.\n"
 
-#: src/util/crypto_rsa.c:970
+#: src/util/crypto_rsa.c:957
 #, c-format
 msgid "RSA signature verification failed at %s:%d: %s\n"
 msgstr "RSA Signaturüberprüfung fehlgeschlagen bei %s:%d: %s\n"
 
-#: src/nse/gnunet-nse-profiler.c:650 src/dht/gnunet-dht-get.c:213
+#: src/nse/gnunet-nse-profiler.c:646 src/dht/gnunet-dht-get.c:213
 #: src/dht/gnunet-dht-put.c:184 src/fs/gnunet-unindex.c:169
 #: src/fs/gnunet-search.c:297 src/fs/gnunet-publish.c:591
 #: src/fs/gnunet-download.c:263
 msgid "be verbose (print progress information)"
 msgstr ""
 
-#: src/nse/gnunet-nse-profiler.c:668
+#: src/nse/gnunet-nse-profiler.c:664
 #, fuzzy
 msgid "Measure quality and performance of the NSE service."
 msgstr "Auf den Dienst konnte nicht zugegriffen werden"
 
-#: src/nse/gnunet-service-nse.c:875
+#: src/nse/gnunet-service-nse.c:878
 #, c-format
 msgid "Proof of work invalid: %llu!\n"
 msgstr ""
 
-#: src/nse/gnunet-service-nse.c:1298 src/nse/gnunet-service-nse.c:1317
-#: src/nse/gnunet-service-nse.c:1338
+#: src/nse/gnunet-service-nse.c:1301 src/nse/gnunet-service-nse.c:1320
+#: src/nse/gnunet-service-nse.c:1341
 msgid "NSE service is lacking key configuration settings.  Exiting.\n"
 msgstr ""
 
-#: src/nse/gnunet-service-nse.c:1305
+#: src/nse/gnunet-service-nse.c:1308
 #, fuzzy
 msgid "Invalid work requirement for NSE service. Exiting.\n"
 msgstr "Ungültige Parameter. Abbruch.\n"
 
-#: src/nse/gnunet-service-nse.c:1326
+#: src/nse/gnunet-service-nse.c:1329
 #, fuzzy
 msgid "NSE service could not access hostkey.  Exiting.\n"
 msgstr "Auf die Namespace Informationen konnte nicht zugegriffen werden.\n"
 
-#: src/peerinfo/gnunet-service-peerinfo.c:136
+#: src/peerinfo/gnunet-service-peerinfo.c:134
 #, fuzzy, c-format
 msgid "Removing expired address of transport `%s'\n"
 msgstr "Verfügbare(r) Transport(e): %s\n"
 
-#: src/peerinfo/gnunet-service-peerinfo.c:197
+#: src/peerinfo/gnunet-service-peerinfo.c:196
 msgid "# peers known"
 msgstr ""
 
-#: src/peerinfo/gnunet-service-peerinfo.c:241
+#: src/peerinfo/gnunet-service-peerinfo.c:240
 #, c-format
 msgid ""
 "File `%s' in directory `%s' does not match naming convention. Removed.\n"
@@ -1325,7 +1314,7 @@
 "Die Datei `%s' im Verzeichnis `%s' entspricht nicht der Namenskonvention. "
 "Datei wurde entfernt.\n"
 
-#: src/peerinfo/gnunet-service-peerinfo.c:306
+#: src/peerinfo/gnunet-service-peerinfo.c:305
 #, fuzzy, c-format
 msgid "Still no peers found in `%s'!\n"
 msgstr "Dienst `%s' konnte nicht ordentlich entladen werden!\n"
@@ -1335,50 +1324,50 @@
 msgid "Could not connect to `%s' service.\n"
 msgstr "Verbindung zu gnunetd konnte nicht hergestellt werden.\n"
 
-#: src/peerinfo/peerinfo_api.c:278
+#: src/peerinfo/peerinfo_api.c:279
 #, fuzzy, c-format
 msgid "Failed to transmit message to `%s' service.\n"
 msgstr "`%s' Dienst konnte nicht initialisiert werden.\n"
 
-#: src/peerinfo/peerinfo_api.c:433
+#: src/peerinfo/peerinfo_api.c:435
 #, fuzzy
 msgid "Failed to receive response from `PEERINFO' service."
 msgstr "Fehler beim Empfangen der Antwort von gnunetd auf die `%s' Nachricht\n"
 
-#: src/peerinfo/peerinfo_api.c:461 src/peerinfo/peerinfo_api.c:479
+#: src/peerinfo/peerinfo_api.c:463 src/peerinfo/peerinfo_api.c:481
 #, fuzzy
 msgid "Received invalid message from `PEERINFO' service.\n"
 msgstr "Ungültige `%s' Anfrage von `%s' empfangen.\n"
 
-#: src/peerinfo/peerinfo_api.c:521
+#: src/peerinfo/peerinfo_api.c:523
 #, fuzzy
 msgid "Failed to transmit iteration request to `PEERINFO' service\n"
 msgstr "Fehler beim Senden einer `%s' Anfrage an den SMTP Server.\n"
 
-#: src/peerinfo/peerinfo_api.c:555
+#: src/peerinfo/peerinfo_api.c:557
 msgid "Timeout transmitting iteration request to `PEERINFO' service.\n"
 msgstr ""
 
-#: src/datacache/plugin_datacache_sqlite.c:439
+#: src/datacache/plugin_datacache_sqlite.c:424
 msgid "Sqlite datacache running\n"
 msgstr ""
 
-#: src/datacache/datacache.c:177
+#: src/datacache/datacache.c:176
 #, c-format
 msgid "Loading `%s' datacache plugin\n"
 msgstr ""
 
-#: src/datacache/datacache.c:185
+#: src/datacache/datacache.c:184
 #, fuzzy, c-format
 msgid "Failed to load datacache plugin for `%s'\n"
 msgstr "Fehler beim Aktualisieren der Daten des Moduls `%s'\n"
 
-#: src/datacache/datacache.c:276
+#: src/datacache/datacache.c:274
 #, fuzzy
 msgid "# requests received"
 msgstr "# Client Trace-Anfragen empfangen"
 
-#: src/datacache/datacache.c:287
+#: src/datacache/datacache.c:284
 msgid "# requests filtered by bloom filter"
 msgstr ""
 
@@ -1408,92 +1397,92 @@
 msgid "# FIND PEER messages initiated"
 msgstr "# PING Nachrichten erstellt"
 
-#: src/dht/gnunet-service-dht_neighbours.c:632
-#: src/dht/gnunet-service-dht_neighbours.c:697
+#: src/dht/gnunet-service-dht_neighbours.c:627
+#: src/dht/gnunet-service-dht_neighbours.c:687
 #, fuzzy
 msgid "# Peers connected"
 msgstr "# verbundener Knoten"
 
-#: src/dht/gnunet-service-dht_neighbours.c:734
+#: src/dht/gnunet-service-dht_neighbours.c:721
 #, fuzzy
 msgid "# Queued messages discarded (peer disconnected)"
 msgstr "# defragmentierter Nachrichten"
 
-#: src/dht/gnunet-service-dht_neighbours.c:787
+#: src/dht/gnunet-service-dht_neighbours.c:776
 #, fuzzy
 msgid "# Bytes transmitted to other peers"
 msgstr "# Bytes des Typs %d übertragen"
 
-#: src/dht/gnunet-service-dht_neighbours.c:824
+#: src/dht/gnunet-service-dht_neighbours.c:814
 #, fuzzy
 msgid "# Bytes of bandwdith requested from core"
 msgstr "# Client Trace-Anfragen empfangen"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1051
-#: src/dht/gnunet-service-dht_neighbours.c:1078
+#: src/dht/gnunet-service-dht_neighbours.c:1038
+#: src/dht/gnunet-service-dht_neighbours.c:1066
 msgid "# Peers excluded from routing due to Bloomfilter"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1060
-#: src/dht/gnunet-service-dht_neighbours.c:1096
+#: src/dht/gnunet-service-dht_neighbours.c:1047
+#: src/dht/gnunet-service-dht_neighbours.c:1083
 #, fuzzy
 msgid "# Peer selection failed"
 msgstr " Verbindung fehlgeschlagen\n"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1238
+#: src/dht/gnunet-service-dht_neighbours.c:1219
 #, fuzzy
 msgid "# PUT requests routed"
 msgstr "# dht Anfragen weitergeleitet"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1267
+#: src/dht/gnunet-service-dht_neighbours.c:1250
 #, fuzzy
 msgid "# PUT messages queued for transmission"
 msgstr "# PING Nachrichten erstellt"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1352
+#: src/dht/gnunet-service-dht_neighbours.c:1331
 #, fuzzy
 msgid "# GET requests routed"
 msgstr "# dht Anfragen weitergeleitet"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1384
+#: src/dht/gnunet-service-dht_neighbours.c:1362
 #, fuzzy
 msgid "# GET messages queued for transmission"
 msgstr "# PING Nachrichten erstellt"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1485
+#: src/dht/gnunet-service-dht_neighbours.c:1465
 #, fuzzy
 msgid "# RESULT messages queued for transmission"
 msgstr "# PING Nachrichten erstellt"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1574
+#: src/dht/gnunet-service-dht_neighbours.c:1553
 #, fuzzy
 msgid "# P2P PUT requests received"
 msgstr "# Client Trace-Anfragen empfangen"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1700
+#: src/dht/gnunet-service-dht_neighbours.c:1662
 msgid "# FIND PEER requests ignored due to Bloomfilter"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1707
+#: src/dht/gnunet-service-dht_neighbours.c:1670
 msgid "# FIND PEER requests ignored due to lack of HELLO"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1800
+#: src/dht/gnunet-service-dht_neighbours.c:1761
 #, fuzzy
 msgid "# P2P GET requests received"
 msgstr "# Client Trace-Anfragen empfangen"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1853
+#: src/dht/gnunet-service-dht_neighbours.c:1805
 #, fuzzy
 msgid "# P2P FIND PEER requests processed"
 msgstr "# Client Trace-Anfragen empfangen"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1872
+#: src/dht/gnunet-service-dht_neighbours.c:1819
 #, fuzzy
 msgid "# P2P GET requests ONLY routed"
 msgstr "# dht Anfragen weitergeleitet"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1941
+#: src/dht/gnunet-service-dht_neighbours.c:1885
 #, fuzzy
 msgid "# P2P RESULTS received"
 msgstr "# Bytes empfangen über TCP"
@@ -1503,7 +1492,7 @@
 msgid "Failed to connect to the DHT service!\n"
 msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
 
-#: src/dht/gnunet-service-dht.c:165
+#: src/dht/gnunet-service-dht.c:163
 #, fuzzy
 msgid "Failed to connect to transport service!\n"
 msgstr "Der Transportdienst auf Port %d konnte nicht gestartet werden.\n"
@@ -1528,50 +1517,50 @@
 msgid "Issue a GET request to the GNUnet DHT, prints results."
 msgstr ""
 
-#: src/dht/gnunet-service-dht_clients.c:321
+#: src/dht/gnunet-service-dht_clients.c:311
 #, fuzzy
 msgid "# GET requests from clients injected"
 msgstr "# Client Trace-Anfragen empfangen"
 
-#: src/dht/gnunet-service-dht_clients.c:413
+#: src/dht/gnunet-service-dht_clients.c:402
 #, fuzzy
 msgid "# PUT requests received from clients"
 msgstr "Empfangene Client-Nachricht ist ungültig.\n"
 
-#: src/dht/gnunet-service-dht_clients.c:486
+#: src/dht/gnunet-service-dht_clients.c:469
 #, fuzzy
 msgid "# GET requests received from clients"
 msgstr "Empfangene Client-Nachricht ist ungültig.\n"
 
-#: src/dht/gnunet-service-dht_clients.c:585
+#: src/dht/gnunet-service-dht_clients.c:564
 #, fuzzy
 msgid "# GET STOP requests received from clients"
 msgstr "Empfangene Client-Nachricht ist ungültig.\n"
 
-#: src/dht/gnunet-service-dht_clients.c:790
+#: src/dht/gnunet-service-dht_clients.c:757
 msgid "# Key match, type mismatches in REPLY to CLIENT"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_clients.c:808
+#: src/dht/gnunet-service-dht_clients.c:772
 msgid "# Duplicate REPLIES to CLIENT request dropped"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_clients.c:852
+#: src/dht/gnunet-service-dht_clients.c:809
 #, fuzzy, c-format
 msgid "Unsupported block type (%u) in request!\n"
 msgstr "Ungültige Nachricht des Typs %u empfangen. Nachricht wird verworfen.\n"
 
-#: src/dht/gnunet-service-dht_clients.c:875
+#: src/dht/gnunet-service-dht_clients.c:831
 #, fuzzy
 msgid "# RESULTS queued for clients"
 msgstr "Empfangene Client-Nachricht ist ungültig.\n"
 
-#: src/dht/gnunet-service-dht_clients.c:928
-#: src/dht/gnunet-service-dht_clients.c:971
+#: src/dht/gnunet-service-dht_clients.c:882
+#: src/dht/gnunet-service-dht_clients.c:925
 msgid "# REPLIES ignored for CLIENTS (no match)"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_clients.c:937
+#: src/dht/gnunet-service-dht_clients.c:892
 #, fuzzy
 msgid "Could not pass reply to client, message too big!\n"
 msgstr "'join' Nachricht konnte nicht an gnunetd gesendet werden.\n"
@@ -1626,32 +1615,32 @@
 msgid "Issue a PUT request to the GNUnet DHT insert DATA under KEY."
 msgstr ""
 
-#: src/dht/gnunet-service-dht_routing.c:220
+#: src/dht/gnunet-service-dht_routing.c:211
 msgid "# Good REPLIES matched against routing table"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_routing.c:235
+#: src/dht/gnunet-service-dht_routing.c:220
 msgid "# Duplicate REPLIES matched against routing table"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_routing.c:240
+#: src/dht/gnunet-service-dht_routing.c:226
 msgid "# Invalid REPLIES matched against routing table"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_routing.c:249
+#: src/dht/gnunet-service-dht_routing.c:236
 msgid "# Unsupported REPLIES matched against routing table"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_routing.c:332
-#: src/dht/gnunet-service-dht_routing.c:390
+#: src/dht/gnunet-service-dht_routing.c:314
+#: src/dht/gnunet-service-dht_routing.c:368
 msgid "# Entries removed from routing table"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_routing.c:342
+#: src/dht/gnunet-service-dht_routing.c:324
 msgid "# Entries added to routing table"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_datacache.c:92
+#: src/dht/gnunet-service-dht_datacache.c:93
 #, fuzzy, c-format
 msgid "%s request received, but have no datacache!\n"
 msgstr "# Bytes empfangen über TCP"
@@ -1660,33 +1649,33 @@
 msgid "# ITEMS stored in datacache"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_datacache.c:215
+#: src/dht/gnunet-service-dht_datacache.c:209
 msgid "# Good RESULTS found in datacache"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_datacache.c:229
+#: src/dht/gnunet-service-dht_datacache.c:220
 msgid "# Duplicate RESULTS found in datacache"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_datacache.c:234
+#: src/dht/gnunet-service-dht_datacache.c:226
 msgid "# Invalid RESULTS found in datacache"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_datacache.c:245
+#: src/dht/gnunet-service-dht_datacache.c:238
 msgid "# Unsupported RESULTS found in datacache"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_datacache.c:248
+#: src/dht/gnunet-service-dht_datacache.c:241
 #, c-format
 msgid "Unsupported block type (%u) in local response!\n"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_datacache.c:280
+#: src/dht/gnunet-service-dht_datacache.c:271
 #, fuzzy
 msgid "# GET requests given to datacache"
 msgstr "# Client Trace-Anfragen empfangen"
 
-#: src/dht/gnunet-service-dht_hello.c:86
+#: src/dht/gnunet-service-dht_hello.c:82
 #, fuzzy
 msgid "# HELLOs obtained from peerinfo"
 msgstr "Empfangene Client-Nachricht ist ungültig.\n"
@@ -1996,34 +1985,34 @@
 msgid "# messages defragmented"
 msgstr "# defragmentierter Nachrichten"
 
-#: src/fragmentation/fragmentation.c:183
+#: src/fragmentation/fragmentation.c:188
 #, fuzzy
 msgid "# fragments transmitted"
 msgstr "# Selbstbekanntmachungen übertragen"
 
-#: src/fragmentation/fragmentation.c:186
+#: src/fragmentation/fragmentation.c:191
 #, fuzzy
 msgid "# fragments retransmitted"
 msgstr "# Selbstbekanntmachungen übertragen"
 
-#: src/fragmentation/fragmentation.c:248
+#: src/fragmentation/fragmentation.c:254
 msgid "# messages fragmented"
 msgstr "# fragmentierter Nachrichten"
 
-#: src/fragmentation/fragmentation.c:251
+#: src/fragmentation/fragmentation.c:257
 msgid "# total size of fragmented messages"
 msgstr ""
 
-#: src/fragmentation/fragmentation.c:335
+#: src/fragmentation/fragmentation.c:342
 #, fuzzy
 msgid "# fragment acknowledgements received"
 msgstr "# Knotenankündigungen empfangen"
 
-#: src/fragmentation/fragmentation.c:341
+#: src/fragmentation/fragmentation.c:348
 msgid "# bits removed from fragmentation ACKs"
 msgstr ""
 
-#: src/fragmentation/fragmentation.c:365
+#: src/fragmentation/fragmentation.c:372
 #, fuzzy
 msgid "# fragmentation transmissions completed"
 msgstr "# Klartext PONG Nachrichten empfangen"
@@ -2038,7 +2027,7 @@
 msgid "Wrote %llu bytes of statistics to `%s'\n"
 msgstr "Dateien aus dem GNUnet herunterladen."
 
-#: src/statistics/statistics_api.c:325
+#: src/statistics/statistics_api.c:327
 #, fuzzy
 msgid "Failed to connect to statistics service!\n"
 msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
@@ -2181,56 +2170,56 @@
 msgid "Manage GNUnet pseudonyms."
 msgstr ""
 
-#: src/fs/fs_namespace.c:52 src/fs/fs_namespace.c:78
+#: src/fs/fs_namespace.c:64 src/fs/fs_namespace.c:90
 #, fuzzy, c-format
 msgid "Configuration fails to specify `%s' in section `%s'\n"
 msgstr ""
 "Die Konfigurationsdatei muss in der Sektion `%s' unter `%s' ein Verzeichnis "
 "angeben, in dem FS Daten gespeichert werden.\n"
 
-#: src/fs/fs_namespace.c:107
+#: src/fs/fs_namespace.c:119
 #, fuzzy, c-format
 msgid "Failed to open `%s' for writing: %s\n"
 msgstr "Datei wurde als `%s' gespeichert.\n"
 
-#: src/fs/fs_namespace.c:129 src/fs/fs_namespace.c:217
+#: src/fs/fs_namespace.c:141 src/fs/fs_namespace.c:229
 #, fuzzy, c-format
 msgid "Failed to write `%s': %s\n"
 msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
 
-#: src/fs/fs_namespace.c:323
+#: src/fs/fs_namespace.c:335
 #, fuzzy
 msgid "Unknown error"
 msgstr "Unbekannter Fehler"
 
-#: src/fs/fs_namespace.c:412 src/fs/fs_namespace.c:433
+#: src/fs/fs_namespace.c:424 src/fs/fs_namespace.c:445
 #, fuzzy
 msgid "Failed to serialize meta data"
 msgstr "SQLite Datenbank konnte nicht initialisiert werden.\n"
 
-#: src/fs/fs_namespace.c:452
+#: src/fs/fs_namespace.c:464
 #, fuzzy
 msgid "Failed to connect to datastore service"
 msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
 
-#: src/fs/fs_namespace.c:495
+#: src/fs/fs_namespace.c:507
 #, fuzzy, c-format
 msgid "Failed to create or read private key for namespace `%s'\n"
 msgstr "Fehler beim Aktualisieren der Daten des Moduls `%s'\n"
 
-#: src/fs/fs_namespace.c:597
+#: src/fs/fs_namespace.c:609
 #, fuzzy, c-format
 msgid "Failed to read namespace private key file `%s', deleting it!\n"
 msgstr ""
 "Der Eintrag konnte dem Namespace `%s' nicht hinzugefügt werden (existiert "
 "er?)\n"
 
-#: src/fs/fs_namespace.c:822 src/fs/fs_publish.c:1518
+#: src/fs/fs_namespace.c:834 src/fs/fs_publish.c:1523
 #, fuzzy
 msgid "Internal error."
 msgstr "Unbekannter Fehler.\n"
 
-#: src/fs/fs_namespace.c:866
+#: src/fs/fs_namespace.c:878
 #, fuzzy
 msgid "Failed to connect to datastore."
 msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden."
@@ -2344,11 +2333,11 @@
 msgid "Could not access hostkey file `%s'.\n"
 msgstr "Konfigurationsdatei `%s' konnte nicht geparst werden.\n"
 
-#: src/fs/fs_uri.c:1238 src/fs/fs_uri.c:1265
+#: src/fs/fs_uri.c:1232 src/fs/fs_uri.c:1259
 msgid "No keywords specified!\n"
 msgstr "Keine Schlüsselwörter angegeben!\n"
 
-#: src/fs/fs_uri.c:1271
+#: src/fs/fs_uri.c:1265
 msgid "Number of double-quotes not balanced!\n"
 msgstr ""
 
@@ -2408,7 +2397,7 @@
 msgstr "Option `%s' macht keinen Sinn ohne die Option `%s'.\n"
 
 #: src/fs/gnunet-publish.c:393 src/fs/gnunet-publish.c:400
-#: src/transport/gnunet-transport.c:525
+#: src/transport/gnunet-transport.c:477
 #, c-format
 msgid "Option `%s' makes no sense without option `%s'.\n"
 msgstr "Option `%s' macht keinen Sinn ohne die Option `%s'.\n"
@@ -2511,13 +2500,13 @@
 msgid "Publish a file or directory on GNUnet"
 msgstr ""
 
-#: src/fs/fs_search.c:798
+#: src/fs/fs_search.c:803
 #, c-format
 msgid "Got result with unknown block type `%d', ignoring"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_lc.c:202 src/fs/gnunet-service-fs_lc.c:359
-#: src/fs/gnunet-service-fs_lc.c:480
+#: src/fs/gnunet-service-fs_lc.c:202 src/fs/gnunet-service-fs_lc.c:365
+#: src/fs/gnunet-service-fs_lc.c:490
 #, fuzzy
 msgid "# client searches active"
 msgstr "# gap Anfragen insgesamt empfangen"
@@ -2527,12 +2516,12 @@
 msgid "# replies received for local clients"
 msgstr "# gap Anfragen insgesamt empfangen"
 
-#: src/fs/gnunet-service-fs_lc.c:312
+#: src/fs/gnunet-service-fs_lc.c:319
 #, fuzzy
 msgid "# client searches received"
 msgstr "# gap Anfragen insgesamt empfangen"
 
-#: src/fs/gnunet-service-fs_lc.c:351
+#: src/fs/gnunet-service-fs_lc.c:359
 msgid "# client searches updated (merged content seen list)"
 msgstr ""
 
@@ -2576,246 +2565,248 @@
 msgid "Display contents of a GNUnet directory"
 msgstr "Dateiformat fehlerhaft (kein GNUnet Verzeichnis?)\n"
 
-#: src/fs/gnunet-service-fs_pr.c:272
+#: src/fs/gnunet-service-fs_pr.c:287
 #, fuzzy
 msgid "# Pending requests created"
 msgstr "# Client Trace-Anfragen empfangen"
 
-#: src/fs/gnunet-service-fs_pr.c:352 src/fs/gnunet-service-fs_pr.c:607
+#: src/fs/gnunet-service-fs_pr.c:368 src/fs/gnunet-service-fs_pr.c:622
 #, fuzzy
 msgid "# Pending requests active"
 msgstr "# Client Trace-Anfragen empfangen"
 
-#: src/fs/gnunet-service-fs_pr.c:771
+#: src/fs/gnunet-service-fs_pr.c:786
 #, fuzzy
 msgid "# replies received and matched"
 msgstr "# Bytes empfangen über TCP"
 
-#: src/fs/gnunet-service-fs_pr.c:798
+#: src/fs/gnunet-service-fs_pr.c:813
 msgid "# duplicate replies discarded (bloomfilter)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:814
+#: src/fs/gnunet-service-fs_pr.c:829
 #, c-format
 msgid "Unsupported block type %u\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:829
+#: src/fs/gnunet-service-fs_pr.c:844
 msgid "# results found locally"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:921
+#: src/fs/gnunet-service-fs_pr.c:936
 msgid "# Datastore `PUT' failures"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:948
+#: src/fs/gnunet-service-fs_pr.c:963
 #, fuzzy
 msgid "# storage requests dropped due to high load"
 msgstr "# gap Anfragen verworfen: Kollision in RT"
 
-#: src/fs/gnunet-service-fs_pr.c:983
+#: src/fs/gnunet-service-fs_pr.c:998
 #, fuzzy
 msgid "# Replies received from DHT"
 msgstr "# Bytes empfangen über HTTP"
 
-#: src/fs/gnunet-service-fs_pr.c:1074
+#: src/fs/gnunet-service-fs_pr.c:1088
 #, c-format
 msgid "Datastore lookup already took %llu ms!\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1095
+#: src/fs/gnunet-service-fs_pr.c:1109
 #, c-format
 msgid "On-demand lookup already took %llu ms!\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1142
+#: src/fs/gnunet-service-fs_pr.c:1156
 msgid "# Datastore lookups concluded (no results)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1156
+#: src/fs/gnunet-service-fs_pr.c:1170
 msgid "# Datastore lookups concluded (seen all)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1165
+#: src/fs/gnunet-service-fs_pr.c:1179
 msgid "# Datastore lookups aborted (more than MAX_RESULTS)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1181
+#: src/fs/gnunet-service-fs_pr.c:1195
 msgid "# requested DBLOCK or IBLOCK not found"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1198
+#: src/fs/gnunet-service-fs_pr.c:1212
 msgid "# on-demand blocks matched requests"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1211
+#: src/fs/gnunet-service-fs_pr.c:1225
 msgid "# on-demand lookups performed successfully"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1216
+#: src/fs/gnunet-service-fs_pr.c:1230
 msgid "# on-demand lookups failed"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1242 src/fs/gnunet-service-fs_pr.c:1281
-#: src/fs/gnunet-service-fs_pr.c:1416
+#: src/fs/gnunet-service-fs_pr.c:1257 src/fs/gnunet-service-fs_pr.c:1297
+#: src/fs/gnunet-service-fs_pr.c:1437
 msgid "# Datastore lookups concluded (error queueing)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1299
+#: src/fs/gnunet-service-fs_pr.c:1315
 msgid "# Datastore lookups concluded (found last result)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1312
+#: src/fs/gnunet-service-fs_pr.c:1328
 msgid "# Datastore lookups concluded (load too high)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1394
+#: src/fs/gnunet-service-fs_pr.c:1414
 msgid "# Datastore lookups initiated"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1474
+#: src/fs/gnunet-service-fs_pr.c:1495
 #, fuzzy
 msgid "# GAP PUT messages received"
 msgstr "# verschlüsselter PONG Nachrichten empfangen"
 
-#: src/fs/gnunet-service-fs_pr.c:1565 src/fs/gnunet-service-fs_pr.c:1576
+#: src/fs/gnunet-service-fs_pr.c:1586 src/fs/gnunet-service-fs_pr.c:1595
 #, fuzzy, c-format
 msgid "Configuration fails to specify `%s', assuming default value."
 msgstr "Konfigurationsdatei `%s' wurde erzeugt.\n"
 
-#: src/fs/gnunet-service-fs_pe.c:259
+#: src/fs/gnunet-service-fs_pe.c:265
 msgid "# average retransmission delay (ms)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pe.c:354
+#: src/fs/gnunet-service-fs_pe.c:392
 #, fuzzy
 msgid "# transmission failed (core has no bandwidth)"
 msgstr "Kein Transport des Typs %d bekannt.\n"
 
-#: src/fs/gnunet-service-fs_pe.c:385
+#: src/fs/gnunet-service-fs_pe.c:423
 #, fuzzy
 msgid "# query messages sent to other peers"
 msgstr "# Bytes ausgehender Nachrichten verworfen"
 
-#: src/fs/gnunet-service-fs_pe.c:440
+#: src/fs/gnunet-service-fs_pe.c:476
 msgid "# delay heap timeout"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pe.c:450
+#: src/fs/gnunet-service-fs_pe.c:483
 #, fuzzy
 msgid "# query plans executed"
 msgstr "# dht Anfragen weitergeleitet"
 
-#: src/fs/gnunet-service-fs_pe.c:516
+#: src/fs/gnunet-service-fs_pe.c:547
 #, fuzzy
 msgid "# requests merged"
 msgstr "# Client Trace-Anfragen empfangen"
 
-#: src/fs/gnunet-service-fs_pe.c:522
+#: src/fs/gnunet-service-fs_pe.c:553
 #, fuzzy
 msgid "# requests refreshed"
 msgstr "# Client Trace-Anfragen empfangen"
 
-#: src/fs/gnunet-service-fs_pe.c:576 src/fs/gnunet-service-fs_pe.c:665
-#: src/fs/gnunet-service-fs_pe.c:706
+#: src/fs/gnunet-service-fs_pe.c:606 src/fs/gnunet-service-fs_pe.c:692
+#: src/fs/gnunet-service-fs_pe.c:734
 msgid "# query plan entries"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:618 src/fs/gnunet-service-fs_cp.c:1552
-#: src/transport/gnunet-service-transport_neighbours.c:870
-#: src/transport/gnunet-service-transport_neighbours.c:2036
-#: src/transport/gnunet-service-transport_neighbours.c:2123
-#: src/topology/gnunet-daemon-topology.c:653
-#: src/topology/gnunet-daemon-topology.c:755
+#: src/fs/gnunet-service-fs_cp.c:615 src/fs/gnunet-service-fs_cp.c:1543
+#: src/transport/gnunet-service-transport_neighbours.c:938
+#: src/transport/gnunet-service-transport_neighbours.c:943
+#: src/transport/gnunet-service-transport_neighbours.c:1266
+#: src/transport/gnunet-service-transport_neighbours.c:2352
+#: src/transport/gnunet-service-transport_neighbours.c:2423
+#: src/topology/gnunet-daemon-topology.c:654
+#: src/topology/gnunet-daemon-topology.c:756
 #, fuzzy
 msgid "# peers connected"
 msgstr "# verbundener Knoten"
 
-#: src/fs/gnunet-service-fs_cp.c:701
+#: src/fs/gnunet-service-fs_cp.c:696
 #, fuzzy
 msgid "# migration stop messages received"
 msgstr "# verschlüsselter PING Nachrichten empfangen"
 
-#: src/fs/gnunet-service-fs_cp.c:705
+#: src/fs/gnunet-service-fs_cp.c:700
 #, c-format
 msgid "Migration of content to peer `%s' blocked for %llu ms\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:740
+#: src/fs/gnunet-service-fs_cp.c:735
 #, fuzzy
 msgid "# replies transmitted to other peers"
 msgstr "# Bytes des Typs %d übertragen"
 
-#: src/fs/gnunet-service-fs_cp.c:746
+#: src/fs/gnunet-service-fs_cp.c:741
 msgid "# replies dropped"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:775 src/fs/gnunet-service-fs_cp.c:891
-#: src/fs/gnunet-service-fs_cp.c:1301 src/fs/gnunet-service-fs_cp.c:1340
+#: src/fs/gnunet-service-fs_cp.c:770 src/fs/gnunet-service-fs_cp.c:886
+#: src/fs/gnunet-service-fs_cp.c:1296 src/fs/gnunet-service-fs_cp.c:1333
 msgid "# P2P searches active"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:848
+#: src/fs/gnunet-service-fs_cp.c:843
 msgid "# artificial delays introduced (ms)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:911
+#: src/fs/gnunet-service-fs_cp.c:906
 #, fuzzy
 msgid "# replies received for other peers"
 msgstr "# Bytes des Typs %d empfangen"
 
-#: src/fs/gnunet-service-fs_cp.c:925
+#: src/fs/gnunet-service-fs_cp.c:920
 msgid "# replies dropped due to insufficient cover traffic"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:963
+#: src/fs/gnunet-service-fs_cp.c:958
 msgid "# P2P searches destroyed due to ultimate reply"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1030
+#: src/fs/gnunet-service-fs_cp.c:1025
 #, fuzzy
 msgid "# requests done for free (low load)"
 msgstr "# gap Anfragen verworfen: Kollision in RT"
 
-#: src/fs/gnunet-service-fs_cp.c:1054
+#: src/fs/gnunet-service-fs_cp.c:1049
 msgid "# request dropped, priority insufficient"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1064
+#: src/fs/gnunet-service-fs_cp.c:1059
 #, fuzzy
 msgid "# requests done for a price (normal load)"
 msgstr "# gap Anfragen verworfen: Kollision in RT"
 
-#: src/fs/gnunet-service-fs_cp.c:1143
+#: src/fs/gnunet-service-fs_cp.c:1138
 msgid "# GET requests received (from other peers)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1177
+#: src/fs/gnunet-service-fs_cp.c:1172
 #, fuzzy
 msgid "# requests dropped due to initiator not being connected"
 msgstr "# gap Anfragen verworfen: Kollision in RT"
 
-#: src/fs/gnunet-service-fs_cp.c:1201
+#: src/fs/gnunet-service-fs_cp.c:1196
 #, fuzzy
 msgid "# requests dropped due to missing reverse route"
 msgstr "# gap Anfragen verworfen: Kollision in RT"
 
-#: src/fs/gnunet-service-fs_cp.c:1267
+#: src/fs/gnunet-service-fs_cp.c:1262
 #, fuzzy
 msgid "# requests dropped due TTL underflow"
 msgstr "# gap Anfragen verworfen: Kollision in RT"
 
-#: src/fs/gnunet-service-fs_cp.c:1295
+#: src/fs/gnunet-service-fs_cp.c:1290
 #, fuzzy
 msgid "# requests dropped due to higher-TTL request"
 msgstr "# gap Anfragen verworfen: Kollision in RT"
 
-#: src/fs/gnunet-service-fs_cp.c:1338
+#: src/fs/gnunet-service-fs_cp.c:1331
 #, fuzzy
 msgid "# P2P query messages received and processed"
 msgstr "# verschlüsselter PING Nachrichten empfangen"
 
-#: src/fs/gnunet-service-fs_push.c:642
+#: src/fs/gnunet-service-fs_push.c:653
 #, c-format
 msgid ""
 "Invalid value specified for option `%s' in section `%s', content pushing "
@@ -2856,17 +2847,21 @@
 msgid "Failed to delete bogus block: %s\n"
 msgstr "Datei wurde als `%s' gespeichert.\n"
 
-#: src/fs/gnunet-service-fs_indexing.c:552
+#: src/fs/gnunet-service-fs_indexing.c:545
+msgid "# index blocks removed: original file inaccessible"
+msgstr ""
+
+#: src/fs/gnunet-service-fs_indexing.c:560
 #, fuzzy, c-format
 msgid "Could not access indexed file `%s' (%s) at offset %llu: %s\n"
 msgstr "`%s' konnte nicht aufgelöst werden: %s\n"
 
-#: src/fs/gnunet-service-fs_indexing.c:554
+#: src/fs/gnunet-service-fs_indexing.c:562
 #, fuzzy
 msgid "not indexed"
 msgstr "Deindizierung schlug fehl."
 
-#: src/fs/gnunet-service-fs_indexing.c:569
+#: src/fs/gnunet-service-fs_indexing.c:577
 #, fuzzy, c-format
 msgid "Indexed file `%s' changed at offset %llu\n"
 msgstr "Indizierung der Daten schlug an Position %i fehl.\n"
@@ -2996,148 +2991,148 @@
 "`unknown' instead.\n"
 msgstr ""
 
-#: src/fs/fs_publish.c:142 src/fs/fs_publish.c:410
+#: src/fs/fs_publish.c:147 src/fs/fs_publish.c:415
 #, fuzzy, c-format
 msgid "Publishing failed: %s"
 msgstr ""
 "\n"
 "Fehler beim Uploaden der Datei: %s\n"
 
-#: src/fs/fs_publish.c:647 src/fs/fs_publish.c:664 src/fs/fs_publish.c:703
-#: src/fs/fs_publish.c:723 src/fs/fs_publish.c:750 src/fs/fs_publish.c:898
+#: src/fs/fs_publish.c:652 src/fs/fs_publish.c:669 src/fs/fs_publish.c:708
+#: src/fs/fs_publish.c:728 src/fs/fs_publish.c:755 src/fs/fs_publish.c:903
 #, 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"
 
-#: src/fs/fs_publish.c:649
+#: src/fs/fs_publish.c:654
 msgid "timeout on index-start request to `fs' service"
 msgstr ""
 
-#: src/fs/fs_publish.c:661
+#: src/fs/fs_publish.c:666
 #, fuzzy
 msgid "unknown error"
 msgstr "Unbekannter Fehler"
 
-#: src/fs/fs_publish.c:704
+#: src/fs/fs_publish.c:709
 msgid "failed to compute hash"
 msgstr ""
 
-#: src/fs/fs_publish.c:724
+#: src/fs/fs_publish.c:729
 msgid "filename too long"
 msgstr ""
 
-#: src/fs/fs_publish.c:751
+#: src/fs/fs_publish.c:756
 #, fuzzy
 msgid "could not connect to `fs' service"
 msgstr "Verbindung zu gnunetd konnte nicht hergestellt werden.\n"
 
-#: src/fs/fs_publish.c:775
+#: src/fs/fs_publish.c:780
 #, fuzzy, c-format
 msgid "Failed to get file identifiers for `%s'\n"
 msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
 
-#: src/fs/fs_publish.c:845
+#: src/fs/fs_publish.c:850
 #, 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:851
+#: src/fs/fs_publish.c:856
 #, fuzzy, c-format
 msgid "Recursive upload failed: %s"
 msgstr ""
 "\n"
 "Fehler beim Uploaden der Datei: %s\n"
 
-#: src/fs/fs_publish.c:899
+#: src/fs/fs_publish.c:904
 #, fuzzy
 msgid "needs to be an actual file"
 msgstr "`%s' ist keine normale Datei.\n"
 
-#: src/fs/fs_publish.c:1078
+#: src/fs/fs_publish.c:1083
 #, c-format
 msgid "Insufficient space for publishing: %s"
 msgstr ""
 
-#: src/fs/fs_publish.c:1149
+#: src/fs/fs_publish.c:1154
 #, c-format
 msgid "Reserving space for %u entries and %llu bytes for publication\n"
 msgstr ""
 
-#: src/fs/fs_publish.c:1482
+#: src/fs/fs_publish.c:1487
 #, fuzzy
 msgid "Could not connect to datastore."
 msgstr "Verbindung zu gnunetd konnte nicht hergestellt werden.\n"
 
-#: src/fs/fs.c:284
+#: src/fs/fs_api.c:284
 #, fuzzy, c-format
 msgid "Could not open file `%s': %s"
 msgstr "Datei wurde als `%s' gespeichert.\n"
 
-#: src/fs/fs.c:293
+#: src/fs/fs_api.c:293
 #, fuzzy, c-format
 msgid "Could not read file `%s': %s"
 msgstr "Datei wurde als `%s' gespeichert.\n"
 
-#: src/fs/fs.c:299
+#: src/fs/fs_api.c:299
 #, c-format
 msgid "Short read reading from file `%s'!"
 msgstr ""
 
-#: src/fs/fs.c:877
+#: src/fs/fs_api.c:877
 #, fuzzy, c-format
 msgid "Failed to resume publishing information `%s': %s\n"
 msgstr "Datei wurde als `%s' gespeichert.\n"
 
-#: src/fs/fs.c:1323
+#: src/fs/fs_api.c:1323
 #, c-format
 msgid "Failed to recover namespace `%s', cannot resume publishing operation.\n"
 msgstr ""
 
-#: src/fs/fs.c:1364
+#: src/fs/fs_api.c:1364
 #, c-format
 msgid "Failure while resuming publishing operation `%s': %s\n"
 msgstr ""
 
-#: src/fs/fs.c:1380
+#: src/fs/fs_api.c:1380
 #, fuzzy, c-format
 msgid "Failed to resume publishing operation `%s': %s\n"
 msgstr "Datei wurde als `%s' gespeichert.\n"
 
-#: src/fs/fs.c:1984
+#: src/fs/fs_api.c:1984
 #, c-format
 msgid "Failure while resuming unindexing operation `%s': %s\n"
 msgstr ""
 
-#: src/fs/fs.c:1994
+#: src/fs/fs_api.c:1994
 #, fuzzy, c-format
 msgid "Failed to resume unindexing operation `%s': %s\n"
 msgstr "Datei wurde als `%s' gespeichert.\n"
 
-#: src/fs/fs.c:2107 src/fs/fs.c:2346
+#: src/fs/fs_api.c:2107 src/fs/fs_api.c:2346
 #, fuzzy, c-format
 msgid "Failed to resume sub-download `%s': %s\n"
 msgstr "Datei wurde als `%s' gespeichert.\n"
 
-#: src/fs/fs.c:2124
+#: src/fs/fs_api.c:2124
 #, fuzzy, c-format
 msgid "Failed to resume sub-search `%s': %s\n"
 msgstr "Datei wurde als `%s' gespeichert.\n"
 
-#: src/fs/fs.c:2136 src/fs/fs.c:2155 src/fs/fs.c:2631
+#: src/fs/fs_api.c:2136 src/fs/fs_api.c:2155 src/fs/fs_api.c:2631
 #, c-format
 msgid "Failure while resuming search operation `%s': %s\n"
 msgstr ""
 
-#: src/fs/fs.c:2337
+#: src/fs/fs_api.c:2337
 #, c-format
 msgid "Failed to resume sub-download `%s': could not open file `%s'\n"
 msgstr ""
 
-#: src/fs/fs.c:2583
+#: src/fs/fs_api.c:2583
 msgid "Could not resume running search, will resume as paused search\n"
 msgstr ""
 
-#: src/fs/fs.c:2669
+#: src/fs/fs_api.c:2669
 #, c-format
 msgid "Failure while resuming download operation `%s': %s\n"
 msgstr ""
@@ -3194,13 +3189,17 @@
 msgid "Invalid URI"
 msgstr "Ungültiger Parameter: `%s'\n"
 
-#: src/fs/gnunet-service-fs.c:268 src/fs/gnunet-service-fs.c:448
+#: src/fs/gnunet-service-fs.c:240
+msgid "# running average P2P latency (ms)"
+msgstr ""
+
+#: src/fs/gnunet-service-fs.c:300 src/fs/gnunet-service-fs.c:490
 #, fuzzy
 msgid "# Loopback routes suppressed"
 msgstr "# gap Routing erfolgreich (insgesamt)"
 
-#: src/fs/gnunet-service-fs.c:542 src/topology/gnunet-daemon-topology.c:1292
-#: src/topology/gnunet-daemon-topology.c:1299
+#: src/fs/gnunet-service-fs.c:583 src/topology/gnunet-daemon-topology.c:1290
+#: src/topology/gnunet-daemon-topology.c:1297
 #: src/hostlist/gnunet-daemon-hostlist.c:290
 #, fuzzy, c-format
 msgid "Failed to connect to `%s' service.\n"
@@ -3211,76 +3210,101 @@
 msgid "`%s' failed on file `%s': %s"
 msgstr "`%s' fehlgeschlagen für Laufwerk %s: %u\n"
 
-#: src/transport/gnunet-service-transport_neighbours.c:435
+#: src/transport/gnunet-service-transport_neighbours.c:465
 msgid "# failed connection attempts due to timeout"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:819
+#: src/transport/gnunet-service-transport_neighbours.c:857
 #, fuzzy
 msgid "# peers disconnected due to external request"
 msgstr "# gap Anfragen verworfen: Kollision in RT"
 
-#: src/transport/gnunet-service-transport_neighbours.c:925
+#: src/transport/gnunet-service-transport_neighbours.c:947
 #, fuzzy
+msgid "# fast reconnects failed"
+msgstr "# verbundener Knoten"
+
+#: src/transport/gnunet-service-transport_neighbours.c:1002
+#, fuzzy
 msgid "# peers disconnected due to timeout"
 msgstr "# geschlossener Verbindungen (HANGUP gesendet)"
 
-#: src/transport/gnunet-service-transport_neighbours.c:949
+#: src/transport/gnunet-service-transport_neighbours.c:1027
 #, fuzzy
 msgid "# keepalives sent"
 msgstr "# p2p Trace-Antworten gesendet"
 
-#: src/transport/gnunet-service-transport_neighbours.c:981
+#: src/transport/gnunet-service-transport_neighbours.c:1068
 #, fuzzy
 msgid "# peers disconnected due to global disconnect"
 msgstr "# Knotenankündigungen empfangen"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1543
-#: src/transport/gnunet-service-transport_neighbours.c:1564
+#: src/transport/gnunet-service-transport_neighbours.c:1774
+#: src/transport/gnunet-service-transport_neighbours.c:1795
 #, fuzzy
 msgid "# messages not sent (no such peer or not connected)"
 msgstr "# defragmentierter Nachrichten"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1580
+#: src/transport/gnunet-service-transport_neighbours.c:1811
 #, fuzzy
 msgid "# bytes in message queue for other peers"
 msgstr "# Bytes ausgehender Nachrichten verworfen"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1632
+#: src/transport/gnunet-service-transport_neighbours.c:1863
 #, fuzzy
 msgid "# messages discarded due to lack of neighbour record"
 msgstr "# defragmentierter Nachrichten"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1668
+#: src/transport/gnunet-service-transport_neighbours.c:1899
 #, fuzzy
 msgid "# bandwidth quota violations by other peers"
 msgstr "Verfolgt die Bandbreitennutzung von gnunetd"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1686
+#: src/transport/gnunet-service-transport_neighbours.c:1917
 msgid "# ms throttling suggested"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1715
+#: src/transport/gnunet-service-transport_neighbours.c:1946
 #, fuzzy
 msgid "# KEEPALIVE messages discarded (not connected)"
 msgstr "# defragmentierter Nachrichten"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1749
+#: src/transport/gnunet-service-transport_neighbours.c:1995
+#, fuzzy
+msgid "# KEEPALIVE_RESPONSE messages discarded (not connected)"
+msgstr "# defragmentierter Nachrichten"
+
+#: src/transport/gnunet-service-transport_neighbours.c:2003
+#, fuzzy
+msgid "# KEEPALIVE_RESPONSE messages discarded (not expected)"
+msgstr "# defragmentierter Nachrichten"
+
+#: src/transport/gnunet-service-transport_neighbours.c:2064
 msgid "# SET QUOTA messages ignored (no such peer)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1762
+#: src/transport/gnunet-service-transport_neighbours.c:2082
 msgid "# disconnects due to quota of 0"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1884
+#: src/transport/gnunet-service-transport_neighbours.c:2200
 msgid "# disconnect messages ignored (old format)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1896
+#: src/transport/gnunet-service-transport_neighbours.c:2213
 msgid "# disconnect messages ignored (timestamp)"
 msgstr ""
 
+#: src/transport/gnunet-service-transport_neighbours.c:2302
+#, fuzzy
+msgid "# unexpected CONNECT_ACK messages"
+msgstr "COUNT Nachrichten versenden"
+
+#: src/transport/gnunet-service-transport_neighbours.c:2400
+#, fuzzy
+msgid "# unexpected ACK messages"
+msgstr "# verschlüsselter PONG Nachrichten gesendet"
+
 #: src/transport/gnunet-service-transport_blacklist.c:247
 #, fuzzy, c-format
 msgid "Could not read blacklist file `%s'\n"
@@ -3319,54 +3343,53 @@
 msgstr ""
 
 #: src/transport/gnunet-service-transport_blacklist.c:522
-#: src/transport/gnunet-service-transport_blacklist.c:760
+#: src/transport/gnunet-service-transport_blacklist.c:756
 msgid "# disconnects due to blacklist"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:184
+#: src/transport/plugin_transport_http_server.c:189
 msgid ""
 "Could not create a new TLS certificate, program `gnunet-transport-"
 "certificate-creation' could not be started!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:208
+#: src/transport/plugin_transport_http_server.c:213
 msgid "No usable TLS certificate found and creating one failed!\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_hello.c:177
+#: src/transport/gnunet-service-transport_hello.c:172
 msgid "# refreshed my HELLO"
 msgstr ""
 
-#: src/transport/plugin_transport_udp.c:1431
-#: src/transport/plugin_transport_udp.c:2130
+#: src/transport/plugin_transport_udp.c:1518
 #, fuzzy
-msgid "# HELLO beacons received via udp"
+msgid "# IPv4 broadcast HELLO beacons received via udp"
 msgstr "# verschlüsselter PONG Nachrichten empfangen"
 
-#: src/transport/plugin_transport_udp.c:1894
-#: src/transport/plugin_transport_udp_new.c:1209
+#: src/transport/plugin_transport_udp.c:1555
+#, fuzzy
+msgid "# IPv6 multicast HELLO beacons received via udp"
+msgstr "# verschlüsselter PONG Nachrichten empfangen"
+
+#: src/transport/plugin_transport_udp.c:2041
+#: src/transport/plugin_transport_udp_new.c:1218
 #, c-format
 msgid "Given `%s' option is out of range: %llu > %u\n"
 msgstr ""
 
-#: src/transport/plugin_transport_udp.c:1947
-#: src/transport/plugin_transport_udp_new.c:1259
+#: src/transport/plugin_transport_udp.c:2092
+#: src/transport/plugin_transport_udp_new.c:1268
 #, fuzzy, c-format
 msgid "Invalid IPv6 address: `%s'\n"
 msgstr "Ungültiger Parameter: `%s'\n"
 
-#: src/transport/plugin_transport_udp.c:2102
-#, fuzzy, c-format
-msgid "Failed to create IPv4 broadcast socket on port %d\n"
-msgstr "Fehler beim Aktualisieren der Daten des Moduls `%s'\n"
-
-#: src/transport/plugin_transport_udp.c:2112
+#: src/transport/plugin_transport_udp.c:2235
 #, c-format
 msgid "Failed to set IPv4 broadcast option for broadcast socket on port %d\n"
 msgstr ""
 
-#: src/transport/plugin_transport_udp.c:2144
-#: src/transport/plugin_transport_udp_new.c:1388
+#: src/transport/plugin_transport_udp.c:2274
+#: src/transport/plugin_transport_udp_new.c:1396
 #, fuzzy
 msgid "Failed to open UDP sockets\n"
 msgstr "Fehler beim Binden an UDP6 Port %d.\n"
@@ -3381,7 +3404,7 @@
 msgid "%s failed at %s:%d: `%s'\n"
 msgstr "`%s' schlug fehl bei %s:%d mit dem Fehler: `%s'.\n"
 
-#: src/transport/plugin_transport_http_client.c:617
+#: src/transport/plugin_transport_http_client.c:619
 #, c-format
 msgid "Could not initialize curl multi handle, failed to start %s plugin!\n"
 msgstr ""
@@ -3393,16 +3416,16 @@
 
 #: src/transport/plugin_transport_tcp.c:590
 #: src/transport/plugin_transport_tcp.c:679
-#: src/transport/plugin_transport_tcp.c:732
-#: src/transport/plugin_transport_tcp.c:821
-#: src/transport/plugin_transport_tcp.c:1160
+#: src/transport/plugin_transport_tcp.c:731
+#: src/transport/plugin_transport_tcp.c:820
+#: src/transport/plugin_transport_tcp.c:1156
 #, fuzzy
 msgid "# bytes currently in TCP buffers"
 msgstr "# Bytes gesendet über TCP"
 
 #: src/transport/plugin_transport_tcp.c:596
-#: src/transport/plugin_transport_tcp.c:847
-#: src/transport/plugin_transport_tcp.c:1548
+#: src/transport/plugin_transport_tcp.c:846
+#: src/transport/plugin_transport_tcp.c:1544
 #, fuzzy
 msgid "# TCP sessions active"
 msgstr "# Sitzungsschlüssel akzeptiert"
@@ -3412,128 +3435,128 @@
 msgid "# bytes discarded by TCP (timeout)"
 msgstr "# Bytes verworfen von TCP (ausgehend)"
 
-#: src/transport/plugin_transport_tcp.c:735
+#: src/transport/plugin_transport_tcp.c:734
 #, fuzzy
 msgid "# bytes transmitted via TCP"
 msgstr "# Bytes des Typs %d übertragen"
 
-#: src/transport/plugin_transport_tcp.c:825
+#: src/transport/plugin_transport_tcp.c:824
 #, fuzzy
 msgid "# bytes discarded by TCP (disconnect)"
 msgstr "# Bytes verworfen von TCP (ausgehend)"
 
-#: src/transport/plugin_transport_tcp.c:946
+#: src/transport/plugin_transport_tcp.c:945
 #, fuzzy
 msgid "# bytes TCP was asked to transmit"
 msgstr "# Bytes des Typs %d übertragen"
 
-#: src/transport/plugin_transport_tcp.c:997
+#: src/transport/plugin_transport_tcp.c:996
 msgid "# bytes discarded by TCP (no address and no connection)"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:1040
+#: src/transport/plugin_transport_tcp.c:1039
 #, c-format
 msgid "Address of unexpected length: %u\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:1057
+#: src/transport/plugin_transport_tcp.c:1056
 msgid "Found valid IPv4 NAT address (creating session)!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:1108
+#: src/transport/plugin_transport_tcp.c:1107
 #, fuzzy
 msgid "# bytes discarded by TCP (failed to connect)"
 msgstr "# Bytes verworfen von TCP (ausgehend)"
 
-#: src/transport/plugin_transport_tcp.c:1228
+#: src/transport/plugin_transport_tcp.c:1224
 msgid "# transport-service disconnect requests for TCP"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:1591
+#: src/transport/plugin_transport_tcp.c:1587
 #, fuzzy
 msgid "# TCP WELCOME messages received"
 msgstr "# verschlüsselter PONG Nachrichten empfangen"
 
-#: src/transport/plugin_transport_tcp.c:1736
+#: src/transport/plugin_transport_tcp.c:1732
 msgid "# bytes received via TCP"
 msgstr "# Bytes empfangen über TCP"
 
-#: src/transport/plugin_transport_tcp.c:1800
+#: src/transport/plugin_transport_tcp.c:1796
 msgid "# network-level TCP disconnect events"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:1953
+#: src/transport/plugin_transport_tcp.c:1949
 #, fuzzy
 msgid "Failed to start service.\n"
 msgstr "Fehler beim Starten der Collection.\n"
 
-#: src/transport/plugin_transport_tcp.c:2013
+#: src/transport/plugin_transport_tcp.c:2009
 #, fuzzy, c-format
 msgid "Failed to find option %s in section %s!\n"
 msgstr "Fehler beim Binden an UDP Port %d.\n"
 
-#: src/transport/plugin_transport_tcp.c:2036
+#: src/transport/plugin_transport_tcp.c:2032
 #, fuzzy, c-format
 msgid "TCP transport listening on port %llu\n"
 msgstr "Der Transportdienst auf Port %d konnte nicht gestartet werden.\n"
 
-#: src/transport/plugin_transport_tcp.c:2040
+#: src/transport/plugin_transport_tcp.c:2036
 msgid "TCP transport not listening on any port (client only)\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2044
+#: src/transport/plugin_transport_tcp.c:2040
 #, c-format
 msgid "TCP transport advertises itself as being on port %llu\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http.c:829
+#: src/transport/plugin_transport_http.c:920
 msgid "Disabling IPv6 since it is not supported on this system!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http.c:878
+#: src/transport/plugin_transport_http.c:968
 #, fuzzy
 msgid "Require valid port number for service in configuration!\n"
 msgstr "In der Konfigurationsdatei wurden keine Anwendungen definiert!\n"
 
-#: src/transport/plugin_transport_http.c:1025
+#: src/transport/plugin_transport_http.c:1115
 #, c-format
 msgid "Found %u addresses to report to NAT service\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http.c:1040
+#: src/transport/plugin_transport_http.c:1128
 #, c-format
 msgid "FREEING %s\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http.c:1115
+#: src/transport/plugin_transport_http.c:1203
 #, fuzzy
 msgid "Neither IPv4 nor IPv6 are enabled! Fix in configuration\n"
 msgstr "Netzwerkbekanntmachungen wurden per Konfiguration deaktiviert!\n"
 
-#: src/transport/plugin_transport_http.c:1128
+#: src/transport/plugin_transport_http.c:1216
 #, fuzzy
 msgid "Port is required! Fix in configuration\n"
 msgstr " gconfig\tGTK Konfiguration\n"
 
-#: src/transport/plugin_transport_http.c:1139
+#: src/transport/plugin_transport_http.c:1227
 msgid "Port 0, client only mode\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http.c:1155
+#: src/transport/plugin_transport_http.c:1247
 #, c-format
 msgid ""
 "Specific IPv4 address `%s' for plugin %s in configuration file is invalid! "
 "Binding to all addresses!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http.c:1181
+#: src/transport/plugin_transport_http.c:1277
 #, c-format
 msgid ""
 "Specific IPv6 address `%s' for plugin %s in configuration file is invalid! "
 "Binding to all addresses!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_unix.c:1088
+#: src/transport/plugin_transport_unix.c:1087
 #, fuzzy
 msgid "Failed to open UNIX sockets\n"
 msgstr "Datei wurde als `%s' gespeichert.\n"
@@ -3588,284 +3611,289 @@
 msgid "# bytes dropped by SMTP (outgoing)"
 msgstr "# Bytes verworfen von TCP (ausgehend)"
 
-#: src/transport/gnunet-service-transport_plugins.c:108
+#: src/transport/gnunet-service-transport_plugins.c:109
 msgid "Transport service is lacking NEIGHBOUR_LIMIT option.\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_plugins.c:115
+#: src/transport/gnunet-service-transport_plugins.c:116
 #, fuzzy, c-format
 msgid "Starting transport plugins `%s'\n"
 msgstr "Teste Transport(e) %s\n"
 
-#: src/transport/gnunet-service-transport_plugins.c:119
+#: src/transport/gnunet-service-transport_plugins.c:120
 #, fuzzy, c-format
 msgid "Loading `%s' transport plugin\n"
 msgstr "Teste Transport(e) %s\n"
 
-#: src/transport/gnunet-service-transport_plugins.c:139
+#: src/transport/gnunet-service-transport_plugins.c:147
 #, fuzzy, c-format
 msgid "Failed to load transport plugin for `%s'\n"
 msgstr "Anwendung `%s' konnte nicht initialisiert werden.\n"
 
-#: src/transport/plugin_transport_wlan.c:877
+#: src/transport/plugin_transport_wlan.c:884
 #, fuzzy
 msgid "# wlan session timeouts"
 msgstr "# Sitzungsschlüssel akzeptiert"
 
-#: src/transport/plugin_transport_wlan.c:902
+#: src/transport/plugin_transport_wlan.c:909
 #, fuzzy
 msgid "# wlan session created"
 msgstr "# Sitzungsschlüssel akzeptiert"
 
-#: src/transport/plugin_transport_wlan.c:985
-#: src/transport/plugin_transport_wlan.c:1143
-#: src/transport/plugin_transport_wlan.c:1163
-#: src/transport/plugin_transport_wlan.c:1193
-#: src/transport/plugin_transport_wlan.c:2376
-#: src/transport/plugin_transport_wlan.c:3210
+#: src/transport/plugin_transport_wlan.c:993
+#: src/transport/plugin_transport_wlan.c:1157
+#: src/transport/plugin_transport_wlan.c:1178
+#: src/transport/plugin_transport_wlan.c:1209
+#: src/transport/plugin_transport_wlan.c:2447
+#: src/transport/plugin_transport_wlan.c:3304
 msgid "# wlan pending sessions"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:1237
-#: src/transport/plugin_transport_wlan.c:1941
+#: src/transport/plugin_transport_wlan.c:1252
+#: src/transport/plugin_transport_wlan.c:2000
 #, fuzzy
 msgid "# wlan pending fragments"
 msgstr "# verworfener Nachrichten"
 
-#: src/transport/plugin_transport_wlan.c:1459
+#: src/transport/plugin_transport_wlan.c:1475
 #, c-format
 msgid "Finished reading from wlan-helper stdout with code: %d\n"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:1782
+#: src/transport/plugin_transport_wlan.c:1840
 msgid "# wlan hello beacons send"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:1814
-#: src/transport/plugin_transport_wlan.c:2028
-#: src/transport/plugin_transport_wlan.c:2121
+#: src/transport/plugin_transport_wlan.c:1873
+#: src/transport/plugin_transport_wlan.c:2089
+#: src/transport/plugin_transport_wlan.c:2184
 #, c-format
 msgid "Error writing to wlan healper. errno == %d, ERROR: %s\n"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:2015
+#: src/transport/plugin_transport_wlan.c:2075
 msgid "# wlan acks send"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:2084
+#: src/transport/plugin_transport_wlan.c:2146
 #, fuzzy
 msgid "# wlan fragments send"
 msgstr "# verworfener Nachrichten"
 
-#: src/transport/plugin_transport_wlan.c:2243
+#: src/transport/plugin_transport_wlan.c:2312
 #, c-format
 msgid "Wlan Address len %d is wrong\n"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:2248
+#: src/transport/plugin_transport_wlan.c:2317
 #, fuzzy
 msgid "# wlan messages queued"
 msgstr "# verschlüsselter PING Nachrichten empfangen"
 
-#: src/transport/plugin_transport_wlan.c:2338
-#: src/transport/plugin_transport_wlan.c:2977
-#: src/transport/plugin_transport_wlan.c:3212
+#: src/transport/plugin_transport_wlan.c:2408
+#: src/transport/plugin_transport_wlan.c:3060
+#: src/transport/plugin_transport_wlan.c:3307
 msgid "# wlan mac endpoints"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:2561
+#: src/transport/plugin_transport_wlan.c:2636
 #, fuzzy
 msgid "# wlan whole messages received"
 msgstr "# verschlüsselter PING Nachrichten empfangen"
 
-#: src/transport/plugin_transport_wlan.c:2759
+#: src/transport/plugin_transport_wlan.c:2836
 #, fuzzy
 msgid "# wlan hello messages received"
 msgstr "# verschlüsselter PING Nachrichten empfangen"
 
-#: src/transport/plugin_transport_wlan.c:2793
+#: src/transport/plugin_transport_wlan.c:2873
 #, fuzzy
 msgid "# wlan fragments received"
 msgstr "# verworfener Nachrichten"
 
-#: src/transport/plugin_transport_wlan.c:2845
+#: src/transport/plugin_transport_wlan.c:2925
 #, fuzzy
 msgid "# wlan acks received"
 msgstr "# gap Anfragen insgesamt empfangen"
 
-#: src/transport/plugin_transport_wlan.c:2938
+#: src/transport/plugin_transport_wlan.c:3020
 msgid "# wlan mac endpoints timeouts"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:2961
+#: src/transport/plugin_transport_wlan.c:3044
 #, fuzzy
 msgid "# wlan mac endpoints created"
 msgstr "# Client Trace-Anfragen empfangen"
 
-#: src/transport/plugin_transport_wlan.c:3017
+#: src/transport/plugin_transport_wlan.c:3102
 msgid "# wlan WLAN_HELPER_DATA received"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:3068
+#: src/transport/plugin_transport_wlan.c:3158
 #, fuzzy
 msgid "# wlan messages for this client received"
 msgstr "# verschlüsselter PING Nachrichten empfangen"
 
-#: src/transport/plugin_transport_wlan.c:3076
+#: src/transport/plugin_transport_wlan.c:3169
 #, fuzzy
 msgid "# wlan messages inside WLAN_HELPER_DATA received"
 msgstr "# verschlüsselter PING Nachrichten empfangen"
 
-#: src/transport/gnunet-transport.c:251
+#: src/transport/gnunet-transport.c:245
 #, c-format
 msgid "No transport plugins configured, peer will never communicate\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:268
+#: src/transport/gnunet-transport.c:258
 #, c-format
 msgid "No port configured for plugin `%s', cannot test it\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:321
+#: src/transport/gnunet-transport.c:308
 #, c-format
 msgid "Received %llu bytes/s (%llu bytes in %llu ms)\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:330
+#: src/transport/gnunet-transport.c:315
 #, c-format
 msgid "Transmitted %llu bytes/s (%llu bytes in %llu ms)\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:369
+#: src/transport/gnunet-transport.c:348
 #, 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:395
+#: src/transport/gnunet-transport.c:368
 #, fuzzy, c-format
 msgid "Connected to %s\n"
 msgstr "`%s' hat sich mit `%s' verbunden.\n"
 
-#: src/transport/gnunet-transport.c:436
+#: src/transport/gnunet-transport.c:399
 #, fuzzy, c-format
 msgid "Disconnected from %s\n"
 msgstr "`%s' hat sich mit `%s' verbunden.\n"
 
-#: src/transport/gnunet-transport.c:476
+#: src/transport/gnunet-transport.c:428
 #, 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:498
+#: src/transport/gnunet-transport.c:448
 #, fuzzy, c-format
 msgid "Peer `%s' plugin: `%s' address `%s'\n"
 msgstr "Knoten `%s' mit Vertrauen %8u und Adresse `%s'\n"
 
-#: src/transport/gnunet-transport.c:536
+#: src/transport/gnunet-transport.c:486
 #, fuzzy, c-format
 msgid "Failed to parse peer identity `%s'\n"
 msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
 
-#: src/transport/gnunet-transport.c:574
+#: src/transport/gnunet-transport.c:522
 msgid "measure how fast we are receiving data (until CTRL-C)"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:577
+#: src/transport/gnunet-transport.c:525
 #, fuzzy
 msgid "try to connect to the given peer"
 msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
 
-#: src/transport/gnunet-transport.c:580
+#: src/transport/gnunet-transport.c:528
 #, fuzzy
 msgid "provide information about all current connections (once)"
 msgstr "Informationen über andere GNUnet Knoten ausgeben."
 
-#: src/transport/gnunet-transport.c:583
+#: src/transport/gnunet-transport.c:532
 msgid "send data for benchmarking to the other peer (until CTRL-C)"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:586
+#: src/transport/gnunet-transport.c:535
 msgid "test transport configuration (involves external server)"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:593
+#: src/transport/gnunet-transport.c:543
 #, fuzzy
 msgid "Direct access to transport service."
 msgstr "Der Transportdienst auf Port %d konnte nicht gestartet werden.\n"
 
-#: src/transport/gnunet-service-transport_validation.c:515
+#: src/transport/gnunet-service-transport_validation.c:412
 msgid "# address records discarded"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:628
+#: src/transport/gnunet-service-transport_validation.c:458
 #, c-format
 msgid ""
-"Not confirming PING with address `%s' since I cannot confirm having this "
-"address.\n"
+"Not transmitting `%s' with `%s', message too big (%u bytes!). This should "
+"not happen.\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:696
-msgid "# PONGs unicast via reliable transport"
-msgstr ""
+#: src/transport/gnunet-service-transport_validation.c:493
+#, fuzzy
+msgid "# PING without HELLO messages sent"
+msgstr "# Klartext PING Nachrichten gesendet"
 
-#: src/transport/gnunet-service-transport_validation.c:705
-msgid "# PONGs multicast to all available addresses"
+#: src/transport/gnunet-service-transport_validation.c:552
+msgid "# address revalidations started"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:769
+#: src/transport/gnunet-service-transport_validation.c:776
+#, fuzzy
+msgid "# PING message for different peer received"
+msgstr "# PING Nachrichten erstellt"
+
+#: src/transport/gnunet-service-transport_validation.c:812
 #, c-format
 msgid ""
-"Not transmitting `%s' with `%s', message too big (%u bytes!). This should "
-"not happen.\n"
+"Not confirming PING with address `%s' since I cannot confirm having this "
+"address.\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:803
-#, fuzzy
-msgid "# PING without HELLO messages sent"
-msgstr "# Klartext PING Nachrichten gesendet"
+#: src/transport/gnunet-service-transport_validation.c:882
+msgid "# PONGs unicast via reliable transport"
+msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:875
-msgid "# address revalidations started"
+#: src/transport/gnunet-service-transport_validation.c:891
+msgid "# PONGs multicast to all available addresses"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:956
+#: src/transport/gnunet-service-transport_validation.c:1015
 msgid "# PONGs dropped, no matching pending validation"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:972
+#: src/transport/gnunet-service-transport_validation.c:1040
 msgid "# PONGs dropped, signature expired"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1050
+#: src/transport/gnunet-service-transport_validation.c:1099
 #, fuzzy, c-format
 msgid "Adding `%s' without addresses for peer `%s'\n"
 msgstr "Adresse des Knotens `%s' konnte nicht ermittelt werden.\n"
 
-#: src/transport/gnunet-service-transport_clients.c:250
+#: src/transport/gnunet-service-transport_clients.c:254
 #, 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:255
+#: src/transport/gnunet-service-transport_clients.c:259
 #, fuzzy
 msgid "# messages dropped due to slow client"
 msgstr "# gap Anfragen verworfen: Kollision in RT"
 
-#: src/transport/gnunet-service-transport_clients.c:405
+#: src/transport/gnunet-service-transport_clients.c:406
 #, c-format
 msgid "Rejecting control connection from peer `%s', which is not me!\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_clients.c:522
+#: src/transport/gnunet-service-transport_clients.c:523
 #, fuzzy
 msgid "# bytes payload received for other peers"
 msgstr "# Bytes des Typs %d empfangen"
 
-#: src/transport/gnunet-service-transport_clients.c:539
+#: src/transport/gnunet-service-transport_clients.c:540
 msgid "# bytes payload dropped (other peer was not connected)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_clients.c:590
+#: src/transport/gnunet-service-transport_clients.c:591
 #, fuzzy
 msgid "# REQUEST CONNECT messages received"
 msgstr "# verschlüsselter PONG Nachrichten empfangen"
@@ -3875,16 +3903,16 @@
 msgid "Received unexpected message of type %u in %s:%u\n"
 msgstr "Es wurde eine unbekannte Testbed Nachricht des Typs %u empfangen.\n"
 
-#: src/transport/gnunet-service-transport.c:159
+#: src/transport/gnunet-service-transport.c:156
 #, fuzzy
 msgid "# bytes payload discarded due to not connected peer "
 msgstr "# Knotenankündigungen empfangen"
 
-#: src/transport/gnunet-service-transport.c:517
+#: src/transport/gnunet-service-transport.c:514
 msgid "Transport service is lacking key configuration settings.  Exiting.\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport.c:526
+#: src/transport/gnunet-service-transport.c:523
 msgid "Transport service could not access hostkey.  Exiting.\n"
 msgstr ""
 
@@ -3902,101 +3930,101 @@
 msgid "# peers blacklisted"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:379
+#: src/topology/gnunet-daemon-topology.c:380
 #, fuzzy
 msgid "# connect requests issued to transport"
 msgstr "# Client Trace-Anfragen empfangen"
 
-#: src/topology/gnunet-daemon-topology.c:674
-#: src/topology/gnunet-daemon-topology.c:760
+#: src/topology/gnunet-daemon-topology.c:675
+#: src/topology/gnunet-daemon-topology.c:761
 #, fuzzy
 msgid "# friends connected"
 msgstr "# verbundener Knoten"
 
-#: src/topology/gnunet-daemon-topology.c:877
-#: src/hostlist/hostlist-server.c:187
+#: src/topology/gnunet-daemon-topology.c:875
+#: src/hostlist/hostlist-server.c:184
 #, fuzzy, c-format
 msgid "Error in communication with PEERINFO service: %s\n"
 msgstr "Informationen über andere GNUnet Knoten ausgeben."
 
-#: src/topology/gnunet-daemon-topology.c:952
+#: src/topology/gnunet-daemon-topology.c:950
 msgid "Failed to connect to core service, can not manage topology!\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:984
+#: src/topology/gnunet-daemon-topology.c:982
 #, c-format
 msgid "Option `%s' in section `%s' not specified!\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:996
+#: src/topology/gnunet-daemon-topology.c:994
 #, fuzzy, c-format
 msgid "Could not read friends list `%s'\n"
 msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
 
-#: src/topology/gnunet-daemon-topology.c:1002
+#: src/topology/gnunet-daemon-topology.c:1000
 #, c-format
 msgid "Friends file `%s' is empty.\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:1011
+#: src/topology/gnunet-daemon-topology.c:1009
 #, fuzzy, c-format
 msgid "Failed to read friends list from `%s': out of memory\n"
 msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
 
-#: src/topology/gnunet-daemon-topology.c:1019
+#: src/topology/gnunet-daemon-topology.c:1017
 #, c-format
 msgid "Failed to read friends list from `%s'\n"
 msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
 
-#: src/topology/gnunet-daemon-topology.c:1039
+#: src/topology/gnunet-daemon-topology.c:1037
 #, fuzzy, c-format
 msgid ""
 "Syntax error in topology specification at offset %llu, skipping bytes.\n"
 msgstr "Syntaxfehler in Topolgieangabe, Bytes werden übersprungen.\n"
 
-#: src/topology/gnunet-daemon-topology.c:1052
+#: src/topology/gnunet-daemon-topology.c:1050
 #, fuzzy, c-format
 msgid ""
 "Syntax error in topology specification at offset %llu, skipping bytes `%s'.\n"
 msgstr "Syntaxfehler in Topologieangabe, überspringe Bytes `%s'.\n"
 
-#: src/topology/gnunet-daemon-topology.c:1062
+#: src/topology/gnunet-daemon-topology.c:1060
 #, fuzzy, c-format
 msgid "Found friend `%s' in configuration\n"
 msgstr " gconfig\tGTK Konfiguration\n"
 
-#: src/topology/gnunet-daemon-topology.c:1068
+#: src/topology/gnunet-daemon-topology.c:1066
 #, c-format
 msgid "Found myself `%s' in friend list (useless, ignored)\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:1078
+#: src/topology/gnunet-daemon-topology.c:1076
 #, fuzzy
 msgid "# friends in configuration"
 msgstr " gconfig\tGTK Konfiguration\n"
 
-#: src/topology/gnunet-daemon-topology.c:1084
+#: src/topology/gnunet-daemon-topology.c:1082
 msgid ""
 "Fewer friends specified than required by minimum friend count. Will only "
 "connect to friends.\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:1091
+#: src/topology/gnunet-daemon-topology.c:1089
 msgid ""
 "More friendly connections required than target total number of connections.\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:1128
+#: src/topology/gnunet-daemon-topology.c:1126
 #, fuzzy
 msgid "# HELLO messages received"
 msgstr "# verschlüsselter PONG Nachrichten empfangen"
 
-#: src/topology/gnunet-daemon-topology.c:1185
+#: src/topology/gnunet-daemon-topology.c:1183
 #, fuzzy
 msgid "# HELLO messages gossipped"
 msgstr "# ausgehender Nachrichten verworfen"
 
-#: src/topology/gnunet-daemon-topology.c:1325
+#: src/topology/gnunet-daemon-topology.c:1323
 msgid "GNUnet topology control (maintaining P2P mesh and F2F constraints)"
 msgstr ""
 
@@ -4274,33 +4302,33 @@
 msgid "GNUnet NAT traversal test helper daemon"
 msgstr ""
 
-#: src/nat/nat.c:776
+#: src/nat/nat.c:803
 #, c-format
 msgid "gnunet-helper-nat-server generated malformed address `%s'\n"
 msgstr ""
 
-#: src/nat/nat.c:825
+#: src/nat/nat.c:852
 #, fuzzy, c-format
 msgid "Failed to start %s\n"
 msgstr "Fehler beim Starten der Collection.\n"
 
-#: src/nat/nat.c:1094
+#: src/nat/nat.c:1121
 #, fuzzy, c-format
 msgid "Malformed %s `%s' given in configuration!\n"
 msgstr "Fehler beim Speichern der Konfiguration!"
 
-#: src/nat/nat.c:1156 src/nat/nat.c:1166
+#: src/nat/nat.c:1187 src/nat/nat.c:1197
 #, c-format
 msgid ""
 "Configuration requires `%s', but binary is not installed properly (SUID bit "
 "not set).  Option disabled.\n"
 msgstr ""
 
-#: src/nat/nat.c:1298
+#: src/nat/nat.c:1329
 msgid "Internal IP address not known, cannot use ICMP NAT traversal method\n"
 msgstr ""
 
-#: src/nat/nat.c:1310
+#: src/nat/nat.c:1341
 #, c-format
 msgid "Running gnunet-helper-nat-client %s %s %u\n"
 msgstr ""
@@ -4315,44 +4343,39 @@
 msgid "Failed to create listen socket bound to `%s' for NAT test: %s\n"
 msgstr ""
 
-#: src/block/plugin_block_dht.c:122
+#: src/dht/plugin_block_dht.c:124
 #, fuzzy, c-format
 msgid "Block not of type %u\n"
 msgstr "Kein Transport des Typs %d bekannt.\n"
 
-#: src/block/plugin_block_dht.c:129
+#: src/dht/plugin_block_dht.c:131
 msgid "Size mismatch for block\n"
 msgstr ""
 
-#: src/block/plugin_block_dht.c:138
+#: src/dht/plugin_block_dht.c:140
 #, c-format
 msgid "Block of type %u is malformed\n"
 msgstr ""
 
-#: src/block/plugin_block_fs.c:131
+#: src/fs/plugin_block_fs.c:131
 msgid "Reply mismatched in terms of namespace.  Discarded.\n"
 msgstr ""
 
-#: src/block/block.c:109
+#: src/block/block.c:105
 #, fuzzy, c-format
-msgid "Loading block plugins `%s'\n"
+msgid "Loading block plugin `%s'\n"
 msgstr "Teste Transport(e) %s\n"
 
-#: src/block/block.c:119
-#, fuzzy, c-format
-msgid "Failed to load block plugin `%s'\n"
-msgstr "Anwendung `%s' konnte nicht initialisiert werden.\n"
-
-#: src/mesh/gnunet-service-mesh.c:4206
+#: src/mesh/gnunet-service-mesh.c:4192
 msgid "MESH: Wrong CORE service\n"
 msgstr ""
 
-#: src/mesh/gnunet-service-mesh.c:4410
+#: src/mesh/gnunet-service-mesh.c:4397
 #, fuzzy
 msgid "Mesh service is lacking key configuration settings.  Exiting.\n"
 msgstr "GNUnet Konfiguration"
 
-#: src/mesh/gnunet-service-mesh.c:4419
+#: src/mesh/gnunet-service-mesh.c:4406
 #, fuzzy
 msgid "Mesh service could not access hostkey.  Exiting.\n"
 msgstr "Auf die Namespace Informationen konnte nicht zugegriffen werden.\n"
@@ -4573,113 +4596,113 @@
 msgid "bytes in hostlist"
 msgstr "# bytes in der Datenbank"
 
-#: src/hostlist/hostlist-server.c:160
+#: src/hostlist/hostlist-server.c:157
 msgid "expired addresses encountered"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:208
+#: src/hostlist/hostlist-server.c:205
 msgid "HELLOs without addresses encountered (ignored)"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:224
+#: src/hostlist/hostlist-server.c:221
 msgid "bytes not included in hostlist (size limit)"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:272
+#: src/hostlist/hostlist-server.c:269
 #, fuzzy, c-format
 msgid "Refusing `%s' request to hostlist server\n"
 msgstr "Fehler beim Senden einer `%s' Anfrage an den SMTP Server.\n"
 
-#: src/hostlist/hostlist-server.c:275
+#: src/hostlist/hostlist-server.c:272
 #, fuzzy
 msgid "hostlist requests refused (not HTTP GET)"
 msgstr "# Client Trace-Anfragen empfangen"
 
-#: src/hostlist/hostlist-server.c:283
+#: src/hostlist/hostlist-server.c:280
 msgid "Sending 100 CONTINUE reply\n"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:290
+#: src/hostlist/hostlist-server.c:287
 #, c-format
 msgid "Refusing `%s' request with %llu bytes of upload data\n"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:294
+#: src/hostlist/hostlist-server.c:291
 #, fuzzy
 msgid "hostlist requests refused (upload data)"
 msgstr "# Client Trace-Anfragen empfangen"
 
-#: src/hostlist/hostlist-server.c:302
+#: src/hostlist/hostlist-server.c:299
 msgid "Could not handle hostlist request since I do not have a response yet\n"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:305
+#: src/hostlist/hostlist-server.c:302
 #, fuzzy
 msgid "hostlist requests refused (not ready)"
 msgstr "# Client Trace-Anfragen empfangen"
 
-#: src/hostlist/hostlist-server.c:309
+#: src/hostlist/hostlist-server.c:306
 msgid "Received request for our hostlist\n"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:310
+#: src/hostlist/hostlist-server.c:307
 #, fuzzy
 msgid "hostlist requests processed"
 msgstr "# Client Trace-Anfragen empfangen"
 
-#: src/hostlist/hostlist-server.c:353
+#: src/hostlist/hostlist-server.c:350
 #, fuzzy
 msgid "# hostlist advertisements send"
 msgstr "# Bekanntmachungen von anderen übertragen"
 
-#: src/hostlist/hostlist-server.c:400
+#: src/hostlist/hostlist-server.c:397
 msgid "Advertisement message could not be queued by core\n"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:568
+#: src/hostlist/hostlist-server.c:565
 #, fuzzy, c-format
 msgid "Invalid port number %llu.  Exiting.\n"
 msgstr "Ungültige Parameter. Abbruch.\n"
 
-#: src/hostlist/hostlist-server.c:577
+#: src/hostlist/hostlist-server.c:574
 #, c-format
 msgid "Hostlist service starts on %s:%llu\n"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:591
+#: src/hostlist/hostlist-server.c:588
 #, fuzzy, c-format
 msgid "Address to obtain hostlist: `%s'\n"
 msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
 
-#: src/hostlist/hostlist-server.c:629
+#: src/hostlist/hostlist-server.c:626
 #, 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"
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:222
+#: src/peerinfo-tool/gnunet-peerinfo.c:221
 #, fuzzy, c-format
 msgid "Could not find option `%s:%s' in configuration.\n"
 msgstr "Knoten `%s' konnte nicht in der Routing Tabelle gefunden werden!\n"
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:229
+#: src/peerinfo-tool/gnunet-peerinfo.c:228
 #, 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:241
+#: src/peerinfo-tool/gnunet-peerinfo.c:240
 #, c-format
 msgid "I am peer `%s'.\n"
 msgstr "Ich bin Peer `%s'.\n"
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:261
+#: src/peerinfo-tool/gnunet-peerinfo.c:260
 msgid "output only the identity strings"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:264
+#: src/peerinfo-tool/gnunet-peerinfo.c:263
 msgid "output our own identity only"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:270
+#: src/peerinfo-tool/gnunet-peerinfo.c:269
 #, fuzzy
 msgid "Print information about peers."
 msgstr "Informationen über andere GNUnet Knoten ausgeben."
@@ -4708,23 +4731,31 @@
 msgid "use configuration file FILENAME"
 msgstr "Konfigurationsdatei FILENAME verwenden"
 
-#: src/include/gnunet_common.h:352 src/include/gnunet_common.h:357
-#: src/include/gnunet_common.h:363
+#: src/include/gnunet_common.h:361 src/include/gnunet_common.h:366
+#: src/include/gnunet_common.h:372
 #, fuzzy, c-format
 msgid "Assertion failed at %s:%d.\n"
 msgstr "Absicherung fehlgeschlagen bei %s:%d.\n"
 
-#: src/include/gnunet_common.h:373
+#: src/include/gnunet_common.h:382
 #, fuzzy, c-format
 msgid "External protocol violation detected at %s:%d.\n"
 msgstr "Absicherung fehlgeschlagen bei %s:%d.\n"
 
-#: src/include/gnunet_common.h:394 src/include/gnunet_common.h:401
+#: src/include/gnunet_common.h:403 src/include/gnunet_common.h:410
 #, fuzzy, c-format
 msgid "`%s' failed on file `%s' at %s:%d with error: %s\n"
 msgstr "`%s' schlug bei Datei `%s' fehl. Ort: %s:%d. Fehler: %s\n"
 
 #, fuzzy
+#~ msgid "Failed to create IPv4 broadcast socket on port %d\n"
+#~ msgstr "Fehler beim Aktualisieren der Daten des Moduls `%s'\n"
+
+#, fuzzy
+#~ msgid "Failed to load block plugin `%s'\n"
+#~ msgstr "Anwendung `%s' konnte nicht initialisiert werden.\n"
+
+#, fuzzy
 #~ msgid "Target is %d connections per peer."
 #~ msgstr "Fehler beim Aufbauen einer Verbindung mit gnunetd.\n"
 
@@ -5830,9 +5861,6 @@
 #~ msgid "# encrypted PING messages received"
 #~ msgstr "# verschlüsselter PING Nachrichten empfangen"
 
-#~ msgid "# encrypted PONG messages sent"
-#~ msgstr "# verschlüsselter PONG Nachrichten gesendet"
-
 #~ msgid "# encrypted PING messages sent"
 #~ msgstr "# verschlüsselter PING Nachrichten gesendet"
 
@@ -6497,9 +6525,6 @@
 #~ msgid "ping peers from HOSTLISTURL that match transports"
 #~ msgstr "Knoten aus HOSTLISTURL anpingen, deren Transports passen"
 
-#~ msgid "send COUNT messages"
-#~ msgstr "COUNT Nachrichten versenden"
-
 #~ msgid "send messages with SIZE bytes payload"
 #~ msgstr "Nachrichten mit SIZE Bytes Nutzlast versenden"
 
@@ -7473,9 +7498,6 @@
 #~ "HTTP-Listener konnte nicht an Port %d gebunden werden. Der Transport "
 #~ "Dienst wurde nicht gestartet.\n"
 
-#~ msgid "Could not determine my public IP address.\n"
-#~ msgstr "Öffentliche IP-Adresse konnte nicht ermittelt werden.\n"
-
 #~ msgid "Unexpected reply to `%s' operation.\n"
 #~ msgstr "Unerwartete Antwort zu `%s' Operation.\n"
 

Modified: gnunet/po/es.gmo
===================================================================
(Binary files differ)

Modified: gnunet/po/es.po
===================================================================
--- gnunet/po/es.po     2011-11-23 10:05:05 UTC (rev 18268)
+++ gnunet/po/es.po     2011-11-23 10:05:21 UTC (rev 18269)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: GNUnet 0.7.0e\n"
 "Report-Msgid-Bugs-To: address@hidden"
-"POT-Creation-Date: 2011-11-03 13:55+0100\n"
+"POT-Creation-Date: 2011-11-23 11:01+0100\n"
 "PO-Revision-Date: 2006-06-29 12:05+0200\n"
 "Last-Translator: Miguel Angel Arruga <address@hidden>\n"
 "Language-Team: Spanish\n"
@@ -30,8 +30,8 @@
 #: src/datacache/plugin_datacache_mysql.c:517
 #: src/datacache/plugin_datacache_mysql.c:526
 #: src/datacache/plugin_datacache_mysql.c:598
-#: src/datacache/plugin_datacache_mysql.c:614 src/include/gnunet_common.h:380
-#: src/include/gnunet_common.h:387
+#: src/datacache/plugin_datacache_mysql.c:614 src/include/gnunet_common.h:389
+#: src/include/gnunet_common.h:396
 #, c-format
 msgid "`%s' failed at %s:%d with error: %s\n"
 msgstr "'%s' falló en %s: %d con el error: %s\n"
@@ -51,28 +51,28 @@
 msgid "Unable to initialize SQLite: %s.\n"
 msgstr "Imposible inicializar SQLite.\n"
 
-#: src/datastore/plugin_datastore_sqlite.c:420
-#: src/datacache/plugin_datacache_sqlite.c:471
+#: src/datastore/plugin_datastore_sqlite.c:414
+#: src/datacache/plugin_datacache_sqlite.c:457
 msgid "Tried to close sqlite without finalizing all prepared statements.\n"
 msgstr ""
 
-#: src/datastore/plugin_datastore_sqlite.c:677
+#: src/datastore/plugin_datastore_sqlite.c:671
 #, fuzzy
 msgid "Invalid data in database.  Trying to fix (by deletion).\n"
 msgstr "Datos no válidos en %s.  Intentando fijar (por borrado).\n"
 
-#: src/datastore/plugin_datastore_sqlite.c:1130
+#: src/datastore/plugin_datastore_sqlite.c:1124
 msgid "sqlite version to old to determine size, assuming zero\n"
 msgstr ""
 
-#: src/datastore/plugin_datastore_sqlite.c:1149
+#: src/datastore/plugin_datastore_sqlite.c:1143
 #, c-format
 msgid ""
 "Using sqlite page utilization to estimate payload (%llu pages of size %llu "
 "bytes)\n"
 msgstr ""
 
-#: src/datastore/plugin_datastore_sqlite.c:1188
+#: src/datastore/plugin_datastore_sqlite.c:1182
 #, fuzzy
 msgid "Sqlite database running\n"
 msgstr "base de datos sqlite"
@@ -292,8 +292,8 @@
 msgid "Could not find matching reservation"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:824 src/datacache/datacache.c:119
-#: src/datacache/datacache.c:250
+#: src/datastore/gnunet-service-datastore.c:824 src/datacache/datacache.c:118
+#: src/datacache/datacache.c:248
 #, fuzzy
 msgid "# bytes stored"
 msgstr "# bytes en la base de datos"
@@ -347,8 +347,8 @@
 msgstr ""
 
 #: src/datastore/gnunet-service-datastore.c:1295
-#: src/datastore/gnunet-service-datastore.c:1486 src/datacache/datacache.c:145
-#: src/datacache/datacache.c:152
+#: src/datastore/gnunet-service-datastore.c:1486 src/datacache/datacache.c:144
+#: src/datacache/datacache.c:151
 #, fuzzy, c-format
 msgid "No `%s' specified for `%s' in configuration!\n"
 msgstr "¡Ninguna aplicación definida en la configuración!\n"
@@ -381,21 +381,16 @@
 msgid "Failed to initialize bloomfilter.\n"
 msgstr "Imposible inicializar SQLite.\n"
 
-#: src/core/gnunet-service-core_sessions.c:204
+#: src/core/gnunet-service-core_sessions.c:210
 #: src/core/gnunet-service-core_sessions.c:275
 msgid "# entries in session map"
 msgstr ""
 
-#: src/core/gnunet-service-core_sessions.c:236
+#: src/core/gnunet-service-core_sessions.c:240
 msgid "# type map refreshes sent"
 msgstr ""
 
-#: src/core/gnunet-service-core_sessions.c:360
-#, fuzzy
-msgid "# send requests dropped (disconnected)"
-msgstr "# Anuncios de los pares recibidos"
-
-#: src/core/gnunet-service-core_sessions.c:427
+#: src/core/gnunet-service-core_sessions.c:416
 msgid "# messages discarded (expired prior to transmission)"
 msgstr ""
 
@@ -406,13 +401,13 @@
 msgstr "Yo soy el par '%s'.\n"
 
 #: src/core/gnunet-core-list-connections.c:167
-#: src/peerinfo-tool/gnunet-peerinfo.c:200
+#: src/peerinfo-tool/gnunet-peerinfo.c:199
 #, fuzzy, c-format
 msgid "Invalid command line argument `%s'\n"
 msgstr "Argumentos en la linea de comandos inválidos:\n"
 
 #: src/core/gnunet-core-list-connections.c:188
-#: src/peerinfo-tool/gnunet-peerinfo.c:258
+#: src/peerinfo-tool/gnunet-peerinfo.c:257
 msgid "don't resolve host names"
 msgstr ""
 
@@ -421,46 +416,51 @@
 msgid "Print information about connected peers."
 msgstr "Imprime información de los pares de GNUnet."
 
-#: src/core/gnunet-service-core_clients.c:452
+#: src/core/gnunet-service-core_clients.c:357
 #, fuzzy
+msgid "# send requests dropped (disconnected)"
+msgstr "# Anuncios de los pares recibidos"
+
+#: src/core/gnunet-service-core_clients.c:462
+#, fuzzy
 msgid "# messages discarded (session disconnected)"
 msgstr "# mensajes defragmentados"
 
-#: src/core/gnunet-service-core_clients.c:796
+#: src/core/gnunet-service-core_clients.c:791
 #, fuzzy, c-format
 msgid "# bytes of messages of type %u received"
 msgstr "# bytes de ruido recibidos"
 
-#: src/core/gnunet-service-core.c:101
+#: src/core/gnunet-service-core.c:99
 #, c-format
 msgid "Core service of `%4s' ready.\n"
 msgstr ""
 
-#: src/core/gnunet-service-core_typemap.c:111
-#: src/core/gnunet-service-core_typemap.c:124
+#: src/core/gnunet-service-core_typemap.c:110
+#: src/core/gnunet-service-core_typemap.c:121
 #, fuzzy
 msgid "# type maps received"
 msgstr "# mensajes PONG encriptados recibidos"
 
-#: src/core/gnunet-service-core_typemap.c:156
+#: src/core/gnunet-service-core_typemap.c:151
 msgid "# updates to my type map"
 msgstr ""
 
-#: src/core/gnunet-service-core_neighbours.c:162
+#: src/core/gnunet-service-core_neighbours.c:163
 #, fuzzy
 msgid "# sessions terminated by transport disconnect"
 msgstr "# Anuncios de los pares recibidos"
 
-#: src/core/gnunet-service-core_neighbours.c:179
+#: src/core/gnunet-service-core_neighbours.c:180
 #: src/core/gnunet-service-core_neighbours.c:343
 msgid "# neighbour entries allocated"
 msgstr ""
 
-#: src/core/gnunet-service-core_neighbours.c:251
+#: src/core/gnunet-service-core_neighbours.c:252
 msgid "# encrypted bytes given to transport"
 msgstr ""
 
-#: src/core/gnunet-service-core_neighbours.c:432
+#: src/core/gnunet-service-core_neighbours.c:430
 #, fuzzy, c-format
 msgid "Unsupported message of type %u received.\n"
 msgstr "Mensaje no válido del tipo %u recibido.  Omitiendo.\n"
@@ -473,8 +473,8 @@
 msgid "# bytes decrypted"
 msgstr "# bytes desencriptados"
 
-#: src/core/gnunet-service-core_kx.c:602 src/dv/gnunet-service-dv.c:3000
-#: src/hostlist/hostlist-server.c:439 src/peerinfo-tool/gnunet-peerinfo.c:157
+#: src/core/gnunet-service-core_kx.c:602 src/dv/gnunet-service-dv.c:3002
+#: src/hostlist/hostlist-server.c:436 src/peerinfo-tool/gnunet-peerinfo.c:156
 #, fuzzy, c-format
 msgid "Error in communication with PEERINFO service\n"
 msgstr "Imprime información de los pares de GNUnet."
@@ -483,120 +483,120 @@
 msgid "# Delayed connecting due to lack of public key"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:669
+#: src/core/gnunet-service-core_kx.c:668
 msgid "# key exchanges initiated"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:693
+#: src/core/gnunet-service-core_kx.c:689
 msgid "# key exchanges stopped"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:746
+#: src/core/gnunet-service-core_kx.c:741
 #, fuzzy
 msgid "# session keys received"
 msgstr "# claves de la sesión rechazadas"
 
-#: src/core/gnunet-service-core_kx.c:764
+#: src/core/gnunet-service-core_kx.c:760
 #, fuzzy, c-format
 msgid "`%s' is for `%s', not for me.  Ignoring.\n"
 msgstr "el tamaño del '%s' mensaje es demasiado corto. Ignorandolo.\n"
 
-#: src/core/gnunet-service-core_kx.c:803
+#: src/core/gnunet-service-core_kx.c:798
 #, fuzzy
 msgid "# SET_KEY messages decrypted"
 msgstr "# mensajes defragmentados"
 
-#: src/core/gnunet-service-core_kx.c:884
-#: src/transport/gnunet-service-transport_validation.c:601
+#: src/core/gnunet-service-core_kx.c:878
+#: src/transport/gnunet-service-transport_validation.c:781
 #, fuzzy
 msgid "# PING messages received"
 msgstr "# mensajes PONG encriptados recibidos"
 
-#: src/core/gnunet-service-core_kx.c:918
+#: src/core/gnunet-service-core_kx.c:912
 #, 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:941
+#: src/core/gnunet-service-core_kx.c:933
 #, fuzzy
 msgid "# PONG messages created"
 msgstr "# mensajes fragmentados"
 
-#: src/core/gnunet-service-core_kx.c:1029
+#: src/core/gnunet-service-core_kx.c:1021
 #, fuzzy
 msgid "# sessions terminated by timeout"
 msgstr "# bytes omitidos por TCP (salientes)"
 
-#: src/core/gnunet-service-core_kx.c:1042
+#: src/core/gnunet-service-core_kx.c:1032
 #, fuzzy
 msgid "# keepalive messages sent"
 msgstr "# mensajes PONG encriptados recibidos"
 
-#: src/core/gnunet-service-core_kx.c:1098
-#: src/transport/gnunet-service-transport_validation.c:934
+#: src/core/gnunet-service-core_kx.c:1090
+#: src/transport/gnunet-service-transport_validation.c:991
 #, fuzzy
 msgid "# PONG messages received"
 msgstr "# mensajes PONG encriptados recibidos"
 
-#: src/core/gnunet-service-core_kx.c:1128
+#: src/core/gnunet-service-core_kx.c:1120
 #, fuzzy
 msgid "# PONG messages decrypted"
 msgstr "# mensajes defragmentados"
 
-#: src/core/gnunet-service-core_kx.c:1161
+#: src/core/gnunet-service-core_kx.c:1152
 #, fuzzy
 msgid "# session keys confirmed via PONG"
 msgstr "# Anuncios de los pares recibidos"
 
-#: src/core/gnunet-service-core_kx.c:1224
+#: src/core/gnunet-service-core_kx.c:1216
 #, fuzzy
 msgid "# SET_KEY and PING messages created"
 msgstr "# mensajes de texto mandados por PING"
 
-#: src/core/gnunet-service-core_kx.c:1372
+#: src/core/gnunet-service-core_kx.c:1357
 msgid "# failed to decrypt message (no session key)"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1416
-#: src/core/gnunet-service-core_kx.c:1441
+#: src/core/gnunet-service-core_kx.c:1399
+#: src/core/gnunet-service-core_kx.c:1424
 #, fuzzy
 msgid "# bytes dropped (duplicates)"
 msgstr "# bytes omitidos por UDP (salientes)"
 
-#: src/core/gnunet-service-core_kx.c:1428
+#: src/core/gnunet-service-core_kx.c:1411
 #, fuzzy
 msgid "# bytes dropped (out of sequence)"
 msgstr "# bytes omitidos por UDP (salientes)"
 
-#: src/core/gnunet-service-core_kx.c:1465
+#: src/core/gnunet-service-core_kx.c:1448
 #, fuzzy, c-format
 msgid "Message received far too old (%llu ms). Content ignored.\n"
 msgstr "El mensaje recibido del cliente es inválido\n"
 
-#: src/core/gnunet-service-core_kx.c:1469
+#: src/core/gnunet-service-core_kx.c:1452
 #, fuzzy
 msgid "# bytes dropped (ancient message)"
 msgstr "# bytes omitidos por UDP (salientes)"
 
-#: src/core/gnunet-service-core_kx.c:1477
+#: src/core/gnunet-service-core_kx.c:1460
 #, fuzzy
 msgid "# bytes of payload decrypted"
 msgstr "# bytes desencriptados"
 
-#: src/core/gnunet-service-core_kx.c:1541
+#: src/core/gnunet-service-core_kx.c:1521
 #, fuzzy
 msgid "Core service is lacking HOSTKEY configuration setting.  Exiting.\n"
 msgstr "Configuración de GNUnet"
 
-#: src/core/gnunet-service-core_kx.c:1549
+#: src/core/gnunet-service-core_kx.c:1529
 msgid "Core service could not access hostkey.  Exiting.\n"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1559
-#: src/transport/gnunet-service-transport.c:540
-#: src/hostlist/hostlist-server.c:558 src/peerinfo-tool/gnunet-peerinfo.c:208
+#: src/core/gnunet-service-core_kx.c:1539
+#: src/transport/gnunet-service-transport.c:537
+#: src/hostlist/hostlist-server.c:555 src/peerinfo-tool/gnunet-peerinfo.c:207
 #, fuzzy, c-format
 msgid "Could not access PEERINFO service.  Exiting.\n"
 msgstr "Imposible acceder a la información del espacio.\n"
@@ -605,11 +605,11 @@
 msgid "Client was disconnected from core service, trying to reconnect.\n"
 msgstr ""
 
-#: src/vpn/gnunet-daemon-exit.c:1499
+#: src/vpn/gnunet-daemon-exit.c:1513
 msgid "Daemon to run to provide an IP exit node for the VPN"
 msgstr ""
 
-#: src/vpn/gnunet-daemon-vpn.c:1287
+#: src/vpn/gnunet-daemon-vpn.c:1294
 #, fuzzy
 msgid "help text"
 msgstr "texto de ayuda para -t"
@@ -620,51 +620,51 @@
 "Arguments mandatory for long options are also mandatory for short options.\n"
 msgstr ""
 
-#: src/util/getopt_helpers.c:258 src/util/getopt_helpers.c:287
+#: src/util/getopt_helpers.c:255 src/util/getopt_helpers.c:283
 #, c-format
 msgid "You must pass a number to the `%s' option.\n"
 msgstr "Tienes que introducir un número en la opción '%s'.\n"
 
-#: src/util/common_logging.c:242 src/util/common_logging.c:838
+#: src/util/common_logging.c:239 src/util/common_logging.c:861
 msgid "DEBUG"
 msgstr "DEPURACIÓN"
 
-#: src/util/common_logging.c:244 src/util/common_logging.c:836
+#: src/util/common_logging.c:241 src/util/common_logging.c:859
 msgid "INFO"
 msgstr "INFORMACIÓN"
 
-#: src/util/common_logging.c:246 src/util/common_logging.c:834
+#: src/util/common_logging.c:243 src/util/common_logging.c:857
 msgid "WARNING"
 msgstr "PELIGRO"
 
-#: src/util/common_logging.c:248 src/util/common_logging.c:832
+#: src/util/common_logging.c:245 src/util/common_logging.c:855
 msgid "ERROR"
 msgstr "ERROR"
 
-#: src/util/common_logging.c:250 src/util/common_logging.c:840
+#: src/util/common_logging.c:247 src/util/common_logging.c:863
 msgid "NONE"
 msgstr ""
 
-#: src/util/common_logging.c:554
+#: src/util/common_logging.c:579
 #, fuzzy, c-format
 msgid "Failed to create or access directory for log file `%s'\n"
 msgstr "Imposible pasar el fichero de configuración '%s'.\n"
 
-#: src/util/common_logging.c:672
+#: src/util/common_logging.c:696
 #, c-format
 msgid "Message `%.*s' repeated %u times in the last %s\n"
 msgstr ""
 
-#: src/util/common_logging.c:841
+#: src/util/common_logging.c:864
 msgid "INVALID"
 msgstr ""
 
-#: src/util/common_logging.c:923
+#: src/util/common_logging.c:946
 #, fuzzy
 msgid "unknown address"
 msgstr "desconocido"
 
-#: src/util/common_logging.c:961
+#: src/util/common_logging.c:984
 #, fuzzy
 msgid "invalid address"
 msgstr "Argumentos inválidos: "
@@ -684,25 +684,30 @@
 msgid "`%s' failed for library `%s' with error: %s\n"
 msgstr "'%s' falló en la biblioteca '%s' en %s:%d con un error: %s\n"
 
-#: src/util/configuration.c:249
+#: src/util/plugin.c:349
+#, fuzzy
+msgid "Could not determine plugin installation path.\n"
+msgstr "Imposible determinar mi dirección IPv6 pública.\n"
+
+#: src/util/configuration.c:245
 #, fuzzy, c-format
 msgid "Syntax error in configuration file `%s' at line %u.\n"
 msgstr ""
 "Error de sintaxis en el fichero de configuración '%s' en la linea %d.\n"
 
-#: src/util/configuration.c:812
+#: src/util/configuration.c:817
 #, c-format
 msgid ""
 "Configuration value '%s' for '%s' in section '%s' is not in set of legal "
 "choices\n"
 msgstr ""
 
-#: src/util/getopt.c:670
+#: src/util/getopt.c:672
 #, c-format
 msgid "%s: option `%s' is ambiguous\n"
 msgstr "%s: la opción '%s' es ambigua\n"
 
-#: src/util/getopt.c:695
+#: src/util/getopt.c:696
 #, c-format
 msgid "%s: option `--%s' does not allow an argument\n"
 msgstr "%s: la opción '--%s' no permite un argumento\n"
@@ -712,109 +717,109 @@
 msgid "%s: option `%c%s' does not allow an argument\n"
 msgstr "%s: la opción '%c%s' no permite un argumento\n"
 
-#: src/util/getopt.c:720 src/util/getopt.c:889
+#: src/util/getopt.c:718 src/util/getopt.c:886
 #, c-format
 msgid "%s: option `%s' requires an argument\n"
 msgstr "%s: la opción '%s' requiere un argumento\n"
 
-#: src/util/getopt.c:749
+#: src/util/getopt.c:747
 #, c-format
 msgid "%s: unrecognized option `--%s'\n"
 msgstr "%s: opción no reconocida '--%s'\n"
 
-#: src/util/getopt.c:753
+#: src/util/getopt.c:751
 #, c-format
 msgid "%s: unrecognized option `%c%s'\n"
 msgstr "%s: opción no reconocida '%c%s'\n"
 
-#: src/util/getopt.c:778
+#: src/util/getopt.c:776
 #, c-format
 msgid "%s: illegal option -- %c\n"
 msgstr "%s: opción ilegal -- %c\n"
 
-#: src/util/getopt.c:780
+#: src/util/getopt.c:778
 #, c-format
 msgid "%s: invalid option -- %c\n"
 msgstr "%s: opción no válida -- %c\n"
 
-#: src/util/getopt.c:808 src/util/getopt.c:938
+#: src/util/getopt.c:806 src/util/getopt.c:934
 #, c-format
 msgid "%s: option requires an argument -- %c\n"
 msgstr "%s: la opción requiere un argumento --%c\n"
 
-#: src/util/getopt.c:856
+#: src/util/getopt.c:854
 #, c-format
 msgid "%s: option `-W %s' is ambiguous\n"
 msgstr "%s: la opción '-W %s' es ambigua\n"
 
-#: src/util/getopt.c:874
+#: src/util/getopt.c:872
 #, c-format
 msgid "%s: option `-W %s' does not allow an argument\n"
 msgstr "%s: la opción '-W %s' no permite un argumento\n"
 
-#: src/util/getopt.c:1042
+#: src/util/getopt.c:1038
 #, c-format
 msgid "Use --help to get a list of options.\n"
 msgstr "Usar --help para obtener una lista de opciones.\n"
 
-#: src/util/scheduler.c:863
+#: src/util/scheduler.c:860
 msgid "Looks like we're busy waiting...\n"
 msgstr ""
 
-#: src/util/scheduler.c:994
+#: src/util/scheduler.c:990
 #, c-format
 msgid "Attempt to cancel dead task %llu!\n"
 msgstr ""
 
-#: src/util/connection.c:462
+#: src/util/connection.c:461
 #, fuzzy, c-format
 msgid "Access denied to `%s'\n"
 msgstr "Permiso denegado para '%s' en %s:%d.\n"
 
-#: src/util/connection.c:477
+#: src/util/connection.c:476
 #, c-format
 msgid "Accepting connection from `%s': %p\n"
 msgstr ""
 
-#: src/util/connection.c:646
+#: src/util/connection.c:642
 #, fuzzy, c-format
 msgid ""
 "Failed to establish TCP connection to `%s:%u', no further addresses to try.\n"
 msgstr "Se produjo un error estableciendo conexión con gnunetd.\n"
 
-#: src/util/connection.c:858 src/util/connection.c:1034
+#: src/util/connection.c:852 src/util/connection.c:1025
 #, fuzzy, c-format
 msgid "Trying to connect to `%s' (%p)\n"
 msgstr "Fallo al conectar a gnunetd.\n"
 
-#: src/util/connection.c:869
+#: src/util/connection.c:862
 #, fuzzy, c-format
 msgid "Failed to connect to `%s' (%p)\n"
 msgstr "Fallo al conectar a gnunetd.\n"
 
-#: src/util/connection.c:1024
+#: src/util/connection.c:1015
 #, fuzzy, c-format
 msgid "Attempt to connect to `%s' failed\n"
 msgstr "Fallo al conectar a gnunetd.\n"
 
-#: src/util/connection.c:1540
+#: src/util/connection.c:1528
 #, c-format
 msgid ""
 "Could not satisfy pending transmission request, socket closed or connect "
 "failed (%p).\n"
 msgstr ""
 
-#: src/util/connection.c:1576
+#: src/util/connection.c:1564
 #, fuzzy, c-format
 msgid "Failed to send to `%s': %s\n"
 msgstr "Fichero almacenado en '%s'.\n"
 
-#: src/util/signal.c:81
+#: src/util/signal.c:80
 #, fuzzy, c-format
 msgid "signal (%d, %p) returned %d.\n"
 msgstr "La llamada a '%s' devuelve %d.\n"
 
-#: src/util/network.c:1204
+#: src/util/network.c:1197
 #, c-format
 msgid ""
 "Fatal internal logic error, process hangs in `%s' (abort with CTRL-C)!\n"
@@ -827,98 +832,82 @@
 "variable.\n"
 msgstr ""
 
-#: src/util/os_installation.c:481
+#: src/util/os_installation.c:477
 #, fuzzy, c-format
 msgid "Could not find binary `%s' in PATH!\n"
 msgstr "¡Imposible encontrar el par '%s' en la tabla de enrutado!\n"
 
-#: src/util/os_installation.c:486
+#: src/util/os_installation.c:483
 #, fuzzy, c-format
 msgid "stat (%s) failed: %s\n"
 msgstr "'%s' %s falló: %s\n"
 
-#: src/util/strings.c:144
+#: src/util/strings.c:143
 msgid "b"
 msgstr "b"
 
-#: src/util/strings.c:150
-msgid "KiB"
-msgstr "KiB"
-
-#: src/util/strings.c:154
-msgid "MiB"
-msgstr "MiB"
-
-#: src/util/strings.c:158
-msgid "GiB"
-msgstr "GiB"
-
-#: src/util/strings.c:162
-msgid "TiB"
-msgstr "TiB"
-
-#: src/util/strings.c:198
+#: src/util/strings.c:355
 #, c-format
 msgid "Character set requested was `%s'\n"
 msgstr ""
 
-#: src/util/strings.c:276
+#: src/util/strings.c:433
 msgid "Failed to expand `$HOME': environment variable `HOME' not set"
 msgstr ""
 
-#: src/util/strings.c:368
+#: src/util/strings.c:525
 msgid "ms"
 msgstr "ms"
 
-#: src/util/strings.c:373
+#: src/util/strings.c:530
 msgid "eternity"
 msgstr ""
 
-#: src/util/strings.c:377
+#: src/util/strings.c:534
 msgid "s"
 msgstr "s"
 
-#: src/util/strings.c:381
+#: src/util/strings.c:538
 msgid "m"
 msgstr "m"
 
-#: src/util/strings.c:385
+#: src/util/strings.c:542
 msgid "h"
 msgstr "h"
 
-#: src/util/strings.c:389
+#: src/util/strings.c:546
 msgid " days"
 msgstr " días"
 
-#: src/util/strings.c:413
+#: src/util/strings.c:570
 msgid "end of time"
 msgstr ""
 
-#: src/util/server.c:392
+#: src/util/server.c:388
 #, fuzzy, c-format
 msgid "`%s' failed for port %d (%s).\n"
 msgstr "'%s' falló para la unidad %s: %u\n"
 
-#: src/util/server.c:400
+#: src/util/server.c:397
 #, fuzzy, c-format
 msgid "`%s' failed for port %d (%s): address already in use\n"
 msgstr ""
 "'%s' falló para el puerto %d: %s. ¿Está gnunet ejecutandose actualmente?\n"
 
-#: src/util/server.c:405
+#: src/util/server.c:402
 #, fuzzy, c-format
 msgid "`%s' failed for `%s': address already in use\n"
 msgstr ""
 "'%s' falló para el puerto %d: %s. ¿Está gnunet ejecutandose actualmente?\n"
 
-#: src/util/server.c:623
+#: src/util/server.c:617
 #, c-format
 msgid ""
 "Processing code for message of type %u did not call "
 "GNUNET_SERVER_receive_done after %llums\n"
 msgstr ""
 
-#: src/util/crypto_random.c:240
+#: src/util/crypto_random.c:239
 #, c-format
 msgid "Starting `%s' process to generate entropy\n"
 msgstr ""
@@ -929,157 +918,157 @@
 msgstr ""
 "libgcrypt no está en la versión esperada (se necesita la versión %s).\n"
 
-#: src/util/disk.c:435
+#: src/util/disk.c:434
 #, fuzzy, c-format
 msgid "`%s' failed for drive `%s': %u\n"
 msgstr "'%s' falló para la unidad %s: %u\n"
 
-#: src/util/disk.c:838
+#: src/util/disk.c:834
 #, fuzzy, c-format
 msgid "Expected `%s' to be a directory!\n"
 msgstr "¡'%s' se esperaba que '%s' fuera un directorio!\n"
 
-#: src/util/disk.c:1189 src/util/service.c:1473
+#: src/util/disk.c:1186 src/util/service.c:1452
 #, fuzzy, c-format
 msgid "Cannot obtain information about user `%s': %s\n"
 msgstr "Imposible guardar el fichero de configuración '%s': %s.\n"
 
-#: src/util/disk.c:1497
+#: src/util/disk.c:1491
 #, fuzzy, c-format
 msgid "No `%s' specified for service `%s' in configuration.\n"
 msgstr "¡Ninguna aplicación definida en la configuración!\n"
 
-#: src/util/service.c:118 src/util/service.c:144 src/util/service.c:188
-#: src/util/service.c:209 src/util/service.c:216
+#: src/util/service.c:117 src/util/service.c:143 src/util/service.c:186
+#: src/util/service.c:207 src/util/service.c:214
 #, c-format
 msgid "Invalid format for IP: `%s'\n"
 msgstr "Formato no válido para la IP: '%s'\n"
 
-#: src/util/service.c:171
+#: src/util/service.c:170
 #, c-format
 msgid "Invalid network notation ('/%d' is not legal in IPv4 CIDR)."
 msgstr "Notación de red no válida ('/%d' no es válido en IPv4 CIDR)."
 
-#: src/util/service.c:265
+#: src/util/service.c:263
 #, c-format
 msgid "Invalid network notation (does not end with ';': `%s')\n"
 msgstr "Notación de red no válida (no termina con ';': '%s')\n"
 
-#: src/util/service.c:301
+#: src/util/service.c:296
 #, fuzzy, c-format
 msgid "Wrong format `%s' for netmask\n"
 msgstr "Formato '%s' erróneo para la máscara de red: %s\n"
 
-#: src/util/service.c:332
+#: src/util/service.c:326
 #, fuzzy, c-format
 msgid "Wrong format `%s' for network\n"
 msgstr "Formato '%s' erróneo para la red: %s\n"
 
-#: src/util/service.c:638
+#: src/util/service.c:629
 #, c-format
 msgid "Access denied to UID %d / GID %d\n"
 msgstr ""
 
-#: src/util/service.c:643
+#: src/util/service.c:634
 #, fuzzy, c-format
 msgid "Unknown address family %d\n"
 msgstr "Operación desconocida '%s'\n"
 
-#: src/util/service.c:650
+#: src/util/service.c:641
 #, c-format
 msgid "Access from `%s' denied to service `%s'\n"
 msgstr ""
 
-#: src/util/service.c:694
+#: src/util/service.c:685
 #, c-format
 msgid "Could not parse IPv4 network specification `%s' for `%s:%s'\n"
 msgstr ""
 
-#: src/util/service.c:723
+#: src/util/service.c:713
 #, c-format
 msgid "Could not parse IPv6 network specification `%s' for `%s:%s'\n"
 msgstr ""
 
-#: src/util/service.c:841
+#: src/util/service.c:830
 #, c-format
 msgid ""
 "Disabling IPv6 support for service `%s', failed to create IPv6 socket: %s\n"
 msgstr ""
 
-#: src/util/service.c:862 src/transport/plugin_transport_tcp.c:1939
+#: src/util/service.c:850 src/transport/plugin_transport_tcp.c:1935
 #, c-format
 msgid "Require valid port number for service `%s' in configuration!\n"
 msgstr ""
 
-#: src/util/service.c:893 src/util/client.c:712
+#: src/util/service.c:880 src/util/client.c:707
 #, c-format
 msgid "UNIXPATH `%s' too long, maximum length is %llu\n"
 msgstr ""
 
-#: src/util/service.c:913
+#: src/util/service.c:900
 #, c-format
 msgid ""
 "Disabling UNIX domain socket support for service `%s', failed to create UNIX "
 "domain socket: %s\n"
 msgstr ""
 
-#: src/util/service.c:930
+#: src/util/service.c:917
 #, c-format
 msgid "Have neither PORT nor UNIXPATH for service `%s', but one is required\n"
 msgstr ""
 
-#: src/util/service.c:960 src/transport/plugin_transport_http.c:903
+#: src/util/service.c:947 src/transport/plugin_transport_http.c:993
 #, fuzzy, c-format
 msgid "Failed to resolve `%s': %s\n"
 msgstr "Fichero almacenado en '%s'.\n"
 
-#: src/util/service.c:978 src/transport/plugin_transport_http.c:920
+#: src/util/service.c:964 src/transport/plugin_transport_http.c:1010
 #, fuzzy, c-format
 msgid "Failed to find %saddress for `%s'.\n"
 msgstr "Fallo al conectar a gnunetd.\n"
 
-#: src/util/service.c:1135 src/util/service.c:1153
+#: src/util/service.c:1120 src/util/service.c:1138
 #, c-format
 msgid "Specified value for `%s' of service `%s' is invalid\n"
 msgstr ""
 
-#: src/util/service.c:1181
+#: src/util/service.c:1165
 #, c-format
 msgid "Could not access pre-bound socket %u, will try to bind myself\n"
 msgstr ""
 
-#: src/util/service.c:1333
+#: src/util/service.c:1314
 #, fuzzy, c-format
 msgid "Failed to start `%s' at `%s'\n"
 msgstr "Fallo al conectar a gnunetd.\n"
 
-#: src/util/service.c:1366
+#: src/util/service.c:1347
 #, fuzzy, c-format
 msgid "Service `%s' runs at %s\n"
 msgstr "Par '%s' con credibilidad %8u y dirección '%s'\n"
 
-#: src/util/service.c:1414
+#: src/util/service.c:1393
 msgid "Service process failed to initialize\n"
 msgstr ""
 
-#: src/util/service.c:1418
+#: src/util/service.c:1397
 msgid "Service process could not initialize server function\n"
 msgstr ""
 
-#: src/util/service.c:1422
+#: src/util/service.c:1401
 msgid "Service process failed to report status\n"
 msgstr ""
 
-#: src/util/service.c:1474
+#: src/util/service.c:1453
 msgid "No such user"
 msgstr ""
 
-#: src/util/service.c:1488
+#: src/util/service.c:1466
 #, 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:1551
+#: src/util/service.c:1529
 msgid "do daemonize (detach from terminal)"
 msgstr ""
 
@@ -1087,7 +1076,7 @@
 msgid "Test GNUnet DNS resolver code."
 msgstr ""
 
-#: src/util/os_priority.c:117
+#: src/util/os_priority.c:114
 #, c-format
 msgid "Not installing a handler because $%s=%s\n"
 msgstr ""
@@ -1105,215 +1094,215 @@
 "Debes especificar un número positivo para '%s' en la configuración en la "
 "sección '%s'.\n"
 
-#: src/util/resolver_api.c:356
+#: src/util/resolver_api.c:358
 #, fuzzy, c-format
 msgid "Timeout trying to resolve IP address `%s'.\n"
 msgstr "GNUnet usa ahora la dirección IP %u.%u.%u.%u.\n"
 
-#: src/util/resolver_api.c:360
+#: src/util/resolver_api.c:362
 #, c-format
 msgid "Timeout trying to resolve hostname `%s'.\n"
 msgstr ""
 
-#: src/util/resolver_api.c:428
+#: src/util/resolver_api.c:430
 #, c-format
 msgid "Resolver returns `%s' for IP `%s'.\n"
 msgstr ""
 
-#: src/util/resolver_api.c:793
+#: src/util/resolver_api.c:791
 #, c-format
 msgid "Resolver returns `%s'.\n"
 msgstr ""
 
-#: src/util/resolver_api.c:877
+#: src/util/resolver_api.c:875
 #, c-format
 msgid "Resolving our FQDN `%s'\n"
 msgstr ""
 
-#: src/util/resolver_api.c:882
+#: src/util/resolver_api.c:880
 #, fuzzy, c-format
 msgid "Could not resolve our FQDN : %s\n"
 msgstr "Imposible resolver '%s': %s\n"
 
-#: src/util/resolver_api.c:914
+#: src/util/resolver_api.c:912
 #, c-format
 msgid "Resolving our hostname `%s'\n"
 msgstr ""
 
-#: src/util/pseudonym.c:269
+#: src/util/pseudonym.c:266
 #, fuzzy, c-format
 msgid "Failed to parse metadata about pseudonym from file `%s': %s\n"
 msgstr "Falló al pasar los datos de la interfaz de '%s' de %s:%d.\n"
 
-#: src/util/pseudonym.c:333
+#: src/util/pseudonym.c:330
 #, fuzzy
 msgid "no-name"
 msgstr "Mostrar el nombre"
 
-#: src/util/gnunet-service-resolver.c:262
+#: src/util/gnunet-service-resolver.c:261
 #, fuzzy, c-format
 msgid "Could not resolve `%s' (%s): %s\n"
 msgstr "Imposible resolver '%s': %s\n"
 
-#: src/util/gnunet-service-resolver.c:318
-#: src/util/gnunet-service-resolver.c:363
+#: src/util/gnunet-service-resolver.c:317
+#: src/util/gnunet-service-resolver.c:362
 #, c-format
 msgid "Could not find IP of host `%s': %s\n"
 msgstr "Imposible encontrar la IP del host '%s': %s\n"
 
-#: src/util/gnunet-service-resolver.c:462
+#: src/util/gnunet-service-resolver.c:460
 #, c-format
 msgid "Resolver asked to look up `%s'.\n"
 msgstr ""
 
-#: src/util/gnunet-service-resolver.c:509
+#: src/util/gnunet-service-resolver.c:508
 #, c-format
 msgid "Resolver asked to look up IP address `%s'.\n"
 msgstr ""
 
-#: src/util/bio.c:137 src/util/bio.c:143
+#: src/util/bio.c:136 src/util/bio.c:142
 #, fuzzy, c-format
 msgid "Error reading `%s': %s"
 msgstr "Error creando usuario"
 
-#: src/util/bio.c:144
+#: src/util/bio.c:143
 #, fuzzy
 msgid "End of file"
 msgstr "Cargar un fichero de configuración"
 
-#: src/util/bio.c:196
+#: src/util/bio.c:195
 #, c-format
 msgid "Error reading length of string `%s'"
 msgstr ""
 
-#: src/util/bio.c:208
+#: src/util/bio.c:205
 #, c-format
 msgid "String `%s' longer than allowed (%u > %u)"
 msgstr ""
 
-#: src/util/bio.c:254
+#: src/util/bio.c:250
 #, c-format
 msgid "Serialized metadata `%s' larger than allowed (%u>%u)"
 msgstr ""
 
-#: src/util/bio.c:268
+#: src/util/bio.c:264
 #, c-format
 msgid "Metadata `%s' failed to deserialize"
 msgstr ""
 
-#: src/util/client.c:303
+#: src/util/client.c:301
 #, c-format
 msgid ""
 "Could not determine valid hostname and port for service `%s' from "
 "configuration.\n"
 msgstr ""
 
-#: src/util/client.c:311
+#: src/util/client.c:309
 #, c-format
 msgid "Need a non-empty hostname for service `%s'.\n"
 msgstr ""
 
-#: src/util/client.c:652
+#: src/util/client.c:647
 msgid "Failure to transmit TEST request.\n"
 msgstr ""
 
-#: src/util/client.c:857
+#: src/util/client.c:849
 #, fuzzy, c-format
 msgid "Could not connect to service `%s', must not be running.\n"
 msgstr "Imposible conectar con gnunetd.\n"
 
-#: src/util/client.c:874
+#: src/util/client.c:865
 #, fuzzy, c-format
 msgid "Failure to transmit request to service `%s'\n"
 msgstr "Falló al mandar la petición HTTP al host '%s': %s\n"
 
-#: src/util/client.c:1143
+#: src/util/client.c:1133
 msgid "Could not submit request, not expecting to receive a response.\n"
 msgstr ""
 
-#: src/util/crypto_rsa.c:624 src/util/crypto_rsa.c:672
+#: src/util/crypto_rsa.c:616 src/util/crypto_rsa.c:663
 #, fuzzy, c-format
 msgid "Could not aquire lock on file `%s': %s...\n"
 msgstr "Imposible escribir PID al fichero '%s': %s.\n"
 
-#: src/util/crypto_rsa.c:629
+#: src/util/crypto_rsa.c:621
 #, fuzzy
 msgid "Creating a new private key.  This may take a while.\n"
 msgstr "Creando nueva clave local (esto puede llevar un tiempo).\n"
 
-#: src/util/crypto_rsa.c:648
+#: src/util/crypto_rsa.c:639
 #, c-format
 msgid "I am host `%s'.  Stored new private key in `%s'.\n"
 msgstr ""
 
-#: src/util/crypto_rsa.c:676 src/util/crypto_rsa.c:714
+#: src/util/crypto_rsa.c:667 src/util/crypto_rsa.c:703
 msgid "This may be ok if someone is currently generating a hostkey.\n"
 msgstr ""
 
-#: src/util/crypto_rsa.c:709
+#: src/util/crypto_rsa.c:698
 #, c-format
 msgid ""
 "When trying to read hostkey file `%s' I found %u bytes but I need at least "
 "%u.\n"
 msgstr ""
 
-#: src/util/crypto_rsa.c:730
+#: src/util/crypto_rsa.c:718
 #, fuzzy, c-format
 msgid "File `%s' does not contain a valid private key.  Deleting it.\n"
 msgstr "El fichero '%s' no contiene un pseudónimo.\n"
 
-#: src/util/crypto_rsa.c:748
+#: src/util/crypto_rsa.c:736
 #, fuzzy, c-format
 msgid "I am host `%s'.  Read private key from `%s'.\n"
 msgstr "Llamada a '%s' con la clave '%s'.\n"
 
-#: src/util/crypto_rsa.c:970
+#: src/util/crypto_rsa.c:957
 #, c-format
 msgid "RSA signature verification failed at %s:%d: %s\n"
 msgstr "La verificación de la firma RSA fallo en %s: %d: %s\n"
 
-#: src/nse/gnunet-nse-profiler.c:650 src/dht/gnunet-dht-get.c:213
+#: src/nse/gnunet-nse-profiler.c:646 src/dht/gnunet-dht-get.c:213
 #: src/dht/gnunet-dht-put.c:184 src/fs/gnunet-unindex.c:169
 #: src/fs/gnunet-search.c:297 src/fs/gnunet-publish.c:591
 #: src/fs/gnunet-download.c:263
 msgid "be verbose (print progress information)"
 msgstr ""
 
-#: src/nse/gnunet-nse-profiler.c:668
+#: src/nse/gnunet-nse-profiler.c:664
 #, fuzzy
 msgid "Measure quality and performance of the NSE service."
 msgstr "Imposible acceder al servicio"
 
-#: src/nse/gnunet-service-nse.c:875
+#: src/nse/gnunet-service-nse.c:878
 #, c-format
 msgid "Proof of work invalid: %llu!\n"
 msgstr ""
 
-#: src/nse/gnunet-service-nse.c:1298 src/nse/gnunet-service-nse.c:1317
-#: src/nse/gnunet-service-nse.c:1338
+#: src/nse/gnunet-service-nse.c:1301 src/nse/gnunet-service-nse.c:1320
+#: src/nse/gnunet-service-nse.c:1341
 msgid "NSE service is lacking key configuration settings.  Exiting.\n"
 msgstr ""
 
-#: src/nse/gnunet-service-nse.c:1305
+#: src/nse/gnunet-service-nse.c:1308
 #, fuzzy
 msgid "Invalid work requirement for NSE service. Exiting.\n"
 msgstr "Argumentos no válidos. Saliendo.\n"
 
-#: src/nse/gnunet-service-nse.c:1326
+#: src/nse/gnunet-service-nse.c:1329
 #, fuzzy
 msgid "NSE service could not access hostkey.  Exiting.\n"
 msgstr "Imposible acceder a la información del espacio.\n"
 
-#: src/peerinfo/gnunet-service-peerinfo.c:136
+#: src/peerinfo/gnunet-service-peerinfo.c:134
 #, fuzzy, c-format
 msgid "Removing expired address of transport `%s'\n"
 msgstr "Transporte(s) disponible(s): %s\n"
 
-#: src/peerinfo/gnunet-service-peerinfo.c:197
+#: src/peerinfo/gnunet-service-peerinfo.c:196
 msgid "# peers known"
 msgstr ""
 
-#: src/peerinfo/gnunet-service-peerinfo.c:241
+#: src/peerinfo/gnunet-service-peerinfo.c:240
 #, c-format
 msgid ""
 "File `%s' in directory `%s' does not match naming convention. Removed.\n"
@@ -1321,7 +1310,7 @@
 "El fichero '%s' en el directorio '%s' no sigue la convención de nombres. "
 "Eliminando.\n"
 
-#: src/peerinfo/gnunet-service-peerinfo.c:306
+#: src/peerinfo/gnunet-service-peerinfo.c:305
 #, fuzzy, c-format
 msgid "Still no peers found in `%s'!\n"
 msgstr "¡Imposible descargar adecuadamente el servicio '%s'!\n"
@@ -1331,50 +1320,50 @@
 msgid "Could not connect to `%s' service.\n"
 msgstr "Imposible conectar con gnunetd.\n"
 
-#: src/peerinfo/peerinfo_api.c:278
+#: src/peerinfo/peerinfo_api.c:279
 #, fuzzy, c-format
 msgid "Failed to transmit message to `%s' service.\n"
 msgstr "Falló al inicializar el servicio '%s'.\n"
 
-#: src/peerinfo/peerinfo_api.c:433
+#: src/peerinfo/peerinfo_api.c:435
 #, fuzzy
 msgid "Failed to receive response from `PEERINFO' service."
 msgstr "Falló al recibir la respuesta al mensaje '%s' de gnunetd\n"
 
-#: src/peerinfo/peerinfo_api.c:461 src/peerinfo/peerinfo_api.c:479
+#: src/peerinfo/peerinfo_api.c:463 src/peerinfo/peerinfo_api.c:481
 #, fuzzy
 msgid "Received invalid message from `PEERINFO' service.\n"
 msgstr "Recibido mensaje UDP6 inválido de %s:%d, omitiendo.\n"
 
-#: src/peerinfo/peerinfo_api.c:521
+#: src/peerinfo/peerinfo_api.c:523
 #, fuzzy
 msgid "Failed to transmit iteration request to `PEERINFO' service\n"
 msgstr "Falló al inicializar el servicio '%s'.\n"
 
-#: src/peerinfo/peerinfo_api.c:555
+#: src/peerinfo/peerinfo_api.c:557
 msgid "Timeout transmitting iteration request to `PEERINFO' service.\n"
 msgstr ""
 
-#: src/datacache/plugin_datacache_sqlite.c:439
+#: src/datacache/plugin_datacache_sqlite.c:424
 msgid "Sqlite datacache running\n"
 msgstr ""
 
-#: src/datacache/datacache.c:177
+#: src/datacache/datacache.c:176
 #, c-format
 msgid "Loading `%s' datacache plugin\n"
 msgstr ""
 
-#: src/datacache/datacache.c:185
+#: src/datacache/datacache.c:184
 #, fuzzy, c-format
 msgid "Failed to load datacache plugin for `%s'\n"
 msgstr "Falló al actualizar los datos del módulo '%s'\n"
 
-#: src/datacache/datacache.c:276
+#: src/datacache/datacache.c:274
 #, fuzzy
 msgid "# requests received"
 msgstr "# mensajes PONG encriptados recibidos"
 
-#: src/datacache/datacache.c:287
+#: src/datacache/datacache.c:284
 msgid "# requests filtered by bloom filter"
 msgstr ""
 
@@ -1404,91 +1393,91 @@
 msgid "# FIND PEER messages initiated"
 msgstr "# mensajes fragmentados"
 
-#: src/dht/gnunet-service-dht_neighbours.c:632
-#: src/dht/gnunet-service-dht_neighbours.c:697
+#: src/dht/gnunet-service-dht_neighbours.c:627
+#: src/dht/gnunet-service-dht_neighbours.c:687
 #, fuzzy
 msgid "# Peers connected"
 msgstr "# de pares conectados"
 
-#: src/dht/gnunet-service-dht_neighbours.c:734
+#: src/dht/gnunet-service-dht_neighbours.c:721
 #, fuzzy
 msgid "# Queued messages discarded (peer disconnected)"
 msgstr "# mensajes defragmentados"
 
-#: src/dht/gnunet-service-dht_neighbours.c:787
+#: src/dht/gnunet-service-dht_neighbours.c:776
 #, fuzzy
 msgid "# Bytes transmitted to other peers"
 msgstr "# bytes recibidos por TCP"
 
-#: src/dht/gnunet-service-dht_neighbours.c:824
+#: src/dht/gnunet-service-dht_neighbours.c:814
 #, fuzzy
 msgid "# Bytes of bandwdith requested from core"
 msgstr "# mensajes PONG encriptados recibidos"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1051
-#: src/dht/gnunet-service-dht_neighbours.c:1078
+#: src/dht/gnunet-service-dht_neighbours.c:1038
+#: src/dht/gnunet-service-dht_neighbours.c:1066
 msgid "# Peers excluded from routing due to Bloomfilter"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1060
-#: src/dht/gnunet-service-dht_neighbours.c:1096
+#: src/dht/gnunet-service-dht_neighbours.c:1047
+#: src/dht/gnunet-service-dht_neighbours.c:1083
 #, fuzzy
 msgid "# Peer selection failed"
 msgstr "Conexión fallida\n"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1238
+#: src/dht/gnunet-service-dht_neighbours.c:1219
 #, fuzzy
 msgid "# PUT requests routed"
 msgstr "# mensajes PONG encriptados recibidos"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1267
+#: src/dht/gnunet-service-dht_neighbours.c:1250
 #, fuzzy
 msgid "# PUT messages queued for transmission"
 msgstr "# bytes de mensajes salientes omitidos"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1352
+#: src/dht/gnunet-service-dht_neighbours.c:1331
 #, fuzzy
 msgid "# GET requests routed"
 msgstr "# mensajes PONG encriptados recibidos"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1384
+#: src/dht/gnunet-service-dht_neighbours.c:1362
 #, fuzzy
 msgid "# GET messages queued for transmission"
 msgstr "# bytes de mensajes salientes omitidos"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1485
+#: src/dht/gnunet-service-dht_neighbours.c:1465
 msgid "# RESULT messages queued for transmission"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1574
+#: src/dht/gnunet-service-dht_neighbours.c:1553
 #, fuzzy
 msgid "# P2P PUT requests received"
 msgstr "# mensajes PONG encriptados recibidos"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1700
+#: src/dht/gnunet-service-dht_neighbours.c:1662
 msgid "# FIND PEER requests ignored due to Bloomfilter"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1707
+#: src/dht/gnunet-service-dht_neighbours.c:1670
 msgid "# FIND PEER requests ignored due to lack of HELLO"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1800
+#: src/dht/gnunet-service-dht_neighbours.c:1761
 #, fuzzy
 msgid "# P2P GET requests received"
 msgstr "# mensajes PONG encriptados recibidos"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1853
+#: src/dht/gnunet-service-dht_neighbours.c:1805
 #, fuzzy
 msgid "# P2P FIND PEER requests processed"
 msgstr "# mensajes PONG encriptados recibidos"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1872
+#: src/dht/gnunet-service-dht_neighbours.c:1819
 #, fuzzy
 msgid "# P2P GET requests ONLY routed"
 msgstr "# mensajes PONG encriptados recibidos"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1941
+#: src/dht/gnunet-service-dht_neighbours.c:1885
 #, fuzzy
 msgid "# P2P RESULTS received"
 msgstr "# bytes recibidos por TCP"
@@ -1498,7 +1487,7 @@
 msgid "Failed to connect to the DHT service!\n"
 msgstr "Fallo al conectar a gnunetd.\n"
 
-#: src/dht/gnunet-service-dht.c:165
+#: src/dht/gnunet-service-dht.c:163
 #, fuzzy
 msgid "Failed to connect to transport service!\n"
 msgstr "Fallo al conectar a gnunetd.\n"
@@ -1523,50 +1512,50 @@
 msgid "Issue a GET request to the GNUnet DHT, prints results."
 msgstr ""
 
-#: src/dht/gnunet-service-dht_clients.c:321
+#: src/dht/gnunet-service-dht_clients.c:311
 #, fuzzy
 msgid "# GET requests from clients injected"
 msgstr "# mensajes PONG encriptados recibidos"
 
-#: src/dht/gnunet-service-dht_clients.c:413
+#: src/dht/gnunet-service-dht_clients.c:402
 #, fuzzy
 msgid "# PUT requests received from clients"
 msgstr "El mensaje recibido del cliente es inválido\n"
 
-#: src/dht/gnunet-service-dht_clients.c:486
+#: src/dht/gnunet-service-dht_clients.c:469
 #, fuzzy
 msgid "# GET requests received from clients"
 msgstr "El mensaje recibido del cliente es inválido\n"
 
-#: src/dht/gnunet-service-dht_clients.c:585
+#: src/dht/gnunet-service-dht_clients.c:564
 #, fuzzy
 msgid "# GET STOP requests received from clients"
 msgstr "El mensaje recibido del cliente es inválido\n"
 
-#: src/dht/gnunet-service-dht_clients.c:790
+#: src/dht/gnunet-service-dht_clients.c:757
 msgid "# Key match, type mismatches in REPLY to CLIENT"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_clients.c:808
+#: src/dht/gnunet-service-dht_clients.c:772
 msgid "# Duplicate REPLIES to CLIENT request dropped"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_clients.c:852
+#: src/dht/gnunet-service-dht_clients.c:809
 #, fuzzy, c-format
 msgid "Unsupported block type (%u) in request!\n"
 msgstr "Mensaje no válido del tipo %u recibido.  Omitiendo.\n"
 
-#: src/dht/gnunet-service-dht_clients.c:875
+#: src/dht/gnunet-service-dht_clients.c:831
 #, fuzzy
 msgid "# RESULTS queued for clients"
 msgstr "El mensaje recibido del cliente es inválido\n"
 
-#: src/dht/gnunet-service-dht_clients.c:928
-#: src/dht/gnunet-service-dht_clients.c:971
+#: src/dht/gnunet-service-dht_clients.c:882
+#: src/dht/gnunet-service-dht_clients.c:925
 msgid "# REPLIES ignored for CLIENTS (no match)"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_clients.c:937
+#: src/dht/gnunet-service-dht_clients.c:892
 #, fuzzy
 msgid "Could not pass reply to client, message too big!\n"
 msgstr "Imposible mandar el mensaje a gnunetd\n"
@@ -1621,32 +1610,32 @@
 msgid "Issue a PUT request to the GNUnet DHT insert DATA under KEY."
 msgstr ""
 
-#: src/dht/gnunet-service-dht_routing.c:220
+#: src/dht/gnunet-service-dht_routing.c:211
 msgid "# Good REPLIES matched against routing table"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_routing.c:235
+#: src/dht/gnunet-service-dht_routing.c:220
 msgid "# Duplicate REPLIES matched against routing table"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_routing.c:240
+#: src/dht/gnunet-service-dht_routing.c:226
 msgid "# Invalid REPLIES matched against routing table"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_routing.c:249
+#: src/dht/gnunet-service-dht_routing.c:236
 msgid "# Unsupported REPLIES matched against routing table"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_routing.c:332
-#: src/dht/gnunet-service-dht_routing.c:390
+#: src/dht/gnunet-service-dht_routing.c:314
+#: src/dht/gnunet-service-dht_routing.c:368
 msgid "# Entries removed from routing table"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_routing.c:342
+#: src/dht/gnunet-service-dht_routing.c:324
 msgid "# Entries added to routing table"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_datacache.c:92
+#: src/dht/gnunet-service-dht_datacache.c:93
 #, fuzzy, c-format
 msgid "%s request received, but have no datacache!\n"
 msgstr "# bytes recibidos por TCP"
@@ -1655,33 +1644,33 @@
 msgid "# ITEMS stored in datacache"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_datacache.c:215
+#: src/dht/gnunet-service-dht_datacache.c:209
 msgid "# Good RESULTS found in datacache"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_datacache.c:229
+#: src/dht/gnunet-service-dht_datacache.c:220
 msgid "# Duplicate RESULTS found in datacache"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_datacache.c:234
+#: src/dht/gnunet-service-dht_datacache.c:226
 msgid "# Invalid RESULTS found in datacache"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_datacache.c:245
+#: src/dht/gnunet-service-dht_datacache.c:238
 msgid "# Unsupported RESULTS found in datacache"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_datacache.c:248
+#: src/dht/gnunet-service-dht_datacache.c:241
 #, c-format
 msgid "Unsupported block type (%u) in local response!\n"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_datacache.c:280
+#: src/dht/gnunet-service-dht_datacache.c:271
 #, fuzzy
 msgid "# GET requests given to datacache"
 msgstr "# mensajes PONG encriptados recibidos"
 
-#: src/dht/gnunet-service-dht_hello.c:86
+#: src/dht/gnunet-service-dht_hello.c:82
 #, fuzzy
 msgid "# HELLOs obtained from peerinfo"
 msgstr "El mensaje recibido del cliente es inválido\n"
@@ -1986,34 +1975,34 @@
 msgid "# messages defragmented"
 msgstr "# mensajes defragmentados"
 
-#: src/fragmentation/fragmentation.c:183
+#: src/fragmentation/fragmentation.c:188
 #, fuzzy
 msgid "# fragments transmitted"
 msgstr "# Auto-anuncios transmitidos"
 
-#: src/fragmentation/fragmentation.c:186
+#: src/fragmentation/fragmentation.c:191
 #, fuzzy
 msgid "# fragments retransmitted"
 msgstr "# Auto-anuncios transmitidos"
 
-#: src/fragmentation/fragmentation.c:248
+#: src/fragmentation/fragmentation.c:254
 msgid "# messages fragmented"
 msgstr "# mensajes fragmentados"
 
-#: src/fragmentation/fragmentation.c:251
+#: src/fragmentation/fragmentation.c:257
 msgid "# total size of fragmented messages"
 msgstr ""
 
-#: src/fragmentation/fragmentation.c:335
+#: src/fragmentation/fragmentation.c:342
 #, fuzzy
 msgid "# fragment acknowledgements received"
 msgstr "# Anuncios de los pares recibidos"
 
-#: src/fragmentation/fragmentation.c:341
+#: src/fragmentation/fragmentation.c:348
 msgid "# bits removed from fragmentation ACKs"
 msgstr ""
 
-#: src/fragmentation/fragmentation.c:365
+#: src/fragmentation/fragmentation.c:372
 #, fuzzy
 msgid "# fragmentation transmissions completed"
 msgstr "# mensajes de texto mandados por PING"
@@ -2028,7 +2017,7 @@
 msgid "Wrote %llu bytes of statistics to `%s'\n"
 msgstr "Descarga los ficheros de GNUnet"
 
-#: src/statistics/statistics_api.c:325
+#: src/statistics/statistics_api.c:327
 #, fuzzy
 msgid "Failed to connect to statistics service!\n"
 msgstr "Fallo al conectar a gnunetd.\n"
@@ -2169,54 +2158,54 @@
 msgid "Manage GNUnet pseudonyms."
 msgstr ""
 
-#: src/fs/fs_namespace.c:52 src/fs/fs_namespace.c:78
+#: src/fs/fs_namespace.c:64 src/fs/fs_namespace.c:90
 #, fuzzy, c-format
 msgid "Configuration fails to specify `%s' in section `%s'\n"
 msgstr ""
 "El fichero de configuración debe especificar el directorio para almacenar "
 "los datos FS en la sección '%s' bajo '%s'.\n"
 
-#: src/fs/fs_namespace.c:107
+#: src/fs/fs_namespace.c:119
 #, fuzzy, c-format
 msgid "Failed to open `%s' for writing: %s\n"
 msgstr "Fichero almacenado en '%s'.\n"
 
-#: src/fs/fs_namespace.c:129 src/fs/fs_namespace.c:217
+#: src/fs/fs_namespace.c:141 src/fs/fs_namespace.c:229
 #, fuzzy, c-format
 msgid "Failed to write `%s': %s\n"
 msgstr "Fallo al conectar a gnunetd.\n"
 
-#: src/fs/fs_namespace.c:323
+#: src/fs/fs_namespace.c:335
 #, fuzzy
 msgid "Unknown error"
 msgstr "Error desconocido"
 
-#: src/fs/fs_namespace.c:412 src/fs/fs_namespace.c:433
+#: src/fs/fs_namespace.c:424 src/fs/fs_namespace.c:445
 #, fuzzy
 msgid "Failed to serialize meta data"
 msgstr "Imposible inicializar SQLite.\n"
 
-#: src/fs/fs_namespace.c:452
+#: src/fs/fs_namespace.c:464
 #, fuzzy
 msgid "Failed to connect to datastore service"
 msgstr "Fallo al conectar a gnunetd.\n"
 
-#: src/fs/fs_namespace.c:495
+#: src/fs/fs_namespace.c:507
 #, fuzzy, c-format
 msgid "Failed to create or read private key for namespace `%s'\n"
 msgstr "Falló al actualizar los datos del módulo '%s'\n"
 
-#: src/fs/fs_namespace.c:597
+#: src/fs/fs_namespace.c:609
 #, fuzzy, c-format
 msgid "Failed to read namespace private key file `%s', deleting it!\n"
 msgstr "Fallo al añadir la entrada al espacio '%s' (¿existe?)\n"
 
-#: src/fs/fs_namespace.c:822 src/fs/fs_publish.c:1518
+#: src/fs/fs_namespace.c:834 src/fs/fs_publish.c:1523
 #, fuzzy
 msgid "Internal error."
 msgstr "Error desconocido.\n"
 
-#: src/fs/fs_namespace.c:866
+#: src/fs/fs_namespace.c:878
 #, fuzzy
 msgid "Failed to connect to datastore."
 msgstr "Fallo al conectarse a gnunetd"
@@ -2330,11 +2319,11 @@
 msgid "Could not access hostkey file `%s'.\n"
 msgstr "Imposible pasar el fichero de configuración '%s'.\n"
 
-#: src/fs/fs_uri.c:1238 src/fs/fs_uri.c:1265
+#: src/fs/fs_uri.c:1232 src/fs/fs_uri.c:1259
 msgid "No keywords specified!\n"
 msgstr "¡Ninguna clave especificada!\n"
 
-#: src/fs/fs_uri.c:1271
+#: src/fs/fs_uri.c:1265
 msgid "Number of double-quotes not balanced!\n"
 msgstr ""
 
@@ -2394,7 +2383,7 @@
 msgstr "La opción '%s' no tiene sentido sin la opción '%s'.\n"
 
 #: src/fs/gnunet-publish.c:393 src/fs/gnunet-publish.c:400
-#: src/transport/gnunet-transport.c:525
+#: src/transport/gnunet-transport.c:477
 #, 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"
@@ -2497,13 +2486,13 @@
 msgid "Publish a file or directory on GNUnet"
 msgstr ""
 
-#: src/fs/fs_search.c:798
+#: src/fs/fs_search.c:803
 #, c-format
 msgid "Got result with unknown block type `%d', ignoring"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_lc.c:202 src/fs/gnunet-service-fs_lc.c:359
-#: src/fs/gnunet-service-fs_lc.c:480
+#: src/fs/gnunet-service-fs_lc.c:202 src/fs/gnunet-service-fs_lc.c:365
+#: src/fs/gnunet-service-fs_lc.c:490
 #, fuzzy
 msgid "# client searches active"
 msgstr "# mensajes PONG encriptados recibidos"
@@ -2513,12 +2502,12 @@
 msgid "# replies received for local clients"
 msgstr "El mensaje recibido del cliente es inválido\n"
 
-#: src/fs/gnunet-service-fs_lc.c:312
+#: src/fs/gnunet-service-fs_lc.c:319
 #, fuzzy
 msgid "# client searches received"
 msgstr "# mensajes PONG encriptados recibidos"
 
-#: src/fs/gnunet-service-fs_lc.c:351
+#: src/fs/gnunet-service-fs_lc.c:359
 msgid "# client searches updated (merged content seen list)"
 msgstr ""
 
@@ -2562,243 +2551,245 @@
 msgid "Display contents of a GNUnet directory"
 msgstr "Error en el formato del fichero (¿no es un directorio de GNUnet?)\n"
 
-#: src/fs/gnunet-service-fs_pr.c:272
+#: src/fs/gnunet-service-fs_pr.c:287
 #, fuzzy
 msgid "# Pending requests created"
 msgstr "# mensajes PONG encriptados recibidos"
 
-#: src/fs/gnunet-service-fs_pr.c:352 src/fs/gnunet-service-fs_pr.c:607
+#: src/fs/gnunet-service-fs_pr.c:368 src/fs/gnunet-service-fs_pr.c:622
 #, fuzzy
 msgid "# Pending requests active"
 msgstr "# mensajes PONG encriptados recibidos"
 
-#: src/fs/gnunet-service-fs_pr.c:771
+#: src/fs/gnunet-service-fs_pr.c:786
 #, fuzzy
 msgid "# replies received and matched"
 msgstr "# bytes recibidos por TCP"
 
-#: src/fs/gnunet-service-fs_pr.c:798
+#: src/fs/gnunet-service-fs_pr.c:813
 msgid "# duplicate replies discarded (bloomfilter)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:814
+#: src/fs/gnunet-service-fs_pr.c:829
 #, c-format
 msgid "Unsupported block type %u\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:829
+#: src/fs/gnunet-service-fs_pr.c:844
 msgid "# results found locally"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:921
+#: src/fs/gnunet-service-fs_pr.c:936
 msgid "# Datastore `PUT' failures"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:948
+#: src/fs/gnunet-service-fs_pr.c:963
 #, fuzzy
 msgid "# storage requests dropped due to high load"
 msgstr "# Anuncios de los pares recibidos"
 
-#: src/fs/gnunet-service-fs_pr.c:983
+#: src/fs/gnunet-service-fs_pr.c:998
 #, fuzzy
 msgid "# Replies received from DHT"
 msgstr "# bytes recibidos vía HTTP"
 
-#: src/fs/gnunet-service-fs_pr.c:1074
+#: src/fs/gnunet-service-fs_pr.c:1088
 #, c-format
 msgid "Datastore lookup already took %llu ms!\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1095
+#: src/fs/gnunet-service-fs_pr.c:1109
 #, c-format
 msgid "On-demand lookup already took %llu ms!\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1142
+#: src/fs/gnunet-service-fs_pr.c:1156
 msgid "# Datastore lookups concluded (no results)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1156
+#: src/fs/gnunet-service-fs_pr.c:1170
 msgid "# Datastore lookups concluded (seen all)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1165
+#: src/fs/gnunet-service-fs_pr.c:1179
 msgid "# Datastore lookups aborted (more than MAX_RESULTS)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1181
+#: src/fs/gnunet-service-fs_pr.c:1195
 msgid "# requested DBLOCK or IBLOCK not found"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1198
+#: src/fs/gnunet-service-fs_pr.c:1212
 msgid "# on-demand blocks matched requests"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1211
+#: src/fs/gnunet-service-fs_pr.c:1225
 msgid "# on-demand lookups performed successfully"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1216
+#: src/fs/gnunet-service-fs_pr.c:1230
 msgid "# on-demand lookups failed"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1242 src/fs/gnunet-service-fs_pr.c:1281
-#: src/fs/gnunet-service-fs_pr.c:1416
+#: src/fs/gnunet-service-fs_pr.c:1257 src/fs/gnunet-service-fs_pr.c:1297
+#: src/fs/gnunet-service-fs_pr.c:1437
 msgid "# Datastore lookups concluded (error queueing)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1299
+#: src/fs/gnunet-service-fs_pr.c:1315
 msgid "# Datastore lookups concluded (found last result)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1312
+#: src/fs/gnunet-service-fs_pr.c:1328
 msgid "# Datastore lookups concluded (load too high)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1394
+#: src/fs/gnunet-service-fs_pr.c:1414
 msgid "# Datastore lookups initiated"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1474
+#: src/fs/gnunet-service-fs_pr.c:1495
 #, fuzzy
 msgid "# GAP PUT messages received"
 msgstr "# mensajes PONG encriptados recibidos"
 
-#: src/fs/gnunet-service-fs_pr.c:1565 src/fs/gnunet-service-fs_pr.c:1576
+#: src/fs/gnunet-service-fs_pr.c:1586 src/fs/gnunet-service-fs_pr.c:1595
 #, fuzzy, c-format
 msgid "Configuration fails to specify `%s', assuming default value."
 msgstr "Fichero de configuración '%s' creado.\n"
 
-#: src/fs/gnunet-service-fs_pe.c:259
+#: src/fs/gnunet-service-fs_pe.c:265
 msgid "# average retransmission delay (ms)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pe.c:354
+#: src/fs/gnunet-service-fs_pe.c:392
 msgid "# transmission failed (core has no bandwidth)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pe.c:385
+#: src/fs/gnunet-service-fs_pe.c:423
 #, fuzzy
 msgid "# query messages sent to other peers"
 msgstr "# bytes de mensajes salientes omitidos"
 
-#: src/fs/gnunet-service-fs_pe.c:440
+#: src/fs/gnunet-service-fs_pe.c:476
 msgid "# delay heap timeout"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pe.c:450
+#: src/fs/gnunet-service-fs_pe.c:483
 #, fuzzy
 msgid "# query plans executed"
 msgstr "# mensajes PONG encriptados recibidos"
 
-#: src/fs/gnunet-service-fs_pe.c:516
+#: src/fs/gnunet-service-fs_pe.c:547
 #, fuzzy
 msgid "# requests merged"
 msgstr "# mensajes PONG encriptados recibidos"
 
-#: src/fs/gnunet-service-fs_pe.c:522
+#: src/fs/gnunet-service-fs_pe.c:553
 #, fuzzy
 msgid "# requests refreshed"
 msgstr "# mensajes PONG encriptados recibidos"
 
-#: src/fs/gnunet-service-fs_pe.c:576 src/fs/gnunet-service-fs_pe.c:665
-#: src/fs/gnunet-service-fs_pe.c:706
+#: src/fs/gnunet-service-fs_pe.c:606 src/fs/gnunet-service-fs_pe.c:692
+#: src/fs/gnunet-service-fs_pe.c:734
 msgid "# query plan entries"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:618 src/fs/gnunet-service-fs_cp.c:1552
-#: src/transport/gnunet-service-transport_neighbours.c:870
-#: src/transport/gnunet-service-transport_neighbours.c:2036
-#: src/transport/gnunet-service-transport_neighbours.c:2123
-#: src/topology/gnunet-daemon-topology.c:653
-#: src/topology/gnunet-daemon-topology.c:755
+#: src/fs/gnunet-service-fs_cp.c:615 src/fs/gnunet-service-fs_cp.c:1543
+#: src/transport/gnunet-service-transport_neighbours.c:938
+#: src/transport/gnunet-service-transport_neighbours.c:943
+#: src/transport/gnunet-service-transport_neighbours.c:1266
+#: src/transport/gnunet-service-transport_neighbours.c:2352
+#: src/transport/gnunet-service-transport_neighbours.c:2423
+#: src/topology/gnunet-daemon-topology.c:654
+#: src/topology/gnunet-daemon-topology.c:756
 #, fuzzy
 msgid "# peers connected"
 msgstr "# de pares conectados"
 
-#: src/fs/gnunet-service-fs_cp.c:701
+#: src/fs/gnunet-service-fs_cp.c:696
 #, fuzzy
 msgid "# migration stop messages received"
 msgstr "# mensajes PONG encriptados recibidos"
 
-#: src/fs/gnunet-service-fs_cp.c:705
+#: src/fs/gnunet-service-fs_cp.c:700
 #, c-format
 msgid "Migration of content to peer `%s' blocked for %llu ms\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:740
+#: src/fs/gnunet-service-fs_cp.c:735
 msgid "# replies transmitted to other peers"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:746
+#: src/fs/gnunet-service-fs_cp.c:741
 msgid "# replies dropped"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:775 src/fs/gnunet-service-fs_cp.c:891
-#: src/fs/gnunet-service-fs_cp.c:1301 src/fs/gnunet-service-fs_cp.c:1340
+#: src/fs/gnunet-service-fs_cp.c:770 src/fs/gnunet-service-fs_cp.c:886
+#: src/fs/gnunet-service-fs_cp.c:1296 src/fs/gnunet-service-fs_cp.c:1333
 msgid "# P2P searches active"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:848
+#: src/fs/gnunet-service-fs_cp.c:843
 msgid "# artificial delays introduced (ms)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:911
+#: src/fs/gnunet-service-fs_cp.c:906
 msgid "# replies received for other peers"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:925
+#: src/fs/gnunet-service-fs_cp.c:920
 msgid "# replies dropped due to insufficient cover traffic"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:963
+#: src/fs/gnunet-service-fs_cp.c:958
 msgid "# P2P searches destroyed due to ultimate reply"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1030
+#: src/fs/gnunet-service-fs_cp.c:1025
 #, fuzzy
 msgid "# requests done for free (low load)"
 msgstr "# Anuncios de los pares recibidos"
 
-#: src/fs/gnunet-service-fs_cp.c:1054
+#: src/fs/gnunet-service-fs_cp.c:1049
 msgid "# request dropped, priority insufficient"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1064
+#: src/fs/gnunet-service-fs_cp.c:1059
 #, fuzzy
 msgid "# requests done for a price (normal load)"
 msgstr "# Anuncios de los pares recibidos"
 
-#: src/fs/gnunet-service-fs_cp.c:1143
+#: src/fs/gnunet-service-fs_cp.c:1138
 msgid "# GET requests received (from other peers)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1177
+#: src/fs/gnunet-service-fs_cp.c:1172
 #, fuzzy
 msgid "# requests dropped due to initiator not being connected"
 msgstr "# Anuncios de los pares recibidos"
 
-#: src/fs/gnunet-service-fs_cp.c:1201
+#: src/fs/gnunet-service-fs_cp.c:1196
 #, fuzzy
 msgid "# requests dropped due to missing reverse route"
 msgstr "# Anuncios de los pares recibidos"
 
-#: src/fs/gnunet-service-fs_cp.c:1267
+#: src/fs/gnunet-service-fs_cp.c:1262
 #, fuzzy
 msgid "# requests dropped due TTL underflow"
 msgstr "# Anuncios de los pares recibidos"
 
-#: src/fs/gnunet-service-fs_cp.c:1295
+#: src/fs/gnunet-service-fs_cp.c:1290
 #, fuzzy
 msgid "# requests dropped due to higher-TTL request"
 msgstr "# Anuncios de los pares recibidos"
 
-#: src/fs/gnunet-service-fs_cp.c:1338
+#: src/fs/gnunet-service-fs_cp.c:1331
 #, fuzzy
 msgid "# P2P query messages received and processed"
 msgstr "# mensajes PONG encriptados recibidos"
 
-#: src/fs/gnunet-service-fs_push.c:642
+#: src/fs/gnunet-service-fs_push.c:653
 #, c-format
 msgid ""
 "Invalid value specified for option `%s' in section `%s', content pushing "
@@ -2839,17 +2830,21 @@
 msgid "Failed to delete bogus block: %s\n"
 msgstr "Fichero almacenado en '%s'.\n"
 
-#: src/fs/gnunet-service-fs_indexing.c:552
+#: src/fs/gnunet-service-fs_indexing.c:545
+msgid "# index blocks removed: original file inaccessible"
+msgstr ""
+
+#: src/fs/gnunet-service-fs_indexing.c:560
 #, fuzzy, c-format
 msgid "Could not access indexed file `%s' (%s) at offset %llu: %s\n"
 msgstr "Imposible resolver '%s': %s\n"
 
-#: src/fs/gnunet-service-fs_indexing.c:554
+#: src/fs/gnunet-service-fs_indexing.c:562
 #, fuzzy
 msgid "not indexed"
 msgstr "El desindexado falló"
 
-#: src/fs/gnunet-service-fs_indexing.c:569
+#: src/fs/gnunet-service-fs_indexing.c:577
 #, fuzzy, c-format
 msgid "Indexed file `%s' changed at offset %llu\n"
 msgstr "La indexación de los datos falló en la posición %i.\n"
@@ -2981,148 +2976,148 @@
 "Tipo de metadatos desconocido en la opción de metadatos '%s'.  Usando el "
 "tipo de metadatos 'desconocido' en su lugar.\n"
 
-#: src/fs/fs_publish.c:142 src/fs/fs_publish.c:410
+#: src/fs/fs_publish.c:147 src/fs/fs_publish.c:415
 #, fuzzy, c-format
 msgid "Publishing failed: %s"
 msgstr ""
 "\n"
 "Error subiendo el fichero %s\n"
 
-#: src/fs/fs_publish.c:647 src/fs/fs_publish.c:664 src/fs/fs_publish.c:703
-#: src/fs/fs_publish.c:723 src/fs/fs_publish.c:750 src/fs/fs_publish.c:898
+#: src/fs/fs_publish.c:652 src/fs/fs_publish.c:669 src/fs/fs_publish.c:708
+#: src/fs/fs_publish.c:728 src/fs/fs_publish.c:755 src/fs/fs_publish.c:903
 #, fuzzy, c-format
 msgid "Can not index file `%s': %s.  Will try to insert instead.\n"
 msgstr "Indexación del fichero '%s' fallida. Intentando insertar fichero...\n"
 
-#: src/fs/fs_publish.c:649
+#: src/fs/fs_publish.c:654
 msgid "timeout on index-start request to `fs' service"
 msgstr ""
 
-#: src/fs/fs_publish.c:661
+#: src/fs/fs_publish.c:666
 #, fuzzy
 msgid "unknown error"
 msgstr "Error desconocido"
 
-#: src/fs/fs_publish.c:704
+#: src/fs/fs_publish.c:709
 msgid "failed to compute hash"
 msgstr ""
 
-#: src/fs/fs_publish.c:724
+#: src/fs/fs_publish.c:729
 msgid "filename too long"
 msgstr ""
 
-#: src/fs/fs_publish.c:751
+#: src/fs/fs_publish.c:756
 #, fuzzy
 msgid "could not connect to `fs' service"
 msgstr "Imposible conectar con gnunetd.\n"
 
-#: src/fs/fs_publish.c:775
+#: src/fs/fs_publish.c:780
 #, fuzzy, c-format
 msgid "Failed to get file identifiers for `%s'\n"
 msgstr "Falló al actualizar los datos del módulo '%s'\n"
 
-#: src/fs/fs_publish.c:845
+#: src/fs/fs_publish.c:850
 #, fuzzy, c-format
 msgid "Recursive upload failed at `%s': %s"
 msgstr "'%s' falló en %s: %d con error: '%s'.\n"
 
-#: src/fs/fs_publish.c:851
+#: src/fs/fs_publish.c:856
 #, fuzzy, c-format
 msgid "Recursive upload failed: %s"
 msgstr ""
 "\n"
 "Error subiendo el fichero %s\n"
 
-#: src/fs/fs_publish.c:899
+#: src/fs/fs_publish.c:904
 #, fuzzy
 msgid "needs to be an actual file"
 msgstr "'%s' no es un fichero regular.\n"
 
-#: src/fs/fs_publish.c:1078
+#: src/fs/fs_publish.c:1083
 #, c-format
 msgid "Insufficient space for publishing: %s"
 msgstr ""
 
-#: src/fs/fs_publish.c:1149
+#: src/fs/fs_publish.c:1154
 #, c-format
 msgid "Reserving space for %u entries and %llu bytes for publication\n"
 msgstr ""
 
-#: src/fs/fs_publish.c:1482
+#: src/fs/fs_publish.c:1487
 #, fuzzy
 msgid "Could not connect to datastore."
 msgstr "Imposible conectar con gnunetd.\n"
 
-#: src/fs/fs.c:284
+#: src/fs/fs_api.c:284
 #, fuzzy, c-format
 msgid "Could not open file `%s': %s"
 msgstr "Fichero almacenado en '%s'.\n"
 
-#: src/fs/fs.c:293
+#: src/fs/fs_api.c:293
 #, fuzzy, c-format
 msgid "Could not read file `%s': %s"
 msgstr "Fichero almacenado en '%s'.\n"
 
-#: src/fs/fs.c:299
+#: src/fs/fs_api.c:299
 #, c-format
 msgid "Short read reading from file `%s'!"
 msgstr ""
 
-#: src/fs/fs.c:877
+#: src/fs/fs_api.c:877
 #, fuzzy, c-format
 msgid "Failed to resume publishing information `%s': %s\n"
 msgstr "Fichero almacenado en '%s'.\n"
 
-#: src/fs/fs.c:1323
+#: src/fs/fs_api.c:1323
 #, c-format
 msgid "Failed to recover namespace `%s', cannot resume publishing operation.\n"
 msgstr ""
 
-#: src/fs/fs.c:1364
+#: src/fs/fs_api.c:1364
 #, c-format
 msgid "Failure while resuming publishing operation `%s': %s\n"
 msgstr ""
 
-#: src/fs/fs.c:1380
+#: src/fs/fs_api.c:1380
 #, fuzzy, c-format
 msgid "Failed to resume publishing operation `%s': %s\n"
 msgstr "Fichero almacenado en '%s'.\n"
 
-#: src/fs/fs.c:1984
+#: src/fs/fs_api.c:1984
 #, c-format
 msgid "Failure while resuming unindexing operation `%s': %s\n"
 msgstr ""
 
-#: src/fs/fs.c:1994
+#: src/fs/fs_api.c:1994
 #, fuzzy, c-format
 msgid "Failed to resume unindexing operation `%s': %s\n"
 msgstr "Fichero almacenado en '%s'.\n"
 
-#: src/fs/fs.c:2107 src/fs/fs.c:2346
+#: src/fs/fs_api.c:2107 src/fs/fs_api.c:2346
 #, fuzzy, c-format
 msgid "Failed to resume sub-download `%s': %s\n"
 msgstr "Fichero almacenado en '%s'.\n"
 
-#: src/fs/fs.c:2124
+#: src/fs/fs_api.c:2124
 #, fuzzy, c-format
 msgid "Failed to resume sub-search `%s': %s\n"
 msgstr "Fichero almacenado en '%s'.\n"
 
-#: src/fs/fs.c:2136 src/fs/fs.c:2155 src/fs/fs.c:2631
+#: src/fs/fs_api.c:2136 src/fs/fs_api.c:2155 src/fs/fs_api.c:2631
 #, c-format
 msgid "Failure while resuming search operation `%s': %s\n"
 msgstr ""
 
-#: src/fs/fs.c:2337
+#: src/fs/fs_api.c:2337
 #, c-format
 msgid "Failed to resume sub-download `%s': could not open file `%s'\n"
 msgstr ""
 
-#: src/fs/fs.c:2583
+#: src/fs/fs_api.c:2583
 msgid "Could not resume running search, will resume as paused search\n"
 msgstr ""
 
-#: src/fs/fs.c:2669
+#: src/fs/fs_api.c:2669
 #, c-format
 msgid "Failure while resuming download operation `%s': %s\n"
 msgstr ""
@@ -3178,12 +3173,16 @@
 msgid "Invalid URI"
 msgstr "Argumento no válido: '%s'\n"
 
-#: src/fs/gnunet-service-fs.c:268 src/fs/gnunet-service-fs.c:448
+#: src/fs/gnunet-service-fs.c:240
+msgid "# running average P2P latency (ms)"
+msgstr ""
+
+#: src/fs/gnunet-service-fs.c:300 src/fs/gnunet-service-fs.c:490
 msgid "# Loopback routes suppressed"
 msgstr ""
 
-#: src/fs/gnunet-service-fs.c:542 src/topology/gnunet-daemon-topology.c:1292
-#: src/topology/gnunet-daemon-topology.c:1299
+#: src/fs/gnunet-service-fs.c:583 src/topology/gnunet-daemon-topology.c:1290
+#: src/topology/gnunet-daemon-topology.c:1297
 #: src/hostlist/gnunet-daemon-hostlist.c:290
 #, fuzzy, c-format
 msgid "Failed to connect to `%s' service.\n"
@@ -3194,75 +3193,100 @@
 msgid "`%s' failed on file `%s': %s"
 msgstr "'%s' falló para la unidad %s: %u\n"
 
-#: src/transport/gnunet-service-transport_neighbours.c:435
+#: src/transport/gnunet-service-transport_neighbours.c:465
 msgid "# failed connection attempts due to timeout"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:819
+#: src/transport/gnunet-service-transport_neighbours.c:857
 #, fuzzy
 msgid "# peers disconnected due to external request"
 msgstr "# Anuncios de los pares recibidos"
 
-#: src/transport/gnunet-service-transport_neighbours.c:925
+#: src/transport/gnunet-service-transport_neighbours.c:947
 #, fuzzy
+msgid "# fast reconnects failed"
+msgstr "# de pares conectados"
+
+#: src/transport/gnunet-service-transport_neighbours.c:1002
+#, fuzzy
 msgid "# peers disconnected due to timeout"
 msgstr "# de pares conectados"
 
-#: src/transport/gnunet-service-transport_neighbours.c:949
+#: src/transport/gnunet-service-transport_neighbours.c:1027
 #, fuzzy
 msgid "# keepalives sent"
 msgstr "# claves de la sesión mandadas"
 
-#: src/transport/gnunet-service-transport_neighbours.c:981
+#: src/transport/gnunet-service-transport_neighbours.c:1068
 #, fuzzy
 msgid "# peers disconnected due to global disconnect"
 msgstr "# Anuncios de los pares recibidos"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1543
-#: src/transport/gnunet-service-transport_neighbours.c:1564
+#: src/transport/gnunet-service-transport_neighbours.c:1774
+#: src/transport/gnunet-service-transport_neighbours.c:1795
 #, fuzzy
 msgid "# messages not sent (no such peer or not connected)"
 msgstr "# mensajes defragmentados"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1580
+#: src/transport/gnunet-service-transport_neighbours.c:1811
 #, fuzzy
 msgid "# bytes in message queue for other peers"
 msgstr "# bytes de mensajes salientes omitidos"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1632
+#: src/transport/gnunet-service-transport_neighbours.c:1863
 #, fuzzy
 msgid "# messages discarded due to lack of neighbour record"
 msgstr "# mensajes defragmentados"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1668
+#: src/transport/gnunet-service-transport_neighbours.c:1899
 msgid "# bandwidth quota violations by other peers"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1686
+#: src/transport/gnunet-service-transport_neighbours.c:1917
 msgid "# ms throttling suggested"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1715
+#: src/transport/gnunet-service-transport_neighbours.c:1946
 #, fuzzy
 msgid "# KEEPALIVE messages discarded (not connected)"
 msgstr "# mensajes defragmentados"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1749
+#: src/transport/gnunet-service-transport_neighbours.c:1995
+#, fuzzy
+msgid "# KEEPALIVE_RESPONSE messages discarded (not connected)"
+msgstr "# mensajes defragmentados"
+
+#: src/transport/gnunet-service-transport_neighbours.c:2003
+#, fuzzy
+msgid "# KEEPALIVE_RESPONSE messages discarded (not expected)"
+msgstr "# mensajes defragmentados"
+
+#: src/transport/gnunet-service-transport_neighbours.c:2064
 msgid "# SET QUOTA messages ignored (no such peer)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1762
+#: src/transport/gnunet-service-transport_neighbours.c:2082
 msgid "# disconnects due to quota of 0"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1884
+#: src/transport/gnunet-service-transport_neighbours.c:2200
 msgid "# disconnect messages ignored (old format)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1896
+#: src/transport/gnunet-service-transport_neighbours.c:2213
 msgid "# disconnect messages ignored (timestamp)"
 msgstr ""
 
+#: src/transport/gnunet-service-transport_neighbours.c:2302
+#, fuzzy
+msgid "# unexpected CONNECT_ACK messages"
+msgstr "envia COUNT mensajes"
+
+#: src/transport/gnunet-service-transport_neighbours.c:2400
+#, fuzzy
+msgid "# unexpected ACK messages"
+msgstr "# de pares conectados"
+
 #: src/transport/gnunet-service-transport_blacklist.c:247
 #, fuzzy, c-format
 msgid "Could not read blacklist file `%s'\n"
@@ -3303,54 +3327,53 @@
 msgstr ""
 
 #: src/transport/gnunet-service-transport_blacklist.c:522
-#: src/transport/gnunet-service-transport_blacklist.c:760
+#: src/transport/gnunet-service-transport_blacklist.c:756
 msgid "# disconnects due to blacklist"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:184
+#: src/transport/plugin_transport_http_server.c:189
 msgid ""
 "Could not create a new TLS certificate, program `gnunet-transport-"
 "certificate-creation' could not be started!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:208
+#: src/transport/plugin_transport_http_server.c:213
 msgid "No usable TLS certificate found and creating one failed!\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_hello.c:177
+#: src/transport/gnunet-service-transport_hello.c:172
 msgid "# refreshed my HELLO"
 msgstr ""
 
-#: src/transport/plugin_transport_udp.c:1431
-#: src/transport/plugin_transport_udp.c:2130
+#: src/transport/plugin_transport_udp.c:1518
 #, fuzzy
-msgid "# HELLO beacons received via udp"
+msgid "# IPv4 broadcast HELLO beacons received via udp"
 msgstr "# mensajes PONG encriptados recibidos"
 
-#: src/transport/plugin_transport_udp.c:1894
-#: src/transport/plugin_transport_udp_new.c:1209
+#: src/transport/plugin_transport_udp.c:1555
+#, fuzzy
+msgid "# IPv6 multicast HELLO beacons received via udp"
+msgstr "# mensajes PONG encriptados recibidos"
+
+#: src/transport/plugin_transport_udp.c:2041
+#: src/transport/plugin_transport_udp_new.c:1218
 #, c-format
 msgid "Given `%s' option is out of range: %llu > %u\n"
 msgstr ""
 
-#: src/transport/plugin_transport_udp.c:1947
-#: src/transport/plugin_transport_udp_new.c:1259
+#: src/transport/plugin_transport_udp.c:2092
+#: src/transport/plugin_transport_udp_new.c:1268
 #, fuzzy, c-format
 msgid "Invalid IPv6 address: `%s'\n"
 msgstr "Argumento no válido: '%s'\n"
 
-#: src/transport/plugin_transport_udp.c:2102
-#, fuzzy, c-format
-msgid "Failed to create IPv4 broadcast socket on port %d\n"
-msgstr "Falló al actualizar los datos del módulo '%s'\n"
-
-#: src/transport/plugin_transport_udp.c:2112
+#: src/transport/plugin_transport_udp.c:2235
 #, c-format
 msgid "Failed to set IPv4 broadcast option for broadcast socket on port %d\n"
 msgstr ""
 
-#: src/transport/plugin_transport_udp.c:2144
-#: src/transport/plugin_transport_udp_new.c:1388
+#: src/transport/plugin_transport_udp.c:2274
+#: src/transport/plugin_transport_udp_new.c:1396
 #, fuzzy
 msgid "Failed to open UDP sockets\n"
 msgstr "Fichero almacenado en '%s'.\n"
@@ -3365,7 +3388,7 @@
 msgid "%s failed at %s:%d: `%s'\n"
 msgstr "'%s' falló en %s: %d con error: '%s'.\n"
 
-#: src/transport/plugin_transport_http_client.c:617
+#: src/transport/plugin_transport_http_client.c:619
 #, c-format
 msgid "Could not initialize curl multi handle, failed to start %s plugin!\n"
 msgstr ""
@@ -3377,16 +3400,16 @@
 
 #: src/transport/plugin_transport_tcp.c:590
 #: src/transport/plugin_transport_tcp.c:679
-#: src/transport/plugin_transport_tcp.c:732
-#: src/transport/plugin_transport_tcp.c:821
-#: src/transport/plugin_transport_tcp.c:1160
+#: src/transport/plugin_transport_tcp.c:731
+#: src/transport/plugin_transport_tcp.c:820
+#: src/transport/plugin_transport_tcp.c:1156
 #, fuzzy
 msgid "# bytes currently in TCP buffers"
 msgstr "# bytes enviados por TCP"
 
 #: src/transport/plugin_transport_tcp.c:596
-#: src/transport/plugin_transport_tcp.c:847
-#: src/transport/plugin_transport_tcp.c:1548
+#: src/transport/plugin_transport_tcp.c:846
+#: src/transport/plugin_transport_tcp.c:1544
 #, fuzzy
 msgid "# TCP sessions active"
 msgstr "# claves de la sesión aceptadas"
@@ -3396,128 +3419,128 @@
 msgid "# bytes discarded by TCP (timeout)"
 msgstr "# bytes omitidos por TCP (salientes)"
 
-#: src/transport/plugin_transport_tcp.c:735
+#: src/transport/plugin_transport_tcp.c:734
 #, fuzzy
 msgid "# bytes transmitted via TCP"
 msgstr "# bytes desencriptados"
 
-#: src/transport/plugin_transport_tcp.c:825
+#: src/transport/plugin_transport_tcp.c:824
 #, fuzzy
 msgid "# bytes discarded by TCP (disconnect)"
 msgstr "# bytes omitidos por TCP (salientes)"
 
-#: src/transport/plugin_transport_tcp.c:946
+#: src/transport/plugin_transport_tcp.c:945
 #, fuzzy
 msgid "# bytes TCP was asked to transmit"
 msgstr "# bytes desencriptados"
 
-#: src/transport/plugin_transport_tcp.c:997
+#: src/transport/plugin_transport_tcp.c:996
 msgid "# bytes discarded by TCP (no address and no connection)"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:1040
+#: src/transport/plugin_transport_tcp.c:1039
 #, c-format
 msgid "Address of unexpected length: %u\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:1057
+#: src/transport/plugin_transport_tcp.c:1056
 msgid "Found valid IPv4 NAT address (creating session)!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:1108
+#: src/transport/plugin_transport_tcp.c:1107
 #, fuzzy
 msgid "# bytes discarded by TCP (failed to connect)"
 msgstr "# bytes omitidos por TCP (salientes)"
 
-#: src/transport/plugin_transport_tcp.c:1228
+#: src/transport/plugin_transport_tcp.c:1224
 msgid "# transport-service disconnect requests for TCP"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:1591
+#: src/transport/plugin_transport_tcp.c:1587
 #, fuzzy
 msgid "# TCP WELCOME messages received"
 msgstr "# mensajes PONG encriptados recibidos"
 
-#: src/transport/plugin_transport_tcp.c:1736
+#: src/transport/plugin_transport_tcp.c:1732
 msgid "# bytes received via TCP"
 msgstr "# bytes recibidos por TCP"
 
-#: src/transport/plugin_transport_tcp.c:1800
+#: src/transport/plugin_transport_tcp.c:1796
 msgid "# network-level TCP disconnect events"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:1953
+#: src/transport/plugin_transport_tcp.c:1949
 #, fuzzy
 msgid "Failed to start service.\n"
 msgstr "Falló al comenzar la recolección.\n"
 
-#: src/transport/plugin_transport_tcp.c:2013
+#: src/transport/plugin_transport_tcp.c:2009
 #, fuzzy, c-format
 msgid "Failed to find option %s in section %s!\n"
 msgstr "Fallo al conectar a gnunetd.\n"
 
-#: src/transport/plugin_transport_tcp.c:2036
+#: src/transport/plugin_transport_tcp.c:2032
 #, c-format
 msgid "TCP transport listening on port %llu\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2040
+#: src/transport/plugin_transport_tcp.c:2036
 msgid "TCP transport not listening on any port (client only)\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2044
+#: src/transport/plugin_transport_tcp.c:2040
 #, c-format
 msgid "TCP transport advertises itself as being on port %llu\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http.c:829
+#: src/transport/plugin_transport_http.c:920
 msgid "Disabling IPv6 since it is not supported on this system!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http.c:878
+#: src/transport/plugin_transport_http.c:968
 #, fuzzy
 msgid "Require valid port number for service in configuration!\n"
 msgstr "¡Ninguna aplicación definida en la configuración!\n"
 
-#: src/transport/plugin_transport_http.c:1025
+#: src/transport/plugin_transport_http.c:1115
 #, c-format
 msgid "Found %u addresses to report to NAT service\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http.c:1040
+#: src/transport/plugin_transport_http.c:1128
 #, c-format
 msgid "FREEING %s\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http.c:1115
+#: src/transport/plugin_transport_http.c:1203
 #, fuzzy
 msgid "Neither IPv4 nor IPv6 are enabled! Fix in configuration\n"
 msgstr "¡Advertencias de la red desconectadas por configuración!\n"
 
-#: src/transport/plugin_transport_http.c:1128
+#: src/transport/plugin_transport_http.c:1216
 #, fuzzy
 msgid "Port is required! Fix in configuration\n"
 msgstr " gconfig\tConfiguración GTK\n"
 
-#: src/transport/plugin_transport_http.c:1139
+#: src/transport/plugin_transport_http.c:1227
 msgid "Port 0, client only mode\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http.c:1155
+#: src/transport/plugin_transport_http.c:1247
 #, c-format
 msgid ""
 "Specific IPv4 address `%s' for plugin %s in configuration file is invalid! "
 "Binding to all addresses!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http.c:1181
+#: src/transport/plugin_transport_http.c:1277
 #, c-format
 msgid ""
 "Specific IPv6 address `%s' for plugin %s in configuration file is invalid! "
 "Binding to all addresses!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_unix.c:1088
+#: src/transport/plugin_transport_unix.c:1087
 #, fuzzy
 msgid "Failed to open UNIX sockets\n"
 msgstr "Fichero almacenado en '%s'.\n"
@@ -3567,284 +3590,289 @@
 msgid "# bytes dropped by SMTP (outgoing)"
 msgstr "# bytes omitidos por TCP (salientes)"
 
-#: src/transport/gnunet-service-transport_plugins.c:108
+#: src/transport/gnunet-service-transport_plugins.c:109
 msgid "Transport service is lacking NEIGHBOUR_LIMIT option.\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_plugins.c:115
+#: src/transport/gnunet-service-transport_plugins.c:116
 #, fuzzy, c-format
 msgid "Starting transport plugins `%s'\n"
 msgstr "Probando transporte(s) %s\n"
 
-#: src/transport/gnunet-service-transport_plugins.c:119
+#: src/transport/gnunet-service-transport_plugins.c:120
 #, fuzzy, c-format
 msgid "Loading `%s' transport plugin\n"
 msgstr "Probando transporte(s) %s\n"
 
-#: src/transport/gnunet-service-transport_plugins.c:139
+#: src/transport/gnunet-service-transport_plugins.c:147
 #, fuzzy, c-format
 msgid "Failed to load transport plugin for `%s'\n"
 msgstr "Imposible inicializar la aplicación '%s'\n"
 
-#: src/transport/plugin_transport_wlan.c:877
+#: src/transport/plugin_transport_wlan.c:884
 #, fuzzy
 msgid "# wlan session timeouts"
 msgstr "# claves de la sesión aceptadas"
 
-#: src/transport/plugin_transport_wlan.c:902
+#: src/transport/plugin_transport_wlan.c:909
 #, fuzzy
 msgid "# wlan session created"
 msgstr "# claves de la sesión aceptadas"
 
-#: src/transport/plugin_transport_wlan.c:985
-#: src/transport/plugin_transport_wlan.c:1143
-#: src/transport/plugin_transport_wlan.c:1163
-#: src/transport/plugin_transport_wlan.c:1193
-#: src/transport/plugin_transport_wlan.c:2376
-#: src/transport/plugin_transport_wlan.c:3210
+#: src/transport/plugin_transport_wlan.c:993
+#: src/transport/plugin_transport_wlan.c:1157
+#: src/transport/plugin_transport_wlan.c:1178
+#: src/transport/plugin_transport_wlan.c:1209
+#: src/transport/plugin_transport_wlan.c:2447
+#: src/transport/plugin_transport_wlan.c:3304
 msgid "# wlan pending sessions"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:1237
-#: src/transport/plugin_transport_wlan.c:1941
+#: src/transport/plugin_transport_wlan.c:1252
+#: src/transport/plugin_transport_wlan.c:2000
 #, fuzzy
 msgid "# wlan pending fragments"
 msgstr "# fragmentos descartados"
 
-#: src/transport/plugin_transport_wlan.c:1459
+#: src/transport/plugin_transport_wlan.c:1475
 #, c-format
 msgid "Finished reading from wlan-helper stdout with code: %d\n"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:1782
+#: src/transport/plugin_transport_wlan.c:1840
 msgid "# wlan hello beacons send"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:1814
-#: src/transport/plugin_transport_wlan.c:2028
-#: src/transport/plugin_transport_wlan.c:2121
+#: src/transport/plugin_transport_wlan.c:1873
+#: src/transport/plugin_transport_wlan.c:2089
+#: src/transport/plugin_transport_wlan.c:2184
 #, c-format
 msgid "Error writing to wlan healper. errno == %d, ERROR: %s\n"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:2015
+#: src/transport/plugin_transport_wlan.c:2075
 msgid "# wlan acks send"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:2084
+#: src/transport/plugin_transport_wlan.c:2146
 #, fuzzy
 msgid "# wlan fragments send"
 msgstr "# fragmentos descartados"
 
-#: src/transport/plugin_transport_wlan.c:2243
+#: src/transport/plugin_transport_wlan.c:2312
 #, c-format
 msgid "Wlan Address len %d is wrong\n"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:2248
+#: src/transport/plugin_transport_wlan.c:2317
 #, fuzzy
 msgid "# wlan messages queued"
 msgstr "# mensajes PONG encriptados recibidos"
 
-#: src/transport/plugin_transport_wlan.c:2338
-#: src/transport/plugin_transport_wlan.c:2977
-#: src/transport/plugin_transport_wlan.c:3212
+#: src/transport/plugin_transport_wlan.c:2408
+#: src/transport/plugin_transport_wlan.c:3060
+#: src/transport/plugin_transport_wlan.c:3307
 msgid "# wlan mac endpoints"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:2561
+#: src/transport/plugin_transport_wlan.c:2636
 #, fuzzy
 msgid "# wlan whole messages received"
 msgstr "# mensajes PONG encriptados recibidos"
 
-#: src/transport/plugin_transport_wlan.c:2759
+#: src/transport/plugin_transport_wlan.c:2836
 #, fuzzy
 msgid "# wlan hello messages received"
 msgstr "# mensajes PONG encriptados recibidos"
 
-#: src/transport/plugin_transport_wlan.c:2793
+#: src/transport/plugin_transport_wlan.c:2873
 #, fuzzy
 msgid "# wlan fragments received"
 msgstr "# fragmentos descartados"
 
-#: src/transport/plugin_transport_wlan.c:2845
+#: src/transport/plugin_transport_wlan.c:2925
 #, fuzzy
 msgid "# wlan acks received"
 msgstr "# mensajes PONG encriptados recibidos"
 
-#: src/transport/plugin_transport_wlan.c:2938
+#: src/transport/plugin_transport_wlan.c:3020
 msgid "# wlan mac endpoints timeouts"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:2961
+#: src/transport/plugin_transport_wlan.c:3044
 #, fuzzy
 msgid "# wlan mac endpoints created"
 msgstr "# mensajes PONG encriptados recibidos"
 
-#: src/transport/plugin_transport_wlan.c:3017
+#: src/transport/plugin_transport_wlan.c:3102
 msgid "# wlan WLAN_HELPER_DATA received"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:3068
+#: src/transport/plugin_transport_wlan.c:3158
 #, fuzzy
 msgid "# wlan messages for this client received"
 msgstr "# mensajes PONG encriptados recibidos"
 
-#: src/transport/plugin_transport_wlan.c:3076
+#: src/transport/plugin_transport_wlan.c:3169
 #, fuzzy
 msgid "# wlan messages inside WLAN_HELPER_DATA received"
 msgstr "# mensajes PONG encriptados recibidos"
 
-#: src/transport/gnunet-transport.c:251
+#: src/transport/gnunet-transport.c:245
 #, c-format
 msgid "No transport plugins configured, peer will never communicate\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:268
+#: src/transport/gnunet-transport.c:258
 #, c-format
 msgid "No port configured for plugin `%s', cannot test it\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:321
+#: src/transport/gnunet-transport.c:308
 #, c-format
 msgid "Received %llu bytes/s (%llu bytes in %llu ms)\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:330
+#: src/transport/gnunet-transport.c:315
 #, c-format
 msgid "Transmitted %llu bytes/s (%llu bytes in %llu ms)\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:369
+#: src/transport/gnunet-transport.c:348
 #, c-format
 msgid "Transmitting %u bytes to %s\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:395
+#: src/transport/gnunet-transport.c:368
 #, fuzzy, c-format
 msgid "Connected to %s\n"
 msgstr "'%s' conectado a '%s'.\n"
 
-#: src/transport/gnunet-transport.c:436
+#: src/transport/gnunet-transport.c:399
 #, fuzzy, c-format
 msgid "Disconnected from %s\n"
 msgstr "'%s' conectado a '%s'.\n"
 
-#: src/transport/gnunet-transport.c:476
+#: src/transport/gnunet-transport.c:428
 #, fuzzy, c-format
 msgid "Received %u bytes from %s\n"
 msgstr "GAP recibido contenido no válido de '%s'\n"
 
-#: src/transport/gnunet-transport.c:498
+#: src/transport/gnunet-transport.c:448
 #, fuzzy, c-format
 msgid "Peer `%s' plugin: `%s' address `%s'\n"
 msgstr "Par '%s' con credibilidad %8u y dirección '%s'\n"
 
-#: src/transport/gnunet-transport.c:536
+#: src/transport/gnunet-transport.c:486
 #, fuzzy, c-format
 msgid "Failed to parse peer identity `%s'\n"
 msgstr "Falló al actualizar los datos del módulo '%s'\n"
 
-#: src/transport/gnunet-transport.c:574
+#: src/transport/gnunet-transport.c:522
 msgid "measure how fast we are receiving data (until CTRL-C)"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:577
+#: src/transport/gnunet-transport.c:525
 #, fuzzy
 msgid "try to connect to the given peer"
 msgstr "Fallo al conectar a gnunetd.\n"
 
-#: src/transport/gnunet-transport.c:580
+#: src/transport/gnunet-transport.c:528
 #, fuzzy
 msgid "provide information about all current connections (once)"
 msgstr "Imprime información de los pares de GNUnet."
 
-#: src/transport/gnunet-transport.c:583
+#: src/transport/gnunet-transport.c:532
 msgid "send data for benchmarking to the other peer (until CTRL-C)"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:586
+#: src/transport/gnunet-transport.c:535
 msgid "test transport configuration (involves external server)"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:593
+#: src/transport/gnunet-transport.c:543
 #, fuzzy
 msgid "Direct access to transport service."
 msgstr "Fallo al conectar a gnunetd.\n"
 
-#: src/transport/gnunet-service-transport_validation.c:515
+#: src/transport/gnunet-service-transport_validation.c:412
 msgid "# address records discarded"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:628
+#: src/transport/gnunet-service-transport_validation.c:458
 #, c-format
 msgid ""
-"Not confirming PING with address `%s' since I cannot confirm having this "
-"address.\n"
+"Not transmitting `%s' with `%s', message too big (%u bytes!). This should "
+"not happen.\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:696
-msgid "# PONGs unicast via reliable transport"
-msgstr ""
+#: src/transport/gnunet-service-transport_validation.c:493
+#, fuzzy
+msgid "# PING without HELLO messages sent"
+msgstr "# mensajes de texto mandados por PING"
 
-#: src/transport/gnunet-service-transport_validation.c:705
-msgid "# PONGs multicast to all available addresses"
+#: src/transport/gnunet-service-transport_validation.c:552
+msgid "# address revalidations started"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:769
+#: src/transport/gnunet-service-transport_validation.c:776
+#, fuzzy
+msgid "# PING message for different peer received"
+msgstr "# mensajes PONG encriptados recibidos"
+
+#: src/transport/gnunet-service-transport_validation.c:812
 #, c-format
 msgid ""
-"Not transmitting `%s' with `%s', message too big (%u bytes!). This should "
-"not happen.\n"
+"Not confirming PING with address `%s' since I cannot confirm having this "
+"address.\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:803
-#, fuzzy
-msgid "# PING without HELLO messages sent"
-msgstr "# mensajes de texto mandados por PING"
+#: src/transport/gnunet-service-transport_validation.c:882
+msgid "# PONGs unicast via reliable transport"
+msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:875
-msgid "# address revalidations started"
+#: src/transport/gnunet-service-transport_validation.c:891
+msgid "# PONGs multicast to all available addresses"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:956
+#: src/transport/gnunet-service-transport_validation.c:1015
 msgid "# PONGs dropped, no matching pending validation"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:972
+#: src/transport/gnunet-service-transport_validation.c:1040
 msgid "# PONGs dropped, signature expired"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1050
+#: src/transport/gnunet-service-transport_validation.c:1099
 #, fuzzy, c-format
 msgid "Adding `%s' without addresses for peer `%s'\n"
 msgstr "Imposible obtener la dirección del par '%s'.\n"
 
-#: src/transport/gnunet-service-transport_clients.c:250
+#: src/transport/gnunet-service-transport_clients.c:254
 #, 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:255
+#: src/transport/gnunet-service-transport_clients.c:259
 #, fuzzy
 msgid "# messages dropped due to slow client"
 msgstr "# Anuncios de los pares recibidos"
 
-#: src/transport/gnunet-service-transport_clients.c:405
+#: src/transport/gnunet-service-transport_clients.c:406
 #, c-format
 msgid "Rejecting control connection from peer `%s', which is not me!\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_clients.c:522
+#: src/transport/gnunet-service-transport_clients.c:523
 #, fuzzy
 msgid "# bytes payload received for other peers"
 msgstr "# bytes recibidos por TCP"
 
-#: src/transport/gnunet-service-transport_clients.c:539
+#: src/transport/gnunet-service-transport_clients.c:540
 msgid "# bytes payload dropped (other peer was not connected)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_clients.c:590
+#: src/transport/gnunet-service-transport_clients.c:591
 #, fuzzy
 msgid "# REQUEST CONNECT messages received"
 msgstr "# mensajes PONG encriptados recibidos"
@@ -3854,16 +3882,16 @@
 msgid "Received unexpected message of type %u in %s:%u\n"
 msgstr "Recibido mensaje corrupto del par '%s' en %s:%d.\n"
 
-#: src/transport/gnunet-service-transport.c:159
+#: src/transport/gnunet-service-transport.c:156
 #, fuzzy
 msgid "# bytes payload discarded due to not connected peer "
 msgstr "# Anuncios de los pares recibidos"
 
-#: src/transport/gnunet-service-transport.c:517
+#: src/transport/gnunet-service-transport.c:514
 msgid "Transport service is lacking key configuration settings.  Exiting.\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport.c:526
+#: src/transport/gnunet-service-transport.c:523
 msgid "Transport service could not access hostkey.  Exiting.\n"
 msgstr ""
 
@@ -3881,101 +3909,101 @@
 msgid "# peers blacklisted"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:379
+#: src/topology/gnunet-daemon-topology.c:380
 #, fuzzy
 msgid "# connect requests issued to transport"
 msgstr "# mensajes PONG encriptados recibidos"
 
-#: src/topology/gnunet-daemon-topology.c:674
-#: src/topology/gnunet-daemon-topology.c:760
+#: src/topology/gnunet-daemon-topology.c:675
+#: src/topology/gnunet-daemon-topology.c:761
 #, fuzzy
 msgid "# friends connected"
 msgstr "# de pares conectados"
 
-#: src/topology/gnunet-daemon-topology.c:877
-#: src/hostlist/hostlist-server.c:187
+#: src/topology/gnunet-daemon-topology.c:875
+#: src/hostlist/hostlist-server.c:184
 #, fuzzy, c-format
 msgid "Error in communication with PEERINFO service: %s\n"
 msgstr "Imprime información de los pares de GNUnet."
 
-#: src/topology/gnunet-daemon-topology.c:952
+#: src/topology/gnunet-daemon-topology.c:950
 msgid "Failed to connect to core service, can not manage topology!\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:984
+#: src/topology/gnunet-daemon-topology.c:982
 #, c-format
 msgid "Option `%s' in section `%s' not specified!\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:996
+#: src/topology/gnunet-daemon-topology.c:994
 #, fuzzy, c-format
 msgid "Could not read friends list `%s'\n"
 msgstr "Imposible inicializar la aplicación '%s'\n"
 
-#: src/topology/gnunet-daemon-topology.c:1002
+#: src/topology/gnunet-daemon-topology.c:1000
 #, fuzzy, c-format
 msgid "Friends file `%s' is empty.\n"
 msgstr "El formato del fichero '%s' no es válido.\n"
 
-#: src/topology/gnunet-daemon-topology.c:1011
+#: src/topology/gnunet-daemon-topology.c:1009
 #, fuzzy, c-format
 msgid "Failed to read friends list from `%s': out of memory\n"
 msgstr "Imposible inicializar la aplicación '%s'\n"
 
-#: src/topology/gnunet-daemon-topology.c:1019
+#: src/topology/gnunet-daemon-topology.c:1017
 #, c-format
 msgid "Failed to read friends list from `%s'\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:1039
+#: src/topology/gnunet-daemon-topology.c:1037
 #, c-format
 msgid ""
 "Syntax error in topology specification at offset %llu, skipping bytes.\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:1052
+#: src/topology/gnunet-daemon-topology.c:1050
 #, c-format
 msgid ""
 "Syntax error in topology specification at offset %llu, skipping bytes `%s'.\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:1062
+#: src/topology/gnunet-daemon-topology.c:1060
 #, fuzzy, c-format
 msgid "Found friend `%s' in configuration\n"
 msgstr " gconfig\tConfiguración GTK\n"
 
-#: src/topology/gnunet-daemon-topology.c:1068
+#: src/topology/gnunet-daemon-topology.c:1066
 #, c-format
 msgid "Found myself `%s' in friend list (useless, ignored)\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:1078
+#: src/topology/gnunet-daemon-topology.c:1076
 #, fuzzy
 msgid "# friends in configuration"
 msgstr " gconfig\tConfiguración GTK\n"
 
-#: src/topology/gnunet-daemon-topology.c:1084
+#: src/topology/gnunet-daemon-topology.c:1082
 msgid ""
 "Fewer friends specified than required by minimum friend count. Will only "
 "connect to friends.\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:1091
+#: src/topology/gnunet-daemon-topology.c:1089
 msgid ""
 "More friendly connections required than target total number of connections.\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:1128
+#: src/topology/gnunet-daemon-topology.c:1126
 #, fuzzy
 msgid "# HELLO messages received"
 msgstr "# mensajes PONG encriptados recibidos"
 
-#: src/topology/gnunet-daemon-topology.c:1185
+#: src/topology/gnunet-daemon-topology.c:1183
 #, fuzzy
 msgid "# HELLO messages gossipped"
 msgstr "# mensajes salientes omitidos"
 
-#: src/topology/gnunet-daemon-topology.c:1325
+#: src/topology/gnunet-daemon-topology.c:1323
 msgid "GNUnet topology control (maintaining P2P mesh and F2F constraints)"
 msgstr ""
 
@@ -4253,33 +4281,33 @@
 msgid "GNUnet NAT traversal test helper daemon"
 msgstr ""
 
-#: src/nat/nat.c:776
+#: src/nat/nat.c:803
 #, c-format
 msgid "gnunet-helper-nat-server generated malformed address `%s'\n"
 msgstr ""
 
-#: src/nat/nat.c:825
+#: src/nat/nat.c:852
 #, fuzzy, c-format
 msgid "Failed to start %s\n"
 msgstr "Falló al comenzar la recolección.\n"
 
-#: src/nat/nat.c:1094
+#: src/nat/nat.c:1121
 #, fuzzy, c-format
 msgid "Malformed %s `%s' given in configuration!\n"
 msgstr "Imposible guardar la configuración"
 
-#: src/nat/nat.c:1156 src/nat/nat.c:1166
+#: src/nat/nat.c:1187 src/nat/nat.c:1197
 #, c-format
 msgid ""
 "Configuration requires `%s', but binary is not installed properly (SUID bit "
 "not set).  Option disabled.\n"
 msgstr ""
 
-#: src/nat/nat.c:1298
+#: src/nat/nat.c:1329
 msgid "Internal IP address not known, cannot use ICMP NAT traversal method\n"
 msgstr ""
 
-#: src/nat/nat.c:1310
+#: src/nat/nat.c:1341
 #, c-format
 msgid "Running gnunet-helper-nat-client %s %s %u\n"
 msgstr ""
@@ -4294,44 +4322,39 @@
 msgid "Failed to create listen socket bound to `%s' for NAT test: %s\n"
 msgstr ""
 
-#: src/block/plugin_block_dht.c:122
+#: src/dht/plugin_block_dht.c:124
 #, c-format
 msgid "Block not of type %u\n"
 msgstr ""
 
-#: src/block/plugin_block_dht.c:129
+#: src/dht/plugin_block_dht.c:131
 msgid "Size mismatch for block\n"
 msgstr ""
 
-#: src/block/plugin_block_dht.c:138
+#: src/dht/plugin_block_dht.c:140
 #, c-format
 msgid "Block of type %u is malformed\n"
 msgstr ""
 
-#: src/block/plugin_block_fs.c:131
+#: src/fs/plugin_block_fs.c:131
 msgid "Reply mismatched in terms of namespace.  Discarded.\n"
 msgstr ""
 
-#: src/block/block.c:109
+#: src/block/block.c:105
 #, fuzzy, c-format
-msgid "Loading block plugins `%s'\n"
+msgid "Loading block plugin `%s'\n"
 msgstr "Probando transporte(s) %s\n"
 
-#: src/block/block.c:119
-#, fuzzy, c-format
-msgid "Failed to load block plugin `%s'\n"
-msgstr "Imposible inicializar la aplicación '%s'\n"
-
-#: src/mesh/gnunet-service-mesh.c:4206
+#: src/mesh/gnunet-service-mesh.c:4192
 msgid "MESH: Wrong CORE service\n"
 msgstr ""
 
-#: src/mesh/gnunet-service-mesh.c:4410
+#: src/mesh/gnunet-service-mesh.c:4397
 #, fuzzy
 msgid "Mesh service is lacking key configuration settings.  Exiting.\n"
 msgstr "Configuración de GNUnet"
 
-#: src/mesh/gnunet-service-mesh.c:4419
+#: src/mesh/gnunet-service-mesh.c:4406
 #, fuzzy
 msgid "Mesh service could not access hostkey.  Exiting.\n"
 msgstr "Imposible acceder a la información del espacio.\n"
@@ -4552,113 +4575,113 @@
 msgid "bytes in hostlist"
 msgstr "# bytes en la base de datos"
 
-#: src/hostlist/hostlist-server.c:160
+#: src/hostlist/hostlist-server.c:157
 msgid "expired addresses encountered"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:208
+#: src/hostlist/hostlist-server.c:205
 msgid "HELLOs without addresses encountered (ignored)"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:224
+#: src/hostlist/hostlist-server.c:221
 msgid "bytes not included in hostlist (size limit)"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:272
+#: src/hostlist/hostlist-server.c:269
 #, c-format
 msgid "Refusing `%s' request to hostlist server\n"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:275
+#: src/hostlist/hostlist-server.c:272
 #, fuzzy
 msgid "hostlist requests refused (not HTTP GET)"
 msgstr "# mensajes PONG encriptados recibidos"
 
-#: src/hostlist/hostlist-server.c:283
+#: src/hostlist/hostlist-server.c:280
 msgid "Sending 100 CONTINUE reply\n"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:290
+#: src/hostlist/hostlist-server.c:287
 #, c-format
 msgid "Refusing `%s' request with %llu bytes of upload data\n"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:294
+#: src/hostlist/hostlist-server.c:291
 #, fuzzy
 msgid "hostlist requests refused (upload data)"
 msgstr "# mensajes PONG encriptados recibidos"
 
-#: src/hostlist/hostlist-server.c:302
+#: src/hostlist/hostlist-server.c:299
 msgid "Could not handle hostlist request since I do not have a response yet\n"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:305
+#: src/hostlist/hostlist-server.c:302
 #, fuzzy
 msgid "hostlist requests refused (not ready)"
 msgstr "# mensajes PONG encriptados recibidos"
 
-#: src/hostlist/hostlist-server.c:309
+#: src/hostlist/hostlist-server.c:306
 msgid "Received request for our hostlist\n"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:310
+#: src/hostlist/hostlist-server.c:307
 #, fuzzy
 msgid "hostlist requests processed"
 msgstr "# mensajes PONG encriptados recibidos"
 
-#: src/hostlist/hostlist-server.c:353
+#: src/hostlist/hostlist-server.c:350
 #, fuzzy
 msgid "# hostlist advertisements send"
 msgstr "# Anuncios a extraños mandados"
 
-#: src/hostlist/hostlist-server.c:400
+#: src/hostlist/hostlist-server.c:397
 msgid "Advertisement message could not be queued by core\n"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:568
+#: src/hostlist/hostlist-server.c:565
 #, fuzzy, c-format
 msgid "Invalid port number %llu.  Exiting.\n"
 msgstr "Argumentos no válidos. Saliendo.\n"
 
-#: src/hostlist/hostlist-server.c:577
+#: src/hostlist/hostlist-server.c:574
 #, c-format
 msgid "Hostlist service starts on %s:%llu\n"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:591
+#: src/hostlist/hostlist-server.c:588
 #, c-format
 msgid "Address to obtain hostlist: `%s'\n"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:629
+#: src/hostlist/hostlist-server.c:626
 #, c-format
 msgid "Could not start hostlist HTTP server on port %u\n"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:222
+#: src/peerinfo-tool/gnunet-peerinfo.c:221
 #, fuzzy, c-format
 msgid "Could not find option `%s:%s' in configuration.\n"
 msgstr "¡Imposible encontrar el par '%s' en la tabla de enrutado!\n"
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:229
+#: src/peerinfo-tool/gnunet-peerinfo.c:228
 #, fuzzy, c-format
 msgid "Loading hostkey from `%s' failed.\n"
 msgstr "Analizando saludo de '%s' se produjo un fallo.\n"
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:241
+#: src/peerinfo-tool/gnunet-peerinfo.c:240
 #, c-format
 msgid "I am peer `%s'.\n"
 msgstr "Yo soy el par '%s'.\n"
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:261
+#: src/peerinfo-tool/gnunet-peerinfo.c:260
 msgid "output only the identity strings"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:264
+#: src/peerinfo-tool/gnunet-peerinfo.c:263
 msgid "output our own identity only"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:270
+#: src/peerinfo-tool/gnunet-peerinfo.c:269
 #, fuzzy
 msgid "Print information about peers."
 msgstr "Imprime información de los pares de GNUnet."
@@ -4688,23 +4711,43 @@
 msgid "use configuration file FILENAME"
 msgstr "usa el fichero de configuración FILENAME"
 
-#: src/include/gnunet_common.h:352 src/include/gnunet_common.h:357
-#: src/include/gnunet_common.h:363
+#: src/include/gnunet_common.h:361 src/include/gnunet_common.h:366
+#: src/include/gnunet_common.h:372
 #, fuzzy, c-format
 msgid "Assertion failed at %s:%d.\n"
 msgstr "La verificación de la firma RSA fallo en %s: %d: %s\n"
 
-#: src/include/gnunet_common.h:373
+#: src/include/gnunet_common.h:382
 #, fuzzy, c-format
 msgid "External protocol violation detected at %s:%d.\n"
 msgstr "La verificación de la firma RSA fallo en %s: %d: %s\n"
 
-#: src/include/gnunet_common.h:394 src/include/gnunet_common.h:401
+#: src/include/gnunet_common.h:403 src/include/gnunet_common.h:410
 #, fuzzy, c-format
 msgid "`%s' failed on file `%s' at %s:%d with error: %s\n"
 msgstr "'%s' falló en el fichero '%s' en %s: %d con el error: %s\n"
 
+#~ msgid "KiB"
+#~ msgstr "KiB"
+
+#~ msgid "MiB"
+#~ msgstr "MiB"
+
+#~ msgid "GiB"
+#~ msgstr "GiB"
+
+#~ msgid "TiB"
+#~ msgstr "TiB"
+
 #, fuzzy
+#~ msgid "Failed to create IPv4 broadcast socket on port %d\n"
+#~ msgstr "Falló al actualizar los datos del módulo '%s'\n"
+
+#, fuzzy
+#~ msgid "Failed to load block plugin `%s'\n"
+#~ msgstr "Imposible inicializar la aplicación '%s'\n"
+
+#, fuzzy
 #~ msgid "Target is %d connections per peer."
 #~ msgstr "Se produjo un error estableciendo conexión con gnunetd.\n"
 
@@ -4881,10 +4924,6 @@
 #~ msgstr "# bytes desencriptados"
 
 #, fuzzy
-#~ msgid "# connected addresses"
-#~ msgstr "# de pares conectados"
-
-#, fuzzy
 #~ msgid "# transport failed to selected peer address"
 #~ msgstr "Anunciando mi transporte %d a los pares seleccionados.\n"
 
@@ -6273,9 +6312,6 @@
 #~ msgid "OK!\n"
 #~ msgstr "OK"
 
-#~ msgid "send COUNT messages"
-#~ msgstr "envia COUNT mensajes"
-
 #~ msgid "send messages with SIZE bytes payload"
 #~ msgstr "manda mensajes con SIZE bytes payload"
 
@@ -6806,9 +6842,6 @@
 #~ msgid "async RPC reply not received.\n"
 #~ msgstr "respuesta RPC asíncrona no recibida.\n"
 
-#~ msgid "Could not determine my public IPv6 address.\n"
-#~ msgstr "Imposible determinar mi dirección IPv6 pública.\n"
-
 #~ msgid "`%s': unknown service: %s\n"
 #~ msgstr "'%s': servicio desconocido: %s\n"
 

Modified: gnunet/po/gnunet.pot
===================================================================
--- gnunet/po/gnunet.pot        2011-11-23 10:05:05 UTC (rev 18268)
+++ gnunet/po/gnunet.pot        2011-11-23 10:05:21 UTC (rev 18269)
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: address@hidden"
-"POT-Creation-Date: 2011-11-03 13:55+0100\n"
+"POT-Creation-Date: 2011-11-23 11:01+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <address@hidden>\n"
 "Language-Team: LANGUAGE <address@hidden>\n"
@@ -30,8 +30,8 @@
 #: src/datacache/plugin_datacache_mysql.c:517
 #: src/datacache/plugin_datacache_mysql.c:526
 #: src/datacache/plugin_datacache_mysql.c:598
-#: src/datacache/plugin_datacache_mysql.c:614 src/include/gnunet_common.h:380
-#: src/include/gnunet_common.h:387
+#: src/datacache/plugin_datacache_mysql.c:614 src/include/gnunet_common.h:389
+#: src/include/gnunet_common.h:396
 #, c-format
 msgid "`%s' failed at %s:%d with error: %s\n"
 msgstr ""
@@ -51,27 +51,27 @@
 msgid "Unable to initialize SQLite: %s.\n"
 msgstr ""
 
-#: src/datastore/plugin_datastore_sqlite.c:420
-#: src/datacache/plugin_datacache_sqlite.c:471
+#: src/datastore/plugin_datastore_sqlite.c:414
+#: src/datacache/plugin_datacache_sqlite.c:457
 msgid "Tried to close sqlite without finalizing all prepared statements.\n"
 msgstr ""
 
-#: src/datastore/plugin_datastore_sqlite.c:677
+#: src/datastore/plugin_datastore_sqlite.c:671
 msgid "Invalid data in database.  Trying to fix (by deletion).\n"
 msgstr ""
 
-#: src/datastore/plugin_datastore_sqlite.c:1130
+#: src/datastore/plugin_datastore_sqlite.c:1124
 msgid "sqlite version to old to determine size, assuming zero\n"
 msgstr ""
 
-#: src/datastore/plugin_datastore_sqlite.c:1149
+#: src/datastore/plugin_datastore_sqlite.c:1143
 #, c-format
 msgid ""
 "Using sqlite page utilization to estimate payload (%llu pages of size %llu "
 "bytes)\n"
 msgstr ""
 
-#: src/datastore/plugin_datastore_sqlite.c:1188
+#: src/datastore/plugin_datastore_sqlite.c:1182
 msgid "Sqlite database running\n"
 msgstr ""
 
@@ -271,8 +271,8 @@
 msgid "Could not find matching reservation"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:824 src/datacache/datacache.c:119
-#: src/datacache/datacache.c:250
+#: src/datastore/gnunet-service-datastore.c:824 src/datacache/datacache.c:118
+#: src/datacache/datacache.c:248
 msgid "# bytes stored"
 msgstr ""
 
@@ -319,8 +319,8 @@
 msgstr ""
 
 #: src/datastore/gnunet-service-datastore.c:1295
-#: src/datastore/gnunet-service-datastore.c:1486 src/datacache/datacache.c:145
-#: src/datacache/datacache.c:152
+#: src/datastore/gnunet-service-datastore.c:1486 src/datacache/datacache.c:144
+#: src/datacache/datacache.c:151
 #, c-format
 msgid "No `%s' specified for `%s' in configuration!\n"
 msgstr ""
@@ -352,20 +352,16 @@
 msgid "Failed to initialize bloomfilter.\n"
 msgstr ""
 
-#: src/core/gnunet-service-core_sessions.c:204
+#: src/core/gnunet-service-core_sessions.c:210
 #: src/core/gnunet-service-core_sessions.c:275
 msgid "# entries in session map"
 msgstr ""
 
-#: src/core/gnunet-service-core_sessions.c:236
+#: src/core/gnunet-service-core_sessions.c:240
 msgid "# type map refreshes sent"
 msgstr ""
 
-#: src/core/gnunet-service-core_sessions.c:360
-msgid "# send requests dropped (disconnected)"
-msgstr ""
-
-#: src/core/gnunet-service-core_sessions.c:427
+#: src/core/gnunet-service-core_sessions.c:416
 msgid "# messages discarded (expired prior to transmission)"
 msgstr ""
 
@@ -376,13 +372,13 @@
 msgstr ""
 
 #: src/core/gnunet-core-list-connections.c:167
-#: src/peerinfo-tool/gnunet-peerinfo.c:200
+#: src/peerinfo-tool/gnunet-peerinfo.c:199
 #, c-format
 msgid "Invalid command line argument `%s'\n"
 msgstr ""
 
 #: src/core/gnunet-core-list-connections.c:188
-#: src/peerinfo-tool/gnunet-peerinfo.c:258
+#: src/peerinfo-tool/gnunet-peerinfo.c:257
 msgid "don't resolve host names"
 msgstr ""
 
@@ -390,43 +386,47 @@
 msgid "Print information about connected peers."
 msgstr ""
 
-#: src/core/gnunet-service-core_clients.c:452
+#: src/core/gnunet-service-core_clients.c:357
+msgid "# send requests dropped (disconnected)"
+msgstr ""
+
+#: src/core/gnunet-service-core_clients.c:462
 msgid "# messages discarded (session disconnected)"
 msgstr ""
 
-#: src/core/gnunet-service-core_clients.c:796
+#: src/core/gnunet-service-core_clients.c:791
 #, c-format
 msgid "# bytes of messages of type %u received"
 msgstr ""
 
-#: src/core/gnunet-service-core.c:101
+#: src/core/gnunet-service-core.c:99
 #, c-format
 msgid "Core service of `%4s' ready.\n"
 msgstr ""
 
-#: src/core/gnunet-service-core_typemap.c:111
-#: src/core/gnunet-service-core_typemap.c:124
+#: src/core/gnunet-service-core_typemap.c:110
+#: src/core/gnunet-service-core_typemap.c:121
 msgid "# type maps received"
 msgstr ""
 
-#: src/core/gnunet-service-core_typemap.c:156
+#: src/core/gnunet-service-core_typemap.c:151
 msgid "# updates to my type map"
 msgstr ""
 
-#: src/core/gnunet-service-core_neighbours.c:162
+#: src/core/gnunet-service-core_neighbours.c:163
 msgid "# sessions terminated by transport disconnect"
 msgstr ""
 
-#: src/core/gnunet-service-core_neighbours.c:179
+#: src/core/gnunet-service-core_neighbours.c:180
 #: src/core/gnunet-service-core_neighbours.c:343
 msgid "# neighbour entries allocated"
 msgstr ""
 
-#: src/core/gnunet-service-core_neighbours.c:251
+#: src/core/gnunet-service-core_neighbours.c:252
 msgid "# encrypted bytes given to transport"
 msgstr ""
 
-#: src/core/gnunet-service-core_neighbours.c:432
+#: src/core/gnunet-service-core_neighbours.c:430
 #, c-format
 msgid "Unsupported message of type %u received.\n"
 msgstr ""
@@ -439,8 +439,8 @@
 msgid "# bytes decrypted"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:602 src/dv/gnunet-service-dv.c:3000
-#: src/hostlist/hostlist-server.c:439 src/peerinfo-tool/gnunet-peerinfo.c:157
+#: src/core/gnunet-service-core_kx.c:602 src/dv/gnunet-service-dv.c:3002
+#: src/hostlist/hostlist-server.c:436 src/peerinfo-tool/gnunet-peerinfo.c:156
 #, c-format
 msgid "Error in communication with PEERINFO service\n"
 msgstr ""
@@ -449,105 +449,105 @@
 msgid "# Delayed connecting due to lack of public key"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:669
+#: src/core/gnunet-service-core_kx.c:668
 msgid "# key exchanges initiated"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:693
+#: src/core/gnunet-service-core_kx.c:689
 msgid "# key exchanges stopped"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:746
+#: src/core/gnunet-service-core_kx.c:741
 msgid "# session keys received"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:764
+#: src/core/gnunet-service-core_kx.c:760
 #, c-format
 msgid "`%s' is for `%s', not for me.  Ignoring.\n"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:803
+#: src/core/gnunet-service-core_kx.c:798
 msgid "# SET_KEY messages decrypted"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:884
-#: src/transport/gnunet-service-transport_validation.c:601
+#: src/core/gnunet-service-core_kx.c:878
+#: src/transport/gnunet-service-transport_validation.c:781
 msgid "# PING messages received"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:918
+#: src/core/gnunet-service-core_kx.c:912
 #, 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:941
+#: src/core/gnunet-service-core_kx.c:933
 msgid "# PONG messages created"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1029
+#: src/core/gnunet-service-core_kx.c:1021
 msgid "# sessions terminated by timeout"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1042
+#: src/core/gnunet-service-core_kx.c:1032
 msgid "# keepalive messages sent"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1098
-#: src/transport/gnunet-service-transport_validation.c:934
+#: src/core/gnunet-service-core_kx.c:1090
+#: src/transport/gnunet-service-transport_validation.c:991
 msgid "# PONG messages received"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1128
+#: src/core/gnunet-service-core_kx.c:1120
 msgid "# PONG messages decrypted"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1161
+#: src/core/gnunet-service-core_kx.c:1152
 msgid "# session keys confirmed via PONG"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1224
+#: src/core/gnunet-service-core_kx.c:1216
 msgid "# SET_KEY and PING messages created"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1372
+#: src/core/gnunet-service-core_kx.c:1357
 msgid "# failed to decrypt message (no session key)"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1416
-#: src/core/gnunet-service-core_kx.c:1441
+#: src/core/gnunet-service-core_kx.c:1399
+#: src/core/gnunet-service-core_kx.c:1424
 msgid "# bytes dropped (duplicates)"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1428
+#: src/core/gnunet-service-core_kx.c:1411
 msgid "# bytes dropped (out of sequence)"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1465
+#: src/core/gnunet-service-core_kx.c:1448
 #, c-format
 msgid "Message received far too old (%llu ms). Content ignored.\n"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1469
+#: src/core/gnunet-service-core_kx.c:1452
 msgid "# bytes dropped (ancient message)"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1477
+#: src/core/gnunet-service-core_kx.c:1460
 msgid "# bytes of payload decrypted"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1541
+#: src/core/gnunet-service-core_kx.c:1521
 msgid "Core service is lacking HOSTKEY configuration setting.  Exiting.\n"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1549
+#: src/core/gnunet-service-core_kx.c:1529
 msgid "Core service could not access hostkey.  Exiting.\n"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1559
-#: src/transport/gnunet-service-transport.c:540
-#: src/hostlist/hostlist-server.c:558 src/peerinfo-tool/gnunet-peerinfo.c:208
+#: src/core/gnunet-service-core_kx.c:1539
+#: src/transport/gnunet-service-transport.c:537
+#: src/hostlist/hostlist-server.c:555 src/peerinfo-tool/gnunet-peerinfo.c:207
 #, c-format
 msgid "Could not access PEERINFO service.  Exiting.\n"
 msgstr ""
@@ -556,11 +556,11 @@
 msgid "Client was disconnected from core service, trying to reconnect.\n"
 msgstr ""
 
-#: src/vpn/gnunet-daemon-exit.c:1499
+#: src/vpn/gnunet-daemon-exit.c:1513
 msgid "Daemon to run to provide an IP exit node for the VPN"
 msgstr ""
 
-#: src/vpn/gnunet-daemon-vpn.c:1287
+#: src/vpn/gnunet-daemon-vpn.c:1294
 msgid "help text"
 msgstr ""
 
@@ -570,50 +570,50 @@
 "Arguments mandatory for long options are also mandatory for short options.\n"
 msgstr ""
 
-#: src/util/getopt_helpers.c:258 src/util/getopt_helpers.c:287
+#: src/util/getopt_helpers.c:255 src/util/getopt_helpers.c:283
 #, c-format
 msgid "You must pass a number to the `%s' option.\n"
 msgstr ""
 
-#: src/util/common_logging.c:242 src/util/common_logging.c:838
+#: src/util/common_logging.c:239 src/util/common_logging.c:861
 msgid "DEBUG"
 msgstr ""
 
-#: src/util/common_logging.c:244 src/util/common_logging.c:836
+#: src/util/common_logging.c:241 src/util/common_logging.c:859
 msgid "INFO"
 msgstr ""
 
-#: src/util/common_logging.c:246 src/util/common_logging.c:834
+#: src/util/common_logging.c:243 src/util/common_logging.c:857
 msgid "WARNING"
 msgstr ""
 
-#: src/util/common_logging.c:248 src/util/common_logging.c:832
+#: src/util/common_logging.c:245 src/util/common_logging.c:855
 msgid "ERROR"
 msgstr ""
 
-#: src/util/common_logging.c:250 src/util/common_logging.c:840
+#: src/util/common_logging.c:247 src/util/common_logging.c:863
 msgid "NONE"
 msgstr ""
 
-#: src/util/common_logging.c:554
+#: src/util/common_logging.c:579
 #, c-format
 msgid "Failed to create or access directory for log file `%s'\n"
 msgstr ""
 
-#: src/util/common_logging.c:672
+#: src/util/common_logging.c:696
 #, c-format
 msgid "Message `%.*s' repeated %u times in the last %s\n"
 msgstr ""
 
-#: src/util/common_logging.c:841
+#: src/util/common_logging.c:864
 msgid "INVALID"
 msgstr ""
 
-#: src/util/common_logging.c:923
+#: src/util/common_logging.c:946
 msgid "unknown address"
 msgstr ""
 
-#: src/util/common_logging.c:961
+#: src/util/common_logging.c:984
 msgid "invalid address"
 msgstr ""
 
@@ -632,24 +632,28 @@
 msgid "`%s' failed for library `%s' with error: %s\n"
 msgstr ""
 
-#: src/util/configuration.c:249
+#: src/util/plugin.c:349
+msgid "Could not determine plugin installation path.\n"
+msgstr ""
+
+#: src/util/configuration.c:245
 #, c-format
 msgid "Syntax error in configuration file `%s' at line %u.\n"
 msgstr ""
 
-#: src/util/configuration.c:812
+#: src/util/configuration.c:817
 #, c-format
 msgid ""
 "Configuration value '%s' for '%s' in section '%s' is not in set of legal "
 "choices\n"
 msgstr ""
 
-#: src/util/getopt.c:670
+#: src/util/getopt.c:672
 #, c-format
 msgid "%s: option `%s' is ambiguous\n"
 msgstr ""
 
-#: src/util/getopt.c:695
+#: src/util/getopt.c:696
 #, c-format
 msgid "%s: option `--%s' does not allow an argument\n"
 msgstr ""
@@ -659,109 +663,109 @@
 msgid "%s: option `%c%s' does not allow an argument\n"
 msgstr ""
 
-#: src/util/getopt.c:720 src/util/getopt.c:889
+#: src/util/getopt.c:718 src/util/getopt.c:886
 #, c-format
 msgid "%s: option `%s' requires an argument\n"
 msgstr ""
 
-#: src/util/getopt.c:749
+#: src/util/getopt.c:747
 #, c-format
 msgid "%s: unrecognized option `--%s'\n"
 msgstr ""
 
-#: src/util/getopt.c:753
+#: src/util/getopt.c:751
 #, c-format
 msgid "%s: unrecognized option `%c%s'\n"
 msgstr ""
 
-#: src/util/getopt.c:778
+#: src/util/getopt.c:776
 #, c-format
 msgid "%s: illegal option -- %c\n"
 msgstr ""
 
-#: src/util/getopt.c:780
+#: src/util/getopt.c:778
 #, c-format
 msgid "%s: invalid option -- %c\n"
 msgstr ""
 
-#: src/util/getopt.c:808 src/util/getopt.c:938
+#: src/util/getopt.c:806 src/util/getopt.c:934
 #, c-format
 msgid "%s: option requires an argument -- %c\n"
 msgstr ""
 
-#: src/util/getopt.c:856
+#: src/util/getopt.c:854
 #, c-format
 msgid "%s: option `-W %s' is ambiguous\n"
 msgstr ""
 
-#: src/util/getopt.c:874
+#: src/util/getopt.c:872
 #, c-format
 msgid "%s: option `-W %s' does not allow an argument\n"
 msgstr ""
 
-#: src/util/getopt.c:1042
+#: src/util/getopt.c:1038
 #, c-format
 msgid "Use --help to get a list of options.\n"
 msgstr ""
 
-#: src/util/scheduler.c:863
+#: src/util/scheduler.c:860
 msgid "Looks like we're busy waiting...\n"
 msgstr ""
 
-#: src/util/scheduler.c:994
+#: src/util/scheduler.c:990
 #, c-format
 msgid "Attempt to cancel dead task %llu!\n"
 msgstr ""
 
-#: src/util/connection.c:462
+#: src/util/connection.c:461
 #, c-format
 msgid "Access denied to `%s'\n"
 msgstr ""
 
-#: src/util/connection.c:477
+#: src/util/connection.c:476
 #, c-format
 msgid "Accepting connection from `%s': %p\n"
 msgstr ""
 
-#: src/util/connection.c:646
+#: src/util/connection.c:642
 #, c-format
 msgid ""
 "Failed to establish TCP connection to `%s:%u', no further addresses to try.\n"
 msgstr ""
 
-#: src/util/connection.c:858 src/util/connection.c:1034
+#: src/util/connection.c:852 src/util/connection.c:1025
 #, c-format
 msgid "Trying to connect to `%s' (%p)\n"
 msgstr ""
 
-#: src/util/connection.c:869
+#: src/util/connection.c:862
 #, c-format
 msgid "Failed to connect to `%s' (%p)\n"
 msgstr ""
 
-#: src/util/connection.c:1024
+#: src/util/connection.c:1015
 #, c-format
 msgid "Attempt to connect to `%s' failed\n"
 msgstr ""
 
-#: src/util/connection.c:1540
+#: src/util/connection.c:1528
 #, c-format
 msgid ""
 "Could not satisfy pending transmission request, socket closed or connect "
 "failed (%p).\n"
 msgstr ""
 
-#: src/util/connection.c:1576
+#: src/util/connection.c:1564
 #, c-format
 msgid "Failed to send to `%s': %s\n"
 msgstr ""
 
-#: src/util/signal.c:81
+#: src/util/signal.c:80
 #, c-format
 msgid "signal (%d, %p) returned %d.\n"
 msgstr ""
 
-#: src/util/network.c:1204
+#: src/util/network.c:1197
 #, c-format
 msgid ""
 "Fatal internal logic error, process hangs in `%s' (abort with CTRL-C)!\n"
@@ -774,96 +778,80 @@
 "variable.\n"
 msgstr ""
 
-#: src/util/os_installation.c:481
+#: src/util/os_installation.c:477
 #, c-format
 msgid "Could not find binary `%s' in PATH!\n"
 msgstr ""
 
-#: src/util/os_installation.c:486
+#: src/util/os_installation.c:483
 #, c-format
 msgid "stat (%s) failed: %s\n"
 msgstr ""
 
-#: src/util/strings.c:144
+#: src/util/strings.c:143
 msgid "b"
 msgstr ""
 
-#: src/util/strings.c:150
-msgid "KiB"
-msgstr ""
-
-#: src/util/strings.c:154
-msgid "MiB"
-msgstr ""
-
-#: src/util/strings.c:158
-msgid "GiB"
-msgstr ""
-
-#: src/util/strings.c:162
-msgid "TiB"
-msgstr ""
-
-#: src/util/strings.c:198
+#: src/util/strings.c:355
 #, c-format
 msgid "Character set requested was `%s'\n"
 msgstr ""
 
-#: src/util/strings.c:276
+#: src/util/strings.c:433
 msgid "Failed to expand `$HOME': environment variable `HOME' not set"
 msgstr ""
 
-#: src/util/strings.c:368
+#: src/util/strings.c:525
 msgid "ms"
 msgstr ""
 
-#: src/util/strings.c:373
+#: src/util/strings.c:530
 msgid "eternity"
 msgstr ""
 
-#: src/util/strings.c:377
+#: src/util/strings.c:534
 msgid "s"
 msgstr ""
 
-#: src/util/strings.c:381
+#: src/util/strings.c:538
 msgid "m"
 msgstr ""
 
-#: src/util/strings.c:385
+#: src/util/strings.c:542
 msgid "h"
 msgstr ""
 
-#: src/util/strings.c:389
+#: src/util/strings.c:546
 msgid " days"
 msgstr ""
 
-#: src/util/strings.c:413
+#: src/util/strings.c:570
 msgid "end of time"
 msgstr ""
 
-#: src/util/server.c:392
+#: src/util/server.c:388
 #, c-format
 msgid "`%s' failed for port %d (%s).\n"
 msgstr ""
 
-#: src/util/server.c:400
+#: src/util/server.c:397
 #, c-format
 msgid "`%s' failed for port %d (%s): address already in use\n"
 msgstr ""
 
-#: src/util/server.c:405
+#: src/util/server.c:402
 #, c-format
 msgid "`%s' failed for `%s': address already in use\n"
 msgstr ""
 
-#: src/util/server.c:623
+#: src/util/server.c:617
 #, c-format
 msgid ""
 "Processing code for message of type %u did not call "
 "GNUNET_SERVER_receive_done after %llums\n"
 msgstr ""
 
-#: src/util/crypto_random.c:240
+#: src/util/crypto_random.c:239
 #, c-format
 msgid "Starting `%s' process to generate entropy\n"
 msgstr ""
@@ -873,157 +861,157 @@
 msgid "libgcrypt has not the expected version (version %s is required).\n"
 msgstr ""
 
-#: src/util/disk.c:435
+#: src/util/disk.c:434
 #, c-format
 msgid "`%s' failed for drive `%s': %u\n"
 msgstr ""
 
-#: src/util/disk.c:838
+#: src/util/disk.c:834
 #, c-format
 msgid "Expected `%s' to be a directory!\n"
 msgstr ""
 
-#: src/util/disk.c:1189 src/util/service.c:1473
+#: src/util/disk.c:1186 src/util/service.c:1452
 #, c-format
 msgid "Cannot obtain information about user `%s': %s\n"
 msgstr ""
 
-#: src/util/disk.c:1497
+#: src/util/disk.c:1491
 #, c-format
 msgid "No `%s' specified for service `%s' in configuration.\n"
 msgstr ""
 
-#: src/util/service.c:118 src/util/service.c:144 src/util/service.c:188
-#: src/util/service.c:209 src/util/service.c:216
+#: src/util/service.c:117 src/util/service.c:143 src/util/service.c:186
+#: src/util/service.c:207 src/util/service.c:214
 #, c-format
 msgid "Invalid format for IP: `%s'\n"
 msgstr ""
 
-#: src/util/service.c:171
+#: src/util/service.c:170
 #, c-format
 msgid "Invalid network notation ('/%d' is not legal in IPv4 CIDR)."
 msgstr ""
 
-#: src/util/service.c:265
+#: src/util/service.c:263
 #, c-format
 msgid "Invalid network notation (does not end with ';': `%s')\n"
 msgstr ""
 
-#: src/util/service.c:301
+#: src/util/service.c:296
 #, c-format
 msgid "Wrong format `%s' for netmask\n"
 msgstr ""
 
-#: src/util/service.c:332
+#: src/util/service.c:326
 #, c-format
 msgid "Wrong format `%s' for network\n"
 msgstr ""
 
-#: src/util/service.c:638
+#: src/util/service.c:629
 #, c-format
 msgid "Access denied to UID %d / GID %d\n"
 msgstr ""
 
-#: src/util/service.c:643
+#: src/util/service.c:634
 #, c-format
 msgid "Unknown address family %d\n"
 msgstr ""
 
-#: src/util/service.c:650
+#: src/util/service.c:641
 #, c-format
 msgid "Access from `%s' denied to service `%s'\n"
 msgstr ""
 
-#: src/util/service.c:694
+#: src/util/service.c:685
 #, c-format
 msgid "Could not parse IPv4 network specification `%s' for `%s:%s'\n"
 msgstr ""
 
-#: src/util/service.c:723
+#: src/util/service.c:713
 #, c-format
 msgid "Could not parse IPv6 network specification `%s' for `%s:%s'\n"
 msgstr ""
 
-#: src/util/service.c:841
+#: src/util/service.c:830
 #, c-format
 msgid ""
 "Disabling IPv6 support for service `%s', failed to create IPv6 socket: %s\n"
 msgstr ""
 
-#: src/util/service.c:862 src/transport/plugin_transport_tcp.c:1939
+#: src/util/service.c:850 src/transport/plugin_transport_tcp.c:1935
 #, c-format
 msgid "Require valid port number for service `%s' in configuration!\n"
 msgstr ""
 
-#: src/util/service.c:893 src/util/client.c:712
+#: src/util/service.c:880 src/util/client.c:707
 #, c-format
 msgid "UNIXPATH `%s' too long, maximum length is %llu\n"
 msgstr ""
 
-#: src/util/service.c:913
+#: src/util/service.c:900
 #, c-format
 msgid ""
 "Disabling UNIX domain socket support for service `%s', failed to create UNIX "
 "domain socket: %s\n"
 msgstr ""
 
-#: src/util/service.c:930
+#: src/util/service.c:917
 #, c-format
 msgid "Have neither PORT nor UNIXPATH for service `%s', but one is required\n"
 msgstr ""
 
-#: src/util/service.c:960 src/transport/plugin_transport_http.c:903
+#: src/util/service.c:947 src/transport/plugin_transport_http.c:993
 #, c-format
 msgid "Failed to resolve `%s': %s\n"
 msgstr ""
 
-#: src/util/service.c:978 src/transport/plugin_transport_http.c:920
+#: src/util/service.c:964 src/transport/plugin_transport_http.c:1010
 #, c-format
 msgid "Failed to find %saddress for `%s'.\n"
 msgstr ""
 
-#: src/util/service.c:1135 src/util/service.c:1153
+#: src/util/service.c:1120 src/util/service.c:1138
 #, c-format
 msgid "Specified value for `%s' of service `%s' is invalid\n"
 msgstr ""
 
-#: src/util/service.c:1181
+#: src/util/service.c:1165
 #, c-format
 msgid "Could not access pre-bound socket %u, will try to bind myself\n"
 msgstr ""
 
-#: src/util/service.c:1333
+#: src/util/service.c:1314
 #, c-format
 msgid "Failed to start `%s' at `%s'\n"
 msgstr ""
 
-#: src/util/service.c:1366
+#: src/util/service.c:1347
 #, c-format
 msgid "Service `%s' runs at %s\n"
 msgstr ""
 
-#: src/util/service.c:1414
+#: src/util/service.c:1393
 msgid "Service process failed to initialize\n"
 msgstr ""
 
-#: src/util/service.c:1418
+#: src/util/service.c:1397
 msgid "Service process could not initialize server function\n"
 msgstr ""
 
-#: src/util/service.c:1422
+#: src/util/service.c:1401
 msgid "Service process failed to report status\n"
 msgstr ""
 
-#: src/util/service.c:1474
+#: src/util/service.c:1453
 msgid "No such user"
 msgstr ""
 
-#: src/util/service.c:1488
+#: src/util/service.c:1466
 #, c-format
 msgid "Cannot change user/group to `%s': %s\n"
 msgstr ""
 
-#: src/util/service.c:1551
+#: src/util/service.c:1529
 msgid "do daemonize (detach from terminal)"
 msgstr ""
 
@@ -1031,7 +1019,7 @@
 msgid "Test GNUnet DNS resolver code."
 msgstr ""
 
-#: src/util/os_priority.c:117
+#: src/util/os_priority.c:114
 #, c-format
 msgid "Not installing a handler because $%s=%s\n"
 msgstr ""
@@ -1047,215 +1035,215 @@
 "Must specify `%s' or numeric IP address for `%s' of `%s' in configuration!\n"
 msgstr ""
 
-#: src/util/resolver_api.c:356
+#: src/util/resolver_api.c:358
 #, c-format
 msgid "Timeout trying to resolve IP address `%s'.\n"
 msgstr ""
 
-#: src/util/resolver_api.c:360
+#: src/util/resolver_api.c:362
 #, c-format
 msgid "Timeout trying to resolve hostname `%s'.\n"
 msgstr ""
 
-#: src/util/resolver_api.c:428
+#: src/util/resolver_api.c:430
 #, c-format
 msgid "Resolver returns `%s' for IP `%s'.\n"
 msgstr ""
 
-#: src/util/resolver_api.c:793
+#: src/util/resolver_api.c:791
 #, c-format
 msgid "Resolver returns `%s'.\n"
 msgstr ""
 
-#: src/util/resolver_api.c:877
+#: src/util/resolver_api.c:875
 #, c-format
 msgid "Resolving our FQDN `%s'\n"
 msgstr ""
 
-#: src/util/resolver_api.c:882
+#: src/util/resolver_api.c:880
 #, c-format
 msgid "Could not resolve our FQDN : %s\n"
 msgstr ""
 
-#: src/util/resolver_api.c:914
+#: src/util/resolver_api.c:912
 #, c-format
 msgid "Resolving our hostname `%s'\n"
 msgstr ""
 
-#: src/util/pseudonym.c:269
+#: src/util/pseudonym.c:266
 #, c-format
 msgid "Failed to parse metadata about pseudonym from file `%s': %s\n"
 msgstr ""
 
-#: src/util/pseudonym.c:333
+#: src/util/pseudonym.c:330
 msgid "no-name"
 msgstr ""
 
-#: src/util/gnunet-service-resolver.c:262
+#: src/util/gnunet-service-resolver.c:261
 #, c-format
 msgid "Could not resolve `%s' (%s): %s\n"
 msgstr ""
 
-#: src/util/gnunet-service-resolver.c:318
-#: src/util/gnunet-service-resolver.c:363
+#: src/util/gnunet-service-resolver.c:317
+#: src/util/gnunet-service-resolver.c:362
 #, c-format
 msgid "Could not find IP of host `%s': %s\n"
 msgstr ""
 
-#: src/util/gnunet-service-resolver.c:462
+#: src/util/gnunet-service-resolver.c:460
 #, c-format
 msgid "Resolver asked to look up `%s'.\n"
 msgstr ""
 
-#: src/util/gnunet-service-resolver.c:509
+#: src/util/gnunet-service-resolver.c:508
 #, c-format
 msgid "Resolver asked to look up IP address `%s'.\n"
 msgstr ""
 
-#: src/util/bio.c:137 src/util/bio.c:143
+#: src/util/bio.c:136 src/util/bio.c:142
 #, c-format
 msgid "Error reading `%s': %s"
 msgstr ""
 
-#: src/util/bio.c:144
+#: src/util/bio.c:143
 msgid "End of file"
 msgstr ""
 
-#: src/util/bio.c:196
+#: src/util/bio.c:195
 #, c-format
 msgid "Error reading length of string `%s'"
 msgstr ""
 
-#: src/util/bio.c:208
+#: src/util/bio.c:205
 #, c-format
 msgid "String `%s' longer than allowed (%u > %u)"
 msgstr ""
 
-#: src/util/bio.c:254
+#: src/util/bio.c:250
 #, c-format
 msgid "Serialized metadata `%s' larger than allowed (%u>%u)"
 msgstr ""
 
-#: src/util/bio.c:268
+#: src/util/bio.c:264
 #, c-format
 msgid "Metadata `%s' failed to deserialize"
 msgstr ""
 
-#: src/util/client.c:303
+#: src/util/client.c:301
 #, c-format
 msgid ""
 "Could not determine valid hostname and port for service `%s' from "
 "configuration.\n"
 msgstr ""
 
-#: src/util/client.c:311
+#: src/util/client.c:309
 #, c-format
 msgid "Need a non-empty hostname for service `%s'.\n"
 msgstr ""
 
-#: src/util/client.c:652
+#: src/util/client.c:647
 msgid "Failure to transmit TEST request.\n"
 msgstr ""
 
-#: src/util/client.c:857
+#: src/util/client.c:849
 #, c-format
 msgid "Could not connect to service `%s', must not be running.\n"
 msgstr ""
 
-#: src/util/client.c:874
+#: src/util/client.c:865
 #, c-format
 msgid "Failure to transmit request to service `%s'\n"
 msgstr ""
 
-#: src/util/client.c:1143
+#: src/util/client.c:1133
 msgid "Could not submit request, not expecting to receive a response.\n"
 msgstr ""
 
-#: src/util/crypto_rsa.c:624 src/util/crypto_rsa.c:672
+#: src/util/crypto_rsa.c:616 src/util/crypto_rsa.c:663
 #, c-format
 msgid "Could not aquire lock on file `%s': %s...\n"
 msgstr ""
 
-#: src/util/crypto_rsa.c:629
+#: src/util/crypto_rsa.c:621
 msgid "Creating a new private key.  This may take a while.\n"
 msgstr ""
 
-#: src/util/crypto_rsa.c:648
+#: src/util/crypto_rsa.c:639
 #, c-format
 msgid "I am host `%s'.  Stored new private key in `%s'.\n"
 msgstr ""
 
-#: src/util/crypto_rsa.c:676 src/util/crypto_rsa.c:714
+#: src/util/crypto_rsa.c:667 src/util/crypto_rsa.c:703
 msgid "This may be ok if someone is currently generating a hostkey.\n"
 msgstr ""
 
-#: src/util/crypto_rsa.c:709
+#: src/util/crypto_rsa.c:698
 #, c-format
 msgid ""
 "When trying to read hostkey file `%s' I found %u bytes but I need at least "
 "%u.\n"
 msgstr ""
 
-#: src/util/crypto_rsa.c:730
+#: src/util/crypto_rsa.c:718
 #, c-format
 msgid "File `%s' does not contain a valid private key.  Deleting it.\n"
 msgstr ""
 
-#: src/util/crypto_rsa.c:748
+#: src/util/crypto_rsa.c:736
 #, c-format
 msgid "I am host `%s'.  Read private key from `%s'.\n"
 msgstr ""
 
-#: src/util/crypto_rsa.c:970
+#: src/util/crypto_rsa.c:957
 #, c-format
 msgid "RSA signature verification failed at %s:%d: %s\n"
 msgstr ""
 
-#: src/nse/gnunet-nse-profiler.c:650 src/dht/gnunet-dht-get.c:213
+#: src/nse/gnunet-nse-profiler.c:646 src/dht/gnunet-dht-get.c:213
 #: src/dht/gnunet-dht-put.c:184 src/fs/gnunet-unindex.c:169
 #: src/fs/gnunet-search.c:297 src/fs/gnunet-publish.c:591
 #: src/fs/gnunet-download.c:263
 msgid "be verbose (print progress information)"
 msgstr ""
 
-#: src/nse/gnunet-nse-profiler.c:668
+#: src/nse/gnunet-nse-profiler.c:664
 msgid "Measure quality and performance of the NSE service."
 msgstr ""
 
-#: src/nse/gnunet-service-nse.c:875
+#: src/nse/gnunet-service-nse.c:878
 #, c-format
 msgid "Proof of work invalid: %llu!\n"
 msgstr ""
 
-#: src/nse/gnunet-service-nse.c:1298 src/nse/gnunet-service-nse.c:1317
-#: src/nse/gnunet-service-nse.c:1338
+#: src/nse/gnunet-service-nse.c:1301 src/nse/gnunet-service-nse.c:1320
+#: src/nse/gnunet-service-nse.c:1341
 msgid "NSE service is lacking key configuration settings.  Exiting.\n"
 msgstr ""
 
-#: src/nse/gnunet-service-nse.c:1305
+#: src/nse/gnunet-service-nse.c:1308
 msgid "Invalid work requirement for NSE service. Exiting.\n"
 msgstr ""
 
-#: src/nse/gnunet-service-nse.c:1326
+#: src/nse/gnunet-service-nse.c:1329
 msgid "NSE service could not access hostkey.  Exiting.\n"
 msgstr ""
 
-#: src/peerinfo/gnunet-service-peerinfo.c:136
+#: src/peerinfo/gnunet-service-peerinfo.c:134
 #, c-format
 msgid "Removing expired address of transport `%s'\n"
 msgstr ""
 
-#: src/peerinfo/gnunet-service-peerinfo.c:197
+#: src/peerinfo/gnunet-service-peerinfo.c:196
 msgid "# peers known"
 msgstr ""
 
-#: src/peerinfo/gnunet-service-peerinfo.c:241
+#: src/peerinfo/gnunet-service-peerinfo.c:240
 #, c-format
 msgid ""
 "File `%s' in directory `%s' does not match naming convention. Removed.\n"
 msgstr ""
 
-#: src/peerinfo/gnunet-service-peerinfo.c:306
+#: src/peerinfo/gnunet-service-peerinfo.c:305
 #, c-format
 msgid "Still no peers found in `%s'!\n"
 msgstr ""
@@ -1265,46 +1253,46 @@
 msgid "Could not connect to `%s' service.\n"
 msgstr ""
 
-#: src/peerinfo/peerinfo_api.c:278
+#: src/peerinfo/peerinfo_api.c:279
 #, c-format
 msgid "Failed to transmit message to `%s' service.\n"
 msgstr ""
 
-#: src/peerinfo/peerinfo_api.c:433
+#: src/peerinfo/peerinfo_api.c:435
 msgid "Failed to receive response from `PEERINFO' service."
 msgstr ""
 
-#: src/peerinfo/peerinfo_api.c:461 src/peerinfo/peerinfo_api.c:479
+#: src/peerinfo/peerinfo_api.c:463 src/peerinfo/peerinfo_api.c:481
 msgid "Received invalid message from `PEERINFO' service.\n"
 msgstr ""
 
-#: src/peerinfo/peerinfo_api.c:521
+#: src/peerinfo/peerinfo_api.c:523
 msgid "Failed to transmit iteration request to `PEERINFO' service\n"
 msgstr ""
 
-#: src/peerinfo/peerinfo_api.c:555
+#: src/peerinfo/peerinfo_api.c:557
 msgid "Timeout transmitting iteration request to `PEERINFO' service.\n"
 msgstr ""
 
-#: src/datacache/plugin_datacache_sqlite.c:439
+#: src/datacache/plugin_datacache_sqlite.c:424
 msgid "Sqlite datacache running\n"
 msgstr ""
 
-#: src/datacache/datacache.c:177
+#: src/datacache/datacache.c:176
 #, c-format
 msgid "Loading `%s' datacache plugin\n"
 msgstr ""
 
-#: src/datacache/datacache.c:185
+#: src/datacache/datacache.c:184
 #, c-format
 msgid "Failed to load datacache plugin for `%s'\n"
 msgstr ""
 
-#: src/datacache/datacache.c:276
+#: src/datacache/datacache.c:274
 msgid "# requests received"
 msgstr ""
 
-#: src/datacache/datacache.c:287
+#: src/datacache/datacache.c:284
 msgid "# requests filtered by bloom filter"
 msgstr ""
 
@@ -1333,78 +1321,78 @@
 msgid "# FIND PEER messages initiated"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:632
-#: src/dht/gnunet-service-dht_neighbours.c:697
+#: src/dht/gnunet-service-dht_neighbours.c:627
+#: src/dht/gnunet-service-dht_neighbours.c:687
 msgid "# Peers connected"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:734
+#: src/dht/gnunet-service-dht_neighbours.c:721
 msgid "# Queued messages discarded (peer disconnected)"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:787
+#: src/dht/gnunet-service-dht_neighbours.c:776
 msgid "# Bytes transmitted to other peers"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:824
+#: src/dht/gnunet-service-dht_neighbours.c:814
 msgid "# Bytes of bandwdith requested from core"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1051
-#: src/dht/gnunet-service-dht_neighbours.c:1078
+#: src/dht/gnunet-service-dht_neighbours.c:1038
+#: src/dht/gnunet-service-dht_neighbours.c:1066
 msgid "# Peers excluded from routing due to Bloomfilter"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1060
-#: src/dht/gnunet-service-dht_neighbours.c:1096
+#: src/dht/gnunet-service-dht_neighbours.c:1047
+#: src/dht/gnunet-service-dht_neighbours.c:1083
 msgid "# Peer selection failed"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1238
+#: src/dht/gnunet-service-dht_neighbours.c:1219
 msgid "# PUT requests routed"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1267
+#: src/dht/gnunet-service-dht_neighbours.c:1250
 msgid "# PUT messages queued for transmission"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1352
+#: src/dht/gnunet-service-dht_neighbours.c:1331
 msgid "# GET requests routed"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1384
+#: src/dht/gnunet-service-dht_neighbours.c:1362
 msgid "# GET messages queued for transmission"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1485
+#: src/dht/gnunet-service-dht_neighbours.c:1465
 msgid "# RESULT messages queued for transmission"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1574
+#: src/dht/gnunet-service-dht_neighbours.c:1553
 msgid "# P2P PUT requests received"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1700
+#: src/dht/gnunet-service-dht_neighbours.c:1662
 msgid "# FIND PEER requests ignored due to Bloomfilter"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1707
+#: src/dht/gnunet-service-dht_neighbours.c:1670
 msgid "# FIND PEER requests ignored due to lack of HELLO"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1800
+#: src/dht/gnunet-service-dht_neighbours.c:1761
 msgid "# P2P GET requests received"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1853
+#: src/dht/gnunet-service-dht_neighbours.c:1805
 msgid "# P2P FIND PEER requests processed"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1872
+#: src/dht/gnunet-service-dht_neighbours.c:1819
 msgid "# P2P GET requests ONLY routed"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1941
+#: src/dht/gnunet-service-dht_neighbours.c:1885
 msgid "# P2P RESULTS received"
 msgstr ""
 
@@ -1412,7 +1400,7 @@
 msgid "Failed to connect to the DHT service!\n"
 msgstr ""
 
-#: src/dht/gnunet-service-dht.c:165
+#: src/dht/gnunet-service-dht.c:163
 msgid "Failed to connect to transport service!\n"
 msgstr ""
 
@@ -1436,45 +1424,45 @@
 msgid "Issue a GET request to the GNUnet DHT, prints results."
 msgstr ""
 
-#: src/dht/gnunet-service-dht_clients.c:321
+#: src/dht/gnunet-service-dht_clients.c:311
 msgid "# GET requests from clients injected"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_clients.c:413
+#: src/dht/gnunet-service-dht_clients.c:402
 msgid "# PUT requests received from clients"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_clients.c:486
+#: src/dht/gnunet-service-dht_clients.c:469
 msgid "# GET requests received from clients"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_clients.c:585
+#: src/dht/gnunet-service-dht_clients.c:564
 msgid "# GET STOP requests received from clients"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_clients.c:790
+#: src/dht/gnunet-service-dht_clients.c:757
 msgid "# Key match, type mismatches in REPLY to CLIENT"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_clients.c:808
+#: src/dht/gnunet-service-dht_clients.c:772
 msgid "# Duplicate REPLIES to CLIENT request dropped"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_clients.c:852
+#: src/dht/gnunet-service-dht_clients.c:809
 #, c-format
 msgid "Unsupported block type (%u) in request!\n"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_clients.c:875
+#: src/dht/gnunet-service-dht_clients.c:831
 msgid "# RESULTS queued for clients"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_clients.c:928
-#: src/dht/gnunet-service-dht_clients.c:971
+#: src/dht/gnunet-service-dht_clients.c:882
+#: src/dht/gnunet-service-dht_clients.c:925
 msgid "# REPLIES ignored for CLIENTS (no match)"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_clients.c:937
+#: src/dht/gnunet-service-dht_clients.c:892
 msgid "Could not pass reply to client, message too big!\n"
 msgstr ""
 
@@ -1527,32 +1515,32 @@
 msgid "Issue a PUT request to the GNUnet DHT insert DATA under KEY."
 msgstr ""
 
-#: src/dht/gnunet-service-dht_routing.c:220
+#: src/dht/gnunet-service-dht_routing.c:211
 msgid "# Good REPLIES matched against routing table"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_routing.c:235
+#: src/dht/gnunet-service-dht_routing.c:220
 msgid "# Duplicate REPLIES matched against routing table"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_routing.c:240
+#: src/dht/gnunet-service-dht_routing.c:226
 msgid "# Invalid REPLIES matched against routing table"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_routing.c:249
+#: src/dht/gnunet-service-dht_routing.c:236
 msgid "# Unsupported REPLIES matched against routing table"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_routing.c:332
-#: src/dht/gnunet-service-dht_routing.c:390
+#: src/dht/gnunet-service-dht_routing.c:314
+#: src/dht/gnunet-service-dht_routing.c:368
 msgid "# Entries removed from routing table"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_routing.c:342
+#: src/dht/gnunet-service-dht_routing.c:324
 msgid "# Entries added to routing table"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_datacache.c:92
+#: src/dht/gnunet-service-dht_datacache.c:93
 #, c-format
 msgid "%s request received, but have no datacache!\n"
 msgstr ""
@@ -1561,32 +1549,32 @@
 msgid "# ITEMS stored in datacache"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_datacache.c:215
+#: src/dht/gnunet-service-dht_datacache.c:209
 msgid "# Good RESULTS found in datacache"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_datacache.c:229
+#: src/dht/gnunet-service-dht_datacache.c:220
 msgid "# Duplicate RESULTS found in datacache"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_datacache.c:234
+#: src/dht/gnunet-service-dht_datacache.c:226
 msgid "# Invalid RESULTS found in datacache"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_datacache.c:245
+#: src/dht/gnunet-service-dht_datacache.c:238
 msgid "# Unsupported RESULTS found in datacache"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_datacache.c:248
+#: src/dht/gnunet-service-dht_datacache.c:241
 #, c-format
 msgid "Unsupported block type (%u) in local response!\n"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_datacache.c:280
+#: src/dht/gnunet-service-dht_datacache.c:271
 msgid "# GET requests given to datacache"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_hello.c:86
+#: src/dht/gnunet-service-dht_hello.c:82
 msgid "# HELLOs obtained from peerinfo"
 msgstr ""
 
@@ -1880,31 +1868,31 @@
 msgid "# messages defragmented"
 msgstr ""
 
-#: src/fragmentation/fragmentation.c:183
+#: src/fragmentation/fragmentation.c:188
 msgid "# fragments transmitted"
 msgstr ""
 
-#: src/fragmentation/fragmentation.c:186
+#: src/fragmentation/fragmentation.c:191
 msgid "# fragments retransmitted"
 msgstr ""
 
-#: src/fragmentation/fragmentation.c:248
+#: src/fragmentation/fragmentation.c:254
 msgid "# messages fragmented"
 msgstr ""
 
-#: src/fragmentation/fragmentation.c:251
+#: src/fragmentation/fragmentation.c:257
 msgid "# total size of fragmented messages"
 msgstr ""
 
-#: src/fragmentation/fragmentation.c:335
+#: src/fragmentation/fragmentation.c:342
 msgid "# fragment acknowledgements received"
 msgstr ""
 
-#: src/fragmentation/fragmentation.c:341
+#: src/fragmentation/fragmentation.c:348
 msgid "# bits removed from fragmentation ACKs"
 msgstr ""
 
-#: src/fragmentation/fragmentation.c:365
+#: src/fragmentation/fragmentation.c:372
 msgid "# fragmentation transmissions completed"
 msgstr ""
 
@@ -1918,7 +1906,7 @@
 msgid "Wrote %llu bytes of statistics to `%s'\n"
 msgstr ""
 
-#: src/statistics/statistics_api.c:325
+#: src/statistics/statistics_api.c:327
 msgid "Failed to connect to statistics service!\n"
 msgstr ""
 
@@ -2050,48 +2038,48 @@
 msgid "Manage GNUnet pseudonyms."
 msgstr ""
 
-#: src/fs/fs_namespace.c:52 src/fs/fs_namespace.c:78
+#: src/fs/fs_namespace.c:64 src/fs/fs_namespace.c:90
 #, c-format
 msgid "Configuration fails to specify `%s' in section `%s'\n"
 msgstr ""
 
-#: src/fs/fs_namespace.c:107
+#: src/fs/fs_namespace.c:119
 #, c-format
 msgid "Failed to open `%s' for writing: %s\n"
 msgstr ""
 
-#: src/fs/fs_namespace.c:129 src/fs/fs_namespace.c:217
+#: src/fs/fs_namespace.c:141 src/fs/fs_namespace.c:229
 #, c-format
 msgid "Failed to write `%s': %s\n"
 msgstr ""
 
-#: src/fs/fs_namespace.c:323
+#: src/fs/fs_namespace.c:335
 msgid "Unknown error"
 msgstr ""
 
-#: src/fs/fs_namespace.c:412 src/fs/fs_namespace.c:433
+#: src/fs/fs_namespace.c:424 src/fs/fs_namespace.c:445
 msgid "Failed to serialize meta data"
 msgstr ""
 
-#: src/fs/fs_namespace.c:452
+#: src/fs/fs_namespace.c:464
 msgid "Failed to connect to datastore service"
 msgstr ""
 
-#: src/fs/fs_namespace.c:495
+#: src/fs/fs_namespace.c:507
 #, c-format
 msgid "Failed to create or read private key for namespace `%s'\n"
 msgstr ""
 
-#: src/fs/fs_namespace.c:597
+#: src/fs/fs_namespace.c:609
 #, c-format
 msgid "Failed to read namespace private key file `%s', deleting it!\n"
 msgstr ""
 
-#: src/fs/fs_namespace.c:822 src/fs/fs_publish.c:1518
+#: src/fs/fs_namespace.c:834 src/fs/fs_publish.c:1523
 msgid "Internal error."
 msgstr ""
 
-#: src/fs/fs_namespace.c:866
+#: src/fs/fs_namespace.c:878
 msgid "Failed to connect to datastore."
 msgstr ""
 
@@ -2202,11 +2190,11 @@
 msgid "Could not access hostkey file `%s'.\n"
 msgstr ""
 
-#: src/fs/fs_uri.c:1238 src/fs/fs_uri.c:1265
+#: src/fs/fs_uri.c:1232 src/fs/fs_uri.c:1259
 msgid "No keywords specified!\n"
 msgstr ""
 
-#: src/fs/fs_uri.c:1271
+#: src/fs/fs_uri.c:1265
 msgid "Number of double-quotes not balanced!\n"
 msgstr ""
 
@@ -2266,7 +2254,7 @@
 msgstr ""
 
 #: src/fs/gnunet-publish.c:393 src/fs/gnunet-publish.c:400
-#: src/transport/gnunet-transport.c:525
+#: src/transport/gnunet-transport.c:477
 #, c-format
 msgid "Option `%s' makes no sense without option `%s'.\n"
 msgstr ""
@@ -2357,13 +2345,13 @@
 msgid "Publish a file or directory on GNUnet"
 msgstr ""
 
-#: src/fs/fs_search.c:798
+#: src/fs/fs_search.c:803
 #, c-format
 msgid "Got result with unknown block type `%d', ignoring"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_lc.c:202 src/fs/gnunet-service-fs_lc.c:359
-#: src/fs/gnunet-service-fs_lc.c:480
+#: src/fs/gnunet-service-fs_lc.c:202 src/fs/gnunet-service-fs_lc.c:365
+#: src/fs/gnunet-service-fs_lc.c:490
 msgid "# client searches active"
 msgstr ""
 
@@ -2371,11 +2359,11 @@
 msgid "# replies received for local clients"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_lc.c:312
+#: src/fs/gnunet-service-fs_lc.c:319
 msgid "# client searches received"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_lc.c:351
+#: src/fs/gnunet-service-fs_lc.c:359
 msgid "# client searches updated (merged content seen list)"
 msgstr ""
 
@@ -2417,224 +2405,226 @@
 msgid "Display contents of a GNUnet directory"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:272
+#: src/fs/gnunet-service-fs_pr.c:287
 msgid "# Pending requests created"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:352 src/fs/gnunet-service-fs_pr.c:607
+#: src/fs/gnunet-service-fs_pr.c:368 src/fs/gnunet-service-fs_pr.c:622
 msgid "# Pending requests active"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:771
+#: src/fs/gnunet-service-fs_pr.c:786
 msgid "# replies received and matched"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:798
+#: src/fs/gnunet-service-fs_pr.c:813
 msgid "# duplicate replies discarded (bloomfilter)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:814
+#: src/fs/gnunet-service-fs_pr.c:829
 #, c-format
 msgid "Unsupported block type %u\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:829
+#: src/fs/gnunet-service-fs_pr.c:844
 msgid "# results found locally"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:921
+#: src/fs/gnunet-service-fs_pr.c:936
 msgid "# Datastore `PUT' failures"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:948
+#: src/fs/gnunet-service-fs_pr.c:963
 msgid "# storage requests dropped due to high load"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:983
+#: src/fs/gnunet-service-fs_pr.c:998
 msgid "# Replies received from DHT"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1074
+#: src/fs/gnunet-service-fs_pr.c:1088
 #, c-format
 msgid "Datastore lookup already took %llu ms!\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1095
+#: src/fs/gnunet-service-fs_pr.c:1109
 #, c-format
 msgid "On-demand lookup already took %llu ms!\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1142
+#: src/fs/gnunet-service-fs_pr.c:1156
 msgid "# Datastore lookups concluded (no results)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1156
+#: src/fs/gnunet-service-fs_pr.c:1170
 msgid "# Datastore lookups concluded (seen all)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1165
+#: src/fs/gnunet-service-fs_pr.c:1179
 msgid "# Datastore lookups aborted (more than MAX_RESULTS)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1181
+#: src/fs/gnunet-service-fs_pr.c:1195
 msgid "# requested DBLOCK or IBLOCK not found"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1198
+#: src/fs/gnunet-service-fs_pr.c:1212
 msgid "# on-demand blocks matched requests"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1211
+#: src/fs/gnunet-service-fs_pr.c:1225
 msgid "# on-demand lookups performed successfully"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1216
+#: src/fs/gnunet-service-fs_pr.c:1230
 msgid "# on-demand lookups failed"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1242 src/fs/gnunet-service-fs_pr.c:1281
-#: src/fs/gnunet-service-fs_pr.c:1416
+#: src/fs/gnunet-service-fs_pr.c:1257 src/fs/gnunet-service-fs_pr.c:1297
+#: src/fs/gnunet-service-fs_pr.c:1437
 msgid "# Datastore lookups concluded (error queueing)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1299
+#: src/fs/gnunet-service-fs_pr.c:1315
 msgid "# Datastore lookups concluded (found last result)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1312
+#: src/fs/gnunet-service-fs_pr.c:1328
 msgid "# Datastore lookups concluded (load too high)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1394
+#: src/fs/gnunet-service-fs_pr.c:1414
 msgid "# Datastore lookups initiated"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1474
+#: src/fs/gnunet-service-fs_pr.c:1495
 msgid "# GAP PUT messages received"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1565 src/fs/gnunet-service-fs_pr.c:1576
+#: src/fs/gnunet-service-fs_pr.c:1586 src/fs/gnunet-service-fs_pr.c:1595
 #, c-format
 msgid "Configuration fails to specify `%s', assuming default value."
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pe.c:259
+#: src/fs/gnunet-service-fs_pe.c:265
 msgid "# average retransmission delay (ms)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pe.c:354
+#: src/fs/gnunet-service-fs_pe.c:392
 msgid "# transmission failed (core has no bandwidth)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pe.c:385
+#: src/fs/gnunet-service-fs_pe.c:423
 msgid "# query messages sent to other peers"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pe.c:440
+#: src/fs/gnunet-service-fs_pe.c:476
 msgid "# delay heap timeout"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pe.c:450
+#: src/fs/gnunet-service-fs_pe.c:483
 msgid "# query plans executed"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pe.c:516
+#: src/fs/gnunet-service-fs_pe.c:547
 msgid "# requests merged"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pe.c:522
+#: src/fs/gnunet-service-fs_pe.c:553
 msgid "# requests refreshed"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pe.c:576 src/fs/gnunet-service-fs_pe.c:665
-#: src/fs/gnunet-service-fs_pe.c:706
+#: src/fs/gnunet-service-fs_pe.c:606 src/fs/gnunet-service-fs_pe.c:692
+#: src/fs/gnunet-service-fs_pe.c:734
 msgid "# query plan entries"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:618 src/fs/gnunet-service-fs_cp.c:1552
-#: src/transport/gnunet-service-transport_neighbours.c:870
-#: src/transport/gnunet-service-transport_neighbours.c:2036
-#: src/transport/gnunet-service-transport_neighbours.c:2123
-#: src/topology/gnunet-daemon-topology.c:653
-#: src/topology/gnunet-daemon-topology.c:755
+#: src/fs/gnunet-service-fs_cp.c:615 src/fs/gnunet-service-fs_cp.c:1543
+#: src/transport/gnunet-service-transport_neighbours.c:938
+#: src/transport/gnunet-service-transport_neighbours.c:943
+#: src/transport/gnunet-service-transport_neighbours.c:1266
+#: src/transport/gnunet-service-transport_neighbours.c:2352
+#: src/transport/gnunet-service-transport_neighbours.c:2423
+#: src/topology/gnunet-daemon-topology.c:654
+#: src/topology/gnunet-daemon-topology.c:756
 msgid "# peers connected"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:701
+#: src/fs/gnunet-service-fs_cp.c:696
 msgid "# migration stop messages received"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:705
+#: src/fs/gnunet-service-fs_cp.c:700
 #, c-format
 msgid "Migration of content to peer `%s' blocked for %llu ms\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:740
+#: src/fs/gnunet-service-fs_cp.c:735
 msgid "# replies transmitted to other peers"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:746
+#: src/fs/gnunet-service-fs_cp.c:741
 msgid "# replies dropped"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:775 src/fs/gnunet-service-fs_cp.c:891
-#: src/fs/gnunet-service-fs_cp.c:1301 src/fs/gnunet-service-fs_cp.c:1340
+#: src/fs/gnunet-service-fs_cp.c:770 src/fs/gnunet-service-fs_cp.c:886
+#: src/fs/gnunet-service-fs_cp.c:1296 src/fs/gnunet-service-fs_cp.c:1333
 msgid "# P2P searches active"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:848
+#: src/fs/gnunet-service-fs_cp.c:843
 msgid "# artificial delays introduced (ms)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:911
+#: src/fs/gnunet-service-fs_cp.c:906
 msgid "# replies received for other peers"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:925
+#: src/fs/gnunet-service-fs_cp.c:920
 msgid "# replies dropped due to insufficient cover traffic"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:963
+#: src/fs/gnunet-service-fs_cp.c:958
 msgid "# P2P searches destroyed due to ultimate reply"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1030
+#: src/fs/gnunet-service-fs_cp.c:1025
 msgid "# requests done for free (low load)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1054
+#: src/fs/gnunet-service-fs_cp.c:1049
 msgid "# request dropped, priority insufficient"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1064
+#: src/fs/gnunet-service-fs_cp.c:1059
 msgid "# requests done for a price (normal load)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1143
+#: src/fs/gnunet-service-fs_cp.c:1138
 msgid "# GET requests received (from other peers)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1177
+#: src/fs/gnunet-service-fs_cp.c:1172
 msgid "# requests dropped due to initiator not being connected"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1201
+#: src/fs/gnunet-service-fs_cp.c:1196
 msgid "# requests dropped due to missing reverse route"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1267
+#: src/fs/gnunet-service-fs_cp.c:1262
 msgid "# requests dropped due TTL underflow"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1295
+#: src/fs/gnunet-service-fs_cp.c:1290
 msgid "# requests dropped due to higher-TTL request"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1338
+#: src/fs/gnunet-service-fs_cp.c:1331
 msgid "# P2P query messages received and processed"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_push.c:642
+#: src/fs/gnunet-service-fs_push.c:653
 #, c-format
 msgid ""
 "Invalid value specified for option `%s' in section `%s', content pushing "
@@ -2675,16 +2665,20 @@
 msgid "Failed to delete bogus block: %s\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_indexing.c:552
+#: src/fs/gnunet-service-fs_indexing.c:545
+msgid "# index blocks removed: original file inaccessible"
+msgstr ""
+
+#: src/fs/gnunet-service-fs_indexing.c:560
 #, c-format
 msgid "Could not access indexed file `%s' (%s) at offset %llu: %s\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_indexing.c:554
+#: src/fs/gnunet-service-fs_indexing.c:562
 msgid "not indexed"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_indexing.c:569
+#: src/fs/gnunet-service-fs_indexing.c:577
 #, c-format
 msgid "Indexed file `%s' changed at offset %llu\n"
 msgstr ""
@@ -2808,140 +2802,140 @@
 "`unknown' instead.\n"
 msgstr ""
 
-#: src/fs/fs_publish.c:142 src/fs/fs_publish.c:410
+#: src/fs/fs_publish.c:147 src/fs/fs_publish.c:415
 #, c-format
 msgid "Publishing failed: %s"
 msgstr ""
 
-#: src/fs/fs_publish.c:647 src/fs/fs_publish.c:664 src/fs/fs_publish.c:703
-#: src/fs/fs_publish.c:723 src/fs/fs_publish.c:750 src/fs/fs_publish.c:898
+#: src/fs/fs_publish.c:652 src/fs/fs_publish.c:669 src/fs/fs_publish.c:708
+#: src/fs/fs_publish.c:728 src/fs/fs_publish.c:755 src/fs/fs_publish.c:903
 #, c-format
 msgid "Can not index file `%s': %s.  Will try to insert instead.\n"
 msgstr ""
 
-#: src/fs/fs_publish.c:649
+#: src/fs/fs_publish.c:654
 msgid "timeout on index-start request to `fs' service"
 msgstr ""
 
-#: src/fs/fs_publish.c:661
+#: src/fs/fs_publish.c:666
 msgid "unknown error"
 msgstr ""
 
-#: src/fs/fs_publish.c:704
+#: src/fs/fs_publish.c:709
 msgid "failed to compute hash"
 msgstr ""
 
-#: src/fs/fs_publish.c:724
+#: src/fs/fs_publish.c:729
 msgid "filename too long"
 msgstr ""
 
-#: src/fs/fs_publish.c:751
+#: src/fs/fs_publish.c:756
 msgid "could not connect to `fs' service"
 msgstr ""
 
-#: src/fs/fs_publish.c:775
+#: src/fs/fs_publish.c:780
 #, c-format
 msgid "Failed to get file identifiers for `%s'\n"
 msgstr ""
 
-#: src/fs/fs_publish.c:845
+#: src/fs/fs_publish.c:850
 #, c-format
 msgid "Recursive upload failed at `%s': %s"
 msgstr ""
 
-#: src/fs/fs_publish.c:851
+#: src/fs/fs_publish.c:856
 #, c-format
 msgid "Recursive upload failed: %s"
 msgstr ""
 
-#: src/fs/fs_publish.c:899
+#: src/fs/fs_publish.c:904
 msgid "needs to be an actual file"
 msgstr ""
 
-#: src/fs/fs_publish.c:1078
+#: src/fs/fs_publish.c:1083
 #, c-format
 msgid "Insufficient space for publishing: %s"
 msgstr ""
 
-#: src/fs/fs_publish.c:1149
+#: src/fs/fs_publish.c:1154
 #, c-format
 msgid "Reserving space for %u entries and %llu bytes for publication\n"
 msgstr ""
 
-#: src/fs/fs_publish.c:1482
+#: src/fs/fs_publish.c:1487
 msgid "Could not connect to datastore."
 msgstr ""
 
-#: src/fs/fs.c:284
+#: src/fs/fs_api.c:284
 #, c-format
 msgid "Could not open file `%s': %s"
 msgstr ""
 
-#: src/fs/fs.c:293
+#: src/fs/fs_api.c:293
 #, c-format
 msgid "Could not read file `%s': %s"
 msgstr ""
 
-#: src/fs/fs.c:299
+#: src/fs/fs_api.c:299
 #, c-format
 msgid "Short read reading from file `%s'!"
 msgstr ""
 
-#: src/fs/fs.c:877
+#: src/fs/fs_api.c:877
 #, c-format
 msgid "Failed to resume publishing information `%s': %s\n"
 msgstr ""
 
-#: src/fs/fs.c:1323
+#: src/fs/fs_api.c:1323
 #, c-format
 msgid "Failed to recover namespace `%s', cannot resume publishing operation.\n"
 msgstr ""
 
-#: src/fs/fs.c:1364
+#: src/fs/fs_api.c:1364
 #, c-format
 msgid "Failure while resuming publishing operation `%s': %s\n"
 msgstr ""
 
-#: src/fs/fs.c:1380
+#: src/fs/fs_api.c:1380
 #, c-format
 msgid "Failed to resume publishing operation `%s': %s\n"
 msgstr ""
 
-#: src/fs/fs.c:1984
+#: src/fs/fs_api.c:1984
 #, c-format
 msgid "Failure while resuming unindexing operation `%s': %s\n"
 msgstr ""
 
-#: src/fs/fs.c:1994
+#: src/fs/fs_api.c:1994
 #, c-format
 msgid "Failed to resume unindexing operation `%s': %s\n"
 msgstr ""
 
-#: src/fs/fs.c:2107 src/fs/fs.c:2346
+#: src/fs/fs_api.c:2107 src/fs/fs_api.c:2346
 #, c-format
 msgid "Failed to resume sub-download `%s': %s\n"
 msgstr ""
 
-#: src/fs/fs.c:2124
+#: src/fs/fs_api.c:2124
 #, c-format
 msgid "Failed to resume sub-search `%s': %s\n"
 msgstr ""
 
-#: src/fs/fs.c:2136 src/fs/fs.c:2155 src/fs/fs.c:2631
+#: src/fs/fs_api.c:2136 src/fs/fs_api.c:2155 src/fs/fs_api.c:2631
 #, c-format
 msgid "Failure while resuming search operation `%s': %s\n"
 msgstr ""
 
-#: src/fs/fs.c:2337
+#: src/fs/fs_api.c:2337
 #, c-format
 msgid "Failed to resume sub-download `%s': could not open file `%s'\n"
 msgstr ""
 
-#: src/fs/fs.c:2583
+#: src/fs/fs_api.c:2583
 msgid "Could not resume running search, will resume as paused search\n"
 msgstr ""
 
-#: src/fs/fs.c:2669
+#: src/fs/fs_api.c:2669
 #, c-format
 msgid "Failure while resuming download operation `%s': %s\n"
 msgstr ""
@@ -2996,12 +2990,16 @@
 msgid "Invalid URI"
 msgstr ""
 
-#: src/fs/gnunet-service-fs.c:268 src/fs/gnunet-service-fs.c:448
+#: src/fs/gnunet-service-fs.c:240
+msgid "# running average P2P latency (ms)"
+msgstr ""
+
+#: src/fs/gnunet-service-fs.c:300 src/fs/gnunet-service-fs.c:490
 msgid "# Loopback routes suppressed"
 msgstr ""
 
-#: src/fs/gnunet-service-fs.c:542 src/topology/gnunet-daemon-topology.c:1292
-#: src/topology/gnunet-daemon-topology.c:1299
+#: src/fs/gnunet-service-fs.c:583 src/topology/gnunet-daemon-topology.c:1290
+#: src/topology/gnunet-daemon-topology.c:1297
 #: src/hostlist/gnunet-daemon-hostlist.c:290
 #, c-format
 msgid "Failed to connect to `%s' service.\n"
@@ -3012,67 +3010,87 @@
 msgid "`%s' failed on file `%s': %s"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:435
+#: src/transport/gnunet-service-transport_neighbours.c:465
 msgid "# failed connection attempts due to timeout"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:819
+#: src/transport/gnunet-service-transport_neighbours.c:857
 msgid "# peers disconnected due to external request"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:925
+#: src/transport/gnunet-service-transport_neighbours.c:947
+msgid "# fast reconnects failed"
+msgstr ""
+
+#: src/transport/gnunet-service-transport_neighbours.c:1002
 msgid "# peers disconnected due to timeout"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:949
+#: src/transport/gnunet-service-transport_neighbours.c:1027
 msgid "# keepalives sent"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:981
+#: src/transport/gnunet-service-transport_neighbours.c:1068
 msgid "# peers disconnected due to global disconnect"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1543
-#: src/transport/gnunet-service-transport_neighbours.c:1564
+#: src/transport/gnunet-service-transport_neighbours.c:1774
+#: src/transport/gnunet-service-transport_neighbours.c:1795
 msgid "# messages not sent (no such peer or not connected)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1580
+#: src/transport/gnunet-service-transport_neighbours.c:1811
 msgid "# bytes in message queue for other peers"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1632
+#: src/transport/gnunet-service-transport_neighbours.c:1863
 msgid "# messages discarded due to lack of neighbour record"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1668
+#: src/transport/gnunet-service-transport_neighbours.c:1899
 msgid "# bandwidth quota violations by other peers"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1686
+#: src/transport/gnunet-service-transport_neighbours.c:1917
 msgid "# ms throttling suggested"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1715
+#: src/transport/gnunet-service-transport_neighbours.c:1946
 msgid "# KEEPALIVE messages discarded (not connected)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1749
+#: src/transport/gnunet-service-transport_neighbours.c:1995
+msgid "# KEEPALIVE_RESPONSE messages discarded (not connected)"
+msgstr ""
+
+#: src/transport/gnunet-service-transport_neighbours.c:2003
+msgid "# KEEPALIVE_RESPONSE messages discarded (not expected)"
+msgstr ""
+
+#: src/transport/gnunet-service-transport_neighbours.c:2064
 msgid "# SET QUOTA messages ignored (no such peer)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1762
+#: src/transport/gnunet-service-transport_neighbours.c:2082
 msgid "# disconnects due to quota of 0"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1884
+#: src/transport/gnunet-service-transport_neighbours.c:2200
 msgid "# disconnect messages ignored (old format)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1896
+#: src/transport/gnunet-service-transport_neighbours.c:2213
 msgid "# disconnect messages ignored (timestamp)"
 msgstr ""
 
+#: src/transport/gnunet-service-transport_neighbours.c:2302
+msgid "# unexpected CONNECT_ACK messages"
+msgstr ""
+
+#: src/transport/gnunet-service-transport_neighbours.c:2400
+msgid "# unexpected ACK messages"
+msgstr ""
+
 #: src/transport/gnunet-service-transport_blacklist.c:247
 #, c-format
 msgid "Could not read blacklist file `%s'\n"
@@ -3111,53 +3129,51 @@
 msgstr ""
 
 #: src/transport/gnunet-service-transport_blacklist.c:522
-#: src/transport/gnunet-service-transport_blacklist.c:760
+#: src/transport/gnunet-service-transport_blacklist.c:756
 msgid "# disconnects due to blacklist"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:184
+#: src/transport/plugin_transport_http_server.c:189
 msgid ""
 "Could not create a new TLS certificate, program `gnunet-transport-"
 "certificate-creation' could not be started!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:208
+#: src/transport/plugin_transport_http_server.c:213
 msgid "No usable TLS certificate found and creating one failed!\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_hello.c:177
+#: src/transport/gnunet-service-transport_hello.c:172
 msgid "# refreshed my HELLO"
 msgstr ""
 
-#: src/transport/plugin_transport_udp.c:1431
-#: src/transport/plugin_transport_udp.c:2130
-msgid "# HELLO beacons received via udp"
+#: src/transport/plugin_transport_udp.c:1518
+msgid "# IPv4 broadcast HELLO beacons received via udp"
 msgstr ""
 
-#: src/transport/plugin_transport_udp.c:1894
-#: src/transport/plugin_transport_udp_new.c:1209
+#: src/transport/plugin_transport_udp.c:1555
+msgid "# IPv6 multicast HELLO beacons received via udp"
+msgstr ""
+
+#: src/transport/plugin_transport_udp.c:2041
+#: src/transport/plugin_transport_udp_new.c:1218
 #, c-format
 msgid "Given `%s' option is out of range: %llu > %u\n"
 msgstr ""
 
-#: src/transport/plugin_transport_udp.c:1947
-#: src/transport/plugin_transport_udp_new.c:1259
+#: src/transport/plugin_transport_udp.c:2092
+#: src/transport/plugin_transport_udp_new.c:1268
 #, c-format
 msgid "Invalid IPv6 address: `%s'\n"
 msgstr ""
 
-#: src/transport/plugin_transport_udp.c:2102
+#: src/transport/plugin_transport_udp.c:2235
 #, c-format
-msgid "Failed to create IPv4 broadcast socket on port %d\n"
-msgstr ""
-
-#: src/transport/plugin_transport_udp.c:2112
-#, c-format
 msgid "Failed to set IPv4 broadcast option for broadcast socket on port %d\n"
 msgstr ""
 
-#: src/transport/plugin_transport_udp.c:2144
-#: src/transport/plugin_transport_udp_new.c:1388
+#: src/transport/plugin_transport_udp.c:2274
+#: src/transport/plugin_transport_udp_new.c:1396
 msgid "Failed to open UDP sockets\n"
 msgstr ""
 
@@ -3171,7 +3187,7 @@
 msgid "%s failed at %s:%d: `%s'\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_client.c:617
+#: src/transport/plugin_transport_http_client.c:619
 #, c-format
 msgid "Could not initialize curl multi handle, failed to start %s plugin!\n"
 msgstr ""
@@ -3183,15 +3199,15 @@
 
 #: src/transport/plugin_transport_tcp.c:590
 #: src/transport/plugin_transport_tcp.c:679
-#: src/transport/plugin_transport_tcp.c:732
-#: src/transport/plugin_transport_tcp.c:821
-#: src/transport/plugin_transport_tcp.c:1160
+#: src/transport/plugin_transport_tcp.c:731
+#: src/transport/plugin_transport_tcp.c:820
+#: src/transport/plugin_transport_tcp.c:1156
 msgid "# bytes currently in TCP buffers"
 msgstr ""
 
 #: src/transport/plugin_transport_tcp.c:596
-#: src/transport/plugin_transport_tcp.c:847
-#: src/transport/plugin_transport_tcp.c:1548
+#: src/transport/plugin_transport_tcp.c:846
+#: src/transport/plugin_transport_tcp.c:1544
 msgid "# TCP sessions active"
 msgstr ""
 
@@ -3199,119 +3215,119 @@
 msgid "# bytes discarded by TCP (timeout)"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:735
+#: src/transport/plugin_transport_tcp.c:734
 msgid "# bytes transmitted via TCP"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:825
+#: src/transport/plugin_transport_tcp.c:824
 msgid "# bytes discarded by TCP (disconnect)"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:946
+#: src/transport/plugin_transport_tcp.c:945
 msgid "# bytes TCP was asked to transmit"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:997
+#: src/transport/plugin_transport_tcp.c:996
 msgid "# bytes discarded by TCP (no address and no connection)"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:1040
+#: src/transport/plugin_transport_tcp.c:1039
 #, c-format
 msgid "Address of unexpected length: %u\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:1057
+#: src/transport/plugin_transport_tcp.c:1056
 msgid "Found valid IPv4 NAT address (creating session)!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:1108
+#: src/transport/plugin_transport_tcp.c:1107
 msgid "# bytes discarded by TCP (failed to connect)"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:1228
+#: src/transport/plugin_transport_tcp.c:1224
 msgid "# transport-service disconnect requests for TCP"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:1591
+#: src/transport/plugin_transport_tcp.c:1587
 msgid "# TCP WELCOME messages received"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:1736
+#: src/transport/plugin_transport_tcp.c:1732
 msgid "# bytes received via TCP"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:1800
+#: src/transport/plugin_transport_tcp.c:1796
 msgid "# network-level TCP disconnect events"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:1953
+#: src/transport/plugin_transport_tcp.c:1949
 msgid "Failed to start service.\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2013
+#: src/transport/plugin_transport_tcp.c:2009
 #, c-format
 msgid "Failed to find option %s in section %s!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2036
+#: src/transport/plugin_transport_tcp.c:2032
 #, c-format
 msgid "TCP transport listening on port %llu\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2040
+#: src/transport/plugin_transport_tcp.c:2036
 msgid "TCP transport not listening on any port (client only)\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2044
+#: src/transport/plugin_transport_tcp.c:2040
 #, c-format
 msgid "TCP transport advertises itself as being on port %llu\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http.c:829
+#: src/transport/plugin_transport_http.c:920
 msgid "Disabling IPv6 since it is not supported on this system!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http.c:878
+#: src/transport/plugin_transport_http.c:968
 msgid "Require valid port number for service in configuration!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http.c:1025
+#: src/transport/plugin_transport_http.c:1115
 #, c-format
 msgid "Found %u addresses to report to NAT service\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http.c:1040
+#: src/transport/plugin_transport_http.c:1128
 #, c-format
 msgid "FREEING %s\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http.c:1115
+#: src/transport/plugin_transport_http.c:1203
 msgid "Neither IPv4 nor IPv6 are enabled! Fix in configuration\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http.c:1128
+#: src/transport/plugin_transport_http.c:1216
 msgid "Port is required! Fix in configuration\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http.c:1139
+#: src/transport/plugin_transport_http.c:1227
 msgid "Port 0, client only mode\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http.c:1155
+#: src/transport/plugin_transport_http.c:1247
 #, c-format
 msgid ""
 "Specific IPv4 address `%s' for plugin %s in configuration file is invalid! "
 "Binding to all addresses!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http.c:1181
+#: src/transport/plugin_transport_http.c:1277
 #, c-format
 msgid ""
 "Specific IPv6 address `%s' for plugin %s in configuration file is invalid! "
 "Binding to all addresses!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_unix.c:1088
+#: src/transport/plugin_transport_unix.c:1087
 msgid "Failed to open UNIX sockets\n"
 msgstr ""
 
@@ -3357,266 +3373,270 @@
 msgid "# bytes dropped by SMTP (outgoing)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_plugins.c:108
+#: src/transport/gnunet-service-transport_plugins.c:109
 msgid "Transport service is lacking NEIGHBOUR_LIMIT option.\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_plugins.c:115
+#: src/transport/gnunet-service-transport_plugins.c:116
 #, c-format
 msgid "Starting transport plugins `%s'\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_plugins.c:119
+#: src/transport/gnunet-service-transport_plugins.c:120
 #, c-format
 msgid "Loading `%s' transport plugin\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_plugins.c:139
+#: src/transport/gnunet-service-transport_plugins.c:147
 #, c-format
 msgid "Failed to load transport plugin for `%s'\n"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:877
+#: src/transport/plugin_transport_wlan.c:884
 msgid "# wlan session timeouts"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:902
+#: src/transport/plugin_transport_wlan.c:909
 msgid "# wlan session created"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:985
-#: src/transport/plugin_transport_wlan.c:1143
-#: src/transport/plugin_transport_wlan.c:1163
-#: src/transport/plugin_transport_wlan.c:1193
-#: src/transport/plugin_transport_wlan.c:2376
-#: src/transport/plugin_transport_wlan.c:3210
+#: src/transport/plugin_transport_wlan.c:993
+#: src/transport/plugin_transport_wlan.c:1157
+#: src/transport/plugin_transport_wlan.c:1178
+#: src/transport/plugin_transport_wlan.c:1209
+#: src/transport/plugin_transport_wlan.c:2447
+#: src/transport/plugin_transport_wlan.c:3304
 msgid "# wlan pending sessions"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:1237
-#: src/transport/plugin_transport_wlan.c:1941
+#: src/transport/plugin_transport_wlan.c:1252
+#: src/transport/plugin_transport_wlan.c:2000
 msgid "# wlan pending fragments"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:1459
+#: src/transport/plugin_transport_wlan.c:1475
 #, c-format
 msgid "Finished reading from wlan-helper stdout with code: %d\n"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:1782
+#: src/transport/plugin_transport_wlan.c:1840
 msgid "# wlan hello beacons send"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:1814
-#: src/transport/plugin_transport_wlan.c:2028
-#: src/transport/plugin_transport_wlan.c:2121
+#: src/transport/plugin_transport_wlan.c:1873
+#: src/transport/plugin_transport_wlan.c:2089
+#: src/transport/plugin_transport_wlan.c:2184
 #, c-format
 msgid "Error writing to wlan healper. errno == %d, ERROR: %s\n"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:2015
+#: src/transport/plugin_transport_wlan.c:2075
 msgid "# wlan acks send"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:2084
+#: src/transport/plugin_transport_wlan.c:2146
 msgid "# wlan fragments send"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:2243
+#: src/transport/plugin_transport_wlan.c:2312
 #, c-format
 msgid "Wlan Address len %d is wrong\n"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:2248
+#: src/transport/plugin_transport_wlan.c:2317
 msgid "# wlan messages queued"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:2338
-#: src/transport/plugin_transport_wlan.c:2977
-#: src/transport/plugin_transport_wlan.c:3212
+#: src/transport/plugin_transport_wlan.c:2408
+#: src/transport/plugin_transport_wlan.c:3060
+#: src/transport/plugin_transport_wlan.c:3307
 msgid "# wlan mac endpoints"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:2561
+#: src/transport/plugin_transport_wlan.c:2636
 msgid "# wlan whole messages received"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:2759
+#: src/transport/plugin_transport_wlan.c:2836
 msgid "# wlan hello messages received"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:2793
+#: src/transport/plugin_transport_wlan.c:2873
 msgid "# wlan fragments received"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:2845
+#: src/transport/plugin_transport_wlan.c:2925
 msgid "# wlan acks received"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:2938
+#: src/transport/plugin_transport_wlan.c:3020
 msgid "# wlan mac endpoints timeouts"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:2961
+#: src/transport/plugin_transport_wlan.c:3044
 msgid "# wlan mac endpoints created"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:3017
+#: src/transport/plugin_transport_wlan.c:3102
 msgid "# wlan WLAN_HELPER_DATA received"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:3068
+#: src/transport/plugin_transport_wlan.c:3158
 msgid "# wlan messages for this client received"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:3076
+#: src/transport/plugin_transport_wlan.c:3169
 msgid "# wlan messages inside WLAN_HELPER_DATA received"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:251
+#: src/transport/gnunet-transport.c:245
 #, c-format
 msgid "No transport plugins configured, peer will never communicate\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:268
+#: src/transport/gnunet-transport.c:258
 #, c-format
 msgid "No port configured for plugin `%s', cannot test it\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:321
+#: src/transport/gnunet-transport.c:308
 #, c-format
 msgid "Received %llu bytes/s (%llu bytes in %llu ms)\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:330
+#: src/transport/gnunet-transport.c:315
 #, c-format
 msgid "Transmitted %llu bytes/s (%llu bytes in %llu ms)\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:369
+#: src/transport/gnunet-transport.c:348
 #, c-format
 msgid "Transmitting %u bytes to %s\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:395
+#: src/transport/gnunet-transport.c:368
 #, c-format
 msgid "Connected to %s\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:436
+#: src/transport/gnunet-transport.c:399
 #, c-format
 msgid "Disconnected from %s\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:476
+#: src/transport/gnunet-transport.c:428
 #, c-format
 msgid "Received %u bytes from %s\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:498
+#: src/transport/gnunet-transport.c:448
 #, c-format
 msgid "Peer `%s' plugin: `%s' address `%s'\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:536
+#: src/transport/gnunet-transport.c:486
 #, c-format
 msgid "Failed to parse peer identity `%s'\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:574
+#: src/transport/gnunet-transport.c:522
 msgid "measure how fast we are receiving data (until CTRL-C)"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:577
+#: src/transport/gnunet-transport.c:525
 msgid "try to connect to the given peer"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:580
+#: src/transport/gnunet-transport.c:528
 msgid "provide information about all current connections (once)"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:583
+#: src/transport/gnunet-transport.c:532
 msgid "send data for benchmarking to the other peer (until CTRL-C)"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:586
+#: src/transport/gnunet-transport.c:535
 msgid "test transport configuration (involves external server)"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:593
+#: src/transport/gnunet-transport.c:543
 msgid "Direct access to transport service."
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:515
+#: src/transport/gnunet-service-transport_validation.c:412
 msgid "# address records discarded"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:628
+#: src/transport/gnunet-service-transport_validation.c:458
 #, c-format
 msgid ""
-"Not confirming PING with address `%s' since I cannot confirm having this "
-"address.\n"
+"Not transmitting `%s' with `%s', message too big (%u bytes!). This should "
+"not happen.\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:696
-msgid "# PONGs unicast via reliable transport"
+#: src/transport/gnunet-service-transport_validation.c:493
+msgid "# PING without HELLO messages sent"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:705
-msgid "# PONGs multicast to all available addresses"
+#: src/transport/gnunet-service-transport_validation.c:552
+msgid "# address revalidations started"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:769
+#: src/transport/gnunet-service-transport_validation.c:776
+msgid "# PING message for different peer received"
+msgstr ""
+
+#: src/transport/gnunet-service-transport_validation.c:812
 #, c-format
 msgid ""
-"Not transmitting `%s' with `%s', message too big (%u bytes!). This should "
-"not happen.\n"
+"Not confirming PING with address `%s' since I cannot confirm having this "
+"address.\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:803
-msgid "# PING without HELLO messages sent"
+#: src/transport/gnunet-service-transport_validation.c:882
+msgid "# PONGs unicast via reliable transport"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:875
-msgid "# address revalidations started"
+#: src/transport/gnunet-service-transport_validation.c:891
+msgid "# PONGs multicast to all available addresses"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:956
+#: src/transport/gnunet-service-transport_validation.c:1015
 msgid "# PONGs dropped, no matching pending validation"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:972
+#: src/transport/gnunet-service-transport_validation.c:1040
 msgid "# PONGs dropped, signature expired"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1050
+#: src/transport/gnunet-service-transport_validation.c:1099
 #, c-format
 msgid "Adding `%s' without addresses for peer `%s'\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_clients.c:250
+#: src/transport/gnunet-service-transport_clients.c:254
 #, 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:255
+#: src/transport/gnunet-service-transport_clients.c:259
 msgid "# messages dropped due to slow client"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_clients.c:405
+#: src/transport/gnunet-service-transport_clients.c:406
 #, c-format
 msgid "Rejecting control connection from peer `%s', which is not me!\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_clients.c:522
+#: src/transport/gnunet-service-transport_clients.c:523
 msgid "# bytes payload received for other peers"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_clients.c:539
+#: src/transport/gnunet-service-transport_clients.c:540
 msgid "# bytes payload dropped (other peer was not connected)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_clients.c:590
+#: src/transport/gnunet-service-transport_clients.c:591
 msgid "# REQUEST CONNECT messages received"
 msgstr ""
 
@@ -3625,15 +3645,15 @@
 msgid "Received unexpected message of type %u in %s:%u\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport.c:159
+#: src/transport/gnunet-service-transport.c:156
 msgid "# bytes payload discarded due to not connected peer "
 msgstr ""
 
-#: src/transport/gnunet-service-transport.c:517
+#: src/transport/gnunet-service-transport.c:514
 msgid "Transport service is lacking key configuration settings.  Exiting.\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport.c:526
+#: src/transport/gnunet-service-transport.c:523
 msgid "Transport service could not access hostkey.  Exiting.\n"
 msgstr ""
 
@@ -3650,96 +3670,96 @@
 msgid "# peers blacklisted"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:379
+#: src/topology/gnunet-daemon-topology.c:380
 msgid "# connect requests issued to transport"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:674
-#: src/topology/gnunet-daemon-topology.c:760
+#: src/topology/gnunet-daemon-topology.c:675
+#: src/topology/gnunet-daemon-topology.c:761
 msgid "# friends connected"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:877
-#: src/hostlist/hostlist-server.c:187
+#: src/topology/gnunet-daemon-topology.c:875
+#: src/hostlist/hostlist-server.c:184
 #, c-format
 msgid "Error in communication with PEERINFO service: %s\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:952
+#: src/topology/gnunet-daemon-topology.c:950
 msgid "Failed to connect to core service, can not manage topology!\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:984
+#: src/topology/gnunet-daemon-topology.c:982
 #, c-format
 msgid "Option `%s' in section `%s' not specified!\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:996
+#: src/topology/gnunet-daemon-topology.c:994
 #, c-format
 msgid "Could not read friends list `%s'\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:1002
+#: src/topology/gnunet-daemon-topology.c:1000
 #, c-format
 msgid "Friends file `%s' is empty.\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:1011
+#: src/topology/gnunet-daemon-topology.c:1009
 #, c-format
 msgid "Failed to read friends list from `%s': out of memory\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:1019
+#: src/topology/gnunet-daemon-topology.c:1017
 #, c-format
 msgid "Failed to read friends list from `%s'\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:1039
+#: src/topology/gnunet-daemon-topology.c:1037
 #, c-format
 msgid ""
 "Syntax error in topology specification at offset %llu, skipping bytes.\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:1052
+#: src/topology/gnunet-daemon-topology.c:1050
 #, c-format
 msgid ""
 "Syntax error in topology specification at offset %llu, skipping bytes `%s'.\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:1062
+#: src/topology/gnunet-daemon-topology.c:1060
 #, c-format
 msgid "Found friend `%s' in configuration\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:1068
+#: src/topology/gnunet-daemon-topology.c:1066
 #, c-format
 msgid "Found myself `%s' in friend list (useless, ignored)\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:1078
+#: src/topology/gnunet-daemon-topology.c:1076
 msgid "# friends in configuration"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:1084
+#: src/topology/gnunet-daemon-topology.c:1082
 msgid ""
 "Fewer friends specified than required by minimum friend count. Will only "
 "connect to friends.\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:1091
+#: src/topology/gnunet-daemon-topology.c:1089
 msgid ""
 "More friendly connections required than target total number of connections.\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:1128
+#: src/topology/gnunet-daemon-topology.c:1126
 msgid "# HELLO messages received"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:1185
+#: src/topology/gnunet-daemon-topology.c:1183
 msgid "# HELLO messages gossipped"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:1325
+#: src/topology/gnunet-daemon-topology.c:1323
 msgid "GNUnet topology control (maintaining P2P mesh and F2F constraints)"
 msgstr ""
 
@@ -4010,33 +4030,33 @@
 msgid "GNUnet NAT traversal test helper daemon"
 msgstr ""
 
-#: src/nat/nat.c:776
+#: src/nat/nat.c:803
 #, c-format
 msgid "gnunet-helper-nat-server generated malformed address `%s'\n"
 msgstr ""
 
-#: src/nat/nat.c:825
+#: src/nat/nat.c:852
 #, c-format
 msgid "Failed to start %s\n"
 msgstr ""
 
-#: src/nat/nat.c:1094
+#: src/nat/nat.c:1121
 #, c-format
 msgid "Malformed %s `%s' given in configuration!\n"
 msgstr ""
 
-#: src/nat/nat.c:1156 src/nat/nat.c:1166
+#: src/nat/nat.c:1187 src/nat/nat.c:1197
 #, c-format
 msgid ""
 "Configuration requires `%s', but binary is not installed properly (SUID bit "
 "not set).  Option disabled.\n"
 msgstr ""
 
-#: src/nat/nat.c:1298
+#: src/nat/nat.c:1329
 msgid "Internal IP address not known, cannot use ICMP NAT traversal method\n"
 msgstr ""
 
-#: src/nat/nat.c:1310
+#: src/nat/nat.c:1341
 #, c-format
 msgid "Running gnunet-helper-nat-client %s %s %u\n"
 msgstr ""
@@ -4050,43 +4070,38 @@
 msgid "Failed to create listen socket bound to `%s' for NAT test: %s\n"
 msgstr ""
 
-#: src/block/plugin_block_dht.c:122
+#: src/dht/plugin_block_dht.c:124
 #, c-format
 msgid "Block not of type %u\n"
 msgstr ""
 
-#: src/block/plugin_block_dht.c:129
+#: src/dht/plugin_block_dht.c:131
 msgid "Size mismatch for block\n"
 msgstr ""
 
-#: src/block/plugin_block_dht.c:138
+#: src/dht/plugin_block_dht.c:140
 #, c-format
 msgid "Block of type %u is malformed\n"
 msgstr ""
 
-#: src/block/plugin_block_fs.c:131
+#: src/fs/plugin_block_fs.c:131
 msgid "Reply mismatched in terms of namespace.  Discarded.\n"
 msgstr ""
 
-#: src/block/block.c:109
+#: src/block/block.c:105
 #, c-format
-msgid "Loading block plugins `%s'\n"
+msgid "Loading block plugin `%s'\n"
 msgstr ""
 
-#: src/block/block.c:119
-#, c-format
-msgid "Failed to load block plugin `%s'\n"
-msgstr ""
-
-#: src/mesh/gnunet-service-mesh.c:4206
+#: src/mesh/gnunet-service-mesh.c:4192
 msgid "MESH: Wrong CORE service\n"
 msgstr ""
 
-#: src/mesh/gnunet-service-mesh.c:4410
+#: src/mesh/gnunet-service-mesh.c:4397
 msgid "Mesh service is lacking key configuration settings.  Exiting.\n"
 msgstr ""
 
-#: src/mesh/gnunet-service-mesh.c:4419
+#: src/mesh/gnunet-service-mesh.c:4406
 msgid "Mesh service could not access hostkey.  Exiting.\n"
 msgstr ""
 
@@ -4300,108 +4315,108 @@
 msgid "bytes in hostlist"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:160
+#: src/hostlist/hostlist-server.c:157
 msgid "expired addresses encountered"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:208
+#: src/hostlist/hostlist-server.c:205
 msgid "HELLOs without addresses encountered (ignored)"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:224
+#: src/hostlist/hostlist-server.c:221
 msgid "bytes not included in hostlist (size limit)"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:272
+#: src/hostlist/hostlist-server.c:269
 #, c-format
 msgid "Refusing `%s' request to hostlist server\n"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:275
+#: src/hostlist/hostlist-server.c:272
 msgid "hostlist requests refused (not HTTP GET)"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:283
+#: src/hostlist/hostlist-server.c:280
 msgid "Sending 100 CONTINUE reply\n"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:290
+#: src/hostlist/hostlist-server.c:287
 #, c-format
 msgid "Refusing `%s' request with %llu bytes of upload data\n"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:294
+#: src/hostlist/hostlist-server.c:291
 msgid "hostlist requests refused (upload data)"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:302
+#: src/hostlist/hostlist-server.c:299
 msgid "Could not handle hostlist request since I do not have a response yet\n"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:305
+#: src/hostlist/hostlist-server.c:302
 msgid "hostlist requests refused (not ready)"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:309
+#: src/hostlist/hostlist-server.c:306
 msgid "Received request for our hostlist\n"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:310
+#: src/hostlist/hostlist-server.c:307
 msgid "hostlist requests processed"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:353
+#: src/hostlist/hostlist-server.c:350
 msgid "# hostlist advertisements send"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:400
+#: src/hostlist/hostlist-server.c:397
 msgid "Advertisement message could not be queued by core\n"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:568
+#: src/hostlist/hostlist-server.c:565
 #, c-format
 msgid "Invalid port number %llu.  Exiting.\n"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:577
+#: src/hostlist/hostlist-server.c:574
 #, c-format
 msgid "Hostlist service starts on %s:%llu\n"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:591
+#: src/hostlist/hostlist-server.c:588
 #, c-format
 msgid "Address to obtain hostlist: `%s'\n"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:629
+#: src/hostlist/hostlist-server.c:626
 #, c-format
 msgid "Could not start hostlist HTTP server on port %u\n"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:222
+#: src/peerinfo-tool/gnunet-peerinfo.c:221
 #, c-format
 msgid "Could not find option `%s:%s' in configuration.\n"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:229
+#: src/peerinfo-tool/gnunet-peerinfo.c:228
 #, c-format
 msgid "Loading hostkey from `%s' failed.\n"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:241
+#: src/peerinfo-tool/gnunet-peerinfo.c:240
 #, c-format
 msgid "I am peer `%s'.\n"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:261
+#: src/peerinfo-tool/gnunet-peerinfo.c:260
 msgid "output only the identity strings"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:264
+#: src/peerinfo-tool/gnunet-peerinfo.c:263
 msgid "output our own identity only"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:270
+#: src/peerinfo-tool/gnunet-peerinfo.c:269
 msgid "Print information about peers."
 msgstr ""
 
@@ -4429,18 +4444,18 @@
 msgid "use configuration file FILENAME"
 msgstr ""
 
-#: src/include/gnunet_common.h:352 src/include/gnunet_common.h:357
-#: src/include/gnunet_common.h:363
+#: src/include/gnunet_common.h:361 src/include/gnunet_common.h:366
+#: src/include/gnunet_common.h:372
 #, c-format
 msgid "Assertion failed at %s:%d.\n"
 msgstr ""
 
-#: src/include/gnunet_common.h:373
+#: src/include/gnunet_common.h:382
 #, c-format
 msgid "External protocol violation detected at %s:%d.\n"
 msgstr ""
 
-#: src/include/gnunet_common.h:394 src/include/gnunet_common.h:401
+#: src/include/gnunet_common.h:403 src/include/gnunet_common.h:410
 #, c-format
 msgid "`%s' failed on file `%s' at %s:%d with error: %s\n"
 msgstr ""

Modified: gnunet/po/sv.gmo
===================================================================
(Binary files differ)

Modified: gnunet/po/sv.po
===================================================================
--- gnunet/po/sv.po     2011-11-23 10:05:05 UTC (rev 18268)
+++ gnunet/po/sv.po     2011-11-23 10:05:21 UTC (rev 18269)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: GNUnet 0.7.0b\n"
 "Report-Msgid-Bugs-To: address@hidden"
-"POT-Creation-Date: 2011-11-03 13:55+0100\n"
+"POT-Creation-Date: 2011-11-23 11:01+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"
@@ -29,8 +29,8 @@
 #: src/datacache/plugin_datacache_mysql.c:517
 #: src/datacache/plugin_datacache_mysql.c:526
 #: src/datacache/plugin_datacache_mysql.c:598
-#: src/datacache/plugin_datacache_mysql.c:614 src/include/gnunet_common.h:380
-#: src/include/gnunet_common.h:387
+#: src/datacache/plugin_datacache_mysql.c:614 src/include/gnunet_common.h:389
+#: src/include/gnunet_common.h:396
 #, c-format
 msgid "`%s' failed at %s:%d with error: %s\n"
 msgstr "\"%s\" misslyckades vid %s:%d med fel: %s\n"
@@ -50,27 +50,27 @@
 msgid "Unable to initialize SQLite: %s.\n"
 msgstr "Kunde inte initiera SQLite.\n"
 
-#: src/datastore/plugin_datastore_sqlite.c:420
-#: src/datacache/plugin_datacache_sqlite.c:471
+#: src/datastore/plugin_datastore_sqlite.c:414
+#: src/datacache/plugin_datacache_sqlite.c:457
 msgid "Tried to close sqlite without finalizing all prepared statements.\n"
 msgstr ""
 
-#: src/datastore/plugin_datastore_sqlite.c:677
+#: src/datastore/plugin_datastore_sqlite.c:671
 msgid "Invalid data in database.  Trying to fix (by deletion).\n"
 msgstr ""
 
-#: src/datastore/plugin_datastore_sqlite.c:1130
+#: src/datastore/plugin_datastore_sqlite.c:1124
 msgid "sqlite version to old to determine size, assuming zero\n"
 msgstr ""
 
-#: src/datastore/plugin_datastore_sqlite.c:1149
+#: src/datastore/plugin_datastore_sqlite.c:1143
 #, c-format
 msgid ""
 "Using sqlite page utilization to estimate payload (%llu pages of size %llu "
 "bytes)\n"
 msgstr ""
 
-#: src/datastore/plugin_datastore_sqlite.c:1188
+#: src/datastore/plugin_datastore_sqlite.c:1182
 msgid "Sqlite database running\n"
 msgstr ""
 
@@ -282,8 +282,8 @@
 msgid "Could not find matching reservation"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:824 src/datacache/datacache.c:119
-#: src/datacache/datacache.c:250
+#: src/datastore/gnunet-service-datastore.c:824 src/datacache/datacache.c:118
+#: src/datacache/datacache.c:248
 #, fuzzy
 msgid "# bytes stored"
 msgstr "# byte krypterade"
@@ -335,8 +335,8 @@
 msgstr ""
 
 #: src/datastore/gnunet-service-datastore.c:1295
-#: src/datastore/gnunet-service-datastore.c:1486 src/datacache/datacache.c:145
-#: src/datacache/datacache.c:152
+#: src/datastore/gnunet-service-datastore.c:1486 src/datacache/datacache.c:144
+#: src/datacache/datacache.c:151
 #, fuzzy, c-format
 msgid "No `%s' specified for `%s' in configuration!\n"
 msgstr "Inga applikationer definierade i konfiguration!\n"
@@ -369,20 +369,16 @@
 msgid "Failed to initialize bloomfilter.\n"
 msgstr "Misslyckades att initiera tjänsten \"%s\".\n"
 
-#: src/core/gnunet-service-core_sessions.c:204
+#: src/core/gnunet-service-core_sessions.c:210
 #: src/core/gnunet-service-core_sessions.c:275
 msgid "# entries in session map"
 msgstr ""
 
-#: src/core/gnunet-service-core_sessions.c:236
+#: src/core/gnunet-service-core_sessions.c:240
 msgid "# type map refreshes sent"
 msgstr ""
 
-#: src/core/gnunet-service-core_sessions.c:360
-msgid "# send requests dropped (disconnected)"
-msgstr ""
-
-#: src/core/gnunet-service-core_sessions.c:427
+#: src/core/gnunet-service-core_sessions.c:416
 msgid "# messages discarded (expired prior to transmission)"
 msgstr ""
 
@@ -393,13 +389,13 @@
 msgstr "Jag är ändpunkt \"%s\".\n"
 
 #: src/core/gnunet-core-list-connections.c:167
-#: src/peerinfo-tool/gnunet-peerinfo.c:200
+#: src/peerinfo-tool/gnunet-peerinfo.c:199
 #, fuzzy, c-format
 msgid "Invalid command line argument `%s'\n"
 msgstr "Ogiltiga kommandoradsargument:\n"
 
 #: src/core/gnunet-core-list-connections.c:188
-#: src/peerinfo-tool/gnunet-peerinfo.c:258
+#: src/peerinfo-tool/gnunet-peerinfo.c:257
 msgid "don't resolve host names"
 msgstr ""
 
@@ -408,46 +404,50 @@
 msgid "Print information about connected peers."
 msgstr "Skriv ut information om GNUnets motparter."
 
-#: src/core/gnunet-service-core_clients.c:452
+#: src/core/gnunet-service-core_clients.c:357
+msgid "# send requests dropped (disconnected)"
+msgstr ""
+
+#: src/core/gnunet-service-core_clients.c:462
 #, fuzzy
 msgid "# messages discarded (session disconnected)"
 msgstr "Nätverksannonsering avstängd i konfigurationen!\n"
 
-#: src/core/gnunet-service-core_clients.c:796
+#: src/core/gnunet-service-core_clients.c:791
 #, fuzzy, c-format
 msgid "# bytes of messages of type %u received"
 msgstr "# krypterade PONG-meddelanden mottagna"
 
-#: src/core/gnunet-service-core.c:101
+#: src/core/gnunet-service-core.c:99
 #, c-format
 msgid "Core service of `%4s' ready.\n"
 msgstr ""
 
-#: src/core/gnunet-service-core_typemap.c:111
-#: src/core/gnunet-service-core_typemap.c:124
+#: src/core/gnunet-service-core_typemap.c:110
+#: src/core/gnunet-service-core_typemap.c:121
 #, fuzzy
 msgid "# type maps received"
 msgstr "# krypterade PONG-meddelanden mottagna"
 
-#: src/core/gnunet-service-core_typemap.c:156
+#: src/core/gnunet-service-core_typemap.c:151
 msgid "# updates to my type map"
 msgstr ""
 
-#: src/core/gnunet-service-core_neighbours.c:162
+#: src/core/gnunet-service-core_neighbours.c:163
 #, fuzzy
 msgid "# sessions terminated by transport disconnect"
 msgstr "Nätverksannonsering avstängd i konfigurationen!\n"
 
-#: src/core/gnunet-service-core_neighbours.c:179
+#: src/core/gnunet-service-core_neighbours.c:180
 #: src/core/gnunet-service-core_neighbours.c:343
 msgid "# neighbour entries allocated"
 msgstr ""
 
-#: src/core/gnunet-service-core_neighbours.c:251
+#: src/core/gnunet-service-core_neighbours.c:252
 msgid "# encrypted bytes given to transport"
 msgstr ""
 
-#: src/core/gnunet-service-core_neighbours.c:432
+#: src/core/gnunet-service-core_neighbours.c:430
 #, c-format
 msgid "Unsupported message of type %u received.\n"
 msgstr ""
@@ -460,8 +460,8 @@
 msgid "# bytes decrypted"
 msgstr "# byte dekrypterade"
 
-#: src/core/gnunet-service-core_kx.c:602 src/dv/gnunet-service-dv.c:3000
-#: src/hostlist/hostlist-server.c:439 src/peerinfo-tool/gnunet-peerinfo.c:157
+#: src/core/gnunet-service-core_kx.c:602 src/dv/gnunet-service-dv.c:3002
+#: src/hostlist/hostlist-server.c:436 src/peerinfo-tool/gnunet-peerinfo.c:156
 #, fuzzy, c-format
 msgid "Error in communication with PEERINFO service\n"
 msgstr "Skriv ut information om GNUnets motparter."
@@ -470,120 +470,120 @@
 msgid "# Delayed connecting due to lack of public key"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:669
+#: src/core/gnunet-service-core_kx.c:668
 msgid "# key exchanges initiated"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:693
+#: src/core/gnunet-service-core_kx.c:689
 msgid "# key exchanges stopped"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:746
+#: src/core/gnunet-service-core_kx.c:741
 #, fuzzy
 msgid "# session keys received"
 msgstr "# sessionnycklar vägrade"
 
-#: src/core/gnunet-service-core_kx.c:764
+#: src/core/gnunet-service-core_kx.c:760
 #, fuzzy, c-format
 msgid "`%s' is for `%s', not for me.  Ignoring.\n"
 msgstr "storlek på \"%s\" meddelande är för litet. Ignorerar.\n"
 
-#: src/core/gnunet-service-core_kx.c:803
+#: src/core/gnunet-service-core_kx.c:798
 #, fuzzy
 msgid "# SET_KEY messages decrypted"
 msgstr "# PING-meddelanden skapade"
 
-#: src/core/gnunet-service-core_kx.c:884
-#: src/transport/gnunet-service-transport_validation.c:601
+#: src/core/gnunet-service-core_kx.c:878
+#: src/transport/gnunet-service-transport_validation.c:781
 #, fuzzy
 msgid "# PING messages received"
 msgstr "# PING-meddelanden skapade"
 
-#: src/core/gnunet-service-core_kx.c:918
+#: src/core/gnunet-service-core_kx.c:912
 #, 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:941
+#: src/core/gnunet-service-core_kx.c:933
 #, fuzzy
 msgid "# PONG messages created"
 msgstr "# PING-meddelanden skapade"
 
-#: src/core/gnunet-service-core_kx.c:1029
+#: src/core/gnunet-service-core_kx.c:1021
 #, fuzzy
 msgid "# sessions terminated by timeout"
 msgstr "# byte kastade via TCP (utgående)"
 
-#: src/core/gnunet-service-core_kx.c:1042
+#: src/core/gnunet-service-core_kx.c:1032
 #, fuzzy
 msgid "# keepalive messages sent"
 msgstr "# PING-meddelanden i klartext skickade"
 
-#: src/core/gnunet-service-core_kx.c:1098
-#: src/transport/gnunet-service-transport_validation.c:934
+#: src/core/gnunet-service-core_kx.c:1090
+#: src/transport/gnunet-service-transport_validation.c:991
 #, fuzzy
 msgid "# PONG messages received"
 msgstr "# krypterade PONG-meddelanden mottagna"
 
-#: src/core/gnunet-service-core_kx.c:1128
+#: src/core/gnunet-service-core_kx.c:1120
 #, fuzzy
 msgid "# PONG messages decrypted"
 msgstr "# PING-meddelanden skapade"
 
-#: src/core/gnunet-service-core_kx.c:1161
+#: src/core/gnunet-service-core_kx.c:1152
 #, fuzzy
 msgid "# session keys confirmed via PONG"
 msgstr "# sessionnycklar vägrade"
 
-#: src/core/gnunet-service-core_kx.c:1224
+#: src/core/gnunet-service-core_kx.c:1216
 #, fuzzy
 msgid "# SET_KEY and PING messages created"
 msgstr "# PING-meddelanden skapade"
 
-#: src/core/gnunet-service-core_kx.c:1372
+#: src/core/gnunet-service-core_kx.c:1357
 msgid "# failed to decrypt message (no session key)"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1416
-#: src/core/gnunet-service-core_kx.c:1441
+#: src/core/gnunet-service-core_kx.c:1399
+#: src/core/gnunet-service-core_kx.c:1424
 #, fuzzy
 msgid "# bytes dropped (duplicates)"
 msgstr "# byte kastade via UDP (utgående)"
 
-#: src/core/gnunet-service-core_kx.c:1428
+#: src/core/gnunet-service-core_kx.c:1411
 #, fuzzy
 msgid "# bytes dropped (out of sequence)"
 msgstr "# byte kastade via UDP (utgående)"
 
-#: src/core/gnunet-service-core_kx.c:1465
+#: src/core/gnunet-service-core_kx.c:1448
 #, fuzzy, c-format
 msgid "Message received far too old (%llu ms). Content ignored.\n"
 msgstr "Meddelande mottaget från klient är ogiltig.\n"
 
-#: src/core/gnunet-service-core_kx.c:1469
+#: src/core/gnunet-service-core_kx.c:1452
 #, fuzzy
 msgid "# bytes dropped (ancient message)"
 msgstr "# byte kastade via UDP (utgående)"
 
-#: src/core/gnunet-service-core_kx.c:1477
+#: src/core/gnunet-service-core_kx.c:1460
 #, fuzzy
 msgid "# bytes of payload decrypted"
 msgstr "# byte dekrypterade"
 
-#: src/core/gnunet-service-core_kx.c:1541
+#: src/core/gnunet-service-core_kx.c:1521
 #, fuzzy
 msgid "Core service is lacking HOSTKEY configuration setting.  Exiting.\n"
 msgstr "GNUnet-konfiguration"
 
-#: src/core/gnunet-service-core_kx.c:1549
+#: src/core/gnunet-service-core_kx.c:1529
 msgid "Core service could not access hostkey.  Exiting.\n"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1559
-#: src/transport/gnunet-service-transport.c:540
-#: src/hostlist/hostlist-server.c:558 src/peerinfo-tool/gnunet-peerinfo.c:208
+#: src/core/gnunet-service-core_kx.c:1539
+#: src/transport/gnunet-service-transport.c:537
+#: src/hostlist/hostlist-server.c:555 src/peerinfo-tool/gnunet-peerinfo.c:207
 #, fuzzy, c-format
 msgid "Could not access PEERINFO service.  Exiting.\n"
 msgstr "Kunde inte komma åt namnrymdsinformation.\n"
@@ -592,11 +592,11 @@
 msgid "Client was disconnected from core service, trying to reconnect.\n"
 msgstr ""
 
-#: src/vpn/gnunet-daemon-exit.c:1499
+#: src/vpn/gnunet-daemon-exit.c:1513
 msgid "Daemon to run to provide an IP exit node for the VPN"
 msgstr ""
 
-#: src/vpn/gnunet-daemon-vpn.c:1287
+#: src/vpn/gnunet-daemon-vpn.c:1294
 #, fuzzy
 msgid "help text"
 msgstr "hjälptext för -t"
@@ -609,50 +609,50 @@
 "Argument som är obligatoriska för långa flaggor är också obligatoriska för "
 "korta flaggor.\n"
 
-#: src/util/getopt_helpers.c:258 src/util/getopt_helpers.c:287
+#: src/util/getopt_helpers.c:255 src/util/getopt_helpers.c:283
 #, c-format
 msgid "You must pass a number to the `%s' option.\n"
 msgstr "Du måste skicka med ett nummer till flaggan \"%s\".\n"
 
-#: src/util/common_logging.c:242 src/util/common_logging.c:838
+#: src/util/common_logging.c:239 src/util/common_logging.c:861
 msgid "DEBUG"
 msgstr "FELSÖKNING"
 
-#: src/util/common_logging.c:244 src/util/common_logging.c:836
+#: src/util/common_logging.c:241 src/util/common_logging.c:859
 msgid "INFO"
 msgstr "INFO"
 
-#: src/util/common_logging.c:246 src/util/common_logging.c:834
+#: src/util/common_logging.c:243 src/util/common_logging.c:857
 msgid "WARNING"
 msgstr "VARNING"
 
-#: src/util/common_logging.c:248 src/util/common_logging.c:832
+#: src/util/common_logging.c:245 src/util/common_logging.c:855
 msgid "ERROR"
 msgstr "FEL"
 
-#: src/util/common_logging.c:250 src/util/common_logging.c:840
+#: src/util/common_logging.c:247 src/util/common_logging.c:863
 msgid "NONE"
 msgstr ""
 
-#: src/util/common_logging.c:554
+#: src/util/common_logging.c:579
 #, fuzzy, c-format
 msgid "Failed to create or access directory for log file `%s'\n"
 msgstr "Kunde inte tolka konfigurationsfil \"%s\".\n"
 
-#: src/util/common_logging.c:672
+#: src/util/common_logging.c:696
 #, c-format
 msgid "Message `%.*s' repeated %u times in the last %s\n"
 msgstr ""
 
-#: src/util/common_logging.c:841
+#: src/util/common_logging.c:864
 msgid "INVALID"
 msgstr ""
 
-#: src/util/common_logging.c:923
+#: src/util/common_logging.c:946
 msgid "unknown address"
 msgstr ""
 
-#: src/util/common_logging.c:961
+#: src/util/common_logging.c:984
 msgid "invalid address"
 msgstr ""
 
@@ -671,24 +671,29 @@
 msgid "`%s' failed for library `%s' with error: %s\n"
 msgstr "\"%s\" misslyckades vid %s:%d med fel: %s\n"
 
-#: src/util/configuration.c:249
+#: src/util/plugin.c:349
+#, fuzzy
+msgid "Could not determine plugin installation path.\n"
+msgstr "Kunde inte fastställa min publika IPv6-adress.\n"
+
+#: src/util/configuration.c:245
 #, fuzzy, c-format
 msgid "Syntax error in configuration file `%s' at line %u.\n"
 msgstr "Syntaxfel i konfigurationsfil \"%s\" på rad %d.\n"
 
-#: src/util/configuration.c:812
+#: src/util/configuration.c:817
 #, c-format
 msgid ""
 "Configuration value '%s' for '%s' in section '%s' is not in set of legal "
 "choices\n"
 msgstr ""
 
-#: src/util/getopt.c:670
+#: src/util/getopt.c:672
 #, c-format
 msgid "%s: option `%s' is ambiguous\n"
 msgstr "%s: flagga \"%s\" är tvetydig\n"
 
-#: src/util/getopt.c:695
+#: src/util/getopt.c:696
 #, c-format
 msgid "%s: option `--%s' does not allow an argument\n"
 msgstr "%s: flagga \"--%s\" tillåter inte ett argument\n"
@@ -698,109 +703,109 @@
 msgid "%s: option `%c%s' does not allow an argument\n"
 msgstr "%s: flagga \"%c%s\" tillåter inte ett argument\n"
 
-#: src/util/getopt.c:720 src/util/getopt.c:889
+#: src/util/getopt.c:718 src/util/getopt.c:886
 #, c-format
 msgid "%s: option `%s' requires an argument\n"
 msgstr "%s: flagga \"%s\" kräver ett argument\n"
 
-#: src/util/getopt.c:749
+#: src/util/getopt.c:747
 #, c-format
 msgid "%s: unrecognized option `--%s'\n"
 msgstr "%s: okänd flagga \"--%s\"\n"
 
-#: src/util/getopt.c:753
+#: src/util/getopt.c:751
 #, c-format
 msgid "%s: unrecognized option `%c%s'\n"
 msgstr "%s: okänd flagga \"%c%s\"\n"
 
-#: src/util/getopt.c:778
+#: src/util/getopt.c:776
 #, c-format
 msgid "%s: illegal option -- %c\n"
 msgstr "%s: otillåten flagga -- %c\n"
 
-#: src/util/getopt.c:780
+#: src/util/getopt.c:778
 #, c-format
 msgid "%s: invalid option -- %c\n"
 msgstr "%s: ogiltig flagga -- %c\n"
 
-#: src/util/getopt.c:808 src/util/getopt.c:938
+#: src/util/getopt.c:806 src/util/getopt.c:934
 #, c-format
 msgid "%s: option requires an argument -- %c\n"
 msgstr "%s: flagga kräver ett argument -- %c\n"
 
-#: src/util/getopt.c:856
+#: src/util/getopt.c:854
 #, c-format
 msgid "%s: option `-W %s' is ambiguous\n"
 msgstr "%s: flagga \"-W %s\" är tvetydig\n"
 
-#: src/util/getopt.c:874
+#: src/util/getopt.c:872
 #, c-format
 msgid "%s: option `-W %s' does not allow an argument\n"
 msgstr "%s: flagga \"-W %s\" tillåter inte ett argument\n"
 
-#: src/util/getopt.c:1042
+#: src/util/getopt.c:1038
 #, c-format
 msgid "Use --help to get a list of options.\n"
 msgstr "Använd --help för att få en lista på flaggor.\n"
 
-#: src/util/scheduler.c:863
+#: src/util/scheduler.c:860
 msgid "Looks like we're busy waiting...\n"
 msgstr ""
 
-#: src/util/scheduler.c:994
+#: src/util/scheduler.c:990
 #, c-format
 msgid "Attempt to cancel dead task %llu!\n"
 msgstr ""
 
-#: src/util/connection.c:462
+#: src/util/connection.c:461
 #, fuzzy, c-format
 msgid "Access denied to `%s'\n"
 msgstr "Åtkomst nekad för \"%s\" vid %s:%d.\n"
 
-#: src/util/connection.c:477
+#: src/util/connection.c:476
 #, c-format
 msgid "Accepting connection from `%s': %p\n"
 msgstr ""
 
-#: src/util/connection.c:646
+#: src/util/connection.c:642
 #, fuzzy, c-format
 msgid ""
 "Failed to establish TCP connection to `%s:%u', no further addresses to try.\n"
 msgstr "Misslyckades att starta samling.\n"
 
-#: src/util/connection.c:858 src/util/connection.c:1034
+#: src/util/connection.c:852 src/util/connection.c:1025
 #, fuzzy, c-format
 msgid "Trying to connect to `%s' (%p)\n"
 msgstr "Kan inte ansluta till %u.%u.%u.%u:%u: %s\n"
 
-#: src/util/connection.c:869
+#: src/util/connection.c:862
 #, fuzzy, c-format
 msgid "Failed to connect to `%s' (%p)\n"
 msgstr "Kan inte ansluta till %u.%u.%u.%u:%u: %s\n"
 
-#: src/util/connection.c:1024
+#: src/util/connection.c:1015
 #, fuzzy, c-format
 msgid "Attempt to connect to `%s' failed\n"
 msgstr " Anslutning misslyckades\n"
 
-#: src/util/connection.c:1540
+#: src/util/connection.c:1528
 #, c-format
 msgid ""
 "Could not satisfy pending transmission request, socket closed or connect "
 "failed (%p).\n"
 msgstr ""
 
-#: src/util/connection.c:1576
+#: src/util/connection.c:1564
 #, fuzzy, c-format
 msgid "Failed to send to `%s': %s\n"
 msgstr "Misslyckades att leverera \"%s\" meddelande.\n"
 
-#: src/util/signal.c:81
+#: src/util/signal.c:80
 #, fuzzy, c-format
 msgid "signal (%d, %p) returned %d.\n"
 msgstr "Anrop till \"%s\" returnerade %d.\n"
 
-#: src/util/network.c:1204
+#: src/util/network.c:1197
 #, c-format
 msgid ""
 "Fatal internal logic error, process hangs in `%s' (abort with CTRL-C)!\n"
@@ -813,97 +818,81 @@
 "variable.\n"
 msgstr ""
 
-#: src/util/os_installation.c:481
+#: src/util/os_installation.c:477
 #, fuzzy, c-format
 msgid "Could not find binary `%s' in PATH!\n"
 msgstr "Kunde inte hitta motpart \"%s\" i routingtabell!\n"
 
-#: src/util/os_installation.c:486
+#: src/util/os_installation.c:483
 #, fuzzy, c-format
 msgid "stat (%s) failed: %s\n"
 msgstr "\"%s\" %s misslyckades: %s\n"
 
-#: src/util/strings.c:144
+#: src/util/strings.c:143
 msgid "b"
 msgstr "b"
 
-#: src/util/strings.c:150
-msgid "KiB"
-msgstr ""
-
-#: src/util/strings.c:154
-msgid "MiB"
-msgstr ""
-
-#: src/util/strings.c:158
-msgid "GiB"
-msgstr ""
-
-#: src/util/strings.c:162
-msgid "TiB"
-msgstr ""
-
-#: src/util/strings.c:198
+#: src/util/strings.c:355
 #, c-format
 msgid "Character set requested was `%s'\n"
 msgstr ""
 
-#: src/util/strings.c:276
+#: src/util/strings.c:433
 msgid "Failed to expand `$HOME': environment variable `HOME' not set"
 msgstr ""
 
-#: src/util/strings.c:368
+#: src/util/strings.c:525
 msgid "ms"
 msgstr "ms"
 
-#: src/util/strings.c:373
+#: src/util/strings.c:530
 msgid "eternity"
 msgstr ""
 
-#: src/util/strings.c:377
+#: src/util/strings.c:534
 msgid "s"
 msgstr "s"
 
-#: src/util/strings.c:381
+#: src/util/strings.c:538
 msgid "m"
 msgstr "m"
 
-#: src/util/strings.c:385
+#: src/util/strings.c:542
 msgid "h"
 msgstr "h"
 
-#: src/util/strings.c:389
+#: src/util/strings.c:546
 msgid " days"
 msgstr " dagar"
 
-#: src/util/strings.c:413
+#: src/util/strings.c:570
 msgid "end of time"
 msgstr ""
 
 # drive = hard drive ?
-#: src/util/server.c:392
+#: src/util/server.c:388
 #, fuzzy, c-format
 msgid "`%s' failed for port %d (%s).\n"
 msgstr "\"%s\" misslyckades för enhet %s: %u\n"
 
-#: src/util/server.c:400
+#: src/util/server.c:397
 #, fuzzy, c-format
 msgid "`%s' failed for port %d (%s): address already in use\n"
 msgstr "\"%s\" misslyckades för port %d: %s. Körs verkligen gnunetd?\n"
 
-#: src/util/server.c:405
+#: src/util/server.c:402
 #, fuzzy, c-format
 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:623
+#: src/util/server.c:617
 #, c-format
 msgid ""
 "Processing code for message of type %u did not call "
 "GNUNET_SERVER_receive_done after %llums\n"
 msgstr ""
 
-#: src/util/crypto_random.c:240
+#: src/util/crypto_random.c:239
 #, c-format
 msgid "Starting `%s' process to generate entropy\n"
 msgstr ""
@@ -914,157 +903,157 @@
 msgstr "libgcrypt har inte den förväntande versionen (version %s krävs).\n"
 
 # drive = hard drive ?
-#: src/util/disk.c:435
+#: src/util/disk.c:434
 #, fuzzy, c-format
 msgid "`%s' failed for drive `%s': %u\n"
 msgstr "\"%s\" misslyckades för enhet %s: %u\n"
 
-#: src/util/disk.c:838
+#: src/util/disk.c:834
 #, fuzzy, c-format
 msgid "Expected `%s' to be a directory!\n"
 msgstr "\"%s\" förväntade att \"%s\" skulle vara en katalog!\n"
 
-#: src/util/disk.c:1189 src/util/service.c:1473
+#: src/util/disk.c:1186 src/util/service.c:1452
 #, fuzzy, c-format
 msgid "Cannot obtain information about user `%s': %s\n"
 msgstr "Kan inte öppna konfigurationsfil \"%s\".\n"
 
-#: src/util/disk.c:1497
+#: src/util/disk.c:1491
 #, fuzzy, c-format
 msgid "No `%s' specified for service `%s' in configuration.\n"
 msgstr "Inga applikationer definierade i konfiguration!\n"
 
-#: src/util/service.c:118 src/util/service.c:144 src/util/service.c:188
-#: src/util/service.c:209 src/util/service.c:216
+#: src/util/service.c:117 src/util/service.c:143 src/util/service.c:186
+#: src/util/service.c:207 src/util/service.c:214
 #, c-format
 msgid "Invalid format for IP: `%s'\n"
 msgstr "Ogiltigt format för IP: \"%s\"\n"
 
-#: src/util/service.c:171
+#: src/util/service.c:170
 #, c-format
 msgid "Invalid network notation ('/%d' is not legal in IPv4 CIDR)."
 msgstr "Ogiltig nätverksnotation (\"/%d\" är inte giltig i IPv4 CIDR)."
 
-#: src/util/service.c:265
+#: src/util/service.c:263
 #, c-format
 msgid "Invalid network notation (does not end with ';': `%s')\n"
 msgstr "Ogiltig nätverksnotation (slutar inte med \";\": \"%s\")\n"
 
-#: src/util/service.c:301
+#: src/util/service.c:296
 #, fuzzy, c-format
 msgid "Wrong format `%s' for netmask\n"
 msgstr "Fel format \"%s\" för nätmask: %s\n"
 
-#: src/util/service.c:332
+#: src/util/service.c:326
 #, fuzzy, c-format
 msgid "Wrong format `%s' for network\n"
 msgstr "Fel format \"%s\" för nätverk: %s\n"
 
-#: src/util/service.c:638
+#: src/util/service.c:629
 #, c-format
 msgid "Access denied to UID %d / GID %d\n"
 msgstr ""
 
-#: src/util/service.c:643
+#: src/util/service.c:634
 #, fuzzy, c-format
 msgid "Unknown address family %d\n"
 msgstr "Okänd operation \"%s\"\n"
 
-#: src/util/service.c:650
+#: src/util/service.c:641
 #, c-format
 msgid "Access from `%s' denied to service `%s'\n"
 msgstr ""
 
-#: src/util/service.c:694
+#: src/util/service.c:685
 #, c-format
 msgid "Could not parse IPv4 network specification `%s' for `%s:%s'\n"
 msgstr ""
 
-#: src/util/service.c:723
+#: src/util/service.c:713
 #, c-format
 msgid "Could not parse IPv6 network specification `%s' for `%s:%s'\n"
 msgstr ""
 
-#: src/util/service.c:841
+#: src/util/service.c:830
 #, c-format
 msgid ""
 "Disabling IPv6 support for service `%s', failed to create IPv6 socket: %s\n"
 msgstr ""
 
-#: src/util/service.c:862 src/transport/plugin_transport_tcp.c:1939
+#: src/util/service.c:850 src/transport/plugin_transport_tcp.c:1935
 #, c-format
 msgid "Require valid port number for service `%s' in configuration!\n"
 msgstr ""
 
-#: src/util/service.c:893 src/util/client.c:712
+#: src/util/service.c:880 src/util/client.c:707
 #, c-format
 msgid "UNIXPATH `%s' too long, maximum length is %llu\n"
 msgstr ""
 
-#: src/util/service.c:913
+#: src/util/service.c:900
 #, c-format
 msgid ""
 "Disabling UNIX domain socket support for service `%s', failed to create UNIX "
 "domain socket: %s\n"
 msgstr ""
 
-#: src/util/service.c:930
+#: src/util/service.c:917
 #, c-format
 msgid "Have neither PORT nor UNIXPATH for service `%s', but one is required\n"
 msgstr ""
 
-#: src/util/service.c:960 src/transport/plugin_transport_http.c:903
+#: src/util/service.c:947 src/transport/plugin_transport_http.c:993
 #, fuzzy, c-format
 msgid "Failed to resolve `%s': %s\n"
 msgstr "Misslyckades att leverera \"%s\" meddelande.\n"
 
-#: src/util/service.c:978 src/transport/plugin_transport_http.c:920
+#: src/util/service.c:964 src/transport/plugin_transport_http.c:1010
 #, fuzzy, c-format
 msgid "Failed to find %saddress for `%s'.\n"
 msgstr "Misslyckades att binda till UDP-port %d.\n"
 
-#: src/util/service.c:1135 src/util/service.c:1153
+#: src/util/service.c:1120 src/util/service.c:1138
 #, c-format
 msgid "Specified value for `%s' of service `%s' is invalid\n"
 msgstr ""
 
-#: src/util/service.c:1181
+#: src/util/service.c:1165
 #, c-format
 msgid "Could not access pre-bound socket %u, will try to bind myself\n"
 msgstr ""
 
-#: src/util/service.c:1333
+#: src/util/service.c:1314
 #, fuzzy, c-format
 msgid "Failed to start `%s' at `%s'\n"
 msgstr "Fel vid %s:%d.\n"
 
-#: src/util/service.c:1366
+#: src/util/service.c:1347
 #, 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:1414
+#: src/util/service.c:1393
 msgid "Service process failed to initialize\n"
 msgstr ""
 
-#: src/util/service.c:1418
+#: src/util/service.c:1397
 msgid "Service process could not initialize server function\n"
 msgstr ""
 
-#: src/util/service.c:1422
+#: src/util/service.c:1401
 msgid "Service process failed to report status\n"
 msgstr ""
 
-#: src/util/service.c:1474
+#: src/util/service.c:1453
 msgid "No such user"
 msgstr ""
 
-#: src/util/service.c:1488
+#: src/util/service.c:1466
 #, 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:1551
+#: src/util/service.c:1529
 msgid "do daemonize (detach from terminal)"
 msgstr ""
 
@@ -1072,7 +1061,7 @@
 msgid "Test GNUnet DNS resolver code."
 msgstr ""
 
-#: src/util/os_priority.c:117
+#: src/util/os_priority.c:114
 #, c-format
 msgid "Not installing a handler because $%s=%s\n"
 msgstr ""
@@ -1090,221 +1079,221 @@
 "Du måste ange ett positivt nummer för \"%s\" i konfigurationen i sektion \"%s"
 "\".\n"
 
-#: src/util/resolver_api.c:356
+#: src/util/resolver_api.c:358
 #, c-format
 msgid "Timeout trying to resolve IP address `%s'.\n"
 msgstr ""
 
-#: src/util/resolver_api.c:360
+#: src/util/resolver_api.c:362
 #, fuzzy, c-format
 msgid "Timeout trying to resolve hostname `%s'.\n"
 msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 
-#: src/util/resolver_api.c:428
+#: src/util/resolver_api.c:430
 #, c-format
 msgid "Resolver returns `%s' for IP `%s'.\n"
 msgstr ""
 
-#: src/util/resolver_api.c:793
+#: src/util/resolver_api.c:791
 #, c-format
 msgid "Resolver returns `%s'.\n"
 msgstr ""
 
-#: src/util/resolver_api.c:877
+#: src/util/resolver_api.c:875
 #, c-format
 msgid "Resolving our FQDN `%s'\n"
 msgstr ""
 
-#: src/util/resolver_api.c:882
+#: src/util/resolver_api.c:880
 #, fuzzy, c-format
 msgid "Could not resolve our FQDN : %s\n"
 msgstr "Kunde inte slå upp \"%s\": %s\n"
 
-#: src/util/resolver_api.c:914
+#: src/util/resolver_api.c:912
 #, c-format
 msgid "Resolving our hostname `%s'\n"
 msgstr ""
 
-#: src/util/pseudonym.c:269
+#: src/util/pseudonym.c:266
 #, fuzzy, c-format
 msgid "Failed to parse metadata about pseudonym from file `%s': %s\n"
 msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 
-#: src/util/pseudonym.c:333
+#: src/util/pseudonym.c:330
 #, fuzzy
 msgid "no-name"
 msgstr "Visa namn"
 
-#: src/util/gnunet-service-resolver.c:262
+#: src/util/gnunet-service-resolver.c:261
 #, fuzzy, c-format
 msgid "Could not resolve `%s' (%s): %s\n"
 msgstr "Kunde inte slå upp \"%s\": %s\n"
 
-#: src/util/gnunet-service-resolver.c:318
-#: src/util/gnunet-service-resolver.c:363
+#: src/util/gnunet-service-resolver.c:317
+#: src/util/gnunet-service-resolver.c:362
 #, c-format
 msgid "Could not find IP of host `%s': %s\n"
 msgstr ""
 
-#: src/util/gnunet-service-resolver.c:462
+#: src/util/gnunet-service-resolver.c:460
 #, c-format
 msgid "Resolver asked to look up `%s'.\n"
 msgstr ""
 
-#: src/util/gnunet-service-resolver.c:509
+#: src/util/gnunet-service-resolver.c:508
 #, c-format
 msgid "Resolver asked to look up IP address `%s'.\n"
 msgstr ""
 
-#: src/util/bio.c:137 src/util/bio.c:143
+#: src/util/bio.c:136 src/util/bio.c:142
 #, fuzzy, c-format
 msgid "Error reading `%s': %s"
 msgstr "Fel vid skapandet av användare"
 
-#: src/util/bio.c:144
+#: src/util/bio.c:143
 #, fuzzy
 msgid "End of file"
 msgstr "Läs in en konfigurationsfil"
 
-#: src/util/bio.c:196
+#: src/util/bio.c:195
 #, c-format
 msgid "Error reading length of string `%s'"
 msgstr ""
 
-#: src/util/bio.c:208
+#: src/util/bio.c:205
 #, c-format
 msgid "String `%s' longer than allowed (%u > %u)"
 msgstr ""
 
-#: src/util/bio.c:254
+#: src/util/bio.c:250
 #, c-format
 msgid "Serialized metadata `%s' larger than allowed (%u>%u)"
 msgstr ""
 
-#: src/util/bio.c:268
+#: src/util/bio.c:264
 #, c-format
 msgid "Metadata `%s' failed to deserialize"
 msgstr ""
 
-#: src/util/client.c:303
+#: src/util/client.c:301
 #, c-format
 msgid ""
 "Could not determine valid hostname and port for service `%s' from "
 "configuration.\n"
 msgstr ""
 
-#: src/util/client.c:311
+#: src/util/client.c:309
 #, c-format
 msgid "Need a non-empty hostname for service `%s'.\n"
 msgstr ""
 
-#: src/util/client.c:652
+#: src/util/client.c:647
 msgid "Failure to transmit TEST request.\n"
 msgstr ""
 
-#: src/util/client.c:857
+#: src/util/client.c:849
 #, fuzzy, c-format
 msgid "Could not connect to service `%s', must not be running.\n"
 msgstr "Kunde inte ansluta till gnunetd.\n"
 
-#: src/util/client.c:874
+#: src/util/client.c:865
 #, fuzzy, c-format
 msgid "Failure to transmit request to service `%s'\n"
 msgstr "Misslyckades att skicka HTTP-begäran till värd \"%s\": %s\n"
 
-#: src/util/client.c:1143
+#: src/util/client.c:1133
 msgid "Could not submit request, not expecting to receive a response.\n"
 msgstr ""
 
-#: src/util/crypto_rsa.c:624 src/util/crypto_rsa.c:672
+#: src/util/crypto_rsa.c:616 src/util/crypto_rsa.c:663
 #, fuzzy, c-format
 msgid "Could not aquire lock on file `%s': %s...\n"
 msgstr "Kunde inte slå upp \"%s\": %s\n"
 
-#: src/util/crypto_rsa.c:629
+#: src/util/crypto_rsa.c:621
 #, fuzzy
 msgid "Creating a new private key.  This may take a while.\n"
 msgstr "Skapar ny värdnyckel (det här kan ta en stund).\n"
 
-#: src/util/crypto_rsa.c:648
+#: src/util/crypto_rsa.c:639
 #, c-format
 msgid "I am host `%s'.  Stored new private key in `%s'.\n"
 msgstr ""
 
-#: src/util/crypto_rsa.c:676 src/util/crypto_rsa.c:714
+#: src/util/crypto_rsa.c:667 src/util/crypto_rsa.c:703
 msgid "This may be ok if someone is currently generating a hostkey.\n"
 msgstr ""
 
-#: src/util/crypto_rsa.c:709
+#: src/util/crypto_rsa.c:698
 #, c-format
 msgid ""
 "When trying to read hostkey file `%s' I found %u bytes but I need at least "
 "%u.\n"
 msgstr ""
 
-#: src/util/crypto_rsa.c:730
+#: src/util/crypto_rsa.c:718
 #, fuzzy, c-format
 msgid "File `%s' does not contain a valid private key.  Deleting it.\n"
 msgstr "Filen \"%s\" innehåller ingen pseudonym.\n"
 
-#: src/util/crypto_rsa.c:748
+#: src/util/crypto_rsa.c:736
 #, fuzzy, c-format
 msgid "I am host `%s'.  Read private key from `%s'.\n"
 msgstr "Anrop till \"%s\" med nyckel \"%s\".\n"
 
-#: src/util/crypto_rsa.c:970
+#: src/util/crypto_rsa.c:957
 #, c-format
 msgid "RSA signature verification failed at %s:%d: %s\n"
 msgstr ""
 
-#: src/nse/gnunet-nse-profiler.c:650 src/dht/gnunet-dht-get.c:213
+#: src/nse/gnunet-nse-profiler.c:646 src/dht/gnunet-dht-get.c:213
 #: src/dht/gnunet-dht-put.c:184 src/fs/gnunet-unindex.c:169
 #: src/fs/gnunet-search.c:297 src/fs/gnunet-publish.c:591
 #: src/fs/gnunet-download.c:263
 msgid "be verbose (print progress information)"
 msgstr ""
 
-#: src/nse/gnunet-nse-profiler.c:668
+#: src/nse/gnunet-nse-profiler.c:664
 #, fuzzy
 msgid "Measure quality and performance of the NSE service."
 msgstr "Kan inte tillgå tjänsten"
 
-#: src/nse/gnunet-service-nse.c:875
+#: src/nse/gnunet-service-nse.c:878
 #, c-format
 msgid "Proof of work invalid: %llu!\n"
 msgstr ""
 
-#: src/nse/gnunet-service-nse.c:1298 src/nse/gnunet-service-nse.c:1317
-#: src/nse/gnunet-service-nse.c:1338
+#: src/nse/gnunet-service-nse.c:1301 src/nse/gnunet-service-nse.c:1320
+#: src/nse/gnunet-service-nse.c:1341
 msgid "NSE service is lacking key configuration settings.  Exiting.\n"
 msgstr ""
 
-#: src/nse/gnunet-service-nse.c:1305
+#: src/nse/gnunet-service-nse.c:1308
 #, fuzzy
 msgid "Invalid work requirement for NSE service. Exiting.\n"
 msgstr "Ogiltiga argument. Avslutar.\n"
 
-#: src/nse/gnunet-service-nse.c:1326
+#: src/nse/gnunet-service-nse.c:1329
 #, fuzzy
 msgid "NSE service could not access hostkey.  Exiting.\n"
 msgstr "Kunde inte komma åt namnrymdsinformation.\n"
 
-#: src/peerinfo/gnunet-service-peerinfo.c:136
+#: src/peerinfo/gnunet-service-peerinfo.c:134
 #, fuzzy, c-format
 msgid "Removing expired address of transport `%s'\n"
 msgstr "Tillgängliga transport(er): %s\n"
 
-#: src/peerinfo/gnunet-service-peerinfo.c:197
+#: src/peerinfo/gnunet-service-peerinfo.c:196
 msgid "# peers known"
 msgstr ""
 
-#: src/peerinfo/gnunet-service-peerinfo.c:241
+#: src/peerinfo/gnunet-service-peerinfo.c:240
 #, c-format
 msgid ""
 "File `%s' in directory `%s' does not match naming convention. Removed.\n"
 msgstr ""
 
-#: src/peerinfo/gnunet-service-peerinfo.c:306
+#: src/peerinfo/gnunet-service-peerinfo.c:305
 #, c-format
 msgid "Still no peers found in `%s'!\n"
 msgstr ""
@@ -1314,50 +1303,50 @@
 msgid "Could not connect to `%s' service.\n"
 msgstr "Kunde inte ansluta till gnunetd.\n"
 
-#: src/peerinfo/peerinfo_api.c:278
+#: src/peerinfo/peerinfo_api.c:279
 #, fuzzy, c-format
 msgid "Failed to transmit message to `%s' service.\n"
 msgstr "Misslyckades att initiera tjänsten \"%s\".\n"
 
-#: src/peerinfo/peerinfo_api.c:433
+#: src/peerinfo/peerinfo_api.c:435
 #, fuzzy
 msgid "Failed to receive response from `PEERINFO' service."
 msgstr "Misslyckades att ta emot svar till \"%s\" meddelande från gnunetd\n"
 
-#: src/peerinfo/peerinfo_api.c:461 src/peerinfo/peerinfo_api.c:479
+#: src/peerinfo/peerinfo_api.c:463 src/peerinfo/peerinfo_api.c:481
 #, fuzzy
 msgid "Received invalid message from `PEERINFO' service.\n"
 msgstr "mottog ogiltigt \"%s\" meddelande: %s.\n"
 
-#: src/peerinfo/peerinfo_api.c:521
+#: src/peerinfo/peerinfo_api.c:523
 #, fuzzy
 msgid "Failed to transmit iteration request to `PEERINFO' service\n"
 msgstr "Misslyckades att initiera tjänsten \"%s\".\n"
 
-#: src/peerinfo/peerinfo_api.c:555
+#: src/peerinfo/peerinfo_api.c:557
 msgid "Timeout transmitting iteration request to `PEERINFO' service.\n"
 msgstr ""
 
-#: src/datacache/plugin_datacache_sqlite.c:439
+#: src/datacache/plugin_datacache_sqlite.c:424
 msgid "Sqlite datacache running\n"
 msgstr ""
 
-#: src/datacache/datacache.c:177
+#: src/datacache/datacache.c:176
 #, c-format
 msgid "Loading `%s' datacache plugin\n"
 msgstr ""
 
-#: src/datacache/datacache.c:185
+#: src/datacache/datacache.c:184
 #, fuzzy, c-format
 msgid "Failed to load datacache plugin for `%s'\n"
 msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 
-#: src/datacache/datacache.c:276
+#: src/datacache/datacache.c:274
 #, fuzzy
 msgid "# requests received"
 msgstr "# byte mottogs via TCP"
 
-#: src/datacache/datacache.c:287
+#: src/datacache/datacache.c:284
 msgid "# requests filtered by bloom filter"
 msgstr ""
 
@@ -1387,90 +1376,90 @@
 msgid "# FIND PEER messages initiated"
 msgstr "# PING-meddelanden skapade"
 
-#: src/dht/gnunet-service-dht_neighbours.c:632
-#: src/dht/gnunet-service-dht_neighbours.c:697
+#: src/dht/gnunet-service-dht_neighbours.c:627
+#: src/dht/gnunet-service-dht_neighbours.c:687
 #, fuzzy
 msgid "# Peers connected"
 msgstr "# av anslutna parter"
 
-#: src/dht/gnunet-service-dht_neighbours.c:734
+#: src/dht/gnunet-service-dht_neighbours.c:721
 #, fuzzy
 msgid "# Queued messages discarded (peer disconnected)"
 msgstr "Nätverksannonsering avstängd i konfigurationen!\n"
 
-#: src/dht/gnunet-service-dht_neighbours.c:787
+#: src/dht/gnunet-service-dht_neighbours.c:776
 #, fuzzy
 msgid "# Bytes transmitted to other peers"
 msgstr "# byte skickade av typen %d"
 
-#: src/dht/gnunet-service-dht_neighbours.c:824
+#: src/dht/gnunet-service-dht_neighbours.c:814
 msgid "# Bytes of bandwdith requested from core"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1051
-#: src/dht/gnunet-service-dht_neighbours.c:1078
+#: src/dht/gnunet-service-dht_neighbours.c:1038
+#: src/dht/gnunet-service-dht_neighbours.c:1066
 msgid "# Peers excluded from routing due to Bloomfilter"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1060
-#: src/dht/gnunet-service-dht_neighbours.c:1096
+#: src/dht/gnunet-service-dht_neighbours.c:1047
+#: src/dht/gnunet-service-dht_neighbours.c:1083
 msgid "# Peer selection failed"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1238
+#: src/dht/gnunet-service-dht_neighbours.c:1219
 #, fuzzy
 msgid "# PUT requests routed"
 msgstr "# byte mottogs via TCP"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1267
+#: src/dht/gnunet-service-dht_neighbours.c:1250
 #, fuzzy
 msgid "# PUT messages queued for transmission"
 msgstr "# PING-meddelanden skapade"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1352
+#: src/dht/gnunet-service-dht_neighbours.c:1331
 #, fuzzy
 msgid "# GET requests routed"
 msgstr "# byte mottogs via TCP"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1384
+#: src/dht/gnunet-service-dht_neighbours.c:1362
 #, fuzzy
 msgid "# GET messages queued for transmission"
 msgstr "# PING-meddelanden skapade"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1485
+#: src/dht/gnunet-service-dht_neighbours.c:1465
 #, fuzzy
 msgid "# RESULT messages queued for transmission"
 msgstr "# PING-meddelanden skapade"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1574
+#: src/dht/gnunet-service-dht_neighbours.c:1553
 #, fuzzy
 msgid "# P2P PUT requests received"
 msgstr "# byte mottogs via TCP"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1700
+#: src/dht/gnunet-service-dht_neighbours.c:1662
 msgid "# FIND PEER requests ignored due to Bloomfilter"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1707
+#: src/dht/gnunet-service-dht_neighbours.c:1670
 msgid "# FIND PEER requests ignored due to lack of HELLO"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1800
+#: src/dht/gnunet-service-dht_neighbours.c:1761
 #, fuzzy
 msgid "# P2P GET requests received"
 msgstr "# byte mottogs via TCP"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1853
+#: src/dht/gnunet-service-dht_neighbours.c:1805
 #, fuzzy
 msgid "# P2P FIND PEER requests processed"
 msgstr "# byte mottogs via TCP"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1872
+#: src/dht/gnunet-service-dht_neighbours.c:1819
 #, fuzzy
 msgid "# P2P GET requests ONLY routed"
 msgstr "# byte mottogs via TCP"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1941
+#: src/dht/gnunet-service-dht_neighbours.c:1885
 #, fuzzy
 msgid "# P2P RESULTS received"
 msgstr "# krypterade PONG-meddelanden mottagna"
@@ -1480,7 +1469,7 @@
 msgid "Failed to connect to the DHT service!\n"
 msgstr "Misslyckades att ansluta till gnunetd.\n"
 
-#: src/dht/gnunet-service-dht.c:165
+#: src/dht/gnunet-service-dht.c:163
 #, fuzzy
 msgid "Failed to connect to transport service!\n"
 msgstr "Misslyckades att ansluta till gnunetd.\n"
@@ -1505,50 +1494,50 @@
 msgid "Issue a GET request to the GNUnet DHT, prints results."
 msgstr ""
 
-#: src/dht/gnunet-service-dht_clients.c:321
+#: src/dht/gnunet-service-dht_clients.c:311
 #, fuzzy
 msgid "# GET requests from clients injected"
 msgstr "# byte mottogs via TCP"
 
-#: src/dht/gnunet-service-dht_clients.c:413
+#: src/dht/gnunet-service-dht_clients.c:402
 #, fuzzy
 msgid "# PUT requests received from clients"
 msgstr "Meddelande mottaget från klient är ogiltig.\n"
 
-#: src/dht/gnunet-service-dht_clients.c:486
+#: src/dht/gnunet-service-dht_clients.c:469
 #, fuzzy
 msgid "# GET requests received from clients"
 msgstr "Meddelande mottaget från klient är ogiltig.\n"
 
-#: src/dht/gnunet-service-dht_clients.c:585
+#: src/dht/gnunet-service-dht_clients.c:564
 #, fuzzy
 msgid "# GET STOP requests received from clients"
 msgstr "Meddelande mottaget från klient är ogiltig.\n"
 
-#: src/dht/gnunet-service-dht_clients.c:790
+#: src/dht/gnunet-service-dht_clients.c:757
 msgid "# Key match, type mismatches in REPLY to CLIENT"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_clients.c:808
+#: src/dht/gnunet-service-dht_clients.c:772
 msgid "# Duplicate REPLIES to CLIENT request dropped"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_clients.c:852
+#: src/dht/gnunet-service-dht_clients.c:809
 #, c-format
 msgid "Unsupported block type (%u) in request!\n"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_clients.c:875
+#: src/dht/gnunet-service-dht_clients.c:831
 #, fuzzy
 msgid "# RESULTS queued for clients"
 msgstr "Meddelande mottaget från klient är ogiltig.\n"
 
-#: src/dht/gnunet-service-dht_clients.c:928
-#: src/dht/gnunet-service-dht_clients.c:971
+#: src/dht/gnunet-service-dht_clients.c:882
+#: src/dht/gnunet-service-dht_clients.c:925
 msgid "# REPLIES ignored for CLIENTS (no match)"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_clients.c:937
+#: src/dht/gnunet-service-dht_clients.c:892
 #, fuzzy
 msgid "Could not pass reply to client, message too big!\n"
 msgstr "Kunde inte skicka meddelande till gnunetd\n"
@@ -1603,32 +1592,32 @@
 msgid "Issue a PUT request to the GNUnet DHT insert DATA under KEY."
 msgstr ""
 
-#: src/dht/gnunet-service-dht_routing.c:220
+#: src/dht/gnunet-service-dht_routing.c:211
 msgid "# Good REPLIES matched against routing table"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_routing.c:235
+#: src/dht/gnunet-service-dht_routing.c:220
 msgid "# Duplicate REPLIES matched against routing table"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_routing.c:240
+#: src/dht/gnunet-service-dht_routing.c:226
 msgid "# Invalid REPLIES matched against routing table"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_routing.c:249
+#: src/dht/gnunet-service-dht_routing.c:236
 msgid "# Unsupported REPLIES matched against routing table"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_routing.c:332
-#: src/dht/gnunet-service-dht_routing.c:390
+#: src/dht/gnunet-service-dht_routing.c:314
+#: src/dht/gnunet-service-dht_routing.c:368
 msgid "# Entries removed from routing table"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_routing.c:342
+#: src/dht/gnunet-service-dht_routing.c:324
 msgid "# Entries added to routing table"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_datacache.c:92
+#: src/dht/gnunet-service-dht_datacache.c:93
 #, fuzzy, c-format
 msgid "%s request received, but have no datacache!\n"
 msgstr "# byte mottagna av typen %d"
@@ -1637,33 +1626,33 @@
 msgid "# ITEMS stored in datacache"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_datacache.c:215
+#: src/dht/gnunet-service-dht_datacache.c:209
 msgid "# Good RESULTS found in datacache"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_datacache.c:229
+#: src/dht/gnunet-service-dht_datacache.c:220
 msgid "# Duplicate RESULTS found in datacache"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_datacache.c:234
+#: src/dht/gnunet-service-dht_datacache.c:226
 msgid "# Invalid RESULTS found in datacache"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_datacache.c:245
+#: src/dht/gnunet-service-dht_datacache.c:238
 msgid "# Unsupported RESULTS found in datacache"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_datacache.c:248
+#: src/dht/gnunet-service-dht_datacache.c:241
 #, c-format
 msgid "Unsupported block type (%u) in local response!\n"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_datacache.c:280
+#: src/dht/gnunet-service-dht_datacache.c:271
 #, fuzzy
 msgid "# GET requests given to datacache"
 msgstr "# byte mottogs via TCP"
 
-#: src/dht/gnunet-service-dht_hello.c:86
+#: src/dht/gnunet-service-dht_hello.c:82
 #, fuzzy
 msgid "# HELLOs obtained from peerinfo"
 msgstr "Meddelande mottaget från klient är ogiltig.\n"
@@ -1963,33 +1952,33 @@
 msgid "# messages defragmented"
 msgstr ""
 
-#: src/fragmentation/fragmentation.c:183
+#: src/fragmentation/fragmentation.c:188
 #, fuzzy
 msgid "# fragments transmitted"
 msgstr "# byte skickade av typen %d"
 
-#: src/fragmentation/fragmentation.c:186
+#: src/fragmentation/fragmentation.c:191
 #, fuzzy
 msgid "# fragments retransmitted"
 msgstr "# byte skickade av typen %d"
 
-#: src/fragmentation/fragmentation.c:248
+#: src/fragmentation/fragmentation.c:254
 msgid "# messages fragmented"
 msgstr ""
 
-#: src/fragmentation/fragmentation.c:251
+#: src/fragmentation/fragmentation.c:257
 msgid "# total size of fragmented messages"
 msgstr ""
 
-#: src/fragmentation/fragmentation.c:335
+#: src/fragmentation/fragmentation.c:342
 msgid "# fragment acknowledgements received"
 msgstr ""
 
-#: src/fragmentation/fragmentation.c:341
+#: src/fragmentation/fragmentation.c:348
 msgid "# bits removed from fragmentation ACKs"
 msgstr ""
 
-#: src/fragmentation/fragmentation.c:365
+#: src/fragmentation/fragmentation.c:372
 #, fuzzy
 msgid "# fragmentation transmissions completed"
 msgstr "# klartext PONG-meddelanden mottagna"
@@ -2004,7 +1993,7 @@
 msgid "Wrote %llu bytes of statistics to `%s'\n"
 msgstr "Ladda ner filer från GNUnet."
 
-#: src/statistics/statistics_api.c:325
+#: src/statistics/statistics_api.c:327
 #, fuzzy
 msgid "Failed to connect to statistics service!\n"
 msgstr "Misslyckades att ansluta till gnunetd.\n"
@@ -2140,52 +2129,52 @@
 msgid "Manage GNUnet pseudonyms."
 msgstr ""
 
-#: src/fs/fs_namespace.c:52 src/fs/fs_namespace.c:78
+#: src/fs/fs_namespace.c:64 src/fs/fs_namespace.c:90
 #, fuzzy, c-format
 msgid "Configuration fails to specify `%s' in section `%s'\n"
 msgstr "Konfigurationsfil \"%s\" skapad.\n"
 
-#: src/fs/fs_namespace.c:107
+#: src/fs/fs_namespace.c:119
 #, fuzzy, c-format
 msgid "Failed to open `%s' for writing: %s\n"
 msgstr "Misslyckades att leverera \"%s\" meddelande.\n"
 
-#: src/fs/fs_namespace.c:129 src/fs/fs_namespace.c:217
+#: src/fs/fs_namespace.c:141 src/fs/fs_namespace.c:229
 #, fuzzy, c-format
 msgid "Failed to write `%s': %s\n"
 msgstr "Fel vid %s:%d.\n"
 
-#: src/fs/fs_namespace.c:323
+#: src/fs/fs_namespace.c:335
 #, fuzzy
 msgid "Unknown error"
 msgstr "Okänt fel"
 
-#: src/fs/fs_namespace.c:412 src/fs/fs_namespace.c:433
+#: src/fs/fs_namespace.c:424 src/fs/fs_namespace.c:445
 #, fuzzy
 msgid "Failed to serialize meta data"
 msgstr "Misslyckades att leverera \"%s\" meddelande.\n"
 
-#: src/fs/fs_namespace.c:452
+#: src/fs/fs_namespace.c:464
 #, fuzzy
 msgid "Failed to connect to datastore service"
 msgstr "Misslyckades att ansluta till gnunetd.\n"
 
-#: src/fs/fs_namespace.c:495
+#: src/fs/fs_namespace.c:507
 #, fuzzy, c-format
 msgid "Failed to create or read private key for namespace `%s'\n"
 msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 
-#: src/fs/fs_namespace.c:597
+#: src/fs/fs_namespace.c:609
 #, c-format
 msgid "Failed to read namespace private key file `%s', deleting it!\n"
 msgstr ""
 
-#: src/fs/fs_namespace.c:822 src/fs/fs_publish.c:1518
+#: src/fs/fs_namespace.c:834 src/fs/fs_publish.c:1523
 #, fuzzy
 msgid "Internal error."
 msgstr "Okänt fel.\n"
 
-#: src/fs/fs_namespace.c:866
+#: src/fs/fs_namespace.c:878
 #, fuzzy
 msgid "Failed to connect to datastore."
 msgstr "Misslyckades att ansluta till gnunetd.\n"
@@ -2299,11 +2288,11 @@
 msgid "Could not access hostkey file `%s'.\n"
 msgstr "Kunde inte tolka konfigurationsfil \"%s\".\n"
 
-#: src/fs/fs_uri.c:1238 src/fs/fs_uri.c:1265
+#: src/fs/fs_uri.c:1232 src/fs/fs_uri.c:1259
 msgid "No keywords specified!\n"
 msgstr "Inga nyckelord angivna!\n"
 
-#: src/fs/fs_uri.c:1271
+#: src/fs/fs_uri.c:1265
 msgid "Number of double-quotes not balanced!\n"
 msgstr ""
 
@@ -2363,7 +2352,7 @@
 msgstr "Kommando \"%s\" kräver ett argument (\"%s\").\n"
 
 #: src/fs/gnunet-publish.c:393 src/fs/gnunet-publish.c:400
-#: src/transport/gnunet-transport.c:525
+#: src/transport/gnunet-transport.c:477
 #, c-format
 msgid "Option `%s' makes no sense without option `%s'.\n"
 msgstr ""
@@ -2454,13 +2443,13 @@
 msgid "Publish a file or directory on GNUnet"
 msgstr ""
 
-#: src/fs/fs_search.c:798
+#: src/fs/fs_search.c:803
 #, c-format
 msgid "Got result with unknown block type `%d', ignoring"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_lc.c:202 src/fs/gnunet-service-fs_lc.c:359
-#: src/fs/gnunet-service-fs_lc.c:480
+#: src/fs/gnunet-service-fs_lc.c:202 src/fs/gnunet-service-fs_lc.c:365
+#: src/fs/gnunet-service-fs_lc.c:490
 #, fuzzy
 msgid "# client searches active"
 msgstr "# klartext PONG-meddelanden mottagna"
@@ -2470,12 +2459,12 @@
 msgid "# replies received for local clients"
 msgstr "Meddelande mottaget från klient är ogiltig.\n"
 
-#: src/fs/gnunet-service-fs_lc.c:312
+#: src/fs/gnunet-service-fs_lc.c:319
 #, fuzzy
 msgid "# client searches received"
 msgstr "# klartext PONG-meddelanden mottagna"
 
-#: src/fs/gnunet-service-fs_lc.c:351
+#: src/fs/gnunet-service-fs_lc.c:359
 msgid "# client searches updated (merged content seen list)"
 msgstr ""
 
@@ -2519,238 +2508,240 @@
 msgid "Display contents of a GNUnet directory"
 msgstr "Filformatsfel (inte en GNUnet-katalog?)\n"
 
-#: src/fs/gnunet-service-fs_pr.c:272
+#: src/fs/gnunet-service-fs_pr.c:287
 #, fuzzy
 msgid "# Pending requests created"
 msgstr "# byte mottogs via TCP"
 
-#: src/fs/gnunet-service-fs_pr.c:352 src/fs/gnunet-service-fs_pr.c:607
+#: src/fs/gnunet-service-fs_pr.c:368 src/fs/gnunet-service-fs_pr.c:622
 msgid "# Pending requests active"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:771
+#: src/fs/gnunet-service-fs_pr.c:786
 #, fuzzy
 msgid "# replies received and matched"
 msgstr "# byte mottagna av typen %d"
 
-#: src/fs/gnunet-service-fs_pr.c:798
+#: src/fs/gnunet-service-fs_pr.c:813
 msgid "# duplicate replies discarded (bloomfilter)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:814
+#: src/fs/gnunet-service-fs_pr.c:829
 #, c-format
 msgid "Unsupported block type %u\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:829
+#: src/fs/gnunet-service-fs_pr.c:844
 msgid "# results found locally"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:921
+#: src/fs/gnunet-service-fs_pr.c:936
 msgid "# Datastore `PUT' failures"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:948
+#: src/fs/gnunet-service-fs_pr.c:963
 #, fuzzy
 msgid "# storage requests dropped due to high load"
 msgstr "Nätverksannonsering avstängd i konfigurationen!\n"
 
-#: src/fs/gnunet-service-fs_pr.c:983
+#: src/fs/gnunet-service-fs_pr.c:998
 #, fuzzy
 msgid "# Replies received from DHT"
 msgstr "# byte mottagna via HTTP"
 
-#: src/fs/gnunet-service-fs_pr.c:1074
+#: src/fs/gnunet-service-fs_pr.c:1088
 #, c-format
 msgid "Datastore lookup already took %llu ms!\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1095
+#: src/fs/gnunet-service-fs_pr.c:1109
 #, c-format
 msgid "On-demand lookup already took %llu ms!\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1142
+#: src/fs/gnunet-service-fs_pr.c:1156
 msgid "# Datastore lookups concluded (no results)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1156
+#: src/fs/gnunet-service-fs_pr.c:1170
 msgid "# Datastore lookups concluded (seen all)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1165
+#: src/fs/gnunet-service-fs_pr.c:1179
 msgid "# Datastore lookups aborted (more than MAX_RESULTS)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1181
+#: src/fs/gnunet-service-fs_pr.c:1195
 msgid "# requested DBLOCK or IBLOCK not found"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1198
+#: src/fs/gnunet-service-fs_pr.c:1212
 msgid "# on-demand blocks matched requests"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1211
+#: src/fs/gnunet-service-fs_pr.c:1225
 msgid "# on-demand lookups performed successfully"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1216
+#: src/fs/gnunet-service-fs_pr.c:1230
 msgid "# on-demand lookups failed"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1242 src/fs/gnunet-service-fs_pr.c:1281
-#: src/fs/gnunet-service-fs_pr.c:1416
+#: src/fs/gnunet-service-fs_pr.c:1257 src/fs/gnunet-service-fs_pr.c:1297
+#: src/fs/gnunet-service-fs_pr.c:1437
 msgid "# Datastore lookups concluded (error queueing)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1299
+#: src/fs/gnunet-service-fs_pr.c:1315
 msgid "# Datastore lookups concluded (found last result)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1312
+#: src/fs/gnunet-service-fs_pr.c:1328
 msgid "# Datastore lookups concluded (load too high)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1394
+#: src/fs/gnunet-service-fs_pr.c:1414
 msgid "# Datastore lookups initiated"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1474
+#: src/fs/gnunet-service-fs_pr.c:1495
 #, fuzzy
 msgid "# GAP PUT messages received"
 msgstr "# krypterade PONG-meddelanden mottagna"
 
-#: src/fs/gnunet-service-fs_pr.c:1565 src/fs/gnunet-service-fs_pr.c:1576
+#: src/fs/gnunet-service-fs_pr.c:1586 src/fs/gnunet-service-fs_pr.c:1595
 #, fuzzy, c-format
 msgid "Configuration fails to specify `%s', assuming default value."
 msgstr "Konfigurationsfil \"%s\" skapad.\n"
 
-#: src/fs/gnunet-service-fs_pe.c:259
+#: src/fs/gnunet-service-fs_pe.c:265
 msgid "# average retransmission delay (ms)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pe.c:354
+#: src/fs/gnunet-service-fs_pe.c:392
 #, fuzzy
 msgid "# transmission failed (core has no bandwidth)"
 msgstr "Ingen transport av typ %d är känd.\n"
 
-#: src/fs/gnunet-service-fs_pe.c:385
+#: src/fs/gnunet-service-fs_pe.c:423
 #, fuzzy
 msgid "# query messages sent to other peers"
 msgstr "# byte skickade av typen %d"
 
-#: src/fs/gnunet-service-fs_pe.c:440
+#: src/fs/gnunet-service-fs_pe.c:476
 msgid "# delay heap timeout"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pe.c:450
+#: src/fs/gnunet-service-fs_pe.c:483
 msgid "# query plans executed"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pe.c:516
+#: src/fs/gnunet-service-fs_pe.c:547
 #, fuzzy
 msgid "# requests merged"
 msgstr "# byte mottogs via TCP"
 
-#: src/fs/gnunet-service-fs_pe.c:522
+#: src/fs/gnunet-service-fs_pe.c:553
 #, fuzzy
 msgid "# requests refreshed"
 msgstr "# byte mottogs via TCP"
 
-#: src/fs/gnunet-service-fs_pe.c:576 src/fs/gnunet-service-fs_pe.c:665
-#: src/fs/gnunet-service-fs_pe.c:706
+#: src/fs/gnunet-service-fs_pe.c:606 src/fs/gnunet-service-fs_pe.c:692
+#: src/fs/gnunet-service-fs_pe.c:734
 msgid "# query plan entries"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:618 src/fs/gnunet-service-fs_cp.c:1552
-#: src/transport/gnunet-service-transport_neighbours.c:870
-#: src/transport/gnunet-service-transport_neighbours.c:2036
-#: src/transport/gnunet-service-transport_neighbours.c:2123
-#: src/topology/gnunet-daemon-topology.c:653
-#: src/topology/gnunet-daemon-topology.c:755
+#: src/fs/gnunet-service-fs_cp.c:615 src/fs/gnunet-service-fs_cp.c:1543
+#: src/transport/gnunet-service-transport_neighbours.c:938
+#: src/transport/gnunet-service-transport_neighbours.c:943
+#: src/transport/gnunet-service-transport_neighbours.c:1266
+#: src/transport/gnunet-service-transport_neighbours.c:2352
+#: src/transport/gnunet-service-transport_neighbours.c:2423
+#: src/topology/gnunet-daemon-topology.c:654
+#: src/topology/gnunet-daemon-topology.c:756
 #, fuzzy
 msgid "# peers connected"
 msgstr "# av anslutna parter"
 
-#: src/fs/gnunet-service-fs_cp.c:701
+#: src/fs/gnunet-service-fs_cp.c:696
 #, fuzzy
 msgid "# migration stop messages received"
 msgstr "# krypterade PONG-meddelanden mottagna"
 
-#: src/fs/gnunet-service-fs_cp.c:705
+#: src/fs/gnunet-service-fs_cp.c:700
 #, c-format
 msgid "Migration of content to peer `%s' blocked for %llu ms\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:740
+#: src/fs/gnunet-service-fs_cp.c:735
 #, fuzzy
 msgid "# replies transmitted to other peers"
 msgstr "# byte skickade av typen %d"
 
-#: src/fs/gnunet-service-fs_cp.c:746
+#: src/fs/gnunet-service-fs_cp.c:741
 msgid "# replies dropped"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:775 src/fs/gnunet-service-fs_cp.c:891
-#: src/fs/gnunet-service-fs_cp.c:1301 src/fs/gnunet-service-fs_cp.c:1340
+#: src/fs/gnunet-service-fs_cp.c:770 src/fs/gnunet-service-fs_cp.c:886
+#: src/fs/gnunet-service-fs_cp.c:1296 src/fs/gnunet-service-fs_cp.c:1333
 msgid "# P2P searches active"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:848
+#: src/fs/gnunet-service-fs_cp.c:843
 msgid "# artificial delays introduced (ms)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:911
+#: src/fs/gnunet-service-fs_cp.c:906
 #, fuzzy
 msgid "# replies received for other peers"
 msgstr "# byte mottagna av typen %d"
 
-#: src/fs/gnunet-service-fs_cp.c:925
+#: src/fs/gnunet-service-fs_cp.c:920
 msgid "# replies dropped due to insufficient cover traffic"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:963
+#: src/fs/gnunet-service-fs_cp.c:958
 msgid "# P2P searches destroyed due to ultimate reply"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1030
+#: src/fs/gnunet-service-fs_cp.c:1025
 msgid "# requests done for free (low load)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1054
+#: src/fs/gnunet-service-fs_cp.c:1049
 msgid "# request dropped, priority insufficient"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1064
+#: src/fs/gnunet-service-fs_cp.c:1059
 msgid "# requests done for a price (normal load)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1143
+#: src/fs/gnunet-service-fs_cp.c:1138
 msgid "# GET requests received (from other peers)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1177
+#: src/fs/gnunet-service-fs_cp.c:1172
 msgid "# requests dropped due to initiator not being connected"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1201
+#: src/fs/gnunet-service-fs_cp.c:1196
 msgid "# requests dropped due to missing reverse route"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1267
+#: src/fs/gnunet-service-fs_cp.c:1262
 msgid "# requests dropped due TTL underflow"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1295
+#: src/fs/gnunet-service-fs_cp.c:1290
 msgid "# requests dropped due to higher-TTL request"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1338
+#: src/fs/gnunet-service-fs_cp.c:1331
 #, fuzzy
 msgid "# P2P query messages received and processed"
 msgstr "# krypterade PONG-meddelanden mottagna"
 
-#: src/fs/gnunet-service-fs_push.c:642
+#: src/fs/gnunet-service-fs_push.c:653
 #, c-format
 msgid ""
 "Invalid value specified for option `%s' in section `%s', content pushing "
@@ -2791,17 +2782,21 @@
 msgid "Failed to delete bogus block: %s\n"
 msgstr "Misslyckades att leverera \"%s\" meddelande.\n"
 
-#: src/fs/gnunet-service-fs_indexing.c:552
+#: src/fs/gnunet-service-fs_indexing.c:545
+msgid "# index blocks removed: original file inaccessible"
+msgstr ""
+
+#: src/fs/gnunet-service-fs_indexing.c:560
 #, fuzzy, c-format
 msgid "Could not access indexed file `%s' (%s) at offset %llu: %s\n"
 msgstr "Kunde inte slå upp \"%s\": %s\n"
 
-#: src/fs/gnunet-service-fs_indexing.c:554
+#: src/fs/gnunet-service-fs_indexing.c:562
 #, fuzzy
 msgid "not indexed"
 msgstr "Avindexering misslyckades."
 
-#: src/fs/gnunet-service-fs_indexing.c:569
+#: src/fs/gnunet-service-fs_indexing.c:577
 #, fuzzy, c-format
 msgid "Indexed file `%s' changed at offset %llu\n"
 msgstr "Indexering av data misslyckades vid position %i.\n"
@@ -2931,147 +2926,147 @@
 "`unknown' instead.\n"
 msgstr ""
 
-#: src/fs/fs_publish.c:142 src/fs/fs_publish.c:410
+#: src/fs/fs_publish.c:147 src/fs/fs_publish.c:415
 #, fuzzy, c-format
 msgid "Publishing failed: %s"
 msgstr ""
 "\n"
 "Fel vid uppladdning av fil: %s\n"
 
-#: src/fs/fs_publish.c:647 src/fs/fs_publish.c:664 src/fs/fs_publish.c:703
-#: src/fs/fs_publish.c:723 src/fs/fs_publish.c:750 src/fs/fs_publish.c:898
+#: src/fs/fs_publish.c:652 src/fs/fs_publish.c:669 src/fs/fs_publish.c:708
+#: src/fs/fs_publish.c:728 src/fs/fs_publish.c:755 src/fs/fs_publish.c:903
 #, 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"
 
-#: src/fs/fs_publish.c:649
+#: src/fs/fs_publish.c:654
 msgid "timeout on index-start request to `fs' service"
 msgstr ""
 
-#: src/fs/fs_publish.c:661
+#: src/fs/fs_publish.c:666
 #, fuzzy
 msgid "unknown error"
 msgstr "Okänt fel"
 
-#: src/fs/fs_publish.c:704
+#: src/fs/fs_publish.c:709
 msgid "failed to compute hash"
 msgstr ""
 
-#: src/fs/fs_publish.c:724
+#: src/fs/fs_publish.c:729
 msgid "filename too long"
 msgstr ""
 
-#: src/fs/fs_publish.c:751
+#: src/fs/fs_publish.c:756
 #, fuzzy
 msgid "could not connect to `fs' service"
 msgstr "Kunde inte ansluta till gnunetd.\n"
 
-#: src/fs/fs_publish.c:775
+#: src/fs/fs_publish.c:780
 #, fuzzy, c-format
 msgid "Failed to get file identifiers for `%s'\n"
 msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 
-#: src/fs/fs_publish.c:845
+#: src/fs/fs_publish.c:850
 #, 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:851
+#: src/fs/fs_publish.c:856
 #, fuzzy, c-format
 msgid "Recursive upload failed: %s"
 msgstr ""
 "\n"
 "Fel vid uppladdning av fil: %s\n"
 
-#: src/fs/fs_publish.c:899
+#: src/fs/fs_publish.c:904
 msgid "needs to be an actual file"
 msgstr ""
 
-#: src/fs/fs_publish.c:1078
+#: src/fs/fs_publish.c:1083
 #, c-format
 msgid "Insufficient space for publishing: %s"
 msgstr ""
 
-#: src/fs/fs_publish.c:1149
+#: src/fs/fs_publish.c:1154
 #, c-format
 msgid "Reserving space for %u entries and %llu bytes for publication\n"
 msgstr ""
 
-#: src/fs/fs_publish.c:1482
+#: src/fs/fs_publish.c:1487
 #, fuzzy
 msgid "Could not connect to datastore."
 msgstr "Kunde inte ansluta till gnunetd.\n"
 
-#: src/fs/fs.c:284
+#: src/fs/fs_api.c:284
 #, fuzzy, c-format
 msgid "Could not open file `%s': %s"
 msgstr "Kunde inte slå upp \"%s\": %s\n"
 
-#: src/fs/fs.c:293
+#: src/fs/fs_api.c:293
 #, fuzzy, c-format
 msgid "Could not read file `%s': %s"
 msgstr "Kunde inte slå upp \"%s\": %s\n"
 
-#: src/fs/fs.c:299
+#: src/fs/fs_api.c:299
 #, c-format
 msgid "Short read reading from file `%s'!"
 msgstr ""
 
-#: src/fs/fs.c:877
+#: src/fs/fs_api.c:877
 #, fuzzy, c-format
 msgid "Failed to resume publishing information `%s': %s\n"
 msgstr "Misslyckades att leverera \"%s\" meddelande.\n"
 
-#: src/fs/fs.c:1323
+#: src/fs/fs_api.c:1323
 #, c-format
 msgid "Failed to recover namespace `%s', cannot resume publishing operation.\n"
 msgstr ""
 
-#: src/fs/fs.c:1364
+#: src/fs/fs_api.c:1364
 #, c-format
 msgid "Failure while resuming publishing operation `%s': %s\n"
 msgstr ""
 
-#: src/fs/fs.c:1380
+#: src/fs/fs_api.c:1380
 #, fuzzy, c-format
 msgid "Failed to resume publishing operation `%s': %s\n"
 msgstr "Misslyckades att leverera \"%s\" meddelande.\n"
 
-#: src/fs/fs.c:1984
+#: src/fs/fs_api.c:1984
 #, c-format
 msgid "Failure while resuming unindexing operation `%s': %s\n"
 msgstr ""
 
-#: src/fs/fs.c:1994
+#: src/fs/fs_api.c:1994
 #, fuzzy, c-format
 msgid "Failed to resume unindexing operation `%s': %s\n"
 msgstr "Misslyckades att leverera \"%s\" meddelande.\n"
 
-#: src/fs/fs.c:2107 src/fs/fs.c:2346
+#: src/fs/fs_api.c:2107 src/fs/fs_api.c:2346
 #, fuzzy, c-format
 msgid "Failed to resume sub-download `%s': %s\n"
 msgstr "Misslyckades att leverera \"%s\" meddelande.\n"
 
-#: src/fs/fs.c:2124
+#: src/fs/fs_api.c:2124
 #, fuzzy, c-format
 msgid "Failed to resume sub-search `%s': %s\n"
 msgstr "Misslyckades att leverera \"%s\" meddelande.\n"
 
-#: src/fs/fs.c:2136 src/fs/fs.c:2155 src/fs/fs.c:2631
+#: src/fs/fs_api.c:2136 src/fs/fs_api.c:2155 src/fs/fs_api.c:2631
 #, c-format
 msgid "Failure while resuming search operation `%s': %s\n"
 msgstr ""
 
-#: src/fs/fs.c:2337
+#: src/fs/fs_api.c:2337
 #, c-format
 msgid "Failed to resume sub-download `%s': could not open file `%s'\n"
 msgstr ""
 
-#: src/fs/fs.c:2583
+#: src/fs/fs_api.c:2583
 msgid "Could not resume running search, will resume as paused search\n"
 msgstr ""
 
-#: src/fs/fs.c:2669
+#: src/fs/fs_api.c:2669
 #, c-format
 msgid "Failure while resuming download operation `%s': %s\n"
 msgstr ""
@@ -3127,12 +3122,16 @@
 msgid "Invalid URI"
 msgstr "Ogiltiga argument: "
 
-#: src/fs/gnunet-service-fs.c:268 src/fs/gnunet-service-fs.c:448
+#: src/fs/gnunet-service-fs.c:240
+msgid "# running average P2P latency (ms)"
+msgstr ""
+
+#: src/fs/gnunet-service-fs.c:300 src/fs/gnunet-service-fs.c:490
 msgid "# Loopback routes suppressed"
 msgstr ""
 
-#: src/fs/gnunet-service-fs.c:542 src/topology/gnunet-daemon-topology.c:1292
-#: src/topology/gnunet-daemon-topology.c:1299
+#: src/fs/gnunet-service-fs.c:583 src/topology/gnunet-daemon-topology.c:1290
+#: src/topology/gnunet-daemon-topology.c:1297
 #: src/hostlist/gnunet-daemon-hostlist.c:290
 #, fuzzy, c-format
 msgid "Failed to connect to `%s' service.\n"
@@ -3144,72 +3143,97 @@
 msgid "`%s' failed on file `%s': %s"
 msgstr "\"%s\" misslyckades för enhet %s: %u\n"
 
-#: src/transport/gnunet-service-transport_neighbours.c:435
+#: src/transport/gnunet-service-transport_neighbours.c:465
 msgid "# failed connection attempts due to timeout"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:819
+#: src/transport/gnunet-service-transport_neighbours.c:857
 #, fuzzy
 msgid "# peers disconnected due to external request"
 msgstr "# av anslutna parter"
 
-#: src/transport/gnunet-service-transport_neighbours.c:925
+#: src/transport/gnunet-service-transport_neighbours.c:947
 #, fuzzy
+msgid "# fast reconnects failed"
+msgstr "# av anslutna parter"
+
+#: src/transport/gnunet-service-transport_neighbours.c:1002
+#, fuzzy
 msgid "# peers disconnected due to timeout"
 msgstr "# av anslutna parter"
 
-#: src/transport/gnunet-service-transport_neighbours.c:949
+#: src/transport/gnunet-service-transport_neighbours.c:1027
 #, fuzzy
 msgid "# keepalives sent"
 msgstr "# sessionsnycklar skickade"
 
-#: src/transport/gnunet-service-transport_neighbours.c:981
+#: src/transport/gnunet-service-transport_neighbours.c:1068
 #, fuzzy
 msgid "# peers disconnected due to global disconnect"
 msgstr "Nätverksannonsering avstängd i konfigurationen!\n"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1543
-#: src/transport/gnunet-service-transport_neighbours.c:1564
+#: src/transport/gnunet-service-transport_neighbours.c:1774
+#: src/transport/gnunet-service-transport_neighbours.c:1795
 msgid "# messages not sent (no such peer or not connected)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1580
+#: src/transport/gnunet-service-transport_neighbours.c:1811
 msgid "# bytes in message queue for other peers"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1632
+#: src/transport/gnunet-service-transport_neighbours.c:1863
 #, 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:1668
+#: src/transport/gnunet-service-transport_neighbours.c:1899
 msgid "# bandwidth quota violations by other peers"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1686
+#: src/transport/gnunet-service-transport_neighbours.c:1917
 msgid "# ms throttling suggested"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1715
+#: src/transport/gnunet-service-transport_neighbours.c:1946
 msgid "# KEEPALIVE messages discarded (not connected)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1749
+#: src/transport/gnunet-service-transport_neighbours.c:1995
+#, fuzzy
+msgid "# KEEPALIVE_RESPONSE messages discarded (not connected)"
+msgstr "Nätverksannonsering avstängd i konfigurationen!\n"
+
+#: src/transport/gnunet-service-transport_neighbours.c:2003
+#, fuzzy
+msgid "# KEEPALIVE_RESPONSE messages discarded (not expected)"
+msgstr "Nätverksannonsering avstängd i konfigurationen!\n"
+
+#: src/transport/gnunet-service-transport_neighbours.c:2064
 msgid "# SET QUOTA messages ignored (no such peer)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1762
+#: src/transport/gnunet-service-transport_neighbours.c:2082
 msgid "# disconnects due to quota of 0"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1884
+#: src/transport/gnunet-service-transport_neighbours.c:2200
 msgid "# disconnect messages ignored (old format)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1896
+#: src/transport/gnunet-service-transport_neighbours.c:2213
 msgid "# disconnect messages ignored (timestamp)"
 msgstr ""
 
+#: src/transport/gnunet-service-transport_neighbours.c:2302
+#, fuzzy
+msgid "# unexpected CONNECT_ACK messages"
+msgstr "skicka ANTAL meddelanden"
+
+#: src/transport/gnunet-service-transport_neighbours.c:2400
+#, fuzzy
+msgid "# unexpected ACK messages"
+msgstr "# krypterade PONG-meddelanden skickade"
+
 #: src/transport/gnunet-service-transport_blacklist.c:247
 #, fuzzy, c-format
 msgid "Could not read blacklist file `%s'\n"
@@ -3248,54 +3272,53 @@
 msgstr ""
 
 #: src/transport/gnunet-service-transport_blacklist.c:522
-#: src/transport/gnunet-service-transport_blacklist.c:760
+#: src/transport/gnunet-service-transport_blacklist.c:756
 msgid "# disconnects due to blacklist"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:184
+#: src/transport/plugin_transport_http_server.c:189
 msgid ""
 "Could not create a new TLS certificate, program `gnunet-transport-"
 "certificate-creation' could not be started!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:208
+#: src/transport/plugin_transport_http_server.c:213
 msgid "No usable TLS certificate found and creating one failed!\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_hello.c:177
+#: src/transport/gnunet-service-transport_hello.c:172
 msgid "# refreshed my HELLO"
 msgstr ""
 
-#: src/transport/plugin_transport_udp.c:1431
-#: src/transport/plugin_transport_udp.c:2130
+#: src/transport/plugin_transport_udp.c:1518
 #, fuzzy
-msgid "# HELLO beacons received via udp"
+msgid "# IPv4 broadcast HELLO beacons received via udp"
 msgstr "# krypterade PONG-meddelanden mottagna"
 
-#: src/transport/plugin_transport_udp.c:1894
-#: src/transport/plugin_transport_udp_new.c:1209
+#: src/transport/plugin_transport_udp.c:1555
+#, fuzzy
+msgid "# IPv6 multicast HELLO beacons received via udp"
+msgstr "# krypterade PONG-meddelanden mottagna"
+
+#: src/transport/plugin_transport_udp.c:2041
+#: src/transport/plugin_transport_udp_new.c:1218
 #, c-format
 msgid "Given `%s' option is out of range: %llu > %u\n"
 msgstr ""
 
-#: src/transport/plugin_transport_udp.c:1947
-#: src/transport/plugin_transport_udp_new.c:1259
+#: src/transport/plugin_transport_udp.c:2092
+#: src/transport/plugin_transport_udp_new.c:1268
 #, fuzzy, c-format
 msgid "Invalid IPv6 address: `%s'\n"
 msgstr "Ogiltigt svar på \"%s\".\n"
 
-#: src/transport/plugin_transport_udp.c:2102
-#, fuzzy, c-format
-msgid "Failed to create IPv4 broadcast socket on port %d\n"
-msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
-
-#: src/transport/plugin_transport_udp.c:2112
+#: src/transport/plugin_transport_udp.c:2235
 #, c-format
 msgid "Failed to set IPv4 broadcast option for broadcast socket on port %d\n"
 msgstr ""
 
-#: src/transport/plugin_transport_udp.c:2144
-#: src/transport/plugin_transport_udp_new.c:1388
+#: src/transport/plugin_transport_udp.c:2274
+#: src/transport/plugin_transport_udp_new.c:1396
 #, fuzzy
 msgid "Failed to open UDP sockets\n"
 msgstr "Misslyckades att binda till UDP6-port %d.\n"
@@ -3310,7 +3333,7 @@
 msgid "%s failed at %s:%d: `%s'\n"
 msgstr "\"%s\" misslyckades vid %s:%d med fel: \"%s\".\n"
 
-#: src/transport/plugin_transport_http_client.c:617
+#: src/transport/plugin_transport_http_client.c:619
 #, c-format
 msgid "Could not initialize curl multi handle, failed to start %s plugin!\n"
 msgstr ""
@@ -3322,16 +3345,16 @@
 
 #: src/transport/plugin_transport_tcp.c:590
 #: src/transport/plugin_transport_tcp.c:679
-#: src/transport/plugin_transport_tcp.c:732
-#: src/transport/plugin_transport_tcp.c:821
-#: src/transport/plugin_transport_tcp.c:1160
+#: src/transport/plugin_transport_tcp.c:731
+#: src/transport/plugin_transport_tcp.c:820
+#: src/transport/plugin_transport_tcp.c:1156
 #, fuzzy
 msgid "# bytes currently in TCP buffers"
 msgstr "# byte skickades via TCP"
 
 #: src/transport/plugin_transport_tcp.c:596
-#: src/transport/plugin_transport_tcp.c:847
-#: src/transport/plugin_transport_tcp.c:1548
+#: src/transport/plugin_transport_tcp.c:846
+#: src/transport/plugin_transport_tcp.c:1544
 #, fuzzy
 msgid "# TCP sessions active"
 msgstr "# sessionsnycklar accepterade"
@@ -3341,127 +3364,127 @@
 msgid "# bytes discarded by TCP (timeout)"
 msgstr "# byte kastade via TCP (utgående)"
 
-#: src/transport/plugin_transport_tcp.c:735
+#: src/transport/plugin_transport_tcp.c:734
 #, fuzzy
 msgid "# bytes transmitted via TCP"
 msgstr "# byte skickade av typen %d"
 
-#: src/transport/plugin_transport_tcp.c:825
+#: src/transport/plugin_transport_tcp.c:824
 #, fuzzy
 msgid "# bytes discarded by TCP (disconnect)"
 msgstr "# byte kastade via TCP (utgående)"
 
-#: src/transport/plugin_transport_tcp.c:946
+#: src/transport/plugin_transport_tcp.c:945
 #, fuzzy
 msgid "# bytes TCP was asked to transmit"
 msgstr "# byte skickade av typen %d"
 
-#: src/transport/plugin_transport_tcp.c:997
+#: src/transport/plugin_transport_tcp.c:996
 msgid "# bytes discarded by TCP (no address and no connection)"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:1040
+#: src/transport/plugin_transport_tcp.c:1039
 #, c-format
 msgid "Address of unexpected length: %u\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:1057
+#: src/transport/plugin_transport_tcp.c:1056
 msgid "Found valid IPv4 NAT address (creating session)!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:1108
+#: src/transport/plugin_transport_tcp.c:1107
 #, fuzzy
 msgid "# bytes discarded by TCP (failed to connect)"
 msgstr "# byte kastade via TCP (utgående)"
 
-#: src/transport/plugin_transport_tcp.c:1228
+#: src/transport/plugin_transport_tcp.c:1224
 msgid "# transport-service disconnect requests for TCP"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:1591
+#: src/transport/plugin_transport_tcp.c:1587
 #, fuzzy
 msgid "# TCP WELCOME messages received"
 msgstr "# krypterade PONG-meddelanden mottagna"
 
-#: src/transport/plugin_transport_tcp.c:1736
+#: src/transport/plugin_transport_tcp.c:1732
 msgid "# bytes received via TCP"
 msgstr "# byte mottogs via TCP"
 
-#: src/transport/plugin_transport_tcp.c:1800
+#: src/transport/plugin_transport_tcp.c:1796
 msgid "# network-level TCP disconnect events"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:1953
+#: src/transport/plugin_transport_tcp.c:1949
 #, fuzzy
 msgid "Failed to start service.\n"
 msgstr "Misslyckades att starta samling.\n"
 
-#: src/transport/plugin_transport_tcp.c:2013
+#: src/transport/plugin_transport_tcp.c:2009
 #, fuzzy, c-format
 msgid "Failed to find option %s in section %s!\n"
 msgstr "Misslyckades att binda till UDP-port %d.\n"
 
-#: src/transport/plugin_transport_tcp.c:2036
+#: src/transport/plugin_transport_tcp.c:2032
 #, c-format
 msgid "TCP transport listening on port %llu\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2040
+#: src/transport/plugin_transport_tcp.c:2036
 msgid "TCP transport not listening on any port (client only)\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2044
+#: src/transport/plugin_transport_tcp.c:2040
 #, c-format
 msgid "TCP transport advertises itself as being on port %llu\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http.c:829
+#: src/transport/plugin_transport_http.c:920
 msgid "Disabling IPv6 since it is not supported on this system!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http.c:878
+#: src/transport/plugin_transport_http.c:968
 #, fuzzy
 msgid "Require valid port number for service in configuration!\n"
 msgstr "Inga applikationer definierade i konfiguration!\n"
 
-#: src/transport/plugin_transport_http.c:1025
+#: src/transport/plugin_transport_http.c:1115
 #, c-format
 msgid "Found %u addresses to report to NAT service\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http.c:1040
+#: src/transport/plugin_transport_http.c:1128
 #, c-format
 msgid "FREEING %s\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http.c:1115
+#: src/transport/plugin_transport_http.c:1203
 msgid "Neither IPv4 nor IPv6 are enabled! Fix in configuration\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http.c:1128
+#: src/transport/plugin_transport_http.c:1216
 #, fuzzy
 msgid "Port is required! Fix in configuration\n"
 msgstr " gconfig\tGTK-konfiguration\n"
 
-#: src/transport/plugin_transport_http.c:1139
+#: src/transport/plugin_transport_http.c:1227
 msgid "Port 0, client only mode\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http.c:1155
+#: src/transport/plugin_transport_http.c:1247
 #, c-format
 msgid ""
 "Specific IPv4 address `%s' for plugin %s in configuration file is invalid! "
 "Binding to all addresses!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http.c:1181
+#: src/transport/plugin_transport_http.c:1277
 #, c-format
 msgid ""
 "Specific IPv6 address `%s' for plugin %s in configuration file is invalid! "
 "Binding to all addresses!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_unix.c:1088
+#: src/transport/plugin_transport_unix.c:1087
 #, fuzzy
 msgid "Failed to open UNIX sockets\n"
 msgstr "Misslyckades att leverera \"%s\" meddelande.\n"
@@ -3514,283 +3537,288 @@
 msgid "# bytes dropped by SMTP (outgoing)"
 msgstr "# byte kastade via TCP (utgående)"
 
-#: src/transport/gnunet-service-transport_plugins.c:108
+#: src/transport/gnunet-service-transport_plugins.c:109
 msgid "Transport service is lacking NEIGHBOUR_LIMIT option.\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_plugins.c:115
+#: src/transport/gnunet-service-transport_plugins.c:116
 #, fuzzy, c-format
 msgid "Starting transport plugins `%s'\n"
 msgstr "Testar transport(er) %s\n"
 
-#: src/transport/gnunet-service-transport_plugins.c:119
+#: src/transport/gnunet-service-transport_plugins.c:120
 #, fuzzy, c-format
 msgid "Loading `%s' transport plugin\n"
 msgstr "Testar transport(er) %s\n"
 
-#: src/transport/gnunet-service-transport_plugins.c:139
+#: src/transport/gnunet-service-transport_plugins.c:147
 #, fuzzy, c-format
 msgid "Failed to load transport plugin for `%s'\n"
 msgstr "Kunde inte slå upp \"%s\": %s\n"
 
-#: src/transport/plugin_transport_wlan.c:877
+#: src/transport/plugin_transport_wlan.c:884
 #, fuzzy
 msgid "# wlan session timeouts"
 msgstr "# sessionsnycklar accepterade"
 
-#: src/transport/plugin_transport_wlan.c:902
+#: src/transport/plugin_transport_wlan.c:909
 #, fuzzy
 msgid "# wlan session created"
 msgstr "# sessionsnycklar accepterade"
 
-#: src/transport/plugin_transport_wlan.c:985
-#: src/transport/plugin_transport_wlan.c:1143
-#: src/transport/plugin_transport_wlan.c:1163
-#: src/transport/plugin_transport_wlan.c:1193
-#: src/transport/plugin_transport_wlan.c:2376
-#: src/transport/plugin_transport_wlan.c:3210
+#: src/transport/plugin_transport_wlan.c:993
+#: src/transport/plugin_transport_wlan.c:1157
+#: src/transport/plugin_transport_wlan.c:1178
+#: src/transport/plugin_transport_wlan.c:1209
+#: src/transport/plugin_transport_wlan.c:2447
+#: src/transport/plugin_transport_wlan.c:3304
 msgid "# wlan pending sessions"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:1237
-#: src/transport/plugin_transport_wlan.c:1941
+#: src/transport/plugin_transport_wlan.c:1252
+#: src/transport/plugin_transport_wlan.c:2000
 #, fuzzy
 msgid "# wlan pending fragments"
 msgstr "# byte mottogs via TCP"
 
-#: src/transport/plugin_transport_wlan.c:1459
+#: src/transport/plugin_transport_wlan.c:1475
 #, c-format
 msgid "Finished reading from wlan-helper stdout with code: %d\n"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:1782
+#: src/transport/plugin_transport_wlan.c:1840
 msgid "# wlan hello beacons send"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:1814
-#: src/transport/plugin_transport_wlan.c:2028
-#: src/transport/plugin_transport_wlan.c:2121
+#: src/transport/plugin_transport_wlan.c:1873
+#: src/transport/plugin_transport_wlan.c:2089
+#: src/transport/plugin_transport_wlan.c:2184
 #, c-format
 msgid "Error writing to wlan healper. errno == %d, ERROR: %s\n"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:2015
+#: src/transport/plugin_transport_wlan.c:2075
 msgid "# wlan acks send"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:2084
+#: src/transport/plugin_transport_wlan.c:2146
 #, fuzzy
 msgid "# wlan fragments send"
 msgstr "# byte mottogs via TCP"
 
-#: src/transport/plugin_transport_wlan.c:2243
+#: src/transport/plugin_transport_wlan.c:2312
 #, c-format
 msgid "Wlan Address len %d is wrong\n"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:2248
+#: src/transport/plugin_transport_wlan.c:2317
 #, fuzzy
 msgid "# wlan messages queued"
 msgstr "# krypterade PONG-meddelanden mottagna"
 
-#: src/transport/plugin_transport_wlan.c:2338
-#: src/transport/plugin_transport_wlan.c:2977
-#: src/transport/plugin_transport_wlan.c:3212
+#: src/transport/plugin_transport_wlan.c:2408
+#: src/transport/plugin_transport_wlan.c:3060
+#: src/transport/plugin_transport_wlan.c:3307
 msgid "# wlan mac endpoints"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:2561
+#: src/transport/plugin_transport_wlan.c:2636
 #, fuzzy
 msgid "# wlan whole messages received"
 msgstr "# krypterade PONG-meddelanden mottagna"
 
-#: src/transport/plugin_transport_wlan.c:2759
+#: src/transport/plugin_transport_wlan.c:2836
 #, fuzzy
 msgid "# wlan hello messages received"
 msgstr "# krypterade PONG-meddelanden mottagna"
 
-#: src/transport/plugin_transport_wlan.c:2793
+#: src/transport/plugin_transport_wlan.c:2873
 #, fuzzy
 msgid "# wlan fragments received"
 msgstr "# byte mottogs via TCP"
 
-#: src/transport/plugin_transport_wlan.c:2845
+#: src/transport/plugin_transport_wlan.c:2925
 #, fuzzy
 msgid "# wlan acks received"
 msgstr "# klartext PONG-meddelanden mottagna"
 
-#: src/transport/plugin_transport_wlan.c:2938
+#: src/transport/plugin_transport_wlan.c:3020
 msgid "# wlan mac endpoints timeouts"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:2961
+#: src/transport/plugin_transport_wlan.c:3044
 #, fuzzy
 msgid "# wlan mac endpoints created"
 msgstr "# byte mottogs via TCP"
 
-#: src/transport/plugin_transport_wlan.c:3017
+#: src/transport/plugin_transport_wlan.c:3102
 msgid "# wlan WLAN_HELPER_DATA received"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:3068
+#: src/transport/plugin_transport_wlan.c:3158
 #, fuzzy
 msgid "# wlan messages for this client received"
 msgstr "# krypterade PONG-meddelanden mottagna"
 
-#: src/transport/plugin_transport_wlan.c:3076
+#: src/transport/plugin_transport_wlan.c:3169
 #, fuzzy
 msgid "# wlan messages inside WLAN_HELPER_DATA received"
 msgstr "# krypterade PONG-meddelanden mottagna"
 
-#: src/transport/gnunet-transport.c:251
+#: src/transport/gnunet-transport.c:245
 #, c-format
 msgid "No transport plugins configured, peer will never communicate\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:268
+#: src/transport/gnunet-transport.c:258
 #, c-format
 msgid "No port configured for plugin `%s', cannot test it\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:321
+#: src/transport/gnunet-transport.c:308
 #, c-format
 msgid "Received %llu bytes/s (%llu bytes in %llu ms)\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:330
+#: src/transport/gnunet-transport.c:315
 #, c-format
 msgid "Transmitted %llu bytes/s (%llu bytes in %llu ms)\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:369
+#: src/transport/gnunet-transport.c:348
 #, 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:395
+#: src/transport/gnunet-transport.c:368
 #, fuzzy, c-format
 msgid "Connected to %s\n"
 msgstr "\"%s\" ansluten till \"%s\".\n"
 
-#: src/transport/gnunet-transport.c:436
+#: src/transport/gnunet-transport.c:399
 #, fuzzy, c-format
 msgid "Disconnected from %s\n"
 msgstr "\"%s\" ansluten till \"%s\".\n"
 
-#: src/transport/gnunet-transport.c:476
+#: src/transport/gnunet-transport.c:428
 #, c-format
 msgid "Received %u bytes from %s\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:498
+#: src/transport/gnunet-transport.c:448
 #, fuzzy, c-format
 msgid "Peer `%s' plugin: `%s' address `%s'\n"
 msgstr "Motpart \"%s\" med pålitlighet %8u och adress \"%s\"\n"
 
-#: src/transport/gnunet-transport.c:536
+#: src/transport/gnunet-transport.c:486
 #, fuzzy, c-format
 msgid "Failed to parse peer identity `%s'\n"
 msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 
-#: src/transport/gnunet-transport.c:574
+#: src/transport/gnunet-transport.c:522
 msgid "measure how fast we are receiving data (until CTRL-C)"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:577
+#: src/transport/gnunet-transport.c:525
 #, fuzzy
 msgid "try to connect to the given peer"
 msgstr "Misslyckades att ansluta till gnunetd.\n"
 
-#: src/transport/gnunet-transport.c:580
+#: src/transport/gnunet-transport.c:528
 #, fuzzy
 msgid "provide information about all current connections (once)"
 msgstr "Skriv ut information om GNUnets motparter."
 
-#: src/transport/gnunet-transport.c:583
+#: src/transport/gnunet-transport.c:532
 msgid "send data for benchmarking to the other peer (until CTRL-C)"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:586
+#: src/transport/gnunet-transport.c:535
 msgid "test transport configuration (involves external server)"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:593
+#: src/transport/gnunet-transport.c:543
 #, fuzzy
 msgid "Direct access to transport service."
 msgstr "Misslyckades att ansluta till gnunetd.\n"
 
-#: src/transport/gnunet-service-transport_validation.c:515
+#: src/transport/gnunet-service-transport_validation.c:412
 msgid "# address records discarded"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:628
+#: src/transport/gnunet-service-transport_validation.c:458
 #, c-format
 msgid ""
-"Not confirming PING with address `%s' since I cannot confirm having this "
-"address.\n"
+"Not transmitting `%s' with `%s', message too big (%u bytes!). This should "
+"not happen.\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:696
-msgid "# PONGs unicast via reliable transport"
-msgstr ""
+#: src/transport/gnunet-service-transport_validation.c:493
+#, fuzzy
+msgid "# PING without HELLO messages sent"
+msgstr "# PING-meddelanden i klartext skickade"
 
-#: src/transport/gnunet-service-transport_validation.c:705
-msgid "# PONGs multicast to all available addresses"
+#: src/transport/gnunet-service-transport_validation.c:552
+msgid "# address revalidations started"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:769
+#: src/transport/gnunet-service-transport_validation.c:776
+#, fuzzy
+msgid "# PING message for different peer received"
+msgstr "# PING-meddelanden skapade"
+
+#: src/transport/gnunet-service-transport_validation.c:812
 #, c-format
 msgid ""
-"Not transmitting `%s' with `%s', message too big (%u bytes!). This should "
-"not happen.\n"
+"Not confirming PING with address `%s' since I cannot confirm having this "
+"address.\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:803
-#, fuzzy
-msgid "# PING without HELLO messages sent"
-msgstr "# PING-meddelanden i klartext skickade"
+#: src/transport/gnunet-service-transport_validation.c:882
+msgid "# PONGs unicast via reliable transport"
+msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:875
-msgid "# address revalidations started"
+#: src/transport/gnunet-service-transport_validation.c:891
+msgid "# PONGs multicast to all available addresses"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:956
+#: src/transport/gnunet-service-transport_validation.c:1015
 msgid "# PONGs dropped, no matching pending validation"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:972
+#: src/transport/gnunet-service-transport_validation.c:1040
 msgid "# PONGs dropped, signature expired"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1050
+#: src/transport/gnunet-service-transport_validation.c:1099
 #, fuzzy, c-format
 msgid "Adding `%s' without addresses for peer `%s'\n"
 msgstr "Motpart \"%s\" med pålitlighet %8u och adress \"%s\"\n"
 
-#: src/transport/gnunet-service-transport_clients.c:250
+#: src/transport/gnunet-service-transport_clients.c:254
 #, 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:255
+#: src/transport/gnunet-service-transport_clients.c:259
 msgid "# messages dropped due to slow client"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_clients.c:405
+#: src/transport/gnunet-service-transport_clients.c:406
 #, c-format
 msgid "Rejecting control connection from peer `%s', which is not me!\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_clients.c:522
+#: src/transport/gnunet-service-transport_clients.c:523
 #, fuzzy
 msgid "# bytes payload received for other peers"
 msgstr "# byte mottagna av typen %d"
 
-#: src/transport/gnunet-service-transport_clients.c:539
+#: src/transport/gnunet-service-transport_clients.c:540
 msgid "# bytes payload dropped (other peer was not connected)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_clients.c:590
+#: src/transport/gnunet-service-transport_clients.c:591
 #, fuzzy
 msgid "# REQUEST CONNECT messages received"
 msgstr "# krypterade PONG-meddelanden mottagna"
@@ -3800,16 +3828,16 @@
 msgid "Received unexpected message of type %u in %s:%u\n"
 msgstr "Mottog skadat meddelande från motpart \"%s\"i %s:%d.\n"
 
-#: src/transport/gnunet-service-transport.c:159
+#: src/transport/gnunet-service-transport.c:156
 #, fuzzy
 msgid "# bytes payload discarded due to not connected peer "
 msgstr "Nätverksannonsering avstängd i konfigurationen!\n"
 
-#: src/transport/gnunet-service-transport.c:517
+#: src/transport/gnunet-service-transport.c:514
 msgid "Transport service is lacking key configuration settings.  Exiting.\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport.c:526
+#: src/transport/gnunet-service-transport.c:523
 msgid "Transport service could not access hostkey.  Exiting.\n"
 msgstr ""
 
@@ -3827,100 +3855,100 @@
 msgid "# peers blacklisted"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:379
+#: src/topology/gnunet-daemon-topology.c:380
 #, fuzzy
 msgid "# connect requests issued to transport"
 msgstr "# byte mottogs via TCP"
 
-#: src/topology/gnunet-daemon-topology.c:674
-#: src/topology/gnunet-daemon-topology.c:760
+#: src/topology/gnunet-daemon-topology.c:675
+#: src/topology/gnunet-daemon-topology.c:761
 #, fuzzy
 msgid "# friends connected"
 msgstr "# av anslutna parter"
 
-#: src/topology/gnunet-daemon-topology.c:877
-#: src/hostlist/hostlist-server.c:187
+#: src/topology/gnunet-daemon-topology.c:875
+#: src/hostlist/hostlist-server.c:184
 #, fuzzy, c-format
 msgid "Error in communication with PEERINFO service: %s\n"
 msgstr "Skriv ut information om GNUnets motparter."
 
-#: src/topology/gnunet-daemon-topology.c:952
+#: src/topology/gnunet-daemon-topology.c:950
 msgid "Failed to connect to core service, can not manage topology!\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:984
+#: src/topology/gnunet-daemon-topology.c:982
 #, c-format
 msgid "Option `%s' in section `%s' not specified!\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:996
+#: src/topology/gnunet-daemon-topology.c:994
 #, fuzzy, c-format
 msgid "Could not read friends list `%s'\n"
 msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 
-#: src/topology/gnunet-daemon-topology.c:1002
+#: src/topology/gnunet-daemon-topology.c:1000
 #, c-format
 msgid "Friends file `%s' is empty.\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:1011
+#: src/topology/gnunet-daemon-topology.c:1009
 #, fuzzy, c-format
 msgid "Failed to read friends list from `%s': out of memory\n"
 msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 
-#: src/topology/gnunet-daemon-topology.c:1019
+#: src/topology/gnunet-daemon-topology.c:1017
 #, c-format
 msgid "Failed to read friends list from `%s'\n"
 msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 
-#: src/topology/gnunet-daemon-topology.c:1039
+#: src/topology/gnunet-daemon-topology.c:1037
 #, c-format
 msgid ""
 "Syntax error in topology specification at offset %llu, skipping bytes.\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:1052
+#: src/topology/gnunet-daemon-topology.c:1050
 #, c-format
 msgid ""
 "Syntax error in topology specification at offset %llu, skipping bytes `%s'.\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:1062
+#: src/topology/gnunet-daemon-topology.c:1060
 #, fuzzy, c-format
 msgid "Found friend `%s' in configuration\n"
 msgstr " gconfig\tGTK-konfiguration\n"
 
-#: src/topology/gnunet-daemon-topology.c:1068
+#: src/topology/gnunet-daemon-topology.c:1066
 #, c-format
 msgid "Found myself `%s' in friend list (useless, ignored)\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:1078
+#: src/topology/gnunet-daemon-topology.c:1076
 #, fuzzy
 msgid "# friends in configuration"
 msgstr " gconfig\tGTK-konfiguration\n"
 
-#: src/topology/gnunet-daemon-topology.c:1084
+#: src/topology/gnunet-daemon-topology.c:1082
 msgid ""
 "Fewer friends specified than required by minimum friend count. Will only "
 "connect to friends.\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:1091
+#: src/topology/gnunet-daemon-topology.c:1089
 msgid ""
 "More friendly connections required than target total number of connections.\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:1128
+#: src/topology/gnunet-daemon-topology.c:1126
 #, fuzzy
 msgid "# HELLO messages received"
 msgstr "# krypterade PONG-meddelanden mottagna"
 
-#: src/topology/gnunet-daemon-topology.c:1185
+#: src/topology/gnunet-daemon-topology.c:1183
 msgid "# HELLO messages gossipped"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:1325
+#: src/topology/gnunet-daemon-topology.c:1323
 msgid "GNUnet topology control (maintaining P2P mesh and F2F constraints)"
 msgstr ""
 
@@ -4200,33 +4228,33 @@
 msgid "GNUnet NAT traversal test helper daemon"
 msgstr ""
 
-#: src/nat/nat.c:776
+#: src/nat/nat.c:803
 #, c-format
 msgid "gnunet-helper-nat-server generated malformed address `%s'\n"
 msgstr ""
 
-#: src/nat/nat.c:825
+#: src/nat/nat.c:852
 #, fuzzy, c-format
 msgid "Failed to start %s\n"
 msgstr "Misslyckades att starta samling.\n"
 
-#: src/nat/nat.c:1094
+#: src/nat/nat.c:1121
 #, fuzzy, c-format
 msgid "Malformed %s `%s' given in configuration!\n"
 msgstr "Kunde inte spara konfiguration!"
 
-#: src/nat/nat.c:1156 src/nat/nat.c:1166
+#: src/nat/nat.c:1187 src/nat/nat.c:1197
 #, c-format
 msgid ""
 "Configuration requires `%s', but binary is not installed properly (SUID bit "
 "not set).  Option disabled.\n"
 msgstr ""
 
-#: src/nat/nat.c:1298
+#: src/nat/nat.c:1329
 msgid "Internal IP address not known, cannot use ICMP NAT traversal method\n"
 msgstr ""
 
-#: src/nat/nat.c:1310
+#: src/nat/nat.c:1341
 #, c-format
 msgid "Running gnunet-helper-nat-client %s %s %u\n"
 msgstr ""
@@ -4241,44 +4269,39 @@
 msgid "Failed to create listen socket bound to `%s' for NAT test: %s\n"
 msgstr ""
 
-#: src/block/plugin_block_dht.c:122
+#: src/dht/plugin_block_dht.c:124
 #, fuzzy, c-format
 msgid "Block not of type %u\n"
 msgstr "Ingen transport av typ %d är känd.\n"
 
-#: src/block/plugin_block_dht.c:129
+#: src/dht/plugin_block_dht.c:131
 msgid "Size mismatch for block\n"
 msgstr ""
 
-#: src/block/plugin_block_dht.c:138
+#: src/dht/plugin_block_dht.c:140
 #, c-format
 msgid "Block of type %u is malformed\n"
 msgstr ""
 
-#: src/block/plugin_block_fs.c:131
+#: src/fs/plugin_block_fs.c:131
 msgid "Reply mismatched in terms of namespace.  Discarded.\n"
 msgstr ""
 
-#: src/block/block.c:109
+#: src/block/block.c:105
 #, fuzzy, c-format
-msgid "Loading block plugins `%s'\n"
+msgid "Loading block plugin `%s'\n"
 msgstr "Testar transport(er) %s\n"
 
-#: src/block/block.c:119
-#, fuzzy, c-format
-msgid "Failed to load block plugin `%s'\n"
-msgstr "Kunde inte slå upp \"%s\": %s\n"
-
-#: src/mesh/gnunet-service-mesh.c:4206
+#: src/mesh/gnunet-service-mesh.c:4192
 msgid "MESH: Wrong CORE service\n"
 msgstr ""
 
-#: src/mesh/gnunet-service-mesh.c:4410
+#: src/mesh/gnunet-service-mesh.c:4397
 #, fuzzy
 msgid "Mesh service is lacking key configuration settings.  Exiting.\n"
 msgstr "GNUnet-konfiguration"
 
-#: src/mesh/gnunet-service-mesh.c:4419
+#: src/mesh/gnunet-service-mesh.c:4406
 #, fuzzy
 msgid "Mesh service could not access hostkey.  Exiting.\n"
 msgstr "Kunde inte komma åt namnrymdsinformation.\n"
@@ -4496,108 +4519,108 @@
 msgid "bytes in hostlist"
 msgstr "# byte krypterade"
 
-#: src/hostlist/hostlist-server.c:160
+#: src/hostlist/hostlist-server.c:157
 msgid "expired addresses encountered"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:208
+#: src/hostlist/hostlist-server.c:205
 msgid "HELLOs without addresses encountered (ignored)"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:224
+#: src/hostlist/hostlist-server.c:221
 msgid "bytes not included in hostlist (size limit)"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:272
+#: src/hostlist/hostlist-server.c:269
 #, c-format
 msgid "Refusing `%s' request to hostlist server\n"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:275
+#: src/hostlist/hostlist-server.c:272
 msgid "hostlist requests refused (not HTTP GET)"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:283
+#: src/hostlist/hostlist-server.c:280
 msgid "Sending 100 CONTINUE reply\n"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:290
+#: src/hostlist/hostlist-server.c:287
 #, c-format
 msgid "Refusing `%s' request with %llu bytes of upload data\n"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:294
+#: src/hostlist/hostlist-server.c:291
 msgid "hostlist requests refused (upload data)"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:302
+#: src/hostlist/hostlist-server.c:299
 msgid "Could not handle hostlist request since I do not have a response yet\n"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:305
+#: src/hostlist/hostlist-server.c:302
 msgid "hostlist requests refused (not ready)"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:309
+#: src/hostlist/hostlist-server.c:306
 msgid "Received request for our hostlist\n"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:310
+#: src/hostlist/hostlist-server.c:307
 msgid "hostlist requests processed"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:353
+#: src/hostlist/hostlist-server.c:350
 msgid "# hostlist advertisements send"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:400
+#: src/hostlist/hostlist-server.c:397
 msgid "Advertisement message could not be queued by core\n"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:568
+#: src/hostlist/hostlist-server.c:565
 #, fuzzy, c-format
 msgid "Invalid port number %llu.  Exiting.\n"
 msgstr "Ogiltiga argument. Avslutar.\n"
 
-#: src/hostlist/hostlist-server.c:577
+#: src/hostlist/hostlist-server.c:574
 #, c-format
 msgid "Hostlist service starts on %s:%llu\n"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:591
+#: src/hostlist/hostlist-server.c:588
 #, fuzzy, c-format
 msgid "Address to obtain hostlist: `%s'\n"
 msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 
-#: src/hostlist/hostlist-server.c:629
+#: src/hostlist/hostlist-server.c:626
 #, c-format
 msgid "Could not start hostlist HTTP server on port %u\n"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:222
+#: src/peerinfo-tool/gnunet-peerinfo.c:221
 #, fuzzy, c-format
 msgid "Could not find option `%s:%s' in configuration.\n"
 msgstr "Kunde inte hitta motpart \"%s\" i routingtabell!\n"
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:229
+#: src/peerinfo-tool/gnunet-peerinfo.c:228
 #, 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:241
+#: src/peerinfo-tool/gnunet-peerinfo.c:240
 #, c-format
 msgid "I am peer `%s'.\n"
 msgstr "Jag är ändpunkt \"%s\".\n"
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:261
+#: src/peerinfo-tool/gnunet-peerinfo.c:260
 msgid "output only the identity strings"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:264
+#: src/peerinfo-tool/gnunet-peerinfo.c:263
 msgid "output our own identity only"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:270
+#: src/peerinfo-tool/gnunet-peerinfo.c:269
 #, fuzzy
 msgid "Print information about peers."
 msgstr "Skriv ut information om GNUnets motparter."
@@ -4626,23 +4649,31 @@
 msgid "use configuration file FILENAME"
 msgstr "använd konfigurationsfil FILNAMN"
 
-#: src/include/gnunet_common.h:352 src/include/gnunet_common.h:357
-#: src/include/gnunet_common.h:363
+#: src/include/gnunet_common.h:361 src/include/gnunet_common.h:366
+#: src/include/gnunet_common.h:372
 #, fuzzy, c-format
 msgid "Assertion failed at %s:%d.\n"
 msgstr "\"%s\" misslyckades vid %s:%d med fel: \"%s\".\n"
 
-#: src/include/gnunet_common.h:373
+#: src/include/gnunet_common.h:382
 #, c-format
 msgid "External protocol violation detected at %s:%d.\n"
 msgstr ""
 
-#: src/include/gnunet_common.h:394 src/include/gnunet_common.h:401
+#: src/include/gnunet_common.h:403 src/include/gnunet_common.h:410
 #, c-format
 msgid "`%s' failed on file `%s' at %s:%d with error: %s\n"
 msgstr "\"%s\" misslyckades för fil \"%s\" vid %s:%d med fel: %s\n"
 
 #, fuzzy
+#~ msgid "Failed to create IPv4 broadcast socket on port %d\n"
+#~ msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
+
+#, fuzzy
+#~ msgid "Failed to load block plugin `%s'\n"
+#~ msgstr "Kunde inte slå upp \"%s\": %s\n"
+
+#, fuzzy
 #~ msgid "Target is %d connections per peer."
 #~ msgstr "Misslyckades att starta samling.\n"
 
@@ -5246,9 +5277,6 @@
 #~ msgid "# encrypted PING messages received"
 #~ msgstr "# krypterade PING-meddelanden mottagna"
 
-#~ msgid "# encrypted PONG messages sent"
-#~ msgstr "# krypterade PONG-meddelanden skickade"
-
 #~ msgid "# encrypted PING messages sent"
 #~ msgstr "# krypterade PING-meddelanden skickade"
 
@@ -5610,9 +5638,6 @@
 #~ msgid "OK!\n"
 #~ msgstr "OK"
 
-#~ msgid "send COUNT messages"
-#~ msgstr "skicka ANTAL meddelanden"
-
 #~ msgid "send messages with SIZE bytes payload"
 #~ msgstr "skicka meddelanden med STORLEK bytes nyttolast"
 
@@ -6121,9 +6146,6 @@
 #~ msgid "%.*s filter %s (SMTP)"
 #~ msgstr "%.*s filter %s (SMTP)"
 
-#~ msgid "Could not determine my public IPv6 address.\n"
-#~ msgstr "Kunde inte fastställa min publika IPv6-adress.\n"
-
 #~ msgid "`%s': unknown service: %s\n"
 #~ msgstr "\"%s\": okänd tjänst: %s\n"
 

Modified: gnunet/po/vi.gmo
===================================================================
(Binary files differ)

Modified: gnunet/po/vi.po
===================================================================
--- gnunet/po/vi.po     2011-11-23 10:05:05 UTC (rev 18268)
+++ gnunet/po/vi.po     2011-11-23 10:05:21 UTC (rev 18269)
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: gnunet 0.8.0a\n"
 "Report-Msgid-Bugs-To: address@hidden"
-"POT-Creation-Date: 2011-11-03 13:55+0100\n"
+"POT-Creation-Date: 2011-11-23 11:01+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"
@@ -32,8 +32,8 @@
 #: src/datacache/plugin_datacache_mysql.c:517
 #: src/datacache/plugin_datacache_mysql.c:526
 #: src/datacache/plugin_datacache_mysql.c:598
-#: src/datacache/plugin_datacache_mysql.c:614 src/include/gnunet_common.h:380
-#: src/include/gnunet_common.h:387
+#: src/datacache/plugin_datacache_mysql.c:614 src/include/gnunet_common.h:389
+#: src/include/gnunet_common.h:396
 #, c-format
 msgid "`%s' failed at %s:%d with error: %s\n"
 msgstr "« %s » bị lỗi tại %s:%d với lỗi: %s\n"
@@ -53,28 +53,28 @@
 msgid "Unable to initialize SQLite: %s.\n"
 msgstr "Không thể sơ khởi SQLite: %s.\n"
 
-#: src/datastore/plugin_datastore_sqlite.c:420
-#: src/datacache/plugin_datacache_sqlite.c:471
+#: src/datastore/plugin_datastore_sqlite.c:414
+#: src/datacache/plugin_datacache_sqlite.c:457
 msgid "Tried to close sqlite without finalizing all prepared statements.\n"
 msgstr ""
 
-#: src/datastore/plugin_datastore_sqlite.c:677
+#: src/datastore/plugin_datastore_sqlite.c:671
 #, fuzzy
 msgid "Invalid data in database.  Trying to fix (by deletion).\n"
 msgstr "Dữ liệu sai trong %s. Đang thử sửa chữa (bằng cách xoá).\n"
 
-#: src/datastore/plugin_datastore_sqlite.c:1130
+#: src/datastore/plugin_datastore_sqlite.c:1124
 msgid "sqlite version to old to determine size, assuming zero\n"
 msgstr ""
 
-#: src/datastore/plugin_datastore_sqlite.c:1149
+#: src/datastore/plugin_datastore_sqlite.c:1143
 #, c-format
 msgid ""
 "Using sqlite page utilization to estimate payload (%llu pages of size %llu "
 "bytes)\n"
 msgstr ""
 
-#: src/datastore/plugin_datastore_sqlite.c:1188
+#: src/datastore/plugin_datastore_sqlite.c:1182
 #, fuzzy
 msgid "Sqlite database running\n"
 msgstr "kho dữ liệu sqlite"
@@ -296,8 +296,8 @@
 msgid "Could not find matching reservation"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:824 src/datacache/datacache.c:119
-#: src/datacache/datacache.c:250
+#: src/datastore/gnunet-service-datastore.c:824 src/datacache/datacache.c:118
+#: src/datacache/datacache.c:248
 #, fuzzy
 msgid "# bytes stored"
 msgstr "# các byte trong kho dữ liệu"
@@ -351,8 +351,8 @@
 msgstr ""
 
 #: src/datastore/gnunet-service-datastore.c:1295
-#: src/datastore/gnunet-service-datastore.c:1486 src/datacache/datacache.c:145
-#: src/datacache/datacache.c:152
+#: src/datastore/gnunet-service-datastore.c:1486 src/datacache/datacache.c:144
+#: src/datacache/datacache.c:151
 #, c-format
 msgid "No `%s' specified for `%s' in configuration!\n"
 msgstr ""
@@ -385,22 +385,17 @@
 msgid "Failed to initialize bloomfilter.\n"
 msgstr "Lỗi sơ khởi dịch vụ « %s ».\n"
 
-#: src/core/gnunet-service-core_sessions.c:204
+#: src/core/gnunet-service-core_sessions.c:210
 #: src/core/gnunet-service-core_sessions.c:275
 msgid "# entries in session map"
 msgstr ""
 
-#: src/core/gnunet-service-core_sessions.c:236
+#: src/core/gnunet-service-core_sessions.c:240
 #, fuzzy
 msgid "# type map refreshes sent"
 msgstr "# tổng số yêu cầu lỗ hổng được gửi"
 
-#: src/core/gnunet-service-core_sessions.c:360
-#, 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_sessions.c:427
+#: src/core/gnunet-service-core_sessions.c:416
 msgid "# messages discarded (expired prior to transmission)"
 msgstr ""
 
@@ -411,13 +406,13 @@
 msgstr "Tôi là đồng đẳng « %s ».\n"
 
 #: src/core/gnunet-core-list-connections.c:167
-#: src/peerinfo-tool/gnunet-peerinfo.c:200
+#: src/peerinfo-tool/gnunet-peerinfo.c:199
 #, 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-list-connections.c:188
-#: src/peerinfo-tool/gnunet-peerinfo.c:258
+#: src/peerinfo-tool/gnunet-peerinfo.c:257
 msgid "don't resolve host names"
 msgstr "không quyết định các tên máy"
 
@@ -426,46 +421,51 @@
 msgid "Print information about connected peers."
 msgstr "In ra thông tin về các đồng đẳng GNUnet."
 
-#: src/core/gnunet-service-core_clients.c:452
+#: src/core/gnunet-service-core_clients.c:357
 #, 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:462
+#, 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:796
+#: src/core/gnunet-service-core_clients.c:791
 #, fuzzy, c-format
 msgid "# bytes of messages of type %u received"
 msgstr "# các byte nhiễu được nhận"
 
-#: src/core/gnunet-service-core.c:101
+#: src/core/gnunet-service-core.c:99
 #, c-format
 msgid "Core service of `%4s' ready.\n"
 msgstr ""
 
-#: src/core/gnunet-service-core_typemap.c:111
-#: src/core/gnunet-service-core_typemap.c:124
+#: src/core/gnunet-service-core_typemap.c:110
+#: src/core/gnunet-service-core_typemap.c:121
 #, fuzzy
 msgid "# type maps received"
 msgstr "# các thông báo phát hiện dht được nhận"
 
-#: src/core/gnunet-service-core_typemap.c:156
+#: src/core/gnunet-service-core_typemap.c:151
 msgid "# updates to my type map"
 msgstr ""
 
-#: src/core/gnunet-service-core_neighbours.c:162
+#: src/core/gnunet-service-core_neighbours.c:163
 #, fuzzy
 msgid "# sessions terminated by transport disconnect"
 msgstr "# Các quảng cáo đồng đẳng bị hủy do trọng tải"
 
-#: src/core/gnunet-service-core_neighbours.c:179
+#: src/core/gnunet-service-core_neighbours.c:180
 #: src/core/gnunet-service-core_neighbours.c:343
 msgid "# neighbour entries allocated"
 msgstr ""
 
-#: src/core/gnunet-service-core_neighbours.c:251
+#: src/core/gnunet-service-core_neighbours.c:252
 msgid "# encrypted bytes given to transport"
 msgstr ""
 
-#: src/core/gnunet-service-core_neighbours.c:432
+#: src/core/gnunet-service-core_neighbours.c:430
 #, c-format
 msgid "Unsupported message of type %u received.\n"
 msgstr ""
@@ -478,8 +478,8 @@
 msgid "# bytes decrypted"
 msgstr "# các byte đã giải mã"
 
-#: src/core/gnunet-service-core_kx.c:602 src/dv/gnunet-service-dv.c:3000
-#: src/hostlist/hostlist-server.c:439 src/peerinfo-tool/gnunet-peerinfo.c:157
+#: src/core/gnunet-service-core_kx.c:602 src/dv/gnunet-service-dv.c:3002
+#: src/hostlist/hostlist-server.c:436 src/peerinfo-tool/gnunet-peerinfo.c:156
 #, fuzzy, c-format
 msgid "Error in communication with PEERINFO service\n"
 msgstr "Cổng để liên lạc với giao diện người dùng GNUnet"
@@ -488,120 +488,120 @@
 msgid "# Delayed connecting due to lack of public key"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:669
+#: src/core/gnunet-service-core_kx.c:668
 msgid "# key exchanges initiated"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:693
+#: src/core/gnunet-service-core_kx.c:689
 msgid "# key exchanges stopped"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:746
+#: src/core/gnunet-service-core_kx.c:741
 #, fuzzy
 msgid "# session keys received"
 msgstr "# các khoá phiên chạy bị từ chối"
 
-#: src/core/gnunet-service-core_kx.c:764
+#: src/core/gnunet-service-core_kx.c:760
 #, c-format
 msgid "`%s' is for `%s', not for me.  Ignoring.\n"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:803
+#: src/core/gnunet-service-core_kx.c:798
 #, fuzzy
 msgid "# SET_KEY messages decrypted"
 msgstr "# các thông báo được chắp liền"
 
-#: src/core/gnunet-service-core_kx.c:884
-#: src/transport/gnunet-service-transport_validation.c:601
+#: src/core/gnunet-service-core_kx.c:878
+#: src/transport/gnunet-service-transport_validation.c:781
 #, fuzzy
 msgid "# PING messages received"
 msgstr "# các thông báo PING được tạo"
 
-#: src/core/gnunet-service-core_kx.c:918
+#: src/core/gnunet-service-core_kx.c:912
 #, 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:941
+#: src/core/gnunet-service-core_kx.c:933
 #, fuzzy
 msgid "# PONG messages created"
 msgstr "# các thông báo PING được tạo"
 
-#: src/core/gnunet-service-core_kx.c:1029
+#: src/core/gnunet-service-core_kx.c:1021
 #, 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:1042
+#: src/core/gnunet-service-core_kx.c:1032
 #, 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:1098
-#: src/transport/gnunet-service-transport_validation.c:934
+#: src/core/gnunet-service-core_kx.c:1090
+#: src/transport/gnunet-service-transport_validation.c:991
 #, 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:1128
+#: src/core/gnunet-service-core_kx.c:1120
 #, fuzzy
 msgid "# PONG messages decrypted"
 msgstr "# các thông báo PING được tạo"
 
-#: src/core/gnunet-service-core_kx.c:1161
+#: src/core/gnunet-service-core_kx.c:1152
 #, 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:1224
+#: src/core/gnunet-service-core_kx.c:1216
 #, fuzzy
 msgid "# SET_KEY and PING messages created"
 msgstr "# các thông báo PING được tạo"
 
-#: src/core/gnunet-service-core_kx.c:1372
+#: src/core/gnunet-service-core_kx.c:1357
 msgid "# failed to decrypt message (no session key)"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1416
-#: src/core/gnunet-service-core_kx.c:1441
+#: src/core/gnunet-service-core_kx.c:1399
+#: src/core/gnunet-service-core_kx.c:1424
 #, fuzzy
 msgid "# bytes dropped (duplicates)"
 msgstr "# các byte loại bỏ bởi UDP (đi ra)"
 
-#: src/core/gnunet-service-core_kx.c:1428
+#: src/core/gnunet-service-core_kx.c:1411
 #, 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:1465
+#: src/core/gnunet-service-core_kx.c:1448
 #, fuzzy, c-format
 msgid "Message received far too old (%llu ms). Content ignored.\n"
 msgstr "Thông báo nhận được cũ hơn một ngày. Đã loại bỏ.\n"
 
-#: src/core/gnunet-service-core_kx.c:1469
+#: src/core/gnunet-service-core_kx.c:1452
 #, 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:1477
+#: src/core/gnunet-service-core_kx.c:1460
 #, fuzzy
 msgid "# bytes of payload decrypted"
 msgstr "# các byte đã giải mã"
 
-#: src/core/gnunet-service-core_kx.c:1541
+#: src/core/gnunet-service-core_kx.c:1521
 #, fuzzy
 msgid "Core service is lacking HOSTKEY configuration setting.  Exiting.\n"
 msgstr "Lưu cấu hình ngay bây giờ không?"
 
-#: src/core/gnunet-service-core_kx.c:1549
+#: src/core/gnunet-service-core_kx.c:1529
 msgid "Core service could not access hostkey.  Exiting.\n"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1559
-#: src/transport/gnunet-service-transport.c:540
-#: src/hostlist/hostlist-server.c:558 src/peerinfo-tool/gnunet-peerinfo.c:208
+#: src/core/gnunet-service-core_kx.c:1539
+#: src/transport/gnunet-service-transport.c:537
+#: src/hostlist/hostlist-server.c:555 src/peerinfo-tool/gnunet-peerinfo.c:207
 #, fuzzy, c-format
 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"
@@ -610,11 +610,11 @@
 msgid "Client was disconnected from core service, trying to reconnect.\n"
 msgstr ""
 
-#: src/vpn/gnunet-daemon-exit.c:1499
+#: src/vpn/gnunet-daemon-exit.c:1513
 msgid "Daemon to run to provide an IP exit node for the VPN"
 msgstr ""
 
-#: src/vpn/gnunet-daemon-vpn.c:1287
+#: src/vpn/gnunet-daemon-vpn.c:1294
 msgid "help text"
 msgstr ""
 
@@ -626,50 +626,50 @@
 "Mọi đối số bắt buộc phải sử dụng với tùy chọn dài cũng bắt buộc với tùy chọn "
 "ngắn.\n"
 
-#: src/util/getopt_helpers.c:258 src/util/getopt_helpers.c:287
+#: src/util/getopt_helpers.c:255 src/util/getopt_helpers.c:283
 #, c-format
 msgid "You must pass a number to the `%s' option.\n"
 msgstr "Phải gửi một con số cho tùy chọn « %s ».\n"
 
-#: src/util/common_logging.c:242 src/util/common_logging.c:838
+#: src/util/common_logging.c:239 src/util/common_logging.c:861
 msgid "DEBUG"
 msgstr "GỠ LỖI"
 
-#: src/util/common_logging.c:244 src/util/common_logging.c:836
+#: src/util/common_logging.c:241 src/util/common_logging.c:859
 msgid "INFO"
 msgstr "TIN"
 
-#: src/util/common_logging.c:246 src/util/common_logging.c:834
+#: src/util/common_logging.c:243 src/util/common_logging.c:857
 msgid "WARNING"
 msgstr "CẢNH BÁO"
 
-#: src/util/common_logging.c:248 src/util/common_logging.c:832
+#: src/util/common_logging.c:245 src/util/common_logging.c:855
 msgid "ERROR"
 msgstr "LỖI"
 
-#: src/util/common_logging.c:250 src/util/common_logging.c:840
+#: src/util/common_logging.c:247 src/util/common_logging.c:863
 msgid "NONE"
 msgstr ""
 
-#: src/util/common_logging.c:554
+#: src/util/common_logging.c:579
 #, fuzzy, c-format
 msgid "Failed to create or access directory for log file `%s'\n"
 msgstr "Không thể truy cập đến tập tin gnunet-directory « %s »\n"
 
-#: src/util/common_logging.c:672
+#: src/util/common_logging.c:696
 #, fuzzy, c-format
 msgid "Message `%.*s' repeated %u times in the last %s\n"
 msgstr "Thông điệp « %.*s » đã lặp lại %u lần trong %llu giây trước\n"
 
-#: src/util/common_logging.c:841
+#: src/util/common_logging.c:864
 msgid "INVALID"
 msgstr ""
 
-#: src/util/common_logging.c:923
+#: src/util/common_logging.c:946
 msgid "unknown address"
 msgstr ""
 
-#: src/util/common_logging.c:961
+#: src/util/common_logging.c:984
 msgid "invalid address"
 msgstr ""
 
@@ -688,12 +688,17 @@
 msgid "`%s' failed for library `%s' with error: %s\n"
 msgstr "« %s » thất bại cho thư viện « %s » với lỗi: %s\n"
 
-#: src/util/configuration.c:249
+#: src/util/plugin.c:349
+#, fuzzy
+msgid "Could not determine plugin installation path.\n"
+msgstr "Không thể truy cập đến thông tin về không gian tên.\n"
+
+#: src/util/configuration.c:245
 #, fuzzy, c-format
 msgid "Syntax error in configuration file `%s' at 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:812
+#: src/util/configuration.c:817
 #, c-format
 msgid ""
 "Configuration value '%s' for '%s' in section '%s' is not in set of legal "
@@ -702,12 +707,12 @@
 "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/getopt.c:670
+#: src/util/getopt.c:672
 #, c-format
 msgid "%s: option `%s' is ambiguous\n"
 msgstr "%s: tùy chọn « %s » là mơ hồ\n"
 
-#: src/util/getopt.c:695
+#: src/util/getopt.c:696
 #, c-format
 msgid "%s: option `--%s' does not allow an argument\n"
 msgstr "%s: tùy chọn « --%s » không cho phép đối số\n"
@@ -717,110 +722,110 @@
 msgid "%s: option `%c%s' does not allow an argument\n"
 msgstr "%s: tùy chọn « %c%s » không cho phép đối số\n"
 
-#: src/util/getopt.c:720 src/util/getopt.c:889
+#: src/util/getopt.c:718 src/util/getopt.c:886
 #, c-format
 msgid "%s: option `%s' requires an argument\n"
 msgstr "%s: tùy chọn « %s » cần thiết đối số\n"
 
-#: src/util/getopt.c:749
+#: src/util/getopt.c:747
 #, c-format
 msgid "%s: unrecognized option `--%s'\n"
 msgstr "%s: không nhận ra tùy chọn « --%s »\n"
 
-#: src/util/getopt.c:753
+#: src/util/getopt.c:751
 #, c-format
 msgid "%s: unrecognized option `%c%s'\n"
 msgstr "%s: không nhận ra tùy chọn « %c%s »\n"
 
-#: src/util/getopt.c:778
+#: src/util/getopt.c:776
 #, c-format
 msgid "%s: illegal option -- %c\n"
 msgstr "%s: tùy chọn không được phép -- %c\n"
 
-#: src/util/getopt.c:780
+#: src/util/getopt.c:778
 #, c-format
 msgid "%s: invalid option -- %c\n"
 msgstr "%s: tùy chọn không hợp lệ -- %c\n"
 
-#: src/util/getopt.c:808 src/util/getopt.c:938
+#: src/util/getopt.c:806 src/util/getopt.c:934
 #, c-format
 msgid "%s: option requires an argument -- %c\n"
 msgstr "%s: tùy chọn cần thiết đối số -- %c\n"
 
-#: src/util/getopt.c:856
+#: src/util/getopt.c:854
 #, c-format
 msgid "%s: option `-W %s' is ambiguous\n"
 msgstr "%s: tùy chọn « -W %s » là mơ hồ\n"
 
-#: src/util/getopt.c:874
+#: src/util/getopt.c:872
 #, c-format
 msgid "%s: option `-W %s' does not allow an argument\n"
 msgstr "%s: tùy chọn « -W %s » không cho phép đối số\n"
 
-#: src/util/getopt.c:1042
+#: src/util/getopt.c:1038
 #, c-format
 msgid "Use --help to get a list of options.\n"
 msgstr ""
 "Hãy sử dụng câu lệnh trợ giúp « --help » để xem danh sách các tùy chọn.\n"
 
-#: src/util/scheduler.c:863
+#: src/util/scheduler.c:860
 msgid "Looks like we're busy waiting...\n"
 msgstr ""
 
-#: src/util/scheduler.c:994
+#: src/util/scheduler.c:990
 #, c-format
 msgid "Attempt to cancel dead task %llu!\n"
 msgstr ""
 
-#: src/util/connection.c:462
+#: src/util/connection.c:461
 #, fuzzy, c-format
 msgid "Access denied to `%s'\n"
 msgstr "Không đủ quyền cho « %s ».\n"
 
-#: src/util/connection.c:477
+#: src/util/connection.c:476
 #, c-format
 msgid "Accepting connection from `%s': %p\n"
 msgstr ""
 
-#: src/util/connection.c:646
+#: src/util/connection.c:642
 #, fuzzy, c-format
 msgid ""
 "Failed to establish TCP connection to `%s:%u', no further addresses to try.\n"
 msgstr "Lỗi thiết lập kết nối với đồng đẳng.\n"
 
-#: src/util/connection.c:858 src/util/connection.c:1034
+#: src/util/connection.c:852 src/util/connection.c:1025
 #, fuzzy, c-format
 msgid "Trying to connect to `%s' (%p)\n"
 msgstr "Không thể kết nối tới %s:%u: %s\n"
 
-#: src/util/connection.c:869
+#: src/util/connection.c:862
 #, fuzzy, c-format
 msgid "Failed to connect to `%s' (%p)\n"
 msgstr "Không thể kết nối tới %s:%u: %s\n"
 
-#: src/util/connection.c:1024
+#: src/util/connection.c:1015
 #, fuzzy, c-format
 msgid "Attempt to connect to `%s' failed\n"
 msgstr " Lỗi kết nối\n"
 
-#: src/util/connection.c:1540
+#: src/util/connection.c:1528
 #, c-format
 msgid ""
 "Could not satisfy pending transmission request, socket closed or connect "
 "failed (%p).\n"
 msgstr ""
 
-#: src/util/connection.c:1576
+#: src/util/connection.c:1564
 #, fuzzy, c-format
 msgid "Failed to send to `%s': %s\n"
 msgstr "Lỗi mở tập tin ghi sự kiện « %s »: %s\n"
 
-#: src/util/signal.c:81
+#: src/util/signal.c:80
 #, c-format
 msgid "signal (%d, %p) returned %d.\n"
 msgstr ""
 
-#: src/util/network.c:1204
+#: src/util/network.c:1197
 #, c-format
 msgid ""
 "Fatal internal logic error, process hangs in `%s' (abort with CTRL-C)!\n"
@@ -833,97 +838,81 @@
 "variable.\n"
 msgstr ""
 
-#: src/util/os_installation.c:481
+#: src/util/os_installation.c:477
 #, fuzzy, c-format
 msgid "Could not find binary `%s' in PATH!\n"
 msgstr "Không thể đọc danh sách bạn bè « %s »\n"
 
-#: src/util/os_installation.c:486
+#: src/util/os_installation.c:483
 #, fuzzy, c-format
 msgid "stat (%s) failed: %s\n"
 msgstr "SMTP: « %s » bị lỗi: %s\n"
 
-#: src/util/strings.c:144
+#: src/util/strings.c:143
 msgid "b"
 msgstr "b"
 
-#: src/util/strings.c:150
-msgid "KiB"
-msgstr "KiB"
-
-#: src/util/strings.c:154
-msgid "MiB"
-msgstr "MiB"
-
-#: src/util/strings.c:158
-msgid "GiB"
-msgstr "GiB"
-
-#: src/util/strings.c:162
-msgid "TiB"
-msgstr "TiB"
-
-#: src/util/strings.c:198
+#: src/util/strings.c:355
 #, c-format
 msgid "Character set requested was `%s'\n"
 msgstr ""
 
-#: src/util/strings.c:276
+#: src/util/strings.c:433
 msgid "Failed to expand `$HOME': environment variable `HOME' not set"
 msgstr ""
 "Lỗi mở rộng biến môi trường « $HOME »: chưa đặt biến môi trường « HOME »"
 
-#: src/util/strings.c:368
+#: src/util/strings.c:525
 msgid "ms"
 msgstr "mg"
 
-#: src/util/strings.c:373
+#: src/util/strings.c:530
 msgid "eternity"
 msgstr ""
 
-#: src/util/strings.c:377
+#: src/util/strings.c:534
 msgid "s"
 msgstr "g"
 
-#: src/util/strings.c:381
+#: src/util/strings.c:538
 msgid "m"
 msgstr "p"
 
-#: src/util/strings.c:385
+#: src/util/strings.c:542
 msgid "h"
 msgstr "g"
 
-#: src/util/strings.c:389
+#: src/util/strings.c:546
 msgid " days"
 msgstr " ngày"
 
-#: src/util/strings.c:413
+#: src/util/strings.c:570
 msgid "end of time"
 msgstr ""
 
-#: src/util/server.c:392
+#: src/util/server.c:388
 #, fuzzy, c-format
 msgid "`%s' failed for port %d (%s).\n"
 msgstr "« %s » thất bại cho ổ đĩa « %s »: %u\n"
 
-#: src/util/server.c:400
+#: src/util/server.c:397
 #, fuzzy, c-format
 msgid "`%s' failed for port %d (%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:405
+#: src/util/server.c:402
 #, fuzzy, c-format
 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:623
+#: src/util/server.c:617
 #, c-format
 msgid ""
 "Processing code for message of type %u did not call "
 "GNUNET_SERVER_receive_done after %llums\n"
 msgstr ""
 
-#: src/util/crypto_random.c:240
+#: src/util/crypto_random.c:239
 #, c-format
 msgid "Starting `%s' process to generate entropy\n"
 msgstr ""
@@ -933,157 +922,157 @@
 msgid "libgcrypt has not the expected version (version %s is required).\n"
 msgstr "libgcrypt không có phiên bản mong đợi (yêu cầu phiên bản %s).\n"
 
-#: src/util/disk.c:435
+#: src/util/disk.c:434
 #, c-format
 msgid "`%s' failed for drive `%s': %u\n"
 msgstr "« %s » thất bại cho ổ đĩa « %s »: %u\n"
 
-#: src/util/disk.c:838
+#: src/util/disk.c:834
 #, c-format
 msgid "Expected `%s' to be a directory!\n"
 msgstr "Mong đợi « %s » là một thư mục.\n"
 
-#: src/util/disk.c:1189 src/util/service.c:1473
+#: src/util/disk.c:1186 src/util/service.c:1452
 #, 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"
 
-#: src/util/disk.c:1497
+#: src/util/disk.c:1491
 #, c-format
 msgid "No `%s' specified for service `%s' in configuration.\n"
 msgstr ""
 
-#: src/util/service.c:118 src/util/service.c:144 src/util/service.c:188
-#: src/util/service.c:209 src/util/service.c:216
+#: src/util/service.c:117 src/util/service.c:143 src/util/service.c:186
+#: src/util/service.c:207 src/util/service.c:214
 #, c-format
 msgid "Invalid format for IP: `%s'\n"
 msgstr "Địa chỉ IP định dạng sai: %s\n"
 
-#: src/util/service.c:171
+#: src/util/service.c:170
 #, c-format
 msgid "Invalid network notation ('/%d' is not legal in IPv4 CIDR)."
 msgstr "Ký hiệu mạng sai (« /%d » không hợp lệ trong CIDR IPv4)."
 
-#: src/util/service.c:265
+#: src/util/service.c:263
 #, c-format
 msgid "Invalid network notation (does not end with ';': `%s')\n"
 msgstr "Ký hiệu mạng sai (không kết thúc với « ; »: « %s »)\n"
 
-#: src/util/service.c:301
+#: src/util/service.c:296
 #, fuzzy, c-format
 msgid "Wrong format `%s' for netmask\n"
 msgstr "Mặt nạ mạng có định dạng sai « %s »: %s\n"
 
-#: src/util/service.c:332
+#: src/util/service.c:326
 #, fuzzy, c-format
 msgid "Wrong format `%s' for network\n"
 msgstr "Mạng có định dạng sai « %s »: %s\n"
 
-#: src/util/service.c:638
+#: src/util/service.c:629
 #, c-format
 msgid "Access denied to UID %d / GID %d\n"
 msgstr ""
 
-#: src/util/service.c:643
+#: src/util/service.c:634
 #, fuzzy, c-format
 msgid "Unknown address family %d\n"
 msgstr "\tKhông rõ miền tên « %s »\n"
 
-#: src/util/service.c:650
+#: src/util/service.c:641
 #, c-format
 msgid "Access from `%s' denied to service `%s'\n"
 msgstr ""
 
-#: src/util/service.c:694
+#: src/util/service.c:685
 #, c-format
 msgid "Could not parse IPv4 network specification `%s' for `%s:%s'\n"
 msgstr ""
 
-#: src/util/service.c:723
+#: src/util/service.c:713
 #, c-format
 msgid "Could not parse IPv6 network specification `%s' for `%s:%s'\n"
 msgstr ""
 
-#: src/util/service.c:841
+#: src/util/service.c:830
 #, c-format
 msgid ""
 "Disabling IPv6 support for service `%s', failed to create IPv6 socket: %s\n"
 msgstr ""
 
-#: src/util/service.c:862 src/transport/plugin_transport_tcp.c:1939
+#: src/util/service.c:850 src/transport/plugin_transport_tcp.c:1935
 #, c-format
 msgid "Require valid port number for service `%s' in configuration!\n"
 msgstr ""
 
-#: src/util/service.c:893 src/util/client.c:712
+#: src/util/service.c:880 src/util/client.c:707
 #, c-format
 msgid "UNIXPATH `%s' too long, maximum length is %llu\n"
 msgstr ""
 
-#: src/util/service.c:913
+#: src/util/service.c:900
 #, c-format
 msgid ""
 "Disabling UNIX domain socket support for service `%s', failed to create UNIX "
 "domain socket: %s\n"
 msgstr ""
 
-#: src/util/service.c:930
+#: src/util/service.c:917
 #, c-format
 msgid "Have neither PORT nor UNIXPATH for service `%s', but one is required\n"
 msgstr ""
 
-#: src/util/service.c:960 src/transport/plugin_transport_http.c:903
+#: src/util/service.c:947 src/transport/plugin_transport_http.c:993
 #, 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/util/service.c:978 src/transport/plugin_transport_http.c:920
+#: src/util/service.c:964 src/transport/plugin_transport_http.c:1010
 #, fuzzy, c-format
 msgid "Failed to find %saddress for `%s'.\n"
 msgstr "Lỗi đóng kết đến cổng %s %d.\n"
 
-#: src/util/service.c:1135 src/util/service.c:1153
+#: src/util/service.c:1120 src/util/service.c:1138
 #, c-format
 msgid "Specified value for `%s' of service `%s' is invalid\n"
 msgstr ""
 
-#: src/util/service.c:1181
+#: src/util/service.c:1165
 #, c-format
 msgid "Could not access pre-bound socket %u, will try to bind myself\n"
 msgstr ""
 
-#: src/util/service.c:1333
+#: src/util/service.c:1314
 #, fuzzy, c-format
 msgid "Failed to start `%s' at `%s'\n"
 msgstr "Lỗi chạy %s: %s %d\n"
 
-#: src/util/service.c:1366
+#: src/util/service.c:1347
 #, 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:1414
+#: src/util/service.c:1393
 msgid "Service process failed to initialize\n"
 msgstr ""
 
-#: src/util/service.c:1418
+#: src/util/service.c:1397
 msgid "Service process could not initialize server function\n"
 msgstr ""
 
-#: src/util/service.c:1422
+#: src/util/service.c:1401
 msgid "Service process failed to report status\n"
 msgstr ""
 
-#: src/util/service.c:1474
+#: src/util/service.c:1453
 msgid "No such user"
 msgstr "Không có người dùng như vậy"
 
-#: src/util/service.c:1488
+#: src/util/service.c:1466
 #, 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:1551
+#: src/util/service.c:1529
 msgid "do daemonize (detach from terminal)"
 msgstr ""
 
@@ -1091,7 +1080,7 @@
 msgid "Test GNUnet DNS resolver code."
 msgstr ""
 
-#: src/util/os_priority.c:117
+#: src/util/os_priority.c:114
 #, c-format
 msgid "Not installing a handler because $%s=%s\n"
 msgstr ""
@@ -1107,212 +1096,212 @@
 "Must specify `%s' or numeric IP address for `%s' of `%s' in configuration!\n"
 msgstr ""
 
-#: src/util/resolver_api.c:356
+#: src/util/resolver_api.c:358
 #, fuzzy, c-format
 msgid "Timeout trying to resolve IP address `%s'.\n"
 msgstr "GNUnet bây giờ sử dụng địa chỉ IP %s.\n"
 
-#: src/util/resolver_api.c:360
+#: src/util/resolver_api.c:362
 #, fuzzy, c-format
 msgid "Timeout trying to resolve hostname `%s'.\n"
 msgstr "không quyết định các tên máy"
 
-#: src/util/resolver_api.c:428
+#: src/util/resolver_api.c:430
 #, c-format
 msgid "Resolver returns `%s' for IP `%s'.\n"
 msgstr ""
 
-#: src/util/resolver_api.c:793
+#: src/util/resolver_api.c:791
 #, c-format
 msgid "Resolver returns `%s'.\n"
 msgstr ""
 
-#: src/util/resolver_api.c:877
+#: src/util/resolver_api.c:875
 #, c-format
 msgid "Resolving our FQDN `%s'\n"
 msgstr ""
 
-#: src/util/resolver_api.c:882
+#: src/util/resolver_api.c:880
 #, fuzzy, c-format
 msgid "Could not resolve our FQDN : %s\n"
 msgstr "Không thể giải quyết « %s » (%s): %s\n"
 
-#: src/util/resolver_api.c:914
+#: src/util/resolver_api.c:912
 #, c-format
 msgid "Resolving our hostname `%s'\n"
 msgstr ""
 
-#: src/util/pseudonym.c:269
+#: src/util/pseudonym.c:266
 #, fuzzy, c-format
 msgid "Failed to parse metadata about pseudonym from file `%s': %s\n"
 msgstr "Lỗi phân tích dữ liệu giao diện từ « %s ».\n"
 
-#: src/util/pseudonym.c:333
+#: src/util/pseudonym.c:330
 msgid "no-name"
 msgstr "không-tên"
 
-#: src/util/gnunet-service-resolver.c:262
+#: src/util/gnunet-service-resolver.c:261
 #, c-format
 msgid "Could not resolve `%s' (%s): %s\n"
 msgstr "Không thể giải quyết « %s » (%s): %s\n"
 
-#: src/util/gnunet-service-resolver.c:318
-#: src/util/gnunet-service-resolver.c:363
+#: src/util/gnunet-service-resolver.c:317
+#: src/util/gnunet-service-resolver.c:362
 #, c-format
 msgid "Could not find IP of host `%s': %s\n"
 msgstr "Không tìm thấy địa chỉ IP của máy « %s »: %s\n"
 
-#: src/util/gnunet-service-resolver.c:462
+#: src/util/gnunet-service-resolver.c:460
 #, c-format
 msgid "Resolver asked to look up `%s'.\n"
 msgstr ""
 
-#: src/util/gnunet-service-resolver.c:509
+#: src/util/gnunet-service-resolver.c:508
 #, c-format
 msgid "Resolver asked to look up IP address `%s'.\n"
 msgstr ""
 
-#: src/util/bio.c:137 src/util/bio.c:143
+#: src/util/bio.c:136 src/util/bio.c:142
 #, fuzzy, c-format
 msgid "Error reading `%s': %s"
 msgstr "Gặp lỗi khi tạo người dùng"
 
-#: src/util/bio.c:144
+#: src/util/bio.c:143
 msgid "End of file"
 msgstr ""
 
-#: src/util/bio.c:196
+#: src/util/bio.c:195
 #, c-format
 msgid "Error reading length of string `%s'"
 msgstr ""
 
-#: src/util/bio.c:208
+#: src/util/bio.c:205
 #, c-format
 msgid "String `%s' longer than allowed (%u > %u)"
 msgstr ""
 
-#: src/util/bio.c:254
+#: src/util/bio.c:250
 #, c-format
 msgid "Serialized metadata `%s' larger than allowed (%u>%u)"
 msgstr ""
 
-#: src/util/bio.c:268
+#: src/util/bio.c:264
 #, c-format
 msgid "Metadata `%s' failed to deserialize"
 msgstr ""
 
-#: src/util/client.c:303
+#: src/util/client.c:301
 #, c-format
 msgid ""
 "Could not determine valid hostname and port for service `%s' from "
 "configuration.\n"
 msgstr ""
 
-#: src/util/client.c:311
+#: src/util/client.c:309
 #, c-format
 msgid "Need a non-empty hostname for service `%s'.\n"
 msgstr ""
 
-#: src/util/client.c:652
+#: src/util/client.c:647
 msgid "Failure to transmit TEST request.\n"
 msgstr ""
 
-#: src/util/client.c:857
+#: src/util/client.c:849
 #, c-format
 msgid "Could not connect to service `%s', must not be running.\n"
 msgstr ""
 
-#: src/util/client.c:874
+#: src/util/client.c:865
 #, fuzzy, c-format
 msgid "Failure to transmit request to service `%s'\n"
 msgstr "Lỗi đọc danh sách bạn bè từ « %s »\n"
 
-#: src/util/client.c:1143
+#: src/util/client.c:1133
 msgid "Could not submit request, not expecting to receive a response.\n"
 msgstr ""
 
-#: src/util/crypto_rsa.c:624 src/util/crypto_rsa.c:672
+#: src/util/crypto_rsa.c:616 src/util/crypto_rsa.c:663
 #, fuzzy, c-format
 msgid "Could not aquire lock on file `%s': %s...\n"
 msgstr "Lỗi mở tập tin theo dõi « %s »: %s\n"
 
-#: src/util/crypto_rsa.c:629
+#: src/util/crypto_rsa.c:621
 #, fuzzy
 msgid "Creating a new private key.  This may take a while.\n"
 msgstr "Đang tạo khoá máy mới (có thể hơi lâu).\n"
 
-#: src/util/crypto_rsa.c:648
+#: src/util/crypto_rsa.c:639
 #, c-format
 msgid "I am host `%s'.  Stored new private key in `%s'.\n"
 msgstr ""
 
-#: src/util/crypto_rsa.c:676 src/util/crypto_rsa.c:714
+#: src/util/crypto_rsa.c:667 src/util/crypto_rsa.c:703
 msgid "This may be ok if someone is currently generating a hostkey.\n"
 msgstr ""
 
-#: src/util/crypto_rsa.c:709
+#: src/util/crypto_rsa.c:698
 #, c-format
 msgid ""
 "When trying to read hostkey file `%s' I found %u bytes but I need at least "
 "%u.\n"
 msgstr ""
 
-#: src/util/crypto_rsa.c:730
+#: src/util/crypto_rsa.c:718
 #, fuzzy, c-format
 msgid "File `%s' does not contain a valid private key.  Deleting it.\n"
 msgstr "Tập tin « %s » không chứa biệt hiệu nên thử gỡ bỏ.\n"
 
-#: src/util/crypto_rsa.c:748
+#: src/util/crypto_rsa.c:736
 #, c-format
 msgid "I am host `%s'.  Read private key from `%s'.\n"
 msgstr ""
 
-#: src/util/crypto_rsa.c:970
+#: src/util/crypto_rsa.c:957
 #, c-format
 msgid "RSA signature verification failed at %s:%d: %s\n"
 msgstr "Lỗi thẩm tra chữ ký RSA tại %s:%d: %s\n"
 
-#: src/nse/gnunet-nse-profiler.c:650 src/dht/gnunet-dht-get.c:213
+#: src/nse/gnunet-nse-profiler.c:646 src/dht/gnunet-dht-get.c:213
 #: src/dht/gnunet-dht-put.c:184 src/fs/gnunet-unindex.c:169
 #: src/fs/gnunet-search.c:297 src/fs/gnunet-publish.c:591
 #: src/fs/gnunet-download.c:263
 msgid "be verbose (print progress information)"
 msgstr ""
 
-#: src/nse/gnunet-nse-profiler.c:668
+#: src/nse/gnunet-nse-profiler.c:664
 #, fuzzy
 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:875
+#: src/nse/gnunet-service-nse.c:878
 #, c-format
 msgid "Proof of work invalid: %llu!\n"
 msgstr ""
 
-#: src/nse/gnunet-service-nse.c:1298 src/nse/gnunet-service-nse.c:1317
-#: src/nse/gnunet-service-nse.c:1338
+#: src/nse/gnunet-service-nse.c:1301 src/nse/gnunet-service-nse.c:1320
+#: src/nse/gnunet-service-nse.c:1341
 msgid "NSE service is lacking key configuration settings.  Exiting.\n"
 msgstr ""
 
-#: src/nse/gnunet-service-nse.c:1305
+#: src/nse/gnunet-service-nse.c:1308
 msgid "Invalid work requirement for NSE service. Exiting.\n"
 msgstr ""
 
-#: src/nse/gnunet-service-nse.c:1326
+#: src/nse/gnunet-service-nse.c:1329
 #, fuzzy
 msgid "NSE service could not access hostkey.  Exiting.\n"
 msgstr "Không thể truy cập đến thông tin về không gian tên.\n"
 
-#: src/peerinfo/gnunet-service-peerinfo.c:136
+#: src/peerinfo/gnunet-service-peerinfo.c:134
 #, fuzzy, c-format
 msgid "Removing expired address of transport `%s'\n"
 msgstr "Đã nạp truyền tải « %s »\n"
 
-#: src/peerinfo/gnunet-service-peerinfo.c:197
+#: src/peerinfo/gnunet-service-peerinfo.c:196
 msgid "# peers known"
 msgstr ""
 
-#: src/peerinfo/gnunet-service-peerinfo.c:241
+#: src/peerinfo/gnunet-service-peerinfo.c:240
 #, c-format
 msgid ""
 "File `%s' in directory `%s' does not match naming convention. Removed.\n"
@@ -1320,7 +1309,7 @@
 "Tập tin « %s » trong thư mục « %s » không tùy theo quy ước đặt tên. Bị gỡ "
 "bỏ.\n"
 
-#: src/peerinfo/gnunet-service-peerinfo.c:306
+#: src/peerinfo/gnunet-service-peerinfo.c:305
 #, c-format
 msgid "Still no peers found in `%s'!\n"
 msgstr "Vẫn còn không tìm thấy đồng đẳng trong « %s ».\n"
@@ -1330,51 +1319,51 @@
 msgid "Could not connect to `%s' service.\n"
 msgstr "Không thể kết nối tới %s:%u: %s\n"
 
-#: src/peerinfo/peerinfo_api.c:278
+#: src/peerinfo/peerinfo_api.c:279
 #, fuzzy, c-format
 msgid "Failed to transmit message to `%s' service.\n"
 msgstr "Lỗi sơ khởi dịch vụ « %s ».\n"
 
-#: src/peerinfo/peerinfo_api.c:433
+#: src/peerinfo/peerinfo_api.c:435
 #, fuzzy
 msgid "Failed to receive response from `PEERINFO' service."
 msgstr ""
 "\n"
 "Không nhận được đáp ứng từ gnunetd.\n"
 
-#: src/peerinfo/peerinfo_api.c:461 src/peerinfo/peerinfo_api.c:479
+#: src/peerinfo/peerinfo_api.c:463 src/peerinfo/peerinfo_api.c:481
 msgid "Received invalid message from `PEERINFO' service.\n"
 msgstr ""
 
-#: src/peerinfo/peerinfo_api.c:521
+#: src/peerinfo/peerinfo_api.c:523
 #, fuzzy
 msgid "Failed to transmit iteration request to `PEERINFO' service\n"
 msgstr "Lỗi sơ khởi dịch vụ « %s ».\n"
 
-#: src/peerinfo/peerinfo_api.c:555
+#: src/peerinfo/peerinfo_api.c:557
 msgid "Timeout transmitting iteration request to `PEERINFO' service.\n"
 msgstr ""
 
-#: src/datacache/plugin_datacache_sqlite.c:439
+#: src/datacache/plugin_datacache_sqlite.c:424
 msgid "Sqlite datacache running\n"
 msgstr ""
 
-#: src/datacache/datacache.c:177
+#: src/datacache/datacache.c:176
 #, c-format
 msgid "Loading `%s' datacache plugin\n"
 msgstr ""
 
-#: src/datacache/datacache.c:185
+#: src/datacache/datacache.c:184
 #, fuzzy, c-format
 msgid "Failed to load datacache plugin for `%s'\n"
 msgstr "Lỗi cập nhật dữ liệu cho mô-đun « %s »\n"
 
-#: src/datacache/datacache.c:276
+#: src/datacache/datacache.c:274
 #, fuzzy
 msgid "# requests received"
 msgstr "# các yêu cầu get (lấy) dht được nhận"
 
-#: src/datacache/datacache.c:287
+#: src/datacache/datacache.c:284
 msgid "# requests filtered by bloom filter"
 msgstr "# các yêu cầu được lọc theo bộ lọc bloom"
 
@@ -1404,93 +1393,93 @@
 msgid "# FIND PEER messages initiated"
 msgstr "# các thông báo PING được tạo"
 
-#: src/dht/gnunet-service-dht_neighbours.c:632
-#: src/dht/gnunet-service-dht_neighbours.c:697
+#: src/dht/gnunet-service-dht_neighbours.c:627
+#: src/dht/gnunet-service-dht_neighbours.c:687
 #, fuzzy
 msgid "# Peers connected"
 msgstr "# của các đồng đẳng đã kết nối"
 
-#: src/dht/gnunet-service-dht_neighbours.c:734
+#: src/dht/gnunet-service-dht_neighbours.c:721
 #, 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:787
+#: src/dht/gnunet-service-dht_neighbours.c:776
 #, fuzzy
 msgid "# Bytes transmitted to other peers"
 msgstr "# các byte kiểu %d được gửi "
 
-#: src/dht/gnunet-service-dht_neighbours.c:824
+#: src/dht/gnunet-service-dht_neighbours.c:814
 #, fuzzy
 msgid "# Bytes of bandwdith 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:1051
-#: src/dht/gnunet-service-dht_neighbours.c:1078
+#: src/dht/gnunet-service-dht_neighbours.c:1038
+#: src/dht/gnunet-service-dht_neighbours.c:1066
 msgid "# Peers excluded from routing due to Bloomfilter"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1060
-#: src/dht/gnunet-service-dht_neighbours.c:1096
+#: src/dht/gnunet-service-dht_neighbours.c:1047
+#: src/dht/gnunet-service-dht_neighbours.c:1083
 #, 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:1238
+#: src/dht/gnunet-service-dht_neighbours.c:1219
 #, fuzzy
 msgid "# PUT requests routed"
 msgstr "# các yêu cầu dht được định tuyến"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1267
+#: src/dht/gnunet-service-dht_neighbours.c:1250
 #, 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:1352
+#: src/dht/gnunet-service-dht_neighbours.c:1331
 #, fuzzy
 msgid "# GET requests routed"
 msgstr "# các yêu cầu dht được định tuyến"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1384
+#: src/dht/gnunet-service-dht_neighbours.c:1362
 #, 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:1485
+#: src/dht/gnunet-service-dht_neighbours.c:1465
 #, 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:1574
+#: src/dht/gnunet-service-dht_neighbours.c:1553
 #, 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:1700
+#: src/dht/gnunet-service-dht_neighbours.c:1662
 #, 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:1707
+#: src/dht/gnunet-service-dht_neighbours.c:1670
 msgid "# FIND PEER requests ignored due to lack of HELLO"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1800
+#: src/dht/gnunet-service-dht_neighbours.c:1761
 #, 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:1853
+#: src/dht/gnunet-service-dht_neighbours.c:1805
 #, 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:1872
+#: src/dht/gnunet-service-dht_neighbours.c:1819
 #, 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:1941
+#: src/dht/gnunet-service-dht_neighbours.c:1885
 #, fuzzy
 msgid "# P2P RESULTS received"
 msgstr "# Tín hiệu HTTP PUT được nhận"
@@ -1500,7 +1489,7 @@
 msgid "Failed to connect to the DHT service!\n"
 msgstr "Lỗi kết nối đến gnunetd.\n"
 
-#: src/dht/gnunet-service-dht.c:165
+#: src/dht/gnunet-service-dht.c:163
 #, fuzzy
 msgid "Failed to connect to transport service!\n"
 msgstr "Lỗi kết nối đến gnunetd.\n"
@@ -1525,49 +1514,49 @@
 msgid "Issue a GET request to the GNUnet DHT, prints results."
 msgstr ""
 
-#: src/dht/gnunet-service-dht_clients.c:321
+#: src/dht/gnunet-service-dht_clients.c:311
 #, fuzzy
 msgid "# GET requests from clients injected"
 msgstr "# các yêu cầu get (lấy) dht được nhận"
 
-#: src/dht/gnunet-service-dht_clients.c:413
+#: src/dht/gnunet-service-dht_clients.c:402
 #, fuzzy
 msgid "# PUT requests received from clients"
 msgstr "# các đáp ứng lỗ hổng được gửi cho trình/máy khách"
 
-#: src/dht/gnunet-service-dht_clients.c:486
+#: src/dht/gnunet-service-dht_clients.c:469
 #, fuzzy
 msgid "# GET requests received from clients"
 msgstr "# các yêu cầu get (lấy) dht được nhận"
 
-#: src/dht/gnunet-service-dht_clients.c:585
+#: src/dht/gnunet-service-dht_clients.c:564
 #, fuzzy
 msgid "# GET STOP requests received from clients"
 msgstr "# các yêu cầu get (lấy) dht được nhận"
 
-#: src/dht/gnunet-service-dht_clients.c:790
+#: src/dht/gnunet-service-dht_clients.c:757
 msgid "# Key match, type mismatches in REPLY to CLIENT"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_clients.c:808
+#: src/dht/gnunet-service-dht_clients.c:772
 msgid "# Duplicate REPLIES to CLIENT request dropped"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_clients.c:852
+#: src/dht/gnunet-service-dht_clients.c:809
 #, c-format
 msgid "Unsupported block type (%u) in request!\n"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_clients.c:875
+#: src/dht/gnunet-service-dht_clients.c:831
 msgid "# RESULTS queued for clients"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_clients.c:928
-#: src/dht/gnunet-service-dht_clients.c:971
+#: src/dht/gnunet-service-dht_clients.c:882
+#: src/dht/gnunet-service-dht_clients.c:925
 msgid "# REPLIES ignored for CLIENTS (no match)"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_clients.c:937
+#: src/dht/gnunet-service-dht_clients.c:892
 msgid "Could not pass reply to client, message too big!\n"
 msgstr ""
 
@@ -1621,32 +1610,32 @@
 msgid "Issue a PUT request to the GNUnet DHT insert DATA under KEY."
 msgstr ""
 
-#: src/dht/gnunet-service-dht_routing.c:220
+#: src/dht/gnunet-service-dht_routing.c:211
 msgid "# Good REPLIES matched against routing table"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_routing.c:235
+#: src/dht/gnunet-service-dht_routing.c:220
 msgid "# Duplicate REPLIES matched against routing table"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_routing.c:240
+#: src/dht/gnunet-service-dht_routing.c:226
 msgid "# Invalid REPLIES matched against routing table"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_routing.c:249
+#: src/dht/gnunet-service-dht_routing.c:236
 msgid "# Unsupported REPLIES matched against routing table"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_routing.c:332
-#: src/dht/gnunet-service-dht_routing.c:390
+#: src/dht/gnunet-service-dht_routing.c:314
+#: src/dht/gnunet-service-dht_routing.c:368
 msgid "# Entries removed from routing table"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_routing.c:342
+#: src/dht/gnunet-service-dht_routing.c:324
 msgid "# Entries added to routing table"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_datacache.c:92
+#: src/dht/gnunet-service-dht_datacache.c:93
 #, fuzzy, c-format
 msgid "%s request received, but have no datacache!\n"
 msgstr "# các byte kiểu %d được nhận"
@@ -1655,33 +1644,33 @@
 msgid "# ITEMS stored in datacache"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_datacache.c:215
+#: src/dht/gnunet-service-dht_datacache.c:209
 msgid "# Good RESULTS found in datacache"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_datacache.c:229
+#: src/dht/gnunet-service-dht_datacache.c:220
 msgid "# Duplicate RESULTS found in datacache"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_datacache.c:234
+#: src/dht/gnunet-service-dht_datacache.c:226
 msgid "# Invalid RESULTS found in datacache"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_datacache.c:245
+#: src/dht/gnunet-service-dht_datacache.c:238
 msgid "# Unsupported RESULTS found in datacache"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_datacache.c:248
+#: src/dht/gnunet-service-dht_datacache.c:241
 #, c-format
 msgid "Unsupported block type (%u) in local response!\n"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_datacache.c:280
+#: src/dht/gnunet-service-dht_datacache.c:271
 #, fuzzy
 msgid "# GET requests given to datacache"
 msgstr "# các yêu cầu get (lấy) dht được nhận"
 
-#: src/dht/gnunet-service-dht_hello.c:86
+#: src/dht/gnunet-service-dht_hello.c:82
 #, fuzzy
 msgid "# HELLOs obtained from peerinfo"
 msgstr "Nhận được thông báo « %s » sai từ đồng đẳng « %s ».\n"
@@ -1986,34 +1975,34 @@
 msgid "# messages defragmented"
 msgstr "# các thông báo được chắp liền"
 
-#: src/fragmentation/fragmentation.c:183
+#: src/fragmentation/fragmentation.c:188
 #, fuzzy
 msgid "# fragments transmitted"
 msgstr "# Các tự quảng cáo được truyền"
 
-#: src/fragmentation/fragmentation.c:186
+#: src/fragmentation/fragmentation.c:191
 #, fuzzy
 msgid "# fragments retransmitted"
 msgstr "# Các tự quảng cáo được truyền"
 
-#: src/fragmentation/fragmentation.c:248
+#: src/fragmentation/fragmentation.c:254
 msgid "# messages fragmented"
 msgstr "# các thông báo bị tế phân"
 
-#: src/fragmentation/fragmentation.c:251
+#: src/fragmentation/fragmentation.c:257
 msgid "# total size of fragmented messages"
 msgstr ""
 
-#: src/fragmentation/fragmentation.c:335
+#: src/fragmentation/fragmentation.c:342
 #, fuzzy
 msgid "# fragment acknowledgements received"
 msgstr "# Các quảng cáo đồng đẳng được nhận"
 
-#: src/fragmentation/fragmentation.c:341
+#: src/fragmentation/fragmentation.c:348
 msgid "# bits removed from fragmentation ACKs"
 msgstr ""
 
-#: src/fragmentation/fragmentation.c:365
+#: src/fragmentation/fragmentation.c:372
 #, fuzzy
 msgid "# fragmentation transmissions completed"
 msgstr "# các sự truyền PONG bị lỗi"
@@ -2028,7 +2017,7 @@
 msgid "Wrote %llu bytes of statistics to `%s'\n"
 msgstr "Đã tải %llu byte xuống « %s ».\n"
 
-#: src/statistics/statistics_api.c:325
+#: src/statistics/statistics_api.c:327
 #, fuzzy
 msgid "Failed to connect to statistics service!\n"
 msgstr "Lỗi kết nối đến gnunetd.\n"
@@ -2169,52 +2158,52 @@
 msgid "Manage GNUnet pseudonyms."
 msgstr ""
 
-#: src/fs/fs_namespace.c:52 src/fs/fs_namespace.c:78
+#: src/fs/fs_namespace.c:64 src/fs/fs_namespace.c:90
 #, fuzzy, c-format
 msgid "Configuration fails to specify `%s' in section `%s'\n"
 msgstr "Tập tin cấu hình « %s » đã được ghi.\n"
 
-#: src/fs/fs_namespace.c:107
+#: src/fs/fs_namespace.c:119
 #, fuzzy, c-format
 msgid "Failed to open `%s' for writing: %s\n"
 msgstr "Lỗi mở tập tin ghi sự kiện « %s »: %s\n"
 
-#: src/fs/fs_namespace.c:129 src/fs/fs_namespace.c:217
+#: src/fs/fs_namespace.c:141 src/fs/fs_namespace.c:229
 #, fuzzy, c-format
 msgid "Failed to write `%s': %s\n"
 msgstr "Lỗi chạy %s: %s %d\n"
 
-#: src/fs/fs_namespace.c:323
+#: src/fs/fs_namespace.c:335
 #, fuzzy
 msgid "Unknown error"
 msgstr "Lỗi không rõ.\n"
 
-#: src/fs/fs_namespace.c:412 src/fs/fs_namespace.c:433
+#: src/fs/fs_namespace.c:424 src/fs/fs_namespace.c:445
 #, fuzzy
 msgid "Failed to serialize meta data"
 msgstr "Lỗi lấy thông kê về truyền tải.\n"
 
-#: src/fs/fs_namespace.c:452
+#: src/fs/fs_namespace.c:464
 #, fuzzy
 msgid "Failed to connect to datastore service"
 msgstr "Không kết nối được đến trình nền gnunetd."
 
-#: src/fs/fs_namespace.c:495
+#: src/fs/fs_namespace.c:507
 #, fuzzy, c-format
 msgid "Failed to create or read private key for namespace `%s'\n"
 msgstr "Lỗi cập nhật dữ liệu cho mô-đun « %s »\n"
 
-#: src/fs/fs_namespace.c:597
+#: src/fs/fs_namespace.c:609
 #, fuzzy, c-format
 msgid "Failed to read namespace private key file `%s', deleting it!\n"
 msgstr "Lỗi thêm mục nhập vào không gian tên « %s » (có chưa ?)\n"
 
-#: src/fs/fs_namespace.c:822 src/fs/fs_publish.c:1518
+#: src/fs/fs_namespace.c:834 src/fs/fs_publish.c:1523
 #, fuzzy
 msgid "Internal error."
 msgstr "Lỗi VR."
 
-#: src/fs/fs_namespace.c:866
+#: src/fs/fs_namespace.c:878
 #, fuzzy
 msgid "Failed to connect to datastore."
 msgstr "Không kết nối được đến trình nền gnunetd."
@@ -2329,11 +2318,11 @@
 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:1238 src/fs/fs_uri.c:1265
+#: src/fs/fs_uri.c:1232 src/fs/fs_uri.c:1259
 msgid "No keywords specified!\n"
 msgstr "Chưa ghi rõ từ khoá.\n"
 
-#: src/fs/fs_uri.c:1271
+#: src/fs/fs_uri.c:1265
 msgid "Number of double-quotes not balanced!\n"
 msgstr "Có dấu nháy kép thừa hay thiếu.\n"
 
@@ -2393,7 +2382,7 @@
 msgstr "Tùy chọn « %s » cần thiết khi dùng tùy chọn « %s ».\n"
 
 #: src/fs/gnunet-publish.c:393 src/fs/gnunet-publish.c:400
-#: src/transport/gnunet-transport.c:525
+#: src/transport/gnunet-transport.c:477
 #, 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"
@@ -2498,13 +2487,13 @@
 msgid "Publish a file or directory on GNUnet"
 msgstr ""
 
-#: src/fs/fs_search.c:798
+#: src/fs/fs_search.c:803
 #, c-format
 msgid "Got result with unknown block type `%d', ignoring"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_lc.c:202 src/fs/gnunet-service-fs_lc.c:359
-#: src/fs/gnunet-service-fs_lc.c:480
+#: src/fs/gnunet-service-fs_lc.c:202 src/fs/gnunet-service-fs_lc.c:365
+#: src/fs/gnunet-service-fs_lc.c:490
 #, fuzzy
 msgid "# client searches active"
 msgstr "# các yêu cầu khách lỗ hổng được nhận"
@@ -2514,12 +2503,12 @@
 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:312
+#: src/fs/gnunet-service-fs_lc.c:319
 #, 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:351
+#: src/fs/gnunet-service-fs_lc.c:359
 msgid "# client searches updated (merged content seen list)"
 msgstr ""
 
@@ -2563,249 +2552,251 @@
 msgid "Display contents of a GNUnet directory"
 msgstr "Lỗi định dạng tập tin (không phải là thư mục GNUnet ?)\n"
 
-#: src/fs/gnunet-service-fs_pr.c:272
+#: src/fs/gnunet-service-fs_pr.c:287
 #, fuzzy
 msgid "# Pending requests created"
 msgstr "# các yêu cầu get (lấy) dht được nhận"
 
-#: src/fs/gnunet-service-fs_pr.c:352 src/fs/gnunet-service-fs_pr.c:607
+#: src/fs/gnunet-service-fs_pr.c:368 src/fs/gnunet-service-fs_pr.c:622
 #, fuzzy
 msgid "# Pending requests active"
 msgstr "# các yêu cầu get (lấy) dht được nhận"
 
-#: src/fs/gnunet-service-fs_pr.c:771
+#: src/fs/gnunet-service-fs_pr.c:786
 #, fuzzy
 msgid "# replies received and matched"
 msgstr "# các byte kiểu %d được nhận"
 
-#: src/fs/gnunet-service-fs_pr.c:798
+#: src/fs/gnunet-service-fs_pr.c:813
 msgid "# duplicate replies discarded (bloomfilter)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:814
+#: src/fs/gnunet-service-fs_pr.c:829
 #, c-format
 msgid "Unsupported block type %u\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:829
+#: src/fs/gnunet-service-fs_pr.c:844
 #, fuzzy
 msgid "# results found locally"
 msgstr "# nội dung lỗ hổng được tìm cục bộ"
 
-#: src/fs/gnunet-service-fs_pr.c:921
+#: src/fs/gnunet-service-fs_pr.c:936
 msgid "# Datastore `PUT' failures"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:948
+#: src/fs/gnunet-service-fs_pr.c:963
 #, 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:983
+#: src/fs/gnunet-service-fs_pr.c:998
 #, fuzzy
 msgid "# Replies received from DHT"
 msgstr "# các byte đã nhận qua HTTP"
 
-#: src/fs/gnunet-service-fs_pr.c:1074
+#: src/fs/gnunet-service-fs_pr.c:1088
 #, c-format
 msgid "Datastore lookup already took %llu ms!\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1095
+#: src/fs/gnunet-service-fs_pr.c:1109
 #, c-format
 msgid "On-demand lookup already took %llu ms!\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1142
+#: src/fs/gnunet-service-fs_pr.c:1156
 msgid "# Datastore lookups concluded (no results)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1156
+#: src/fs/gnunet-service-fs_pr.c:1170
 msgid "# Datastore lookups concluded (seen all)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1165
+#: src/fs/gnunet-service-fs_pr.c:1179
 msgid "# Datastore lookups aborted (more than MAX_RESULTS)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1181
+#: src/fs/gnunet-service-fs_pr.c:1195
 msgid "# requested DBLOCK or IBLOCK not found"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1198
+#: src/fs/gnunet-service-fs_pr.c:1212
 msgid "# on-demand blocks matched requests"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1211
+#: src/fs/gnunet-service-fs_pr.c:1225
 msgid "# on-demand lookups performed successfully"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1216
+#: src/fs/gnunet-service-fs_pr.c:1230
 msgid "# on-demand lookups failed"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1242 src/fs/gnunet-service-fs_pr.c:1281
-#: src/fs/gnunet-service-fs_pr.c:1416
+#: src/fs/gnunet-service-fs_pr.c:1257 src/fs/gnunet-service-fs_pr.c:1297
+#: src/fs/gnunet-service-fs_pr.c:1437
 msgid "# Datastore lookups concluded (error queueing)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1299
+#: src/fs/gnunet-service-fs_pr.c:1315
 msgid "# Datastore lookups concluded (found last result)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1312
+#: src/fs/gnunet-service-fs_pr.c:1328
 msgid "# Datastore lookups concluded (load too high)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1394
+#: src/fs/gnunet-service-fs_pr.c:1414
 msgid "# Datastore lookups initiated"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1474
+#: src/fs/gnunet-service-fs_pr.c:1495
 #, 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_pr.c:1565 src/fs/gnunet-service-fs_pr.c:1576
+#: src/fs/gnunet-service-fs_pr.c:1586 src/fs/gnunet-service-fs_pr.c:1595
 #, fuzzy, c-format
 msgid "Configuration fails to specify `%s', assuming default value."
 msgstr "Tập tin cấu hình « %s » đã được ghi.\n"
 
-#: src/fs/gnunet-service-fs_pe.c:259
+#: src/fs/gnunet-service-fs_pe.c:265
 #, fuzzy
 msgid "# average retransmission delay (ms)"
 msgstr "# thời gian trung bình còn kết nối (theo miligiây)"
 
-#: src/fs/gnunet-service-fs_pe.c:354
+#: src/fs/gnunet-service-fs_pe.c:392
 #, fuzzy
 msgid "# transmission failed (core has no bandwidth)"
 msgstr "Lỗi thử gửi, kiểu truyền tải %d không được hỗ trợ\n"
 
-#: src/fs/gnunet-service-fs_pe.c:385
+#: src/fs/gnunet-service-fs_pe.c:423
 #, fuzzy
 msgid "# query messages sent to other peers"
 msgstr "# các byte thông báo gửi đi bị loại bỏ"
 
-#: src/fs/gnunet-service-fs_pe.c:440
+#: src/fs/gnunet-service-fs_pe.c:476
 msgid "# delay heap timeout"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pe.c:450
+#: src/fs/gnunet-service-fs_pe.c:483
 #, fuzzy
 msgid "# query plans executed"
 msgstr "# các yêu cầu dht được định tuyến"
 
-#: src/fs/gnunet-service-fs_pe.c:516
+#: src/fs/gnunet-service-fs_pe.c:547
 #, fuzzy
 msgid "# requests merged"
 msgstr "# các yêu cầu get (lấy) dht được nhận"
 
-#: src/fs/gnunet-service-fs_pe.c:522
+#: src/fs/gnunet-service-fs_pe.c:553
 #, fuzzy
 msgid "# requests refreshed"
 msgstr "# các yêu cầu get (lấy) dht được nhận"
 
-#: src/fs/gnunet-service-fs_pe.c:576 src/fs/gnunet-service-fs_pe.c:665
-#: src/fs/gnunet-service-fs_pe.c:706
+#: src/fs/gnunet-service-fs_pe.c:606 src/fs/gnunet-service-fs_pe.c:692
+#: src/fs/gnunet-service-fs_pe.c:734
 msgid "# query plan entries"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:618 src/fs/gnunet-service-fs_cp.c:1552
-#: src/transport/gnunet-service-transport_neighbours.c:870
-#: src/transport/gnunet-service-transport_neighbours.c:2036
-#: src/transport/gnunet-service-transport_neighbours.c:2123
-#: src/topology/gnunet-daemon-topology.c:653
-#: src/topology/gnunet-daemon-topology.c:755
+#: src/fs/gnunet-service-fs_cp.c:615 src/fs/gnunet-service-fs_cp.c:1543
+#: src/transport/gnunet-service-transport_neighbours.c:938
+#: src/transport/gnunet-service-transport_neighbours.c:943
+#: src/transport/gnunet-service-transport_neighbours.c:1266
+#: src/transport/gnunet-service-transport_neighbours.c:2352
+#: src/transport/gnunet-service-transport_neighbours.c:2423
+#: src/topology/gnunet-daemon-topology.c:654
+#: src/topology/gnunet-daemon-topology.c:756
 #, fuzzy
 msgid "# peers connected"
 msgstr "# của các đồng đẳng đã kết nối"
 
-#: src/fs/gnunet-service-fs_cp.c:701
+#: src/fs/gnunet-service-fs_cp.c:696
 #, 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:705
+#: src/fs/gnunet-service-fs_cp.c:700
 #, c-format
 msgid "Migration of content to peer `%s' blocked for %llu ms\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:740
+#: src/fs/gnunet-service-fs_cp.c:735
 #, fuzzy
 msgid "# replies transmitted to other peers"
 msgstr "# các byte kiểu %d được gửi "
 
-#: src/fs/gnunet-service-fs_cp.c:746
+#: src/fs/gnunet-service-fs_cp.c:741
 #, fuzzy
 msgid "# replies dropped"
 msgstr "# các đáp ứng dht được định tuyến"
 
-#: src/fs/gnunet-service-fs_cp.c:775 src/fs/gnunet-service-fs_cp.c:891
-#: src/fs/gnunet-service-fs_cp.c:1301 src/fs/gnunet-service-fs_cp.c:1340
+#: src/fs/gnunet-service-fs_cp.c:770 src/fs/gnunet-service-fs_cp.c:886
+#: src/fs/gnunet-service-fs_cp.c:1296 src/fs/gnunet-service-fs_cp.c:1333
 msgid "# P2P searches active"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:848
+#: src/fs/gnunet-service-fs_cp.c:843
 msgid "# artificial delays introduced (ms)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:911
+#: src/fs/gnunet-service-fs_cp.c:906
 #, fuzzy
 msgid "# replies received for other peers"
 msgstr "# các byte kiểu %d được nhận"
 
-#: src/fs/gnunet-service-fs_cp.c:925
+#: src/fs/gnunet-service-fs_cp.c:920
 msgid "# replies dropped due to insufficient cover traffic"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:963
+#: src/fs/gnunet-service-fs_cp.c:958
 msgid "# P2P searches destroyed due to ultimate reply"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1030
+#: src/fs/gnunet-service-fs_cp.c:1025
 #, 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:1054
+#: src/fs/gnunet-service-fs_cp.c:1049
 msgid "# request dropped, priority insufficient"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1064
+#: src/fs/gnunet-service-fs_cp.c:1059
 #, 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:1143
+#: src/fs/gnunet-service-fs_cp.c:1138
 msgid "# GET requests received (from other peers)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1177
+#: src/fs/gnunet-service-fs_cp.c:1172
 #, 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:1201
+#: src/fs/gnunet-service-fs_cp.c:1196
 #, 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:1267
+#: src/fs/gnunet-service-fs_cp.c:1262
 #, 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:1295
+#: src/fs/gnunet-service-fs_cp.c:1290
 #, 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:1338
+#: src/fs/gnunet-service-fs_cp.c:1331
 #, 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_push.c:642
+#: src/fs/gnunet-service-fs_push.c:653
 #, c-format
 msgid ""
 "Invalid value specified for option `%s' in section `%s', content pushing "
@@ -2846,16 +2837,20 @@
 msgid "Failed to delete bogus block: %s\n"
 msgstr "Lỗi mở tập tin ghi sự kiện « %s »: %s\n"
 
-#: src/fs/gnunet-service-fs_indexing.c:552
+#: src/fs/gnunet-service-fs_indexing.c:545
+msgid "# index blocks removed: original file inaccessible"
+msgstr ""
+
+#: src/fs/gnunet-service-fs_indexing.c:560
 #, fuzzy, c-format
 msgid "Could not access indexed file `%s' (%s) at offset %llu: %s\n"
 msgstr "Không thể giải quyết « %s » (%s): %s\n"
 
-#: src/fs/gnunet-service-fs_indexing.c:554
+#: src/fs/gnunet-service-fs_indexing.c:562
 msgid "not indexed"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_indexing.c:569
+#: src/fs/gnunet-service-fs_indexing.c:577
 #, fuzzy, c-format
 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"
@@ -2989,143 +2984,143 @@
 "Không rõ kiểu siêu dữ liệu trong tùy chọn siêu dữ liệu « %s ». Đang ùng kiểu "
 "siêu dữ liệu « không rõ » (unknown) để thay thế.\n"
 
-#: src/fs/fs_publish.c:142 src/fs/fs_publish.c:410
+#: src/fs/fs_publish.c:147 src/fs/fs_publish.c:415
 #, fuzzy, c-format
 msgid "Publishing failed: %s"
 msgstr "Gặp lỗi khi tải lên tập tin: %s\n"
 
-#: src/fs/fs_publish.c:647 src/fs/fs_publish.c:664 src/fs/fs_publish.c:703
-#: src/fs/fs_publish.c:723 src/fs/fs_publish.c:750 src/fs/fs_publish.c:898
+#: src/fs/fs_publish.c:652 src/fs/fs_publish.c:669 src/fs/fs_publish.c:708
+#: src/fs/fs_publish.c:728 src/fs/fs_publish.c:755 src/fs/fs_publish.c:903
 #, 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"
 
-#: src/fs/fs_publish.c:649
+#: src/fs/fs_publish.c:654
 msgid "timeout on index-start request to `fs' service"
 msgstr ""
 
-#: src/fs/fs_publish.c:661
+#: src/fs/fs_publish.c:666
 #, fuzzy
 msgid "unknown error"
 msgstr "Lỗi không rõ"
 
-#: src/fs/fs_publish.c:704
+#: src/fs/fs_publish.c:709
 msgid "failed to compute hash"
 msgstr ""
 
-#: src/fs/fs_publish.c:724
+#: src/fs/fs_publish.c:729
 #, fuzzy
 msgid "filename too long"
 msgstr "tên tập tin"
 
-#: src/fs/fs_publish.c:751
+#: src/fs/fs_publish.c:756
 msgid "could not connect to `fs' service"
 msgstr ""
 
-#: src/fs/fs_publish.c:775
+#: src/fs/fs_publish.c:780
 #, fuzzy, c-format
 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:845
+#: src/fs/fs_publish.c:850
 #, 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:851
+#: src/fs/fs_publish.c:856
 #, 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:899
+#: src/fs/fs_publish.c:904
 msgid "needs to be an actual file"
 msgstr ""
 
-#: src/fs/fs_publish.c:1078
+#: src/fs/fs_publish.c:1083
 #, 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:1149
+#: src/fs/fs_publish.c:1154
 #, c-format
 msgid "Reserving space for %u entries and %llu bytes for publication\n"
 msgstr ""
 
-#: src/fs/fs_publish.c:1482
+#: src/fs/fs_publish.c:1487
 #, fuzzy
 msgid "Could not connect to datastore."
 msgstr "« %s »: Không thể kết nối.\n"
 
-#: src/fs/fs.c:284
+#: src/fs/fs_api.c:284
 #, 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.c:293
+#: src/fs/fs_api.c:293
 #, 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.c:299
+#: src/fs/fs_api.c:299
 #, c-format
 msgid "Short read reading from file `%s'!"
 msgstr ""
 
-#: src/fs/fs.c:877
+#: src/fs/fs_api.c:877
 #, 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.c:1323
+#: src/fs/fs_api.c:1323
 #, c-format
 msgid "Failed to recover namespace `%s', cannot resume publishing operation.\n"
 msgstr ""
 
-#: src/fs/fs.c:1364
+#: src/fs/fs_api.c:1364
 #, c-format
 msgid "Failure while resuming publishing operation `%s': %s\n"
 msgstr ""
 
-#: src/fs/fs.c:1380
+#: src/fs/fs_api.c:1380
 #, 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.c:1984
+#: src/fs/fs_api.c:1984
 #, c-format
 msgid "Failure while resuming unindexing operation `%s': %s\n"
 msgstr ""
 
-#: src/fs/fs.c:1994
+#: src/fs/fs_api.c:1994
 #, 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.c:2107 src/fs/fs.c:2346
+#: src/fs/fs_api.c:2107 src/fs/fs_api.c:2346
 #, 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.c:2124
+#: src/fs/fs_api.c:2124
 #, 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.c:2136 src/fs/fs.c:2155 src/fs/fs.c:2631
+#: src/fs/fs_api.c:2136 src/fs/fs_api.c:2155 src/fs/fs_api.c:2631
 #, c-format
 msgid "Failure while resuming search operation `%s': %s\n"
 msgstr ""
 
-#: src/fs/fs.c:2337
+#: src/fs/fs_api.c:2337
 #, c-format
 msgid "Failed to resume sub-download `%s': could not open file `%s'\n"
 msgstr ""
 
-#: src/fs/fs.c:2583
+#: src/fs/fs_api.c:2583
 msgid "Could not resume running search, will resume as paused search\n"
 msgstr ""
 
-#: src/fs/fs.c:2669
+#: src/fs/fs_api.c:2669
 #, c-format
 msgid "Failure while resuming download operation `%s': %s\n"
 msgstr ""
@@ -3181,13 +3176,17 @@
 msgid "Invalid URI"
 msgstr "Dữ liệu nhập không hợp lệ.\n"
 
-#: src/fs/gnunet-service-fs.c:268 src/fs/gnunet-service-fs.c:448
+#: src/fs/gnunet-service-fs.c:240
+msgid "# running average P2P latency (ms)"
+msgstr ""
+
+#: src/fs/gnunet-service-fs.c:300 src/fs/gnunet-service-fs.c:490
 #, 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:542 src/topology/gnunet-daemon-topology.c:1292
-#: src/topology/gnunet-daemon-topology.c:1299
+#: src/fs/gnunet-service-fs.c:583 src/topology/gnunet-daemon-topology.c:1290
+#: src/topology/gnunet-daemon-topology.c:1297
 #: src/hostlist/gnunet-daemon-hostlist.c:290
 #, fuzzy, c-format
 msgid "Failed to connect to `%s' service.\n"
@@ -3198,76 +3197,101 @@
 msgid "`%s' failed on file `%s': %s"
 msgstr "« %s » thất bại cho ổ đĩa « %s »: %u\n"
 
-#: src/transport/gnunet-service-transport_neighbours.c:435
+#: src/transport/gnunet-service-transport_neighbours.c:465
 msgid "# failed connection attempts due to timeout"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:819
+#: src/transport/gnunet-service-transport_neighbours.c:857
 #, fuzzy
 msgid "# peers disconnected due to external request"
 msgstr "# các yêu cầu lỗ hổng bị bỏ do trọng tải"
 
-#: src/transport/gnunet-service-transport_neighbours.c:925
+#: src/transport/gnunet-service-transport_neighbours.c:947
 #, fuzzy
+msgid "# fast reconnects failed"
+msgstr "# của các đồng đẳng đã kết nối"
+
+#: src/transport/gnunet-service-transport_neighbours.c:1002
+#, fuzzy
 msgid "# peers disconnected due to timeout"
 msgstr "# các kết nối bị đóng (vấn đề truyền tải)"
 
-#: src/transport/gnunet-service-transport_neighbours.c:949
+#: src/transport/gnunet-service-transport_neighbours.c:1027
 #, fuzzy
 msgid "# keepalives sent"
 msgstr "# các khoá phiên chạy được gửi"
 
-#: src/transport/gnunet-service-transport_neighbours.c:981
+#: src/transport/gnunet-service-transport_neighbours.c:1068
 #, fuzzy
 msgid "# peers disconnected due to global disconnect"
 msgstr "# Các quảng cáo đồng đẳng bị hủy do trọng tải"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1543
-#: src/transport/gnunet-service-transport_neighbours.c:1564
+#: src/transport/gnunet-service-transport_neighbours.c:1774
+#: src/transport/gnunet-service-transport_neighbours.c:1795
 #, fuzzy
 msgid "# messages not sent (no such peer or not connected)"
 msgstr "# các thông báo được chắp liền"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1580
+#: src/transport/gnunet-service-transport_neighbours.c:1811
 #, 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:1632
+#: src/transport/gnunet-service-transport_neighbours.c:1863
 #, 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:1668
+#: src/transport/gnunet-service-transport_neighbours.c:1899
 #, 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:1686
+#: src/transport/gnunet-service-transport_neighbours.c:1917
 msgid "# ms throttling suggested"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1715
+#: src/transport/gnunet-service-transport_neighbours.c:1946
 #, fuzzy
 msgid "# KEEPALIVE messages discarded (not connected)"
 msgstr "# các thông báo được chắp liền"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1749
+#: src/transport/gnunet-service-transport_neighbours.c:1995
+#, 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:2003
+#, 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:2064
 msgid "# SET QUOTA messages ignored (no such peer)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1762
+#: src/transport/gnunet-service-transport_neighbours.c:2082
 msgid "# disconnects due to quota of 0"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1884
+#: src/transport/gnunet-service-transport_neighbours.c:2200
 msgid "# disconnect messages ignored (old format)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1896
+#: src/transport/gnunet-service-transport_neighbours.c:2213
 msgid "# disconnect messages ignored (timestamp)"
 msgstr ""
 
+#: src/transport/gnunet-service-transport_neighbours.c:2302
+#, fuzzy
+msgid "# unexpected CONNECT_ACK messages"
+msgstr "gửi ĐẾM thông báo"
+
+#: src/transport/gnunet-service-transport_neighbours.c:2400
+#, fuzzy
+msgid "# unexpected ACK messages"
+msgstr "# các thông báo PONG đã mật mã được gửi"
+
 #: src/transport/gnunet-service-transport_blacklist.c:247
 #, fuzzy, c-format
 msgid "Could not read blacklist file `%s'\n"
@@ -3307,54 +3331,53 @@
 msgstr ""
 
 #: src/transport/gnunet-service-transport_blacklist.c:522
-#: src/transport/gnunet-service-transport_blacklist.c:760
+#: src/transport/gnunet-service-transport_blacklist.c:756
 msgid "# disconnects due to blacklist"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:184
+#: src/transport/plugin_transport_http_server.c:189
 msgid ""
 "Could not create a new TLS certificate, program `gnunet-transport-"
 "certificate-creation' could not be started!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:208
+#: src/transport/plugin_transport_http_server.c:213
 msgid "No usable TLS certificate found and creating one failed!\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_hello.c:177
+#: src/transport/gnunet-service-transport_hello.c:172
 msgid "# refreshed my HELLO"
 msgstr ""
 
-#: src/transport/plugin_transport_udp.c:1431
-#: src/transport/plugin_transport_udp.c:2130
+#: src/transport/plugin_transport_udp.c:1518
 #, fuzzy
-msgid "# HELLO beacons received via udp"
+msgid "# IPv4 broadcast HELLO beacons received via udp"
 msgstr "# các thông báo PONG đã mật mã được nhận"
 
-#: src/transport/plugin_transport_udp.c:1894
-#: src/transport/plugin_transport_udp_new.c:1209
+#: src/transport/plugin_transport_udp.c:1555
+#, fuzzy
+msgid "# IPv6 multicast HELLO beacons received via udp"
+msgstr "# các thông báo PONG đã mật mã được nhận"
+
+#: src/transport/plugin_transport_udp.c:2041
+#: src/transport/plugin_transport_udp_new.c:1218
 #, c-format
 msgid "Given `%s' option is out of range: %llu > %u\n"
 msgstr ""
 
-#: src/transport/plugin_transport_udp.c:1947
-#: src/transport/plugin_transport_udp_new.c:1259
+#: src/transport/plugin_transport_udp.c:2092
+#: src/transport/plugin_transport_udp_new.c:1268
 #, 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:2102
-#, fuzzy, c-format
-msgid "Failed to create IPv4 broadcast socket on port %d\n"
-msgstr "Lỗi cập nhật dữ liệu cho mô-đun « %s »\n"
-
-#: src/transport/plugin_transport_udp.c:2112
+#: src/transport/plugin_transport_udp.c:2235
 #, c-format
 msgid "Failed to set IPv4 broadcast option for broadcast socket on port %d\n"
 msgstr ""
 
-#: src/transport/plugin_transport_udp.c:2144
-#: src/transport/plugin_transport_udp_new.c:1388
+#: src/transport/plugin_transport_udp.c:2274
+#: src/transport/plugin_transport_udp_new.c:1396
 #, fuzzy
 msgid "Failed to open UDP sockets\n"
 msgstr "Lỗi mở tập tin ghi sự kiện « %s »: %s\n"
@@ -3369,7 +3392,7 @@
 msgid "%s failed at %s:%d: `%s'\n"
 msgstr "%s bị lỗi tại %s:%d: « %s »\n"
 
-#: src/transport/plugin_transport_http_client.c:617
+#: src/transport/plugin_transport_http_client.c:619
 #, c-format
 msgid "Could not initialize curl multi handle, failed to start %s plugin!\n"
 msgstr ""
@@ -3381,16 +3404,16 @@
 
 #: src/transport/plugin_transport_tcp.c:590
 #: src/transport/plugin_transport_tcp.c:679
-#: src/transport/plugin_transport_tcp.c:732
-#: src/transport/plugin_transport_tcp.c:821
-#: src/transport/plugin_transport_tcp.c:1160
+#: src/transport/plugin_transport_tcp.c:731
+#: src/transport/plugin_transport_tcp.c:820
+#: src/transport/plugin_transport_tcp.c:1156
 #, fuzzy
 msgid "# bytes currently in TCP buffers"
 msgstr "# các byte đã gừi qua TCP"
 
 #: src/transport/plugin_transport_tcp.c:596
-#: src/transport/plugin_transport_tcp.c:847
-#: src/transport/plugin_transport_tcp.c:1548
+#: src/transport/plugin_transport_tcp.c:846
+#: src/transport/plugin_transport_tcp.c:1544
 #, fuzzy
 msgid "# TCP sessions active"
 msgstr "# các khoá phiên chạy được chấp nhận"
@@ -3400,129 +3423,129 @@
 msgid "# bytes discarded by TCP (timeout)"
 msgstr "# các byte loại đi bởi TCP (đi ra)"
 
-#: src/transport/plugin_transport_tcp.c:735
+#: src/transport/plugin_transport_tcp.c:734
 #, fuzzy
 msgid "# bytes transmitted via TCP"
 msgstr "# các byte được gửi"
 
-#: src/transport/plugin_transport_tcp.c:825
+#: src/transport/plugin_transport_tcp.c:824
 #, fuzzy
 msgid "# bytes discarded by TCP (disconnect)"
 msgstr "# các byte loại đi bởi TCP (đi ra)"
 
-#: src/transport/plugin_transport_tcp.c:946
+#: src/transport/plugin_transport_tcp.c:945
 #, fuzzy
 msgid "# bytes TCP was asked to transmit"
 msgstr "# các byte được gửi"
 
-#: src/transport/plugin_transport_tcp.c:997
+#: src/transport/plugin_transport_tcp.c:996
 msgid "# bytes discarded by TCP (no address and no connection)"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:1040
+#: src/transport/plugin_transport_tcp.c:1039
 #, fuzzy, c-format
 msgid "Address of unexpected length: %u\n"
 msgstr "Gặp sự kiện bất thường: %d\n"
 
-#: src/transport/plugin_transport_tcp.c:1057
+#: src/transport/plugin_transport_tcp.c:1056
 msgid "Found valid IPv4 NAT address (creating session)!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:1108
+#: src/transport/plugin_transport_tcp.c:1107
 #, fuzzy
 msgid "# bytes discarded by TCP (failed to connect)"
 msgstr "# các byte loại đi bởi TCP (đi ra)"
 
-#: src/transport/plugin_transport_tcp.c:1228
+#: src/transport/plugin_transport_tcp.c:1224
 msgid "# transport-service disconnect requests for TCP"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:1591
+#: src/transport/plugin_transport_tcp.c:1587
 #, fuzzy
 msgid "# TCP WELCOME messages received"
 msgstr "# các thông báo PONG đã mật mã được nhận"
 
-#: src/transport/plugin_transport_tcp.c:1736
+#: src/transport/plugin_transport_tcp.c:1732
 msgid "# bytes received via TCP"
 msgstr "# các byte đã nhận qua TCP"
 
-#: src/transport/plugin_transport_tcp.c:1800
+#: src/transport/plugin_transport_tcp.c:1796
 msgid "# network-level TCP disconnect events"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:1953
+#: src/transport/plugin_transport_tcp.c:1949
 #, fuzzy
 msgid "Failed to start service.\n"
 msgstr "Lỗi bắt đầu thu thập.\n"
 
-#: src/transport/plugin_transport_tcp.c:2013
+#: src/transport/plugin_transport_tcp.c:2009
 #, fuzzy, c-format
 msgid "Failed to find option %s in section %s!\n"
 msgstr "Lỗi đóng kết đến cổng %s %d.\n"
 
-#: src/transport/plugin_transport_tcp.c:2036
+#: src/transport/plugin_transport_tcp.c:2032
 #, c-format
 msgid "TCP transport listening on port %llu\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2040
+#: src/transport/plugin_transport_tcp.c:2036
 msgid "TCP transport not listening on any port (client only)\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2044
+#: src/transport/plugin_transport_tcp.c:2040
 #, c-format
 msgid "TCP transport advertises itself as being on port %llu\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http.c:829
+#: src/transport/plugin_transport_http.c:920
 msgid "Disabling IPv6 since it is not supported on this system!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http.c:878
+#: src/transport/plugin_transport_http.c:968
 #, fuzzy
 msgid "Require valid port number for service in configuration!\n"
 msgstr "Lỗi lưu cấu hình."
 
-#: src/transport/plugin_transport_http.c:1025
+#: src/transport/plugin_transport_http.c:1115
 #, c-format
 msgid "Found %u addresses to report to NAT service\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http.c:1040
+#: src/transport/plugin_transport_http.c:1128
 #, c-format
 msgid "FREEING %s\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http.c:1115
+#: src/transport/plugin_transport_http.c:1203
 msgid "Neither IPv4 nor IPv6 are enabled! Fix in configuration\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http.c:1128
+#: src/transport/plugin_transport_http.c:1216
 #, fuzzy
 msgid "Port is required! Fix in configuration\n"
 msgstr ""
 "\n"
 "Kết thúc cấu hình.\n"
 
-#: src/transport/plugin_transport_http.c:1139
+#: src/transport/plugin_transport_http.c:1227
 msgid "Port 0, client only mode\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http.c:1155
+#: src/transport/plugin_transport_http.c:1247
 #, c-format
 msgid ""
 "Specific IPv4 address `%s' for plugin %s in configuration file is invalid! "
 "Binding to all addresses!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http.c:1181
+#: src/transport/plugin_transport_http.c:1277
 #, c-format
 msgid ""
 "Specific IPv6 address `%s' for plugin %s in configuration file is invalid! "
 "Binding to all addresses!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_unix.c:1088
+#: src/transport/plugin_transport_unix.c:1087
 #, fuzzy
 msgid "Failed to open UNIX sockets\n"
 msgstr "Lỗi mở tập tin ghi sự kiện « %s »: %s\n"
@@ -3569,284 +3592,289 @@
 msgid "# bytes dropped by SMTP (outgoing)"
 msgstr "# các byte loại đi bởi SMTP (đi ra)"
 
-#: src/transport/gnunet-service-transport_plugins.c:108
+#: src/transport/gnunet-service-transport_plugins.c:109
 msgid "Transport service is lacking NEIGHBOUR_LIMIT option.\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_plugins.c:115
+#: src/transport/gnunet-service-transport_plugins.c:116
 #, fuzzy, c-format
 msgid "Starting transport plugins `%s'\n"
 msgstr "Đang nạp các truyền tải « %s »\n"
 
-#: src/transport/gnunet-service-transport_plugins.c:119
+#: src/transport/gnunet-service-transport_plugins.c:120
 #, fuzzy, c-format
 msgid "Loading `%s' transport plugin\n"
 msgstr "Đang nạp các truyền tải « %s »\n"
 
-#: src/transport/gnunet-service-transport_plugins.c:139
+#: src/transport/gnunet-service-transport_plugins.c:147
 #, fuzzy, c-format
 msgid "Failed to load transport plugin for `%s'\n"
 msgstr "Không thể nạp phần bổ sung truyền tải « %s »\n"
 
-#: src/transport/plugin_transport_wlan.c:877
+#: src/transport/plugin_transport_wlan.c:884
 #, fuzzy
 msgid "# wlan session timeouts"
 msgstr "# các khoá phiên chạy được chấp nhận"
 
-#: src/transport/plugin_transport_wlan.c:902
+#: src/transport/plugin_transport_wlan.c:909
 #, fuzzy
 msgid "# wlan session created"
 msgstr "# các khoá phiên chạy được chấp nhận"
 
-#: src/transport/plugin_transport_wlan.c:985
-#: src/transport/plugin_transport_wlan.c:1143
-#: src/transport/plugin_transport_wlan.c:1163
-#: src/transport/plugin_transport_wlan.c:1193
-#: src/transport/plugin_transport_wlan.c:2376
-#: src/transport/plugin_transport_wlan.c:3210
+#: src/transport/plugin_transport_wlan.c:993
+#: src/transport/plugin_transport_wlan.c:1157
+#: src/transport/plugin_transport_wlan.c:1178
+#: src/transport/plugin_transport_wlan.c:1209
+#: src/transport/plugin_transport_wlan.c:2447
+#: src/transport/plugin_transport_wlan.c:3304
 msgid "# wlan pending sessions"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:1237
-#: src/transport/plugin_transport_wlan.c:1941
+#: src/transport/plugin_transport_wlan.c:1252
+#: src/transport/plugin_transport_wlan.c:2000
 #, fuzzy
 msgid "# wlan pending fragments"
 msgstr "# các mảnh bị loại bỏ"
 
-#: src/transport/plugin_transport_wlan.c:1459
+#: src/transport/plugin_transport_wlan.c:1475
 #, c-format
 msgid "Finished reading from wlan-helper stdout with code: %d\n"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:1782
+#: src/transport/plugin_transport_wlan.c:1840
 msgid "# wlan hello beacons send"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:1814
-#: src/transport/plugin_transport_wlan.c:2028
-#: src/transport/plugin_transport_wlan.c:2121
+#: src/transport/plugin_transport_wlan.c:1873
+#: src/transport/plugin_transport_wlan.c:2089
+#: src/transport/plugin_transport_wlan.c:2184
 #, c-format
 msgid "Error writing to wlan healper. errno == %d, ERROR: %s\n"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:2015
+#: src/transport/plugin_transport_wlan.c:2075
 msgid "# wlan acks send"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:2084
+#: src/transport/plugin_transport_wlan.c:2146
 #, fuzzy
 msgid "# wlan fragments send"
 msgstr "# các mảnh bị loại bỏ"
 
-#: src/transport/plugin_transport_wlan.c:2243
+#: src/transport/plugin_transport_wlan.c:2312
 #, c-format
 msgid "Wlan Address len %d is wrong\n"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:2248
+#: src/transport/plugin_transport_wlan.c:2317
 #, fuzzy
 msgid "# wlan messages queued"
 msgstr "# các thông báo phát hiện dht được nhận"
 
-#: src/transport/plugin_transport_wlan.c:2338
-#: src/transport/plugin_transport_wlan.c:2977
-#: src/transport/plugin_transport_wlan.c:3212
+#: src/transport/plugin_transport_wlan.c:2408
+#: src/transport/plugin_transport_wlan.c:3060
+#: src/transport/plugin_transport_wlan.c:3307
 msgid "# wlan mac endpoints"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:2561
+#: src/transport/plugin_transport_wlan.c:2636
 #, fuzzy
 msgid "# wlan whole messages received"
 msgstr "# các thông báo phát hiện dht được nhận"
 
-#: src/transport/plugin_transport_wlan.c:2759
+#: src/transport/plugin_transport_wlan.c:2836
 #, fuzzy
 msgid "# wlan hello messages received"
 msgstr "# các thông báo phát hiện dht được nhận"
 
-#: src/transport/plugin_transport_wlan.c:2793
+#: src/transport/plugin_transport_wlan.c:2873
 #, fuzzy
 msgid "# wlan fragments received"
 msgstr "# các mảnh bị loại bỏ"
 
-#: src/transport/plugin_transport_wlan.c:2845
+#: src/transport/plugin_transport_wlan.c:2925
 #, fuzzy
 msgid "# wlan acks received"
 msgstr "# các yêu cầu khách lỗ hổng được nhận"
 
-#: src/transport/plugin_transport_wlan.c:2938
+#: src/transport/plugin_transport_wlan.c:3020
 msgid "# wlan mac endpoints timeouts"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:2961
+#: src/transport/plugin_transport_wlan.c:3044
 #, fuzzy
 msgid "# wlan mac endpoints created"
 msgstr "# các yêu cầu get (lấy) dht được nhận"
 
-#: src/transport/plugin_transport_wlan.c:3017
+#: src/transport/plugin_transport_wlan.c:3102
 msgid "# wlan WLAN_HELPER_DATA received"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:3068
+#: src/transport/plugin_transport_wlan.c:3158
 #, fuzzy
 msgid "# wlan messages for this client received"
 msgstr "# các thông báo phát hiện dht được nhận"
 
-#: src/transport/plugin_transport_wlan.c:3076
+#: src/transport/plugin_transport_wlan.c:3169
 #, fuzzy
 msgid "# wlan messages inside WLAN_HELPER_DATA received"
 msgstr "# các thông báo phát hiện dht được nhận"
 
-#: src/transport/gnunet-transport.c:251
+#: src/transport/gnunet-transport.c:245
 #, c-format
 msgid "No transport plugins configured, peer will never communicate\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:268
+#: src/transport/gnunet-transport.c:258
 #, c-format
 msgid "No port configured for plugin `%s', cannot test it\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:321
+#: src/transport/gnunet-transport.c:308
 #, c-format
 msgid "Received %llu bytes/s (%llu bytes in %llu ms)\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:330
+#: src/transport/gnunet-transport.c:315
 #, c-format
 msgid "Transmitted %llu bytes/s (%llu bytes in %llu ms)\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:369
+#: src/transport/gnunet-transport.c:348
 #, 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:395
+#: src/transport/gnunet-transport.c:368
 #, fuzzy, c-format
 msgid "Connected to %s\n"
 msgstr "« %s » được kết nối tới « %s ».\n"
 
-#: src/transport/gnunet-transport.c:436
+#: src/transport/gnunet-transport.c:399
 #, fuzzy, c-format
 msgid "Disconnected from %s\n"
 msgstr "« %.*s » được kết nối tới « %.*s ».\n"
 
-#: src/transport/gnunet-transport.c:476
+#: src/transport/gnunet-transport.c:428
 #, 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:498
+#: src/transport/gnunet-transport.c:448
 #, fuzzy, c-format
 msgid "Peer `%s' plugin: `%s' address `%s'\n"
 msgstr "Đồng đẳng « %s » có mức tin cậy %8u và địa chỉ « %s »\n"
 
-#: src/transport/gnunet-transport.c:536
+#: src/transport/gnunet-transport.c:486
 #, 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/transport/gnunet-transport.c:574
+#: src/transport/gnunet-transport.c:522
 msgid "measure how fast we are receiving data (until CTRL-C)"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:577
+#: src/transport/gnunet-transport.c:525
 #, fuzzy
 msgid "try to connect to the given peer"
 msgstr "Lỗi kết nối đến gnunetd.\n"
 
-#: src/transport/gnunet-transport.c:580
+#: src/transport/gnunet-transport.c:528
 #, 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:583
+#: src/transport/gnunet-transport.c:532
 msgid "send data for benchmarking to the other peer (until CTRL-C)"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:586
+#: src/transport/gnunet-transport.c:535
 msgid "test transport configuration (involves external server)"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:593
+#: src/transport/gnunet-transport.c:543
 #, fuzzy
 msgid "Direct access to transport service."
 msgstr "Lỗi kết nối đến gnunetd.\n"
 
-#: src/transport/gnunet-service-transport_validation.c:515
+#: src/transport/gnunet-service-transport_validation.c:412
 msgid "# address records discarded"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:628
+#: src/transport/gnunet-service-transport_validation.c:458
 #, c-format
 msgid ""
-"Not confirming PING with address `%s' since I cannot confirm having this "
-"address.\n"
+"Not transmitting `%s' with `%s', message too big (%u bytes!). This should "
+"not happen.\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:696
-msgid "# PONGs unicast via reliable transport"
-msgstr ""
+#: src/transport/gnunet-service-transport_validation.c:493
+#, fuzzy
+msgid "# PING without HELLO messages sent"
+msgstr "# các thông báo PONG nhập thô được gửi"
 
-#: src/transport/gnunet-service-transport_validation.c:705
-msgid "# PONGs multicast to all available addresses"
+#: src/transport/gnunet-service-transport_validation.c:552
+msgid "# address revalidations started"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:769
+#: src/transport/gnunet-service-transport_validation.c:776
+#, fuzzy
+msgid "# PING message for different peer received"
+msgstr "# các thông báo PING được tạo"
+
+#: src/transport/gnunet-service-transport_validation.c:812
 #, c-format
 msgid ""
-"Not transmitting `%s' with `%s', message too big (%u bytes!). This should "
-"not happen.\n"
+"Not confirming PING with address `%s' since I cannot confirm having this "
+"address.\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:803
-#, fuzzy
-msgid "# PING without HELLO messages sent"
-msgstr "# các thông báo PONG nhập thô được gửi"
+#: src/transport/gnunet-service-transport_validation.c:882
+msgid "# PONGs unicast via reliable transport"
+msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:875
-msgid "# address revalidations started"
+#: src/transport/gnunet-service-transport_validation.c:891
+msgid "# PONGs multicast to all available addresses"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:956
+#: src/transport/gnunet-service-transport_validation.c:1015
 msgid "# PONGs dropped, no matching pending validation"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:972
+#: src/transport/gnunet-service-transport_validation.c:1040
 msgid "# PONGs dropped, signature expired"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1050
+#: src/transport/gnunet-service-transport_validation.c:1099
 #, fuzzy, c-format
 msgid "Adding `%s' without addresses for peer `%s'\n"
 msgstr "Không thể lấy địa chỉ của đồng đẳng « %s ».\n"
 
-#: src/transport/gnunet-service-transport_clients.c:250
+#: src/transport/gnunet-service-transport_clients.c:254
 #, 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:255
+#: src/transport/gnunet-service-transport_clients.c:259
 #, 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:405
+#: src/transport/gnunet-service-transport_clients.c:406
 #, c-format
 msgid "Rejecting control connection from peer `%s', which is not me!\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_clients.c:522
+#: src/transport/gnunet-service-transport_clients.c:523
 #, fuzzy
 msgid "# bytes payload received for other peers"
 msgstr "# các byte kiểu %d được nhận"
 
-#: src/transport/gnunet-service-transport_clients.c:539
+#: src/transport/gnunet-service-transport_clients.c:540
 msgid "# bytes payload dropped (other peer was not connected)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_clients.c:590
+#: src/transport/gnunet-service-transport_clients.c:591
 #, fuzzy
 msgid "# REQUEST CONNECT messages received"
 msgstr "# các thông báo PONG đã mật mã được nhận"
@@ -3856,16 +3884,16 @@
 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"
 
-#: src/transport/gnunet-service-transport.c:159
+#: src/transport/gnunet-service-transport.c:156
 #, fuzzy
 msgid "# bytes payload discarded due to not connected peer "
 msgstr "# Các quảng cáo đồng đẳng bị hủy do trọng tải"
 
-#: src/transport/gnunet-service-transport.c:517
+#: src/transport/gnunet-service-transport.c:514
 msgid "Transport service is lacking key configuration settings.  Exiting.\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport.c:526
+#: src/transport/gnunet-service-transport.c:523
 msgid "Transport service could not access hostkey.  Exiting.\n"
 msgstr ""
 
@@ -3883,107 +3911,107 @@
 msgid "# peers blacklisted"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:379
+#: src/topology/gnunet-daemon-topology.c:380
 #, fuzzy
 msgid "# connect requests issued to transport"
 msgstr "# các yêu cầu máy/trình khách lỗ hổng được phun vào"
 
-#: src/topology/gnunet-daemon-topology.c:674
-#: src/topology/gnunet-daemon-topology.c:760
+#: src/topology/gnunet-daemon-topology.c:675
+#: src/topology/gnunet-daemon-topology.c:761
 #, fuzzy
 msgid "# friends connected"
 msgstr "# của các đồng đẳng đã kết nối"
 
-#: src/topology/gnunet-daemon-topology.c:877
-#: src/hostlist/hostlist-server.c:187
+#: src/topology/gnunet-daemon-topology.c:875
+#: src/hostlist/hostlist-server.c:184
 #, 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/topology/gnunet-daemon-topology.c:952
+#: src/topology/gnunet-daemon-topology.c:950
 msgid "Failed to connect to core service, can not manage topology!\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:984
+#: src/topology/gnunet-daemon-topology.c:982
 #, fuzzy, c-format
 msgid "Option `%s' in section `%s' not specified!\n"
 msgstr "Bị từ chối đặt tùy chọn « %s » trong phần « %s » thành « %s ».\n"
 
-#: src/topology/gnunet-daemon-topology.c:996
+#: src/topology/gnunet-daemon-topology.c:994
 #, c-format
 msgid "Could not read friends list `%s'\n"
 msgstr "Không thể đọc danh sách bạn bè « %s »\n"
 
-#: src/topology/gnunet-daemon-topology.c:1002
+#: src/topology/gnunet-daemon-topology.c:1000
 #, fuzzy, c-format
 msgid "Friends file `%s' is empty.\n"
 msgstr "Định dạng của tập tin « %s » là không hợp lệ.\n"
 
-#: src/topology/gnunet-daemon-topology.c:1011
+#: src/topology/gnunet-daemon-topology.c:1009
 #, fuzzy, c-format
 msgid "Failed to read friends list from `%s': out of memory\n"
 msgstr "Lỗi đọc danh sách bạn bè từ « %s »\n"
 
-#: src/topology/gnunet-daemon-topology.c:1019
+#: src/topology/gnunet-daemon-topology.c:1017
 #, c-format
 msgid "Failed to read friends list from `%s'\n"
 msgstr "Lỗi đọc danh sách bạn bè từ « %s »\n"
 
-#: src/topology/gnunet-daemon-topology.c:1039
+#: src/topology/gnunet-daemon-topology.c:1037
 #, fuzzy, c-format
 msgid ""
 "Syntax error in topology specification at offset %llu, skipping bytes.\n"
 msgstr "Lỗi cú pháp trong sự xác định địa hình học, đang bỏ qua các byte.\n"
 
-#: src/topology/gnunet-daemon-topology.c:1052
+#: src/topology/gnunet-daemon-topology.c:1050
 #, fuzzy, c-format
 msgid ""
 "Syntax error in topology specification at offset %llu, skipping bytes `%s'.\n"
 msgstr ""
 "Lỗi cú pháp trong sự xác định địa hình học, đang bỏ qua các byte « %s ».\n"
 
-#: src/topology/gnunet-daemon-topology.c:1062
+#: src/topology/gnunet-daemon-topology.c:1060
 #, fuzzy, c-format
 msgid "Found friend `%s' in configuration\n"
 msgstr ""
 "\n"
 "Kết thúc cấu hình.\n"
 
-#: src/topology/gnunet-daemon-topology.c:1068
+#: src/topology/gnunet-daemon-topology.c:1066
 #, c-format
 msgid "Found myself `%s' in friend list (useless, ignored)\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:1078
+#: src/topology/gnunet-daemon-topology.c:1076
 #, fuzzy
 msgid "# friends in configuration"
 msgstr ""
 "\n"
 "Kết thúc cấu hình.\n"
 
-#: src/topology/gnunet-daemon-topology.c:1084
+#: src/topology/gnunet-daemon-topology.c:1082
 msgid ""
 "Fewer friends specified than required by minimum friend count. Will only "
 "connect to friends.\n"
 msgstr ""
 "Xác định quá ít bạn bè (dưới số tối thiểu). Sẽ chỉ kết nối tới bạn bè.\n"
 
-#: src/topology/gnunet-daemon-topology.c:1091
+#: src/topology/gnunet-daemon-topology.c:1089
 msgid ""
 "More friendly connections required than target total number of connections.\n"
 msgstr "Cần thiết nhiều kết nối bạn bè hơn tổng số kết nối đích.\n"
 
-#: src/topology/gnunet-daemon-topology.c:1128
+#: src/topology/gnunet-daemon-topology.c:1126
 #, fuzzy
 msgid "# HELLO messages received"
 msgstr "# các thông báo PONG đã mật mã được nhận"
 
-#: src/topology/gnunet-daemon-topology.c:1185
+#: src/topology/gnunet-daemon-topology.c:1183
 #, fuzzy
 msgid "# HELLO messages gossipped"
 msgstr "# các thông báo gửi đi bị loại bỏ"
 
-#: src/topology/gnunet-daemon-topology.c:1325
+#: src/topology/gnunet-daemon-topology.c:1323
 msgid "GNUnet topology control (maintaining P2P mesh and F2F constraints)"
 msgstr ""
 
@@ -4273,33 +4301,33 @@
 msgid "GNUnet NAT traversal test helper daemon"
 msgstr ""
 
-#: src/nat/nat.c:776
+#: src/nat/nat.c:803
 #, c-format
 msgid "gnunet-helper-nat-server generated malformed address `%s'\n"
 msgstr ""
 
-#: src/nat/nat.c:825
+#: src/nat/nat.c:852
 #, fuzzy, c-format
 msgid "Failed to start %s\n"
 msgstr "Lỗi bắt đầu thu thập.\n"
 
-#: src/nat/nat.c:1094
+#: src/nat/nat.c:1121
 #, fuzzy, c-format
 msgid "Malformed %s `%s' given in configuration!\n"
 msgstr "Lỗi lưu cấu hình."
 
-#: src/nat/nat.c:1156 src/nat/nat.c:1166
+#: src/nat/nat.c:1187 src/nat/nat.c:1197
 #, c-format
 msgid ""
 "Configuration requires `%s', but binary is not installed properly (SUID bit "
 "not set).  Option disabled.\n"
 msgstr ""
 
-#: src/nat/nat.c:1298
+#: src/nat/nat.c:1329
 msgid "Internal IP address not known, cannot use ICMP NAT traversal method\n"
 msgstr ""
 
-#: src/nat/nat.c:1310
+#: src/nat/nat.c:1341
 #, c-format
 msgid "Running gnunet-helper-nat-client %s %s %u\n"
 msgstr ""
@@ -4314,44 +4342,39 @@
 msgid "Failed to create listen socket bound to `%s' for NAT test: %s\n"
 msgstr ""
 
-#: src/block/plugin_block_dht.c:122
+#: src/dht/plugin_block_dht.c:124
 #, fuzzy, c-format
 msgid "Block not of type %u\n"
 msgstr "Không biết truyền tải nào kiểu %d.\n"
 
-#: src/block/plugin_block_dht.c:129
+#: src/dht/plugin_block_dht.c:131
 msgid "Size mismatch for block\n"
 msgstr ""
 
-#: src/block/plugin_block_dht.c:138
+#: src/dht/plugin_block_dht.c:140
 #, c-format
 msgid "Block of type %u is malformed\n"
 msgstr ""
 
-#: src/block/plugin_block_fs.c:131
+#: src/fs/plugin_block_fs.c:131
 msgid "Reply mismatched in terms of namespace.  Discarded.\n"
 msgstr ""
 
-#: src/block/block.c:109
+#: src/block/block.c:105
 #, fuzzy, c-format
-msgid "Loading block plugins `%s'\n"
+msgid "Loading block plugin `%s'\n"
 msgstr "Đang nạp các truyền tải « %s »\n"
 
-#: src/block/block.c:119
-#, fuzzy, c-format
-msgid "Failed to load block plugin `%s'\n"
-msgstr "Không thể nạp phần bổ sung truyền tải « %s »\n"
-
-#: src/mesh/gnunet-service-mesh.c:4206
+#: src/mesh/gnunet-service-mesh.c:4192
 msgid "MESH: Wrong CORE service\n"
 msgstr ""
 
-#: src/mesh/gnunet-service-mesh.c:4410
+#: src/mesh/gnunet-service-mesh.c:4397
 #, fuzzy
 msgid "Mesh service is lacking key configuration settings.  Exiting.\n"
 msgstr "Lưu cấu hình ngay bây giờ không?"
 
-#: src/mesh/gnunet-service-mesh.c:4419
+#: src/mesh/gnunet-service-mesh.c:4406
 #, fuzzy
 msgid "Mesh service could not access hostkey.  Exiting.\n"
 msgstr "Không thể truy cập đến thông tin về không gian tên.\n"
@@ -4579,114 +4602,114 @@
 msgid "bytes in hostlist"
 msgstr "# các byte trong kho dữ liệu"
 
-#: src/hostlist/hostlist-server.c:160
+#: src/hostlist/hostlist-server.c:157
 msgid "expired addresses encountered"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:208
+#: src/hostlist/hostlist-server.c:205
 msgid "HELLOs without addresses encountered (ignored)"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:224
+#: src/hostlist/hostlist-server.c:221
 msgid "bytes not included in hostlist (size limit)"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:272
+#: src/hostlist/hostlist-server.c:269
 #, fuzzy, c-format
 msgid "Refusing `%s' request to hostlist server\n"
 msgstr "trình phục vụ danh sách máy HTTP hợp nhất"
 
-#: src/hostlist/hostlist-server.c:275
+#: src/hostlist/hostlist-server.c:272
 #, fuzzy
 msgid "hostlist requests refused (not HTTP GET)"
 msgstr "# các yêu cầu danh sách máy được nhận"
 
-#: src/hostlist/hostlist-server.c:283
+#: src/hostlist/hostlist-server.c:280
 msgid "Sending 100 CONTINUE reply\n"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:290
+#: src/hostlist/hostlist-server.c:287
 #, c-format
 msgid "Refusing `%s' request with %llu bytes of upload data\n"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:294
+#: src/hostlist/hostlist-server.c:291
 #, fuzzy
 msgid "hostlist requests refused (upload data)"
 msgstr "# các yêu cầu danh sách máy được nhận"
 
-#: src/hostlist/hostlist-server.c:302
+#: src/hostlist/hostlist-server.c:299
 msgid "Could not handle hostlist request since I do not have a response yet\n"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:305
+#: src/hostlist/hostlist-server.c:302
 #, fuzzy
 msgid "hostlist requests refused (not ready)"
 msgstr "# các yêu cầu danh sách máy được nhận"
 
-#: src/hostlist/hostlist-server.c:309
+#: src/hostlist/hostlist-server.c:306
 #, fuzzy
 msgid "Received request for our hostlist\n"
 msgstr "Nhận yêu cầu định tuyến\n"
 
-#: src/hostlist/hostlist-server.c:310
+#: src/hostlist/hostlist-server.c:307
 #, fuzzy
 msgid "hostlist requests processed"
 msgstr "# các yêu cầu danh sách máy được nhận"
 
-#: src/hostlist/hostlist-server.c:353
+#: src/hostlist/hostlist-server.c:350
 #, fuzzy
 msgid "# hostlist advertisements send"
 msgstr "# Các quảng cáo ngoại được chuyển tiếp"
 
-#: src/hostlist/hostlist-server.c:400
+#: src/hostlist/hostlist-server.c:397
 msgid "Advertisement message could not be queued by core\n"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:568
+#: src/hostlist/hostlist-server.c:565
 #, c-format
 msgid "Invalid port number %llu.  Exiting.\n"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:577
+#: src/hostlist/hostlist-server.c:574
 #, c-format
 msgid "Hostlist service starts on %s:%llu\n"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:591
+#: src/hostlist/hostlist-server.c:588
 #, fuzzy, c-format
 msgid "Address to obtain hostlist: `%s'\n"
 msgstr "Đang thử tải danh sách các máy xuống « %s »\n"
 
-#: src/hostlist/hostlist-server.c:629
+#: src/hostlist/hostlist-server.c:626
 #, 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"
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:222
+#: src/peerinfo-tool/gnunet-peerinfo.c:221
 #, fuzzy, c-format
 msgid "Could not find option `%s:%s' in configuration.\n"
 msgstr "Không tìm thấy phương pháp « %s%s » trong thư viện « %s ».\n"
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:229
+#: src/peerinfo-tool/gnunet-peerinfo.c:228
 #, c-format
 msgid "Loading hostkey from `%s' failed.\n"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:241
+#: src/peerinfo-tool/gnunet-peerinfo.c:240
 #, c-format
 msgid "I am peer `%s'.\n"
 msgstr "Tôi là đồng đẳng « %s ».\n"
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:261
+#: src/peerinfo-tool/gnunet-peerinfo.c:260
 msgid "output only the identity strings"
 msgstr "chỉ xuất những chuỗi nhận diện"
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:264
+#: src/peerinfo-tool/gnunet-peerinfo.c:263
 msgid "output our own identity only"
 msgstr "chỉ xuất nhận diện mình"
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:270
+#: src/peerinfo-tool/gnunet-peerinfo.c:269
 #, fuzzy
 msgid "Print information about peers."
 msgstr "In ra thông tin về các đồng đẳng GNUnet."
@@ -4716,23 +4739,43 @@
 msgid "use configuration file FILENAME"
 msgstr "dùng tập tin cấu hình TÊN_TẬP_TIN"
 
-#: src/include/gnunet_common.h:352 src/include/gnunet_common.h:357
-#: src/include/gnunet_common.h:363
+#: src/include/gnunet_common.h:361 src/include/gnunet_common.h:366
+#: src/include/gnunet_common.h:372
 #, fuzzy, c-format
 msgid "Assertion failed at %s:%d.\n"
 msgstr "Lỗi nội bộ : khẳng định không thành công tại %s:%d.\n"
 
-#: src/include/gnunet_common.h:373
+#: src/include/gnunet_common.h:382
 #, fuzzy, c-format
 msgid "External protocol violation detected at %s:%d.\n"
 msgstr "Lỗi nội bộ : khẳng định không thành công tại %s:%d.\n"
 
-#: src/include/gnunet_common.h:394 src/include/gnunet_common.h:401
+#: src/include/gnunet_common.h:403 src/include/gnunet_common.h:410
 #, c-format
 msgid "`%s' failed on file `%s' at %s:%d with error: %s\n"
 msgstr "« %s » thất bại ở tập tin « %s » tại %s:%d với lỗi: %s\n"
 
+#~ msgid "KiB"
+#~ msgstr "KiB"
+
+#~ msgid "MiB"
+#~ msgstr "MiB"
+
+#~ msgid "GiB"
+#~ msgstr "GiB"
+
+#~ msgid "TiB"
+#~ msgstr "TiB"
+
 #, fuzzy
+#~ msgid "Failed to create IPv4 broadcast socket on port %d\n"
+#~ msgstr "Lỗi cập nhật dữ liệu cho mô-đun « %s »\n"
+
+#, fuzzy
+#~ msgid "Failed to load block plugin `%s'\n"
+#~ msgstr "Không thể nạp phần bổ sung truyền tải « %s »\n"
+
+#, fuzzy
 #~ msgid "Invalid value `%s' for option `%s' in section `%s': expected float\n"
 #~ msgstr ""
 #~ "Giá trị cấu hình « %s » cho « %s » trong phần « %s » nên là con số\n"
@@ -5923,9 +5966,6 @@
 #~ msgid "# encrypted PING messages received"
 #~ msgstr "# các thông báo PING đã mật mã được nhận"
 
-#~ msgid "# encrypted PONG messages sent"
-#~ msgstr "# các thông báo PONG đã mật mã được gửi"
-
 #~ msgid "# encrypted PING messages sent"
 #~ msgstr "# các thông báo PING đã mật mã được gửi"
 
@@ -6848,9 +6888,6 @@
 #~ "gửi tín hiệu ping cho các đồng đẳng từ HOSTLISTURL (danh sách máy theo "
 #~ "URL) tương ứng với truyền tải"
 
-#~ msgid "send COUNT messages"
-#~ msgstr "gửi ĐẾM thông báo"
-
 #~ msgid "send messages with SIZE bytes payload"
 #~ msgstr "gửi thông báo có KÍCH_CỠ byte tải trọng"
 

Modified: gnunet/po/zh_CN.po
===================================================================
--- gnunet/po/zh_CN.po  2011-11-23 10:05:05 UTC (rev 18268)
+++ gnunet/po/zh_CN.po  2011-11-23 10:05:21 UTC (rev 18269)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: gnunet-0.8.1\n"
 "Report-Msgid-Bugs-To: address@hidden"
-"POT-Creation-Date: 2011-11-03 13:55+0100\n"
+"POT-Creation-Date: 2011-11-23 11:01+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"
@@ -29,8 +29,8 @@
 #: src/datacache/plugin_datacache_mysql.c:517
 #: src/datacache/plugin_datacache_mysql.c:526
 #: src/datacache/plugin_datacache_mysql.c:598
-#: src/datacache/plugin_datacache_mysql.c:614 src/include/gnunet_common.h:380
-#: src/include/gnunet_common.h:387
+#: src/datacache/plugin_datacache_mysql.c:614 src/include/gnunet_common.h:389
+#: src/include/gnunet_common.h:396
 #, fuzzy, c-format
 msgid "`%s' failed at %s:%d with error: %s\n"
 msgstr "“%s”于 %s:%d 处失败,错误为:%s\n"
@@ -50,28 +50,28 @@
 msgid "Unable to initialize SQLite: %s.\n"
 msgstr "无法初始化 SQLite:%s。\n"
 
-#: src/datastore/plugin_datastore_sqlite.c:420
-#: src/datacache/plugin_datacache_sqlite.c:471
+#: src/datastore/plugin_datastore_sqlite.c:414
+#: src/datacache/plugin_datacache_sqlite.c:457
 msgid "Tried to close sqlite without finalizing all prepared statements.\n"
 msgstr ""
 
-#: src/datastore/plugin_datastore_sqlite.c:677
+#: src/datastore/plugin_datastore_sqlite.c:671
 #, fuzzy
 msgid "Invalid data in database.  Trying to fix (by deletion).\n"
 msgstr "%s 中有无效数据。请尝试修复(删除之)。\n"
 
-#: src/datastore/plugin_datastore_sqlite.c:1130
+#: src/datastore/plugin_datastore_sqlite.c:1124
 msgid "sqlite version to old to determine size, assuming zero\n"
 msgstr ""
 
-#: src/datastore/plugin_datastore_sqlite.c:1149
+#: src/datastore/plugin_datastore_sqlite.c:1143
 #, c-format
 msgid ""
 "Using sqlite page utilization to estimate payload (%llu pages of size %llu "
 "bytes)\n"
 msgstr ""
 
-#: src/datastore/plugin_datastore_sqlite.c:1188
+#: src/datastore/plugin_datastore_sqlite.c:1182
 #, fuzzy
 msgid "Sqlite database running\n"
 msgstr "sqlite 数据仓库"
@@ -272,8 +272,8 @@
 msgid "Could not find matching reservation"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:824 src/datacache/datacache.c:119
-#: src/datacache/datacache.c:250
+#: src/datastore/gnunet-service-datastore.c:824 src/datacache/datacache.c:118
+#: src/datacache/datacache.c:248
 msgid "# bytes stored"
 msgstr ""
 
@@ -320,8 +320,8 @@
 msgstr ""
 
 #: src/datastore/gnunet-service-datastore.c:1295
-#: src/datastore/gnunet-service-datastore.c:1486 src/datacache/datacache.c:145
-#: src/datacache/datacache.c:152
+#: src/datastore/gnunet-service-datastore.c:1486 src/datacache/datacache.c:144
+#: src/datacache/datacache.c:151
 #, c-format
 msgid "No `%s' specified for `%s' in configuration!\n"
 msgstr ""
@@ -354,20 +354,16 @@
 msgid "Failed to initialize bloomfilter.\n"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/core/gnunet-service-core_sessions.c:204
+#: src/core/gnunet-service-core_sessions.c:210
 #: src/core/gnunet-service-core_sessions.c:275
 msgid "# entries in session map"
 msgstr ""
 
-#: src/core/gnunet-service-core_sessions.c:236
+#: src/core/gnunet-service-core_sessions.c:240
 msgid "# type map refreshes sent"
 msgstr ""
 
-#: src/core/gnunet-service-core_sessions.c:360
-msgid "# send requests dropped (disconnected)"
-msgstr ""
-
-#: src/core/gnunet-service-core_sessions.c:427
+#: src/core/gnunet-service-core_sessions.c:416
 msgid "# messages discarded (expired prior to transmission)"
 msgstr ""
 
@@ -378,13 +374,13 @@
 msgstr ""
 
 #: src/core/gnunet-core-list-connections.c:167
-#: src/peerinfo-tool/gnunet-peerinfo.c:200
+#: src/peerinfo-tool/gnunet-peerinfo.c:199
 #, fuzzy, c-format
 msgid "Invalid command line argument `%s'\n"
 msgstr "“%s”的参数无效。\n"
 
 #: src/core/gnunet-core-list-connections.c:188
-#: src/peerinfo-tool/gnunet-peerinfo.c:258
+#: src/peerinfo-tool/gnunet-peerinfo.c:257
 msgid "don't resolve host names"
 msgstr ""
 
@@ -392,43 +388,47 @@
 msgid "Print information about connected peers."
 msgstr ""
 
-#: src/core/gnunet-service-core_clients.c:452
+#: src/core/gnunet-service-core_clients.c:357
+msgid "# send requests dropped (disconnected)"
+msgstr ""
+
+#: src/core/gnunet-service-core_clients.c:462
 msgid "# messages discarded (session disconnected)"
 msgstr ""
 
-#: src/core/gnunet-service-core_clients.c:796
+#: src/core/gnunet-service-core_clients.c:791
 #, c-format
 msgid "# bytes of messages of type %u received"
 msgstr ""
 
-#: src/core/gnunet-service-core.c:101
+#: src/core/gnunet-service-core.c:99
 #, c-format
 msgid "Core service of `%4s' ready.\n"
 msgstr ""
 
-#: src/core/gnunet-service-core_typemap.c:111
-#: src/core/gnunet-service-core_typemap.c:124
+#: src/core/gnunet-service-core_typemap.c:110
+#: src/core/gnunet-service-core_typemap.c:121
 msgid "# type maps received"
 msgstr ""
 
-#: src/core/gnunet-service-core_typemap.c:156
+#: src/core/gnunet-service-core_typemap.c:151
 msgid "# updates to my type map"
 msgstr ""
 
-#: src/core/gnunet-service-core_neighbours.c:162
+#: src/core/gnunet-service-core_neighbours.c:163
 msgid "# sessions terminated by transport disconnect"
 msgstr ""
 
-#: src/core/gnunet-service-core_neighbours.c:179
+#: src/core/gnunet-service-core_neighbours.c:180
 #: src/core/gnunet-service-core_neighbours.c:343
 msgid "# neighbour entries allocated"
 msgstr ""
 
-#: src/core/gnunet-service-core_neighbours.c:251
+#: src/core/gnunet-service-core_neighbours.c:252
 msgid "# encrypted bytes given to transport"
 msgstr ""
 
-#: src/core/gnunet-service-core_neighbours.c:432
+#: src/core/gnunet-service-core_neighbours.c:430
 #, c-format
 msgid "Unsupported message of type %u received.\n"
 msgstr ""
@@ -441,8 +441,8 @@
 msgid "# bytes decrypted"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:602 src/dv/gnunet-service-dv.c:3000
-#: src/hostlist/hostlist-server.c:439 src/peerinfo-tool/gnunet-peerinfo.c:157
+#: src/core/gnunet-service-core_kx.c:602 src/dv/gnunet-service-dv.c:3002
+#: src/hostlist/hostlist-server.c:436 src/peerinfo-tool/gnunet-peerinfo.c:156
 #, c-format
 msgid "Error in communication with PEERINFO service\n"
 msgstr ""
@@ -451,106 +451,106 @@
 msgid "# Delayed connecting due to lack of public key"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:669
+#: src/core/gnunet-service-core_kx.c:668
 msgid "# key exchanges initiated"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:693
+#: src/core/gnunet-service-core_kx.c:689
 msgid "# key exchanges stopped"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:746
+#: src/core/gnunet-service-core_kx.c:741
 msgid "# session keys received"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:764
+#: src/core/gnunet-service-core_kx.c:760
 #, c-format
 msgid "`%s' is for `%s', not for me.  Ignoring.\n"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:803
+#: src/core/gnunet-service-core_kx.c:798
 msgid "# SET_KEY messages decrypted"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:884
-#: src/transport/gnunet-service-transport_validation.c:601
+#: src/core/gnunet-service-core_kx.c:878
+#: src/transport/gnunet-service-transport_validation.c:781
 msgid "# PING messages received"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:918
+#: src/core/gnunet-service-core_kx.c:912
 #, 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:941
+#: src/core/gnunet-service-core_kx.c:933
 msgid "# PONG messages created"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1029
+#: src/core/gnunet-service-core_kx.c:1021
 msgid "# sessions terminated by timeout"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1042
+#: src/core/gnunet-service-core_kx.c:1032
 msgid "# keepalive messages sent"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1098
-#: src/transport/gnunet-service-transport_validation.c:934
+#: src/core/gnunet-service-core_kx.c:1090
+#: src/transport/gnunet-service-transport_validation.c:991
 msgid "# PONG messages received"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1128
+#: src/core/gnunet-service-core_kx.c:1120
 msgid "# PONG messages decrypted"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1161
+#: src/core/gnunet-service-core_kx.c:1152
 msgid "# session keys confirmed via PONG"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1224
+#: src/core/gnunet-service-core_kx.c:1216
 msgid "# SET_KEY and PING messages created"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1372
+#: src/core/gnunet-service-core_kx.c:1357
 msgid "# failed to decrypt message (no session key)"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1416
-#: src/core/gnunet-service-core_kx.c:1441
+#: src/core/gnunet-service-core_kx.c:1399
+#: src/core/gnunet-service-core_kx.c:1424
 msgid "# bytes dropped (duplicates)"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1428
+#: src/core/gnunet-service-core_kx.c:1411
 msgid "# bytes dropped (out of sequence)"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1465
+#: src/core/gnunet-service-core_kx.c:1448
 #, c-format
 msgid "Message received far too old (%llu ms). Content ignored.\n"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1469
+#: src/core/gnunet-service-core_kx.c:1452
 msgid "# bytes dropped (ancient message)"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1477
+#: src/core/gnunet-service-core_kx.c:1460
 msgid "# bytes of payload decrypted"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1541
+#: src/core/gnunet-service-core_kx.c:1521
 #, fuzzy
 msgid "Core service is lacking HOSTKEY configuration setting.  Exiting.\n"
 msgstr "立即保存配置?"
 
-#: src/core/gnunet-service-core_kx.c:1549
+#: src/core/gnunet-service-core_kx.c:1529
 msgid "Core service could not access hostkey.  Exiting.\n"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1559
-#: src/transport/gnunet-service-transport.c:540
-#: src/hostlist/hostlist-server.c:558 src/peerinfo-tool/gnunet-peerinfo.c:208
+#: src/core/gnunet-service-core_kx.c:1539
+#: src/transport/gnunet-service-transport.c:537
+#: src/hostlist/hostlist-server.c:555 src/peerinfo-tool/gnunet-peerinfo.c:207
 #, c-format
 msgid "Could not access PEERINFO service.  Exiting.\n"
 msgstr ""
@@ -559,11 +559,11 @@
 msgid "Client was disconnected from core service, trying to reconnect.\n"
 msgstr ""
 
-#: src/vpn/gnunet-daemon-exit.c:1499
+#: src/vpn/gnunet-daemon-exit.c:1513
 msgid "Daemon to run to provide an IP exit node for the VPN"
 msgstr ""
 
-#: src/vpn/gnunet-daemon-vpn.c:1287
+#: src/vpn/gnunet-daemon-vpn.c:1294
 msgid "help text"
 msgstr ""
 
@@ -573,50 +573,50 @@
 "Arguments mandatory for long options are also mandatory for short options.\n"
 msgstr "长选项的必选参数对短选项也是必选的。\n"
 
-#: src/util/getopt_helpers.c:258 src/util/getopt_helpers.c:287
+#: src/util/getopt_helpers.c:255 src/util/getopt_helpers.c:283
 #, c-format
 msgid "You must pass a number to the `%s' option.\n"
 msgstr "您必须向“%s”选项传递一个数字。\n"
 
-#: src/util/common_logging.c:242 src/util/common_logging.c:838
+#: src/util/common_logging.c:239 src/util/common_logging.c:861
 msgid "DEBUG"
 msgstr "调试"
 
-#: src/util/common_logging.c:244 src/util/common_logging.c:836
+#: src/util/common_logging.c:241 src/util/common_logging.c:859
 msgid "INFO"
 msgstr "信息"
 
-#: src/util/common_logging.c:246 src/util/common_logging.c:834
+#: src/util/common_logging.c:243 src/util/common_logging.c:857
 msgid "WARNING"
 msgstr "警告"
 
-#: src/util/common_logging.c:248 src/util/common_logging.c:832
+#: src/util/common_logging.c:245 src/util/common_logging.c:855
 msgid "ERROR"
 msgstr "错误"
 
-#: src/util/common_logging.c:250 src/util/common_logging.c:840
+#: src/util/common_logging.c:247 src/util/common_logging.c:863
 msgid "NONE"
 msgstr ""
 
-#: src/util/common_logging.c:554
+#: src/util/common_logging.c:579
 #, fuzzy, c-format
 msgid "Failed to create or access directory for log file `%s'\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/util/common_logging.c:672
+#: src/util/common_logging.c:696
 #, fuzzy, c-format
 msgid "Message `%.*s' repeated %u times in the last %s\n"
 msgstr "消息“%.*s”重复了 %u 次,在最近 %llu 秒内\n"
 
-#: src/util/common_logging.c:841
+#: src/util/common_logging.c:864
 msgid "INVALID"
 msgstr ""
 
-#: src/util/common_logging.c:923
+#: src/util/common_logging.c:946
 msgid "unknown address"
 msgstr ""
 
-#: src/util/common_logging.c:961
+#: src/util/common_logging.c:984
 msgid "invalid address"
 msgstr ""
 
@@ -635,24 +635,29 @@
 msgid "`%s' failed for library `%s' with error: %s\n"
 msgstr ""
 
-#: src/util/configuration.c:249
+#: src/util/plugin.c:349
+#, fuzzy
+msgid "Could not determine plugin installation path.\n"
+msgstr "无法确定用户界面定义文件。"
+
+#: src/util/configuration.c:245
 #, fuzzy, c-format
 msgid "Syntax error in configuration file `%s' at line %u.\n"
 msgstr "配置文件“%s”第 %d 行有语法错误。\n"
 
-#: src/util/configuration.c:812
+#: src/util/configuration.c:817
 #, c-format
 msgid ""
 "Configuration value '%s' for '%s' in section '%s' is not in set of legal "
 "choices\n"
 msgstr ""
 
-#: src/util/getopt.c:670
+#: src/util/getopt.c:672
 #, c-format
 msgid "%s: option `%s' is ambiguous\n"
 msgstr "%s:选项“%s”有歧义\n"
 
-#: src/util/getopt.c:695
+#: src/util/getopt.c:696
 #, c-format
 msgid "%s: option `--%s' does not allow an argument\n"
 msgstr "%s:选项“--%s”不允许有参数\n"
@@ -662,109 +667,109 @@
 msgid "%s: option `%c%s' does not allow an argument\n"
 msgstr "%s:选项“%c%s”不允许有参数\n"
 
-#: src/util/getopt.c:720 src/util/getopt.c:889
+#: src/util/getopt.c:718 src/util/getopt.c:886
 #, c-format
 msgid "%s: option `%s' requires an argument\n"
 msgstr "%s:选项“%s”要求有一个参数\n"
 
-#: src/util/getopt.c:749
+#: src/util/getopt.c:747
 #, c-format
 msgid "%s: unrecognized option `--%s'\n"
 msgstr "%s:无法识别的选项“--%s”\n"
 
-#: src/util/getopt.c:753
+#: src/util/getopt.c:751
 #, c-format
 msgid "%s: unrecognized option `%c%s'\n"
 msgstr "%s:无法识别的选项“%c%s”\n"
 
-#: src/util/getopt.c:778
+#: src/util/getopt.c:776
 #, c-format
 msgid "%s: illegal option -- %c\n"
 msgstr "%s:非法选项 -- %c\n"
 
-#: src/util/getopt.c:780
+#: src/util/getopt.c:778
 #, c-format
 msgid "%s: invalid option -- %c\n"
 msgstr "%s:无效选项 -- %c\n"
 
-#: src/util/getopt.c:808 src/util/getopt.c:938
+#: src/util/getopt.c:806 src/util/getopt.c:934
 #, c-format
 msgid "%s: option requires an argument -- %c\n"
 msgstr "%s:选项要求有一个参数 -- %c\n"
 
-#: src/util/getopt.c:856
+#: src/util/getopt.c:854
 #, c-format
 msgid "%s: option `-W %s' is ambiguous\n"
 msgstr "%s:选项“-W %s”有歧义\n"
 
-#: src/util/getopt.c:874
+#: src/util/getopt.c:872
 #, c-format
 msgid "%s: option `-W %s' does not allow an argument\n"
 msgstr "%s:选项“-W %s” 不允许有参数\n"
 
-#: src/util/getopt.c:1042
+#: src/util/getopt.c:1038
 #, c-format
 msgid "Use --help to get a list of options.\n"
 msgstr "请使用 --help 获取选项列表。\n"
 
-#: src/util/scheduler.c:863
+#: src/util/scheduler.c:860
 msgid "Looks like we're busy waiting...\n"
 msgstr ""
 
-#: src/util/scheduler.c:994
+#: src/util/scheduler.c:990
 #, c-format
 msgid "Attempt to cancel dead task %llu!\n"
 msgstr ""
 
-#: src/util/connection.c:462
+#: src/util/connection.c:461
 #, fuzzy, c-format
 msgid "Access denied to `%s'\n"
 msgstr "“%s”已连接到“%s”。\n"
 
-#: src/util/connection.c:477
+#: src/util/connection.c:476
 #, c-format
 msgid "Accepting connection from `%s': %p\n"
 msgstr ""
 
-#: src/util/connection.c:646
+#: src/util/connection.c:642
 #, c-format
 msgid ""
 "Failed to establish TCP connection to `%s:%u', no further addresses to try.\n"
 msgstr ""
 
-#: src/util/connection.c:858 src/util/connection.c:1034
+#: src/util/connection.c:852 src/util/connection.c:1025
 #, fuzzy, c-format
 msgid "Trying to connect to `%s' (%p)\n"
 msgstr "无法连接到 %s:%u:%s\n"
 
-#: src/util/connection.c:869
+#: src/util/connection.c:862
 #, fuzzy, c-format
 msgid "Failed to connect to `%s' (%p)\n"
 msgstr "无法连接到 %s:%u:%s\n"
 
-#: src/util/connection.c:1024
+#: src/util/connection.c:1015
 #, c-format
 msgid "Attempt to connect to `%s' failed\n"
 msgstr ""
 
-#: src/util/connection.c:1540
+#: src/util/connection.c:1528
 #, c-format
 msgid ""
 "Could not satisfy pending transmission request, socket closed or connect "
 "failed (%p).\n"
 msgstr ""
 
-#: src/util/connection.c:1576
+#: src/util/connection.c:1564
 #, fuzzy, c-format
 msgid "Failed to send to `%s': %s\n"
 msgstr "打开日志文件“%s”失败:%s\n"
 
-#: src/util/signal.c:81
+#: src/util/signal.c:80
 #, c-format
 msgid "signal (%d, %p) returned %d.\n"
 msgstr ""
 
-#: src/util/network.c:1204
+#: src/util/network.c:1197
 #, c-format
 msgid ""
 "Fatal internal logic error, process hangs in `%s' (abort with CTRL-C)!\n"
@@ -777,96 +782,80 @@
 "variable.\n"
 msgstr "无法确定安装路径。请尝试设置“%s”\n"
 
-#: src/util/os_installation.c:481
+#: src/util/os_installation.c:477
 #, fuzzy, c-format
 msgid "Could not find binary `%s' in PATH!\n"
 msgstr "找不到主机“%s”的 IP:%s\n"
 
-#: src/util/os_installation.c:486
+#: src/util/os_installation.c:483
 #, fuzzy, c-format
 msgid "stat (%s) failed: %s\n"
 msgstr "“%s”说:%s\n"
 
-#: src/util/strings.c:144
+#: src/util/strings.c:143
 msgid "b"
 msgstr "b"
 
-#: src/util/strings.c:150
-msgid "KiB"
-msgstr "KiB"
-
-#: src/util/strings.c:154
-msgid "MiB"
-msgstr "MiB"
-
-#: src/util/strings.c:158
-msgid "GiB"
-msgstr "GiB"
-
-#: src/util/strings.c:162
-msgid "TiB"
-msgstr "TiB"
-
-#: src/util/strings.c:198
+#: src/util/strings.c:355
 #, c-format
 msgid "Character set requested was `%s'\n"
 msgstr ""
 
-#: src/util/strings.c:276
+#: src/util/strings.c:433
 msgid "Failed to expand `$HOME': environment variable `HOME' not set"
 msgstr "扩展“$HOME”失败:没有设置环境变量“HOME”"
 
-#: src/util/strings.c:368
+#: src/util/strings.c:525
 msgid "ms"
 msgstr "毫秒"
 
-#: src/util/strings.c:373
+#: src/util/strings.c:530
 msgid "eternity"
 msgstr ""
 
-#: src/util/strings.c:377
+#: src/util/strings.c:534
 msgid "s"
 msgstr "秒"
 
-#: src/util/strings.c:381
+#: src/util/strings.c:538
 msgid "m"
 msgstr "分"
 
-#: src/util/strings.c:385
+#: src/util/strings.c:542
 msgid "h"
 msgstr "时"
 
-#: src/util/strings.c:389
+#: src/util/strings.c:546
 msgid " days"
 msgstr " 天"
 
-#: src/util/strings.c:413
+#: src/util/strings.c:570
 msgid "end of time"
 msgstr ""
 
-#: src/util/server.c:392
+#: src/util/server.c:388
 #, fuzzy, c-format
 msgid "`%s' failed for port %d (%s).\n"
 msgstr "对驱动器“%2$s”的“%1$s”操作失败:%3$u\n"
 
-#: src/util/server.c:400
+#: src/util/server.c:397
 #, c-format
 msgid "`%s' failed for port %d (%s): address already in use\n"
 msgstr ""
 
-#: src/util/server.c:405
+#: src/util/server.c:402
 #, fuzzy, c-format
 msgid "`%s' failed for `%s': address already in use\n"
 msgstr "对驱动器“%2$s”的“%1$s”操作失败:%3$u\n"
 
-#: src/util/server.c:623
+#: src/util/server.c:617
 #, c-format
 msgid ""
 "Processing code for message of type %u did not call "
 "GNUNET_SERVER_receive_done after %llums\n"
 msgstr ""
 
-#: src/util/crypto_random.c:240
+#: src/util/crypto_random.c:239
 #, c-format
 msgid "Starting `%s' process to generate entropy\n"
 msgstr ""
@@ -876,157 +865,157 @@
 msgid "libgcrypt has not the expected version (version %s is required).\n"
 msgstr "libgcrypt 的版本不符合预期(要求版本 %s)。\n"
 
-#: src/util/disk.c:435
+#: src/util/disk.c:434
 #, fuzzy, c-format
 msgid "`%s' failed for drive `%s': %u\n"
 msgstr "对驱动器“%2$s”的“%1$s”操作失败:%3$u\n"
 
-#: src/util/disk.c:838
+#: src/util/disk.c:834
 #, c-format
 msgid "Expected `%s' to be a directory!\n"
 msgstr "“%s”应为目录!\n"
 
-#: src/util/disk.c:1189 src/util/service.c:1473
+#: src/util/disk.c:1186 src/util/service.c:1452
 #, c-format
 msgid "Cannot obtain information about user `%s': %s\n"
 msgstr "无法获取有关用户“%s”的信息:%s\n"
 
-#: src/util/disk.c:1497
+#: src/util/disk.c:1491
 #, c-format
 msgid "No `%s' specified for service `%s' in configuration.\n"
 msgstr ""
 
-#: src/util/service.c:118 src/util/service.c:144 src/util/service.c:188
-#: src/util/service.c:209 src/util/service.c:216
+#: src/util/service.c:117 src/util/service.c:143 src/util/service.c:186
+#: src/util/service.c:207 src/util/service.c:214
 #, c-format
 msgid "Invalid format for IP: `%s'\n"
 msgstr "IP 格式无效:“%s”\n"
 
-#: src/util/service.c:171
+#: src/util/service.c:170
 #, c-format
 msgid "Invalid network notation ('/%d' is not legal in IPv4 CIDR)."
 msgstr "网络表示法无效(“/%d” 在 IPv4 CIDR 中是非法的)。"
 
-#: src/util/service.c:265
+#: src/util/service.c:263
 #, c-format
 msgid "Invalid network notation (does not end with ';': `%s')\n"
 msgstr "无效的网络表示法(没有以“;”结尾:“%s”)\n"
 
-#: src/util/service.c:301
+#: src/util/service.c:296
 #, c-format
 msgid "Wrong format `%s' for netmask\n"
 msgstr "网络掩码的格式“%s”错误\n"
 
-#: src/util/service.c:332
+#: src/util/service.c:326
 #, c-format
 msgid "Wrong format `%s' for network\n"
 msgstr "网络的格式“%s”错误\n"
 
-#: src/util/service.c:638
+#: src/util/service.c:629
 #, c-format
 msgid "Access denied to UID %d / GID %d\n"
 msgstr ""
 
-#: src/util/service.c:643
+#: src/util/service.c:634
 #, c-format
 msgid "Unknown address family %d\n"
 msgstr ""
 
-#: src/util/service.c:650
+#: src/util/service.c:641
 #, c-format
 msgid "Access from `%s' denied to service `%s'\n"
 msgstr ""
 
-#: src/util/service.c:694
+#: src/util/service.c:685
 #, c-format
 msgid "Could not parse IPv4 network specification `%s' for `%s:%s'\n"
 msgstr ""
 
-#: src/util/service.c:723
+#: src/util/service.c:713
 #, c-format
 msgid "Could not parse IPv6 network specification `%s' for `%s:%s'\n"
 msgstr ""
 
-#: src/util/service.c:841
+#: src/util/service.c:830
 #, c-format
 msgid ""
 "Disabling IPv6 support for service `%s', failed to create IPv6 socket: %s\n"
 msgstr ""
 
-#: src/util/service.c:862 src/transport/plugin_transport_tcp.c:1939
+#: src/util/service.c:850 src/transport/plugin_transport_tcp.c:1935
 #, c-format
 msgid "Require valid port number for service `%s' in configuration!\n"
 msgstr ""
 
-#: src/util/service.c:893 src/util/client.c:712
+#: src/util/service.c:880 src/util/client.c:707
 #, c-format
 msgid "UNIXPATH `%s' too long, maximum length is %llu\n"
 msgstr ""
 
-#: src/util/service.c:913
+#: src/util/service.c:900
 #, c-format
 msgid ""
 "Disabling UNIX domain socket support for service `%s', failed to create UNIX "
 "domain socket: %s\n"
 msgstr ""
 
-#: src/util/service.c:930
+#: src/util/service.c:917
 #, c-format
 msgid "Have neither PORT nor UNIXPATH for service `%s', but one is required\n"
 msgstr ""
 
-#: src/util/service.c:960 src/transport/plugin_transport_http.c:903
+#: src/util/service.c:947 src/transport/plugin_transport_http.c:993
 #, fuzzy, c-format
 msgid "Failed to resolve `%s': %s\n"
 msgstr "打开日志文件“%s”失败:%s\n"
 
-#: src/util/service.c:978 src/transport/plugin_transport_http.c:920
+#: src/util/service.c:964 src/transport/plugin_transport_http.c:1010
 #, fuzzy, c-format
 msgid "Failed to find %saddress for `%s'.\n"
 msgstr "找不到接口“%s”的一个 IP 地址。\n"
 
-#: src/util/service.c:1135 src/util/service.c:1153
+#: src/util/service.c:1120 src/util/service.c:1138
 #, c-format
 msgid "Specified value for `%s' of service `%s' is invalid\n"
 msgstr ""
 
-#: src/util/service.c:1181
+#: src/util/service.c:1165
 #, c-format
 msgid "Could not access pre-bound socket %u, will try to bind myself\n"
 msgstr ""
 
-#: src/util/service.c:1333
+#: src/util/service.c:1314
 #, fuzzy, c-format
 msgid "Failed to start `%s' at `%s'\n"
 msgstr "运行 %s失败:%s %d\n"
 
-#: src/util/service.c:1366
+#: src/util/service.c:1347
 #, c-format
 msgid "Service `%s' runs at %s\n"
 msgstr ""
 
-#: src/util/service.c:1414
+#: src/util/service.c:1393
 msgid "Service process failed to initialize\n"
 msgstr ""
 
-#: src/util/service.c:1418
+#: src/util/service.c:1397
 msgid "Service process could not initialize server function\n"
 msgstr ""
 
-#: src/util/service.c:1422
+#: src/util/service.c:1401
 msgid "Service process failed to report status\n"
 msgstr ""
 
-#: src/util/service.c:1474
+#: src/util/service.c:1453
 msgid "No such user"
 msgstr "无此用户"
 
-#: src/util/service.c:1488
+#: src/util/service.c:1466
 #, c-format
 msgid "Cannot change user/group to `%s': %s\n"
 msgstr "无法更改用户/组为“%s”:%s\n"
 
-#: src/util/service.c:1551
+#: src/util/service.c:1529
 msgid "do daemonize (detach from terminal)"
 msgstr ""
 
@@ -1034,7 +1023,7 @@
 msgid "Test GNUnet DNS resolver code."
 msgstr ""
 
-#: src/util/os_priority.c:117
+#: src/util/os_priority.c:114
 #, c-format
 msgid "Not installing a handler because $%s=%s\n"
 msgstr ""
@@ -1050,218 +1039,218 @@
 "Must specify `%s' or numeric IP address for `%s' of `%s' in configuration!\n"
 msgstr ""
 
-#: src/util/resolver_api.c:356
+#: src/util/resolver_api.c:358
 #, fuzzy, c-format
 msgid "Timeout trying to resolve IP address `%s'.\n"
 msgstr "GNUnet 现在使用 IP 地址 %s。\n"
 
-#: src/util/resolver_api.c:360
+#: src/util/resolver_api.c:362
 #, c-format
 msgid "Timeout trying to resolve hostname `%s'.\n"
 msgstr ""
 
-#: src/util/resolver_api.c:428
+#: src/util/resolver_api.c:430
 #, c-format
 msgid "Resolver returns `%s' for IP `%s'.\n"
 msgstr ""
 
-#: src/util/resolver_api.c:793
+#: src/util/resolver_api.c:791
 #, c-format
 msgid "Resolver returns `%s'.\n"
 msgstr ""
 
-#: src/util/resolver_api.c:877
+#: src/util/resolver_api.c:875
 #, c-format
 msgid "Resolving our FQDN `%s'\n"
 msgstr ""
 
-#: src/util/resolver_api.c:882
+#: src/util/resolver_api.c:880
 #, fuzzy, c-format
 msgid "Could not resolve our FQDN : %s\n"
 msgstr "无法解析“%s”(%s):%s\n"
 
-#: src/util/resolver_api.c:914
+#: src/util/resolver_api.c:912
 #, c-format
 msgid "Resolving our hostname `%s'\n"
 msgstr ""
 
-#: src/util/pseudonym.c:269
+#: src/util/pseudonym.c:266
 #, fuzzy, c-format
 msgid "Failed to parse metadata about pseudonym from file `%s': %s\n"
 msgstr "打开日志文件“%s”失败:%s\n"
 
-#: src/util/pseudonym.c:333
+#: src/util/pseudonym.c:330
 msgid "no-name"
 msgstr "无名称"
 
-#: src/util/gnunet-service-resolver.c:262
+#: src/util/gnunet-service-resolver.c:261
 #, c-format
 msgid "Could not resolve `%s' (%s): %s\n"
 msgstr "无法解析“%s”(%s):%s\n"
 
-#: src/util/gnunet-service-resolver.c:318
-#: src/util/gnunet-service-resolver.c:363
+#: src/util/gnunet-service-resolver.c:317
+#: src/util/gnunet-service-resolver.c:362
 #, c-format
 msgid "Could not find IP of host `%s': %s\n"
 msgstr "找不到主机“%s”的 IP:%s\n"
 
-#: src/util/gnunet-service-resolver.c:462
+#: src/util/gnunet-service-resolver.c:460
 #, c-format
 msgid "Resolver asked to look up `%s'.\n"
 msgstr ""
 
-#: src/util/gnunet-service-resolver.c:509
+#: src/util/gnunet-service-resolver.c:508
 #, c-format
 msgid "Resolver asked to look up IP address `%s'.\n"
 msgstr ""
 
-#: src/util/bio.c:137 src/util/bio.c:143
+#: src/util/bio.c:136 src/util/bio.c:142
 #, fuzzy, c-format
 msgid "Error reading `%s': %s"
 msgstr "创建用户出错"
 
-#: src/util/bio.c:144
+#: src/util/bio.c:143
 msgid "End of file"
 msgstr ""
 
-#: src/util/bio.c:196
+#: src/util/bio.c:195
 #, c-format
 msgid "Error reading length of string `%s'"
 msgstr ""
 
-#: src/util/bio.c:208
+#: src/util/bio.c:205
 #, c-format
 msgid "String `%s' longer than allowed (%u > %u)"
 msgstr ""
 
-#: src/util/bio.c:254
+#: src/util/bio.c:250
 #, c-format
 msgid "Serialized metadata `%s' larger than allowed (%u>%u)"
 msgstr ""
 
-#: src/util/bio.c:268
+#: src/util/bio.c:264
 #, c-format
 msgid "Metadata `%s' failed to deserialize"
 msgstr ""
 
-#: src/util/client.c:303
+#: src/util/client.c:301
 #, c-format
 msgid ""
 "Could not determine valid hostname and port for service `%s' from "
 "configuration.\n"
 msgstr ""
 
-#: src/util/client.c:311
+#: src/util/client.c:309
 #, c-format
 msgid "Need a non-empty hostname for service `%s'.\n"
 msgstr ""
 
-#: src/util/client.c:652
+#: src/util/client.c:647
 msgid "Failure to transmit TEST request.\n"
 msgstr ""
 
-#: src/util/client.c:857
+#: src/util/client.c:849
 #, c-format
 msgid "Could not connect to service `%s', must not be running.\n"
 msgstr ""
 
-#: src/util/client.c:874
+#: src/util/client.c:865
 #, c-format
 msgid "Failure to transmit request to service `%s'\n"
 msgstr ""
 
-#: src/util/client.c:1143
+#: src/util/client.c:1133
 msgid "Could not submit request, not expecting to receive a response.\n"
 msgstr ""
 
-#: src/util/crypto_rsa.c:624 src/util/crypto_rsa.c:672
+#: src/util/crypto_rsa.c:616 src/util/crypto_rsa.c:663
 #, fuzzy, c-format
 msgid "Could not aquire lock on file `%s': %s...\n"
 msgstr "无法解析“%s”(%s):%s\n"
 
-#: src/util/crypto_rsa.c:629
+#: src/util/crypto_rsa.c:621
 #, fuzzy
 msgid "Creating a new private key.  This may take a while.\n"
 msgstr "正在启动数据仓库转换(可能需要一段时间)。\n"
 
-#: src/util/crypto_rsa.c:648
+#: src/util/crypto_rsa.c:639
 #, c-format
 msgid "I am host `%s'.  Stored new private key in `%s'.\n"
 msgstr ""
 
-#: src/util/crypto_rsa.c:676 src/util/crypto_rsa.c:714
+#: src/util/crypto_rsa.c:667 src/util/crypto_rsa.c:703
 msgid "This may be ok if someone is currently generating a hostkey.\n"
 msgstr ""
 
-#: src/util/crypto_rsa.c:709
+#: src/util/crypto_rsa.c:698
 #, c-format
 msgid ""
 "When trying to read hostkey file `%s' I found %u bytes but I need at least "
 "%u.\n"
 msgstr ""
 
-#: src/util/crypto_rsa.c:730
+#: src/util/crypto_rsa.c:718
 #, c-format
 msgid "File `%s' does not contain a valid private key.  Deleting it.\n"
 msgstr ""
 
-#: src/util/crypto_rsa.c:748
+#: src/util/crypto_rsa.c:736
 #, c-format
 msgid "I am host `%s'.  Read private key from `%s'.\n"
 msgstr ""
 
-#: src/util/crypto_rsa.c:970
+#: src/util/crypto_rsa.c:957
 #, c-format
 msgid "RSA signature verification failed at %s:%d: %s\n"
 msgstr ""
 
-#: src/nse/gnunet-nse-profiler.c:650 src/dht/gnunet-dht-get.c:213
+#: src/nse/gnunet-nse-profiler.c:646 src/dht/gnunet-dht-get.c:213
 #: src/dht/gnunet-dht-put.c:184 src/fs/gnunet-unindex.c:169
 #: src/fs/gnunet-search.c:297 src/fs/gnunet-publish.c:591
 #: src/fs/gnunet-download.c:263
 msgid "be verbose (print progress information)"
 msgstr ""
 
-#: src/nse/gnunet-nse-profiler.c:668
+#: src/nse/gnunet-nse-profiler.c:664
 #, fuzzy
 msgid "Measure quality and performance of the NSE service."
 msgstr "无法访问该服务"
 
-#: src/nse/gnunet-service-nse.c:875
+#: src/nse/gnunet-service-nse.c:878
 #, c-format
 msgid "Proof of work invalid: %llu!\n"
 msgstr ""
 
-#: src/nse/gnunet-service-nse.c:1298 src/nse/gnunet-service-nse.c:1317
-#: src/nse/gnunet-service-nse.c:1338
+#: src/nse/gnunet-service-nse.c:1301 src/nse/gnunet-service-nse.c:1320
+#: src/nse/gnunet-service-nse.c:1341
 msgid "NSE service is lacking key configuration settings.  Exiting.\n"
 msgstr ""
 
-#: src/nse/gnunet-service-nse.c:1305
+#: src/nse/gnunet-service-nse.c:1308
 msgid "Invalid work requirement for NSE service. Exiting.\n"
 msgstr ""
 
-#: src/nse/gnunet-service-nse.c:1326
+#: src/nse/gnunet-service-nse.c:1329
 #, fuzzy
 msgid "NSE service could not access hostkey.  Exiting.\n"
 msgstr "找不到接口“%s”的一个 IP 地址。\n"
 
-#: src/peerinfo/gnunet-service-peerinfo.c:136
+#: src/peerinfo/gnunet-service-peerinfo.c:134
 #, c-format
 msgid "Removing expired address of transport `%s'\n"
 msgstr ""
 
-#: src/peerinfo/gnunet-service-peerinfo.c:197
+#: src/peerinfo/gnunet-service-peerinfo.c:196
 msgid "# peers known"
 msgstr ""
 
-#: src/peerinfo/gnunet-service-peerinfo.c:241
+#: src/peerinfo/gnunet-service-peerinfo.c:240
 #, c-format
 msgid ""
 "File `%s' in directory `%s' does not match naming convention. Removed.\n"
 msgstr ""
 
-#: src/peerinfo/gnunet-service-peerinfo.c:306
+#: src/peerinfo/gnunet-service-peerinfo.c:305
 #, c-format
 msgid "Still no peers found in `%s'!\n"
 msgstr ""
@@ -1271,47 +1260,47 @@
 msgid "Could not connect to `%s' service.\n"
 msgstr "无法连接到 %s:%u:%s\n"
 
-#: src/peerinfo/peerinfo_api.c:278
+#: src/peerinfo/peerinfo_api.c:279
 #, fuzzy, c-format
 msgid "Failed to transmit message to `%s' service.\n"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/peerinfo/peerinfo_api.c:433
+#: src/peerinfo/peerinfo_api.c:435
 msgid "Failed to receive response from `PEERINFO' service."
 msgstr ""
 
-#: src/peerinfo/peerinfo_api.c:461 src/peerinfo/peerinfo_api.c:479
+#: src/peerinfo/peerinfo_api.c:463 src/peerinfo/peerinfo_api.c:481
 msgid "Received invalid message from `PEERINFO' service.\n"
 msgstr ""
 
-#: src/peerinfo/peerinfo_api.c:521
+#: src/peerinfo/peerinfo_api.c:523
 #, fuzzy
 msgid "Failed to transmit iteration request to `PEERINFO' service\n"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/peerinfo/peerinfo_api.c:555
+#: src/peerinfo/peerinfo_api.c:557
 msgid "Timeout transmitting iteration request to `PEERINFO' service.\n"
 msgstr ""
 
-#: src/datacache/plugin_datacache_sqlite.c:439
+#: src/datacache/plugin_datacache_sqlite.c:424
 msgid "Sqlite datacache running\n"
 msgstr ""
 
-#: src/datacache/datacache.c:177
+#: src/datacache/datacache.c:176
 #, c-format
 msgid "Loading `%s' datacache plugin\n"
 msgstr ""
 
-#: src/datacache/datacache.c:185
+#: src/datacache/datacache.c:184
 #, c-format
 msgid "Failed to load datacache plugin for `%s'\n"
 msgstr ""
 
-#: src/datacache/datacache.c:276
+#: src/datacache/datacache.c:274
 msgid "# requests received"
 msgstr ""
 
-#: src/datacache/datacache.c:287
+#: src/datacache/datacache.c:284
 msgid "# requests filtered by bloom filter"
 msgstr ""
 
@@ -1340,81 +1329,81 @@
 msgid "# FIND PEER messages initiated"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:632
-#: src/dht/gnunet-service-dht_neighbours.c:697
+#: src/dht/gnunet-service-dht_neighbours.c:627
+#: src/dht/gnunet-service-dht_neighbours.c:687
 #, fuzzy
 msgid "# Peers connected"
 msgstr ""
 "\n"
 "按任意键继续\n"
 
-#: src/dht/gnunet-service-dht_neighbours.c:734
+#: src/dht/gnunet-service-dht_neighbours.c:721
 msgid "# Queued messages discarded (peer disconnected)"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:787
+#: src/dht/gnunet-service-dht_neighbours.c:776
 msgid "# Bytes transmitted to other peers"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:824
+#: src/dht/gnunet-service-dht_neighbours.c:814
 msgid "# Bytes of bandwdith requested from core"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1051
-#: src/dht/gnunet-service-dht_neighbours.c:1078
+#: src/dht/gnunet-service-dht_neighbours.c:1038
+#: src/dht/gnunet-service-dht_neighbours.c:1066
 msgid "# Peers excluded from routing due to Bloomfilter"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1060
-#: src/dht/gnunet-service-dht_neighbours.c:1096
+#: src/dht/gnunet-service-dht_neighbours.c:1047
+#: src/dht/gnunet-service-dht_neighbours.c:1083
 msgid "# Peer selection failed"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1238
+#: src/dht/gnunet-service-dht_neighbours.c:1219
 msgid "# PUT requests routed"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1267
+#: src/dht/gnunet-service-dht_neighbours.c:1250
 msgid "# PUT messages queued for transmission"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1352
+#: src/dht/gnunet-service-dht_neighbours.c:1331
 msgid "# GET requests routed"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1384
+#: src/dht/gnunet-service-dht_neighbours.c:1362
 msgid "# GET messages queued for transmission"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1485
+#: src/dht/gnunet-service-dht_neighbours.c:1465
 msgid "# RESULT messages queued for transmission"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1574
+#: src/dht/gnunet-service-dht_neighbours.c:1553
 msgid "# P2P PUT requests received"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1700
+#: src/dht/gnunet-service-dht_neighbours.c:1662
 msgid "# FIND PEER requests ignored due to Bloomfilter"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1707
+#: src/dht/gnunet-service-dht_neighbours.c:1670
 msgid "# FIND PEER requests ignored due to lack of HELLO"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1800
+#: src/dht/gnunet-service-dht_neighbours.c:1761
 msgid "# P2P GET requests received"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1853
+#: src/dht/gnunet-service-dht_neighbours.c:1805
 msgid "# P2P FIND PEER requests processed"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1872
+#: src/dht/gnunet-service-dht_neighbours.c:1819
 msgid "# P2P GET requests ONLY routed"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1941
+#: src/dht/gnunet-service-dht_neighbours.c:1885
 msgid "# P2P RESULTS received"
 msgstr ""
 
@@ -1423,7 +1412,7 @@
 msgid "Failed to connect to the DHT service!\n"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/dht/gnunet-service-dht.c:165
+#: src/dht/gnunet-service-dht.c:163
 #, fuzzy
 msgid "Failed to connect to transport service!\n"
 msgstr "初始化“%s”服务失败。\n"
@@ -1448,45 +1437,45 @@
 msgid "Issue a GET request to the GNUnet DHT, prints results."
 msgstr ""
 
-#: src/dht/gnunet-service-dht_clients.c:321
+#: src/dht/gnunet-service-dht_clients.c:311
 msgid "# GET requests from clients injected"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_clients.c:413
+#: src/dht/gnunet-service-dht_clients.c:402
 msgid "# PUT requests received from clients"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_clients.c:486
+#: src/dht/gnunet-service-dht_clients.c:469
 msgid "# GET requests received from clients"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_clients.c:585
+#: src/dht/gnunet-service-dht_clients.c:564
 msgid "# GET STOP requests received from clients"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_clients.c:790
+#: src/dht/gnunet-service-dht_clients.c:757
 msgid "# Key match, type mismatches in REPLY to CLIENT"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_clients.c:808
+#: src/dht/gnunet-service-dht_clients.c:772
 msgid "# Duplicate REPLIES to CLIENT request dropped"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_clients.c:852
+#: src/dht/gnunet-service-dht_clients.c:809
 #, c-format
 msgid "Unsupported block type (%u) in request!\n"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_clients.c:875
+#: src/dht/gnunet-service-dht_clients.c:831
 msgid "# RESULTS queued for clients"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_clients.c:928
-#: src/dht/gnunet-service-dht_clients.c:971
+#: src/dht/gnunet-service-dht_clients.c:882
+#: src/dht/gnunet-service-dht_clients.c:925
 msgid "# REPLIES ignored for CLIENTS (no match)"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_clients.c:937
+#: src/dht/gnunet-service-dht_clients.c:892
 msgid "Could not pass reply to client, message too big!\n"
 msgstr ""
 
@@ -1539,32 +1528,32 @@
 msgid "Issue a PUT request to the GNUnet DHT insert DATA under KEY."
 msgstr ""
 
-#: src/dht/gnunet-service-dht_routing.c:220
+#: src/dht/gnunet-service-dht_routing.c:211
 msgid "# Good REPLIES matched against routing table"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_routing.c:235
+#: src/dht/gnunet-service-dht_routing.c:220
 msgid "# Duplicate REPLIES matched against routing table"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_routing.c:240
+#: src/dht/gnunet-service-dht_routing.c:226
 msgid "# Invalid REPLIES matched against routing table"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_routing.c:249
+#: src/dht/gnunet-service-dht_routing.c:236
 msgid "# Unsupported REPLIES matched against routing table"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_routing.c:332
-#: src/dht/gnunet-service-dht_routing.c:390
+#: src/dht/gnunet-service-dht_routing.c:314
+#: src/dht/gnunet-service-dht_routing.c:368
 msgid "# Entries removed from routing table"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_routing.c:342
+#: src/dht/gnunet-service-dht_routing.c:324
 msgid "# Entries added to routing table"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_datacache.c:92
+#: src/dht/gnunet-service-dht_datacache.c:93
 #, c-format
 msgid "%s request received, but have no datacache!\n"
 msgstr ""
@@ -1573,32 +1562,32 @@
 msgid "# ITEMS stored in datacache"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_datacache.c:215
+#: src/dht/gnunet-service-dht_datacache.c:209
 msgid "# Good RESULTS found in datacache"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_datacache.c:229
+#: src/dht/gnunet-service-dht_datacache.c:220
 msgid "# Duplicate RESULTS found in datacache"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_datacache.c:234
+#: src/dht/gnunet-service-dht_datacache.c:226
 msgid "# Invalid RESULTS found in datacache"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_datacache.c:245
+#: src/dht/gnunet-service-dht_datacache.c:238
 msgid "# Unsupported RESULTS found in datacache"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_datacache.c:248
+#: src/dht/gnunet-service-dht_datacache.c:241
 #, c-format
 msgid "Unsupported block type (%u) in local response!\n"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_datacache.c:280
+#: src/dht/gnunet-service-dht_datacache.c:271
 msgid "# GET requests given to datacache"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_hello.c:86
+#: src/dht/gnunet-service-dht_hello.c:82
 msgid "# HELLOs obtained from peerinfo"
 msgstr ""
 
@@ -1897,31 +1886,31 @@
 msgid "# messages defragmented"
 msgstr ""
 
-#: src/fragmentation/fragmentation.c:183
+#: src/fragmentation/fragmentation.c:188
 msgid "# fragments transmitted"
 msgstr ""
 
-#: src/fragmentation/fragmentation.c:186
+#: src/fragmentation/fragmentation.c:191
 msgid "# fragments retransmitted"
 msgstr ""
 
-#: src/fragmentation/fragmentation.c:248
+#: src/fragmentation/fragmentation.c:254
 msgid "# messages fragmented"
 msgstr ""
 
-#: src/fragmentation/fragmentation.c:251
+#: src/fragmentation/fragmentation.c:257
 msgid "# total size of fragmented messages"
 msgstr ""
 
-#: src/fragmentation/fragmentation.c:335
+#: src/fragmentation/fragmentation.c:342
 msgid "# fragment acknowledgements received"
 msgstr ""
 
-#: src/fragmentation/fragmentation.c:341
+#: src/fragmentation/fragmentation.c:348
 msgid "# bits removed from fragmentation ACKs"
 msgstr ""
 
-#: src/fragmentation/fragmentation.c:365
+#: src/fragmentation/fragmentation.c:372
 msgid "# fragmentation transmissions completed"
 msgstr ""
 
@@ -1935,7 +1924,7 @@
 msgid "Wrote %llu bytes of statistics to `%s'\n"
 msgstr ""
 
-#: src/statistics/statistics_api.c:325
+#: src/statistics/statistics_api.c:327
 #, fuzzy
 msgid "Failed to connect to statistics service!\n"
 msgstr "初始化“%s”服务失败。\n"
@@ -2068,52 +2057,52 @@
 msgid "Manage GNUnet pseudonyms."
 msgstr ""
 
-#: src/fs/fs_namespace.c:52 src/fs/fs_namespace.c:78
+#: src/fs/fs_namespace.c:64 src/fs/fs_namespace.c:90
 #, fuzzy, c-format
 msgid "Configuration fails to specify `%s' in section `%s'\n"
 msgstr "配置文件“%s”已写入。\n"
 
-#: src/fs/fs_namespace.c:107
+#: src/fs/fs_namespace.c:119
 #, fuzzy, c-format
 msgid "Failed to open `%s' for writing: %s\n"
 msgstr "打开日志文件“%s”失败:%s\n"
 
-#: src/fs/fs_namespace.c:129 src/fs/fs_namespace.c:217
+#: src/fs/fs_namespace.c:141 src/fs/fs_namespace.c:229
 #, fuzzy, c-format
 msgid "Failed to write `%s': %s\n"
 msgstr "运行 %s失败:%s %d\n"
 
-#: src/fs/fs_namespace.c:323
+#: src/fs/fs_namespace.c:335
 #, fuzzy
 msgid "Unknown error"
 msgstr "未知错误"
 
-#: src/fs/fs_namespace.c:412 src/fs/fs_namespace.c:433
+#: src/fs/fs_namespace.c:424 src/fs/fs_namespace.c:445
 #, fuzzy
 msgid "Failed to serialize meta data"
 msgstr "发送消息失败。\n"
 
-#: src/fs/fs_namespace.c:452
+#: src/fs/fs_namespace.c:464
 #, fuzzy
 msgid "Failed to connect to datastore service"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/fs/fs_namespace.c:495
+#: src/fs/fs_namespace.c:507
 #, c-format
 msgid "Failed to create or read private key for namespace `%s'\n"
 msgstr ""
 
-#: src/fs/fs_namespace.c:597
+#: src/fs/fs_namespace.c:609
 #, c-format
 msgid "Failed to read namespace private key file `%s', deleting it!\n"
 msgstr ""
 
-#: src/fs/fs_namespace.c:822 src/fs/fs_publish.c:1518
+#: src/fs/fs_namespace.c:834 src/fs/fs_publish.c:1523
 #, fuzzy
 msgid "Internal error."
 msgstr "未知错误。\n"
 
-#: src/fs/fs_namespace.c:866
+#: src/fs/fs_namespace.c:878
 msgid "Failed to connect to datastore."
 msgstr ""
 
@@ -2225,11 +2214,11 @@
 msgid "Could not access hostkey file `%s'.\n"
 msgstr "找不到接口“%s”的一个 IP 地址。\n"
 
-#: src/fs/fs_uri.c:1238 src/fs/fs_uri.c:1265
+#: src/fs/fs_uri.c:1232 src/fs/fs_uri.c:1259
 msgid "No keywords specified!\n"
 msgstr ""
 
-#: src/fs/fs_uri.c:1271
+#: src/fs/fs_uri.c:1265
 msgid "Number of double-quotes not balanced!\n"
 msgstr ""
 
@@ -2289,7 +2278,7 @@
 msgstr ""
 
 #: src/fs/gnunet-publish.c:393 src/fs/gnunet-publish.c:400
-#: src/transport/gnunet-transport.c:525
+#: src/transport/gnunet-transport.c:477
 #, c-format
 msgid "Option `%s' makes no sense without option `%s'.\n"
 msgstr ""
@@ -2380,13 +2369,13 @@
 msgid "Publish a file or directory on GNUnet"
 msgstr ""
 
-#: src/fs/fs_search.c:798
+#: src/fs/fs_search.c:803
 #, c-format
 msgid "Got result with unknown block type `%d', ignoring"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_lc.c:202 src/fs/gnunet-service-fs_lc.c:359
-#: src/fs/gnunet-service-fs_lc.c:480
+#: src/fs/gnunet-service-fs_lc.c:202 src/fs/gnunet-service-fs_lc.c:365
+#: src/fs/gnunet-service-fs_lc.c:490
 msgid "# client searches active"
 msgstr ""
 
@@ -2394,11 +2383,11 @@
 msgid "# replies received for local clients"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_lc.c:312
+#: src/fs/gnunet-service-fs_lc.c:319
 msgid "# client searches received"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_lc.c:351
+#: src/fs/gnunet-service-fs_lc.c:359
 msgid "# client searches updated (merged content seen list)"
 msgstr ""
 
@@ -2441,224 +2430,226 @@
 msgid "Display contents of a GNUnet directory"
 msgstr "更改 GNUnet 目录的权限出错"
 
-#: src/fs/gnunet-service-fs_pr.c:272
+#: src/fs/gnunet-service-fs_pr.c:287
 msgid "# Pending requests created"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:352 src/fs/gnunet-service-fs_pr.c:607
+#: src/fs/gnunet-service-fs_pr.c:368 src/fs/gnunet-service-fs_pr.c:622
 msgid "# Pending requests active"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:771
+#: src/fs/gnunet-service-fs_pr.c:786
 msgid "# replies received and matched"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:798
+#: src/fs/gnunet-service-fs_pr.c:813
 msgid "# duplicate replies discarded (bloomfilter)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:814
+#: src/fs/gnunet-service-fs_pr.c:829
 #, c-format
 msgid "Unsupported block type %u\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:829
+#: src/fs/gnunet-service-fs_pr.c:844
 msgid "# results found locally"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:921
+#: src/fs/gnunet-service-fs_pr.c:936
 msgid "# Datastore `PUT' failures"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:948
+#: src/fs/gnunet-service-fs_pr.c:963
 msgid "# storage requests dropped due to high load"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:983
+#: src/fs/gnunet-service-fs_pr.c:998
 msgid "# Replies received from DHT"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1074
+#: src/fs/gnunet-service-fs_pr.c:1088
 #, c-format
 msgid "Datastore lookup already took %llu ms!\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1095
+#: src/fs/gnunet-service-fs_pr.c:1109
 #, c-format
 msgid "On-demand lookup already took %llu ms!\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1142
+#: src/fs/gnunet-service-fs_pr.c:1156
 msgid "# Datastore lookups concluded (no results)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1156
+#: src/fs/gnunet-service-fs_pr.c:1170
 msgid "# Datastore lookups concluded (seen all)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1165
+#: src/fs/gnunet-service-fs_pr.c:1179
 msgid "# Datastore lookups aborted (more than MAX_RESULTS)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1181
+#: src/fs/gnunet-service-fs_pr.c:1195
 msgid "# requested DBLOCK or IBLOCK not found"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1198
+#: src/fs/gnunet-service-fs_pr.c:1212
 msgid "# on-demand blocks matched requests"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1211
+#: src/fs/gnunet-service-fs_pr.c:1225
 msgid "# on-demand lookups performed successfully"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1216
+#: src/fs/gnunet-service-fs_pr.c:1230
 msgid "# on-demand lookups failed"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1242 src/fs/gnunet-service-fs_pr.c:1281
-#: src/fs/gnunet-service-fs_pr.c:1416
+#: src/fs/gnunet-service-fs_pr.c:1257 src/fs/gnunet-service-fs_pr.c:1297
+#: src/fs/gnunet-service-fs_pr.c:1437
 msgid "# Datastore lookups concluded (error queueing)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1299
+#: src/fs/gnunet-service-fs_pr.c:1315
 msgid "# Datastore lookups concluded (found last result)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1312
+#: src/fs/gnunet-service-fs_pr.c:1328
 msgid "# Datastore lookups concluded (load too high)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1394
+#: src/fs/gnunet-service-fs_pr.c:1414
 msgid "# Datastore lookups initiated"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1474
+#: src/fs/gnunet-service-fs_pr.c:1495
 msgid "# GAP PUT messages received"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1565 src/fs/gnunet-service-fs_pr.c:1576
+#: src/fs/gnunet-service-fs_pr.c:1586 src/fs/gnunet-service-fs_pr.c:1595
 #, fuzzy, c-format
 msgid "Configuration fails to specify `%s', assuming default value."
 msgstr "配置文件“%s”已写入。\n"
 
-#: src/fs/gnunet-service-fs_pe.c:259
+#: src/fs/gnunet-service-fs_pe.c:265
 msgid "# average retransmission delay (ms)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pe.c:354
+#: src/fs/gnunet-service-fs_pe.c:392
 msgid "# transmission failed (core has no bandwidth)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pe.c:385
+#: src/fs/gnunet-service-fs_pe.c:423
 msgid "# query messages sent to other peers"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pe.c:440
+#: src/fs/gnunet-service-fs_pe.c:476
 msgid "# delay heap timeout"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pe.c:450
+#: src/fs/gnunet-service-fs_pe.c:483
 msgid "# query plans executed"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pe.c:516
+#: src/fs/gnunet-service-fs_pe.c:547
 msgid "# requests merged"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pe.c:522
+#: src/fs/gnunet-service-fs_pe.c:553
 msgid "# requests refreshed"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pe.c:576 src/fs/gnunet-service-fs_pe.c:665
-#: src/fs/gnunet-service-fs_pe.c:706
+#: src/fs/gnunet-service-fs_pe.c:606 src/fs/gnunet-service-fs_pe.c:692
+#: src/fs/gnunet-service-fs_pe.c:734
 msgid "# query plan entries"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:618 src/fs/gnunet-service-fs_cp.c:1552
-#: src/transport/gnunet-service-transport_neighbours.c:870
-#: src/transport/gnunet-service-transport_neighbours.c:2036
-#: src/transport/gnunet-service-transport_neighbours.c:2123
-#: src/topology/gnunet-daemon-topology.c:653
-#: src/topology/gnunet-daemon-topology.c:755
+#: src/fs/gnunet-service-fs_cp.c:615 src/fs/gnunet-service-fs_cp.c:1543
+#: src/transport/gnunet-service-transport_neighbours.c:938
+#: src/transport/gnunet-service-transport_neighbours.c:943
+#: src/transport/gnunet-service-transport_neighbours.c:1266
+#: src/transport/gnunet-service-transport_neighbours.c:2352
+#: src/transport/gnunet-service-transport_neighbours.c:2423
+#: src/topology/gnunet-daemon-topology.c:654
+#: src/topology/gnunet-daemon-topology.c:756
 msgid "# peers connected"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:701
+#: src/fs/gnunet-service-fs_cp.c:696
 msgid "# migration stop messages received"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:705
+#: src/fs/gnunet-service-fs_cp.c:700
 #, c-format
 msgid "Migration of content to peer `%s' blocked for %llu ms\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:740
+#: src/fs/gnunet-service-fs_cp.c:735
 msgid "# replies transmitted to other peers"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:746
+#: src/fs/gnunet-service-fs_cp.c:741
 msgid "# replies dropped"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:775 src/fs/gnunet-service-fs_cp.c:891
-#: src/fs/gnunet-service-fs_cp.c:1301 src/fs/gnunet-service-fs_cp.c:1340
+#: src/fs/gnunet-service-fs_cp.c:770 src/fs/gnunet-service-fs_cp.c:886
+#: src/fs/gnunet-service-fs_cp.c:1296 src/fs/gnunet-service-fs_cp.c:1333
 msgid "# P2P searches active"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:848
+#: src/fs/gnunet-service-fs_cp.c:843
 msgid "# artificial delays introduced (ms)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:911
+#: src/fs/gnunet-service-fs_cp.c:906
 msgid "# replies received for other peers"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:925
+#: src/fs/gnunet-service-fs_cp.c:920
 msgid "# replies dropped due to insufficient cover traffic"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:963
+#: src/fs/gnunet-service-fs_cp.c:958
 msgid "# P2P searches destroyed due to ultimate reply"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1030
+#: src/fs/gnunet-service-fs_cp.c:1025
 msgid "# requests done for free (low load)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1054
+#: src/fs/gnunet-service-fs_cp.c:1049
 msgid "# request dropped, priority insufficient"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1064
+#: src/fs/gnunet-service-fs_cp.c:1059
 msgid "# requests done for a price (normal load)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1143
+#: src/fs/gnunet-service-fs_cp.c:1138
 msgid "# GET requests received (from other peers)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1177
+#: src/fs/gnunet-service-fs_cp.c:1172
 msgid "# requests dropped due to initiator not being connected"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1201
+#: src/fs/gnunet-service-fs_cp.c:1196
 msgid "# requests dropped due to missing reverse route"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1267
+#: src/fs/gnunet-service-fs_cp.c:1262
 msgid "# requests dropped due TTL underflow"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1295
+#: src/fs/gnunet-service-fs_cp.c:1290
 msgid "# requests dropped due to higher-TTL request"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1338
+#: src/fs/gnunet-service-fs_cp.c:1331
 msgid "# P2P query messages received and processed"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_push.c:642
+#: src/fs/gnunet-service-fs_push.c:653
 #, c-format
 msgid ""
 "Invalid value specified for option `%s' in section `%s', content pushing "
@@ -2699,16 +2690,20 @@
 msgid "Failed to delete bogus block: %s\n"
 msgstr "打开日志文件“%s”失败:%s\n"
 
-#: src/fs/gnunet-service-fs_indexing.c:552
+#: src/fs/gnunet-service-fs_indexing.c:545
+msgid "# index blocks removed: original file inaccessible"
+msgstr ""
+
+#: src/fs/gnunet-service-fs_indexing.c:560
 #, fuzzy, c-format
 msgid "Could not access indexed file `%s' (%s) at offset %llu: %s\n"
 msgstr "无法解析“%s”(%s):%s\n"
 
-#: src/fs/gnunet-service-fs_indexing.c:554
+#: src/fs/gnunet-service-fs_indexing.c:562
 msgid "not indexed"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_indexing.c:569
+#: src/fs/gnunet-service-fs_indexing.c:577
 #, c-format
 msgid "Indexed file `%s' changed at offset %llu\n"
 msgstr ""
@@ -2836,141 +2831,141 @@
 "`unknown' instead.\n"
 msgstr ""
 
-#: src/fs/fs_publish.c:142 src/fs/fs_publish.c:410
+#: src/fs/fs_publish.c:147 src/fs/fs_publish.c:415
 #, c-format
 msgid "Publishing failed: %s"
 msgstr ""
 
-#: src/fs/fs_publish.c:647 src/fs/fs_publish.c:664 src/fs/fs_publish.c:703
-#: src/fs/fs_publish.c:723 src/fs/fs_publish.c:750 src/fs/fs_publish.c:898
+#: src/fs/fs_publish.c:652 src/fs/fs_publish.c:669 src/fs/fs_publish.c:708
+#: src/fs/fs_publish.c:728 src/fs/fs_publish.c:755 src/fs/fs_publish.c:903
 #, c-format
 msgid "Can not index file `%s': %s.  Will try to insert instead.\n"
 msgstr ""
 
-#: src/fs/fs_publish.c:649
+#: src/fs/fs_publish.c:654
 msgid "timeout on index-start request to `fs' service"
 msgstr ""
 
-#: src/fs/fs_publish.c:661
+#: src/fs/fs_publish.c:666
 #, fuzzy
 msgid "unknown error"
 msgstr "未知错误"
 
-#: src/fs/fs_publish.c:704
+#: src/fs/fs_publish.c:709
 msgid "failed to compute hash"
 msgstr ""
 
-#: src/fs/fs_publish.c:724
+#: src/fs/fs_publish.c:729
 msgid "filename too long"
 msgstr ""
 
-#: src/fs/fs_publish.c:751
+#: src/fs/fs_publish.c:756
 msgid "could not connect to `fs' service"
 msgstr ""
 
-#: src/fs/fs_publish.c:775
+#: src/fs/fs_publish.c:780
 #, fuzzy, c-format
 msgid "Failed to get file identifiers for `%s'\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/fs/fs_publish.c:845
+#: src/fs/fs_publish.c:850
 #, c-format
 msgid "Recursive upload failed at `%s': %s"
 msgstr ""
 
-#: src/fs/fs_publish.c:851
+#: src/fs/fs_publish.c:856
 #, c-format
 msgid "Recursive upload failed: %s"
 msgstr ""
 
-#: src/fs/fs_publish.c:899
+#: src/fs/fs_publish.c:904
 msgid "needs to be an actual file"
 msgstr ""
 
-#: src/fs/fs_publish.c:1078
+#: src/fs/fs_publish.c:1083
 #, c-format
 msgid "Insufficient space for publishing: %s"
 msgstr ""
 
-#: src/fs/fs_publish.c:1149
+#: src/fs/fs_publish.c:1154
 #, c-format
 msgid "Reserving space for %u entries and %llu bytes for publication\n"
 msgstr ""
 
-#: src/fs/fs_publish.c:1482
+#: src/fs/fs_publish.c:1487
 msgid "Could not connect to datastore."
 msgstr ""
 
-#: src/fs/fs.c:284
+#: src/fs/fs_api.c:284
 #, fuzzy, c-format
 msgid "Could not open file `%s': %s"
 msgstr "打开日志文件“%s”失败:%s\n"
 
-#: src/fs/fs.c:293
+#: src/fs/fs_api.c:293
 #, fuzzy, c-format
 msgid "Could not read file `%s': %s"
 msgstr "无法解析“%s”(%s):%s\n"
 
-#: src/fs/fs.c:299
+#: src/fs/fs_api.c:299
 #, c-format
 msgid "Short read reading from file `%s'!"
 msgstr ""
 
-#: src/fs/fs.c:877
+#: src/fs/fs_api.c:877
 #, fuzzy, c-format
 msgid "Failed to resume publishing information `%s': %s\n"
 msgstr "打开日志文件“%s”失败:%s\n"
 
-#: src/fs/fs.c:1323
+#: src/fs/fs_api.c:1323
 #, c-format
 msgid "Failed to recover namespace `%s', cannot resume publishing operation.\n"
 msgstr ""
 
-#: src/fs/fs.c:1364
+#: src/fs/fs_api.c:1364
 #, c-format
 msgid "Failure while resuming publishing operation `%s': %s\n"
 msgstr ""
 
-#: src/fs/fs.c:1380
+#: src/fs/fs_api.c:1380
 #, fuzzy, c-format
 msgid "Failed to resume publishing operation `%s': %s\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/fs/fs.c:1984
+#: src/fs/fs_api.c:1984
 #, c-format
 msgid "Failure while resuming unindexing operation `%s': %s\n"
 msgstr ""
 
-#: src/fs/fs.c:1994
+#: src/fs/fs_api.c:1994
 #, fuzzy, c-format
 msgid "Failed to resume unindexing operation `%s': %s\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/fs/fs.c:2107 src/fs/fs.c:2346
+#: src/fs/fs_api.c:2107 src/fs/fs_api.c:2346
 #, fuzzy, c-format
 msgid "Failed to resume sub-download `%s': %s\n"
 msgstr "打开日志文件“%s”失败:%s\n"
 
-#: src/fs/fs.c:2124
+#: src/fs/fs_api.c:2124
 #, fuzzy, c-format
 msgid "Failed to resume sub-search `%s': %s\n"
 msgstr "打开日志文件“%s”失败:%s\n"
 
-#: src/fs/fs.c:2136 src/fs/fs.c:2155 src/fs/fs.c:2631
+#: src/fs/fs_api.c:2136 src/fs/fs_api.c:2155 src/fs/fs_api.c:2631
 #, c-format
 msgid "Failure while resuming search operation `%s': %s\n"
 msgstr ""
 
-#: src/fs/fs.c:2337
+#: src/fs/fs_api.c:2337
 #, fuzzy, c-format
 msgid "Failed to resume sub-download `%s': could not open file `%s'\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/fs/fs.c:2583
+#: src/fs/fs_api.c:2583
 msgid "Could not resume running search, will resume as paused search\n"
 msgstr ""
 
-#: src/fs/fs.c:2669
+#: src/fs/fs_api.c:2669
 #, c-format
 msgid "Failure while resuming download operation `%s': %s\n"
 msgstr ""
@@ -3026,12 +3021,16 @@
 msgid "Invalid URI"
 msgstr "无效条目。\n"
 
-#: src/fs/gnunet-service-fs.c:268 src/fs/gnunet-service-fs.c:448
+#: src/fs/gnunet-service-fs.c:240
+msgid "# running average P2P latency (ms)"
+msgstr ""
+
+#: src/fs/gnunet-service-fs.c:300 src/fs/gnunet-service-fs.c:490
 msgid "# Loopback routes suppressed"
 msgstr ""
 
-#: src/fs/gnunet-service-fs.c:542 src/topology/gnunet-daemon-topology.c:1292
-#: src/topology/gnunet-daemon-topology.c:1299
+#: src/fs/gnunet-service-fs.c:583 src/topology/gnunet-daemon-topology.c:1290
+#: src/topology/gnunet-daemon-topology.c:1297
 #: src/hostlist/gnunet-daemon-hostlist.c:290
 #, fuzzy, c-format
 msgid "Failed to connect to `%s' service.\n"
@@ -3042,67 +3041,90 @@
 msgid "`%s' failed on file `%s': %s"
 msgstr "对驱动器“%2$s”的“%1$s”操作失败:%3$u\n"
 
-#: src/transport/gnunet-service-transport_neighbours.c:435
+#: src/transport/gnunet-service-transport_neighbours.c:465
 msgid "# failed connection attempts due to timeout"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:819
+#: src/transport/gnunet-service-transport_neighbours.c:857
 msgid "# peers disconnected due to external request"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:925
+#: src/transport/gnunet-service-transport_neighbours.c:947
+#, fuzzy
+msgid "# fast reconnects failed"
+msgstr ""
+"\n"
+"按任意键继续\n"
+
+#: src/transport/gnunet-service-transport_neighbours.c:1002
 msgid "# peers disconnected due to timeout"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:949
+#: src/transport/gnunet-service-transport_neighbours.c:1027
 msgid "# keepalives sent"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:981
+#: src/transport/gnunet-service-transport_neighbours.c:1068
 msgid "# peers disconnected due to global disconnect"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1543
-#: src/transport/gnunet-service-transport_neighbours.c:1564
+#: src/transport/gnunet-service-transport_neighbours.c:1774
+#: src/transport/gnunet-service-transport_neighbours.c:1795
 msgid "# messages not sent (no such peer or not connected)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1580
+#: src/transport/gnunet-service-transport_neighbours.c:1811
 msgid "# bytes in message queue for other peers"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1632
+#: src/transport/gnunet-service-transport_neighbours.c:1863
 msgid "# messages discarded due to lack of neighbour record"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1668
+#: src/transport/gnunet-service-transport_neighbours.c:1899
 msgid "# bandwidth quota violations by other peers"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1686
+#: src/transport/gnunet-service-transport_neighbours.c:1917
 msgid "# ms throttling suggested"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1715
+#: src/transport/gnunet-service-transport_neighbours.c:1946
 msgid "# KEEPALIVE messages discarded (not connected)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1749
+#: src/transport/gnunet-service-transport_neighbours.c:1995
+msgid "# KEEPALIVE_RESPONSE messages discarded (not connected)"
+msgstr ""
+
+#: src/transport/gnunet-service-transport_neighbours.c:2003
+msgid "# KEEPALIVE_RESPONSE messages discarded (not expected)"
+msgstr ""
+
+#: src/transport/gnunet-service-transport_neighbours.c:2064
 msgid "# SET QUOTA messages ignored (no such peer)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1762
+#: src/transport/gnunet-service-transport_neighbours.c:2082
 msgid "# disconnects due to quota of 0"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1884
+#: src/transport/gnunet-service-transport_neighbours.c:2200
 msgid "# disconnect messages ignored (old format)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1896
+#: src/transport/gnunet-service-transport_neighbours.c:2213
 msgid "# disconnect messages ignored (timestamp)"
 msgstr ""
 
+#: src/transport/gnunet-service-transport_neighbours.c:2302
+msgid "# unexpected CONNECT_ACK messages"
+msgstr ""
+
+#: src/transport/gnunet-service-transport_neighbours.c:2400
+msgid "# unexpected ACK messages"
+msgstr ""
+
 #: src/transport/gnunet-service-transport_blacklist.c:247
 #, fuzzy, c-format
 msgid "Could not read blacklist file `%s'\n"
@@ -3141,53 +3163,51 @@
 msgstr ""
 
 #: src/transport/gnunet-service-transport_blacklist.c:522
-#: src/transport/gnunet-service-transport_blacklist.c:760
+#: src/transport/gnunet-service-transport_blacklist.c:756
 msgid "# disconnects due to blacklist"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:184
+#: src/transport/plugin_transport_http_server.c:189
 msgid ""
 "Could not create a new TLS certificate, program `gnunet-transport-"
 "certificate-creation' could not be started!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:208
+#: src/transport/plugin_transport_http_server.c:213
 msgid "No usable TLS certificate found and creating one failed!\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_hello.c:177
+#: src/transport/gnunet-service-transport_hello.c:172
 msgid "# refreshed my HELLO"
 msgstr ""
 
-#: src/transport/plugin_transport_udp.c:1431
-#: src/transport/plugin_transport_udp.c:2130
-msgid "# HELLO beacons received via udp"
+#: src/transport/plugin_transport_udp.c:1518
+msgid "# IPv4 broadcast HELLO beacons received via udp"
 msgstr ""
 
-#: src/transport/plugin_transport_udp.c:1894
-#: src/transport/plugin_transport_udp_new.c:1209
+#: src/transport/plugin_transport_udp.c:1555
+msgid "# IPv6 multicast HELLO beacons received via udp"
+msgstr ""
+
+#: src/transport/plugin_transport_udp.c:2041
+#: src/transport/plugin_transport_udp_new.c:1218
 #, c-format
 msgid "Given `%s' option is out of range: %llu > %u\n"
 msgstr ""
 
-#: src/transport/plugin_transport_udp.c:1947
-#: src/transport/plugin_transport_udp_new.c:1259
+#: src/transport/plugin_transport_udp.c:2092
+#: src/transport/plugin_transport_udp_new.c:1268
 #, fuzzy, c-format
 msgid "Invalid IPv6 address: `%s'\n"
 msgstr "无效的进程优先级“%s”\n"
 
-#: src/transport/plugin_transport_udp.c:2102
+#: src/transport/plugin_transport_udp.c:2235
 #, c-format
-msgid "Failed to create IPv4 broadcast socket on port %d\n"
-msgstr ""
-
-#: src/transport/plugin_transport_udp.c:2112
-#, c-format
 msgid "Failed to set IPv4 broadcast option for broadcast socket on port %d\n"
 msgstr ""
 
-#: src/transport/plugin_transport_udp.c:2144
-#: src/transport/plugin_transport_udp_new.c:1388
+#: src/transport/plugin_transport_udp.c:2274
+#: src/transport/plugin_transport_udp_new.c:1396
 #, fuzzy
 msgid "Failed to open UDP sockets\n"
 msgstr "打开日志文件“%s”失败:%s\n"
@@ -3202,7 +3222,7 @@
 msgid "%s failed at %s:%d: `%s'\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_client.c:617
+#: src/transport/plugin_transport_http_client.c:619
 #, c-format
 msgid "Could not initialize curl multi handle, failed to start %s plugin!\n"
 msgstr ""
@@ -3214,15 +3234,15 @@
 
 #: src/transport/plugin_transport_tcp.c:590
 #: src/transport/plugin_transport_tcp.c:679
-#: src/transport/plugin_transport_tcp.c:732
-#: src/transport/plugin_transport_tcp.c:821
-#: src/transport/plugin_transport_tcp.c:1160
+#: src/transport/plugin_transport_tcp.c:731
+#: src/transport/plugin_transport_tcp.c:820
+#: src/transport/plugin_transport_tcp.c:1156
 msgid "# bytes currently in TCP buffers"
 msgstr ""
 
 #: src/transport/plugin_transport_tcp.c:596
-#: src/transport/plugin_transport_tcp.c:847
-#: src/transport/plugin_transport_tcp.c:1548
+#: src/transport/plugin_transport_tcp.c:846
+#: src/transport/plugin_transport_tcp.c:1544
 msgid "# TCP sessions active"
 msgstr ""
 
@@ -3230,124 +3250,124 @@
 msgid "# bytes discarded by TCP (timeout)"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:735
+#: src/transport/plugin_transport_tcp.c:734
 msgid "# bytes transmitted via TCP"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:825
+#: src/transport/plugin_transport_tcp.c:824
 msgid "# bytes discarded by TCP (disconnect)"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:946
+#: src/transport/plugin_transport_tcp.c:945
 msgid "# bytes TCP was asked to transmit"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:997
+#: src/transport/plugin_transport_tcp.c:996
 msgid "# bytes discarded by TCP (no address and no connection)"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:1040
+#: src/transport/plugin_transport_tcp.c:1039
 #, c-format
 msgid "Address of unexpected length: %u\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:1057
+#: src/transport/plugin_transport_tcp.c:1056
 msgid "Found valid IPv4 NAT address (creating session)!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:1108
+#: src/transport/plugin_transport_tcp.c:1107
 msgid "# bytes discarded by TCP (failed to connect)"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:1228
+#: src/transport/plugin_transport_tcp.c:1224
 msgid "# transport-service disconnect requests for TCP"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:1591
+#: src/transport/plugin_transport_tcp.c:1587
 msgid "# TCP WELCOME messages received"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:1736
+#: src/transport/plugin_transport_tcp.c:1732
 msgid "# bytes received via TCP"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:1800
+#: src/transport/plugin_transport_tcp.c:1796
 msgid "# network-level TCP disconnect events"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:1953
+#: src/transport/plugin_transport_tcp.c:1949
 #, fuzzy
 msgid "Failed to start service.\n"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/transport/plugin_transport_tcp.c:2013
+#: src/transport/plugin_transport_tcp.c:2009
 #, c-format
 msgid "Failed to find option %s in section %s!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2036
+#: src/transport/plugin_transport_tcp.c:2032
 #, c-format
 msgid "TCP transport listening on port %llu\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2040
+#: src/transport/plugin_transport_tcp.c:2036
 msgid "TCP transport not listening on any port (client only)\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2044
+#: src/transport/plugin_transport_tcp.c:2040
 #, c-format
 msgid "TCP transport advertises itself as being on port %llu\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http.c:829
+#: src/transport/plugin_transport_http.c:920
 msgid "Disabling IPv6 since it is not supported on this system!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http.c:878
+#: src/transport/plugin_transport_http.c:968
 #, fuzzy
 msgid "Require valid port number for service in configuration!\n"
 msgstr "保存配置失败。"
 
-#: src/transport/plugin_transport_http.c:1025
+#: src/transport/plugin_transport_http.c:1115
 #, c-format
 msgid "Found %u addresses to report to NAT service\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http.c:1040
+#: src/transport/plugin_transport_http.c:1128
 #, c-format
 msgid "FREEING %s\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http.c:1115
+#: src/transport/plugin_transport_http.c:1203
 msgid "Neither IPv4 nor IPv6 are enabled! Fix in configuration\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http.c:1128
+#: src/transport/plugin_transport_http.c:1216
 #, fuzzy
 msgid "Port is required! Fix in configuration\n"
 msgstr ""
 "\n"
 "结束配置。\n"
 
-#: src/transport/plugin_transport_http.c:1139
+#: src/transport/plugin_transport_http.c:1227
 msgid "Port 0, client only mode\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http.c:1155
+#: src/transport/plugin_transport_http.c:1247
 #, c-format
 msgid ""
 "Specific IPv4 address `%s' for plugin %s in configuration file is invalid! "
 "Binding to all addresses!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http.c:1181
+#: src/transport/plugin_transport_http.c:1277
 #, c-format
 msgid ""
 "Specific IPv6 address `%s' for plugin %s in configuration file is invalid! "
 "Binding to all addresses!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_unix.c:1088
+#: src/transport/plugin_transport_unix.c:1087
 #, fuzzy
 msgid "Failed to open UNIX sockets\n"
 msgstr "打开日志文件“%s”失败:%s\n"
@@ -3394,268 +3414,272 @@
 msgid "# bytes dropped by SMTP (outgoing)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_plugins.c:108
+#: src/transport/gnunet-service-transport_plugins.c:109
 msgid "Transport service is lacking NEIGHBOUR_LIMIT option.\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_plugins.c:115
+#: src/transport/gnunet-service-transport_plugins.c:116
 #, c-format
 msgid "Starting transport plugins `%s'\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_plugins.c:119
+#: src/transport/gnunet-service-transport_plugins.c:120
 #, c-format
 msgid "Loading `%s' transport plugin\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_plugins.c:139
+#: src/transport/gnunet-service-transport_plugins.c:147
 #, fuzzy, c-format
 msgid "Failed to load transport plugin for `%s'\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/transport/plugin_transport_wlan.c:877
+#: src/transport/plugin_transport_wlan.c:884
 msgid "# wlan session timeouts"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:902
+#: src/transport/plugin_transport_wlan.c:909
 msgid "# wlan session created"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:985
-#: src/transport/plugin_transport_wlan.c:1143
-#: src/transport/plugin_transport_wlan.c:1163
-#: src/transport/plugin_transport_wlan.c:1193
-#: src/transport/plugin_transport_wlan.c:2376
-#: src/transport/plugin_transport_wlan.c:3210
+#: src/transport/plugin_transport_wlan.c:993
+#: src/transport/plugin_transport_wlan.c:1157
+#: src/transport/plugin_transport_wlan.c:1178
+#: src/transport/plugin_transport_wlan.c:1209
+#: src/transport/plugin_transport_wlan.c:2447
+#: src/transport/plugin_transport_wlan.c:3304
 msgid "# wlan pending sessions"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:1237
-#: src/transport/plugin_transport_wlan.c:1941
+#: src/transport/plugin_transport_wlan.c:1252
+#: src/transport/plugin_transport_wlan.c:2000
 msgid "# wlan pending fragments"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:1459
+#: src/transport/plugin_transport_wlan.c:1475
 #, c-format
 msgid "Finished reading from wlan-helper stdout with code: %d\n"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:1782
+#: src/transport/plugin_transport_wlan.c:1840
 msgid "# wlan hello beacons send"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:1814
-#: src/transport/plugin_transport_wlan.c:2028
-#: src/transport/plugin_transport_wlan.c:2121
+#: src/transport/plugin_transport_wlan.c:1873
+#: src/transport/plugin_transport_wlan.c:2089
+#: src/transport/plugin_transport_wlan.c:2184
 #, c-format
 msgid "Error writing to wlan healper. errno == %d, ERROR: %s\n"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:2015
+#: src/transport/plugin_transport_wlan.c:2075
 msgid "# wlan acks send"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:2084
+#: src/transport/plugin_transport_wlan.c:2146
 msgid "# wlan fragments send"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:2243
+#: src/transport/plugin_transport_wlan.c:2312
 #, c-format
 msgid "Wlan Address len %d is wrong\n"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:2248
+#: src/transport/plugin_transport_wlan.c:2317
 msgid "# wlan messages queued"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:2338
-#: src/transport/plugin_transport_wlan.c:2977
-#: src/transport/plugin_transport_wlan.c:3212
+#: src/transport/plugin_transport_wlan.c:2408
+#: src/transport/plugin_transport_wlan.c:3060
+#: src/transport/plugin_transport_wlan.c:3307
 msgid "# wlan mac endpoints"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:2561
+#: src/transport/plugin_transport_wlan.c:2636
 msgid "# wlan whole messages received"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:2759
+#: src/transport/plugin_transport_wlan.c:2836
 msgid "# wlan hello messages received"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:2793
+#: src/transport/plugin_transport_wlan.c:2873
 msgid "# wlan fragments received"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:2845
+#: src/transport/plugin_transport_wlan.c:2925
 msgid "# wlan acks received"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:2938
+#: src/transport/plugin_transport_wlan.c:3020
 msgid "# wlan mac endpoints timeouts"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:2961
+#: src/transport/plugin_transport_wlan.c:3044
 msgid "# wlan mac endpoints created"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:3017
+#: src/transport/plugin_transport_wlan.c:3102
 msgid "# wlan WLAN_HELPER_DATA received"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:3068
+#: src/transport/plugin_transport_wlan.c:3158
 msgid "# wlan messages for this client received"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:3076
+#: src/transport/plugin_transport_wlan.c:3169
 msgid "# wlan messages inside WLAN_HELPER_DATA received"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:251
+#: src/transport/gnunet-transport.c:245
 #, c-format
 msgid "No transport plugins configured, peer will never communicate\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:268
+#: src/transport/gnunet-transport.c:258
 #, c-format
 msgid "No port configured for plugin `%s', cannot test it\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:321
+#: src/transport/gnunet-transport.c:308
 #, c-format
 msgid "Received %llu bytes/s (%llu bytes in %llu ms)\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:330
+#: src/transport/gnunet-transport.c:315
 #, c-format
 msgid "Transmitted %llu bytes/s (%llu bytes in %llu ms)\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:369
+#: src/transport/gnunet-transport.c:348
 #, c-format
 msgid "Transmitting %u bytes to %s\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:395
+#: src/transport/gnunet-transport.c:368
 #, fuzzy, c-format
 msgid "Connected to %s\n"
 msgstr "“%s”已连接到“%s”。\n"
 
-#: src/transport/gnunet-transport.c:436
+#: src/transport/gnunet-transport.c:399
 #, fuzzy, c-format
 msgid "Disconnected from %s\n"
 msgstr "“%s”已连接到“%s”。\n"
 
-#: src/transport/gnunet-transport.c:476
+#: src/transport/gnunet-transport.c:428
 #, c-format
 msgid "Received %u bytes from %s\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:498
+#: src/transport/gnunet-transport.c:448
 #, c-format
 msgid "Peer `%s' plugin: `%s' address `%s'\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:536
+#: src/transport/gnunet-transport.c:486
 #, fuzzy, c-format
 msgid "Failed to parse peer identity `%s'\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/transport/gnunet-transport.c:574
+#: src/transport/gnunet-transport.c:522
 msgid "measure how fast we are receiving data (until CTRL-C)"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:577
+#: src/transport/gnunet-transport.c:525
 #, fuzzy
 msgid "try to connect to the given peer"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/transport/gnunet-transport.c:580
+#: src/transport/gnunet-transport.c:528
 msgid "provide information about all current connections (once)"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:583
+#: src/transport/gnunet-transport.c:532
 msgid "send data for benchmarking to the other peer (until CTRL-C)"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:586
+#: src/transport/gnunet-transport.c:535
 msgid "test transport configuration (involves external server)"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:593
+#: src/transport/gnunet-transport.c:543
 #, fuzzy
 msgid "Direct access to transport service."
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/transport/gnunet-service-transport_validation.c:515
+#: src/transport/gnunet-service-transport_validation.c:412
 msgid "# address records discarded"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:628
+#: src/transport/gnunet-service-transport_validation.c:458
 #, c-format
 msgid ""
-"Not confirming PING with address `%s' since I cannot confirm having this "
-"address.\n"
+"Not transmitting `%s' with `%s', message too big (%u bytes!). This should "
+"not happen.\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:696
-msgid "# PONGs unicast via reliable transport"
+#: src/transport/gnunet-service-transport_validation.c:493
+msgid "# PING without HELLO messages sent"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:705
-msgid "# PONGs multicast to all available addresses"
+#: src/transport/gnunet-service-transport_validation.c:552
+msgid "# address revalidations started"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:769
+#: src/transport/gnunet-service-transport_validation.c:776
+msgid "# PING message for different peer received"
+msgstr ""
+
+#: src/transport/gnunet-service-transport_validation.c:812
 #, c-format
 msgid ""
-"Not transmitting `%s' with `%s', message too big (%u bytes!). This should "
-"not happen.\n"
+"Not confirming PING with address `%s' since I cannot confirm having this "
+"address.\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:803
-msgid "# PING without HELLO messages sent"
+#: src/transport/gnunet-service-transport_validation.c:882
+msgid "# PONGs unicast via reliable transport"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:875
-msgid "# address revalidations started"
+#: src/transport/gnunet-service-transport_validation.c:891
+msgid "# PONGs multicast to all available addresses"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:956
+#: src/transport/gnunet-service-transport_validation.c:1015
 msgid "# PONGs dropped, no matching pending validation"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:972
+#: src/transport/gnunet-service-transport_validation.c:1040
 msgid "# PONGs dropped, signature expired"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1050
+#: src/transport/gnunet-service-transport_validation.c:1099
 #, c-format
 msgid "Adding `%s' without addresses for peer `%s'\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_clients.c:250
+#: src/transport/gnunet-service-transport_clients.c:254
 #, 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:255
+#: src/transport/gnunet-service-transport_clients.c:259
 msgid "# messages dropped due to slow client"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_clients.c:405
+#: src/transport/gnunet-service-transport_clients.c:406
 #, c-format
 msgid "Rejecting control connection from peer `%s', which is not me!\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_clients.c:522
+#: src/transport/gnunet-service-transport_clients.c:523
 msgid "# bytes payload received for other peers"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_clients.c:539
+#: src/transport/gnunet-service-transport_clients.c:540
 msgid "# bytes payload dropped (other peer was not connected)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_clients.c:590
+#: src/transport/gnunet-service-transport_clients.c:591
 msgid "# REQUEST CONNECT messages received"
 msgstr ""
 
@@ -3664,15 +3688,15 @@
 msgid "Received unexpected message of type %u in %s:%u\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport.c:159
+#: src/transport/gnunet-service-transport.c:156
 msgid "# bytes payload discarded due to not connected peer "
 msgstr ""
 
-#: src/transport/gnunet-service-transport.c:517
+#: src/transport/gnunet-service-transport.c:514
 msgid "Transport service is lacking key configuration settings.  Exiting.\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport.c:526
+#: src/transport/gnunet-service-transport.c:523
 msgid "Transport service could not access hostkey.  Exiting.\n"
 msgstr ""
 
@@ -3690,101 +3714,101 @@
 msgid "# peers blacklisted"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:379
+#: src/topology/gnunet-daemon-topology.c:380
 msgid "# connect requests issued to transport"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:674
-#: src/topology/gnunet-daemon-topology.c:760
+#: src/topology/gnunet-daemon-topology.c:675
+#: src/topology/gnunet-daemon-topology.c:761
 msgid "# friends connected"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:877
-#: src/hostlist/hostlist-server.c:187
+#: src/topology/gnunet-daemon-topology.c:875
+#: src/hostlist/hostlist-server.c:184
 #, c-format
 msgid "Error in communication with PEERINFO service: %s\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:952
+#: src/topology/gnunet-daemon-topology.c:950
 msgid "Failed to connect to core service, can not manage topology!\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:984
+#: src/topology/gnunet-daemon-topology.c:982
 #, c-format
 msgid "Option `%s' in section `%s' not specified!\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:996
+#: src/topology/gnunet-daemon-topology.c:994
 #, c-format
 msgid "Could not read friends list `%s'\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:1002
+#: src/topology/gnunet-daemon-topology.c:1000
 #, c-format
 msgid "Friends file `%s' is empty.\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:1011
+#: src/topology/gnunet-daemon-topology.c:1009
 #, c-format
 msgid "Failed to read friends list from `%s': out of memory\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:1019
+#: src/topology/gnunet-daemon-topology.c:1017
 #, c-format
 msgid "Failed to read friends list from `%s'\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:1039
+#: src/topology/gnunet-daemon-topology.c:1037
 #, c-format
 msgid ""
 "Syntax error in topology specification at offset %llu, skipping bytes.\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:1052
+#: src/topology/gnunet-daemon-topology.c:1050
 #, c-format
 msgid ""
 "Syntax error in topology specification at offset %llu, skipping bytes `%s'.\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:1062
+#: src/topology/gnunet-daemon-topology.c:1060
 #, fuzzy, c-format
 msgid "Found friend `%s' in configuration\n"
 msgstr ""
 "\n"
 "结束配置。\n"
 
-#: src/topology/gnunet-daemon-topology.c:1068
+#: src/topology/gnunet-daemon-topology.c:1066
 #, c-format
 msgid "Found myself `%s' in friend list (useless, ignored)\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:1078
+#: src/topology/gnunet-daemon-topology.c:1076
 #, fuzzy
 msgid "# friends in configuration"
 msgstr ""
 "\n"
 "结束配置。\n"
 
-#: src/topology/gnunet-daemon-topology.c:1084
+#: src/topology/gnunet-daemon-topology.c:1082
 msgid ""
 "Fewer friends specified than required by minimum friend count. Will only "
 "connect to friends.\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:1091
+#: src/topology/gnunet-daemon-topology.c:1089
 msgid ""
 "More friendly connections required than target total number of connections.\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:1128
+#: src/topology/gnunet-daemon-topology.c:1126
 msgid "# HELLO messages received"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:1185
+#: src/topology/gnunet-daemon-topology.c:1183
 msgid "# HELLO messages gossipped"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:1325
+#: src/topology/gnunet-daemon-topology.c:1323
 msgid "GNUnet topology control (maintaining P2P mesh and F2F constraints)"
 msgstr ""
 
@@ -4060,33 +4084,33 @@
 msgid "GNUnet NAT traversal test helper daemon"
 msgstr ""
 
-#: src/nat/nat.c:776
+#: src/nat/nat.c:803
 #, c-format
 msgid "gnunet-helper-nat-server generated malformed address `%s'\n"
 msgstr ""
 
-#: src/nat/nat.c:825
+#: src/nat/nat.c:852
 #, fuzzy, c-format
 msgid "Failed to start %s\n"
 msgstr "运行 %s失败:%s %d\n"
 
-#: src/nat/nat.c:1094
+#: src/nat/nat.c:1121
 #, fuzzy, c-format
 msgid "Malformed %s `%s' given in configuration!\n"
 msgstr "保存配置失败。"
 
-#: src/nat/nat.c:1156 src/nat/nat.c:1166
+#: src/nat/nat.c:1187 src/nat/nat.c:1197
 #, c-format
 msgid ""
 "Configuration requires `%s', but binary is not installed properly (SUID bit "
 "not set).  Option disabled.\n"
 msgstr ""
 
-#: src/nat/nat.c:1298
+#: src/nat/nat.c:1329
 msgid "Internal IP address not known, cannot use ICMP NAT traversal method\n"
 msgstr ""
 
-#: src/nat/nat.c:1310
+#: src/nat/nat.c:1341
 #, c-format
 msgid "Running gnunet-helper-nat-client %s %s %u\n"
 msgstr ""
@@ -4100,44 +4124,39 @@
 msgid "Failed to create listen socket bound to `%s' for NAT test: %s\n"
 msgstr ""
 
-#: src/block/plugin_block_dht.c:122
+#: src/dht/plugin_block_dht.c:124
 #, c-format
 msgid "Block not of type %u\n"
 msgstr ""
 
-#: src/block/plugin_block_dht.c:129
+#: src/dht/plugin_block_dht.c:131
 msgid "Size mismatch for block\n"
 msgstr ""
 
-#: src/block/plugin_block_dht.c:138
+#: src/dht/plugin_block_dht.c:140
 #, c-format
 msgid "Block of type %u is malformed\n"
 msgstr ""
 
-#: src/block/plugin_block_fs.c:131
+#: src/fs/plugin_block_fs.c:131
 msgid "Reply mismatched in terms of namespace.  Discarded.\n"
 msgstr ""
 
-#: src/block/block.c:109
-#, c-format
-msgid "Loading block plugins `%s'\n"
-msgstr ""
-
-#: src/block/block.c:119
+#: src/block/block.c:105
 #, fuzzy, c-format
-msgid "Failed to load block plugin `%s'\n"
+msgid "Loading block plugin `%s'\n"
 msgstr "打开日志文件“%s”失败:%s\n"
 
-#: src/mesh/gnunet-service-mesh.c:4206
+#: src/mesh/gnunet-service-mesh.c:4192
 msgid "MESH: Wrong CORE service\n"
 msgstr ""
 
-#: src/mesh/gnunet-service-mesh.c:4410
+#: src/mesh/gnunet-service-mesh.c:4397
 #, fuzzy
 msgid "Mesh service is lacking key configuration settings.  Exiting.\n"
 msgstr "立即保存配置?"
 
-#: src/mesh/gnunet-service-mesh.c:4419
+#: src/mesh/gnunet-service-mesh.c:4406
 #, fuzzy
 msgid "Mesh service could not access hostkey.  Exiting.\n"
 msgstr "找不到接口“%s”的一个 IP 地址。\n"
@@ -4352,108 +4371,108 @@
 msgid "bytes in hostlist"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:160
+#: src/hostlist/hostlist-server.c:157
 msgid "expired addresses encountered"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:208
+#: src/hostlist/hostlist-server.c:205
 msgid "HELLOs without addresses encountered (ignored)"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:224
+#: src/hostlist/hostlist-server.c:221
 msgid "bytes not included in hostlist (size limit)"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:272
+#: src/hostlist/hostlist-server.c:269
 #, c-format
 msgid "Refusing `%s' request to hostlist server\n"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:275
+#: src/hostlist/hostlist-server.c:272
 msgid "hostlist requests refused (not HTTP GET)"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:283
+#: src/hostlist/hostlist-server.c:280
 msgid "Sending 100 CONTINUE reply\n"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:290
+#: src/hostlist/hostlist-server.c:287
 #, c-format
 msgid "Refusing `%s' request with %llu bytes of upload data\n"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:294
+#: src/hostlist/hostlist-server.c:291
 msgid "hostlist requests refused (upload data)"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:302
+#: src/hostlist/hostlist-server.c:299
 msgid "Could not handle hostlist request since I do not have a response yet\n"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:305
+#: src/hostlist/hostlist-server.c:302
 msgid "hostlist requests refused (not ready)"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:309
+#: src/hostlist/hostlist-server.c:306
 msgid "Received request for our hostlist\n"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:310
+#: src/hostlist/hostlist-server.c:307
 msgid "hostlist requests processed"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:353
+#: src/hostlist/hostlist-server.c:350
 msgid "# hostlist advertisements send"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:400
+#: src/hostlist/hostlist-server.c:397
 msgid "Advertisement message could not be queued by core\n"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:568
+#: src/hostlist/hostlist-server.c:565
 #, c-format
 msgid "Invalid port number %llu.  Exiting.\n"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:577
+#: src/hostlist/hostlist-server.c:574
 #, c-format
 msgid "Hostlist service starts on %s:%llu\n"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:591
+#: src/hostlist/hostlist-server.c:588
 #, c-format
 msgid "Address to obtain hostlist: `%s'\n"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:629
+#: src/hostlist/hostlist-server.c:626
 #, c-format
 msgid "Could not start hostlist HTTP server on port %u\n"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:222
+#: src/peerinfo-tool/gnunet-peerinfo.c:221
 #, fuzzy, c-format
 msgid "Could not find option `%s:%s' in configuration.\n"
 msgstr "找不到主机“%s”的 IP:%s\n"
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:229
+#: src/peerinfo-tool/gnunet-peerinfo.c:228
 #, c-format
 msgid "Loading hostkey from `%s' failed.\n"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:241
+#: src/peerinfo-tool/gnunet-peerinfo.c:240
 #, c-format
 msgid "I am peer `%s'.\n"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:261
+#: src/peerinfo-tool/gnunet-peerinfo.c:260
 msgid "output only the identity strings"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:264
+#: src/peerinfo-tool/gnunet-peerinfo.c:263
 msgid "output our own identity only"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:270
+#: src/peerinfo-tool/gnunet-peerinfo.c:269
 #, fuzzy
 msgid "Print information about peers."
 msgstr "无法获取有关用户“%s”的信息:%s\n"
@@ -4482,22 +4501,34 @@
 msgid "use configuration file FILENAME"
 msgstr ""
 
-#: src/include/gnunet_common.h:352 src/include/gnunet_common.h:357
-#: src/include/gnunet_common.h:363
+#: src/include/gnunet_common.h:361 src/include/gnunet_common.h:366
+#: src/include/gnunet_common.h:372
 #, c-format
 msgid "Assertion failed at %s:%d.\n"
 msgstr ""
 
-#: src/include/gnunet_common.h:373
+#: src/include/gnunet_common.h:382
 #, c-format
 msgid "External protocol violation detected at %s:%d.\n"
 msgstr ""
 
-#: src/include/gnunet_common.h:394 src/include/gnunet_common.h:401
+#: src/include/gnunet_common.h:403 src/include/gnunet_common.h:410
 #, c-format
 msgid "`%s' failed on file `%s' at %s:%d with error: %s\n"
 msgstr ""
 
+#~ msgid "KiB"
+#~ msgstr "KiB"
+
+#~ msgid "MiB"
+#~ msgstr "MiB"
+
+#~ msgid "GiB"
+#~ msgstr "GiB"
+
+#~ msgid "TiB"
+#~ msgstr "TiB"
+
 #, fuzzy
 #~ msgid "Copying file with command cp %s %s\n"
 #~ msgstr "“%s”以错误码 %s 失败:%s\n"
@@ -5226,9 +5257,6 @@
 #~ msgid "Unsupported command `%s'.  Aborting.\n"
 #~ msgstr "未知的命令“%s”。\n"
 
-#~ msgid "Could not determine UI definition filename."
-#~ msgstr "无法确定用户界面定义文件。"
-
 #~ msgid ""
 #~ "OS tells us about very large message (%u bytes) pending on UDP socket, "
 #~ "truncating at 64k\n"




reply via email to

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