From 0b6c7ce5d68756c14b9c073d8dca42a6b3960dc3 Mon Sep 17 00:00:00 2001 From: Sadie Powell Date: Wed, 25 Jun 2025 15:23:52 +0100 Subject: [PATCH 1/2] Update some messages for the language used by modern BIND versions. --- data/modules.example.conf | 2 +- data/operserv.example.conf | 6 +++--- modules/m_dns.cpp | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/data/modules.example.conf b/data/modules.example.conf index b19d20b49..247c34b7c 100644 --- a/data/modules.example.conf +++ b/data/modules.example.conf @@ -65,7 +65,7 @@ module { name = "help" } /* This should be the names of the public facing nameservers serving the records. */ nameservers = "ns1.example.com ns2.example.com" - /* The time slave servers are allowed to cache. This should be reasonably low + /* The time secondary servers are allowed to cache for. This should be reasonably low * if you want your records to be updated without much delay. */ refresh = 3600 diff --git a/data/operserv.example.conf b/data/operserv.example.conf index 10d853e9c..7b87e7f49 100644 --- a/data/operserv.example.conf +++ b/data/operserv.example.conf @@ -276,15 +276,15 @@ command { service = "OperServ"; name = "CHANKILL"; command = "operserv/chankill" * To use this module you must set a nameserver record for services * so that DNS queries go to services. * - * Alternatively, you may use a slave DNS server to hide service's IP, + * Alternatively, you may use a secondary DNS server to hide service's IP, * provide query caching, and provide better fault tolerance. * * To do this using BIND, configure similar to: * * options { max-refresh-time 60; }; * zone "irc.example.com" IN { - * type slave; - * masters { 127.0.0.1 port 5353; }; + * type secondary; + * primaries { 127.0.0.1 port 5353; }; * }; * * Where 127.0.0.1:5353 is the IP and port services are listening on. diff --git a/modules/m_dns.cpp b/modules/m_dns.cpp index e21bf876a..fbd2cb96b 100644 --- a/modules/m_dns.cpp +++ b/modules/m_dns.cpp @@ -627,7 +627,7 @@ class NotifySocket : public Socket if (!packet) return false; - Log(LOG_DEBUG_2) << "Resolver: Notifying slave " << packet->addr.addr(); + Log(LOG_DEBUG_2) << "Resolver: Notifying secondary " << packet->addr.addr(); try { @@ -927,7 +927,7 @@ class MyManager : public Manager, public Timer void Notify(const Anope::string &zone) anope_override { - /* notify slaves of the update */ + /* notify secondaries of the update */ for (unsigned i = 0; i < notify.size(); ++i) { const Anope::string &ip = notify[i].first; From 9bcf46f8eacc3af6978baf6a92f08a94972ed454 Mon Sep 17 00:00:00 2001 From: Sadie Powell Date: Wed, 25 Jun 2025 15:29:16 +0100 Subject: [PATCH 2/2] Fix using service's instead of services' where appropriate. --- data/modules.example.conf | 2 +- data/operserv.example.conf | 2 +- language/anope.ca_ES.po | 2 +- language/anope.de_DE.po | 2 +- language/anope.el_GR.po | 2 +- language/anope.en_US.po | 4 ++-- language/anope.es_ES.po | 2 +- language/anope.fr_FR.po | 2 +- language/anope.hu_HU.po | 2 +- language/anope.it_IT.po | 2 +- language/anope.nl_NL.po | 2 +- language/anope.pl_PL.po | 2 +- language/anope.pt_PT.po | 2 +- language/anope.ru_RU.po | 2 +- language/anope.tr_TR.po | 2 +- modules/commands/ns_recover.cpp | 2 +- 16 files changed, 17 insertions(+), 17 deletions(-) diff --git a/data/modules.example.conf b/data/modules.example.conf index 247c34b7c..686963e2c 100644 --- a/data/modules.example.conf +++ b/data/modules.example.conf @@ -690,7 +690,7 @@ module * [EXTRA] m_sql_log * * This module adds an additional target option to log{} blocks - * that allows logging Service's logs to SQL. To log to SQL, add + * that allows logging Services' logs to SQL. To log to SQL, add * the SQL service name to log:targets prefixed by sql_log:. For * example: * diff --git a/data/operserv.example.conf b/data/operserv.example.conf index 7b87e7f49..77371823a 100644 --- a/data/operserv.example.conf +++ b/data/operserv.example.conf @@ -276,7 +276,7 @@ command { service = "OperServ"; name = "CHANKILL"; command = "operserv/chankill" * To use this module you must set a nameserver record for services * so that DNS queries go to services. * - * Alternatively, you may use a secondary DNS server to hide service's IP, + * Alternatively, you may use a secondary DNS server to hide services' IP, * provide query caching, and provide better fault tolerance. * * To do this using BIND, configure similar to: diff --git a/language/anope.ca_ES.po b/language/anope.ca_ES.po index 54a662f47..47a6b5e67 100644 --- a/language/anope.ca_ES.po +++ b/language/anope.ca_ES.po @@ -6901,7 +6901,7 @@ msgid "Service" msgstr "Servers found: %d" #, fuzzy, c-format -msgid "Service's hold on %s has been released." +msgid "Services' hold on %s has been released." msgstr "El teu nick ha estat alliberat pels serveis." #, fuzzy diff --git a/language/anope.de_DE.po b/language/anope.de_DE.po index e814a2bbf..838863bf8 100644 --- a/language/anope.de_DE.po +++ b/language/anope.de_DE.po @@ -6607,7 +6607,7 @@ msgid "Service" msgstr "Server gefunden: %d" #, fuzzy, c-format -msgid "Service's hold on %s has been released." +msgid "Services' hold on %s has been released." msgstr "Die Services haben den Nicknamen wieder verfügbar gemacht." #, fuzzy diff --git a/language/anope.el_GR.po b/language/anope.el_GR.po index f6f1338bd..113c0b550 100644 --- a/language/anope.el_GR.po +++ b/language/anope.el_GR.po @@ -6832,7 +6832,7 @@ msgid "Service" msgstr "Τα services είναι ενεργά για %s" #, fuzzy, c-format -msgid "Service's hold on %s has been released." +msgid "Services' hold on %s has been released." msgstr "Οι υπηρεσίες απελευθέρωααν το ψευδώνυμό σου." #, fuzzy diff --git a/language/anope.en_US.po b/language/anope.en_US.po index 739ce2c37..258527ac4 100644 --- a/language/anope.en_US.po +++ b/language/anope.en_US.po @@ -6130,8 +6130,8 @@ msgid "Service" msgstr "Service" #, c-format -msgid "Service's hold on %s has been released." -msgstr "Service's hold on %s has been released." +msgid "Services' hold on %s has been released." +msgstr "Services' hold on %s has been released." msgid "Services Operator commands" msgstr "Services Operator commands" diff --git a/language/anope.es_ES.po b/language/anope.es_ES.po index 0f8c39ae0..90a8dd806 100644 --- a/language/anope.es_ES.po +++ b/language/anope.es_ES.po @@ -6273,7 +6273,7 @@ msgid "Service" msgstr "Servicio" #, c-format -msgid "Service's hold on %s has been released." +msgid "Services' hold on %s has been released." msgstr "El nick %s retenido por los servicios ha sido liberado." #, fuzzy diff --git a/language/anope.fr_FR.po b/language/anope.fr_FR.po index 319362469..e64612f9d 100644 --- a/language/anope.fr_FR.po +++ b/language/anope.fr_FR.po @@ -6165,7 +6165,7 @@ msgid "Service" msgstr "Service" #, c-format -msgid "Service's hold on %s has been released." +msgid "Services' hold on %s has been released." msgstr "La tutelle des Services sur %s a été enlevée." msgid "Services Operator commands" diff --git a/language/anope.hu_HU.po b/language/anope.hu_HU.po index 91d07c2c7..6bd38e999 100644 --- a/language/anope.hu_HU.po +++ b/language/anope.hu_HU.po @@ -6838,7 +6838,7 @@ msgid "Service" msgstr "Servers found: %d" #, fuzzy, c-format -msgid "Service's hold on %s has been released." +msgid "Services' hold on %s has been released." msgstr "A Services rendelkezésedre bocsájtotta a nicket." #, fuzzy diff --git a/language/anope.it_IT.po b/language/anope.it_IT.po index 8ddadbeb1..582505e4f 100644 --- a/language/anope.it_IT.po +++ b/language/anope.it_IT.po @@ -6172,7 +6172,7 @@ msgid "Service" msgstr "Servizio" #, c-format -msgid "Service's hold on %s has been released." +msgid "Services' hold on %s has been released." msgstr "Il blocco dei servizi sul nick %s è stato rilasciato." msgid "Services Operator commands" diff --git a/language/anope.nl_NL.po b/language/anope.nl_NL.po index 8565b94aa..c3526e027 100644 --- a/language/anope.nl_NL.po +++ b/language/anope.nl_NL.po @@ -6183,7 +6183,7 @@ msgid "Service" msgstr "Service" #, c-format -msgid "Service's hold on %s has been released." +msgid "Services' hold on %s has been released." msgstr "Nick %s werd vrijgegeven." msgid "Services Operator commands" diff --git a/language/anope.pl_PL.po b/language/anope.pl_PL.po index de50d7aa5..34729b851 100644 --- a/language/anope.pl_PL.po +++ b/language/anope.pl_PL.po @@ -6212,7 +6212,7 @@ msgid "Service" msgstr "Usługa" #, c-format -msgid "Service's hold on %s has been released." +msgid "Services' hold on %s has been released." msgstr "Serwisy właśnie zwolniły nicka %s." msgid "Services Operator commands" diff --git a/language/anope.pt_PT.po b/language/anope.pt_PT.po index cb3904628..e15d94c0b 100644 --- a/language/anope.pt_PT.po +++ b/language/anope.pt_PT.po @@ -6794,7 +6794,7 @@ msgid "Service" msgstr "Servers found: %d" #, fuzzy, c-format -msgid "Service's hold on %s has been released." +msgid "Services' hold on %s has been released." msgstr "Seu nick foi derrubado e pode ser usado." #, fuzzy diff --git a/language/anope.ru_RU.po b/language/anope.ru_RU.po index 1f28c401f..f22a54ed6 100644 --- a/language/anope.ru_RU.po +++ b/language/anope.ru_RU.po @@ -6954,7 +6954,7 @@ msgid "Service" msgstr "Текущее кол-во серверов: %d" #, fuzzy, c-format -msgid "Service's hold on %s has been released." +msgid "Services' hold on %s has been released." msgstr "Ваш ник освобожден от удержания сервисами." #, fuzzy diff --git a/language/anope.tr_TR.po b/language/anope.tr_TR.po index 39ea600f7..5486104a7 100644 --- a/language/anope.tr_TR.po +++ b/language/anope.tr_TR.po @@ -6129,7 +6129,7 @@ msgid "Service" msgstr "Servis" #, c-format -msgid "Service's hold on %s has been released." +msgid "Services' hold on %s has been released." msgstr "Servisin %s üzerindeki bekletmesi kaldırıldı." msgid "Services Operator commands" diff --git a/modules/commands/ns_recover.cpp b/modules/commands/ns_recover.cpp index 756218361..4e0fb4c1e 100644 --- a/modules/commands/ns_recover.cpp +++ b/modules/commands/ns_recover.cpp @@ -48,7 +48,7 @@ class NSRecoverRequest : public IdentifyRequest if (na->HasExt("HELD")) { nickserv->Release(na); - source.Reply(_("Service's hold on \002%s\002 has been released."), na->nick.c_str()); + source.Reply(_("Services' hold on \002%s\002 has been released."), na->nick.c_str()); } else if (!u) {