Update language files: fix for Bug 12671 - remove evil spirits - demon vs daemon

- 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@ipfire.org>
Reviewed-by: Michael Tremer <michael.tremer@ipfire.org>
Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>

diff --git a/doc/language_issues.en b/doc/language_issues.en
index ee8321a325e4e3ab7f061bb6c27c66522fc165b1..3d10bebc68b35b21bc799142d1dedbe8f75c5f3a 100644 (file)
--- 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
@@ -1635,8 +1635,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 eb41b59ed097e70a13af5fa70bbbd394fa9e31f1..85fdcbe4414d5ec8d9966dfcb38c7be89eac04a8 100644 (file)
--- 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 344406ebcd3441e6f44da3600c05034dbaa38ad4..7aa2094a48ad223ea1d9e7709d950ad8aa6a702b 100644 (file)
--- a/doc/language_missings
+++ b/doc/language_missings
@@ -1419,6 +1419,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 beb7fabc7d296f8e1903e7786aa8397f0135c983..7fbb46a77179fc8117673e5fb859ba91410be346 100644 (file)
--- 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 76bf0469df8d9b70e3a53671869710d18f0e1ce5..70dcb10a61da0c4c37d8d2ad1e5b59ee6474e742 100644 (file)
--- 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',
@@ -2286,8 +2286,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 181dc80b06a61c34fd28bb7e3edc9d9b00faab70..67958894057364a03276391a57156c278d4bc68a 100644 (file)
--- 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',
@@ -2327,8 +2327,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 1080afdead08052439b701af9afd4d57eaf84a1f..6ddcd325c285687bd168d2c59914cbadfcc197f8 100644 (file)
--- 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 984b974f15ba802aa0fb43695a706e662fea42f5..7f823977329576398f55aafe09e6f48a70dd18ca 100644 (file)
--- 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 e9bd157a30e523f5c0454489c1dd7b5042ef33b2..701961dfff2a5bfedd61115853b9bcd481a792ff 100644 (file)
--- 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 d607e4f89e288e74450e7546233840e2b0c7c993..400e6b7225f5b49f5194782f68ca4c18292dc5e6 100644 (file)
--- 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 a44f43fa446e67b0790b9fb46a8b135c7aac31c1..03a922c5f948eab3dcf224f1efccc1c9392ac0c6 100644 (file)
--- 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 c0342eb253828719f9438a0fd4f5fb04d6f46daf..1d440a940e59d188560b310ee1035d8a3849cf07 100644 (file)
--- 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 f90bee0ea7ae35fab8eeba3bd9369ea0ac63ee1b..c1d53adbc8f6cbff4944de9fe9b85fd6b753221f 100644 (file)
--- 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ı',