diff --git a/lib/formfields/admin/domains/formfield.domains_add.php b/lib/formfields/admin/domains/formfield.domains_add.php index b91c89a4..3dfd93cb 100644 --- a/lib/formfields/admin/domains/formfield.domains_add.php +++ b/lib/formfields/admin/domains/formfield.domains_add.php @@ -250,7 +250,7 @@ return [ 'ssl_protocols' => [ 'visible' => !empty($ssl_ipsandports) && $userinfo['change_serversettings'] == '1' && Settings::Get('system.webserver') != 'lighttpd', 'label' => lng('serversettings.ssl.ssl_protocols.title'), - 'desc' => lng('serversettings.ssl.ssl_protocols.description'), + 'desc' => lng('serversettings.ssl.ssl_protocols.description').lng('admin.domain_override_tls_addinfo'), 'type' => 'checkbox', 'value' => [ 'TLSv1.2' @@ -278,14 +278,14 @@ return [ 'ssl_cipher_list' => [ 'visible' => !empty($ssl_ipsandports) && $userinfo['change_serversettings'] == '1', 'label' => lng('serversettings.ssl.ssl_cipher_list.title'), - 'desc' => lng('serversettings.ssl.ssl_cipher_list.description'), + 'desc' => lng('serversettings.ssl.ssl_cipher_list.description').lng('admin.domain_override_tls_addinfo'), 'type' => 'text', 'value' => Settings::Get('system.ssl_cipher_list') ], 'tlsv13_cipher_list' => [ 'visible' => !empty($ssl_ipsandports) && $userinfo['change_serversettings'] == '1' && Settings::Get('system.webserver') == "apache2" && Settings::Get('system.apache24') == 1, 'label' => lng('serversettings.ssl.tlsv13_cipher_list.title'), - 'desc' => lng('serversettings.ssl.tlsv13_cipher_list.description'), + 'desc' => lng('serversettings.ssl.tlsv13_cipher_list.description').lng('admin.domain_override_tls_addinfo'), 'type' => 'text', 'value' => Settings::Get('system.tlsv13_cipher_list') ], diff --git a/lib/formfields/admin/domains/formfield.domains_edit.php b/lib/formfields/admin/domains/formfield.domains_edit.php index 48eadb60..7c15eef9 100644 --- a/lib/formfields/admin/domains/formfield.domains_edit.php +++ b/lib/formfields/admin/domains/formfield.domains_edit.php @@ -277,7 +277,7 @@ return [ 'ssl_protocols' => [ 'visible' => !empty($ssl_ipsandports) && $userinfo['change_serversettings'] == '1' && Settings::Get('system.webserver') != 'lighttpd', 'label' => lng('serversettings.ssl.ssl_protocols.title'), - 'desc' => lng('serversettings.ssl.ssl_protocols.description'), + 'desc' => lng('serversettings.ssl.ssl_protocols.description').lng('admin.domain_override_tls_addinfo'), 'type' => 'checkbox', 'value' => !empty($result['ssl_protocols']) ? explode(",", $result['ssl_protocols']) : explode(",", Settings::Get('system.ssl_protocols')), 'values' => [ @@ -303,14 +303,14 @@ return [ 'ssl_cipher_list' => [ 'visible' => !empty($ssl_ipsandports) && $userinfo['change_serversettings'] == '1', 'label' => lng('serversettings.ssl.ssl_cipher_list.title'), - 'desc' => lng('serversettings.ssl.ssl_cipher_list.description'), + 'desc' => lng('serversettings.ssl.ssl_cipher_list.description').lng('admin.domain_override_tls_addinfo'), 'type' => 'text', 'value' => !empty($result['ssl_cipher_list']) ? $result['ssl_cipher_list'] : Settings::Get('system.ssl_cipher_list') ], 'tlsv13_cipher_list' => [ 'visible' => !empty($ssl_ipsandports) && $userinfo['change_serversettings'] == '1' && Settings::Get('system.webserver') == "apache2" && Settings::Get('system.apache24') == 1, 'label' => lng('serversettings.ssl.tlsv13_cipher_list.title'), - 'desc' => lng('serversettings.ssl.tlsv13_cipher_list.description'), + 'desc' => lng('serversettings.ssl.tlsv13_cipher_list.description').lng('admin.domain_override_tls_addinfo'), 'type' => 'text', 'value' => !empty($result['tlsv13_cipher_list']) ? $result['tlsv13_cipher_list'] : Settings::Get('system.tlsv13_cipher_list') ], diff --git a/lng/de.lng.php b/lng/de.lng.php index a82b4599..add64217 100644 --- a/lng/de.lng.php +++ b/lng/de.lng.php @@ -454,6 +454,7 @@ return [ 'novhostcontainer' => '

Keine der IPs und Ports hat die Option "Erstelle vHost-Container" aktiviert, einige Einstellungen sind daher nicht verfügbar.', 'ownsslvhostsettings' => 'Eigene SSL vHost-Einstellungen', 'domain_override_tls' => 'Überschreibe System TLS Einstellungen', + 'domain_override_tls_addinfo' => '
Nur verwendet wenn "Überschreibe System TLS Einstellungen" auf "Ja" gestellt ist', 'domain_sslenabled' => 'Aktiviere Nutzung von SSL', 'domain_honorcipherorder' => 'Bevorzuge die serverseitige Cipher Reihenfolge, Standardwert nein', 'domain_sessiontickets' => 'Aktiviere TLS Sessiontickets (RFC 5077), Standardwert ja', @@ -568,7 +569,6 @@ return [ 'email_quota' => 'E-Mail-Kontingent', 'email_imap' => 'IMAP', 'email_pop3' => 'POP3', - 'mail_quota' => 'E-Mail-Kontingent', 'sendinfomail' => 'Daten per E-Mail an mich senden', 'generated_pwd' => 'Passwortvorschlag', 'usedmax' => 'Benutzt / Max.', diff --git a/lng/en.lng.php b/lng/en.lng.php index 7da617bb..339a9159 100644 --- a/lng/en.lng.php +++ b/lng/en.lng.php @@ -461,6 +461,7 @@ return [ 'novhostcontainer' => '

None of the IPs and ports has the "Create vHost-Container" option enabled, many settings here will not be available', 'ownsslvhostsettings' => 'Own SSL vHost-settings', 'domain_override_tls' => 'Override system TLS settings', + 'domain_override_tls_addinfo' => '
Only used if "Override system TLS settings" is set to "Yes"', 'domain_sslenabled' => 'Enable usage of SSL', 'domain_honorcipherorder' => 'Honor the (server) cipher order, default no', 'domain_sessiontickets' => 'Enable TLS sessiontickets (RFC 5077), default yes', @@ -613,7 +614,6 @@ return [ 'email_quota' => 'E-mail quota', 'email_imap' => 'E-mail IMAP', 'email_pop3' => 'E-mail POP3', - 'mail_quota' => 'Mailquota', 'sendinfomail' => 'Send data via email to me', 'generated_pwd' => 'Password suggestion', 'usedmax' => 'Used / Max',