-fix warnings

1 files changed, 375 insertions, 328 deletions

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"
@@ -9429,10 +9480,6 @@ msgstr ""
 #~ 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."