- demon used in place of daemon in the language files
- This patch corrects that and fixes bug #12671
Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org>
---
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 = Current fixed leases
WARNING: untranslated string: current hosts = Current hosts
WARNING: untranslated string: current playlist = Current Playlist
WARNING: untranslated string: current rules = Current rules:
+WARNING: untranslated string: daemon login script = Daemon login script
WARNING: untranslated string: dangerous = Dangerous
WARNING: untranslated string: date = Date
WARNING: untranslated string: date not in logs = No (or only partial) logs exist for the day queried
@@ -536,7 +537,6 @@ WARNING: untranslated string: default IP address = Default IP Address
WARNING: untranslated string: default lease time = Default lease time (mins):
WARNING: untranslated string: default renewal time = Default Renewal Time
WARNING: untranslated string: delete = Delete
-WARNING: untranslated string: demon login script = Demon login script
WARNING: untranslated string: desired = Desired
WARNING: untranslated string: dest ip and port = Dest. IP: Port
WARNING: untranslated string: destination = Destination
@@ -1633,8 +1633,8 @@ WARNING: untranslated string: ssh no auth = You have not allowed any authenticat
WARNING: untranslated string: ssh passwords = Allow password based authentication
WARNING: untranslated string: ssh port = Set SSH port to default 22 (222 is used otherwise)
WARNING: untranslated string: ssh portfw = Allow TCP forwarding
-WARNING: untranslated string: ssh tempstart15 = Stop SSH demon in 15 minutes
-WARNING: untranslated string: ssh tempstart30 = Stop SSH demon in 30 minutes
+WARNING: untranslated string: ssh tempstart15 = Stop SSH Daemon in 15 minutes
+WARNING: untranslated string: ssh tempstart30 = Stop SSH Daemon in 30 minutes
WARNING: untranslated string: ssh username = Username
WARNING: untranslated string: sstraffic = Net-Traffic
WARNING: untranslated string: standard = 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 = Check all
WARNING: untranslated string: cpu frequency = CPU frequency
WARNING: untranslated string: crypto error = Cryptographic error
WARNING: untranslated string: crypto warning = Cryptographic warning
+WARNING: untranslated string: daemon login script = Daemon login script
WARNING: untranslated string: dangerous = Dangerous
WARNING: untranslated string: default = Default
WARNING: untranslated string: default IP address = 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 <<END
<option value='standard-login-script' $selected{'AUTH'}{'standard-login-script'}>$Lang::tr{'standard login script'}</option>
- <option value='demon-login-script' $selected{'AUTH'}{'demon-login-script'}>$Lang::tr{'demon login script'}</option>
+ <option value='demon-login-script' $selected{'AUTH'}{'demon-login-script'}>$Lang::tr{'daemon login script'}</option>
<option value='other-login-script' $selected{'AUTH'}{'other-login-script'}>$Lang::tr{'other login script'}</option>
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' => 'Aktuelle Regeln:',
'custom networks' => 'Benutzerdefinierte Netzwerke',
'custom services' => 'Benutzerdefinierte Dienste',
+'daemon login script' => 'Daemon-Anmeldeskript',
'daily firewallhits' => 'tägliche Firewalltreffer',
'dangerous' => 'gefährlich',
'dat without key' => 'Ein verschlüsseltes Archiv kann ohne Schlüssel nicht wiederhergestellt werden.',
@@ -735,7 +736,6 @@
'delete pc' => 'PC löschen',
'delete share' => 'Freigabe löschen',
'delete user' => 'Benutzer löschen',
-'demon login script' => 'Demon-Anmeldeskript',
'deprecated fs warn' => 'Veraltetes Dateisystem! Keine Unterstützung in neueren Kernelversionen. Sichern und Umformatieren!',
'description' => 'Beschreibung',
'dest ip and port' => 'Ziel-IP:Port',
@@ -2284,8 +2284,8 @@
'ssh passwords' => 'Passwortbasierte Authentifizierung zulassen',
'ssh port' => 'SSH-Port auf Standardport 22 setzen (andernfalls 222)',
'ssh portfw' => 'TCP-Weiterleitung zulassen',
-'ssh tempstart15' => 'SSH-Deamon in 15 Minuten beenden',
-'ssh tempstart30' => 'SSH-Deamon in 30 Minuten beenden',
+'ssh tempstart15' => 'SSH-Daemon in 15 Minuten beenden',
+'ssh tempstart30' => 'SSH-Daemon in 30 Minuten beenden',
'ssh username' => 'Benutzername',
'ssh1 disabled' => 'SSHv1 ist deaktiviert, ein Client der Version 2 wird benötigt.',
'ssh1 enabled' => 'SSHv1 ist aktiviert, Clients mit alten Versionen werden unterstützt.',
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' => 'Current rules:',
'custom networks' => 'Custom networks',
'custom services' => 'Custom services',
+'daemon login script' => 'Daemon login script',
'daily firewallhits' => 'daily firewallhits',
'dangerous' => 'Dangerous',
'dat without key' => 'An encrypted archive cannot be restored without the key.',
@@ -752,7 +753,6 @@
'delete pc' => 'Delete workstation',
'delete share' => 'Delete share',
'delete user' => 'Delete user',
-'demon login script' => 'Demon login script',
'deprecated fs warn' => 'Deprecated filesystem! Newer kernel drop the support. Backup and reformat!',
'description' => 'Description',
'desired' => 'Desired',
@@ -2325,8 +2325,8 @@
'ssh passwords' => 'Allow password based authentication',
'ssh port' => 'Set SSH port to default 22 (222 is used otherwise)',
'ssh portfw' => 'Allow TCP forwarding',
-'ssh tempstart15' => 'Stop SSH demon in 15 minutes',
-'ssh tempstart30' => 'Stop SSH demon in 30 minutes',
+'ssh tempstart15' => 'Stop SSH Daemon in 15 minutes',
+'ssh tempstart30' => 'Stop SSH Daemon in 30 minutes',
'ssh username' => 'Username',
'ssh1 disabled' => 'SSHv1 is disabled, a version 2 client will be required.',
'ssh1 enabled' => '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' => 'Reglas actuales',
'custom networks' => 'Redes personalizadas',
'custom services' => 'Servicios personalizados',
+'daemon login script' => 'Daemon login script',
'daily firewallhits' => 'Hits diarios al firewall',
'dat without key' => 'Un archivo encriptado no puede ser restaurado sin la respectiva llave',
'date' => 'Fecha',
@@ -649,7 +650,6 @@
'delete pc' => 'Eliminar Estación de Trabajo',
'delete share' => 'Eliminar recurso compartido de red',
'delete user' => 'Eliminar usuario',
-'demon login script' => 'Demon login script',
'description' => 'Descripción:',
'dest ip and port' => 'Puerto IP de destino:',
'destination' => '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' => 'Règles actuelles :',
'custom networks' => 'Réseaux personnalisés',
'custom services' => 'Services personnalisés',
+'daemon login script' => 'Script de login du service',
'daily firewallhits' => 'Contacts journaliers du pare-feu',
'dangerous' => 'dangereux',
'dat without key' => 'Une archive chiffrée ne pouvant être restaurée sans la clef.',
@@ -758,7 +759,6 @@
'delete pc' => 'Effacer la station de travail',
'delete share' => 'Effacer le partage',
'delete user' => 'Supprimer utilisateur',
-'demon login script' => 'Script de login du service',
'deprecated fs warn' => 'Système de fichiers obsolète ! Le nouveau noyau supprime le support. Sauvegarde et reformatage !',
'description' => 'Description',
'desired' => 'Souhaité',
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' => 'Current rules:',
'custom networks' => 'Custom networks',
'custom services' => 'Servizio Custom',
+'daemon login script' => 'Daemon login script',
'daily firewallhits' => 'daily firewallhits',
'dat without key' => 'An encrypted archive cannot be restored without the key.',
'date' => 'Date',
@@ -665,7 +666,6 @@
'delete pc' => 'Delete workstation',
'delete share' => 'Delete share',
'delete user' => 'Delete user',
-'demon login script' => 'Demon login script',
'deprecated fs warn' => 'Deprecated filesystem! Newer kernel drop the support. Backup and reformat!',
'description' => 'Description',
'dest ip and port' => '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' => 'Toestaan van authenticatie m.b.v. een wachtwoord',
'ssh port' => 'SSH poort gezet op 22 (standaard is 222)',
'ssh portfw' => 'Toestaan van TCP forwarding',
-'ssh tempstart15' => 'Stop SSH daemon over 15 minuten',
-'ssh tempstart30' => 'Stop SSH daemon over 30 minuten',
+'ssh tempstart15' => 'Stop SSH Daemon over 15 minuten',
+'ssh tempstart30' => 'Stop SSH Daemon over 30 minuten',
'ssh1 disabled' => 'SSHv1 is uitgeschakeld, een versie 2 client is vereist',
'ssh1 enabled' => 'SSHv1 is ingeschakeld, oudere clients zullen ondersteund worden.',
'ssh1 support' => 'Ondersteun SSH protocol versie 1 (alleen noodzakelijk voor 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' => 'Aktualne reguły:',
'custom networks' => 'Własne sieci',
'custom services' => 'Własne usługi',
+'daemon login script' => 'Daemon login script',
'daily firewallhits' => 'daily firewallhits',
'dat without key' => 'Zaszyfrowane archiwa nie mogą być odzyskane bez podania klucza.',
'date' => 'Data',
@@ -596,7 +597,6 @@
'delete pc' => 'Usuń komputer',
'delete share' => 'Usuń zasób',
'delete user' => 'Usuń użytkownika',
-'demon login script' => 'Demon login script',
'description' => 'Opis',
'dest ip and port' => 'Cel IP: Port',
'destination' => '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' => 'Установленные правила:',
'custom networks' => 'Пользовательские сети',
'custom services' => 'Пользовательские сервисыs',
+'daemon login script' => 'Daemon login скрипт',
'daily firewallhits' => 'daily firewallhits',
'dat without key' => 'Зашифрованный архив не может быть использован без ключа.',
'date' => 'Дата',
@@ -593,7 +594,6 @@
'delete pc' => 'Удалить рабочую станцию',
'delete share' => 'Удалить шару',
'delete user' => 'Удалить пользователя',
-'demon login script' => 'Demon login скрипт',
'description' => 'Описание',
'dest ip and port' => 'IP получателя: Порт',
'destination' => 'Пункт назначения',
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' => 'Mevcut kurallar:',
'custom networks' => 'Özel ağlar',
'custom services' => 'Özel hizmetler',
+'daemon login script' => 'Daemon giriş betiği',
'daily firewallhits' => 'günlük güvenlik duvarı kaydı',
'dat without key' => 'Şifreli bir arşiv anahtarı olmadan geri yüklenemez.',
'date' => 'Tarih',
@@ -730,7 +731,6 @@
'delete pc' => 'İş istasyonunu sil',
'delete share' => 'Paylaşımı sil',
'delete user' => 'Kullanıcıyı sil',
-'demon login script' => 'Demon giriş betiği',
'deprecated fs warn' => 'Dosya sistemi kalktı. Yeni çekirdekte bu destek bırakıldı. Yedekleyip yeniden biçimlendirin!',
'description' => 'Açıklama',
'dest ip and port' => 'Hedef IP: Bağlantı noktası',
--
2.32.0