[gnunet] branch master updated: -fix warnings

gnunet-svn
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[gnunet] branch master updated: -fix warnings

From:	gnunet
Subject:	[gnunet] branch master updated: -fix warnings
Date:	Fri, 21 Oct 2022 06:48:09 +0200
This is an automated email from the git hooks/post-receive script.

martin-schanzenbach pushed a commit to branch master
in repository gnunet.

The following commit(s) were added to refs/heads/master by this push:
     new bb49aa011 -fix warnings
bb49aa011 is described below

commit bb49aa0110c5648e9eaae0f013fc5a05f7156862
Author: Martin Schanzenbach <schanzen@gnunet.org>
AuthorDate: Fri Oct 21 13:48:01 2022 +0900

    -fix warnings
---
 po/POTFILES.in                             |   2 +-
 po/de.po                                   | 703 +++++++++++++++-------------
 po/es.po                                   | 709 +++++++++++++++--------------
 po/fr.po                                   | 694 +++++++++++++++-------------
 po/it.po                                   | 694 +++++++++++++++-------------
 po/sr.po                                   | 700 +++++++++++++++-------------
 po/sv.po                                   | 700 +++++++++++++++-------------
 po/vi.po                                   | 703 +++++++++++++++-------------
 po/zh_CN.po                                | 703 +++++++++++++++-------------
 src/include/gnunet_mysql_lib.h             |   6 +-
 src/namestore/gnunet-namestore-zonefile.c  |  19 +-
 src/zonemaster/gnunet-service-zonemaster.c |  25 +-
 12 files changed, 3018 insertions(+), 2640 deletions(-)

diff --git a/po/POTFILES.in b/po/POTFILES.in
index 116033d20..1d5ef29e3 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -244,6 +244,7 @@ src/namecache/plugin_namecache_postgres.c
 src/namecache/plugin_namecache_sqlite.c
 src/namestore/gnunet-namestore-dbtool.c
 src/namestore/gnunet-namestore-fcfsd.c
+src/namestore/gnunet-namestore-zonefile.c
 src/namestore/gnunet-namestore.c
 src/namestore/gnunet-service-namestore.c
 src/namestore/gnunet-zoneimport.c
@@ -587,7 +588,6 @@ src/vpn/gnunet-helper-vpn.c
 src/vpn/gnunet-service-vpn.c
 src/vpn/gnunet-vpn.c
 src/vpn/vpn_api.c
-src/zonemaster/gnunet-service-zonemaster-monitor.c
 src/zonemaster/gnunet-service-zonemaster.c
 src/fs/fs_api.h
 src/include/gnunet_json_lib.h
diff --git a/po/de.po b/po/de.po
index d5bc9a3ad..242ebbacc 100644
--- a/po/de.po
+++ b/po/de.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnunet 0.10.1\n"
 "Report-Msgid-Bugs-To: gnunet-developers@mail.gnu.org\n"
-"POT-Creation-Date: 2022-10-16 18:47+0900\n"
+"POT-Creation-Date: 2022-10-21 13:20+0900\n"
 "PO-Revision-Date: 2015-03-08 16:16+0100\n"
 "Last-Translator: Mario Blättermann <mario.blaettermann@gmail.com>\n"
 "Language-Team: German <translation-team-de@lists.sourceforge.net>\n"
@@ -21,7 +21,10 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: Poedit 1.7.4\n"
 
-#: src/abd/gnunet-abd.c:392 src/namestore/gnunet-namestore.c:1245
+#: src/abd/gnunet-abd.c:392 src/namestore/gnunet-namestore-zonefile.c:193
+#: src/namestore/gnunet-namestore-zonefile.c:652
+#: src/namestore/gnunet-namestore-zonefile.c:673
+#: src/namestore/gnunet-namestore.c:1245
 #, fuzzy, c-format
 msgid "Ego `%s' not known to identity service\n"
 msgstr "`%s': unbekannter Dienst: %s\n"
@@ -168,15 +171,15 @@ msgstr "Fehler beim Speichern der Konfigurationsdatei 
`%s':"
 msgid "Failed to remove servicehome directory %s\n"
 msgstr "Dateiformat fehlerhaft (kein GNUnet Verzeichnis?)\n"
 
-#: src/arm/gnunet-arm.c:229 src/testbed/gnunet-service-testbed_peers.c:1144
+#: src/arm/gnunet-arm.c:229 src/testbed/gnunet-service-testbed_peers.c:1132
 msgid "Message was sent successfully"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:232 src/testbed/gnunet-service-testbed_peers.c:1147
+#: src/arm/gnunet-arm.c:232 src/testbed/gnunet-service-testbed_peers.c:1135
 msgid "We disconnected from ARM before we could send a request"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:234 src/testbed/gnunet-service-testbed_peers.c:1149
+#: src/arm/gnunet-arm.c:234 src/testbed/gnunet-service-testbed_peers.c:1137
 msgid "Unknown request status"
 msgstr "Unbekannter Anfragestatus"
 
@@ -1354,160 +1357,160 @@ msgstr ""
 msgid "Core service of `%s' ready.\n"
 msgstr "Dienst »%s« wird neu gestartet.\n"
 
-#: src/core/gnunet-service-core_kx.c:512
+#: src/core/gnunet-service-core_kx.c:513
 msgid "# bytes encrypted"
 msgstr "# Bytes verschlüsselt"
 
-#: src/core/gnunet-service-core_kx.c:570
+#: src/core/gnunet-service-core_kx.c:571
 msgid "# bytes decrypted"
 msgstr "# Bytes entschlüsselt"
 
-#: src/core/gnunet-service-core_kx.c:667
+#: src/core/gnunet-service-core_kx.c:668
 msgid "# PAYLOAD dropped (out of order)"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:719
+#: src/core/gnunet-service-core_kx.c:720
 msgid "# key exchanges initiated"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:775
+#: src/core/gnunet-service-core_kx.c:776
 msgid "# key exchanges stopped"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:807
+#: src/core/gnunet-service-core_kx.c:808
 #, fuzzy
 msgid "# PING messages transmitted"
 msgstr "# PING Nachrichten erstellt"
 
-#: src/core/gnunet-service-core_kx.c:866
+#: src/core/gnunet-service-core_kx.c:867
 msgid "# old ephemeral keys ignored"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:880
+#: src/core/gnunet-service-core_kx.c:881
 #, fuzzy
 msgid "# duplicate ephemeral keys ignored"
 msgstr "# verschlüsselter PONG Nachrichten empfangen"
 
-#: src/core/gnunet-service-core_kx.c:915
+#: src/core/gnunet-service-core_kx.c:916
 #, fuzzy
 msgid "# EPHEMERAL_KEYs rejected (bad signature)"
 msgstr "# verschlüsselter PONG Nachrichten empfangen"
 
-#: src/core/gnunet-service-core_kx.c:933
+#: src/core/gnunet-service-core_kx.c:934
 #, c-format
 msgid ""
 "EPHEMERAL_KEY from peer `%s' rejected as its validity range does not match "
 "our system time (%llu not in [%llu,%llu]).\n"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:940
+#: src/core/gnunet-service-core_kx.c:941
 #, fuzzy
 msgid "# EPHEMERAL_KEY messages rejected due to time"
 msgstr "# verschlüsselter PONG Nachrichten empfangen"
 
-#: src/core/gnunet-service-core_kx.c:958
+#: src/core/gnunet-service-core_kx.c:959
 #, fuzzy
 msgid "# valid ephemeral keys received"
 msgstr "# verschlüsselter PONG Nachrichten empfangen"
 
-#: src/core/gnunet-service-core_kx.c:1067
+#: src/core/gnunet-service-core_kx.c:1068
 #: src/transport/gnunet-service-transport_validation.c:1133
 #, fuzzy
 msgid "# PING messages received"
 msgstr "# PING Nachrichten erstellt"
 
-#: src/core/gnunet-service-core_kx.c:1077
+#: src/core/gnunet-service-core_kx.c:1078
 #, fuzzy
 msgid "# PING messages dropped (out of order)"
 msgstr "# PING Nachrichten erstellt"
 
-#: src/core/gnunet-service-core_kx.c:1126
+#: src/core/gnunet-service-core_kx.c:1127
 #, fuzzy
 msgid "# PONG messages created"
 msgstr "# PING Nachrichten erstellt"
 
-#: src/core/gnunet-service-core_kx.c:1151
+#: src/core/gnunet-service-core_kx.c:1152
 msgid "# sessions terminated by timeout"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1164
+#: src/core/gnunet-service-core_kx.c:1165
 #, fuzzy
 msgid "# keepalive messages sent"
 msgstr "# Klartext PING Nachrichten gesendet"
 
-#: src/core/gnunet-service-core_kx.c:1221
+#: src/core/gnunet-service-core_kx.c:1222
 #: src/transport/gnunet-service-transport_validation.c:1476
 #, fuzzy
 msgid "# PONG messages received"
 msgstr "# verschlüsselter PONG Nachrichten empfangen"
 
-#: src/core/gnunet-service-core_kx.c:1229
+#: src/core/gnunet-service-core_kx.c:1230
 msgid "# PONG messages dropped (connection down)"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1237
+#: src/core/gnunet-service-core_kx.c:1238
 #, fuzzy
 msgid "# PONG messages dropped (out of order)"
 msgstr "# PING Nachrichten erstellt"
 
-#: src/core/gnunet-service-core_kx.c:1276
+#: src/core/gnunet-service-core_kx.c:1277
 #, fuzzy
 msgid "# PONG messages decrypted"
 msgstr "# PING Nachrichten erstellt"
 
-#: src/core/gnunet-service-core_kx.c:1316
+#: src/core/gnunet-service-core_kx.c:1317
 #, fuzzy
 msgid "# session keys confirmed via PONG"
 msgstr "# Knotenankündigungen empfangen"
 
-#: src/core/gnunet-service-core_kx.c:1328
+#: src/core/gnunet-service-core_kx.c:1329
 #, fuzzy
 msgid "# timeouts prevented via PONG"
 msgstr "# Bytes empfangen über TCP"
 
-#: src/core/gnunet-service-core_kx.c:1337
+#: src/core/gnunet-service-core_kx.c:1338
 #, fuzzy
 msgid "# rekey operations confirmed via PONG"
 msgstr "# Knotenankündigungen empfangen"
 
-#: src/core/gnunet-service-core_kx.c:1506
+#: src/core/gnunet-service-core_kx.c:1507
 msgid "# DATA message dropped (out of order)"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1517
+#: src/core/gnunet-service-core_kx.c:1518
 #, c-format
 msgid ""
 "Session to peer `%s' went down due to key expiration (should not happen)\n"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1521
+#: src/core/gnunet-service-core_kx.c:1522
 msgid "# sessions terminated by key expiration"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1599
-#: src/core/gnunet-service-core_kx.c:1626
+#: src/core/gnunet-service-core_kx.c:1600
+#: src/core/gnunet-service-core_kx.c:1627
 #, fuzzy
 msgid "# bytes dropped (duplicates)"
 msgstr "# Bytes verworfen von TCP (ausgehend)"
 
-#: src/core/gnunet-service-core_kx.c:1612
+#: src/core/gnunet-service-core_kx.c:1613
 #, fuzzy
 msgid "# bytes dropped (out of sequence)"
 msgstr "# Bytes verworfen von TCP (ausgehend)"
 
-#: src/core/gnunet-service-core_kx.c:1657
+#: src/core/gnunet-service-core_kx.c:1658
 #, fuzzy
 msgid "# bytes dropped (ancient message)"
 msgstr "# Bytes verworfen von TCP (ausgehend)"
 
-#: src/core/gnunet-service-core_kx.c:1666
+#: src/core/gnunet-service-core_kx.c:1667
 #, fuzzy
 msgid "# bytes of payload decrypted"
 msgstr "# Bytes entschlüsselt"
 
 #: src/core/gnunet-service-core_sessions.c:252
 #: src/core/gnunet-service-core_sessions.c:337
-#: src/fs/gnunet-service-fs_cp.c:601 src/fs/gnunet-service-fs_cp.c:1496
+#: src/fs/gnunet-service-fs_cp.c:601 src/fs/gnunet-service-fs_cp.c:1494
 #: src/topology/gnunet-daemon-topology.c:579
 #: src/topology/gnunet-daemon-topology.c:671
 #: src/transport/gnunet-service-transport_neighbours.c:723
@@ -1743,7 +1746,7 @@ msgstr ""
 #: src/datastore/gnunet-service-datastore.c:626
 #: src/datastore/gnunet-service-datastore.c:677
 #: src/datastore/gnunet-service-datastore.c:820
-#: src/datastore/gnunet-service-datastore.c:1429
+#: src/datastore/gnunet-service-datastore.c:1428
 msgid "# reserved"
 msgstr ""
 
@@ -1792,70 +1795,70 @@ msgstr "Kein Inhalt gefunden"
 msgid "# bytes removed (explicit request)"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1059
+#: src/datastore/gnunet-service-datastore.c:1058
 #, fuzzy
 msgid "# REMOVE requests received"
 msgstr "# Client Trace-Anfragen empfangen"
 
-#: src/datastore/gnunet-service-datastore.c:1108
+#: src/datastore/gnunet-service-datastore.c:1107
 #, c-format
 msgid ""
 "Datastore payload must have been inaccurate (%lld < %lld). Recomputing it.\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1113
-#: src/datastore/gnunet-service-datastore.c:1282
+#: src/datastore/gnunet-service-datastore.c:1112
+#: src/datastore/gnunet-service-datastore.c:1281
 #, c-format
 msgid "New payload: %lld\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1168
+#: src/datastore/gnunet-service-datastore.c:1167
 #, c-format
 msgid "Loading `%s' datastore plugin\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1177
+#: src/datastore/gnunet-service-datastore.c:1176
 #, fuzzy, c-format
 msgid "Failed to load datastore plugin for `%s'\n"
 msgstr "Anwendung `%s' konnte nicht initialisiert werden.\n"
 
-#: src/datastore/gnunet-service-datastore.c:1237
+#: src/datastore/gnunet-service-datastore.c:1236
 msgid "Bloomfilter construction complete.\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1289
+#: src/datastore/gnunet-service-datastore.c:1288
 msgid "Rebuilding bloomfilter.  Please be patient.\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1299
+#: src/datastore/gnunet-service-datastore.c:1298
 msgid "Plugin does not support get_keys function. Please fix!\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1464
+#: src/datastore/gnunet-service-datastore.c:1463
 #, fuzzy, c-format
 msgid "# bytes used in file-sharing datastore `%s'"
 msgstr "# bytes erlaubt in der Datenbank"
 
-#: src/datastore/gnunet-service-datastore.c:1473
+#: src/datastore/gnunet-service-datastore.c:1472
 msgid "# quota"
 msgstr "# Kontingent"
 
-#: src/datastore/gnunet-service-datastore.c:1476
+#: src/datastore/gnunet-service-datastore.c:1475
 msgid "# cache size"
 msgstr "# Zwischenspeichergröße"
 
-#: src/datastore/gnunet-service-datastore.c:1492
+#: src/datastore/gnunet-service-datastore.c:1491
 #, c-format
 msgid "Could not use specified filename `%s' for bloomfilter.\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1513
-#: src/datastore/gnunet-service-datastore.c:1535
+#: src/datastore/gnunet-service-datastore.c:1512
+#: src/datastore/gnunet-service-datastore.c:1534
 #, fuzzy, c-format
 msgid "Failed to remove bogus bloomfilter file `%s'\n"
 msgstr "Datei wurde als `%s' gespeichert.\n"
 
-#: src/datastore/gnunet-service-datastore.c:1574
+#: src/datastore/gnunet-service-datastore.c:1573
 msgid "Failed to initialize bloomfilter.\n"
 msgstr "Bloomfilter konnte nicht initialisiert werden.\n"
 
@@ -1908,7 +1911,7 @@ msgstr "`%s' schlug bei %s:%d mit dem Fehler %s fehl\n"
 
 #: src/datastore/plugin_datastore_sqlite.c:310
 #: src/namecache/plugin_namecache_sqlite.c:180
-#: src/namestore/plugin_namestore_sqlite.c:868
+#: src/namestore/plugin_namestore_sqlite.c:891
 #: src/peerstore/plugin_peerstore_sqlite.c:540
 #, c-format
 msgid "Unable to initialize SQLite: %s.\n"
@@ -2163,7 +2166,7 @@ msgstr ""
 msgid "# DNS requests received via TUN interface"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:1117 src/exit/gnunet-daemon-exit.c:3708
+#: src/dns/gnunet-service-dns.c:1117 src/exit/gnunet-daemon-exit.c:3707
 msgid "need a valid IPv4 or IPv6 address\n"
 msgstr ""
 
@@ -2317,69 +2320,69 @@ msgstr ""
 msgid "Packet from unknown protocol %u received.  Ignored.\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3377 src/exit/gnunet-daemon-exit.c:3388
+#: src/exit/gnunet-daemon-exit.c:3376 src/exit/gnunet-daemon-exit.c:3387
 #, c-format
 msgid "Option `%s' for domain `%s' is not formatted correctly!\n"
 msgstr "Option »%s« für Domain »%s« ist nicht korrekt formatiert!\n"
 
-#: src/exit/gnunet-daemon-exit.c:3402 src/exit/gnunet-daemon-exit.c:3410
+#: src/exit/gnunet-daemon-exit.c:3401 src/exit/gnunet-daemon-exit.c:3409
 #, c-format
 msgid "`%s' is not a valid port number (for domain `%s')!"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3452
+#: src/exit/gnunet-daemon-exit.c:3451
 #, c-format
 msgid "No addresses found for hostname `%s' of service `%s'!\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3467 src/exit/gnunet-daemon-exit.c:3482
+#: src/exit/gnunet-daemon-exit.c:3466 src/exit/gnunet-daemon-exit.c:3481
 #, c-format
 msgid "Service `%s' configured for IPv4, but IPv4 is disabled!\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3496
+#: src/exit/gnunet-daemon-exit.c:3495
 #, c-format
 msgid "No IP addresses found for hostname `%s' of service `%s'!\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3641
+#: src/exit/gnunet-daemon-exit.c:3640
 msgid ""
 "This system does not support IPv4, will disable IPv4 functions despite them "
 "being enabled in the configuration\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3650
+#: src/exit/gnunet-daemon-exit.c:3649
 msgid ""
 "This system does not support IPv6, will disable IPv6 functions despite them "
 "being enabled in the configuration\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3658
+#: src/exit/gnunet-daemon-exit.c:3657
 msgid ""
 "Cannot enable IPv4 exit but disable IPv4 on TUN interface, will use "
 "ENABLE_IPv4=YES\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3665
+#: src/exit/gnunet-daemon-exit.c:3664
 msgid ""
 "Cannot enable IPv6 exit but disable IPv6 on TUN interface, will use "
 "ENABLE_IPv6=YES\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3836
+#: src/exit/gnunet-daemon-exit.c:3835
 msgid "Must be a number"
 msgstr "Muss eine Zahl sein"
 
-#: src/exit/gnunet-daemon-exit.c:3952
+#: src/exit/gnunet-daemon-exit.c:3951
 #, c-format
 msgid "`%s' is not SUID or the path is invalid, EXIT will not work\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3964 src/pt/gnunet-daemon-pt.c:1212
+#: src/exit/gnunet-daemon-exit.c:3963 src/pt/gnunet-daemon-pt.c:1212
 msgid "No useful service enabled.  Exiting.\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:4118
+#: src/exit/gnunet-daemon-exit.c:4117
 msgid "Daemon to run to provide an IP exit node for the VPN"
 msgstr ""
 
@@ -2570,7 +2573,7 @@ msgstr ""
 msgid "internal error decoding tree"
 msgstr ""
 
-#: src/fs/fs_download.c:1890
+#: src/fs/fs_download.c:1889
 #, fuzzy
 msgid "Invalid URI"
 msgstr "Ungültiger Parameter: `%s'\n"
@@ -2587,7 +2590,7 @@ msgstr ""
 msgid "Failed to receive response from `%s' service.\n"
 msgstr "Fehler beim Empfangen der Antwort von gnunetd auf die `%s' Nachricht\n"
 
-#: src/fs/fs_list_indexed.c:195
+#: src/fs/fs_list_indexed.c:187
 #, fuzzy, c-format
 msgid "Failed to not connect to `%s' service.\n"
 msgstr "`%s' Dienst konnte nicht initialisiert werden.\n"
@@ -2612,7 +2615,7 @@ msgstr "Es konnte keine Verbindung mit gnunetd 
hergestellt werden.\n"
 msgid "Failed to read `%s': %s\n"
 msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
 
-#: src/fs/fs_namespace.c:472
+#: src/fs/fs_namespace.c:457
 #, fuzzy
 msgid "Failed to connect to datastore."
 msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden."
@@ -2758,96 +2761,96 @@ msgstr "Es konnte keine Verbindung mit gnunetd 
hergestellt werden."
 msgid "Failed to compute hash of file."
 msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden."
 
-#: src/fs/fs_uri.c:239
+#: src/fs/fs_uri.c:231
 #, fuzzy, no-c-format
 msgid "Malformed KSK URI (`%' must be followed by HEX number)"
 msgstr "Ungültige URL `%s' (muss mit `%s' beginnen)\n"
 
-#: src/fs/fs_uri.c:298
+#: src/fs/fs_uri.c:290
 #, fuzzy
 msgid "Malformed KSK URI (must not begin or end with `+')"
 msgstr "Ungültige URL `%s' (muss mit `%s' beginnen)\n"
 
-#: src/fs/fs_uri.c:316
+#: src/fs/fs_uri.c:308
 #, fuzzy
 msgid "Malformed KSK URI (`++' not allowed)"
 msgstr "Ungültige URL `%s' (muss mit `%s' beginnen)\n"
 
-#: src/fs/fs_uri.c:323
+#: src/fs/fs_uri.c:315
 #, fuzzy
 msgid "Malformed KSK URI (quotes not balanced)"
 msgstr "Ungültige URL `%s' (muss mit `%s' beginnen)\n"
 
-#: src/fs/fs_uri.c:390
+#: src/fs/fs_uri.c:382
 msgid "Malformed SKS URI (wrong syntax)"
 msgstr ""
 
-#: src/fs/fs_uri.c:431
+#: src/fs/fs_uri.c:423
 msgid "Malformed CHK URI (wrong syntax)"
 msgstr ""
 
-#: src/fs/fs_uri.c:448
+#: src/fs/fs_uri.c:440
 msgid "Malformed CHK URI (failed to decode CHK)"
 msgstr ""
 
-#: src/fs/fs_uri.c:525
+#: src/fs/fs_uri.c:517
 msgid "LOC URI malformed (wrong syntax)"
 msgstr ""
 
-#: src/fs/fs_uri.c:542
+#: src/fs/fs_uri.c:534
 msgid "LOC URI malformed (no CHK)"
 msgstr ""
 
-#: src/fs/fs_uri.c:552
+#: src/fs/fs_uri.c:544
 msgid "LOC URI malformed (missing LOC)"
 msgstr ""
 
-#: src/fs/fs_uri.c:560
+#: src/fs/fs_uri.c:552
 msgid "LOC URI malformed (wrong syntax for public key)"
 msgstr ""
 
-#: src/fs/fs_uri.c:569
+#: src/fs/fs_uri.c:561
 msgid "LOC URI malformed (could not decode public key)"
 msgstr ""
 
-#: src/fs/fs_uri.c:575
+#: src/fs/fs_uri.c:567
 msgid "LOC URI malformed (could not find signature)"
 msgstr ""
 
-#: src/fs/fs_uri.c:582
+#: src/fs/fs_uri.c:574
 msgid "LOC URI malformed (wrong syntax for signature)"
 msgstr ""
 
-#: src/fs/fs_uri.c:593
+#: src/fs/fs_uri.c:585
 msgid "LOC URI malformed (could not decode signature)"
 msgstr ""
 
-#: src/fs/fs_uri.c:600
+#: src/fs/fs_uri.c:592
 msgid "LOC URI malformed (wrong syntax for expiration time)"
 msgstr ""
 
-#: src/fs/fs_uri.c:606
+#: src/fs/fs_uri.c:598
 msgid "LOC URI malformed (could not parse expiration time)"
 msgstr ""
 
-#: src/fs/fs_uri.c:620
+#: src/fs/fs_uri.c:612
 msgid "LOC URI malformed (signature failed validation)"
 msgstr ""
 
-#: src/fs/fs_uri.c:653
+#: src/fs/fs_uri.c:645
 #, fuzzy
 msgid "invalid argument"
 msgstr "Ungültiges Argument »%s«\n"
 
-#: src/fs/fs_uri.c:673
+#: src/fs/fs_uri.c:665
 msgid "Unrecognized URI type"
 msgstr ""
 
-#: src/fs/fs_uri.c:1077 src/fs/fs_uri.c:1104
+#: src/fs/fs_uri.c:1060 src/fs/fs_uri.c:1087
 msgid "No keywords specified!\n"
 msgstr "Keine Schlüsselwörter angegeben!\n"
 
-#: src/fs/fs_uri.c:1110
+#: src/fs/fs_uri.c:1093
 msgid "Number of double-quotes not balanced!\n"
 msgstr ""
 
@@ -3449,7 +3452,7 @@ msgid "# cadet client connections rejected"
 msgstr "# Sitzungsschlüssel abgelehnt"
 
 #: src/fs/gnunet-service-fs_cadet_server.c:394
-#: src/fs/gnunet-service-fs_cadet_server.c:434
+#: src/fs/gnunet-service-fs_cadet_server.c:433
 #, fuzzy
 msgid "# cadet connections active"
 msgstr " Verbindung fehlgeschlagen\n"
@@ -3512,7 +3515,7 @@ msgstr ""
 msgid "# P2P query messages received and processed"
 msgstr "# verschlüsselter PING Nachrichten empfangen"
 
-#: src/fs/gnunet-service-fs_cp.c:1679
+#: src/fs/gnunet-service-fs_cp.c:1677
 #, fuzzy
 msgid "# migration stop messages sent"
 msgstr "# verschlüsselter PING Nachrichten empfangen"
@@ -3816,8 +3819,8 @@ msgstr ""
 #: src/hostlist/gnunet-daemon-hostlist_client.c:957
 #: src/hostlist/gnunet-daemon-hostlist_client.c:1059
 #: src/hostlist/gnunet-daemon-hostlist_client.c:1067
-#: src/transport/plugin_transport_http_client.c:600
-#: src/transport/plugin_transport_http_client.c:618
+#: src/transport/plugin_transport_http_client.c:599
+#: src/transport/plugin_transport_http_client.c:617
 #, c-format
 msgid "%s failed at %s:%d: `%s'\n"
 msgstr "»%s« schlug fehl bei %s:%d mit dem Fehler: »%s«.\n"
@@ -3882,7 +3885,7 @@ msgstr "SQLite Datenbank konnte nicht initialisiert 
werden: %s.\n"
 msgid "Failed to start HTTPS server for `%s'\n"
 msgstr "Der Transportdienst auf Port %d konnte nicht gestartet werden.\n"
 
-#: src/gns/gnunet-gns-proxy.c:2919 src/rest/gnunet-rest-server.c:958
+#: src/gns/gnunet-gns-proxy.c:2919 src/rest/gnunet-rest-server.c:957
 #, fuzzy
 msgid "Failed to pass client to MHD\n"
 msgstr "Fehler beim Starten der Collection.\n"
@@ -3902,24 +3905,24 @@ msgstr "Kommando `%s' wird nicht unterstützt. Vorgang 
wird abgebrochen.\n"
 msgid "Unsupported socks address type %d\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:3727
+#: src/gns/gnunet-gns-proxy.c:3726
 #, fuzzy, c-format
 msgid "Failed to load X.509 key and certificate from `%s'\n"
 msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
 
-#: src/gns/gnunet-gns-proxy.c:3869
+#: src/gns/gnunet-gns-proxy.c:3868
 msgid "listen on specified port (default: 7777)"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:3874
+#: src/gns/gnunet-gns-proxy.c:3873
 msgid "pem file to use as CA"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:3878
+#: src/gns/gnunet-gns-proxy.c:3877
 msgid "disable use of IPv6"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:3904
+#: src/gns/gnunet-gns-proxy.c:3903
 msgid "GNUnet GNS proxy"
 msgstr ""
 
@@ -3969,21 +3972,19 @@ msgstr ""
 msgid "GNUnet GNS resolver tool"
 msgstr "GNUnet Netzwerk Topologie tracen."
 
-#: src/gns/gnunet-service-gns.c:501
+#: src/gns/gnunet-service-gns.c:500
 #, fuzzy
 msgid "Properly base32-encoded public key required"
 msgstr "# Bytes empfangen über TCP"
 
-#: src/gns/gnunet-service-gns.c:537
-#: src/zonemaster/gnunet-service-zonemaster-monitor.c:542
-#: src/zonemaster/gnunet-service-zonemaster.c:982
+#: src/gns/gnunet-service-gns.c:536
+#: src/zonemaster/gnunet-service-zonemaster.c:1396
 #, fuzzy
 msgid "Failed to connect to the namecache!\n"
 msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
 
-#: src/gns/gnunet-service-gns.c:556
-#: src/zonemaster/gnunet-service-zonemaster-monitor.c:572
-#: src/zonemaster/gnunet-service-zonemaster.c:1021
+#: src/gns/gnunet-service-gns.c:555
+#: src/zonemaster/gnunet-service-zonemaster.c:1435
 #, fuzzy
 msgid "Could not connect to DHT!\n"
 msgstr "Verbindung zu gnunetd konnte nicht hergestellt werden.\n"
@@ -4107,31 +4108,31 @@ msgstr ""
 msgid "Label  contains `.' which is not allowed\n"
 msgstr ""
 
-#: src/gnsrecord/gnsrecord_misc.c:467
+#: src/gnsrecord/gnsrecord_misc.c:481
 msgid "Zone delegation record not allowed in apex."
 msgstr ""
 
-#: src/gnsrecord/gnsrecord_misc.c:475
+#: src/gnsrecord/gnsrecord_misc.c:489
 msgid "Zone delegation record set contains mutually exclusive records."
 msgstr ""
 
-#: src/gnsrecord/gnsrecord_misc.c:485
+#: src/gnsrecord/gnsrecord_misc.c:499
 msgid "Multiple REDIRECT records."
 msgstr ""
 
-#: src/gnsrecord/gnsrecord_misc.c:494 src/gnsrecord/gnsrecord_misc.c:520
+#: src/gnsrecord/gnsrecord_misc.c:508 src/gnsrecord/gnsrecord_misc.c:534
 msgid "Redirection record set contains mutually exclusive records."
 msgstr ""
 
-#: src/gnsrecord/gnsrecord_misc.c:501
+#: src/gnsrecord/gnsrecord_misc.c:515
 msgid "Redirection records not allowed in apex."
 msgstr ""
 
-#: src/gnsrecord/gnsrecord_misc.c:512
+#: src/gnsrecord/gnsrecord_misc.c:526
 msgid "Redirection records not allowed in apex.."
 msgstr ""
 
-#: src/gnsrecord/gnsrecord_misc.c:534
+#: src/gnsrecord/gnsrecord_misc.c:548
 msgid "Mutually exclusive records."
 msgstr ""
 
@@ -4247,34 +4248,34 @@ msgstr "PID konnte nicht in Datei `%s' geschrieben 
werden: %s.\n"
 msgid "Modified %u addresses, wrote %u bytes\n"
 msgstr ""
 
-#: src/hello/hello.c:1111
+#: src/hello/hello.c:1089
 msgid "Failed to parse HELLO message: missing expiration time\n"
 msgstr ""
 
-#: src/hello/hello.c:1121
+#: src/hello/hello.c:1099
 msgid "Failed to parse HELLO message: invalid expiration time\n"
 msgstr ""
 
-#: src/hello/hello.c:1131
+#: src/hello/hello.c:1109
 #, fuzzy
 msgid "Failed to parse HELLO message: malformed\n"
 msgstr "Fehler beim Senden der `%s' Nachricht an gnunetd\n"
 
-#: src/hello/hello.c:1143
+#: src/hello/hello.c:1121
 msgid "Failed to parse HELLO message: missing transport plugin\n"
 msgstr ""
 
-#: src/hello/hello.c:1161
+#: src/hello/hello.c:1139
 #, fuzzy, c-format
 msgid "Plugin `%s' not found, skipping address\n"
 msgstr "Kommando `%s' wurde nicht gefunden!\n"
 
-#: src/hello/hello.c:1169
+#: src/hello/hello.c:1147
 #, c-format
 msgid "Plugin `%s' does not support URIs yet\n"
 msgstr ""
 
-#: src/hello/hello.c:1184
+#: src/hello/hello.c:1162
 #, fuzzy, c-format
 msgid "Failed to parse `%s' as an address for plugin `%s'\n"
 msgstr "Fehler beim Aktualisieren der Daten des Moduls `%s'\n"
@@ -4329,7 +4330,7 @@ msgid "# valid HELLOs downloaded from hostlist servers"
 msgstr "# Hellos per HTTP heruntergeladen"
 
 #: src/hostlist/gnunet-daemon-hostlist_client.c:677
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1453
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1451
 msgid "# advertised hostlist URIs"
 msgstr ""
 
@@ -4380,7 +4381,7 @@ msgid "# hostlist downloads initiated"
 msgstr ""
 
 #: src/hostlist/gnunet-daemon-hostlist_client.c:1137
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1725
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1723
 msgid "# milliseconds between hostlist downloads"
 msgstr ""
 
@@ -4395,67 +4396,67 @@ msgstr ""
 msgid "# active connections"
 msgstr "GNUnet Konfiguration"
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1389
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1387
 #, fuzzy, c-format
 msgid "Loading saved hostlist entries from file `%s' \n"
 msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1394
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1392
 #, fuzzy, c-format
 msgid "Hostlist file `%s' does not exist\n"
 msgstr "Fehler beim Löschen des Pseudonyms `%s' (existiert nicht?).\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1405
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1403
 #, fuzzy, c-format
 msgid "Could not open file `%s' for reading to load hostlists: %s\n"
 msgstr ""
 "`%s' konnte nicht aufgelöst werden, um unsere IP-Adresse zu ermitteln: %s\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1446
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1444
 #, c-format
 msgid "%u hostlist URIs loaded from file\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1449
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1447
 msgid "# hostlist URIs read from file"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1500
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1498
 #, fuzzy, c-format
 msgid "Could not open file `%s' for writing to save hostlists: %s\n"
 msgstr ""
 "Datei `%s' konnte nicht zu `%s' umbenannt werden: Datei existiert bereits\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1507
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1505
 #, fuzzy, c-format
 msgid "Writing %u hostlist URIs to `%s'\n"
 msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1540
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1559
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1538
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1557
 #, c-format
 msgid "Error writing hostlist URIs to file `%s'\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1553
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1551
 msgid "# hostlist URIs written to file"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1654
-#: src/transport/plugin_transport_http_client.c:2294
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1652
+#: src/transport/plugin_transport_http_client.c:2288
 #, c-format
 msgid "Invalid proxy type: `%s', disabling proxy! Check configuration!\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1683
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1681
 msgid "Learning is enabled on this peer\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1696
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1694
 msgid "Learning is not enabled on this peer\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1710
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1708
 #, c-format
 msgid ""
 "Since learning is not enabled on this peer, hostlist file `%s' was removed\n"
@@ -4528,7 +4529,7 @@ msgid "# hostlist advertisements send"
 msgstr "# Bekanntmachungen von anderen übertragen"
 
 #: src/hostlist/gnunet-daemon-hostlist_server.c:674
-#: src/transport/gnunet-service-transport.c:2657
+#: src/transport/gnunet-service-transport.c:2652
 #, fuzzy
 msgid "Could not access PEERINFO service.  Exiting.\n"
 msgstr "Auf die Namespace Informationen konnte nicht zugegriffen werden.\n"
@@ -4647,49 +4648,49 @@ msgstr ""
 msgid "Maintain egos"
 msgstr ""
 
-#: src/identity/gnunet-service-identity.c:502
+#: src/identity/gnunet-service-identity.c:501
 msgid "no default known"
 msgstr ""
 
-#: src/identity/gnunet-service-identity.c:527
+#: src/identity/gnunet-service-identity.c:526
 msgid "default configured, but ego unknown (internal error)"
 msgstr ""
 
-#: src/identity/gnunet-service-identity.c:620
-#: src/identity/gnunet-service-identity.c:895
-#: src/identity/gnunet-service-identity.c:1015
+#: src/identity/gnunet-service-identity.c:618
+#: src/identity/gnunet-service-identity.c:891
+#: src/identity/gnunet-service-identity.c:1010
 #, fuzzy, c-format
 msgid "Failed to write subsystem default identifier map to `%s'.\n"
 msgstr "Fehler beim Aktualisieren der Daten des Moduls `%s'\n"
 
-#: src/identity/gnunet-service-identity.c:630
+#: src/identity/gnunet-service-identity.c:628
 msgid "Unknown ego specified for service (internal error)"
 msgstr ""
 
-#: src/identity/gnunet-service-identity.c:724
+#: src/identity/gnunet-service-identity.c:721
 msgid "identifier already in use for another ego"
 msgstr ""
 
-#: src/identity/gnunet-service-identity.c:871
+#: src/identity/gnunet-service-identity.c:867
 msgid "target name already exists"
 msgstr ""
 
-#: src/identity/gnunet-service-identity.c:913
-#: src/identity/gnunet-service-identity.c:1032
+#: src/identity/gnunet-service-identity.c:909
+#: src/identity/gnunet-service-identity.c:1027
 msgid "no matching ego found"
 msgstr ""
 
-#: src/identity/gnunet-service-identity.c:1130
+#: src/identity/gnunet-service-identity.c:1125
 #, fuzzy, c-format
 msgid "Failed to parse ego information in `%s'\n"
 msgstr "Fehler beim Parsen der Gerätedaten von `%s' bei %s:%d.\n"
 
-#: src/identity/gnunet-service-identity.c:1188
+#: src/identity/gnunet-service-identity.c:1183
 #, fuzzy, c-format
 msgid "Failed to parse subsystem identity configuration file `%s'\n"
 msgstr "Fehler beim Speichern der Konfigurationsdatei `%s':"
 
-#: src/identity/gnunet-service-identity.c:1197
+#: src/identity/gnunet-service-identity.c:1192
 #, fuzzy, c-format
 msgid "Failed to create directory `%s' for storing egos\n"
 msgstr "Dateiformat fehlerhaft (kein GNUnet Verzeichnis?)\n"
@@ -4769,17 +4770,19 @@ msgstr "Die Priorität des Inhalts angeben"
 msgid "GNUnet zone manipulation tool"
 msgstr "GNUnet Konfiguration"
 
-#: src/namecache/namecache_api.c:286
+#: src/namecache/namecache_api.c:285
 msgid "Namecache failed to cache block"
 msgstr ""
 
-#: src/namecache/namecache_api.c:374
+#: src/namecache/namecache_api.c:373
 #, fuzzy
 msgid "Error communicating with namecache service"
 msgstr "Informationen über andere GNUnet Knoten ausgeben."
 
 #: src/namecache/plugin_namecache_flat.c:118
 #: src/namecache/plugin_namecache_flat.c:253
+#: src/namestore/plugin_namestore_flat.c:176
+#: src/namestore/plugin_namestore_flat.c:424
 #: src/peerstore/plugin_peerstore_flat.c:380
 #: src/peerstore/plugin_peerstore_flat.c:542
 #, fuzzy, c-format
@@ -4787,6 +4790,7 @@ msgid "Unable to initialize file: %s.\n"
 msgstr "SQLite-Datenbank konnte nicht initialisiert werden: %s.\n"
 
 #: src/namecache/plugin_namecache_flat.c:129
+#: src/namestore/plugin_namestore_flat.c:187
 #: src/peerstore/plugin_peerstore_flat.c:395
 #, fuzzy, c-format
 msgid "Unable to get filesize: %s.\n"
@@ -4828,6 +4832,7 @@ msgid "the namestore plugin to work with, e.g. 'sqlite'"
 msgstr ""
 
 #: src/namestore/gnunet-namestore-dbtool.c:178
+#: src/namestore/gnunet-namestore-zonefile.c:750
 #, fuzzy
 msgid "GNUnet namestore database manipulation tool"
 msgstr "GNUnet Konfiguration"
@@ -4935,6 +4940,47 @@ msgstr ""
 msgid "GNU Name System First-Come-First-Served name registration service"
 msgstr ""
 
+#: src/namestore/gnunet-namestore-zonefile.c:329
+#, fuzzy, c-format
+msgid "Failed to store records...\n"
+msgstr "Zustellung der Nachricht `%s' fehlgeschlagen.\n"
+
+#: src/namestore/gnunet-namestore-zonefile.c:437
+#: src/namestore/gnunet-namestore-zonefile.c:469
+#, fuzzy, c-format
+msgid "Name `%s' is too long\n"
+msgstr "Dienst »%s« läuft nicht\n"
+
+#: src/namestore/gnunet-namestore-zonefile.c:515
+#, c-format
+msgid "You must provide $ORIGIN in your zonefile or via arguments (--zone)!\n"
+msgstr ""
+
+#: src/namestore/gnunet-namestore-zonefile.c:524
+#, c-format
+msgid "Only %u records per unique name supported.\n"
+msgstr ""
+
+#: src/namestore/gnunet-namestore-zonefile.c:586
+#, fuzzy, c-format
+msgid "Data `%s' invalid\n"
+msgstr "Schlüssel »%s« ist gültig\n"
+
+#: src/namestore/gnunet-namestore-zonefile.c:702
+#, fuzzy, c-format
+msgid "Failed to connect to NAMESTORE\n"
+msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
+
+#: src/namestore/gnunet-namestore-zonefile.c:709
+#, fuzzy, c-format
+msgid "Failed to connect to IDENTITY\n"
+msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
+
+#: src/namestore/gnunet-namestore-zonefile.c:735
+#: src/namestore/gnunet-namestore.c:1628
+msgid "name of the ego controlling the zone"
+msgstr ""
+
 #: src/namestore/gnunet-namestore.c:340
 #, c-format
 msgid "Adding record failed: %s\n"
@@ -5131,21 +5177,21 @@ msgid ""
 "expired"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1628
-msgid "name of the ego controlling the zone"
-msgstr ""
-
-#: src/namestore/gnunet-service-namestore.c:1504
+#: src/namestore/gnunet-service-namestore.c:1673
 #, fuzzy
 msgid "Error normalizing name."
 msgstr "Fehler beim Anlegen des Tunnels\n"
 
-#: src/namestore/gnunet-service-namestore.c:1522
+#: src/namestore/gnunet-service-namestore.c:1691
 #, fuzzy
 msgid "Error deserializing records."
 msgstr "=\tFehler beim Lesen des Verzeichnisses.\n"
 
-#: src/namestore/gnunet-service-namestore.c:1633
+#: src/namestore/gnunet-service-namestore.c:1811
+msgid "Not records to delete."
+msgstr ""
+
+#: src/namestore/gnunet-service-namestore.c:1819
 #, fuzzy
 msgid "Store failed"
 msgstr "Verbindung fehlgeschlagen: %s\n"
@@ -5158,24 +5204,39 @@ msgstr ""
 msgid "minimum expiration time we assume for imported records"
 msgstr ""
 
+#: src/namestore/plugin_namestore_flat.c:195
+#, c-format
+msgid "File too big to map: %llu bytes.\n"
+msgstr ""
+
+#: src/namestore/plugin_namestore_flat.c:219
+#, c-format
+msgid "Namestore database file `%s' malformed\n"
+msgstr ""
+
+#: src/namestore/plugin_namestore_flat.c:792
+#, fuzzy
+msgid "Flat file database running\n"
+msgstr "Sqlite-Datenbank läuft\n"
+
 #: src/namestore/plugin_namestore_sqlite.c:180
 #: src/namestore/plugin_namestore_sqlite.c:190
-#: src/namestore/plugin_namestore_sqlite.c:806
+#: src/namestore/plugin_namestore_sqlite.c:829
 #, fuzzy, c-format
 msgid "Failed to setup database with: `%s'\n"
 msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
 
-#: src/namestore/plugin_namestore_sqlite.c:797
+#: src/namestore/plugin_namestore_sqlite.c:820
 #, fuzzy, c-format
 msgid "Failed to drop database with: `%s'\n"
 msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
 
-#: src/namestore/plugin_namestore_sqlite.c:938
+#: src/namestore/plugin_namestore_sqlite.c:961
 #, fuzzy
 msgid "SQlite database running\n"
 msgstr "Sqlite-Datenbank läuft\n"
 
-#: src/namestore/plugin_rest_namestore.c:1369
+#: src/namestore/plugin_rest_namestore.c:1414
 #, fuzzy
 msgid "Namestore REST API initialized\n"
 msgstr " Verbindung fehlgeschlagen\n"
@@ -5494,7 +5555,7 @@ msgid "Show network size estimates from NSE service."
 msgstr ""
 
 #: src/nse/gnunet-service-nse.c:1441
-#: src/revocation/gnunet-service-revocation.c:888 src/util/gnunet-scrypt.c:243
+#: src/revocation/gnunet-service-revocation.c:888 src/util/gnunet-scrypt.c:242
 msgid "Value is too large.\n"
 msgstr ""
 
@@ -5572,19 +5633,19 @@ msgid "Print information about peers."
 msgstr "Informationen über andere GNUnet Knoten ausgeben."
 
 #: src/peerinfo-tool/gnunet-peerinfo_plugins.c:103
-#: src/transport/gnunet-service-transport_plugins.c:167
+#: src/transport/gnunet-service-transport_plugins.c:154
 #, fuzzy, c-format
 msgid "Starting transport plugins `%s'\n"
 msgstr "Teste Transport(e) %s\n"
 
 #: src/peerinfo-tool/gnunet-peerinfo_plugins.c:107
-#: src/transport/gnunet-service-transport_plugins.c:172
+#: src/transport/gnunet-service-transport_plugins.c:159
 #, fuzzy, c-format
 msgid "Loading `%s' transport plugin\n"
 msgstr "Teste Transport(e) %s\n"
 
 #: src/peerinfo-tool/gnunet-peerinfo_plugins.c:127
-#: src/transport/gnunet-service-transport_plugins.c:207
+#: src/transport/gnunet-service-transport_plugins.c:194
 #, fuzzy, c-format
 msgid "Failed to load transport plugin for `%s'\n"
 msgstr "Anwendung `%s' konnte nicht initialisiert werden.\n"
@@ -5646,7 +5707,7 @@ msgstr ""
 msgid "Skipping import of included HELLOs\n"
 msgstr ""
 
-#: src/peerinfo/peerinfo_api.c:217
+#: src/peerinfo/peerinfo_api.c:210
 #, fuzzy
 msgid "Failed to receive response from `PEERINFO' service."
 msgstr "Fehler beim Empfangen der Antwort von gnunetd auf die `%s' Nachricht\n"
@@ -5669,7 +5730,7 @@ msgstr ""
 msgid "Received a malformed response from service."
 msgstr "Beschädigte Antwort auf `%s' von Knoten `%s' empfangen.\n"
 
-#: src/peerstore/peerstore_api.c:790
+#: src/peerstore/peerstore_api.c:779
 msgid "Received a watch result for a non existing watch.\n"
 msgstr ""
 
@@ -5902,56 +5963,56 @@ msgstr ""
 msgid "Daemon to announce regular expressions for the peer using cadet."
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1366
+#: src/regex/gnunet-regex-profiler.c:1365
 msgid "No configuration file given. Exiting\n"
 msgstr "Keine Konfigurationsdatei angegeben. Abbruch\n"
 
-#: src/regex/gnunet-regex-profiler.c:1408
+#: src/regex/gnunet-regex-profiler.c:1407
 #: src/regex/gnunet-regex-simulation-profiler.c:631
 #, c-format
 msgid "No policy directory specified on command line. Exiting.\n"
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1414
+#: src/regex/gnunet-regex-profiler.c:1413
 #: src/regex/gnunet-regex-simulation-profiler.c:639
 #, c-format
 msgid "Specified policies directory does not exist. Exiting.\n"
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1422
+#: src/regex/gnunet-regex-profiler.c:1421
 #, c-format
 msgid "No files found in `%s'\n"
 msgstr "Keine Dateien in »%s« gefunden\n"
 
-#: src/regex/gnunet-regex-profiler.c:1431
+#: src/regex/gnunet-regex-profiler.c:1430
 msgid "No search strings file given. Exiting.\n"
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1451
+#: src/regex/gnunet-regex-profiler.c:1450
 msgid "Error loading search strings. Exiting.\n"
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1540
+#: src/regex/gnunet-regex-profiler.c:1539
 msgid "name of the file for writing statistics"
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1547
+#: src/regex/gnunet-regex-profiler.c:1546
 msgid "wait TIMEOUT before ending the experiment"
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1553
+#: src/regex/gnunet-regex-profiler.c:1552
 msgid "directory with policy files"
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1560
+#: src/regex/gnunet-regex-profiler.c:1559
 msgid "name of file with input strings"
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1567
+#: src/regex/gnunet-regex-profiler.c:1566
 msgid "name of file with hosts' names"
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1582
+#: src/regex/gnunet-regex-profiler.c:1581
 msgid "Profiler for regex"
 msgstr ""
 
@@ -5972,17 +6033,17 @@ msgstr ""
 msgid "Regex `%s' is too long!\n"
 msgstr ""
 
-#: src/regex/regex_api_search.c:212
+#: src/regex/regex_api_search.c:200
 #, fuzzy, c-format
 msgid "Search string `%s' is too long!\n"
 msgstr "Dienst »%s« läuft nicht\n"
 
-#: src/rest/gnunet-rest-server.c:1367
+#: src/rest/gnunet-rest-server.c:1366
 #, fuzzy
 msgid "GNUnet REST server"
 msgstr "GNUnet Netzwerk Topologie tracen."
 
-#: src/rest/plugin_rest_config.c:429
+#: src/rest/plugin_rest_config.c:428
 #, fuzzy
 msgid "CONFIG REST API initialized\n"
 msgstr " Verbindung fehlgeschlagen\n"
@@ -6183,63 +6244,63 @@ msgstr ""
 msgid "Get peers from biased stream"
 msgstr ""
 
-#: src/scalarproduct/gnunet-scalarproduct.c:229
+#: src/scalarproduct/gnunet-scalarproduct.c:228
 #, fuzzy
 msgid "You must specify at least one message ID to check!\n"
 msgstr "Sie müssen eine Liste von Dateien zum Einfügen angeben.\n"
 
-#: src/scalarproduct/gnunet-scalarproduct.c:237
+#: src/scalarproduct/gnunet-scalarproduct.c:236
 msgid "This program needs a session identifier for comparing vectors.\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-scalarproduct.c:250
+#: src/scalarproduct/gnunet-scalarproduct.c:249
 #, c-format
 msgid ""
 "Tried to set initiator mode, as peer ID was given. However, `%s' is not a "
 "valid peer identifier.\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-scalarproduct.c:268
+#: src/scalarproduct/gnunet-scalarproduct.c:267
 msgid "Need elements to compute the scalarproduct, got none.\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-scalarproduct.c:291
+#: src/scalarproduct/gnunet-scalarproduct.c:290
 #, c-format
 msgid "Malformed input, could not parse `%s'\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-scalarproduct.c:309
+#: src/scalarproduct/gnunet-scalarproduct.c:308
 #, fuzzy, c-format
 msgid "Could not convert `%s' to int64_t.\n"
 msgstr "Verbindung zu gnunetd konnte nicht hergestellt werden.\n"
 
-#: src/scalarproduct/gnunet-scalarproduct.c:339
+#: src/scalarproduct/gnunet-scalarproduct.c:338
 #, c-format
 msgid "Failed to initiate computation, were all keys unique?\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-scalarproduct.c:365
-#: src/scalarproduct/gnunet-scalarproduct.c:372
+#: src/scalarproduct/gnunet-scalarproduct.c:364
+#: src/scalarproduct/gnunet-scalarproduct.c:371
 msgid ""
 "A comma separated list of elements to compare as vector with our remote peer."
 msgstr ""
 
-#: src/scalarproduct/gnunet-scalarproduct.c:379
+#: src/scalarproduct/gnunet-scalarproduct.c:378
 msgid ""
 "[Optional] peer to calculate our scalarproduct with. If this parameter is "
 "not given, the service will wait for a remote peer to compute the request."
 msgstr ""
 
-#: src/scalarproduct/gnunet-scalarproduct.c:386
+#: src/scalarproduct/gnunet-scalarproduct.c:385
 msgid "Transaction ID shared with peer."
 msgstr ""
 
-#: src/scalarproduct/gnunet-scalarproduct.c:397
+#: src/scalarproduct/gnunet-scalarproduct.c:396
 msgid "Calculate the Vectorproduct with a GNUnet peer."
 msgstr ""
 
 #: src/scalarproduct/gnunet-service-scalarproduct-ecc_alice.c:1118
-#: src/scalarproduct/gnunet-service-scalarproduct-ecc_bob.c:1034
+#: src/scalarproduct/gnunet-service-scalarproduct-ecc_bob.c:1032
 #: src/scalarproduct/gnunet-service-scalarproduct_alice.c:1358
 #: src/scalarproduct/gnunet-service-scalarproduct_bob.c:1355
 #, fuzzy
@@ -6266,7 +6327,7 @@ msgstr ""
 msgid "also profile decryption"
 msgstr ""
 
-#: src/set/gnunet-service-set.c:1916 src/seti/gnunet-service-seti.c:2467
+#: src/set/gnunet-service-set.c:1914 src/seti/gnunet-service-seti.c:2467
 #: src/setu/gnunet-service-setu.c:5389
 #, fuzzy
 msgid "Could not connect to CADET service\n"
@@ -6324,16 +6385,16 @@ msgstr ""
 msgid "return intersection instead of delta"
 msgstr ""
 
-#: src/sq/sq.c:54
+#: src/sq/sq.c:47
 #, c-format
 msgid "Failure to bind %u-th SQL parameter\n"
 msgstr ""
 
-#: src/sq/sq.c:61
+#: src/sq/sq.c:54
 msgid "Failure in sqlite3_reset (!)\n"
 msgstr ""
 
-#: src/sq/sq.c:139
+#: src/sq/sq.c:126
 #, fuzzy, c-format
 msgid "Failed to reset sqlite statement with error: %s\n"
 msgstr ""
@@ -6541,57 +6602,57 @@ msgid ""
 "Cannot open %s for writing load statistics.  Not logging load statistics\n"
 msgstr ""
 
-#: src/testbed/gnunet-service-testbed_peers.c:1165
+#: src/testbed/gnunet-service-testbed_peers.c:1153
 #, c-format
 msgid "%s is stopped"
 msgstr "%s wurde gestoppt"
 
-#: src/testbed/gnunet-service-testbed_peers.c:1168
+#: src/testbed/gnunet-service-testbed_peers.c:1156
 #, c-format
 msgid "%s is starting"
 msgstr "%s startet"
 
-#: src/testbed/gnunet-service-testbed_peers.c:1171
+#: src/testbed/gnunet-service-testbed_peers.c:1159
 #, c-format
 msgid "%s is stopping"
 msgstr "%s wird gestoppt"
 
-#: src/testbed/gnunet-service-testbed_peers.c:1174
+#: src/testbed/gnunet-service-testbed_peers.c:1162
 #, c-format
 msgid "%s is starting already"
 msgstr "%s ist bereits gestartet"
 
-#: src/testbed/gnunet-service-testbed_peers.c:1177
+#: src/testbed/gnunet-service-testbed_peers.c:1165
 #, c-format
 msgid "%s is stopping already"
 msgstr "%s wird bereits gestoppt"
 
-#: src/testbed/gnunet-service-testbed_peers.c:1180
+#: src/testbed/gnunet-service-testbed_peers.c:1168
 #, c-format
 msgid "%s is started already"
 msgstr "%s ist bereits gestartet"
 
-#: src/testbed/gnunet-service-testbed_peers.c:1183
+#: src/testbed/gnunet-service-testbed_peers.c:1171
 #, c-format
 msgid "%s is stopped already"
 msgstr "%s ist bereits gestoppt"
 
-#: src/testbed/gnunet-service-testbed_peers.c:1186
+#: src/testbed/gnunet-service-testbed_peers.c:1174
 #, c-format
 msgid "%s service is not known to ARM"
 msgstr ""
 
-#: src/testbed/gnunet-service-testbed_peers.c:1189
+#: src/testbed/gnunet-service-testbed_peers.c:1177
 #, c-format
 msgid "%s service failed to start"
 msgstr "%s-Dienst konnte nicht gestartet werden"
 
-#: src/testbed/gnunet-service-testbed_peers.c:1192
+#: src/testbed/gnunet-service-testbed_peers.c:1180
 #, c-format
 msgid "%s service can't be started because ARM is shutting down"
 msgstr ""
 
-#: src/testbed/gnunet-service-testbed_peers.c:1194
+#: src/testbed/gnunet-service-testbed_peers.c:1182
 #, c-format
 msgid "%.s Unknown result code."
 msgstr ""
@@ -6612,17 +6673,17 @@ msgstr ""
 msgid "Adding host %u failed with error: %s\n"
 msgstr "`%s' an `%s' schlug fehl bei %s:%d mit dem Fehler: %s\n"
 
-#: src/testbed/testbed_api_hosts.c:429
+#: src/testbed/testbed_api_hosts.c:411
 #, fuzzy, c-format
 msgid "Hosts file %s not found\n"
 msgstr "`%s' fehlgeschlagen: Tabelle nicht gefunden!\n"
 
-#: src/testbed/testbed_api_hosts.c:438
+#: src/testbed/testbed_api_hosts.c:420
 #, c-format
 msgid "Hosts file %s has no data\n"
 msgstr ""
 
-#: src/testbed/testbed_api_hosts.c:447
+#: src/testbed/testbed_api_hosts.c:429
 #, c-format
 msgid "Hosts file %s cannot be read\n"
 msgstr ""
@@ -6636,88 +6697,88 @@ msgstr ""
 msgid "Host registration failed for a host. Error: %s\n"
 msgstr ""
 
-#: src/testbed/testbed_api_testbed.c:1065
+#: src/testbed/testbed_api_testbed.c:1060
 msgid "Controller crash detected. Shutting down.\n"
 msgstr ""
 
-#: src/testbed/testbed_api_testbed.c:1154
+#: src/testbed/testbed_api_testbed.c:1149
 #, c-format
 msgid "Host %s cannot start testbed\n"
 msgstr ""
 
-#: src/testbed/testbed_api_testbed.c:1158
+#: src/testbed/testbed_api_testbed.c:1153
 msgid "Testbed cannot be started on localhost\n"
 msgstr ""
 
-#: src/testbed/testbed_api_testbed.c:1196
+#: src/testbed/testbed_api_testbed.c:1191
 #, fuzzy
 msgid "Cannot start the master controller"
 msgstr "GNUnet testbed Controller starten."
 
-#: src/testbed/testbed_api_testbed.c:1214
+#: src/testbed/testbed_api_testbed.c:1209
 msgid "Shutting down testbed due to timeout while setup.\n"
 msgstr ""
 
-#: src/testbed/testbed_api_testbed.c:1276
+#: src/testbed/testbed_api_testbed.c:1271
 msgid "No hosts loaded. Need at least one host\n"
 msgstr ""
 
-#: src/testbed/testbed_api_testbed.c:1301
+#: src/testbed/testbed_api_testbed.c:1296
 msgid "Specified topology must be supported by testbed"
 msgstr ""
 
-#: src/testbed/testbed_api_testbed.c:1357
+#: src/testbed/testbed_api_testbed.c:1352
 #, c-format
 msgid ""
 "Maximum number of edges a peer can have in a scale free topology cannot be "
 "more than %u.  Given `%s = %llu'"
 msgstr ""
 
-#: src/testbed/testbed_api_testbed.c:1374
+#: src/testbed/testbed_api_testbed.c:1369
 #, c-format
 msgid ""
 "The number of edges that can established when adding a new node to scale "
 "free topology cannot be more than %u.  Given `%s = %llu'"
 msgstr ""
 
-#: src/testbed/testbed_api_topology.c:1033 src/testing/testing.c:2753
+#: src/testbed/testbed_api_topology.c:1021 src/testing/testing.c:2693
 #, c-format
 msgid "Topology file %s not found\n"
 msgstr ""
 
-#: src/testbed/testbed_api_topology.c:1041 src/testing/testing.c:2761
+#: src/testbed/testbed_api_topology.c:1029 src/testing/testing.c:2701
 #, c-format
 msgid "Topology file %s has no data\n"
 msgstr ""
 
-#: src/testbed/testbed_api_topology.c:1049 src/testing/testing.c:2769
+#: src/testbed/testbed_api_topology.c:1037 src/testing/testing.c:2709
 #, c-format
 msgid "Topology file %s cannot be read\n"
 msgstr ""
 
-#: src/testbed/testbed_api_topology.c:1071
+#: src/testbed/testbed_api_topology.c:1059
 #, fuzzy, c-format
 msgid "Failed to read peer index from toology file: %s"
 msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
 
-#: src/testbed/testbed_api_topology.c:1080
-#: src/testbed/testbed_api_topology.c:1105
+#: src/testbed/testbed_api_topology.c:1068
+#: src/testbed/testbed_api_topology.c:1093
 #, c-format
 msgid "Value in given topology file: %s out of range\n"
 msgstr ""
 
-#: src/testbed/testbed_api_topology.c:1086
-#: src/testbed/testbed_api_topology.c:1111
+#: src/testbed/testbed_api_topology.c:1074
+#: src/testbed/testbed_api_topology.c:1099
 #, fuzzy, c-format
 msgid "Failed to read peer index from topology file: %s"
 msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
 
-#: src/testbed/testbed_api_topology.c:1092
-#: src/testbed/testbed_api_topology.c:1117
+#: src/testbed/testbed_api_topology.c:1080
+#: src/testbed/testbed_api_topology.c:1105
 msgid "Topology file needs more peers than given ones\n"
 msgstr ""
 
-#: src/testbed/testbed_api_topology.c:1153
+#: src/testbed/testbed_api_topology.c:1141
 #, fuzzy, c-format
 msgid "Ignoring to connect peer %lu to peer %lu\n"
 msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
@@ -6814,7 +6875,7 @@ msgstr "Fehler beim Speichern der Konfigurationsdatei 
`%s':"
 msgid "Failed to start `%s': %s\n"
 msgstr "»%s« konnte nicht gestartet werden: %s\n"
 
-#: src/testing/testing.c:1694
+#: src/testing/testing.c:1646
 #, c-format
 msgid "Failed to load configuration from %s\n"
 msgstr "Konfiguration konnte nicht aus %s geladen werden\n"
@@ -6893,7 +6954,7 @@ msgstr ""
 #: src/transport/gnunet-communicator-tcp.c:3347
 #: src/transport/gnunet-communicator-udp.c:3871
 #: src/transport/gnunet-service-tng.c:11334
-#: src/transport/gnunet-service-transport.c:2622
+#: src/transport/gnunet-service-transport.c:2617
 msgid "Transport service is lacking key configuration settings. Exiting.\n"
 msgstr ""
 
@@ -6956,12 +7017,12 @@ msgstr ""
 msgid "Disallowing connection to peer `%s' on transport %s\n"
 msgstr "Anwendung `%s' konnte nicht initialisiert werden.\n"
 
-#: src/transport/gnunet-service-transport.c:2547
+#: src/transport/gnunet-service-transport.c:2542
 #, c-format
 msgid "Adding blacklisting entry for peer `%s'\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport.c:2556
+#: src/transport/gnunet-service-transport.c:2551
 #, c-format
 msgid "Adding blacklisting entry for peer `%s':`%s'\n"
 msgstr ""
@@ -6988,7 +7049,7 @@ msgid "# disconnects due to quota of 0"
 msgstr ""
 
 #: src/transport/gnunet-service-transport_neighbours.c:1341
-#: src/transport/gnunet-service-transport_neighbours.c:1817
+#: src/transport/gnunet-service-transport_neighbours.c:1807
 #, fuzzy
 msgid "# bytes in message queue for other peers"
 msgstr "# Bytes ausgehender Nachrichten verworfen"
@@ -7059,145 +7120,145 @@ msgstr "Verfolgt die Bandbreitennutzung von gnunetd"
 msgid "# ms throttling suggested"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1886
+#: src/transport/gnunet-service-transport_neighbours.c:1876
 #, fuzzy, c-format
 msgid "Failed to send SYN message to peer `%s'\n"
 msgstr "Fehler beim Parsen der Gerätedaten von `%s' bei %s:%d.\n"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1912
+#: src/transport/gnunet-service-transport_neighbours.c:1902
 msgid "# Failed attempts to switch addresses (failed to send SYN CONT)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1953
+#: src/transport/gnunet-service-transport_neighbours.c:1943
 #, fuzzy
 msgid "# SYN messages sent"
 msgstr "# DISCONNECT-Meldungen empfangen"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1970
+#: src/transport/gnunet-service-transport_neighbours.c:1960
 #, fuzzy, c-format
 msgid "Failed to transmit SYN message to %s\n"
 msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
 
-#: src/transport/gnunet-service-transport_neighbours.c:2006
+#: src/transport/gnunet-service-transport_neighbours.c:1996
 msgid "# Failed attempts to switch addresses (failed to send SYN)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:2077
+#: src/transport/gnunet-service-transport_neighbours.c:2067
 #, fuzzy, c-format
 msgid "Failed to send SYN_ACK message to peer `%s' using address `%s'\n"
 msgstr "Fehler beim Senden der `%s' Nachricht an gnunetd\n"
 
-#: src/transport/gnunet-service-transport_neighbours.c:2132
+#: src/transport/gnunet-service-transport_neighbours.c:2122
 #, fuzzy
 msgid "# SYN_ACK messages sent"
 msgstr "# verschlüsselter PONG Nachrichten gesendet"
 
-#: src/transport/gnunet-service-transport_neighbours.c:2150
+#: src/transport/gnunet-service-transport_neighbours.c:2140
 #, fuzzy, c-format
 msgid "Failed to transmit SYN_ACK message to %s\n"
 msgstr "Fehler beim Aktualisieren der Daten des Moduls `%s'\n"
 
-#: src/transport/gnunet-service-transport_neighbours.c:2314
+#: src/transport/gnunet-service-transport_neighbours.c:2304
 #, fuzzy
 msgid "# SYN messages received"
 msgstr "# PING Nachrichten erstellt"
 
-#: src/transport/gnunet-service-transport_neighbours.c:2320
+#: src/transport/gnunet-service-transport_neighbours.c:2310
 #, c-format
 msgid "SYN request from peer `%s' ignored due impending shutdown\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:2731
+#: src/transport/gnunet-service-transport_neighbours.c:2721
 msgid "# Attempts to switch addresses"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3244
+#: src/transport/gnunet-service-transport_neighbours.c:3227
 #, fuzzy
 msgid "# SYN_ACK messages received"
 msgstr "# SESSION_ACK-Meldungen empfangen"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3252
+#: src/transport/gnunet-service-transport_neighbours.c:3235
 #, fuzzy
 msgid "# unexpected SYN_ACK messages (no peer)"
 msgstr "# verschlüsselter PONG Nachrichten gesendet"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3272
-#: src/transport/gnunet-service-transport_neighbours.c:3300
+#: src/transport/gnunet-service-transport_neighbours.c:3255
+#: src/transport/gnunet-service-transport_neighbours.c:3283
 #, fuzzy
 msgid "# unexpected SYN_ACK messages (not ready)"
 msgstr "# verschlüsselter PONG Nachrichten gesendet"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3315
+#: src/transport/gnunet-service-transport_neighbours.c:3298
 #, fuzzy
 msgid "# unexpected SYN_ACK messages (waiting on ATS)"
 msgstr "# verschlüsselter PONG Nachrichten gesendet"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3345
+#: src/transport/gnunet-service-transport_neighbours.c:3328
 msgid "# Successful attempts to switch addresses"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3359
+#: src/transport/gnunet-service-transport_neighbours.c:3342
 #, fuzzy
 msgid "# unexpected SYN_ACK messages (disconnecting)"
 msgstr "# verschlüsselter PONG Nachrichten gesendet"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3548
+#: src/transport/gnunet-service-transport_neighbours.c:3531
 #, fuzzy
 msgid "# ACK messages received"
 msgstr "# CONNECT_ACK-Meldungen empfangen"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3582
+#: src/transport/gnunet-service-transport_neighbours.c:3565
 #, fuzzy
 msgid "# unexpected ACK messages"
 msgstr "# verschlüsselter PONG Nachrichten gesendet"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3672
+#: src/transport/gnunet-service-transport_neighbours.c:3648
 #, fuzzy
 msgid "# quota messages ignored (malformed)"
 msgstr "# gap Anfragen verworfen: Kollision in RT"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3679
+#: src/transport/gnunet-service-transport_neighbours.c:3655
 #, fuzzy
 msgid "# QUOTA messages received"
 msgstr "# verschlüsselter PONG Nachrichten empfangen"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3722
+#: src/transport/gnunet-service-transport_neighbours.c:3698
 msgid "# disconnect messages ignored (malformed)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3729
+#: src/transport/gnunet-service-transport_neighbours.c:3705
 #, fuzzy
 msgid "# DISCONNECT messages received"
 msgstr "# verschlüsselter PONG Nachrichten empfangen"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3742
+#: src/transport/gnunet-service-transport_neighbours.c:3718
 msgid "# disconnect messages ignored (timestamp)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3879
+#: src/transport/gnunet-service-transport_neighbours.c:3855
 msgid "# disconnected from peer upon explicit request"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_plugins.c:157
+#: src/transport/gnunet-service-transport_plugins.c:144
 msgid "Transport service is lacking NEIGHBOUR_LIMIT option.\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_plugins.c:222
-#: src/transport/gnunet-service-transport_plugins.c:230
-#: src/transport/gnunet-service-transport_plugins.c:238
-#: src/transport/gnunet-service-transport_plugins.c:246
-#: src/transport/gnunet-service-transport_plugins.c:254
-#: src/transport/gnunet-service-transport_plugins.c:262
-#: src/transport/gnunet-service-transport_plugins.c:270
-#: src/transport/gnunet-service-transport_plugins.c:278
-#: src/transport/gnunet-service-transport_plugins.c:286
-#: src/transport/gnunet-service-transport_plugins.c:294
-#: src/transport/gnunet-service-transport_plugins.c:302
+#: src/transport/gnunet-service-transport_plugins.c:209
+#: src/transport/gnunet-service-transport_plugins.c:217
+#: src/transport/gnunet-service-transport_plugins.c:225
+#: src/transport/gnunet-service-transport_plugins.c:233
+#: src/transport/gnunet-service-transport_plugins.c:241
+#: src/transport/gnunet-service-transport_plugins.c:249
+#: src/transport/gnunet-service-transport_plugins.c:257
+#: src/transport/gnunet-service-transport_plugins.c:265
+#: src/transport/gnunet-service-transport_plugins.c:273
+#: src/transport/gnunet-service-transport_plugins.c:281
+#: src/transport/gnunet-service-transport_plugins.c:289
 #, fuzzy, c-format
 msgid "Missing function `%s' in transport plugin for `%s'\n"
 msgstr "Anwendung `%s' konnte nicht initialisiert werden.\n"
 
-#: src/transport/gnunet-service-transport_plugins.c:309
+#: src/transport/gnunet-service-transport_plugins.c:296
 #, fuzzy, c-format
 msgid "Did not load plugin `%s' due to missing functions\n"
 msgstr "Fehler beim Laden des Plugins `%s' bei %s:%d. Plugin wird entladen.\n"
@@ -7472,7 +7533,7 @@ msgstr ""
 msgid "send data for benchmarking to the other peer (until CTRL-C)"
 msgstr ""
 
-#: src/transport/plugin_transport_http_client.c:1488
+#: src/transport/plugin_transport_http_client.c:1482
 #: src/transport/plugin_transport_http_server.c:2331
 #: src/transport/plugin_transport_http_server.c:3562
 #: src/transport/plugin_transport_tcp.c:3773
@@ -7480,24 +7541,24 @@ msgstr ""
 msgid "TCP_STEALTH not supported on this platform.\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_client.c:2134
+#: src/transport/plugin_transport_http_client.c:2128
 #, c-format
 msgid "Could not initialize curl multi handle, failed to start %s plugin!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_client.c:2183
+#: src/transport/plugin_transport_http_client.c:2177
 #: src/transport/plugin_transport_http_server.c:3276
 #, fuzzy, c-format
 msgid "Shutting down plugin `%s'\n"
 msgstr "Collection `%s' begonnen.\n"
 
-#: src/transport/plugin_transport_http_client.c:2200
+#: src/transport/plugin_transport_http_client.c:2194
 #: src/transport/plugin_transport_http_server.c:3346
 #, fuzzy, c-format
 msgid "Shutdown for plugin `%s' complete\n"
 msgstr "GNUnet wurde erfolgreich heruntergefahren.\n"
 
-#: src/transport/plugin_transport_http_client.c:2234
+#: src/transport/plugin_transport_http_client.c:2228
 #, fuzzy, c-format
 msgid "Maximum number of requests is %u\n"
 msgstr "Maximale Anzahl der Verbindungen ist %u\n"
@@ -7907,7 +7968,7 @@ msgstr "`%s' schlug fehl für Port %d: %s. Läuft gnunetd 
bereits?\n"
 msgid "`%s' failed for `%s': address already in use\n"
 msgstr "%s schlug fehl, Nachrichten Typ %d ist bereits in Verwendung.\n"
 
-#: src/transport/tcp_server_legacy.c:897
+#: src/transport/tcp_server_legacy.c:892
 #, c-format
 msgid ""
 "Processing code for message of type %u did not call "
@@ -8133,22 +8194,22 @@ msgstr ""
 msgid "INVALID"
 msgstr ""
 
-#: src/util/common_logging.c:1396
+#: src/util/common_logging.c:1360
 msgid "unknown address"
 msgstr "Unbekannte Adresse"
 
-#: src/util/common_logging.c:1441
+#: src/util/common_logging.c:1405
 msgid "invalid address"
 msgstr "Ungültige Adresse"
 
-#: src/util/common_logging.c:1453
+#: src/util/common_logging.c:1417
 #, fuzzy, c-format
 msgid "Configuration fails to specify option `%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/util/common_logging.c:1468
+#: src/util/common_logging.c:1432
 #, fuzzy, c-format
 msgid ""
 "Configuration specifies invalid value for option `%s' in section `%s': %s\n"
@@ -8302,12 +8363,12 @@ msgstr "IP des Hosts `%s' konnte nicht ermittelt 
werden: %s\n"
 msgid "Received DNS response that is too small (%u bytes)\n"
 msgstr ""
 
-#: src/util/dnsstub.c:508
+#: src/util/dnsstub.c:503
 #, fuzzy, c-format
 msgid "Failed to send DNS request to %s: %s\n"
 msgstr "HTTP Anfrage konnte nicht an Host `%s' gesendet werden: %s\n"
 
-#: src/util/dnsstub.c:513
+#: src/util/dnsstub.c:508
 #, c-format
 msgid "Sent DNS request to %s\n"
 msgstr ""
@@ -8691,28 +8752,28 @@ msgstr ""
 msgid "Use built-in GNUnet stub resolver"
 msgstr ""
 
-#: src/util/gnunet-scrypt.c:215
+#: src/util/gnunet-scrypt.c:214
 #, fuzzy, c-format
 msgid "Loading hostkey from `%s' failed.\n"
 msgstr "Das Parsen des Hello von `%s' schlug fehl.\n"
 
-#: src/util/gnunet-scrypt.c:281
+#: src/util/gnunet-scrypt.c:280
 msgid "number of bits to require for the proof of work"
 msgstr ""
 
-#: src/util/gnunet-scrypt.c:287
+#: src/util/gnunet-scrypt.c:286
 msgid "file with private key, otherwise default is used"
 msgstr ""
 
-#: src/util/gnunet-scrypt.c:293
+#: src/util/gnunet-scrypt.c:292
 msgid "file with proof of work, otherwise default is used"
 msgstr ""
 
-#: src/util/gnunet-scrypt.c:299
+#: src/util/gnunet-scrypt.c:298
 msgid "time to wait between calculations"
 msgstr ""
 
-#: src/util/gnunet-scrypt.c:313
+#: src/util/gnunet-scrypt.c:312
 msgid "Manipulate GNUnet proof of work files"
 msgstr ""
 
@@ -8744,17 +8805,17 @@ msgstr ""
 msgid "Perform default-actions for GNUnet URIs"
 msgstr ""
 
-#: src/util/helper.c:323
+#: src/util/helper.c:306
 #, c-format
 msgid "Error reading from `%s': %s\n"
 msgstr "Fehler beim Lesen von »%s«: %s\n"
 
-#: src/util/helper.c:375
+#: src/util/helper.c:358
 #, fuzzy, c-format
 msgid "Failed to parse inbound message from helper `%s'\n"
 msgstr "Fehler beim Parsen der Gerätedaten von `%s' bei %s:%d.\n"
 
-#: src/util/helper.c:606
+#: src/util/helper.c:573
 #, fuzzy, c-format
 msgid "Error writing to `%s': %s\n"
 msgstr "Verbindung zu %u.%u.%u.%u:%u fehlgeschlagen: %s\n"
@@ -8764,25 +8825,25 @@ msgstr "Verbindung zu %u.%u.%u.%u:%u fehlgeschlagen: 
%s\n"
 msgid "Unable to shorten unix path `%s' while keeping name unique\n"
 msgstr ""
 
-#: src/util/network.c:1307
+#: src/util/network.c:1284
 #, c-format
 msgid ""
 "Fatal internal logic error, process hangs in `%s' (abort with CTRL-C)!\n"
 msgstr ""
 
-#: src/util/os_installation.c:420
+#: src/util/os_installation.c:415
 #, c-format
 msgid ""
 "Could not determine installation path for %s.  Set `%s' environment "
 "variable.\n"
 msgstr ""
 
-#: src/util/os_installation.c:791
+#: src/util/os_installation.c:786
 #, 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:824
+#: src/util/os_installation.c:819
 #, c-format
 msgid "Binary `%s' exists, but is not SUID\n"
 msgstr ""
@@ -8828,7 +8889,7 @@ msgstr "Konfigurationsdatei `%s' wurde erzeugt.\n"
 msgid "Malformed configuration. Exiting ...\n"
 msgstr "GNUnet Konfiguration"
 
-#: src/util/regex.c:139
+#: src/util/regex.c:123
 #, c-format
 msgid "Bad mask: %d\n"
 msgstr ""
@@ -9146,26 +9207,16 @@ msgstr "Dienst wird über UDP angeboten"
 msgid "Setup tunnels via VPN."
 msgstr "Tunnel über VPN einrichten."
 
-#: src/zonemaster/gnunet-service-zonemaster-monitor.c:249
-#: src/zonemaster/gnunet-service-zonemaster.c:364
+#: src/zonemaster/gnunet-service-zonemaster.c:521
 #, c-format
 msgid "Failed to replicate block in namecache: %s\n"
 msgstr ""
 
-#: src/zonemaster/gnunet-service-zonemaster-monitor.c:529
-#: src/zonemaster/gnunet-service-zonemaster.c:969
+#: src/zonemaster/gnunet-service-zonemaster.c:1383
 #, fuzzy
 msgid "Failed to connect to the namestore!\n"
 msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
 
-#: src/zonemaster/gnunet-service-zonemaster-monitor.c:550
-msgid "Namecache is disabled!\n"
-msgstr ""
-
-#, fuzzy
-#~ msgid "Flat file database running\n"
-#~ msgstr "Sqlite-Datenbank läuft\n"
-
 #, fuzzy, c-format
 #~ msgid "Invalid DID `%s'\n"
 #~ msgstr "Ungültiger Parameter: `%s'\n"
@@ -9428,10 +9479,6 @@ msgstr ""
 #~ 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 connect to CREDENTIAL\n"
-#~ msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
-
 #, fuzzy
 #~ msgid "GNUnet credential resolver tool"
 #~ msgstr "GNUnet Netzwerk Topologie tracen."
diff --git a/po/es.po b/po/es.po
index 0b5d9ac39..ce83de043 100644
--- a/po/es.po
+++ b/po/es.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnunet 0.9.5a\n"
 "Report-Msgid-Bugs-To: gnunet-developers@mail.gnu.org\n"
-"POT-Creation-Date: 2022-10-16 18:47+0900\n"
+"POT-Creation-Date: 2022-10-21 13:20+0900\n"
 "PO-Revision-Date: 2013-02-23 17:50+0100\n"
 "Last-Translator: Miguel Ángel Arruga Vivas <rosen644835@gmail.com>\n"
 "Language-Team: Spanish <es@li.org>\n"
@@ -18,7 +18,10 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: src/abd/gnunet-abd.c:392 src/namestore/gnunet-namestore.c:1245
+#: src/abd/gnunet-abd.c:392 src/namestore/gnunet-namestore-zonefile.c:193
+#: src/namestore/gnunet-namestore-zonefile.c:652
+#: src/namestore/gnunet-namestore-zonefile.c:673
+#: src/namestore/gnunet-namestore.c:1245
 #, fuzzy, c-format
 msgid "Ego `%s' not known to identity service\n"
 msgstr "'%s': servicio desconocido: %s\n"
@@ -167,17 +170,17 @@ msgstr "Se produjo un fallo al borrar el fichero de 
configuración %s\n"
 msgid "Failed to remove servicehome directory %s\n"
 msgstr "Se produjo un fallo al eliminar el directorio «servicehome» %s.\n"
 
-#: src/arm/gnunet-arm.c:229 src/testbed/gnunet-service-testbed_peers.c:1144
+#: src/arm/gnunet-arm.c:229 src/testbed/gnunet-service-testbed_peers.c:1132
 #, fuzzy
 msgid "Message was sent successfully"
 msgstr "El almacén de nombres añadió el registro satisfactoriamente"
 
-#: src/arm/gnunet-arm.c:232 src/testbed/gnunet-service-testbed_peers.c:1147
+#: src/arm/gnunet-arm.c:232 src/testbed/gnunet-service-testbed_peers.c:1135
 #, fuzzy
 msgid "We disconnected from ARM before we could send a request"
 msgstr "# desconexiones del par debido a una petición explícita"
 
-#: src/arm/gnunet-arm.c:234 src/testbed/gnunet-service-testbed_peers.c:1149
+#: src/arm/gnunet-arm.c:234 src/testbed/gnunet-service-testbed_peers.c:1137
 #, fuzzy
 msgid "Unknown request status"
 msgstr "Usuario desconocido «%s»\n"
@@ -1431,153 +1434,153 @@ msgstr ""
 msgid "Core service of `%s' ready.\n"
 msgstr "El servicio principal de «%4s» está listo.\n"
 
-#: src/core/gnunet-service-core_kx.c:512
+#: src/core/gnunet-service-core_kx.c:513
 msgid "# bytes encrypted"
 msgstr "# bytes cifrados"
 
-#: src/core/gnunet-service-core_kx.c:570
+#: src/core/gnunet-service-core_kx.c:571
 msgid "# bytes decrypted"
 msgstr "# bytes descifrados"
 
-#: src/core/gnunet-service-core_kx.c:667
+#: src/core/gnunet-service-core_kx.c:668
 #, fuzzy
 msgid "# PAYLOAD dropped (out of order)"
 msgstr "# bytes omitidos (fuera de secuencia)"
 
-#: src/core/gnunet-service-core_kx.c:719
+#: src/core/gnunet-service-core_kx.c:720
 msgid "# key exchanges initiated"
 msgstr "# intercambio de claves iniciados"
 
-#: src/core/gnunet-service-core_kx.c:775
+#: src/core/gnunet-service-core_kx.c:776
 msgid "# key exchanges stopped"
 msgstr "# intercambio de claves parados"
 
-#: src/core/gnunet-service-core_kx.c:807
+#: src/core/gnunet-service-core_kx.c:808
 #, fuzzy
 msgid "# PING messages transmitted"
 msgstr "# mensajes PONG creados"
 
-#: src/core/gnunet-service-core_kx.c:866
+#: src/core/gnunet-service-core_kx.c:867
 msgid "# old ephemeral keys ignored"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:880
+#: src/core/gnunet-service-core_kx.c:881
 #, fuzzy
 msgid "# duplicate ephemeral keys ignored"
 msgstr "# mapas de tipos recibidos"
 
-#: src/core/gnunet-service-core_kx.c:915
+#: src/core/gnunet-service-core_kx.c:916
 #, fuzzy
 msgid "# EPHEMERAL_KEYs rejected (bad signature)"
 msgstr "# mensajes «SET_KEY» descifrados"
 
-#: src/core/gnunet-service-core_kx.c:933
+#: src/core/gnunet-service-core_kx.c:934
 #, c-format
 msgid ""
 "EPHEMERAL_KEY from peer `%s' rejected as its validity range does not match "
 "our system time (%llu not in [%llu,%llu]).\n"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:940
+#: src/core/gnunet-service-core_kx.c:941
 #, fuzzy
 msgid "# EPHEMERAL_KEY messages rejected due to time"
 msgstr "# mensajes «SET_KEY» descifrados"
 
-#: src/core/gnunet-service-core_kx.c:958
+#: src/core/gnunet-service-core_kx.c:959
 #, fuzzy
 msgid "# valid ephemeral keys received"
 msgstr "# mapas de tipos recibidos"
 
-#: src/core/gnunet-service-core_kx.c:1067
+#: src/core/gnunet-service-core_kx.c:1068
 #: src/transport/gnunet-service-transport_validation.c:1133
 msgid "# PING messages received"
 msgstr "# mensajes PING recibidos"
 
-#: src/core/gnunet-service-core_kx.c:1077
+#: src/core/gnunet-service-core_kx.c:1078
 #, fuzzy
 msgid "# PING messages dropped (out of order)"
 msgstr "# Mensajes P2P omitidos debido a saturación de la cola"
 
-#: src/core/gnunet-service-core_kx.c:1126
+#: src/core/gnunet-service-core_kx.c:1127
 msgid "# PONG messages created"
 msgstr "# mensajes PONG creados"
 
-#: src/core/gnunet-service-core_kx.c:1151
+#: src/core/gnunet-service-core_kx.c:1152
 msgid "# sessions terminated by timeout"
 msgstr "# sesiones terminadas por plazo de expiración"
 
-#: src/core/gnunet-service-core_kx.c:1164
+#: src/core/gnunet-service-core_kx.c:1165
 msgid "# keepalive messages sent"
 msgstr "# mensajes «keepalive» enviados"
 
-#: src/core/gnunet-service-core_kx.c:1221
+#: src/core/gnunet-service-core_kx.c:1222
 #: src/transport/gnunet-service-transport_validation.c:1476
 msgid "# PONG messages received"
 msgstr "# mensajes PONG recibidos"
 
-#: src/core/gnunet-service-core_kx.c:1229
+#: src/core/gnunet-service-core_kx.c:1230
 #, fuzzy
 msgid "# PONG messages dropped (connection down)"
 msgstr "# mensajes PONG recibidos"
 
-#: src/core/gnunet-service-core_kx.c:1237
+#: src/core/gnunet-service-core_kx.c:1238
 #, fuzzy
 msgid "# PONG messages dropped (out of order)"
 msgstr "# Mensajes P2P omitidos debido a saturación de la cola"
 
-#: src/core/gnunet-service-core_kx.c:1276
+#: src/core/gnunet-service-core_kx.c:1277
 msgid "# PONG messages decrypted"
 msgstr "# mensajes PONG descifrados"
 
-#: src/core/gnunet-service-core_kx.c:1316
+#: src/core/gnunet-service-core_kx.c:1317
 msgid "# session keys confirmed via PONG"
 msgstr "# claves de sesión confirmadas vía PONG"
 
-#: src/core/gnunet-service-core_kx.c:1328
+#: src/core/gnunet-service-core_kx.c:1329
 #, fuzzy
 msgid "# timeouts prevented via PONG"
 msgstr "# bytes recibidos vía TCP"
 
-#: src/core/gnunet-service-core_kx.c:1337
+#: src/core/gnunet-service-core_kx.c:1338
 msgid "# rekey operations confirmed via PONG"
 msgstr "# operaciones de cambio de clave confirmadas vía PONG"
 
-#: src/core/gnunet-service-core_kx.c:1506
+#: src/core/gnunet-service-core_kx.c:1507
 #, fuzzy
 msgid "# DATA message dropped (out of order)"
 msgstr "# bytes omitidos (fuera de secuencia)"
 
-#: src/core/gnunet-service-core_kx.c:1517
+#: src/core/gnunet-service-core_kx.c:1518
 #, c-format
 msgid ""
 "Session to peer `%s' went down due to key expiration (should not happen)\n"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1521
+#: src/core/gnunet-service-core_kx.c:1522
 #, fuzzy
 msgid "# sessions terminated by key expiration"
 msgstr "# sesiones terminadas por plazo de expiración"
 
-#: src/core/gnunet-service-core_kx.c:1599
-#: src/core/gnunet-service-core_kx.c:1626
+#: src/core/gnunet-service-core_kx.c:1600
+#: src/core/gnunet-service-core_kx.c:1627
 msgid "# bytes dropped (duplicates)"
 msgstr "# bytes omitidos (duplicados)"
 
-#: src/core/gnunet-service-core_kx.c:1612
+#: src/core/gnunet-service-core_kx.c:1613
 msgid "# bytes dropped (out of sequence)"
 msgstr "# bytes omitidos (fuera de secuencia)"
 
-#: src/core/gnunet-service-core_kx.c:1657
+#: src/core/gnunet-service-core_kx.c:1658
 msgid "# bytes dropped (ancient message)"
 msgstr "# bytes omitidos (mensaje antiguo)"
 
-#: src/core/gnunet-service-core_kx.c:1666
+#: src/core/gnunet-service-core_kx.c:1667
 msgid "# bytes of payload decrypted"
 msgstr "# bytes de «payload» descifrados"
 
 #: src/core/gnunet-service-core_sessions.c:252
 #: src/core/gnunet-service-core_sessions.c:337
-#: src/fs/gnunet-service-fs_cp.c:601 src/fs/gnunet-service-fs_cp.c:1496
+#: src/fs/gnunet-service-fs_cp.c:601 src/fs/gnunet-service-fs_cp.c:1494
 #: src/topology/gnunet-daemon-topology.c:579
 #: src/topology/gnunet-daemon-topology.c:671
 #: src/transport/gnunet-service-transport_neighbours.c:723
@@ -1815,7 +1818,7 @@ msgstr "Espacio insuficiente para satisfacer la petición"
 #: src/datastore/gnunet-service-datastore.c:626
 #: src/datastore/gnunet-service-datastore.c:677
 #: src/datastore/gnunet-service-datastore.c:820
-#: src/datastore/gnunet-service-datastore.c:1429
+#: src/datastore/gnunet-service-datastore.c:1428
 msgid "# reserved"
 msgstr "# reservado"
 
@@ -1862,12 +1865,12 @@ msgstr "Contenido no encontrado"
 msgid "# bytes removed (explicit request)"
 msgstr "# bytes eliminados (petición explícita)"
 
-#: src/datastore/gnunet-service-datastore.c:1059
+#: src/datastore/gnunet-service-datastore.c:1058
 msgid "# REMOVE requests received"
 msgstr "# peticiones «REMOVE» recibidas"
 
 # Miguel: ¿Cómo traducir «payload»? ¿Código cargado?
-#: src/datastore/gnunet-service-datastore.c:1108
+#: src/datastore/gnunet-service-datastore.c:1107
 #, fuzzy, c-format
 msgid ""
 "Datastore payload must have been inaccurate (%lld < %lld). Recomputing it.\n"
@@ -1875,63 +1878,63 @@ msgstr ""
 "El «payload» del almacén de datos es impreciso (%lld < %lld).  Intentando "
 "repararlo.\n"
 
-#: src/datastore/gnunet-service-datastore.c:1113
-#: src/datastore/gnunet-service-datastore.c:1282
+#: src/datastore/gnunet-service-datastore.c:1112
+#: src/datastore/gnunet-service-datastore.c:1281
 #, c-format
 msgid "New payload: %lld\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1168
+#: src/datastore/gnunet-service-datastore.c:1167
 #, c-format
 msgid "Loading `%s' datastore plugin\n"
 msgstr "Cargando el módulo del almacén de datos «%s»\n"
 
-#: src/datastore/gnunet-service-datastore.c:1177
+#: src/datastore/gnunet-service-datastore.c:1176
 #, c-format
 msgid "Failed to load datastore plugin for `%s'\n"
 msgstr ""
 "Se produjo un fallo al inicializar el módulo del almacén de datos para «%s»\n"
 
-#: src/datastore/gnunet-service-datastore.c:1237
+#: src/datastore/gnunet-service-datastore.c:1236
 msgid "Bloomfilter construction complete.\n"
 msgstr "Construcción de «bloomfilter» completa.\n"
 
-#: src/datastore/gnunet-service-datastore.c:1289
+#: src/datastore/gnunet-service-datastore.c:1288
 msgid "Rebuilding bloomfilter.  Please be patient.\n"
 msgstr "Reconstruyendo «bloomfilter».  Por favor, tenga paciencia.\n"
 
-#: src/datastore/gnunet-service-datastore.c:1299
+#: src/datastore/gnunet-service-datastore.c:1298
 msgid "Plugin does not support get_keys function. Please fix!\n"
 msgstr "El módulo no soporta la función «get_keys». Por favor, corríjalo.\n"
 
-#: src/datastore/gnunet-service-datastore.c:1464
+#: src/datastore/gnunet-service-datastore.c:1463
 #, c-format
 msgid "# bytes used in file-sharing datastore `%s'"
 msgstr "# bytes usados en el almacén de ficheros compartidos «%s»"
 
-#: src/datastore/gnunet-service-datastore.c:1473
+#: src/datastore/gnunet-service-datastore.c:1472
 msgid "# quota"
 msgstr "# cuota"
 
-#: src/datastore/gnunet-service-datastore.c:1476
+#: src/datastore/gnunet-service-datastore.c:1475
 msgid "# cache size"
 msgstr "# tamaño de la caché"
 
-#: src/datastore/gnunet-service-datastore.c:1492
+#: src/datastore/gnunet-service-datastore.c:1491
 #, c-format
 msgid "Could not use specified filename `%s' for bloomfilter.\n"
 msgstr ""
 "No se pudo usar el nombre de fichero especificado «%s» para «bloomfilter».\n"
 
-#: src/datastore/gnunet-service-datastore.c:1513
-#: src/datastore/gnunet-service-datastore.c:1535
+#: src/datastore/gnunet-service-datastore.c:1512
+#: src/datastore/gnunet-service-datastore.c:1534
 #, c-format
 msgid "Failed to remove bogus bloomfilter file `%s'\n"
 msgstr ""
 "Se produjo un fallo al borrar el fichero de configuración defectuoso de "
 "«bloomfilter» «%s»:\n"
 
-#: src/datastore/gnunet-service-datastore.c:1574
+#: src/datastore/gnunet-service-datastore.c:1573
 msgid "Failed to initialize bloomfilter.\n"
 msgstr "Se produjo un fallo al inicializar «bloomfilter».\n"
 
@@ -1983,7 +1986,7 @@ msgstr "«%s» falló en %s:%u con el error: %s"
 
 #: src/datastore/plugin_datastore_sqlite.c:310
 #: src/namecache/plugin_namecache_sqlite.c:180
-#: src/namestore/plugin_namestore_sqlite.c:868
+#: src/namestore/plugin_namestore_sqlite.c:891
 #: src/peerstore/plugin_peerstore_sqlite.c:540
 #, c-format
 msgid "Unable to initialize SQLite: %s.\n"
@@ -2254,7 +2257,7 @@ msgstr "# Paquetes UDP no-DNS recibidos vía interfaz TUN"
 msgid "# DNS requests received via TUN interface"
 msgstr "# Peticiones DNS recibidas vía interfaz TUN"
 
-#: src/dns/gnunet-service-dns.c:1117 src/exit/gnunet-daemon-exit.c:3708
+#: src/dns/gnunet-service-dns.c:1117 src/exit/gnunet-daemon-exit.c:3707
 msgid "need a valid IPv4 or IPv6 address\n"
 msgstr "se necesita una dirección IPv4 o IPv6 válida\n"
 
@@ -2404,36 +2407,36 @@ msgstr ""
 msgid "Packet from unknown protocol %u received.  Ignored.\n"
 msgstr "Recibido paquete de protocolo desconocido %u.  Ignorado.\n"
 
-#: src/exit/gnunet-daemon-exit.c:3377 src/exit/gnunet-daemon-exit.c:3388
+#: src/exit/gnunet-daemon-exit.c:3376 src/exit/gnunet-daemon-exit.c:3387
 #, fuzzy, c-format
 msgid "Option `%s' for domain `%s' is not formatted correctly!\n"
 msgstr "Las opción «%s» o «%s» es necesaria.\n"
 
-#: src/exit/gnunet-daemon-exit.c:3402 src/exit/gnunet-daemon-exit.c:3410
+#: src/exit/gnunet-daemon-exit.c:3401 src/exit/gnunet-daemon-exit.c:3409
 #, c-format
 msgid "`%s' is not a valid port number (for domain `%s')!"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3452
+#: src/exit/gnunet-daemon-exit.c:3451
 #, c-format
 msgid "No addresses found for hostname `%s' of service `%s'!\n"
 msgstr ""
 "¡No se encontraron direcciones para el nombre de máquina «%s» del servicio "
 "«%s»!\n"
 
-#: src/exit/gnunet-daemon-exit.c:3467 src/exit/gnunet-daemon-exit.c:3482
+#: src/exit/gnunet-daemon-exit.c:3466 src/exit/gnunet-daemon-exit.c:3481
 #, c-format
 msgid "Service `%s' configured for IPv4, but IPv4 is disabled!\n"
 msgstr "¡Servicio «%s» configurado para IPv4, pero IPv4 está deshabilitado!\n"
 
-#: src/exit/gnunet-daemon-exit.c:3496
+#: src/exit/gnunet-daemon-exit.c:3495
 #, c-format
 msgid "No IP addresses found for hostname `%s' of service `%s'!\n"
 msgstr ""
 "¡No se encontraron direcciones IP para el nombre de máquina «%s» del "
 "servicio «%s»!\n"
 
-#: src/exit/gnunet-daemon-exit.c:3641
+#: src/exit/gnunet-daemon-exit.c:3640
 msgid ""
 "This system does not support IPv4, will disable IPv4 functions despite them "
 "being enabled in the configuration\n"
@@ -2441,7 +2444,7 @@ msgstr ""
 "Este sistema no soporta IPv4, se deshabilitarán las funciones IPv4 aunque "
 "estén habilitadas en la configuración\n"
 
-#: src/exit/gnunet-daemon-exit.c:3650
+#: src/exit/gnunet-daemon-exit.c:3649
 msgid ""
 "This system does not support IPv6, will disable IPv6 functions despite them "
 "being enabled in the configuration\n"
@@ -2449,7 +2452,7 @@ msgstr ""
 "Este sistema no soporta IPv6, se deshabilitarán las funciones IPv6 aunque "
 "estén habilitadas en la configuración\n"
 
-#: src/exit/gnunet-daemon-exit.c:3658
+#: src/exit/gnunet-daemon-exit.c:3657
 msgid ""
 "Cannot enable IPv4 exit but disable IPv4 on TUN interface, will use "
 "ENABLE_IPv4=YES\n"
@@ -2457,7 +2460,7 @@ msgstr ""
 "No se puede habilitar salida IPv4 pero se deshabilita IPv4 sobre interfaz "
 "TUN, se usará ENABLE_IPv4=YES\n"
 
-#: src/exit/gnunet-daemon-exit.c:3665
+#: src/exit/gnunet-daemon-exit.c:3664
 msgid ""
 "Cannot enable IPv6 exit but disable IPv6 on TUN interface, will use "
 "ENABLE_IPv6=YES\n"
@@ -2465,20 +2468,20 @@ msgstr ""
 "No se pudo habilitar la salida IPv6 pero se deshabilita IPv6 sobre interfaz "
 "TUN, se usará ENABLE_IPv6=YES\n"
 
-#: src/exit/gnunet-daemon-exit.c:3836
+#: src/exit/gnunet-daemon-exit.c:3835
 msgid "Must be a number"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3952
+#: src/exit/gnunet-daemon-exit.c:3951
 #, fuzzy, c-format
 msgid "`%s' is not SUID or the path is invalid, EXIT will not work\n"
 msgstr "«%s» debe ser instalado con SUID, se niega a arrancar\n"
 
-#: src/exit/gnunet-daemon-exit.c:3964 src/pt/gnunet-daemon-pt.c:1212
+#: src/exit/gnunet-daemon-exit.c:3963 src/pt/gnunet-daemon-pt.c:1212
 msgid "No useful service enabled.  Exiting.\n"
 msgstr "Ningún servicio útil habilitado.  Saliendo.\n"
 
-#: src/exit/gnunet-daemon-exit.c:4118
+#: src/exit/gnunet-daemon-exit.c:4117
 msgid "Daemon to run to provide an IP exit node for the VPN"
 msgstr "Demonio a ejecutar para obtener un nodo de salida IP para la VPN"
 
@@ -2682,7 +2685,7 @@ msgstr ""
 msgid "internal error decoding tree"
 msgstr "error interno decodificando árbol"
 
-#: src/fs/fs_download.c:1890
+#: src/fs/fs_download.c:1889
 msgid "Invalid URI"
 msgstr "URI no válida"
 
@@ -2703,7 +2706,7 @@ msgid "Failed to receive response from `%s' service.\n"
 msgstr ""
 "No se obtuvo respuesta del servicio de información de pares (PEERINFO)."
 
-#: src/fs/fs_list_indexed.c:195
+#: src/fs/fs_list_indexed.c:187
 #, c-format
 msgid "Failed to not connect to `%s' service.\n"
 msgstr "Se produjo un fallo al conectar con el servicio «%s».\n"
@@ -2728,7 +2731,7 @@ msgstr "Se produjo un fallo al escribir «%s»: %s\n"
 msgid "Failed to read `%s': %s\n"
 msgstr "Se produjo un fallo al escribir «%s»: %s\n"
 
-#: src/fs/fs_namespace.c:472
+#: src/fs/fs_namespace.c:457
 msgid "Failed to connect to datastore."
 msgstr "Se produjo un fallo al conectar con el almacén de datos."
 
@@ -2868,108 +2871,108 @@ msgid "Failed to compute hash of file."
 msgstr "Se produjo un fallo al calcular el hash del fichero."
 
 # Cadena erronea, corregida en SVN.
-#: src/fs/fs_uri.c:239
+#: src/fs/fs_uri.c:231
 #, fuzzy, no-c-format
 msgid "Malformed KSK URI (`%' must be followed by HEX number)"
 msgstr "'%' debe ser seguido por un número hexadecimal"
 
-#: src/fs/fs_uri.c:298
+#: src/fs/fs_uri.c:290
 msgid "Malformed KSK URI (must not begin or end with `+')"
 msgstr "URI KSK mal formada (no debe empezar ni terminar con «+»)"
 
-#: src/fs/fs_uri.c:316
+#: src/fs/fs_uri.c:308
 #, fuzzy
 msgid "Malformed KSK URI (`++' not allowed)"
 msgstr "URI KSK mal formada (no debe empezar ni terminar con «+»)"
 
-#: src/fs/fs_uri.c:323
+#: src/fs/fs_uri.c:315
 #, fuzzy
 msgid "Malformed KSK URI (quotes not balanced)"
 msgstr "URI KSK mal formada (no debe empezar ni terminar con «+»)"
 
-#: src/fs/fs_uri.c:390
+#: src/fs/fs_uri.c:382
 #, fuzzy
 msgid "Malformed SKS URI (wrong syntax)"
 msgstr "URI SKS mal formada"
 
-#: src/fs/fs_uri.c:431
+#: src/fs/fs_uri.c:423
 #, fuzzy
 msgid "Malformed CHK URI (wrong syntax)"
 msgstr "URI CHK mal formada"
 
-#: src/fs/fs_uri.c:448
+#: src/fs/fs_uri.c:440
 msgid "Malformed CHK URI (failed to decode CHK)"
 msgstr ""
 
-#: src/fs/fs_uri.c:525
+#: src/fs/fs_uri.c:517
 #, fuzzy
 msgid "LOC URI malformed (wrong syntax)"
 msgstr "URI SKS mal formada"
 
-#: src/fs/fs_uri.c:542
+#: src/fs/fs_uri.c:534
 #, fuzzy
 msgid "LOC URI malformed (no CHK)"
 msgstr "URI SKS mal formada"
 
-#: src/fs/fs_uri.c:552
+#: src/fs/fs_uri.c:544
 #, fuzzy
 msgid "LOC URI malformed (missing LOC)"
 msgstr "URI SKS mal formada"
 
-#: src/fs/fs_uri.c:560
+#: src/fs/fs_uri.c:552
 #, fuzzy
 msgid "LOC URI malformed (wrong syntax for public key)"
 msgstr "URI SKS mal formada (no se pudo decodificar la clave pública)"
 
-#: src/fs/fs_uri.c:569
+#: src/fs/fs_uri.c:561
 #, fuzzy
 msgid "LOC URI malformed (could not decode public key)"
 msgstr "URI SKS mal formada (no se pudo decodificar la clave pública)"
 
-#: src/fs/fs_uri.c:575
+#: src/fs/fs_uri.c:567
 #, fuzzy
 msgid "LOC URI malformed (could not find signature)"
 msgstr "URI SKS mal formada (no se pudo encontrar la firma)"
 
-#: src/fs/fs_uri.c:582
+#: src/fs/fs_uri.c:574
 #, fuzzy
 msgid "LOC URI malformed (wrong syntax for signature)"
 msgstr "URI SKS mal formada (no se pudo encontrar la firma)"
 
-#: src/fs/fs_uri.c:593
+#: src/fs/fs_uri.c:585
 #, fuzzy
 msgid "LOC URI malformed (could not decode signature)"
 msgstr "URI SKS mal formada (no se pudo decodificar la firma)"
 
-#: src/fs/fs_uri.c:600
+#: src/fs/fs_uri.c:592
 #, fuzzy
 msgid "LOC URI malformed (wrong syntax for expiration time)"
 msgstr "URI SKS mal formada (no se encuentra el tiempo de expiración)"
 
-#: src/fs/fs_uri.c:606
+#: src/fs/fs_uri.c:598
 #, fuzzy
 msgid "LOC URI malformed (could not parse expiration time)"
 msgstr "URI SKS mal formada (no se encuentra el tiempo de expiración)"
 
-#: src/fs/fs_uri.c:620
+#: src/fs/fs_uri.c:612
 #, fuzzy
 msgid "LOC URI malformed (signature failed validation)"
 msgstr "URI SKS mal formada (se produjo un fallo al validar la firma)"
 
-#: src/fs/fs_uri.c:653
+#: src/fs/fs_uri.c:645
 #, fuzzy
 msgid "invalid argument"
 msgstr "Parámetro no válido «%s»\n"
 
-#: src/fs/fs_uri.c:673
+#: src/fs/fs_uri.c:665
 msgid "Unrecognized URI type"
 msgstr "Tipo de URI no reconocido"
 
-#: src/fs/fs_uri.c:1077 src/fs/fs_uri.c:1104
+#: src/fs/fs_uri.c:1060 src/fs/fs_uri.c:1087
 msgid "No keywords specified!\n"
 msgstr "¡Ninguna palabra clave especificada!\n"
 
-#: src/fs/fs_uri.c:1110
+#: src/fs/fs_uri.c:1093
 msgid "Number of double-quotes not balanced!\n"
 msgstr "¡Número de comillas dobles no balanceado!\n"
 
@@ -3585,7 +3588,7 @@ msgid "# cadet client connections rejected"
 msgstr "# conexiones de clientes «stream» rechazadas"
 
 #: src/fs/gnunet-service-fs_cadet_server.c:394
-#: src/fs/gnunet-service-fs_cadet_server.c:434
+#: src/fs/gnunet-service-fs_cadet_server.c:433
 #, fuzzy
 msgid "# cadet connections active"
 msgstr "# conexiones «stream» activas"
@@ -3644,7 +3647,7 @@ msgstr "# peticiones omitidas debido a expiración del TTL"
 msgid "# P2P query messages received and processed"
 msgstr "# mensajes de búsqueda P2P recibidos y procesados"
 
-#: src/fs/gnunet-service-fs_cp.c:1679
+#: src/fs/gnunet-service-fs_cp.c:1677
 msgid "# migration stop messages sent"
 msgstr "# mensajes de detención de migración enviados"
 
@@ -3942,8 +3945,8 @@ msgstr ""
 #: src/hostlist/gnunet-daemon-hostlist_client.c:957
 #: src/hostlist/gnunet-daemon-hostlist_client.c:1059
 #: src/hostlist/gnunet-daemon-hostlist_client.c:1067
-#: src/transport/plugin_transport_http_client.c:600
-#: src/transport/plugin_transport_http_client.c:618
+#: src/transport/plugin_transport_http_client.c:599
+#: src/transport/plugin_transport_http_client.c:617
 #, c-format
 msgid "%s failed at %s:%d: `%s'\n"
 msgstr "%s falló en %s:%d: «%s».\n"
@@ -4008,7 +4011,7 @@ msgstr "No se pudo importar el certificado %s\n"
 msgid "Failed to start HTTPS server for `%s'\n"
 msgstr "Se produjo un fallo al iniciar el servidor HTTP\n"
 
-#: src/gns/gnunet-gns-proxy.c:2919 src/rest/gnunet-rest-server.c:958
+#: src/gns/gnunet-gns-proxy.c:2919 src/rest/gnunet-rest-server.c:957
 #, fuzzy
 msgid "Failed to pass client to MHD\n"
 msgstr "Se produjo un fallo al conectar con GNS\n"
@@ -4028,24 +4031,24 @@ msgstr "Tipo de bloque %u no soportado\n"
 msgid "Unsupported socks address type %d\n"
 msgstr "Tipo de bloque %u no soportado\n"
 
-#: src/gns/gnunet-gns-proxy.c:3727
+#: src/gns/gnunet-gns-proxy.c:3726
 #, fuzzy, c-format
 msgid "Failed to load X.509 key and certificate from `%s'\n"
 msgstr "Se produjo un fallo al leer la lista de amigos de «%s»\n"
 
-#: src/gns/gnunet-gns-proxy.c:3869
+#: src/gns/gnunet-gns-proxy.c:3868
 msgid "listen on specified port (default: 7777)"
 msgstr "escuchar en el puerto especificado (predeterminado: 7777)"
 
-#: src/gns/gnunet-gns-proxy.c:3874
+#: src/gns/gnunet-gns-proxy.c:3873
 msgid "pem file to use as CA"
 msgstr "fichero pem para usar como autoridad de certificación (CA)"
 
-#: src/gns/gnunet-gns-proxy.c:3878
+#: src/gns/gnunet-gns-proxy.c:3877
 msgid "disable use of IPv6"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:3904
+#: src/gns/gnunet-gns-proxy.c:3903
 msgid "GNUnet GNS proxy"
 msgstr "Proxy GNUnet GNS"
 
@@ -4096,21 +4099,19 @@ msgstr ""
 msgid "GNUnet GNS resolver tool"
 msgstr "Herramienta de acceso GNUnet GNS"
 
-#: src/gns/gnunet-service-gns.c:501
+#: src/gns/gnunet-service-gns.c:500
 #, fuzzy
 msgid "Properly base32-encoded public key required"
 msgstr "Tipo requerido\n"
 
-#: src/gns/gnunet-service-gns.c:537
-#: src/zonemaster/gnunet-service-zonemaster-monitor.c:542
-#: src/zonemaster/gnunet-service-zonemaster.c:982
+#: src/gns/gnunet-service-gns.c:536
+#: src/zonemaster/gnunet-service-zonemaster.c:1396
 #, fuzzy
 msgid "Failed to connect to the namecache!\n"
 msgstr "¡Se produjo un fallo al conectar con el almacén de nombres!\n"
 
-#: src/gns/gnunet-service-gns.c:556
-#: src/zonemaster/gnunet-service-zonemaster-monitor.c:572
-#: src/zonemaster/gnunet-service-zonemaster.c:1021
+#: src/gns/gnunet-service-gns.c:555
+#: src/zonemaster/gnunet-service-zonemaster.c:1435
 msgid "Could not connect to DHT!\n"
 msgstr "¡No se pudo conectar a la DHT!\n"
 
@@ -4235,31 +4236,31 @@ msgstr ""
 msgid "Label  contains `.' which is not allowed\n"
 msgstr ""
 
-#: src/gnsrecord/gnsrecord_misc.c:467
+#: src/gnsrecord/gnsrecord_misc.c:481
 msgid "Zone delegation record not allowed in apex."
 msgstr ""
 
-#: src/gnsrecord/gnsrecord_misc.c:475
+#: src/gnsrecord/gnsrecord_misc.c:489
 msgid "Zone delegation record set contains mutually exclusive records."
 msgstr ""
 
-#: src/gnsrecord/gnsrecord_misc.c:485
+#: src/gnsrecord/gnsrecord_misc.c:499
 msgid "Multiple REDIRECT records."
 msgstr ""
 
-#: src/gnsrecord/gnsrecord_misc.c:494 src/gnsrecord/gnsrecord_misc.c:520
+#: src/gnsrecord/gnsrecord_misc.c:508 src/gnsrecord/gnsrecord_misc.c:534
 msgid "Redirection record set contains mutually exclusive records."
 msgstr ""
 
-#: src/gnsrecord/gnsrecord_misc.c:501
+#: src/gnsrecord/gnsrecord_misc.c:515
 msgid "Redirection records not allowed in apex."
 msgstr ""
 
-#: src/gnsrecord/gnsrecord_misc.c:512
+#: src/gnsrecord/gnsrecord_misc.c:526
 msgid "Redirection records not allowed in apex.."
 msgstr ""
 
-#: src/gnsrecord/gnsrecord_misc.c:534
+#: src/gnsrecord/gnsrecord_misc.c:548
 msgid "Mutually exclusive records."
 msgstr ""
 
@@ -4385,39 +4386,39 @@ msgstr "Error escribiendo «HELLO» al fichero «%s»: %s\n"
 msgid "Modified %u addresses, wrote %u bytes\n"
 msgstr ""
 
-#: src/hello/hello.c:1111
+#: src/hello/hello.c:1089
 msgid "Failed to parse HELLO message: missing expiration time\n"
 msgstr ""
 "Se produjo un fallo al procesar un mensaje «HELLO»: falta el tiempo de "
 "expiración\n"
 
-#: src/hello/hello.c:1121
+#: src/hello/hello.c:1099
 msgid "Failed to parse HELLO message: invalid expiration time\n"
 msgstr ""
 "Se produjo un fallo al procesar un mensaje «HELLO»: tiempo de expiración no "
 "válido\n"
 
-#: src/hello/hello.c:1131
+#: src/hello/hello.c:1109
 msgid "Failed to parse HELLO message: malformed\n"
 msgstr "Se produjo un fallo al procesar un mensaje «HELLO»: mal formado\n"
 
-#: src/hello/hello.c:1143
+#: src/hello/hello.c:1121
 msgid "Failed to parse HELLO message: missing transport plugin\n"
 msgstr ""
 "Se produjo un fallo al procesar un mensaje «HELLO»: falta el módulo de "
 "transporte\n"
 
-#: src/hello/hello.c:1161
+#: src/hello/hello.c:1139
 #, fuzzy, c-format
 msgid "Plugin `%s' not found, skipping address\n"
 msgstr "Módulo «%s» no encontrado\n"
 
-#: src/hello/hello.c:1169
+#: src/hello/hello.c:1147
 #, c-format
 msgid "Plugin `%s' does not support URIs yet\n"
 msgstr "El módulo «%s» no soporta URI todavía\n"
 
-#: src/hello/hello.c:1184
+#: src/hello/hello.c:1162
 #, c-format
 msgid "Failed to parse `%s' as an address for plugin `%s'\n"
 msgstr ""
@@ -4476,7 +4477,7 @@ msgid "# valid HELLOs downloaded from hostlist servers"
 msgstr "# «HELLO» válidos descargados de servidores de listas de máquinas"
 
 #: src/hostlist/gnunet-daemon-hostlist_client.c:677
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1453
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1451
 msgid "# advertised hostlist URIs"
 msgstr "# URI de listas de máquinas anunciadas"
 
@@ -4530,7 +4531,7 @@ msgid "# hostlist downloads initiated"
 msgstr "# descargas de listas de máquinas iniciadas"
 
 #: src/hostlist/gnunet-daemon-hostlist_client.c:1137
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1725
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1723
 msgid "# milliseconds between hostlist downloads"
 msgstr "# milisegundos entre descargas de listas de máquinas"
 
@@ -4545,69 +4546,69 @@ msgstr ""
 msgid "# active connections"
 msgstr "# conexiones activas"
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1389
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1387
 #, c-format
 msgid "Loading saved hostlist entries from file `%s' \n"
 msgstr "Cargando entradas guardadas de listas de máquinas del fichero «%s»\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1394
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1392
 #, c-format
 msgid "Hostlist file `%s' does not exist\n"
 msgstr "El fichero de listas de máquinas «%s» no existe\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1405
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1403
 #, c-format
 msgid "Could not open file `%s' for reading to load hostlists: %s\n"
 msgstr ""
 "No se pudo abrir el fichero «%s» en modo lectura para cargar las listas de "
 "máquinas: %s\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1446
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1444
 #, c-format
 msgid "%u hostlist URIs loaded from file\n"
 msgstr "%u URI de listas de máquinas cargadas del fichero\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1449
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1447
 msgid "# hostlist URIs read from file"
 msgstr "# URI de listas de máquinas leídas de fichero"
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1500
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1498
 #, c-format
 msgid "Could not open file `%s' for writing to save hostlists: %s\n"
 msgstr ""
 "No se pudo abrir el fichero «%s» en modo escritura para almacenar las listas "
 "de máquinas: %s\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1507
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1505
 #, c-format
 msgid "Writing %u hostlist URIs to `%s'\n"
 msgstr "Escribiendo %u URI de listas de máquinas a «%s»\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1540
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1559
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1538
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1557
 #, c-format
 msgid "Error writing hostlist URIs to file `%s'\n"
 msgstr "Error escribiendo URI de listas de máquinas al fichero «%s»\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1553
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1551
 msgid "# hostlist URIs written to file"
 msgstr "# URI de listas de máquinas escritas a fichero"
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1654
-#: src/transport/plugin_transport_http_client.c:2294
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1652
+#: src/transport/plugin_transport_http_client.c:2288
 #, c-format
 msgid "Invalid proxy type: `%s', disabling proxy! Check configuration!\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1683
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1681
 msgid "Learning is enabled on this peer\n"
 msgstr "El aprendizaje está habilitado en este par\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1696
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1694
 msgid "Learning is not enabled on this peer\n"
 msgstr "El aprendizaje no está habilitado en este par\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1710
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1708
 #, c-format
 msgid ""
 "Since learning is not enabled on this peer, hostlist file `%s' was removed\n"
@@ -4683,7 +4684,7 @@ msgid "# hostlist advertisements send"
 msgstr "# anuncios de listas de máquinas enviados"
 
 #: src/hostlist/gnunet-daemon-hostlist_server.c:674
-#: src/transport/gnunet-service-transport.c:2657
+#: src/transport/gnunet-service-transport.c:2652
 msgid "Could not access PEERINFO service.  Exiting.\n"
 msgstr ""
 "No se pudo acceder al servicio de información de pares (PEERINFO).  "
@@ -4811,51 +4812,51 @@ msgstr ""
 msgid "Maintain egos"
 msgstr ""
 
-#: src/identity/gnunet-service-identity.c:502
+#: src/identity/gnunet-service-identity.c:501
 msgid "no default known"
 msgstr ""
 
-#: src/identity/gnunet-service-identity.c:527
+#: src/identity/gnunet-service-identity.c:526
 msgid "default configured, but ego unknown (internal error)"
 msgstr ""
 
-#: src/identity/gnunet-service-identity.c:620
-#: src/identity/gnunet-service-identity.c:895
-#: src/identity/gnunet-service-identity.c:1015
+#: src/identity/gnunet-service-identity.c:618
+#: src/identity/gnunet-service-identity.c:891
+#: src/identity/gnunet-service-identity.c:1010
 #, fuzzy, c-format
 msgid "Failed to write subsystem default identifier map to `%s'.\n"
 msgstr ""
 "Se produjo un fallo al obtener los identificadores de fichero para «%s»\n"
 
-#: src/identity/gnunet-service-identity.c:630
+#: src/identity/gnunet-service-identity.c:628
 msgid "Unknown ego specified for service (internal error)"
 msgstr ""
 
-#: src/identity/gnunet-service-identity.c:724
+#: src/identity/gnunet-service-identity.c:721
 msgid "identifier already in use for another ego"
 msgstr ""
 
-#: src/identity/gnunet-service-identity.c:871
+#: src/identity/gnunet-service-identity.c:867
 #, fuzzy
 msgid "target name already exists"
 msgstr "El registro ya existía en el almacén de nombres"
 
-#: src/identity/gnunet-service-identity.c:913
-#: src/identity/gnunet-service-identity.c:1032
+#: src/identity/gnunet-service-identity.c:909
+#: src/identity/gnunet-service-identity.c:1027
 msgid "no matching ego found"
 msgstr ""
 
-#: src/identity/gnunet-service-identity.c:1130
+#: src/identity/gnunet-service-identity.c:1125
 #, fuzzy, c-format
 msgid "Failed to parse ego information in `%s'\n"
 msgstr "Se produjo un fallo al procesar la identidad del par «%s»\n"
 
-#: src/identity/gnunet-service-identity.c:1188
+#: src/identity/gnunet-service-identity.c:1183
 #, fuzzy, c-format
 msgid "Failed to parse subsystem identity configuration file `%s'\n"
 msgstr "Se produjo un fallo al borrar el fichero de configuración %s\n"
 
-#: src/identity/gnunet-service-identity.c:1197
+#: src/identity/gnunet-service-identity.c:1192
 #, fuzzy, c-format
 msgid "Failed to create directory `%s' for storing egos\n"
 msgstr "Se produjo un fallo al leer el directorio «%s»\n"
@@ -4935,19 +4936,21 @@ msgstr "Especificar el tipo del registro a buscar"
 msgid "GNUnet zone manipulation tool"
 msgstr "Herramienta de manipulación de zona de GNUnet"
 
-#: src/namecache/namecache_api.c:286
+#: src/namecache/namecache_api.c:285
 #, fuzzy
 msgid "Namecache failed to cache block"
 msgstr "El almacén de nombres no pudo añadir el registro"
 
 # Miguel: ¿Conectar y conexión?
-#: src/namecache/namecache_api.c:374
+#: src/namecache/namecache_api.c:373
 #, fuzzy
 msgid "Error communicating with namecache service"
 msgstr "Error al comunicar con el servicio ARM.\n"
 
 #: src/namecache/plugin_namecache_flat.c:118
 #: src/namecache/plugin_namecache_flat.c:253
+#: src/namestore/plugin_namestore_flat.c:176
+#: src/namestore/plugin_namestore_flat.c:424
 #: src/peerstore/plugin_peerstore_flat.c:380
 #: src/peerstore/plugin_peerstore_flat.c:542
 #, fuzzy, c-format
@@ -4955,6 +4958,7 @@ msgid "Unable to initialize file: %s.\n"
 msgstr "Imposible inicializar SQLite: %s.\n"
 
 #: src/namecache/plugin_namecache_flat.c:129
+#: src/namestore/plugin_namestore_flat.c:187
 #: src/peerstore/plugin_peerstore_flat.c:395
 #, fuzzy, c-format
 msgid "Unable to get filesize: %s.\n"
@@ -4996,6 +5000,7 @@ msgid "the namestore plugin to work with, e.g. 'sqlite'"
 msgstr ""
 
 #: src/namestore/gnunet-namestore-dbtool.c:178
+#: src/namestore/gnunet-namestore-zonefile.c:750
 #, fuzzy
 msgid "GNUnet namestore database manipulation tool"
 msgstr "Herramienta de manipulación de zona de GNUnet"
@@ -5106,6 +5111,48 @@ msgstr ""
 msgid "GNU Name System First-Come-First-Served name registration service"
 msgstr "Servicio de registro GNUnet GNS primero en llegar, primero en servirse"
 
+#: src/namestore/gnunet-namestore-zonefile.c:329
+#, fuzzy, c-format
+msgid "Failed to store records...\n"
+msgstr "El almacén de nombres no pudo añadir el registro\n"
+
+#: src/namestore/gnunet-namestore-zonefile.c:437
+#: src/namestore/gnunet-namestore-zonefile.c:469
+#, fuzzy, c-format
+msgid "Name `%s' is too long\n"
+msgstr "El servicio «%s» no está ejecutandose\n"
+
+#: src/namestore/gnunet-namestore-zonefile.c:515
+#, c-format
+msgid "You must provide $ORIGIN in your zonefile or via arguments (--zone)!\n"
+msgstr ""
+
+#: src/namestore/gnunet-namestore-zonefile.c:524
+#, c-format
+msgid "Only %u records per unique name supported.\n"
+msgstr ""
+
+#: src/namestore/gnunet-namestore-zonefile.c:586
+#, fuzzy, c-format
+msgid "Data `%s' invalid\n"
+msgstr "Formato del pseudónimo '%s' no es válido.\n"
+
+#: src/namestore/gnunet-namestore-zonefile.c:702
+#, fuzzy, c-format
+msgid "Failed to connect to NAMESTORE\n"
+msgstr "Se produjo un fallo al conectar con GNS\n"
+
+#: src/namestore/gnunet-namestore-zonefile.c:709
+#, fuzzy, c-format
+msgid "Failed to connect to IDENTITY\n"
+msgstr "Se produjo un fallo al conectar con GNS\n"
+
+#: src/namestore/gnunet-namestore-zonefile.c:735
+#: src/namestore/gnunet-namestore.c:1628
+#, fuzzy
+msgid "name of the ego controlling the zone"
+msgstr "nombre de la sección a la que acceder"
+
 #: src/namestore/gnunet-namestore.c:340
 #, c-format
 msgid "Adding record failed: %s\n"
@@ -5307,22 +5354,22 @@ msgid ""
 "expired"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1628
-#, fuzzy
-msgid "name of the ego controlling the zone"
-msgstr "nombre de la sección a la que acceder"
-
-#: src/namestore/gnunet-service-namestore.c:1504
+#: src/namestore/gnunet-service-namestore.c:1673
 #, fuzzy
 msgid "Error normalizing name."
 msgstr "Error creando el túnel\n"
 
-#: src/namestore/gnunet-service-namestore.c:1522
+#: src/namestore/gnunet-service-namestore.c:1691
 #, fuzzy
 msgid "Error deserializing records."
 msgstr "Error interno escaneando directorio.\n"
 
-#: src/namestore/gnunet-service-namestore.c:1633
+#: src/namestore/gnunet-service-namestore.c:1811
+#, fuzzy
+msgid "Not records to delete."
+msgstr "No hay registros para la entrada"
+
+#: src/namestore/gnunet-service-namestore.c:1819
 #, fuzzy
 msgid "Store failed"
 msgstr "«gnunet-ecc» falló"
@@ -5335,24 +5382,39 @@ msgstr ""
 msgid "minimum expiration time we assume for imported records"
 msgstr ""
 
+#: src/namestore/plugin_namestore_flat.c:195
+#, c-format
+msgid "File too big to map: %llu bytes.\n"
+msgstr ""
+
+#: src/namestore/plugin_namestore_flat.c:219
+#, c-format
+msgid "Namestore database file `%s' malformed\n"
+msgstr ""
+
+#: src/namestore/plugin_namestore_flat.c:792
+#, fuzzy
+msgid "Flat file database running\n"
+msgstr "Base de datos de plantilla ejecutándose\n"
+
 #: src/namestore/plugin_namestore_sqlite.c:180
 #: src/namestore/plugin_namestore_sqlite.c:190
-#: src/namestore/plugin_namestore_sqlite.c:806
+#: src/namestore/plugin_namestore_sqlite.c:829
 #, fuzzy, c-format
 msgid "Failed to setup database with: `%s'\n"
 msgstr "Se produjo un fallo al inciar «%s» en «%s»\n"
 
-#: src/namestore/plugin_namestore_sqlite.c:797
+#: src/namestore/plugin_namestore_sqlite.c:820
 #, fuzzy, c-format
 msgid "Failed to drop database with: `%s'\n"
 msgstr "Se produjo un fallo al inciar «%s» en «%s»\n"
 
-#: src/namestore/plugin_namestore_sqlite.c:938
+#: src/namestore/plugin_namestore_sqlite.c:961
 #, fuzzy
 msgid "SQlite database running\n"
 msgstr "Base de datos sqlite ejecutándose\n"
 
-#: src/namestore/plugin_rest_namestore.c:1369
+#: src/namestore/plugin_rest_namestore.c:1414
 #, fuzzy
 msgid "Namestore REST API initialized\n"
 msgstr "Conexión fallida\n"
@@ -5683,7 +5745,7 @@ msgid "Show network size estimates from NSE service."
 msgstr "# Estimaciones del tamaño de red recibidas"
 
 #: src/nse/gnunet-service-nse.c:1441
-#: src/revocation/gnunet-service-revocation.c:888 src/util/gnunet-scrypt.c:243
+#: src/revocation/gnunet-service-revocation.c:888 src/util/gnunet-scrypt.c:242
 msgid "Value is too large.\n"
 msgstr ""
 
@@ -5760,19 +5822,19 @@ msgid "Print information about peers."
 msgstr "Imprimir información sobre los pares."
 
 #: src/peerinfo-tool/gnunet-peerinfo_plugins.c:103
-#: src/transport/gnunet-service-transport_plugins.c:167
+#: src/transport/gnunet-service-transport_plugins.c:154
 #, c-format
 msgid "Starting transport plugins `%s'\n"
 msgstr "Iniciando los módulos de transporte «%s»\n"
 
 #: src/peerinfo-tool/gnunet-peerinfo_plugins.c:107
-#: src/transport/gnunet-service-transport_plugins.c:172
+#: src/transport/gnunet-service-transport_plugins.c:159
 #, c-format
 msgid "Loading `%s' transport plugin\n"
 msgstr "Cargando el módulo de transporte «%s»\n"
 
 #: src/peerinfo-tool/gnunet-peerinfo_plugins.c:127
-#: src/transport/gnunet-service-transport_plugins.c:207
+#: src/transport/gnunet-service-transport_plugins.c:194
 #, c-format
 msgid "Failed to load transport plugin for `%s'\n"
 msgstr "Se produjo un fallo al cargar el módulo del transporte para «%s»\n"
@@ -5836,7 +5898,7 @@ msgstr ""
 
 # Miguel: "Failed to receive" también aquí está traducido como
 # "no se obtuvo respuesta" por claridad.
-#: src/peerinfo/peerinfo_api.c:217
+#: src/peerinfo/peerinfo_api.c:210
 msgid "Failed to receive response from `PEERINFO' service."
 msgstr ""
 "No se obtuvo respuesta del servicio de información de pares (PEERINFO)."
@@ -5860,7 +5922,7 @@ msgstr "El formato de salida es desconocido, ésto no 
debería pasar.\n"
 msgid "Received a malformed response from service."
 msgstr "Recibida petición DNS mal formada de %s\n"
 
-#: src/peerstore/peerstore_api.c:790
+#: src/peerstore/peerstore_api.c:779
 msgid "Received a watch result for a non existing watch.\n"
 msgstr ""
 
@@ -6091,11 +6153,11 @@ msgstr ""
 msgid "Daemon to announce regular expressions for the peer using cadet."
 msgstr "Demonio para anunciar expresiones regulares para el par usando mesh."
 
-#: src/regex/gnunet-regex-profiler.c:1366
+#: src/regex/gnunet-regex-profiler.c:1365
 msgid "No configuration file given. Exiting\n"
 msgstr "No se ha introducido ningún fichero de configuración. Saliendo\n"
 
-#: src/regex/gnunet-regex-profiler.c:1408
+#: src/regex/gnunet-regex-profiler.c:1407
 #: src/regex/gnunet-regex-simulation-profiler.c:631
 #, c-format
 msgid "No policy directory specified on command line. Exiting.\n"
@@ -6103,51 +6165,51 @@ msgstr ""
 "No se ha especificado una política de directorios en la línea de comandos. "
 "Saliendo.\n"
 
-#: src/regex/gnunet-regex-profiler.c:1414
+#: src/regex/gnunet-regex-profiler.c:1413
 #: src/regex/gnunet-regex-simulation-profiler.c:639
 #, c-format
 msgid "Specified policies directory does not exist. Exiting.\n"
 msgstr "Las políticas de directorio especificadas no existen. Saliendo.\n"
 
-#: src/regex/gnunet-regex-profiler.c:1422
+#: src/regex/gnunet-regex-profiler.c:1421
 #, c-format
 msgid "No files found in `%s'\n"
 msgstr "No se han encontrado ficheros en «%s»\n"
 
-#: src/regex/gnunet-regex-profiler.c:1431
+#: src/regex/gnunet-regex-profiler.c:1430
 msgid "No search strings file given. Exiting.\n"
 msgstr "No se ha proporcionado un fichero de cadenas de búsqueda. Saliendo.\n"
 
-#: src/regex/gnunet-regex-profiler.c:1451
+#: src/regex/gnunet-regex-profiler.c:1450
 msgid "Error loading search strings. Exiting.\n"
 msgstr "Error cargando cadenas de búsqueda. Saliendo.\n"
 
-#: src/regex/gnunet-regex-profiler.c:1540
+#: src/regex/gnunet-regex-profiler.c:1539
 msgid "name of the file for writing statistics"
 msgstr "nombre del fichero para escribir las estadísticas"
 
-#: src/regex/gnunet-regex-profiler.c:1547
+#: src/regex/gnunet-regex-profiler.c:1546
 #, fuzzy
 msgid "wait TIMEOUT before ending the experiment"
 msgstr ""
 "esperar «TIMEOUT» antes de considerar que una coincidencia de cadenas como "
 "fallida"
 
-#: src/regex/gnunet-regex-profiler.c:1553
+#: src/regex/gnunet-regex-profiler.c:1552
 msgid "directory with policy files"
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1560
+#: src/regex/gnunet-regex-profiler.c:1559
 #, fuzzy
 msgid "name of file with input strings"
 msgstr "nombre del fichero para escribir las estadísticas"
 
-#: src/regex/gnunet-regex-profiler.c:1567
+#: src/regex/gnunet-regex-profiler.c:1566
 #, fuzzy
 msgid "name of file with hosts' names"
 msgstr "nombre del fichero para escribir las estadísticas"
 
-#: src/regex/gnunet-regex-profiler.c:1582
+#: src/regex/gnunet-regex-profiler.c:1581
 msgid "Profiler for regex"
 msgstr "Perfilador para expresiones regulares."
 
@@ -6169,17 +6231,17 @@ msgstr "Analizador de rendimiento para la biblioteca de 
expresiones regulares"
 msgid "Regex `%s' is too long!\n"
 msgstr "El servicio «%s» no está ejecutandose\n"
 
-#: src/regex/regex_api_search.c:212
+#: src/regex/regex_api_search.c:200
 #, fuzzy, c-format
 msgid "Search string `%s' is too long!\n"
 msgstr "El servicio «%s» no está ejecutandose\n"
 
-#: src/rest/gnunet-rest-server.c:1367
+#: src/rest/gnunet-rest-server.c:1366
 #, fuzzy
 msgid "GNUnet REST server"
 msgstr "Herramienta de acceso GNUnet GNS"
 
-#: src/rest/plugin_rest_config.c:429
+#: src/rest/plugin_rest_config.c:428
 #, fuzzy
 msgid "CONFIG REST API initialized\n"
 msgstr "Conexión fallida\n"
@@ -6390,63 +6452,63 @@ msgstr ""
 msgid "Get peers from biased stream"
 msgstr ""
 
-#: src/scalarproduct/gnunet-scalarproduct.c:229
+#: src/scalarproduct/gnunet-scalarproduct.c:228
 #, fuzzy
 msgid "You must specify at least one message ID to check!\n"
 msgstr "Debes especificar un fichero a inspeccionar.\n"
 
-#: src/scalarproduct/gnunet-scalarproduct.c:237
+#: src/scalarproduct/gnunet-scalarproduct.c:236
 msgid "This program needs a session identifier for comparing vectors.\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-scalarproduct.c:250
+#: src/scalarproduct/gnunet-scalarproduct.c:249
 #, c-format
 msgid ""
 "Tried to set initiator mode, as peer ID was given. However, `%s' is not a "
 "valid peer identifier.\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-scalarproduct.c:268
+#: src/scalarproduct/gnunet-scalarproduct.c:267
 msgid "Need elements to compute the scalarproduct, got none.\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-scalarproduct.c:291
+#: src/scalarproduct/gnunet-scalarproduct.c:290
 #, fuzzy, c-format
 msgid "Malformed input, could not parse `%s'\n"
 msgstr "Se produjo un fallo al iniciar el servicio «%s»\n"
 
-#: src/scalarproduct/gnunet-scalarproduct.c:309
+#: src/scalarproduct/gnunet-scalarproduct.c:308
 #, fuzzy, c-format
 msgid "Could not convert `%s' to int64_t.\n"
 msgstr "No se pudo conectar al servicio %s.\n"
 
-#: src/scalarproduct/gnunet-scalarproduct.c:339
+#: src/scalarproduct/gnunet-scalarproduct.c:338
 #, c-format
 msgid "Failed to initiate computation, were all keys unique?\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-scalarproduct.c:365
-#: src/scalarproduct/gnunet-scalarproduct.c:372
+#: src/scalarproduct/gnunet-scalarproduct.c:364
+#: src/scalarproduct/gnunet-scalarproduct.c:371
 msgid ""
 "A comma separated list of elements to compare as vector with our remote peer."
 msgstr ""
 
-#: src/scalarproduct/gnunet-scalarproduct.c:379
+#: src/scalarproduct/gnunet-scalarproduct.c:378
 msgid ""
 "[Optional] peer to calculate our scalarproduct with. If this parameter is "
 "not given, the service will wait for a remote peer to compute the request."
 msgstr ""
 
-#: src/scalarproduct/gnunet-scalarproduct.c:386
+#: src/scalarproduct/gnunet-scalarproduct.c:385
 msgid "Transaction ID shared with peer."
 msgstr ""
 
-#: src/scalarproduct/gnunet-scalarproduct.c:397
+#: src/scalarproduct/gnunet-scalarproduct.c:396
 msgid "Calculate the Vectorproduct with a GNUnet peer."
 msgstr ""
 
 #: src/scalarproduct/gnunet-service-scalarproduct-ecc_alice.c:1118
-#: src/scalarproduct/gnunet-service-scalarproduct-ecc_bob.c:1034
+#: src/scalarproduct/gnunet-service-scalarproduct-ecc_bob.c:1032
 #: src/scalarproduct/gnunet-service-scalarproduct_alice.c:1358
 #: src/scalarproduct/gnunet-service-scalarproduct_bob.c:1355
 #, fuzzy
@@ -6473,7 +6535,7 @@ msgstr ""
 msgid "also profile decryption"
 msgstr ""
 
-#: src/set/gnunet-service-set.c:1916 src/seti/gnunet-service-seti.c:2467
+#: src/set/gnunet-service-set.c:1914 src/seti/gnunet-service-seti.c:2467
 #: src/setu/gnunet-service-setu.c:5389
 #, fuzzy
 msgid "Could not connect to CADET service\n"
@@ -6532,16 +6594,16 @@ msgstr ""
 msgid "return intersection instead of delta"
 msgstr ""
 
-#: src/sq/sq.c:54
+#: src/sq/sq.c:47
 #, c-format
 msgid "Failure to bind %u-th SQL parameter\n"
 msgstr ""
 
-#: src/sq/sq.c:61
+#: src/sq/sq.c:54
 msgid "Failure in sqlite3_reset (!)\n"
 msgstr ""
 
-#: src/sq/sq.c:139
+#: src/sq/sq.c:126
 #, fuzzy, c-format
 msgid "Failed to reset sqlite statement with error: %s\n"
 msgstr "«%s» falló al resolver el método «%s» con error: %s\n"
@@ -6749,37 +6811,37 @@ msgid ""
 "Cannot open %s for writing load statistics.  Not logging load statistics\n"
 msgstr ""
 
-#: src/testbed/gnunet-service-testbed_peers.c:1165
+#: src/testbed/gnunet-service-testbed_peers.c:1153
 #, fuzzy, c-format
 msgid "%s is stopped"
 msgstr "# elementos almacenados"
 
-#: src/testbed/gnunet-service-testbed_peers.c:1168
+#: src/testbed/gnunet-service-testbed_peers.c:1156
 #, fuzzy, c-format
 msgid "%s is starting"
 msgstr "'%s' comenzando\n"
 
-#: src/testbed/gnunet-service-testbed_peers.c:1171
+#: src/testbed/gnunet-service-testbed_peers.c:1159
 #, c-format
 msgid "%s is stopping"
 msgstr ""
 
-#: src/testbed/gnunet-service-testbed_peers.c:1174
+#: src/testbed/gnunet-service-testbed_peers.c:1162
 #, fuzzy, c-format
 msgid "%s is starting already"
 msgstr "'%s' comenzando\n"
 
-#: src/testbed/gnunet-service-testbed_peers.c:1177
+#: src/testbed/gnunet-service-testbed_peers.c:1165
 #, c-format
 msgid "%s is stopping already"
 msgstr ""
 
-#: src/testbed/gnunet-service-testbed_peers.c:1180
+#: src/testbed/gnunet-service-testbed_peers.c:1168
 #, c-format
 msgid "%s is started already"
 msgstr ""
 
-#: src/testbed/gnunet-service-testbed_peers.c:1183
+#: src/testbed/gnunet-service-testbed_peers.c:1171
 #, c-format
 msgid "%s is stopped already"
 msgstr ""
@@ -6787,23 +6849,23 @@ msgstr ""
 # Miguel: ¿Debería cambiar las siglas de ARM?
 # De momento las he mantenido con una traducción en
 # otro mensaje.
-#: src/testbed/gnunet-service-testbed_peers.c:1186
+#: src/testbed/gnunet-service-testbed_peers.c:1174
 #, fuzzy, c-format
 msgid "%s service is not known to ARM"
 msgstr "El servicio «%s» es desconocido para el ARM.\n"
 
-#: src/testbed/gnunet-service-testbed_peers.c:1189
+#: src/testbed/gnunet-service-testbed_peers.c:1177
 #, fuzzy, c-format
 msgid "%s service failed to start"
 msgstr "El proceso del servicio no devolvió un estado\n"
 
 # Miguel: ¿Es mejor «ya que» que «porque» o «debido al apagado»?
-#: src/testbed/gnunet-service-testbed_peers.c:1192
+#: src/testbed/gnunet-service-testbed_peers.c:1180
 #, fuzzy, c-format
 msgid "%s service can't be started because ARM is shutting down"
 msgstr "Petición ignorada porque el ARM se está apagando.\n"
 
-#: src/testbed/gnunet-service-testbed_peers.c:1194
+#: src/testbed/gnunet-service-testbed_peers.c:1182
 #, fuzzy, c-format
 msgid "%.s Unknown result code."
 msgstr "Código de respuesta del ARM desconocido.\n"
@@ -6825,17 +6887,17 @@ msgstr ""
 msgid "Adding host %u failed with error: %s\n"
 msgstr "No se pudo añadir la máquina %u por el error: %s\n"
 
-#: src/testbed/testbed_api_hosts.c:429
+#: src/testbed/testbed_api_hosts.c:411
 #, c-format
 msgid "Hosts file %s not found\n"
 msgstr "El fichero de máquinas %s no fue encontrado\n"
 
-#: src/testbed/testbed_api_hosts.c:438
+#: src/testbed/testbed_api_hosts.c:420
 #, c-format
 msgid "Hosts file %s has no data\n"
 msgstr "El archivo de máquinas %s no tiene datos\n"
 
-#: src/testbed/testbed_api_hosts.c:447
+#: src/testbed/testbed_api_hosts.c:429
 #, c-format
 msgid "Hosts file %s cannot be read\n"
 msgstr "El archivo de máquinas %s no puede leerse\n"
@@ -6849,90 +6911,90 @@ msgstr "Los controladores de enlazado fallaron. 
Saliendo"
 msgid "Host registration failed for a host. Error: %s\n"
 msgstr "El registro de máquinas falló para una máquina. Error: %s\n"
 
-#: src/testbed/testbed_api_testbed.c:1065
+#: src/testbed/testbed_api_testbed.c:1060
 msgid "Controller crash detected. Shutting down.\n"
 msgstr ""
 
-#: src/testbed/testbed_api_testbed.c:1154
+#: src/testbed/testbed_api_testbed.c:1149
 #, c-format
 msgid "Host %s cannot start testbed\n"
 msgstr "La máquina %s no puede comenzar la batería de pruebas\n"
 
-#: src/testbed/testbed_api_testbed.c:1158
+#: src/testbed/testbed_api_testbed.c:1153
 msgid "Testbed cannot be started on localhost\n"
 msgstr "La batería de pruebas no se puede iniciar en localhost\n"
 
-#: src/testbed/testbed_api_testbed.c:1196
+#: src/testbed/testbed_api_testbed.c:1191
 msgid "Cannot start the master controller"
 msgstr "No se puede iniciar el controlador maestro"
 
-#: src/testbed/testbed_api_testbed.c:1214
+#: src/testbed/testbed_api_testbed.c:1209
 msgid "Shutting down testbed due to timeout while setup.\n"
 msgstr ""
 
-#: src/testbed/testbed_api_testbed.c:1276
+#: src/testbed/testbed_api_testbed.c:1271
 msgid "No hosts loaded. Need at least one host\n"
 msgstr "No se han cargado máquinas. Se necesita al menos una máquina.\n"
 
-#: src/testbed/testbed_api_testbed.c:1301
+#: src/testbed/testbed_api_testbed.c:1296
 msgid "Specified topology must be supported by testbed"
 msgstr ""
 "La topología especificada debe estar soportada por la batería de pruebas"
 
-#: src/testbed/testbed_api_testbed.c:1357
+#: src/testbed/testbed_api_testbed.c:1352
 #, c-format
 msgid ""
 "Maximum number of edges a peer can have in a scale free topology cannot be "
 "more than %u.  Given `%s = %llu'"
 msgstr ""
 
-#: src/testbed/testbed_api_testbed.c:1374
+#: src/testbed/testbed_api_testbed.c:1369
 #, c-format
 msgid ""
 "The number of edges that can established when adding a new node to scale "
 "free topology cannot be more than %u.  Given `%s = %llu'"
 msgstr ""
 
-#: src/testbed/testbed_api_topology.c:1033 src/testing/testing.c:2753
+#: src/testbed/testbed_api_topology.c:1021 src/testing/testing.c:2693
 #, c-format
 msgid "Topology file %s not found\n"
 msgstr "El fichero de topología %s no fue encontrado\n"
 
-#: src/testbed/testbed_api_topology.c:1041 src/testing/testing.c:2761
+#: src/testbed/testbed_api_topology.c:1029 src/testing/testing.c:2701
 #, c-format
 msgid "Topology file %s has no data\n"
 msgstr "El fichero de topología %s no tiene datos\n"
 
-#: src/testbed/testbed_api_topology.c:1049 src/testing/testing.c:2769
+#: src/testbed/testbed_api_topology.c:1037 src/testing/testing.c:2709
 #, c-format
 msgid "Topology file %s cannot be read\n"
 msgstr "El fichero de topología %s no puede ser leido\n"
 
-#: src/testbed/testbed_api_topology.c:1071
+#: src/testbed/testbed_api_topology.c:1059
 #, c-format
 msgid "Failed to read peer index from toology file: %s"
 msgstr ""
 "Se produjo un fallo al leer el índice de pares del archivo de topología: %s"
 
-#: src/testbed/testbed_api_topology.c:1080
-#: src/testbed/testbed_api_topology.c:1105
+#: src/testbed/testbed_api_topology.c:1068
+#: src/testbed/testbed_api_topology.c:1093
 #, c-format
 msgid "Value in given topology file: %s out of range\n"
 msgstr "Valor en el fichero de topología dato: %s está fuera de rango\n"
 
-#: src/testbed/testbed_api_topology.c:1086
-#: src/testbed/testbed_api_topology.c:1111
+#: src/testbed/testbed_api_topology.c:1074
+#: src/testbed/testbed_api_topology.c:1099
 #, c-format
 msgid "Failed to read peer index from topology file: %s"
 msgstr ""
 "Se produjo un fallo al leer índice de pares del fichero de topología: %s"
 
-#: src/testbed/testbed_api_topology.c:1092
-#: src/testbed/testbed_api_topology.c:1117
+#: src/testbed/testbed_api_topology.c:1080
+#: src/testbed/testbed_api_topology.c:1105
 msgid "Topology file needs more peers than given ones\n"
 msgstr "El fichero de topología necesita más pares que los dados\n"
 
-#: src/testbed/testbed_api_topology.c:1153
+#: src/testbed/testbed_api_topology.c:1141
 #, fuzzy, c-format
 msgid "Ignoring to connect peer %lu to peer %lu\n"
 msgstr "Ignorando conexión del par %u al par %u\n"
@@ -7046,7 +7108,7 @@ msgstr ""
 msgid "Failed to start `%s': %s\n"
 msgstr "Se produjo un fallo al arrancar «%s»: %s\n"
 
-#: src/testing/testing.c:1694
+#: src/testing/testing.c:1646
 #, c-format
 msgid "Failed to load configuration from %s\n"
 msgstr "Se produjo un fallo al cargar la configuración de %s\n"
@@ -7133,7 +7195,7 @@ msgstr ""
 #: src/transport/gnunet-communicator-tcp.c:3347
 #: src/transport/gnunet-communicator-udp.c:3871
 #: src/transport/gnunet-service-tng.c:11334
-#: src/transport/gnunet-service-transport.c:2622
+#: src/transport/gnunet-service-transport.c:2617
 #, fuzzy
 msgid "Transport service is lacking key configuration settings. Exiting.\n"
 msgstr ""
@@ -7203,12 +7265,12 @@ msgstr "# desconexiones debido a la lista negra"
 msgid "Disallowing connection to peer `%s' on transport %s\n"
 msgstr "Se produjo un fallo al cargar el módulo del transporte para «%s»\n"
 
-#: src/transport/gnunet-service-transport.c:2547
+#: src/transport/gnunet-service-transport.c:2542
 #, fuzzy, c-format
 msgid "Adding blacklisting entry for peer `%s'\n"
 msgstr "Añadiendo «%s» sin direcciones para el par «%s»\n"
 
-#: src/transport/gnunet-service-transport.c:2556
+#: src/transport/gnunet-service-transport.c:2551
 #, c-format
 msgid "Adding blacklisting entry for peer `%s':`%s'\n"
 msgstr ""
@@ -7235,7 +7297,7 @@ msgid "# disconnects due to quota of 0"
 msgstr "# desconexiones debido a una cuota de 0"
 
 #: src/transport/gnunet-service-transport_neighbours.c:1341
-#: src/transport/gnunet-service-transport_neighbours.c:1817
+#: src/transport/gnunet-service-transport_neighbours.c:1807
 msgid "# bytes in message queue for other peers"
 msgstr "# bytes en la cola de mensajes para otros pares"
 
@@ -7310,150 +7372,150 @@ msgstr "# violaciones de la cuota de ancho de banda 
por otros pares"
 msgid "# ms throttling suggested"
 msgstr "# ms de impulso sugeridos"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1886
+#: src/transport/gnunet-service-transport_neighbours.c:1876
 #, fuzzy, c-format
 msgid "Failed to send SYN message to peer `%s'\n"
 msgstr ""
 "Se produjo un fallo al procesar el mensaje interno del programa auxiliar "
 "«%s»\n"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1912
+#: src/transport/gnunet-service-transport_neighbours.c:1902
 #, fuzzy
 msgid "# Failed attempts to switch addresses (failed to send SYN CONT)"
 msgstr "Se produjo un fallo al procesar la petición DNS.  Omitiendo.\n"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1953
+#: src/transport/gnunet-service-transport_neighbours.c:1943
 #, fuzzy
 msgid "# SYN messages sent"
 msgstr "# Mensajes «DISCONNECT» enviados"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1970
+#: src/transport/gnunet-service-transport_neighbours.c:1960
 #, fuzzy, c-format
 msgid "Failed to transmit SYN message to %s\n"
 msgstr "Se produjo un fallo al transmitir un mensaje al servicio «%s».\n"
 
-#: src/transport/gnunet-service-transport_neighbours.c:2006
+#: src/transport/gnunet-service-transport_neighbours.c:1996
 #, fuzzy
 msgid "# Failed attempts to switch addresses (failed to send SYN)"
 msgstr "Se produjo un fallo al procesar la petición DNS.  Omitiendo.\n"
 
-#: src/transport/gnunet-service-transport_neighbours.c:2077
+#: src/transport/gnunet-service-transport_neighbours.c:2067
 #, fuzzy, c-format
 msgid "Failed to send SYN_ACK message to peer `%s' using address `%s'\n"
 msgstr "¡Se produjo un fallo al conectar al servicio de estadísticas!\n"
 
-#: src/transport/gnunet-service-transport_neighbours.c:2132
+#: src/transport/gnunet-service-transport_neighbours.c:2122
 #, fuzzy
 msgid "# SYN_ACK messages sent"
 msgstr "# Mensajes «DISCONNECT» enviados"
 
-#: src/transport/gnunet-service-transport_neighbours.c:2150
+#: src/transport/gnunet-service-transport_neighbours.c:2140
 #, fuzzy, c-format
 msgid "Failed to transmit SYN_ACK message to %s\n"
 msgstr "Se produjo un fallo al transmitir un mensaje al servicio «%s».\n"
 
-#: src/transport/gnunet-service-transport_neighbours.c:2314
+#: src/transport/gnunet-service-transport_neighbours.c:2304
 #, fuzzy
 msgid "# SYN messages received"
 msgstr "# mensajes PING recibidos"
 
-#: src/transport/gnunet-service-transport_neighbours.c:2320
+#: src/transport/gnunet-service-transport_neighbours.c:2310
 #, c-format
 msgid "SYN request from peer `%s' ignored due impending shutdown\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:2731
+#: src/transport/gnunet-service-transport_neighbours.c:2721
 msgid "# Attempts to switch addresses"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3244
+#: src/transport/gnunet-service-transport_neighbours.c:3227
 #, fuzzy
 msgid "# SYN_ACK messages received"
 msgstr "# mensajes SET QUOTA recibidos"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3252
+#: src/transport/gnunet-service-transport_neighbours.c:3235
 #, fuzzy
 msgid "# unexpected SYN_ACK messages (no peer)"
 msgstr "# Mensajes «CONNECT_ACK» inesperados (sin par)"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3272
-#: src/transport/gnunet-service-transport_neighbours.c:3300
+#: src/transport/gnunet-service-transport_neighbours.c:3255
+#: src/transport/gnunet-service-transport_neighbours.c:3283
 #, fuzzy
 msgid "# unexpected SYN_ACK messages (not ready)"
 msgstr "# Mensajes «CONNECT_ACK» inesperados (no estaba preparado)"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3315
+#: src/transport/gnunet-service-transport_neighbours.c:3298
 #, fuzzy
 msgid "# unexpected SYN_ACK messages (waiting on ATS)"
 msgstr "# Mensajes «CONNECT_ACK» inesperados (esperando en el ATS)"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3345
+#: src/transport/gnunet-service-transport_neighbours.c:3328
 msgid "# Successful attempts to switch addresses"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3359
+#: src/transport/gnunet-service-transport_neighbours.c:3342
 #, fuzzy
 msgid "# unexpected SYN_ACK messages (disconnecting)"
 msgstr "# Mensajes «CONNECT_ACK» inesperados (desconectando)"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3548
+#: src/transport/gnunet-service-transport_neighbours.c:3531
 #, fuzzy
 msgid "# ACK messages received"
 msgstr "# mensajes «REQUEST CONNECT» recibidos"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3582
+#: src/transport/gnunet-service-transport_neighbours.c:3565
 #, fuzzy
 msgid "# unexpected ACK messages"
 msgstr "# Mensajes «SESSION ACK» inesperados"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3672
+#: src/transport/gnunet-service-transport_neighbours.c:3648
 #, fuzzy
 msgid "# quota messages ignored (malformed)"
 msgstr "# mensajes de desconexión ignorados (formato antiguo)"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3679
+#: src/transport/gnunet-service-transport_neighbours.c:3655
 #, fuzzy
 msgid "# QUOTA messages received"
 msgstr "# Mensajes «GAP PUT» recibidos"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3722
+#: src/transport/gnunet-service-transport_neighbours.c:3698
 #, fuzzy
 msgid "# disconnect messages ignored (malformed)"
 msgstr "# mensajes de desconexión ignorados (formato antiguo)"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3729
+#: src/transport/gnunet-service-transport_neighbours.c:3705
 #, fuzzy
 msgid "# DISCONNECT messages received"
 msgstr "# mensajes «REQUEST CONNECT» recibidos"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3742
+#: src/transport/gnunet-service-transport_neighbours.c:3718
 msgid "# disconnect messages ignored (timestamp)"
 msgstr "# mensajes de desconexión ignorados (marca temporal)"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3879
+#: src/transport/gnunet-service-transport_neighbours.c:3855
 msgid "# disconnected from peer upon explicit request"
 msgstr "# desconexiones del par debido a una petición explícita"
 
-#: src/transport/gnunet-service-transport_plugins.c:157
+#: src/transport/gnunet-service-transport_plugins.c:144
 msgid "Transport service is lacking NEIGHBOUR_LIMIT option.\n"
 msgstr "El servicio de transporte carece de la opción «NEIGHBOUR_LIMIT».\n"
 
-#: src/transport/gnunet-service-transport_plugins.c:222
-#: src/transport/gnunet-service-transport_plugins.c:230
-#: src/transport/gnunet-service-transport_plugins.c:238
-#: src/transport/gnunet-service-transport_plugins.c:246
-#: src/transport/gnunet-service-transport_plugins.c:254
-#: src/transport/gnunet-service-transport_plugins.c:262
-#: src/transport/gnunet-service-transport_plugins.c:270
-#: src/transport/gnunet-service-transport_plugins.c:278
-#: src/transport/gnunet-service-transport_plugins.c:286
-#: src/transport/gnunet-service-transport_plugins.c:294
-#: src/transport/gnunet-service-transport_plugins.c:302
+#: src/transport/gnunet-service-transport_plugins.c:209
+#: src/transport/gnunet-service-transport_plugins.c:217
+#: src/transport/gnunet-service-transport_plugins.c:225
+#: src/transport/gnunet-service-transport_plugins.c:233
+#: src/transport/gnunet-service-transport_plugins.c:241
+#: src/transport/gnunet-service-transport_plugins.c:249
+#: src/transport/gnunet-service-transport_plugins.c:257
+#: src/transport/gnunet-service-transport_plugins.c:265
+#: src/transport/gnunet-service-transport_plugins.c:273
+#: src/transport/gnunet-service-transport_plugins.c:281
+#: src/transport/gnunet-service-transport_plugins.c:289
 #, fuzzy, c-format
 msgid "Missing function `%s' in transport plugin for `%s'\n"
 msgstr "Se produjo un fallo al cargar el módulo del transporte para «%s»\n"
 
-#: src/transport/gnunet-service-transport_plugins.c:309
+#: src/transport/gnunet-service-transport_plugins.c:296
 #, fuzzy, c-format
 msgid "Did not load plugin `%s' due to missing functions\n"
 msgstr "Falló al cargar el plugin '%s' en %s:%d. Descargando plugin.\n"
@@ -7750,7 +7812,7 @@ msgstr "# sesiones wlan pendientes"
 msgid "send data for benchmarking to the other peer (until CTRL-C)"
 msgstr "enviar data para prueba a otro par (hasta CTRL-C)"
 
-#: src/transport/plugin_transport_http_client.c:1488
+#: src/transport/plugin_transport_http_client.c:1482
 #: src/transport/plugin_transport_http_server.c:2331
 #: src/transport/plugin_transport_http_server.c:3562
 #: src/transport/plugin_transport_tcp.c:3773
@@ -7758,26 +7820,26 @@ msgstr "enviar data para prueba a otro par (hasta 
CTRL-C)"
 msgid "TCP_STEALTH not supported on this platform.\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_client.c:2134
+#: src/transport/plugin_transport_http_client.c:2128
 #, c-format
 msgid "Could not initialize curl multi handle, failed to start %s plugin!\n"
 msgstr ""
 "¡No se pudo inicializar el multi-manejador de curl, no se pudo iniciar el "
 "módulo %s!\n"
 
-#: src/transport/plugin_transport_http_client.c:2183
+#: src/transport/plugin_transport_http_client.c:2177
 #: src/transport/plugin_transport_http_server.c:3276
 #, c-format
 msgid "Shutting down plugin `%s'\n"
 msgstr "Finalizando el módulo «%s»\n"
 
-#: src/transport/plugin_transport_http_client.c:2200
+#: src/transport/plugin_transport_http_client.c:2194
 #: src/transport/plugin_transport_http_server.c:3346
 #, c-format
 msgid "Shutdown for plugin `%s' complete\n"
 msgstr "Finalización del módulo «%s» completa\n"
 
-#: src/transport/plugin_transport_http_client.c:2234
+#: src/transport/plugin_transport_http_client.c:2228
 #, fuzzy, c-format
 msgid "Maximum number of requests is %u\n"
 msgstr "El número máximo de conexiones es %u\n"
@@ -8210,7 +8272,7 @@ msgstr "«%s» falló para el puerto %d (%s): dirección en 
uso actualmente\n"
 msgid "`%s' failed for `%s': address already in use\n"
 msgstr "«%s» falló para «%.*s»: dirección en uso actualmente\n"
 
-#: src/transport/tcp_server_legacy.c:897
+#: src/transport/tcp_server_legacy.c:892
 #, c-format
 msgid ""
 "Processing code for message of type %u did not call "
@@ -8441,20 +8503,20 @@ msgstr "NINGUNO"
 msgid "INVALID"
 msgstr "NO VÁLIDO"
 
-#: src/util/common_logging.c:1396
+#: src/util/common_logging.c:1360
 msgid "unknown address"
 msgstr "dirección desconocida"
 
-#: src/util/common_logging.c:1441
+#: src/util/common_logging.c:1405
 msgid "invalid address"
 msgstr "dirección no válida"
 
-#: src/util/common_logging.c:1453
+#: src/util/common_logging.c:1417
 #, c-format
 msgid "Configuration fails to specify option `%s' in section `%s'!\n"
 msgstr "¡La configuración no especifica la opción «%s» en la sección «%s»!\n"
 
-#: src/util/common_logging.c:1468
+#: src/util/common_logging.c:1432
 #, c-format
 msgid ""
 "Configuration specifies invalid value for option `%s' in section `%s': %s\n"
@@ -8614,12 +8676,12 @@ msgstr "No se pudo asociar con ningún puerto: %s\n"
 msgid "Received DNS response that is too small (%u bytes)\n"
 msgstr "Recibida respuesta DNS demasiado pequeña (%u bytes)"
 
-#: src/util/dnsstub.c:508
+#: src/util/dnsstub.c:503
 #, fuzzy, c-format
 msgid "Failed to send DNS request to %s: %s\n"
 msgstr "Se produjo un fallo al mandar la petición DNS a %s\n"
 
-#: src/util/dnsstub.c:513
+#: src/util/dnsstub.c:508
 #, c-format
 msgid "Sent DNS request to %s\n"
 msgstr "Petición DNS enviada a %s\n"
@@ -9003,28 +9065,28 @@ msgstr "realizar una búsqueda inversa"
 msgid "Use built-in GNUnet stub resolver"
 msgstr "Utilizar el resolvedor interno para pruebas de GNUnet"
 
-#: src/util/gnunet-scrypt.c:215
+#: src/util/gnunet-scrypt.c:214
 #, c-format
 msgid "Loading hostkey from `%s' failed.\n"
 msgstr "La carga de la clave de la máquina desde «%s» ha fallado.\n"
 
-#: src/util/gnunet-scrypt.c:281
+#: src/util/gnunet-scrypt.c:280
 msgid "number of bits to require for the proof of work"
 msgstr ""
 
-#: src/util/gnunet-scrypt.c:287
+#: src/util/gnunet-scrypt.c:286
 msgid "file with private key, otherwise default is used"
 msgstr ""
 
-#: src/util/gnunet-scrypt.c:293
+#: src/util/gnunet-scrypt.c:292
 msgid "file with proof of work, otherwise default is used"
 msgstr ""
 
-#: src/util/gnunet-scrypt.c:299
+#: src/util/gnunet-scrypt.c:298
 msgid "time to wait between calculations"
 msgstr ""
 
-#: src/util/gnunet-scrypt.c:313
+#: src/util/gnunet-scrypt.c:312
 #, fuzzy
 msgid "Manipulate GNUnet proof of work files"
 msgstr "Manipular los ficheros de clave privada ECC de GNUnet"
@@ -9057,19 +9119,19 @@ msgstr "No hay un manejador conocido para el subsistema 
«%s»\n"
 msgid "Perform default-actions for GNUnet URIs"
 msgstr "Realizar las acciones predeterminadas para URI de GNUnet"
 
-#: src/util/helper.c:323
+#: src/util/helper.c:306
 #, c-format
 msgid "Error reading from `%s': %s\n"
 msgstr "Error leyendo de «%s»: %s\n"
 
-#: src/util/helper.c:375
+#: src/util/helper.c:358
 #, c-format
 msgid "Failed to parse inbound message from helper `%s'\n"
 msgstr ""
 "Se produjo un fallo al procesar el mensaje interno del programa auxiliar "
 "«%s»\n"
 
-#: src/util/helper.c:606
+#: src/util/helper.c:573
 #, c-format
 msgid "Error writing to `%s': %s\n"
 msgstr "Error escribiendo a «%s»: %s\n"
@@ -9079,7 +9141,7 @@ msgstr "Error escribiendo a «%s»: %s\n"
 msgid "Unable to shorten unix path `%s' while keeping name unique\n"
 msgstr "Imposible acortar la ruta unix «%s» manteniendo el nombre único\n"
 
-#: src/util/network.c:1307
+#: src/util/network.c:1284
 #, c-format
 msgid ""
 "Fatal internal logic error, process hangs in `%s' (abort with CTRL-C)!\n"
@@ -9087,7 +9149,7 @@ msgstr ""
 "¡Error lógico interno fatal, el proceso está colgado en «%s» (abortar con "
 "CTRL-C)!\n"
 
-#: src/util/os_installation.c:420
+#: src/util/os_installation.c:415
 #, c-format
 msgid ""
 "Could not determine installation path for %s.  Set `%s' environment "
@@ -9096,12 +9158,12 @@ msgstr ""
 "No se pudo determinar la ruta de instalación de %s.  Establezca la variable "
 "de entorno «%s».\n"
 
-#: src/util/os_installation.c:791
+#: src/util/os_installation.c:786
 #, c-format
 msgid "Could not find binary `%s' in PATH!\n"
 msgstr "¡No se pudo encontrar el programa llamado «%s» en PATH!\n"
 
-#: src/util/os_installation.c:824
+#: src/util/os_installation.c:819
 #, c-format
 msgid "Binary `%s' exists, but is not SUID\n"
 msgstr ""
@@ -9145,7 +9207,7 @@ msgstr "Se produjo un fallo al borrar el fichero de 
configuración %s\n"
 msgid "Malformed configuration. Exiting ...\n"
 msgstr "Se produjo un fallo al borrar el fichero de configuración %s\n"
 
-#: src/util/regex.c:139
+#: src/util/regex.c:123
 #, c-format
 msgid "Bad mask: %d\n"
 msgstr ""
@@ -9479,31 +9541,21 @@ msgstr "el servicio es ofrecido vía UDP"
 msgid "Setup tunnels via VPN."
 msgstr "Configurar túneles vía VPN."
 
-#: src/zonemaster/gnunet-service-zonemaster-monitor.c:249
-#: src/zonemaster/gnunet-service-zonemaster.c:364
+#: src/zonemaster/gnunet-service-zonemaster.c:521
 #, fuzzy, c-format
 msgid "Failed to replicate block in namecache: %s\n"
 msgstr "Se produjo un fallo al crear el espacio de nombres «%s»\n"
 
-#: src/zonemaster/gnunet-service-zonemaster-monitor.c:529
-#: src/zonemaster/gnunet-service-zonemaster.c:969
+#: src/zonemaster/gnunet-service-zonemaster.c:1383
 msgid "Failed to connect to the namestore!\n"
 msgstr "¡Se produjo un fallo al conectar con el almacén de nombres!\n"
 
-#: src/zonemaster/gnunet-service-zonemaster-monitor.c:550
-msgid "Namecache is disabled!\n"
-msgstr ""
-
 #, fuzzy
 #~ msgid "UDP port to listen on for inbound DNS requests; default: 2853"
 #~ msgstr ""
 #~ "Puerto UDP en el que escuchar para peticiones DNS entrantes; "
 #~ "predeterminado: 53"
 
-#, fuzzy
-#~ msgid "Flat file database running\n"
-#~ msgstr "Base de datos de plantilla ejecutándose\n"
-
 #, fuzzy, c-format
 #~ msgid "Invalid DID `%s'\n"
 #~ msgstr "URI no válida: «%s»\n"
@@ -10007,10 +10059,6 @@ msgstr ""
 #~ 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"
 
-#, fuzzy
-#~ msgid "Failed to connect to CREDENTIAL\n"
-#~ msgstr "Se produjo un fallo al conectar con GNS\n"
-
 #, fuzzy
 #~ msgid "GNUnet credential resolver tool"
 #~ msgstr "Herramienta de acceso GNUnet GNS"
@@ -12746,9 +12794,6 @@ msgstr ""
 #~ msgid "Stored zonekey for zone `%s' in file `%s'\n"
 #~ msgstr "Almacenada clave de zona para la zona «%s» en el fichero «%s»\n"
 
-#~ msgid "No records for entry"
-#~ msgstr "No hay registros para la entrada"
-
 #~ msgid "tmppath cannot be NULL\n"
 #~ msgstr "tmppath no puede ser NULL\n"
 
diff --git a/po/fr.po b/po/fr.po
index 2c6529119..034e6f387 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnunet 0.10.1\n"
 "Report-Msgid-Bugs-To: gnunet-developers@mail.gnu.org\n"
-"POT-Creation-Date: 2022-10-16 18:47+0900\n"
+"POT-Creation-Date: 2022-10-21 13:20+0900\n"
 "PO-Revision-Date: 2021-11-21 00:53+0100\n"
 "Last-Translator: Stéphane  Aulery <lkppo@free.fr>\n"
 "Language-Team: French <traduc@traduc.org>\n"
@@ -17,7 +17,10 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Bugs: Report translation errors to the Language-Team address.\n"
 
-#: src/abd/gnunet-abd.c:392 src/namestore/gnunet-namestore.c:1245
+#: src/abd/gnunet-abd.c:392 src/namestore/gnunet-namestore-zonefile.c:193
+#: src/namestore/gnunet-namestore-zonefile.c:652
+#: src/namestore/gnunet-namestore-zonefile.c:673
+#: src/namestore/gnunet-namestore.c:1245
 #, c-format
 msgid "Ego `%s' not known to identity service\n"
 msgstr ""
@@ -161,15 +164,15 @@ msgstr ""
 msgid "Failed to remove servicehome directory %s\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:229 src/testbed/gnunet-service-testbed_peers.c:1144
+#: src/arm/gnunet-arm.c:229 src/testbed/gnunet-service-testbed_peers.c:1132
 msgid "Message was sent successfully"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:232 src/testbed/gnunet-service-testbed_peers.c:1147
+#: src/arm/gnunet-arm.c:232 src/testbed/gnunet-service-testbed_peers.c:1135
 msgid "We disconnected from ARM before we could send a request"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:234 src/testbed/gnunet-service-testbed_peers.c:1149
+#: src/arm/gnunet-arm.c:234 src/testbed/gnunet-service-testbed_peers.c:1137
 msgid "Unknown request status"
 msgstr ""
 
@@ -1329,141 +1332,141 @@ msgstr ""
 msgid "Core service of `%s' ready.\n"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:512
+#: src/core/gnunet-service-core_kx.c:513
 msgid "# bytes encrypted"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:570
+#: src/core/gnunet-service-core_kx.c:571
 msgid "# bytes decrypted"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:667
+#: src/core/gnunet-service-core_kx.c:668
 msgid "# PAYLOAD dropped (out of order)"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:719
+#: src/core/gnunet-service-core_kx.c:720
 msgid "# key exchanges initiated"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:775
+#: src/core/gnunet-service-core_kx.c:776
 msgid "# key exchanges stopped"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:807
+#: src/core/gnunet-service-core_kx.c:808
 msgid "# PING messages transmitted"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:866
+#: src/core/gnunet-service-core_kx.c:867
 msgid "# old ephemeral keys ignored"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:880
+#: src/core/gnunet-service-core_kx.c:881
 msgid "# duplicate ephemeral keys ignored"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:915
+#: src/core/gnunet-service-core_kx.c:916
 msgid "# EPHEMERAL_KEYs rejected (bad signature)"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:933
+#: src/core/gnunet-service-core_kx.c:934
 #, c-format
 msgid ""
 "EPHEMERAL_KEY from peer `%s' rejected as its validity range does not match "
 "our system time (%llu not in [%llu,%llu]).\n"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:940
+#: src/core/gnunet-service-core_kx.c:941
 msgid "# EPHEMERAL_KEY messages rejected due to time"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:958
+#: src/core/gnunet-service-core_kx.c:959
 msgid "# valid ephemeral keys received"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1067
+#: src/core/gnunet-service-core_kx.c:1068
 #: src/transport/gnunet-service-transport_validation.c:1133
 msgid "# PING messages received"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1077
+#: src/core/gnunet-service-core_kx.c:1078
 msgid "# PING messages dropped (out of order)"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1126
+#: src/core/gnunet-service-core_kx.c:1127
 msgid "# PONG messages created"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1151
+#: src/core/gnunet-service-core_kx.c:1152
 msgid "# sessions terminated by timeout"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1164
+#: src/core/gnunet-service-core_kx.c:1165
 msgid "# keepalive messages sent"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1221
+#: src/core/gnunet-service-core_kx.c:1222
 #: src/transport/gnunet-service-transport_validation.c:1476
 msgid "# PONG messages received"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1229
+#: src/core/gnunet-service-core_kx.c:1230
 msgid "# PONG messages dropped (connection down)"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1237
+#: src/core/gnunet-service-core_kx.c:1238
 msgid "# PONG messages dropped (out of order)"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1276
+#: src/core/gnunet-service-core_kx.c:1277
 msgid "# PONG messages decrypted"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1316
+#: src/core/gnunet-service-core_kx.c:1317
 msgid "# session keys confirmed via PONG"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1328
+#: src/core/gnunet-service-core_kx.c:1329
 msgid "# timeouts prevented via PONG"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1337
+#: src/core/gnunet-service-core_kx.c:1338
 msgid "# rekey operations confirmed via PONG"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1506
+#: src/core/gnunet-service-core_kx.c:1507
 msgid "# DATA message dropped (out of order)"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1517
+#: src/core/gnunet-service-core_kx.c:1518
 #, c-format
 msgid ""
 "Session to peer `%s' went down due to key expiration (should not happen)\n"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1521
+#: src/core/gnunet-service-core_kx.c:1522
 msgid "# sessions terminated by key expiration"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1599
-#: src/core/gnunet-service-core_kx.c:1626
+#: src/core/gnunet-service-core_kx.c:1600
+#: src/core/gnunet-service-core_kx.c:1627
 msgid "# bytes dropped (duplicates)"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1612
+#: src/core/gnunet-service-core_kx.c:1613
 msgid "# bytes dropped (out of sequence)"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1657
+#: src/core/gnunet-service-core_kx.c:1658
 msgid "# bytes dropped (ancient message)"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1666
+#: src/core/gnunet-service-core_kx.c:1667
 msgid "# bytes of payload decrypted"
 msgstr ""
 
 #: src/core/gnunet-service-core_sessions.c:252
 #: src/core/gnunet-service-core_sessions.c:337
-#: src/fs/gnunet-service-fs_cp.c:601 src/fs/gnunet-service-fs_cp.c:1496
+#: src/fs/gnunet-service-fs_cp.c:601 src/fs/gnunet-service-fs_cp.c:1494
 #: src/topology/gnunet-daemon-topology.c:579
 #: src/topology/gnunet-daemon-topology.c:671
 #: src/transport/gnunet-service-transport_neighbours.c:723
@@ -1689,7 +1692,7 @@ msgstr ""
 #: src/datastore/gnunet-service-datastore.c:626
 #: src/datastore/gnunet-service-datastore.c:677
 #: src/datastore/gnunet-service-datastore.c:820
-#: src/datastore/gnunet-service-datastore.c:1429
+#: src/datastore/gnunet-service-datastore.c:1428
 msgid "# reserved"
 msgstr "# réservé"
 
@@ -1734,69 +1737,69 @@ msgstr ""
 msgid "# bytes removed (explicit request)"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1059
+#: src/datastore/gnunet-service-datastore.c:1058
 msgid "# REMOVE requests received"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1108
+#: src/datastore/gnunet-service-datastore.c:1107
 #, c-format
 msgid ""
 "Datastore payload must have been inaccurate (%lld < %lld). Recomputing it.\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1113
-#: src/datastore/gnunet-service-datastore.c:1282
+#: src/datastore/gnunet-service-datastore.c:1112
+#: src/datastore/gnunet-service-datastore.c:1281
 #, c-format
 msgid "New payload: %lld\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1168
+#: src/datastore/gnunet-service-datastore.c:1167
 #, c-format
 msgid "Loading `%s' datastore plugin\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1177
+#: src/datastore/gnunet-service-datastore.c:1176
 #, c-format
 msgid "Failed to load datastore plugin for `%s'\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1237
+#: src/datastore/gnunet-service-datastore.c:1236
 msgid "Bloomfilter construction complete.\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1289
+#: src/datastore/gnunet-service-datastore.c:1288
 msgid "Rebuilding bloomfilter.  Please be patient.\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1299
+#: src/datastore/gnunet-service-datastore.c:1298
 msgid "Plugin does not support get_keys function. Please fix!\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1464
+#: src/datastore/gnunet-service-datastore.c:1463
 #, c-format
 msgid "# bytes used in file-sharing datastore `%s'"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1473
+#: src/datastore/gnunet-service-datastore.c:1472
 msgid "# quota"
 msgstr "# quota"
 
-#: src/datastore/gnunet-service-datastore.c:1476
+#: src/datastore/gnunet-service-datastore.c:1475
 msgid "# cache size"
 msgstr "# taille du cache"
 
-#: src/datastore/gnunet-service-datastore.c:1492
+#: src/datastore/gnunet-service-datastore.c:1491
 #, c-format
 msgid "Could not use specified filename `%s' for bloomfilter.\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1513
-#: src/datastore/gnunet-service-datastore.c:1535
+#: src/datastore/gnunet-service-datastore.c:1512
+#: src/datastore/gnunet-service-datastore.c:1534
 #, c-format
 msgid "Failed to remove bogus bloomfilter file `%s'\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1574
+#: src/datastore/gnunet-service-datastore.c:1573
 msgid "Failed to initialize bloomfilter.\n"
 msgstr ""
 
@@ -1847,7 +1850,7 @@ msgstr ""
 
 #: src/datastore/plugin_datastore_sqlite.c:310
 #: src/namecache/plugin_namecache_sqlite.c:180
-#: src/namestore/plugin_namestore_sqlite.c:868
+#: src/namestore/plugin_namestore_sqlite.c:891
 #: src/peerstore/plugin_peerstore_sqlite.c:540
 #, c-format
 msgid "Unable to initialize SQLite: %s.\n"
@@ -2105,7 +2108,7 @@ msgstr ""
 msgid "# DNS requests received via TUN interface"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:1117 src/exit/gnunet-daemon-exit.c:3708
+#: src/dns/gnunet-service-dns.c:1117 src/exit/gnunet-daemon-exit.c:3707
 msgid "need a valid IPv4 or IPv6 address\n"
 msgstr ""
 
@@ -2243,69 +2246,69 @@ msgstr ""
 msgid "Packet from unknown protocol %u received.  Ignored.\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3377 src/exit/gnunet-daemon-exit.c:3388
+#: src/exit/gnunet-daemon-exit.c:3376 src/exit/gnunet-daemon-exit.c:3387
 #, c-format
 msgid "Option `%s' for domain `%s' is not formatted correctly!\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3402 src/exit/gnunet-daemon-exit.c:3410
+#: src/exit/gnunet-daemon-exit.c:3401 src/exit/gnunet-daemon-exit.c:3409
 #, c-format
 msgid "`%s' is not a valid port number (for domain `%s')!"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3452
+#: src/exit/gnunet-daemon-exit.c:3451
 #, c-format
 msgid "No addresses found for hostname `%s' of service `%s'!\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3467 src/exit/gnunet-daemon-exit.c:3482
+#: src/exit/gnunet-daemon-exit.c:3466 src/exit/gnunet-daemon-exit.c:3481
 #, c-format
 msgid "Service `%s' configured for IPv4, but IPv4 is disabled!\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3496
+#: src/exit/gnunet-daemon-exit.c:3495
 #, c-format
 msgid "No IP addresses found for hostname `%s' of service `%s'!\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3641
+#: src/exit/gnunet-daemon-exit.c:3640
 msgid ""
 "This system does not support IPv4, will disable IPv4 functions despite them "
 "being enabled in the configuration\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3650
+#: src/exit/gnunet-daemon-exit.c:3649
 msgid ""
 "This system does not support IPv6, will disable IPv6 functions despite them "
 "being enabled in the configuration\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3658
+#: src/exit/gnunet-daemon-exit.c:3657
 msgid ""
 "Cannot enable IPv4 exit but disable IPv4 on TUN interface, will use "
 "ENABLE_IPv4=YES\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3665
+#: src/exit/gnunet-daemon-exit.c:3664
 msgid ""
 "Cannot enable IPv6 exit but disable IPv6 on TUN interface, will use "
 "ENABLE_IPv6=YES\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3836
+#: src/exit/gnunet-daemon-exit.c:3835
 msgid "Must be a number"
 msgstr "Doit être un nombre"
 
-#: src/exit/gnunet-daemon-exit.c:3952
+#: src/exit/gnunet-daemon-exit.c:3951
 #, c-format
 msgid "`%s' is not SUID or the path is invalid, EXIT will not work\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3964 src/pt/gnunet-daemon-pt.c:1212
+#: src/exit/gnunet-daemon-exit.c:3963 src/pt/gnunet-daemon-pt.c:1212
 msgid "No useful service enabled.  Exiting.\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:4118
+#: src/exit/gnunet-daemon-exit.c:4117
 msgid "Daemon to run to provide an IP exit node for the VPN"
 msgstr ""
 
@@ -2487,7 +2490,7 @@ msgstr ""
 msgid "internal error decoding tree"
 msgstr ""
 
-#: src/fs/fs_download.c:1890
+#: src/fs/fs_download.c:1889
 msgid "Invalid URI"
 msgstr "URI invalide"
 
@@ -2503,7 +2506,7 @@ msgstr ""
 msgid "Failed to receive response from `%s' service.\n"
 msgstr "Résolution de « %s » échouée : %s\n"
 
-#: src/fs/fs_list_indexed.c:195
+#: src/fs/fs_list_indexed.c:187
 #, c-format
 msgid "Failed to not connect to `%s' service.\n"
 msgstr ""
@@ -2528,7 +2531,7 @@ msgstr ""
 msgid "Failed to read `%s': %s\n"
 msgstr ""
 
-#: src/fs/fs_namespace.c:472
+#: src/fs/fs_namespace.c:457
 msgid "Failed to connect to datastore."
 msgstr ""
 
@@ -2657,93 +2660,93 @@ msgstr ""
 msgid "Failed to compute hash of file."
 msgstr ""
 
-#: src/fs/fs_uri.c:239
+#: src/fs/fs_uri.c:231
 #, no-c-format
 msgid "Malformed KSK URI (`%' must be followed by HEX number)"
 msgstr ""
 
-#: src/fs/fs_uri.c:298
+#: src/fs/fs_uri.c:290
 msgid "Malformed KSK URI (must not begin or end with `+')"
 msgstr ""
 
-#: src/fs/fs_uri.c:316
+#: src/fs/fs_uri.c:308
 msgid "Malformed KSK URI (`++' not allowed)"
 msgstr ""
 
-#: src/fs/fs_uri.c:323
+#: src/fs/fs_uri.c:315
 msgid "Malformed KSK URI (quotes not balanced)"
 msgstr ""
 
-#: src/fs/fs_uri.c:390
+#: src/fs/fs_uri.c:382
 msgid "Malformed SKS URI (wrong syntax)"
 msgstr ""
 
-#: src/fs/fs_uri.c:431
+#: src/fs/fs_uri.c:423
 msgid "Malformed CHK URI (wrong syntax)"
 msgstr ""
 
-#: src/fs/fs_uri.c:448
+#: src/fs/fs_uri.c:440
 msgid "Malformed CHK URI (failed to decode CHK)"
 msgstr ""
 
-#: src/fs/fs_uri.c:525
+#: src/fs/fs_uri.c:517
 msgid "LOC URI malformed (wrong syntax)"
 msgstr ""
 
-#: src/fs/fs_uri.c:542
+#: src/fs/fs_uri.c:534
 msgid "LOC URI malformed (no CHK)"
 msgstr ""
 
-#: src/fs/fs_uri.c:552
+#: src/fs/fs_uri.c:544
 msgid "LOC URI malformed (missing LOC)"
 msgstr ""
 
-#: src/fs/fs_uri.c:560
+#: src/fs/fs_uri.c:552
 msgid "LOC URI malformed (wrong syntax for public key)"
 msgstr ""
 
-#: src/fs/fs_uri.c:569
+#: src/fs/fs_uri.c:561
 msgid "LOC URI malformed (could not decode public key)"
 msgstr ""
 
-#: src/fs/fs_uri.c:575
+#: src/fs/fs_uri.c:567
 msgid "LOC URI malformed (could not find signature)"
 msgstr ""
 
-#: src/fs/fs_uri.c:582
+#: src/fs/fs_uri.c:574
 msgid "LOC URI malformed (wrong syntax for signature)"
 msgstr ""
 
-#: src/fs/fs_uri.c:593
+#: src/fs/fs_uri.c:585
 msgid "LOC URI malformed (could not decode signature)"
 msgstr ""
 
-#: src/fs/fs_uri.c:600
+#: src/fs/fs_uri.c:592
 msgid "LOC URI malformed (wrong syntax for expiration time)"
 msgstr ""
 
-#: src/fs/fs_uri.c:606
+#: src/fs/fs_uri.c:598
 msgid "LOC URI malformed (could not parse expiration time)"
 msgstr ""
 
-#: src/fs/fs_uri.c:620
+#: src/fs/fs_uri.c:612
 msgid "LOC URI malformed (signature failed validation)"
 msgstr ""
 
-#: src/fs/fs_uri.c:653
+#: src/fs/fs_uri.c:645
 #, fuzzy
 msgid "invalid argument"
 msgstr "Argument invalide « %s »\n"
 
-#: src/fs/fs_uri.c:673
+#: src/fs/fs_uri.c:665
 msgid "Unrecognized URI type"
 msgstr "Type d’URI non reconnu"
 
-#: src/fs/fs_uri.c:1077 src/fs/fs_uri.c:1104
+#: src/fs/fs_uri.c:1060 src/fs/fs_uri.c:1087
 msgid "No keywords specified!\n"
 msgstr ""
 
-#: src/fs/fs_uri.c:1110
+#: src/fs/fs_uri.c:1093
 msgid "Number of double-quotes not balanced!\n"
 msgstr ""
 
@@ -3309,7 +3312,7 @@ msgid "# cadet client connections rejected"
 msgstr ""
 
 #: src/fs/gnunet-service-fs_cadet_server.c:394
-#: src/fs/gnunet-service-fs_cadet_server.c:434
+#: src/fs/gnunet-service-fs_cadet_server.c:433
 #, fuzzy
 msgid "# cadet connections active"
 msgstr "# Session TCP active"
@@ -3367,7 +3370,7 @@ msgstr ""
 msgid "# P2P query messages received and processed"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1679
+#: src/fs/gnunet-service-fs_cp.c:1677
 msgid "# migration stop messages sent"
 msgstr ""
 
@@ -3653,8 +3656,8 @@ msgstr ""
 #: src/hostlist/gnunet-daemon-hostlist_client.c:957
 #: src/hostlist/gnunet-daemon-hostlist_client.c:1059
 #: src/hostlist/gnunet-daemon-hostlist_client.c:1067
-#: src/transport/plugin_transport_http_client.c:600
-#: src/transport/plugin_transport_http_client.c:618
+#: src/transport/plugin_transport_http_client.c:599
+#: src/transport/plugin_transport_http_client.c:617
 #, c-format
 msgid "%s failed at %s:%d: `%s'\n"
 msgstr ""
@@ -3719,7 +3722,7 @@ msgstr ""
 msgid "Failed to start HTTPS server for `%s'\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:2919 src/rest/gnunet-rest-server.c:958
+#: src/gns/gnunet-gns-proxy.c:2919 src/rest/gnunet-rest-server.c:957
 msgid "Failed to pass client to MHD\n"
 msgstr ""
 
@@ -3738,24 +3741,24 @@ msgstr ""
 msgid "Unsupported socks address type %d\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:3727
+#: src/gns/gnunet-gns-proxy.c:3726
 #, c-format
 msgid "Failed to load X.509 key and certificate from `%s'\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:3869
+#: src/gns/gnunet-gns-proxy.c:3868
 msgid "listen on specified port (default: 7777)"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:3874
+#: src/gns/gnunet-gns-proxy.c:3873
 msgid "pem file to use as CA"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:3878
+#: src/gns/gnunet-gns-proxy.c:3877
 msgid "disable use of IPv6"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:3904
+#: src/gns/gnunet-gns-proxy.c:3903
 msgid "GNUnet GNS proxy"
 msgstr ""
 
@@ -3802,19 +3805,17 @@ msgstr ""
 msgid "GNUnet GNS resolver tool"
 msgstr ""
 
-#: src/gns/gnunet-service-gns.c:501
+#: src/gns/gnunet-service-gns.c:500
 msgid "Properly base32-encoded public key required"
 msgstr ""
 
-#: src/gns/gnunet-service-gns.c:537
-#: src/zonemaster/gnunet-service-zonemaster-monitor.c:542
-#: src/zonemaster/gnunet-service-zonemaster.c:982
+#: src/gns/gnunet-service-gns.c:536
+#: src/zonemaster/gnunet-service-zonemaster.c:1396
 msgid "Failed to connect to the namecache!\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns.c:556
-#: src/zonemaster/gnunet-service-zonemaster-monitor.c:572
-#: src/zonemaster/gnunet-service-zonemaster.c:1021
+#: src/gns/gnunet-service-gns.c:555
+#: src/zonemaster/gnunet-service-zonemaster.c:1435
 msgid "Could not connect to DHT!\n"
 msgstr ""
 
@@ -3933,31 +3934,31 @@ msgstr ""
 msgid "Label  contains `.' which is not allowed\n"
 msgstr ""
 
-#: src/gnsrecord/gnsrecord_misc.c:467
+#: src/gnsrecord/gnsrecord_misc.c:481
 msgid "Zone delegation record not allowed in apex."
 msgstr ""
 
-#: src/gnsrecord/gnsrecord_misc.c:475
+#: src/gnsrecord/gnsrecord_misc.c:489
 msgid "Zone delegation record set contains mutually exclusive records."
 msgstr ""
 
-#: src/gnsrecord/gnsrecord_misc.c:485
+#: src/gnsrecord/gnsrecord_misc.c:499
 msgid "Multiple REDIRECT records."
 msgstr ""
 
-#: src/gnsrecord/gnsrecord_misc.c:494 src/gnsrecord/gnsrecord_misc.c:520
+#: src/gnsrecord/gnsrecord_misc.c:508 src/gnsrecord/gnsrecord_misc.c:534
 msgid "Redirection record set contains mutually exclusive records."
 msgstr ""
 
-#: src/gnsrecord/gnsrecord_misc.c:501
+#: src/gnsrecord/gnsrecord_misc.c:515
 msgid "Redirection records not allowed in apex."
 msgstr ""
 
-#: src/gnsrecord/gnsrecord_misc.c:512
+#: src/gnsrecord/gnsrecord_misc.c:526
 msgid "Redirection records not allowed in apex.."
 msgstr ""
 
-#: src/gnsrecord/gnsrecord_misc.c:534
+#: src/gnsrecord/gnsrecord_misc.c:548
 msgid "Mutually exclusive records."
 msgstr ""
 
@@ -4071,33 +4072,33 @@ msgstr ""
 msgid "Modified %u addresses, wrote %u bytes\n"
 msgstr ""
 
-#: src/hello/hello.c:1111
+#: src/hello/hello.c:1089
 msgid "Failed to parse HELLO message: missing expiration time\n"
 msgstr ""
 
-#: src/hello/hello.c:1121
+#: src/hello/hello.c:1099
 msgid "Failed to parse HELLO message: invalid expiration time\n"
 msgstr ""
 
-#: src/hello/hello.c:1131
+#: src/hello/hello.c:1109
 msgid "Failed to parse HELLO message: malformed\n"
 msgstr ""
 
-#: src/hello/hello.c:1143
+#: src/hello/hello.c:1121
 msgid "Failed to parse HELLO message: missing transport plugin\n"
 msgstr ""
 
-#: src/hello/hello.c:1161
+#: src/hello/hello.c:1139
 #, fuzzy, c-format
 msgid "Plugin `%s' not found, skipping address\n"
 msgstr "Extension « %s » introuvable\n"
 
-#: src/hello/hello.c:1169
+#: src/hello/hello.c:1147
 #, c-format
 msgid "Plugin `%s' does not support URIs yet\n"
 msgstr ""
 
-#: src/hello/hello.c:1184
+#: src/hello/hello.c:1162
 #, c-format
 msgid "Failed to parse `%s' as an address for plugin `%s'\n"
 msgstr ""
@@ -4150,7 +4151,7 @@ msgid "# valid HELLOs downloaded from hostlist servers"
 msgstr ""
 
 #: src/hostlist/gnunet-daemon-hostlist_client.c:677
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1453
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1451
 msgid "# advertised hostlist URIs"
 msgstr ""
 
@@ -4201,7 +4202,7 @@ msgid "# hostlist downloads initiated"
 msgstr ""
 
 #: src/hostlist/gnunet-daemon-hostlist_client.c:1137
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1725
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1723
 msgid "# milliseconds between hostlist downloads"
 msgstr ""
 
@@ -4215,65 +4216,65 @@ msgstr ""
 msgid "# active connections"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1389
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1387
 #, c-format
 msgid "Loading saved hostlist entries from file `%s' \n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1394
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1392
 #, c-format
 msgid "Hostlist file `%s' does not exist\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1405
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1403
 #, c-format
 msgid "Could not open file `%s' for reading to load hostlists: %s\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1446
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1444
 #, c-format
 msgid "%u hostlist URIs loaded from file\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1449
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1447
 msgid "# hostlist URIs read from file"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1500
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1498
 #, c-format
 msgid "Could not open file `%s' for writing to save hostlists: %s\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1507
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1505
 #, c-format
 msgid "Writing %u hostlist URIs to `%s'\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1540
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1559
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1538
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1557
 #, c-format
 msgid "Error writing hostlist URIs to file `%s'\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1553
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1551
 msgid "# hostlist URIs written to file"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1654
-#: src/transport/plugin_transport_http_client.c:2294
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1652
+#: src/transport/plugin_transport_http_client.c:2288
 #, c-format
 msgid "Invalid proxy type: `%s', disabling proxy! Check configuration!\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1683
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1681
 msgid "Learning is enabled on this peer\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1696
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1694
 msgid "Learning is not enabled on this peer\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1710
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1708
 #, c-format
 msgid ""
 "Since learning is not enabled on this peer, hostlist file `%s' was removed\n"
@@ -4343,7 +4344,7 @@ msgid "# hostlist advertisements send"
 msgstr ""
 
 #: src/hostlist/gnunet-daemon-hostlist_server.c:674
-#: src/transport/gnunet-service-transport.c:2657
+#: src/transport/gnunet-service-transport.c:2652
 msgid "Could not access PEERINFO service.  Exiting.\n"
 msgstr ""
 
@@ -4461,49 +4462,49 @@ msgstr ""
 msgid "Maintain egos"
 msgstr ""
 
-#: src/identity/gnunet-service-identity.c:502
+#: src/identity/gnunet-service-identity.c:501
 msgid "no default known"
 msgstr ""
 
-#: src/identity/gnunet-service-identity.c:527
+#: src/identity/gnunet-service-identity.c:526
 msgid "default configured, but ego unknown (internal error)"
 msgstr ""
 
-#: src/identity/gnunet-service-identity.c:620
-#: src/identity/gnunet-service-identity.c:895
-#: src/identity/gnunet-service-identity.c:1015
+#: src/identity/gnunet-service-identity.c:618
+#: src/identity/gnunet-service-identity.c:891
+#: src/identity/gnunet-service-identity.c:1010
 #, c-format
 msgid "Failed to write subsystem default identifier map to `%s'.\n"
 msgstr ""
 
-#: src/identity/gnunet-service-identity.c:630
+#: src/identity/gnunet-service-identity.c:628
 msgid "Unknown ego specified for service (internal error)"
 msgstr ""
 
-#: src/identity/gnunet-service-identity.c:724
+#: src/identity/gnunet-service-identity.c:721
 msgid "identifier already in use for another ego"
 msgstr ""
 
-#: src/identity/gnunet-service-identity.c:871
+#: src/identity/gnunet-service-identity.c:867
 msgid "target name already exists"
 msgstr ""
 
-#: src/identity/gnunet-service-identity.c:913
-#: src/identity/gnunet-service-identity.c:1032
+#: src/identity/gnunet-service-identity.c:909
+#: src/identity/gnunet-service-identity.c:1027
 msgid "no matching ego found"
 msgstr ""
 
-#: src/identity/gnunet-service-identity.c:1130
+#: src/identity/gnunet-service-identity.c:1125
 #, c-format
 msgid "Failed to parse ego information in `%s'\n"
 msgstr ""
 
-#: src/identity/gnunet-service-identity.c:1188
+#: src/identity/gnunet-service-identity.c:1183
 #, c-format
 msgid "Failed to parse subsystem identity configuration file `%s'\n"
 msgstr ""
 
-#: src/identity/gnunet-service-identity.c:1197
+#: src/identity/gnunet-service-identity.c:1192
 #, c-format
 msgid "Failed to create directory `%s' for storing egos\n"
 msgstr ""
@@ -4581,16 +4582,18 @@ msgstr ""
 msgid "GNUnet zone manipulation tool"
 msgstr ""
 
-#: src/namecache/namecache_api.c:286
+#: src/namecache/namecache_api.c:285
 msgid "Namecache failed to cache block"
 msgstr ""
 
-#: src/namecache/namecache_api.c:374
+#: src/namecache/namecache_api.c:373
 msgid "Error communicating with namecache service"
 msgstr ""
 
 #: src/namecache/plugin_namecache_flat.c:118
 #: src/namecache/plugin_namecache_flat.c:253
+#: src/namestore/plugin_namestore_flat.c:176
+#: src/namestore/plugin_namestore_flat.c:424
 #: src/peerstore/plugin_peerstore_flat.c:380
 #: src/peerstore/plugin_peerstore_flat.c:542
 #, c-format
@@ -4598,6 +4601,7 @@ msgid "Unable to initialize file: %s.\n"
 msgstr ""
 
 #: src/namecache/plugin_namecache_flat.c:129
+#: src/namestore/plugin_namestore_flat.c:187
 #: src/peerstore/plugin_peerstore_flat.c:395
 #, c-format
 msgid "Unable to get filesize: %s.\n"
@@ -4638,6 +4642,7 @@ msgid "the namestore plugin to work with, e.g. 'sqlite'"
 msgstr ""
 
 #: src/namestore/gnunet-namestore-dbtool.c:178
+#: src/namestore/gnunet-namestore-zonefile.c:750
 msgid "GNUnet namestore database manipulation tool"
 msgstr ""
 
@@ -4739,6 +4744,47 @@ msgstr ""
 msgid "GNU Name System First-Come-First-Served name registration service"
 msgstr ""
 
+#: src/namestore/gnunet-namestore-zonefile.c:329
+#, fuzzy, c-format
+msgid "Failed to store records...\n"
+msgstr "Échec du démarrage de %s\n"
+
+#: src/namestore/gnunet-namestore-zonefile.c:437
+#: src/namestore/gnunet-namestore-zonefile.c:469
+#, c-format
+msgid "Name `%s' is too long\n"
+msgstr ""
+
+#: src/namestore/gnunet-namestore-zonefile.c:515
+#, c-format
+msgid "You must provide $ORIGIN in your zonefile or via arguments (--zone)!\n"
+msgstr ""
+
+#: src/namestore/gnunet-namestore-zonefile.c:524
+#, c-format
+msgid "Only %u records per unique name supported.\n"
+msgstr ""
+
+#: src/namestore/gnunet-namestore-zonefile.c:586
+#, fuzzy, c-format
+msgid "Data `%s' invalid\n"
+msgstr "Appel terminé\n"
+
+#: src/namestore/gnunet-namestore-zonefile.c:702
+#, fuzzy, c-format
+msgid "Failed to connect to NAMESTORE\n"
+msgstr "Échec du démarrage de %s\n"
+
+#: src/namestore/gnunet-namestore-zonefile.c:709
+#, fuzzy, c-format
+msgid "Failed to connect to IDENTITY\n"
+msgstr "Échec du démarrage de %s\n"
+
+#: src/namestore/gnunet-namestore-zonefile.c:735
+#: src/namestore/gnunet-namestore.c:1628
+msgid "name of the ego controlling the zone"
+msgstr ""
+
 #: src/namestore/gnunet-namestore.c:340
 #, c-format
 msgid "Adding record failed: %s\n"
@@ -4935,21 +4981,21 @@ msgid ""
 "expired"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1628
-msgid "name of the ego controlling the zone"
-msgstr ""
-
-#: src/namestore/gnunet-service-namestore.c:1504
+#: src/namestore/gnunet-service-namestore.c:1673
 #, fuzzy
 msgid "Error normalizing name."
 msgstr "Erreur de création du tunnel\n"
 
-#: src/namestore/gnunet-service-namestore.c:1522
+#: src/namestore/gnunet-service-namestore.c:1691
 #, fuzzy
 msgid "Error deserializing records."
 msgstr "Erreur de création du tunnel\n"
 
-#: src/namestore/gnunet-service-namestore.c:1633
+#: src/namestore/gnunet-service-namestore.c:1811
+msgid "Not records to delete."
+msgstr ""
+
+#: src/namestore/gnunet-service-namestore.c:1819
 #, fuzzy
 msgid "Store failed"
 msgstr "pa_stream_new() échoué : %s\n"
@@ -4962,23 +5008,37 @@ msgstr ""
 msgid "minimum expiration time we assume for imported records"
 msgstr ""
 
+#: src/namestore/plugin_namestore_flat.c:195
+#, c-format
+msgid "File too big to map: %llu bytes.\n"
+msgstr ""
+
+#: src/namestore/plugin_namestore_flat.c:219
+#, c-format
+msgid "Namestore database file `%s' malformed\n"
+msgstr ""
+
+#: src/namestore/plugin_namestore_flat.c:792
+msgid "Flat file database running\n"
+msgstr ""
+
 #: src/namestore/plugin_namestore_sqlite.c:180
 #: src/namestore/plugin_namestore_sqlite.c:190
-#: src/namestore/plugin_namestore_sqlite.c:806
+#: src/namestore/plugin_namestore_sqlite.c:829
 #, fuzzy, c-format
 msgid "Failed to setup database with: `%s'\n"
 msgstr "Échec du démarrage de %s\n"
 
-#: src/namestore/plugin_namestore_sqlite.c:797
+#: src/namestore/plugin_namestore_sqlite.c:820
 #, fuzzy, c-format
 msgid "Failed to drop database with: `%s'\n"
 msgstr "Échec du démarrage de %s\n"
 
-#: src/namestore/plugin_namestore_sqlite.c:938
+#: src/namestore/plugin_namestore_sqlite.c:961
 msgid "SQlite database running\n"
 msgstr ""
 
-#: src/namestore/plugin_rest_namestore.c:1369
+#: src/namestore/plugin_rest_namestore.c:1414
 msgid "Namestore REST API initialized\n"
 msgstr ""
 
@@ -5281,7 +5341,7 @@ msgid "Show network size estimates from NSE service."
 msgstr ""
 
 #: src/nse/gnunet-service-nse.c:1441
-#: src/revocation/gnunet-service-revocation.c:888 src/util/gnunet-scrypt.c:243
+#: src/revocation/gnunet-service-revocation.c:888 src/util/gnunet-scrypt.c:242
 msgid "Value is too large.\n"
 msgstr ""
 
@@ -5358,19 +5418,19 @@ msgid "Print information about peers."
 msgstr ""
 
 #: src/peerinfo-tool/gnunet-peerinfo_plugins.c:103
-#: src/transport/gnunet-service-transport_plugins.c:167
+#: src/transport/gnunet-service-transport_plugins.c:154
 #, c-format
 msgid "Starting transport plugins `%s'\n"
 msgstr ""
 
 #: src/peerinfo-tool/gnunet-peerinfo_plugins.c:107
-#: src/transport/gnunet-service-transport_plugins.c:172
+#: src/transport/gnunet-service-transport_plugins.c:159
 #, c-format
 msgid "Loading `%s' transport plugin\n"
 msgstr ""
 
 #: src/peerinfo-tool/gnunet-peerinfo_plugins.c:127
-#: src/transport/gnunet-service-transport_plugins.c:207
+#: src/transport/gnunet-service-transport_plugins.c:194
 #, c-format
 msgid "Failed to load transport plugin for `%s'\n"
 msgstr ""
@@ -5429,7 +5489,7 @@ msgstr ""
 msgid "Skipping import of included HELLOs\n"
 msgstr ""
 
-#: src/peerinfo/peerinfo_api.c:217
+#: src/peerinfo/peerinfo_api.c:210
 msgid "Failed to receive response from `PEERINFO' service."
 msgstr ""
 
@@ -5450,7 +5510,7 @@ msgstr ""
 msgid "Received a malformed response from service."
 msgstr ""
 
-#: src/peerstore/peerstore_api.c:790
+#: src/peerstore/peerstore_api.c:779
 msgid "Received a watch result for a non existing watch.\n"
 msgstr ""
 
@@ -5673,56 +5733,56 @@ msgstr ""
 msgid "Daemon to announce regular expressions for the peer using cadet."
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1366
+#: src/regex/gnunet-regex-profiler.c:1365
 msgid "No configuration file given. Exiting\n"
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1408
+#: src/regex/gnunet-regex-profiler.c:1407
 #: src/regex/gnunet-regex-simulation-profiler.c:631
 #, c-format
 msgid "No policy directory specified on command line. Exiting.\n"
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1414
+#: src/regex/gnunet-regex-profiler.c:1413
 #: src/regex/gnunet-regex-simulation-profiler.c:639
 #, c-format
 msgid "Specified policies directory does not exist. Exiting.\n"
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1422
+#: src/regex/gnunet-regex-profiler.c:1421
 #, c-format
 msgid "No files found in `%s'\n"
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1431
+#: src/regex/gnunet-regex-profiler.c:1430
 msgid "No search strings file given. Exiting.\n"
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1451
+#: src/regex/gnunet-regex-profiler.c:1450
 msgid "Error loading search strings. Exiting.\n"
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1540
+#: src/regex/gnunet-regex-profiler.c:1539
 msgid "name of the file for writing statistics"
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1547
+#: src/regex/gnunet-regex-profiler.c:1546
 msgid "wait TIMEOUT before ending the experiment"
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1553
+#: src/regex/gnunet-regex-profiler.c:1552
 msgid "directory with policy files"
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1560
+#: src/regex/gnunet-regex-profiler.c:1559
 msgid "name of file with input strings"
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1567
+#: src/regex/gnunet-regex-profiler.c:1566
 msgid "name of file with hosts' names"
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1582
+#: src/regex/gnunet-regex-profiler.c:1581
 msgid "Profiler for regex"
 msgstr ""
 
@@ -5743,16 +5803,16 @@ msgstr ""
 msgid "Regex `%s' is too long!\n"
 msgstr ""
 
-#: src/regex/regex_api_search.c:212
+#: src/regex/regex_api_search.c:200
 #, c-format
 msgid "Search string `%s' is too long!\n"
 msgstr ""
 
-#: src/rest/gnunet-rest-server.c:1367
+#: src/rest/gnunet-rest-server.c:1366
 msgid "GNUnet REST server"
 msgstr ""
 
-#: src/rest/plugin_rest_config.c:429
+#: src/rest/plugin_rest_config.c:428
 msgid "CONFIG REST API initialized\n"
 msgstr ""
 
@@ -5944,62 +6004,62 @@ msgstr ""
 msgid "Get peers from biased stream"
 msgstr ""
 
-#: src/scalarproduct/gnunet-scalarproduct.c:229
+#: src/scalarproduct/gnunet-scalarproduct.c:228
 msgid "You must specify at least one message ID to check!\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-scalarproduct.c:237
+#: src/scalarproduct/gnunet-scalarproduct.c:236
 msgid "This program needs a session identifier for comparing vectors.\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-scalarproduct.c:250
+#: src/scalarproduct/gnunet-scalarproduct.c:249
 #, c-format
 msgid ""
 "Tried to set initiator mode, as peer ID was given. However, `%s' is not a "
 "valid peer identifier.\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-scalarproduct.c:268
+#: src/scalarproduct/gnunet-scalarproduct.c:267
 msgid "Need elements to compute the scalarproduct, got none.\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-scalarproduct.c:291
+#: src/scalarproduct/gnunet-scalarproduct.c:290
 #, c-format
 msgid "Malformed input, could not parse `%s'\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-scalarproduct.c:309
+#: src/scalarproduct/gnunet-scalarproduct.c:308
 #, fuzzy, c-format
 msgid "Could not convert `%s' to int64_t.\n"
 msgstr "Impossible d’ouvrir « %s ».\n"
 
-#: src/scalarproduct/gnunet-scalarproduct.c:339
+#: src/scalarproduct/gnunet-scalarproduct.c:338
 #, c-format
 msgid "Failed to initiate computation, were all keys unique?\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-scalarproduct.c:365
-#: src/scalarproduct/gnunet-scalarproduct.c:372
+#: src/scalarproduct/gnunet-scalarproduct.c:364
+#: src/scalarproduct/gnunet-scalarproduct.c:371
 msgid ""
 "A comma separated list of elements to compare as vector with our remote peer."
 msgstr ""
 
-#: src/scalarproduct/gnunet-scalarproduct.c:379
+#: src/scalarproduct/gnunet-scalarproduct.c:378
 msgid ""
 "[Optional] peer to calculate our scalarproduct with. If this parameter is "
 "not given, the service will wait for a remote peer to compute the request."
 msgstr ""
 
-#: src/scalarproduct/gnunet-scalarproduct.c:386
+#: src/scalarproduct/gnunet-scalarproduct.c:385
 msgid "Transaction ID shared with peer."
 msgstr ""
 
-#: src/scalarproduct/gnunet-scalarproduct.c:397
+#: src/scalarproduct/gnunet-scalarproduct.c:396
 msgid "Calculate the Vectorproduct with a GNUnet peer."
 msgstr ""
 
 #: src/scalarproduct/gnunet-service-scalarproduct-ecc_alice.c:1118
-#: src/scalarproduct/gnunet-service-scalarproduct-ecc_bob.c:1034
+#: src/scalarproduct/gnunet-service-scalarproduct-ecc_bob.c:1032
 #: src/scalarproduct/gnunet-service-scalarproduct_alice.c:1358
 #: src/scalarproduct/gnunet-service-scalarproduct_bob.c:1355
 msgid "Connect to CADET failed\n"
@@ -6025,7 +6085,7 @@ msgstr "threshold"
 msgid "also profile decryption"
 msgstr ""
 
-#: src/set/gnunet-service-set.c:1916 src/seti/gnunet-service-seti.c:2467
+#: src/set/gnunet-service-set.c:1914 src/seti/gnunet-service-seti.c:2467
 #: src/setu/gnunet-service-setu.c:5389
 msgid "Could not connect to CADET service\n"
 msgstr ""
@@ -6080,16 +6140,16 @@ msgstr ""
 msgid "return intersection instead of delta"
 msgstr ""
 
-#: src/sq/sq.c:54
+#: src/sq/sq.c:47
 #, c-format
 msgid "Failure to bind %u-th SQL parameter\n"
 msgstr ""
 
-#: src/sq/sq.c:61
+#: src/sq/sq.c:54
 msgid "Failure in sqlite3_reset (!)\n"
 msgstr ""
 
-#: src/sq/sq.c:139
+#: src/sq/sq.c:126
 #, c-format
 msgid "Failed to reset sqlite statement with error: %s\n"
 msgstr ""
@@ -6294,57 +6354,57 @@ msgid ""
 "Cannot open %s for writing load statistics.  Not logging load statistics\n"
 msgstr ""
 
-#: src/testbed/gnunet-service-testbed_peers.c:1165
+#: src/testbed/gnunet-service-testbed_peers.c:1153
 #, c-format
 msgid "%s is stopped"
 msgstr "%s est arrêté"
 
-#: src/testbed/gnunet-service-testbed_peers.c:1168
+#: src/testbed/gnunet-service-testbed_peers.c:1156
 #, c-format
 msgid "%s is starting"
 msgstr "%s est en cours de démarrage"
 
-#: src/testbed/gnunet-service-testbed_peers.c:1171
+#: src/testbed/gnunet-service-testbed_peers.c:1159
 #, c-format
 msgid "%s is stopping"
 msgstr "%s est en cours d'arrêt"
 
-#: src/testbed/gnunet-service-testbed_peers.c:1174
+#: src/testbed/gnunet-service-testbed_peers.c:1162
 #, c-format
 msgid "%s is starting already"
 msgstr "%s est déjà en cours de démarrage"
 
-#: src/testbed/gnunet-service-testbed_peers.c:1177
+#: src/testbed/gnunet-service-testbed_peers.c:1165
 #, c-format
 msgid "%s is stopping already"
 msgstr "%s est déjà arrêté"
 
-#: src/testbed/gnunet-service-testbed_peers.c:1180
+#: src/testbed/gnunet-service-testbed_peers.c:1168
 #, c-format
 msgid "%s is started already"
 msgstr "%s est déjà démarré"
 
-#: src/testbed/gnunet-service-testbed_peers.c:1183
+#: src/testbed/gnunet-service-testbed_peers.c:1171
 #, c-format
 msgid "%s is stopped already"
 msgstr "%s est déjà arrêté"
 
-#: src/testbed/gnunet-service-testbed_peers.c:1186
+#: src/testbed/gnunet-service-testbed_peers.c:1174
 #, c-format
 msgid "%s service is not known to ARM"
 msgstr ""
 
-#: src/testbed/gnunet-service-testbed_peers.c:1189
+#: src/testbed/gnunet-service-testbed_peers.c:1177
 #, c-format
 msgid "%s service failed to start"
 msgstr ""
 
-#: src/testbed/gnunet-service-testbed_peers.c:1192
+#: src/testbed/gnunet-service-testbed_peers.c:1180
 #, c-format
 msgid "%s service can't be started because ARM is shutting down"
 msgstr ""
 
-#: src/testbed/gnunet-service-testbed_peers.c:1194
+#: src/testbed/gnunet-service-testbed_peers.c:1182
 #, c-format
 msgid "%.s Unknown result code."
 msgstr "%.s Code d'erreur inconnu"
@@ -6365,17 +6425,17 @@ msgstr ""
 msgid "Adding host %u failed with error: %s\n"
 msgstr ""
 
-#: src/testbed/testbed_api_hosts.c:429
+#: src/testbed/testbed_api_hosts.c:411
 #, c-format
 msgid "Hosts file %s not found\n"
 msgstr ""
 
-#: src/testbed/testbed_api_hosts.c:438
+#: src/testbed/testbed_api_hosts.c:420
 #, c-format
 msgid "Hosts file %s has no data\n"
 msgstr ""
 
-#: src/testbed/testbed_api_hosts.c:447
+#: src/testbed/testbed_api_hosts.c:429
 #, c-format
 msgid "Hosts file %s cannot be read\n"
 msgstr ""
@@ -6389,87 +6449,87 @@ msgstr ""
 msgid "Host registration failed for a host. Error: %s\n"
 msgstr ""
 
-#: src/testbed/testbed_api_testbed.c:1065
+#: src/testbed/testbed_api_testbed.c:1060
 msgid "Controller crash detected. Shutting down.\n"
 msgstr ""
 
-#: src/testbed/testbed_api_testbed.c:1154
+#: src/testbed/testbed_api_testbed.c:1149
 #, c-format
 msgid "Host %s cannot start testbed\n"
 msgstr ""
 
-#: src/testbed/testbed_api_testbed.c:1158
+#: src/testbed/testbed_api_testbed.c:1153
 msgid "Testbed cannot be started on localhost\n"
 msgstr ""
 
-#: src/testbed/testbed_api_testbed.c:1196
+#: src/testbed/testbed_api_testbed.c:1191
 msgid "Cannot start the master controller"
 msgstr ""
 
-#: src/testbed/testbed_api_testbed.c:1214
+#: src/testbed/testbed_api_testbed.c:1209
 msgid "Shutting down testbed due to timeout while setup.\n"
 msgstr ""
 
-#: src/testbed/testbed_api_testbed.c:1276
+#: src/testbed/testbed_api_testbed.c:1271
 msgid "No hosts loaded. Need at least one host\n"
 msgstr ""
 
-#: src/testbed/testbed_api_testbed.c:1301
+#: src/testbed/testbed_api_testbed.c:1296
 msgid "Specified topology must be supported by testbed"
 msgstr ""
 
-#: src/testbed/testbed_api_testbed.c:1357
+#: src/testbed/testbed_api_testbed.c:1352
 #, c-format
 msgid ""
 "Maximum number of edges a peer can have in a scale free topology cannot be "
 "more than %u.  Given `%s = %llu'"
 msgstr ""
 
-#: src/testbed/testbed_api_testbed.c:1374
+#: src/testbed/testbed_api_testbed.c:1369
 #, c-format
 msgid ""
 "The number of edges that can established when adding a new node to scale "
 "free topology cannot be more than %u.  Given `%s = %llu'"
 msgstr ""
 
-#: src/testbed/testbed_api_topology.c:1033 src/testing/testing.c:2753
+#: src/testbed/testbed_api_topology.c:1021 src/testing/testing.c:2693
 #, c-format
 msgid "Topology file %s not found\n"
 msgstr ""
 
-#: src/testbed/testbed_api_topology.c:1041 src/testing/testing.c:2761
+#: src/testbed/testbed_api_topology.c:1029 src/testing/testing.c:2701
 #, c-format
 msgid "Topology file %s has no data\n"
 msgstr ""
 
-#: src/testbed/testbed_api_topology.c:1049 src/testing/testing.c:2769
+#: src/testbed/testbed_api_topology.c:1037 src/testing/testing.c:2709
 #, c-format
 msgid "Topology file %s cannot be read\n"
 msgstr ""
 
-#: src/testbed/testbed_api_topology.c:1071
+#: src/testbed/testbed_api_topology.c:1059
 #, c-format
 msgid "Failed to read peer index from toology file: %s"
 msgstr ""
 
-#: src/testbed/testbed_api_topology.c:1080
-#: src/testbed/testbed_api_topology.c:1105
+#: src/testbed/testbed_api_topology.c:1068
+#: src/testbed/testbed_api_topology.c:1093
 #, c-format
 msgid "Value in given topology file: %s out of range\n"
 msgstr ""
 
-#: src/testbed/testbed_api_topology.c:1086
-#: src/testbed/testbed_api_topology.c:1111
+#: src/testbed/testbed_api_topology.c:1074
+#: src/testbed/testbed_api_topology.c:1099
 #, c-format
 msgid "Failed to read peer index from topology file: %s"
 msgstr ""
 
-#: src/testbed/testbed_api_topology.c:1092
-#: src/testbed/testbed_api_topology.c:1117
+#: src/testbed/testbed_api_topology.c:1080
+#: src/testbed/testbed_api_topology.c:1105
 msgid "Topology file needs more peers than given ones\n"
 msgstr ""
 
-#: src/testbed/testbed_api_topology.c:1153
+#: src/testbed/testbed_api_topology.c:1141
 #, c-format
 msgid "Ignoring to connect peer %lu to peer %lu\n"
 msgstr ""
@@ -6564,7 +6624,7 @@ msgstr ""
 msgid "Failed to start `%s': %s\n"
 msgstr ""
 
-#: src/testing/testing.c:1694
+#: src/testing/testing.c:1646
 #, c-format
 msgid "Failed to load configuration from %s\n"
 msgstr ""
@@ -6641,7 +6701,7 @@ msgstr ""
 #: src/transport/gnunet-communicator-tcp.c:3347
 #: src/transport/gnunet-communicator-udp.c:3871
 #: src/transport/gnunet-service-tng.c:11334
-#: src/transport/gnunet-service-transport.c:2622
+#: src/transport/gnunet-service-transport.c:2617
 msgid "Transport service is lacking key configuration settings. Exiting.\n"
 msgstr ""
 
@@ -6702,12 +6762,12 @@ msgstr ""
 msgid "Disallowing connection to peer `%s' on transport %s\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport.c:2547
+#: src/transport/gnunet-service-transport.c:2542
 #, c-format
 msgid "Adding blacklisting entry for peer `%s'\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport.c:2556
+#: src/transport/gnunet-service-transport.c:2551
 #, c-format
 msgid "Adding blacklisting entry for peer `%s':`%s'\n"
 msgstr ""
@@ -6734,7 +6794,7 @@ msgid "# disconnects due to quota of 0"
 msgstr ""
 
 #: src/transport/gnunet-service-transport_neighbours.c:1341
-#: src/transport/gnunet-service-transport_neighbours.c:1817
+#: src/transport/gnunet-service-transport_neighbours.c:1807
 msgid "# bytes in message queue for other peers"
 msgstr ""
 
@@ -6802,132 +6862,132 @@ msgstr ""
 msgid "# ms throttling suggested"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1886
+#: src/transport/gnunet-service-transport_neighbours.c:1876
 #, fuzzy, c-format
 msgid "Failed to send SYN message to peer `%s'\n"
 msgstr "Résolution de « %s » échouée\n"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1912
+#: src/transport/gnunet-service-transport_neighbours.c:1902
 msgid "# Failed attempts to switch addresses (failed to send SYN CONT)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1953
+#: src/transport/gnunet-service-transport_neighbours.c:1943
 msgid "# SYN messages sent"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1970
+#: src/transport/gnunet-service-transport_neighbours.c:1960
 #, fuzzy, c-format
 msgid "Failed to transmit SYN message to %s\n"
 msgstr "Échec du démarrage de %s\n"
 
-#: src/transport/gnunet-service-transport_neighbours.c:2006
+#: src/transport/gnunet-service-transport_neighbours.c:1996
 msgid "# Failed attempts to switch addresses (failed to send SYN)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:2077
+#: src/transport/gnunet-service-transport_neighbours.c:2067
 #, c-format
 msgid "Failed to send SYN_ACK message to peer `%s' using address `%s'\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:2132
+#: src/transport/gnunet-service-transport_neighbours.c:2122
 msgid "# SYN_ACK messages sent"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:2150
+#: src/transport/gnunet-service-transport_neighbours.c:2140
 #, fuzzy, c-format
 msgid "Failed to transmit SYN_ACK message to %s\n"
 msgstr "Échec du démarrage de %s\n"
 
-#: src/transport/gnunet-service-transport_neighbours.c:2314
+#: src/transport/gnunet-service-transport_neighbours.c:2304
 msgid "# SYN messages received"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:2320
+#: src/transport/gnunet-service-transport_neighbours.c:2310
 #, c-format
 msgid "SYN request from peer `%s' ignored due impending shutdown\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:2731
+#: src/transport/gnunet-service-transport_neighbours.c:2721
 msgid "# Attempts to switch addresses"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3244
+#: src/transport/gnunet-service-transport_neighbours.c:3227
 msgid "# SYN_ACK messages received"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3252
+#: src/transport/gnunet-service-transport_neighbours.c:3235
 msgid "# unexpected SYN_ACK messages (no peer)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3272
-#: src/transport/gnunet-service-transport_neighbours.c:3300
+#: src/transport/gnunet-service-transport_neighbours.c:3255
+#: src/transport/gnunet-service-transport_neighbours.c:3283
 msgid "# unexpected SYN_ACK messages (not ready)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3315
+#: src/transport/gnunet-service-transport_neighbours.c:3298
 msgid "# unexpected SYN_ACK messages (waiting on ATS)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3345
+#: src/transport/gnunet-service-transport_neighbours.c:3328
 msgid "# Successful attempts to switch addresses"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3359
+#: src/transport/gnunet-service-transport_neighbours.c:3342
 msgid "# unexpected SYN_ACK messages (disconnecting)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3548
+#: src/transport/gnunet-service-transport_neighbours.c:3531
 msgid "# ACK messages received"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3582
+#: src/transport/gnunet-service-transport_neighbours.c:3565
 msgid "# unexpected ACK messages"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3672
+#: src/transport/gnunet-service-transport_neighbours.c:3648
 msgid "# quota messages ignored (malformed)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3679
+#: src/transport/gnunet-service-transport_neighbours.c:3655
 msgid "# QUOTA messages received"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3722
+#: src/transport/gnunet-service-transport_neighbours.c:3698
 msgid "# disconnect messages ignored (malformed)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3729
+#: src/transport/gnunet-service-transport_neighbours.c:3705
 msgid "# DISCONNECT messages received"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3742
+#: src/transport/gnunet-service-transport_neighbours.c:3718
 msgid "# disconnect messages ignored (timestamp)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3879
+#: src/transport/gnunet-service-transport_neighbours.c:3855
 msgid "# disconnected from peer upon explicit request"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_plugins.c:157
+#: src/transport/gnunet-service-transport_plugins.c:144
 msgid "Transport service is lacking NEIGHBOUR_LIMIT option.\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_plugins.c:222
-#: src/transport/gnunet-service-transport_plugins.c:230
-#: src/transport/gnunet-service-transport_plugins.c:238
-#: src/transport/gnunet-service-transport_plugins.c:246
-#: src/transport/gnunet-service-transport_plugins.c:254
-#: src/transport/gnunet-service-transport_plugins.c:262
-#: src/transport/gnunet-service-transport_plugins.c:270
-#: src/transport/gnunet-service-transport_plugins.c:278
-#: src/transport/gnunet-service-transport_plugins.c:286
-#: src/transport/gnunet-service-transport_plugins.c:294
-#: src/transport/gnunet-service-transport_plugins.c:302
+#: src/transport/gnunet-service-transport_plugins.c:209
+#: src/transport/gnunet-service-transport_plugins.c:217
+#: src/transport/gnunet-service-transport_plugins.c:225
+#: src/transport/gnunet-service-transport_plugins.c:233
+#: src/transport/gnunet-service-transport_plugins.c:241
+#: src/transport/gnunet-service-transport_plugins.c:249
+#: src/transport/gnunet-service-transport_plugins.c:257
+#: src/transport/gnunet-service-transport_plugins.c:265
+#: src/transport/gnunet-service-transport_plugins.c:273
+#: src/transport/gnunet-service-transport_plugins.c:281
+#: src/transport/gnunet-service-transport_plugins.c:289
 #, c-format
 msgid "Missing function `%s' in transport plugin for `%s'\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_plugins.c:309
+#: src/transport/gnunet-service-transport_plugins.c:296
 #, c-format
 msgid "Did not load plugin `%s' due to missing functions\n"
 msgstr ""
@@ -7194,7 +7254,7 @@ msgstr ""
 msgid "send data for benchmarking to the other peer (until CTRL-C)"
 msgstr ""
 
-#: src/transport/plugin_transport_http_client.c:1488
+#: src/transport/plugin_transport_http_client.c:1482
 #: src/transport/plugin_transport_http_server.c:2331
 #: src/transport/plugin_transport_http_server.c:3562
 #: src/transport/plugin_transport_tcp.c:3773
@@ -7202,24 +7262,24 @@ msgstr ""
 msgid "TCP_STEALTH not supported on this platform.\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_client.c:2134
+#: src/transport/plugin_transport_http_client.c:2128
 #, c-format
 msgid "Could not initialize curl multi handle, failed to start %s plugin!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_client.c:2183
+#: src/transport/plugin_transport_http_client.c:2177
 #: src/transport/plugin_transport_http_server.c:3276
 #, c-format
 msgid "Shutting down plugin `%s'\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_client.c:2200
+#: src/transport/plugin_transport_http_client.c:2194
 #: src/transport/plugin_transport_http_server.c:3346
 #, c-format
 msgid "Shutdown for plugin `%s' complete\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_client.c:2234
+#: src/transport/plugin_transport_http_client.c:2228
 #, c-format
 msgid "Maximum number of requests is %u\n"
 msgstr ""
@@ -7611,7 +7671,7 @@ msgstr ""
 msgid "`%s' failed for `%s': address already in use\n"
 msgstr ""
 
-#: src/transport/tcp_server_legacy.c:897
+#: src/transport/tcp_server_legacy.c:892
 #, c-format
 msgid ""
 "Processing code for message of type %u did not call "
@@ -7836,20 +7896,20 @@ msgstr "AUCUN"
 msgid "INVALID"
 msgstr "INVALIDE"
 
-#: src/util/common_logging.c:1396
+#: src/util/common_logging.c:1360
 msgid "unknown address"
 msgstr "adresse inconnue"
 
-#: src/util/common_logging.c:1441
+#: src/util/common_logging.c:1405
 msgid "invalid address"
 msgstr "adresse invalide"
 
-#: src/util/common_logging.c:1453
+#: src/util/common_logging.c:1417
 #, c-format
 msgid "Configuration fails to specify option `%s' in section `%s'!\n"
 msgstr ""
 
-#: src/util/common_logging.c:1468
+#: src/util/common_logging.c:1432
 #, c-format
 msgid ""
 "Configuration specifies invalid value for option `%s' in section `%s': %s\n"
@@ -7999,12 +8059,12 @@ msgstr ""
 msgid "Received DNS response that is too small (%u bytes)\n"
 msgstr ""
 
-#: src/util/dnsstub.c:508
+#: src/util/dnsstub.c:503
 #, fuzzy, c-format
 msgid "Failed to send DNS request to %s: %s\n"
 msgstr "Résolution de « %s » échouée : %s\n"
 
-#: src/util/dnsstub.c:513
+#: src/util/dnsstub.c:508
 #, c-format
 msgid "Sent DNS request to %s\n"
 msgstr ""
@@ -8382,28 +8442,28 @@ msgstr ""
 msgid "Use built-in GNUnet stub resolver"
 msgstr ""
 
-#: src/util/gnunet-scrypt.c:215
+#: src/util/gnunet-scrypt.c:214
 #, c-format
 msgid "Loading hostkey from `%s' failed.\n"
 msgstr ""
 
-#: src/util/gnunet-scrypt.c:281
+#: src/util/gnunet-scrypt.c:280
 msgid "number of bits to require for the proof of work"
 msgstr ""
 
-#: src/util/gnunet-scrypt.c:287
+#: src/util/gnunet-scrypt.c:286
 msgid "file with private key, otherwise default is used"
 msgstr ""
 
-#: src/util/gnunet-scrypt.c:293
+#: src/util/gnunet-scrypt.c:292
 msgid "file with proof of work, otherwise default is used"
 msgstr ""
 
-#: src/util/gnunet-scrypt.c:299
+#: src/util/gnunet-scrypt.c:298
 msgid "time to wait between calculations"
 msgstr ""
 
-#: src/util/gnunet-scrypt.c:313
+#: src/util/gnunet-scrypt.c:312
 msgid "Manipulate GNUnet proof of work files"
 msgstr ""
 
@@ -8435,17 +8495,17 @@ msgstr ""
 msgid "Perform default-actions for GNUnet URIs"
 msgstr ""
 
-#: src/util/helper.c:323
+#: src/util/helper.c:306
 #, c-format
 msgid "Error reading from `%s': %s\n"
 msgstr ""
 
-#: src/util/helper.c:375
+#: src/util/helper.c:358
 #, c-format
 msgid "Failed to parse inbound message from helper `%s'\n"
 msgstr ""
 
-#: src/util/helper.c:606
+#: src/util/helper.c:573
 #, c-format
 msgid "Error writing to `%s': %s\n"
 msgstr ""
@@ -8455,25 +8515,25 @@ msgstr ""
 msgid "Unable to shorten unix path `%s' while keeping name unique\n"
 msgstr ""
 
-#: src/util/network.c:1307
+#: src/util/network.c:1284
 #, c-format
 msgid ""
 "Fatal internal logic error, process hangs in `%s' (abort with CTRL-C)!\n"
 msgstr ""
 
-#: src/util/os_installation.c:420
+#: src/util/os_installation.c:415
 #, c-format
 msgid ""
 "Could not determine installation path for %s.  Set `%s' environment "
 "variable.\n"
 msgstr ""
 
-#: src/util/os_installation.c:791
+#: src/util/os_installation.c:786
 #, c-format
 msgid "Could not find binary `%s' in PATH!\n"
 msgstr ""
 
-#: src/util/os_installation.c:824
+#: src/util/os_installation.c:819
 #, c-format
 msgid "Binary `%s' exists, but is not SUID\n"
 msgstr ""
@@ -8516,7 +8576,7 @@ msgstr ""
 msgid "Malformed configuration. Exiting ...\n"
 msgstr ""
 
-#: src/util/regex.c:139
+#: src/util/regex.c:123
 #, c-format
 msgid "Bad mask: %d\n"
 msgstr "Masque érroné : %d\n"
@@ -8821,21 +8881,15 @@ msgstr ""
 msgid "Setup tunnels via VPN."
 msgstr "Configurer des tunnels via VPN."
 
-#: src/zonemaster/gnunet-service-zonemaster-monitor.c:249
-#: src/zonemaster/gnunet-service-zonemaster.c:364
+#: src/zonemaster/gnunet-service-zonemaster.c:521
 #, c-format
 msgid "Failed to replicate block in namecache: %s\n"
 msgstr ""
 
-#: src/zonemaster/gnunet-service-zonemaster-monitor.c:529
-#: src/zonemaster/gnunet-service-zonemaster.c:969
+#: src/zonemaster/gnunet-service-zonemaster.c:1383
 msgid "Failed to connect to the namestore!\n"
 msgstr ""
 
-#: src/zonemaster/gnunet-service-zonemaster-monitor.c:550
-msgid "Namecache is disabled!\n"
-msgstr ""
-
 #, fuzzy, c-format
 #~ msgid "Invalid DID `%s'\n"
 #~ msgstr "URI invalide « %s »\n"
diff --git a/po/it.po b/po/it.po
index b8eb9b9fa..c3c3ab7e3 100644
--- a/po/it.po
+++ b/po/it.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnunet 0.10.1\n"
 "Report-Msgid-Bugs-To: gnunet-developers@mail.gnu.org\n"
-"POT-Creation-Date: 2022-10-16 18:47+0900\n"
+"POT-Creation-Date: 2022-10-21 13:20+0900\n"
 "PO-Revision-Date: 2019-10-16 11:00+0200\n"
 "Last-Translator: Sebastiano Pistore <sebastianopistore.info@protonmail.ch>\n"
 "Language-Team: Italian <tp@lists.linux.it>\n"
@@ -20,7 +20,10 @@ msgstr ""
 "X-Generator: Poedit 2.2.3\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: src/abd/gnunet-abd.c:392 src/namestore/gnunet-namestore.c:1245
+#: src/abd/gnunet-abd.c:392 src/namestore/gnunet-namestore-zonefile.c:193
+#: src/namestore/gnunet-namestore-zonefile.c:652
+#: src/namestore/gnunet-namestore-zonefile.c:673
+#: src/namestore/gnunet-namestore.c:1245
 #, c-format
 msgid "Ego `%s' not known to identity service\n"
 msgstr ""
@@ -164,15 +167,15 @@ msgstr ""
 msgid "Failed to remove servicehome directory %s\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:229 src/testbed/gnunet-service-testbed_peers.c:1144
+#: src/arm/gnunet-arm.c:229 src/testbed/gnunet-service-testbed_peers.c:1132
 msgid "Message was sent successfully"
 msgstr "Messaggio inviato con successo"
 
-#: src/arm/gnunet-arm.c:232 src/testbed/gnunet-service-testbed_peers.c:1147
+#: src/arm/gnunet-arm.c:232 src/testbed/gnunet-service-testbed_peers.c:1135
 msgid "We disconnected from ARM before we could send a request"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:234 src/testbed/gnunet-service-testbed_peers.c:1149
+#: src/arm/gnunet-arm.c:234 src/testbed/gnunet-service-testbed_peers.c:1137
 msgid "Unknown request status"
 msgstr ""
 
@@ -1331,145 +1334,145 @@ msgstr ""
 msgid "Core service of `%s' ready.\n"
 msgstr "Avvio del servizio '%s' in corso\n"
 
-#: src/core/gnunet-service-core_kx.c:512
+#: src/core/gnunet-service-core_kx.c:513
 msgid "# bytes encrypted"
 msgstr "# byte crittografati"
 
-#: src/core/gnunet-service-core_kx.c:570
+#: src/core/gnunet-service-core_kx.c:571
 msgid "# bytes decrypted"
 msgstr "# byte decrittati"
 
-#: src/core/gnunet-service-core_kx.c:667
+#: src/core/gnunet-service-core_kx.c:668
 msgid "# PAYLOAD dropped (out of order)"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:719
+#: src/core/gnunet-service-core_kx.c:720
 msgid "# key exchanges initiated"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:775
+#: src/core/gnunet-service-core_kx.c:776
 msgid "# key exchanges stopped"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:807
+#: src/core/gnunet-service-core_kx.c:808
 msgid "# PING messages transmitted"
 msgstr "# Messaggi PING trasmessi"
 
-#: src/core/gnunet-service-core_kx.c:866
+#: src/core/gnunet-service-core_kx.c:867
 msgid "# old ephemeral keys ignored"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:880
+#: src/core/gnunet-service-core_kx.c:881
 #, fuzzy
 msgid "# duplicate ephemeral keys ignored"
 msgstr "# messaggi PONG ricevuti"
 
-#: src/core/gnunet-service-core_kx.c:915
+#: src/core/gnunet-service-core_kx.c:916
 #, fuzzy
 msgid "# EPHEMERAL_KEYs rejected (bad signature)"
 msgstr "# messaggi SYN ricevuti"
 
-#: src/core/gnunet-service-core_kx.c:933
+#: src/core/gnunet-service-core_kx.c:934
 #, c-format
 msgid ""
 "EPHEMERAL_KEY from peer `%s' rejected as its validity range does not match "
 "our system time (%llu not in [%llu,%llu]).\n"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:940
+#: src/core/gnunet-service-core_kx.c:941
 #, fuzzy
 msgid "# EPHEMERAL_KEY messages rejected due to time"
 msgstr "# messaggi SYN ricevuti"
 
-#: src/core/gnunet-service-core_kx.c:958
+#: src/core/gnunet-service-core_kx.c:959
 #, fuzzy
 msgid "# valid ephemeral keys received"
 msgstr "# messaggi PONG ricevuti"
 
-#: src/core/gnunet-service-core_kx.c:1067
+#: src/core/gnunet-service-core_kx.c:1068
 #: src/transport/gnunet-service-transport_validation.c:1133
 msgid "# PING messages received"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1077
+#: src/core/gnunet-service-core_kx.c:1078
 msgid "# PING messages dropped (out of order)"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1126
+#: src/core/gnunet-service-core_kx.c:1127
 msgid "# PONG messages created"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1151
+#: src/core/gnunet-service-core_kx.c:1152
 msgid "# sessions terminated by timeout"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1164
+#: src/core/gnunet-service-core_kx.c:1165
 msgid "# keepalive messages sent"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1221
+#: src/core/gnunet-service-core_kx.c:1222
 #: src/transport/gnunet-service-transport_validation.c:1476
 msgid "# PONG messages received"
 msgstr "# messaggi PONG ricevuti"
 
-#: src/core/gnunet-service-core_kx.c:1229
+#: src/core/gnunet-service-core_kx.c:1230
 msgid "# PONG messages dropped (connection down)"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1237
+#: src/core/gnunet-service-core_kx.c:1238
 msgid "# PONG messages dropped (out of order)"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1276
+#: src/core/gnunet-service-core_kx.c:1277
 msgid "# PONG messages decrypted"
 msgstr "# messaggi PONG decrittati"
 
-#: src/core/gnunet-service-core_kx.c:1316
+#: src/core/gnunet-service-core_kx.c:1317
 msgid "# session keys confirmed via PONG"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1328
+#: src/core/gnunet-service-core_kx.c:1329
 msgid "# timeouts prevented via PONG"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1337
+#: src/core/gnunet-service-core_kx.c:1338
 msgid "# rekey operations confirmed via PONG"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1506
+#: src/core/gnunet-service-core_kx.c:1507
 msgid "# DATA message dropped (out of order)"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1517
+#: src/core/gnunet-service-core_kx.c:1518
 #, c-format
 msgid ""
 "Session to peer `%s' went down due to key expiration (should not happen)\n"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1521
+#: src/core/gnunet-service-core_kx.c:1522
 msgid "# sessions terminated by key expiration"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1599
-#: src/core/gnunet-service-core_kx.c:1626
+#: src/core/gnunet-service-core_kx.c:1600
+#: src/core/gnunet-service-core_kx.c:1627
 msgid "# bytes dropped (duplicates)"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1612
+#: src/core/gnunet-service-core_kx.c:1613
 msgid "# bytes dropped (out of sequence)"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1657
+#: src/core/gnunet-service-core_kx.c:1658
 msgid "# bytes dropped (ancient message)"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1666
+#: src/core/gnunet-service-core_kx.c:1667
 msgid "# bytes of payload decrypted"
 msgstr ""
 
 #: src/core/gnunet-service-core_sessions.c:252
 #: src/core/gnunet-service-core_sessions.c:337
-#: src/fs/gnunet-service-fs_cp.c:601 src/fs/gnunet-service-fs_cp.c:1496
+#: src/fs/gnunet-service-fs_cp.c:601 src/fs/gnunet-service-fs_cp.c:1494
 #: src/topology/gnunet-daemon-topology.c:579
 #: src/topology/gnunet-daemon-topology.c:671
 #: src/transport/gnunet-service-transport_neighbours.c:723
@@ -1696,7 +1699,7 @@ msgstr ""
 #: src/datastore/gnunet-service-datastore.c:626
 #: src/datastore/gnunet-service-datastore.c:677
 #: src/datastore/gnunet-service-datastore.c:820
-#: src/datastore/gnunet-service-datastore.c:1429
+#: src/datastore/gnunet-service-datastore.c:1428
 msgid "# reserved"
 msgstr ""
 
@@ -1742,69 +1745,69 @@ msgstr "Contenuto non trovato"
 msgid "# bytes removed (explicit request)"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1059
+#: src/datastore/gnunet-service-datastore.c:1058
 msgid "# REMOVE requests received"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1108
+#: src/datastore/gnunet-service-datastore.c:1107
 #, c-format
 msgid ""
 "Datastore payload must have been inaccurate (%lld < %lld). Recomputing it.\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1113
-#: src/datastore/gnunet-service-datastore.c:1282
+#: src/datastore/gnunet-service-datastore.c:1112
+#: src/datastore/gnunet-service-datastore.c:1281
 #, c-format
 msgid "New payload: %lld\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1168
+#: src/datastore/gnunet-service-datastore.c:1167
 #, c-format
 msgid "Loading `%s' datastore plugin\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1177
+#: src/datastore/gnunet-service-datastore.c:1176
 #, c-format
 msgid "Failed to load datastore plugin for `%s'\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1237
+#: src/datastore/gnunet-service-datastore.c:1236
 msgid "Bloomfilter construction complete.\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1289
+#: src/datastore/gnunet-service-datastore.c:1288
 msgid "Rebuilding bloomfilter.  Please be patient.\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1299
+#: src/datastore/gnunet-service-datastore.c:1298
 msgid "Plugin does not support get_keys function. Please fix!\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1464
+#: src/datastore/gnunet-service-datastore.c:1463
 #, c-format
 msgid "# bytes used in file-sharing datastore `%s'"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1473
+#: src/datastore/gnunet-service-datastore.c:1472
 msgid "# quota"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1476
+#: src/datastore/gnunet-service-datastore.c:1475
 msgid "# cache size"
 msgstr "# dimensione cache"
 
-#: src/datastore/gnunet-service-datastore.c:1492
+#: src/datastore/gnunet-service-datastore.c:1491
 #, c-format
 msgid "Could not use specified filename `%s' for bloomfilter.\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1513
-#: src/datastore/gnunet-service-datastore.c:1535
+#: src/datastore/gnunet-service-datastore.c:1512
+#: src/datastore/gnunet-service-datastore.c:1534
 #, c-format
 msgid "Failed to remove bogus bloomfilter file `%s'\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1574
+#: src/datastore/gnunet-service-datastore.c:1573
 msgid "Failed to initialize bloomfilter.\n"
 msgstr ""
 
@@ -1855,7 +1858,7 @@ msgstr ""
 
 #: src/datastore/plugin_datastore_sqlite.c:310
 #: src/namecache/plugin_namecache_sqlite.c:180
-#: src/namestore/plugin_namestore_sqlite.c:868
+#: src/namestore/plugin_namestore_sqlite.c:891
 #: src/peerstore/plugin_peerstore_sqlite.c:540
 #, c-format
 msgid "Unable to initialize SQLite: %s.\n"
@@ -2108,7 +2111,7 @@ msgstr ""
 msgid "# DNS requests received via TUN interface"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:1117 src/exit/gnunet-daemon-exit.c:3708
+#: src/dns/gnunet-service-dns.c:1117 src/exit/gnunet-daemon-exit.c:3707
 msgid "need a valid IPv4 or IPv6 address\n"
 msgstr ""
 
@@ -2256,69 +2259,69 @@ msgstr ""
 msgid "Packet from unknown protocol %u received.  Ignored.\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3377 src/exit/gnunet-daemon-exit.c:3388
+#: src/exit/gnunet-daemon-exit.c:3376 src/exit/gnunet-daemon-exit.c:3387
 #, c-format
 msgid "Option `%s' for domain `%s' is not formatted correctly!\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3402 src/exit/gnunet-daemon-exit.c:3410
+#: src/exit/gnunet-daemon-exit.c:3401 src/exit/gnunet-daemon-exit.c:3409
 #, c-format
 msgid "`%s' is not a valid port number (for domain `%s')!"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3452
+#: src/exit/gnunet-daemon-exit.c:3451
 #, c-format
 msgid "No addresses found for hostname `%s' of service `%s'!\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3467 src/exit/gnunet-daemon-exit.c:3482
+#: src/exit/gnunet-daemon-exit.c:3466 src/exit/gnunet-daemon-exit.c:3481
 #, c-format
 msgid "Service `%s' configured for IPv4, but IPv4 is disabled!\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3496
+#: src/exit/gnunet-daemon-exit.c:3495
 #, c-format
 msgid "No IP addresses found for hostname `%s' of service `%s'!\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3641
+#: src/exit/gnunet-daemon-exit.c:3640
 msgid ""
 "This system does not support IPv4, will disable IPv4 functions despite them "
 "being enabled in the configuration\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3650
+#: src/exit/gnunet-daemon-exit.c:3649
 msgid ""
 "This system does not support IPv6, will disable IPv6 functions despite them "
 "being enabled in the configuration\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3658
+#: src/exit/gnunet-daemon-exit.c:3657
 msgid ""
 "Cannot enable IPv4 exit but disable IPv4 on TUN interface, will use "
 "ENABLE_IPv4=YES\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3665
+#: src/exit/gnunet-daemon-exit.c:3664
 msgid ""
 "Cannot enable IPv6 exit but disable IPv6 on TUN interface, will use "
 "ENABLE_IPv6=YES\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3836
+#: src/exit/gnunet-daemon-exit.c:3835
 msgid "Must be a number"
 msgstr "Deve essere un numero"
 
-#: src/exit/gnunet-daemon-exit.c:3952
+#: src/exit/gnunet-daemon-exit.c:3951
 #, c-format
 msgid "`%s' is not SUID or the path is invalid, EXIT will not work\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3964 src/pt/gnunet-daemon-pt.c:1212
+#: src/exit/gnunet-daemon-exit.c:3963 src/pt/gnunet-daemon-pt.c:1212
 msgid "No useful service enabled.  Exiting.\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:4118
+#: src/exit/gnunet-daemon-exit.c:4117
 msgid "Daemon to run to provide an IP exit node for the VPN"
 msgstr ""
 
@@ -2500,7 +2503,7 @@ msgstr ""
 msgid "internal error decoding tree"
 msgstr ""
 
-#: src/fs/fs_download.c:1890
+#: src/fs/fs_download.c:1889
 msgid "Invalid URI"
 msgstr ""
 
@@ -2516,7 +2519,7 @@ msgstr ""
 msgid "Failed to receive response from `%s' service.\n"
 msgstr "Generazione statistiche fallita\n"
 
-#: src/fs/fs_list_indexed.c:195
+#: src/fs/fs_list_indexed.c:187
 #, c-format
 msgid "Failed to not connect to `%s' service.\n"
 msgstr ""
@@ -2541,7 +2544,7 @@ msgstr ""
 msgid "Failed to read `%s': %s\n"
 msgstr ""
 
-#: src/fs/fs_namespace.c:472
+#: src/fs/fs_namespace.c:457
 msgid "Failed to connect to datastore."
 msgstr ""
 
@@ -2671,92 +2674,92 @@ msgstr ""
 msgid "Failed to compute hash of file."
 msgstr "Impossibile calcolare l'hash del file."
 
-#: src/fs/fs_uri.c:239
+#: src/fs/fs_uri.c:231
 #, no-c-format
 msgid "Malformed KSK URI (`%' must be followed by HEX number)"
 msgstr ""
 
-#: src/fs/fs_uri.c:298
+#: src/fs/fs_uri.c:290
 msgid "Malformed KSK URI (must not begin or end with `+')"
 msgstr ""
 
-#: src/fs/fs_uri.c:316
+#: src/fs/fs_uri.c:308
 msgid "Malformed KSK URI (`++' not allowed)"
 msgstr ""
 
-#: src/fs/fs_uri.c:323
+#: src/fs/fs_uri.c:315
 msgid "Malformed KSK URI (quotes not balanced)"
 msgstr ""
 
-#: src/fs/fs_uri.c:390
+#: src/fs/fs_uri.c:382
 msgid "Malformed SKS URI (wrong syntax)"
 msgstr ""
 
-#: src/fs/fs_uri.c:431
+#: src/fs/fs_uri.c:423
 msgid "Malformed CHK URI (wrong syntax)"
 msgstr ""
 
-#: src/fs/fs_uri.c:448
+#: src/fs/fs_uri.c:440
 msgid "Malformed CHK URI (failed to decode CHK)"
 msgstr ""
 
-#: src/fs/fs_uri.c:525
+#: src/fs/fs_uri.c:517
 msgid "LOC URI malformed (wrong syntax)"
 msgstr ""
 
-#: src/fs/fs_uri.c:542
+#: src/fs/fs_uri.c:534
 msgid "LOC URI malformed (no CHK)"
 msgstr ""
 
-#: src/fs/fs_uri.c:552
+#: src/fs/fs_uri.c:544
 msgid "LOC URI malformed (missing LOC)"
 msgstr ""
 
-#: src/fs/fs_uri.c:560
+#: src/fs/fs_uri.c:552
 msgid "LOC URI malformed (wrong syntax for public key)"
 msgstr ""
 
-#: src/fs/fs_uri.c:569
+#: src/fs/fs_uri.c:561
 msgid "LOC URI malformed (could not decode public key)"
 msgstr ""
 
-#: src/fs/fs_uri.c:575
+#: src/fs/fs_uri.c:567
 msgid "LOC URI malformed (could not find signature)"
 msgstr ""
 
-#: src/fs/fs_uri.c:582
+#: src/fs/fs_uri.c:574
 msgid "LOC URI malformed (wrong syntax for signature)"
 msgstr ""
 
-#: src/fs/fs_uri.c:593
+#: src/fs/fs_uri.c:585
 msgid "LOC URI malformed (could not decode signature)"
 msgstr ""
 
-#: src/fs/fs_uri.c:600
+#: src/fs/fs_uri.c:592
 msgid "LOC URI malformed (wrong syntax for expiration time)"
 msgstr ""
 
-#: src/fs/fs_uri.c:606
+#: src/fs/fs_uri.c:598
 msgid "LOC URI malformed (could not parse expiration time)"
 msgstr ""
 
-#: src/fs/fs_uri.c:620
+#: src/fs/fs_uri.c:612
 msgid "LOC URI malformed (signature failed validation)"
 msgstr ""
 
-#: src/fs/fs_uri.c:653
+#: src/fs/fs_uri.c:645
 msgid "invalid argument"
 msgstr "argomento non valido"
 
-#: src/fs/fs_uri.c:673
+#: src/fs/fs_uri.c:665
 msgid "Unrecognized URI type"
 msgstr ""
 
-#: src/fs/fs_uri.c:1077 src/fs/fs_uri.c:1104
+#: src/fs/fs_uri.c:1060 src/fs/fs_uri.c:1087
 msgid "No keywords specified!\n"
 msgstr ""
 
-#: src/fs/fs_uri.c:1110
+#: src/fs/fs_uri.c:1093
 msgid "Number of double-quotes not balanced!\n"
 msgstr ""
 
@@ -3331,7 +3334,7 @@ msgid "# cadet client connections rejected"
 msgstr "# connessioni attive"
 
 #: src/fs/gnunet-service-fs_cadet_server.c:394
-#: src/fs/gnunet-service-fs_cadet_server.c:434
+#: src/fs/gnunet-service-fs_cadet_server.c:433
 #, fuzzy
 msgid "# cadet connections active"
 msgstr "# connessioni attive"
@@ -3389,7 +3392,7 @@ msgstr ""
 msgid "# P2P query messages received and processed"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1679
+#: src/fs/gnunet-service-fs_cp.c:1677
 msgid "# migration stop messages sent"
 msgstr ""
 
@@ -3676,8 +3679,8 @@ msgstr ""
 #: src/hostlist/gnunet-daemon-hostlist_client.c:957
 #: src/hostlist/gnunet-daemon-hostlist_client.c:1059
 #: src/hostlist/gnunet-daemon-hostlist_client.c:1067
-#: src/transport/plugin_transport_http_client.c:600
-#: src/transport/plugin_transport_http_client.c:618
+#: src/transport/plugin_transport_http_client.c:599
+#: src/transport/plugin_transport_http_client.c:617
 #, c-format
 msgid "%s failed at %s:%d: `%s'\n"
 msgstr ""
@@ -3742,7 +3745,7 @@ msgstr "Generazione statistiche fallita\n"
 msgid "Failed to start HTTPS server for `%s'\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:2919 src/rest/gnunet-rest-server.c:958
+#: src/gns/gnunet-gns-proxy.c:2919 src/rest/gnunet-rest-server.c:957
 msgid "Failed to pass client to MHD\n"
 msgstr ""
 
@@ -3761,24 +3764,24 @@ msgstr ""
 msgid "Unsupported socks address type %d\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:3727
+#: src/gns/gnunet-gns-proxy.c:3726
 #, c-format
 msgid "Failed to load X.509 key and certificate from `%s'\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:3869
+#: src/gns/gnunet-gns-proxy.c:3868
 msgid "listen on specified port (default: 7777)"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:3874
+#: src/gns/gnunet-gns-proxy.c:3873
 msgid "pem file to use as CA"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:3878
+#: src/gns/gnunet-gns-proxy.c:3877
 msgid "disable use of IPv6"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:3904
+#: src/gns/gnunet-gns-proxy.c:3903
 msgid "GNUnet GNS proxy"
 msgstr ""
 
@@ -3825,20 +3828,18 @@ msgstr ""
 msgid "GNUnet GNS resolver tool"
 msgstr ""
 
-#: src/gns/gnunet-service-gns.c:501
+#: src/gns/gnunet-service-gns.c:500
 #, fuzzy
 msgid "Properly base32-encoded public key required"
 msgstr "# messaggi PONG ricevuti"
 
-#: src/gns/gnunet-service-gns.c:537
-#: src/zonemaster/gnunet-service-zonemaster-monitor.c:542
-#: src/zonemaster/gnunet-service-zonemaster.c:982
+#: src/gns/gnunet-service-gns.c:536
+#: src/zonemaster/gnunet-service-zonemaster.c:1396
 msgid "Failed to connect to the namecache!\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns.c:556
-#: src/zonemaster/gnunet-service-zonemaster-monitor.c:572
-#: src/zonemaster/gnunet-service-zonemaster.c:1021
+#: src/gns/gnunet-service-gns.c:555
+#: src/zonemaster/gnunet-service-zonemaster.c:1435
 msgid "Could not connect to DHT!\n"
 msgstr ""
 
@@ -3957,31 +3958,31 @@ msgstr ""
 msgid "Label  contains `.' which is not allowed\n"
 msgstr ""
 
-#: src/gnsrecord/gnsrecord_misc.c:467
+#: src/gnsrecord/gnsrecord_misc.c:481
 msgid "Zone delegation record not allowed in apex."
 msgstr ""
 
-#: src/gnsrecord/gnsrecord_misc.c:475
+#: src/gnsrecord/gnsrecord_misc.c:489
 msgid "Zone delegation record set contains mutually exclusive records."
 msgstr ""
 
-#: src/gnsrecord/gnsrecord_misc.c:485
+#: src/gnsrecord/gnsrecord_misc.c:499
 msgid "Multiple REDIRECT records."
 msgstr ""
 
-#: src/gnsrecord/gnsrecord_misc.c:494 src/gnsrecord/gnsrecord_misc.c:520
+#: src/gnsrecord/gnsrecord_misc.c:508 src/gnsrecord/gnsrecord_misc.c:534
 msgid "Redirection record set contains mutually exclusive records."
 msgstr ""
 
-#: src/gnsrecord/gnsrecord_misc.c:501
+#: src/gnsrecord/gnsrecord_misc.c:515
 msgid "Redirection records not allowed in apex."
 msgstr ""
 
-#: src/gnsrecord/gnsrecord_misc.c:512
+#: src/gnsrecord/gnsrecord_misc.c:526
 msgid "Redirection records not allowed in apex.."
 msgstr ""
 
-#: src/gnsrecord/gnsrecord_misc.c:534
+#: src/gnsrecord/gnsrecord_misc.c:548
 msgid "Mutually exclusive records."
 msgstr ""
 
@@ -4095,33 +4096,33 @@ msgstr ""
 msgid "Modified %u addresses, wrote %u bytes\n"
 msgstr ""
 
-#: src/hello/hello.c:1111
+#: src/hello/hello.c:1089
 msgid "Failed to parse HELLO message: missing expiration time\n"
 msgstr ""
 
-#: src/hello/hello.c:1121
+#: src/hello/hello.c:1099
 msgid "Failed to parse HELLO message: invalid expiration time\n"
 msgstr ""
 
-#: src/hello/hello.c:1131
+#: src/hello/hello.c:1109
 msgid "Failed to parse HELLO message: malformed\n"
 msgstr ""
 
-#: src/hello/hello.c:1143
+#: src/hello/hello.c:1121
 msgid "Failed to parse HELLO message: missing transport plugin\n"
 msgstr ""
 
-#: src/hello/hello.c:1161
+#: src/hello/hello.c:1139
 #, c-format
 msgid "Plugin `%s' not found, skipping address\n"
 msgstr ""
 
-#: src/hello/hello.c:1169
+#: src/hello/hello.c:1147
 #, c-format
 msgid "Plugin `%s' does not support URIs yet\n"
 msgstr ""
 
-#: src/hello/hello.c:1184
+#: src/hello/hello.c:1162
 #, c-format
 msgid "Failed to parse `%s' as an address for plugin `%s'\n"
 msgstr ""
@@ -4174,7 +4175,7 @@ msgid "# valid HELLOs downloaded from hostlist servers"
 msgstr ""
 
 #: src/hostlist/gnunet-daemon-hostlist_client.c:677
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1453
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1451
 msgid "# advertised hostlist URIs"
 msgstr ""
 
@@ -4225,7 +4226,7 @@ msgid "# hostlist downloads initiated"
 msgstr ""
 
 #: src/hostlist/gnunet-daemon-hostlist_client.c:1137
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1725
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1723
 msgid "# milliseconds between hostlist downloads"
 msgstr ""
 
@@ -4239,65 +4240,65 @@ msgstr ""
 msgid "# active connections"
 msgstr "# connessioni attive"
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1389
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1387
 #, c-format
 msgid "Loading saved hostlist entries from file `%s' \n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1394
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1392
 #, c-format
 msgid "Hostlist file `%s' does not exist\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1405
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1403
 #, c-format
 msgid "Could not open file `%s' for reading to load hostlists: %s\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1446
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1444
 #, c-format
 msgid "%u hostlist URIs loaded from file\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1449
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1447
 msgid "# hostlist URIs read from file"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1500
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1498
 #, c-format
 msgid "Could not open file `%s' for writing to save hostlists: %s\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1507
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1505
 #, c-format
 msgid "Writing %u hostlist URIs to `%s'\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1540
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1559
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1538
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1557
 #, c-format
 msgid "Error writing hostlist URIs to file `%s'\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1553
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1551
 msgid "# hostlist URIs written to file"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1654
-#: src/transport/plugin_transport_http_client.c:2294
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1652
+#: src/transport/plugin_transport_http_client.c:2288
 #, c-format
 msgid "Invalid proxy type: `%s', disabling proxy! Check configuration!\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1683
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1681
 msgid "Learning is enabled on this peer\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1696
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1694
 msgid "Learning is not enabled on this peer\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1710
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1708
 #, c-format
 msgid ""
 "Since learning is not enabled on this peer, hostlist file `%s' was removed\n"
@@ -4367,7 +4368,7 @@ msgid "# hostlist advertisements send"
 msgstr ""
 
 #: src/hostlist/gnunet-daemon-hostlist_server.c:674
-#: src/transport/gnunet-service-transport.c:2657
+#: src/transport/gnunet-service-transport.c:2652
 msgid "Could not access PEERINFO service.  Exiting.\n"
 msgstr ""
 
@@ -4486,49 +4487,49 @@ msgstr ""
 msgid "Maintain egos"
 msgstr ""
 
-#: src/identity/gnunet-service-identity.c:502
+#: src/identity/gnunet-service-identity.c:501
 msgid "no default known"
 msgstr ""
 
-#: src/identity/gnunet-service-identity.c:527
+#: src/identity/gnunet-service-identity.c:526
 msgid "default configured, but ego unknown (internal error)"
 msgstr ""
 
-#: src/identity/gnunet-service-identity.c:620
-#: src/identity/gnunet-service-identity.c:895
-#: src/identity/gnunet-service-identity.c:1015
+#: src/identity/gnunet-service-identity.c:618
+#: src/identity/gnunet-service-identity.c:891
+#: src/identity/gnunet-service-identity.c:1010
 #, c-format
 msgid "Failed to write subsystem default identifier map to `%s'.\n"
 msgstr ""
 
-#: src/identity/gnunet-service-identity.c:630
+#: src/identity/gnunet-service-identity.c:628
 msgid "Unknown ego specified for service (internal error)"
 msgstr ""
 
-#: src/identity/gnunet-service-identity.c:724
+#: src/identity/gnunet-service-identity.c:721
 msgid "identifier already in use for another ego"
 msgstr ""
 
-#: src/identity/gnunet-service-identity.c:871
+#: src/identity/gnunet-service-identity.c:867
 msgid "target name already exists"
 msgstr ""
 
-#: src/identity/gnunet-service-identity.c:913
-#: src/identity/gnunet-service-identity.c:1032
+#: src/identity/gnunet-service-identity.c:909
+#: src/identity/gnunet-service-identity.c:1027
 msgid "no matching ego found"
 msgstr ""
 
-#: src/identity/gnunet-service-identity.c:1130
+#: src/identity/gnunet-service-identity.c:1125
 #, c-format
 msgid "Failed to parse ego information in `%s'\n"
 msgstr ""
 
-#: src/identity/gnunet-service-identity.c:1188
+#: src/identity/gnunet-service-identity.c:1183
 #, c-format
 msgid "Failed to parse subsystem identity configuration file `%s'\n"
 msgstr ""
 
-#: src/identity/gnunet-service-identity.c:1197
+#: src/identity/gnunet-service-identity.c:1192
 #, c-format
 msgid "Failed to create directory `%s' for storing egos\n"
 msgstr ""
@@ -4606,16 +4607,18 @@ msgstr ""
 msgid "GNUnet zone manipulation tool"
 msgstr ""
 
-#: src/namecache/namecache_api.c:286
+#: src/namecache/namecache_api.c:285
 msgid "Namecache failed to cache block"
 msgstr ""
 
-#: src/namecache/namecache_api.c:374
+#: src/namecache/namecache_api.c:373
 msgid "Error communicating with namecache service"
 msgstr ""
 
 #: src/namecache/plugin_namecache_flat.c:118
 #: src/namecache/plugin_namecache_flat.c:253
+#: src/namestore/plugin_namestore_flat.c:176
+#: src/namestore/plugin_namestore_flat.c:424
 #: src/peerstore/plugin_peerstore_flat.c:380
 #: src/peerstore/plugin_peerstore_flat.c:542
 #, fuzzy, c-format
@@ -4623,6 +4626,7 @@ msgid "Unable to initialize file: %s.\n"
 msgstr "Generazione statistiche fallita\n"
 
 #: src/namecache/plugin_namecache_flat.c:129
+#: src/namestore/plugin_namestore_flat.c:187
 #: src/peerstore/plugin_peerstore_flat.c:395
 #, fuzzy, c-format
 msgid "Unable to get filesize: %s.\n"
@@ -4663,6 +4667,7 @@ msgid "the namestore plugin to work with, e.g. 'sqlite'"
 msgstr ""
 
 #: src/namestore/gnunet-namestore-dbtool.c:178
+#: src/namestore/gnunet-namestore-zonefile.c:750
 msgid "GNUnet namestore database manipulation tool"
 msgstr ""
 
@@ -4765,6 +4770,47 @@ msgstr ""
 msgid "GNU Name System First-Come-First-Served name registration service"
 msgstr ""
 
+#: src/namestore/gnunet-namestore-zonefile.c:329
+#, fuzzy, c-format
+msgid "Failed to store records...\n"
+msgstr "Impossibile avviare il servizio.\n"
+
+#: src/namestore/gnunet-namestore-zonefile.c:437
+#: src/namestore/gnunet-namestore-zonefile.c:469
+#, fuzzy, c-format
+msgid "Name `%s' is too long\n"
+msgstr "nome file troppo lungo"
+
+#: src/namestore/gnunet-namestore-zonefile.c:515
+#, c-format
+msgid "You must provide $ORIGIN in your zonefile or via arguments (--zone)!\n"
+msgstr ""
+
+#: src/namestore/gnunet-namestore-zonefile.c:524
+#, c-format
+msgid "Only %u records per unique name supported.\n"
+msgstr ""
+
+#: src/namestore/gnunet-namestore-zonefile.c:586
+#, c-format
+msgid "Data `%s' invalid\n"
+msgstr ""
+
+#: src/namestore/gnunet-namestore-zonefile.c:702
+#, fuzzy, c-format
+msgid "Failed to connect to NAMESTORE\n"
+msgstr "Impossibile avviare il servizio.\n"
+
+#: src/namestore/gnunet-namestore-zonefile.c:709
+#, fuzzy, c-format
+msgid "Failed to connect to IDENTITY\n"
+msgstr "Impossibile avviare il servizio.\n"
+
+#: src/namestore/gnunet-namestore-zonefile.c:735
+#: src/namestore/gnunet-namestore.c:1628
+msgid "name of the ego controlling the zone"
+msgstr ""
+
 #: src/namestore/gnunet-namestore.c:340
 #, c-format
 msgid "Adding record failed: %s\n"
@@ -4961,21 +5007,21 @@ msgid ""
 "expired"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1628
-msgid "name of the ego controlling the zone"
-msgstr ""
-
-#: src/namestore/gnunet-service-namestore.c:1504
+#: src/namestore/gnunet-service-namestore.c:1673
 #, fuzzy
 msgid "Error normalizing name."
 msgstr "Errore durante la scrittura di `%s'.\n"
 
-#: src/namestore/gnunet-service-namestore.c:1522
+#: src/namestore/gnunet-service-namestore.c:1691
 #, fuzzy
 msgid "Error deserializing records."
 msgstr "Errore interno."
 
-#: src/namestore/gnunet-service-namestore.c:1633
+#: src/namestore/gnunet-service-namestore.c:1811
+msgid "Not records to delete."
+msgstr ""
+
+#: src/namestore/gnunet-service-namestore.c:1819
 msgid "Store failed"
 msgstr ""
 
@@ -4987,23 +5033,37 @@ msgstr ""
 msgid "minimum expiration time we assume for imported records"
 msgstr ""
 
+#: src/namestore/plugin_namestore_flat.c:195
+#, c-format
+msgid "File too big to map: %llu bytes.\n"
+msgstr ""
+
+#: src/namestore/plugin_namestore_flat.c:219
+#, c-format
+msgid "Namestore database file `%s' malformed\n"
+msgstr ""
+
+#: src/namestore/plugin_namestore_flat.c:792
+msgid "Flat file database running\n"
+msgstr ""
+
 #: src/namestore/plugin_namestore_sqlite.c:180
 #: src/namestore/plugin_namestore_sqlite.c:190
-#: src/namestore/plugin_namestore_sqlite.c:806
+#: src/namestore/plugin_namestore_sqlite.c:829
 #, fuzzy, c-format
 msgid "Failed to setup database with: `%s'\n"
 msgstr "Impossibile avviare il servizio ' %s'\n"
 
-#: src/namestore/plugin_namestore_sqlite.c:797
+#: src/namestore/plugin_namestore_sqlite.c:820
 #, fuzzy, c-format
 msgid "Failed to drop database with: `%s'\n"
 msgstr "Impossibile avviare il servizio ' %s'\n"
 
-#: src/namestore/plugin_namestore_sqlite.c:938
+#: src/namestore/plugin_namestore_sqlite.c:961
 msgid "SQlite database running\n"
 msgstr ""
 
-#: src/namestore/plugin_rest_namestore.c:1369
+#: src/namestore/plugin_rest_namestore.c:1414
 msgid "Namestore REST API initialized\n"
 msgstr ""
 
@@ -5307,7 +5367,7 @@ msgid "Show network size estimates from NSE service."
 msgstr ""
 
 #: src/nse/gnunet-service-nse.c:1441
-#: src/revocation/gnunet-service-revocation.c:888 src/util/gnunet-scrypt.c:243
+#: src/revocation/gnunet-service-revocation.c:888 src/util/gnunet-scrypt.c:242
 msgid "Value is too large.\n"
 msgstr ""
 
@@ -5384,19 +5444,19 @@ msgid "Print information about peers."
 msgstr ""
 
 #: src/peerinfo-tool/gnunet-peerinfo_plugins.c:103
-#: src/transport/gnunet-service-transport_plugins.c:167
+#: src/transport/gnunet-service-transport_plugins.c:154
 #, c-format
 msgid "Starting transport plugins `%s'\n"
 msgstr ""
 
 #: src/peerinfo-tool/gnunet-peerinfo_plugins.c:107
-#: src/transport/gnunet-service-transport_plugins.c:172
+#: src/transport/gnunet-service-transport_plugins.c:159
 #, c-format
 msgid "Loading `%s' transport plugin\n"
 msgstr ""
 
 #: src/peerinfo-tool/gnunet-peerinfo_plugins.c:127
-#: src/transport/gnunet-service-transport_plugins.c:207
+#: src/transport/gnunet-service-transport_plugins.c:194
 #, c-format
 msgid "Failed to load transport plugin for `%s'\n"
 msgstr ""
@@ -5455,7 +5515,7 @@ msgstr ""
 msgid "Skipping import of included HELLOs\n"
 msgstr ""
 
-#: src/peerinfo/peerinfo_api.c:217
+#: src/peerinfo/peerinfo_api.c:210
 msgid "Failed to receive response from `PEERINFO' service."
 msgstr ""
 
@@ -5476,7 +5536,7 @@ msgstr ""
 msgid "Received a malformed response from service."
 msgstr ""
 
-#: src/peerstore/peerstore_api.c:790
+#: src/peerstore/peerstore_api.c:779
 msgid "Received a watch result for a non existing watch.\n"
 msgstr ""
 
@@ -5699,56 +5759,56 @@ msgstr ""
 msgid "Daemon to announce regular expressions for the peer using cadet."
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1366
+#: src/regex/gnunet-regex-profiler.c:1365
 msgid "No configuration file given. Exiting\n"
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1408
+#: src/regex/gnunet-regex-profiler.c:1407
 #: src/regex/gnunet-regex-simulation-profiler.c:631
 #, c-format
 msgid "No policy directory specified on command line. Exiting.\n"
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1414
+#: src/regex/gnunet-regex-profiler.c:1413
 #: src/regex/gnunet-regex-simulation-profiler.c:639
 #, c-format
 msgid "Specified policies directory does not exist. Exiting.\n"
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1422
+#: src/regex/gnunet-regex-profiler.c:1421
 #, c-format
 msgid "No files found in `%s'\n"
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1431
+#: src/regex/gnunet-regex-profiler.c:1430
 msgid "No search strings file given. Exiting.\n"
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1451
+#: src/regex/gnunet-regex-profiler.c:1450
 msgid "Error loading search strings. Exiting.\n"
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1540
+#: src/regex/gnunet-regex-profiler.c:1539
 msgid "name of the file for writing statistics"
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1547
+#: src/regex/gnunet-regex-profiler.c:1546
 msgid "wait TIMEOUT before ending the experiment"
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1553
+#: src/regex/gnunet-regex-profiler.c:1552
 msgid "directory with policy files"
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1560
+#: src/regex/gnunet-regex-profiler.c:1559
 msgid "name of file with input strings"
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1567
+#: src/regex/gnunet-regex-profiler.c:1566
 msgid "name of file with hosts' names"
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1582
+#: src/regex/gnunet-regex-profiler.c:1581
 msgid "Profiler for regex"
 msgstr ""
 
@@ -5769,16 +5829,16 @@ msgstr ""
 msgid "Regex `%s' is too long!\n"
 msgstr ""
 
-#: src/regex/regex_api_search.c:212
+#: src/regex/regex_api_search.c:200
 #, c-format
 msgid "Search string `%s' is too long!\n"
 msgstr ""
 
-#: src/rest/gnunet-rest-server.c:1367
+#: src/rest/gnunet-rest-server.c:1366
 msgid "GNUnet REST server"
 msgstr ""
 
-#: src/rest/plugin_rest_config.c:429
+#: src/rest/plugin_rest_config.c:428
 msgid "CONFIG REST API initialized\n"
 msgstr ""
 
@@ -5971,62 +6031,62 @@ msgstr ""
 msgid "Get peers from biased stream"
 msgstr ""
 
-#: src/scalarproduct/gnunet-scalarproduct.c:229
+#: src/scalarproduct/gnunet-scalarproduct.c:228
 msgid "You must specify at least one message ID to check!\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-scalarproduct.c:237
+#: src/scalarproduct/gnunet-scalarproduct.c:236
 msgid "This program needs a session identifier for comparing vectors.\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-scalarproduct.c:250
+#: src/scalarproduct/gnunet-scalarproduct.c:249
 #, c-format
 msgid ""
 "Tried to set initiator mode, as peer ID was given. However, `%s' is not a "
 "valid peer identifier.\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-scalarproduct.c:268
+#: src/scalarproduct/gnunet-scalarproduct.c:267
 msgid "Need elements to compute the scalarproduct, got none.\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-scalarproduct.c:291
+#: src/scalarproduct/gnunet-scalarproduct.c:290
 #, c-format
 msgid "Malformed input, could not parse `%s'\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-scalarproduct.c:309
+#: src/scalarproduct/gnunet-scalarproduct.c:308
 #, c-format
 msgid "Could not convert `%s' to int64_t.\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-scalarproduct.c:339
+#: src/scalarproduct/gnunet-scalarproduct.c:338
 #, c-format
 msgid "Failed to initiate computation, were all keys unique?\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-scalarproduct.c:365
-#: src/scalarproduct/gnunet-scalarproduct.c:372
+#: src/scalarproduct/gnunet-scalarproduct.c:364
+#: src/scalarproduct/gnunet-scalarproduct.c:371
 msgid ""
 "A comma separated list of elements to compare as vector with our remote peer."
 msgstr ""
 
-#: src/scalarproduct/gnunet-scalarproduct.c:379
+#: src/scalarproduct/gnunet-scalarproduct.c:378
 msgid ""
 "[Optional] peer to calculate our scalarproduct with. If this parameter is "
 "not given, the service will wait for a remote peer to compute the request."
 msgstr ""
 
-#: src/scalarproduct/gnunet-scalarproduct.c:386
+#: src/scalarproduct/gnunet-scalarproduct.c:385
 msgid "Transaction ID shared with peer."
 msgstr ""
 
-#: src/scalarproduct/gnunet-scalarproduct.c:397
+#: src/scalarproduct/gnunet-scalarproduct.c:396
 msgid "Calculate the Vectorproduct with a GNUnet peer."
 msgstr ""
 
 #: src/scalarproduct/gnunet-service-scalarproduct-ecc_alice.c:1118
-#: src/scalarproduct/gnunet-service-scalarproduct-ecc_bob.c:1034
+#: src/scalarproduct/gnunet-service-scalarproduct-ecc_bob.c:1032
 #: src/scalarproduct/gnunet-service-scalarproduct_alice.c:1358
 #: src/scalarproduct/gnunet-service-scalarproduct_bob.c:1355
 msgid "Connect to CADET failed\n"
@@ -6052,7 +6112,7 @@ msgstr ""
 msgid "also profile decryption"
 msgstr ""
 
-#: src/set/gnunet-service-set.c:1916 src/seti/gnunet-service-seti.c:2467
+#: src/set/gnunet-service-set.c:1914 src/seti/gnunet-service-seti.c:2467
 #: src/setu/gnunet-service-setu.c:5389
 #, fuzzy
 msgid "Could not connect to CADET service\n"
@@ -6108,16 +6168,16 @@ msgstr ""
 msgid "return intersection instead of delta"
 msgstr ""
 
-#: src/sq/sq.c:54
+#: src/sq/sq.c:47
 #, c-format
 msgid "Failure to bind %u-th SQL parameter\n"
 msgstr ""
 
-#: src/sq/sq.c:61
+#: src/sq/sq.c:54
 msgid "Failure in sqlite3_reset (!)\n"
 msgstr ""
 
-#: src/sq/sq.c:139
+#: src/sq/sq.c:126
 #, fuzzy, c-format
 msgid "Failed to reset sqlite statement with error: %s\n"
 msgstr "Impossibile avviare il servizio ' %s'\n"
@@ -6323,57 +6383,57 @@ msgid ""
 "Cannot open %s for writing load statistics.  Not logging load statistics\n"
 msgstr ""
 
-#: src/testbed/gnunet-service-testbed_peers.c:1165
+#: src/testbed/gnunet-service-testbed_peers.c:1153
 #, c-format
 msgid "%s is stopped"
 msgstr ""
 
-#: src/testbed/gnunet-service-testbed_peers.c:1168
+#: src/testbed/gnunet-service-testbed_peers.c:1156
 #, c-format
 msgid "%s is starting"
 msgstr ""
 
-#: src/testbed/gnunet-service-testbed_peers.c:1171
+#: src/testbed/gnunet-service-testbed_peers.c:1159
 #, c-format
 msgid "%s is stopping"
 msgstr ""
 
-#: src/testbed/gnunet-service-testbed_peers.c:1174
+#: src/testbed/gnunet-service-testbed_peers.c:1162
 #, c-format
 msgid "%s is starting already"
 msgstr ""
 
-#: src/testbed/gnunet-service-testbed_peers.c:1177
+#: src/testbed/gnunet-service-testbed_peers.c:1165
 #, c-format
 msgid "%s is stopping already"
 msgstr ""
 
-#: src/testbed/gnunet-service-testbed_peers.c:1180
+#: src/testbed/gnunet-service-testbed_peers.c:1168
 #, c-format
 msgid "%s is started already"
 msgstr ""
 
-#: src/testbed/gnunet-service-testbed_peers.c:1183
+#: src/testbed/gnunet-service-testbed_peers.c:1171
 #, c-format
 msgid "%s is stopped already"
 msgstr ""
 
-#: src/testbed/gnunet-service-testbed_peers.c:1186
+#: src/testbed/gnunet-service-testbed_peers.c:1174
 #, c-format
 msgid "%s service is not known to ARM"
 msgstr ""
 
-#: src/testbed/gnunet-service-testbed_peers.c:1189
+#: src/testbed/gnunet-service-testbed_peers.c:1177
 #, c-format
 msgid "%s service failed to start"
 msgstr ""
 
-#: src/testbed/gnunet-service-testbed_peers.c:1192
+#: src/testbed/gnunet-service-testbed_peers.c:1180
 #, c-format
 msgid "%s service can't be started because ARM is shutting down"
 msgstr ""
 
-#: src/testbed/gnunet-service-testbed_peers.c:1194
+#: src/testbed/gnunet-service-testbed_peers.c:1182
 #, c-format
 msgid "%.s Unknown result code."
 msgstr ""
@@ -6394,17 +6454,17 @@ msgstr ""
 msgid "Adding host %u failed with error: %s\n"
 msgstr ""
 
-#: src/testbed/testbed_api_hosts.c:429
+#: src/testbed/testbed_api_hosts.c:411
 #, c-format
 msgid "Hosts file %s not found\n"
 msgstr ""
 
-#: src/testbed/testbed_api_hosts.c:438
+#: src/testbed/testbed_api_hosts.c:420
 #, c-format
 msgid "Hosts file %s has no data\n"
 msgstr ""
 
-#: src/testbed/testbed_api_hosts.c:447
+#: src/testbed/testbed_api_hosts.c:429
 #, c-format
 msgid "Hosts file %s cannot be read\n"
 msgstr ""
@@ -6418,87 +6478,87 @@ msgstr ""
 msgid "Host registration failed for a host. Error: %s\n"
 msgstr ""
 
-#: src/testbed/testbed_api_testbed.c:1065
+#: src/testbed/testbed_api_testbed.c:1060
 msgid "Controller crash detected. Shutting down.\n"
 msgstr ""
 
-#: src/testbed/testbed_api_testbed.c:1154
+#: src/testbed/testbed_api_testbed.c:1149
 #, c-format
 msgid "Host %s cannot start testbed\n"
 msgstr ""
 
-#: src/testbed/testbed_api_testbed.c:1158
+#: src/testbed/testbed_api_testbed.c:1153
 msgid "Testbed cannot be started on localhost\n"
 msgstr ""
 
-#: src/testbed/testbed_api_testbed.c:1196
+#: src/testbed/testbed_api_testbed.c:1191
 msgid "Cannot start the master controller"
 msgstr ""
 
-#: src/testbed/testbed_api_testbed.c:1214
+#: src/testbed/testbed_api_testbed.c:1209
 msgid "Shutting down testbed due to timeout while setup.\n"
 msgstr ""
 
-#: src/testbed/testbed_api_testbed.c:1276
+#: src/testbed/testbed_api_testbed.c:1271
 msgid "No hosts loaded. Need at least one host\n"
 msgstr ""
 
-#: src/testbed/testbed_api_testbed.c:1301
+#: src/testbed/testbed_api_testbed.c:1296
 msgid "Specified topology must be supported by testbed"
 msgstr ""
 
-#: src/testbed/testbed_api_testbed.c:1357
+#: src/testbed/testbed_api_testbed.c:1352
 #, c-format
 msgid ""
 "Maximum number of edges a peer can have in a scale free topology cannot be "
 "more than %u.  Given `%s = %llu'"
 msgstr ""
 
-#: src/testbed/testbed_api_testbed.c:1374
+#: src/testbed/testbed_api_testbed.c:1369
 #, c-format
 msgid ""
 "The number of edges that can established when adding a new node to scale "
 "free topology cannot be more than %u.  Given `%s = %llu'"
 msgstr ""
 
-#: src/testbed/testbed_api_topology.c:1033 src/testing/testing.c:2753
+#: src/testbed/testbed_api_topology.c:1021 src/testing/testing.c:2693
 #, c-format
 msgid "Topology file %s not found\n"
 msgstr ""
 
-#: src/testbed/testbed_api_topology.c:1041 src/testing/testing.c:2761
+#: src/testbed/testbed_api_topology.c:1029 src/testing/testing.c:2701
 #, c-format
 msgid "Topology file %s has no data\n"
 msgstr ""
 
-#: src/testbed/testbed_api_topology.c:1049 src/testing/testing.c:2769
+#: src/testbed/testbed_api_topology.c:1037 src/testing/testing.c:2709
 #, c-format
 msgid "Topology file %s cannot be read\n"
 msgstr ""
 
-#: src/testbed/testbed_api_topology.c:1071
+#: src/testbed/testbed_api_topology.c:1059
 #, c-format
 msgid "Failed to read peer index from toology file: %s"
 msgstr ""
 
-#: src/testbed/testbed_api_topology.c:1080
-#: src/testbed/testbed_api_topology.c:1105
+#: src/testbed/testbed_api_topology.c:1068
+#: src/testbed/testbed_api_topology.c:1093
 #, c-format
 msgid "Value in given topology file: %s out of range\n"
 msgstr ""
 
-#: src/testbed/testbed_api_topology.c:1086
-#: src/testbed/testbed_api_topology.c:1111
+#: src/testbed/testbed_api_topology.c:1074
+#: src/testbed/testbed_api_topology.c:1099
 #, c-format
 msgid "Failed to read peer index from topology file: %s"
 msgstr ""
 
-#: src/testbed/testbed_api_topology.c:1092
-#: src/testbed/testbed_api_topology.c:1117
+#: src/testbed/testbed_api_topology.c:1080
+#: src/testbed/testbed_api_topology.c:1105
 msgid "Topology file needs more peers than given ones\n"
 msgstr ""
 
-#: src/testbed/testbed_api_topology.c:1153
+#: src/testbed/testbed_api_topology.c:1141
 #, fuzzy, c-format
 msgid "Ignoring to connect peer %lu to peer %lu\n"
 msgstr "Generazione statistiche fallita\n"
@@ -6593,7 +6653,7 @@ msgstr ""
 msgid "Failed to start `%s': %s\n"
 msgstr ""
 
-#: src/testing/testing.c:1694
+#: src/testing/testing.c:1646
 #, c-format
 msgid "Failed to load configuration from %s\n"
 msgstr ""
@@ -6670,7 +6730,7 @@ msgstr ""
 #: src/transport/gnunet-communicator-tcp.c:3347
 #: src/transport/gnunet-communicator-udp.c:3871
 #: src/transport/gnunet-service-tng.c:11334
-#: src/transport/gnunet-service-transport.c:2622
+#: src/transport/gnunet-service-transport.c:2617
 msgid "Transport service is lacking key configuration settings. Exiting.\n"
 msgstr ""
 
@@ -6731,12 +6791,12 @@ msgstr ""
 msgid "Disallowing connection to peer `%s' on transport %s\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport.c:2547
+#: src/transport/gnunet-service-transport.c:2542
 #, c-format
 msgid "Adding blacklisting entry for peer `%s'\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport.c:2556
+#: src/transport/gnunet-service-transport.c:2551
 #, c-format
 msgid "Adding blacklisting entry for peer `%s':`%s'\n"
 msgstr ""
@@ -6763,7 +6823,7 @@ msgid "# disconnects due to quota of 0"
 msgstr ""
 
 #: src/transport/gnunet-service-transport_neighbours.c:1341
-#: src/transport/gnunet-service-transport_neighbours.c:1817
+#: src/transport/gnunet-service-transport_neighbours.c:1807
 msgid "# bytes in message queue for other peers"
 msgstr ""
 
@@ -6831,144 +6891,144 @@ msgstr ""
 msgid "# ms throttling suggested"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1886
+#: src/transport/gnunet-service-transport_neighbours.c:1876
 #, fuzzy, c-format
 msgid "Failed to send SYN message to peer `%s'\n"
 msgstr "Generazione statistiche fallita\n"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1912
+#: src/transport/gnunet-service-transport_neighbours.c:1902
 msgid "# Failed attempts to switch addresses (failed to send SYN CONT)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1953
+#: src/transport/gnunet-service-transport_neighbours.c:1943
 #, fuzzy
 msgid "# SYN messages sent"
 msgstr "# messaggi PONG decrittati"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1970
+#: src/transport/gnunet-service-transport_neighbours.c:1960
 #, fuzzy, c-format
 msgid "Failed to transmit SYN message to %s\n"
 msgstr "Impossibile avviare il servizio.\n"
 
-#: src/transport/gnunet-service-transport_neighbours.c:2006
+#: src/transport/gnunet-service-transport_neighbours.c:1996
 msgid "# Failed attempts to switch addresses (failed to send SYN)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:2077
+#: src/transport/gnunet-service-transport_neighbours.c:2067
 #, fuzzy, c-format
 msgid "Failed to send SYN_ACK message to peer `%s' using address `%s'\n"
 msgstr "Impossibile avviare il servizio.\n"
 
-#: src/transport/gnunet-service-transport_neighbours.c:2132
+#: src/transport/gnunet-service-transport_neighbours.c:2122
 #, fuzzy
 msgid "# SYN_ACK messages sent"
 msgstr "# messaggi PONG decrittati"
 
-#: src/transport/gnunet-service-transport_neighbours.c:2150
+#: src/transport/gnunet-service-transport_neighbours.c:2140
 #, fuzzy, c-format
 msgid "Failed to transmit SYN_ACK message to %s\n"
 msgstr "Impossibile avviare il servizio ' %s'\n"
 
-#: src/transport/gnunet-service-transport_neighbours.c:2314
+#: src/transport/gnunet-service-transport_neighbours.c:2304
 #, fuzzy
 msgid "# SYN messages received"
 msgstr "# messaggi PONG ricevuti"
 
-#: src/transport/gnunet-service-transport_neighbours.c:2320
+#: src/transport/gnunet-service-transport_neighbours.c:2310
 #, c-format
 msgid "SYN request from peer `%s' ignored due impending shutdown\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:2731
+#: src/transport/gnunet-service-transport_neighbours.c:2721
 msgid "# Attempts to switch addresses"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3244
+#: src/transport/gnunet-service-transport_neighbours.c:3227
 #, fuzzy
 msgid "# SYN_ACK messages received"
 msgstr "# messaggi PONG ricevuti"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3252
+#: src/transport/gnunet-service-transport_neighbours.c:3235
 #, fuzzy
 msgid "# unexpected SYN_ACK messages (no peer)"
 msgstr "# messaggi PONG decrittati"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3272
-#: src/transport/gnunet-service-transport_neighbours.c:3300
+#: src/transport/gnunet-service-transport_neighbours.c:3255
+#: src/transport/gnunet-service-transport_neighbours.c:3283
 #, fuzzy
 msgid "# unexpected SYN_ACK messages (not ready)"
 msgstr "# messaggi PONG decrittati"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3315
+#: src/transport/gnunet-service-transport_neighbours.c:3298
 #, fuzzy
 msgid "# unexpected SYN_ACK messages (waiting on ATS)"
 msgstr "# messaggi PONG decrittati"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3345
+#: src/transport/gnunet-service-transport_neighbours.c:3328
 msgid "# Successful attempts to switch addresses"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3359
+#: src/transport/gnunet-service-transport_neighbours.c:3342
 #, fuzzy
 msgid "# unexpected SYN_ACK messages (disconnecting)"
 msgstr "# messaggi PONG decrittati"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3548
+#: src/transport/gnunet-service-transport_neighbours.c:3531
 #, fuzzy
 msgid "# ACK messages received"
 msgstr "# messaggi PONG ricevuti"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3582
+#: src/transport/gnunet-service-transport_neighbours.c:3565
 #, fuzzy
 msgid "# unexpected ACK messages"
 msgstr "# messaggi PONG decrittati"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3672
+#: src/transport/gnunet-service-transport_neighbours.c:3648
 #, fuzzy
 msgid "# quota messages ignored (malformed)"
 msgstr "# messaggi PONG decrittati"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3679
+#: src/transport/gnunet-service-transport_neighbours.c:3655
 #, fuzzy
 msgid "# QUOTA messages received"
 msgstr "# messaggi PONG ricevuti"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3722
+#: src/transport/gnunet-service-transport_neighbours.c:3698
 msgid "# disconnect messages ignored (malformed)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3729
+#: src/transport/gnunet-service-transport_neighbours.c:3705
 msgid "# DISCONNECT messages received"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3742
+#: src/transport/gnunet-service-transport_neighbours.c:3718
 msgid "# disconnect messages ignored (timestamp)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3879
+#: src/transport/gnunet-service-transport_neighbours.c:3855
 msgid "# disconnected from peer upon explicit request"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_plugins.c:157
+#: src/transport/gnunet-service-transport_plugins.c:144
 msgid "Transport service is lacking NEIGHBOUR_LIMIT option.\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_plugins.c:222
-#: src/transport/gnunet-service-transport_plugins.c:230
-#: src/transport/gnunet-service-transport_plugins.c:238
-#: src/transport/gnunet-service-transport_plugins.c:246
-#: src/transport/gnunet-service-transport_plugins.c:254
-#: src/transport/gnunet-service-transport_plugins.c:262
-#: src/transport/gnunet-service-transport_plugins.c:270
-#: src/transport/gnunet-service-transport_plugins.c:278
-#: src/transport/gnunet-service-transport_plugins.c:286
-#: src/transport/gnunet-service-transport_plugins.c:294
-#: src/transport/gnunet-service-transport_plugins.c:302
+#: src/transport/gnunet-service-transport_plugins.c:209
+#: src/transport/gnunet-service-transport_plugins.c:217
+#: src/transport/gnunet-service-transport_plugins.c:225
+#: src/transport/gnunet-service-transport_plugins.c:233
+#: src/transport/gnunet-service-transport_plugins.c:241
+#: src/transport/gnunet-service-transport_plugins.c:249
+#: src/transport/gnunet-service-transport_plugins.c:257
+#: src/transport/gnunet-service-transport_plugins.c:265
+#: src/transport/gnunet-service-transport_plugins.c:273
+#: src/transport/gnunet-service-transport_plugins.c:281
+#: src/transport/gnunet-service-transport_plugins.c:289
 #, c-format
 msgid "Missing function `%s' in transport plugin for `%s'\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_plugins.c:309
+#: src/transport/gnunet-service-transport_plugins.c:296
 #, c-format
 msgid "Did not load plugin `%s' due to missing functions\n"
 msgstr ""
@@ -7237,7 +7297,7 @@ msgstr ""
 msgid "send data for benchmarking to the other peer (until CTRL-C)"
 msgstr ""
 
-#: src/transport/plugin_transport_http_client.c:1488
+#: src/transport/plugin_transport_http_client.c:1482
 #: src/transport/plugin_transport_http_server.c:2331
 #: src/transport/plugin_transport_http_server.c:3562
 #: src/transport/plugin_transport_tcp.c:3773
@@ -7245,24 +7305,24 @@ msgstr ""
 msgid "TCP_STEALTH not supported on this platform.\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_client.c:2134
+#: src/transport/plugin_transport_http_client.c:2128
 #, c-format
 msgid "Could not initialize curl multi handle, failed to start %s plugin!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_client.c:2183
+#: src/transport/plugin_transport_http_client.c:2177
 #: src/transport/plugin_transport_http_server.c:3276
 #, c-format
 msgid "Shutting down plugin `%s'\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_client.c:2200
+#: src/transport/plugin_transport_http_client.c:2194
 #: src/transport/plugin_transport_http_server.c:3346
 #, c-format
 msgid "Shutdown for plugin `%s' complete\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_client.c:2234
+#: src/transport/plugin_transport_http_client.c:2228
 #, c-format
 msgid "Maximum number of requests is %u\n"
 msgstr ""
@@ -7662,7 +7722,7 @@ msgstr ""
 msgid "`%s' failed for `%s': address already in use\n"
 msgstr ""
 
-#: src/transport/tcp_server_legacy.c:897
+#: src/transport/tcp_server_legacy.c:892
 #, c-format
 msgid ""
 "Processing code for message of type %u did not call "
@@ -7887,20 +7947,20 @@ msgstr "NESSUNA"
 msgid "INVALID"
 msgstr "NON VALIDO"
 
-#: src/util/common_logging.c:1396
+#: src/util/common_logging.c:1360
 msgid "unknown address"
 msgstr "indirizzo sconosciuto"
 
-#: src/util/common_logging.c:1441
+#: src/util/common_logging.c:1405
 msgid "invalid address"
 msgstr "indirizzo non valido"
 
-#: src/util/common_logging.c:1453
+#: src/util/common_logging.c:1417
 #, c-format
 msgid "Configuration fails to specify option `%s' in section `%s'!\n"
 msgstr ""
 
-#: src/util/common_logging.c:1468
+#: src/util/common_logging.c:1432
 #, c-format
 msgid ""
 "Configuration specifies invalid value for option `%s' in section `%s': %s\n"
@@ -8050,12 +8110,12 @@ msgstr ""
 msgid "Received DNS response that is too small (%u bytes)\n"
 msgstr ""
 
-#: src/util/dnsstub.c:508
+#: src/util/dnsstub.c:503
 #, fuzzy, c-format
 msgid "Failed to send DNS request to %s: %s\n"
 msgstr "Generazione statistiche fallita\n"
 
-#: src/util/dnsstub.c:513
+#: src/util/dnsstub.c:508
 #, c-format
 msgid "Sent DNS request to %s\n"
 msgstr ""
@@ -8433,28 +8493,28 @@ msgstr ""
 msgid "Use built-in GNUnet stub resolver"
 msgstr ""
 
-#: src/util/gnunet-scrypt.c:215
+#: src/util/gnunet-scrypt.c:214
 #, c-format
 msgid "Loading hostkey from `%s' failed.\n"
 msgstr ""
 
-#: src/util/gnunet-scrypt.c:281
+#: src/util/gnunet-scrypt.c:280
 msgid "number of bits to require for the proof of work"
 msgstr ""
 
-#: src/util/gnunet-scrypt.c:287
+#: src/util/gnunet-scrypt.c:286
 msgid "file with private key, otherwise default is used"
 msgstr ""
 
-#: src/util/gnunet-scrypt.c:293
+#: src/util/gnunet-scrypt.c:292
 msgid "file with proof of work, otherwise default is used"
 msgstr ""
 
-#: src/util/gnunet-scrypt.c:299
+#: src/util/gnunet-scrypt.c:298
 msgid "time to wait between calculations"
 msgstr ""
 
-#: src/util/gnunet-scrypt.c:313
+#: src/util/gnunet-scrypt.c:312
 msgid "Manipulate GNUnet proof of work files"
 msgstr ""
 
@@ -8486,17 +8546,17 @@ msgstr ""
 msgid "Perform default-actions for GNUnet URIs"
 msgstr ""
 
-#: src/util/helper.c:323
+#: src/util/helper.c:306
 #, c-format
 msgid "Error reading from `%s': %s\n"
 msgstr "Errore di lettura da '%s': %s\n"
 
-#: src/util/helper.c:375
+#: src/util/helper.c:358
 #, c-format
 msgid "Failed to parse inbound message from helper `%s'\n"
 msgstr ""
 
-#: src/util/helper.c:606
+#: src/util/helper.c:573
 #, c-format
 msgid "Error writing to `%s': %s\n"
 msgstr ""
@@ -8506,25 +8566,25 @@ msgstr ""
 msgid "Unable to shorten unix path `%s' while keeping name unique\n"
 msgstr ""
 
-#: src/util/network.c:1307
+#: src/util/network.c:1284
 #, c-format
 msgid ""
 "Fatal internal logic error, process hangs in `%s' (abort with CTRL-C)!\n"
 msgstr ""
 
-#: src/util/os_installation.c:420
+#: src/util/os_installation.c:415
 #, c-format
 msgid ""
 "Could not determine installation path for %s.  Set `%s' environment "
 "variable.\n"
 msgstr ""
 
-#: src/util/os_installation.c:791
+#: src/util/os_installation.c:786
 #, c-format
 msgid "Could not find binary `%s' in PATH!\n"
 msgstr ""
 
-#: src/util/os_installation.c:824
+#: src/util/os_installation.c:819
 #, c-format
 msgid "Binary `%s' exists, but is not SUID\n"
 msgstr ""
@@ -8568,7 +8628,7 @@ msgstr "Impossibile avviare il servizio ' %s'\n"
 msgid "Malformed configuration. Exiting ...\n"
 msgstr "Impossibile avviare il servizio ' %s'\n"
 
-#: src/util/regex.c:139
+#: src/util/regex.c:123
 #, c-format
 msgid "Bad mask: %d\n"
 msgstr ""
@@ -8877,21 +8937,15 @@ msgstr ""
 msgid "Setup tunnels via VPN."
 msgstr ""
 
-#: src/zonemaster/gnunet-service-zonemaster-monitor.c:249
-#: src/zonemaster/gnunet-service-zonemaster.c:364
+#: src/zonemaster/gnunet-service-zonemaster.c:521
 #, c-format
 msgid "Failed to replicate block in namecache: %s\n"
 msgstr ""
 
-#: src/zonemaster/gnunet-service-zonemaster-monitor.c:529
-#: src/zonemaster/gnunet-service-zonemaster.c:969
+#: src/zonemaster/gnunet-service-zonemaster.c:1383
 msgid "Failed to connect to the namestore!\n"
 msgstr ""
 
-#: src/zonemaster/gnunet-service-zonemaster-monitor.c:550
-msgid "Namecache is disabled!\n"
-msgstr ""
-
 #~ msgid "# items stored"
 #~ msgstr "# elementi memorizzati"
 
diff --git a/po/sr.po b/po/sr.po
index 5a259bd46..cd0ac004a 100644
--- a/po/sr.po
+++ b/po/sr.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnunet-0.10.1\n"
 "Report-Msgid-Bugs-To: gnunet-developers@mail.gnu.org\n"
-"POT-Creation-Date: 2022-10-16 18:47+0900\n"
+"POT-Creation-Date: 2022-10-21 13:20+0900\n"
 "PO-Revision-Date: 2020-10-23 18:39+0200\n"
 "Last-Translator: Мирослав Николић <miroslavnikolic@rocketmail.com>\n"
 "Language-Team: Serbian <(nothing)>\n"
@@ -18,7 +18,10 @@ msgstr ""
 "n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 "X-Bugs: Report translation errors to the Language-Team address.\n"
 
-#: src/abd/gnunet-abd.c:392 src/namestore/gnunet-namestore.c:1245
+#: src/abd/gnunet-abd.c:392 src/namestore/gnunet-namestore-zonefile.c:193
+#: src/namestore/gnunet-namestore-zonefile.c:652
+#: src/namestore/gnunet-namestore-zonefile.c:673
+#: src/namestore/gnunet-namestore.c:1245
 #, c-format
 msgid "Ego `%s' not known to identity service\n"
 msgstr "Его „%s“ није познат услузи идентитета\n"
@@ -165,15 +168,15 @@ msgstr "Нисам успео да уклоним датотеку подеша
 msgid "Failed to remove servicehome directory %s\n"
 msgstr "Нисам успео да уклоним матични директоријум услуге „%s“\n"
 
-#: src/arm/gnunet-arm.c:229 src/testbed/gnunet-service-testbed_peers.c:1144
+#: src/arm/gnunet-arm.c:229 src/testbed/gnunet-service-testbed_peers.c:1132
 msgid "Message was sent successfully"
 msgstr "Порука је успешно послата"
 
-#: src/arm/gnunet-arm.c:232 src/testbed/gnunet-service-testbed_peers.c:1147
+#: src/arm/gnunet-arm.c:232 src/testbed/gnunet-service-testbed_peers.c:1135
 msgid "We disconnected from ARM before we could send a request"
 msgstr "Прекинута је веза са АУР-ом пре него ли можемо послати захтев"
 
-#: src/arm/gnunet-arm.c:234 src/testbed/gnunet-service-testbed_peers.c:1149
+#: src/arm/gnunet-arm.c:234 src/testbed/gnunet-service-testbed_peers.c:1137
 msgid "Unknown request status"
 msgstr "Стање захтева је непознато"
 
@@ -1387,46 +1390,46 @@ msgstr ""
 msgid "Core service of `%s' ready.\n"
 msgstr "Кључна услуга „%4s“ је спремна.\n"
 
-#: src/core/gnunet-service-core_kx.c:512
+#: src/core/gnunet-service-core_kx.c:513
 msgid "# bytes encrypted"
 msgstr "# бајтова шифрованих"
 
-#: src/core/gnunet-service-core_kx.c:570
+#: src/core/gnunet-service-core_kx.c:571
 msgid "# bytes decrypted"
 msgstr "# бајтова дешифрованих"
 
-#: src/core/gnunet-service-core_kx.c:667
+#: src/core/gnunet-service-core_kx.c:668
 msgid "# PAYLOAD dropped (out of order)"
 msgstr "# УТОВАР је одбачен (ван поретка)"
 
-#: src/core/gnunet-service-core_kx.c:719
+#: src/core/gnunet-service-core_kx.c:720
 msgid "# key exchanges initiated"
 msgstr "# кључ измена је покренут"
 
-#: src/core/gnunet-service-core_kx.c:775
+#: src/core/gnunet-service-core_kx.c:776
 msgid "# key exchanges stopped"
 msgstr "# кључ измена је заустављен"
 
-#: src/core/gnunet-service-core_kx.c:807
+#: src/core/gnunet-service-core_kx.c:808
 #, fuzzy
 msgid "# PING messages transmitted"
 msgstr "# ПОНГ поруке су направљене"
 
-#: src/core/gnunet-service-core_kx.c:866
+#: src/core/gnunet-service-core_kx.c:867
 msgid "# old ephemeral keys ignored"
 msgstr "# стари једнократни кључеви су занемарени"
 
-#: src/core/gnunet-service-core_kx.c:880
+#: src/core/gnunet-service-core_kx.c:881
 #, fuzzy
 msgid "# duplicate ephemeral keys ignored"
 msgstr "# стари једнократни кључеви су занемарени"
 
-#: src/core/gnunet-service-core_kx.c:915
+#: src/core/gnunet-service-core_kx.c:916
 #, fuzzy
 msgid "# EPHEMERAL_KEYs rejected (bad signature)"
 msgstr "# поруке ЈЕДНОКРАТНОГ_КЉУЧА су примљене"
 
-#: src/core/gnunet-service-core_kx.c:933
+#: src/core/gnunet-service-core_kx.c:934
 #, fuzzy, c-format
 msgid ""
 "EPHEMERAL_KEY from peer `%s' rejected as its validity range does not match "
@@ -1435,101 +1438,101 @@ msgstr ""
 "Порука једнократног кључа од парњака „%s“ је одбачена јер њен опсег "
 "исправности не одговара времену нашег система (%llu није у [%llu,%llu]).\n"
 
-#: src/core/gnunet-service-core_kx.c:940
+#: src/core/gnunet-service-core_kx.c:941
 #, fuzzy
 msgid "# EPHEMERAL_KEY messages rejected due to time"
 msgstr "# поруке ЈЕДНОКРАТНОГ_КЉУЧА су примљене"
 
-#: src/core/gnunet-service-core_kx.c:958
+#: src/core/gnunet-service-core_kx.c:959
 #, fuzzy
 msgid "# valid ephemeral keys received"
 msgstr "# једнократни кључеви су примљени"
 
-#: src/core/gnunet-service-core_kx.c:1067
+#: src/core/gnunet-service-core_kx.c:1068
 #: src/transport/gnunet-service-transport_validation.c:1133
 msgid "# PING messages received"
 msgstr "# ПИНГ поруке су примљене"
 
-#: src/core/gnunet-service-core_kx.c:1077
+#: src/core/gnunet-service-core_kx.c:1078
 msgid "# PING messages dropped (out of order)"
 msgstr "# ПИНГ поруке су одбачене (ван поретка)"
 
-#: src/core/gnunet-service-core_kx.c:1126
+#: src/core/gnunet-service-core_kx.c:1127
 msgid "# PONG messages created"
 msgstr "# ПОНГ поруке су направљене"
 
-#: src/core/gnunet-service-core_kx.c:1151
+#: src/core/gnunet-service-core_kx.c:1152
 msgid "# sessions terminated by timeout"
 msgstr "# сесије су окончане временским истеком"
 
-#: src/core/gnunet-service-core_kx.c:1164
+#: src/core/gnunet-service-core_kx.c:1165
 msgid "# keepalive messages sent"
 msgstr "# поруке држања у животу су послате"
 
-#: src/core/gnunet-service-core_kx.c:1221
+#: src/core/gnunet-service-core_kx.c:1222
 #: src/transport/gnunet-service-transport_validation.c:1476
 msgid "# PONG messages received"
 msgstr "# ПОНГ поруке су примљене"
 
-#: src/core/gnunet-service-core_kx.c:1229
+#: src/core/gnunet-service-core_kx.c:1230
 msgid "# PONG messages dropped (connection down)"
 msgstr "# ПОНГ поруке су одбачене (веза је пала)"
 
-#: src/core/gnunet-service-core_kx.c:1237
+#: src/core/gnunet-service-core_kx.c:1238
 msgid "# PONG messages dropped (out of order)"
 msgstr "# ПОНГ поруке су одбачене (ван поретка)"
 
-#: src/core/gnunet-service-core_kx.c:1276
+#: src/core/gnunet-service-core_kx.c:1277
 msgid "# PONG messages decrypted"
 msgstr "# ПОНГ поруке су дешифроване"
 
-#: src/core/gnunet-service-core_kx.c:1316
+#: src/core/gnunet-service-core_kx.c:1317
 msgid "# session keys confirmed via PONG"
 msgstr "# кључеви сесије су потврђени путем ПОНГ-а"
 
-#: src/core/gnunet-service-core_kx.c:1328
+#: src/core/gnunet-service-core_kx.c:1329
 msgid "# timeouts prevented via PONG"
 msgstr "# временски истеци су спречени путем ПОНГ-а"
 
-#: src/core/gnunet-service-core_kx.c:1337
+#: src/core/gnunet-service-core_kx.c:1338
 msgid "# rekey operations confirmed via PONG"
 msgstr "# операције рекључа су потврђене путем ПОНГ-а"
 
-#: src/core/gnunet-service-core_kx.c:1506
+#: src/core/gnunet-service-core_kx.c:1507
 msgid "# DATA message dropped (out of order)"
 msgstr "# ПОДАТАКА порука је одбачена (ван поретка)"
 
-#: src/core/gnunet-service-core_kx.c:1517
+#: src/core/gnunet-service-core_kx.c:1518
 #, c-format
 msgid ""
 "Session to peer `%s' went down due to key expiration (should not happen)\n"
 msgstr ""
 "Сесија за парњака „%s“ је пала услед истека кључа (није требало да се деси)\n"
 
-#: src/core/gnunet-service-core_kx.c:1521
+#: src/core/gnunet-service-core_kx.c:1522
 msgid "# sessions terminated by key expiration"
 msgstr "# сесије су окончане истеком кључа"
 
-#: src/core/gnunet-service-core_kx.c:1599
-#: src/core/gnunet-service-core_kx.c:1626
+#: src/core/gnunet-service-core_kx.c:1600
+#: src/core/gnunet-service-core_kx.c:1627
 msgid "# bytes dropped (duplicates)"
 msgstr "# бајтови одбачени (удвострученост)"
 
-#: src/core/gnunet-service-core_kx.c:1612
+#: src/core/gnunet-service-core_kx.c:1613
 msgid "# bytes dropped (out of sequence)"
 msgstr "# бајтови одбачени (ван низа)"
 
-#: src/core/gnunet-service-core_kx.c:1657
+#: src/core/gnunet-service-core_kx.c:1658
 msgid "# bytes dropped (ancient message)"
 msgstr "# бајтови одбачени (стара порука)"
 
-#: src/core/gnunet-service-core_kx.c:1666
+#: src/core/gnunet-service-core_kx.c:1667
 msgid "# bytes of payload decrypted"
 msgstr "# бајтови утовара су дешифровани"
 
 #: src/core/gnunet-service-core_sessions.c:252
 #: src/core/gnunet-service-core_sessions.c:337
-#: src/fs/gnunet-service-fs_cp.c:601 src/fs/gnunet-service-fs_cp.c:1496
+#: src/fs/gnunet-service-fs_cp.c:601 src/fs/gnunet-service-fs_cp.c:1494
 #: src/topology/gnunet-daemon-topology.c:579
 #: src/topology/gnunet-daemon-topology.c:671
 #: src/transport/gnunet-service-transport_neighbours.c:723
@@ -1764,7 +1767,7 @@ msgstr "Недовољно простора за задовољавање зах
 #: src/datastore/gnunet-service-datastore.c:626
 #: src/datastore/gnunet-service-datastore.c:677
 #: src/datastore/gnunet-service-datastore.c:820
-#: src/datastore/gnunet-service-datastore.c:1429
+#: src/datastore/gnunet-service-datastore.c:1428
 msgid "# reserved"
 msgstr "# је резервисано"
 
@@ -1811,70 +1814,70 @@ msgstr "Нисам нашао садржај"
 msgid "# bytes removed (explicit request)"
 msgstr "# бајта је уклоњено (изричити захтев)"
 
-#: src/datastore/gnunet-service-datastore.c:1059
+#: src/datastore/gnunet-service-datastore.c:1058
 msgid "# REMOVE requests received"
 msgstr "# захтеви УКЛОНИ су уклоњени"
 
-#: src/datastore/gnunet-service-datastore.c:1108
+#: src/datastore/gnunet-service-datastore.c:1107
 #, fuzzy, c-format
 msgid ""
 "Datastore payload must have been inaccurate (%lld < %lld). Recomputing it.\n"
 msgstr ""
 "Утовар смештаја података није тачан (%lld < %lld).  Покушавам да поправим.\n"
 
-#: src/datastore/gnunet-service-datastore.c:1113
-#: src/datastore/gnunet-service-datastore.c:1282
+#: src/datastore/gnunet-service-datastore.c:1112
+#: src/datastore/gnunet-service-datastore.c:1281
 #, c-format
 msgid "New payload: %lld\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1168
+#: src/datastore/gnunet-service-datastore.c:1167
 #, c-format
 msgid "Loading `%s' datastore plugin\n"
 msgstr "Учитавам прикључак „%s“ смештаја података\n"
 
-#: src/datastore/gnunet-service-datastore.c:1177
+#: src/datastore/gnunet-service-datastore.c:1176
 #, c-format
 msgid "Failed to load datastore plugin for `%s'\n"
 msgstr "Нисам успео да учитам прикључак смештаја података за „%s“\n"
 
-#: src/datastore/gnunet-service-datastore.c:1237
+#: src/datastore/gnunet-service-datastore.c:1236
 msgid "Bloomfilter construction complete.\n"
 msgstr "Изградња блумфилтера је завршена.\n"
 
-#: src/datastore/gnunet-service-datastore.c:1289
+#: src/datastore/gnunet-service-datastore.c:1288
 msgid "Rebuilding bloomfilter.  Please be patient.\n"
 msgstr "Поново градим блумфилтер.  Будите стрпљиви.\n"
 
-#: src/datastore/gnunet-service-datastore.c:1299
+#: src/datastore/gnunet-service-datastore.c:1298
 msgid "Plugin does not support get_keys function. Please fix!\n"
 msgstr "Прикључак не подржава функцију „get_keys“. Поправите то!\n"
 
-#: src/datastore/gnunet-service-datastore.c:1464
+#: src/datastore/gnunet-service-datastore.c:1463
 #, c-format
 msgid "# bytes used in file-sharing datastore `%s'"
 msgstr "# бајтови су коришћени у смештају података дељења датотека „%s“"
 
-#: src/datastore/gnunet-service-datastore.c:1473
+#: src/datastore/gnunet-service-datastore.c:1472
 msgid "# quota"
 msgstr "# квота"
 
-#: src/datastore/gnunet-service-datastore.c:1476
+#: src/datastore/gnunet-service-datastore.c:1475
 msgid "# cache size"
 msgstr "# величина кеша"
 
-#: src/datastore/gnunet-service-datastore.c:1492
+#: src/datastore/gnunet-service-datastore.c:1491
 #, c-format
 msgid "Could not use specified filename `%s' for bloomfilter.\n"
 msgstr "Не могу да користим наведени назив датотеке „%s“ за блумфилтер.\n"
 
-#: src/datastore/gnunet-service-datastore.c:1513
-#: src/datastore/gnunet-service-datastore.c:1535
+#: src/datastore/gnunet-service-datastore.c:1512
+#: src/datastore/gnunet-service-datastore.c:1534
 #, c-format
 msgid "Failed to remove bogus bloomfilter file `%s'\n"
 msgstr "Нисам успео да уклоним лажну датотеку блумфилтера „%s“\n"
 
-#: src/datastore/gnunet-service-datastore.c:1574
+#: src/datastore/gnunet-service-datastore.c:1573
 msgid "Failed to initialize bloomfilter.\n"
 msgstr "Нисам успео да покренем блумфилтер.\n"
 
@@ -1926,7 +1929,7 @@ msgstr "„%s“ није успело на %s:%u са грешком: %s"
 
 #: src/datastore/plugin_datastore_sqlite.c:310
 #: src/namecache/plugin_namecache_sqlite.c:180
-#: src/namestore/plugin_namestore_sqlite.c:868
+#: src/namestore/plugin_namestore_sqlite.c:891
 #: src/peerstore/plugin_peerstore_sqlite.c:540
 #, c-format
 msgid "Unable to initialize SQLite: %s.\n"
@@ -2191,7 +2194,7 @@ msgstr "# Не-ДНС УДП пакет је примљен путем ТУН с
 msgid "# DNS requests received via TUN interface"
 msgstr "# ДНС захтеви су примљени путем ТУН сучеља"
 
-#: src/dns/gnunet-service-dns.c:1117 src/exit/gnunet-daemon-exit.c:3708
+#: src/dns/gnunet-service-dns.c:1117 src/exit/gnunet-daemon-exit.c:3707
 msgid "need a valid IPv4 or IPv6 address\n"
 msgstr "потребна је исправна ИПв4 или ИПв6 адреса\n"
 
@@ -2341,32 +2344,32 @@ msgstr ""
 msgid "Packet from unknown protocol %u received.  Ignored.\n"
 msgstr "Пакет са непознатог протокола %u је примљен.  Занемарено.\n"
 
-#: src/exit/gnunet-daemon-exit.c:3377 src/exit/gnunet-daemon-exit.c:3388
+#: src/exit/gnunet-daemon-exit.c:3376 src/exit/gnunet-daemon-exit.c:3387
 #, c-format
 msgid "Option `%s' for domain `%s' is not formatted correctly!\n"
 msgstr "Опција „%s“ за домен „%s“ није форматирана исправна!\n"
 
-#: src/exit/gnunet-daemon-exit.c:3402 src/exit/gnunet-daemon-exit.c:3410
+#: src/exit/gnunet-daemon-exit.c:3401 src/exit/gnunet-daemon-exit.c:3409
 #, c-format
 msgid "`%s' is not a valid port number (for domain `%s')!"
 msgstr "„%s“ није исправан број прикључника (за домен „%s“)!"
 
-#: src/exit/gnunet-daemon-exit.c:3452
+#: src/exit/gnunet-daemon-exit.c:3451
 #, c-format
 msgid "No addresses found for hostname `%s' of service `%s'!\n"
 msgstr "Није нађена ниједна адрееса за назив домаћина „%s“ услуге „%s“!\n"
 
-#: src/exit/gnunet-daemon-exit.c:3467 src/exit/gnunet-daemon-exit.c:3482
+#: src/exit/gnunet-daemon-exit.c:3466 src/exit/gnunet-daemon-exit.c:3481
 #, c-format
 msgid "Service `%s' configured for IPv4, but IPv4 is disabled!\n"
 msgstr "Услуга „%s“ је подешена за IPv4, али IPv4 је искључено!\n"
 
-#: src/exit/gnunet-daemon-exit.c:3496
+#: src/exit/gnunet-daemon-exit.c:3495
 #, c-format
 msgid "No IP addresses found for hostname `%s' of service `%s'!\n"
 msgstr "Није нађена ниједна ИП адрееса за назив домаћина „%s“ услуге „%s“!\n"
 
-#: src/exit/gnunet-daemon-exit.c:3641
+#: src/exit/gnunet-daemon-exit.c:3640
 msgid ""
 "This system does not support IPv4, will disable IPv4 functions despite them "
 "being enabled in the configuration\n"
@@ -2374,7 +2377,7 @@ msgstr ""
 "Овај систем не подржава IPv4, искључиће IPv4 функције упркос томе што су "
 "укључене у подешавањима\n"
 
-#: src/exit/gnunet-daemon-exit.c:3650
+#: src/exit/gnunet-daemon-exit.c:3649
 msgid ""
 "This system does not support IPv6, will disable IPv6 functions despite them "
 "being enabled in the configuration\n"
@@ -2382,7 +2385,7 @@ msgstr ""
 "Овај систем не подржава IPv6, искључиће IPv6 функције упркос томе што су "
 "укључене у подешавањима\n"
 
-#: src/exit/gnunet-daemon-exit.c:3658
+#: src/exit/gnunet-daemon-exit.c:3657
 msgid ""
 "Cannot enable IPv4 exit but disable IPv4 on TUN interface, will use "
 "ENABLE_IPv4=YES\n"
@@ -2390,7 +2393,7 @@ msgstr ""
 "Не могу да укључим ИПв4 излаз али искључујем ИПв4 на ТУН сучељу, користићу "
 "„ENABLE_IPv4=ДА“\n"
 
-#: src/exit/gnunet-daemon-exit.c:3665
+#: src/exit/gnunet-daemon-exit.c:3664
 msgid ""
 "Cannot enable IPv6 exit but disable IPv6 on TUN interface, will use "
 "ENABLE_IPv6=YES\n"
@@ -2398,20 +2401,20 @@ msgstr ""
 "Не могу да укључим ИПв6 излаз али искључујем ИПв6 на ТУН сучељу, користићу "
 "„ENABLE_IPv6=ДА“\n"
 
-#: src/exit/gnunet-daemon-exit.c:3836
+#: src/exit/gnunet-daemon-exit.c:3835
 msgid "Must be a number"
 msgstr "Мора бити број"
 
-#: src/exit/gnunet-daemon-exit.c:3952
+#: src/exit/gnunet-daemon-exit.c:3951
 #, c-format
 msgid "`%s' is not SUID or the path is invalid, EXIT will not work\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3964 src/pt/gnunet-daemon-pt.c:1212
+#: src/exit/gnunet-daemon-exit.c:3963 src/pt/gnunet-daemon-pt.c:1212
 msgid "No useful service enabled.  Exiting.\n"
 msgstr "Ниједна корисна услуга није укључена.  Излазим.\n"
 
-#: src/exit/gnunet-daemon-exit.c:4118
+#: src/exit/gnunet-daemon-exit.c:4117
 msgid "Daemon to run to provide an IP exit node for the VPN"
 msgstr "Демон за покретање за обезбеђивање чвора ИП излаза за ВПН"
 
@@ -2603,7 +2606,7 @@ msgstr ""
 msgid "internal error decoding tree"
 msgstr "унутрашња грешка декодирања стабла"
 
-#: src/fs/fs_download.c:1890
+#: src/fs/fs_download.c:1889
 msgid "Invalid URI"
 msgstr "Неисправан УРИ"
 
@@ -2621,7 +2624,7 @@ msgstr ""
 msgid "Failed to receive response from `%s' service.\n"
 msgstr "Нисам успео да примим одговор са услуге „PEERINFO“."
 
-#: src/fs/fs_list_indexed.c:195
+#: src/fs/fs_list_indexed.c:187
 #, c-format
 msgid "Failed to not connect to `%s' service.\n"
 msgstr "Нисам успео да се не повежем са „%s“ услугом.\n"
@@ -2646,7 +2649,7 @@ msgstr "Нисам успео да пишем „%s“: %s\n"
 msgid "Failed to read `%s': %s\n"
 msgstr "Нисам успео да прочитам „%s“: %s\n"
 
-#: src/fs/fs_namespace.c:472
+#: src/fs/fs_namespace.c:457
 msgid "Failed to connect to datastore."
 msgstr "Нисам успео да се повежем са смештајем података."
 
@@ -2777,107 +2780,107 @@ msgstr "Нисам успео да отворим датотеку за пони
 msgid "Failed to compute hash of file."
 msgstr "Нисам успео да израчунам хеш датотеке."
 
-#: src/fs/fs_uri.c:239
+#: src/fs/fs_uri.c:231
 #, fuzzy, no-c-format
 msgid "Malformed KSK URI (`%' must be followed by HEX number)"
 msgstr "„%“ мора бити праћено HEX бројем"
 
-#: src/fs/fs_uri.c:298
+#: src/fs/fs_uri.c:290
 msgid "Malformed KSK URI (must not begin or end with `+')"
 msgstr "Лоша KSK УРИ (не сме почињати или завршавати се са знаком +)"
 
-#: src/fs/fs_uri.c:316
+#: src/fs/fs_uri.c:308
 #, fuzzy
 msgid "Malformed KSK URI (`++' not allowed)"
 msgstr "Лоша KSK УРИ (не сме почињати или завршавати се са знаком +)"
 
-#: src/fs/fs_uri.c:323
+#: src/fs/fs_uri.c:315
 #, fuzzy
 msgid "Malformed KSK URI (quotes not balanced)"
 msgstr "Лоша KSK УРИ (не сме почињати или завршавати се са знаком +)"
 
-#: src/fs/fs_uri.c:390
+#: src/fs/fs_uri.c:382
 #, fuzzy
 msgid "Malformed SKS URI (wrong syntax)"
 msgstr "Лоша SKS УРИ"
 
-#: src/fs/fs_uri.c:431
+#: src/fs/fs_uri.c:423
 #, fuzzy
 msgid "Malformed CHK URI (wrong syntax)"
 msgstr "Лоша CHK УРИ"
 
-#: src/fs/fs_uri.c:448
+#: src/fs/fs_uri.c:440
 msgid "Malformed CHK URI (failed to decode CHK)"
 msgstr ""
 
-#: src/fs/fs_uri.c:525
+#: src/fs/fs_uri.c:517
 #, fuzzy
 msgid "LOC URI malformed (wrong syntax)"
 msgstr "LOC УРИ је лоше"
 
-#: src/fs/fs_uri.c:542
+#: src/fs/fs_uri.c:534
 #, fuzzy
 msgid "LOC URI malformed (no CHK)"
 msgstr "LOC УРИ је лоше"
 
-#: src/fs/fs_uri.c:552
+#: src/fs/fs_uri.c:544
 #, fuzzy
 msgid "LOC URI malformed (missing LOC)"
 msgstr "LOC УРИ је лоше"
 
-#: src/fs/fs_uri.c:560
+#: src/fs/fs_uri.c:552
 #, fuzzy
 msgid "LOC URI malformed (wrong syntax for public key)"
 msgstr "LOC УРИ је лоше (не могу да декодирам јавни кључ)"
 
-#: src/fs/fs_uri.c:569
+#: src/fs/fs_uri.c:561
 msgid "LOC URI malformed (could not decode public key)"
 msgstr "LOC УРИ је лоше (не могу да декодирам јавни кључ)"
 
-#: src/fs/fs_uri.c:575
+#: src/fs/fs_uri.c:567
 #, fuzzy
 msgid "LOC URI malformed (could not find signature)"
 msgstr "SKS УРИ је лоше (не могу да нашем потпис)"
 
-#: src/fs/fs_uri.c:582
+#: src/fs/fs_uri.c:574
 #, fuzzy
 msgid "LOC URI malformed (wrong syntax for signature)"
 msgstr "SKS УРИ је лоше (не могу да нашем потпис)"
 
-#: src/fs/fs_uri.c:593
+#: src/fs/fs_uri.c:585
 #, fuzzy
 msgid "LOC URI malformed (could not decode signature)"
 msgstr "SKS УРИ је лоше (не могу да декодирам потпис)"
 
-#: src/fs/fs_uri.c:600
+#: src/fs/fs_uri.c:592
 #, fuzzy
 msgid "LOC URI malformed (wrong syntax for expiration time)"
 msgstr "SKS УРИ је лоше (не могу да обрадим време истека)"
 
-#: src/fs/fs_uri.c:606
+#: src/fs/fs_uri.c:598
 #, fuzzy
 msgid "LOC URI malformed (could not parse expiration time)"
 msgstr "SKS УРИ је лоше (не могу да обрадим време истека)"
 
-#: src/fs/fs_uri.c:620
+#: src/fs/fs_uri.c:612
 #, fuzzy
 msgid "LOC URI malformed (signature failed validation)"
 msgstr "SKS УРИ је лоше (потврђивање потписа није успело)"
 
-#: src/fs/fs_uri.c:653
+#: src/fs/fs_uri.c:645
 #, fuzzy
 msgid "invalid argument"
 msgstr "Неисправан аргумент „%s“\n"
 
-#: src/fs/fs_uri.c:673
+#: src/fs/fs_uri.c:665
 msgid "Unrecognized URI type"
 msgstr "Непозната УРИ врста"
 
-#: src/fs/fs_uri.c:1077 src/fs/fs_uri.c:1104
+#: src/fs/fs_uri.c:1060 src/fs/fs_uri.c:1087
 msgid "No keywords specified!\n"
 msgstr "Нису наведене речи кључа!\n"
 
-#: src/fs/fs_uri.c:1110
+#: src/fs/fs_uri.c:1093
 msgid "Number of double-quotes not balanced!\n"
 msgstr "Број двоструких квота које нису уравнотежене!\n"
 
@@ -3482,7 +3485,7 @@ msgid "# cadet client connections rejected"
 msgstr "# везе меш клијента су одбијене"
 
 #: src/fs/gnunet-service-fs_cadet_server.c:394
-#: src/fs/gnunet-service-fs_cadet_server.c:434
+#: src/fs/gnunet-service-fs_cadet_server.c:433
 #, fuzzy
 msgid "# cadet connections active"
 msgstr "# меш везе су радне"
@@ -3541,7 +3544,7 @@ msgstr "# захтеви су одбачени услед ниског ТТЛ т
 msgid "# P2P query messages received and processed"
 msgstr "# поруке П2П упита су примљене и обрађене"
 
-#: src/fs/gnunet-service-fs_cp.c:1679
+#: src/fs/gnunet-service-fs_cp.c:1677
 msgid "# migration stop messages sent"
 msgstr "# поруке зауставља миграције су послате"
 
@@ -3838,8 +3841,8 @@ msgstr "Овај програм ће увести неке ГНС ауторит
 #: src/hostlist/gnunet-daemon-hostlist_client.c:957
 #: src/hostlist/gnunet-daemon-hostlist_client.c:1059
 #: src/hostlist/gnunet-daemon-hostlist_client.c:1067
-#: src/transport/plugin_transport_http_client.c:600
-#: src/transport/plugin_transport_http_client.c:618
+#: src/transport/plugin_transport_http_client.c:599
+#: src/transport/plugin_transport_http_client.c:617
 #, c-format
 msgid "%s failed at %s:%d: `%s'\n"
 msgstr "„%s“ није успело на %s:%d: „%s“\n"
@@ -3904,7 +3907,7 @@ msgstr "Не могу да увезем уверење „%s“\n"
 msgid "Failed to start HTTPS server for `%s'\n"
 msgstr "Нисам успео да покренем ХТТПС сервер за „%s“\n"
 
-#: src/gns/gnunet-gns-proxy.c:2919 src/rest/gnunet-rest-server.c:958
+#: src/gns/gnunet-gns-proxy.c:2919 src/rest/gnunet-rest-server.c:957
 msgid "Failed to pass client to MHD\n"
 msgstr "Нисам успео да проследим клијента МХД-у\n"
 
@@ -3923,24 +3926,24 @@ msgstr "Неподржана наредба прикључнице %d\n"
 msgid "Unsupported socks address type %d\n"
 msgstr "Неподржана врста адресе прикључнице %d\n"
 
-#: src/gns/gnunet-gns-proxy.c:3727
+#: src/gns/gnunet-gns-proxy.c:3726
 #, fuzzy, c-format
 msgid "Failed to load X.509 key and certificate from `%s'\n"
 msgstr "Нисам успео да учитам ССЛ/ТЛС кључ и уверење из „%s“\n"
 
-#: src/gns/gnunet-gns-proxy.c:3869
+#: src/gns/gnunet-gns-proxy.c:3868
 msgid "listen on specified port (default: 7777)"
 msgstr "ослушкиван на наведеном прикључнику (основно: 7777)"
 
-#: src/gns/gnunet-gns-proxy.c:3874
+#: src/gns/gnunet-gns-proxy.c:3873
 msgid "pem file to use as CA"
 msgstr "пем датотека за коришћење као издавач уверења"
 
-#: src/gns/gnunet-gns-proxy.c:3878
+#: src/gns/gnunet-gns-proxy.c:3877
 msgid "disable use of IPv6"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:3904
+#: src/gns/gnunet-gns-proxy.c:3903
 msgid "GNUnet GNS proxy"
 msgstr "ГНУнет ГНС посредник"
 
@@ -3988,20 +3991,18 @@ msgstr ""
 msgid "GNUnet GNS resolver tool"
 msgstr "Алат ГНУнет ГНС решавача"
 
-#: src/gns/gnunet-service-gns.c:501
+#: src/gns/gnunet-service-gns.c:500
 #, fuzzy
 msgid "Properly base32-encoded public key required"
 msgstr "исправан јавни кључ се захтева"
 
-#: src/gns/gnunet-service-gns.c:537
-#: src/zonemaster/gnunet-service-zonemaster-monitor.c:542
-#: src/zonemaster/gnunet-service-zonemaster.c:982
+#: src/gns/gnunet-service-gns.c:536
+#: src/zonemaster/gnunet-service-zonemaster.c:1396
 msgid "Failed to connect to the namecache!\n"
 msgstr "Нисам успео да се повежем са оставом назива!\n"
 
-#: src/gns/gnunet-service-gns.c:556
-#: src/zonemaster/gnunet-service-zonemaster-monitor.c:572
-#: src/zonemaster/gnunet-service-zonemaster.c:1021
+#: src/gns/gnunet-service-gns.c:555
+#: src/zonemaster/gnunet-service-zonemaster.c:1435
 msgid "Could not connect to DHT!\n"
 msgstr "Не могу да се повежем на ДХТ!\n"
 
@@ -4121,31 +4122,31 @@ msgstr ""
 msgid "Label  contains `.' which is not allowed\n"
 msgstr ""
 
-#: src/gnsrecord/gnsrecord_misc.c:467
+#: src/gnsrecord/gnsrecord_misc.c:481
 msgid "Zone delegation record not allowed in apex."
 msgstr ""
 
-#: src/gnsrecord/gnsrecord_misc.c:475
+#: src/gnsrecord/gnsrecord_misc.c:489
 msgid "Zone delegation record set contains mutually exclusive records."
 msgstr ""
 
-#: src/gnsrecord/gnsrecord_misc.c:485
+#: src/gnsrecord/gnsrecord_misc.c:499
 msgid "Multiple REDIRECT records."
 msgstr ""
 
-#: src/gnsrecord/gnsrecord_misc.c:494 src/gnsrecord/gnsrecord_misc.c:520
+#: src/gnsrecord/gnsrecord_misc.c:508 src/gnsrecord/gnsrecord_misc.c:534
 msgid "Redirection record set contains mutually exclusive records."
 msgstr ""
 
-#: src/gnsrecord/gnsrecord_misc.c:501
+#: src/gnsrecord/gnsrecord_misc.c:515
 msgid "Redirection records not allowed in apex."
 msgstr ""
 
-#: src/gnsrecord/gnsrecord_misc.c:512
+#: src/gnsrecord/gnsrecord_misc.c:526
 msgid "Redirection records not allowed in apex.."
 msgstr ""
 
-#: src/gnsrecord/gnsrecord_misc.c:534
+#: src/gnsrecord/gnsrecord_misc.c:548
 msgid "Mutually exclusive records."
 msgstr ""
 
@@ -4260,33 +4261,33 @@ msgstr "Грешка писања „HELLO“-а у датотеку „%s“: %
 msgid "Modified %u addresses, wrote %u bytes\n"
 msgstr "Измењених адреса — %u \n"
 
-#: src/hello/hello.c:1111
+#: src/hello/hello.c:1089
 msgid "Failed to parse HELLO message: missing expiration time\n"
 msgstr "Нисам успео да обрадим „HELLO“ поруку: недостаје време истека\n"
 
-#: src/hello/hello.c:1121
+#: src/hello/hello.c:1099
 msgid "Failed to parse HELLO message: invalid expiration time\n"
 msgstr "Нисам успео да обрадим „HELLO“ поруку: неисправно време истека\n"
 
-#: src/hello/hello.c:1131
+#: src/hello/hello.c:1109
 msgid "Failed to parse HELLO message: malformed\n"
 msgstr "Нисам успео да обрадим „HELLO“ поруку: лоша\n"
 
-#: src/hello/hello.c:1143
+#: src/hello/hello.c:1121
 msgid "Failed to parse HELLO message: missing transport plugin\n"
 msgstr "Нисам успео да обрадим „HELLO“ поруку: недостаје прикључак преноса\n"
 
-#: src/hello/hello.c:1161
+#: src/hello/hello.c:1139
 #, fuzzy, c-format
 msgid "Plugin `%s' not found, skipping address\n"
 msgstr "Нисам нашао прикључак „%s“\n"
 
-#: src/hello/hello.c:1169
+#: src/hello/hello.c:1147
 #, c-format
 msgid "Plugin `%s' does not support URIs yet\n"
 msgstr "Прикључак „%s“ још не подржава УРИ-је\n"
 
-#: src/hello/hello.c:1184
+#: src/hello/hello.c:1162
 #, c-format
 msgid "Failed to parse `%s' as an address for plugin `%s'\n"
 msgstr "Нисам успео да обрадим „%s“ као адресу за прикључак „%s“\n"
@@ -4343,7 +4344,7 @@ msgid "# valid HELLOs downloaded from hostlist servers"
 msgstr "# исправни „HELLO“-и су преузети са сервера списка домаћина"
 
 #: src/hostlist/gnunet-daemon-hostlist_client.c:677
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1453
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1451
 msgid "# advertised hostlist URIs"
 msgstr "# рекламиране путање списка домаћина"
 
@@ -4397,7 +4398,7 @@ msgid "# hostlist downloads initiated"
 msgstr "# преузимања списка домаћина су започета"
 
 #: src/hostlist/gnunet-daemon-hostlist_client.c:1137
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1725
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1723
 msgid "# milliseconds between hostlist downloads"
 msgstr "# милисекунди између преузимања списка домаћина"
 
@@ -4411,68 +4412,68 @@ msgstr "Имам %u/%u везе.  Размотрићу преузимање сп
 msgid "# active connections"
 msgstr "# активних веза"
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1389
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1387
 #, c-format
 msgid "Loading saved hostlist entries from file `%s' \n"
 msgstr "Учитавам сачуване уносе списка домаћина из датотеке „%s“ \n"
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1394
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1392
 #, c-format
 msgid "Hostlist file `%s' does not exist\n"
 msgstr "Датотека списка домаћина „%s“ не постоји\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1405
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1403
 #, c-format
 msgid "Could not open file `%s' for reading to load hostlists: %s\n"
 msgstr ""
 "Не могу да отворим датотеку „%s“ за читање да утоварим спискове домаћина: "
 "%s\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1446
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1444
 #, c-format
 msgid "%u hostlist URIs loaded from file\n"
 msgstr "УРИ-и %u списка домаћина су учитани из датотеке\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1449
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1447
 msgid "# hostlist URIs read from file"
 msgstr "# УРИ-и списка домаћина су учитани из датотеке"
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1500
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1498
 #, c-format
 msgid "Could not open file `%s' for writing to save hostlists: %s\n"
 msgstr ""
 "Не могу да отворим датотеку „%s“ за писање да сачувам спискове домаћина: %s\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1507
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1505
 #, c-format
 msgid "Writing %u hostlist URIs to `%s'\n"
 msgstr "Уписујем УРИ-је %u списка домаћина у „%s“\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1540
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1559
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1538
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1557
 #, c-format
 msgid "Error writing hostlist URIs to file `%s'\n"
 msgstr "Грешка писања УРИ-а списка домаћина у датотеку „%s“\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1553
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1551
 msgid "# hostlist URIs written to file"
 msgstr "# УРИ-и списка домаћина су записани у датотеку"
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1654
-#: src/transport/plugin_transport_http_client.c:2294
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1652
+#: src/transport/plugin_transport_http_client.c:2288
 #, c-format
 msgid "Invalid proxy type: `%s', disabling proxy! Check configuration!\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1683
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1681
 msgid "Learning is enabled on this peer\n"
 msgstr "Учење је укључено на овом парњаку\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1696
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1694
 msgid "Learning is not enabled on this peer\n"
 msgstr "Учење није укључено на овом парњаку\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1710
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1708
 #, c-format
 msgid ""
 "Since learning is not enabled on this peer, hostlist file `%s' was removed\n"
@@ -4544,7 +4545,7 @@ msgid "# hostlist advertisements send"
 msgstr "# рекламе списка домаћина су послате"
 
 #: src/hostlist/gnunet-daemon-hostlist_server.c:674
-#: src/transport/gnunet-service-transport.c:2657
+#: src/transport/gnunet-service-transport.c:2652
 msgid "Could not access PEERINFO service.  Exiting.\n"
 msgstr "Не могу да приступим услузи ИНФО_ПАРЊАКА.  Излазим.\n"
 
@@ -4671,50 +4672,50 @@ msgstr ""
 msgid "Maintain egos"
 msgstr "Одржава егое"
 
-#: src/identity/gnunet-service-identity.c:502
+#: src/identity/gnunet-service-identity.c:501
 msgid "no default known"
 msgstr "основнст није позната"
 
-#: src/identity/gnunet-service-identity.c:527
+#: src/identity/gnunet-service-identity.c:526
 msgid "default configured, but ego unknown (internal error)"
 msgstr "основни је подешен, али его није познат (унутрашња грешка)"
 
-#: src/identity/gnunet-service-identity.c:620
-#: src/identity/gnunet-service-identity.c:895
-#: src/identity/gnunet-service-identity.c:1015
+#: src/identity/gnunet-service-identity.c:618
+#: src/identity/gnunet-service-identity.c:891
+#: src/identity/gnunet-service-identity.c:1010
 #, c-format
 msgid "Failed to write subsystem default identifier map to `%s'.\n"
 msgstr "Нисам успео да запишем основну мапу одредника подсистема у „%s“.\n"
 
-#: src/identity/gnunet-service-identity.c:630
+#: src/identity/gnunet-service-identity.c:628
 msgid "Unknown ego specified for service (internal error)"
 msgstr "Непознат его је наведен за услугу (унутрашња грешка)"
 
-#: src/identity/gnunet-service-identity.c:724
+#: src/identity/gnunet-service-identity.c:721
 msgid "identifier already in use for another ego"
 msgstr "одредник се већ користи за други его"
 
-#: src/identity/gnunet-service-identity.c:871
+#: src/identity/gnunet-service-identity.c:867
 msgid "target name already exists"
 msgstr "назив мете већ постоји"
 
-#: src/identity/gnunet-service-identity.c:913
-#: src/identity/gnunet-service-identity.c:1032
+#: src/identity/gnunet-service-identity.c:909
+#: src/identity/gnunet-service-identity.c:1027
 msgid "no matching ego found"
 msgstr "нисам нашао одговарајући его"
 
-#: src/identity/gnunet-service-identity.c:1130
+#: src/identity/gnunet-service-identity.c:1125
 #, c-format
 msgid "Failed to parse ego information in `%s'\n"
 msgstr "Нисам успео да обрадим податке егоа у „%s“\n"
 
-#: src/identity/gnunet-service-identity.c:1188
+#: src/identity/gnunet-service-identity.c:1183
 #, c-format
 msgid "Failed to parse subsystem identity configuration file `%s'\n"
 msgstr ""
 "Нисам успео да обрадим датотеку подешавања идентитета субсистема „%s“\n"
 
-#: src/identity/gnunet-service-identity.c:1197
+#: src/identity/gnunet-service-identity.c:1192
 #, c-format
 msgid "Failed to create directory `%s' for storing egos\n"
 msgstr "Нисам успео да направим директоријум „%s“ за смештајне егое\n"
@@ -4793,17 +4794,19 @@ msgstr "наводи јавни кључ зоне за претраживање"
 msgid "GNUnet zone manipulation tool"
 msgstr "Алат манипуслисања ГНУнет зоном"
 
-#: src/namecache/namecache_api.c:286
+#: src/namecache/namecache_api.c:285
 msgid "Namecache failed to cache block"
 msgstr "Остава назива није успела да смести у оставу блок"
 
-#: src/namecache/namecache_api.c:374
+#: src/namecache/namecache_api.c:373
 #, fuzzy
 msgid "Error communicating with namecache service"
 msgstr "Грешка у комуникацији са услугом ПОДАЦИ_ПАРЊАКА: %s\n"
 
 #: src/namecache/plugin_namecache_flat.c:118
 #: src/namecache/plugin_namecache_flat.c:253
+#: src/namestore/plugin_namestore_flat.c:176
+#: src/namestore/plugin_namestore_flat.c:424
 #: src/peerstore/plugin_peerstore_flat.c:380
 #: src/peerstore/plugin_peerstore_flat.c:542
 #, fuzzy, c-format
@@ -4811,6 +4814,7 @@ msgid "Unable to initialize file: %s.\n"
 msgstr "Не могу да покренем СКуЛајт: %s.\n"
 
 #: src/namecache/plugin_namecache_flat.c:129
+#: src/namestore/plugin_namestore_flat.c:187
 #: src/peerstore/plugin_peerstore_flat.c:395
 #, fuzzy, c-format
 msgid "Unable to get filesize: %s.\n"
@@ -4851,6 +4855,7 @@ msgid "the namestore plugin to work with, e.g. 'sqlite'"
 msgstr ""
 
 #: src/namestore/gnunet-namestore-dbtool.c:178
+#: src/namestore/gnunet-namestore-zonefile.c:750
 #, fuzzy
 msgid "GNUnet namestore database manipulation tool"
 msgstr "Алат манипуслисања ГНУнет зоном"
@@ -4958,6 +4963,47 @@ msgstr ""
 msgid "GNU Name System First-Come-First-Served name registration service"
 msgstr "Услуга регистрације назива Први Стиже Први Служи ГНУ Система Назива"
 
+#: src/namestore/gnunet-namestore-zonefile.c:329
+#, fuzzy, c-format
+msgid "Failed to store records...\n"
+msgstr "Смештај назива није успео да смести запис\n"
+
+#: src/namestore/gnunet-namestore-zonefile.c:437
+#: src/namestore/gnunet-namestore-zonefile.c:469
+#, fuzzy, c-format
+msgid "Name `%s' is too long\n"
+msgstr "Регуларни израз „%s“ је превелик!\n"
+
+#: src/namestore/gnunet-namestore-zonefile.c:515
+#, c-format
+msgid "You must provide $ORIGIN in your zonefile or via arguments (--zone)!\n"
+msgstr ""
+
+#: src/namestore/gnunet-namestore-zonefile.c:524
+#, c-format
+msgid "Only %u records per unique name supported.\n"
+msgstr ""
+
+#: src/namestore/gnunet-namestore-zonefile.c:586
+#, fuzzy, c-format
+msgid "Data `%s' invalid\n"
+msgstr "Кључ „%s“ је исправан\n"
+
+#: src/namestore/gnunet-namestore-zonefile.c:702
+#, fuzzy, c-format
+msgid "Failed to connect to NAMESTORE\n"
+msgstr "Нисам успео да се повежем са ГНС-ом\n"
+
+#: src/namestore/gnunet-namestore-zonefile.c:709
+#, fuzzy, c-format
+msgid "Failed to connect to IDENTITY\n"
+msgstr "Нисам успео да се повежем са ГНС-ом\n"
+
+#: src/namestore/gnunet-namestore-zonefile.c:735
+#: src/namestore/gnunet-namestore.c:1628
+msgid "name of the ego controlling the zone"
+msgstr "назив егоа који контролише зону"
+
 #: src/namestore/gnunet-namestore.c:340
 #, c-format
 msgid "Adding record failed: %s\n"
@@ -5155,21 +5201,22 @@ msgid ""
 msgstr ""
 "прави сеновити запис (важи само ако су сви остали записи исте врсте истекли"
 
-#: src/namestore/gnunet-namestore.c:1628
-msgid "name of the ego controlling the zone"
-msgstr "назив егоа који контролише зону"
-
-#: src/namestore/gnunet-service-namestore.c:1504
+#: src/namestore/gnunet-service-namestore.c:1673
 #, fuzzy
 msgid "Error normalizing name."
 msgstr "Грешка стварања тунела\n"
 
-#: src/namestore/gnunet-service-namestore.c:1522
+#: src/namestore/gnunet-service-namestore.c:1691
 #, fuzzy
 msgid "Error deserializing records."
 msgstr "Унутрашња грешка скенирања директоријума.\n"
 
-#: src/namestore/gnunet-service-namestore.c:1633
+#: src/namestore/gnunet-service-namestore.c:1811
+#, fuzzy
+msgid "Not records to delete."
+msgstr "вредност записа за додавање/брисање"
+
+#: src/namestore/gnunet-service-namestore.c:1819
 #, fuzzy
 msgid "Store failed"
 msgstr "# Неуспеси „СТАВИ“ смештаја података"
@@ -5182,24 +5229,39 @@ msgstr ""
 msgid "minimum expiration time we assume for imported records"
 msgstr ""
 
+#: src/namestore/plugin_namestore_flat.c:195
+#, c-format
+msgid "File too big to map: %llu bytes.\n"
+msgstr ""
+
+#: src/namestore/plugin_namestore_flat.c:219
+#, c-format
+msgid "Namestore database file `%s' malformed\n"
+msgstr ""
+
+#: src/namestore/plugin_namestore_flat.c:792
+#, fuzzy
+msgid "Flat file database running\n"
+msgstr "База података шаблона ради\n"
+
 #: src/namestore/plugin_namestore_sqlite.c:180
 #: src/namestore/plugin_namestore_sqlite.c:190
-#: src/namestore/plugin_namestore_sqlite.c:806
+#: src/namestore/plugin_namestore_sqlite.c:829
 #, fuzzy, c-format
 msgid "Failed to setup database with: `%s'\n"
 msgstr "Нисам успео да покренем „%s“ на „%s“\n"
 
-#: src/namestore/plugin_namestore_sqlite.c:797
+#: src/namestore/plugin_namestore_sqlite.c:820
 #, fuzzy, c-format
 msgid "Failed to drop database with: `%s'\n"
 msgstr "Нисам успео да покренем „%s“ на „%s“\n"
 
-#: src/namestore/plugin_namestore_sqlite.c:938
+#: src/namestore/plugin_namestore_sqlite.c:961
 #, fuzzy
 msgid "SQlite database running\n"
 msgstr "База података Скулајта ради\n"
 
-#: src/namestore/plugin_rest_namestore.c:1369
+#: src/namestore/plugin_rest_namestore.c:1414
 #, fuzzy
 msgid "Namestore REST API initialized\n"
 msgstr "Меш је покренут\n"
@@ -5520,7 +5582,7 @@ msgid "Show network size estimates from NSE service."
 msgstr "Показује процене величине мреже из НСЕ услуге."
 
 #: src/nse/gnunet-service-nse.c:1441
-#: src/revocation/gnunet-service-revocation.c:888 src/util/gnunet-scrypt.c:243
+#: src/revocation/gnunet-service-revocation.c:888 src/util/gnunet-scrypt.c:242
 msgid "Value is too large.\n"
 msgstr "Вредност је превелика.\n"
 
@@ -5597,19 +5659,19 @@ msgid "Print information about peers."
 msgstr "Исписује податке о парњацима."
 
 #: src/peerinfo-tool/gnunet-peerinfo_plugins.c:103
-#: src/transport/gnunet-service-transport_plugins.c:167
+#: src/transport/gnunet-service-transport_plugins.c:154
 #, c-format
 msgid "Starting transport plugins `%s'\n"
 msgstr "Покрећем прикључке преноса „%s“\n"
 
 #: src/peerinfo-tool/gnunet-peerinfo_plugins.c:107
-#: src/transport/gnunet-service-transport_plugins.c:172
+#: src/transport/gnunet-service-transport_plugins.c:159
 #, c-format
 msgid "Loading `%s' transport plugin\n"
 msgstr "Учитавам „%s“ прикључак преноса\n"
 
 #: src/peerinfo-tool/gnunet-peerinfo_plugins.c:127
-#: src/transport/gnunet-service-transport_plugins.c:207
+#: src/transport/gnunet-service-transport_plugins.c:194
 #, c-format
 msgid "Failed to load transport plugin for `%s'\n"
 msgstr "Нисам успео да учитам прикључак преноса за „%s“\n"
@@ -5670,7 +5732,7 @@ msgstr "Увозим „HELLO“-е из „%s“\n"
 msgid "Skipping import of included HELLOs\n"
 msgstr "Прескачем увоз укључених „HELLO“-а\n"
 
-#: src/peerinfo/peerinfo_api.c:217
+#: src/peerinfo/peerinfo_api.c:210
 msgid "Failed to receive response from `PEERINFO' service."
 msgstr "Нисам успео да примим одговор са услуге „PEERINFO“."
 
@@ -5692,7 +5754,7 @@ msgstr ""
 msgid "Received a malformed response from service."
 msgstr "Примих лош ДНС захтев од „%s“\n"
 
-#: src/peerstore/peerstore_api.c:790
+#: src/peerstore/peerstore_api.c:779
 msgid "Received a watch result for a non existing watch.\n"
 msgstr ""
 
@@ -5921,56 +5983,56 @@ msgstr "„%s“ услузи недостају поставке подешав
 msgid "Daemon to announce regular expressions for the peer using cadet."
 msgstr "Демон за најаву регуларних израза за парњака који користи меш."
 
-#: src/regex/gnunet-regex-profiler.c:1366
+#: src/regex/gnunet-regex-profiler.c:1365
 msgid "No configuration file given. Exiting\n"
 msgstr "Није дата датотека подешавања. Излазим\n"
 
-#: src/regex/gnunet-regex-profiler.c:1408
+#: src/regex/gnunet-regex-profiler.c:1407
 #: src/regex/gnunet-regex-simulation-profiler.c:631
 #, c-format
 msgid "No policy directory specified on command line. Exiting.\n"
 msgstr "На линији наредби није наведен директоријум политике. Излазим.\n"
 
-#: src/regex/gnunet-regex-profiler.c:1414
+#: src/regex/gnunet-regex-profiler.c:1413
 #: src/regex/gnunet-regex-simulation-profiler.c:639
 #, c-format
 msgid "Specified policies directory does not exist. Exiting.\n"
 msgstr "Наведени директоријум политике не постоји. Излазим.\n"
 
-#: src/regex/gnunet-regex-profiler.c:1422
+#: src/regex/gnunet-regex-profiler.c:1421
 #, c-format
 msgid "No files found in `%s'\n"
 msgstr "Нисам нашао датотеке у „%s“\n"
 
-#: src/regex/gnunet-regex-profiler.c:1431
+#: src/regex/gnunet-regex-profiler.c:1430
 msgid "No search strings file given. Exiting.\n"
 msgstr "Није дата датотека ниски претраге. Излазим.\n"
 
-#: src/regex/gnunet-regex-profiler.c:1451
+#: src/regex/gnunet-regex-profiler.c:1450
 msgid "Error loading search strings. Exiting.\n"
 msgstr "Грешка учитавања ниски претраге. Излазим.\n"
 
-#: src/regex/gnunet-regex-profiler.c:1540
+#: src/regex/gnunet-regex-profiler.c:1539
 msgid "name of the file for writing statistics"
 msgstr "назив датотеке за записивање статистике"
 
-#: src/regex/gnunet-regex-profiler.c:1547
+#: src/regex/gnunet-regex-profiler.c:1546
 msgid "wait TIMEOUT before ending the experiment"
 msgstr "чека ВРЕМЕ_ИСТЕКА пре завршавања експеримента"
 
-#: src/regex/gnunet-regex-profiler.c:1553
+#: src/regex/gnunet-regex-profiler.c:1552
 msgid "directory with policy files"
 msgstr "директоријум са датотекама политике"
 
-#: src/regex/gnunet-regex-profiler.c:1560
+#: src/regex/gnunet-regex-profiler.c:1559
 msgid "name of file with input strings"
 msgstr "назив датотеке са улазним нискама"
 
-#: src/regex/gnunet-regex-profiler.c:1567
+#: src/regex/gnunet-regex-profiler.c:1566
 msgid "name of file with hosts' names"
 msgstr "назив датотеке са називима домаћина"
 
-#: src/regex/gnunet-regex-profiler.c:1582
+#: src/regex/gnunet-regex-profiler.c:1581
 msgid "Profiler for regex"
 msgstr "Профилатор за регуларни израз"
 
@@ -5991,17 +6053,17 @@ msgstr "Профилатор за библиотеку регуларног из
 msgid "Regex `%s' is too long!\n"
 msgstr "Регуларни израз „%s“ је превелик!\n"
 
-#: src/regex/regex_api_search.c:212
+#: src/regex/regex_api_search.c:200
 #, fuzzy, c-format
 msgid "Search string `%s' is too long!\n"
 msgstr "Регуларни израз „%s“ је превелик!\n"
 
-#: src/rest/gnunet-rest-server.c:1367
+#: src/rest/gnunet-rest-server.c:1366
 #, fuzzy
 msgid "GNUnet REST server"
 msgstr "Алат ГНУнет ГНС решавача"
 
-#: src/rest/plugin_rest_config.c:429
+#: src/rest/plugin_rest_config.c:428
 msgid "CONFIG REST API initialized\n"
 msgstr ""
 
@@ -6202,15 +6264,15 @@ msgstr ""
 msgid "Get peers from biased stream"
 msgstr ""
 
-#: src/scalarproduct/gnunet-scalarproduct.c:229
+#: src/scalarproduct/gnunet-scalarproduct.c:228
 msgid "You must specify at least one message ID to check!\n"
 msgstr "Морате навести бар један ИБ поруке за проверу!\n"
 
-#: src/scalarproduct/gnunet-scalarproduct.c:237
+#: src/scalarproduct/gnunet-scalarproduct.c:236
 msgid "This program needs a session identifier for comparing vectors.\n"
 msgstr "Овом програму је потребан одредник сесије за поређење вектора.\n"
 
-#: src/scalarproduct/gnunet-scalarproduct.c:250
+#: src/scalarproduct/gnunet-scalarproduct.c:249
 #, c-format
 msgid ""
 "Tried to set initiator mode, as peer ID was given. However, `%s' is not a "
@@ -6219,37 +6281,37 @@ msgstr ""
 "Покушах да поставим режим покретача, јер је ИБ парњака био дат. Било како "
 "било, „%s“ није добар одредник парњака.\n"
 
-#: src/scalarproduct/gnunet-scalarproduct.c:268
+#: src/scalarproduct/gnunet-scalarproduct.c:267
 #, fuzzy
 msgid "Need elements to compute the scalarproduct, got none.\n"
 msgstr ""
 "Потребни су елементи за израчунавање производа вектора, нисам добио "
 "ниједан.\n"
 
-#: src/scalarproduct/gnunet-scalarproduct.c:291
+#: src/scalarproduct/gnunet-scalarproduct.c:290
 #, fuzzy, c-format
 msgid "Malformed input, could not parse `%s'\n"
 msgstr "Лоша политика прикључника „%s“\n"
 
-#: src/scalarproduct/gnunet-scalarproduct.c:309
+#: src/scalarproduct/gnunet-scalarproduct.c:308
 #, fuzzy, c-format
 msgid "Could not convert `%s' to int64_t.\n"
 msgstr "Не могу да претворим „%s“ у „int32_t“.\n"
 
-#: src/scalarproduct/gnunet-scalarproduct.c:339
+#: src/scalarproduct/gnunet-scalarproduct.c:338
 #, c-format
 msgid "Failed to initiate computation, were all keys unique?\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-scalarproduct.c:365
-#: src/scalarproduct/gnunet-scalarproduct.c:372
+#: src/scalarproduct/gnunet-scalarproduct.c:364
+#: src/scalarproduct/gnunet-scalarproduct.c:371
 msgid ""
 "A comma separated list of elements to compare as vector with our remote peer."
 msgstr ""
 "Зарезом раздвојен списак елемената за поређење као вектора са нашим удаљеним "
 "парњаком."
 
-#: src/scalarproduct/gnunet-scalarproduct.c:379
+#: src/scalarproduct/gnunet-scalarproduct.c:378
 msgid ""
 "[Optional] peer to calculate our scalarproduct with. If this parameter is "
 "not given, the service will wait for a remote peer to compute the request."
@@ -6257,16 +6319,16 @@ msgstr ""
 "[Изборни] парњак са којим израчунавамо наш скаларни производ. Ако тај "
 "параметар није дат, услуга ће чекати да удаљени парњак прорачуна захтев."
 
-#: src/scalarproduct/gnunet-scalarproduct.c:386
+#: src/scalarproduct/gnunet-scalarproduct.c:385
 msgid "Transaction ID shared with peer."
 msgstr "ИБ преноса дељеног са парњаком."
 
-#: src/scalarproduct/gnunet-scalarproduct.c:397
+#: src/scalarproduct/gnunet-scalarproduct.c:396
 msgid "Calculate the Vectorproduct with a GNUnet peer."
 msgstr "Израчунава Производ вектора са ГНУнет парњаком."
 
 #: src/scalarproduct/gnunet-service-scalarproduct-ecc_alice.c:1118
-#: src/scalarproduct/gnunet-service-scalarproduct-ecc_bob.c:1034
+#: src/scalarproduct/gnunet-service-scalarproduct-ecc_bob.c:1032
 #: src/scalarproduct/gnunet-service-scalarproduct_alice.c:1358
 #: src/scalarproduct/gnunet-service-scalarproduct_bob.c:1355
 #, fuzzy
@@ -6293,7 +6355,7 @@ msgstr "осетљивост"
 msgid "also profile decryption"
 msgstr "такође опис профила"
 
-#: src/set/gnunet-service-set.c:1916 src/seti/gnunet-service-seti.c:2467
+#: src/set/gnunet-service-set.c:1914 src/seti/gnunet-service-seti.c:2467
 #: src/setu/gnunet-service-setu.c:5389
 #, fuzzy
 msgid "Could not connect to CADET service\n"
@@ -6351,16 +6413,16 @@ msgstr "експеримент за коришћење"
 msgid "return intersection instead of delta"
 msgstr ""
 
-#: src/sq/sq.c:54
+#: src/sq/sq.c:47
 #, c-format
 msgid "Failure to bind %u-th SQL parameter\n"
 msgstr ""
 
-#: src/sq/sq.c:61
+#: src/sq/sq.c:54
 msgid "Failure in sqlite3_reset (!)\n"
 msgstr ""
 
-#: src/sq/sq.c:139
+#: src/sq/sq.c:126
 #, fuzzy, c-format
 msgid "Failed to reset sqlite statement with error: %s\n"
 msgstr "„%s“ није успело да реши метод '%s' са грешком: %s\n"
@@ -6592,57 +6654,57 @@ msgstr ""
 "Не могу да отворим „%s“ за писање статистике учитавања.  Не записујем у "
 "дневник статистику учитавања\n"
 
-#: src/testbed/gnunet-service-testbed_peers.c:1165
+#: src/testbed/gnunet-service-testbed_peers.c:1153
 #, c-format
 msgid "%s is stopped"
 msgstr "„%s“ је заустављен"
 
-#: src/testbed/gnunet-service-testbed_peers.c:1168
+#: src/testbed/gnunet-service-testbed_peers.c:1156
 #, c-format
 msgid "%s is starting"
 msgstr "„%s“ се покреће"
 
-#: src/testbed/gnunet-service-testbed_peers.c:1171
+#: src/testbed/gnunet-service-testbed_peers.c:1159
 #, c-format
 msgid "%s is stopping"
 msgstr "„%s“ се зауставља"
 
-#: src/testbed/gnunet-service-testbed_peers.c:1174
+#: src/testbed/gnunet-service-testbed_peers.c:1162
 #, c-format
 msgid "%s is starting already"
 msgstr "„%s“ се већ покреће"
 
-#: src/testbed/gnunet-service-testbed_peers.c:1177
+#: src/testbed/gnunet-service-testbed_peers.c:1165
 #, c-format
 msgid "%s is stopping already"
 msgstr "„%s“ се већ зауставља"
 
-#: src/testbed/gnunet-service-testbed_peers.c:1180
+#: src/testbed/gnunet-service-testbed_peers.c:1168
 #, c-format
 msgid "%s is started already"
 msgstr "„%s“ је већ покренут"
 
-#: src/testbed/gnunet-service-testbed_peers.c:1183
+#: src/testbed/gnunet-service-testbed_peers.c:1171
 #, c-format
 msgid "%s is stopped already"
 msgstr "„%s“ је већ заустављен"
 
-#: src/testbed/gnunet-service-testbed_peers.c:1186
+#: src/testbed/gnunet-service-testbed_peers.c:1174
 #, c-format
 msgid "%s service is not known to ARM"
 msgstr "„%s“ услуга није позната АУР-у"
 
-#: src/testbed/gnunet-service-testbed_peers.c:1189
+#: src/testbed/gnunet-service-testbed_peers.c:1177
 #, c-format
 msgid "%s service failed to start"
 msgstr "„%s“ услуга није успела да се покрене"
 
-#: src/testbed/gnunet-service-testbed_peers.c:1192
+#: src/testbed/gnunet-service-testbed_peers.c:1180
 #, c-format
 msgid "%s service can't be started because ARM is shutting down"
 msgstr "„%s“ услуга се не може покренути јер се АУР гаси"
 
-#: src/testbed/gnunet-service-testbed_peers.c:1194
+#: src/testbed/gnunet-service-testbed_peers.c:1182
 #, c-format
 msgid "%.s Unknown result code."
 msgstr "%.s Непознат код резултата."
@@ -6667,17 +6729,17 @@ msgstr ""
 msgid "Adding host %u failed with error: %s\n"
 msgstr "Додавање домаћина %u није успело са грешком: %s\n"
 
-#: src/testbed/testbed_api_hosts.c:429
+#: src/testbed/testbed_api_hosts.c:411
 #, c-format
 msgid "Hosts file %s not found\n"
 msgstr "Нисам нашао датотеку домаћина „%s“\n"
 
-#: src/testbed/testbed_api_hosts.c:438
+#: src/testbed/testbed_api_hosts.c:420
 #, c-format
 msgid "Hosts file %s has no data\n"
 msgstr "Датотека домаћина „%s“ нема података\n"
 
-#: src/testbed/testbed_api_hosts.c:447
+#: src/testbed/testbed_api_hosts.c:429
 #, c-format
 msgid "Hosts file %s cannot be read\n"
 msgstr "Не могу да прочитам датотеку домаћина „%s“\n"
@@ -6691,36 +6753,36 @@ msgstr "Повезивање контролера није успело. Изл
 msgid "Host registration failed for a host. Error: %s\n"
 msgstr "Регистрација домаћина није успела за домаћина. Грешка: %s\n"
 
-#: src/testbed/testbed_api_testbed.c:1065
+#: src/testbed/testbed_api_testbed.c:1060
 msgid "Controller crash detected. Shutting down.\n"
 msgstr "Урушавање контролера је откривено. Гасим се.\n"
 
-#: src/testbed/testbed_api_testbed.c:1154
+#: src/testbed/testbed_api_testbed.c:1149
 #, c-format
 msgid "Host %s cannot start testbed\n"
 msgstr "Домаћин „%s“ не може да покрене пробно место\n"
 
-#: src/testbed/testbed_api_testbed.c:1158
+#: src/testbed/testbed_api_testbed.c:1153
 msgid "Testbed cannot be started on localhost\n"
 msgstr "Пробно место се не може покренути на локалном домаћину\n"
 
-#: src/testbed/testbed_api_testbed.c:1196
+#: src/testbed/testbed_api_testbed.c:1191
 msgid "Cannot start the master controller"
 msgstr "Не могу да покренем главног контролора"
 
-#: src/testbed/testbed_api_testbed.c:1214
+#: src/testbed/testbed_api_testbed.c:1209
 msgid "Shutting down testbed due to timeout while setup.\n"
 msgstr "Гасим пробно место због истека времена приликом подешавања.\n"
 
-#: src/testbed/testbed_api_testbed.c:1276
+#: src/testbed/testbed_api_testbed.c:1271
 msgid "No hosts loaded. Need at least one host\n"
 msgstr "Ниједан домаћин није учитан. Потребан је барем један домаћин\n"
 
-#: src/testbed/testbed_api_testbed.c:1301
+#: src/testbed/testbed_api_testbed.c:1296
 msgid "Specified topology must be supported by testbed"
 msgstr "Наведени размештај мора бити подржан пробним местом"
 
-#: src/testbed/testbed_api_testbed.c:1357
+#: src/testbed/testbed_api_testbed.c:1352
 #, c-format
 msgid ""
 "Maximum number of edges a peer can have in a scale free topology cannot be "
@@ -6729,7 +6791,7 @@ msgstr ""
 "Највећи број ивица које парњак може имати у слободном размештају лествице не "
 "може бити већи од %u.  Дато је „%s = %llu“"
 
-#: src/testbed/testbed_api_testbed.c:1374
+#: src/testbed/testbed_api_testbed.c:1369
 #, c-format
 msgid ""
 "The number of edges that can established when adding a new node to scale "
@@ -6738,44 +6800,44 @@ msgstr ""
 "Број ивица које се могу успоставити приликом додавања новог чвора у "
 "слободном размештају лествице не може бити већи од %u.  Дато је „%s = %llu“"
 
-#: src/testbed/testbed_api_topology.c:1033 src/testing/testing.c:2753
+#: src/testbed/testbed_api_topology.c:1021 src/testing/testing.c:2693
 #, c-format
 msgid "Topology file %s not found\n"
 msgstr "Нисам нашао датотеку размештаја „%s“\n"
 
-#: src/testbed/testbed_api_topology.c:1041 src/testing/testing.c:2761
+#: src/testbed/testbed_api_topology.c:1029 src/testing/testing.c:2701
 #, c-format
 msgid "Topology file %s has no data\n"
 msgstr "Датотека размештаја „%s“ нема података\n"
 
-#: src/testbed/testbed_api_topology.c:1049 src/testing/testing.c:2769
+#: src/testbed/testbed_api_topology.c:1037 src/testing/testing.c:2709
 #, c-format
 msgid "Topology file %s cannot be read\n"
 msgstr "Не могу да прочитам датотеку размештаја „%s“\n"
 
-#: src/testbed/testbed_api_topology.c:1071
+#: src/testbed/testbed_api_topology.c:1059
 #, c-format
 msgid "Failed to read peer index from toology file: %s"
 msgstr "Нисам успео да прочитам индекс парњака из датотеке размештаја: %s"
 
-#: src/testbed/testbed_api_topology.c:1080
-#: src/testbed/testbed_api_topology.c:1105
+#: src/testbed/testbed_api_topology.c:1068
+#: src/testbed/testbed_api_topology.c:1093
 #, c-format
 msgid "Value in given topology file: %s out of range\n"
 msgstr "Вредност у датој датотеци размештаја: „%s“ је ван опсега\n"
 
-#: src/testbed/testbed_api_topology.c:1086
-#: src/testbed/testbed_api_topology.c:1111
+#: src/testbed/testbed_api_topology.c:1074
+#: src/testbed/testbed_api_topology.c:1099
 #, c-format
 msgid "Failed to read peer index from topology file: %s"
 msgstr "Нисам успео да прочитам индекс парњака из датотеке размештаја: %s"
 
-#: src/testbed/testbed_api_topology.c:1092
-#: src/testbed/testbed_api_topology.c:1117
+#: src/testbed/testbed_api_topology.c:1080
+#: src/testbed/testbed_api_topology.c:1105
 msgid "Topology file needs more peers than given ones\n"
 msgstr "Датотеци размештаја је потребно више парњака од једног датог\n"
 
-#: src/testbed/testbed_api_topology.c:1153
+#: src/testbed/testbed_api_topology.c:1141
 #, fuzzy, c-format
 msgid "Ignoring to connect peer %lu to peer %lu\n"
 msgstr "Занемарујем да повежем парњака %u са парњаком %u\n"
@@ -6881,7 +6943,7 @@ msgstr "Нисам успео да запишем датотеку подеша
 msgid "Failed to start `%s': %s\n"
 msgstr "Нисам успео да покренем „%s“: %s\n"
 
-#: src/testing/testing.c:1694
+#: src/testing/testing.c:1646
 #, c-format
 msgid "Failed to load configuration from %s\n"
 msgstr "Нисам успео да учитам подешавање за „%s“\n"
@@ -6964,7 +7026,7 @@ msgstr ""
 #: src/transport/gnunet-communicator-tcp.c:3347
 #: src/transport/gnunet-communicator-udp.c:3871
 #: src/transport/gnunet-service-tng.c:11334
-#: src/transport/gnunet-service-transport.c:2622
+#: src/transport/gnunet-service-transport.c:2617
 msgid "Transport service is lacking key configuration settings. Exiting.\n"
 msgstr "Услузи преноса недостају поставке подешавања кључа. Излазим.\n"
 
@@ -7027,12 +7089,12 @@ msgstr "# прекиди везе због списка забрана"
 msgid "Disallowing connection to peer `%s' on transport %s\n"
 msgstr "Недостаје функција „%s“ у прикључку преноса за „%s“\n"
 
-#: src/transport/gnunet-service-transport.c:2547
+#: src/transport/gnunet-service-transport.c:2542
 #, c-format
 msgid "Adding blacklisting entry for peer `%s'\n"
 msgstr "Додајем унос списка забрана за парњака „%s“\n"
 
-#: src/transport/gnunet-service-transport.c:2556
+#: src/transport/gnunet-service-transport.c:2551
 #, c-format
 msgid "Adding blacklisting entry for peer `%s':`%s'\n"
 msgstr "Додајем унос списка забрана за парњака „%s“:„%s“\n"
@@ -7059,7 +7121,7 @@ msgid "# disconnects due to quota of 0"
 msgstr "# прекиди везе због квоте 0"
 
 #: src/transport/gnunet-service-transport_neighbours.c:1341
-#: src/transport/gnunet-service-transport_neighbours.c:1817
+#: src/transport/gnunet-service-transport_neighbours.c:1807
 msgid "# bytes in message queue for other peers"
 msgstr "# бајтови у реду поруке за друге парњаке"
 
@@ -7133,152 +7195,152 @@ msgstr "# повређивање квоте пропусног опсега од
 msgid "# ms throttling suggested"
 msgstr "# ms пригушење се саветује"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1886
+#: src/transport/gnunet-service-transport_neighbours.c:1876
 #, fuzzy, c-format
 msgid "Failed to send SYN message to peer `%s'\n"
 msgstr "Нисам успео да обрадим долазну поруку са помоћника „%s“\n"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1912
+#: src/transport/gnunet-service-transport_neighbours.c:1902
 #, fuzzy
 msgid "# Failed attempts to switch addresses (failed to send SYN CONT)"
 msgstr ""
 "# Нису успели покушаји за пребацивање адреса (нисам успео да пошаљем "
 "ПОВЕЖИ_СЕ)"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1953
+#: src/transport/gnunet-service-transport_neighbours.c:1943
 #, fuzzy
 msgid "# SYN messages sent"
 msgstr "# ПРЕКИНИ_ВЕЗУ поруке су послате"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1970
+#: src/transport/gnunet-service-transport_neighbours.c:1960
 #, fuzzy, c-format
 msgid "Failed to transmit SYN message to %s\n"
 msgstr "Нисам успео да пренесем поруку ПОВЕЖИ_СЕ путем прикључка ка „%s“\n"
 
-#: src/transport/gnunet-service-transport_neighbours.c:2006
+#: src/transport/gnunet-service-transport_neighbours.c:1996
 #, fuzzy
 msgid "# Failed attempts to switch addresses (failed to send SYN)"
 msgstr ""
 "# Нису успели покушаји за пребацивање адреса (нисам успео да пошаљем "
 "ПОВЕЖИ_СЕ)"
 
-#: src/transport/gnunet-service-transport_neighbours.c:2077
+#: src/transport/gnunet-service-transport_neighbours.c:2067
 #, fuzzy, c-format
 msgid "Failed to send SYN_ACK message to peer `%s' using address `%s'\n"
 msgstr ""
 "Нисам успео да пошаљем поруку ПОВЕЖИ_АЦК парњаку „%s“ користећи адресу „%s“ "
 "сесије %p\n"
 
-#: src/transport/gnunet-service-transport_neighbours.c:2132
+#: src/transport/gnunet-service-transport_neighbours.c:2122
 #, fuzzy
 msgid "# SYN_ACK messages sent"
 msgstr "# ПОВЕЖИ_АЦК поруке су послате"
 
-#: src/transport/gnunet-service-transport_neighbours.c:2150
+#: src/transport/gnunet-service-transport_neighbours.c:2140
 #, fuzzy, c-format
 msgid "Failed to transmit SYN_ACK message to %s\n"
 msgstr "Нисам успео да пренесем поруку ПОВЕЖИ_АЦК путем прикључка ка „%s“\n"
 
-#: src/transport/gnunet-service-transport_neighbours.c:2314
+#: src/transport/gnunet-service-transport_neighbours.c:2304
 #, fuzzy
 msgid "# SYN messages received"
 msgstr "# ПИНГ поруке су примљене"
 
-#: src/transport/gnunet-service-transport_neighbours.c:2320
+#: src/transport/gnunet-service-transport_neighbours.c:2310
 #, fuzzy, c-format
 msgid "SYN request from peer `%s' ignored due impending shutdown\n"
 msgstr "ПОВЕЖИ_СЕ захтев са парњака „%s“ је занемарен због неминовног гашења\n"
 
-#: src/transport/gnunet-service-transport_neighbours.c:2731
+#: src/transport/gnunet-service-transport_neighbours.c:2721
 msgid "# Attempts to switch addresses"
 msgstr "# Покушаји за пребацивање адреса"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3244
+#: src/transport/gnunet-service-transport_neighbours.c:3227
 #, fuzzy
 msgid "# SYN_ACK messages received"
 msgstr "# поруке СЕСИЈА_АЦК су примљене"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3252
+#: src/transport/gnunet-service-transport_neighbours.c:3235
 #, fuzzy
 msgid "# unexpected SYN_ACK messages (no peer)"
 msgstr "# неочекиване ПОВЕЖИ_АЦК поруке (нема парњака)"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3272
-#: src/transport/gnunet-service-transport_neighbours.c:3300
+#: src/transport/gnunet-service-transport_neighbours.c:3255
+#: src/transport/gnunet-service-transport_neighbours.c:3283
 #, fuzzy
 msgid "# unexpected SYN_ACK messages (not ready)"
 msgstr "# неочекиване ПОВЕЖИ_АЦК поруке (нису спремне)"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3315
+#: src/transport/gnunet-service-transport_neighbours.c:3298
 #, fuzzy
 msgid "# unexpected SYN_ACK messages (waiting on ATS)"
 msgstr "# неочекиване ПОВЕЖИ_АЦК поруке (чекам на АТС)"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3345
+#: src/transport/gnunet-service-transport_neighbours.c:3328
 msgid "# Successful attempts to switch addresses"
 msgstr "# Покушаји за пребацивање адреса су успели"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3359
+#: src/transport/gnunet-service-transport_neighbours.c:3342
 #, fuzzy
 msgid "# unexpected SYN_ACK messages (disconnecting)"
 msgstr "# неочекиване ПОВЕЖИ_АЦК поруке (прекидам везу)"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3548
+#: src/transport/gnunet-service-transport_neighbours.c:3531
 #, fuzzy
 msgid "# ACK messages received"
 msgstr "# ПОВЕЖИ_АЦК поруке су примљене"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3582
+#: src/transport/gnunet-service-transport_neighbours.c:3565
 #, fuzzy
 msgid "# unexpected ACK messages"
 msgstr "# неочекиване СЕСИЈА_АЦК поруке"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3672
+#: src/transport/gnunet-service-transport_neighbours.c:3648
 #, fuzzy
 msgid "# quota messages ignored (malformed)"
 msgstr "# поруке прекида везе су занемарене(лоше су)"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3679
+#: src/transport/gnunet-service-transport_neighbours.c:3655
 #, fuzzy
 msgid "# QUOTA messages received"
 msgstr "# ПОНГ поруке су примљене"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3722
+#: src/transport/gnunet-service-transport_neighbours.c:3698
 msgid "# disconnect messages ignored (malformed)"
 msgstr "# поруке прекида везе су занемарене(лоше су)"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3729
+#: src/transport/gnunet-service-transport_neighbours.c:3705
 msgid "# DISCONNECT messages received"
 msgstr "# ПРЕКИНИ_ВЕЗУ поруке су примљене"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3742
+#: src/transport/gnunet-service-transport_neighbours.c:3718
 msgid "# disconnect messages ignored (timestamp)"
 msgstr "# поруке прекида везе су занемарене(временска ознака)"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3879
+#: src/transport/gnunet-service-transport_neighbours.c:3855
 msgid "# disconnected from peer upon explicit request"
 msgstr "# прекинута је веза са парњаком услед изричитог захтева"
 
-#: src/transport/gnunet-service-transport_plugins.c:157
+#: src/transport/gnunet-service-transport_plugins.c:144
 msgid "Transport service is lacking NEIGHBOUR_LIMIT option.\n"
 msgstr "Услузи преноса недостаје опција ОГРАНИЧЕЊЕ_СУСЕДА.\n"
 
-#: src/transport/gnunet-service-transport_plugins.c:222
-#: src/transport/gnunet-service-transport_plugins.c:230
-#: src/transport/gnunet-service-transport_plugins.c:238
-#: src/transport/gnunet-service-transport_plugins.c:246
-#: src/transport/gnunet-service-transport_plugins.c:254
-#: src/transport/gnunet-service-transport_plugins.c:262
-#: src/transport/gnunet-service-transport_plugins.c:270
-#: src/transport/gnunet-service-transport_plugins.c:278
-#: src/transport/gnunet-service-transport_plugins.c:286
-#: src/transport/gnunet-service-transport_plugins.c:294
-#: src/transport/gnunet-service-transport_plugins.c:302
+#: src/transport/gnunet-service-transport_plugins.c:209
+#: src/transport/gnunet-service-transport_plugins.c:217
+#: src/transport/gnunet-service-transport_plugins.c:225
+#: src/transport/gnunet-service-transport_plugins.c:233
+#: src/transport/gnunet-service-transport_plugins.c:241
+#: src/transport/gnunet-service-transport_plugins.c:249
+#: src/transport/gnunet-service-transport_plugins.c:257
+#: src/transport/gnunet-service-transport_plugins.c:265
+#: src/transport/gnunet-service-transport_plugins.c:273
+#: src/transport/gnunet-service-transport_plugins.c:281
+#: src/transport/gnunet-service-transport_plugins.c:289
 #, c-format
 msgid "Missing function `%s' in transport plugin for `%s'\n"
 msgstr "Недостаје функција „%s“ у прикључку преноса за „%s“\n"
 
-#: src/transport/gnunet-service-transport_plugins.c:309
+#: src/transport/gnunet-service-transport_plugins.c:296
 #, c-format
 msgid "Did not load plugin `%s' due to missing functions\n"
 msgstr "Не учитавам прикључак „%s“ услед недостајућих функција\n"
@@ -7564,7 +7626,7 @@ msgstr ""
 msgid "send data for benchmarking to the other peer (until CTRL-C)"
 msgstr "шаље податке за оцењивање другим парњацима (све до КТРЛ-Ц)"
 
-#: src/transport/plugin_transport_http_client.c:1488
+#: src/transport/plugin_transport_http_client.c:1482
 #: src/transport/plugin_transport_http_server.c:2331
 #: src/transport/plugin_transport_http_server.c:3562
 #: src/transport/plugin_transport_tcp.c:3773
@@ -7572,26 +7634,26 @@ msgstr "шаље податке за оцењивање другим парња
 msgid "TCP_STEALTH not supported on this platform.\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_client.c:2134
+#: src/transport/plugin_transport_http_client.c:2128
 #, c-format
 msgid "Could not initialize curl multi handle, failed to start %s plugin!\n"
 msgstr ""
 "Не могу да покренем мулти ручку „curl“-а, нисам успео да покренем „%s“ "
 "прикључак!\n"
 
-#: src/transport/plugin_transport_http_client.c:2183
+#: src/transport/plugin_transport_http_client.c:2177
 #: src/transport/plugin_transport_http_server.c:3276
 #, c-format
 msgid "Shutting down plugin `%s'\n"
 msgstr "Гасим прикључак „%s“\n"
 
-#: src/transport/plugin_transport_http_client.c:2200
+#: src/transport/plugin_transport_http_client.c:2194
 #: src/transport/plugin_transport_http_server.c:3346
 #, c-format
 msgid "Shutdown for plugin `%s' complete\n"
 msgstr "Гашење за прикључак „%s“ је завршено\n"
 
-#: src/transport/plugin_transport_http_client.c:2234
+#: src/transport/plugin_transport_http_client.c:2228
 #, fuzzy, c-format
 msgid "Maximum number of requests is %u\n"
 msgstr "Највећи број веза је %u\n"
@@ -8010,7 +8072,7 @@ msgstr "„%s“ није успело за прикључник %d (%s): адр
 msgid "`%s' failed for `%s': address already in use\n"
 msgstr "„%s“ није успело за „%s“: адреса је већ у употреби\n"
 
-#: src/transport/tcp_server_legacy.c:897
+#: src/transport/tcp_server_legacy.c:892
 #, c-format
 msgid ""
 "Processing code for message of type %u did not call "
@@ -8239,20 +8301,20 @@ msgstr "НИШТА"
 msgid "INVALID"
 msgstr "НЕИСПРАВНО"
 
-#: src/util/common_logging.c:1396
+#: src/util/common_logging.c:1360
 msgid "unknown address"
 msgstr "непозната адреса"
 
-#: src/util/common_logging.c:1441
+#: src/util/common_logging.c:1405
 msgid "invalid address"
 msgstr "неисправна адреса"
 
-#: src/util/common_logging.c:1453
+#: src/util/common_logging.c:1417
 #, c-format
 msgid "Configuration fails to specify option `%s' in section `%s'!\n"
 msgstr "Подешавање није успело да наведе опцију „%s“ у одељку „%s“!\n"
 
-#: src/util/common_logging.c:1468
+#: src/util/common_logging.c:1432
 #, c-format
 msgid ""
 "Configuration specifies invalid value for option `%s' in section `%s': %s\n"
@@ -8409,12 +8471,12 @@ msgstr "Не могу да се вежем ни за један прикључн
 msgid "Received DNS response that is too small (%u bytes)\n"
 msgstr "Примих ДНС одговор који је премали (%u бајта)"
 
-#: src/util/dnsstub.c:508
+#: src/util/dnsstub.c:503
 #, fuzzy, c-format
 msgid "Failed to send DNS request to %s: %s\n"
 msgstr "Нисам успео да пошаљем ДНС захтев за %s\n"
 
-#: src/util/dnsstub.c:513
+#: src/util/dnsstub.c:508
 #, c-format
 msgid "Sent DNS request to %s\n"
 msgstr "Послао сам ДНС захтев за %s\n"
@@ -8801,28 +8863,28 @@ msgstr "обавља повратну претрагу"
 msgid "Use built-in GNUnet stub resolver"
 msgstr "Користи уграђеног заменског решавача ГНУнет-а"
 
-#: src/util/gnunet-scrypt.c:215
+#: src/util/gnunet-scrypt.c:214
 #, c-format
 msgid "Loading hostkey from `%s' failed.\n"
 msgstr "Учитавање кључа домаћина из „%s“ није успело.\n"
 
-#: src/util/gnunet-scrypt.c:281
+#: src/util/gnunet-scrypt.c:280
 msgid "number of bits to require for the proof of work"
 msgstr "број битова за тражење доказивања о раду"
 
-#: src/util/gnunet-scrypt.c:287
+#: src/util/gnunet-scrypt.c:286
 msgid "file with private key, otherwise default is used"
 msgstr "датотека са личним кључем, у супротном користи се основна"
 
-#: src/util/gnunet-scrypt.c:293
+#: src/util/gnunet-scrypt.c:292
 msgid "file with proof of work, otherwise default is used"
 msgstr "датотека са доказом о раду, у супротном користи се основна"
 
-#: src/util/gnunet-scrypt.c:299
+#: src/util/gnunet-scrypt.c:298
 msgid "time to wait between calculations"
 msgstr "време за чекање између прорачуна"
 
-#: src/util/gnunet-scrypt.c:313
+#: src/util/gnunet-scrypt.c:312
 msgid "Manipulate GNUnet proof of work files"
 msgstr "Управља ГНУнет датотекама доказа о раду"
 
@@ -8854,17 +8916,17 @@ msgstr "Није познат руковалац за подсистем „%s
 msgid "Perform default-actions for GNUnet URIs"
 msgstr "Обавља основне радње за путање ГНУнет-а"
 
-#: src/util/helper.c:323
+#: src/util/helper.c:306
 #, c-format
 msgid "Error reading from `%s': %s\n"
 msgstr "Грешка читања из „%s“: %s\n"
 
-#: src/util/helper.c:375
+#: src/util/helper.c:358
 #, c-format
 msgid "Failed to parse inbound message from helper `%s'\n"
 msgstr "Нисам успео да обрадим долазну поруку са помоћника „%s“\n"
 
-#: src/util/helper.c:606
+#: src/util/helper.c:573
 #, c-format
 msgid "Error writing to `%s': %s\n"
 msgstr "Грешка писања у „%s“: %s\n"
@@ -8875,7 +8937,7 @@ msgid "Unable to shorten unix path `%s' while keeping 
name unique\n"
 msgstr ""
 "Не могу да скратим јуникс путању „%s“ док задржавам назив јединственим\n"
 
-#: src/util/network.c:1307
+#: src/util/network.c:1284
 #, c-format
 msgid ""
 "Fatal internal logic error, process hangs in `%s' (abort with CTRL-C)!\n"
@@ -8883,7 +8945,7 @@ msgstr ""
 "Кобна унутрашња логичка грешка, процес се заплео у „%s“ (прекините са КТРЛ-"
 "Ц)!\n"
 
-#: src/util/os_installation.c:420
+#: src/util/os_installation.c:415
 #, c-format
 msgid ""
 "Could not determine installation path for %s.  Set `%s' environment "
@@ -8892,12 +8954,12 @@ msgstr ""
 "Не могу да одредим путању инсталирања за „%s“.  Поставите „%s“ променљиву "
 "окружења.\n"
 
-#: src/util/os_installation.c:791
+#: src/util/os_installation.c:786
 #, c-format
 msgid "Could not find binary `%s' in PATH!\n"
 msgstr "Не могу да нађем извршну „%s“ у ПУТАЊИ!\n"
 
-#: src/util/os_installation.c:824
+#: src/util/os_installation.c:819
 #, c-format
 msgid "Binary `%s' exists, but is not SUID\n"
 msgstr ""
@@ -8941,7 +9003,7 @@ msgstr "Лоша датотека подешавања „%s“, излазим
 msgid "Malformed configuration. Exiting ...\n"
 msgstr "Лоше подешавање, излазим ...\n"
 
-#: src/util/regex.c:139
+#: src/util/regex.c:123
 #, c-format
 msgid "Bad mask: %d\n"
 msgstr "Лоша маска: %d\n"
@@ -9257,31 +9319,21 @@ msgstr "услуга се нуди путем УДП-ом"
 msgid "Setup tunnels via VPN."
 msgstr "Поставља тунеле путем ВПН-а."
 
-#: src/zonemaster/gnunet-service-zonemaster-monitor.c:249
-#: src/zonemaster/gnunet-service-zonemaster.c:364
+#: src/zonemaster/gnunet-service-zonemaster.c:521
 #, c-format
 msgid "Failed to replicate block in namecache: %s\n"
 msgstr "Нисам успео да реплицирам блок у остави назива: %s\n"
 
-#: src/zonemaster/gnunet-service-zonemaster-monitor.c:529
-#: src/zonemaster/gnunet-service-zonemaster.c:969
+#: src/zonemaster/gnunet-service-zonemaster.c:1383
 msgid "Failed to connect to the namestore!\n"
 msgstr "Нисам успео да се повежем са смештајем назива!\n"
 
-#: src/zonemaster/gnunet-service-zonemaster-monitor.c:550
-msgid "Namecache is disabled!\n"
-msgstr ""
-
 #, fuzzy
 #~ msgid "UDP port to listen on for inbound DNS requests; default: 2853"
 #~ msgstr ""
 #~ "УДП прикључник на коме ће ослушкивати за долазним ДНС захтевима; основно: "
 #~ "53"
 
-#, fuzzy
-#~ msgid "Flat file database running\n"
-#~ msgstr "База података шаблона ради\n"
-
 #, fuzzy, c-format
 #~ msgid "Invalid DID `%s'\n"
 #~ msgstr "Неисправан УРИ „%s“\n"
diff --git a/po/sv.po b/po/sv.po
index b628af97a..2992f6d9e 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: GNUnet 0.7.0b\n"
 "Report-Msgid-Bugs-To: gnunet-developers@mail.gnu.org\n"
-"POT-Creation-Date: 2022-10-16 18:47+0900\n"
+"POT-Creation-Date: 2022-10-21 13:20+0900\n"
 "PO-Revision-Date: 2006-01-21 17:16+0100\n"
 "Last-Translator: Daniel Nylander <po@danielnylander.se>\n"
 "Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n"
@@ -16,7 +16,10 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: src/abd/gnunet-abd.c:392 src/namestore/gnunet-namestore.c:1245
+#: src/abd/gnunet-abd.c:392 src/namestore/gnunet-namestore-zonefile.c:193
+#: src/namestore/gnunet-namestore-zonefile.c:652
+#: src/namestore/gnunet-namestore-zonefile.c:673
+#: src/namestore/gnunet-namestore.c:1245
 #, fuzzy, c-format
 msgid "Ego `%s' not known to identity service\n"
 msgstr "\"%s\": okänd tjänst: %s\n"
@@ -165,16 +168,16 @@ msgstr "Kunde inte spara konfigurationsfil \"%s\":"
 msgid "Failed to remove servicehome directory %s\n"
 msgstr "Filformatsfel (inte en GNUnet-katalog?)\n"
 
-#: src/arm/gnunet-arm.c:229 src/testbed/gnunet-service-testbed_peers.c:1144
+#: src/arm/gnunet-arm.c:229 src/testbed/gnunet-service-testbed_peers.c:1132
 msgid "Message was sent successfully"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:232 src/testbed/gnunet-service-testbed_peers.c:1147
+#: src/arm/gnunet-arm.c:232 src/testbed/gnunet-service-testbed_peers.c:1135
 #, fuzzy
 msgid "We disconnected from ARM before we could send a request"
 msgstr "# av anslutna parter"
 
-#: src/arm/gnunet-arm.c:234 src/testbed/gnunet-service-testbed_peers.c:1149
+#: src/arm/gnunet-arm.c:234 src/testbed/gnunet-service-testbed_peers.c:1137
 #, fuzzy
 msgid "Unknown request status"
 msgstr "Okänd operation \"%s\"\n"
@@ -1377,165 +1380,165 @@ msgstr "GNUnet-konfiguration"
 msgid "Core service of `%s' ready.\n"
 msgstr "\"%s\" är inte en fil.\n"
 
-#: src/core/gnunet-service-core_kx.c:512
+#: src/core/gnunet-service-core_kx.c:513
 msgid "# bytes encrypted"
 msgstr "# byte krypterade"
 
-#: src/core/gnunet-service-core_kx.c:570
+#: src/core/gnunet-service-core_kx.c:571
 msgid "# bytes decrypted"
 msgstr "# byte dekrypterade"
 
-#: src/core/gnunet-service-core_kx.c:667
+#: src/core/gnunet-service-core_kx.c:668
 #, fuzzy
 msgid "# PAYLOAD dropped (out of order)"
 msgstr "# byte kastade via UDP (utgående)"
 
-#: src/core/gnunet-service-core_kx.c:719
+#: src/core/gnunet-service-core_kx.c:720
 msgid "# key exchanges initiated"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:775
+#: src/core/gnunet-service-core_kx.c:776
 msgid "# key exchanges stopped"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:807
+#: src/core/gnunet-service-core_kx.c:808
 #, fuzzy
 msgid "# PING messages transmitted"
 msgstr "# PING-meddelanden skapade"
 
-#: src/core/gnunet-service-core_kx.c:866
+#: src/core/gnunet-service-core_kx.c:867
 msgid "# old ephemeral keys ignored"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:880
+#: src/core/gnunet-service-core_kx.c:881
 #, fuzzy
 msgid "# duplicate ephemeral keys ignored"
 msgstr "# krypterade PONG-meddelanden mottagna"
 
-#: src/core/gnunet-service-core_kx.c:915
+#: src/core/gnunet-service-core_kx.c:916
 #, fuzzy
 msgid "# EPHEMERAL_KEYs rejected (bad signature)"
 msgstr "# PING-meddelanden skapade"
 
-#: src/core/gnunet-service-core_kx.c:933
+#: src/core/gnunet-service-core_kx.c:934
 #, c-format
 msgid ""
 "EPHEMERAL_KEY from peer `%s' rejected as its validity range does not match "
 "our system time (%llu not in [%llu,%llu]).\n"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:940
+#: src/core/gnunet-service-core_kx.c:941
 #, fuzzy
 msgid "# EPHEMERAL_KEY messages rejected due to time"
 msgstr "# PING-meddelanden skapade"
 
-#: src/core/gnunet-service-core_kx.c:958
+#: src/core/gnunet-service-core_kx.c:959
 #, fuzzy
 msgid "# valid ephemeral keys received"
 msgstr "# krypterade PONG-meddelanden mottagna"
 
-#: src/core/gnunet-service-core_kx.c:1067
+#: src/core/gnunet-service-core_kx.c:1068
 #: src/transport/gnunet-service-transport_validation.c:1133
 #, fuzzy
 msgid "# PING messages received"
 msgstr "# PING-meddelanden skapade"
 
-#: src/core/gnunet-service-core_kx.c:1077
+#: src/core/gnunet-service-core_kx.c:1078
 #, fuzzy
 msgid "# PING messages dropped (out of order)"
 msgstr "Nätverksannonsering avstängd i konfigurationen!\n"
 
-#: src/core/gnunet-service-core_kx.c:1126
+#: src/core/gnunet-service-core_kx.c:1127
 #, fuzzy
 msgid "# PONG messages created"
 msgstr "# PING-meddelanden skapade"
 
-#: src/core/gnunet-service-core_kx.c:1151
+#: src/core/gnunet-service-core_kx.c:1152
 #, fuzzy
 msgid "# sessions terminated by timeout"
 msgstr "# byte kastade via TCP (utgående)"
 
-#: src/core/gnunet-service-core_kx.c:1164
+#: src/core/gnunet-service-core_kx.c:1165
 #, fuzzy
 msgid "# keepalive messages sent"
 msgstr "# PING-meddelanden i klartext skickade"
 
-#: src/core/gnunet-service-core_kx.c:1221
+#: src/core/gnunet-service-core_kx.c:1222
 #: src/transport/gnunet-service-transport_validation.c:1476
 #, fuzzy
 msgid "# PONG messages received"
 msgstr "# krypterade PONG-meddelanden mottagna"
 
-#: src/core/gnunet-service-core_kx.c:1229
+#: src/core/gnunet-service-core_kx.c:1230
 #, fuzzy
 msgid "# PONG messages dropped (connection down)"
 msgstr "# krypterade PONG-meddelanden mottagna"
 
-#: src/core/gnunet-service-core_kx.c:1237
+#: src/core/gnunet-service-core_kx.c:1238
 #, fuzzy
 msgid "# PONG messages dropped (out of order)"
 msgstr "Nätverksannonsering avstängd i konfigurationen!\n"
 
-#: src/core/gnunet-service-core_kx.c:1276
+#: src/core/gnunet-service-core_kx.c:1277
 #, fuzzy
 msgid "# PONG messages decrypted"
 msgstr "# PING-meddelanden skapade"
 
-#: src/core/gnunet-service-core_kx.c:1316
+#: src/core/gnunet-service-core_kx.c:1317
 #, fuzzy
 msgid "# session keys confirmed via PONG"
 msgstr "# sessionnycklar vägrade"
 
-#: src/core/gnunet-service-core_kx.c:1328
+#: src/core/gnunet-service-core_kx.c:1329
 #, fuzzy
 msgid "# timeouts prevented via PONG"
 msgstr "# byte mottogs via TCP"
 
-#: src/core/gnunet-service-core_kx.c:1337
+#: src/core/gnunet-service-core_kx.c:1338
 #, fuzzy
 msgid "# rekey operations confirmed via PONG"
 msgstr "# sessionnycklar vägrade"
 
-#: src/core/gnunet-service-core_kx.c:1506
+#: src/core/gnunet-service-core_kx.c:1507
 #, fuzzy
 msgid "# DATA message dropped (out of order)"
 msgstr "# byte kastade via UDP (utgående)"
 
-#: src/core/gnunet-service-core_kx.c:1517
+#: src/core/gnunet-service-core_kx.c:1518
 #, c-format
 msgid ""
 "Session to peer `%s' went down due to key expiration (should not happen)\n"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1521
+#: src/core/gnunet-service-core_kx.c:1522
 #, fuzzy
 msgid "# sessions terminated by key expiration"
 msgstr "# byte kastade via TCP (utgående)"
 
-#: src/core/gnunet-service-core_kx.c:1599
-#: src/core/gnunet-service-core_kx.c:1626
+#: src/core/gnunet-service-core_kx.c:1600
+#: src/core/gnunet-service-core_kx.c:1627
 #, fuzzy
 msgid "# bytes dropped (duplicates)"
 msgstr "# byte kastade via UDP (utgående)"
 
-#: src/core/gnunet-service-core_kx.c:1612
+#: src/core/gnunet-service-core_kx.c:1613
 #, fuzzy
 msgid "# bytes dropped (out of sequence)"
 msgstr "# byte kastade via UDP (utgående)"
 
-#: src/core/gnunet-service-core_kx.c:1657
+#: src/core/gnunet-service-core_kx.c:1658
 #, fuzzy
 msgid "# bytes dropped (ancient message)"
 msgstr "# byte kastade via UDP (utgående)"
 
-#: src/core/gnunet-service-core_kx.c:1666
+#: src/core/gnunet-service-core_kx.c:1667
 #, fuzzy
 msgid "# bytes of payload decrypted"
 msgstr "# byte dekrypterade"
 
 #: src/core/gnunet-service-core_sessions.c:252
 #: src/core/gnunet-service-core_sessions.c:337
-#: src/fs/gnunet-service-fs_cp.c:601 src/fs/gnunet-service-fs_cp.c:1496
+#: src/fs/gnunet-service-fs_cp.c:601 src/fs/gnunet-service-fs_cp.c:1494
 #: src/topology/gnunet-daemon-topology.c:579
 #: src/topology/gnunet-daemon-topology.c:671
 #: src/transport/gnunet-service-transport_neighbours.c:723
@@ -1773,7 +1776,7 @@ msgstr ""
 #: src/datastore/gnunet-service-datastore.c:626
 #: src/datastore/gnunet-service-datastore.c:677
 #: src/datastore/gnunet-service-datastore.c:820
-#: src/datastore/gnunet-service-datastore.c:1429
+#: src/datastore/gnunet-service-datastore.c:1428
 msgid "# reserved"
 msgstr ""
 
@@ -1822,70 +1825,70 @@ msgstr "Kommando \"%s\" hittades inte!\n"
 msgid "# bytes removed (explicit request)"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1059
+#: src/datastore/gnunet-service-datastore.c:1058
 #, fuzzy
 msgid "# REMOVE requests received"
 msgstr "# byte mottogs via TCP"
 
-#: src/datastore/gnunet-service-datastore.c:1108
+#: src/datastore/gnunet-service-datastore.c:1107
 #, c-format
 msgid ""
 "Datastore payload must have been inaccurate (%lld < %lld). Recomputing it.\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1113
-#: src/datastore/gnunet-service-datastore.c:1282
+#: src/datastore/gnunet-service-datastore.c:1112
+#: src/datastore/gnunet-service-datastore.c:1281
 #, c-format
 msgid "New payload: %lld\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1168
+#: src/datastore/gnunet-service-datastore.c:1167
 #, c-format
 msgid "Loading `%s' datastore plugin\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1177
+#: src/datastore/gnunet-service-datastore.c:1176
 #, fuzzy, c-format
 msgid "Failed to load datastore plugin for `%s'\n"
 msgstr "Kunde inte slå upp \"%s\": %s\n"
 
-#: src/datastore/gnunet-service-datastore.c:1237
+#: src/datastore/gnunet-service-datastore.c:1236
 msgid "Bloomfilter construction complete.\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1289
+#: src/datastore/gnunet-service-datastore.c:1288
 msgid "Rebuilding bloomfilter.  Please be patient.\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1299
+#: src/datastore/gnunet-service-datastore.c:1298
 msgid "Plugin does not support get_keys function. Please fix!\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1464
+#: src/datastore/gnunet-service-datastore.c:1463
 #, fuzzy, c-format
 msgid "# bytes used in file-sharing datastore `%s'"
 msgstr "# byte krypterade"
 
-#: src/datastore/gnunet-service-datastore.c:1473
+#: src/datastore/gnunet-service-datastore.c:1472
 msgid "# quota"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1476
+#: src/datastore/gnunet-service-datastore.c:1475
 msgid "# cache size"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1492
+#: src/datastore/gnunet-service-datastore.c:1491
 #, c-format
 msgid "Could not use specified filename `%s' for bloomfilter.\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1513
-#: src/datastore/gnunet-service-datastore.c:1535
+#: src/datastore/gnunet-service-datastore.c:1512
+#: src/datastore/gnunet-service-datastore.c:1534
 #, fuzzy, c-format
 msgid "Failed to remove bogus bloomfilter file `%s'\n"
 msgstr "Kunde inte spara konfigurationsfil \"%s\":"
 
-#: src/datastore/gnunet-service-datastore.c:1574
+#: src/datastore/gnunet-service-datastore.c:1573
 #, fuzzy
 msgid "Failed to initialize bloomfilter.\n"
 msgstr "Misslyckades att initiera tjänsten \"%s\".\n"
@@ -1939,7 +1942,7 @@ msgstr "\"%s\" misslyckades vid %s:%d med fel: %s\n"
 
 #: src/datastore/plugin_datastore_sqlite.c:310
 #: src/namecache/plugin_namecache_sqlite.c:180
-#: src/namestore/plugin_namestore_sqlite.c:868
+#: src/namestore/plugin_namestore_sqlite.c:891
 #: src/peerstore/plugin_peerstore_sqlite.c:540
 #, fuzzy, c-format
 msgid "Unable to initialize SQLite: %s.\n"
@@ -2196,7 +2199,7 @@ msgstr ""
 msgid "# DNS requests received via TUN interface"
 msgstr "Meddelande mottaget från klient är ogiltig.\n"
 
-#: src/dns/gnunet-service-dns.c:1117 src/exit/gnunet-daemon-exit.c:3708
+#: src/dns/gnunet-service-dns.c:1117 src/exit/gnunet-daemon-exit.c:3707
 #, fuzzy
 msgid "need a valid IPv4 or IPv6 address\n"
 msgstr "Ogiltigt svar på \"%s\".\n"
@@ -2351,69 +2354,69 @@ msgstr ""
 msgid "Packet from unknown protocol %u received.  Ignored.\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3377 src/exit/gnunet-daemon-exit.c:3388
+#: src/exit/gnunet-daemon-exit.c:3376 src/exit/gnunet-daemon-exit.c:3387
 #, fuzzy, c-format
 msgid "Option `%s' for domain `%s' is not formatted correctly!\n"
 msgstr "%s: flagga \"%s\" är tvetydig\n"
 
-#: src/exit/gnunet-daemon-exit.c:3402 src/exit/gnunet-daemon-exit.c:3410
+#: src/exit/gnunet-daemon-exit.c:3401 src/exit/gnunet-daemon-exit.c:3409
 #, c-format
 msgid "`%s' is not a valid port number (for domain `%s')!"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3452
+#: src/exit/gnunet-daemon-exit.c:3451
 #, c-format
 msgid "No addresses found for hostname `%s' of service `%s'!\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3467 src/exit/gnunet-daemon-exit.c:3482
+#: src/exit/gnunet-daemon-exit.c:3466 src/exit/gnunet-daemon-exit.c:3481
 #, c-format
 msgid "Service `%s' configured for IPv4, but IPv4 is disabled!\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3496
+#: src/exit/gnunet-daemon-exit.c:3495
 #, c-format
 msgid "No IP addresses found for hostname `%s' of service `%s'!\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3641
+#: src/exit/gnunet-daemon-exit.c:3640
 msgid ""
 "This system does not support IPv4, will disable IPv4 functions despite them "
 "being enabled in the configuration\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3650
+#: src/exit/gnunet-daemon-exit.c:3649
 msgid ""
 "This system does not support IPv6, will disable IPv6 functions despite them "
 "being enabled in the configuration\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3658
+#: src/exit/gnunet-daemon-exit.c:3657
 msgid ""
 "Cannot enable IPv4 exit but disable IPv4 on TUN interface, will use "
 "ENABLE_IPv4=YES\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3665
+#: src/exit/gnunet-daemon-exit.c:3664
 msgid ""
 "Cannot enable IPv6 exit but disable IPv6 on TUN interface, will use "
 "ENABLE_IPv6=YES\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3836
+#: src/exit/gnunet-daemon-exit.c:3835
 msgid "Must be a number"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3952
+#: src/exit/gnunet-daemon-exit.c:3951
 #, c-format
 msgid "`%s' is not SUID or the path is invalid, EXIT will not work\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3964 src/pt/gnunet-daemon-pt.c:1212
+#: src/exit/gnunet-daemon-exit.c:3963 src/pt/gnunet-daemon-pt.c:1212
 msgid "No useful service enabled.  Exiting.\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:4118
+#: src/exit/gnunet-daemon-exit.c:4117
 msgid "Daemon to run to provide an IP exit node for the VPN"
 msgstr ""
 
@@ -2603,7 +2606,7 @@ msgstr "Misslyckades att leverera \"%s\" meddelande.\n"
 msgid "internal error decoding tree"
 msgstr "=\tFel vid läsning av katalog.\n"
 
-#: src/fs/fs_download.c:1890
+#: src/fs/fs_download.c:1889
 #, fuzzy
 msgid "Invalid URI"
 msgstr "Ogiltiga argument: "
@@ -2620,7 +2623,7 @@ msgstr ""
 msgid "Failed to receive response from `%s' service.\n"
 msgstr "Misslyckades att ta emot svar till \"%s\" meddelande från gnunetd\n"
 
-#: src/fs/fs_list_indexed.c:195
+#: src/fs/fs_list_indexed.c:187
 #, fuzzy, c-format
 msgid "Failed to not connect to `%s' service.\n"
 msgstr "Misslyckades att initiera tjänsten \"%s\".\n"
@@ -2645,7 +2648,7 @@ msgstr "Fel vid %s:%d.\n"
 msgid "Failed to read `%s': %s\n"
 msgstr "Fel vid %s:%d.\n"
 
-#: src/fs/fs_namespace.c:472
+#: src/fs/fs_namespace.c:457
 #, fuzzy
 msgid "Failed to connect to datastore."
 msgstr "Misslyckades att ansluta till gnunetd.\n"
@@ -2790,96 +2793,96 @@ msgstr "Misslyckades att ansluta till gnunetd.\n"
 msgid "Failed to compute hash of file."
 msgstr "Misslyckades att ansluta till gnunetd.\n"
 
-#: src/fs/fs_uri.c:239
+#: src/fs/fs_uri.c:231
 #, fuzzy, no-c-format
 msgid "Malformed KSK URI (`%' must be followed by HEX number)"
 msgstr "Ogiltig URL \"%s\" (måste börja med \"%s\")\n"
 
-#: src/fs/fs_uri.c:298
+#: src/fs/fs_uri.c:290
 #, fuzzy
 msgid "Malformed KSK URI (must not begin or end with `+')"
 msgstr "Ogiltig URL \"%s\" (måste börja med \"%s\")\n"
 
-#: src/fs/fs_uri.c:316
+#: src/fs/fs_uri.c:308
 #, fuzzy
 msgid "Malformed KSK URI (`++' not allowed)"
 msgstr "Ogiltig URL \"%s\" (måste börja med \"%s\")\n"
 
-#: src/fs/fs_uri.c:323
+#: src/fs/fs_uri.c:315
 #, fuzzy
 msgid "Malformed KSK URI (quotes not balanced)"
 msgstr "Ogiltig URL \"%s\" (måste börja med \"%s\")\n"
 
-#: src/fs/fs_uri.c:390
+#: src/fs/fs_uri.c:382
 msgid "Malformed SKS URI (wrong syntax)"
 msgstr ""
 
-#: src/fs/fs_uri.c:431
+#: src/fs/fs_uri.c:423
 msgid "Malformed CHK URI (wrong syntax)"
 msgstr ""
 
-#: src/fs/fs_uri.c:448
+#: src/fs/fs_uri.c:440
 msgid "Malformed CHK URI (failed to decode CHK)"
 msgstr ""
 
-#: src/fs/fs_uri.c:525
+#: src/fs/fs_uri.c:517
 msgid "LOC URI malformed (wrong syntax)"
 msgstr ""
 
-#: src/fs/fs_uri.c:542
+#: src/fs/fs_uri.c:534
 msgid "LOC URI malformed (no CHK)"
 msgstr ""
 
-#: src/fs/fs_uri.c:552
+#: src/fs/fs_uri.c:544
 msgid "LOC URI malformed (missing LOC)"
 msgstr ""
 
-#: src/fs/fs_uri.c:560
+#: src/fs/fs_uri.c:552
 msgid "LOC URI malformed (wrong syntax for public key)"
 msgstr ""
 
-#: src/fs/fs_uri.c:569
+#: src/fs/fs_uri.c:561
 msgid "LOC URI malformed (could not decode public key)"
 msgstr ""
 
-#: src/fs/fs_uri.c:575
+#: src/fs/fs_uri.c:567
 msgid "LOC URI malformed (could not find signature)"
 msgstr ""
 
-#: src/fs/fs_uri.c:582
+#: src/fs/fs_uri.c:574
 msgid "LOC URI malformed (wrong syntax for signature)"
 msgstr ""
 
-#: src/fs/fs_uri.c:593
+#: src/fs/fs_uri.c:585
 msgid "LOC URI malformed (could not decode signature)"
 msgstr ""
 
-#: src/fs/fs_uri.c:600
+#: src/fs/fs_uri.c:592
 msgid "LOC URI malformed (wrong syntax for expiration time)"
 msgstr ""
 
-#: src/fs/fs_uri.c:606
+#: src/fs/fs_uri.c:598
 msgid "LOC URI malformed (could not parse expiration time)"
 msgstr ""
 
-#: src/fs/fs_uri.c:620
+#: src/fs/fs_uri.c:612
 msgid "LOC URI malformed (signature failed validation)"
 msgstr ""
 
-#: src/fs/fs_uri.c:653
+#: src/fs/fs_uri.c:645
 #, fuzzy
 msgid "invalid argument"
 msgstr "Ogiltigt argument: \"%s\"\n"
 
-#: src/fs/fs_uri.c:673
+#: src/fs/fs_uri.c:665
 msgid "Unrecognized URI type"
 msgstr ""
 
-#: src/fs/fs_uri.c:1077 src/fs/fs_uri.c:1104
+#: src/fs/fs_uri.c:1060 src/fs/fs_uri.c:1087
 msgid "No keywords specified!\n"
 msgstr "Inga nyckelord angivna!\n"
 
-#: src/fs/fs_uri.c:1110
+#: src/fs/fs_uri.c:1093
 msgid "Number of double-quotes not balanced!\n"
 msgstr ""
 
@@ -3471,7 +3474,7 @@ msgid "# cadet client connections rejected"
 msgstr "Nätverksanslutning"
 
 #: src/fs/gnunet-service-fs_cadet_server.c:394
-#: src/fs/gnunet-service-fs_cadet_server.c:434
+#: src/fs/gnunet-service-fs_cadet_server.c:433
 #, fuzzy
 msgid "# cadet connections active"
 msgstr "Nätverksanslutning"
@@ -3532,7 +3535,7 @@ msgstr ""
 msgid "# P2P query messages received and processed"
 msgstr "# krypterade PONG-meddelanden mottagna"
 
-#: src/fs/gnunet-service-fs_cp.c:1679
+#: src/fs/gnunet-service-fs_cp.c:1677
 #, fuzzy
 msgid "# migration stop messages sent"
 msgstr "# krypterade PONG-meddelanden mottagna"
@@ -3837,8 +3840,8 @@ msgstr ""
 #: src/hostlist/gnunet-daemon-hostlist_client.c:957
 #: src/hostlist/gnunet-daemon-hostlist_client.c:1059
 #: src/hostlist/gnunet-daemon-hostlist_client.c:1067
-#: src/transport/plugin_transport_http_client.c:600
-#: src/transport/plugin_transport_http_client.c:618
+#: src/transport/plugin_transport_http_client.c:599
+#: src/transport/plugin_transport_http_client.c:617
 #, fuzzy, c-format
 msgid "%s failed at %s:%d: `%s'\n"
 msgstr "\"%s\" misslyckades vid %s:%d med fel: \"%s\".\n"
@@ -3903,7 +3906,7 @@ msgstr "Kunde inte spara konfigurationsfil \"%s\":"
 msgid "Failed to start HTTPS server for `%s'\n"
 msgstr "Misslyckades att starta samling.\n"
 
-#: src/gns/gnunet-gns-proxy.c:2919 src/rest/gnunet-rest-server.c:958
+#: src/gns/gnunet-gns-proxy.c:2919 src/rest/gnunet-rest-server.c:957
 #, fuzzy
 msgid "Failed to pass client to MHD\n"
 msgstr "Misslyckades att ansluta till gnunetd.\n"
@@ -3923,24 +3926,24 @@ msgstr "Kommando \"%s\" stöds ej.  Avbryter.\n"
 msgid "Unsupported socks address type %d\n"
 msgstr "Kommando \"%s\" stöds ej.  Avbryter.\n"
 
-#: src/gns/gnunet-gns-proxy.c:3727
+#: src/gns/gnunet-gns-proxy.c:3726
 #, fuzzy, c-format
 msgid "Failed to load X.509 key and certificate from `%s'\n"
 msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 
-#: src/gns/gnunet-gns-proxy.c:3869
+#: src/gns/gnunet-gns-proxy.c:3868
 msgid "listen on specified port (default: 7777)"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:3874
+#: src/gns/gnunet-gns-proxy.c:3873
 msgid "pem file to use as CA"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:3878
+#: src/gns/gnunet-gns-proxy.c:3877
 msgid "disable use of IPv6"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:3904
+#: src/gns/gnunet-gns-proxy.c:3903
 msgid "GNUnet GNS proxy"
 msgstr ""
 
@@ -3990,21 +3993,19 @@ msgstr ""
 msgid "GNUnet GNS resolver tool"
 msgstr "Spåra GNUnets nätverkstopologi."
 
-#: src/gns/gnunet-service-gns.c:501
+#: src/gns/gnunet-service-gns.c:500
 #, fuzzy
 msgid "Properly base32-encoded public key required"
 msgstr "Ogiltigt argument: \"%s\"\n"
 
-#: src/gns/gnunet-service-gns.c:537
-#: src/zonemaster/gnunet-service-zonemaster-monitor.c:542
-#: src/zonemaster/gnunet-service-zonemaster.c:982
+#: src/gns/gnunet-service-gns.c:536
+#: src/zonemaster/gnunet-service-zonemaster.c:1396
 #, fuzzy
 msgid "Failed to connect to the namecache!\n"
 msgstr "Misslyckades att ansluta till gnunetd.\n"
 
-#: src/gns/gnunet-service-gns.c:556
-#: src/zonemaster/gnunet-service-zonemaster-monitor.c:572
-#: src/zonemaster/gnunet-service-zonemaster.c:1021
+#: src/gns/gnunet-service-gns.c:555
+#: src/zonemaster/gnunet-service-zonemaster.c:1435
 #, fuzzy
 msgid "Could not connect to DHT!\n"
 msgstr "Kunde inte ansluta till gnunetd.\n"
@@ -4127,31 +4128,31 @@ msgstr ""
 msgid "Label  contains `.' which is not allowed\n"
 msgstr ""
 
-#: src/gnsrecord/gnsrecord_misc.c:467
+#: src/gnsrecord/gnsrecord_misc.c:481
 msgid "Zone delegation record not allowed in apex."
 msgstr ""
 
-#: src/gnsrecord/gnsrecord_misc.c:475
+#: src/gnsrecord/gnsrecord_misc.c:489
 msgid "Zone delegation record set contains mutually exclusive records."
 msgstr ""
 
-#: src/gnsrecord/gnsrecord_misc.c:485
+#: src/gnsrecord/gnsrecord_misc.c:499
 msgid "Multiple REDIRECT records."
 msgstr ""
 
-#: src/gnsrecord/gnsrecord_misc.c:494 src/gnsrecord/gnsrecord_misc.c:520
+#: src/gnsrecord/gnsrecord_misc.c:508 src/gnsrecord/gnsrecord_misc.c:534
 msgid "Redirection record set contains mutually exclusive records."
 msgstr ""
 
-#: src/gnsrecord/gnsrecord_misc.c:501
+#: src/gnsrecord/gnsrecord_misc.c:515
 msgid "Redirection records not allowed in apex."
 msgstr ""
 
-#: src/gnsrecord/gnsrecord_misc.c:512
+#: src/gnsrecord/gnsrecord_misc.c:526
 msgid "Redirection records not allowed in apex.."
 msgstr ""
 
-#: src/gnsrecord/gnsrecord_misc.c:534
+#: src/gnsrecord/gnsrecord_misc.c:548
 msgid "Mutually exclusive records."
 msgstr ""
 
@@ -4265,37 +4266,37 @@ msgstr "Fel vid skapandet av användare"
 msgid "Modified %u addresses, wrote %u bytes\n"
 msgstr ""
 
-#: src/hello/hello.c:1111
+#: src/hello/hello.c:1089
 #, fuzzy
 msgid "Failed to parse HELLO message: missing expiration time\n"
 msgstr "Kunde inte spara konfiguration!"
 
-#: src/hello/hello.c:1121
+#: src/hello/hello.c:1099
 #, fuzzy
 msgid "Failed to parse HELLO message: invalid expiration time\n"
 msgstr "Kunde inte spara konfiguration!"
 
-#: src/hello/hello.c:1131
+#: src/hello/hello.c:1109
 #, fuzzy
 msgid "Failed to parse HELLO message: malformed\n"
 msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 
-#: src/hello/hello.c:1143
+#: src/hello/hello.c:1121
 #, fuzzy
 msgid "Failed to parse HELLO message: missing transport plugin\n"
 msgstr "Kunde inte slå upp \"%s\": %s\n"
 
-#: src/hello/hello.c:1161
+#: src/hello/hello.c:1139
 #, c-format
 msgid "Plugin `%s' not found, skipping address\n"
 msgstr ""
 
-#: src/hello/hello.c:1169
+#: src/hello/hello.c:1147
 #, c-format
 msgid "Plugin `%s' does not support URIs yet\n"
 msgstr ""
 
-#: src/hello/hello.c:1184
+#: src/hello/hello.c:1162
 #, fuzzy, c-format
 msgid "Failed to parse `%s' as an address for plugin `%s'\n"
 msgstr "Misslyckades att binda till UDP-port %d.\n"
@@ -4348,7 +4349,7 @@ msgid "# valid HELLOs downloaded from hostlist servers"
 msgstr ""
 
 #: src/hostlist/gnunet-daemon-hostlist_client.c:677
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1453
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1451
 msgid "# advertised hostlist URIs"
 msgstr ""
 
@@ -4401,7 +4402,7 @@ msgid "# hostlist downloads initiated"
 msgstr ""
 
 #: src/hostlist/gnunet-daemon-hostlist_client.c:1137
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1725
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1723
 msgid "# milliseconds between hostlist downloads"
 msgstr ""
 
@@ -4416,65 +4417,65 @@ msgstr ""
 msgid "# active connections"
 msgstr "Nätverksanslutning"
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1389
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1387
 #, fuzzy, c-format
 msgid "Loading saved hostlist entries from file `%s' \n"
 msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1394
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1392
 #, fuzzy, c-format
 msgid "Hostlist file `%s' does not exist\n"
 msgstr "antal meddelanden att använda per iteration"
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1405
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1403
 #, fuzzy, c-format
 msgid "Could not open file `%s' for reading to load hostlists: %s\n"
 msgstr "Kunde inte slå upp \"%s\": %s\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1446
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1444
 #, c-format
 msgid "%u hostlist URIs loaded from file\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1449
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1447
 msgid "# hostlist URIs read from file"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1500
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1498
 #, fuzzy, c-format
 msgid "Could not open file `%s' for writing to save hostlists: %s\n"
 msgstr "Kunde inte slå upp \"%s\": %s\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1507
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1505
 #, fuzzy, c-format
 msgid "Writing %u hostlist URIs to `%s'\n"
 msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1540
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1559
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1538
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1557
 #, c-format
 msgid "Error writing hostlist URIs to file `%s'\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1553
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1551
 msgid "# hostlist URIs written to file"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1654
-#: src/transport/plugin_transport_http_client.c:2294
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1652
+#: src/transport/plugin_transport_http_client.c:2288
 #, c-format
 msgid "Invalid proxy type: `%s', disabling proxy! Check configuration!\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1683
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1681
 msgid "Learning is enabled on this peer\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1696
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1694
 msgid "Learning is not enabled on this peer\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1710
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1708
 #, c-format
 msgid ""
 "Since learning is not enabled on this peer, hostlist file `%s' was removed\n"
@@ -4545,7 +4546,7 @@ msgid "# hostlist advertisements send"
 msgstr ""
 
 #: src/hostlist/gnunet-daemon-hostlist_server.c:674
-#: src/transport/gnunet-service-transport.c:2657
+#: src/transport/gnunet-service-transport.c:2652
 #, fuzzy
 msgid "Could not access PEERINFO service.  Exiting.\n"
 msgstr "Kunde inte komma åt namnrymdsinformation.\n"
@@ -4665,49 +4666,49 @@ msgstr ""
 msgid "Maintain egos"
 msgstr ""
 
-#: src/identity/gnunet-service-identity.c:502
+#: src/identity/gnunet-service-identity.c:501
 msgid "no default known"
 msgstr ""
 
-#: src/identity/gnunet-service-identity.c:527
+#: src/identity/gnunet-service-identity.c:526
 msgid "default configured, but ego unknown (internal error)"
 msgstr ""
 
-#: src/identity/gnunet-service-identity.c:620
-#: src/identity/gnunet-service-identity.c:895
-#: src/identity/gnunet-service-identity.c:1015
+#: src/identity/gnunet-service-identity.c:618
+#: src/identity/gnunet-service-identity.c:891
+#: src/identity/gnunet-service-identity.c:1010
 #, fuzzy, c-format
 msgid "Failed to write subsystem default identifier map to `%s'.\n"
 msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 
-#: src/identity/gnunet-service-identity.c:630
+#: src/identity/gnunet-service-identity.c:628
 msgid "Unknown ego specified for service (internal error)"
 msgstr ""
 
-#: src/identity/gnunet-service-identity.c:724
+#: src/identity/gnunet-service-identity.c:721
 msgid "identifier already in use for another ego"
 msgstr ""
 
-#: src/identity/gnunet-service-identity.c:871
+#: src/identity/gnunet-service-identity.c:867
 msgid "target name already exists"
 msgstr ""
 
-#: src/identity/gnunet-service-identity.c:913
-#: src/identity/gnunet-service-identity.c:1032
+#: src/identity/gnunet-service-identity.c:909
+#: src/identity/gnunet-service-identity.c:1027
 msgid "no matching ego found"
 msgstr ""
 
-#: src/identity/gnunet-service-identity.c:1130
+#: src/identity/gnunet-service-identity.c:1125
 #, fuzzy, c-format
 msgid "Failed to parse ego information in `%s'\n"
 msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 
-#: src/identity/gnunet-service-identity.c:1188
+#: src/identity/gnunet-service-identity.c:1183
 #, fuzzy, c-format
 msgid "Failed to parse subsystem identity configuration file `%s'\n"
 msgstr "Kunde inte spara konfigurationsfil \"%s\":"
 
-#: src/identity/gnunet-service-identity.c:1197
+#: src/identity/gnunet-service-identity.c:1192
 #, fuzzy, c-format
 msgid "Failed to create directory `%s' for storing egos\n"
 msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
@@ -4788,17 +4789,19 @@ msgstr "ange prioritet för innehållet"
 msgid "GNUnet zone manipulation tool"
 msgstr "GNUnet-konfiguration"
 
-#: src/namecache/namecache_api.c:286
+#: src/namecache/namecache_api.c:285
 msgid "Namecache failed to cache block"
 msgstr ""
 
-#: src/namecache/namecache_api.c:374
+#: src/namecache/namecache_api.c:373
 #, fuzzy
 msgid "Error communicating with namecache service"
 msgstr "Skriv ut information om GNUnets motparter."
 
 #: src/namecache/plugin_namecache_flat.c:118
 #: src/namecache/plugin_namecache_flat.c:253
+#: src/namestore/plugin_namestore_flat.c:176
+#: src/namestore/plugin_namestore_flat.c:424
 #: src/peerstore/plugin_peerstore_flat.c:380
 #: src/peerstore/plugin_peerstore_flat.c:542
 #, fuzzy, c-format
@@ -4806,6 +4809,7 @@ msgid "Unable to initialize file: %s.\n"
 msgstr "Kunde inte initiera SQLite.\n"
 
 #: src/namecache/plugin_namecache_flat.c:129
+#: src/namestore/plugin_namestore_flat.c:187
 #: src/peerstore/plugin_peerstore_flat.c:395
 #, fuzzy, c-format
 msgid "Unable to get filesize: %s.\n"
@@ -4846,6 +4850,7 @@ msgid "the namestore plugin to work with, e.g. 'sqlite'"
 msgstr ""
 
 #: src/namestore/gnunet-namestore-dbtool.c:178
+#: src/namestore/gnunet-namestore-zonefile.c:750
 #, fuzzy
 msgid "GNUnet namestore database manipulation tool"
 msgstr "GNUnet-konfiguration"
@@ -4954,6 +4959,48 @@ msgstr ""
 msgid "GNU Name System First-Come-First-Served name registration service"
 msgstr ""
 
+#: src/namestore/gnunet-namestore-zonefile.c:329
+#, fuzzy, c-format
+msgid "Failed to store records...\n"
+msgstr "Misslyckades att starta samling.\n"
+
+#: src/namestore/gnunet-namestore-zonefile.c:437
+#: src/namestore/gnunet-namestore-zonefile.c:469
+#, fuzzy, c-format
+msgid "Name `%s' is too long\n"
+msgstr "\"%s\" är inte en fil.\n"
+
+#: src/namestore/gnunet-namestore-zonefile.c:515
+#, c-format
+msgid "You must provide $ORIGIN in your zonefile or via arguments (--zone)!\n"
+msgstr ""
+
+#: src/namestore/gnunet-namestore-zonefile.c:524
+#, c-format
+msgid "Only %u records per unique name supported.\n"
+msgstr ""
+
+#: src/namestore/gnunet-namestore-zonefile.c:586
+#, fuzzy, c-format
+msgid "Data `%s' invalid\n"
+msgstr "Formatet på pseudonym \"%s\" är ogiltig.\n"
+
+#: src/namestore/gnunet-namestore-zonefile.c:702
+#, fuzzy, c-format
+msgid "Failed to connect to NAMESTORE\n"
+msgstr "Misslyckades att ansluta till gnunetd.\n"
+
+#: src/namestore/gnunet-namestore-zonefile.c:709
+#, fuzzy, c-format
+msgid "Failed to connect to IDENTITY\n"
+msgstr "Misslyckades att ansluta till gnunetd.\n"
+
+#: src/namestore/gnunet-namestore-zonefile.c:735
+#: src/namestore/gnunet-namestore.c:1628
+#, fuzzy
+msgid "name of the ego controlling the zone"
+msgstr "Visa värde av alternativet"
+
 #: src/namestore/gnunet-namestore.c:340
 #, fuzzy, c-format
 msgid "Adding record failed: %s\n"
@@ -5159,22 +5206,21 @@ msgid ""
 "expired"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1628
-#, fuzzy
-msgid "name of the ego controlling the zone"
-msgstr "Visa värde av alternativet"
-
-#: src/namestore/gnunet-service-namestore.c:1504
+#: src/namestore/gnunet-service-namestore.c:1673
 #, fuzzy
 msgid "Error normalizing name."
 msgstr "Klar med skapandet av värdnyckel.\n"
 
-#: src/namestore/gnunet-service-namestore.c:1522
+#: src/namestore/gnunet-service-namestore.c:1691
 #, fuzzy
 msgid "Error deserializing records."
 msgstr "=\tFel vid läsning av katalog.\n"
 
-#: src/namestore/gnunet-service-namestore.c:1633
+#: src/namestore/gnunet-service-namestore.c:1811
+msgid "Not records to delete."
+msgstr ""
+
+#: src/namestore/gnunet-service-namestore.c:1819
 #, fuzzy
 msgid "Store failed"
 msgstr "gnunet-update misslyckades!"
@@ -5187,23 +5233,37 @@ msgstr ""
 msgid "minimum expiration time we assume for imported records"
 msgstr ""
 
+#: src/namestore/plugin_namestore_flat.c:195
+#, c-format
+msgid "File too big to map: %llu bytes.\n"
+msgstr ""
+
+#: src/namestore/plugin_namestore_flat.c:219
+#, c-format
+msgid "Namestore database file `%s' malformed\n"
+msgstr ""
+
+#: src/namestore/plugin_namestore_flat.c:792
+msgid "Flat file database running\n"
+msgstr ""
+
 #: src/namestore/plugin_namestore_sqlite.c:180
 #: src/namestore/plugin_namestore_sqlite.c:190
-#: src/namestore/plugin_namestore_sqlite.c:806
+#: src/namestore/plugin_namestore_sqlite.c:829
 #, fuzzy, c-format
 msgid "Failed to setup database with: `%s'\n"
 msgstr "Fel vid %s:%d.\n"
 
-#: src/namestore/plugin_namestore_sqlite.c:797
+#: src/namestore/plugin_namestore_sqlite.c:820
 #, fuzzy, c-format
 msgid "Failed to drop database with: `%s'\n"
 msgstr "Fel vid %s:%d.\n"
 
-#: src/namestore/plugin_namestore_sqlite.c:938
+#: src/namestore/plugin_namestore_sqlite.c:961
 msgid "SQlite database running\n"
 msgstr ""
 
-#: src/namestore/plugin_rest_namestore.c:1369
+#: src/namestore/plugin_rest_namestore.c:1414
 #, fuzzy
 msgid "Namestore REST API initialized\n"
 msgstr " Anslutning misslyckades\n"
@@ -5526,7 +5586,7 @@ msgid "Show network size estimates from NSE service."
 msgstr "# byte mottogs via TCP"
 
 #: src/nse/gnunet-service-nse.c:1441
-#: src/revocation/gnunet-service-revocation.c:888 src/util/gnunet-scrypt.c:243
+#: src/revocation/gnunet-service-revocation.c:888 src/util/gnunet-scrypt.c:242
 msgid "Value is too large.\n"
 msgstr ""
 
@@ -5604,19 +5664,19 @@ msgid "Print information about peers."
 msgstr "Skriv ut information om GNUnets motparter."
 
 #: src/peerinfo-tool/gnunet-peerinfo_plugins.c:103
-#: src/transport/gnunet-service-transport_plugins.c:167
+#: src/transport/gnunet-service-transport_plugins.c:154
 #, fuzzy, c-format
 msgid "Starting transport plugins `%s'\n"
 msgstr "Testar transport(er) %s\n"
 
 #: src/peerinfo-tool/gnunet-peerinfo_plugins.c:107
-#: src/transport/gnunet-service-transport_plugins.c:172
+#: src/transport/gnunet-service-transport_plugins.c:159
 #, fuzzy, c-format
 msgid "Loading `%s' transport plugin\n"
 msgstr "Testar transport(er) %s\n"
 
 #: src/peerinfo-tool/gnunet-peerinfo_plugins.c:127
-#: src/transport/gnunet-service-transport_plugins.c:207
+#: src/transport/gnunet-service-transport_plugins.c:194
 #, fuzzy, c-format
 msgid "Failed to load transport plugin for `%s'\n"
 msgstr "Kunde inte slå upp \"%s\": %s\n"
@@ -5676,7 +5736,7 @@ msgstr ""
 msgid "Skipping import of included HELLOs\n"
 msgstr ""
 
-#: src/peerinfo/peerinfo_api.c:217
+#: src/peerinfo/peerinfo_api.c:210
 #, fuzzy
 msgid "Failed to receive response from `PEERINFO' service."
 msgstr "Misslyckades att ta emot svar till \"%s\" meddelande från gnunetd\n"
@@ -5700,7 +5760,7 @@ msgstr "Utdataformat är inte känt, detta bör inte 
hända.\n"
 msgid "Received a malformed response from service."
 msgstr "Mottog ogiltig \"%s\" begäran (storlek %d)\n"
 
-#: src/peerstore/peerstore_api.c:790
+#: src/peerstore/peerstore_api.c:779
 msgid "Received a watch result for a non existing watch.\n"
 msgstr ""
 
@@ -5935,61 +5995,61 @@ msgstr "GNUnet-konfiguration"
 msgid "Daemon to announce regular expressions for the peer using cadet."
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1366
+#: src/regex/gnunet-regex-profiler.c:1365
 #, fuzzy
 msgid "No configuration file given. Exiting\n"
 msgstr "använd konfigurationsfil FILNAMN"
 
-#: src/regex/gnunet-regex-profiler.c:1408
+#: src/regex/gnunet-regex-profiler.c:1407
 #: src/regex/gnunet-regex-simulation-profiler.c:631
 #, c-format
 msgid "No policy directory specified on command line. Exiting.\n"
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1414
+#: src/regex/gnunet-regex-profiler.c:1413
 #: src/regex/gnunet-regex-simulation-profiler.c:639
 #, c-format
 msgid "Specified policies directory does not exist. Exiting.\n"
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1422
+#: src/regex/gnunet-regex-profiler.c:1421
 #, fuzzy, c-format
 msgid "No files found in `%s'\n"
 msgstr "%d filer hittades i katalog.\n"
 
-#: src/regex/gnunet-regex-profiler.c:1431
+#: src/regex/gnunet-regex-profiler.c:1430
 msgid "No search strings file given. Exiting.\n"
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1451
+#: src/regex/gnunet-regex-profiler.c:1450
 #, fuzzy
 msgid "Error loading search strings. Exiting.\n"
 msgstr "Fel vid lämning av DHT.\n"
 
-#: src/regex/gnunet-regex-profiler.c:1540
+#: src/regex/gnunet-regex-profiler.c:1539
 #, fuzzy
 msgid "name of the file for writing statistics"
 msgstr "Visa värde av alternativet"
 
-#: src/regex/gnunet-regex-profiler.c:1547
+#: src/regex/gnunet-regex-profiler.c:1546
 msgid "wait TIMEOUT before ending the experiment"
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1553
+#: src/regex/gnunet-regex-profiler.c:1552
 msgid "directory with policy files"
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1560
+#: src/regex/gnunet-regex-profiler.c:1559
 #, fuzzy
 msgid "name of file with input strings"
 msgstr "Visa värde av alternativet"
 
-#: src/regex/gnunet-regex-profiler.c:1567
+#: src/regex/gnunet-regex-profiler.c:1566
 #, fuzzy
 msgid "name of file with hosts' names"
 msgstr "Visa värde av alternativet"
 
-#: src/regex/gnunet-regex-profiler.c:1582
+#: src/regex/gnunet-regex-profiler.c:1581
 msgid "Profiler for regex"
 msgstr ""
 
@@ -6011,17 +6071,17 @@ msgstr ""
 msgid "Regex `%s' is too long!\n"
 msgstr "\"%s\" är inte en fil.\n"
 
-#: src/regex/regex_api_search.c:212
+#: src/regex/regex_api_search.c:200
 #, fuzzy, c-format
 msgid "Search string `%s' is too long!\n"
 msgstr "\"%s\" är inte en fil.\n"
 
-#: src/rest/gnunet-rest-server.c:1367
+#: src/rest/gnunet-rest-server.c:1366
 #, fuzzy
 msgid "GNUnet REST server"
 msgstr "Spåra GNUnets nätverkstopologi."
 
-#: src/rest/plugin_rest_config.c:429
+#: src/rest/plugin_rest_config.c:428
 #, fuzzy
 msgid "CONFIG REST API initialized\n"
 msgstr " Anslutning misslyckades\n"
@@ -6228,63 +6288,63 @@ msgstr ""
 msgid "Get peers from biased stream"
 msgstr ""
 
-#: src/scalarproduct/gnunet-scalarproduct.c:229
+#: src/scalarproduct/gnunet-scalarproduct.c:228
 #, fuzzy
 msgid "You must specify at least one message ID to check!\n"
 msgstr "Du måste ange en lista av filer att lägga in.\n"
 
-#: src/scalarproduct/gnunet-scalarproduct.c:237
+#: src/scalarproduct/gnunet-scalarproduct.c:236
 msgid "This program needs a session identifier for comparing vectors.\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-scalarproduct.c:250
+#: src/scalarproduct/gnunet-scalarproduct.c:249
 #, c-format
 msgid ""
 "Tried to set initiator mode, as peer ID was given. However, `%s' is not a "
 "valid peer identifier.\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-scalarproduct.c:268
+#: src/scalarproduct/gnunet-scalarproduct.c:267
 msgid "Need elements to compute the scalarproduct, got none.\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-scalarproduct.c:291
+#: src/scalarproduct/gnunet-scalarproduct.c:290
 #, fuzzy, c-format
 msgid "Malformed input, could not parse `%s'\n"
 msgstr "Misslyckades att starta samling.\n"
 
-#: src/scalarproduct/gnunet-scalarproduct.c:309
+#: src/scalarproduct/gnunet-scalarproduct.c:308
 #, fuzzy, c-format
 msgid "Could not convert `%s' to int64_t.\n"
 msgstr "Kunde inte ansluta till gnunetd.\n"
 
-#: src/scalarproduct/gnunet-scalarproduct.c:339
+#: src/scalarproduct/gnunet-scalarproduct.c:338
 #, c-format
 msgid "Failed to initiate computation, were all keys unique?\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-scalarproduct.c:365
-#: src/scalarproduct/gnunet-scalarproduct.c:372
+#: src/scalarproduct/gnunet-scalarproduct.c:364
+#: src/scalarproduct/gnunet-scalarproduct.c:371
 msgid ""
 "A comma separated list of elements to compare as vector with our remote peer."
 msgstr ""
 
-#: src/scalarproduct/gnunet-scalarproduct.c:379
+#: src/scalarproduct/gnunet-scalarproduct.c:378
 msgid ""
 "[Optional] peer to calculate our scalarproduct with. If this parameter is "
 "not given, the service will wait for a remote peer to compute the request."
 msgstr ""
 
-#: src/scalarproduct/gnunet-scalarproduct.c:386
+#: src/scalarproduct/gnunet-scalarproduct.c:385
 msgid "Transaction ID shared with peer."
 msgstr ""
 
-#: src/scalarproduct/gnunet-scalarproduct.c:397
+#: src/scalarproduct/gnunet-scalarproduct.c:396
 msgid "Calculate the Vectorproduct with a GNUnet peer."
 msgstr ""
 
 #: src/scalarproduct/gnunet-service-scalarproduct-ecc_alice.c:1118
-#: src/scalarproduct/gnunet-service-scalarproduct-ecc_bob.c:1034
+#: src/scalarproduct/gnunet-service-scalarproduct-ecc_bob.c:1032
 #: src/scalarproduct/gnunet-service-scalarproduct_alice.c:1358
 #: src/scalarproduct/gnunet-service-scalarproduct_bob.c:1355
 #, fuzzy
@@ -6311,7 +6371,7 @@ msgstr ""
 msgid "also profile decryption"
 msgstr ""
 
-#: src/set/gnunet-service-set.c:1916 src/seti/gnunet-service-seti.c:2467
+#: src/set/gnunet-service-set.c:1914 src/seti/gnunet-service-seti.c:2467
 #: src/setu/gnunet-service-setu.c:5389
 #, fuzzy
 msgid "Could not connect to CADET service\n"
@@ -6369,16 +6429,16 @@ msgstr ""
 msgid "return intersection instead of delta"
 msgstr ""
 
-#: src/sq/sq.c:54
+#: src/sq/sq.c:47
 #, c-format
 msgid "Failure to bind %u-th SQL parameter\n"
 msgstr ""
 
-#: src/sq/sq.c:61
+#: src/sq/sq.c:54
 msgid "Failure in sqlite3_reset (!)\n"
 msgstr ""
 
-#: src/sq/sq.c:139
+#: src/sq/sq.c:126
 #, fuzzy, c-format
 msgid "Failed to reset sqlite statement with error: %s\n"
 msgstr "\"%s\" misslyckades för fil \"%s\" vid %s:%d med fel: %s\n"
@@ -6586,57 +6646,57 @@ msgid ""
 "Cannot open %s for writing load statistics.  Not logging load statistics\n"
 msgstr ""
 
-#: src/testbed/gnunet-service-testbed_peers.c:1165
+#: src/testbed/gnunet-service-testbed_peers.c:1153
 #, fuzzy, c-format
 msgid "%s is stopped"
 msgstr "# byte krypterade"
 
-#: src/testbed/gnunet-service-testbed_peers.c:1168
+#: src/testbed/gnunet-service-testbed_peers.c:1156
 #, fuzzy, c-format
 msgid "%s is starting"
 msgstr "\"%s\" startar\n"
 
-#: src/testbed/gnunet-service-testbed_peers.c:1171
+#: src/testbed/gnunet-service-testbed_peers.c:1159
 #, c-format
 msgid "%s is stopping"
 msgstr ""
 
-#: src/testbed/gnunet-service-testbed_peers.c:1174
+#: src/testbed/gnunet-service-testbed_peers.c:1162
 #, fuzzy, c-format
 msgid "%s is starting already"
 msgstr "\"%s\" startar\n"
 
-#: src/testbed/gnunet-service-testbed_peers.c:1177
+#: src/testbed/gnunet-service-testbed_peers.c:1165
 #, c-format
 msgid "%s is stopping already"
 msgstr ""
 
-#: src/testbed/gnunet-service-testbed_peers.c:1180
+#: src/testbed/gnunet-service-testbed_peers.c:1168
 #, c-format
 msgid "%s is started already"
 msgstr ""
 
-#: src/testbed/gnunet-service-testbed_peers.c:1183
+#: src/testbed/gnunet-service-testbed_peers.c:1171
 #, c-format
 msgid "%s is stopped already"
 msgstr ""
 
-#: src/testbed/gnunet-service-testbed_peers.c:1186
+#: src/testbed/gnunet-service-testbed_peers.c:1174
 #, fuzzy, c-format
 msgid "%s service is not known to ARM"
 msgstr "\"%s\" är inte en fil.\n"
 
-#: src/testbed/gnunet-service-testbed_peers.c:1189
+#: src/testbed/gnunet-service-testbed_peers.c:1177
 #, fuzzy, c-format
 msgid "%s service failed to start"
 msgstr "Misslyckades att starta samling.\n"
 
-#: src/testbed/gnunet-service-testbed_peers.c:1192
+#: src/testbed/gnunet-service-testbed_peers.c:1180
 #, c-format
 msgid "%s service can't be started because ARM is shutting down"
 msgstr ""
 
-#: src/testbed/gnunet-service-testbed_peers.c:1194
+#: src/testbed/gnunet-service-testbed_peers.c:1182
 #, c-format
 msgid "%.s Unknown result code."
 msgstr ""
@@ -6657,17 +6717,17 @@ msgstr ""
 msgid "Adding host %u failed with error: %s\n"
 msgstr "\"%s\" misslyckades vid %s:%d med fel: %s\n"
 
-#: src/testbed/testbed_api_hosts.c:429
+#: src/testbed/testbed_api_hosts.c:411
 #, fuzzy, c-format
 msgid "Hosts file %s not found\n"
 msgstr "\"%s\" misslyckades: tabell hittades inte!\n"
 
-#: src/testbed/testbed_api_hosts.c:438
+#: src/testbed/testbed_api_hosts.c:420
 #, c-format
 msgid "Hosts file %s has no data\n"
 msgstr ""
 
-#: src/testbed/testbed_api_hosts.c:447
+#: src/testbed/testbed_api_hosts.c:429
 #, c-format
 msgid "Hosts file %s cannot be read\n"
 msgstr ""
@@ -6681,87 +6741,87 @@ msgstr ""
 msgid "Host registration failed for a host. Error: %s\n"
 msgstr ""
 
-#: src/testbed/testbed_api_testbed.c:1065
+#: src/testbed/testbed_api_testbed.c:1060
 msgid "Controller crash detected. Shutting down.\n"
 msgstr ""
 
-#: src/testbed/testbed_api_testbed.c:1154
+#: src/testbed/testbed_api_testbed.c:1149
 #, c-format
 msgid "Host %s cannot start testbed\n"
 msgstr ""
 
-#: src/testbed/testbed_api_testbed.c:1158
+#: src/testbed/testbed_api_testbed.c:1153
 msgid "Testbed cannot be started on localhost\n"
 msgstr ""
 
-#: src/testbed/testbed_api_testbed.c:1196
+#: src/testbed/testbed_api_testbed.c:1191
 msgid "Cannot start the master controller"
 msgstr ""
 
-#: src/testbed/testbed_api_testbed.c:1214
+#: src/testbed/testbed_api_testbed.c:1209
 msgid "Shutting down testbed due to timeout while setup.\n"
 msgstr ""
 
-#: src/testbed/testbed_api_testbed.c:1276
+#: src/testbed/testbed_api_testbed.c:1271
 msgid "No hosts loaded. Need at least one host\n"
 msgstr ""
 
-#: src/testbed/testbed_api_testbed.c:1301
+#: src/testbed/testbed_api_testbed.c:1296
 msgid "Specified topology must be supported by testbed"
 msgstr ""
 
-#: src/testbed/testbed_api_testbed.c:1357
+#: src/testbed/testbed_api_testbed.c:1352
 #, c-format
 msgid ""
 "Maximum number of edges a peer can have in a scale free topology cannot be "
 "more than %u.  Given `%s = %llu'"
 msgstr ""
 
-#: src/testbed/testbed_api_testbed.c:1374
+#: src/testbed/testbed_api_testbed.c:1369
 #, c-format
 msgid ""
 "The number of edges that can established when adding a new node to scale "
 "free topology cannot be more than %u.  Given `%s = %llu'"
 msgstr ""
 
-#: src/testbed/testbed_api_topology.c:1033 src/testing/testing.c:2753
+#: src/testbed/testbed_api_topology.c:1021 src/testing/testing.c:2693
 #, fuzzy, c-format
 msgid "Topology file %s not found\n"
 msgstr "\"%s\" misslyckades: tabell hittades inte!\n"
 
-#: src/testbed/testbed_api_topology.c:1041 src/testing/testing.c:2761
+#: src/testbed/testbed_api_topology.c:1029 src/testing/testing.c:2701
 #, c-format
 msgid "Topology file %s has no data\n"
 msgstr ""
 
-#: src/testbed/testbed_api_topology.c:1049 src/testing/testing.c:2769
+#: src/testbed/testbed_api_topology.c:1037 src/testing/testing.c:2709
 #, c-format
 msgid "Topology file %s cannot be read\n"
 msgstr ""
 
-#: src/testbed/testbed_api_topology.c:1071
+#: src/testbed/testbed_api_topology.c:1059
 #, fuzzy, c-format
 msgid "Failed to read peer index from toology file: %s"
 msgstr "Kunde inte tolka konfigurationsfil \"%s\".\n"
 
-#: src/testbed/testbed_api_topology.c:1080
-#: src/testbed/testbed_api_topology.c:1105
+#: src/testbed/testbed_api_topology.c:1068
+#: src/testbed/testbed_api_topology.c:1093
 #, c-format
 msgid "Value in given topology file: %s out of range\n"
 msgstr ""
 
-#: src/testbed/testbed_api_topology.c:1086
-#: src/testbed/testbed_api_topology.c:1111
+#: src/testbed/testbed_api_topology.c:1074
+#: src/testbed/testbed_api_topology.c:1099
 #, fuzzy, c-format
 msgid "Failed to read peer index from topology file: %s"
 msgstr "Kunde inte tolka konfigurationsfil \"%s\".\n"
 
-#: src/testbed/testbed_api_topology.c:1092
-#: src/testbed/testbed_api_topology.c:1117
+#: src/testbed/testbed_api_topology.c:1080
+#: src/testbed/testbed_api_topology.c:1105
 msgid "Topology file needs more peers than given ones\n"
 msgstr ""
 
-#: src/testbed/testbed_api_topology.c:1153
+#: src/testbed/testbed_api_topology.c:1141
 #, fuzzy, c-format
 msgid "Ignoring to connect peer %lu to peer %lu\n"
 msgstr "Kan inte ansluta till %u.%u.%u.%u:%u: %s\n"
@@ -6861,7 +6921,7 @@ msgstr "Kunde inte spara konfigurationsfil \"%s\":"
 msgid "Failed to start `%s': %s\n"
 msgstr "Fel vid %s:%d.\n"
 
-#: src/testing/testing.c:1694
+#: src/testing/testing.c:1646
 #, fuzzy, c-format
 msgid "Failed to load configuration from %s\n"
 msgstr "Kunde inte spara konfigurationsfil \"%s\":"
@@ -6942,7 +7002,7 @@ msgstr ""
 #: src/transport/gnunet-communicator-tcp.c:3347
 #: src/transport/gnunet-communicator-udp.c:3871
 #: src/transport/gnunet-service-tng.c:11334
-#: src/transport/gnunet-service-transport.c:2622
+#: src/transport/gnunet-service-transport.c:2617
 #, fuzzy
 msgid "Transport service is lacking key configuration settings. Exiting.\n"
 msgstr "GNUnet-konfiguration"
@@ -7009,12 +7069,12 @@ msgstr ""
 msgid "Disallowing connection to peer `%s' on transport %s\n"
 msgstr "Kunde inte slå upp \"%s\": %s\n"
 
-#: src/transport/gnunet-service-transport.c:2547
+#: src/transport/gnunet-service-transport.c:2542
 #, fuzzy, c-format
 msgid "Adding blacklisting entry for peer `%s'\n"
 msgstr "Motpart \"%s\" med pålitlighet %8u och adress \"%s\"\n"
 
-#: src/transport/gnunet-service-transport.c:2556
+#: src/transport/gnunet-service-transport.c:2551
 #, c-format
 msgid "Adding blacklisting entry for peer `%s':`%s'\n"
 msgstr ""
@@ -7042,7 +7102,7 @@ msgid "# disconnects due to quota of 0"
 msgstr ""
 
 #: src/transport/gnunet-service-transport_neighbours.c:1341
-#: src/transport/gnunet-service-transport_neighbours.c:1817
+#: src/transport/gnunet-service-transport_neighbours.c:1807
 msgid "# bytes in message queue for other peers"
 msgstr ""
 
@@ -7121,148 +7181,148 @@ msgstr ""
 msgid "# ms throttling suggested"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1886
+#: src/transport/gnunet-service-transport_neighbours.c:1876
 #, fuzzy, c-format
 msgid "Failed to send SYN message to peer `%s'\n"
 msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1912
+#: src/transport/gnunet-service-transport_neighbours.c:1902
 #, fuzzy
 msgid "# Failed attempts to switch addresses (failed to send SYN CONT)"
 msgstr "Misslyckades att skicka HTTP-begäran till värd \"%s\": %s\n"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1953
+#: src/transport/gnunet-service-transport_neighbours.c:1943
 #, fuzzy
 msgid "# SYN messages sent"
 msgstr "# krypterade PONG-meddelanden mottagna"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1970
+#: src/transport/gnunet-service-transport_neighbours.c:1960
 #, fuzzy, c-format
 msgid "Failed to transmit SYN message to %s\n"
 msgstr "Misslyckades att initiera tjänsten \"%s\".\n"
 
-#: src/transport/gnunet-service-transport_neighbours.c:2006
+#: src/transport/gnunet-service-transport_neighbours.c:1996
 #, fuzzy
 msgid "# Failed attempts to switch addresses (failed to send SYN)"
 msgstr "Misslyckades att skicka HTTP-begäran till värd \"%s\": %s\n"
 
-#: src/transport/gnunet-service-transport_neighbours.c:2077
+#: src/transport/gnunet-service-transport_neighbours.c:2067
 #, fuzzy, c-format
 msgid "Failed to send SYN_ACK message to peer `%s' using address `%s'\n"
 msgstr "Misslyckades att ansluta till gnunetd.\n"
 
-#: src/transport/gnunet-service-transport_neighbours.c:2132
+#: src/transport/gnunet-service-transport_neighbours.c:2122
 #, fuzzy
 msgid "# SYN_ACK messages sent"
 msgstr "# krypterade PONG-meddelanden mottagna"
 
-#: src/transport/gnunet-service-transport_neighbours.c:2150
+#: src/transport/gnunet-service-transport_neighbours.c:2140
 #, fuzzy, c-format
 msgid "Failed to transmit SYN_ACK message to %s\n"
 msgstr "Misslyckades att initiera tjänsten \"%s\".\n"
 
-#: src/transport/gnunet-service-transport_neighbours.c:2314
+#: src/transport/gnunet-service-transport_neighbours.c:2304
 #, fuzzy
 msgid "# SYN messages received"
 msgstr "# PING-meddelanden skapade"
 
-#: src/transport/gnunet-service-transport_neighbours.c:2320
+#: src/transport/gnunet-service-transport_neighbours.c:2310
 #, c-format
 msgid "SYN request from peer `%s' ignored due impending shutdown\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:2731
+#: src/transport/gnunet-service-transport_neighbours.c:2721
 msgid "# Attempts to switch addresses"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3244
+#: src/transport/gnunet-service-transport_neighbours.c:3227
 #, fuzzy
 msgid "# SYN_ACK messages received"
 msgstr "# krypterade PONG-meddelanden mottagna"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3252
+#: src/transport/gnunet-service-transport_neighbours.c:3235
 #, fuzzy
 msgid "# unexpected SYN_ACK messages (no peer)"
 msgstr "skicka ANTAL meddelanden"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3272
-#: src/transport/gnunet-service-transport_neighbours.c:3300
+#: src/transport/gnunet-service-transport_neighbours.c:3255
+#: src/transport/gnunet-service-transport_neighbours.c:3283
 #, fuzzy
 msgid "# unexpected SYN_ACK messages (not ready)"
 msgstr "skicka ANTAL meddelanden"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3315
+#: src/transport/gnunet-service-transport_neighbours.c:3298
 #, fuzzy
 msgid "# unexpected SYN_ACK messages (waiting on ATS)"
 msgstr "skicka ANTAL meddelanden"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3345
+#: src/transport/gnunet-service-transport_neighbours.c:3328
 msgid "# Successful attempts to switch addresses"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3359
+#: src/transport/gnunet-service-transport_neighbours.c:3342
 #, fuzzy
 msgid "# unexpected SYN_ACK messages (disconnecting)"
 msgstr "skicka ANTAL meddelanden"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3548
+#: src/transport/gnunet-service-transport_neighbours.c:3531
 #, fuzzy
 msgid "# ACK messages received"
 msgstr "# krypterade PONG-meddelanden mottagna"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3582
+#: src/transport/gnunet-service-transport_neighbours.c:3565
 #, fuzzy
 msgid "# unexpected ACK messages"
 msgstr "# krypterade PONG-meddelanden skickade"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3672
+#: src/transport/gnunet-service-transport_neighbours.c:3648
 #, fuzzy
 msgid "# quota messages ignored (malformed)"
 msgstr "# byte mottogs via TCP"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3679
+#: src/transport/gnunet-service-transport_neighbours.c:3655
 #, fuzzy
 msgid "# QUOTA messages received"
 msgstr "# krypterade PONG-meddelanden mottagna"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3722
+#: src/transport/gnunet-service-transport_neighbours.c:3698
 msgid "# disconnect messages ignored (malformed)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3729
+#: src/transport/gnunet-service-transport_neighbours.c:3705
 #, fuzzy
 msgid "# DISCONNECT messages received"
 msgstr "# krypterade PONG-meddelanden mottagna"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3742
+#: src/transport/gnunet-service-transport_neighbours.c:3718
 msgid "# disconnect messages ignored (timestamp)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3879
+#: src/transport/gnunet-service-transport_neighbours.c:3855
 #, fuzzy
 msgid "# disconnected from peer upon explicit request"
 msgstr "# av anslutna parter"
 
-#: src/transport/gnunet-service-transport_plugins.c:157
+#: src/transport/gnunet-service-transport_plugins.c:144
 msgid "Transport service is lacking NEIGHBOUR_LIMIT option.\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_plugins.c:222
-#: src/transport/gnunet-service-transport_plugins.c:230
-#: src/transport/gnunet-service-transport_plugins.c:238
-#: src/transport/gnunet-service-transport_plugins.c:246
-#: src/transport/gnunet-service-transport_plugins.c:254
-#: src/transport/gnunet-service-transport_plugins.c:262
-#: src/transport/gnunet-service-transport_plugins.c:270
-#: src/transport/gnunet-service-transport_plugins.c:278
-#: src/transport/gnunet-service-transport_plugins.c:286
-#: src/transport/gnunet-service-transport_plugins.c:294
-#: src/transport/gnunet-service-transport_plugins.c:302
+#: src/transport/gnunet-service-transport_plugins.c:209
+#: src/transport/gnunet-service-transport_plugins.c:217
+#: src/transport/gnunet-service-transport_plugins.c:225
+#: src/transport/gnunet-service-transport_plugins.c:233
+#: src/transport/gnunet-service-transport_plugins.c:241
+#: src/transport/gnunet-service-transport_plugins.c:249
+#: src/transport/gnunet-service-transport_plugins.c:257
+#: src/transport/gnunet-service-transport_plugins.c:265
+#: src/transport/gnunet-service-transport_plugins.c:273
+#: src/transport/gnunet-service-transport_plugins.c:281
+#: src/transport/gnunet-service-transport_plugins.c:289
 #, fuzzy, c-format
 msgid "Missing function `%s' in transport plugin for `%s'\n"
 msgstr "Kunde inte slå upp \"%s\": %s\n"
 
-#: src/transport/gnunet-service-transport_plugins.c:309
+#: src/transport/gnunet-service-transport_plugins.c:296
 #, c-format
 msgid "Did not load plugin `%s' due to missing functions\n"
 msgstr ""
@@ -7546,7 +7606,7 @@ msgstr ""
 msgid "send data for benchmarking to the other peer (until CTRL-C)"
 msgstr ""
 
-#: src/transport/plugin_transport_http_client.c:1488
+#: src/transport/plugin_transport_http_client.c:1482
 #: src/transport/plugin_transport_http_server.c:2331
 #: src/transport/plugin_transport_http_server.c:3562
 #: src/transport/plugin_transport_tcp.c:3773
@@ -7554,25 +7614,25 @@ msgstr ""
 msgid "TCP_STEALTH not supported on this platform.\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_client.c:2134
+#: src/transport/plugin_transport_http_client.c:2128
 #, c-format
 msgid "Could not initialize curl multi handle, failed to start %s plugin!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_client.c:2183
+#: src/transport/plugin_transport_http_client.c:2177
 #: src/transport/plugin_transport_http_server.c:3276
 #, fuzzy, c-format
 msgid "Shutting down plugin `%s'\n"
 msgstr "Testar transport(er) %s\n"
 
-#: src/transport/plugin_transport_http_client.c:2200
+#: src/transport/plugin_transport_http_client.c:2194
 #: src/transport/plugin_transport_http_server.c:3346
 #, fuzzy, c-format
 msgid "Shutdown for plugin `%s' complete\n"
 msgstr ""
 "Uppladdning av \"%s\" klar, aktuell genomsnittshastighet är %8.3f kbps.\n"
 
-#: src/transport/plugin_transport_http_client.c:2234
+#: src/transport/plugin_transport_http_client.c:2228
 #, fuzzy, c-format
 msgid "Maximum number of requests is %u\n"
 msgstr "Maximalt antal chattklienter uppnått.\n"
@@ -7999,7 +8059,7 @@ msgstr "\"%s\" misslyckades för port %d: %s. Körs 
verkligen gnunetd?\n"
 msgid "`%s' failed for `%s': address already in use\n"
 msgstr "\"%s\" misslyckades för port %d: %s. Körs verkligen gnunetd?\n"
 
-#: src/transport/tcp_server_legacy.c:897
+#: src/transport/tcp_server_legacy.c:892
 #, c-format
 msgid ""
 "Processing code for message of type %u did not call "
@@ -8226,20 +8286,20 @@ msgstr ""
 msgid "INVALID"
 msgstr ""
 
-#: src/util/common_logging.c:1396
+#: src/util/common_logging.c:1360
 msgid "unknown address"
 msgstr ""
 
-#: src/util/common_logging.c:1441
+#: src/util/common_logging.c:1405
 msgid "invalid address"
 msgstr ""
 
-#: src/util/common_logging.c:1453
+#: src/util/common_logging.c:1417
 #, fuzzy, c-format
 msgid "Configuration fails to specify option `%s' in section `%s'!\n"
 msgstr "Konfigurationsfil \"%s\" skapad.\n"
 
-#: src/util/common_logging.c:1468
+#: src/util/common_logging.c:1432
 #, fuzzy, c-format
 msgid ""
 "Configuration specifies invalid value for option `%s' in section `%s': %s\n"
@@ -8391,12 +8451,12 @@ msgstr "Kunde inte köra \"%s\": %s\n"
 msgid "Received DNS response that is too small (%u bytes)\n"
 msgstr ""
 
-#: src/util/dnsstub.c:508
+#: src/util/dnsstub.c:503
 #, fuzzy, c-format
 msgid "Failed to send DNS request to %s: %s\n"
 msgstr "Misslyckades att skicka HTTP-begäran till värd \"%s\": %s\n"
 
-#: src/util/dnsstub.c:513
+#: src/util/dnsstub.c:508
 #, fuzzy, c-format
 msgid "Sent DNS request to %s\n"
 msgstr "Misslyckades att skicka HTTP-begäran till värd \"%s\": %s\n"
@@ -8777,28 +8837,28 @@ msgstr ""
 msgid "Use built-in GNUnet stub resolver"
 msgstr ""
 
-#: src/util/gnunet-scrypt.c:215
+#: src/util/gnunet-scrypt.c:214
 #, fuzzy, c-format
 msgid "Loading hostkey from `%s' failed.\n"
 msgstr "Tolkning av HTTP-svar för URL \"%s\" misslyckades.\n"
 
-#: src/util/gnunet-scrypt.c:281
+#: src/util/gnunet-scrypt.c:280
 msgid "number of bits to require for the proof of work"
 msgstr ""
 
-#: src/util/gnunet-scrypt.c:287
+#: src/util/gnunet-scrypt.c:286
 msgid "file with private key, otherwise default is used"
 msgstr ""
 
-#: src/util/gnunet-scrypt.c:293
+#: src/util/gnunet-scrypt.c:292
 msgid "file with proof of work, otherwise default is used"
 msgstr ""
 
-#: src/util/gnunet-scrypt.c:299
+#: src/util/gnunet-scrypt.c:298
 msgid "time to wait between calculations"
 msgstr ""
 
-#: src/util/gnunet-scrypt.c:313
+#: src/util/gnunet-scrypt.c:312
 #, fuzzy
 msgid "Manipulate GNUnet proof of work files"
 msgstr "skriv ut ett värde från konfigurationsfilen till standard ut"
@@ -8831,17 +8891,17 @@ msgstr ""
 msgid "Perform default-actions for GNUnet URIs"
 msgstr ""
 
-#: src/util/helper.c:323
+#: src/util/helper.c:306
 #, fuzzy, c-format
 msgid "Error reading from `%s': %s\n"
 msgstr "Fel vid skapandet av användare"
 
-#: src/util/helper.c:375
+#: src/util/helper.c:358
 #, fuzzy, c-format
 msgid "Failed to parse inbound message from helper `%s'\n"
 msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 
-#: src/util/helper.c:606
+#: src/util/helper.c:573
 #, fuzzy, c-format
 msgid "Error writing to `%s': %s\n"
 msgstr "Fel vid skapandet av användare"
@@ -8851,25 +8911,25 @@ msgstr "Fel vid skapandet av användare"
 msgid "Unable to shorten unix path `%s' while keeping name unique\n"
 msgstr ""
 
-#: src/util/network.c:1307
+#: src/util/network.c:1284
 #, c-format
 msgid ""
 "Fatal internal logic error, process hangs in `%s' (abort with CTRL-C)!\n"
 msgstr ""
 
-#: src/util/os_installation.c:420
+#: src/util/os_installation.c:415
 #, c-format
 msgid ""
 "Could not determine installation path for %s.  Set `%s' environment "
 "variable.\n"
 msgstr ""
 
-#: src/util/os_installation.c:791
+#: src/util/os_installation.c:786
 #, 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:824
+#: src/util/os_installation.c:819
 #, c-format
 msgid "Binary `%s' exists, but is not SUID\n"
 msgstr ""
@@ -8914,7 +8974,7 @@ msgstr "Kunde inte spara konfigurationsfil \"%s\":"
 msgid "Malformed configuration. Exiting ...\n"
 msgstr "Kunde inte spara konfigurationsfil \"%s\":"
 
-#: src/util/regex.c:139
+#: src/util/regex.c:123
 #, c-format
 msgid "Bad mask: %d\n"
 msgstr ""
@@ -9235,22 +9295,16 @@ msgstr "# byte mottagna via UDP"
 msgid "Setup tunnels via VPN."
 msgstr ""
 
-#: src/zonemaster/gnunet-service-zonemaster-monitor.c:249
-#: src/zonemaster/gnunet-service-zonemaster.c:364
+#: src/zonemaster/gnunet-service-zonemaster.c:521
 #, fuzzy, c-format
 msgid "Failed to replicate block in namecache: %s\n"
 msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 
-#: src/zonemaster/gnunet-service-zonemaster-monitor.c:529
-#: src/zonemaster/gnunet-service-zonemaster.c:969
+#: src/zonemaster/gnunet-service-zonemaster.c:1383
 #, fuzzy
 msgid "Failed to connect to the namestore!\n"
 msgstr "Misslyckades att ansluta till gnunetd.\n"
 
-#: src/zonemaster/gnunet-service-zonemaster-monitor.c:550
-msgid "Namecache is disabled!\n"
-msgstr ""
-
 #, fuzzy, c-format
 #~ msgid "Invalid DID `%s'\n"
 #~ msgstr "Ogiltiga argument: "
@@ -9542,10 +9596,6 @@ msgstr ""
 #~ 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 connect to CREDENTIAL\n"
-#~ msgstr "Misslyckades att ansluta till gnunetd.\n"
-
 #, fuzzy
 #~ msgid "GNUnet credential resolver tool"
 #~ msgstr "Spåra GNUnets nätverkstopologi."
diff --git a/po/vi.po b/po/vi.po
index 7c335d868..72e2b2c7a 100644
--- a/po/vi.po
+++ b/po/vi.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnunet 0.8.0a\n"
 "Report-Msgid-Bugs-To: gnunet-developers@mail.gnu.org\n"
-"POT-Creation-Date: 2022-10-16 18:47+0900\n"
+"POT-Creation-Date: 2022-10-21 13:20+0900\n"
 "PO-Revision-Date: 2008-09-10 22:05+0930\n"
 "Last-Translator: Clytie Siddall <clytie@riverland.net.au>\n"
 "Language-Team: Vietnamese <vi-VN@googlegroups.com>\n"
@@ -19,7 +19,10 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 "X-Generator: LocFactoryEditor 1.7b3\n"
 
-#: src/abd/gnunet-abd.c:392 src/namestore/gnunet-namestore.c:1245
+#: src/abd/gnunet-abd.c:392 src/namestore/gnunet-namestore-zonefile.c:193
+#: src/namestore/gnunet-namestore-zonefile.c:652
+#: src/namestore/gnunet-namestore-zonefile.c:673
+#: src/namestore/gnunet-namestore.c:1245
 #, c-format
 msgid "Ego `%s' not known to identity service\n"
 msgstr ""
@@ -168,16 +171,16 @@ msgstr "Không thể lưu tập tin cấu hình « %s »:"
 msgid "Failed to remove servicehome directory %s\n"
 msgstr "Lỗi truy cập đến thư mục nhà GNUnet « %s »\n"
 
-#: src/arm/gnunet-arm.c:229 src/testbed/gnunet-service-testbed_peers.c:1144
+#: src/arm/gnunet-arm.c:229 src/testbed/gnunet-service-testbed_peers.c:1132
 msgid "Message was sent successfully"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:232 src/testbed/gnunet-service-testbed_peers.c:1147
+#: src/arm/gnunet-arm.c:232 src/testbed/gnunet-service-testbed_peers.c:1135
 #, fuzzy
 msgid "We disconnected from ARM before we could send a request"
 msgstr "# các yêu cầu lỗ hổng bị bỏ do trọng tải"
 
-#: src/arm/gnunet-arm.c:234 src/testbed/gnunet-service-testbed_peers.c:1149
+#: src/arm/gnunet-arm.c:234 src/testbed/gnunet-service-testbed_peers.c:1137
 #, fuzzy
 msgid "Unknown request status"
 msgstr "Không rõ người dùng « %s »\n"
@@ -1384,165 +1387,165 @@ msgstr "Lưu cấu hình ngay bây giờ không?"
 msgid "Core service of `%s' ready.\n"
 msgstr "Không gian tên « %s » có đánh giá %d.\n"
 
-#: src/core/gnunet-service-core_kx.c:512
+#: src/core/gnunet-service-core_kx.c:513
 msgid "# bytes encrypted"
 msgstr "# các byte đã mã hoá"
 
-#: src/core/gnunet-service-core_kx.c:570
+#: src/core/gnunet-service-core_kx.c:571
 msgid "# bytes decrypted"
 msgstr "# các byte đã giải mã"
 
-#: src/core/gnunet-service-core_kx.c:667
+#: src/core/gnunet-service-core_kx.c:668
 #, fuzzy
 msgid "# PAYLOAD dropped (out of order)"
 msgstr "# các byte loại bỏ bởi UDP (đi ra)"
 
-#: src/core/gnunet-service-core_kx.c:719
+#: src/core/gnunet-service-core_kx.c:720
 msgid "# key exchanges initiated"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:775
+#: src/core/gnunet-service-core_kx.c:776
 msgid "# key exchanges stopped"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:807
+#: src/core/gnunet-service-core_kx.c:808
 #, fuzzy
 msgid "# PING messages transmitted"
 msgstr "# các thông báo PING được tạo"
 
-#: src/core/gnunet-service-core_kx.c:866
+#: src/core/gnunet-service-core_kx.c:867
 msgid "# old ephemeral keys ignored"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:880
+#: src/core/gnunet-service-core_kx.c:881
 #, fuzzy
 msgid "# duplicate ephemeral keys ignored"
 msgstr "# các thông báo phát hiện dht được nhận"
 
-#: src/core/gnunet-service-core_kx.c:915
+#: src/core/gnunet-service-core_kx.c:916
 #, fuzzy
 msgid "# EPHEMERAL_KEYs rejected (bad signature)"
 msgstr "# các thông báo được chắp liền"
 
-#: src/core/gnunet-service-core_kx.c:933
+#: src/core/gnunet-service-core_kx.c:934
 #, c-format
 msgid ""
 "EPHEMERAL_KEY from peer `%s' rejected as its validity range does not match "
 "our system time (%llu not in [%llu,%llu]).\n"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:940
+#: src/core/gnunet-service-core_kx.c:941
 #, fuzzy
 msgid "# EPHEMERAL_KEY messages rejected due to time"
 msgstr "# các thông báo được chắp liền"
 
-#: src/core/gnunet-service-core_kx.c:958
+#: src/core/gnunet-service-core_kx.c:959
 #, fuzzy
 msgid "# valid ephemeral keys received"
 msgstr "# các thông báo phát hiện dht được nhận"
 
-#: src/core/gnunet-service-core_kx.c:1067
+#: src/core/gnunet-service-core_kx.c:1068
 #: src/transport/gnunet-service-transport_validation.c:1133
 #, fuzzy
 msgid "# PING messages received"
 msgstr "# các thông báo PING được tạo"
 
-#: src/core/gnunet-service-core_kx.c:1077
+#: src/core/gnunet-service-core_kx.c:1078
 #, fuzzy
 msgid "# PING messages dropped (out of order)"
 msgstr "# các yêu cầu lỗ hổng bị bỏ do trọng tải"
 
-#: src/core/gnunet-service-core_kx.c:1126
+#: src/core/gnunet-service-core_kx.c:1127
 #, fuzzy
 msgid "# PONG messages created"
 msgstr "# các thông báo PING được tạo"
 
-#: src/core/gnunet-service-core_kx.c:1151
+#: src/core/gnunet-service-core_kx.c:1152
 #, 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:1164
+#: src/core/gnunet-service-core_kx.c:1165
 #, 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:1221
+#: src/core/gnunet-service-core_kx.c:1222
 #: src/transport/gnunet-service-transport_validation.c:1476
 #, 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:1229
+#: src/core/gnunet-service-core_kx.c:1230
 #, fuzzy
 msgid "# PONG messages dropped (connection down)"
 msgstr "# các thông báo PONG đã mật mã được nhận"
 
-#: src/core/gnunet-service-core_kx.c:1237
+#: src/core/gnunet-service-core_kx.c:1238
 #, fuzzy
 msgid "# PONG messages dropped (out of order)"
 msgstr "# các yêu cầu lỗ hổng bị bỏ do trọng tải"
 
-#: src/core/gnunet-service-core_kx.c:1276
+#: src/core/gnunet-service-core_kx.c:1277
 #, fuzzy
 msgid "# PONG messages decrypted"
 msgstr "# các thông báo PING được tạo"
 
-#: src/core/gnunet-service-core_kx.c:1316
+#: src/core/gnunet-service-core_kx.c:1317
 #, 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:1328
+#: src/core/gnunet-service-core_kx.c:1329
 #, fuzzy
 msgid "# timeouts prevented via PONG"
 msgstr "# các byte đã nhận qua TCP"
 
-#: src/core/gnunet-service-core_kx.c:1337
+#: src/core/gnunet-service-core_kx.c:1338
 #, fuzzy
 msgid "# rekey operations confirmed via PONG"
 msgstr "# Các quảng cáo đồng đẳng được xác nhận qua PONG"
 
-#: src/core/gnunet-service-core_kx.c:1506
+#: src/core/gnunet-service-core_kx.c:1507
 #, fuzzy
 msgid "# DATA message dropped (out of order)"
 msgstr "# các byte loại bỏ bởi UDP (đi ra)"
 
-#: src/core/gnunet-service-core_kx.c:1517
+#: src/core/gnunet-service-core_kx.c:1518
 #, c-format
 msgid ""
 "Session to peer `%s' went down due to key expiration (should not happen)\n"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1521
+#: src/core/gnunet-service-core_kx.c:1522
 #, fuzzy
 msgid "# sessions terminated by key expiration"
 msgstr "# các byte loại đi bởi TCP (đi ra)"
 
-#: src/core/gnunet-service-core_kx.c:1599
-#: src/core/gnunet-service-core_kx.c:1626
+#: src/core/gnunet-service-core_kx.c:1600
+#: src/core/gnunet-service-core_kx.c:1627
 #, fuzzy
 msgid "# bytes dropped (duplicates)"
 msgstr "# các byte loại bỏ bởi UDP (đi ra)"
 
-#: src/core/gnunet-service-core_kx.c:1612
+#: src/core/gnunet-service-core_kx.c:1613
 #, 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:1657
+#: src/core/gnunet-service-core_kx.c:1658
 #, 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:1666
+#: src/core/gnunet-service-core_kx.c:1667
 #, fuzzy
 msgid "# bytes of payload decrypted"
 msgstr "# các byte đã giải mã"
 
 #: src/core/gnunet-service-core_sessions.c:252
 #: src/core/gnunet-service-core_sessions.c:337
-#: src/fs/gnunet-service-fs_cp.c:601 src/fs/gnunet-service-fs_cp.c:1496
+#: src/fs/gnunet-service-fs_cp.c:601 src/fs/gnunet-service-fs_cp.c:1494
 #: src/topology/gnunet-daemon-topology.c:579
 #: src/topology/gnunet-daemon-topology.c:671
 #: src/transport/gnunet-service-transport_neighbours.c:723
@@ -1788,7 +1791,7 @@ msgstr ""
 #: src/datastore/gnunet-service-datastore.c:626
 #: src/datastore/gnunet-service-datastore.c:677
 #: src/datastore/gnunet-service-datastore.c:820
-#: src/datastore/gnunet-service-datastore.c:1429
+#: src/datastore/gnunet-service-datastore.c:1428
 msgid "# reserved"
 msgstr ""
 
@@ -1839,70 +1842,70 @@ msgstr ""
 msgid "# bytes removed (explicit request)"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1059
+#: src/datastore/gnunet-service-datastore.c:1058
 #, fuzzy
 msgid "# REMOVE requests received"
 msgstr "# các yêu cầu get (lấy) dht được nhận"
 
-#: src/datastore/gnunet-service-datastore.c:1108
+#: src/datastore/gnunet-service-datastore.c:1107
 #, c-format
 msgid ""
 "Datastore payload must have been inaccurate (%lld < %lld). Recomputing it.\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1113
-#: src/datastore/gnunet-service-datastore.c:1282
+#: src/datastore/gnunet-service-datastore.c:1112
+#: src/datastore/gnunet-service-datastore.c:1281
 #, c-format
 msgid "New payload: %lld\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1168
+#: src/datastore/gnunet-service-datastore.c:1167
 #, c-format
 msgid "Loading `%s' datastore plugin\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1177
+#: src/datastore/gnunet-service-datastore.c:1176
 #, fuzzy, c-format
 msgid "Failed to load datastore plugin for `%s'\n"
 msgstr "Không thể nạp phần bổ sung truyền tải « %s »\n"
 
-#: src/datastore/gnunet-service-datastore.c:1237
+#: src/datastore/gnunet-service-datastore.c:1236
 msgid "Bloomfilter construction complete.\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1289
+#: src/datastore/gnunet-service-datastore.c:1288
 msgid "Rebuilding bloomfilter.  Please be patient.\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1299
+#: src/datastore/gnunet-service-datastore.c:1298
 msgid "Plugin does not support get_keys function. Please fix!\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1464
+#: src/datastore/gnunet-service-datastore.c:1463
 #, fuzzy, c-format
 msgid "# bytes used in file-sharing datastore `%s'"
 msgstr "# các byte được phép trong kho dữ liệu"
 
-#: src/datastore/gnunet-service-datastore.c:1473
+#: src/datastore/gnunet-service-datastore.c:1472
 msgid "# quota"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1476
+#: src/datastore/gnunet-service-datastore.c:1475
 msgid "# cache size"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1492
+#: src/datastore/gnunet-service-datastore.c:1491
 #, c-format
 msgid "Could not use specified filename `%s' for bloomfilter.\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1513
-#: src/datastore/gnunet-service-datastore.c:1535
+#: src/datastore/gnunet-service-datastore.c:1512
+#: src/datastore/gnunet-service-datastore.c:1534
 #, fuzzy, c-format
 msgid "Failed to remove bogus bloomfilter file `%s'\n"
 msgstr "Không thể lưu tập tin cấu hình « %s »:"
 
-#: src/datastore/gnunet-service-datastore.c:1574
+#: src/datastore/gnunet-service-datastore.c:1573
 #, fuzzy
 msgid "Failed to initialize bloomfilter.\n"
 msgstr "Lỗi sơ khởi dịch vụ « %s ».\n"
@@ -1959,7 +1962,7 @@ msgstr "« %s » bị lỗi tại %s:%d với lỗi: %s"
 
 #: src/datastore/plugin_datastore_sqlite.c:310
 #: src/namecache/plugin_namecache_sqlite.c:180
-#: src/namestore/plugin_namestore_sqlite.c:868
+#: src/namestore/plugin_namestore_sqlite.c:891
 #: src/peerstore/plugin_peerstore_sqlite.c:540
 #, c-format
 msgid "Unable to initialize SQLite: %s.\n"
@@ -2217,7 +2220,7 @@ msgstr ""
 msgid "# DNS requests received via TUN interface"
 msgstr "# các đáp ứng lỗ hổng được gửi cho trình/máy khách"
 
-#: src/dns/gnunet-service-dns.c:1117 src/exit/gnunet-daemon-exit.c:3708
+#: src/dns/gnunet-service-dns.c:1117 src/exit/gnunet-daemon-exit.c:3707
 #, fuzzy
 msgid "need a valid IPv4 or IPv6 address\n"
 msgstr "Mức ưu tiên tiến trình không hợp lê « %s ».\n"
@@ -2372,69 +2375,69 @@ msgstr ""
 msgid "Packet from unknown protocol %u received.  Ignored.\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3377 src/exit/gnunet-daemon-exit.c:3388
+#: src/exit/gnunet-daemon-exit.c:3376 src/exit/gnunet-daemon-exit.c:3387
 #, fuzzy, c-format
 msgid "Option `%s' for domain `%s' is not formatted correctly!\n"
 msgstr "Bị từ chối đặt tùy chọn « %s » trong phần « %s » thành « %s ».\n"
 
-#: src/exit/gnunet-daemon-exit.c:3402 src/exit/gnunet-daemon-exit.c:3410
+#: src/exit/gnunet-daemon-exit.c:3401 src/exit/gnunet-daemon-exit.c:3409
 #, c-format
 msgid "`%s' is not a valid port number (for domain `%s')!"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3452
+#: src/exit/gnunet-daemon-exit.c:3451
 #, c-format
 msgid "No addresses found for hostname `%s' of service `%s'!\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3467 src/exit/gnunet-daemon-exit.c:3482
+#: src/exit/gnunet-daemon-exit.c:3466 src/exit/gnunet-daemon-exit.c:3481
 #, c-format
 msgid "Service `%s' configured for IPv4, but IPv4 is disabled!\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3496
+#: src/exit/gnunet-daemon-exit.c:3495
 #, c-format
 msgid "No IP addresses found for hostname `%s' of service `%s'!\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3641
+#: src/exit/gnunet-daemon-exit.c:3640
 msgid ""
 "This system does not support IPv4, will disable IPv4 functions despite them "
 "being enabled in the configuration\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3650
+#: src/exit/gnunet-daemon-exit.c:3649
 msgid ""
 "This system does not support IPv6, will disable IPv6 functions despite them "
 "being enabled in the configuration\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3658
+#: src/exit/gnunet-daemon-exit.c:3657
 msgid ""
 "Cannot enable IPv4 exit but disable IPv4 on TUN interface, will use "
 "ENABLE_IPv4=YES\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3665
+#: src/exit/gnunet-daemon-exit.c:3664
 msgid ""
 "Cannot enable IPv6 exit but disable IPv6 on TUN interface, will use "
 "ENABLE_IPv6=YES\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3836
+#: src/exit/gnunet-daemon-exit.c:3835
 msgid "Must be a number"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3952
+#: src/exit/gnunet-daemon-exit.c:3951
 #, c-format
 msgid "`%s' is not SUID or the path is invalid, EXIT will not work\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3964 src/pt/gnunet-daemon-pt.c:1212
+#: src/exit/gnunet-daemon-exit.c:3963 src/pt/gnunet-daemon-pt.c:1212
 msgid "No useful service enabled.  Exiting.\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:4118
+#: src/exit/gnunet-daemon-exit.c:4117
 msgid "Daemon to run to provide an IP exit node for the VPN"
 msgstr ""
 
@@ -2625,7 +2628,7 @@ msgstr "Lỗi mở tập tin ghi sự kiện « %s »: %s\n"
 msgid "internal error decoding tree"
 msgstr "=\tLỗi đọc thư mục.\n"
 
-#: src/fs/fs_download.c:1890
+#: src/fs/fs_download.c:1889
 #, fuzzy
 msgid "Invalid URI"
 msgstr "Dữ liệu nhập không hợp lệ.\n"
@@ -2646,7 +2649,7 @@ msgstr ""
 "\n"
 "Không nhận được đáp ứng từ gnunetd.\n"
 
-#: src/fs/fs_list_indexed.c:195
+#: src/fs/fs_list_indexed.c:187
 #, fuzzy, c-format
 msgid "Failed to not connect to `%s' service.\n"
 msgstr "Lỗi sơ khởi dịch vụ « %s ».\n"
@@ -2671,7 +2674,7 @@ msgstr "Lỗi chạy %s: %s %d\n"
 msgid "Failed to read `%s': %s\n"
 msgstr "Lỗi chạy %s: %s %d\n"
 
-#: src/fs/fs_namespace.c:472
+#: src/fs/fs_namespace.c:457
 #, fuzzy
 msgid "Failed to connect to datastore."
 msgstr "Không kết nối được đến trình nền gnunetd."
@@ -2812,93 +2815,93 @@ msgstr "Không kết nối được đến trình nền gnunetd."
 msgid "Failed to compute hash of file."
 msgstr "Không kết nối được đến trình nền gnunetd."
 
-#: src/fs/fs_uri.c:239
+#: src/fs/fs_uri.c:231
 #, no-c-format
 msgid "Malformed KSK URI (`%' must be followed by HEX number)"
 msgstr ""
 
-#: src/fs/fs_uri.c:298
+#: src/fs/fs_uri.c:290
 msgid "Malformed KSK URI (must not begin or end with `+')"
 msgstr ""
 
-#: src/fs/fs_uri.c:316
+#: src/fs/fs_uri.c:308
 msgid "Malformed KSK URI (`++' not allowed)"
 msgstr ""
 
-#: src/fs/fs_uri.c:323
+#: src/fs/fs_uri.c:315
 msgid "Malformed KSK URI (quotes not balanced)"
 msgstr ""
 
-#: src/fs/fs_uri.c:390
+#: src/fs/fs_uri.c:382
 msgid "Malformed SKS URI (wrong syntax)"
 msgstr ""
 
-#: src/fs/fs_uri.c:431
+#: src/fs/fs_uri.c:423
 msgid "Malformed CHK URI (wrong syntax)"
 msgstr ""
 
-#: src/fs/fs_uri.c:448
+#: src/fs/fs_uri.c:440
 msgid "Malformed CHK URI (failed to decode CHK)"
 msgstr ""
 
-#: src/fs/fs_uri.c:525
+#: src/fs/fs_uri.c:517
 msgid "LOC URI malformed (wrong syntax)"
 msgstr ""
 
-#: src/fs/fs_uri.c:542
+#: src/fs/fs_uri.c:534
 msgid "LOC URI malformed (no CHK)"
 msgstr ""
 
-#: src/fs/fs_uri.c:552
+#: src/fs/fs_uri.c:544
 msgid "LOC URI malformed (missing LOC)"
 msgstr ""
 
-#: src/fs/fs_uri.c:560
+#: src/fs/fs_uri.c:552
 msgid "LOC URI malformed (wrong syntax for public key)"
 msgstr ""
 
-#: src/fs/fs_uri.c:569
+#: src/fs/fs_uri.c:561
 msgid "LOC URI malformed (could not decode public key)"
 msgstr ""
 
-#: src/fs/fs_uri.c:575
+#: src/fs/fs_uri.c:567
 msgid "LOC URI malformed (could not find signature)"
 msgstr ""
 
-#: src/fs/fs_uri.c:582
+#: src/fs/fs_uri.c:574
 msgid "LOC URI malformed (wrong syntax for signature)"
 msgstr ""
 
-#: src/fs/fs_uri.c:593
+#: src/fs/fs_uri.c:585
 msgid "LOC URI malformed (could not decode signature)"
 msgstr ""
 
-#: src/fs/fs_uri.c:600
+#: src/fs/fs_uri.c:592
 msgid "LOC URI malformed (wrong syntax for expiration time)"
 msgstr ""
 
-#: src/fs/fs_uri.c:606
+#: src/fs/fs_uri.c:598
 msgid "LOC URI malformed (could not parse expiration time)"
 msgstr ""
 
-#: src/fs/fs_uri.c:620
+#: src/fs/fs_uri.c:612
 msgid "LOC URI malformed (signature failed validation)"
 msgstr ""
 
-#: src/fs/fs_uri.c:653
+#: src/fs/fs_uri.c:645
 #, fuzzy
 msgid "invalid argument"
 msgstr "Đối số không hợp lệ cho « %s ».\n"
 
-#: src/fs/fs_uri.c:673
+#: src/fs/fs_uri.c:665
 msgid "Unrecognized URI type"
 msgstr ""
 
-#: src/fs/fs_uri.c:1077 src/fs/fs_uri.c:1104
+#: src/fs/fs_uri.c:1060 src/fs/fs_uri.c:1087
 msgid "No keywords specified!\n"
 msgstr "Chưa ghi rõ từ khoá.\n"
 
-#: src/fs/fs_uri.c:1110
+#: src/fs/fs_uri.c:1093
 msgid "Number of double-quotes not balanced!\n"
 msgstr "Có dấu nháy kép thừa hay thiếu.\n"
 
@@ -3509,7 +3512,7 @@ msgid "# cadet client connections rejected"
 msgstr "# các kết nối dht"
 
 #: src/fs/gnunet-service-fs_cadet_server.c:394
-#: src/fs/gnunet-service-fs_cadet_server.c:434
+#: src/fs/gnunet-service-fs_cadet_server.c:433
 #, fuzzy
 msgid "# cadet connections active"
 msgstr "# các kết nối dht"
@@ -3575,7 +3578,7 @@ msgstr "# các yêu cầu lỗ hổng bị bỏ do trọng tải"
 msgid "# P2P query messages received and processed"
 msgstr "# các thông báo phát hiện dht được nhận"
 
-#: src/fs/gnunet-service-fs_cp.c:1679
+#: src/fs/gnunet-service-fs_cp.c:1677
 #, fuzzy
 msgid "# migration stop messages sent"
 msgstr "# các thông báo phát hiện dht được nhận"
@@ -3883,8 +3886,8 @@ msgstr ""
 #: src/hostlist/gnunet-daemon-hostlist_client.c:957
 #: src/hostlist/gnunet-daemon-hostlist_client.c:1059
 #: src/hostlist/gnunet-daemon-hostlist_client.c:1067
-#: src/transport/plugin_transport_http_client.c:600
-#: src/transport/plugin_transport_http_client.c:618
+#: src/transport/plugin_transport_http_client.c:599
+#: src/transport/plugin_transport_http_client.c:617
 #, c-format
 msgid "%s failed at %s:%d: `%s'\n"
 msgstr "%s bị lỗi tại %s:%d: « %s »\n"
@@ -3949,7 +3952,7 @@ msgstr "Không thể lưu tập tin cấu hình « %s »:"
 msgid "Failed to start HTTPS server for `%s'\n"
 msgstr "Lỗi bắt đầu thu thập.\n"
 
-#: src/gns/gnunet-gns-proxy.c:2919 src/rest/gnunet-rest-server.c:958
+#: src/gns/gnunet-gns-proxy.c:2919 src/rest/gnunet-rest-server.c:957
 #, fuzzy
 msgid "Failed to pass client to MHD\n"
 msgstr "Lỗi kết nối đến gnunetd.\n"
@@ -3969,24 +3972,24 @@ msgstr "Lệnh không được hỗ trợ « %s ». Đang hủy bỏ.\n"
 msgid "Unsupported socks address type %d\n"
 msgstr "Lệnh không được hỗ trợ « %s ». Đang hủy bỏ.\n"
 
-#: src/gns/gnunet-gns-proxy.c:3727
+#: src/gns/gnunet-gns-proxy.c:3726
 #, fuzzy, c-format
 msgid "Failed to load X.509 key and certificate from `%s'\n"
 msgstr "Lỗi đọc danh sách bạn bè từ « %s »\n"
 
-#: src/gns/gnunet-gns-proxy.c:3869
+#: src/gns/gnunet-gns-proxy.c:3868
 msgid "listen on specified port (default: 7777)"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:3874
+#: src/gns/gnunet-gns-proxy.c:3873
 msgid "pem file to use as CA"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:3878
+#: src/gns/gnunet-gns-proxy.c:3877
 msgid "disable use of IPv6"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:3904
+#: src/gns/gnunet-gns-proxy.c:3903
 msgid "GNUnet GNS proxy"
 msgstr ""
 
@@ -4036,21 +4039,19 @@ msgstr ""
 msgid "GNUnet GNS resolver tool"
 msgstr "Bản ghi lỗi GNUnet"
 
-#: src/gns/gnunet-service-gns.c:501
+#: src/gns/gnunet-service-gns.c:500
 #, fuzzy
 msgid "Properly base32-encoded public key required"
 msgstr "Đối số không hợp lệ cho « %s ».\n"
 
-#: src/gns/gnunet-service-gns.c:537
-#: src/zonemaster/gnunet-service-zonemaster-monitor.c:542
-#: src/zonemaster/gnunet-service-zonemaster.c:982
+#: src/gns/gnunet-service-gns.c:536
+#: src/zonemaster/gnunet-service-zonemaster.c:1396
 #, fuzzy
 msgid "Failed to connect to the namecache!\n"
 msgstr "Không kết nối được đến trình nền gnunetd."
 
-#: src/gns/gnunet-service-gns.c:556
-#: src/zonemaster/gnunet-service-zonemaster-monitor.c:572
-#: src/zonemaster/gnunet-service-zonemaster.c:1021
+#: src/gns/gnunet-service-gns.c:555
+#: src/zonemaster/gnunet-service-zonemaster.c:1435
 #, fuzzy
 msgid "Could not connect to DHT!\n"
 msgstr "Không thể kết nối tới %s:%u: %s\n"
@@ -4174,31 +4175,31 @@ msgstr ""
 msgid "Label  contains `.' which is not allowed\n"
 msgstr ""
 
-#: src/gnsrecord/gnsrecord_misc.c:467
+#: src/gnsrecord/gnsrecord_misc.c:481
 msgid "Zone delegation record not allowed in apex."
 msgstr ""
 
-#: src/gnsrecord/gnsrecord_misc.c:475
+#: src/gnsrecord/gnsrecord_misc.c:489
 msgid "Zone delegation record set contains mutually exclusive records."
 msgstr ""
 
-#: src/gnsrecord/gnsrecord_misc.c:485
+#: src/gnsrecord/gnsrecord_misc.c:499
 msgid "Multiple REDIRECT records."
 msgstr ""
 
-#: src/gnsrecord/gnsrecord_misc.c:494 src/gnsrecord/gnsrecord_misc.c:520
+#: src/gnsrecord/gnsrecord_misc.c:508 src/gnsrecord/gnsrecord_misc.c:534
 msgid "Redirection record set contains mutually exclusive records."
 msgstr ""
 
-#: src/gnsrecord/gnsrecord_misc.c:501
+#: src/gnsrecord/gnsrecord_misc.c:515
 msgid "Redirection records not allowed in apex."
 msgstr ""
 
-#: src/gnsrecord/gnsrecord_misc.c:512
+#: src/gnsrecord/gnsrecord_misc.c:526
 msgid "Redirection records not allowed in apex.."
 msgstr ""
 
-#: src/gnsrecord/gnsrecord_misc.c:534
+#: src/gnsrecord/gnsrecord_misc.c:548
 msgid "Mutually exclusive records."
 msgstr ""
 
@@ -4312,37 +4313,37 @@ msgstr "Gặp lỗi khi tạo người dùng"
 msgid "Modified %u addresses, wrote %u bytes\n"
 msgstr ""
 
-#: src/hello/hello.c:1111
+#: src/hello/hello.c:1089
 #, fuzzy
 msgid "Failed to parse HELLO message: missing expiration time\n"
 msgstr "Lỗi lưu cấu hình."
 
-#: src/hello/hello.c:1121
+#: src/hello/hello.c:1099
 #, fuzzy
 msgid "Failed to parse HELLO message: invalid expiration time\n"
 msgstr "Lỗi lưu cấu hình."
 
-#: src/hello/hello.c:1131
+#: src/hello/hello.c:1109
 #, fuzzy
 msgid "Failed to parse HELLO message: malformed\n"
 msgstr "Lỗi đọc danh sách bạn bè từ « %s »\n"
 
-#: src/hello/hello.c:1143
+#: src/hello/hello.c:1121
 #, fuzzy
 msgid "Failed to parse HELLO message: missing transport plugin\n"
 msgstr "Không thể nạp phần bổ sung truyền tải « %s »\n"
 
-#: src/hello/hello.c:1161
+#: src/hello/hello.c:1139
 #, c-format
 msgid "Plugin `%s' not found, skipping address\n"
 msgstr ""
 
-#: src/hello/hello.c:1169
+#: src/hello/hello.c:1147
 #, c-format
 msgid "Plugin `%s' does not support URIs yet\n"
 msgstr ""
 
-#: src/hello/hello.c:1184
+#: src/hello/hello.c:1162
 #, fuzzy, c-format
 msgid "Failed to parse `%s' as an address for plugin `%s'\n"
 msgstr "Lỗi đóng kết đến cổng %s %d.\n"
@@ -4401,7 +4402,7 @@ msgid "# valid HELLOs downloaded from hostlist servers"
 msgstr "# các HELLO tải xuống qua HTTP"
 
 #: src/hostlist/gnunet-daemon-hostlist_client.c:677
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1453
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1451
 msgid "# advertised hostlist URIs"
 msgstr ""
 
@@ -4452,7 +4453,7 @@ msgid "# hostlist downloads initiated"
 msgstr ""
 
 #: src/hostlist/gnunet-daemon-hostlist_client.c:1137
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1725
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1723
 msgid "# milliseconds between hostlist downloads"
 msgstr ""
 
@@ -4467,67 +4468,67 @@ msgstr ""
 msgid "# active connections"
 msgstr "# các kết nối dht"
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1389
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1387
 #, fuzzy, c-format
 msgid "Loading saved hostlist entries from file `%s' \n"
 msgstr "Đang thử tải danh sách các máy xuống « %s »\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1394
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1392
 #, fuzzy, c-format
 msgid "Hostlist file `%s' does not exist\n"
 msgstr "Khoá phiên chạy từ đồng đẳng « %s » không thể được thẩm tra.\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1405
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1403
 #, fuzzy, c-format
 msgid "Could not open file `%s' for reading to load hostlists: %s\n"
 msgstr "Lỗi mở tập tin theo dõi « %s »: %s\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1446
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1444
 #, c-format
 msgid "%u hostlist URIs loaded from file\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1449
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1447
 #, fuzzy
 msgid "# hostlist URIs read from file"
 msgstr "# các byte danh sách máy được trả về"
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1500
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1498
 #, fuzzy, c-format
 msgid "Could not open file `%s' for writing to save hostlists: %s\n"
 msgstr "Lỗi mở tập tin theo dõi « %s »: %s\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1507
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1505
 #, fuzzy, c-format
 msgid "Writing %u hostlist URIs to `%s'\n"
 msgstr "Đang thử tải danh sách các máy xuống « %s »\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1540
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1559
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1538
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1557
 #, c-format
 msgid "Error writing hostlist URIs to file `%s'\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1553
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1551
 #, fuzzy
 msgid "# hostlist URIs written to file"
 msgstr "# các byte danh sách máy được trả về"
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1654
-#: src/transport/plugin_transport_http_client.c:2294
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1652
+#: src/transport/plugin_transport_http_client.c:2288
 #, c-format
 msgid "Invalid proxy type: `%s', disabling proxy! Check configuration!\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1683
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1681
 msgid "Learning is enabled on this peer\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1696
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1694
 msgid "Learning is not enabled on this peer\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1710
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1708
 #, c-format
 msgid ""
 "Since learning is not enabled on this peer, hostlist file `%s' was removed\n"
@@ -4604,7 +4605,7 @@ msgid "# hostlist advertisements send"
 msgstr "# Các quảng cáo ngoại được chuyển tiếp"
 
 #: src/hostlist/gnunet-daemon-hostlist_server.c:674
-#: src/transport/gnunet-service-transport.c:2657
+#: src/transport/gnunet-service-transport.c:2652
 #, fuzzy
 msgid "Could not access PEERINFO service.  Exiting.\n"
 msgstr "Không thể truy cập đến thông tin về không gian tên.\n"
@@ -4725,49 +4726,49 @@ msgstr ""
 msgid "Maintain egos"
 msgstr ""
 
-#: src/identity/gnunet-service-identity.c:502
+#: src/identity/gnunet-service-identity.c:501
 msgid "no default known"
 msgstr ""
 
-#: src/identity/gnunet-service-identity.c:527
+#: src/identity/gnunet-service-identity.c:526
 msgid "default configured, but ego unknown (internal error)"
 msgstr ""
 
-#: src/identity/gnunet-service-identity.c:620
-#: src/identity/gnunet-service-identity.c:895
-#: src/identity/gnunet-service-identity.c:1015
+#: src/identity/gnunet-service-identity.c:618
+#: src/identity/gnunet-service-identity.c:891
+#: src/identity/gnunet-service-identity.c:1010
 #, fuzzy, c-format
 msgid "Failed to write subsystem default identifier map to `%s'.\n"
 msgstr "Lỗi đọc danh sách bạn bè từ « %s »\n"
 
-#: src/identity/gnunet-service-identity.c:630
+#: src/identity/gnunet-service-identity.c:628
 msgid "Unknown ego specified for service (internal error)"
 msgstr ""
 
-#: src/identity/gnunet-service-identity.c:724
+#: src/identity/gnunet-service-identity.c:721
 msgid "identifier already in use for another ego"
 msgstr ""
 
-#: src/identity/gnunet-service-identity.c:871
+#: src/identity/gnunet-service-identity.c:867
 msgid "target name already exists"
 msgstr ""
 
-#: src/identity/gnunet-service-identity.c:913
-#: src/identity/gnunet-service-identity.c:1032
+#: src/identity/gnunet-service-identity.c:909
+#: src/identity/gnunet-service-identity.c:1027
 msgid "no matching ego found"
 msgstr ""
 
-#: src/identity/gnunet-service-identity.c:1130
+#: src/identity/gnunet-service-identity.c:1125
 #, fuzzy, c-format
 msgid "Failed to parse ego information in `%s'\n"
 msgstr "Lỗi đọc danh sách bạn bè từ « %s »\n"
 
-#: src/identity/gnunet-service-identity.c:1188
+#: src/identity/gnunet-service-identity.c:1183
 #, fuzzy, c-format
 msgid "Failed to parse subsystem identity configuration file `%s'\n"
 msgstr "Không thể lưu tập tin cấu hình « %s »:"
 
-#: src/identity/gnunet-service-identity.c:1197
+#: src/identity/gnunet-service-identity.c:1192
 #, fuzzy, c-format
 msgid "Failed to create directory `%s' for storing egos\n"
 msgstr "Lỗi đọc danh sách bạn bè từ « %s »\n"
@@ -4848,17 +4849,19 @@ msgstr "xác định mức ưu tiên của nội dung"
 msgid "GNUnet zone manipulation tool"
 msgstr "Cấu hình GNUnet"
 
-#: src/namecache/namecache_api.c:286
+#: src/namecache/namecache_api.c:285
 msgid "Namecache failed to cache block"
 msgstr ""
 
-#: src/namecache/namecache_api.c:374
+#: src/namecache/namecache_api.c:373
 #, fuzzy
 msgid "Error communicating with namecache service"
 msgstr "Cổng để liên lạc với giao diện người dùng GNUnet"
 
 #: src/namecache/plugin_namecache_flat.c:118
 #: src/namecache/plugin_namecache_flat.c:253
+#: src/namestore/plugin_namestore_flat.c:176
+#: src/namestore/plugin_namestore_flat.c:424
 #: src/peerstore/plugin_peerstore_flat.c:380
 #: src/peerstore/plugin_peerstore_flat.c:542
 #, fuzzy, c-format
@@ -4866,6 +4869,7 @@ msgid "Unable to initialize file: %s.\n"
 msgstr "Không thể sơ khởi SQLite: %s.\n"
 
 #: src/namecache/plugin_namecache_flat.c:129
+#: src/namestore/plugin_namestore_flat.c:187
 #: src/peerstore/plugin_peerstore_flat.c:395
 #, fuzzy, c-format
 msgid "Unable to get filesize: %s.\n"
@@ -4907,6 +4911,7 @@ msgid "the namestore plugin to work with, e.g. 'sqlite'"
 msgstr ""
 
 #: src/namestore/gnunet-namestore-dbtool.c:178
+#: src/namestore/gnunet-namestore-zonefile.c:750
 #, fuzzy
 msgid "GNUnet namestore database manipulation tool"
 msgstr "Cấu hình GNUnet"
@@ -5015,6 +5020,47 @@ msgstr ""
 msgid "GNU Name System First-Come-First-Served name registration service"
 msgstr ""
 
+#: src/namestore/gnunet-namestore-zonefile.c:329
+#, fuzzy, c-format
+msgid "Failed to store records...\n"
+msgstr "Lỗi bắt đầu thu thập.\n"
+
+#: src/namestore/gnunet-namestore-zonefile.c:437
+#: src/namestore/gnunet-namestore-zonefile.c:469
+#, fuzzy, c-format
+msgid "Name `%s' is too long\n"
+msgstr "« %s » không phải là một tập tin.\n"
+
+#: src/namestore/gnunet-namestore-zonefile.c:515
+#, c-format
+msgid "You must provide $ORIGIN in your zonefile or via arguments (--zone)!\n"
+msgstr ""
+
+#: src/namestore/gnunet-namestore-zonefile.c:524
+#, c-format
+msgid "Only %u records per unique name supported.\n"
+msgstr ""
+
+#: src/namestore/gnunet-namestore-zonefile.c:586
+#, fuzzy, c-format
+msgid "Data `%s' invalid\n"
+msgstr "Định dạng của biệt hiệu « %s » là không hợp lệ.\n"
+
+#: src/namestore/gnunet-namestore-zonefile.c:702
+#, fuzzy, c-format
+msgid "Failed to connect to NAMESTORE\n"
+msgstr "Lỗi kết nối đến gnunetd.\n"
+
+#: src/namestore/gnunet-namestore-zonefile.c:709
+#, fuzzy, c-format
+msgid "Failed to connect to IDENTITY\n"
+msgstr "Lỗi kết nối đến gnunetd.\n"
+
+#: src/namestore/gnunet-namestore-zonefile.c:735
+#: src/namestore/gnunet-namestore.c:1628
+msgid "name of the ego controlling the zone"
+msgstr ""
+
 #: src/namestore/gnunet-namestore.c:340
 #, fuzzy, c-format
 msgid "Adding record failed: %s\n"
@@ -5214,21 +5260,21 @@ msgid ""
 "expired"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1628
-msgid "name of the ego controlling the zone"
-msgstr ""
-
-#: src/namestore/gnunet-service-namestore.c:1504
+#: src/namestore/gnunet-service-namestore.c:1673
 #, fuzzy
 msgid "Error normalizing name."
 msgstr "Hoàn thành tạo khoá.\n"
 
-#: src/namestore/gnunet-service-namestore.c:1522
+#: src/namestore/gnunet-service-namestore.c:1691
 #, fuzzy
 msgid "Error deserializing records."
 msgstr "=\tLỗi đọc thư mục.\n"
 
-#: src/namestore/gnunet-service-namestore.c:1633
+#: src/namestore/gnunet-service-namestore.c:1811
+msgid "Not records to delete."
+msgstr ""
+
+#: src/namestore/gnunet-service-namestore.c:1819
 #, fuzzy
 msgid "Store failed"
 msgstr "Kho dữ liệu đầy.\n"
@@ -5241,24 +5287,39 @@ msgstr ""
 msgid "minimum expiration time we assume for imported records"
 msgstr ""
 
+#: src/namestore/plugin_namestore_flat.c:195
+#, c-format
+msgid "File too big to map: %llu bytes.\n"
+msgstr ""
+
+#: src/namestore/plugin_namestore_flat.c:219
+#, c-format
+msgid "Namestore database file `%s' malformed\n"
+msgstr ""
+
+#: src/namestore/plugin_namestore_flat.c:792
+#, fuzzy
+msgid "Flat file database running\n"
+msgstr "kho dữ liệu sqlite"
+
 #: src/namestore/plugin_namestore_sqlite.c:180
 #: src/namestore/plugin_namestore_sqlite.c:190
-#: src/namestore/plugin_namestore_sqlite.c:806
+#: src/namestore/plugin_namestore_sqlite.c:829
 #, fuzzy, c-format
 msgid "Failed to setup database with: `%s'\n"
 msgstr "Lỗi chạy %s: %s %d\n"
 
-#: src/namestore/plugin_namestore_sqlite.c:797
+#: src/namestore/plugin_namestore_sqlite.c:820
 #, fuzzy, c-format
 msgid "Failed to drop database with: `%s'\n"
 msgstr "Lỗi chạy %s: %s %d\n"
 
-#: src/namestore/plugin_namestore_sqlite.c:938
+#: src/namestore/plugin_namestore_sqlite.c:961
 #, fuzzy
 msgid "SQlite database running\n"
 msgstr "kho dữ liệu sqlite"
 
-#: src/namestore/plugin_rest_namestore.c:1369
+#: src/namestore/plugin_rest_namestore.c:1414
 #, fuzzy
 msgid "Namestore REST API initialized\n"
 msgstr "Lỗi sơ khởi lõi.\n"
@@ -5577,7 +5638,7 @@ msgid "Show network size estimates from NSE service."
 msgstr "# các yêu cầu get (lấy) dht được nhận"
 
 #: src/nse/gnunet-service-nse.c:1441
-#: src/revocation/gnunet-service-revocation.c:888 src/util/gnunet-scrypt.c:243
+#: src/revocation/gnunet-service-revocation.c:888 src/util/gnunet-scrypt.c:242
 #, fuzzy
 msgid "Value is too large.\n"
 msgstr "Giá trị không nằm trong phạm vi được phép."
@@ -5657,19 +5718,19 @@ msgid "Print information about peers."
 msgstr "In ra thông tin về các đồng đẳng GNUnet."
 
 #: src/peerinfo-tool/gnunet-peerinfo_plugins.c:103
-#: src/transport/gnunet-service-transport_plugins.c:167
+#: src/transport/gnunet-service-transport_plugins.c:154
 #, fuzzy, c-format
 msgid "Starting transport plugins `%s'\n"
 msgstr "Đang nạp các truyền tải « %s »\n"
 
 #: src/peerinfo-tool/gnunet-peerinfo_plugins.c:107
-#: src/transport/gnunet-service-transport_plugins.c:172
+#: src/transport/gnunet-service-transport_plugins.c:159
 #, fuzzy, c-format
 msgid "Loading `%s' transport plugin\n"
 msgstr "Đang nạp các truyền tải « %s »\n"
 
 #: src/peerinfo-tool/gnunet-peerinfo_plugins.c:127
-#: src/transport/gnunet-service-transport_plugins.c:207
+#: src/transport/gnunet-service-transport_plugins.c:194
 #, 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"
@@ -5731,7 +5792,7 @@ msgstr ""
 msgid "Skipping import of included HELLOs\n"
 msgstr ""
 
-#: src/peerinfo/peerinfo_api.c:217
+#: src/peerinfo/peerinfo_api.c:210
 #, fuzzy
 msgid "Failed to receive response from `PEERINFO' service."
 msgstr ""
@@ -5757,7 +5818,7 @@ msgstr "Định dạng kết xuất không rõ, điều này không nên 
xảy r
 msgid "Received a malformed response from service."
 msgstr "Nhận yêu cầu định tuyến\n"
 
-#: src/peerstore/peerstore_api.c:790
+#: src/peerstore/peerstore_api.c:779
 msgid "Received a watch result for a non existing watch.\n"
 msgstr ""
 
@@ -5991,61 +6052,61 @@ msgstr "Lưu cấu hình ngay bây giờ không?"
 msgid "Daemon to announce regular expressions for the peer using cadet."
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1366
+#: src/regex/gnunet-regex-profiler.c:1365
 #, fuzzy
 msgid "No configuration file given. Exiting\n"
 msgstr "dùng tập tin cấu hình TÊN_TẬP_TIN"
 
-#: src/regex/gnunet-regex-profiler.c:1408
+#: src/regex/gnunet-regex-profiler.c:1407
 #: src/regex/gnunet-regex-simulation-profiler.c:631
 #, c-format
 msgid "No policy directory specified on command line. Exiting.\n"
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1414
+#: src/regex/gnunet-regex-profiler.c:1413
 #: src/regex/gnunet-regex-simulation-profiler.c:639
 #, c-format
 msgid "Specified policies directory does not exist. Exiting.\n"
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1422
+#: src/regex/gnunet-regex-profiler.c:1421
 #, fuzzy, c-format
 msgid "No files found in `%s'\n"
 msgstr "Vẫn còn không tìm thấy đồng đẳng trong « %s ».\n"
 
-#: src/regex/gnunet-regex-profiler.c:1431
+#: src/regex/gnunet-regex-profiler.c:1430
 msgid "No search strings file given. Exiting.\n"
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1451
+#: src/regex/gnunet-regex-profiler.c:1450
 #, fuzzy
 msgid "Error loading search strings. Exiting.\n"
 msgstr "Gặp lỗi khi tải xuống: %s\n"
 
-#: src/regex/gnunet-regex-profiler.c:1540
+#: src/regex/gnunet-regex-profiler.c:1539
 #, fuzzy
 msgid "name of the file for writing statistics"
 msgstr "Lỗi lấy thông kê về truyền tải.\n"
 
-#: src/regex/gnunet-regex-profiler.c:1547
+#: src/regex/gnunet-regex-profiler.c:1546
 msgid "wait TIMEOUT before ending the experiment"
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1553
+#: src/regex/gnunet-regex-profiler.c:1552
 msgid "directory with policy files"
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1560
+#: src/regex/gnunet-regex-profiler.c:1559
 #, fuzzy
 msgid "name of file with input strings"
 msgstr "Lỗi lấy thông kê về truyền tải.\n"
 
-#: src/regex/gnunet-regex-profiler.c:1567
+#: src/regex/gnunet-regex-profiler.c:1566
 #, fuzzy
 msgid "name of file with hosts' names"
 msgstr "Lỗi lấy thông kê về truyền tải.\n"
 
-#: src/regex/gnunet-regex-profiler.c:1582
+#: src/regex/gnunet-regex-profiler.c:1581
 msgid "Profiler for regex"
 msgstr ""
 
@@ -6066,17 +6127,17 @@ msgstr ""
 msgid "Regex `%s' is too long!\n"
 msgstr "« %s » không phải là một tập tin.\n"
 
-#: src/regex/regex_api_search.c:212
+#: src/regex/regex_api_search.c:200
 #, fuzzy, c-format
 msgid "Search string `%s' is too long!\n"
 msgstr "« %s » không phải là một tập tin.\n"
 
-#: src/rest/gnunet-rest-server.c:1367
+#: src/rest/gnunet-rest-server.c:1366
 #, fuzzy
 msgid "GNUnet REST server"
 msgstr "Bản ghi lỗi GNUnet"
 
-#: src/rest/plugin_rest_config.c:429
+#: src/rest/plugin_rest_config.c:428
 #, fuzzy
 msgid "CONFIG REST API initialized\n"
 msgstr "Lỗi sơ khởi lõi.\n"
@@ -6283,63 +6344,63 @@ msgstr ""
 msgid "Get peers from biased stream"
 msgstr ""
 
-#: src/scalarproduct/gnunet-scalarproduct.c:229
+#: src/scalarproduct/gnunet-scalarproduct.c:228
 #, fuzzy
 msgid "You must specify at least one message ID to check!\n"
 msgstr "Phải ghi rõ chỉ một tên tập tin để chèn.\n"
 
-#: src/scalarproduct/gnunet-scalarproduct.c:237
+#: src/scalarproduct/gnunet-scalarproduct.c:236
 msgid "This program needs a session identifier for comparing vectors.\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-scalarproduct.c:250
+#: src/scalarproduct/gnunet-scalarproduct.c:249
 #, c-format
 msgid ""
 "Tried to set initiator mode, as peer ID was given. However, `%s' is not a "
 "valid peer identifier.\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-scalarproduct.c:268
+#: src/scalarproduct/gnunet-scalarproduct.c:267
 msgid "Need elements to compute the scalarproduct, got none.\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-scalarproduct.c:291
+#: src/scalarproduct/gnunet-scalarproduct.c:290
 #, fuzzy, c-format
 msgid "Malformed input, could not parse `%s'\n"
 msgstr "Lỗi bắt đầu thu thập.\n"
 
-#: src/scalarproduct/gnunet-scalarproduct.c:309
+#: src/scalarproduct/gnunet-scalarproduct.c:308
 #, fuzzy, c-format
 msgid "Could not convert `%s' to int64_t.\n"
 msgstr "Không thể kết nối tới %s:%u: %s\n"
 
-#: src/scalarproduct/gnunet-scalarproduct.c:339
+#: src/scalarproduct/gnunet-scalarproduct.c:338
 #, c-format
 msgid "Failed to initiate computation, were all keys unique?\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-scalarproduct.c:365
-#: src/scalarproduct/gnunet-scalarproduct.c:372
+#: src/scalarproduct/gnunet-scalarproduct.c:364
+#: src/scalarproduct/gnunet-scalarproduct.c:371
 msgid ""
 "A comma separated list of elements to compare as vector with our remote peer."
 msgstr ""
 
-#: src/scalarproduct/gnunet-scalarproduct.c:379
+#: src/scalarproduct/gnunet-scalarproduct.c:378
 msgid ""
 "[Optional] peer to calculate our scalarproduct with. If this parameter is "
 "not given, the service will wait for a remote peer to compute the request."
 msgstr ""
 
-#: src/scalarproduct/gnunet-scalarproduct.c:386
+#: src/scalarproduct/gnunet-scalarproduct.c:385
 msgid "Transaction ID shared with peer."
 msgstr ""
 
-#: src/scalarproduct/gnunet-scalarproduct.c:397
+#: src/scalarproduct/gnunet-scalarproduct.c:396
 msgid "Calculate the Vectorproduct with a GNUnet peer."
 msgstr ""
 
 #: src/scalarproduct/gnunet-service-scalarproduct-ecc_alice.c:1118
-#: src/scalarproduct/gnunet-service-scalarproduct-ecc_bob.c:1034
+#: src/scalarproduct/gnunet-service-scalarproduct-ecc_bob.c:1032
 #: src/scalarproduct/gnunet-service-scalarproduct_alice.c:1358
 #: src/scalarproduct/gnunet-service-scalarproduct_bob.c:1355
 #, fuzzy
@@ -6366,7 +6427,7 @@ msgstr ""
 msgid "also profile decryption"
 msgstr ""
 
-#: src/set/gnunet-service-set.c:1916 src/seti/gnunet-service-seti.c:2467
+#: src/set/gnunet-service-set.c:1914 src/seti/gnunet-service-seti.c:2467
 #: src/setu/gnunet-service-setu.c:5389
 #, fuzzy
 msgid "Could not connect to CADET service\n"
@@ -6424,16 +6485,16 @@ msgstr ""
 msgid "return intersection instead of delta"
 msgstr ""
 
-#: src/sq/sq.c:54
+#: src/sq/sq.c:47
 #, c-format
 msgid "Failure to bind %u-th SQL parameter\n"
 msgstr ""
 
-#: src/sq/sq.c:61
+#: src/sq/sq.c:54
 msgid "Failure in sqlite3_reset (!)\n"
 msgstr ""
 
-#: src/sq/sq.c:139
+#: src/sq/sq.c:126
 #, fuzzy, c-format
 msgid "Failed to reset sqlite statement with error: %s\n"
 msgstr "« %s » không giải quyết được phương pháp « %s », với lỗi: %s\n"
@@ -6641,57 +6702,57 @@ msgid ""
 "Cannot open %s for writing load statistics.  Not logging load statistics\n"
 msgstr ""
 
-#: src/testbed/gnunet-service-testbed_peers.c:1165
+#: src/testbed/gnunet-service-testbed_peers.c:1153
 #, fuzzy, c-format
 msgid "%s is stopped"
 msgstr "# các byte trong kho dữ liệu"
 
-#: src/testbed/gnunet-service-testbed_peers.c:1168
+#: src/testbed/gnunet-service-testbed_peers.c:1156
 #, c-format
 msgid "%s is starting"
 msgstr ""
 
-#: src/testbed/gnunet-service-testbed_peers.c:1171
+#: src/testbed/gnunet-service-testbed_peers.c:1159
 #, c-format
 msgid "%s is stopping"
 msgstr ""
 
-#: src/testbed/gnunet-service-testbed_peers.c:1174
+#: src/testbed/gnunet-service-testbed_peers.c:1162
 #, fuzzy, c-format
 msgid "%s is starting already"
 msgstr "« %s » đang đăng ký trình điều khiển %d\n"
 
-#: src/testbed/gnunet-service-testbed_peers.c:1177
+#: src/testbed/gnunet-service-testbed_peers.c:1165
 #, c-format
 msgid "%s is stopping already"
 msgstr ""
 
-#: src/testbed/gnunet-service-testbed_peers.c:1180
+#: src/testbed/gnunet-service-testbed_peers.c:1168
 #, c-format
 msgid "%s is started already"
 msgstr ""
 
-#: src/testbed/gnunet-service-testbed_peers.c:1183
+#: src/testbed/gnunet-service-testbed_peers.c:1171
 #, c-format
 msgid "%s is stopped already"
 msgstr ""
 
-#: src/testbed/gnunet-service-testbed_peers.c:1186
+#: src/testbed/gnunet-service-testbed_peers.c:1174
 #, fuzzy, c-format
 msgid "%s service is not known to ARM"
 msgstr "Không gian tên « %s » có đánh giá %d.\n"
 
-#: src/testbed/gnunet-service-testbed_peers.c:1189
+#: src/testbed/gnunet-service-testbed_peers.c:1177
 #, fuzzy, c-format
 msgid "%s service failed to start"
 msgstr "Lỗi bắt đầu thu thập.\n"
 
-#: src/testbed/gnunet-service-testbed_peers.c:1192
+#: src/testbed/gnunet-service-testbed_peers.c:1180
 #, fuzzy, c-format
 msgid "%s service can't be started because ARM is shutting down"
 msgstr "« %s » đang tắt.\n"
 
-#: src/testbed/gnunet-service-testbed_peers.c:1194
+#: src/testbed/gnunet-service-testbed_peers.c:1182
 #, c-format
 msgid "%.s Unknown result code."
 msgstr ""
@@ -6712,17 +6773,17 @@ msgstr ""
 msgid "Adding host %u failed with error: %s\n"
 msgstr "« %s » thất bại với mã lỗi %d: %s\n"
 
-#: src/testbed/testbed_api_hosts.c:429
+#: src/testbed/testbed_api_hosts.c:411
 #, fuzzy, c-format
 msgid "Hosts file %s not found\n"
 msgstr "Khoá phiên chạy từ đồng đẳng « %s » không thể được thẩm tra.\n"
 
-#: src/testbed/testbed_api_hosts.c:438
+#: src/testbed/testbed_api_hosts.c:420
 #, fuzzy, c-format
 msgid "Hosts file %s has no data\n"
 msgstr "Khoá phiên chạy từ đồng đẳng « %s » không thể được thẩm tra.\n"
 
-#: src/testbed/testbed_api_hosts.c:447
+#: src/testbed/testbed_api_hosts.c:429
 #, fuzzy, c-format
 msgid "Hosts file %s cannot be read\n"
 msgstr "Khoá phiên chạy từ đồng đẳng « %s » không thể được thẩm tra.\n"
@@ -6736,87 +6797,87 @@ msgstr ""
 msgid "Host registration failed for a host. Error: %s\n"
 msgstr ""
 
-#: src/testbed/testbed_api_testbed.c:1065
+#: src/testbed/testbed_api_testbed.c:1060
 msgid "Controller crash detected. Shutting down.\n"
 msgstr ""
 
-#: src/testbed/testbed_api_testbed.c:1154
+#: src/testbed/testbed_api_testbed.c:1149
 #, c-format
 msgid "Host %s cannot start testbed\n"
 msgstr ""
 
-#: src/testbed/testbed_api_testbed.c:1158
+#: src/testbed/testbed_api_testbed.c:1153
 msgid "Testbed cannot be started on localhost\n"
 msgstr ""
 
-#: src/testbed/testbed_api_testbed.c:1196
+#: src/testbed/testbed_api_testbed.c:1191
 msgid "Cannot start the master controller"
 msgstr ""
 
-#: src/testbed/testbed_api_testbed.c:1214
+#: src/testbed/testbed_api_testbed.c:1209
 msgid "Shutting down testbed due to timeout while setup.\n"
 msgstr ""
 
-#: src/testbed/testbed_api_testbed.c:1276
+#: src/testbed/testbed_api_testbed.c:1271
 msgid "No hosts loaded. Need at least one host\n"
 msgstr ""
 
-#: src/testbed/testbed_api_testbed.c:1301
+#: src/testbed/testbed_api_testbed.c:1296
 msgid "Specified topology must be supported by testbed"
 msgstr ""
 
-#: src/testbed/testbed_api_testbed.c:1357
+#: src/testbed/testbed_api_testbed.c:1352
 #, c-format
 msgid ""
 "Maximum number of edges a peer can have in a scale free topology cannot be "
 "more than %u.  Given `%s = %llu'"
 msgstr ""
 
-#: src/testbed/testbed_api_testbed.c:1374
+#: src/testbed/testbed_api_testbed.c:1369
 #, c-format
 msgid ""
 "The number of edges that can established when adding a new node to scale "
 "free topology cannot be more than %u.  Given `%s = %llu'"
 msgstr ""
 
-#: src/testbed/testbed_api_topology.c:1033 src/testing/testing.c:2753
+#: src/testbed/testbed_api_topology.c:1021 src/testing/testing.c:2693
 #, fuzzy, c-format
 msgid "Topology file %s not found\n"
 msgstr "Khoá phiên chạy từ đồng đẳng « %s » không thể được thẩm tra.\n"
 
-#: src/testbed/testbed_api_topology.c:1041 src/testing/testing.c:2761
+#: src/testbed/testbed_api_topology.c:1029 src/testing/testing.c:2701
 #, fuzzy, c-format
 msgid "Topology file %s has no data\n"
 msgstr "Khoá phiên chạy từ đồng đẳng « %s » không thể được thẩm tra.\n"
 
-#: src/testbed/testbed_api_topology.c:1049 src/testing/testing.c:2769
+#: src/testbed/testbed_api_topology.c:1037 src/testing/testing.c:2709
 #, fuzzy, c-format
 msgid "Topology file %s cannot be read\n"
 msgstr "Khoá phiên chạy từ đồng đẳng « %s » không thể được thẩm tra.\n"
 
-#: src/testbed/testbed_api_topology.c:1071
+#: src/testbed/testbed_api_topology.c:1059
 #, fuzzy, c-format
 msgid "Failed to read peer index from toology file: %s"
 msgstr "Không thể truy cập đến tập tin gnunet-directory « %s »\n"
 
-#: src/testbed/testbed_api_topology.c:1080
-#: src/testbed/testbed_api_topology.c:1105
+#: src/testbed/testbed_api_topology.c:1068
+#: src/testbed/testbed_api_topology.c:1093
 #, c-format
 msgid "Value in given topology file: %s out of range\n"
 msgstr ""
 
-#: src/testbed/testbed_api_topology.c:1086
-#: src/testbed/testbed_api_topology.c:1111
+#: src/testbed/testbed_api_topology.c:1074
+#: src/testbed/testbed_api_topology.c:1099
 #, fuzzy, c-format
 msgid "Failed to read peer index from topology file: %s"
 msgstr "Không thể truy cập đến tập tin gnunet-directory « %s »\n"
 
-#: src/testbed/testbed_api_topology.c:1092
-#: src/testbed/testbed_api_topology.c:1117
+#: src/testbed/testbed_api_topology.c:1080
+#: src/testbed/testbed_api_topology.c:1105
 msgid "Topology file needs more peers than given ones\n"
 msgstr ""
 
-#: src/testbed/testbed_api_topology.c:1153
+#: src/testbed/testbed_api_topology.c:1141
 #, fuzzy, c-format
 msgid "Ignoring to connect peer %lu to peer %lu\n"
 msgstr "đang kết nối đồng đẳng %s:%d tới đồng đẳng %s:%d\n"
@@ -6915,7 +6976,7 @@ msgstr "Không thể lưu tập tin cấu hình « %s »:"
 msgid "Failed to start `%s': %s\n"
 msgstr "Lỗi chạy %s: %s %d\n"
 
-#: src/testing/testing.c:1694
+#: src/testing/testing.c:1646
 #, fuzzy, c-format
 msgid "Failed to load configuration from %s\n"
 msgstr "Không thể lưu tập tin cấu hình « %s »:"
@@ -7003,7 +7064,7 @@ msgstr ""
 #: src/transport/gnunet-communicator-tcp.c:3347
 #: src/transport/gnunet-communicator-udp.c:3871
 #: src/transport/gnunet-service-tng.c:11334
-#: src/transport/gnunet-service-transport.c:2622
+#: src/transport/gnunet-service-transport.c:2617
 #, fuzzy
 msgid "Transport service is lacking key configuration settings. Exiting.\n"
 msgstr "Lưu cấu hình ngay bây giờ không?"
@@ -7071,12 +7132,12 @@ msgstr ""
 msgid "Disallowing connection to peer `%s' on transport %s\n"
 msgstr "Không thể nạp phần bổ sung truyền tải « %s »\n"
 
-#: src/transport/gnunet-service-transport.c:2547
+#: src/transport/gnunet-service-transport.c:2542
 #, fuzzy, c-format
 msgid "Adding blacklisting entry for peer `%s'\n"
 msgstr "Không thể lấy địa chỉ của đồng đẳng « %s ».\n"
 
-#: src/transport/gnunet-service-transport.c:2556
+#: src/transport/gnunet-service-transport.c:2551
 #, c-format
 msgid "Adding blacklisting entry for peer `%s':`%s'\n"
 msgstr ""
@@ -7104,7 +7165,7 @@ msgid "# disconnects due to quota of 0"
 msgstr ""
 
 #: src/transport/gnunet-service-transport_neighbours.c:1341
-#: src/transport/gnunet-service-transport_neighbours.c:1817
+#: src/transport/gnunet-service-transport_neighbours.c:1807
 #, fuzzy
 msgid "# bytes in message queue for other peers"
 msgstr "# các byte thông báo gửi đi bị loại bỏ"
@@ -7185,148 +7246,148 @@ msgstr "theo dõi gnunetd sử dụng dải thông"
 msgid "# ms throttling suggested"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1886
+#: src/transport/gnunet-service-transport_neighbours.c:1876
 #, fuzzy, c-format
 msgid "Failed to send SYN message to peer `%s'\n"
 msgstr "Lỗi đọc danh sách bạn bè từ « %s »\n"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1912
+#: src/transport/gnunet-service-transport_neighbours.c:1902
 #, fuzzy
 msgid "# Failed attempts to switch addresses (failed to send SYN CONT)"
 msgstr "Lỗi mở tập tin ghi sự kiện « %s »: %s\n"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1953
+#: src/transport/gnunet-service-transport_neighbours.c:1943
 #, fuzzy
 msgid "# SYN messages sent"
 msgstr "# các thông báo PONG đã mật mã được nhận"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1970
+#: src/transport/gnunet-service-transport_neighbours.c:1960
 #, fuzzy, c-format
 msgid "Failed to transmit SYN message to %s\n"
 msgstr "Lỗi sơ khởi dịch vụ « %s ».\n"
 
-#: src/transport/gnunet-service-transport_neighbours.c:2006
+#: src/transport/gnunet-service-transport_neighbours.c:1996
 #, fuzzy
 msgid "# Failed attempts to switch addresses (failed to send SYN)"
 msgstr "Lỗi mở tập tin ghi sự kiện « %s »: %s\n"
 
-#: src/transport/gnunet-service-transport_neighbours.c:2077
+#: src/transport/gnunet-service-transport_neighbours.c:2067
 #, fuzzy, c-format
 msgid "Failed to send SYN_ACK message to peer `%s' using address `%s'\n"
 msgstr "Lỗi kết nối đến gnunetd.\n"
 
-#: src/transport/gnunet-service-transport_neighbours.c:2132
+#: src/transport/gnunet-service-transport_neighbours.c:2122
 #, fuzzy
 msgid "# SYN_ACK messages sent"
 msgstr "# các thông báo PONG đã mật mã được nhận"
 
-#: src/transport/gnunet-service-transport_neighbours.c:2150
+#: src/transport/gnunet-service-transport_neighbours.c:2140
 #, fuzzy, c-format
 msgid "Failed to transmit SYN_ACK message to %s\n"
 msgstr "Lỗi sơ khởi dịch vụ « %s ».\n"
 
-#: src/transport/gnunet-service-transport_neighbours.c:2314
+#: src/transport/gnunet-service-transport_neighbours.c:2304
 #, fuzzy
 msgid "# SYN messages received"
 msgstr "# các thông báo PING được tạo"
 
-#: src/transport/gnunet-service-transport_neighbours.c:2320
+#: src/transport/gnunet-service-transport_neighbours.c:2310
 #, c-format
 msgid "SYN request from peer `%s' ignored due impending shutdown\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:2731
+#: src/transport/gnunet-service-transport_neighbours.c:2721
 msgid "# Attempts to switch addresses"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3244
+#: src/transport/gnunet-service-transport_neighbours.c:3227
 #, fuzzy
 msgid "# SYN_ACK messages received"
 msgstr "# các thông báo PONG đã mật mã được nhận"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3252
+#: src/transport/gnunet-service-transport_neighbours.c:3235
 #, fuzzy
 msgid "# unexpected SYN_ACK messages (no peer)"
 msgstr "gửi ĐẾM thông báo"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3272
-#: src/transport/gnunet-service-transport_neighbours.c:3300
+#: src/transport/gnunet-service-transport_neighbours.c:3255
+#: src/transport/gnunet-service-transport_neighbours.c:3283
 #, fuzzy
 msgid "# unexpected SYN_ACK messages (not ready)"
 msgstr "gửi ĐẾM thông báo"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3315
+#: src/transport/gnunet-service-transport_neighbours.c:3298
 #, fuzzy
 msgid "# unexpected SYN_ACK messages (waiting on ATS)"
 msgstr "gửi ĐẾM thông báo"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3345
+#: src/transport/gnunet-service-transport_neighbours.c:3328
 msgid "# Successful attempts to switch addresses"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3359
+#: src/transport/gnunet-service-transport_neighbours.c:3342
 #, fuzzy
 msgid "# unexpected SYN_ACK messages (disconnecting)"
 msgstr "gửi ĐẾM thông báo"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3548
+#: src/transport/gnunet-service-transport_neighbours.c:3531
 #, fuzzy
 msgid "# ACK messages received"
 msgstr "# các thông báo PONG đã mật mã được nhận"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3582
+#: src/transport/gnunet-service-transport_neighbours.c:3565
 #, fuzzy
 msgid "# unexpected ACK messages"
 msgstr "# các thông báo PONG đã mật mã được gửi"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3672
+#: src/transport/gnunet-service-transport_neighbours.c:3648
 #, fuzzy
 msgid "# quota messages ignored (malformed)"
 msgstr "# các yêu cầu lỗ hổng bị bỏ do trọng tải"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3679
+#: src/transport/gnunet-service-transport_neighbours.c:3655
 #, fuzzy
 msgid "# QUOTA messages received"
 msgstr "# các thông báo PONG đã mật mã được nhận"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3722
+#: src/transport/gnunet-service-transport_neighbours.c:3698
 msgid "# disconnect messages ignored (malformed)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3729
+#: src/transport/gnunet-service-transport_neighbours.c:3705
 #, fuzzy
 msgid "# DISCONNECT messages received"
 msgstr "# các thông báo PONG đã mật mã được nhận"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3742
+#: src/transport/gnunet-service-transport_neighbours.c:3718
 msgid "# disconnect messages ignored (timestamp)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3879
+#: src/transport/gnunet-service-transport_neighbours.c:3855
 #, fuzzy
 msgid "# disconnected from peer upon explicit request"
 msgstr "# các yêu cầu lỗ hổng bị bỏ do trọng tải"
 
-#: src/transport/gnunet-service-transport_plugins.c:157
+#: src/transport/gnunet-service-transport_plugins.c:144
 msgid "Transport service is lacking NEIGHBOUR_LIMIT option.\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_plugins.c:222
-#: src/transport/gnunet-service-transport_plugins.c:230
-#: src/transport/gnunet-service-transport_plugins.c:238
-#: src/transport/gnunet-service-transport_plugins.c:246
-#: src/transport/gnunet-service-transport_plugins.c:254
-#: src/transport/gnunet-service-transport_plugins.c:262
-#: src/transport/gnunet-service-transport_plugins.c:270
-#: src/transport/gnunet-service-transport_plugins.c:278
-#: src/transport/gnunet-service-transport_plugins.c:286
-#: src/transport/gnunet-service-transport_plugins.c:294
-#: src/transport/gnunet-service-transport_plugins.c:302
+#: src/transport/gnunet-service-transport_plugins.c:209
+#: src/transport/gnunet-service-transport_plugins.c:217
+#: src/transport/gnunet-service-transport_plugins.c:225
+#: src/transport/gnunet-service-transport_plugins.c:233
+#: src/transport/gnunet-service-transport_plugins.c:241
+#: src/transport/gnunet-service-transport_plugins.c:249
+#: src/transport/gnunet-service-transport_plugins.c:257
+#: src/transport/gnunet-service-transport_plugins.c:265
+#: src/transport/gnunet-service-transport_plugins.c:273
+#: src/transport/gnunet-service-transport_plugins.c:281
+#: src/transport/gnunet-service-transport_plugins.c:289
 #, fuzzy, c-format
 msgid "Missing function `%s' in transport plugin for `%s'\n"
 msgstr "Không thể nạp phần bổ sung truyền tải « %s »\n"
 
-#: src/transport/gnunet-service-transport_plugins.c:309
+#: src/transport/gnunet-service-transport_plugins.c:296
 #, fuzzy, c-format
 msgid "Did not load plugin `%s' due to missing functions\n"
 msgstr "Lỗi nạp phần bổ sung « %s » tại %s:%d. Đang hủy nạp phần bổ sung.\n"
@@ -7611,7 +7672,7 @@ msgstr ""
 msgid "send data for benchmarking to the other peer (until CTRL-C)"
 msgstr ""
 
-#: src/transport/plugin_transport_http_client.c:1488
+#: src/transport/plugin_transport_http_client.c:1482
 #: src/transport/plugin_transport_http_server.c:2331
 #: src/transport/plugin_transport_http_server.c:3562
 #: src/transport/plugin_transport_tcp.c:3773
@@ -7619,24 +7680,24 @@ msgstr ""
 msgid "TCP_STEALTH not supported on this platform.\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_client.c:2134
+#: src/transport/plugin_transport_http_client.c:2128
 #, c-format
 msgid "Could not initialize curl multi handle, failed to start %s plugin!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_client.c:2183
+#: src/transport/plugin_transport_http_client.c:2177
 #: src/transport/plugin_transport_http_server.c:3276
 #, fuzzy, c-format
 msgid "Shutting down plugin `%s'\n"
 msgstr "Đang nạp các truyền tải « %s »\n"
 
-#: src/transport/plugin_transport_http_client.c:2200
+#: src/transport/plugin_transport_http_client.c:2194
 #: src/transport/plugin_transport_http_server.c:3346
 #, fuzzy, c-format
 msgid "Shutdown for plugin `%s' complete\n"
 msgstr "Tải lên « %s » hoàn thành, địa chỉ URI là « %s ».\n"
 
-#: src/transport/plugin_transport_http_client.c:2234
+#: src/transport/plugin_transport_http_client.c:2228
 #, fuzzy, c-format
 msgid "Maximum number of requests is %u\n"
 msgstr "tăng sổ tối đa các kết nối TCP/IP"
@@ -8054,7 +8115,7 @@ msgstr "« %s » bị lỗi cho cổng %d. Trình gnunetd có chạy 
chưa?\n"
 msgid "`%s' failed for `%s': address already in use\n"
 msgstr "« %s » bị lỗi cho cổng %d. Trình gnunetd có chạy chưa?\n"
 
-#: src/transport/tcp_server_legacy.c:897
+#: src/transport/tcp_server_legacy.c:892
 #, c-format
 msgid ""
 "Processing code for message of type %u did not call "
@@ -8280,21 +8341,21 @@ msgstr ""
 msgid "INVALID"
 msgstr ""
 
-#: src/util/common_logging.c:1396
+#: src/util/common_logging.c:1360
 msgid "unknown address"
 msgstr ""
 
-#: src/util/common_logging.c:1441
+#: src/util/common_logging.c:1405
 msgid "invalid address"
 msgstr ""
 
-#: src/util/common_logging.c:1453
+#: src/util/common_logging.c:1417
 #, fuzzy, c-format
 msgid "Configuration fails to specify option `%s' in section `%s'!\n"
 msgstr ""
 "Cấu hình không thỏa mãn các ràng buộc của tập tin đặc tả cấu hình « %s ».\n"
 
-#: src/util/common_logging.c:1468
+#: src/util/common_logging.c:1432
 #, fuzzy, c-format
 msgid ""
 "Configuration specifies invalid value for option `%s' in section `%s': %s\n"
@@ -8449,12 +8510,12 @@ msgstr "Không tìm thấy địa chỉ IP của máy « %s »: %s\n"
 msgid "Received DNS response that is too small (%u bytes)\n"
 msgstr ""
 
-#: src/util/dnsstub.c:508
+#: src/util/dnsstub.c:503
 #, fuzzy, c-format
 msgid "Failed to send DNS request to %s: %s\n"
 msgstr "Lỗi mở tập tin ghi sự kiện « %s »: %s\n"
 
-#: src/util/dnsstub.c:513
+#: src/util/dnsstub.c:508
 #, fuzzy, c-format
 msgid "Sent DNS request to %s\n"
 msgstr "Lỗi mở tập tin ghi sự kiện « %s »: %s\n"
@@ -8836,28 +8897,28 @@ msgstr ""
 msgid "Use built-in GNUnet stub resolver"
 msgstr ""
 
-#: src/util/gnunet-scrypt.c:215
+#: src/util/gnunet-scrypt.c:214
 #, c-format
 msgid "Loading hostkey from `%s' failed.\n"
 msgstr ""
 
-#: src/util/gnunet-scrypt.c:281
+#: src/util/gnunet-scrypt.c:280
 msgid "number of bits to require for the proof of work"
 msgstr ""
 
-#: src/util/gnunet-scrypt.c:287
+#: src/util/gnunet-scrypt.c:286
 msgid "file with private key, otherwise default is used"
 msgstr ""
 
-#: src/util/gnunet-scrypt.c:293
+#: src/util/gnunet-scrypt.c:292
 msgid "file with proof of work, otherwise default is used"
 msgstr ""
 
-#: src/util/gnunet-scrypt.c:299
+#: src/util/gnunet-scrypt.c:298
 msgid "time to wait between calculations"
 msgstr ""
 
-#: src/util/gnunet-scrypt.c:313
+#: src/util/gnunet-scrypt.c:312
 #, fuzzy
 msgid "Manipulate GNUnet proof of work files"
 msgstr "cập nhật một giá trị trong tập tin cấu hình"
@@ -8890,17 +8951,17 @@ msgstr ""
 msgid "Perform default-actions for GNUnet URIs"
 msgstr ""
 
-#: src/util/helper.c:323
+#: src/util/helper.c:306
 #, fuzzy, c-format
 msgid "Error reading from `%s': %s\n"
 msgstr "Gặp lỗi khi tạo người dùng"
 
-#: src/util/helper.c:375
+#: src/util/helper.c:358
 #, fuzzy, c-format
 msgid "Failed to parse inbound message from helper `%s'\n"
 msgstr "Lỗi đọc danh sách bạn bè từ « %s »\n"
 
-#: src/util/helper.c:606
+#: src/util/helper.c:573
 #, fuzzy, c-format
 msgid "Error writing to `%s': %s\n"
 msgstr "Gặp lỗi khi tạo người dùng"
@@ -8910,25 +8971,25 @@ msgstr "Gặp lỗi khi tạo người dùng"
 msgid "Unable to shorten unix path `%s' while keeping name unique\n"
 msgstr ""
 
-#: src/util/network.c:1307
+#: src/util/network.c:1284
 #, c-format
 msgid ""
 "Fatal internal logic error, process hangs in `%s' (abort with CTRL-C)!\n"
 msgstr ""
 
-#: src/util/os_installation.c:420
+#: src/util/os_installation.c:415
 #, c-format
 msgid ""
 "Could not determine installation path for %s.  Set `%s' environment "
 "variable.\n"
 msgstr ""
 
-#: src/util/os_installation.c:791
+#: src/util/os_installation.c:786
 #, 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:824
+#: src/util/os_installation.c:819
 #, c-format
 msgid "Binary `%s' exists, but is not SUID\n"
 msgstr ""
@@ -8973,7 +9034,7 @@ msgstr "Không thể lưu tập tin cấu hình « %s »:"
 msgid "Malformed configuration. Exiting ...\n"
 msgstr "Không thể lưu tập tin cấu hình « %s »:"
 
-#: src/util/regex.c:139
+#: src/util/regex.c:123
 #, c-format
 msgid "Bad mask: %d\n"
 msgstr ""
@@ -9293,26 +9354,16 @@ msgstr "# các byte đã nhận qua UDP"
 msgid "Setup tunnels via VPN."
 msgstr ""
 
-#: src/zonemaster/gnunet-service-zonemaster-monitor.c:249
-#: src/zonemaster/gnunet-service-zonemaster.c:364
+#: src/zonemaster/gnunet-service-zonemaster.c:521
 #, fuzzy, c-format
 msgid "Failed to replicate block in namecache: %s\n"
 msgstr "Lỗi cập nhật dữ liệu cho mô-đun « %s »\n"
 
-#: src/zonemaster/gnunet-service-zonemaster-monitor.c:529
-#: src/zonemaster/gnunet-service-zonemaster.c:969
+#: src/zonemaster/gnunet-service-zonemaster.c:1383
 #, fuzzy
 msgid "Failed to connect to the namestore!\n"
 msgstr "Không kết nối được đến trình nền gnunetd."
 
-#: src/zonemaster/gnunet-service-zonemaster-monitor.c:550
-msgid "Namecache is disabled!\n"
-msgstr ""
-
-#, fuzzy
-#~ msgid "Flat file database running\n"
-#~ msgstr "kho dữ liệu sqlite"
-
 #, fuzzy, c-format
 #~ msgid "Invalid DID `%s'\n"
 #~ msgstr "Dữ liệu nhập không hợp lệ.\n"
@@ -9610,10 +9661,6 @@ msgstr ""
 #~ msgid "`%s' failed on file `%s' at %s:%d with error: %s\n"
 #~ msgstr "« %s » thất bại ở tập tin « %s » tại %s:%d với lỗi: %s\n"
 
-#, fuzzy
-#~ msgid "Failed to connect to CREDENTIAL\n"
-#~ msgstr "Lỗi kết nối đến gnunetd.\n"
-
 #, fuzzy
 #~ msgid "GNUnet credential resolver tool"
 #~ msgstr "Bản ghi lỗi GNUnet"
diff --git a/po/zh_CN.po b/po/zh_CN.po
index fa164ddf7..8e6faf1c6 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnunet-0.8.1\n"
 "Report-Msgid-Bugs-To: gnunet-developers@mail.gnu.org\n"
-"POT-Creation-Date: 2022-10-16 18:47+0900\n"
+"POT-Creation-Date: 2022-10-21 13:20+0900\n"
 "PO-Revision-Date: 2011-07-09 12:12+0800\n"
 "Last-Translator: Wylmer Wang <wantinghard@gmail.com>\n"
 "Language-Team: Chinese (simplified) <i18n-zh@googlegroups.com>\n"
@@ -16,7 +16,10 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: src/abd/gnunet-abd.c:392 src/namestore/gnunet-namestore.c:1245
+#: src/abd/gnunet-abd.c:392 src/namestore/gnunet-namestore-zonefile.c:193
+#: src/namestore/gnunet-namestore-zonefile.c:652
+#: src/namestore/gnunet-namestore-zonefile.c:673
+#: src/namestore/gnunet-namestore.c:1245
 #, c-format
 msgid "Ego `%s' not known to identity service\n"
 msgstr ""
@@ -162,15 +165,15 @@ msgstr "解析配置文件“%s”失败\n"
 msgid "Failed to remove servicehome directory %s\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:229 src/testbed/gnunet-service-testbed_peers.c:1144
+#: src/arm/gnunet-arm.c:229 src/testbed/gnunet-service-testbed_peers.c:1132
 msgid "Message was sent successfully"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:232 src/testbed/gnunet-service-testbed_peers.c:1147
+#: src/arm/gnunet-arm.c:232 src/testbed/gnunet-service-testbed_peers.c:1135
 msgid "We disconnected from ARM before we could send a request"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:234 src/testbed/gnunet-service-testbed_peers.c:1149
+#: src/arm/gnunet-arm.c:234 src/testbed/gnunet-service-testbed_peers.c:1137
 #, fuzzy
 msgid "Unknown request status"
 msgstr "未知的用户“%s”\n"
@@ -1355,143 +1358,143 @@ msgstr "立即保存配置？"
 msgid "Core service of `%s' ready.\n"
 msgstr "服务已删除。\n"
 
-#: src/core/gnunet-service-core_kx.c:512
+#: src/core/gnunet-service-core_kx.c:513
 msgid "# bytes encrypted"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:570
+#: src/core/gnunet-service-core_kx.c:571
 msgid "# bytes decrypted"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:667
+#: src/core/gnunet-service-core_kx.c:668
 msgid "# PAYLOAD dropped (out of order)"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:719
+#: src/core/gnunet-service-core_kx.c:720
 msgid "# key exchanges initiated"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:775
+#: src/core/gnunet-service-core_kx.c:776
 msgid "# key exchanges stopped"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:807
+#: src/core/gnunet-service-core_kx.c:808
 #, fuzzy
 msgid "# PING messages transmitted"
 msgstr "消息尺寸"
 
-#: src/core/gnunet-service-core_kx.c:866
+#: src/core/gnunet-service-core_kx.c:867
 msgid "# old ephemeral keys ignored"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:880
+#: src/core/gnunet-service-core_kx.c:881
 msgid "# duplicate ephemeral keys ignored"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:915
+#: src/core/gnunet-service-core_kx.c:916
 msgid "# EPHEMERAL_KEYs rejected (bad signature)"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:933
+#: src/core/gnunet-service-core_kx.c:934
 #, c-format
 msgid ""
 "EPHEMERAL_KEY from peer `%s' rejected as its validity range does not match "
 "our system time (%llu not in [%llu,%llu]).\n"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:940
+#: src/core/gnunet-service-core_kx.c:941
 msgid "# EPHEMERAL_KEY messages rejected due to time"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:958
+#: src/core/gnunet-service-core_kx.c:959
 #, fuzzy
 msgid "# valid ephemeral keys received"
 msgstr "保存配置失败。"
 
-#: src/core/gnunet-service-core_kx.c:1067
+#: src/core/gnunet-service-core_kx.c:1068
 #: src/transport/gnunet-service-transport_validation.c:1133
 msgid "# PING messages received"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1077
+#: src/core/gnunet-service-core_kx.c:1078
 msgid "# PING messages dropped (out of order)"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1126
+#: src/core/gnunet-service-core_kx.c:1127
 msgid "# PONG messages created"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1151
+#: src/core/gnunet-service-core_kx.c:1152
 msgid "# sessions terminated by timeout"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1164
+#: src/core/gnunet-service-core_kx.c:1165
 msgid "# keepalive messages sent"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1221
+#: src/core/gnunet-service-core_kx.c:1222
 #: src/transport/gnunet-service-transport_validation.c:1476
 msgid "# PONG messages received"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1229
+#: src/core/gnunet-service-core_kx.c:1230
 msgid "# PONG messages dropped (connection down)"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1237
+#: src/core/gnunet-service-core_kx.c:1238
 msgid "# PONG messages dropped (out of order)"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1276
+#: src/core/gnunet-service-core_kx.c:1277
 msgid "# PONG messages decrypted"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1316
+#: src/core/gnunet-service-core_kx.c:1317
 msgid "# session keys confirmed via PONG"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1328
+#: src/core/gnunet-service-core_kx.c:1329
 msgid "# timeouts prevented via PONG"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1337
+#: src/core/gnunet-service-core_kx.c:1338
 msgid "# rekey operations confirmed via PONG"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1506
+#: src/core/gnunet-service-core_kx.c:1507
 msgid "# DATA message dropped (out of order)"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1517
+#: src/core/gnunet-service-core_kx.c:1518
 #, c-format
 msgid ""
 "Session to peer `%s' went down due to key expiration (should not happen)\n"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1521
+#: src/core/gnunet-service-core_kx.c:1522
 msgid "# sessions terminated by key expiration"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1599
-#: src/core/gnunet-service-core_kx.c:1626
+#: src/core/gnunet-service-core_kx.c:1600
+#: src/core/gnunet-service-core_kx.c:1627
 msgid "# bytes dropped (duplicates)"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1612
+#: src/core/gnunet-service-core_kx.c:1613
 msgid "# bytes dropped (out of sequence)"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1657
+#: src/core/gnunet-service-core_kx.c:1658
 msgid "# bytes dropped (ancient message)"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1666
+#: src/core/gnunet-service-core_kx.c:1667
 msgid "# bytes of payload decrypted"
 msgstr ""
 
 #: src/core/gnunet-service-core_sessions.c:252
 #: src/core/gnunet-service-core_sessions.c:337
-#: src/fs/gnunet-service-fs_cp.c:601 src/fs/gnunet-service-fs_cp.c:1496
+#: src/fs/gnunet-service-fs_cp.c:601 src/fs/gnunet-service-fs_cp.c:1494
 #: src/topology/gnunet-daemon-topology.c:579
 #: src/topology/gnunet-daemon-topology.c:671
 #: src/transport/gnunet-service-transport_neighbours.c:723
@@ -1722,7 +1725,7 @@ msgstr ""
 #: src/datastore/gnunet-service-datastore.c:626
 #: src/datastore/gnunet-service-datastore.c:677
 #: src/datastore/gnunet-service-datastore.c:820
-#: src/datastore/gnunet-service-datastore.c:1429
+#: src/datastore/gnunet-service-datastore.c:1428
 msgid "# reserved"
 msgstr ""
 
@@ -1767,69 +1770,69 @@ msgstr ""
 msgid "# bytes removed (explicit request)"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1059
+#: src/datastore/gnunet-service-datastore.c:1058
 msgid "# REMOVE requests received"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1108
+#: src/datastore/gnunet-service-datastore.c:1107
 #, c-format
 msgid ""
 "Datastore payload must have been inaccurate (%lld < %lld). Recomputing it.\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1113
-#: src/datastore/gnunet-service-datastore.c:1282
+#: src/datastore/gnunet-service-datastore.c:1112
+#: src/datastore/gnunet-service-datastore.c:1281
 #, c-format
 msgid "New payload: %lld\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1168
+#: src/datastore/gnunet-service-datastore.c:1167
 #, c-format
 msgid "Loading `%s' datastore plugin\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1177
+#: src/datastore/gnunet-service-datastore.c:1176
 #, fuzzy, c-format
 msgid "Failed to load datastore plugin for `%s'\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/datastore/gnunet-service-datastore.c:1237
+#: src/datastore/gnunet-service-datastore.c:1236
 msgid "Bloomfilter construction complete.\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1289
+#: src/datastore/gnunet-service-datastore.c:1288
 msgid "Rebuilding bloomfilter.  Please be patient.\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1299
+#: src/datastore/gnunet-service-datastore.c:1298
 msgid "Plugin does not support get_keys function. Please fix!\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1464
+#: src/datastore/gnunet-service-datastore.c:1463
 #, c-format
 msgid "# bytes used in file-sharing datastore `%s'"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1473
+#: src/datastore/gnunet-service-datastore.c:1472
 msgid "# quota"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1476
+#: src/datastore/gnunet-service-datastore.c:1475
 msgid "# cache size"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1492
+#: src/datastore/gnunet-service-datastore.c:1491
 #, c-format
 msgid "Could not use specified filename `%s' for bloomfilter.\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1513
-#: src/datastore/gnunet-service-datastore.c:1535
+#: src/datastore/gnunet-service-datastore.c:1512
+#: src/datastore/gnunet-service-datastore.c:1534
 #, fuzzy, c-format
 msgid "Failed to remove bogus bloomfilter file `%s'\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/datastore/gnunet-service-datastore.c:1574
+#: src/datastore/gnunet-service-datastore.c:1573
 #, fuzzy
 msgid "Failed to initialize bloomfilter.\n"
 msgstr "初始化“%s”服务失败。\n"
@@ -1884,7 +1887,7 @@ msgstr "“%s”于 %s:%d 处失败，错误为：%s\n"
 
 #: src/datastore/plugin_datastore_sqlite.c:310
 #: src/namecache/plugin_namecache_sqlite.c:180
-#: src/namestore/plugin_namestore_sqlite.c:868
+#: src/namestore/plugin_namestore_sqlite.c:891
 #: src/peerstore/plugin_peerstore_sqlite.c:540
 #, c-format
 msgid "Unable to initialize SQLite: %s.\n"
@@ -2141,7 +2144,7 @@ msgstr ""
 msgid "# DNS requests received via TUN interface"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:1117 src/exit/gnunet-daemon-exit.c:3708
+#: src/dns/gnunet-service-dns.c:1117 src/exit/gnunet-daemon-exit.c:3707
 #, fuzzy
 msgid "need a valid IPv4 or IPv6 address\n"
 msgstr "无效的进程优先级“%s”\n"
@@ -2286,69 +2289,69 @@ msgstr ""
 msgid "Packet from unknown protocol %u received.  Ignored.\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3377 src/exit/gnunet-daemon-exit.c:3388
+#: src/exit/gnunet-daemon-exit.c:3376 src/exit/gnunet-daemon-exit.c:3387
 #, fuzzy, c-format
 msgid "Option `%s' for domain `%s' is not formatted correctly!\n"
 msgstr "%s：选项“%s”有歧义\n"
 
-#: src/exit/gnunet-daemon-exit.c:3402 src/exit/gnunet-daemon-exit.c:3410
+#: src/exit/gnunet-daemon-exit.c:3401 src/exit/gnunet-daemon-exit.c:3409
 #, c-format
 msgid "`%s' is not a valid port number (for domain `%s')!"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3452
+#: src/exit/gnunet-daemon-exit.c:3451
 #, c-format
 msgid "No addresses found for hostname `%s' of service `%s'!\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3467 src/exit/gnunet-daemon-exit.c:3482
+#: src/exit/gnunet-daemon-exit.c:3466 src/exit/gnunet-daemon-exit.c:3481
 #, c-format
 msgid "Service `%s' configured for IPv4, but IPv4 is disabled!\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3496
+#: src/exit/gnunet-daemon-exit.c:3495
 #, c-format
 msgid "No IP addresses found for hostname `%s' of service `%s'!\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3641
+#: src/exit/gnunet-daemon-exit.c:3640
 msgid ""
 "This system does not support IPv4, will disable IPv4 functions despite them "
 "being enabled in the configuration\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3650
+#: src/exit/gnunet-daemon-exit.c:3649
 msgid ""
 "This system does not support IPv6, will disable IPv6 functions despite them "
 "being enabled in the configuration\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3658
+#: src/exit/gnunet-daemon-exit.c:3657
 msgid ""
 "Cannot enable IPv4 exit but disable IPv4 on TUN interface, will use "
 "ENABLE_IPv4=YES\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3665
+#: src/exit/gnunet-daemon-exit.c:3664
 msgid ""
 "Cannot enable IPv6 exit but disable IPv6 on TUN interface, will use "
 "ENABLE_IPv6=YES\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3836
+#: src/exit/gnunet-daemon-exit.c:3835
 msgid "Must be a number"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3952
+#: src/exit/gnunet-daemon-exit.c:3951
 #, c-format
 msgid "`%s' is not SUID or the path is invalid, EXIT will not work\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3964 src/pt/gnunet-daemon-pt.c:1212
+#: src/exit/gnunet-daemon-exit.c:3963 src/pt/gnunet-daemon-pt.c:1212
 msgid "No useful service enabled.  Exiting.\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:4118
+#: src/exit/gnunet-daemon-exit.c:4117
 msgid "Daemon to run to provide an IP exit node for the VPN"
 msgstr ""
 
@@ -2531,7 +2534,7 @@ msgstr "解析配置文件“%s”失败\n"
 msgid "internal error decoding tree"
 msgstr "未知错误。\n"
 
-#: src/fs/fs_download.c:1890
+#: src/fs/fs_download.c:1889
 #, fuzzy
 msgid "Invalid URI"
 msgstr "无效条目。\n"
@@ -2548,7 +2551,7 @@ msgstr ""
 msgid "Failed to receive response from `%s' service.\n"
 msgstr "“%s”的参数无效。\n"
 
-#: src/fs/fs_list_indexed.c:195
+#: src/fs/fs_list_indexed.c:187
 #, fuzzy, c-format
 msgid "Failed to not connect to `%s' service.\n"
 msgstr "初始化“%s”服务失败。\n"
@@ -2573,7 +2576,7 @@ msgstr "运行 %s失败：%s %d\n"
 msgid "Failed to read `%s': %s\n"
 msgstr "运行 %s失败：%s %d\n"
 
-#: src/fs/fs_namespace.c:472
+#: src/fs/fs_namespace.c:457
 msgid "Failed to connect to datastore."
 msgstr ""
 
@@ -2709,93 +2712,93 @@ msgstr "打开日志文件“%s”失败：%s\n"
 msgid "Failed to compute hash of file."
 msgstr ""
 
-#: src/fs/fs_uri.c:239
+#: src/fs/fs_uri.c:231
 #, no-c-format
 msgid "Malformed KSK URI (`%' must be followed by HEX number)"
 msgstr ""
 
-#: src/fs/fs_uri.c:298
+#: src/fs/fs_uri.c:290
 msgid "Malformed KSK URI (must not begin or end with `+')"
 msgstr ""
 
-#: src/fs/fs_uri.c:316
+#: src/fs/fs_uri.c:308
 msgid "Malformed KSK URI (`++' not allowed)"
 msgstr ""
 
-#: src/fs/fs_uri.c:323
+#: src/fs/fs_uri.c:315
 msgid "Malformed KSK URI (quotes not balanced)"
 msgstr ""
 
-#: src/fs/fs_uri.c:390
+#: src/fs/fs_uri.c:382
 msgid "Malformed SKS URI (wrong syntax)"
 msgstr ""
 
-#: src/fs/fs_uri.c:431
+#: src/fs/fs_uri.c:423
 msgid "Malformed CHK URI (wrong syntax)"
 msgstr ""
 
-#: src/fs/fs_uri.c:448
+#: src/fs/fs_uri.c:440
 msgid "Malformed CHK URI (failed to decode CHK)"
 msgstr ""
 
-#: src/fs/fs_uri.c:525
+#: src/fs/fs_uri.c:517
 msgid "LOC URI malformed (wrong syntax)"
 msgstr ""
 
-#: src/fs/fs_uri.c:542
+#: src/fs/fs_uri.c:534
 msgid "LOC URI malformed (no CHK)"
 msgstr ""
 
-#: src/fs/fs_uri.c:552
+#: src/fs/fs_uri.c:544
 msgid "LOC URI malformed (missing LOC)"
 msgstr ""
 
-#: src/fs/fs_uri.c:560
+#: src/fs/fs_uri.c:552
 msgid "LOC URI malformed (wrong syntax for public key)"
 msgstr ""
 
-#: src/fs/fs_uri.c:569
+#: src/fs/fs_uri.c:561
 msgid "LOC URI malformed (could not decode public key)"
 msgstr ""
 
-#: src/fs/fs_uri.c:575
+#: src/fs/fs_uri.c:567
 msgid "LOC URI malformed (could not find signature)"
 msgstr ""
 
-#: src/fs/fs_uri.c:582
+#: src/fs/fs_uri.c:574
 msgid "LOC URI malformed (wrong syntax for signature)"
 msgstr ""
 
-#: src/fs/fs_uri.c:593
+#: src/fs/fs_uri.c:585
 msgid "LOC URI malformed (could not decode signature)"
 msgstr ""
 
-#: src/fs/fs_uri.c:600
+#: src/fs/fs_uri.c:592
 msgid "LOC URI malformed (wrong syntax for expiration time)"
 msgstr ""
 
-#: src/fs/fs_uri.c:606
+#: src/fs/fs_uri.c:598
 msgid "LOC URI malformed (could not parse expiration time)"
 msgstr ""
 
-#: src/fs/fs_uri.c:620
+#: src/fs/fs_uri.c:612
 msgid "LOC URI malformed (signature failed validation)"
 msgstr ""
 
-#: src/fs/fs_uri.c:653
+#: src/fs/fs_uri.c:645
 #, fuzzy
 msgid "invalid argument"
 msgstr "“%s”的参数无效。\n"
 
-#: src/fs/fs_uri.c:673
+#: src/fs/fs_uri.c:665
 msgid "Unrecognized URI type"
 msgstr ""
 
-#: src/fs/fs_uri.c:1077 src/fs/fs_uri.c:1104
+#: src/fs/fs_uri.c:1060 src/fs/fs_uri.c:1087
 msgid "No keywords specified!\n"
 msgstr ""
 
-#: src/fs/fs_uri.c:1110
+#: src/fs/fs_uri.c:1093
 msgid "Number of double-quotes not balanced!\n"
 msgstr ""
 
@@ -3371,7 +3374,7 @@ msgstr ""
 "按任意键继续\n"
 
 #: src/fs/gnunet-service-fs_cadet_server.c:394
-#: src/fs/gnunet-service-fs_cadet_server.c:434
+#: src/fs/gnunet-service-fs_cadet_server.c:433
 #, fuzzy
 msgid "# cadet connections active"
 msgstr ""
@@ -3431,7 +3434,7 @@ msgstr ""
 msgid "# P2P query messages received and processed"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1679
+#: src/fs/gnunet-service-fs_cp.c:1677
 msgid "# migration stop messages sent"
 msgstr ""
 
@@ -3720,8 +3723,8 @@ msgstr ""
 #: src/hostlist/gnunet-daemon-hostlist_client.c:957
 #: src/hostlist/gnunet-daemon-hostlist_client.c:1059
 #: src/hostlist/gnunet-daemon-hostlist_client.c:1067
-#: src/transport/plugin_transport_http_client.c:600
-#: src/transport/plugin_transport_http_client.c:618
+#: src/transport/plugin_transport_http_client.c:599
+#: src/transport/plugin_transport_http_client.c:617
 #, c-format
 msgid "%s failed at %s:%d: `%s'\n"
 msgstr ""
@@ -3786,7 +3789,7 @@ msgstr "无法保存配置文件“%s”："
 msgid "Failed to start HTTPS server for `%s'\n"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/gns/gnunet-gns-proxy.c:2919 src/rest/gnunet-rest-server.c:958
+#: src/gns/gnunet-gns-proxy.c:2919 src/rest/gnunet-rest-server.c:957
 #, fuzzy
 msgid "Failed to pass client to MHD\n"
 msgstr "初始化“%s”服务失败。\n"
@@ -3806,24 +3809,24 @@ msgstr "未知的命令“%s”。\n"
 msgid "Unsupported socks address type %d\n"
 msgstr "未知的命令“%s”。\n"
 
-#: src/gns/gnunet-gns-proxy.c:3727
+#: src/gns/gnunet-gns-proxy.c:3726
 #, fuzzy, c-format
 msgid "Failed to load X.509 key and certificate from `%s'\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/gns/gnunet-gns-proxy.c:3869
+#: src/gns/gnunet-gns-proxy.c:3868
 msgid "listen on specified port (default: 7777)"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:3874
+#: src/gns/gnunet-gns-proxy.c:3873
 msgid "pem file to use as CA"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:3878
+#: src/gns/gnunet-gns-proxy.c:3877
 msgid "disable use of IPv6"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:3904
+#: src/gns/gnunet-gns-proxy.c:3903
 msgid "GNUnet GNS proxy"
 msgstr ""
 
@@ -3871,21 +3874,19 @@ msgstr ""
 msgid "GNUnet GNS resolver tool"
 msgstr "GNUnet 错误日志"
 
-#: src/gns/gnunet-service-gns.c:501
+#: src/gns/gnunet-service-gns.c:500
 #, fuzzy
 msgid "Properly base32-encoded public key required"
 msgstr "“%s”的参数无效。\n"
 
-#: src/gns/gnunet-service-gns.c:537
-#: src/zonemaster/gnunet-service-zonemaster-monitor.c:542
-#: src/zonemaster/gnunet-service-zonemaster.c:982
+#: src/gns/gnunet-service-gns.c:536
+#: src/zonemaster/gnunet-service-zonemaster.c:1396
 #, fuzzy
 msgid "Failed to connect to the namecache!\n"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/gns/gnunet-service-gns.c:556
-#: src/zonemaster/gnunet-service-zonemaster-monitor.c:572
-#: src/zonemaster/gnunet-service-zonemaster.c:1021
+#: src/gns/gnunet-service-gns.c:555
+#: src/zonemaster/gnunet-service-zonemaster.c:1435
 #, fuzzy
 msgid "Could not connect to DHT!\n"
 msgstr "无法连接到 %s:%u：%s\n"
@@ -4007,31 +4008,31 @@ msgstr ""
 msgid "Label  contains `.' which is not allowed\n"
 msgstr ""
 
-#: src/gnsrecord/gnsrecord_misc.c:467
+#: src/gnsrecord/gnsrecord_misc.c:481
 msgid "Zone delegation record not allowed in apex."
 msgstr ""
 
-#: src/gnsrecord/gnsrecord_misc.c:475
+#: src/gnsrecord/gnsrecord_misc.c:489
 msgid "Zone delegation record set contains mutually exclusive records."
 msgstr ""
 
-#: src/gnsrecord/gnsrecord_misc.c:485
+#: src/gnsrecord/gnsrecord_misc.c:499
 msgid "Multiple REDIRECT records."
 msgstr ""
 
-#: src/gnsrecord/gnsrecord_misc.c:494 src/gnsrecord/gnsrecord_misc.c:520
+#: src/gnsrecord/gnsrecord_misc.c:508 src/gnsrecord/gnsrecord_misc.c:534
 msgid "Redirection record set contains mutually exclusive records."
 msgstr ""
 
-#: src/gnsrecord/gnsrecord_misc.c:501
+#: src/gnsrecord/gnsrecord_misc.c:515
 msgid "Redirection records not allowed in apex."
 msgstr ""
 
-#: src/gnsrecord/gnsrecord_misc.c:512
+#: src/gnsrecord/gnsrecord_misc.c:526
 msgid "Redirection records not allowed in apex.."
 msgstr ""
 
-#: src/gnsrecord/gnsrecord_misc.c:534
+#: src/gnsrecord/gnsrecord_misc.c:548
 msgid "Mutually exclusive records."
 msgstr ""
 
@@ -4145,36 +4146,36 @@ msgstr "创建用户出错"
 msgid "Modified %u addresses, wrote %u bytes\n"
 msgstr ""
 
-#: src/hello/hello.c:1111
+#: src/hello/hello.c:1089
 #, fuzzy
 msgid "Failed to parse HELLO message: missing expiration time\n"
 msgstr "保存配置失败。"
 
-#: src/hello/hello.c:1121
+#: src/hello/hello.c:1099
 #, fuzzy
 msgid "Failed to parse HELLO message: invalid expiration time\n"
 msgstr "保存配置失败。"
 
-#: src/hello/hello.c:1131
+#: src/hello/hello.c:1109
 #, fuzzy
 msgid "Failed to parse HELLO message: malformed\n"
 msgstr "打开日志文件“%s”失败：%s\n"
 
-#: src/hello/hello.c:1143
+#: src/hello/hello.c:1121
 msgid "Failed to parse HELLO message: missing transport plugin\n"
 msgstr ""
 
-#: src/hello/hello.c:1161
+#: src/hello/hello.c:1139
 #, c-format
 msgid "Plugin `%s' not found, skipping address\n"
 msgstr ""
 
-#: src/hello/hello.c:1169
+#: src/hello/hello.c:1147
 #, c-format
 msgid "Plugin `%s' does not support URIs yet\n"
 msgstr ""
 
-#: src/hello/hello.c:1184
+#: src/hello/hello.c:1162
 #, fuzzy, c-format
 msgid "Failed to parse `%s' as an address for plugin `%s'\n"
 msgstr "找不到接口“%s”的一个 IP 地址。\n"
@@ -4227,7 +4228,7 @@ msgid "# valid HELLOs downloaded from hostlist servers"
 msgstr ""
 
 #: src/hostlist/gnunet-daemon-hostlist_client.c:677
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1453
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1451
 msgid "# advertised hostlist URIs"
 msgstr ""
 
@@ -4278,7 +4279,7 @@ msgid "# hostlist downloads initiated"
 msgstr ""
 
 #: src/hostlist/gnunet-daemon-hostlist_client.c:1137
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1725
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1723
 msgid "# milliseconds between hostlist downloads"
 msgstr ""
 
@@ -4292,65 +4293,65 @@ msgstr ""
 msgid "# active connections"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1389
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1387
 #, c-format
 msgid "Loading saved hostlist entries from file `%s' \n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1394
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1392
 #, c-format
 msgid "Hostlist file `%s' does not exist\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1405
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1403
 #, fuzzy, c-format
 msgid "Could not open file `%s' for reading to load hostlists: %s\n"
 msgstr "无法解析“%s”来确定已方的 IP 地址：%s\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1446
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1444
 #, c-format
 msgid "%u hostlist URIs loaded from file\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1449
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1447
 msgid "# hostlist URIs read from file"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1500
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1498
 #, fuzzy, c-format
 msgid "Could not open file `%s' for writing to save hostlists: %s\n"
 msgstr "无法解析“%s”来确定已方的 IP 地址：%s\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1507
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1505
 #, c-format
 msgid "Writing %u hostlist URIs to `%s'\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1540
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1559
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1538
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1557
 #, c-format
 msgid "Error writing hostlist URIs to file `%s'\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1553
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1551
 msgid "# hostlist URIs written to file"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1654
-#: src/transport/plugin_transport_http_client.c:2294
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1652
+#: src/transport/plugin_transport_http_client.c:2288
 #, c-format
 msgid "Invalid proxy type: `%s', disabling proxy! Check configuration!\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1683
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1681
 msgid "Learning is enabled on this peer\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1696
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1694
 msgid "Learning is not enabled on this peer\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1710
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1708
 #, c-format
 msgid ""
 "Since learning is not enabled on this peer, hostlist file `%s' was removed\n"
@@ -4420,7 +4421,7 @@ msgid "# hostlist advertisements send"
 msgstr ""
 
 #: src/hostlist/gnunet-daemon-hostlist_server.c:674
-#: src/transport/gnunet-service-transport.c:2657
+#: src/transport/gnunet-service-transport.c:2652
 msgid "Could not access PEERINFO service.  Exiting.\n"
 msgstr ""
 
@@ -4540,49 +4541,49 @@ msgstr ""
 msgid "Maintain egos"
 msgstr ""
 
-#: src/identity/gnunet-service-identity.c:502
+#: src/identity/gnunet-service-identity.c:501
 msgid "no default known"
 msgstr ""
 
-#: src/identity/gnunet-service-identity.c:527
+#: src/identity/gnunet-service-identity.c:526
 msgid "default configured, but ego unknown (internal error)"
 msgstr ""
 
-#: src/identity/gnunet-service-identity.c:620
-#: src/identity/gnunet-service-identity.c:895
-#: src/identity/gnunet-service-identity.c:1015
+#: src/identity/gnunet-service-identity.c:618
+#: src/identity/gnunet-service-identity.c:891
+#: src/identity/gnunet-service-identity.c:1010
 #, fuzzy, c-format
 msgid "Failed to write subsystem default identifier map to `%s'.\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/identity/gnunet-service-identity.c:630
+#: src/identity/gnunet-service-identity.c:628
 msgid "Unknown ego specified for service (internal error)"
 msgstr ""
 
-#: src/identity/gnunet-service-identity.c:724
+#: src/identity/gnunet-service-identity.c:721
 msgid "identifier already in use for another ego"
 msgstr ""
 
-#: src/identity/gnunet-service-identity.c:871
+#: src/identity/gnunet-service-identity.c:867
 msgid "target name already exists"
 msgstr ""
 
-#: src/identity/gnunet-service-identity.c:913
-#: src/identity/gnunet-service-identity.c:1032
+#: src/identity/gnunet-service-identity.c:909
+#: src/identity/gnunet-service-identity.c:1027
 msgid "no matching ego found"
 msgstr ""
 
-#: src/identity/gnunet-service-identity.c:1130
+#: src/identity/gnunet-service-identity.c:1125
 #, fuzzy, c-format
 msgid "Failed to parse ego information in `%s'\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/identity/gnunet-service-identity.c:1188
+#: src/identity/gnunet-service-identity.c:1183
 #, fuzzy, c-format
 msgid "Failed to parse subsystem identity configuration file `%s'\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/identity/gnunet-service-identity.c:1197
+#: src/identity/gnunet-service-identity.c:1192
 #, fuzzy, c-format
 msgid "Failed to create directory `%s' for storing egos\n"
 msgstr "解析配置文件“%s”失败\n"
@@ -4661,17 +4662,19 @@ msgstr ""
 msgid "GNUnet zone manipulation tool"
 msgstr "GNUnet 配置"
 
-#: src/namecache/namecache_api.c:286
+#: src/namecache/namecache_api.c:285
 msgid "Namecache failed to cache block"
 msgstr ""
 
-#: src/namecache/namecache_api.c:374
+#: src/namecache/namecache_api.c:373
 #, fuzzy
 msgid "Error communicating with namecache service"
 msgstr "连接 %s:%u 出错。守护程序在运行吗？\n"
 
 #: src/namecache/plugin_namecache_flat.c:118
 #: src/namecache/plugin_namecache_flat.c:253
+#: src/namestore/plugin_namestore_flat.c:176
+#: src/namestore/plugin_namestore_flat.c:424
 #: src/peerstore/plugin_peerstore_flat.c:380
 #: src/peerstore/plugin_peerstore_flat.c:542
 #, fuzzy, c-format
@@ -4679,6 +4682,7 @@ msgid "Unable to initialize file: %s.\n"
 msgstr "无法初始化 SQLite：%s。\n"
 
 #: src/namecache/plugin_namecache_flat.c:129
+#: src/namestore/plugin_namestore_flat.c:187
 #: src/peerstore/plugin_peerstore_flat.c:395
 #, fuzzy, c-format
 msgid "Unable to get filesize: %s.\n"
@@ -4720,6 +4724,7 @@ msgid "the namestore plugin to work with, e.g. 'sqlite'"
 msgstr ""
 
 #: src/namestore/gnunet-namestore-dbtool.c:178
+#: src/namestore/gnunet-namestore-zonefile.c:750
 #, fuzzy
 msgid "GNUnet namestore database manipulation tool"
 msgstr "GNUnet 配置"
@@ -4828,6 +4833,47 @@ msgstr ""
 msgid "GNU Name System First-Come-First-Served name registration service"
 msgstr ""
 
+#: src/namestore/gnunet-namestore-zonefile.c:329
+#, fuzzy, c-format
+msgid "Failed to store records...\n"
+msgstr "运行 %s失败：%s %d\n"
+
+#: src/namestore/gnunet-namestore-zonefile.c:437
+#: src/namestore/gnunet-namestore-zonefile.c:469
+#, fuzzy, c-format
+msgid "Name `%s' is too long\n"
+msgstr "服务已删除。\n"
+
+#: src/namestore/gnunet-namestore-zonefile.c:515
+#, c-format
+msgid "You must provide $ORIGIN in your zonefile or via arguments (--zone)!\n"
+msgstr ""
+
+#: src/namestore/gnunet-namestore-zonefile.c:524
+#, c-format
+msgid "Only %u records per unique name supported.\n"
+msgstr ""
+
+#: src/namestore/gnunet-namestore-zonefile.c:586
+#, c-format
+msgid "Data `%s' invalid\n"
+msgstr ""
+
+#: src/namestore/gnunet-namestore-zonefile.c:702
+#, fuzzy, c-format
+msgid "Failed to connect to NAMESTORE\n"
+msgstr "初始化“%s”服务失败。\n"
+
+#: src/namestore/gnunet-namestore-zonefile.c:709
+#, fuzzy, c-format
+msgid "Failed to connect to IDENTITY\n"
+msgstr "初始化“%s”服务失败。\n"
+
+#: src/namestore/gnunet-namestore-zonefile.c:735
+#: src/namestore/gnunet-namestore.c:1628
+msgid "name of the ego controlling the zone"
+msgstr ""
+
 #: src/namestore/gnunet-namestore.c:340
 #, c-format
 msgid "Adding record failed: %s\n"
@@ -5027,21 +5073,21 @@ msgid ""
 "expired"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1628
-msgid "name of the ego controlling the zone"
-msgstr ""
-
-#: src/namestore/gnunet-service-namestore.c:1504
+#: src/namestore/gnunet-service-namestore.c:1673
 #, fuzzy
 msgid "Error normalizing name."
 msgstr "创建用户出错"
 
-#: src/namestore/gnunet-service-namestore.c:1522
+#: src/namestore/gnunet-service-namestore.c:1691
 #, fuzzy
 msgid "Error deserializing records."
 msgstr "未知错误。\n"
 
-#: src/namestore/gnunet-service-namestore.c:1633
+#: src/namestore/gnunet-service-namestore.c:1811
+msgid "Not records to delete."
+msgstr ""
+
+#: src/namestore/gnunet-service-namestore.c:1819
 #, fuzzy
 msgid "Store failed"
 msgstr "“%s”已连接到“%s”。\n"
@@ -5054,24 +5100,39 @@ msgstr ""
 msgid "minimum expiration time we assume for imported records"
 msgstr ""
 
+#: src/namestore/plugin_namestore_flat.c:195
+#, c-format
+msgid "File too big to map: %llu bytes.\n"
+msgstr ""
+
+#: src/namestore/plugin_namestore_flat.c:219
+#, c-format
+msgid "Namestore database file `%s' malformed\n"
+msgstr ""
+
+#: src/namestore/plugin_namestore_flat.c:792
+#, fuzzy
+msgid "Flat file database running\n"
+msgstr "sqlite 数据仓库"
+
 #: src/namestore/plugin_namestore_sqlite.c:180
 #: src/namestore/plugin_namestore_sqlite.c:190
-#: src/namestore/plugin_namestore_sqlite.c:806
+#: src/namestore/plugin_namestore_sqlite.c:829
 #, fuzzy, c-format
 msgid "Failed to setup database with: `%s'\n"
 msgstr "运行 %s失败：%s %d\n"
 
-#: src/namestore/plugin_namestore_sqlite.c:797
+#: src/namestore/plugin_namestore_sqlite.c:820
 #, fuzzy, c-format
 msgid "Failed to drop database with: `%s'\n"
 msgstr "运行 %s失败：%s %d\n"
 
-#: src/namestore/plugin_namestore_sqlite.c:938
+#: src/namestore/plugin_namestore_sqlite.c:961
 #, fuzzy
 msgid "SQlite database running\n"
 msgstr "sqlite 数据仓库"
 
-#: src/namestore/plugin_rest_namestore.c:1369
+#: src/namestore/plugin_rest_namestore.c:1414
 msgid "Namestore REST API initialized\n"
 msgstr ""
 
@@ -5384,7 +5445,7 @@ msgid "Show network size estimates from NSE service."
 msgstr ""
 
 #: src/nse/gnunet-service-nse.c:1441
-#: src/revocation/gnunet-service-revocation.c:888 src/util/gnunet-scrypt.c:243
+#: src/revocation/gnunet-service-revocation.c:888 src/util/gnunet-scrypt.c:242
 #, fuzzy
 msgid "Value is too large.\n"
 msgstr "值不在合法范围内。"
@@ -5464,19 +5525,19 @@ msgid "Print information about peers."
 msgstr "无法获取有关用户“%s”的信息：%s\n"
 
 #: src/peerinfo-tool/gnunet-peerinfo_plugins.c:103
-#: src/transport/gnunet-service-transport_plugins.c:167
+#: src/transport/gnunet-service-transport_plugins.c:154
 #, c-format
 msgid "Starting transport plugins `%s'\n"
 msgstr ""
 
 #: src/peerinfo-tool/gnunet-peerinfo_plugins.c:107
-#: src/transport/gnunet-service-transport_plugins.c:172
+#: src/transport/gnunet-service-transport_plugins.c:159
 #, c-format
 msgid "Loading `%s' transport plugin\n"
 msgstr ""
 
 #: src/peerinfo-tool/gnunet-peerinfo_plugins.c:127
-#: src/transport/gnunet-service-transport_plugins.c:207
+#: src/transport/gnunet-service-transport_plugins.c:194
 #, fuzzy, c-format
 msgid "Failed to load transport plugin for `%s'\n"
 msgstr "解析配置文件“%s”失败\n"
@@ -5535,7 +5596,7 @@ msgstr ""
 msgid "Skipping import of included HELLOs\n"
 msgstr ""
 
-#: src/peerinfo/peerinfo_api.c:217
+#: src/peerinfo/peerinfo_api.c:210
 msgid "Failed to receive response from `PEERINFO' service."
 msgstr ""
 
@@ -5558,7 +5619,7 @@ msgstr "输出格式未知，不应出现这种情况。\n"
 msgid "Received a malformed response from service."
 msgstr "“%s”的参数无效。\n"
 
-#: src/peerstore/peerstore_api.c:790
+#: src/peerstore/peerstore_api.c:779
 msgid "Received a watch result for a non existing watch.\n"
 msgstr ""
 
@@ -5782,60 +5843,60 @@ msgstr "立即保存配置？"
 msgid "Daemon to announce regular expressions for the peer using cadet."
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1366
+#: src/regex/gnunet-regex-profiler.c:1365
 msgid "No configuration file given. Exiting\n"
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1408
+#: src/regex/gnunet-regex-profiler.c:1407
 #: src/regex/gnunet-regex-simulation-profiler.c:631
 #, c-format
 msgid "No policy directory specified on command line. Exiting.\n"
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1414
+#: src/regex/gnunet-regex-profiler.c:1413
 #: src/regex/gnunet-regex-simulation-profiler.c:639
 #, c-format
 msgid "Specified policies directory does not exist. Exiting.\n"
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1422
+#: src/regex/gnunet-regex-profiler.c:1421
 #, fuzzy, c-format
 msgid "No files found in `%s'\n"
 msgstr "运行 %s失败：%s %d\n"
 
-#: src/regex/gnunet-regex-profiler.c:1431
+#: src/regex/gnunet-regex-profiler.c:1430
 msgid "No search strings file given. Exiting.\n"
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1451
+#: src/regex/gnunet-regex-profiler.c:1450
 #, fuzzy
 msgid "Error loading search strings. Exiting.\n"
 msgstr "创建用户出错"
 
-#: src/regex/gnunet-regex-profiler.c:1540
+#: src/regex/gnunet-regex-profiler.c:1539
 #, fuzzy
 msgid "name of the file for writing statistics"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/regex/gnunet-regex-profiler.c:1547
+#: src/regex/gnunet-regex-profiler.c:1546
 msgid "wait TIMEOUT before ending the experiment"
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1553
+#: src/regex/gnunet-regex-profiler.c:1552
 msgid "directory with policy files"
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1560
+#: src/regex/gnunet-regex-profiler.c:1559
 #, fuzzy
 msgid "name of file with input strings"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/regex/gnunet-regex-profiler.c:1567
+#: src/regex/gnunet-regex-profiler.c:1566
 #, fuzzy
 msgid "name of file with hosts' names"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/regex/gnunet-regex-profiler.c:1582
+#: src/regex/gnunet-regex-profiler.c:1581
 msgid "Profiler for regex"
 msgstr ""
 
@@ -5856,17 +5917,17 @@ msgstr ""
 msgid "Regex `%s' is too long!\n"
 msgstr "服务已删除。\n"
 
-#: src/regex/regex_api_search.c:212
+#: src/regex/regex_api_search.c:200
 #, fuzzy, c-format
 msgid "Search string `%s' is too long!\n"
 msgstr "服务已删除。\n"
 
-#: src/rest/gnunet-rest-server.c:1367
+#: src/rest/gnunet-rest-server.c:1366
 #, fuzzy
 msgid "GNUnet REST server"
 msgstr "GNUnet 错误日志"
 
-#: src/rest/plugin_rest_config.c:429
+#: src/rest/plugin_rest_config.c:428
 msgid "CONFIG REST API initialized\n"
 msgstr ""
 
@@ -6068,63 +6129,63 @@ msgstr ""
 msgid "Get peers from biased stream"
 msgstr ""
 
-#: src/scalarproduct/gnunet-scalarproduct.c:229
+#: src/scalarproduct/gnunet-scalarproduct.c:228
 #, fuzzy
 msgid "You must specify at least one message ID to check!\n"
 msgstr "您必须指定一个昵称\n"
 
-#: src/scalarproduct/gnunet-scalarproduct.c:237
+#: src/scalarproduct/gnunet-scalarproduct.c:236
 msgid "This program needs a session identifier for comparing vectors.\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-scalarproduct.c:250
+#: src/scalarproduct/gnunet-scalarproduct.c:249
 #, c-format
 msgid ""
 "Tried to set initiator mode, as peer ID was given. However, `%s' is not a "
 "valid peer identifier.\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-scalarproduct.c:268
+#: src/scalarproduct/gnunet-scalarproduct.c:267
 msgid "Need elements to compute the scalarproduct, got none.\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-scalarproduct.c:291
+#: src/scalarproduct/gnunet-scalarproduct.c:290
 #, fuzzy, c-format
 msgid "Malformed input, could not parse `%s'\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/scalarproduct/gnunet-scalarproduct.c:309
+#: src/scalarproduct/gnunet-scalarproduct.c:308
 #, fuzzy, c-format
 msgid "Could not convert `%s' to int64_t.\n"
 msgstr "无法连接到 %s:%u：%s\n"
 
-#: src/scalarproduct/gnunet-scalarproduct.c:339
+#: src/scalarproduct/gnunet-scalarproduct.c:338
 #, c-format
 msgid "Failed to initiate computation, were all keys unique?\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-scalarproduct.c:365
-#: src/scalarproduct/gnunet-scalarproduct.c:372
+#: src/scalarproduct/gnunet-scalarproduct.c:364
+#: src/scalarproduct/gnunet-scalarproduct.c:371
 msgid ""
 "A comma separated list of elements to compare as vector with our remote peer."
 msgstr ""
 
-#: src/scalarproduct/gnunet-scalarproduct.c:379
+#: src/scalarproduct/gnunet-scalarproduct.c:378
 msgid ""
 "[Optional] peer to calculate our scalarproduct with. If this parameter is "
 "not given, the service will wait for a remote peer to compute the request."
 msgstr ""
 
-#: src/scalarproduct/gnunet-scalarproduct.c:386
+#: src/scalarproduct/gnunet-scalarproduct.c:385
 msgid "Transaction ID shared with peer."
 msgstr ""
 
-#: src/scalarproduct/gnunet-scalarproduct.c:397
+#: src/scalarproduct/gnunet-scalarproduct.c:396
 msgid "Calculate the Vectorproduct with a GNUnet peer."
 msgstr ""
 
 #: src/scalarproduct/gnunet-service-scalarproduct-ecc_alice.c:1118
-#: src/scalarproduct/gnunet-service-scalarproduct-ecc_bob.c:1034
+#: src/scalarproduct/gnunet-service-scalarproduct-ecc_bob.c:1032
 #: src/scalarproduct/gnunet-service-scalarproduct_alice.c:1358
 #: src/scalarproduct/gnunet-service-scalarproduct_bob.c:1355
 #, fuzzy
@@ -6151,7 +6212,7 @@ msgstr ""
 msgid "also profile decryption"
 msgstr ""
 
-#: src/set/gnunet-service-set.c:1916 src/seti/gnunet-service-seti.c:2467
+#: src/set/gnunet-service-set.c:1914 src/seti/gnunet-service-seti.c:2467
 #: src/setu/gnunet-service-setu.c:5389
 #, fuzzy
 msgid "Could not connect to CADET service\n"
@@ -6209,16 +6270,16 @@ msgstr ""
 msgid "return intersection instead of delta"
 msgstr ""
 
-#: src/sq/sq.c:54
+#: src/sq/sq.c:47
 #, c-format
 msgid "Failure to bind %u-th SQL parameter\n"
 msgstr ""
 
-#: src/sq/sq.c:61
+#: src/sq/sq.c:54
 msgid "Failure in sqlite3_reset (!)\n"
 msgstr ""
 
-#: src/sq/sq.c:139
+#: src/sq/sq.c:126
 #, fuzzy, c-format
 msgid "Failed to reset sqlite statement with error: %s\n"
 msgstr "解析配置文件“%s”失败\n"
@@ -6426,57 +6487,57 @@ msgid ""
 "Cannot open %s for writing load statistics.  Not logging load statistics\n"
 msgstr ""
 
-#: src/testbed/gnunet-service-testbed_peers.c:1165
+#: src/testbed/gnunet-service-testbed_peers.c:1153
 #, c-format
 msgid "%s is stopped"
 msgstr ""
 
-#: src/testbed/gnunet-service-testbed_peers.c:1168
+#: src/testbed/gnunet-service-testbed_peers.c:1156
 #, c-format
 msgid "%s is starting"
 msgstr ""
 
-#: src/testbed/gnunet-service-testbed_peers.c:1171
+#: src/testbed/gnunet-service-testbed_peers.c:1159
 #, c-format
 msgid "%s is stopping"
 msgstr ""
 
-#: src/testbed/gnunet-service-testbed_peers.c:1174
+#: src/testbed/gnunet-service-testbed_peers.c:1162
 #, c-format
 msgid "%s is starting already"
 msgstr ""
 
-#: src/testbed/gnunet-service-testbed_peers.c:1177
+#: src/testbed/gnunet-service-testbed_peers.c:1165
 #, c-format
 msgid "%s is stopping already"
 msgstr ""
 
-#: src/testbed/gnunet-service-testbed_peers.c:1180
+#: src/testbed/gnunet-service-testbed_peers.c:1168
 #, c-format
 msgid "%s is started already"
 msgstr ""
 
-#: src/testbed/gnunet-service-testbed_peers.c:1183
+#: src/testbed/gnunet-service-testbed_peers.c:1171
 #, c-format
 msgid "%s is stopped already"
 msgstr ""
 
-#: src/testbed/gnunet-service-testbed_peers.c:1186
+#: src/testbed/gnunet-service-testbed_peers.c:1174
 #, fuzzy, c-format
 msgid "%s service is not known to ARM"
 msgstr "服务已删除。\n"
 
-#: src/testbed/gnunet-service-testbed_peers.c:1189
+#: src/testbed/gnunet-service-testbed_peers.c:1177
 #, fuzzy, c-format
 msgid "%s service failed to start"
 msgstr "运行 %s失败：%s %d\n"
 
-#: src/testbed/gnunet-service-testbed_peers.c:1192
+#: src/testbed/gnunet-service-testbed_peers.c:1180
 #, c-format
 msgid "%s service can't be started because ARM is shutting down"
 msgstr ""
 
-#: src/testbed/gnunet-service-testbed_peers.c:1194
+#: src/testbed/gnunet-service-testbed_peers.c:1182
 #, c-format
 msgid "%.s Unknown result code."
 msgstr ""
@@ -6497,17 +6558,17 @@ msgstr ""
 msgid "Adding host %u failed with error: %s\n"
 msgstr "“%s”以错误码 %d 失败：%s\n"
 
-#: src/testbed/testbed_api_hosts.c:429
+#: src/testbed/testbed_api_hosts.c:411
 #, c-format
 msgid "Hosts file %s not found\n"
 msgstr ""
 
-#: src/testbed/testbed_api_hosts.c:438
+#: src/testbed/testbed_api_hosts.c:420
 #, c-format
 msgid "Hosts file %s has no data\n"
 msgstr ""
 
-#: src/testbed/testbed_api_hosts.c:447
+#: src/testbed/testbed_api_hosts.c:429
 #, c-format
 msgid "Hosts file %s cannot be read\n"
 msgstr ""
@@ -6521,87 +6582,87 @@ msgstr ""
 msgid "Host registration failed for a host. Error: %s\n"
 msgstr ""
 
-#: src/testbed/testbed_api_testbed.c:1065
+#: src/testbed/testbed_api_testbed.c:1060
 msgid "Controller crash detected. Shutting down.\n"
 msgstr ""
 
-#: src/testbed/testbed_api_testbed.c:1154
+#: src/testbed/testbed_api_testbed.c:1149
 #, c-format
 msgid "Host %s cannot start testbed\n"
 msgstr ""
 
-#: src/testbed/testbed_api_testbed.c:1158
+#: src/testbed/testbed_api_testbed.c:1153
 msgid "Testbed cannot be started on localhost\n"
 msgstr ""
 
-#: src/testbed/testbed_api_testbed.c:1196
+#: src/testbed/testbed_api_testbed.c:1191
 msgid "Cannot start the master controller"
 msgstr ""
 
-#: src/testbed/testbed_api_testbed.c:1214
+#: src/testbed/testbed_api_testbed.c:1209
 msgid "Shutting down testbed due to timeout while setup.\n"
 msgstr ""
 
-#: src/testbed/testbed_api_testbed.c:1276
+#: src/testbed/testbed_api_testbed.c:1271
 msgid "No hosts loaded. Need at least one host\n"
 msgstr ""
 
-#: src/testbed/testbed_api_testbed.c:1301
+#: src/testbed/testbed_api_testbed.c:1296
 msgid "Specified topology must be supported by testbed"
 msgstr ""
 
-#: src/testbed/testbed_api_testbed.c:1357
+#: src/testbed/testbed_api_testbed.c:1352
 #, c-format
 msgid ""
 "Maximum number of edges a peer can have in a scale free topology cannot be "
 "more than %u.  Given `%s = %llu'"
 msgstr ""
 
-#: src/testbed/testbed_api_testbed.c:1374
+#: src/testbed/testbed_api_testbed.c:1369
 #, c-format
 msgid ""
 "The number of edges that can established when adding a new node to scale "
 "free topology cannot be more than %u.  Given `%s = %llu'"
 msgstr ""
 
-#: src/testbed/testbed_api_topology.c:1033 src/testing/testing.c:2753
+#: src/testbed/testbed_api_topology.c:1021 src/testing/testing.c:2693
 #, c-format
 msgid "Topology file %s not found\n"
 msgstr ""
 
-#: src/testbed/testbed_api_topology.c:1041 src/testing/testing.c:2761
+#: src/testbed/testbed_api_topology.c:1029 src/testing/testing.c:2701
 #, c-format
 msgid "Topology file %s has no data\n"
 msgstr ""
 
-#: src/testbed/testbed_api_topology.c:1049 src/testing/testing.c:2769
+#: src/testbed/testbed_api_topology.c:1037 src/testing/testing.c:2709
 #, c-format
 msgid "Topology file %s cannot be read\n"
 msgstr ""
 
-#: src/testbed/testbed_api_topology.c:1071
+#: src/testbed/testbed_api_topology.c:1059
 #, fuzzy, c-format
 msgid "Failed to read peer index from toology file: %s"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/testbed/testbed_api_topology.c:1080
-#: src/testbed/testbed_api_topology.c:1105
+#: src/testbed/testbed_api_topology.c:1068
+#: src/testbed/testbed_api_topology.c:1093
 #, c-format
 msgid "Value in given topology file: %s out of range\n"
 msgstr ""
 
-#: src/testbed/testbed_api_topology.c:1086
-#: src/testbed/testbed_api_topology.c:1111
+#: src/testbed/testbed_api_topology.c:1074
+#: src/testbed/testbed_api_topology.c:1099
 #, fuzzy, c-format
 msgid "Failed to read peer index from topology file: %s"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/testbed/testbed_api_topology.c:1092
-#: src/testbed/testbed_api_topology.c:1117
+#: src/testbed/testbed_api_topology.c:1080
+#: src/testbed/testbed_api_topology.c:1105
 msgid "Topology file needs more peers than given ones\n"
 msgstr ""
 
-#: src/testbed/testbed_api_topology.c:1153
+#: src/testbed/testbed_api_topology.c:1141
 #, fuzzy, c-format
 msgid "Ignoring to connect peer %lu to peer %lu\n"
 msgstr "无法连接到 %s:%u：%s\n"
@@ -6700,7 +6761,7 @@ msgstr "解析配置文件“%s”失败\n"
 msgid "Failed to start `%s': %s\n"
 msgstr "运行 %s失败：%s %d\n"
 
-#: src/testing/testing.c:1694
+#: src/testing/testing.c:1646
 #, fuzzy, c-format
 msgid "Failed to load configuration from %s\n"
 msgstr "解析配置文件“%s”失败\n"
@@ -6782,7 +6843,7 @@ msgstr ""
 #: src/transport/gnunet-communicator-tcp.c:3347
 #: src/transport/gnunet-communicator-udp.c:3871
 #: src/transport/gnunet-service-tng.c:11334
-#: src/transport/gnunet-service-transport.c:2622
+#: src/transport/gnunet-service-transport.c:2617
 #, fuzzy
 msgid "Transport service is lacking key configuration settings. Exiting.\n"
 msgstr "立即保存配置？"
@@ -6846,12 +6907,12 @@ msgstr ""
 msgid "Disallowing connection to peer `%s' on transport %s\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/transport/gnunet-service-transport.c:2547
+#: src/transport/gnunet-service-transport.c:2542
 #, fuzzy, c-format
 msgid "Adding blacklisting entry for peer `%s'\n"
 msgstr "卸载 GNUnet 服务"
 
-#: src/transport/gnunet-service-transport.c:2556
+#: src/transport/gnunet-service-transport.c:2551
 #, c-format
 msgid "Adding blacklisting entry for peer `%s':`%s'\n"
 msgstr ""
@@ -6877,7 +6938,7 @@ msgid "# disconnects due to quota of 0"
 msgstr ""
 
 #: src/transport/gnunet-service-transport_neighbours.c:1341
-#: src/transport/gnunet-service-transport_neighbours.c:1817
+#: src/transport/gnunet-service-transport_neighbours.c:1807
 msgid "# bytes in message queue for other peers"
 msgstr ""
 
@@ -6945,135 +7006,135 @@ msgstr ""
 msgid "# ms throttling suggested"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1886
+#: src/transport/gnunet-service-transport_neighbours.c:1876
 #, fuzzy, c-format
 msgid "Failed to send SYN message to peer `%s'\n"
 msgstr "打开日志文件“%s”失败：%s\n"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1912
+#: src/transport/gnunet-service-transport_neighbours.c:1902
 #, fuzzy
 msgid "# Failed attempts to switch addresses (failed to send SYN CONT)"
 msgstr "打开日志文件“%s”失败：%s\n"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1953
+#: src/transport/gnunet-service-transport_neighbours.c:1943
 #, fuzzy
 msgid "# SYN messages sent"
 msgstr "消息尺寸"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1970
+#: src/transport/gnunet-service-transport_neighbours.c:1960
 #, fuzzy, c-format
 msgid "Failed to transmit SYN message to %s\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/transport/gnunet-service-transport_neighbours.c:2006
+#: src/transport/gnunet-service-transport_neighbours.c:1996
 #, fuzzy
 msgid "# Failed attempts to switch addresses (failed to send SYN)"
 msgstr "打开日志文件“%s”失败：%s\n"
 
-#: src/transport/gnunet-service-transport_neighbours.c:2077
+#: src/transport/gnunet-service-transport_neighbours.c:2067
 #, fuzzy, c-format
 msgid "Failed to send SYN_ACK message to peer `%s' using address `%s'\n"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/transport/gnunet-service-transport_neighbours.c:2132
+#: src/transport/gnunet-service-transport_neighbours.c:2122
 msgid "# SYN_ACK messages sent"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:2150
+#: src/transport/gnunet-service-transport_neighbours.c:2140
 #, fuzzy, c-format
 msgid "Failed to transmit SYN_ACK message to %s\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/transport/gnunet-service-transport_neighbours.c:2314
+#: src/transport/gnunet-service-transport_neighbours.c:2304
 msgid "# SYN messages received"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:2320
+#: src/transport/gnunet-service-transport_neighbours.c:2310
 #, c-format
 msgid "SYN request from peer `%s' ignored due impending shutdown\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:2731
+#: src/transport/gnunet-service-transport_neighbours.c:2721
 msgid "# Attempts to switch addresses"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3244
+#: src/transport/gnunet-service-transport_neighbours.c:3227
 msgid "# SYN_ACK messages received"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3252
+#: src/transport/gnunet-service-transport_neighbours.c:3235
 msgid "# unexpected SYN_ACK messages (no peer)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3272
-#: src/transport/gnunet-service-transport_neighbours.c:3300
+#: src/transport/gnunet-service-transport_neighbours.c:3255
+#: src/transport/gnunet-service-transport_neighbours.c:3283
 msgid "# unexpected SYN_ACK messages (not ready)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3315
+#: src/transport/gnunet-service-transport_neighbours.c:3298
 msgid "# unexpected SYN_ACK messages (waiting on ATS)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3345
+#: src/transport/gnunet-service-transport_neighbours.c:3328
 msgid "# Successful attempts to switch addresses"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3359
+#: src/transport/gnunet-service-transport_neighbours.c:3342
 msgid "# unexpected SYN_ACK messages (disconnecting)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3548
+#: src/transport/gnunet-service-transport_neighbours.c:3531
 msgid "# ACK messages received"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3582
+#: src/transport/gnunet-service-transport_neighbours.c:3565
 msgid "# unexpected ACK messages"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3672
+#: src/transport/gnunet-service-transport_neighbours.c:3648
 msgid "# quota messages ignored (malformed)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3679
+#: src/transport/gnunet-service-transport_neighbours.c:3655
 msgid "# QUOTA messages received"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3722
+#: src/transport/gnunet-service-transport_neighbours.c:3698
 msgid "# disconnect messages ignored (malformed)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3729
+#: src/transport/gnunet-service-transport_neighbours.c:3705
 msgid "# DISCONNECT messages received"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3742
+#: src/transport/gnunet-service-transport_neighbours.c:3718
 msgid "# disconnect messages ignored (timestamp)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3879
+#: src/transport/gnunet-service-transport_neighbours.c:3855
 msgid "# disconnected from peer upon explicit request"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_plugins.c:157
+#: src/transport/gnunet-service-transport_plugins.c:144
 msgid "Transport service is lacking NEIGHBOUR_LIMIT option.\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_plugins.c:222
-#: src/transport/gnunet-service-transport_plugins.c:230
-#: src/transport/gnunet-service-transport_plugins.c:238
-#: src/transport/gnunet-service-transport_plugins.c:246
-#: src/transport/gnunet-service-transport_plugins.c:254
-#: src/transport/gnunet-service-transport_plugins.c:262
-#: src/transport/gnunet-service-transport_plugins.c:270
-#: src/transport/gnunet-service-transport_plugins.c:278
-#: src/transport/gnunet-service-transport_plugins.c:286
-#: src/transport/gnunet-service-transport_plugins.c:294
-#: src/transport/gnunet-service-transport_plugins.c:302
+#: src/transport/gnunet-service-transport_plugins.c:209
+#: src/transport/gnunet-service-transport_plugins.c:217
+#: src/transport/gnunet-service-transport_plugins.c:225
+#: src/transport/gnunet-service-transport_plugins.c:233
+#: src/transport/gnunet-service-transport_plugins.c:241
+#: src/transport/gnunet-service-transport_plugins.c:249
+#: src/transport/gnunet-service-transport_plugins.c:257
+#: src/transport/gnunet-service-transport_plugins.c:265
+#: src/transport/gnunet-service-transport_plugins.c:273
+#: src/transport/gnunet-service-transport_plugins.c:281
+#: src/transport/gnunet-service-transport_plugins.c:289
 #, fuzzy, c-format
 msgid "Missing function `%s' in transport plugin for `%s'\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/transport/gnunet-service-transport_plugins.c:309
+#: src/transport/gnunet-service-transport_plugins.c:296
 #, c-format
 msgid "Did not load plugin `%s' due to missing functions\n"
 msgstr ""
@@ -7350,7 +7411,7 @@ msgstr ""
 msgid "send data for benchmarking to the other peer (until CTRL-C)"
 msgstr ""
 
-#: src/transport/plugin_transport_http_client.c:1488
+#: src/transport/plugin_transport_http_client.c:1482
 #: src/transport/plugin_transport_http_server.c:2331
 #: src/transport/plugin_transport_http_server.c:3562
 #: src/transport/plugin_transport_tcp.c:3773
@@ -7358,24 +7419,24 @@ msgstr ""
 msgid "TCP_STEALTH not supported on this platform.\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_client.c:2134
+#: src/transport/plugin_transport_http_client.c:2128
 #, c-format
 msgid "Could not initialize curl multi handle, failed to start %s plugin!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_client.c:2183
+#: src/transport/plugin_transport_http_client.c:2177
 #: src/transport/plugin_transport_http_server.c:3276
 #, fuzzy, c-format
 msgid "Shutting down plugin `%s'\n"
 msgstr "未知的命令“%s”。\n"
 
-#: src/transport/plugin_transport_http_client.c:2200
+#: src/transport/plugin_transport_http_client.c:2194
 #: src/transport/plugin_transport_http_server.c:3346
 #, c-format
 msgid "Shutdown for plugin `%s' complete\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_client.c:2234
+#: src/transport/plugin_transport_http_client.c:2228
 #, fuzzy, c-format
 msgid "Maximum number of requests is %u\n"
 msgstr "增加 TCP/IP 的最大连接数"
@@ -7780,7 +7841,7 @@ msgstr ""
 msgid "`%s' failed for `%s': address already in use\n"
 msgstr "对驱动器“%2$s”的“%1$s”操作失败：%3$u\n"
 
-#: src/transport/tcp_server_legacy.c:897
+#: src/transport/tcp_server_legacy.c:892
 #, c-format
 msgid ""
 "Processing code for message of type %u did not call "
@@ -8006,20 +8067,20 @@ msgstr ""
 msgid "INVALID"
 msgstr ""
 
-#: src/util/common_logging.c:1396
+#: src/util/common_logging.c:1360
 msgid "unknown address"
 msgstr ""
 
-#: src/util/common_logging.c:1441
+#: src/util/common_logging.c:1405
 msgid "invalid address"
 msgstr ""
 
-#: src/util/common_logging.c:1453
+#: src/util/common_logging.c:1417
 #, fuzzy, c-format
 msgid "Configuration fails to specify option `%s' in section `%s'!\n"
 msgstr "配置不满足配置规范文件“%s”的约束！\n"
 
-#: src/util/common_logging.c:1468
+#: src/util/common_logging.c:1432
 #, fuzzy, c-format
 msgid ""
 "Configuration specifies invalid value for option `%s' in section `%s': %s\n"
@@ -8171,12 +8232,12 @@ msgstr "找不到主机“%s”的 IP：%s\n"
 msgid "Received DNS response that is too small (%u bytes)\n"
 msgstr ""
 
-#: src/util/dnsstub.c:508
+#: src/util/dnsstub.c:503
 #, fuzzy, c-format
 msgid "Failed to send DNS request to %s: %s\n"
 msgstr "打开日志文件“%s”失败：%s\n"
 
-#: src/util/dnsstub.c:513
+#: src/util/dnsstub.c:508
 #, fuzzy, c-format
 msgid "Sent DNS request to %s\n"
 msgstr "打开日志文件“%s”失败：%s\n"
@@ -8554,28 +8615,28 @@ msgstr ""
 msgid "Use built-in GNUnet stub resolver"
 msgstr ""
 
-#: src/util/gnunet-scrypt.c:215
+#: src/util/gnunet-scrypt.c:214
 #, c-format
 msgid "Loading hostkey from `%s' failed.\n"
 msgstr ""
 
-#: src/util/gnunet-scrypt.c:281
+#: src/util/gnunet-scrypt.c:280
 msgid "number of bits to require for the proof of work"
 msgstr ""
 
-#: src/util/gnunet-scrypt.c:287
+#: src/util/gnunet-scrypt.c:286
 msgid "file with private key, otherwise default is used"
 msgstr ""
 
-#: src/util/gnunet-scrypt.c:293
+#: src/util/gnunet-scrypt.c:292
 msgid "file with proof of work, otherwise default is used"
 msgstr ""
 
-#: src/util/gnunet-scrypt.c:299
+#: src/util/gnunet-scrypt.c:298
 msgid "time to wait between calculations"
 msgstr ""
 
-#: src/util/gnunet-scrypt.c:313
+#: src/util/gnunet-scrypt.c:312
 #, fuzzy
 msgid "Manipulate GNUnet proof of work files"
 msgstr "更改配置文件中的一个值"
@@ -8608,17 +8669,17 @@ msgstr ""
 msgid "Perform default-actions for GNUnet URIs"
 msgstr ""
 
-#: src/util/helper.c:323
+#: src/util/helper.c:306
 #, fuzzy, c-format
 msgid "Error reading from `%s': %s\n"
 msgstr "创建用户出错"
 
-#: src/util/helper.c:375
+#: src/util/helper.c:358
 #, fuzzy, c-format
 msgid "Failed to parse inbound message from helper `%s'\n"
 msgstr "打开日志文件“%s”失败：%s\n"
 
-#: src/util/helper.c:606
+#: src/util/helper.c:573
 #, fuzzy, c-format
 msgid "Error writing to `%s': %s\n"
 msgstr "创建用户出错"
@@ -8628,25 +8689,25 @@ msgstr "创建用户出错"
 msgid "Unable to shorten unix path `%s' while keeping name unique\n"
 msgstr ""
 
-#: src/util/network.c:1307
+#: src/util/network.c:1284
 #, c-format
 msgid ""
 "Fatal internal logic error, process hangs in `%s' (abort with CTRL-C)!\n"
 msgstr ""
 
-#: src/util/os_installation.c:420
+#: src/util/os_installation.c:415
 #, fuzzy, c-format
 msgid ""
 "Could not determine installation path for %s.  Set `%s' environment "
 "variable.\n"
 msgstr "无法确定安装路径。请尝试设置“%s”\n"
 
-#: src/util/os_installation.c:791
+#: src/util/os_installation.c:786
 #, fuzzy, c-format
 msgid "Could not find binary `%s' in PATH!\n"
 msgstr "找不到主机“%s”的 IP：%s\n"
 
-#: src/util/os_installation.c:824
+#: src/util/os_installation.c:819
 #, c-format
 msgid "Binary `%s' exists, but is not SUID\n"
 msgstr ""
@@ -8691,7 +8752,7 @@ msgstr "解析配置文件“%s”失败\n"
 msgid "Malformed configuration. Exiting ...\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/util/regex.c:139
+#: src/util/regex.c:123
 #, c-format
 msgid "Bad mask: %d\n"
 msgstr ""
@@ -9002,26 +9063,16 @@ msgstr ""
 msgid "Setup tunnels via VPN."
 msgstr ""
 
-#: src/zonemaster/gnunet-service-zonemaster-monitor.c:249
-#: src/zonemaster/gnunet-service-zonemaster.c:364
+#: src/zonemaster/gnunet-service-zonemaster.c:521
 #, fuzzy, c-format
 msgid "Failed to replicate block in namecache: %s\n"
 msgstr "发送消息失败。\n"
 
-#: src/zonemaster/gnunet-service-zonemaster-monitor.c:529
-#: src/zonemaster/gnunet-service-zonemaster.c:969
+#: src/zonemaster/gnunet-service-zonemaster.c:1383
 #, fuzzy
 msgid "Failed to connect to the namestore!\n"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/zonemaster/gnunet-service-zonemaster-monitor.c:550
-msgid "Namecache is disabled!\n"
-msgstr ""
-
-#, fuzzy
-#~ msgid "Flat file database running\n"
-#~ msgstr "sqlite 数据仓库"
-
 #, fuzzy, c-format
 #~ msgid "Invalid DID `%s'\n"
 #~ msgstr "无效条目。\n"
@@ -9137,10 +9188,6 @@ msgstr ""
 #~ msgid "Assertion failed at %s:%d. Aborting.\n"
 #~ msgstr "对驱动器“%2$s”的“%1$s”操作失败：%3$u\n"
 
-#, fuzzy
-#~ msgid "Failed to connect to CREDENTIAL\n"
-#~ msgstr "初始化“%s”服务失败。\n"
-
 #, fuzzy
 #~ msgid "GNUnet credential resolver tool"
 #~ msgstr "GNUnet 错误日志"
diff --git a/src/include/gnunet_mysql_lib.h b/src/include/gnunet_mysql_lib.h
index 843d3ccb3..8da7e5397 100644
--- a/src/include/gnunet_mysql_lib.h
+++ b/src/include/gnunet_mysql_lib.h
@@ -41,11 +41,15 @@ extern "C"
 #endif
 #endif
 
-#ifdef HAVE_MYSQL8
+#ifndef LIBMARIADB
+#ifdef HAVE_MYSQL8 && !LIBMARIADB
   typedef bool MYSQL_BOOL;
 #else
   typedef my_bool MYSQL_BOOL; //MySQL < 8 wants this
 #endif
+#else
+  typedef my_bool MYSQL_BOOL; //MariaDB still uses my_bool
+#endif
 
 
 /**
diff --git a/src/namestore/gnunet-namestore-zonefile.c 
b/src/namestore/gnunet-namestore-zonefile.c
index 26906d140..5cf25abec 100644
--- a/src/namestore/gnunet-namestore-zonefile.c
+++ b/src/namestore/gnunet-namestore-zonefile.c
@@ -271,13 +271,16 @@ parse_origin (char *token, char *origin)
 {
   char *next;
   next = strchr (token, ';');
-  if (NULL != next)
-    next[0] = '\0';
+  if (NULL == next)
+    return GNUNET_SYSERR;
+  next[0] = '\0';
   next = strchr (token, ' ');
-  if (NULL != next)
-    next[0] = '\0';
+  if (NULL == next)
+    return GNUNET_SYSERR;
+  next[0] = '\0';
   strcpy (origin, token);
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Origin is: %s\n", origin);
+  return GNUNET_OK;
 }
 
 static void
@@ -300,7 +303,6 @@ origin_create_cb (void *cls, const struct 
GNUNET_IDENTITY_PrivateKey *pk,
 static void
 origin_lookup_cb (void *cls, struct GNUNET_IDENTITY_Ego *ego)
 {
-  const struct GNUNET_CONFIGURATION_Handle *cfg = cls;
 
   el = NULL;
 
@@ -384,7 +386,7 @@ parse (void *cls)
   parse_task = NULL;
   /* use filename provided as 1st argument (stdin by default) */
   int ln = 0;
-  while (res = fgets (buf, sizeof(buf), stdin))                     /* read 
each line of input */
+  while ((res = fgets (buf, sizeof(buf), stdin)))                     /* read 
each line of input */
   {
     ln++;
     ttl_line = 0;
@@ -512,7 +514,8 @@ parse (void *cls)
       if (ZS_READY == state)
       {
         fprintf (stderr,
-                 _ ("You must provide $ORIGIN in your zonefile or via 
arguments (--zone)!\n"));
+                 _ (
+                   "You must provide $ORIGIN in your zonefile or via arguments 
(--zone)!\n"));
         ret = 1;
         GNUNET_SCHEDULER_shutdown ();
         return;
@@ -661,10 +664,8 @@ tx_start (void *cls, int32_t success, const char *emsg)
 static void
 identity_cb (void *cls, struct GNUNET_IDENTITY_Ego *ego)
 {
-  const struct GNUNET_CONFIGURATION_Handle *cfg = cls;
 
   el = NULL;
-
   if (NULL == ego)
   {
     if (NULL != ego_name)
diff --git a/src/zonemaster/gnunet-service-zonemaster.c 
b/src/zonemaster/gnunet-service-zonemaster.c
index 4cf5e690a..220cf1f99 100644
--- a/src/zonemaster/gnunet-service-zonemaster.c
+++ b/src/zonemaster/gnunet-service-zonemaster.c
@@ -412,7 +412,7 @@ shutdown_task (void *cls)
   struct OpenSignJob *job;
 
   (void) cls;
-  in_shutdown == GNUNET_YES;
+  in_shutdown = GNUNET_YES;
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
               "Shutting down!\n");
   if (NULL != notification_pipe)
@@ -820,11 +820,9 @@ perform_dht_put (const struct GNUNET_IDENTITY_PrivateKey 
*key,
   struct GNUNET_GNSRECORD_Data rd_public[rd_count];
   struct GNUNET_GNSRECORD_Block *block;
   struct GNUNET_GNSRECORD_Block *block_priv;
-  struct GNUNET_HashCode query;
   struct GNUNET_TIME_Absolute expire_pub;
   size_t block_size;
   unsigned int rd_public_count = 0;
-  struct GNUNET_DHT_PutHandle *ret;
   char *emsg;
 
   if (GNUNET_OK !=
@@ -1135,25 +1133,6 @@ publish_zone_dht_start (void *cls)
 }
 
 
-/**
- * Continuation called from DHT once the PUT operation triggered
- * by a monitor is done.
- *
- * @param cls a `struct DhtPutActivity`
- */
-static void
-dht_put_monitor_continuation (void *cls)
-{
-  struct DhtPutActivity *ma = cls;
-
-  ma_queue_length--;
-  GNUNET_CONTAINER_DLL_remove (ma_head,
-                               ma_tail,
-                               ma);
-  GNUNET_free (ma);
-}
-
-
 /**
  * Store GNS records in the DHT.
  *
@@ -1175,11 +1154,9 @@ perform_dht_put_monitor (const struct 
GNUNET_IDENTITY_PrivateKey *key,
   struct GNUNET_GNSRECORD_Data rd_public[rd_count];
   struct GNUNET_GNSRECORD_Block *block;
   struct GNUNET_GNSRECORD_Block *block_priv;
-  struct GNUNET_HashCode query;
   struct GNUNET_TIME_Absolute expire_pub;
   size_t block_size;
   unsigned int rd_public_count = 0;
-  struct GNUNET_DHT_PutHandle *ret;
   char *emsg;
 
   if (GNUNET_OK !=

-- 
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.
[Prev in Thread]
Current Thread
[Next in Thread]
[gnunet] branch master updated: -fix warnings, gnunet <=
Prev by Date: [gnunet] branch master updated: -update handbook
Next by Date: [taler-deployment] branch master updated (6c0c47e -> 23c5ecf)
Previous by thread: [gnunet] branch master updated: -update handbook
Next by thread: [taler-deployment] branch master updated (6c0c47e -> 23c5ecf)
Index(es):
- Date
- Thread