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 9141282b09db282ae202302e25da4ed924e8deec (commit) via 0c6112b0b3478a2a3e088e4fd264af2ee0d88408 (commit) via 743808bb8ece981efbb57a483f01618ad0fd7107 (commit) from f52155611182ebcdec33de7dcd38994464d1ddf3 (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 9141282b09db282ae202302e25da4ed924e8deec Author: Michael Tremer michael.tremer@ipfire.org Date: Sat Nov 7 13:28:44 2020 +0000
core153: Ship dns.cgi
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 0c6112b0b3478a2a3e088e4fd264af2ee0d88408 Author: Michael Tremer michael.tremer@ipfire.org Date: Sat Nov 7 13:27:43 2020 +0000
Run "./make.sh lang"
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 743808bb8ece981efbb57a483f01618ad0fd7107 Author: Matthias Fischer matthias.fischer@ipfire.org Date: Fri Nov 6 17:35:59 2020 +0100
dns.cgi: Cosmetics and customized translations
Updated/deleted redundant, unused or missing translation strings for dns.cgi
Affected: 'dns', 'dns title', 'dns server', 'dns servers'
Signed-off-by: Matthias Fischer matthias.fischer@ipfire.org Signed-off-by: Michael Tremer michael.tremer@ipfire.org
-----------------------------------------------------------------------
Summary of changes: config/rootfiles/core/153/filelists/files | 1 + doc/language_issues.de | 2 -- doc/language_issues.en | 2 +- doc/language_issues.es | 2 +- doc/language_issues.fr | 2 -- doc/language_issues.it | 3 --- doc/language_issues.nl | 2 -- doc/language_issues.pl | 2 +- doc/language_issues.ru | 2 -- doc/language_issues.tr | 3 --- doc/language_missings | 3 --- html/cgi-bin/dns.cgi | 4 ++-- langs/de/cgi-bin/de.pl | 2 -- langs/en/cgi-bin/en.pl | 1 - langs/fr/cgi-bin/fr.pl | 2 -- langs/it/cgi-bin/it.pl | 1 - langs/nl/cgi-bin/nl.pl | 2 +- langs/pl/cgi-bin/pl.pl | 2 +- langs/ru/cgi-bin/ru.pl | 2 +- langs/tr/cgi-bin/tr.pl | 1 - 20 files changed, 9 insertions(+), 32 deletions(-)
Difference in files: diff --git a/config/rootfiles/core/153/filelists/files b/config/rootfiles/core/153/filelists/files index e56f442aa..1a95431f0 100644 --- a/config/rootfiles/core/153/filelists/files +++ b/config/rootfiles/core/153/filelists/files @@ -4,6 +4,7 @@ etc/os-release etc/system-release etc/sysctl.conf srv/web/ipfire/cgi-bin/credits.cgi +srv/web/ipfire/cgi-bin/dns.cgi srv/web/ipfire/cgi-bin/index.cgi srv/web/ipfire/cgi-bin/location-block.cgi srv/web/ipfire/cgi-bin/vpnmain.cgi diff --git a/doc/language_issues.de b/doc/language_issues.de index f3246cd18..fd4dfc9d0 100644 --- a/doc/language_issues.de +++ b/doc/language_issues.de @@ -235,8 +235,6 @@ WARNING: translation string unused: dns new 0 WARNING: translation string unused: dns new 1 WARNING: translation string unused: dns saved WARNING: translation string unused: dns saved txt -WARNING: translation string unused: dns server -WARNING: translation string unused: dns servers WARNING: translation string unused: dnssec information WARNING: translation string unused: do not log this port list WARNING: translation string unused: domain master diff --git a/doc/language_issues.en b/doc/language_issues.en index 9efb56a39..0592f938b 100644 --- a/doc/language_issues.en +++ b/doc/language_issues.en @@ -596,7 +596,6 @@ WARNING: untranslated string: dl client arch = Download Client Package (zip) WARNING: untranslated string: dl client arch insecure = Download insecure Client Package (zip) WARNING: untranslated string: dmz = DMZ WARNING: untranslated string: dnat address = Firewall Interface -WARNING: untranslated string: dns = unknown string WARNING: untranslated string: dns check failed = DNS check failed WARNING: untranslated string: dns check servers = Check DNS Servers WARNING: untranslated string: dns configuration = DNS Configuration @@ -610,6 +609,7 @@ 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 servers = DNS Servers WARNING: untranslated string: dns title = Domain Name System WARNING: untranslated string: dns tls hostname = TLS Hostname WARNING: untranslated string: dns use isp assigned nameservers = Use ISP-assigned DNS servers diff --git a/doc/language_issues.es b/doc/language_issues.es index e01f5aa98..fd9c61b32 100644 --- a/doc/language_issues.es +++ b/doc/language_issues.es @@ -893,7 +893,6 @@ WARNING: untranslated string: disable = Disable WARNING: untranslated string: disconnected = Disconnected WARNING: untranslated string: dl client arch insecure = Download insecure Client Package (zip) WARNING: untranslated string: dnat address = Firewall Interface -WARNING: untranslated string: dns = unknown string WARNING: untranslated string: dns check servers = Check DNS Servers WARNING: untranslated string: dns configuration = DNS Configuration WARNING: untranslated string: dns enable safe-search = Enable Safe Search @@ -905,6 +904,7 @@ WARNING: untranslated string: dns mode for qname minimisation = QNAME Minimisati 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 servers = DNS Servers 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.fr b/doc/language_issues.fr index b98154eca..c84aab2b1 100644 --- a/doc/language_issues.fr +++ b/doc/language_issues.fr @@ -262,8 +262,6 @@ WARNING: translation string unused: dns new 0 WARNING: translation string unused: dns new 1 WARNING: translation string unused: dns saved WARNING: translation string unused: dns saved txt -WARNING: translation string unused: dns server -WARNING: translation string unused: dns servers WARNING: translation string unused: dnssec information WARNING: translation string unused: do not log this port list WARNING: translation string unused: domain master diff --git a/doc/language_issues.it b/doc/language_issues.it index 2f41213a8..505e73373 100644 --- a/doc/language_issues.it +++ b/doc/language_issues.it @@ -236,8 +236,6 @@ WARNING: translation string unused: dns new 0 WARNING: translation string unused: dns new 1 WARNING: translation string unused: dns saved WARNING: translation string unused: dns saved txt -WARNING: translation string unused: dns server -WARNING: translation string unused: dns servers WARNING: translation string unused: dnsforward forward_server WARNING: translation string unused: dnssec information WARNING: translation string unused: do not log this port list @@ -919,7 +917,6 @@ WARNING: untranslated string: dhcp dns update secret = Secret WARNING: untranslated string: disable = Disable WARNING: untranslated string: disconnected = Disconnected WARNING: untranslated string: dl client arch insecure = Download insecure Client Package (zip) -WARNING: untranslated string: dns = unknown string WARNING: untranslated string: dns check servers = Check DNS Servers WARNING: untranslated string: dns configuration = DNS Configuration WARNING: untranslated string: dns enable safe-search = Enable Safe Search diff --git a/doc/language_issues.nl b/doc/language_issues.nl index d486349bc..0f73afc86 100644 --- a/doc/language_issues.nl +++ b/doc/language_issues.nl @@ -234,7 +234,6 @@ WARNING: translation string unused: dns new 0 WARNING: translation string unused: dns new 1 WARNING: translation string unused: dns saved WARNING: translation string unused: dns saved txt -WARNING: translation string unused: dns server WARNING: translation string unused: dnsforward forward_server WARNING: translation string unused: do not log this port list WARNING: translation string unused: domain master @@ -919,7 +918,6 @@ WARNING: untranslated string: dhcp dns update secret = Secret WARNING: untranslated string: disable = Disable WARNING: untranslated string: disconnected = Disconnected WARNING: untranslated string: dl client arch insecure = Download insecure Client Package (zip) -WARNING: untranslated string: dns = unknown string WARNING: untranslated string: dns check servers = Check DNS Servers WARNING: untranslated string: dns configuration = DNS Configuration WARNING: untranslated string: dns enable safe-search = Enable Safe Search diff --git a/doc/language_issues.pl b/doc/language_issues.pl index e01f5aa98..fd9c61b32 100644 --- a/doc/language_issues.pl +++ b/doc/language_issues.pl @@ -893,7 +893,6 @@ WARNING: untranslated string: disable = Disable WARNING: untranslated string: disconnected = Disconnected WARNING: untranslated string: dl client arch insecure = Download insecure Client Package (zip) WARNING: untranslated string: dnat address = Firewall Interface -WARNING: untranslated string: dns = unknown string WARNING: untranslated string: dns check servers = Check DNS Servers WARNING: untranslated string: dns configuration = DNS Configuration WARNING: untranslated string: dns enable safe-search = Enable Safe Search @@ -905,6 +904,7 @@ WARNING: untranslated string: dns mode for qname minimisation = QNAME Minimisati 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 servers = DNS Servers 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 cc2fe7489..bf1d976e9 100644 --- a/doc/language_issues.ru +++ b/doc/language_issues.ru @@ -225,7 +225,6 @@ WARNING: translation string unused: dns new 0 WARNING: translation string unused: dns new 1 WARNING: translation string unused: dns saved WARNING: translation string unused: dns saved txt -WARNING: translation string unused: dns server WARNING: translation string unused: do not log this port list WARNING: translation string unused: domain master WARNING: translation string unused: domain not set @@ -897,7 +896,6 @@ WARNING: untranslated string: disconnected = Disconnected WARNING: untranslated string: disk access = Disk Access WARNING: untranslated string: dl client arch insecure = Download insecure Client Package (zip) WARNING: untranslated string: dnat address = Firewall Interface -WARNING: untranslated string: dns = unknown string WARNING: untranslated string: dns check servers = Check DNS Servers WARNING: untranslated string: dns configuration = DNS Configuration WARNING: untranslated string: dns enable safe-search = Enable Safe Search diff --git a/doc/language_issues.tr b/doc/language_issues.tr index 99ead4c4a..b2c24de57 100644 --- a/doc/language_issues.tr +++ b/doc/language_issues.tr @@ -258,8 +258,6 @@ WARNING: translation string unused: dns new 0 WARNING: translation string unused: dns new 1 WARNING: translation string unused: dns saved WARNING: translation string unused: dns saved txt -WARNING: translation string unused: dns server -WARNING: translation string unused: dns servers WARNING: translation string unused: dnsforward forward_server WARNING: translation string unused: dnssec information WARNING: translation string unused: do not log this port list @@ -896,7 +894,6 @@ WARNING: untranslated string: default IP address = Default IP Address WARNING: untranslated string: desired = Desired WARNING: untranslated string: disable = Disable WARNING: untranslated string: disconnected = Disconnected -WARNING: untranslated string: dns = unknown string WARNING: untranslated string: dns check servers = Check DNS Servers WARNING: untranslated string: dns configuration = DNS Configuration WARNING: untranslated string: dns enable safe-search = Enable Safe Search diff --git a/doc/language_missings b/doc/language_missings index 90f4c2926..d79afff83 100644 --- a/doc/language_missings +++ b/doc/language_missings @@ -1446,7 +1446,6 @@ < dnssec information < dnssec not supported < dnssec validating -< dns servers < dns tls hostname < dns use isp assigned nameservers < dns use protocol for dns queries @@ -1944,7 +1943,6 @@ < dnssec information < dnssec not supported < dnssec validating -< dns servers < dns tls hostname < dns use isp assigned nameservers < dns use protocol for dns queries @@ -2813,7 +2811,6 @@ < dnssec information < dnssec not supported < dnssec validating -< dns servers < dns tls hostname < dns use isp assigned nameservers < dns use protocol for dns queries diff --git a/html/cgi-bin/dns.cgi b/html/cgi-bin/dns.cgi index 0a097e2c0..13dd9d6a0 100755 --- a/html/cgi-bin/dns.cgi +++ b/html/cgi-bin/dns.cgi @@ -272,7 +272,7 @@ my %dns_servers = (); # Libloc database handle my $libloc_db_handle = &Location::Functions::init();
-&Header::openpage($Lang::tr{'dns'}, 1, ''); +&Header::openpage($Lang::tr{'dns title'}, 1, '');
&Header::openbigbox('100%', 'left', '', $errormessage);
@@ -419,7 +419,7 @@ END # Section to display the configured and used DNS servers. # sub show_nameservers () { - &Header::openbox('100%', 'center', "$Lang::tr{'dns title'}"); + &Header::openbox('100%', 'center', "$Lang::tr{'dns servers'}");
# Determine if we are running in recursor mode my $recursor = 0; diff --git a/langs/de/cgi-bin/de.pl b/langs/de/cgi-bin/de.pl index 6ad0e02c5..d4dad7652 100644 --- a/langs/de/cgi-bin/de.pl +++ b/langs/de/cgi-bin/de.pl @@ -819,7 +819,6 @@ 'dmz pinhole rule removed' => 'Regel für DMZ-Schlupfloch entfernt; Starte DMZ-Schlupfloch neu', 'dmzpinholes for same net not necessary' => 'DMZ-Schlupflöcher werden im gleichen Netz nicht benötigt. Wählen Sie ein anderes Quell- oder Ziel-Netz.', 'dnat address' => 'Firewall-Interface', -'dns' => 'Domain Name System', 'dns address deleted' => 'Erfolgreich gelöscht! ', 'dns address deleted txt' => 'DNS Server Adressen wurden erfolgreich gelöscht. Änderungen werden jedoch erst nach einem Neustart oder einer Wiederverbindung übernommen.', 'dns address done' => 'Die DNS-Server Adressen Einstellungen werden übernommen.', @@ -848,7 +847,6 @@ 'dns recursor mode' => 'Recursor-Modus', 'dns saved' => 'Erfolgreich gespeichert!', 'dns saved txt' => 'Die beiden eingegebenen DNS-Server-Adressen wurde erfolgreich gespeichert.<br/>Um die Änderung wirksam zu machen, müssen Sie neustarten oder wiederverbinden!', -'dns server' => 'DNS Server', 'dns servers' => 'DNS-Server', 'dns title' => 'Domain Name System', 'dns tls hostname' => 'TLS-Hostname', diff --git a/langs/en/cgi-bin/en.pl b/langs/en/cgi-bin/en.pl index d00de3d03..19a5eb02f 100644 --- a/langs/en/cgi-bin/en.pl +++ b/langs/en/cgi-bin/en.pl @@ -870,7 +870,6 @@ 'dns recursor mode' => 'Recursor Mode', 'dns saved' => 'Successfully saved!', 'dns saved txt' => 'The two entered DNS server addresses have been saved successfully.<br />You have to reboot or reconnect that the changes have effect!', -'dns server' => 'DNS Server', 'dns servers' => 'DNS Servers', 'dns title' => 'Domain Name System', 'dns tls hostname' => 'TLS Hostname', diff --git a/langs/fr/cgi-bin/fr.pl b/langs/fr/cgi-bin/fr.pl index 00328440d..b5232db8c 100644 --- a/langs/fr/cgi-bin/fr.pl +++ b/langs/fr/cgi-bin/fr.pl @@ -847,7 +847,6 @@ 'dmz pinhole rule removed' => 'Règle DMZ pinhole supprimée; Redémarrage DMZ pinhole', 'dmzpinholes for same net not necessary' => 'Les DMZ Pinholes ne sont pas forcément dans le même réseau. Choisir différentes sources ou destinations réseau.', 'dnat address' => 'Interface pare-feu', -'dns' => 'Système de noms de domaines', 'dns address deleted' => 'Suppression effectuée !', 'dns address deleted txt' => 'Les adresses du serveur DNS ont été supprimées avec succès.<br />Vous devez redémarrer ou reconnecter pour que les modifications prennent effet !', 'dns address done' => 'Les adresses du serveur DNS vont être sauvegardées.', @@ -877,7 +876,6 @@ 'dns recursor mode' => 'Exécution en mode récursif.', 'dns saved' => 'Sauvegarde effectuée !', 'dns saved txt' => 'La sauvegarde des deux adresses saisies du serveur DNS a été effectée correctement.<br />Vous devez redémarrer ou vous reconnecter pour que les changements prennent effets !', -'dns server' => 'Serveur DNS', 'dns servers' => 'Serveurs DNS', 'dns title' => 'Système de noms de domaine (DNS)', 'dns tls hostname' => 'Nom d'hôte TLS', diff --git a/langs/it/cgi-bin/it.pl b/langs/it/cgi-bin/it.pl index d0e9dc4c9..ada8887ac 100644 --- a/langs/it/cgi-bin/it.pl +++ b/langs/it/cgi-bin/it.pl @@ -764,7 +764,6 @@ 'dns proxy server' => 'DNS Proxy Server', 'dns saved' => 'Successfully saved!', 'dns saved txt' => 'The two entered DNS server addresses have been saved successfully.<br />You have to reboot or reconnect that the changes have effect!', -'dns server' => 'DNS Server', 'dns servers' => 'DNS Servers', 'dns title' => 'Domain Name System', 'dnsforward' => 'Inoltro DNS', diff --git a/langs/nl/cgi-bin/nl.pl b/langs/nl/cgi-bin/nl.pl index f67eb0383..bbd5a3f3d 100644 --- a/langs/nl/cgi-bin/nl.pl +++ b/langs/nl/cgi-bin/nl.pl @@ -754,7 +754,7 @@ 'dns proxy server' => 'DNS Proxy Server', 'dns saved' => 'Succesvol opgeslagen!', 'dns saved txt' => 'De twee ingevoerde DNS serveradressen zijn succesvol opgeslagen.<br />U moet herstarten of opnieuw verbinden om de wijzigingen actief te laten worden!', -'dns server' => 'DNS Server', +'dns servers' => 'DNS Server', 'dns title' => 'Domein Naam Systeem', 'dnsforward' => 'DNS Forwarding', 'dnsforward add a new entry' => 'Voeg een nieuwe regel toe', diff --git a/langs/pl/cgi-bin/pl.pl b/langs/pl/cgi-bin/pl.pl index 3f4fc0143..e85173021 100644 --- a/langs/pl/cgi-bin/pl.pl +++ b/langs/pl/cgi-bin/pl.pl @@ -686,7 +686,7 @@ 'dns proxy server' => 'Serwer Proxy DNS', 'dns saved' => 'Zapisano poprawnie!', 'dns saved txt' => 'Podane adresy serwerów DNS zostały poprawnie zapisane. <br />Należy wykonać restart lub wykonać ponowne łączenie, aby zmiany zostały zastosowane!', -'dns server' => 'Serwer DNS', +'dns servers' => 'Serwer DNS', 'dns title' => 'Domain Name System', 'do not log this port list' => 'Odrzucaj tą listę portów zanim zostaną zapisane do logu (zmniejsza rozmiar logów)', 'dod' => 'Łącz na żądanie', diff --git a/langs/ru/cgi-bin/ru.pl b/langs/ru/cgi-bin/ru.pl index 2c91a3fee..371394474 100644 --- a/langs/ru/cgi-bin/ru.pl +++ b/langs/ru/cgi-bin/ru.pl @@ -682,7 +682,7 @@ 'dns proxy server' => 'DNS Proxy Сервер', 'dns saved' => 'Successfully saved!', 'dns saved txt' => 'The two entered DNS server addresses have been saved successfully.<br />You have to reboot or reconnect that the changes have effect!', -'dns server' => 'DNS Сервер', +'dns servers' => 'DNS Сервер', 'dns title' => 'Domain Name System', 'do not log this port list' => 'Drop this port list just before they are logged (reduces log size)', 'dod' => 'Dial on Demand', diff --git a/langs/tr/cgi-bin/tr.pl b/langs/tr/cgi-bin/tr.pl index b958d63fe..da868a312 100644 --- a/langs/tr/cgi-bin/tr.pl +++ b/langs/tr/cgi-bin/tr.pl @@ -836,7 +836,6 @@ 'dns proxy server' => 'DNS Vekil Sunucusu', 'dns saved' => 'Başarıyla kaydedildi!', 'dns saved txt' => 'Girilen iki DNS sunucu adresi başarılı bir şekilde kaydedildi.<br />Değişikliklerin aktifleştirielebilmesi için yeniden başlatın!', -'dns server' => 'DNS Sunucusu', 'dns servers' => 'DNS sunucuları', 'dns title' => 'Etki Alanı Ad Sistemi', 'dnsforward' => 'DNS Yönlendirmesi',
hooks/post-receive -- IPFire 2.x development tree