From mboxrd@z Thu Jan 1 00:00:00 1970 From: Michael Tremer To: ipfire-scm@lists.ipfire.org Subject: [git.ipfire.org] IPFire 2.x development tree branch, next, updated. 9141282b09db282ae202302e25da4ed924e8deec Date: Sat, 07 Nov 2020 13:28:54 +0000 Message-ID: <4CSylC27D6z2xcm@people01.haj.ipfire.org> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============3844866975088342902==" List-Id: --===============3844866975088342902== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable 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 Date: Sat Nov 7 13:28:44 2020 +0000 core153: Ship dns.cgi =20 Signed-off-by: Michael Tremer commit 0c6112b0b3478a2a3e088e4fd264af2ee0d88408 Author: Michael Tremer Date: Sat Nov 7 13:27:43 2020 +0000 Run "./make.sh lang" =20 Signed-off-by: Michael Tremer commit 743808bb8ece981efbb57a483f01618ad0fd7107 Author: Matthias Fischer Date: Fri Nov 6 17:35:59 2020 +0100 dns.cgi: Cosmetics and customized translations =20 Updated/deleted redundant, unused or missing translation strings for dns.= cgi =20 Affected: 'dns', 'dns title', 'dns server', 'dns servers' =20 Signed-off-by: Matthias Fischer Signed-off-by: Michael Tremer ----------------------------------------------------------------------- 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/cor= e/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 =3D Download= Client Package (zip) WARNING: untranslated string: dl client arch insecure =3D Download insecure = Client Package (zip) WARNING: untranslated string: dmz =3D DMZ WARNING: untranslated string: dnat address =3D Firewall Interface -WARNING: untranslated string: dns =3D unknown string WARNING: untranslated string: dns check failed =3D DNS check failed WARNING: untranslated string: dns check servers =3D Check DNS Servers WARNING: untranslated string: dns configuration =3D DNS Configuration @@ -610,6 +609,7 @@ WARNING: untranslated string: dns no address given =3D No= IP Address given. WARNING: untranslated string: dns no tls hostname given =3D No TLS hostname = given. WARNING: untranslated string: dns proxy server =3D DNS Proxy Server WARNING: untranslated string: dns recursor mode =3D Recursor Mode +WARNING: untranslated string: dns servers =3D DNS Servers WARNING: untranslated string: dns title =3D Domain Name System WARNING: untranslated string: dns tls hostname =3D TLS Hostname WARNING: untranslated string: dns use isp assigned nameservers =3D Use ISP-a= ssigned 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 =3D Disable WARNING: untranslated string: disconnected =3D Disconnected WARNING: untranslated string: dl client arch insecure =3D Download insecure = Client Package (zip) WARNING: untranslated string: dnat address =3D Firewall Interface -WARNING: untranslated string: dns =3D unknown string WARNING: untranslated string: dns check servers =3D Check DNS Servers WARNING: untranslated string: dns configuration =3D DNS Configuration WARNING: untranslated string: dns enable safe-search =3D Enable Safe Search @@ -905,6 +904,7 @@ WARNING: untranslated string: dns mode for qname minimisa= tion =3D QNAME Minimisati WARNING: untranslated string: dns no address given =3D No IP Address given. WARNING: untranslated string: dns no tls hostname given =3D No TLS hostname = given. WARNING: untranslated string: dns recursor mode =3D Recursor Mode +WARNING: untranslated string: dns servers =3D DNS Servers WARNING: untranslated string: dns tls hostname =3D TLS Hostname WARNING: untranslated string: dns use isp assigned nameservers =3D Use ISP-a= ssigned DNS servers WARNING: untranslated string: dns use protocol for dns queries =3D 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 =3D = Secret WARNING: untranslated string: disable =3D Disable WARNING: untranslated string: disconnected =3D Disconnected WARNING: untranslated string: dl client arch insecure =3D Download insecure = Client Package (zip) -WARNING: untranslated string: dns =3D unknown string WARNING: untranslated string: dns check servers =3D Check DNS Servers WARNING: untranslated string: dns configuration =3D DNS Configuration WARNING: untranslated string: dns enable safe-search =3D 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 =3D = Secret WARNING: untranslated string: disable =3D Disable WARNING: untranslated string: disconnected =3D Disconnected WARNING: untranslated string: dl client arch insecure =3D Download insecure = Client Package (zip) -WARNING: untranslated string: dns =3D unknown string WARNING: untranslated string: dns check servers =3D Check DNS Servers WARNING: untranslated string: dns configuration =3D DNS Configuration WARNING: untranslated string: dns enable safe-search =3D 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 =3D Disable WARNING: untranslated string: disconnected =3D Disconnected WARNING: untranslated string: dl client arch insecure =3D Download insecure = Client Package (zip) WARNING: untranslated string: dnat address =3D Firewall Interface -WARNING: untranslated string: dns =3D unknown string WARNING: untranslated string: dns check servers =3D Check DNS Servers WARNING: untranslated string: dns configuration =3D DNS Configuration WARNING: untranslated string: dns enable safe-search =3D Enable Safe Search @@ -905,6 +904,7 @@ WARNING: untranslated string: dns mode for qname minimisa= tion =3D QNAME Minimisati WARNING: untranslated string: dns no address given =3D No IP Address given. WARNING: untranslated string: dns no tls hostname given =3D No TLS hostname = given. WARNING: untranslated string: dns recursor mode =3D Recursor Mode +WARNING: untranslated string: dns servers =3D DNS Servers WARNING: untranslated string: dns tls hostname =3D TLS Hostname WARNING: untranslated string: dns use isp assigned nameservers =3D Use ISP-a= ssigned DNS servers WARNING: untranslated string: dns use protocol for dns queries =3D 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 =3D Disconnect= ed WARNING: untranslated string: disk access =3D Disk Access WARNING: untranslated string: dl client arch insecure =3D Download insecure = Client Package (zip) WARNING: untranslated string: dnat address =3D Firewall Interface -WARNING: untranslated string: dns =3D unknown string WARNING: untranslated string: dns check servers =3D Check DNS Servers WARNING: untranslated string: dns configuration =3D DNS Configuration WARNING: untranslated string: dns enable safe-search =3D 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 =3D Defa= ult IP Address WARNING: untranslated string: desired =3D Desired WARNING: untranslated string: disable =3D Disable WARNING: untranslated string: disconnected =3D Disconnected -WARNING: untranslated string: dns =3D unknown string WARNING: untranslated string: dns check servers =3D Check DNS Servers WARNING: untranslated string: dns configuration =3D DNS Configuration WARNING: untranslated string: dns enable safe-search =3D 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 =3D (); # Libloc database handle my $libloc_db_handle =3D &Location::Functions::init(); =20 -&Header::openpage($Lang::tr{'dns'}, 1, ''); +&Header::openpage($Lang::tr{'dns title'}, 1, ''); =20 &Header::openbigbox('100%', 'left', '', $errormessage); =20 @@ -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'}"); =20 # Determine if we are running in recursor mode my $recursor =3D 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' =3D> 'Regel f=C3=BCr DMZ-Schlupfloch entfernt; St= arte DMZ-Schlupfloch neu', 'dmzpinholes for same net not necessary' =3D> 'DMZ-Schlupfl=C3=B6cher werden= im gleichen Netz nicht ben=C3=B6tigt. W=C3=A4hlen Sie ein anderes Quell- ode= r Ziel-Netz.', 'dnat address' =3D> 'Firewall-Interface', -'dns' =3D> 'Domain Name System', 'dns address deleted' =3D> 'Erfolgreich gel=C3=B6scht! ', 'dns address deleted txt' =3D> 'DNS Server Adressen wurden erfolgreich gel= =C3=B6scht. =C3=84nderungen werden jedoch erst nach einem Neustart oder einer= Wiederverbindung =C3=BCbernommen.', 'dns address done' =3D> 'Die DNS-Server Adressen Einstellungen werden =C3=BC= bernommen.', @@ -848,7 +847,6 @@ 'dns recursor mode' =3D> 'Recursor-Modus', 'dns saved' =3D> 'Erfolgreich gespeichert!', 'dns saved txt' =3D> 'Die beiden eingegebenen DNS-Server-Adressen wurde erfo= lgreich gespeichert.
Um die =C3=84nderung wirksam zu machen, m=C3=BCssen = Sie neustarten oder wiederverbinden!', -'dns server' =3D> 'DNS Server', 'dns servers' =3D> 'DNS-Server', 'dns title' =3D> 'Domain Name System', 'dns tls hostname' =3D> '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' =3D> 'Recursor Mode', 'dns saved' =3D> 'Successfully saved!', 'dns saved txt' =3D> 'The two entered DNS server addresses have been saved s= uccessfully.
You have to reboot or reconnect that the changes have effec= t!', -'dns server' =3D> 'DNS Server', 'dns servers' =3D> 'DNS Servers', 'dns title' =3D> 'Domain Name System', 'dns tls hostname' =3D> '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' =3D> 'R=C3=A8gle DMZ pinhole supprim=C3=A9e; Red= =C3=A9marrage DMZ pinhole', 'dmzpinholes for same net not necessary' =3D> 'Les DMZ Pinholes ne sont pas = forc=C3=A9ment dans le m=C3=AAme r=C3=A9seau. Choisir diff=C3=A9rentes source= s ou destinations r=C3=A9seau.', 'dnat address' =3D> 'Interface pare-feu', -'dns' =3D> 'Syst=C3=A8me de noms de domaines', 'dns address deleted' =3D> 'Suppression effectu=C3=A9e !', 'dns address deleted txt' =3D> 'Les adresses du serveur DNS ont =C3=A9t=C3= =A9 supprim=C3=A9es avec succ=C3=A8s.
Vous devez red=C3=A9marrer ou reco= nnecter pour que les modifications prennent effet !', 'dns address done' =3D> 'Les adresses du serveur DNS vont =C3=AAtre sauvegar= d=C3=A9es.', @@ -877,7 +876,6 @@ 'dns recursor mode' =3D> 'Ex=C3=A9cution en mode r=C3=A9cursif.', 'dns saved' =3D> 'Sauvegarde effectu=C3=A9e !', 'dns saved txt' =3D> 'La sauvegarde des deux adresses saisies du serveur DNS= a =C3=A9t=C3=A9 effect=C3=A9e correctement.
Vous devez red=C3=A9marrer = ou vous reconnecter pour que les changements prennent effets !', -'dns server' =3D> 'Serveur DNS', 'dns servers' =3D> 'Serveurs DNS', 'dns title' =3D> 'Syst=C3=A8me de noms de domaine (DNS)', 'dns tls hostname' =3D> 'Nom d\'h=C3=B4te 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' =3D> 'DNS Proxy Server', 'dns saved' =3D> 'Successfully saved!', 'dns saved txt' =3D> 'The two entered DNS server addresses have been saved s= uccessfully.
You have to reboot or reconnect that the changes have effec= t!', -'dns server' =3D> 'DNS Server', 'dns servers' =3D> 'DNS Servers', 'dns title' =3D> 'Domain Name System', 'dnsforward' =3D> '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' =3D> 'DNS Proxy Server', 'dns saved' =3D> 'Succesvol opgeslagen!', 'dns saved txt' =3D> 'De twee ingevoerde DNS serveradressen zijn succesvol o= pgeslagen.
U moet herstarten of opnieuw verbinden om de wijzigingen acti= ef te laten worden!', -'dns server' =3D> 'DNS Server', +'dns servers' =3D> 'DNS Server', 'dns title' =3D> 'Domein Naam Systeem', 'dnsforward' =3D> 'DNS Forwarding', 'dnsforward add a new entry' =3D> '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' =3D> 'Serwer Proxy DNS', 'dns saved' =3D> 'Zapisano poprawnie!', 'dns saved txt' =3D> 'Podane adresy serwer=C3=B3w DNS zosta=C5=82y poprawnie= zapisane.
Nale=C5=BCy wykona=C4=87 restart lub wykona=C4=87 ponowne = =C5=82=C4=85czenie, aby zmiany zosta=C5=82y zastosowane!', -'dns server' =3D> 'Serwer DNS', +'dns servers' =3D> 'Serwer DNS', 'dns title' =3D> 'Domain Name System', 'do not log this port list' =3D> 'Odrzucaj t=C4=85 list=C4=99 port=C3=B3w za= nim zostan=C4=85 zapisane do logu (zmniejsza rozmiar log=C3=B3w)', 'dod' =3D> '=C5=81=C4=85cz na =C5=BC=C4=85danie', 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' =3D> 'DNS Proxy =D0=A1=D0=B5=D1=80=D0=B2=D0=B5=D1=80', 'dns saved' =3D> 'Successfully saved!', 'dns saved txt' =3D> 'The two entered DNS server addresses have been saved s= uccessfully.
You have to reboot or reconnect that the changes have effec= t!', -'dns server' =3D> 'DNS =D0=A1=D0=B5=D1=80=D0=B2=D0=B5=D1=80', +'dns servers' =3D> 'DNS =D0=A1=D0=B5=D1=80=D0=B2=D0=B5=D1=80', 'dns title' =3D> 'Domain Name System', 'do not log this port list' =3D> 'Drop this port list just before they are l= ogged (reduces log size)', 'dod' =3D> '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' =3D> 'DNS Vekil Sunucusu', 'dns saved' =3D> 'Ba=C5=9Far=C4=B1yla kaydedildi!', 'dns saved txt' =3D> 'Girilen iki DNS sunucu adresi ba=C5=9Far=C4=B1l=C4=B1 = bir =C5=9Fekilde kaydedildi.
De=C4=9Fi=C5=9Fikliklerin aktifle=C5=9Ftiri= elebilmesi i=C3=A7in yeniden ba=C5=9Flat=C4=B1n!', -'dns server' =3D> 'DNS Sunucusu', 'dns servers' =3D> 'DNS sunucular=C4=B1', 'dns title' =3D> 'Etki Alan=C4=B1 Ad Sistemi', 'dnsforward' =3D> 'DNS Y=C3=B6nlendirmesi', hooks/post-receive -- IPFire 2.x development tree --===============3844866975088342902==--