ZONEMASTER: Merge monitor into zonemaster process

1 files changed, 56 insertions, 53 deletions

diff --git a/po/de.po b/po/de.po
index a548cf3b2..d5bc9a3ad 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-01 22:27+0900\n"
+"POT-Creation-Date: 2022-10-16 18:47+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"
@@ -1884,17 +1884,17 @@ msgstr "`%s' an `%s' schlug fehl bei %s:%d mit dem Fehler: %s\n"
 msgid "Mysql database running\n"
 msgstr "MySQL-Datenbank läuft\n"
 
-#: src/datastore/plugin_datastore_postgres.c:284
-#: src/datastore/plugin_datastore_postgres.c:897
+#: src/datastore/plugin_datastore_postgres.c:273
+#: src/datastore/plugin_datastore_postgres.c:886
 msgid "Postgresql exec failure"
 msgstr ""
 
-#: src/datastore/plugin_datastore_postgres.c:858
+#: src/datastore/plugin_datastore_postgres.c:847
 #, fuzzy
 msgid "Failed to drop table from database.\n"
 msgstr "Fehler beim Binden an UDP Port %d.\n"
 
-#: src/datastore/plugin_datastore_postgres.c:956
+#: src/datastore/plugin_datastore_postgres.c:945
 msgid "Postgres database running\n"
 msgstr "PostgreSQL-Datenbank läuft\n"
 
@@ -1908,7 +1908,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:869
+#: src/namestore/plugin_namestore_sqlite.c:868
 #: src/peerstore/plugin_peerstore_sqlite.c:540
 #, c-format
 msgid "Unable to initialize SQLite: %s.\n"
@@ -3763,32 +3763,28 @@ msgstr "Zustellung der Nachricht `%s' fehlgeschlagen.\n"
 msgid "VPN returned empty result for `%s'\n"
 msgstr ""
 
-#: src/gns/gnunet-dns2gns.c:655
+#: src/gns/gnunet-dns2gns.c:656
 #, c-format
 msgid "Cannot parse DNS request from %s\n"
 msgstr ""
 
-#: src/gns/gnunet-dns2gns.c:671
+#: src/gns/gnunet-dns2gns.c:672
 #, fuzzy, c-format
 msgid "Received malformed DNS request from %s\n"
 msgstr "Beschädigte Antwort auf `%s' von Knoten `%s' empfangen.\n"
 
-#: src/gns/gnunet-dns2gns.c:679
+#: src/gns/gnunet-dns2gns.c:680
 #, fuzzy, c-format
 msgid "Received unsupported DNS request from %s\n"
 msgstr "Unbekannte Anfrageart %d empfangen bei %s:%d\n"
 
-#: src/gns/gnunet-dns2gns.c:840
+#: src/gns/gnunet-dns2gns.c:841
 #, fuzzy
 msgid "No DNS server specified!\n"
 msgstr "Keine Schlüsselwörter angegeben!\n"
 
-#: src/gns/gnunet-dns2gns.c:995
-msgid "IP of recursive DNS resolver to use (required)"
-msgstr ""
-
 #: src/gns/gnunet-dns2gns.c:1001
-msgid "UDP port to listen on for inbound DNS requests; default: 2853"
+msgid "IP of recursive DNS resolver to use (required)"
 msgstr ""
 
 #: src/gns/gnunet-dns2gns.c:1018
@@ -3979,13 +3975,15 @@ 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
 #, 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:402
-#: src/zonemaster/gnunet-service-zonemaster.c:853
+#: src/zonemaster/gnunet-service-zonemaster-monitor.c:572
+#: src/zonemaster/gnunet-service-zonemaster.c:1021
 #, fuzzy
 msgid "Could not connect to DHT!\n"
 msgstr "Verbindung zu gnunetd konnte nicht hergestellt werden.\n"
@@ -4811,25 +4809,25 @@ msgstr "Sqlite-Datenbank läuft\n"
 msgid "Failed to setup database at `%s'\n"
 msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
 
-#: src/namestore/gnunet-namestore-dbtool.c:87
+#: src/namestore/gnunet-namestore-dbtool.c:86
 #: src/namestore/gnunet-namestore.c:1348
 #, c-format
 msgid "Superfluous command line arguments (starting with `%s') ignored\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-dbtool.c:154
+#: src/namestore/gnunet-namestore-dbtool.c:153
 msgid "initialize database"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-dbtool.c:158
+#: src/namestore/gnunet-namestore-dbtool.c:157
 msgid "reset database (DANGEROUS: All existing data is lost!"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-dbtool.c:165
+#: src/namestore/gnunet-namestore-dbtool.c:164
 msgid "the namestore plugin to work with, e.g. 'sqlite'"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-dbtool.c:179
+#: src/namestore/gnunet-namestore-dbtool.c:178
 #, fuzzy
 msgid "GNUnet namestore database manipulation tool"
 msgstr "GNUnet Konfiguration"
@@ -5137,22 +5135,17 @@ msgstr ""
 msgid "name of the ego controlling the zone"
 msgstr ""
 
-#: src/namestore/gnunet-service-namestore.c:950
-#, c-format
-msgid "Failed to replicate block in namecache: %s\n"
-msgstr ""
-
-#: src/namestore/gnunet-service-namestore.c:1667
+#: src/namestore/gnunet-service-namestore.c:1504
 #, fuzzy
 msgid "Error normalizing name."
 msgstr "Fehler beim Anlegen des Tunnels\n"
 
-#: src/namestore/gnunet-service-namestore.c:1690
+#: src/namestore/gnunet-service-namestore.c:1522
 #, fuzzy
 msgid "Error deserializing records."
 msgstr "=\tFehler beim Lesen des Verzeichnisses.\n"
 
