From d38cca15c31ad61f20c96d2d423881b41853f41e Mon Sep 17 00:00:00 2001 From: Thom Pol Date: Fri, 12 Jun 2020 20:06:35 +0200 Subject: [PATCH 1/4] Rename no_policy to inherit_policy (#4277) --- interface/web/mail/lib/lang/ar_mail_user.lng | 2 +- interface/web/mail/lib/lang/bg_mail_user.lng | 2 +- interface/web/mail/lib/lang/br_mail_user.lng | 2 +- interface/web/mail/lib/lang/ca_mail_user.lng | 2 +- interface/web/mail/lib/lang/cz_mail_user.lng | 2 +- interface/web/mail/lib/lang/de_mail_user.lng | 2 +- interface/web/mail/lib/lang/dk_mail_user.lng | 2 +- interface/web/mail/lib/lang/el_mail_user.lng | 2 +- interface/web/mail/lib/lang/en_mail_user.lng | 2 +- interface/web/mail/lib/lang/es_mail_user.lng | 2 +- interface/web/mail/lib/lang/fi_mail_user.lng | 2 +- interface/web/mail/lib/lang/fr_mail_user.lng | 2 +- interface/web/mail/lib/lang/hr_mail_user.lng | 2 +- interface/web/mail/lib/lang/hu_mail_user.lng | 2 +- interface/web/mail/lib/lang/id_mail_user.lng | 2 +- interface/web/mail/lib/lang/it_mail_user.lng | 2 +- interface/web/mail/lib/lang/ja_mail_user.lng | 2 +- interface/web/mail/lib/lang/nl_mail_user.lng | 2 +- interface/web/mail/lib/lang/pl_mail_user.lng | 2 +- interface/web/mail/lib/lang/pt_mail_user.lng | 2 +- interface/web/mail/lib/lang/ro_mail_user.lng | 2 +- interface/web/mail/lib/lang/ru_mail_user.lng | 2 +- interface/web/mail/lib/lang/se_mail_user.lng | 2 +- interface/web/mail/lib/lang/sk_mail_user.lng | 2 +- interface/web/mail/lib/lang/tr_mail_user.lng | 2 +- interface/web/mail/mail_user_edit.php | 2 +- 26 files changed, 26 insertions(+), 26 deletions(-) diff --git a/interface/web/mail/lib/lang/ar_mail_user.lng b/interface/web/mail/lib/lang/ar_mail_user.lng index c68becf335..6aed9d1d1e 100644 --- a/interface/web/mail/lib/lang/ar_mail_user.lng +++ b/interface/web/mail/lib/lang/ar_mail_user.lng @@ -23,7 +23,7 @@ $wb['postfix_txt'] = 'Enable Receiving'; $wb['greylisting_txt'] = 'Enable greylisting'; $wb['access_txt'] = 'Enable Access'; $wb['policy_txt'] = 'Spamfilter'; -$wb['no_policy'] = '- not enabled -'; +$wb['inherit_policy'] = '- Inherit domain setting -'; $wb['limit_mailbox_txt'] = 'The max. number of mailboxes for your account is reached.'; $wb['limit_mailquota_txt'] = 'The max space for mailboxes is reached. The max. available space in MB is'; $wb['disableimap_txt'] = 'Disable IMAP'; diff --git a/interface/web/mail/lib/lang/bg_mail_user.lng b/interface/web/mail/lib/lang/bg_mail_user.lng index 000377077b..a5ac34c577 100644 --- a/interface/web/mail/lib/lang/bg_mail_user.lng +++ b/interface/web/mail/lib/lang/bg_mail_user.lng @@ -19,7 +19,7 @@ $wb['postfix_txt'] = 'Разреши получаване'; $wb['greylisting_txt'] = 'Enable greylisting'; $wb['access_txt'] = 'Разреши достъп'; $wb['policy_txt'] = 'Спам филтър'; -$wb['no_policy'] = '- забранен -'; +$wb['inherit_policy'] = '- Inherit domain setting -'; $wb['limit_mailbox_txt'] = 'Достигнат е максималният брой на пощенските кутии за твоят профил.'; $wb['limit_mailquota_txt'] = 'Максималното отделено място за твоята кутия е достигнато. Максималното позволено място в МБ е '; $wb['disableimap_txt'] = 'Забрани IMAP'; diff --git a/interface/web/mail/lib/lang/br_mail_user.lng b/interface/web/mail/lib/lang/br_mail_user.lng index ed6e35ef61..c5200273cc 100644 --- a/interface/web/mail/lib/lang/br_mail_user.lng +++ b/interface/web/mail/lib/lang/br_mail_user.lng @@ -27,7 +27,7 @@ $wb['postfix_txt'] = 'Habilitar recebimento'; $wb['greylisting_txt'] = 'Habilitar greylist'; $wb['access_txt'] = 'Habilitar acesso'; $wb['policy_txt'] = 'Filtros anti-spam'; -$wb['no_policy'] = '-desabilitado-'; +$wb['inherit_policy'] = '- Inherit domain setting -'; $wb['limit_mailbox_txt'] = 'O limite de contas de e-mail para esta conta foi alcançado.'; $wb['limit_mailquota_txt'] = 'O limite de tamanho para as contas de e-mails foi alcançado. O espaço disponível em MB é'; $wb['disablesmtp_txt'] = 'Desabilitar SMTP (envio)'; diff --git a/interface/web/mail/lib/lang/ca_mail_user.lng b/interface/web/mail/lib/lang/ca_mail_user.lng index 096572b5e0..ffabcf2395 100644 --- a/interface/web/mail/lib/lang/ca_mail_user.lng +++ b/interface/web/mail/lib/lang/ca_mail_user.lng @@ -18,7 +18,7 @@ $wb['maildir_txt'] = 'Maildir'; $wb['postfix_txt'] = 'Activer la réception'; $wb['access_txt'] = 'Activer l\'accès'; $wb['policy_txt'] = 'Filtre antispam'; -$wb['no_policy'] = '- inactif -'; +$wb['inherit_policy'] = '- Inherit domain setting -'; $wb['limit_mailbox_txt'] = 'Le nombre maximal de boites courriel pour votre compte est atteint..'; $wb['limit_mailquota_txt'] = 'Lespace maximal pour les boites courriel est atteint. Lespace maximal disponible est de '; $wb['disableimap_txt'] = 'Désactiver IMAP'; diff --git a/interface/web/mail/lib/lang/cz_mail_user.lng b/interface/web/mail/lib/lang/cz_mail_user.lng index c697e4cffc..909a7b2b5b 100644 --- a/interface/web/mail/lib/lang/cz_mail_user.lng +++ b/interface/web/mail/lib/lang/cz_mail_user.lng @@ -22,7 +22,7 @@ $wb['maildir_txt'] = 'E-mailový adresář'; $wb['postfix_txt'] = 'Povolit příjem'; $wb['access_txt'] = 'Povolit přístup'; $wb['policy_txt'] = 'Spamový filtr'; -$wb['no_policy'] = '- nepovoleno -'; +$wb['inherit_policy'] = '- Inherit domain setting -'; $wb['limit_mailbox_txt'] = 'Byl dosažen maximální počet mailboxů pro Váš účet.'; $wb['limit_mailquota_txt'] = 'Dosažen maximální prostor pro mailboxy. Max. dostupné místo v MB je'; $wb['disableimap_txt'] = 'Zakázat IMAP'; diff --git a/interface/web/mail/lib/lang/de_mail_user.lng b/interface/web/mail/lib/lang/de_mail_user.lng index b60a756b09..0eb5a3e9ad 100644 --- a/interface/web/mail/lib/lang/de_mail_user.lng +++ b/interface/web/mail/lib/lang/de_mail_user.lng @@ -20,7 +20,7 @@ $wb['postfix_txt'] = 'Aktiviere Empfang'; $wb['greylisting_txt'] = 'Aktiviere Greylisting'; $wb['access_txt'] = 'Aktiviere Zugriff'; $wb['policy_txt'] = 'Spamfilter'; -$wb['no_policy'] = '- nicht aktiviert -'; +$wb['inherit_policy'] = '- Inherit domain setting -'; $wb['limit_mailbox_txt'] = 'Die maximale Anzahl an E-Mailkonten für Ihr Konto wurde erreicht.'; $wb['limit_mailquota_txt'] = 'Der maximale Speicherplatz für Ihr E-Mail Konto wurde erreicht. Der maximal verfügbare Speicher in MB ist'; $wb['disablesmtp_txt'] = 'SMTP (Mailversand) deaktivieren'; diff --git a/interface/web/mail/lib/lang/dk_mail_user.lng b/interface/web/mail/lib/lang/dk_mail_user.lng index fb846da199..b8a641651b 100644 --- a/interface/web/mail/lib/lang/dk_mail_user.lng +++ b/interface/web/mail/lib/lang/dk_mail_user.lng @@ -24,7 +24,7 @@ $wb['maildir_txt'] = 'Mailmappe'; $wb['postfix_txt'] = 'Aktiver modtagelse'; $wb['access_txt'] = 'Aktiver adgang'; $wb['policy_txt'] = 'Spamfilter'; -$wb['no_policy'] = '- ikke aktiveret -'; +$wb['inherit_policy'] = '- Inherit domain setting -'; $wb['limit_mailbox_txt'] = 'Max. antal af mailbokse for din konto er nået.'; $wb['limit_mailquota_txt'] = 'Max. plads for postkasser er nået. Max. tilgængelig plads i MB er'; $wb['disablesmtp_txt'] = 'Deaktiver SMTP (afsending)'; diff --git a/interface/web/mail/lib/lang/el_mail_user.lng b/interface/web/mail/lib/lang/el_mail_user.lng index a097470ad7..381ef2f9ad 100644 --- a/interface/web/mail/lib/lang/el_mail_user.lng +++ b/interface/web/mail/lib/lang/el_mail_user.lng @@ -23,7 +23,7 @@ $wb['postfix_txt'] = 'Ενεργοποίηση Λήψης'; $wb['greylisting_txt'] = 'Enable greylisting'; $wb['access_txt'] = 'Ενεργοποίηση Πρόσβασης'; $wb['policy_txt'] = 'Φίλτρο Spam'; -$wb['no_policy'] = '- ανενεργή -'; +$wb['inherit_policy'] = '- Inherit domain setting -'; $wb['limit_mailbox_txt'] = 'Έχετε φτάσει το μέγιστο πλήθος των θυρίδων για τον λογαριασμό σας.'; $wb['limit_mailquota_txt'] = 'Έχετε φτάσει στο μέγεστο χώρο της θυρίδα σας.Ο μέγιστος διαθέσιμος χώρος σε MB είναι'; $wb['disableimap_txt'] = 'Απενεργοποίηση IMAP'; diff --git a/interface/web/mail/lib/lang/en_mail_user.lng b/interface/web/mail/lib/lang/en_mail_user.lng index 4174081b53..f70140bd4f 100644 --- a/interface/web/mail/lib/lang/en_mail_user.lng +++ b/interface/web/mail/lib/lang/en_mail_user.lng @@ -27,7 +27,7 @@ $wb["postfix_txt"] = 'Enable receiving'; $wb['greylisting_txt'] = 'Enable greylisting'; $wb["access_txt"] = 'Enable access'; $wb["policy_txt"] = 'Spamfilter'; -$wb["no_policy"] = '- not enabled -'; +$wb['inherit_policy'] = '- Inherit domain setting -'; $wb["limit_mailbox_txt"] = 'The max. number of mailboxes for your account is reached.'; $wb["limit_mailquota_txt"] = 'The max space for mailboxes is reached. The max. available space in MB is'; $wb["disablesmtp_txt"] = 'Disable SMTP (sending)'; diff --git a/interface/web/mail/lib/lang/es_mail_user.lng b/interface/web/mail/lib/lang/es_mail_user.lng index 93c2095e1c..cce382fde0 100644 --- a/interface/web/mail/lib/lang/es_mail_user.lng +++ b/interface/web/mail/lib/lang/es_mail_user.lng @@ -44,7 +44,7 @@ $wb['name_optional_txt'] = '(Opcional)'; $wb['name_txt'] = 'Nombre'; $wb['no_backup_txt'] = 'Sin copia de seguridad'; $wb['no_domain_perm'] = 'Usted no tiene permisos para gestionar este dominio.'; -$wb['no_policy'] = '- deshabilitado -'; +$wb['inherit_policy'] = '- Inherit domain setting -'; $wb['now_txt'] = 'Ahora'; $wb['password_match_txt'] = 'Las contraseñas coinciden.'; $wb['password_mismatch_txt'] = 'Las contraseñas no coinciden.'; diff --git a/interface/web/mail/lib/lang/fi_mail_user.lng b/interface/web/mail/lib/lang/fi_mail_user.lng index 8f94f0158f..2ede867053 100644 --- a/interface/web/mail/lib/lang/fi_mail_user.lng +++ b/interface/web/mail/lib/lang/fi_mail_user.lng @@ -18,7 +18,7 @@ $wb['postfix_txt'] = 'Salli vastaanotto'; $wb['greylisting_txt'] = 'Enable greylisting'; $wb['access_txt'] = 'Salli yhteys'; $wb['policy_txt'] = 'Roskapostisuodatin'; -$wb['no_policy'] = '- ei käytössä -'; +$wb['inherit_policy'] = '- Inherit domain setting -'; $wb['limit_mailbox_txt'] = 'Tilisi sallittu postilaatikoiden määrä on ylitetty.'; $wb['limit_mailquota_txt'] = 'Tilisi sallittu postilaatikoiden koko on ylitetty. Vapaa tila megatavuina on'; $wb['disableimap_txt'] = 'Estä IMAP'; diff --git a/interface/web/mail/lib/lang/fr_mail_user.lng b/interface/web/mail/lib/lang/fr_mail_user.lng index bb54c2e0c0..87a1bb9570 100644 --- a/interface/web/mail/lib/lang/fr_mail_user.lng +++ b/interface/web/mail/lib/lang/fr_mail_user.lng @@ -18,7 +18,7 @@ $wb['maildir_txt'] = 'Maildir'; $wb['postfix_txt'] = 'Activer la réception'; $wb['access_txt'] = 'Activer l’accès'; $wb['policy_txt'] = 'Filtre antispam'; -$wb['no_policy'] = '- inactif -'; +$wb['inherit_policy'] = '- Inherit domain setting -'; $wb['limit_mailbox_txt'] = 'Le nombre maximal de boîtes aux lettres pour votre compte est atteint..'; $wb['limit_mailquota_txt'] = 'Lespace maximal pour les boîtes aux lettres est atteint. Lespace maximal disponible est de '; $wb['disableimap_txt'] = 'Désactiver IMAP'; diff --git a/interface/web/mail/lib/lang/hr_mail_user.lng b/interface/web/mail/lib/lang/hr_mail_user.lng index 8dcfe7a6fa..4e48e3a7d7 100644 --- a/interface/web/mail/lib/lang/hr_mail_user.lng +++ b/interface/web/mail/lib/lang/hr_mail_user.lng @@ -23,7 +23,7 @@ $wb['postfix_txt'] = 'Enable Receiving'; $wb['greylisting_txt'] = 'Enable greylisting'; $wb['access_txt'] = 'Enable Access'; $wb['policy_txt'] = 'Spamfilter'; -$wb['no_policy'] = '- not enabled -'; +$wb['inherit_policy'] = '- Inherit domain setting -'; $wb['limit_mailbox_txt'] = 'The max. number of mailboxes for your account is reached.'; $wb['limit_mailquota_txt'] = 'The max space for mailboxes is reached. The max. available space in MB is'; $wb['disableimap_txt'] = 'Disable IMAP'; diff --git a/interface/web/mail/lib/lang/hu_mail_user.lng b/interface/web/mail/lib/lang/hu_mail_user.lng index 43720fbd84..8f7f826c80 100644 --- a/interface/web/mail/lib/lang/hu_mail_user.lng +++ b/interface/web/mail/lib/lang/hu_mail_user.lng @@ -19,7 +19,7 @@ $wb['postfix_txt'] = 'Bejövő engedélyezés'; $wb['greylisting_txt'] = 'Enable greylisting'; $wb['access_txt'] = 'Hozzáférés engelyezés'; $wb['policy_txt'] = 'Spam szűrő'; -$wb['no_policy'] = '- nem engelyézett -'; +$wb['inherit_policy'] = '- Inherit domain setting -'; $wb['limit_mailbox_txt'] = 'Nincs több mailbox lehetőség.'; $wb['limit_mailquota_txt'] = 'Mailbox tárhely elfogyott.'; $wb['disableimap_txt'] = 'IMAP Tiltás'; diff --git a/interface/web/mail/lib/lang/id_mail_user.lng b/interface/web/mail/lib/lang/id_mail_user.lng index ba17e373c7..01bd8f59f4 100644 --- a/interface/web/mail/lib/lang/id_mail_user.lng +++ b/interface/web/mail/lib/lang/id_mail_user.lng @@ -24,7 +24,7 @@ $wb['postfix_txt'] = 'Dapat Menerima'; $wb['greylisting_txt'] = 'Enable greylisting'; $wb['access_txt'] = 'Dapat Mengakses'; $wb['policy_txt'] = 'Spamfilter'; -$wb['no_policy'] = '- tidak diaktifkan -'; +$wb['inherit_policy'] = '- Inherit domain setting -'; $wb['limit_mailbox_txt'] = 'Jumlah maks mailbox untuk akun Anda sudah tercapai.'; $wb['limit_mailquota_txt'] = 'Ruang maks untuk mailbox sudah tercapai. Ruang maks yang tersedia dalam MB adalah'; $wb['disableimap_txt'] = 'Nonaktifkan IMAP'; diff --git a/interface/web/mail/lib/lang/it_mail_user.lng b/interface/web/mail/lib/lang/it_mail_user.lng index e6820a0329..779040835a 100644 --- a/interface/web/mail/lib/lang/it_mail_user.lng +++ b/interface/web/mail/lib/lang/it_mail_user.lng @@ -19,7 +19,7 @@ $wb['maildir_txt'] = 'maildir'; $wb['postfix_txt'] = 'Abilita ricezione'; $wb['access_txt'] = 'Abilita indirizzo'; $wb['policy_txt'] = 'Spamfilter'; -$wb['no_policy'] = '- non abilitato -'; +$wb['inherit_policy'] = '- Inherit domain setting -'; $wb['limit_mailbox_txt'] = 'Hai raggiungo il numero massimo di caselle per il tuo account.'; $wb['limit_mailquota_txt'] = 'Hai raggiunto lo spazio massimo per le tue caselle di posta. Lo spazio massimo in MB è di'; $wb['disableimap_txt'] = 'Disabilita IMAP'; diff --git a/interface/web/mail/lib/lang/ja_mail_user.lng b/interface/web/mail/lib/lang/ja_mail_user.lng index 3cd498f270..17e02481a8 100644 --- a/interface/web/mail/lib/lang/ja_mail_user.lng +++ b/interface/web/mail/lib/lang/ja_mail_user.lng @@ -20,7 +20,7 @@ $wb['postfix_txt'] = 'メールを受信する'; $wb['greylisting_txt'] = 'Enable greylisting'; $wb['access_txt'] = 'アクセスを許可する'; $wb['policy_txt'] = 'スパムフィルター'; -$wb['no_policy'] = '- 利用しない -'; +$wb['inherit_policy'] = '- Inherit domain setting -'; $wb['limit_mailbox_txt'] = 'メールボックスが最大数に達した為、これ以上追加できません。'; $wb['limit_mailquota_txt'] = 'メールボックスが一杯です。 上限（MB）：'; $wb['disableimap_txt'] = 'IMAP を無効にする'; diff --git a/interface/web/mail/lib/lang/nl_mail_user.lng b/interface/web/mail/lib/lang/nl_mail_user.lng index 65d89a32af..620725b3da 100644 --- a/interface/web/mail/lib/lang/nl_mail_user.lng +++ b/interface/web/mail/lib/lang/nl_mail_user.lng @@ -23,7 +23,7 @@ $wb['postfix_txt'] = 'Ontvangen inschakelen'; $wb['greylisting_txt'] = 'Greylisting inschakelen'; $wb['access_txt'] = 'Toegang inschakelen'; $wb['policy_txt'] = 'Spamfilter'; -$wb['no_policy'] = '- niet ingeschakeld -'; +$wb['inherit_policy'] = '- Gebruik domein instelling -'; $wb['limit_mailbox_txt'] = 'Het max. aantal mailboxen voor uw account is bereikt.'; $wb['limit_mailquota_txt'] = 'De max. ruimte voor uw mailboxen is bereikt. De max. beschikbare ruimte in MB is'; $wb['disableimap_txt'] = 'Uitschakelen IMAP'; diff --git a/interface/web/mail/lib/lang/pl_mail_user.lng b/interface/web/mail/lib/lang/pl_mail_user.lng index d090fadb2a..586b823b54 100644 --- a/interface/web/mail/lib/lang/pl_mail_user.lng +++ b/interface/web/mail/lib/lang/pl_mail_user.lng @@ -20,7 +20,7 @@ $wb['postfix_txt'] = 'Zezwól na odbiór poczty'; $wb['greylisting_txt'] = 'Enable greylisting'; $wb['access_txt'] = 'Możliwy dostęp'; $wb['policy_txt'] = 'Filtr spamu'; -$wb['no_policy'] = '- brak polityki -'; +$wb['inherit_policy'] = '- Inherit domain setting -'; $wb['limit_mailbox_txt'] = 'Maksymalna ilość skrzynek pocztowych dla Twojego konta została przekroczona.'; $wb['limit_mailquota_txt'] = 'Maksymalna pojemność skrzynki pocztowej została przekroczona. Maksymalne dostępne miejsce w MB to: '; $wb['disableimap_txt'] = 'Wyłącz IMAP'; diff --git a/interface/web/mail/lib/lang/pt_mail_user.lng b/interface/web/mail/lib/lang/pt_mail_user.lng index aa0e9a0a05..464a7d2de0 100644 --- a/interface/web/mail/lib/lang/pt_mail_user.lng +++ b/interface/web/mail/lib/lang/pt_mail_user.lng @@ -20,7 +20,7 @@ $wb['postfix_txt'] = 'Permitir Recepção'; $wb['greylisting_txt'] = 'Enable greylisting'; $wb['access_txt'] = 'Permitir Acesso'; $wb['policy_txt'] = 'Spamfilter'; -$wb['no_policy'] = '- desactivado -'; +$wb['inherit_policy'] = '- Inherit domain setting -'; $wb['limit_mailbox_txt'] = 'O número máximo de caixas de correio para a conta foi atingido.'; $wb['limit_mailquota_txt'] = 'O espaço em disco disponível para criação de contas foi atingido.'; $wb['disableimap_txt'] = 'Desactivar IMAP'; diff --git a/interface/web/mail/lib/lang/ro_mail_user.lng b/interface/web/mail/lib/lang/ro_mail_user.lng index 3f0f8ec479..4143064581 100644 --- a/interface/web/mail/lib/lang/ro_mail_user.lng +++ b/interface/web/mail/lib/lang/ro_mail_user.lng @@ -20,7 +20,7 @@ $wb['postfix_txt'] = 'Enable Receiving'; $wb['greylisting_txt'] = 'Enable greylisting'; $wb['access_txt'] = 'Enable Access'; $wb['policy_txt'] = 'Spamfilter'; -$wb['no_policy'] = '- not enabled -'; +$wb['inherit_policy'] = '- Inherit domain setting -'; $wb['limit_mailbox_txt'] = 'Numarul maxim de MAILBOX pe contul dumneavoastra a fost atins'; $wb['limit_mailquota_txt'] = 'Spatiul maxim pentru MAILBOX a fost atins.Acesta este '; $wb['disableimap_txt'] = 'Blocheaza IMAP'; diff --git a/interface/web/mail/lib/lang/ru_mail_user.lng b/interface/web/mail/lib/lang/ru_mail_user.lng index 526c976ed5..1bc76633c0 100644 --- a/interface/web/mail/lib/lang/ru_mail_user.lng +++ b/interface/web/mail/lib/lang/ru_mail_user.lng @@ -19,7 +19,7 @@ $wb['postfix_txt'] = 'Разрешить получение'; $wb['greylisting_txt'] = 'Включить серый список (Greylisting)'; $wb['access_txt'] = 'Включить доступ'; $wb['policy_txt'] = 'Спам-фильтр'; -$wb['no_policy'] = '- не включены -'; +$wb['inherit_policy'] = '- Inherit domain setting -'; $wb['limit_mailbox_txt'] = 'Число почтовых ящиков превышено.'; $wb['limit_mailquota_txt'] = 'Место под почтовые ящики превышено. Максимально доступно MB'; $wb['password_strength_txt'] = 'Стойкость пароля'; diff --git a/interface/web/mail/lib/lang/se_mail_user.lng b/interface/web/mail/lib/lang/se_mail_user.lng index a427c50606..7ac9fc62b5 100644 --- a/interface/web/mail/lib/lang/se_mail_user.lng +++ b/interface/web/mail/lib/lang/se_mail_user.lng @@ -20,7 +20,7 @@ $wb['postfix_txt'] = 'Aktivera mottagning'; $wb['greylisting_txt'] = 'Enable greylisting'; $wb['access_txt'] = 'Aktivera åtkomst'; $wb['policy_txt'] = 'Spamfilter'; -$wb['no_policy'] = '- ej aktiverat -'; +$wb['inherit_policy'] = '- Inherit domain setting -'; $wb['limit_mailbox_txt'] = 'The max. number of mailboxes for your account is reached.'; $wb['limit_mailquota_txt'] = 'The max space for mailboxes is reached. The max. available space in MB is'; $wb['disableimap_txt'] = 'Avaktivera IMAP'; diff --git a/interface/web/mail/lib/lang/sk_mail_user.lng b/interface/web/mail/lib/lang/sk_mail_user.lng index 92c6dea578..c936936db2 100644 --- a/interface/web/mail/lib/lang/sk_mail_user.lng +++ b/interface/web/mail/lib/lang/sk_mail_user.lng @@ -20,7 +20,7 @@ $wb['postfix_txt'] = 'Povoliť príjem'; $wb['greylisting_txt'] = 'Enable greylisting'; $wb['access_txt'] = 'Povoliť Prístup'; $wb['policy_txt'] = 'Spamfilter'; -$wb['no_policy'] = '- nepovolená -'; +$wb['inherit_policy'] = '- Inherit domain setting -'; $wb['limit_mailbox_txt'] = 'Max. počet poštových schránok pre váš účet je dosiahnutý.'; $wb['limit_mailquota_txt'] = 'Maximálny priestor pre poštové schránky je dosiahnutý. Max. dostupné miesto v MB je'; $wb['disableimap_txt'] = 'Deaktivovať IMAP'; diff --git a/interface/web/mail/lib/lang/tr_mail_user.lng b/interface/web/mail/lib/lang/tr_mail_user.lng index 99e9860396..4b7f493987 100644 --- a/interface/web/mail/lib/lang/tr_mail_user.lng +++ b/interface/web/mail/lib/lang/tr_mail_user.lng @@ -27,7 +27,7 @@ $wb['postfix_txt'] = 'Alım Etkin'; $wb['greylisting_txt'] = 'Gri Liste Kullanılsın'; $wb['access_txt'] = 'Erişim Etkin'; $wb['policy_txt'] = 'Önemsiz İleti Süzgeci'; -$wb['no_policy'] = '- devre dışı -'; +$wb['inherit_policy'] = '- Inherit domain setting -'; $wb['limit_mailbox_txt'] = 'Hesabınıza ekleyebileceğiniz en fazla e-posta kutusu sayısına ulaştınız.'; $wb['limit_mailquota_txt'] = 'E-posta kutularınız için kullanabileceğiniz en fazla boyuta ulaştınız. Kullanılabilecek alan MB:'; $wb['disablesmtp_txt'] = 'SMTP Kullanılmasın (gönderim)'; diff --git a/interface/web/mail/mail_user_edit.php b/interface/web/mail/mail_user_edit.php index d291367d11..00c70b021f 100644 --- a/interface/web/mail/mail_user_edit.php +++ b/interface/web/mail/mail_user_edit.php @@ -99,7 +99,7 @@ class page_action extends tform_actions { if (isset($_POST['policy'])) $tmp_user['policy_id'] = intval($_POST['policy']); $sql = "SELECT id, policy_name FROM spamfilter_policy WHERE ".$app->tform->getAuthSQL('r') . " ORDER BY policy_name"; $policys = $app->db->queryAllRecords($sql); - $policy_select = ""; + $policy_select = ""; if(is_array($policys)) { foreach( $policys as $p) { $selected = ($p["id"] == $tmp_user["policy_id"])?'SELECTED':''; -- GitLab From 28781ccfee0b8f7c02547c4c87b668f3a1e7b4a8 Mon Sep 17 00:00:00 2001 From: thom Date: Sat, 13 Jun 2020 02:19:55 +0200 Subject: [PATCH 2/4] Add a direct domain add button (4304) --- interface/web/client/lib/lang/ar.lng | 1 + interface/web/client/lib/lang/bg.lng | 1 + interface/web/client/lib/lang/br.lng | 1 + interface/web/client/lib/lang/ca.lng | 1 + interface/web/client/lib/lang/cz.lng | 1 + interface/web/client/lib/lang/de.lng | 1 + interface/web/client/lib/lang/dk.lng | 1 + interface/web/client/lib/lang/el.lng | 1 + interface/web/client/lib/lang/en.lng | 3 ++- interface/web/client/lib/lang/es.lng | 3 ++- interface/web/client/lib/lang/fi.lng | 1 + interface/web/client/lib/lang/fr.lng | 1 + interface/web/client/lib/lang/hr.lng | 1 + interface/web/client/lib/lang/hu.lng | 1 + interface/web/client/lib/lang/id.lng | 1 + interface/web/client/lib/lang/it.lng | 1 + interface/web/client/lib/lang/ja.lng | 1 + interface/web/client/lib/lang/nl.lng | 1 + interface/web/client/lib/lang/nl_domain_list.lng | 2 +- interface/web/client/lib/lang/pl.lng | 1 + interface/web/client/lib/lang/pt.lng | 1 + interface/web/client/lib/lang/ro.lng | 1 + interface/web/client/lib/lang/ru.lng | 1 + interface/web/client/lib/lang/se.lng | 1 + interface/web/client/lib/lang/sk.lng | 1 + interface/web/client/lib/lang/tr.lng | 1 + interface/web/client/lib/module.conf.php | 4 ++++ 27 files changed, 32 insertions(+), 3 deletions(-) diff --git a/interface/web/client/lib/lang/ar.lng b/interface/web/client/lib/lang/ar.lng index 245991ff9d..f129f4273f 100644 --- a/interface/web/client/lib/lang/ar.lng +++ b/interface/web/client/lib/lang/ar.lng @@ -17,6 +17,7 @@ $wb['Messaging'] = 'Messaging'; $wb['Send email'] = 'Send Email'; $wb['Edit Client Circle'] = 'Edit Client Circle'; $wb['Domains'] = 'Domains'; +$wb['Add Domain'] = 'Add Domain'; $wb['domain_txt'] = 'Domain'; $wb['client_txt'] = 'Client'; $wb['error_domain_in mailuse'] = 'This domain cannot be deleted, because it is in use as mail-domain'; diff --git a/interface/web/client/lib/lang/bg.lng b/interface/web/client/lib/lang/bg.lng index c18e2e8fbd..e23521e598 100644 --- a/interface/web/client/lib/lang/bg.lng +++ b/interface/web/client/lib/lang/bg.lng @@ -17,6 +17,7 @@ $wb['Messaging'] = 'Messaging'; $wb['Send email'] = 'Send Email'; $wb['Edit Client Circle'] = 'Edit Client Circle'; $wb['Domains'] = 'Domains'; +$wb['Add Domain'] = 'Add Domain'; $wb['domain_txt'] = 'Domain'; $wb['client_txt'] = 'Client'; $wb['error_domain_in mailuse'] = 'This domain cannot be deleted, because it is in use as mail-domain'; diff --git a/interface/web/client/lib/lang/br.lng b/interface/web/client/lib/lang/br.lng index 538a3e2e85..b65fba3044 100644 --- a/interface/web/client/lib/lang/br.lng +++ b/interface/web/client/lib/lang/br.lng @@ -17,6 +17,7 @@ $wb['Messaging'] = 'Mensagens'; $wb['Send email'] = 'Enviar e-mail'; $wb['Edit Client Circle'] = 'Editar círculo de clientes'; $wb['Domains'] = 'Domínios'; +$wb['Add Domain'] = 'Add Domain'; $wb['domain_txt'] = 'Domínio'; $wb['client_txt'] = 'Cliente'; $wb['error_domain_in dnsuse'] = 'Este domínio não pode ser removido pois é utilizado em uma zona dns.'; diff --git a/interface/web/client/lib/lang/ca.lng b/interface/web/client/lib/lang/ca.lng index 730bd2de99..c51dd2e839 100644 --- a/interface/web/client/lib/lang/ca.lng +++ b/interface/web/client/lib/lang/ca.lng @@ -14,6 +14,7 @@ $wb['delete_additional_template_txt'] = 'Supprimer un modèle'; $wb['Messaging'] = 'Messagerie'; $wb['Edit Client Circle'] = 'Editer les groupes clients'; $wb['Domains'] = 'Domaines'; +$wb['Add Domain'] = 'Add Domain'; $wb['domain_txt'] = 'Domaine'; $wb['client_txt'] = 'Client'; $wb['error_domain_in mailuse'] = 'Ce domaine ne peut pas être supprimé, il est utilisé par un compte courriel'; diff --git a/interface/web/client/lib/lang/cz.lng b/interface/web/client/lib/lang/cz.lng index 447810f940..c8c8f50074 100644 --- a/interface/web/client/lib/lang/cz.lng +++ b/interface/web/client/lib/lang/cz.lng @@ -17,6 +17,7 @@ $wb['Messaging'] = 'Odesílání zpráv'; $wb['Send email'] = 'Odeslat e-mail'; $wb['Edit Client Circle'] = 'Upravit skupinu klientů'; $wb['Domains'] = 'Domény'; +$wb['Add Domain'] = 'Add Domain'; $wb['domain_txt'] = 'Doména'; $wb['client_txt'] = 'Klient'; $wb['error_domain_in mailuse'] = 'Tato doména nelze odstranit, protože je v používána jako poštovní doména'; diff --git a/interface/web/client/lib/lang/de.lng b/interface/web/client/lib/lang/de.lng index 87b85eed71..b55397999a 100644 --- a/interface/web/client/lib/lang/de.lng +++ b/interface/web/client/lib/lang/de.lng @@ -17,6 +17,7 @@ $wb['Messaging'] = 'Benachrichtigungen'; $wb['Send email'] = 'E-Mail versenden'; $wb['Edit Client Circle'] = 'Kundenkreis bearbeiten'; $wb['Domains'] = 'Domains'; +$wb['Add Domain'] = 'Add Domain'; $wb['domain_txt'] = 'Domain'; $wb['client_txt'] = 'Kunde'; $wb['error_domain_in mailuse'] = 'Diese Domain kann nicht gelöscht werden, weil sie als E-Mail Domain verwendet wird'; diff --git a/interface/web/client/lib/lang/dk.lng b/interface/web/client/lib/lang/dk.lng index 0d498a483c..920b3f8805 100644 --- a/interface/web/client/lib/lang/dk.lng +++ b/interface/web/client/lib/lang/dk.lng @@ -17,6 +17,7 @@ $wb['Messaging'] = 'Meddelelser'; $wb['Send email'] = 'Send E-mail'; $wb['Edit Client Circle'] = 'Rediger Kunde Cirkel'; $wb['Domains'] = 'Domæner'; +$wb['Add Domain'] = 'Add Domain'; $wb['domain_txt'] = 'Domæne'; $wb['client_txt'] = 'Kunde'; $wb['error_domain_in mailuse'] = 'Dette domæne kan ikke slettes, da det er i brug som mail-domæne'; diff --git a/interface/web/client/lib/lang/el.lng b/interface/web/client/lib/lang/el.lng index 8c7463d61c..992bfdcd1c 100644 --- a/interface/web/client/lib/lang/el.lng +++ b/interface/web/client/lib/lang/el.lng @@ -15,6 +15,7 @@ $wb['Messaging'] = 'Messaging'; $wb['Send email'] = 'Send Email'; $wb['Edit Client Circle'] = 'Edit Client Circle'; $wb['Domains'] = 'Domains'; +$wb['Add Domain'] = 'Add Domain'; $wb['domain_txt'] = 'Domain'; $wb['client_txt'] = 'Client'; $wb['error_domain_in mailuse'] = 'This domain cannot be deleted, because it is in use as mail-domain'; diff --git a/interface/web/client/lib/lang/en.lng b/interface/web/client/lib/lang/en.lng index 743516c96c..a2004196e2 100644 --- a/interface/web/client/lib/lang/en.lng +++ b/interface/web/client/lib/lang/en.lng @@ -17,6 +17,7 @@ $wb['Messaging'] = 'Messaging'; $wb['Send email'] = 'Send Email'; $wb['Edit Client Circle'] = 'Edit Client Circle'; $wb['Domains'] = 'Domains'; +$wb['Add Domain'] = 'Add Domain'; $wb['domain_txt'] = 'Domain'; $wb['client_txt'] = 'Client'; $wb['error_domain_in dnsuse'] = 'This domain cannot be deleted, because it is in use as dns zone'; @@ -27,4 +28,4 @@ $wb['error_client_can_not_add_domain'] = 'You cannot add a new domain'; $wb['domain_txt'] = 'Domain'; $wb['error_client_group_id_empty'] = 'You have to select a customer
'; $wb['Email-Templates'] = 'Email-Templates'; -?> \ No newline at end of file +?> diff --git a/interface/web/client/lib/lang/es.lng b/interface/web/client/lib/lang/es.lng index 9b8b2a3edb..233b58b7ca 100644 --- a/interface/web/client/lib/lang/es.lng +++ b/interface/web/client/lib/lang/es.lng @@ -25,5 +25,6 @@ $wb['Messaging'] = 'Mensajería'; $wb['Resellers'] = 'Revendedores'; $wb['Send email'] = 'Enviar correo'; $wb['Templates'] = 'Plantillas'; -$wb['Email-Templates'] = 'Email-Templates'; +$wb['Add Domain'] = 'Add Domain'; +$wb['domain_txt'] = '] = 'Email-Templates'; ?> diff --git a/interface/web/client/lib/lang/fi.lng b/interface/web/client/lib/lang/fi.lng index 52dba3949f..812ff1860f 100644 --- a/interface/web/client/lib/lang/fi.lng +++ b/interface/web/client/lib/lang/fi.lng @@ -17,6 +17,7 @@ $wb['Messaging'] = 'Messaging'; $wb['Send email'] = 'Send Email'; $wb['Edit Client Circle'] = 'Edit Client Circle'; $wb['Domains'] = 'Domains'; +$wb['Add Domain'] = 'Add Domain'; $wb['domain_txt'] = 'Domain'; $wb['client_txt'] = 'Client'; $wb['error_domain_in mailuse'] = 'This domain cannot be deleted, because it is in use as mail-domain'; diff --git a/interface/web/client/lib/lang/fr.lng b/interface/web/client/lib/lang/fr.lng index 4538bfb0db..d4efa24b7a 100644 --- a/interface/web/client/lib/lang/fr.lng +++ b/interface/web/client/lib/lang/fr.lng @@ -14,6 +14,7 @@ $wb['delete_additional_template_txt'] = 'Supprimer un modèle'; $wb['Messaging'] = 'Messagerie'; $wb['Edit Client Circle'] = 'Modifier les groupes clients'; $wb['Domains'] = 'Domaines'; +$wb['Add Domain'] = 'Add Domain'; $wb['domain_txt'] = 'Domaine'; $wb['client_txt'] = 'Client'; $wb['error_domain_in mailuse'] = 'Ce domaine ne peut pas être supprimé, il est utilisé par un compte e-mail'; diff --git a/interface/web/client/lib/lang/hr.lng b/interface/web/client/lib/lang/hr.lng index 48c78e2bf1..a9e293840c 100644 --- a/interface/web/client/lib/lang/hr.lng +++ b/interface/web/client/lib/lang/hr.lng @@ -16,6 +16,7 @@ $wb['Messaging'] = 'Slanje poruka'; $wb['Send email'] = 'Pošalji email'; $wb['Edit Client Circle'] = 'Promijeni krug klijenata'; $wb['Domains'] = 'Domene'; +$wb['Add Domain'] = 'Add Domain'; $wb['domain_txt'] = 'Domena'; $wb['client_txt'] = 'Klijent'; $wb['error_domain_in mailuse'] = 'Ova domena ne može biti obrisana jer se koristi kao mail domena'; diff --git a/interface/web/client/lib/lang/hu.lng b/interface/web/client/lib/lang/hu.lng index 6b988dcee2..5e67398550 100644 --- a/interface/web/client/lib/lang/hu.lng +++ b/interface/web/client/lib/lang/hu.lng @@ -17,6 +17,7 @@ $wb['Messaging'] = 'Messaging'; $wb['Send email'] = 'Send Email'; $wb['Edit Client Circle'] = 'Edit Client Circle'; $wb['Domains'] = 'Domains'; +$wb['Add Domain'] = 'Add Domain'; $wb['domain_txt'] = 'Domain'; $wb['client_txt'] = 'Client'; $wb['error_domain_in mailuse'] = 'This domain cannot be deleted, because it is in use as mail-domain'; diff --git a/interface/web/client/lib/lang/id.lng b/interface/web/client/lib/lang/id.lng index a393cb7747..6fe64545f4 100644 --- a/interface/web/client/lib/lang/id.lng +++ b/interface/web/client/lib/lang/id.lng @@ -17,6 +17,7 @@ $wb['Messaging'] = 'Messaging'; $wb['Send email'] = 'Send Email'; $wb['Edit Client Circle'] = 'Edit Client Circle'; $wb['Domains'] = 'Domains'; +$wb['Add Domain'] = 'Add Domain'; $wb['domain_txt'] = 'Domain'; $wb['client_txt'] = 'Client'; $wb['error_domain_in mailuse'] = 'This domain cannot be deleted, because it is in use as mail-domain'; diff --git a/interface/web/client/lib/lang/it.lng b/interface/web/client/lib/lang/it.lng index ff740790b0..257dca805d 100644 --- a/interface/web/client/lib/lang/it.lng +++ b/interface/web/client/lib/lang/it.lng @@ -15,6 +15,7 @@ $wb['Messaging'] = 'Messaging'; $wb['Send email'] = 'Send Email'; $wb['Edit Client Circle'] = 'Edit Client Circle'; $wb['Domains'] = 'Domains'; +$wb['Add Domain'] = 'Add Domain'; $wb['domain_txt'] = 'Dominio'; $wb['client_txt'] = 'Cliente'; $wb['error_domain_in mailuse'] = 'This domain cannot be deleted, because it is in use as mail-domain'; diff --git a/interface/web/client/lib/lang/ja.lng b/interface/web/client/lib/lang/ja.lng index c5ce289f70..b34cf49559 100644 --- a/interface/web/client/lib/lang/ja.lng +++ b/interface/web/client/lib/lang/ja.lng @@ -17,6 +17,7 @@ $wb['Messaging'] = 'Messaging'; $wb['Send email'] = 'Send Email'; $wb['Edit Client Circle'] = 'Edit Client Circle'; $wb['Domains'] = 'Domains'; +$wb['Add Domain'] = 'Add Domain'; $wb['domain_txt'] = 'Domain'; $wb['client_txt'] = 'Client'; $wb['error_domain_in mailuse'] = 'This domain cannot be deleted, because it is in use as mail-domain'; diff --git a/interface/web/client/lib/lang/nl.lng b/interface/web/client/lib/lang/nl.lng index cf2307e6aa..dab8ba3c3c 100644 --- a/interface/web/client/lib/lang/nl.lng +++ b/interface/web/client/lib/lang/nl.lng @@ -17,6 +17,7 @@ $wb['Messaging'] = 'Berichten'; $wb['Send email'] = 'Verstuur e-mail'; $wb['Edit Client Circle'] = 'Klanten collectie bewerken'; $wb['Domains'] = 'Domeinen'; +$wb['Add Domain'] = 'Domein toevoegen'; $wb['domain_txt'] = 'Domein'; $wb['client_txt'] = 'Klant'; $wb['error_domain_in mailuse'] = 'This domain cannot be deleted, because it is in use as mail-domain'; diff --git a/interface/web/client/lib/lang/nl_domain_list.lng b/interface/web/client/lib/lang/nl_domain_list.lng index 130345f388..802917f923 100644 --- a/interface/web/client/lib/lang/nl_domain_list.lng +++ b/interface/web/client/lib/lang/nl_domain_list.lng @@ -1,6 +1,6 @@ diff --git a/interface/web/client/lib/lang/pl.lng b/interface/web/client/lib/lang/pl.lng index ca1563e8b8..8c4061a795 100644 --- a/interface/web/client/lib/lang/pl.lng +++ b/interface/web/client/lib/lang/pl.lng @@ -17,6 +17,7 @@ $wb['Messaging'] = 'Wiadomości dla klientów'; $wb['Send email'] = 'Wyślij email'; $wb['Edit Client Circle'] = 'Edytuj grupy klientów'; $wb['Domains'] = 'Domeny'; +$wb['Add Domain'] = 'Add Domain'; $wb['domain_txt'] = 'Domena'; $wb['client_txt'] = 'Klient'; $wb['error_domain_in mailuse'] = 'Ta domena nie może zostać usunięta ponieważ jest używana jako domena dla poczty email.'; diff --git a/interface/web/client/lib/lang/pt.lng b/interface/web/client/lib/lang/pt.lng index 1be427e820..1f837aa963 100644 --- a/interface/web/client/lib/lang/pt.lng +++ b/interface/web/client/lib/lang/pt.lng @@ -17,6 +17,7 @@ $wb['Messaging'] = 'Messaging'; $wb['Send email'] = 'Send Email'; $wb['Edit Client Circle'] = 'Edit Client Circle'; $wb['Domains'] = 'Domains'; +$wb['Add Domain'] = 'Add Domain'; $wb['domain_txt'] = 'Domain'; $wb['client_txt'] = 'Client'; $wb['error_domain_in mailuse'] = 'This domain cannot be deleted, because it is in use as mail-domain'; diff --git a/interface/web/client/lib/lang/ro.lng b/interface/web/client/lib/lang/ro.lng index 245991ff9d..f129f4273f 100644 --- a/interface/web/client/lib/lang/ro.lng +++ b/interface/web/client/lib/lang/ro.lng @@ -17,6 +17,7 @@ $wb['Messaging'] = 'Messaging'; $wb['Send email'] = 'Send Email'; $wb['Edit Client Circle'] = 'Edit Client Circle'; $wb['Domains'] = 'Domains'; +$wb['Add Domain'] = 'Add Domain'; $wb['domain_txt'] = 'Domain'; $wb['client_txt'] = 'Client'; $wb['error_domain_in mailuse'] = 'This domain cannot be deleted, because it is in use as mail-domain'; diff --git a/interface/web/client/lib/lang/ru.lng b/interface/web/client/lib/lang/ru.lng index c8558a3982..2dabf4c6f3 100644 --- a/interface/web/client/lib/lang/ru.lng +++ b/interface/web/client/lib/lang/ru.lng @@ -17,6 +17,7 @@ $wb['Messaging'] = 'Обмен сообщениями'; $wb['Send email'] = 'Отправить почту'; $wb['Edit Client Circle'] = 'Изменить клиента Группы'; $wb['Domains'] = 'Домены'; +$wb['Add Domain'] = 'Add Domain'; $wb['domain_txt'] = 'Домен'; $wb['client_txt'] = 'Клиент'; $wb['error_domain_in mailuse'] = 'Этот домен не может быть удален, так как он используется в качестве почтового домена.'; diff --git a/interface/web/client/lib/lang/se.lng b/interface/web/client/lib/lang/se.lng index 3845b9c57a..adceb746d6 100644 --- a/interface/web/client/lib/lang/se.lng +++ b/interface/web/client/lib/lang/se.lng @@ -17,6 +17,7 @@ $wb['Messaging'] = 'Meddelanden'; $wb['Send email'] = 'Skicka epost'; $wb['Edit Client Circle'] = 'Redigera kundcirkel'; $wb['Domains'] = 'Domäner'; +$wb['Add Domain'] = 'Add Domain'; $wb['domain_txt'] = 'Domän'; $wb['client_txt'] = 'Kund'; $wb['error_domain_in mailuse'] = 'Den här domänen kan inte tas bort då den används som epostdomän'; diff --git a/interface/web/client/lib/lang/sk.lng b/interface/web/client/lib/lang/sk.lng index f3bfd3e2f6..7058583a32 100644 --- a/interface/web/client/lib/lang/sk.lng +++ b/interface/web/client/lib/lang/sk.lng @@ -17,6 +17,7 @@ $wb['Messaging'] = 'Messaging'; $wb['Send email'] = 'Send Email'; $wb['Edit Client Circle'] = 'Edit Client Circle'; $wb['Domains'] = 'Domains'; +$wb['Add Domain'] = 'Add Domain'; $wb['domain_txt'] = 'Domain'; $wb['client_txt'] = 'Client'; $wb['error_domain_in mailuse'] = 'This domain cannot be deleted, because it is in use as mail-domain'; diff --git a/interface/web/client/lib/lang/tr.lng b/interface/web/client/lib/lang/tr.lng index cc2e8aa022..6f5f55e702 100644 --- a/interface/web/client/lib/lang/tr.lng +++ b/interface/web/client/lib/lang/tr.lng @@ -17,6 +17,7 @@ $wb['Messaging'] = 'İletişim'; $wb['Send email'] = 'E-posta Gönderimi'; $wb['Edit Client Circle'] = 'Müşteri Grubu Düzenleme'; $wb['Domains'] = 'Etki Alanları'; +$wb['Add Domain'] = 'Add Domain'; $wb['domain_txt'] = 'Etki Alanı'; $wb['client_txt'] = 'Müşteri'; $wb['error_domain_in dnsuse'] = 'Bu etki alanı birincil DNS bölgesi olarak kullanıldığından silinemez'; diff --git a/interface/web/client/lib/module.conf.php b/interface/web/client/lib/module.conf.php index 2603550c9b..2203571381 100644 --- a/interface/web/client/lib/module.conf.php +++ b/interface/web/client/lib/module.conf.php @@ -87,6 +87,10 @@ if ($settings['use_domain_module'] == 'y') { 'target' => 'content', 'link' => 'client/domain_list.php'); + $items[] = array( 'title' => 'Add Domain', + 'target' => 'content', + 'link' => 'client/domain_edit.php'); + $module['nav'][] = array( 'title' => 'Domains', 'open' => 1, 'items' => $items); -- GitLab From 41364d2f28f11df3098d2f569f7f7bda5e8fa69f Mon Sep 17 00:00:00 2001 From: thom Date: Mon, 15 Jun 2020 14:26:56 +0200 Subject: [PATCH 3/4] Fix major typo --- interface/web/client/lib/lang/es.lng | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/interface/web/client/lib/lang/es.lng b/interface/web/client/lib/lang/es.lng index 233b58b7ca..9dc7ad813f 100644 --- a/interface/web/client/lib/lang/es.lng +++ b/interface/web/client/lib/lang/es.lng @@ -26,5 +26,5 @@ $wb['Resellers'] = 'Revendedores'; $wb['Send email'] = 'Enviar correo'; $wb['Templates'] = 'Plantillas'; $wb['Add Domain'] = 'Add Domain'; -$wb['domain_txt'] = '] = 'Email-Templates'; +$wb['domain_txt'] = 'Email-Templates'; ?> -- GitLab From 10c55a8c904f932aea657a9a2dd5558548fdc13e Mon Sep 17 00:00:00 2001 From: Thom Pol Date: Mon, 15 Jun 2020 14:38:26 +0200 Subject: [PATCH 4/4] Revert "Merge branch 'inherit-spampolicy' of git.ispconfig.org:thom/ispconfig3 into add-domain-button" This reverts commit a2cf4b73057674533f7e1fcf52e46a98b2cfb1bb --- interface/web/mail/lib/lang/ar_mail_user.lng | 2 +- interface/web/mail/lib/lang/bg_mail_user.lng | 2 +- interface/web/mail/lib/lang/br_mail_user.lng | 2 +- interface/web/mail/lib/lang/ca_mail_user.lng | 2 +- interface/web/mail/lib/lang/cz_mail_user.lng | 2 +- interface/web/mail/lib/lang/de_mail_user.lng | 2 +- interface/web/mail/lib/lang/dk_mail_user.lng | 2 +- interface/web/mail/lib/lang/el_mail_user.lng | 2 +- interface/web/mail/lib/lang/en_mail_user.lng | 2 +- interface/web/mail/lib/lang/es_mail_user.lng | 2 +- interface/web/mail/lib/lang/fi_mail_user.lng | 2 +- interface/web/mail/lib/lang/fr_mail_user.lng | 2 +- interface/web/mail/lib/lang/hr_mail_user.lng | 2 +- interface/web/mail/lib/lang/hu_mail_user.lng | 2 +- interface/web/mail/lib/lang/id_mail_user.lng | 2 +- interface/web/mail/lib/lang/it_mail_user.lng | 2 +- interface/web/mail/lib/lang/ja_mail_user.lng | 2 +- interface/web/mail/lib/lang/nl_mail_user.lng | 2 +- interface/web/mail/lib/lang/pl_mail_user.lng | 2 +- interface/web/mail/lib/lang/pt_mail_user.lng | 2 +- interface/web/mail/lib/lang/ro_mail_user.lng | 2 +- interface/web/mail/lib/lang/ru_mail_user.lng | 2 +- interface/web/mail/lib/lang/se_mail_user.lng | 2 +- interface/web/mail/lib/lang/sk_mail_user.lng | 2 +- interface/web/mail/lib/lang/tr_mail_user.lng | 2 +- interface/web/mail/mail_user_edit.php | 2 +- 26 files changed, 26 insertions(+), 26 deletions(-) diff --git a/interface/web/mail/lib/lang/ar_mail_user.lng b/interface/web/mail/lib/lang/ar_mail_user.lng index 9d4828b557..a67a83c07a 100644 --- a/interface/web/mail/lib/lang/ar_mail_user.lng +++ b/interface/web/mail/lib/lang/ar_mail_user.lng @@ -23,7 +23,7 @@ $wb['postfix_txt'] = 'Enable Receiving'; $wb['greylisting_txt'] = 'Enable greylisting'; $wb['access_txt'] = 'Enable Access'; $wb['policy_txt'] = 'Spamfilter'; -$wb['inherit_policy'] = '- Inherit domain setting -'; +$wb['no_policy'] = '- not enabled -'; $wb['limit_mailbox_txt'] = 'The max. number of mailboxes for your account is reached.'; $wb['limit_mailquota_txt'] = 'The max space for mailboxes is reached. The max. available space in MB is'; $wb['disableimap_txt'] = 'Disable IMAP'; diff --git a/interface/web/mail/lib/lang/bg_mail_user.lng b/interface/web/mail/lib/lang/bg_mail_user.lng index 0901e0a0fd..3b9a27390e 100644 --- a/interface/web/mail/lib/lang/bg_mail_user.lng +++ b/interface/web/mail/lib/lang/bg_mail_user.lng @@ -19,7 +19,7 @@ $wb['postfix_txt'] = 'Разреши получаване'; $wb['greylisting_txt'] = 'Enable greylisting'; $wb['access_txt'] = 'Разреши достъп'; $wb['policy_txt'] = 'Спам филтър'; -$wb['inherit_policy'] = '- Inherit domain setting -'; +$wb['no_policy'] = '- забранен -'; $wb['limit_mailbox_txt'] = 'Достигнат е максималният брой на пощенските кутии за твоят профил.'; $wb['limit_mailquota_txt'] = 'Максималното отделено място за твоята кутия е достигнато. Максималното позволено място в МБ е '; $wb['disableimap_txt'] = 'Забрани IMAP'; diff --git a/interface/web/mail/lib/lang/br_mail_user.lng b/interface/web/mail/lib/lang/br_mail_user.lng index 2abe1931f6..2aca5c3736 100644 --- a/interface/web/mail/lib/lang/br_mail_user.lng +++ b/interface/web/mail/lib/lang/br_mail_user.lng @@ -27,7 +27,7 @@ $wb['postfix_txt'] = 'Habilitar recebimento'; $wb['greylisting_txt'] = 'Habilitar greylist'; $wb['access_txt'] = 'Habilitar acesso'; $wb['policy_txt'] = 'Filtros anti-spam'; -$wb['inherit_policy'] = '- Inherit domain setting -'; +$wb['no_policy'] = '-desabilitado-'; $wb['limit_mailbox_txt'] = 'O limite de contas de e-mail para esta conta foi alcançado.'; $wb['limit_mailquota_txt'] = 'O limite de tamanho para as contas de e-mails foi alcançado. O espaço disponível em MB é'; $wb['disablesmtp_txt'] = 'Desabilitar SMTP (envio)'; diff --git a/interface/web/mail/lib/lang/ca_mail_user.lng b/interface/web/mail/lib/lang/ca_mail_user.lng index 08c9bc78ec..e380b55d2d 100644 --- a/interface/web/mail/lib/lang/ca_mail_user.lng +++ b/interface/web/mail/lib/lang/ca_mail_user.lng @@ -18,7 +18,7 @@ $wb['maildir_txt'] = 'Maildir'; $wb['postfix_txt'] = 'Activer la réception'; $wb['access_txt'] = 'Activer l\'accès'; $wb['policy_txt'] = 'Filtre antispam'; -$wb['inherit_policy'] = '- Inherit domain setting -'; +$wb['no_policy'] = '- inactif -'; $wb['limit_mailbox_txt'] = 'Le nombre maximal de boites courriel pour votre compte est atteint..'; $wb['limit_mailquota_txt'] = 'Lespace maximal pour les boites courriel est atteint. Lespace maximal disponible est de '; $wb['disableimap_txt'] = 'Désactiver IMAP'; diff --git a/interface/web/mail/lib/lang/cz_mail_user.lng b/interface/web/mail/lib/lang/cz_mail_user.lng index fb09f0c0a0..1946d4150f 100644 --- a/interface/web/mail/lib/lang/cz_mail_user.lng +++ b/interface/web/mail/lib/lang/cz_mail_user.lng @@ -22,7 +22,7 @@ $wb['maildir_txt'] = 'E-mailový adresář'; $wb['postfix_txt'] = 'Povolit příjem'; $wb['access_txt'] = 'Povolit přístup'; $wb['policy_txt'] = 'Spamový filtr'; -$wb['inherit_policy'] = '- Inherit domain setting -'; +$wb['no_policy'] = '- nepovoleno -'; $wb['limit_mailbox_txt'] = 'Byl dosažen maximální počet mailboxů pro Váš účet.'; $wb['limit_mailquota_txt'] = 'Dosažen maximální prostor pro mailboxy. Max. dostupné místo v MB je'; $wb['disableimap_txt'] = 'Zakázat IMAP'; diff --git a/interface/web/mail/lib/lang/de_mail_user.lng b/interface/web/mail/lib/lang/de_mail_user.lng index e653fbe288..7c1f02cd4f 100644 --- a/interface/web/mail/lib/lang/de_mail_user.lng +++ b/interface/web/mail/lib/lang/de_mail_user.lng @@ -20,7 +20,7 @@ $wb['postfix_txt'] = 'Aktiviere Empfang'; $wb['greylisting_txt'] = 'Aktiviere Greylisting'; $wb['access_txt'] = 'Aktiviere Zugriff'; $wb['policy_txt'] = 'Spamfilter'; -$wb['inherit_policy'] = '- Inherit domain setting -'; +$wb['no_policy'] = '- nicht aktiviert -'; $wb['limit_mailbox_txt'] = 'Die maximale Anzahl an E-Mailkonten für Ihr Konto wurde erreicht.'; $wb['limit_mailquota_txt'] = 'Der maximale Speicherplatz für Ihr E-Mail Konto wurde erreicht. Der maximal verfügbare Speicher in MB ist'; $wb['disablesmtp_txt'] = 'SMTP (Mailversand) deaktivieren'; diff --git a/interface/web/mail/lib/lang/dk_mail_user.lng b/interface/web/mail/lib/lang/dk_mail_user.lng index 34bf076359..8c0957d353 100644 --- a/interface/web/mail/lib/lang/dk_mail_user.lng +++ b/interface/web/mail/lib/lang/dk_mail_user.lng @@ -24,7 +24,7 @@ $wb['maildir_txt'] = 'Mailmappe'; $wb['postfix_txt'] = 'Aktiver modtagelse'; $wb['access_txt'] = 'Aktiver adgang'; $wb['policy_txt'] = 'Spamfilter'; -$wb['inherit_policy'] = '- Inherit domain setting -'; +$wb['no_policy'] = '- ikke aktiveret -'; $wb['limit_mailbox_txt'] = 'Max. antal af mailbokse for din konto er nået.'; $wb['limit_mailquota_txt'] = 'Max. plads for postkasser er nået. Max. tilgængelig plads i MB er'; $wb['disablesmtp_txt'] = 'Deaktiver SMTP (afsending)'; diff --git a/interface/web/mail/lib/lang/el_mail_user.lng b/interface/web/mail/lib/lang/el_mail_user.lng index 76c266d591..f735d6e7b3 100644 --- a/interface/web/mail/lib/lang/el_mail_user.lng +++ b/interface/web/mail/lib/lang/el_mail_user.lng @@ -23,7 +23,7 @@ $wb['postfix_txt'] = 'Ενεργοποίηση Λήψης'; $wb['greylisting_txt'] = 'Enable greylisting'; $wb['access_txt'] = 'Ενεργοποίηση Πρόσβασης'; $wb['policy_txt'] = 'Φίλτρο Spam'; -$wb['inherit_policy'] = '- Inherit domain setting -'; +$wb['no_policy'] = '- ανενεργή -'; $wb['limit_mailbox_txt'] = 'Έχετε φτάσει το μέγιστο πλήθος των θυρίδων για τον λογαριασμό σας.'; $wb['limit_mailquota_txt'] = 'Έχετε φτάσει στο μέγεστο χώρο της θυρίδα σας.Ο μέγιστος διαθέσιμος χώρος σε MB είναι'; $wb['disableimap_txt'] = 'Απενεργοποίηση IMAP'; diff --git a/interface/web/mail/lib/lang/en_mail_user.lng b/interface/web/mail/lib/lang/en_mail_user.lng index 69ac0a00a9..82cab6d70c 100644 --- a/interface/web/mail/lib/lang/en_mail_user.lng +++ b/interface/web/mail/lib/lang/en_mail_user.lng @@ -27,7 +27,7 @@ $wb["postfix_txt"] = 'Enable receiving'; $wb['greylisting_txt'] = 'Enable greylisting'; $wb["access_txt"] = 'Enable access'; $wb["policy_txt"] = 'Spamfilter'; -$wb['inherit_policy'] = '- Inherit domain setting -'; +$wb["no_policy"] = '- not enabled -'; $wb["limit_mailbox_txt"] = 'The max. number of mailboxes for your account is reached.'; $wb["limit_mailquota_txt"] = 'The max space for mailboxes is reached. The max. available space in MB is'; $wb["disablesmtp_txt"] = 'Disable SMTP (sending)'; diff --git a/interface/web/mail/lib/lang/es_mail_user.lng b/interface/web/mail/lib/lang/es_mail_user.lng index be329c304a..418fd2dbfa 100644 --- a/interface/web/mail/lib/lang/es_mail_user.lng +++ b/interface/web/mail/lib/lang/es_mail_user.lng @@ -44,7 +44,7 @@ $wb['name_optional_txt'] = '(Opcional)'; $wb['name_txt'] = 'Nombre'; $wb['no_backup_txt'] = 'Sin copia de seguridad'; $wb['no_domain_perm'] = 'Usted no tiene permisos para gestionar este dominio.'; -$wb['inherit_policy'] = '- Inherit domain setting -'; +$wb['no_policy'] = '- deshabilitado -'; $wb['now_txt'] = 'Ahora'; $wb['password_match_txt'] = 'Las contraseñas coinciden.'; $wb['password_mismatch_txt'] = 'Las contraseñas no coinciden.'; diff --git a/interface/web/mail/lib/lang/fi_mail_user.lng b/interface/web/mail/lib/lang/fi_mail_user.lng index 45ea1d9b8b..a764e95693 100644 --- a/interface/web/mail/lib/lang/fi_mail_user.lng +++ b/interface/web/mail/lib/lang/fi_mail_user.lng @@ -18,7 +18,7 @@ $wb['postfix_txt'] = 'Salli vastaanotto'; $wb['greylisting_txt'] = 'Enable greylisting'; $wb['access_txt'] = 'Salli yhteys'; $wb['policy_txt'] = 'Roskapostisuodatin'; -$wb['inherit_policy'] = '- Inherit domain setting -'; +$wb['no_policy'] = '- ei käytössä -'; $wb['limit_mailbox_txt'] = 'Tilisi sallittu postilaatikoiden määrä on ylitetty.'; $wb['limit_mailquota_txt'] = 'Tilisi sallittu postilaatikoiden koko on ylitetty. Vapaa tila megatavuina on'; $wb['disableimap_txt'] = 'Estä IMAP'; diff --git a/interface/web/mail/lib/lang/fr_mail_user.lng b/interface/web/mail/lib/lang/fr_mail_user.lng index 8df58233a3..732f3d8cb7 100644 --- a/interface/web/mail/lib/lang/fr_mail_user.lng +++ b/interface/web/mail/lib/lang/fr_mail_user.lng @@ -18,7 +18,7 @@ $wb['maildir_txt'] = 'Maildir'; $wb['postfix_txt'] = 'Activer la réception'; $wb['access_txt'] = 'Activer l’accès'; $wb['policy_txt'] = 'Filtre antispam'; -$wb['inherit_policy'] = '- Inherit domain setting -'; +$wb['no_policy'] = '- inactif -'; $wb['limit_mailbox_txt'] = 'Le nombre maximal de boîtes aux lettres pour votre compte est atteint..'; $wb['limit_mailquota_txt'] = 'Lespace maximal pour les boîtes aux lettres est atteint. Lespace maximal disponible est de '; $wb['disableimap_txt'] = 'Désactiver IMAP'; diff --git a/interface/web/mail/lib/lang/hr_mail_user.lng b/interface/web/mail/lib/lang/hr_mail_user.lng index 170aaa6b61..7406e2d656 100644 --- a/interface/web/mail/lib/lang/hr_mail_user.lng +++ b/interface/web/mail/lib/lang/hr_mail_user.lng @@ -23,7 +23,7 @@ $wb['postfix_txt'] = 'Enable Receiving'; $wb['greylisting_txt'] = 'Enable greylisting'; $wb['access_txt'] = 'Enable Access'; $wb['policy_txt'] = 'Spamfilter'; -$wb['inherit_policy'] = '- Inherit domain setting -'; +$wb['no_policy'] = '- not enabled -'; $wb['limit_mailbox_txt'] = 'The max. number of mailboxes for your account is reached.'; $wb['limit_mailquota_txt'] = 'The max space for mailboxes is reached. The max. available space in MB is'; $wb['disableimap_txt'] = 'Disable IMAP'; diff --git a/interface/web/mail/lib/lang/hu_mail_user.lng b/interface/web/mail/lib/lang/hu_mail_user.lng index 65962cd21c..db8edf775e 100644 --- a/interface/web/mail/lib/lang/hu_mail_user.lng +++ b/interface/web/mail/lib/lang/hu_mail_user.lng @@ -19,7 +19,7 @@ $wb['postfix_txt'] = 'Bejövő engedélyezés'; $wb['greylisting_txt'] = 'Enable greylisting'; $wb['access_txt'] = 'Hozzáférés engelyezés'; $wb['policy_txt'] = 'Spam szűrő'; -$wb['inherit_policy'] = '- Inherit domain setting -'; +$wb['no_policy'] = '- nem engelyézett -'; $wb['limit_mailbox_txt'] = 'Nincs több mailbox lehetőség.'; $wb['limit_mailquota_txt'] = 'Mailbox tárhely elfogyott.'; $wb['disableimap_txt'] = 'IMAP Tiltás'; diff --git a/interface/web/mail/lib/lang/id_mail_user.lng b/interface/web/mail/lib/lang/id_mail_user.lng index 3bedbd9b93..670550062c 100644 --- a/interface/web/mail/lib/lang/id_mail_user.lng +++ b/interface/web/mail/lib/lang/id_mail_user.lng @@ -24,7 +24,7 @@ $wb['postfix_txt'] = 'Dapat Menerima'; $wb['greylisting_txt'] = 'Enable greylisting'; $wb['access_txt'] = 'Dapat Mengakses'; $wb['policy_txt'] = 'Spamfilter'; -$wb['inherit_policy'] = '- Inherit domain setting -'; +$wb['no_policy'] = '- tidak diaktifkan -'; $wb['limit_mailbox_txt'] = 'Jumlah maks mailbox untuk akun Anda sudah tercapai.'; $wb['limit_mailquota_txt'] = 'Ruang maks untuk mailbox sudah tercapai. Ruang maks yang tersedia dalam MB adalah'; $wb['disableimap_txt'] = 'Nonaktifkan IMAP'; diff --git a/interface/web/mail/lib/lang/it_mail_user.lng b/interface/web/mail/lib/lang/it_mail_user.lng index a1a0f8cfd5..dad3f69654 100644 --- a/interface/web/mail/lib/lang/it_mail_user.lng +++ b/interface/web/mail/lib/lang/it_mail_user.lng @@ -19,7 +19,7 @@ $wb['maildir_txt'] = 'maildir'; $wb['postfix_txt'] = 'Abilita ricezione'; $wb['access_txt'] = 'Abilita indirizzo'; $wb['policy_txt'] = 'Spamfilter'; -$wb['inherit_policy'] = '- Inherit domain setting -'; +$wb['no_policy'] = '- non abilitato -'; $wb['limit_mailbox_txt'] = 'Hai raggiungo il numero massimo di caselle per il tuo account.'; $wb['limit_mailquota_txt'] = 'Hai raggiunto lo spazio massimo per le tue caselle di posta. Lo spazio massimo in MB è di'; $wb['disableimap_txt'] = 'Disabilita IMAP'; diff --git a/interface/web/mail/lib/lang/ja_mail_user.lng b/interface/web/mail/lib/lang/ja_mail_user.lng index b58b9d13dd..803a278d5b 100644 --- a/interface/web/mail/lib/lang/ja_mail_user.lng +++ b/interface/web/mail/lib/lang/ja_mail_user.lng @@ -20,7 +20,7 @@ $wb['postfix_txt'] = 'メールを受信する'; $wb['greylisting_txt'] = 'Enable greylisting'; $wb['access_txt'] = 'アクセスを許可する'; $wb['policy_txt'] = 'スパムフィルター'; -$wb['inherit_policy'] = '- Inherit domain setting -'; +$wb['no_policy'] = '- 利用しない -'; $wb['limit_mailbox_txt'] = 'メールボックスが最大数に達した為、これ以上追加できません。'; $wb['limit_mailquota_txt'] = 'メールボックスが一杯です。 上限（MB）：'; $wb['disableimap_txt'] = 'IMAP を無効にする'; diff --git a/interface/web/mail/lib/lang/nl_mail_user.lng b/interface/web/mail/lib/lang/nl_mail_user.lng index 9a75a9fd7a..39cd0bd0f0 100644 --- a/interface/web/mail/lib/lang/nl_mail_user.lng +++ b/interface/web/mail/lib/lang/nl_mail_user.lng @@ -23,7 +23,7 @@ $wb['postfix_txt'] = 'Ontvangen inschakelen'; $wb['greylisting_txt'] = 'Greylisting inschakelen'; $wb['access_txt'] = 'Toegang inschakelen'; $wb['policy_txt'] = 'Spamfilter'; -$wb['inherit_policy'] = '- Gebruik domein instelling -'; +$wb['no_policy'] = '- niet ingeschakeld -'; $wb['limit_mailbox_txt'] = 'Het max. aantal mailboxen voor uw account is bereikt.'; $wb['limit_mailquota_txt'] = 'De max. ruimte voor uw mailboxen is bereikt. De max. beschikbare ruimte in MB is'; $wb['disableimap_txt'] = 'Uitschakelen IMAP'; diff --git a/interface/web/mail/lib/lang/pl_mail_user.lng b/interface/web/mail/lib/lang/pl_mail_user.lng index 593f83531e..8a35e7742e 100644 --- a/interface/web/mail/lib/lang/pl_mail_user.lng +++ b/interface/web/mail/lib/lang/pl_mail_user.lng @@ -20,7 +20,7 @@ $wb['postfix_txt'] = 'Zezwól na odbiór poczty'; $wb['greylisting_txt'] = 'Enable greylisting'; $wb['access_txt'] = 'Możliwy dostęp'; $wb['policy_txt'] = 'Filtr spamu'; -$wb['inherit_policy'] = '- Inherit domain setting -'; +$wb['no_policy'] = '- brak polityki -'; $wb['limit_mailbox_txt'] = 'Maksymalna ilość skrzynek pocztowych dla Twojego konta została przekroczona.'; $wb['limit_mailquota_txt'] = 'Maksymalna pojemność skrzynki pocztowej została przekroczona. Maksymalne dostępne miejsce w MB to: '; $wb['disableimap_txt'] = 'Wyłącz IMAP'; diff --git a/interface/web/mail/lib/lang/pt_mail_user.lng b/interface/web/mail/lib/lang/pt_mail_user.lng index 0b7ffe3d37..56a1f16d30 100644 --- a/interface/web/mail/lib/lang/pt_mail_user.lng +++ b/interface/web/mail/lib/lang/pt_mail_user.lng @@ -20,7 +20,7 @@ $wb['postfix_txt'] = 'Permitir Recepção'; $wb['greylisting_txt'] = 'Enable greylisting'; $wb['access_txt'] = 'Permitir Acesso'; $wb['policy_txt'] = 'Spamfilter'; -$wb['inherit_policy'] = '- Inherit domain setting -'; +$wb['no_policy'] = '- desactivado -'; $wb['limit_mailbox_txt'] = 'O número máximo de caixas de correio para a conta foi atingido.'; $wb['limit_mailquota_txt'] = 'O espaço em disco disponível para criação de contas foi atingido.'; $wb['disableimap_txt'] = 'Desactivar IMAP'; diff --git a/interface/web/mail/lib/lang/ro_mail_user.lng b/interface/web/mail/lib/lang/ro_mail_user.lng index 97dfdafd88..ccdcc49fdf 100644 --- a/interface/web/mail/lib/lang/ro_mail_user.lng +++ b/interface/web/mail/lib/lang/ro_mail_user.lng @@ -20,7 +20,7 @@ $wb['postfix_txt'] = 'Enable Receiving'; $wb['greylisting_txt'] = 'Enable greylisting'; $wb['access_txt'] = 'Enable Access'; $wb['policy_txt'] = 'Spamfilter'; -$wb['inherit_policy'] = '- Inherit domain setting -'; +$wb['no_policy'] = '- not enabled -'; $wb['limit_mailbox_txt'] = 'Numarul maxim de MAILBOX pe contul dumneavoastra a fost atins'; $wb['limit_mailquota_txt'] = 'Spatiul maxim pentru MAILBOX a fost atins.Acesta este '; $wb['disableimap_txt'] = 'Blocheaza IMAP'; diff --git a/interface/web/mail/lib/lang/ru_mail_user.lng b/interface/web/mail/lib/lang/ru_mail_user.lng index 07bab6fd4f..fcfadd9db9 100644 --- a/interface/web/mail/lib/lang/ru_mail_user.lng +++ b/interface/web/mail/lib/lang/ru_mail_user.lng @@ -19,7 +19,7 @@ $wb['postfix_txt'] = 'Разрешить получение'; $wb['greylisting_txt'] = 'Включить серый список (Greylisting)'; $wb['access_txt'] = 'Включить доступ'; $wb['policy_txt'] = 'Спам-фильтр'; -$wb['inherit_policy'] = '- Inherit domain setting -'; +$wb['no_policy'] = '- не включены -'; $wb['limit_mailbox_txt'] = 'Число почтовых ящиков превышено.'; $wb['limit_mailquota_txt'] = 'Место под почтовые ящики превышено. Максимально доступно MB'; $wb['password_strength_txt'] = 'Стойкость пароля'; diff --git a/interface/web/mail/lib/lang/se_mail_user.lng b/interface/web/mail/lib/lang/se_mail_user.lng index da0282e118..c081446557 100644 --- a/interface/web/mail/lib/lang/se_mail_user.lng +++ b/interface/web/mail/lib/lang/se_mail_user.lng @@ -20,7 +20,7 @@ $wb['postfix_txt'] = 'Aktivera mottagning'; $wb['greylisting_txt'] = 'Enable greylisting'; $wb['access_txt'] = 'Aktivera åtkomst'; $wb['policy_txt'] = 'Spamfilter'; -$wb['inherit_policy'] = '- Inherit domain setting -'; +$wb['no_policy'] = '- ej aktiverat -'; $wb['limit_mailbox_txt'] = 'The max. number of mailboxes for your account is reached.'; $wb['limit_mailquota_txt'] = 'The max space for mailboxes is reached. The max. available space in MB is'; $wb['disableimap_txt'] = 'Avaktivera IMAP'; diff --git a/interface/web/mail/lib/lang/sk_mail_user.lng b/interface/web/mail/lib/lang/sk_mail_user.lng index d9a68404ae..eb70b8eba9 100644 --- a/interface/web/mail/lib/lang/sk_mail_user.lng +++ b/interface/web/mail/lib/lang/sk_mail_user.lng @@ -20,7 +20,7 @@ $wb['postfix_txt'] = 'Povoliť príjem'; $wb['greylisting_txt'] = 'Enable greylisting'; $wb['access_txt'] = 'Povoliť Prístup'; $wb['policy_txt'] = 'Spamfilter'; -$wb['inherit_policy'] = '- Inherit domain setting -'; +$wb['no_policy'] = '- nepovolená -'; $wb['limit_mailbox_txt'] = 'Max. počet poštových schránok pre váš účet je dosiahnutý.'; $wb['limit_mailquota_txt'] = 'Maximálny priestor pre poštové schránky je dosiahnutý. Max. dostupné miesto v MB je'; $wb['disableimap_txt'] = 'Deaktivovať IMAP'; diff --git a/interface/web/mail/lib/lang/tr_mail_user.lng b/interface/web/mail/lib/lang/tr_mail_user.lng index 9e964e5e8a..c7dec33b99 100644 --- a/interface/web/mail/lib/lang/tr_mail_user.lng +++ b/interface/web/mail/lib/lang/tr_mail_user.lng @@ -27,7 +27,7 @@ $wb['postfix_txt'] = 'Alım Etkin'; $wb['greylisting_txt'] = 'Gri Liste Kullanılsın'; $wb['access_txt'] = 'Erişim Etkin'; $wb['policy_txt'] = 'Önemsiz İleti Süzgeci'; -$wb['inherit_policy'] = '- Inherit domain setting -'; +$wb['no_policy'] = '- devre dışı -'; $wb['limit_mailbox_txt'] = 'Hesabınıza ekleyebileceğiniz en fazla e-posta kutusu sayısına ulaştınız.'; $wb['limit_mailquota_txt'] = 'E-posta kutularınız için kullanabileceğiniz en fazla boyuta ulaştınız. Kullanılabilecek alan MB:'; $wb['disablesmtp_txt'] = 'SMTP Kullanılmasın (gönderim)'; diff --git a/interface/web/mail/mail_user_edit.php b/interface/web/mail/mail_user_edit.php index ac4607e76a..c7f36a89e0 100644 --- a/interface/web/mail/mail_user_edit.php +++ b/interface/web/mail/mail_user_edit.php @@ -99,7 +99,7 @@ class page_action extends tform_actions { if (isset($_POST['policy'])) $tmp_user['policy_id'] = intval($_POST['policy']); $sql = "SELECT id, policy_name FROM spamfilter_policy WHERE ".$app->tform->getAuthSQL('r') . " ORDER BY policy_name"; $policys = $app->db->queryAllRecords($sql); - $policy_select = ""; + $policy_select = ""; if(is_array($policys)) { foreach( $policys as $p) { $selected = ($p["id"] == $tmp_user["policy_id"])?'SELECTED':''; -- GitLab