diff --git a/actions/admin/settings/100.panel.php b/actions/admin/settings/100.panel.php index aac246ec..f93de097 100644 --- a/actions/admin/settings/100.panel.php +++ b/actions/admin/settings/100.panel.php @@ -255,7 +255,7 @@ return [ 'extras' => lng('menue.extras.extras'), 'extras.directoryprotection' => lng('menue.extras.extras') . " / " . lng('menue.extras.directoryprotection'), 'extras.pathoptions' => lng('menue.extras.extras') . " / " . lng('menue.extras.pathoptions'), - 'extras.logger' => lng('menue.extras.extras') . " / " . lng('admin.loggersystem'), + 'extras.logger' => lng('menue.extras.extras') . " / " . lng('menue.logger.logger'), 'extras.backup' => lng('menue.extras.extras') . " / " . lng('menue.extras.backup'), 'traffic' => lng('menue.traffic.traffic'), 'traffic.http' => lng('menue.traffic.traffic') . " / HTTP", diff --git a/admin_autoupdate.php b/admin_autoupdate.php index 2be6074b..341e28b2 100644 --- a/admin_autoupdate.php +++ b/admin_autoupdate.php @@ -296,5 +296,9 @@ elseif ($page == 'error') { // 9 = checksum mismatch // 10 = [ 'label' => lng('domains.ipandport_ssl_multi.title'), - 'desc' => lng('domains.ipandport_ssl_multi.description'), + 'desc' => lng('domains.ipandport_multi.description'), 'type' => 'checkbox', 'values' => $ssl_ipsandports, 'value' => explode(',', Settings::Get('system.defaultsslip')), @@ -296,7 +296,7 @@ return [ ], 'include_specialsettings' => [ 'visible' => !empty($ssl_ipsandports) && $userinfo['change_serversettings'] == '1', - 'label' => lng('admin.include_ownvhostsettings'), + 'label' => lng('serversettings.includedefault_sslvhostconf'), 'type' => 'checkbox', 'value' => '1', 'checked' => false diff --git a/lib/formfields/admin/domains/formfield.domains_edit.php b/lib/formfields/admin/domains/formfield.domains_edit.php index 2f705d17..5a93987c 100644 --- a/lib/formfields/admin/domains/formfield.domains_edit.php +++ b/lib/formfields/admin/domains/formfield.domains_edit.php @@ -234,7 +234,7 @@ return [ ], 'ssl_ipandport' => [ 'label' => lng('domains.ipandport_ssl_multi.title'), - 'desc' => lng('domains.ipandport_ssl_multi.description'), + 'desc' => lng('domains.ipandport_multi.description'), 'type' => 'checkbox', 'values' => $ssl_ipsandports, 'value' => $usedips, @@ -321,7 +321,7 @@ return [ 'value' => $result['ssl_specialsettings'] ], 'include_specialsettings' => [ - 'label' => lng('admin.include_ownvhostsettings'), + 'label' => lng('serversettings.includedefault_sslvhostconf'), 'type' => 'checkbox', 'value' => '1', 'checked' => $result['include_specialsettings'] diff --git a/lib/formfields/admin/ipsandports/formfield.ipsandports_add.php b/lib/formfields/admin/ipsandports/formfield.ipsandports_add.php index 1d7f52d5..014f03c7 100644 --- a/lib/formfields/admin/ipsandports/formfield.ipsandports_add.php +++ b/lib/formfields/admin/ipsandports/formfield.ipsandports_add.php @@ -115,7 +115,7 @@ return [ 'rows' => 12 ], 'include_default_vhostconf_domain' => [ - 'label' => lng('admin.include_ownvhostsettings'), + 'label' => lng('serversettings.includedefault_sslvhostconf'), 'type' => 'checkbox', 'value' => '1', 'checked' => false @@ -158,7 +158,7 @@ return [ 'rows' => 12 ], 'include_specialsettings' => [ - 'label' => lng('admin.include_ownvhostsettings'), + 'label' => lng('serversettings.includedefault_sslvhostconf'), 'type' => 'checkbox', 'value' => '1', 'checked' => false diff --git a/lib/formfields/admin/ipsandports/formfield.ipsandports_edit.php b/lib/formfields/admin/ipsandports/formfield.ipsandports_edit.php index 0cab1c7b..51d1d810 100644 --- a/lib/formfields/admin/ipsandports/formfield.ipsandports_edit.php +++ b/lib/formfields/admin/ipsandports/formfield.ipsandports_edit.php @@ -120,7 +120,7 @@ return [ 'value' => $result['ssl_default_vhostconf_domain'] ], 'include_default_vhostconf_domain' => [ - 'label' => lng('admin.include_ownvhostsettings'), + 'label' => lng('serversettings.includedefault_sslvhostconf'), 'type' => 'checkbox', 'value' => '1', 'checked' => $result['include_default_vhostconf_domain'] @@ -168,7 +168,7 @@ return [ 'value' => $result['ssl_specialsettings'] ], 'include_specialsettings' => [ - 'label' => lng('admin.include_ownvhostsettings'), + 'label' => lng('serversettings.includedefault_sslvhostconf'), 'type' => 'checkbox', 'value' => '1', 'checked' => $result['include_specialsettings'] diff --git a/lng/cz.lng.php b/lng/cz.lng.php index 5e4e612c..e3e1f006 100644 --- a/lng/cz.lng.php +++ b/lng/cz.lng.php @@ -151,7 +151,6 @@ return [ 'normal' => 'normální', 'paranoid' => 'paranoidní', ], - 'loggersystem' => 'Systémový log', 'emaildomain' => 'Emailová doména', 'email_only' => 'Jen email?', 'wwwserveralias' => 'Přidat "www." ServerAlias', @@ -561,6 +560,9 @@ return [ 'phpsettings' => [ 'maintitle' => 'PHP konfigurace', ], + 'logger' => [ + 'logger' => 'Systémový log', + ], ], 'message' => [ 'norecipients' => 'Email nebyl odeslán, protože databáze neobsahuje žádné příjemce', diff --git a/lng/de.lng.php b/lng/de.lng.php index db4fd26d..76838204 100644 --- a/lng/de.lng.php +++ b/lng/de.lng.php @@ -240,7 +240,6 @@ return [ 'normal' => 'Normal', 'paranoid' => 'Paranoid', ], - 'loggersystem' => 'System-Log', 'emaildomain' => 'E-Mail-Domain', 'email_only' => 'Nur als E-Mail-Domain verwenden?', 'wwwserveralias' => 'Einen "www." ServerAlias hinzufügen', @@ -1057,6 +1056,9 @@ Vielen Dank, Ihr Administrator', 'maintitle' => 'PHP-Konfigurationen', 'fpmdaemons' => 'PHP-FPM Versionen', ], + 'logger' => [ + 'logger' => 'System-Log', + ], ], 'message' => [ 'norecipients' => 'Es wurde keine E-Mail versendet, da sich keine Empfänger in der Datenbank befinden', @@ -1936,6 +1938,7 @@ Vielen Dank, Ihr Administrator', ], 'default_sslvhostconf' => [ 'title' => 'Standard SSL vHost-Einstellungen', + 'description' => 'Der Inhalt dieses Feldes wird direkt in den IP/Port-vHost-Container übernommen. Die folgenden Variablen können verwendet werden:
{DOMAIN}, {DOCROOT}, {CUSTOMER}, {IP}, {PORT}, {SCHEME}, {FPMSOCKET} (wenn zutreffend)

ACHTUNG: Der Code wird nicht auf Fehler geprüft. Etwaige Fehler werden also auch übernommen. Der Webserver könnte nicht mehr starten!', ], 'includedefault_sslvhostconf' => 'Nicht-SSL vHost-Einstellungen in SSL-vHost inkludieren', 'apply_specialsettings_default' => [ diff --git a/lng/en.lng.php b/lng/en.lng.php index 3e606797..c19e3cee 100644 --- a/lng/en.lng.php +++ b/lng/en.lng.php @@ -243,7 +243,6 @@ return [ 'normal' => 'normal', 'paranoid' => 'paranoid', ], - 'loggersystem' => 'System log', 'emaildomain' => 'Emaildomain', 'email_only' => 'Only email?', 'wwwserveralias' => 'Add a "www." ServerAlias', @@ -2287,6 +2286,7 @@ Yours sincerely, your administrator', ], 'default_sslvhostconf' => [ 'title' => 'Default SSL vHost-settings', + 'description' => 'The content of this field will be included into this ip/port vHost container directly. You can use the following variables:
{DOMAIN}, {DOCROOT}, {CUSTOMER}, {IP}, {PORT}, {SCHEME}, {FPMSOCKET} (if applicable)
Attention: The code won\'t be checked for any errors. If it contains errors, webserver might not start again!', ], 'includedefault_sslvhostconf' => 'Include non-SSL vHost-settings in SSL-vHost', 'apply_specialsettings_default' => [ diff --git a/lng/fr.lng.php b/lng/fr.lng.php index 45c5b951..65b1f50a 100644 --- a/lng/fr.lng.php +++ b/lng/fr.lng.php @@ -148,7 +148,6 @@ return [ 'normal' => 'normal', 'paranoid' => 'paranoïaque', ], - 'loggersystem' => 'Log système', 'emaildomain' => 'Domaine e-mail', 'email_only' => 'Seulement des e-mails ?', 'wwwserveralias' => 'Ajouter un "www." à l\'alias du serveur "ServerAlias"', @@ -462,6 +461,9 @@ return [ 'traffic' => 'Trafic', 'current' => 'Mois actuel', ], + 'logger' => [ + 'logger' => 'Log système', + ], ], 'message' => [ 'norecipients' => 'Aucun e-mail n\'a été envoyé car il n\'existe aucun destinataire dans la base de données', diff --git a/lng/it.lng.php b/lng/it.lng.php index 7056f00e..834b6bd2 100644 --- a/lng/it.lng.php +++ b/lng/it.lng.php @@ -207,7 +207,6 @@ return [ 'normal' => 'normale', 'paranoid' => 'paranoico', ], - 'loggersystem' => 'Log di Sistema', 'emaildomain' => 'Email dominio', 'email_only' => 'Solo email?', 'wwwserveralias' => 'Aggiungi a "www." ServerAlias', @@ -1077,6 +1076,9 @@ Cordiali Saluti, Team Froxlor', 'phpsettings' => [ 'maintitle' => 'Configurazioni PHP', ], + 'logger' => [ + 'logger' => 'Log di Sistema', + ], ], 'message' => [ 'norecipients' => 'Nessuna e-mail è stata inviata perch¸ non ci sono i destinatari nel database', diff --git a/lng/nl.lng.php b/lng/nl.lng.php index e82947ee..d9bf3a06 100644 --- a/lng/nl.lng.php +++ b/lng/nl.lng.php @@ -172,7 +172,6 @@ return [ 'normal' => 'normaal', 'paranoid' => 'paranoide', ], - 'loggersystem' => 'Systeemlog', 'emaildomain' => 'Emaildomein', 'email_only' => 'Alleen email?', 'wwwserveralias' => 'Voeg een "www." ServerAlias toe', @@ -653,6 +652,9 @@ Met vriendelijke groet, uw beheerder', 'phpsettings' => [ 'maintitle' => 'PHP Configuratie\'s', ], + 'logger' => [ + 'logger' => 'Systeemlog', + ], ], 'message' => [ 'norecipients' => 'Er is geen email verstuurd omdat er geen ontvangers in de database zijn', diff --git a/lng/pt.lng.php b/lng/pt.lng.php index 3111d81a..b7dd93ef 100644 --- a/lng/pt.lng.php +++ b/lng/pt.lng.php @@ -160,7 +160,6 @@ return [ 'normal' => 'normal', 'paranoid' => 'paranóico', ], - 'loggersystem' => 'Sistema-Log', 'emaildomain' => 'Domínio de Email', 'email_only' => 'Somente Email?', 'wwwserveralias' => 'Adicionar um "www." ServerAlias', @@ -550,6 +549,9 @@ return [ 'phpsettings' => [ 'maintitle' => 'Configurações do PHP', ], + 'logger' > [ + 'logger' => 'Sistema-Log', + ], ], 'message' => [ 'norecipients' => 'Email não enviado porque não tem destinatário no banco de dados',