From mboxrd@z Thu Jan 1 00:00:00 1970 From: Adolf Belka To: development@lists.ipfire.org Subject: [PATCH] Update language files: fix for Bug 12671 - remove evil spirits - demon vs daemon Date: Sun, 08 Aug 2021 22:57:48 +0200 Message-ID: <20210808205748.31185-1-adolf.belka@ipfire.org> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============3889424488782878968==" List-Id: --===============3889424488782878968== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable - demon used in place of daemon in the language files - This patch corrects that and fixes bug #12671 Signed-off-by: Adolf Belka --- doc/language_issues.en | 6 +++--- doc/language_issues.nl | 2 ++ doc/language_missings | 1 + html/cgi-bin/pppsetup.cgi | 2 +- langs/de/cgi-bin/de.pl | 6 +++--- langs/en/cgi-bin/en.pl | 6 +++--- langs/es/cgi-bin/es.pl | 2 +- langs/fr/cgi-bin/fr.pl | 2 +- langs/it/cgi-bin/it.pl | 2 +- langs/nl/cgi-bin/nl.pl | 4 ++-- langs/pl/cgi-bin/pl.pl | 2 +- langs/ru/cgi-bin/ru.pl | 2 +- langs/tr/cgi-bin/tr.pl | 2 +- 13 files changed, 21 insertions(+), 18 deletions(-) diff --git a/doc/language_issues.en b/doc/language_issues.en index 0c9b88777..17f622eb2 100644 --- a/doc/language_issues.en +++ b/doc/language_issues.en @@ -517,6 +517,7 @@ WARNING: untranslated string: current fixed leases =3D Cu= rrent fixed leases WARNING: untranslated string: current hosts =3D Current hosts WARNING: untranslated string: current playlist =3D Current Playlist WARNING: untranslated string: current rules =3D Current rules: +WARNING: untranslated string: daemon login script =3D Daemon login script WARNING: untranslated string: dangerous =3D Dangerous WARNING: untranslated string: date =3D Date WARNING: untranslated string: date not in logs =3D No (or only partial) logs= exist for the day queried @@ -536,7 +537,6 @@ WARNING: untranslated string: default IP address =3D Defa= ult IP Address WARNING: untranslated string: default lease time =3D Default lease time (min= s): WARNING: untranslated string: default renewal time =3D Default Renewal Time WARNING: untranslated string: delete =3D Delete -WARNING: untranslated string: demon login script =3D Demon login script WARNING: untranslated string: desired =3D Desired WARNING: untranslated string: dest ip and port =3D Dest. IP: Port WARNING: untranslated string: destination =3D Destination @@ -1633,8 +1633,8 @@ WARNING: untranslated string: ssh no auth =3D You have = not allowed any authenticat WARNING: untranslated string: ssh passwords =3D Allow password based authent= ication WARNING: untranslated string: ssh port =3D Set SSH port to default 22 (222 i= s used otherwise) WARNING: untranslated string: ssh portfw =3D Allow TCP forwarding -WARNING: untranslated string: ssh tempstart15 =3D Stop SSH demon in 15 minut= es -WARNING: untranslated string: ssh tempstart30 =3D Stop SSH demon in 30 minut= es +WARNING: untranslated string: ssh tempstart15 =3D Stop SSH Daemon in 15 minu= tes +WARNING: untranslated string: ssh tempstart30 =3D Stop SSH Daemon in 30 minu= tes WARNING: untranslated string: ssh username =3D Username WARNING: untranslated string: sstraffic =3D Net-Traffic WARNING: untranslated string: standard =3D Standard diff --git a/doc/language_issues.nl b/doc/language_issues.nl index 5db088b66..baca9673b 100644 --- a/doc/language_issues.nl +++ b/doc/language_issues.nl @@ -191,6 +191,7 @@ WARNING: translation string unused: delete cron WARNING: translation string unused: delete pc WARNING: translation string unused: delete share WARNING: translation string unused: delete user +WARNING: translation string unused: demon login script WARNING: translation string unused: deprecated fs warn WARNING: translation string unused: description WARNING: translation string unused: destination ip bad @@ -912,6 +913,7 @@ WARNING: untranslated string: check all =3D Check all WARNING: untranslated string: cpu frequency =3D CPU frequency WARNING: untranslated string: crypto error =3D Cryptographic error WARNING: untranslated string: crypto warning =3D Cryptographic warning +WARNING: untranslated string: daemon login script =3D Daemon login script WARNING: untranslated string: dangerous =3D Dangerous WARNING: untranslated string: default =3D Default WARNING: untranslated string: default IP address =3D Default IP Address diff --git a/doc/language_missings b/doc/language_missings index fc74274bd..dd83d3d0f 100644 --- a/doc/language_missings +++ b/doc/language_missings @@ -1413,6 +1413,7 @@ < crypto error < cryptographic settings < crypto warning +< daemon login script < Daily < dangerous < default diff --git a/html/cgi-bin/pppsetup.cgi b/html/cgi-bin/pppsetup.cgi index beb7fabc7..7fbb46a77 100644 --- a/html/cgi-bin/pppsetup.cgi +++ b/html/cgi-bin/pppsetup.cgi @@ -931,7 +931,7 @@ END if ($pppsettings{'TYPE'} eq 'modem') { print <$Lang::tr{'standard login script'} - + END ; diff --git a/langs/de/cgi-bin/de.pl b/langs/de/cgi-bin/de.pl index 0d2228ede..824afc3e1 100644 --- a/langs/de/cgi-bin/de.pl +++ b/langs/de/cgi-bin/de.pl @@ -696,6 +696,7 @@ 'current rules' =3D> 'Aktuelle Regeln:', 'custom networks' =3D> 'Benutzerdefinierte Netzwerke', 'custom services' =3D> 'Benutzerdefinierte Dienste', +'daemon login script' =3D> 'Daemon-Anmeldeskript', 'daily firewallhits' =3D> 't=C3=A4gliche Firewalltreffer', 'dangerous' =3D> 'gef=C3=A4hrlich', 'dat without key' =3D> 'Ein verschl=C3=BCsseltes Archiv kann ohne Schl=C3=BC= ssel nicht wiederhergestellt werden.', @@ -735,7 +736,6 @@ 'delete pc' =3D> 'PC l=C3=B6schen', 'delete share' =3D> 'Freigabe l=C3=B6schen', 'delete user' =3D> 'Benutzer l=C3=B6schen', -'demon login script' =3D> 'Demon-Anmeldeskript', 'deprecated fs warn' =3D> 'Veraltetes Dateisystem! Keine Unterst=C3=BCtzung = in neueren Kernelversionen. Sichern und Umformatieren!', 'description' =3D> 'Beschreibung', 'dest ip and port' =3D> 'Ziel-IP:Port', @@ -2284,8 +2284,8 @@ 'ssh passwords' =3D> 'Passwortbasierte Authentifizierung zulassen', 'ssh port' =3D> 'SSH-Port auf Standardport 22 setzen (andernfalls 222)', 'ssh portfw' =3D> 'TCP-Weiterleitung zulassen', -'ssh tempstart15' =3D> 'SSH-Deamon in 15 Minuten beenden', -'ssh tempstart30' =3D> 'SSH-Deamon in 30 Minuten beenden', +'ssh tempstart15' =3D> 'SSH-Daemon in 15 Minuten beenden', +'ssh tempstart30' =3D> 'SSH-Daemon in 30 Minuten beenden', 'ssh username' =3D> 'Benutzername', 'ssh1 disabled' =3D> 'SSHv1 ist deaktiviert, ein Client der Version 2 wird b= en=C3=B6tigt.', 'ssh1 enabled' =3D> 'SSHv1 ist aktiviert, Clients mit alten Versionen werden= unterst=C3=BCtzt.', diff --git a/langs/en/cgi-bin/en.pl b/langs/en/cgi-bin/en.pl index 2ba6961f3..d62004642 100644 --- a/langs/en/cgi-bin/en.pl +++ b/langs/en/cgi-bin/en.pl @@ -713,6 +713,7 @@ 'current rules' =3D> 'Current rules:', 'custom networks' =3D> 'Custom networks', 'custom services' =3D> 'Custom services', +'daemon login script' =3D> 'Daemon login script', 'daily firewallhits' =3D> 'daily firewallhits', 'dangerous' =3D> 'Dangerous', 'dat without key' =3D> 'An encrypted archive cannot be restored without the = key.', @@ -752,7 +753,6 @@ 'delete pc' =3D> 'Delete workstation', 'delete share' =3D> 'Delete share', 'delete user' =3D> 'Delete user', -'demon login script' =3D> 'Demon login script', 'deprecated fs warn' =3D> 'Deprecated filesystem! Newer kernel drop the supp= ort. Backup and reformat!', 'description' =3D> 'Description', 'desired' =3D> 'Desired', @@ -2325,8 +2325,8 @@ 'ssh passwords' =3D> 'Allow password based authentication', 'ssh port' =3D> 'Set SSH port to default 22 (222 is used otherwise)', 'ssh portfw' =3D> 'Allow TCP forwarding', -'ssh tempstart15' =3D> 'Stop SSH demon in 15 minutes', -'ssh tempstart30' =3D> 'Stop SSH demon in 30 minutes', +'ssh tempstart15' =3D> 'Stop SSH Daemon in 15 minutes', +'ssh tempstart30' =3D> 'Stop SSH Daemon in 30 minutes', 'ssh username' =3D> 'Username', 'ssh1 disabled' =3D> 'SSHv1 is disabled, a version 2 client will be required= .', 'ssh1 enabled' =3D> 'SSHv1 is enabled, old clients will be supported.', diff --git a/langs/es/cgi-bin/es.pl b/langs/es/cgi-bin/es.pl index 1080afdea..6ddcd325c 100644 --- a/langs/es/cgi-bin/es.pl +++ b/langs/es/cgi-bin/es.pl @@ -615,6 +615,7 @@ 'current rules' =3D> 'Reglas actuales', 'custom networks' =3D> 'Redes personalizadas', 'custom services' =3D> 'Servicios personalizados', +'daemon login script' =3D> 'Daemon login script', 'daily firewallhits' =3D> 'Hits diarios al firewall', 'dat without key' =3D> 'Un archivo encriptado no puede ser restaurado sin la= respectiva llave', 'date' =3D> 'Fecha', @@ -649,7 +650,6 @@ 'delete pc' =3D> 'Eliminar Estaci=C3=B3n de Trabajo', 'delete share' =3D> 'Eliminar recurso compartido de red', 'delete user' =3D> 'Eliminar usuario', -'demon login script' =3D> 'Demon login script', 'description' =3D> 'Descripci=C3=B3n:', 'dest ip and port' =3D> 'Puerto IP de destino:', 'destination' =3D> 'Destino', diff --git a/langs/fr/cgi-bin/fr.pl b/langs/fr/cgi-bin/fr.pl index 984b974f1..7f8239773 100644 --- a/langs/fr/cgi-bin/fr.pl +++ b/langs/fr/cgi-bin/fr.pl @@ -719,6 +719,7 @@ 'current rules' =3D> 'R=C3=A8gles actuelles :', 'custom networks' =3D> 'R=C3=A9seaux personnalis=C3=A9s', 'custom services' =3D> 'Services personnalis=C3=A9s', +'daemon login script' =3D> 'Script de login du service', 'daily firewallhits' =3D> 'Contacts journaliers du pare-feu', 'dangerous' =3D> 'dangereux', 'dat without key' =3D> 'Une archive chiffr=C3=A9e ne pouvant =C3=AAtre resta= ur=C3=A9e sans la clef.', @@ -758,7 +759,6 @@ 'delete pc' =3D> 'Effacer la station de travail', 'delete share' =3D> 'Effacer le partage', 'delete user' =3D> 'Supprimer utilisateur', -'demon login script' =3D> 'Script de login du service', 'deprecated fs warn' =3D> 'Syst=C3=A8me de fichiers obsol=C3=A8te ! Le nouve= au noyau supprime le support. Sauvegarde et reformatage !', 'description' =3D> 'Description', 'desired' =3D> 'Souhait=C3=A9', diff --git a/langs/it/cgi-bin/it.pl b/langs/it/cgi-bin/it.pl index e9bd157a3..701961dff 100644 --- a/langs/it/cgi-bin/it.pl +++ b/langs/it/cgi-bin/it.pl @@ -628,6 +628,7 @@ 'current rules' =3D> 'Current rules:', 'custom networks' =3D> 'Custom networks', 'custom services' =3D> 'Servizio Custom', +'daemon login script' =3D> 'Daemon login script', 'daily firewallhits' =3D> 'daily firewallhits', 'dat without key' =3D> 'An encrypted archive cannot be restored without the = key.', 'date' =3D> 'Date', @@ -665,7 +666,6 @@ 'delete pc' =3D> 'Delete workstation', 'delete share' =3D> 'Delete share', 'delete user' =3D> 'Delete user', -'demon login script' =3D> 'Demon login script', 'deprecated fs warn' =3D> 'Deprecated filesystem! Newer kernel drop the supp= ort. Backup and reformat!', 'description' =3D> 'Description', 'dest ip and port' =3D> 'Ip Destinazione: Porta', diff --git a/langs/nl/cgi-bin/nl.pl b/langs/nl/cgi-bin/nl.pl index d607e4f89..400e6b722 100644 --- a/langs/nl/cgi-bin/nl.pl +++ b/langs/nl/cgi-bin/nl.pl @@ -1991,8 +1991,8 @@ 'ssh passwords' =3D> 'Toestaan van authenticatie m.b.v. een wachtwoord', 'ssh port' =3D> 'SSH poort gezet op 22 (standaard is 222)', 'ssh portfw' =3D> 'Toestaan van TCP forwarding', -'ssh tempstart15' =3D> 'Stop SSH daemon over 15 minuten', -'ssh tempstart30' =3D> 'Stop SSH daemon over 30 minuten', +'ssh tempstart15' =3D> 'Stop SSH Daemon over 15 minuten', +'ssh tempstart30' =3D> 'Stop SSH Daemon over 30 minuten', 'ssh1 disabled' =3D> 'SSHv1 is uitgeschakeld, een versie 2 client is vereist= ', 'ssh1 enabled' =3D> 'SSHv1 is ingeschakeld, oudere clients zullen ondersteun= d worden.', 'ssh1 support' =3D> 'Ondersteun SSH protocol versie 1 (alleen noodzakelijk v= oor oudere clients)', diff --git a/langs/pl/cgi-bin/pl.pl b/langs/pl/cgi-bin/pl.pl index a44f43fa4..03a922c5f 100644 --- a/langs/pl/cgi-bin/pl.pl +++ b/langs/pl/cgi-bin/pl.pl @@ -562,6 +562,7 @@ 'current rules' =3D> 'Aktualne regu=C5=82y:', 'custom networks' =3D> 'W=C5=82asne sieci', 'custom services' =3D> 'W=C5=82asne us=C5=82ugi', +'daemon login script' =3D> 'Daemon login script', 'daily firewallhits' =3D> 'daily firewallhits', 'dat without key' =3D> 'Zaszyfrowane archiwa nie mog=C4=85 by=C4=87 odzyskan= e bez podania klucza.', 'date' =3D> 'Data', @@ -596,7 +597,6 @@ 'delete pc' =3D> 'Usu=C5=84 komputer', 'delete share' =3D> 'Usu=C5=84 zas=C3=B3b', 'delete user' =3D> 'Usu=C5=84 u=C5=BCytkownika', -'demon login script' =3D> 'Demon login script', 'description' =3D> 'Opis', 'dest ip and port' =3D> 'Cel IP: Port', 'destination' =3D> 'Cel', diff --git a/langs/ru/cgi-bin/ru.pl b/langs/ru/cgi-bin/ru.pl index c0342eb25..1d440a940 100644 --- a/langs/ru/cgi-bin/ru.pl +++ b/langs/ru/cgi-bin/ru.pl @@ -560,6 +560,7 @@ 'current rules' =3D> '=D0=A3=D1=81=D1=82=D0=B0=D0=BD=D0=BE=D0=B2=D0=BB=D0=B5= =D0=BD=D0=BD=D1=8B=D0=B5 =D0=BF=D1=80=D0=B0=D0=B2=D0=B8=D0=BB=D0=B0:', 'custom networks' =3D> '=D0=9F=D0=BE=D0=BB=D1=8C=D0=B7=D0=BE=D0=B2=D0=B0=D1= =82=D0=B5=D0=BB=D1=8C=D1=81=D0=BA=D0=B8=D0=B5 =D1=81=D0=B5=D1=82=D0=B8', 'custom services' =3D> '=D0=9F=D0=BE=D0=BB=D1=8C=D0=B7=D0=BE=D0=B2=D0=B0=D1= =82=D0=B5=D0=BB=D1=8C=D1=81=D0=BA=D0=B8=D0=B5 =D1=81=D0=B5=D1=80=D0=B2=D0=B8= =D1=81=D1=8Bs', +'daemon login script' =3D> 'Daemon login =D1=81=D0=BA=D1=80=D0=B8=D0=BF=D1= =82', 'daily firewallhits' =3D> 'daily firewallhits', 'dat without key' =3D> '=D0=97=D0=B0=D1=88=D0=B8=D1=84=D1=80=D0=BE=D0=B2=D0= =B0=D0=BD=D0=BD=D1=8B=D0=B9 =D0=B0=D1=80=D1=85=D0=B8=D0=B2 =D0=BD=D0=B5 =D0= =BC=D0=BE=D0=B6=D0=B5=D1=82 =D0=B1=D1=8B=D1=82=D1=8C =D0=B8=D1=81=D0=BF=D0=BE= =D0=BB=D1=8C=D0=B7=D0=BE=D0=B2=D0=B0=D0=BD =D0=B1=D0=B5=D0=B7 =D0=BA=D0=BB=D1= =8E=D1=87=D0=B0.', 'date' =3D> '=D0=94=D0=B0=D1=82=D0=B0', @@ -593,7 +594,6 @@ 'delete pc' =3D> '=D0=A3=D0=B4=D0=B0=D0=BB=D0=B8=D1=82=D1=8C =D1=80=D0=B0=D0= =B1=D0=BE=D1=87=D1=83=D1=8E =D1=81=D1=82=D0=B0=D0=BD=D1=86=D0=B8=D1=8E', 'delete share' =3D> '=D0=A3=D0=B4=D0=B0=D0=BB=D0=B8=D1=82=D1=8C =D1=88=D0=B0= =D1=80=D1=83', 'delete user' =3D> '=D0=A3=D0=B4=D0=B0=D0=BB=D0=B8=D1=82=D1=8C =D0=BF=D0=BE= =D0=BB=D1=8C=D0=B7=D0=BE=D0=B2=D0=B0=D1=82=D0=B5=D0=BB=D1=8F', -'demon login script' =3D> 'Demon login =D1=81=D0=BA=D1=80=D0=B8=D0=BF=D1=82', 'description' =3D> '=D0=9E=D0=BF=D0=B8=D1=81=D0=B0=D0=BD=D0=B8=D0=B5', 'dest ip and port' =3D> 'IP =D0=BF=D0=BE=D0=BB=D1=83=D1=87=D0=B0=D1=82=D0=B5= =D0=BB=D1=8F: =D0=9F=D0=BE=D1=80=D1=82', 'destination' =3D> '=D0=9F=D1=83=D0=BD=D0=BA=D1=82 =D0=BD=D0=B0=D0=B7=D0=BD= =D0=B0=D1=87=D0=B5=D0=BD=D0=B8=D1=8F', diff --git a/langs/tr/cgi-bin/tr.pl b/langs/tr/cgi-bin/tr.pl index f90bee0ea..c1d53adbc 100644 --- a/langs/tr/cgi-bin/tr.pl +++ b/langs/tr/cgi-bin/tr.pl @@ -693,6 +693,7 @@ 'current rules' =3D> 'Mevcut kurallar:', 'custom networks' =3D> '=C3=96zel a=C4=9Flar', 'custom services' =3D> '=C3=96zel hizmetler', +'daemon login script' =3D> 'Daemon giri=C5=9F beti=C4=9Fi', 'daily firewallhits' =3D> 'g=C3=BCnl=C3=BCk g=C3=BCvenlik duvar=C4=B1 kayd= =C4=B1', 'dat without key' =3D> '=C5=9Eifreli bir ar=C5=9Fiv anahtar=C4=B1 olmadan ge= ri y=C3=BCklenemez.', 'date' =3D> 'Tarih', @@ -730,7 +731,6 @@ 'delete pc' =3D> '=C4=B0=C5=9F istasyonunu sil', 'delete share' =3D> 'Payla=C5=9F=C4=B1m=C4=B1 sil', 'delete user' =3D> 'Kullan=C4=B1c=C4=B1y=C4=B1 sil', -'demon login script' =3D> 'Demon giri=C5=9F beti=C4=9Fi', 'deprecated fs warn' =3D> 'Dosya sistemi kalkt=C4=B1. Yeni =C3=A7ekirdekte b= u destek b=C4=B1rak=C4=B1ld=C4=B1. Yedekleyip yeniden bi=C3=A7imlendirin!', 'description' =3D> 'A=C3=A7=C4=B1klama', 'dest ip and port' =3D> 'Hedef IP: Ba=C4=9Flant=C4=B1 noktas=C4=B1', --=20 2.32.0 --===============3889424488782878968==--