-#: src/namestore/gnunet-service-namestore.c:1800
+#: src/namestore/gnunet-service-namestore.c:1633
 #, fuzzy
 msgid "Store failed"
 msgstr "Verbindung fehlgeschlagen: %s\n"
@@ -5182,7 +5175,7 @@ msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
 msgid "SQlite database running\n"
 msgstr "Sqlite-Datenbank läuft\n"
 
-#: src/namestore/plugin_rest_namestore.c:1109
+#: src/namestore/plugin_rest_namestore.c:1369
 #, fuzzy
 msgid "Namestore REST API initialized\n"
 msgstr " Verbindung fehlgeschlagen\n"
@@ -5762,43 +5755,43 @@ msgstr ""
 msgid "Daemon to run to perform IP protocol translation to GNUnet"
 msgstr ""
 
-#: src/reclaim/gnunet-did.c:591
+#: src/reclaim/gnunet-did.c:590
 msgid "Create a DID Document and display its DID"
 msgstr ""
 
-#: src/reclaim/gnunet-did.c:596
+#: src/reclaim/gnunet-did.c:595
 msgid "Get the DID Document associated with the given DID"
 msgstr ""
 
-#: src/reclaim/gnunet-did.c:601
+#: src/reclaim/gnunet-did.c:600
 msgid "Remove the DID"
 msgstr ""
 
-#: src/reclaim/gnunet-did.c:605
+#: src/reclaim/gnunet-did.c:604
 msgid "Replace the DID Document."
 msgstr ""
 
-#: src/reclaim/gnunet-did.c:609
+#: src/reclaim/gnunet-did.c:608
 msgid "Show the DID for a given ego"
 msgstr ""
 
-#: src/reclaim/gnunet-did.c:613
+#: src/reclaim/gnunet-did.c:612
 msgid "Show egos with DIDs"
 msgstr ""
 
-#: src/reclaim/gnunet-did.c:619
+#: src/reclaim/gnunet-did.c:618
 msgid "The Decentralized Identity (DID)"
 msgstr ""
 
-#: src/reclaim/gnunet-did.c:625
+#: src/reclaim/gnunet-did.c:624
 msgid "The DID Document to store in GNUNET"
 msgstr ""
 
-#: src/reclaim/gnunet-did.c:630
+#: src/reclaim/gnunet-did.c:629
 msgid "The name of the EGO"
 msgstr ""
 
-#: src/reclaim/gnunet-did.c:636
+#: src/reclaim/gnunet-did.c:635
 msgid "The time until the DID Document is going to expire (e.g. 5d)"
 msgstr ""
 
@@ -5885,7 +5878,7 @@ msgstr ""
 msgid "re:claimID command line tool"
 msgstr ""
 
-#: src/reclaim/plugin_rest_openid_connect.c:3094
+#: src/reclaim/plugin_rest_openid_connect.c:3096
 #, fuzzy
 msgid "OpenID Connect REST API initialized\n"
 msgstr " Verbindung fehlgeschlagen\n"
@@ -6687,17 +6680,17 @@ msgid ""
 "free topology cannot be more than %u.  Given `%s = %llu'"
 msgstr ""
 
-#: src/testbed/testbed_api_topology.c:1033 src/testing/testing.c:2651
+#: src/testbed/testbed_api_topology.c:1033 src/testing/testing.c:2753
 #, c-format
 msgid "Topology file %s not found\n"
 msgstr ""
 
-#: src/testbed/testbed_api_topology.c:1041 src/testing/testing.c:2659
+#: src/testbed/testbed_api_topology.c:1041 src/testing/testing.c:2761
 #, c-format
 msgid "Topology file %s has no data\n"
 msgstr ""
 
-#: src/testbed/testbed_api_topology.c:1049 src/testing/testing.c:2667
+#: src/testbed/testbed_api_topology.c:1049 src/testing/testing.c:2769
 #, c-format
 msgid "Topology file %s cannot be read\n"
 msgstr ""
@@ -6897,18 +6890,18 @@ msgstr "# HELLO-Meldungen empfangen"
 msgid "GNUnet topology control"
 msgstr ""
 
-#: src/transport/gnunet-communicator-tcp.c:3342
-#: src/transport/gnunet-communicator-udp.c:3867
-#: src/transport/gnunet-service-tng.c:11039
+#: 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
 msgid "Transport service is lacking key configuration settings. Exiting.\n"
 msgstr ""
 
-#: src/transport/gnunet-communicator-tcp.c:3675
+#: src/transport/gnunet-communicator-tcp.c:3680
 msgid "GNUnet TCP communicator"
 msgstr ""
 
-#: src/transport/gnunet-communicator-udp.c:3942
+#: src/transport/gnunet-communicator-udp.c:3946
 msgid "GNUnet UDP communicator"
 msgstr ""
 
@@ -8010,7 +8003,7 @@ msgstr "GNUnet Konfiguration"
 msgid "Could not access configuration file `%s'\n"
 msgstr "Konfigurationsdatei `%s' konnte nicht geparst werden.\n"
 
-#: src/transport/transport_api2_communication.c:743
+#: src/transport/transport_api2_communication.c:752
 msgid "Dropped backchanel message: handler not provided by communicator\n"
 msgstr ""
 
@@ -9153,12 +9146,22 @@ msgstr "Dienst wird über UDP angeboten"
 msgid "Setup tunnels via VPN."
 msgstr "Tunnel über VPN einrichten."
 
-#: src/zonemaster/gnunet-service-zonemaster-monitor.c:378
-#: src/zonemaster/gnunet-service-zonemaster.c:815
+#: src/zonemaster/gnunet-service-zonemaster-monitor.c:249
+#: src/zonemaster/gnunet-service-zonemaster.c:364
+#, 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
 #, 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"