Commit a2cf4b73 authored by Thom's avatar Thom 🛠

Merge branch 'inherit-spampolicy' of git.ispconfig.org:thom/ispconfig3 into add-domain-button

parents 41364d2f d38cca15
Pipeline #2935 canceled with stage
......@@ -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';
......
......@@ -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';
......
......@@ -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)';
......
......@@ -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';
......
......@@ -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';
......
......@@ -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';
......
......@@ -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)';
......
......@@ -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';
......
......@@ -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)';
......
......@@ -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.';
......
......@@ -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';
......
......@@ -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';
......
......@@ -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';
......
......@@ -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';
......
......@@ -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';
......
......@@ -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';
......
......@@ -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 を無効にする';
......
......@@ -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';
......
......@@ -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';
......
......@@ -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';
......
......@@ -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';
......
......@@ -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'] = 'Стойкость пароля';
......
......@@ -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';
......
......@@ -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';
......
......@@ -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)';
......
......@@ -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 = "<option value='0'>".$app->tform->lng("no_policy")."</option>";
$policy_select = "<option value='0'>".$app->tform->lng("inherit_policy")."</option>";
if(is_array($policys)) {
foreach( $policys as $p) {
$selected = ($p["id"] == $tmp_user["policy_id"])?'SELECTED':'';
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment