This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree". The branch, next has been updated via 99fe258d2f6495f74921417f916d42e1dcab8674 (commit) via d4b251c238e390356481a5326db7f456cbd4169b (commit) from 5f1fb754f54c5bee40186a69763ec9e0b3a308a0 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 99fe258d2f6495f74921417f916d42e1dcab8674 Author: Michael Tremer Date: Fri May 22 13:10:51 2026 +0000 knot-resolver: Fix rootfile Signed-off-by: Michael Tremer commit d4b251c238e390356481a5326db7f456cbd4169b Author: Michael Tremer Date: Fri May 22 10:45:37 2026 +0000 lang: Rename "DNS Proxy Server" to "DNS Resolver" Signed-off-by: Michael Tremer ----------------------------------------------------------------------- Summary of changes: config/rootfiles/common/knot-resolver | 2 +- config/zabbix_agentd/ipfire_services.pl | 4 ++-- doc/language_issues.de | 1 + doc/language_issues.en | 2 +- doc/language_issues.es | 2 ++ doc/language_issues.fr | 2 ++ doc/language_issues.it | 2 ++ doc/language_issues.nl | 2 ++ doc/language_issues.pl | 2 ++ doc/language_issues.ru | 2 ++ doc/language_issues.tr | 2 ++ doc/language_issues.tw | 2 ++ doc/language_issues.zh | 2 ++ doc/language_missings | 9 +++++++++ html/cgi-bin/services.cgi | 4 ++-- langs/de/cgi-bin/de.pl | 1 + langs/en/cgi-bin/en.pl | 1 + 17 files changed, 36 insertions(+), 6 deletions(-) Difference in files: diff --git a/config/rootfiles/common/knot-resolver b/config/rootfiles/common/knot-resolver index 4376cef50..67068f984 100644 --- a/config/rootfiles/common/knot-resolver +++ b/config/rootfiles/common/knot-resolver @@ -149,7 +149,7 @@ usr/lib/python3.10/site-packages/knot_resolver-6.3.0-py3.10.egg-info/top_level.t #usr/lib/python3.10/site-packages/knot_resolver/controller/supervisord/plugin #usr/lib/python3.10/site-packages/knot_resolver/controller/supervisord/plugin/fast_rpcinterface.py #usr/lib/python3.10/site-packages/knot_resolver/controller/supervisord/plugin/manager_integration.py -#usr/lib/python3.10/site-packages/knot_resolver/controller/supervisord/plugin/notify.cpython-310-x86_64-linux-gnu.so +#usr/lib/python3.10/site-packages/knot_resolver/controller/supervisord/plugin/notify.cpython-310-xxxMACHINExxx-linux-gnu.so #usr/lib/python3.10/site-packages/knot_resolver/controller/supervisord/plugin/notifymodule.c #usr/lib/python3.10/site-packages/knot_resolver/controller/supervisord/plugin/patch_logger.py #usr/lib/python3.10/site-packages/knot_resolver/controller/supervisord/plugin/sd_notify.py diff --git a/config/zabbix_agentd/ipfire_services.pl b/config/zabbix_agentd/ipfire_services.pl index a51b22fed..bfd5509e6 100755 --- a/config/zabbix_agentd/ipfire_services.pl +++ b/config/zabbix_agentd/ipfire_services.pl @@ -56,8 +56,8 @@ my %services = ( "process" => "fcron", }, - # DNS Proxy - 'DNS Proxy Server' => { + # DNS Resolver + 'DNS Resolver' => { "process" => "kresd", }, diff --git a/doc/language_issues.de b/doc/language_issues.de index 7679899e1..d8acb83f7 100644 --- a/doc/language_issues.de +++ b/doc/language_issues.de @@ -259,6 +259,7 @@ WARNING: translation string unused: dns menu WARNING: translation string unused: dns mode for qname minimisation WARNING: translation string unused: dns new 0 WARNING: translation string unused: dns new 1 +WARNING: translation string unused: dns proxy server WARNING: translation string unused: dns saved WARNING: translation string unused: dns saved txt WARNING: translation string unused: dnsbl acl diff --git a/doc/language_issues.en b/doc/language_issues.en index 86363007d..7af708573 100644 --- a/doc/language_issues.en +++ b/doc/language_issues.en @@ -614,8 +614,8 @@ WARNING: untranslated string: dns isp assigned nameserver = ISP-assigned DNS ser WARNING: untranslated string: dns isp nameservers and tls not allowed = ISP-assigned DNS servers and TLS cannot be used at the same time. WARNING: untranslated string: dns no address given = No IP Address given. WARNING: untranslated string: dns no tls hostname given = No TLS hostname given. -WARNING: untranslated string: dns proxy server = DNS Proxy Server WARNING: untranslated string: dns recursor mode = Recursor Mode +WARNING: untranslated string: dns resolver = DNS Resolver WARNING: untranslated string: dns servers = DNS Servers WARNING: untranslated string: dns title = Domain Name System WARNING: untranslated string: dns tls hostname = TLS Hostname diff --git a/doc/language_issues.es b/doc/language_issues.es index 1f6839ae6..e95cc447e 100644 --- a/doc/language_issues.es +++ b/doc/language_issues.es @@ -284,6 +284,7 @@ WARNING: translation string unused: dns menu WARNING: translation string unused: dns mode for qname minimisation WARNING: translation string unused: dns new 0 WARNING: translation string unused: dns new 1 +WARNING: translation string unused: dns proxy server WARNING: translation string unused: dns saved WARNING: translation string unused: dns saved txt WARNING: translation string unused: dns server @@ -1024,6 +1025,7 @@ WARNING: untranslated string: CHACHA20-POLY1305 = ChaCha20-Poly1305 WARNING: untranslated string: Captive ACTIVATE = unknown string WARNING: untranslated string: Captive clients = unknown string WARNING: untranslated string: ca name must only contain characters and spaces = unknown string +WARNING: untranslated string: dns resolver = DNS Resolver WARNING: untranslated string: dns servers = DNS Servers WARNING: untranslated string: dnsbl acl explanation = By default, the blocking will apply to the entire network. You may configure only a few network zones, hosts or subnets where this category will be applied. WARNING: untranslated string: dnsbl dns firewall = DNS Firewall diff --git a/doc/language_issues.fr b/doc/language_issues.fr index 6c280f131..67bdc4331 100644 --- a/doc/language_issues.fr +++ b/doc/language_issues.fr @@ -284,6 +284,7 @@ WARNING: translation string unused: dns menu WARNING: translation string unused: dns mode for qname minimisation WARNING: translation string unused: dns new 0 WARNING: translation string unused: dns new 1 +WARNING: translation string unused: dns proxy server WARNING: translation string unused: dns saved WARNING: translation string unused: dns saved txt WARNING: translation string unused: dnssec disabled warning @@ -1006,6 +1007,7 @@ WARNING: untranslated string: ca name must only contain characters and spaces = WARNING: untranslated string: configuration file = Configuration File WARNING: untranslated string: core notice 3 = available. WARNING: untranslated string: data transfer = Data Transfer +WARNING: untranslated string: dns resolver = DNS Resolver WARNING: untranslated string: dnsbl acl explanation = By default, the blocking will apply to the entire network. You may configure only a few network zones, hosts or subnets where this category will be applied. WARNING: untranslated string: dnsbl dns firewall = DNS Firewall WARNING: untranslated string: dnsbl error domain specified twice = The domain cannot be allowed and blocked at the same time. diff --git a/doc/language_issues.it b/doc/language_issues.it index 1a7e094f9..bd3e5978c 100644 --- a/doc/language_issues.it +++ b/doc/language_issues.it @@ -249,6 +249,7 @@ WARNING: translation string unused: dns list WARNING: translation string unused: dns menu WARNING: translation string unused: dns new 0 WARNING: translation string unused: dns new 1 +WARNING: translation string unused: dns proxy server WARNING: translation string unused: dns saved WARNING: translation string unused: dns saved txt WARNING: translation string unused: dnsforward forward_server @@ -1043,6 +1044,7 @@ WARNING: untranslated string: dns isp nameservers and tls not allowed = ISP-assi WARNING: untranslated string: dns no address given = No IP Address given. WARNING: untranslated string: dns no tls hostname given = No TLS hostname given. WARNING: untranslated string: dns recursor mode = Recursor Mode +WARNING: untranslated string: dns resolver = DNS Resolver WARNING: untranslated string: dns tls hostname = TLS Hostname WARNING: untranslated string: dns use isp assigned nameservers = Use ISP-assigned DNS servers WARNING: untranslated string: dns use protocol for dns queries = Protocol for DNS queries diff --git a/doc/language_issues.nl b/doc/language_issues.nl index 1d15a90f9..cf1324f4c 100644 --- a/doc/language_issues.nl +++ b/doc/language_issues.nl @@ -250,6 +250,7 @@ WARNING: translation string unused: dns list WARNING: translation string unused: dns menu WARNING: translation string unused: dns new 0 WARNING: translation string unused: dns new 1 +WARNING: translation string unused: dns proxy server WARNING: translation string unused: dns saved WARNING: translation string unused: dns saved txt WARNING: translation string unused: dnsforward forward_server @@ -1042,6 +1043,7 @@ WARNING: untranslated string: dns isp nameservers and tls not allowed = ISP-assi WARNING: untranslated string: dns no address given = No IP Address given. WARNING: untranslated string: dns no tls hostname given = No TLS hostname given. WARNING: untranslated string: dns recursor mode = Recursor Mode +WARNING: untranslated string: dns resolver = DNS Resolver WARNING: untranslated string: dns tls hostname = TLS Hostname WARNING: untranslated string: dns use isp assigned nameservers = Use ISP-assigned DNS servers WARNING: untranslated string: dns use protocol for dns queries = Protocol for DNS queries diff --git a/doc/language_issues.pl b/doc/language_issues.pl index 01872ce2d..c0ba6cbbd 100644 --- a/doc/language_issues.pl +++ b/doc/language_issues.pl @@ -234,6 +234,7 @@ WARNING: translation string unused: dns list WARNING: translation string unused: dns menu WARNING: translation string unused: dns new 0 WARNING: translation string unused: dns new 1 +WARNING: translation string unused: dns proxy server WARNING: translation string unused: dns saved WARNING: translation string unused: dns saved txt WARNING: translation string unused: do not log this port list @@ -998,6 +999,7 @@ WARNING: untranslated string: dns isp nameservers and tls not allowed = ISP-assi WARNING: untranslated string: dns no address given = No IP Address given. WARNING: untranslated string: dns no tls hostname given = No TLS hostname given. WARNING: untranslated string: dns recursor mode = Recursor Mode +WARNING: untranslated string: dns resolver = DNS Resolver WARNING: untranslated string: dns tls hostname = TLS Hostname WARNING: untranslated string: dns use isp assigned nameservers = Use ISP-assigned DNS servers WARNING: untranslated string: dns use protocol for dns queries = Protocol for DNS queries diff --git a/doc/language_issues.ru b/doc/language_issues.ru index 031002dd4..eca8e4a92 100644 --- a/doc/language_issues.ru +++ b/doc/language_issues.ru @@ -232,6 +232,7 @@ WARNING: translation string unused: dns list WARNING: translation string unused: dns menu WARNING: translation string unused: dns new 0 WARNING: translation string unused: dns new 1 +WARNING: translation string unused: dns proxy server WARNING: translation string unused: dns saved WARNING: translation string unused: dns saved txt WARNING: translation string unused: do not log this port list @@ -996,6 +997,7 @@ WARNING: untranslated string: dns isp nameservers and tls not allowed = ISP-assi WARNING: untranslated string: dns no address given = No IP Address given. WARNING: untranslated string: dns no tls hostname given = No TLS hostname given. WARNING: untranslated string: dns recursor mode = Recursor Mode +WARNING: untranslated string: dns resolver = DNS Resolver WARNING: untranslated string: dns tls hostname = TLS Hostname WARNING: untranslated string: dns use isp assigned nameservers = Use ISP-assigned DNS servers WARNING: untranslated string: dns use protocol for dns queries = Protocol for DNS queries diff --git a/doc/language_issues.tr b/doc/language_issues.tr index c7d298c76..9b9b18362 100644 --- a/doc/language_issues.tr +++ b/doc/language_issues.tr @@ -271,6 +271,7 @@ WARNING: translation string unused: dns list WARNING: translation string unused: dns menu WARNING: translation string unused: dns new 0 WARNING: translation string unused: dns new 1 +WARNING: translation string unused: dns proxy server WARNING: translation string unused: dns saved WARNING: translation string unused: dns saved txt WARNING: translation string unused: dnsforward forward_server @@ -1024,6 +1025,7 @@ WARNING: untranslated string: dns isp nameservers and tls not allowed = ISP-assi WARNING: untranslated string: dns no address given = No IP Address given. WARNING: untranslated string: dns no tls hostname given = No TLS hostname given. WARNING: untranslated string: dns recursor mode = Recursor Mode +WARNING: untranslated string: dns resolver = DNS Resolver WARNING: untranslated string: dns tls hostname = TLS Hostname WARNING: untranslated string: dns use isp assigned nameservers = Use ISP-assigned DNS servers WARNING: untranslated string: dns use protocol for dns queries = Protocol for DNS queries diff --git a/doc/language_issues.tw b/doc/language_issues.tw index be1158f7a..da35d5afe 100644 --- a/doc/language_issues.tw +++ b/doc/language_issues.tw @@ -286,6 +286,7 @@ WARNING: translation string unused: dns menu WARNING: translation string unused: dns mode for qname minimisation WARNING: translation string unused: dns new 0 WARNING: translation string unused: dns new 1 +WARNING: translation string unused: dns proxy server WARNING: translation string unused: dns saved WARNING: translation string unused: dns saved txt WARNING: translation string unused: dns server @@ -1032,6 +1033,7 @@ WARNING: untranslated string: Captive clients = unknown string WARNING: untranslated string: Captive wrong type = Uploaded file has wrong filetype WARNING: untranslated string: aliases default interface = - Default Interface - WARNING: untranslated string: ca name must only contain characters and spaces = unknown string +WARNING: untranslated string: dns resolver = DNS Resolver WARNING: untranslated string: dns servers = DNS Servers WARNING: untranslated string: dnsbl acl explanation = By default, the blocking will apply to the entire network. You may configure only a few network zones, hosts or subnets where this category will be applied. WARNING: untranslated string: dnsbl dns firewall = DNS Firewall diff --git a/doc/language_issues.zh b/doc/language_issues.zh index be1158f7a..da35d5afe 100644 --- a/doc/language_issues.zh +++ b/doc/language_issues.zh @@ -286,6 +286,7 @@ WARNING: translation string unused: dns menu WARNING: translation string unused: dns mode for qname minimisation WARNING: translation string unused: dns new 0 WARNING: translation string unused: dns new 1 +WARNING: translation string unused: dns proxy server WARNING: translation string unused: dns saved WARNING: translation string unused: dns saved txt WARNING: translation string unused: dns server @@ -1032,6 +1033,7 @@ WARNING: untranslated string: Captive clients = unknown string WARNING: untranslated string: Captive wrong type = Uploaded file has wrong filetype WARNING: untranslated string: aliases default interface = - Default Interface - WARNING: untranslated string: ca name must only contain characters and spaces = unknown string +WARNING: untranslated string: dns resolver = DNS Resolver WARNING: untranslated string: dns servers = DNS Servers WARNING: untranslated string: dnsbl acl explanation = By default, the blocking will apply to the entire network. You may configure only a few network zones, hosts or subnets where this category will be applied. WARNING: untranslated string: dnsbl dns firewall = DNS Firewall diff --git a/doc/language_missings b/doc/language_missings index a505fdd5d..39e44cdee 100644 --- a/doc/language_missings +++ b/doc/language_missings @@ -167,6 +167,7 @@ < dnsbl dns firewall < dnsbl error domain specified twice < dnsbl lists +< dns resolver < dns servers < download report < fwhost invalid country code @@ -274,6 +275,7 @@ < dnsbl dns firewall < dnsbl error domain specified twice < dnsbl lists +< dns resolver < done < download report < endpoint @@ -609,6 +611,7 @@ < dns no address given < dns no tls hostname given < dns recursor mode +< dns resolver < dnssec disabled warning < dns tls hostname < dns use isp assigned nameservers @@ -1310,6 +1313,7 @@ < dns no address given < dns no tls hostname given < dns recursor mode +< dns resolver < dnssec aware < dnssec disabled warning < dnssec information @@ -2082,6 +2086,7 @@ < dns no address given < dns no tls hostname given < dns recursor mode +< dns resolver < dnssec aware < dnssec disabled warning < dnssec information @@ -3256,6 +3261,7 @@ < dns no address given < dns no tls hostname given < dns recursor mode +< dns resolver < dnssec aware < dnssec disabled warning < dnssec information @@ -4288,6 +4294,7 @@ < dns no address given < dns no tls hostname given < dns recursor mode +< dns resolver < dns tls hostname < dns use isp assigned nameservers < dns use protocol for dns queries @@ -4721,6 +4728,7 @@ < dnsbl dns firewall < dnsbl error domain specified twice < dnsbl lists +< dns resolver < dns servers < download report < fwhost invalid country code @@ -4836,6 +4844,7 @@ < dnsbl dns firewall < dnsbl error domain specified twice < dnsbl lists +< dns resolver < dns servers < download report < fwhost invalid country code diff --git a/html/cgi-bin/services.cgi b/html/cgi-bin/services.cgi index da15ca7b8..d7d55d6e3 100644 --- a/html/cgi-bin/services.cgi +++ b/html/cgi-bin/services.cgi @@ -71,8 +71,8 @@ $querry[1] = 'hour' unless defined $querry[1]; "process" => "fcron", }, - # DNS Proxy - $Lang::tr{'dns proxy server'} => { + # DNS Resolver + $Lang::tr{'dns resolver'} => { "process" => "kresd", }, diff --git a/langs/de/cgi-bin/de.pl b/langs/de/cgi-bin/de.pl index d7f8148f3..c7f29eb45 100644 --- a/langs/de/cgi-bin/de.pl +++ b/langs/de/cgi-bin/de.pl @@ -851,6 +851,7 @@ 'dns no tls hostname given' => 'Kein TLS-Hostname angegeben.', 'dns proxy server' => 'DNS-Proxyserver', 'dns recursor mode' => 'Recursor-Modus', +'dns resolver' => 'DNS-Resolver', 'dns saved' => 'Erfolgreich gespeichert!', 'dns saved txt' => 'Die beiden eingegebenen DNS-Server-Adressen wurde erfolgreich gespeichert.
Um die Änderung wirksam zu machen, müssen Sie neustarten oder wiederverbinden!', 'dns servers' => 'DNS-Server', diff --git a/langs/en/cgi-bin/en.pl b/langs/en/cgi-bin/en.pl index 1685a7032..7d74d531f 100644 --- a/langs/en/cgi-bin/en.pl +++ b/langs/en/cgi-bin/en.pl @@ -900,6 +900,7 @@ 'dns no tls hostname given' => 'No TLS hostname given.', 'dns proxy server' => 'DNS Proxy Server', 'dns recursor mode' => 'Recursor Mode', +'dns resolver' => 'DNS Resolver', 'dns saved' => 'Successfully saved!', 'dns saved txt' => 'The two entered DNS server addresses have been saved successfully.
You have to reboot or reconnect that the changes have effect!', 'dns servers' => 'DNS Servers', hooks/post-receive -- IPFire 2.x development tree