From ba21668862afec5541cec8fac0a4e258f0c9b0e2 Mon Sep 17 00:00:00 2001 From: thom Date: Tue, 18 Aug 2020 16:39:30 +0200 Subject: [PATCH 1/8] Add missing strings (Missed in 58708d959ca14762b4280c42348b5f9b85cc809c) --- interface/web/mail/lib/lang/bg_mail_user_filter.lng | 1 + interface/web/mail/lib/lang/br_mail_user_filter.lng | 1 + interface/web/mail/lib/lang/cz_mail_user_filter.lng | 1 + interface/web/mail/lib/lang/de_mail_user_filter.lng | 1 + interface/web/mail/lib/lang/el_mail_user_filter.lng | 1 + interface/web/mail/lib/lang/hr_mail_user_filter.lng | 1 + interface/web/mail/lib/lang/hu_mail_user_filter.lng | 1 + interface/web/mail/lib/lang/it_mail_user_filter.lng | 1 + interface/web/mail/lib/lang/nl_mail_user_filter.lng | 1 + interface/web/mail/lib/lang/pl_mail_user_filter.lng | 1 + interface/web/mail/lib/lang/ru_mail_user_filter.lng | 1 + interface/web/mail/lib/lang/se_mail_user_filter.lng | 1 + interface/web/mail/lib/lang/tr_mail_user_filter.lng | 1 + 13 files changed, 13 insertions(+) diff --git a/interface/web/mail/lib/lang/bg_mail_user_filter.lng b/interface/web/mail/lib/lang/bg_mail_user_filter.lng index 9eb3325c72..6929752c5a 100644 --- a/interface/web/mail/lib/lang/bg_mail_user_filter.lng +++ b/interface/web/mail/lib/lang/bg_mail_user_filter.lng @@ -11,6 +11,7 @@ $wb['limit_mailfilter_txt'] = 'Максималният брой на емайл $wb['subject_txt'] = 'Тема'; $wb['from_txt'] = 'От'; $wb['to_txt'] = 'До'; +$wb['list_id_txt'] = 'List ID'; $wb['contains_txt'] = 'Описание'; $wb['is_txt'] = 'е'; $wb['begins_with_txt'] = 'Начало с'; diff --git a/interface/web/mail/lib/lang/br_mail_user_filter.lng b/interface/web/mail/lib/lang/br_mail_user_filter.lng index 54ae96d692..226b7e2722 100644 --- a/interface/web/mail/lib/lang/br_mail_user_filter.lng +++ b/interface/web/mail/lib/lang/br_mail_user_filter.lng @@ -11,6 +11,7 @@ $wb['limit_mailfilter_txt'] = 'O limite de filtros de e-mail foi alcançado.'; $wb['subject_txt'] = 'Assunto'; $wb['from_txt'] = 'De'; $wb['to_txt'] = 'Para'; +$wb['list_id_txt'] = 'List ID'; $wb['contains_txt'] = 'Contêm'; $wb['is_txt'] = 'é'; $wb['begins_with_txt'] = 'Iniciando com'; diff --git a/interface/web/mail/lib/lang/cz_mail_user_filter.lng b/interface/web/mail/lib/lang/cz_mail_user_filter.lng index 9bd3580635..3f5357f735 100644 --- a/interface/web/mail/lib/lang/cz_mail_user_filter.lng +++ b/interface/web/mail/lib/lang/cz_mail_user_filter.lng @@ -11,6 +11,7 @@ $wb['limit_mailfilter_txt'] = 'Byl dosažen max. počet e-mailový filtrovacích $wb['subject_txt'] = 'Předmět'; $wb['from_txt'] = 'Odesílatel'; $wb['to_txt'] = 'Příjemce (adresát)'; +$wb['list_id_txt'] = 'List ID'; $wb['contains_txt'] = 'Obsahuje'; $wb['is_txt'] = 'Je'; $wb['begins_with_txt'] = 'Začíná na'; diff --git a/interface/web/mail/lib/lang/de_mail_user_filter.lng b/interface/web/mail/lib/lang/de_mail_user_filter.lng index c9fb78fcee..345b9c4fbb 100644 --- a/interface/web/mail/lib/lang/de_mail_user_filter.lng +++ b/interface/web/mail/lib/lang/de_mail_user_filter.lng @@ -11,6 +11,7 @@ $wb['limit_mailfilter_txt'] = 'Die maximale Anzahl an E-Mail Filtern für Ihr Ko $wb['subject_txt'] = 'Betreff'; $wb['from_txt'] = 'Von'; $wb['to_txt'] = 'An'; +$wb['list_id_txt'] = 'List ID'; $wb['contains_txt'] = 'Enthält'; $wb['is_txt'] = 'Ist'; $wb['begins_with_txt'] = 'Beginnt mit'; diff --git a/interface/web/mail/lib/lang/el_mail_user_filter.lng b/interface/web/mail/lib/lang/el_mail_user_filter.lng index f3957144ae..72710a9f7e 100644 --- a/interface/web/mail/lib/lang/el_mail_user_filter.lng +++ b/interface/web/mail/lib/lang/el_mail_user_filter.lng @@ -11,6 +11,7 @@ $wb['limit_mailfilter_txt'] = 'Έχετε φτάσει το μέγιστο πλ $wb['subject_txt'] = 'Θέμα'; $wb['from_txt'] = 'Από'; $wb['to_txt'] = 'Προς'; +$wb['list_id_txt'] = 'List ID'; $wb['contains_txt'] = 'Περιλαμβάνει'; $wb['is_txt'] = 'είναι'; $wb['begins_with_txt'] = 'Ξεκινά με'; diff --git a/interface/web/mail/lib/lang/hr_mail_user_filter.lng b/interface/web/mail/lib/lang/hr_mail_user_filter.lng index 4441ecf5e4..33fd0106a8 100644 --- a/interface/web/mail/lib/lang/hr_mail_user_filter.lng +++ b/interface/web/mail/lib/lang/hr_mail_user_filter.lng @@ -11,6 +11,7 @@ $wb['limit_mailfilter_txt'] = 'Iskorišten je maksimalni broj mail filtera.'; $wb['subject_txt'] = 'Naslov'; $wb['from_txt'] = 'Pošiljatelj'; $wb['to_txt'] = 'Primatelj'; +$wb['list_id_txt'] = 'List ID'; $wb['contains_txt'] = 'Sadrži'; $wb['is_txt'] = 'Is'; $wb['begins_with_txt'] = 'Počinje sa'; diff --git a/interface/web/mail/lib/lang/hu_mail_user_filter.lng b/interface/web/mail/lib/lang/hu_mail_user_filter.lng index 750f3c1ae5..a3db584920 100644 --- a/interface/web/mail/lib/lang/hu_mail_user_filter.lng +++ b/interface/web/mail/lib/lang/hu_mail_user_filter.lng @@ -9,6 +9,7 @@ $wb['source_txt'] = 'Forrás'; $wb['subject_txt'] = 'Tárgy'; $wb['from_txt'] = 'From'; $wb['to_txt'] = 'To'; +$wb['list_id_txt'] = 'List ID'; $wb['contains_txt'] = 'Tartalmazza'; $wb['is_txt'] = 'Is'; $wb['begins_with_txt'] = 'Begins with'; diff --git a/interface/web/mail/lib/lang/it_mail_user_filter.lng b/interface/web/mail/lib/lang/it_mail_user_filter.lng index bad797d6d5..827f906345 100644 --- a/interface/web/mail/lib/lang/it_mail_user_filter.lng +++ b/interface/web/mail/lib/lang/it_mail_user_filter.lng @@ -11,6 +11,7 @@ $wb['limit_mailfilter_txt'] = 'The max. number of mailfilters is reached.'; $wb['subject_txt'] = 'Oggetto'; $wb['from_txt'] = 'Da'; $wb['to_txt'] = 'A'; +$wb['list_id_txt'] = 'List ID'; $wb['contains_txt'] = 'Contiene'; $wb['is_txt'] = 'è'; $wb['begins_with_txt'] = 'Inizia con'; diff --git a/interface/web/mail/lib/lang/nl_mail_user_filter.lng b/interface/web/mail/lib/lang/nl_mail_user_filter.lng index 95af45d96e..427caa72d0 100644 --- a/interface/web/mail/lib/lang/nl_mail_user_filter.lng +++ b/interface/web/mail/lib/lang/nl_mail_user_filter.lng @@ -11,6 +11,7 @@ $wb['limit_mailfilter_txt'] = 'Het max. aantal e-mail filters voor uw account is $wb['subject_txt'] = 'Onderwerp'; $wb['from_txt'] = 'Afzender'; $wb['to_txt'] = 'Bestemming'; +$wb['list_id_txt'] = 'List ID'; $wb['contains_txt'] = 'Bevat'; $wb['is_txt'] = 'Is'; $wb['begins_with_txt'] = 'Begint met'; diff --git a/interface/web/mail/lib/lang/pl_mail_user_filter.lng b/interface/web/mail/lib/lang/pl_mail_user_filter.lng index 1f0b071f19..d0bc6d6a28 100644 --- a/interface/web/mail/lib/lang/pl_mail_user_filter.lng +++ b/interface/web/mail/lib/lang/pl_mail_user_filter.lng @@ -11,6 +11,7 @@ $wb['limit_mailfilter_txt'] = 'Maks. ilość filtrów email jest przekroczona.'; $wb['subject_txt'] = 'Temat'; $wb['from_txt'] = 'Od'; $wb['to_txt'] = 'Do'; +$wb['list_id_txt'] = 'List ID'; $wb['contains_txt'] = 'Zawiera'; $wb['is_txt'] = 'Jest'; $wb['begins_with_txt'] = 'Zaczyna się od'; diff --git a/interface/web/mail/lib/lang/ru_mail_user_filter.lng b/interface/web/mail/lib/lang/ru_mail_user_filter.lng index c8306f9838..78fac01aee 100644 --- a/interface/web/mail/lib/lang/ru_mail_user_filter.lng +++ b/interface/web/mail/lib/lang/ru_mail_user_filter.lng @@ -11,6 +11,7 @@ $wb['limit_mailfilter_txt'] = 'Максимальное число почтов $wb['subject_txt'] = 'Тема'; $wb['from_txt'] = 'От'; $wb['to_txt'] = 'Кому'; +$wb['list_id_txt'] = 'List ID'; $wb['contains_txt'] = 'Содержит'; $wb['is_txt'] = 'Равно'; $wb['begins_with_txt'] = 'Начинается с'; diff --git a/interface/web/mail/lib/lang/se_mail_user_filter.lng b/interface/web/mail/lib/lang/se_mail_user_filter.lng index 0cd888b2e5..9830059195 100644 --- a/interface/web/mail/lib/lang/se_mail_user_filter.lng +++ b/interface/web/mail/lib/lang/se_mail_user_filter.lng @@ -11,6 +11,7 @@ $wb['limit_mailfilter_txt'] = 'Det maximala antalet epostfilter är uppnått.'; $wb['subject_txt'] = 'Ämne'; $wb['from_txt'] = 'Från'; $wb['to_txt'] = 'Till'; +$wb['list_id_txt'] = 'List ID'; $wb['contains_txt'] = 'Innehåller'; $wb['is_txt'] = 'Är'; $wb['begins_with_txt'] = 'Börjar med'; diff --git a/interface/web/mail/lib/lang/tr_mail_user_filter.lng b/interface/web/mail/lib/lang/tr_mail_user_filter.lng index ba55be63dc..6d4e0b8868 100644 --- a/interface/web/mail/lib/lang/tr_mail_user_filter.lng +++ b/interface/web/mail/lib/lang/tr_mail_user_filter.lng @@ -11,6 +11,7 @@ $wb['limit_mailfilter_txt'] = 'Hesabınıza ekleyebileceğiniz en fazla e-posta $wb['subject_txt'] = 'Konu'; $wb['from_txt'] = 'Kimden'; $wb['to_txt'] = 'Kime'; +$wb['list_id_txt'] = 'List ID'; $wb['contains_txt'] = 'Şunu içeren'; $wb['is_txt'] = 'Şununla aynı'; $wb['begins_with_txt'] = 'Şununla başlayan'; -- GitLab From 53ce651c6515d3d2529f4a2c5cd295084d00b64b Mon Sep 17 00:00:00 2001 From: thom Date: Tue, 18 Aug 2020 16:40:32 +0200 Subject: [PATCH 2/8] Fix typo --- interface/web/mail/lib/lang/nl_mail_user_filter.lng | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/interface/web/mail/lib/lang/nl_mail_user_filter.lng b/interface/web/mail/lib/lang/nl_mail_user_filter.lng index 427caa72d0..050d64aaf9 100644 --- a/interface/web/mail/lib/lang/nl_mail_user_filter.lng +++ b/interface/web/mail/lib/lang/nl_mail_user_filter.lng @@ -19,7 +19,7 @@ $wb['ends_with_txt'] = 'Eindigt in'; $wb['delete_txt'] = 'Verwijderen'; $wb['move_stop_txt'] = 'Verplaatsen naar'; $wb['header_txt'] = 'Header'; -$wb['size_over_txt'] = 'Email grootte bove (KB)'; +$wb['size_over_txt'] = 'Email grootte boven (KB)'; $wb['size_under_txt'] = 'Email grootte onder (KB)'; $wb['localpart_txt'] = 'Localpart'; $wb['domain_txt'] = 'Domein'; -- GitLab From 062c0650742293261be76b250ff2bada0875c01d Mon Sep 17 00:00:00 2001 From: thom Date: Tue, 18 Aug 2020 16:43:48 +0200 Subject: [PATCH 3/8] Make new filter functions available for mailusers (#5697) --- .../mailuser/form/mail_user_filter.tform.php | 27 ++++++++++++------- 1 file changed, 18 insertions(+), 9 deletions(-) diff --git a/interface/web/mailuser/form/mail_user_filter.tform.php b/interface/web/mailuser/form/mail_user_filter.tform.php index 9fdd8bdfc0..395b9b83f2 100644 --- a/interface/web/mailuser/form/mail_user_filter.tform.php +++ b/interface/web/mailuser/form/mail_user_filter.tform.php @@ -32,18 +32,17 @@ */ - global $app; $form["title"] = "mailbox_filter_txt"; -$form["description"] = ""; +$form["description"] = ""; $form["name"] = "mail_user_filter"; $form["action"] = "mail_user_filter_edit.php"; $form["db_table"] = "mail_user_filter"; -$form["db_table_idx"] = "filter_id"; +$form["db_table_idx"] = "filter_id"; $form["db_history"] = "no"; -$form["tab_default"] = "filter"; -$form["list_default"] = "mail_user_filter_list.php"; +$form["tab_default"] = "filter"; +$form["list_default"] = "mail_user_filter_list.php"; $form["auth"] = 'yes'; // yes / no $form["auth_preset"]["userid"] = 0; // 0 = id of the user, > 0 id must match with id of current user @@ -74,6 +73,12 @@ $form["tabs"]['filter'] = array ( 'validators' => array ( 0 => array ( 'type' => 'NOTEMPTY', 'errmsg'=> 'rulename_error_empty'), ), + 'filters' => array( + 0 => array( 'event' => 'SAVE', + 'type' => 'STRIPTAGS'), + 1 => array( 'event' => 'SAVE', + 'type' => 'STRIPNL') + ), 'default' => '', 'value' => '', 'width' => '30', @@ -83,14 +88,14 @@ $form["tabs"]['filter'] = array ( 'datatype' => 'VARCHAR', 'formtype' => 'SELECT', 'default' => '', - 'value' => array('Subject' => 'subject_txt', 'From'=>'from_txt', 'To'=>'to_txt', 'List-Id'=>'list_id_txt') + 'value' => array('Subject' => 'subject_txt', 'From'=>'from_txt', 'To'=>'to_txt', 'List-Id'=>'list_id_txt', 'Header' => 'header_txt', 'Size' => 'size_over_txt') ), 'op' => array ( 'datatype' => 'VARCHAR', 'formtype' => 'SELECT', 'default' => '', //'value' => array('contains'=>'contains_txt','is' => 'Is','begins'=>'Begins with','ends'=>'Ends with') - 'value' => array('contains'=>'contains_txt', 'is' => 'is_txt', 'begins'=>'begins_with_txt', 'ends'=>'ends_with_txt') + 'value' => array('contains'=>'contains_txt', 'is' => 'is_txt', 'begins'=>'begins_with_txt', 'ends'=>'ends_with_txt', 'localpart' => 'localpart_txt', 'domain' => 'domain_txt') ), 'searchterm' => array ( 'datatype' => 'VARCHAR', @@ -98,6 +103,10 @@ $form["tabs"]['filter'] = array ( 'validators' => array ( 0 => array ( 'type' => 'NOTEMPTY', 'errmsg'=> 'searchterm_is_empty'), ), + 'filters' => array( + 0 => array( 'event' => 'SAVE', + 'type' => 'STRIPNL') + ), 'default' => '', 'value' => '', 'width' => '30', @@ -107,13 +116,13 @@ $form["tabs"]['filter'] = array ( 'datatype' => 'VARCHAR', 'formtype' => 'SELECT', 'default' => '', - 'value' => array('move' => 'move_to_txt', 'delete'=>'delete_txt') + 'value' => array('move' => 'move_to_txt', 'delete'=>'delete_txt', 'keep' => 'keep_txt', 'reject' => 'reject_txt') ), 'target' => array ( 'datatype' => 'VARCHAR', 'formtype' => 'TEXT', 'validators' => array ( 0 => array ( 'type' => 'REGEX', - 'regex' => '/^[a-zA-Z0-9\.\-\_\ ]{0,100}$/', + 'regex' => '/^[\p{Latin}0-9\.\-\_\ \&]{0,100}$/u', 'errmsg'=> 'target_error_regex'), ), 'default' => '', -- GitLab From bad97a55d77d43c43dc3ae08d3e5b1c4b704c5ca Mon Sep 17 00:00:00 2001 From: thom Date: Tue, 18 Aug 2020 16:47:29 +0200 Subject: [PATCH 4/8] Change wrong translation (in DE) --- interface/web/mailuser/lib/lang/ar_mail_user_autoresponder.lng | 2 +- interface/web/mailuser/lib/lang/bg_mail_user_autoresponder.lng | 2 +- interface/web/mailuser/lib/lang/ca_mail_user_autoresponder.lng | 2 +- interface/web/mailuser/lib/lang/el_mail_user_autoresponder.lng | 2 +- interface/web/mailuser/lib/lang/en_mail_user_autoresponder.lng | 2 +- interface/web/mailuser/lib/lang/fi_mail_user_autoresponder.lng | 2 +- interface/web/mailuser/lib/lang/hr_mail_user_autoresponder.lng | 2 +- interface/web/mailuser/lib/lang/hu_mail_user_autoresponder.lng | 2 +- interface/web/mailuser/lib/lang/id_mail_user_autoresponder.lng | 2 +- interface/web/mailuser/lib/lang/it_mail_user_autoresponder.lng | 2 +- interface/web/mailuser/lib/lang/ja_mail_user_autoresponder.lng | 2 +- interface/web/mailuser/lib/lang/pt_mail_user_autoresponder.lng | 2 +- interface/web/mailuser/lib/lang/ro_mail_user_autoresponder.lng | 2 +- interface/web/mailuser/lib/lang/sk_mail_user_autoresponder.lng | 2 +- 14 files changed, 14 insertions(+), 14 deletions(-) diff --git a/interface/web/mailuser/lib/lang/ar_mail_user_autoresponder.lng b/interface/web/mailuser/lib/lang/ar_mail_user_autoresponder.lng index 79f386a7dc..9dcd0e5dd3 100644 --- a/interface/web/mailuser/lib/lang/ar_mail_user_autoresponder.lng +++ b/interface/web/mailuser/lib/lang/ar_mail_user_autoresponder.lng @@ -9,5 +9,5 @@ $wb['autoresponder_end_date_txt'] = 'End by'; $wb['autoresponder_end_date_isgreater'] = 'End date must be set and be later than start date.'; $wb['autoresponder_active'] = 'Enable the autoresponder'; $wb['now_txt'] = 'Now'; -$wb['autoresponder_subject_txt'] = 'Betreff'; +$wb['autoresponder_subject_txt'] = 'Subject'; ?> diff --git a/interface/web/mailuser/lib/lang/bg_mail_user_autoresponder.lng b/interface/web/mailuser/lib/lang/bg_mail_user_autoresponder.lng index 79f386a7dc..9dcd0e5dd3 100644 --- a/interface/web/mailuser/lib/lang/bg_mail_user_autoresponder.lng +++ b/interface/web/mailuser/lib/lang/bg_mail_user_autoresponder.lng @@ -9,5 +9,5 @@ $wb['autoresponder_end_date_txt'] = 'End by'; $wb['autoresponder_end_date_isgreater'] = 'End date must be set and be later than start date.'; $wb['autoresponder_active'] = 'Enable the autoresponder'; $wb['now_txt'] = 'Now'; -$wb['autoresponder_subject_txt'] = 'Betreff'; +$wb['autoresponder_subject_txt'] = 'Subject'; ?> diff --git a/interface/web/mailuser/lib/lang/ca_mail_user_autoresponder.lng b/interface/web/mailuser/lib/lang/ca_mail_user_autoresponder.lng index 79f386a7dc..9dcd0e5dd3 100644 --- a/interface/web/mailuser/lib/lang/ca_mail_user_autoresponder.lng +++ b/interface/web/mailuser/lib/lang/ca_mail_user_autoresponder.lng @@ -9,5 +9,5 @@ $wb['autoresponder_end_date_txt'] = 'End by'; $wb['autoresponder_end_date_isgreater'] = 'End date must be set and be later than start date.'; $wb['autoresponder_active'] = 'Enable the autoresponder'; $wb['now_txt'] = 'Now'; -$wb['autoresponder_subject_txt'] = 'Betreff'; +$wb['autoresponder_subject_txt'] = 'Subject'; ?> diff --git a/interface/web/mailuser/lib/lang/el_mail_user_autoresponder.lng b/interface/web/mailuser/lib/lang/el_mail_user_autoresponder.lng index 79f386a7dc..9dcd0e5dd3 100644 --- a/interface/web/mailuser/lib/lang/el_mail_user_autoresponder.lng +++ b/interface/web/mailuser/lib/lang/el_mail_user_autoresponder.lng @@ -9,5 +9,5 @@ $wb['autoresponder_end_date_txt'] = 'End by'; $wb['autoresponder_end_date_isgreater'] = 'End date must be set and be later than start date.'; $wb['autoresponder_active'] = 'Enable the autoresponder'; $wb['now_txt'] = 'Now'; -$wb['autoresponder_subject_txt'] = 'Betreff'; +$wb['autoresponder_subject_txt'] = 'Subject'; ?> diff --git a/interface/web/mailuser/lib/lang/en_mail_user_autoresponder.lng b/interface/web/mailuser/lib/lang/en_mail_user_autoresponder.lng index a736abf690..e002815943 100644 --- a/interface/web/mailuser/lib/lang/en_mail_user_autoresponder.lng +++ b/interface/web/mailuser/lib/lang/en_mail_user_autoresponder.lng @@ -9,5 +9,5 @@ $wb["autoresponder_end_date_txt"] = 'End by'; $wb["autoresponder_end_date_isgreater"] = 'End date must be set and be later than start date.'; $wb['autoresponder_active'] = 'Enable the autoresponder'; $wb['now_txt']='Now'; -$wb['autoresponder_subject_txt'] = 'Betreff'; +$wb['autoresponder_subject_txt'] = 'Subject'; ?> diff --git a/interface/web/mailuser/lib/lang/fi_mail_user_autoresponder.lng b/interface/web/mailuser/lib/lang/fi_mail_user_autoresponder.lng index 79f386a7dc..9dcd0e5dd3 100644 --- a/interface/web/mailuser/lib/lang/fi_mail_user_autoresponder.lng +++ b/interface/web/mailuser/lib/lang/fi_mail_user_autoresponder.lng @@ -9,5 +9,5 @@ $wb['autoresponder_end_date_txt'] = 'End by'; $wb['autoresponder_end_date_isgreater'] = 'End date must be set and be later than start date.'; $wb['autoresponder_active'] = 'Enable the autoresponder'; $wb['now_txt'] = 'Now'; -$wb['autoresponder_subject_txt'] = 'Betreff'; +$wb['autoresponder_subject_txt'] = 'Subject'; ?> diff --git a/interface/web/mailuser/lib/lang/hr_mail_user_autoresponder.lng b/interface/web/mailuser/lib/lang/hr_mail_user_autoresponder.lng index bbb3b79bc4..407f487771 100644 --- a/interface/web/mailuser/lib/lang/hr_mail_user_autoresponder.lng +++ b/interface/web/mailuser/lib/lang/hr_mail_user_autoresponder.lng @@ -9,5 +9,5 @@ $wb['autoresponder_end_date_txt'] = 'End by'; $wb['autoresponder_end_date_isgreater'] = 'End date must be set and be later than start date.'; $wb['autoresponder_active'] = 'Enable the autoresponder'; $wb['now_txt'] = 'Sada'; -$wb['autoresponder_subject_txt'] = 'Betreff'; +$wb['autoresponder_subject_txt'] = 'Subject'; ?> diff --git a/interface/web/mailuser/lib/lang/hu_mail_user_autoresponder.lng b/interface/web/mailuser/lib/lang/hu_mail_user_autoresponder.lng index 79f386a7dc..9dcd0e5dd3 100644 --- a/interface/web/mailuser/lib/lang/hu_mail_user_autoresponder.lng +++ b/interface/web/mailuser/lib/lang/hu_mail_user_autoresponder.lng @@ -9,5 +9,5 @@ $wb['autoresponder_end_date_txt'] = 'End by'; $wb['autoresponder_end_date_isgreater'] = 'End date must be set and be later than start date.'; $wb['autoresponder_active'] = 'Enable the autoresponder'; $wb['now_txt'] = 'Now'; -$wb['autoresponder_subject_txt'] = 'Betreff'; +$wb['autoresponder_subject_txt'] = 'Subject'; ?> diff --git a/interface/web/mailuser/lib/lang/id_mail_user_autoresponder.lng b/interface/web/mailuser/lib/lang/id_mail_user_autoresponder.lng index 79f386a7dc..9dcd0e5dd3 100644 --- a/interface/web/mailuser/lib/lang/id_mail_user_autoresponder.lng +++ b/interface/web/mailuser/lib/lang/id_mail_user_autoresponder.lng @@ -9,5 +9,5 @@ $wb['autoresponder_end_date_txt'] = 'End by'; $wb['autoresponder_end_date_isgreater'] = 'End date must be set and be later than start date.'; $wb['autoresponder_active'] = 'Enable the autoresponder'; $wb['now_txt'] = 'Now'; -$wb['autoresponder_subject_txt'] = 'Betreff'; +$wb['autoresponder_subject_txt'] = 'Subject'; ?> diff --git a/interface/web/mailuser/lib/lang/it_mail_user_autoresponder.lng b/interface/web/mailuser/lib/lang/it_mail_user_autoresponder.lng index caaac2e7c4..c4355745a5 100644 --- a/interface/web/mailuser/lib/lang/it_mail_user_autoresponder.lng +++ b/interface/web/mailuser/lib/lang/it_mail_user_autoresponder.lng @@ -9,5 +9,5 @@ $wb['autoresponder_end_date_txt'] = 'End by'; $wb['autoresponder_end_date_isgreater'] = 'End date must be set and be later than start date.'; $wb['autoresponder_active'] = 'Enable the autoresponder'; $wb['now_txt'] = 'Now'; -$wb['autoresponder_subject_txt'] = 'Betreff'; +$wb['autoresponder_subject_txt'] = 'Subject'; ?> diff --git a/interface/web/mailuser/lib/lang/ja_mail_user_autoresponder.lng b/interface/web/mailuser/lib/lang/ja_mail_user_autoresponder.lng index 79f386a7dc..9dcd0e5dd3 100644 --- a/interface/web/mailuser/lib/lang/ja_mail_user_autoresponder.lng +++ b/interface/web/mailuser/lib/lang/ja_mail_user_autoresponder.lng @@ -9,5 +9,5 @@ $wb['autoresponder_end_date_txt'] = 'End by'; $wb['autoresponder_end_date_isgreater'] = 'End date must be set and be later than start date.'; $wb['autoresponder_active'] = 'Enable the autoresponder'; $wb['now_txt'] = 'Now'; -$wb['autoresponder_subject_txt'] = 'Betreff'; +$wb['autoresponder_subject_txt'] = 'Subject'; ?> diff --git a/interface/web/mailuser/lib/lang/pt_mail_user_autoresponder.lng b/interface/web/mailuser/lib/lang/pt_mail_user_autoresponder.lng index 79f386a7dc..9dcd0e5dd3 100644 --- a/interface/web/mailuser/lib/lang/pt_mail_user_autoresponder.lng +++ b/interface/web/mailuser/lib/lang/pt_mail_user_autoresponder.lng @@ -9,5 +9,5 @@ $wb['autoresponder_end_date_txt'] = 'End by'; $wb['autoresponder_end_date_isgreater'] = 'End date must be set and be later than start date.'; $wb['autoresponder_active'] = 'Enable the autoresponder'; $wb['now_txt'] = 'Now'; -$wb['autoresponder_subject_txt'] = 'Betreff'; +$wb['autoresponder_subject_txt'] = 'Subject'; ?> diff --git a/interface/web/mailuser/lib/lang/ro_mail_user_autoresponder.lng b/interface/web/mailuser/lib/lang/ro_mail_user_autoresponder.lng index 79f386a7dc..9dcd0e5dd3 100644 --- a/interface/web/mailuser/lib/lang/ro_mail_user_autoresponder.lng +++ b/interface/web/mailuser/lib/lang/ro_mail_user_autoresponder.lng @@ -9,5 +9,5 @@ $wb['autoresponder_end_date_txt'] = 'End by'; $wb['autoresponder_end_date_isgreater'] = 'End date must be set and be later than start date.'; $wb['autoresponder_active'] = 'Enable the autoresponder'; $wb['now_txt'] = 'Now'; -$wb['autoresponder_subject_txt'] = 'Betreff'; +$wb['autoresponder_subject_txt'] = 'Subject'; ?> diff --git a/interface/web/mailuser/lib/lang/sk_mail_user_autoresponder.lng b/interface/web/mailuser/lib/lang/sk_mail_user_autoresponder.lng index 79f386a7dc..9dcd0e5dd3 100644 --- a/interface/web/mailuser/lib/lang/sk_mail_user_autoresponder.lng +++ b/interface/web/mailuser/lib/lang/sk_mail_user_autoresponder.lng @@ -9,5 +9,5 @@ $wb['autoresponder_end_date_txt'] = 'End by'; $wb['autoresponder_end_date_isgreater'] = 'End date must be set and be later than start date.'; $wb['autoresponder_active'] = 'Enable the autoresponder'; $wb['now_txt'] = 'Now'; -$wb['autoresponder_subject_txt'] = 'Betreff'; +$wb['autoresponder_subject_txt'] = 'Subject'; ?> -- GitLab From 6c2eae78faced30e59b7bf45f056336d0db7e45c Mon Sep 17 00:00:00 2001 From: thom Date: Tue, 18 Aug 2020 17:17:12 +0200 Subject: [PATCH 5/8] Add translations for new filters (#5697) --- interface/web/mailuser/lib/lang/ar_mail_user_filter.lng | 3 +++ interface/web/mailuser/lib/lang/bg_mail_user_filter.lng | 3 +++ interface/web/mailuser/lib/lang/br_mail_user_filter.lng | 3 +++ interface/web/mailuser/lib/lang/ca_mail_user_filter.lng | 3 +++ interface/web/mailuser/lib/lang/cz_mail_user_filter.lng | 3 +++ interface/web/mailuser/lib/lang/de_mail_user_filter.lng | 3 +++ interface/web/mailuser/lib/lang/dk_mail_user_filter.lng | 3 +++ interface/web/mailuser/lib/lang/el_mail_user_filter.lng | 3 +++ interface/web/mailuser/lib/lang/en_mail_user_filter.lng | 3 +++ interface/web/mailuser/lib/lang/es_mail_user_filter.lng | 3 +++ interface/web/mailuser/lib/lang/fi_mail_user_filter.lng | 3 +++ interface/web/mailuser/lib/lang/fr_mail_user_filter.lng | 3 +++ interface/web/mailuser/lib/lang/hr_mail_user_filter.lng | 3 +++ interface/web/mailuser/lib/lang/hu_mail_user_filter.lng | 3 +++ interface/web/mailuser/lib/lang/id_mail_user_filter.lng | 3 +++ interface/web/mailuser/lib/lang/it_mail_user_filter.lng | 3 +++ interface/web/mailuser/lib/lang/ja_mail_user_filter.lng | 3 +++ interface/web/mailuser/lib/lang/nl_mail_user_filter.lng | 3 +++ interface/web/mailuser/lib/lang/pl_mail_user_filter.lng | 3 +++ interface/web/mailuser/lib/lang/pt_mail_user_filter.lng | 3 +++ interface/web/mailuser/lib/lang/ro_mail_user_filter.lng | 3 +++ interface/web/mailuser/lib/lang/ru_mail_user_filter.lng | 3 +++ interface/web/mailuser/lib/lang/se_mail_user_filter.lng | 3 +++ interface/web/mailuser/lib/lang/sk_mail_user_filter.lng | 3 +++ interface/web/mailuser/lib/lang/tr_mail_user_filter.lng | 3 +++ 25 files changed, 75 insertions(+) diff --git a/interface/web/mailuser/lib/lang/ar_mail_user_filter.lng b/interface/web/mailuser/lib/lang/ar_mail_user_filter.lng index 9ac4be357e..a5fdf679cf 100644 --- a/interface/web/mailuser/lib/lang/ar_mail_user_filter.lng +++ b/interface/web/mailuser/lib/lang/ar_mail_user_filter.lng @@ -19,4 +19,7 @@ $wb['ends_with_txt'] = 'Ends with'; $wb['move_to_txt'] = 'Move to'; $wb['delete_txt'] = 'Delete'; $wb['mailbox_filter_txt'] = 'Mailbox filter'; +$wb['header_txt'] = 'Header'; +$wb['size_over_txt'] = 'Email size over (KB)'; +$wb['size_under_txt'] = 'Email size under (KB)'; ?> diff --git a/interface/web/mailuser/lib/lang/bg_mail_user_filter.lng b/interface/web/mailuser/lib/lang/bg_mail_user_filter.lng index 9ac4be357e..a5fdf679cf 100644 --- a/interface/web/mailuser/lib/lang/bg_mail_user_filter.lng +++ b/interface/web/mailuser/lib/lang/bg_mail_user_filter.lng @@ -19,4 +19,7 @@ $wb['ends_with_txt'] = 'Ends with'; $wb['move_to_txt'] = 'Move to'; $wb['delete_txt'] = 'Delete'; $wb['mailbox_filter_txt'] = 'Mailbox filter'; +$wb['header_txt'] = 'Header'; +$wb['size_over_txt'] = 'Email size over (KB)'; +$wb['size_under_txt'] = 'Email size under (KB)'; ?> diff --git a/interface/web/mailuser/lib/lang/br_mail_user_filter.lng b/interface/web/mailuser/lib/lang/br_mail_user_filter.lng index acefe8be6e..ebd4d36628 100644 --- a/interface/web/mailuser/lib/lang/br_mail_user_filter.lng +++ b/interface/web/mailuser/lib/lang/br_mail_user_filter.lng @@ -18,4 +18,7 @@ $wb['begins_with_txt'] = 'Iniciando com'; $wb['ends_with_txt'] = 'Finalizando com'; $wb['move_to_txt'] = 'Mover para'; $wb['delete_txt'] = 'Remover'; +$wb['header_txt'] = 'Header'; +$wb['size_over_txt'] = 'Email size over (KB)'; +$wb['size_under_txt'] = 'Email size under (KB)'; ?> diff --git a/interface/web/mailuser/lib/lang/ca_mail_user_filter.lng b/interface/web/mailuser/lib/lang/ca_mail_user_filter.lng index 9ac4be357e..a5fdf679cf 100644 --- a/interface/web/mailuser/lib/lang/ca_mail_user_filter.lng +++ b/interface/web/mailuser/lib/lang/ca_mail_user_filter.lng @@ -19,4 +19,7 @@ $wb['ends_with_txt'] = 'Ends with'; $wb['move_to_txt'] = 'Move to'; $wb['delete_txt'] = 'Delete'; $wb['mailbox_filter_txt'] = 'Mailbox filter'; +$wb['header_txt'] = 'Header'; +$wb['size_over_txt'] = 'Email size over (KB)'; +$wb['size_under_txt'] = 'Email size under (KB)'; ?> diff --git a/interface/web/mailuser/lib/lang/cz_mail_user_filter.lng b/interface/web/mailuser/lib/lang/cz_mail_user_filter.lng index 27b54c1bc7..95903569bf 100644 --- a/interface/web/mailuser/lib/lang/cz_mail_user_filter.lng +++ b/interface/web/mailuser/lib/lang/cz_mail_user_filter.lng @@ -18,4 +18,7 @@ $wb['ends_with_txt'] = 'Končí na'; $wb['move_to_txt'] = 'Přesunout do'; $wb['delete_txt'] = 'Smazat'; $wb['mailbox_filter_txt'] = 'Mailbox filter'; +$wb['header_txt'] = 'Header'; +$wb['size_over_txt'] = 'Email size over (KB)'; +$wb['size_under_txt'] = 'Email size under (KB)'; ?> diff --git a/interface/web/mailuser/lib/lang/de_mail_user_filter.lng b/interface/web/mailuser/lib/lang/de_mail_user_filter.lng index 1665ba14d2..dbd1803954 100644 --- a/interface/web/mailuser/lib/lang/de_mail_user_filter.lng +++ b/interface/web/mailuser/lib/lang/de_mail_user_filter.lng @@ -18,4 +18,7 @@ $wb['begins_with_txt'] = 'Startet mit'; $wb['ends_with_txt'] = 'Endet mit'; $wb['move_to_txt'] = 'Verschieben nach'; $wb['delete_txt'] = 'Löschen'; +$wb['header_txt'] = 'Header'; +$wb['size_over_txt'] = 'Email size over (KB)'; +$wb['size_under_txt'] = 'Email size under (KB)'; ?> diff --git a/interface/web/mailuser/lib/lang/dk_mail_user_filter.lng b/interface/web/mailuser/lib/lang/dk_mail_user_filter.lng index 0a92f580a1..f911747a49 100644 --- a/interface/web/mailuser/lib/lang/dk_mail_user_filter.lng +++ b/interface/web/mailuser/lib/lang/dk_mail_user_filter.lng @@ -19,4 +19,7 @@ $wb['ends_with_txt'] = 'Slutter med'; $wb['move_to_txt'] = 'Flyt til'; $wb['delete_txt'] = 'Slet'; $wb['mailbox_filter_txt'] = 'Mailbox filter'; +$wb['header_txt'] = 'Header'; +$wb['size_over_txt'] = 'Email size over (KB)'; +$wb['size_under_txt'] = 'Email size under (KB)'; ?> diff --git a/interface/web/mailuser/lib/lang/el_mail_user_filter.lng b/interface/web/mailuser/lib/lang/el_mail_user_filter.lng index 9ac4be357e..a5fdf679cf 100644 --- a/interface/web/mailuser/lib/lang/el_mail_user_filter.lng +++ b/interface/web/mailuser/lib/lang/el_mail_user_filter.lng @@ -19,4 +19,7 @@ $wb['ends_with_txt'] = 'Ends with'; $wb['move_to_txt'] = 'Move to'; $wb['delete_txt'] = 'Delete'; $wb['mailbox_filter_txt'] = 'Mailbox filter'; +$wb['header_txt'] = 'Header'; +$wb['size_over_txt'] = 'Email size over (KB)'; +$wb['size_under_txt'] = 'Email size under (KB)'; ?> diff --git a/interface/web/mailuser/lib/lang/en_mail_user_filter.lng b/interface/web/mailuser/lib/lang/en_mail_user_filter.lng index c26150ba1d..9d5125c169 100644 --- a/interface/web/mailuser/lib/lang/en_mail_user_filter.lng +++ b/interface/web/mailuser/lib/lang/en_mail_user_filter.lng @@ -19,4 +19,7 @@ $wb['begins_with_txt'] = 'Begins with'; $wb['ends_with_txt'] = 'Ends with'; $wb['move_to_txt'] = 'Move to'; $wb['delete_txt'] = 'Delete'; +$wb['header_txt'] = 'Header'; +$wb['size_over_txt'] = 'Email size over (KB)'; +$wb['size_under_txt'] = 'Email size under (KB)'; ?> diff --git a/interface/web/mailuser/lib/lang/es_mail_user_filter.lng b/interface/web/mailuser/lib/lang/es_mail_user_filter.lng index b8a19359f5..4ec6877cfc 100644 --- a/interface/web/mailuser/lib/lang/es_mail_user_filter.lng +++ b/interface/web/mailuser/lib/lang/es_mail_user_filter.lng @@ -19,4 +19,7 @@ $wb['target_txt'] = 'Carpeta'; $wb['to_txt'] = 'Para'; $wb['list_id_txt'] = 'List ID'; $wb['mailbox_filter_txt'] = 'Mailbox filter'; +$wb['header_txt'] = 'Header'; +$wb['size_over_txt'] = 'Email size over (KB)'; +$wb['size_under_txt'] = 'Email size under (KB)'; ?> diff --git a/interface/web/mailuser/lib/lang/fi_mail_user_filter.lng b/interface/web/mailuser/lib/lang/fi_mail_user_filter.lng index 9ac4be357e..a5fdf679cf 100644 --- a/interface/web/mailuser/lib/lang/fi_mail_user_filter.lng +++ b/interface/web/mailuser/lib/lang/fi_mail_user_filter.lng @@ -19,4 +19,7 @@ $wb['ends_with_txt'] = 'Ends with'; $wb['move_to_txt'] = 'Move to'; $wb['delete_txt'] = 'Delete'; $wb['mailbox_filter_txt'] = 'Mailbox filter'; +$wb['header_txt'] = 'Header'; +$wb['size_over_txt'] = 'Email size over (KB)'; +$wb['size_under_txt'] = 'Email size under (KB)'; ?> diff --git a/interface/web/mailuser/lib/lang/fr_mail_user_filter.lng b/interface/web/mailuser/lib/lang/fr_mail_user_filter.lng index b630b05a79..b6f2c193b4 100644 --- a/interface/web/mailuser/lib/lang/fr_mail_user_filter.lng +++ b/interface/web/mailuser/lib/lang/fr_mail_user_filter.lng @@ -18,4 +18,7 @@ $wb['ends_with_txt'] = 'Fini par'; $wb['move_to_txt'] = 'Déplacer vers'; $wb['delete_txt'] = 'Supprimer'; $wb['mailbox_filter_txt'] = 'Mailbox filter'; +$wb['header_txt'] = 'Header'; +$wb['size_over_txt'] = 'Email size over (KB)'; +$wb['size_under_txt'] = 'Email size under (KB)'; ?> diff --git a/interface/web/mailuser/lib/lang/hr_mail_user_filter.lng b/interface/web/mailuser/lib/lang/hr_mail_user_filter.lng index b2793c3805..f87ed828a4 100644 --- a/interface/web/mailuser/lib/lang/hr_mail_user_filter.lng +++ b/interface/web/mailuser/lib/lang/hr_mail_user_filter.lng @@ -18,4 +18,7 @@ $wb['ends_with_txt'] = 'Završava sa'; $wb['move_to_txt'] = 'Prebaci u '; $wb['delete_txt'] = 'Obriši'; $wb['mailbox_filter_txt'] = 'Mailbox filter'; +$wb['header_txt'] = 'Header'; +$wb['size_over_txt'] = 'Email size over (KB)'; +$wb['size_under_txt'] = 'Email size under (KB)'; ?> diff --git a/interface/web/mailuser/lib/lang/hu_mail_user_filter.lng b/interface/web/mailuser/lib/lang/hu_mail_user_filter.lng index 9ac4be357e..a5fdf679cf 100644 --- a/interface/web/mailuser/lib/lang/hu_mail_user_filter.lng +++ b/interface/web/mailuser/lib/lang/hu_mail_user_filter.lng @@ -19,4 +19,7 @@ $wb['ends_with_txt'] = 'Ends with'; $wb['move_to_txt'] = 'Move to'; $wb['delete_txt'] = 'Delete'; $wb['mailbox_filter_txt'] = 'Mailbox filter'; +$wb['header_txt'] = 'Header'; +$wb['size_over_txt'] = 'Email size over (KB)'; +$wb['size_under_txt'] = 'Email size under (KB)'; ?> diff --git a/interface/web/mailuser/lib/lang/id_mail_user_filter.lng b/interface/web/mailuser/lib/lang/id_mail_user_filter.lng index 9ac4be357e..a5fdf679cf 100644 --- a/interface/web/mailuser/lib/lang/id_mail_user_filter.lng +++ b/interface/web/mailuser/lib/lang/id_mail_user_filter.lng @@ -19,4 +19,7 @@ $wb['ends_with_txt'] = 'Ends with'; $wb['move_to_txt'] = 'Move to'; $wb['delete_txt'] = 'Delete'; $wb['mailbox_filter_txt'] = 'Mailbox filter'; +$wb['header_txt'] = 'Header'; +$wb['size_over_txt'] = 'Email size over (KB)'; +$wb['size_under_txt'] = 'Email size under (KB)'; ?> diff --git a/interface/web/mailuser/lib/lang/it_mail_user_filter.lng b/interface/web/mailuser/lib/lang/it_mail_user_filter.lng index 49c3358601..b47458fdbe 100644 --- a/interface/web/mailuser/lib/lang/it_mail_user_filter.lng +++ b/interface/web/mailuser/lib/lang/it_mail_user_filter.lng @@ -18,4 +18,7 @@ $wb['ends_with_txt'] = 'Termina con'; $wb['move_to_txt'] = 'Sposta in'; $wb['delete_txt'] = 'Elimina'; $wb['mailbox_filter_txt'] = 'Mailbox filter'; +$wb['header_txt'] = 'Header'; +$wb['size_over_txt'] = 'Email size over (KB)'; +$wb['size_under_txt'] = 'Email size under (KB)'; ?> diff --git a/interface/web/mailuser/lib/lang/ja_mail_user_filter.lng b/interface/web/mailuser/lib/lang/ja_mail_user_filter.lng index 9ac4be357e..a5fdf679cf 100644 --- a/interface/web/mailuser/lib/lang/ja_mail_user_filter.lng +++ b/interface/web/mailuser/lib/lang/ja_mail_user_filter.lng @@ -19,4 +19,7 @@ $wb['ends_with_txt'] = 'Ends with'; $wb['move_to_txt'] = 'Move to'; $wb['delete_txt'] = 'Delete'; $wb['mailbox_filter_txt'] = 'Mailbox filter'; +$wb['header_txt'] = 'Header'; +$wb['size_over_txt'] = 'Email size over (KB)'; +$wb['size_under_txt'] = 'Email size under (KB)'; ?> diff --git a/interface/web/mailuser/lib/lang/nl_mail_user_filter.lng b/interface/web/mailuser/lib/lang/nl_mail_user_filter.lng index 0092c288a0..ba318014ab 100644 --- a/interface/web/mailuser/lib/lang/nl_mail_user_filter.lng +++ b/interface/web/mailuser/lib/lang/nl_mail_user_filter.lng @@ -18,4 +18,7 @@ $wb['ends_with_txt'] = "Endigt in"; $wb['move_to_txt'] = "Verplaatsen naar"; $wb['delete_txt'] = "Verwijderen"; $wb['mailbox_filter_txt'] = "Mailbox filter"; +$wb['header_txt'] = 'Header'; +$wb['size_over_txt'] = 'Email size over (KB)'; +$wb['size_under_txt'] = 'Email size under (KB)'; ?> diff --git a/interface/web/mailuser/lib/lang/pl_mail_user_filter.lng b/interface/web/mailuser/lib/lang/pl_mail_user_filter.lng index 9ac4be357e..a5fdf679cf 100644 --- a/interface/web/mailuser/lib/lang/pl_mail_user_filter.lng +++ b/interface/web/mailuser/lib/lang/pl_mail_user_filter.lng @@ -19,4 +19,7 @@ $wb['ends_with_txt'] = 'Ends with'; $wb['move_to_txt'] = 'Move to'; $wb['delete_txt'] = 'Delete'; $wb['mailbox_filter_txt'] = 'Mailbox filter'; +$wb['header_txt'] = 'Header'; +$wb['size_over_txt'] = 'Email size over (KB)'; +$wb['size_under_txt'] = 'Email size under (KB)'; ?> diff --git a/interface/web/mailuser/lib/lang/pt_mail_user_filter.lng b/interface/web/mailuser/lib/lang/pt_mail_user_filter.lng index 9ac4be357e..a5fdf679cf 100644 --- a/interface/web/mailuser/lib/lang/pt_mail_user_filter.lng +++ b/interface/web/mailuser/lib/lang/pt_mail_user_filter.lng @@ -19,4 +19,7 @@ $wb['ends_with_txt'] = 'Ends with'; $wb['move_to_txt'] = 'Move to'; $wb['delete_txt'] = 'Delete'; $wb['mailbox_filter_txt'] = 'Mailbox filter'; +$wb['header_txt'] = 'Header'; +$wb['size_over_txt'] = 'Email size over (KB)'; +$wb['size_under_txt'] = 'Email size under (KB)'; ?> diff --git a/interface/web/mailuser/lib/lang/ro_mail_user_filter.lng b/interface/web/mailuser/lib/lang/ro_mail_user_filter.lng index 9ac4be357e..a5fdf679cf 100644 --- a/interface/web/mailuser/lib/lang/ro_mail_user_filter.lng +++ b/interface/web/mailuser/lib/lang/ro_mail_user_filter.lng @@ -19,4 +19,7 @@ $wb['ends_with_txt'] = 'Ends with'; $wb['move_to_txt'] = 'Move to'; $wb['delete_txt'] = 'Delete'; $wb['mailbox_filter_txt'] = 'Mailbox filter'; +$wb['header_txt'] = 'Header'; +$wb['size_over_txt'] = 'Email size over (KB)'; +$wb['size_under_txt'] = 'Email size under (KB)'; ?> diff --git a/interface/web/mailuser/lib/lang/ru_mail_user_filter.lng b/interface/web/mailuser/lib/lang/ru_mail_user_filter.lng index d834e4057a..1f2dc5ded1 100644 --- a/interface/web/mailuser/lib/lang/ru_mail_user_filter.lng +++ b/interface/web/mailuser/lib/lang/ru_mail_user_filter.lng @@ -18,4 +18,7 @@ $wb['ends_with_txt'] = 'Заканчивается на'; $wb['move_to_txt'] = 'Переместить в'; $wb['delete_txt'] = 'Удалить'; $wb['mailbox_filter_txt'] = 'Фильтр почтового ящика'; +$wb['header_txt'] = 'Header'; +$wb['size_over_txt'] = 'Email size over (KB)'; +$wb['size_under_txt'] = 'Email size under (KB)'; ?> diff --git a/interface/web/mailuser/lib/lang/se_mail_user_filter.lng b/interface/web/mailuser/lib/lang/se_mail_user_filter.lng index da15d6f73b..590239681e 100644 --- a/interface/web/mailuser/lib/lang/se_mail_user_filter.lng +++ b/interface/web/mailuser/lib/lang/se_mail_user_filter.lng @@ -18,4 +18,7 @@ $wb['ends_with_txt'] = 'Slutar med'; $wb['move_to_txt'] = 'Flytta till'; $wb['delete_txt'] = 'Radera'; $wb['mailbox_filter_txt'] = 'Mailbox filter'; +$wb['header_txt'] = 'Header'; +$wb['size_over_txt'] = 'Email size over (KB)'; +$wb['size_under_txt'] = 'Email size under (KB)'; ?> diff --git a/interface/web/mailuser/lib/lang/sk_mail_user_filter.lng b/interface/web/mailuser/lib/lang/sk_mail_user_filter.lng index 9ac4be357e..a5fdf679cf 100644 --- a/interface/web/mailuser/lib/lang/sk_mail_user_filter.lng +++ b/interface/web/mailuser/lib/lang/sk_mail_user_filter.lng @@ -19,4 +19,7 @@ $wb['ends_with_txt'] = 'Ends with'; $wb['move_to_txt'] = 'Move to'; $wb['delete_txt'] = 'Delete'; $wb['mailbox_filter_txt'] = 'Mailbox filter'; +$wb['header_txt'] = 'Header'; +$wb['size_over_txt'] = 'Email size over (KB)'; +$wb['size_under_txt'] = 'Email size under (KB)'; ?> diff --git a/interface/web/mailuser/lib/lang/tr_mail_user_filter.lng b/interface/web/mailuser/lib/lang/tr_mail_user_filter.lng index 57db197901..0eb00905dc 100644 --- a/interface/web/mailuser/lib/lang/tr_mail_user_filter.lng +++ b/interface/web/mailuser/lib/lang/tr_mail_user_filter.lng @@ -18,4 +18,7 @@ $wb['ends_with_txt'] = 'Şununla biten'; $wb['move_to_txt'] = 'Şuraya taşı'; $wb['delete_txt'] = 'Sil'; $wb['mailbox_filter_txt'] = 'E-posta kutusu süzgeci'; +$wb['header_txt'] = 'Header'; +$wb['size_over_txt'] = 'Email size over (KB)'; +$wb['size_under_txt'] = 'Email size under (KB)'; ?> -- GitLab From 2d2e17b06e2fe683ba087402910b5383a6bec286 Mon Sep 17 00:00:00 2001 From: thom Date: Thu, 20 Aug 2020 17:45:59 +0200 Subject: [PATCH 6/8] Add changes from !1024 for mailusers (#5697) --- interface/web/mailuser/lib/lang/ar_mail_user_spamfilter.lng | 2 +- interface/web/mailuser/lib/lang/bg_mail_user_spamfilter.lng | 2 +- interface/web/mailuser/lib/lang/br_mail_user_spamfilter.lng | 2 +- interface/web/mailuser/lib/lang/ca_mail_user_spamfilter.lng | 2 +- interface/web/mailuser/lib/lang/cz_mail_user_spamfilter.lng | 2 +- interface/web/mailuser/lib/lang/de_mail_user_spamfilter.lng | 2 +- interface/web/mailuser/lib/lang/dk_mail_user_spamfilter.lng | 2 +- interface/web/mailuser/lib/lang/el_mail_user_spamfilter.lng | 2 +- interface/web/mailuser/lib/lang/en_mail_user_spamfilter.lng | 4 ++-- interface/web/mailuser/lib/lang/es_mail_user_spamfilter.lng | 2 +- interface/web/mailuser/lib/lang/fi_mail_user_spamfilter.lng | 2 +- interface/web/mailuser/lib/lang/fr_mail_user_spamfilter.lng | 2 +- interface/web/mailuser/lib/lang/hr_mail_user_spamfilter.lng | 2 +- interface/web/mailuser/lib/lang/hu_mail_user_spamfilter.lng | 2 +- interface/web/mailuser/lib/lang/id_mail_user_spamfilter.lng | 2 +- interface/web/mailuser/lib/lang/it_mail_user_spamfilter.lng | 2 +- interface/web/mailuser/lib/lang/ja_mail_user_spamfilter.lng | 2 +- interface/web/mailuser/lib/lang/nl_mail_user_spamfilter.lng | 2 +- interface/web/mailuser/lib/lang/pl_mail_user_spamfilter.lng | 2 +- interface/web/mailuser/lib/lang/pt_mail_user_spamfilter.lng | 2 +- interface/web/mailuser/lib/lang/ro_mail_user_spamfilter.lng | 2 +- interface/web/mailuser/lib/lang/ru_mail_user_spamfilter.lng | 2 +- interface/web/mailuser/lib/lang/se_mail_user_spamfilter.lng | 2 +- interface/web/mailuser/lib/lang/sk_mail_user_spamfilter.lng | 2 +- interface/web/mailuser/lib/lang/tr_mail_user_spamfilter.lng | 2 +- interface/web/mailuser/mail_user_spamfilter_edit.php | 4 ++-- 26 files changed, 28 insertions(+), 28 deletions(-) diff --git a/interface/web/mailuser/lib/lang/ar_mail_user_spamfilter.lng b/interface/web/mailuser/lib/lang/ar_mail_user_spamfilter.lng index be4bad9050..fc355eb920 100644 --- a/interface/web/mailuser/lib/lang/ar_mail_user_spamfilter.lng +++ b/interface/web/mailuser/lib/lang/ar_mail_user_spamfilter.lng @@ -2,6 +2,6 @@ $wb['mailbox_spamfilter_txt'] = 'Spamfilter'; $wb['spamfilter_txt'] = 'Spamfilter'; $wb['email_txt'] = 'Email'; -$wb['no_policy'] = '- not enabled -'; +$wb['inherit_policy'] = '- Inherit domain setting -'; $wb['policy_txt'] = 'Policy'; ?> diff --git a/interface/web/mailuser/lib/lang/bg_mail_user_spamfilter.lng b/interface/web/mailuser/lib/lang/bg_mail_user_spamfilter.lng index be4bad9050..fc355eb920 100644 --- a/interface/web/mailuser/lib/lang/bg_mail_user_spamfilter.lng +++ b/interface/web/mailuser/lib/lang/bg_mail_user_spamfilter.lng @@ -2,6 +2,6 @@ $wb['mailbox_spamfilter_txt'] = 'Spamfilter'; $wb['spamfilter_txt'] = 'Spamfilter'; $wb['email_txt'] = 'Email'; -$wb['no_policy'] = '- not enabled -'; +$wb['inherit_policy'] = '- Inherit domain setting -'; $wb['policy_txt'] = 'Policy'; ?> diff --git a/interface/web/mailuser/lib/lang/br_mail_user_spamfilter.lng b/interface/web/mailuser/lib/lang/br_mail_user_spamfilter.lng index eb36922041..360d47d9cc 100644 --- a/interface/web/mailuser/lib/lang/br_mail_user_spamfilter.lng +++ b/interface/web/mailuser/lib/lang/br_mail_user_spamfilter.lng @@ -2,6 +2,6 @@ $wb['mailbox_spamfilter_txt'] = 'Filtros anti-spam'; $wb['spamfilter_txt'] = 'Filtro anti-spam'; $wb['email_txt'] = 'e-Mail'; -$wb['no_policy'] = '-desabilitado-'; +$wb['inherit_policy'] = '- Inherit domain setting -'; $wb['policy_txt'] = 'Política'; ?> diff --git a/interface/web/mailuser/lib/lang/ca_mail_user_spamfilter.lng b/interface/web/mailuser/lib/lang/ca_mail_user_spamfilter.lng index 2b29913e5f..00ed8174f4 100644 --- a/interface/web/mailuser/lib/lang/ca_mail_user_spamfilter.lng +++ b/interface/web/mailuser/lib/lang/ca_mail_user_spamfilter.lng @@ -2,6 +2,6 @@ $wb['mailbox_spamfilter_txt'] = 'Spamfilter'; $wb['spamfilter_txt'] = 'Spamfilter'; $wb['email_txt'] = 'Courriel'; -$wb['no_policy'] = '- not enabled -'; +$wb['inherit_policy'] = '- Inherit domain setting -'; $wb['policy_txt'] = 'Policy'; ?> diff --git a/interface/web/mailuser/lib/lang/cz_mail_user_spamfilter.lng b/interface/web/mailuser/lib/lang/cz_mail_user_spamfilter.lng index 2a53036be6..e6a50b96f8 100644 --- a/interface/web/mailuser/lib/lang/cz_mail_user_spamfilter.lng +++ b/interface/web/mailuser/lib/lang/cz_mail_user_spamfilter.lng @@ -2,6 +2,6 @@ $wb['mailbox_spamfilter_txt'] = 'Spamový filtr'; $wb['spamfilter_txt'] = 'Spamový filtr'; $wb['email_txt'] = 'E-mail'; -$wb['no_policy'] = '- nepovoleno -'; +$wb['inherit_policy'] = '- Inherit domain setting -'; $wb['policy_txt'] = 'Politika'; ?> diff --git a/interface/web/mailuser/lib/lang/de_mail_user_spamfilter.lng b/interface/web/mailuser/lib/lang/de_mail_user_spamfilter.lng index 47ac53a006..d444899a8f 100644 --- a/interface/web/mailuser/lib/lang/de_mail_user_spamfilter.lng +++ b/interface/web/mailuser/lib/lang/de_mail_user_spamfilter.lng @@ -2,6 +2,6 @@ $wb['mailbox_spamfilter_txt'] = 'Spamfilter'; $wb['spamfilter_txt'] = 'Spamfilter'; $wb['email_txt'] = 'E-Mail'; -$wb['no_policy'] = '- nicht aktiviert -'; +$wb['inherit_policy'] = '- Inherit domain setting -'; $wb['policy_txt'] = 'Richtlinie'; ?> diff --git a/interface/web/mailuser/lib/lang/dk_mail_user_spamfilter.lng b/interface/web/mailuser/lib/lang/dk_mail_user_spamfilter.lng index f43190d492..fb05b7565c 100644 --- a/interface/web/mailuser/lib/lang/dk_mail_user_spamfilter.lng +++ b/interface/web/mailuser/lib/lang/dk_mail_user_spamfilter.lng @@ -2,6 +2,6 @@ $wb['mailbox_spamfilter_txt'] = 'Spamfilter'; $wb['spamfilter_txt'] = 'Spamfilter'; $wb['email_txt'] = 'E-mail'; -$wb['no_policy'] = '- ikke aktiveret -'; +$wb['inherit_policy'] = '- Inherit domain setting -'; $wb['policy_txt'] = 'Politik'; ?> diff --git a/interface/web/mailuser/lib/lang/el_mail_user_spamfilter.lng b/interface/web/mailuser/lib/lang/el_mail_user_spamfilter.lng index be4bad9050..fc355eb920 100644 --- a/interface/web/mailuser/lib/lang/el_mail_user_spamfilter.lng +++ b/interface/web/mailuser/lib/lang/el_mail_user_spamfilter.lng @@ -2,6 +2,6 @@ $wb['mailbox_spamfilter_txt'] = 'Spamfilter'; $wb['spamfilter_txt'] = 'Spamfilter'; $wb['email_txt'] = 'Email'; -$wb['no_policy'] = '- not enabled -'; +$wb['inherit_policy'] = '- Inherit domain setting -'; $wb['policy_txt'] = 'Policy'; ?> diff --git a/interface/web/mailuser/lib/lang/en_mail_user_spamfilter.lng b/interface/web/mailuser/lib/lang/en_mail_user_spamfilter.lng index 8f95dd37a7..030e4fce59 100644 --- a/interface/web/mailuser/lib/lang/en_mail_user_spamfilter.lng +++ b/interface/web/mailuser/lib/lang/en_mail_user_spamfilter.lng @@ -2,6 +2,6 @@ $wb["mailbox_spamfilter_txt"] = 'Spamfilter'; $wb["spamfilter_txt"] = 'Spamfilter'; $wb["email_txt"] = 'Email'; -$wb["no_policy"] = '- not enabled -'; +$wb['inherit_policy'] = '- Inherit domain setting -'; $wb["policy_txt"] = 'Policy'; -?> \ No newline at end of file +?> diff --git a/interface/web/mailuser/lib/lang/es_mail_user_spamfilter.lng b/interface/web/mailuser/lib/lang/es_mail_user_spamfilter.lng index 31d7ba7c74..2496d26f93 100644 --- a/interface/web/mailuser/lib/lang/es_mail_user_spamfilter.lng +++ b/interface/web/mailuser/lib/lang/es_mail_user_spamfilter.lng @@ -1,7 +1,7 @@ diff --git a/interface/web/mailuser/lib/lang/fi_mail_user_spamfilter.lng b/interface/web/mailuser/lib/lang/fi_mail_user_spamfilter.lng index be4bad9050..fc355eb920 100644 --- a/interface/web/mailuser/lib/lang/fi_mail_user_spamfilter.lng +++ b/interface/web/mailuser/lib/lang/fi_mail_user_spamfilter.lng @@ -2,6 +2,6 @@ $wb['mailbox_spamfilter_txt'] = 'Spamfilter'; $wb['spamfilter_txt'] = 'Spamfilter'; $wb['email_txt'] = 'Email'; -$wb['no_policy'] = '- not enabled -'; +$wb['inherit_policy'] = '- Inherit domain setting -'; $wb['policy_txt'] = 'Policy'; ?> diff --git a/interface/web/mailuser/lib/lang/fr_mail_user_spamfilter.lng b/interface/web/mailuser/lib/lang/fr_mail_user_spamfilter.lng index f6bcd5d32d..1574f45f3f 100644 --- a/interface/web/mailuser/lib/lang/fr_mail_user_spamfilter.lng +++ b/interface/web/mailuser/lib/lang/fr_mail_user_spamfilter.lng @@ -2,6 +2,6 @@ $wb['mailbox_spamfilter_txt'] = 'Filtre anti-spam'; $wb['spamfilter_txt'] = 'Filtre anti-spam'; $wb['email_txt'] = 'E-mail'; -$wb['no_policy'] = '- non activé -'; +$wb['inherit_policy'] = '- Inherit domain setting -'; $wb['policy_txt'] = 'Stratégie'; ?> diff --git a/interface/web/mailuser/lib/lang/hr_mail_user_spamfilter.lng b/interface/web/mailuser/lib/lang/hr_mail_user_spamfilter.lng index 7d7130e816..b2d208a098 100644 --- a/interface/web/mailuser/lib/lang/hr_mail_user_spamfilter.lng +++ b/interface/web/mailuser/lib/lang/hr_mail_user_spamfilter.lng @@ -2,6 +2,6 @@ $wb['mailbox_spamfilter_txt'] = 'Spam filter'; $wb['spamfilter_txt'] = 'Spam filter'; $wb['email_txt'] = 'Email'; -$wb['no_policy'] = '- isključeno -'; +$wb['inherit_policy'] = '- Inherit domain setting -'; $wb['policy_txt'] = 'Pravila'; ?> diff --git a/interface/web/mailuser/lib/lang/hu_mail_user_spamfilter.lng b/interface/web/mailuser/lib/lang/hu_mail_user_spamfilter.lng index be4bad9050..fc355eb920 100644 --- a/interface/web/mailuser/lib/lang/hu_mail_user_spamfilter.lng +++ b/interface/web/mailuser/lib/lang/hu_mail_user_spamfilter.lng @@ -2,6 +2,6 @@ $wb['mailbox_spamfilter_txt'] = 'Spamfilter'; $wb['spamfilter_txt'] = 'Spamfilter'; $wb['email_txt'] = 'Email'; -$wb['no_policy'] = '- not enabled -'; +$wb['inherit_policy'] = '- Inherit domain setting -'; $wb['policy_txt'] = 'Policy'; ?> diff --git a/interface/web/mailuser/lib/lang/id_mail_user_spamfilter.lng b/interface/web/mailuser/lib/lang/id_mail_user_spamfilter.lng index be4bad9050..fc355eb920 100644 --- a/interface/web/mailuser/lib/lang/id_mail_user_spamfilter.lng +++ b/interface/web/mailuser/lib/lang/id_mail_user_spamfilter.lng @@ -2,6 +2,6 @@ $wb['mailbox_spamfilter_txt'] = 'Spamfilter'; $wb['spamfilter_txt'] = 'Spamfilter'; $wb['email_txt'] = 'Email'; -$wb['no_policy'] = '- not enabled -'; +$wb['inherit_policy'] = '- Inherit domain setting -'; $wb['policy_txt'] = 'Policy'; ?> diff --git a/interface/web/mailuser/lib/lang/it_mail_user_spamfilter.lng b/interface/web/mailuser/lib/lang/it_mail_user_spamfilter.lng index 9d4c5496ea..fc355eb920 100644 --- a/interface/web/mailuser/lib/lang/it_mail_user_spamfilter.lng +++ b/interface/web/mailuser/lib/lang/it_mail_user_spamfilter.lng @@ -2,6 +2,6 @@ $wb['mailbox_spamfilter_txt'] = 'Spamfilter'; $wb['spamfilter_txt'] = 'Spamfilter'; $wb['email_txt'] = 'Email'; -$wb['no_policy'] = '- non abilitato -'; +$wb['inherit_policy'] = '- Inherit domain setting -'; $wb['policy_txt'] = 'Policy'; ?> diff --git a/interface/web/mailuser/lib/lang/ja_mail_user_spamfilter.lng b/interface/web/mailuser/lib/lang/ja_mail_user_spamfilter.lng index be4bad9050..fc355eb920 100644 --- a/interface/web/mailuser/lib/lang/ja_mail_user_spamfilter.lng +++ b/interface/web/mailuser/lib/lang/ja_mail_user_spamfilter.lng @@ -2,6 +2,6 @@ $wb['mailbox_spamfilter_txt'] = 'Spamfilter'; $wb['spamfilter_txt'] = 'Spamfilter'; $wb['email_txt'] = 'Email'; -$wb['no_policy'] = '- not enabled -'; +$wb['inherit_policy'] = '- Inherit domain setting -'; $wb['policy_txt'] = 'Policy'; ?> diff --git a/interface/web/mailuser/lib/lang/nl_mail_user_spamfilter.lng b/interface/web/mailuser/lib/lang/nl_mail_user_spamfilter.lng index be4bad9050..fc355eb920 100644 --- a/interface/web/mailuser/lib/lang/nl_mail_user_spamfilter.lng +++ b/interface/web/mailuser/lib/lang/nl_mail_user_spamfilter.lng @@ -2,6 +2,6 @@ $wb['mailbox_spamfilter_txt'] = 'Spamfilter'; $wb['spamfilter_txt'] = 'Spamfilter'; $wb['email_txt'] = 'Email'; -$wb['no_policy'] = '- not enabled -'; +$wb['inherit_policy'] = '- Inherit domain setting -'; $wb['policy_txt'] = 'Policy'; ?> diff --git a/interface/web/mailuser/lib/lang/pl_mail_user_spamfilter.lng b/interface/web/mailuser/lib/lang/pl_mail_user_spamfilter.lng index b371f3ea75..5a530c0c5e 100644 --- a/interface/web/mailuser/lib/lang/pl_mail_user_spamfilter.lng +++ b/interface/web/mailuser/lib/lang/pl_mail_user_spamfilter.lng @@ -2,6 +2,6 @@ $wb['mailbox_spamfilter_txt'] = 'Ustawienia filtra spamu'; $wb['spamfilter_txt'] = 'Filtr spamu'; $wb['email_txt'] = 'E-mail'; -$wb['no_policy'] = '- nie włączony -'; +$wb['inherit_policy'] = '- Inherit domain setting -'; $wb['policy_txt'] = 'Polityka'; ?> diff --git a/interface/web/mailuser/lib/lang/pt_mail_user_spamfilter.lng b/interface/web/mailuser/lib/lang/pt_mail_user_spamfilter.lng index be4bad9050..fc355eb920 100644 --- a/interface/web/mailuser/lib/lang/pt_mail_user_spamfilter.lng +++ b/interface/web/mailuser/lib/lang/pt_mail_user_spamfilter.lng @@ -2,6 +2,6 @@ $wb['mailbox_spamfilter_txt'] = 'Spamfilter'; $wb['spamfilter_txt'] = 'Spamfilter'; $wb['email_txt'] = 'Email'; -$wb['no_policy'] = '- not enabled -'; +$wb['inherit_policy'] = '- Inherit domain setting -'; $wb['policy_txt'] = 'Policy'; ?> diff --git a/interface/web/mailuser/lib/lang/ro_mail_user_spamfilter.lng b/interface/web/mailuser/lib/lang/ro_mail_user_spamfilter.lng index be4bad9050..fc355eb920 100644 --- a/interface/web/mailuser/lib/lang/ro_mail_user_spamfilter.lng +++ b/interface/web/mailuser/lib/lang/ro_mail_user_spamfilter.lng @@ -2,6 +2,6 @@ $wb['mailbox_spamfilter_txt'] = 'Spamfilter'; $wb['spamfilter_txt'] = 'Spamfilter'; $wb['email_txt'] = 'Email'; -$wb['no_policy'] = '- not enabled -'; +$wb['inherit_policy'] = '- Inherit domain setting -'; $wb['policy_txt'] = 'Policy'; ?> diff --git a/interface/web/mailuser/lib/lang/ru_mail_user_spamfilter.lng b/interface/web/mailuser/lib/lang/ru_mail_user_spamfilter.lng index a4b7a48b7f..1a168b7610 100644 --- a/interface/web/mailuser/lib/lang/ru_mail_user_spamfilter.lng +++ b/interface/web/mailuser/lib/lang/ru_mail_user_spamfilter.lng @@ -2,6 +2,6 @@ $wb['mailbox_spamfilter_txt'] = 'Спам-фильтр'; $wb['spamfilter_txt'] = 'СПАМ-фильтр'; $wb['email_txt'] = 'Адрес эл. почты'; -$wb['no_policy'] = '- Отсутствует -'; +$wb['inherit_policy'] = '- Inherit domain setting -'; $wb['policy_txt'] = 'Правило'; ?> diff --git a/interface/web/mailuser/lib/lang/se_mail_user_spamfilter.lng b/interface/web/mailuser/lib/lang/se_mail_user_spamfilter.lng index 7ec5f2a7d8..8cc318e71c 100644 --- a/interface/web/mailuser/lib/lang/se_mail_user_spamfilter.lng +++ b/interface/web/mailuser/lib/lang/se_mail_user_spamfilter.lng @@ -2,6 +2,6 @@ $wb['mailbox_spamfilter_txt'] = 'Spamfilter'; $wb['spamfilter_txt'] = 'Spamfilter'; $wb['email_txt'] = 'Epost'; -$wb['no_policy'] = '- ej aktiverat -'; +$wb['inherit_policy'] = '- Inherit domain setting -'; $wb['policy_txt'] = 'Policy'; ?> diff --git a/interface/web/mailuser/lib/lang/sk_mail_user_spamfilter.lng b/interface/web/mailuser/lib/lang/sk_mail_user_spamfilter.lng index be4bad9050..fc355eb920 100644 --- a/interface/web/mailuser/lib/lang/sk_mail_user_spamfilter.lng +++ b/interface/web/mailuser/lib/lang/sk_mail_user_spamfilter.lng @@ -2,6 +2,6 @@ $wb['mailbox_spamfilter_txt'] = 'Spamfilter'; $wb['spamfilter_txt'] = 'Spamfilter'; $wb['email_txt'] = 'Email'; -$wb['no_policy'] = '- not enabled -'; +$wb['inherit_policy'] = '- Inherit domain setting -'; $wb['policy_txt'] = 'Policy'; ?> diff --git a/interface/web/mailuser/lib/lang/tr_mail_user_spamfilter.lng b/interface/web/mailuser/lib/lang/tr_mail_user_spamfilter.lng index 3426385a2e..25bd43520a 100644 --- a/interface/web/mailuser/lib/lang/tr_mail_user_spamfilter.lng +++ b/interface/web/mailuser/lib/lang/tr_mail_user_spamfilter.lng @@ -2,6 +2,6 @@ $wb['mailbox_spamfilter_txt'] = 'Önemsiz İleti Süzgeci'; $wb['spamfilter_txt'] = 'Önemsiz ileti süzgeci'; $wb['email_txt'] = 'E-posta'; -$wb['no_policy'] = '- devre dışı -'; +$wb['inherit_policy'] = '- Inherit domain setting -'; $wb['policy_txt'] = 'Kural'; ?> diff --git a/interface/web/mailuser/mail_user_spamfilter_edit.php b/interface/web/mailuser/mail_user_spamfilter_edit.php index abbea21937..75649b5a70 100644 --- a/interface/web/mailuser/mail_user_spamfilter_edit.php +++ b/interface/web/mailuser/mail_user_spamfilter_edit.php @@ -52,7 +52,7 @@ class page_action extends tform_actions { function onShow() { global $app; - + $this->id = $app->functions->intval($_SESSION['s']['user']['mailuser_id']); parent::onShow(); @@ -118,7 +118,7 @@ class page_action extends tform_actions { $tmp_user = $app->db->queryOneRecord("SELECT policy_id FROM spamfilter_users WHERE email = ?", $rec['email']); $sql = "SELECT id, policy_name FROM spamfilter_policy WHERE ".$app->tform->getAuthSQL('r'); $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 a460495999657c69923e267a3bd7bdcf670abbda Mon Sep 17 00:00:00 2001 From: thom Date: Thu, 20 Aug 2020 17:55:07 +0200 Subject: [PATCH 7/8] Add autoresponder changes from !1058 for mailusers (#5697) --- .../form/mail_user_autoresponder.tform.php | 16 ++++++++++------ .../lib/lang/ar_mail_user_autoresponder.lng | 2 +- .../lib/lang/bg_mail_user_autoresponder.lng | 2 +- .../lib/lang/br_mail_user_autoresponder.lng | 2 +- .../lib/lang/ca_mail_user_autoresponder.lng | 2 +- .../lib/lang/cz_mail_user_autoresponder.lng | 2 +- .../lib/lang/de_mail_user_autoresponder.lng | 2 +- .../lib/lang/dk_mail_user_autoresponder.lng | 2 +- .../lib/lang/el_mail_user_autoresponder.lng | 2 +- .../lib/lang/es_mail_user_autoresponder.lng | 2 +- .../lib/lang/fi_mail_user_autoresponder.lng | 2 +- .../lib/lang/hr_mail_user_autoresponder.lng | 2 +- .../lib/lang/hu_mail_user_autoresponder.lng | 2 +- .../lib/lang/id_mail_user_autoresponder.lng | 2 +- .../lib/lang/it_mail_user_autoresponder.lng | 2 +- .../lib/lang/ja_mail_user_autoresponder.lng | 2 +- .../lib/lang/pl_mail_user_autoresponder.lng | 2 +- .../lib/lang/pt_mail_user_autoresponder.lng | 2 +- .../lib/lang/ro_mail_user_autoresponder.lng | 2 +- .../lib/lang/ru_mail_user_autoresponder.lng | 2 +- .../lib/lang/sk_mail_user_autoresponder.lng | 2 +- .../lib/lang/tr_mail_user_autoresponder.lng | 2 +- 22 files changed, 31 insertions(+), 27 deletions(-) diff --git a/interface/web/mailuser/form/mail_user_autoresponder.tform.php b/interface/web/mailuser/form/mail_user_autoresponder.tform.php index e642534c13..fa4025b532 100644 --- a/interface/web/mailuser/form/mail_user_autoresponder.tform.php +++ b/interface/web/mailuser/form/mail_user_autoresponder.tform.php @@ -94,16 +94,20 @@ $form["tabs"]['autoresponder'] = array ( 'autoresponder_start_date' => array ( 'datatype' => 'DATETIME', 'formtype' => 'DATETIME', - 'validators'=> array ( 0 => array ( 'type' => 'CUSTOM', - 'class' => 'validate_autoresponder', - 'function' => 'start_date', - 'errmsg'=> 'autoresponder_start_date_isfuture'), - ), + 'validators'=> array ( + 0 => array ( 'type' => 'ISDATETIME', + 'allowempty' => 'y', + 'errmsg'=> 'autoresponder_start_date_is_no_date'), + ) ), 'autoresponder_end_date' => array ( 'datatype' => 'DATETIME', 'formtype' => 'DATETIME', - 'validators' => array ( 0 => array ( 'type' => 'CUSTOM', + 'validators'=> array ( + 0 => array ( 'type' => 'ISDATETIME', + 'allowempty' => 'y', + 'errmsg'=> 'autoresponder_end_date_is_no_date'), + 1 => array ( 'type' => 'CUSTOM', 'class' => 'validate_autoresponder', 'function' => 'end_date', 'errmsg'=> 'autoresponder_end_date_isgreater'), diff --git a/interface/web/mailuser/lib/lang/ar_mail_user_autoresponder.lng b/interface/web/mailuser/lib/lang/ar_mail_user_autoresponder.lng index 9dcd0e5dd3..b913b5cfa1 100644 --- a/interface/web/mailuser/lib/lang/ar_mail_user_autoresponder.lng +++ b/interface/web/mailuser/lib/lang/ar_mail_user_autoresponder.lng @@ -6,7 +6,7 @@ $wb['autoresponder_txt'] = 'Active'; $wb['autoresponder_start_date_txt'] = 'Start on'; $wb['autoresponder_start_date_isfuture'] = 'Start date cannot be in the past.'; $wb['autoresponder_end_date_txt'] = 'End by'; -$wb['autoresponder_end_date_isgreater'] = 'End date must be set and be later than start date.'; +$wb['autoresponder_end_date_isgreater'] = 'End date must be later than start date.'; $wb['autoresponder_active'] = 'Enable the autoresponder'; $wb['now_txt'] = 'Now'; $wb['autoresponder_subject_txt'] = 'Subject'; diff --git a/interface/web/mailuser/lib/lang/bg_mail_user_autoresponder.lng b/interface/web/mailuser/lib/lang/bg_mail_user_autoresponder.lng index 9dcd0e5dd3..b913b5cfa1 100644 --- a/interface/web/mailuser/lib/lang/bg_mail_user_autoresponder.lng +++ b/interface/web/mailuser/lib/lang/bg_mail_user_autoresponder.lng @@ -6,7 +6,7 @@ $wb['autoresponder_txt'] = 'Active'; $wb['autoresponder_start_date_txt'] = 'Start on'; $wb['autoresponder_start_date_isfuture'] = 'Start date cannot be in the past.'; $wb['autoresponder_end_date_txt'] = 'End by'; -$wb['autoresponder_end_date_isgreater'] = 'End date must be set and be later than start date.'; +$wb['autoresponder_end_date_isgreater'] = 'End date must be later than start date.'; $wb['autoresponder_active'] = 'Enable the autoresponder'; $wb['now_txt'] = 'Now'; $wb['autoresponder_subject_txt'] = 'Subject'; diff --git a/interface/web/mailuser/lib/lang/br_mail_user_autoresponder.lng b/interface/web/mailuser/lib/lang/br_mail_user_autoresponder.lng index 9de387d798..3783bbcb73 100644 --- a/interface/web/mailuser/lib/lang/br_mail_user_autoresponder.lng +++ b/interface/web/mailuser/lib/lang/br_mail_user_autoresponder.lng @@ -6,7 +6,7 @@ $wb['autoresponder_txt'] = 'Ativo'; $wb['autoresponder_start_date_txt'] = 'Iniciar em'; $wb['autoresponder_start_date_isfuture'] = 'O campo "Iniciar em" não pode ser menor que data atual.'; $wb['autoresponder_end_date_txt'] = 'Terminar em'; -$wb['autoresponder_end_date_isgreater'] = 'O campo "Terminar em" não pode ser menor que "Iniciar em".'; +$wb['autoresponder_end_date_isgreater'] = 'End date must be later than start date.'; $wb['autoresponder_active'] = 'Habilitar auto-resposta'; $wb['now_txt'] = 'Agora'; $wb['autoresponder_subject_txt'] = 'Assunto'; diff --git a/interface/web/mailuser/lib/lang/ca_mail_user_autoresponder.lng b/interface/web/mailuser/lib/lang/ca_mail_user_autoresponder.lng index 9dcd0e5dd3..b913b5cfa1 100644 --- a/interface/web/mailuser/lib/lang/ca_mail_user_autoresponder.lng +++ b/interface/web/mailuser/lib/lang/ca_mail_user_autoresponder.lng @@ -6,7 +6,7 @@ $wb['autoresponder_txt'] = 'Active'; $wb['autoresponder_start_date_txt'] = 'Start on'; $wb['autoresponder_start_date_isfuture'] = 'Start date cannot be in the past.'; $wb['autoresponder_end_date_txt'] = 'End by'; -$wb['autoresponder_end_date_isgreater'] = 'End date must be set and be later than start date.'; +$wb['autoresponder_end_date_isgreater'] = 'End date must be later than start date.'; $wb['autoresponder_active'] = 'Enable the autoresponder'; $wb['now_txt'] = 'Now'; $wb['autoresponder_subject_txt'] = 'Subject'; diff --git a/interface/web/mailuser/lib/lang/cz_mail_user_autoresponder.lng b/interface/web/mailuser/lib/lang/cz_mail_user_autoresponder.lng index ef3aeb42da..20134a87b5 100644 --- a/interface/web/mailuser/lib/lang/cz_mail_user_autoresponder.lng +++ b/interface/web/mailuser/lib/lang/cz_mail_user_autoresponder.lng @@ -6,7 +6,7 @@ $wb['autoresponder_txt'] = 'Aktivní'; $wb['autoresponder_start_date_txt'] = 'Začít od'; $wb['autoresponder_start_date_isfuture'] = 'Datum zahájení nesmí být v minulosti.'; $wb['autoresponder_end_date_txt'] = 'Skončit'; -$wb['autoresponder_end_date_isgreater'] = 'Datum ukončení musí být nastaven a musí být pozdější než datum zahájení.'; +$wb['autoresponder_end_date_isgreater'] = 'End date must be later than start date.'; $wb['autoresponder_active'] = 'Povolit automatický odpovídač'; $wb['now_txt'] = 'Nyní'; $wb['autoresponder_subject_txt'] = 'Předmět e-mailu'; diff --git a/interface/web/mailuser/lib/lang/de_mail_user_autoresponder.lng b/interface/web/mailuser/lib/lang/de_mail_user_autoresponder.lng index f8d4e46b12..af164c475d 100644 --- a/interface/web/mailuser/lib/lang/de_mail_user_autoresponder.lng +++ b/interface/web/mailuser/lib/lang/de_mail_user_autoresponder.lng @@ -6,7 +6,7 @@ $wb['autoresponder_txt'] = 'Aktiv'; $wb['autoresponder_start_date_txt'] = 'Start am'; $wb['autoresponder_start_date_isfuture'] = 'Start Datum kann nicht in der Vergangenheit sein.'; $wb['autoresponder_end_date_txt'] = 'Ende am'; -$wb['autoresponder_end_date_isgreater'] = 'End Datum muss gesetzt werden und nach dem Start Datum sein.'; +$wb['autoresponder_end_date_isgreater'] = 'End Datum muss nach dem Start Datum sein.'; $wb['autoresponder_active'] = 'Autoresponder aktivieren'; $wb['now_txt'] = 'Jetzt'; $wb['autoresponder_subject_txt'] = 'Betreff'; diff --git a/interface/web/mailuser/lib/lang/dk_mail_user_autoresponder.lng b/interface/web/mailuser/lib/lang/dk_mail_user_autoresponder.lng index 81bee87afb..e9cf7ba82a 100644 --- a/interface/web/mailuser/lib/lang/dk_mail_user_autoresponder.lng +++ b/interface/web/mailuser/lib/lang/dk_mail_user_autoresponder.lng @@ -6,7 +6,7 @@ $wb['autoresponder_txt'] = 'Aktiv'; $wb['autoresponder_start_date_txt'] = 'Start d.'; $wb['autoresponder_start_date_isfuture'] = 'Start dato kan ikke være i fortid.'; $wb['autoresponder_end_date_txt'] = 'Slut d.'; -$wb['autoresponder_end_date_isgreater'] = 'Slut dato skal indtastes og være senere end start dato.'; +$wb['autoresponder_end_date_isgreater'] = 'End date must be later than start date.'; $wb['autoresponder_active'] = 'Aktiver autosvarer'; $wb['now_txt'] = 'Nu'; $wb['autoresponder_subject_txt'] = 'Emne'; diff --git a/interface/web/mailuser/lib/lang/el_mail_user_autoresponder.lng b/interface/web/mailuser/lib/lang/el_mail_user_autoresponder.lng index 9dcd0e5dd3..b913b5cfa1 100644 --- a/interface/web/mailuser/lib/lang/el_mail_user_autoresponder.lng +++ b/interface/web/mailuser/lib/lang/el_mail_user_autoresponder.lng @@ -6,7 +6,7 @@ $wb['autoresponder_txt'] = 'Active'; $wb['autoresponder_start_date_txt'] = 'Start on'; $wb['autoresponder_start_date_isfuture'] = 'Start date cannot be in the past.'; $wb['autoresponder_end_date_txt'] = 'End by'; -$wb['autoresponder_end_date_isgreater'] = 'End date must be set and be later than start date.'; +$wb['autoresponder_end_date_isgreater'] = 'End date must be later than start date.'; $wb['autoresponder_active'] = 'Enable the autoresponder'; $wb['now_txt'] = 'Now'; $wb['autoresponder_subject_txt'] = 'Subject'; diff --git a/interface/web/mailuser/lib/lang/es_mail_user_autoresponder.lng b/interface/web/mailuser/lib/lang/es_mail_user_autoresponder.lng index 577951ea2b..04e55b28b9 100644 --- a/interface/web/mailuser/lib/lang/es_mail_user_autoresponder.lng +++ b/interface/web/mailuser/lib/lang/es_mail_user_autoresponder.lng @@ -1,6 +1,6 @@ Date: Wed, 26 Aug 2020 12:37:03 +0200 Subject: [PATCH 8/8] Add changes from !1119 for mailusers --- interface/web/mailuser/form/mail_user_filter.tform.php | 2 +- interface/web/mailuser/lib/lang/ar_mail_user_filter.lng | 1 + interface/web/mailuser/lib/lang/bg_mail_user_filter.lng | 1 + interface/web/mailuser/lib/lang/br_mail_user_filter.lng | 1 + interface/web/mailuser/lib/lang/ca_mail_user_filter.lng | 1 + interface/web/mailuser/lib/lang/cz_mail_user_filter.lng | 1 + interface/web/mailuser/lib/lang/de_mail_user_filter.lng | 1 + interface/web/mailuser/lib/lang/dk_mail_user_filter.lng | 1 + interface/web/mailuser/lib/lang/el_mail_user_filter.lng | 1 + interface/web/mailuser/lib/lang/en_mail_user_filter.lng | 1 + interface/web/mailuser/lib/lang/es_mail_user_filter.lng | 1 + interface/web/mailuser/lib/lang/fi_mail_user_filter.lng | 1 + interface/web/mailuser/lib/lang/fr_mail_user_filter.lng | 1 + interface/web/mailuser/lib/lang/hr_mail_user_filter.lng | 1 + interface/web/mailuser/lib/lang/hu_mail_user_filter.lng | 1 + interface/web/mailuser/lib/lang/id_mail_user_filter.lng | 1 + interface/web/mailuser/lib/lang/it_mail_user_filter.lng | 1 + interface/web/mailuser/lib/lang/ja_mail_user_filter.lng | 1 + interface/web/mailuser/lib/lang/nl_mail_user_filter.lng | 1 + interface/web/mailuser/lib/lang/pl_mail_user_filter.lng | 1 + interface/web/mailuser/lib/lang/pt_mail_user_filter.lng | 1 + interface/web/mailuser/lib/lang/ro_mail_user_filter.lng | 1 + interface/web/mailuser/lib/lang/ru_mail_user_filter.lng | 1 + interface/web/mailuser/lib/lang/se_mail_user_filter.lng | 1 + interface/web/mailuser/lib/lang/sk_mail_user_filter.lng | 1 + interface/web/mailuser/lib/lang/tr_mail_user_filter.lng | 1 + 26 files changed, 26 insertions(+), 1 deletion(-) diff --git a/interface/web/mailuser/form/mail_user_filter.tform.php b/interface/web/mailuser/form/mail_user_filter.tform.php index 395b9b83f2..0f454fa6f7 100644 --- a/interface/web/mailuser/form/mail_user_filter.tform.php +++ b/interface/web/mailuser/form/mail_user_filter.tform.php @@ -95,7 +95,7 @@ $form["tabs"]['filter'] = array ( 'formtype' => 'SELECT', 'default' => '', //'value' => array('contains'=>'contains_txt','is' => 'Is','begins'=>'Begins with','ends'=>'Ends with') - 'value' => array('contains'=>'contains_txt', 'is' => 'is_txt', 'begins'=>'begins_with_txt', 'ends'=>'ends_with_txt', 'localpart' => 'localpart_txt', 'domain' => 'domain_txt') + 'value' => array('contains'=>'contains_txt', 'is'=>'is_txt', 'begins'=>'begins_with_txt', 'ends'=>'ends_with_txt', 'regex'=>'regex_txt', 'localpart'=>'localpart_txt', 'domain'=>'domain_txt') ), 'searchterm' => array ( 'datatype' => 'VARCHAR', diff --git a/interface/web/mailuser/lib/lang/ar_mail_user_filter.lng b/interface/web/mailuser/lib/lang/ar_mail_user_filter.lng index a5fdf679cf..0df6e0b75b 100644 --- a/interface/web/mailuser/lib/lang/ar_mail_user_filter.lng +++ b/interface/web/mailuser/lib/lang/ar_mail_user_filter.lng @@ -17,6 +17,7 @@ $wb['is_txt'] = 'Is'; $wb['begins_with_txt'] = 'Begins with'; $wb['ends_with_txt'] = 'Ends with'; $wb['move_to_txt'] = 'Move to'; +$wb['regex_txt'] = 'Matches Regex'; $wb['delete_txt'] = 'Delete'; $wb['mailbox_filter_txt'] = 'Mailbox filter'; $wb['header_txt'] = 'Header'; diff --git a/interface/web/mailuser/lib/lang/bg_mail_user_filter.lng b/interface/web/mailuser/lib/lang/bg_mail_user_filter.lng index a5fdf679cf..0df6e0b75b 100644 --- a/interface/web/mailuser/lib/lang/bg_mail_user_filter.lng +++ b/interface/web/mailuser/lib/lang/bg_mail_user_filter.lng @@ -17,6 +17,7 @@ $wb['is_txt'] = 'Is'; $wb['begins_with_txt'] = 'Begins with'; $wb['ends_with_txt'] = 'Ends with'; $wb['move_to_txt'] = 'Move to'; +$wb['regex_txt'] = 'Matches Regex'; $wb['delete_txt'] = 'Delete'; $wb['mailbox_filter_txt'] = 'Mailbox filter'; $wb['header_txt'] = 'Header'; diff --git a/interface/web/mailuser/lib/lang/br_mail_user_filter.lng b/interface/web/mailuser/lib/lang/br_mail_user_filter.lng index ebd4d36628..88a7271391 100644 --- a/interface/web/mailuser/lib/lang/br_mail_user_filter.lng +++ b/interface/web/mailuser/lib/lang/br_mail_user_filter.lng @@ -17,6 +17,7 @@ $wb['is_txt'] = 'é'; $wb['begins_with_txt'] = 'Iniciando com'; $wb['ends_with_txt'] = 'Finalizando com'; $wb['move_to_txt'] = 'Mover para'; +$wb['regex_txt'] = 'Matches Regex'; $wb['delete_txt'] = 'Remover'; $wb['header_txt'] = 'Header'; $wb['size_over_txt'] = 'Email size over (KB)'; diff --git a/interface/web/mailuser/lib/lang/ca_mail_user_filter.lng b/interface/web/mailuser/lib/lang/ca_mail_user_filter.lng index a5fdf679cf..0df6e0b75b 100644 --- a/interface/web/mailuser/lib/lang/ca_mail_user_filter.lng +++ b/interface/web/mailuser/lib/lang/ca_mail_user_filter.lng @@ -17,6 +17,7 @@ $wb['is_txt'] = 'Is'; $wb['begins_with_txt'] = 'Begins with'; $wb['ends_with_txt'] = 'Ends with'; $wb['move_to_txt'] = 'Move to'; +$wb['regex_txt'] = 'Matches Regex'; $wb['delete_txt'] = 'Delete'; $wb['mailbox_filter_txt'] = 'Mailbox filter'; $wb['header_txt'] = 'Header'; diff --git a/interface/web/mailuser/lib/lang/cz_mail_user_filter.lng b/interface/web/mailuser/lib/lang/cz_mail_user_filter.lng index 95903569bf..010427341e 100644 --- a/interface/web/mailuser/lib/lang/cz_mail_user_filter.lng +++ b/interface/web/mailuser/lib/lang/cz_mail_user_filter.lng @@ -16,6 +16,7 @@ $wb['is_txt'] = 'Je'; $wb['begins_with_txt'] = 'Začíná na'; $wb['ends_with_txt'] = 'Končí na'; $wb['move_to_txt'] = 'Přesunout do'; +$wb['regex_txt'] = 'Matches Regex'; $wb['delete_txt'] = 'Smazat'; $wb['mailbox_filter_txt'] = 'Mailbox filter'; $wb['header_txt'] = 'Header'; diff --git a/interface/web/mailuser/lib/lang/de_mail_user_filter.lng b/interface/web/mailuser/lib/lang/de_mail_user_filter.lng index dbd1803954..5c7d5c20d0 100644 --- a/interface/web/mailuser/lib/lang/de_mail_user_filter.lng +++ b/interface/web/mailuser/lib/lang/de_mail_user_filter.lng @@ -17,6 +17,7 @@ $wb['is_txt'] = 'Ist'; $wb['begins_with_txt'] = 'Startet mit'; $wb['ends_with_txt'] = 'Endet mit'; $wb['move_to_txt'] = 'Verschieben nach'; +$wb['regex_txt'] = 'Matches Regex'; $wb['delete_txt'] = 'Löschen'; $wb['header_txt'] = 'Header'; $wb['size_over_txt'] = 'Email size over (KB)'; diff --git a/interface/web/mailuser/lib/lang/dk_mail_user_filter.lng b/interface/web/mailuser/lib/lang/dk_mail_user_filter.lng index f911747a49..e2325c6902 100644 --- a/interface/web/mailuser/lib/lang/dk_mail_user_filter.lng +++ b/interface/web/mailuser/lib/lang/dk_mail_user_filter.lng @@ -17,6 +17,7 @@ $wb['is_txt'] = 'Er'; $wb['begins_with_txt'] = 'Begynder med'; $wb['ends_with_txt'] = 'Slutter med'; $wb['move_to_txt'] = 'Flyt til'; +$wb['regex_txt'] = 'Matches Regex'; $wb['delete_txt'] = 'Slet'; $wb['mailbox_filter_txt'] = 'Mailbox filter'; $wb['header_txt'] = 'Header'; diff --git a/interface/web/mailuser/lib/lang/el_mail_user_filter.lng b/interface/web/mailuser/lib/lang/el_mail_user_filter.lng index a5fdf679cf..0df6e0b75b 100644 --- a/interface/web/mailuser/lib/lang/el_mail_user_filter.lng +++ b/interface/web/mailuser/lib/lang/el_mail_user_filter.lng @@ -17,6 +17,7 @@ $wb['is_txt'] = 'Is'; $wb['begins_with_txt'] = 'Begins with'; $wb['ends_with_txt'] = 'Ends with'; $wb['move_to_txt'] = 'Move to'; +$wb['regex_txt'] = 'Matches Regex'; $wb['delete_txt'] = 'Delete'; $wb['mailbox_filter_txt'] = 'Mailbox filter'; $wb['header_txt'] = 'Header'; diff --git a/interface/web/mailuser/lib/lang/en_mail_user_filter.lng b/interface/web/mailuser/lib/lang/en_mail_user_filter.lng index 9d5125c169..fb587d4380 100644 --- a/interface/web/mailuser/lib/lang/en_mail_user_filter.lng +++ b/interface/web/mailuser/lib/lang/en_mail_user_filter.lng @@ -18,6 +18,7 @@ $wb['is_txt'] = 'Is'; $wb['begins_with_txt'] = 'Begins with'; $wb['ends_with_txt'] = 'Ends with'; $wb['move_to_txt'] = 'Move to'; +$wb['regex_txt'] = 'Matches Regex'; $wb['delete_txt'] = 'Delete'; $wb['header_txt'] = 'Header'; $wb['size_over_txt'] = 'Email size over (KB)'; diff --git a/interface/web/mailuser/lib/lang/es_mail_user_filter.lng b/interface/web/mailuser/lib/lang/es_mail_user_filter.lng index 4ec6877cfc..3485ea4601 100644 --- a/interface/web/mailuser/lib/lang/es_mail_user_filter.lng +++ b/interface/web/mailuser/lib/lang/es_mail_user_filter.lng @@ -3,6 +3,7 @@ $wb['action_txt'] = 'Acción'; $wb['active_txt'] = 'Habilitado'; $wb['begins_with_txt'] = 'Comienza con'; $wb['contains_txt'] = 'Contiene'; +$wb['regex_txt'] = 'Matches Regex'; $wb['delete_txt'] = 'Borrar'; $wb['ends_with_txt'] = 'Termina con'; $wb['from_txt'] = 'De'; diff --git a/interface/web/mailuser/lib/lang/fi_mail_user_filter.lng b/interface/web/mailuser/lib/lang/fi_mail_user_filter.lng index a5fdf679cf..0df6e0b75b 100644 --- a/interface/web/mailuser/lib/lang/fi_mail_user_filter.lng +++ b/interface/web/mailuser/lib/lang/fi_mail_user_filter.lng @@ -17,6 +17,7 @@ $wb['is_txt'] = 'Is'; $wb['begins_with_txt'] = 'Begins with'; $wb['ends_with_txt'] = 'Ends with'; $wb['move_to_txt'] = 'Move to'; +$wb['regex_txt'] = 'Matches Regex'; $wb['delete_txt'] = 'Delete'; $wb['mailbox_filter_txt'] = 'Mailbox filter'; $wb['header_txt'] = 'Header'; diff --git a/interface/web/mailuser/lib/lang/fr_mail_user_filter.lng b/interface/web/mailuser/lib/lang/fr_mail_user_filter.lng index b6f2c193b4..d2b513b155 100644 --- a/interface/web/mailuser/lib/lang/fr_mail_user_filter.lng +++ b/interface/web/mailuser/lib/lang/fr_mail_user_filter.lng @@ -16,6 +16,7 @@ $wb['is_txt'] = 'est'; $wb['begins_with_txt'] = 'Commence par'; $wb['ends_with_txt'] = 'Fini par'; $wb['move_to_txt'] = 'Déplacer vers'; +$wb['regex_txt'] = 'Matches Regex'; $wb['delete_txt'] = 'Supprimer'; $wb['mailbox_filter_txt'] = 'Mailbox filter'; $wb['header_txt'] = 'Header'; diff --git a/interface/web/mailuser/lib/lang/hr_mail_user_filter.lng b/interface/web/mailuser/lib/lang/hr_mail_user_filter.lng index f87ed828a4..dfb58bd3d2 100644 --- a/interface/web/mailuser/lib/lang/hr_mail_user_filter.lng +++ b/interface/web/mailuser/lib/lang/hr_mail_user_filter.lng @@ -16,6 +16,7 @@ $wb['is_txt'] = 'je'; $wb['begins_with_txt'] = 'Počinje sa'; $wb['ends_with_txt'] = 'Završava sa'; $wb['move_to_txt'] = 'Prebaci u '; +$wb['regex_txt'] = 'Matches Regex'; $wb['delete_txt'] = 'Obriši'; $wb['mailbox_filter_txt'] = 'Mailbox filter'; $wb['header_txt'] = 'Header'; diff --git a/interface/web/mailuser/lib/lang/hu_mail_user_filter.lng b/interface/web/mailuser/lib/lang/hu_mail_user_filter.lng index a5fdf679cf..0df6e0b75b 100644 --- a/interface/web/mailuser/lib/lang/hu_mail_user_filter.lng +++ b/interface/web/mailuser/lib/lang/hu_mail_user_filter.lng @@ -17,6 +17,7 @@ $wb['is_txt'] = 'Is'; $wb['begins_with_txt'] = 'Begins with'; $wb['ends_with_txt'] = 'Ends with'; $wb['move_to_txt'] = 'Move to'; +$wb['regex_txt'] = 'Matches Regex'; $wb['delete_txt'] = 'Delete'; $wb['mailbox_filter_txt'] = 'Mailbox filter'; $wb['header_txt'] = 'Header'; diff --git a/interface/web/mailuser/lib/lang/id_mail_user_filter.lng b/interface/web/mailuser/lib/lang/id_mail_user_filter.lng index a5fdf679cf..0df6e0b75b 100644 --- a/interface/web/mailuser/lib/lang/id_mail_user_filter.lng +++ b/interface/web/mailuser/lib/lang/id_mail_user_filter.lng @@ -17,6 +17,7 @@ $wb['is_txt'] = 'Is'; $wb['begins_with_txt'] = 'Begins with'; $wb['ends_with_txt'] = 'Ends with'; $wb['move_to_txt'] = 'Move to'; +$wb['regex_txt'] = 'Matches Regex'; $wb['delete_txt'] = 'Delete'; $wb['mailbox_filter_txt'] = 'Mailbox filter'; $wb['header_txt'] = 'Header'; diff --git a/interface/web/mailuser/lib/lang/it_mail_user_filter.lng b/interface/web/mailuser/lib/lang/it_mail_user_filter.lng index b47458fdbe..a0b9e360c2 100644 --- a/interface/web/mailuser/lib/lang/it_mail_user_filter.lng +++ b/interface/web/mailuser/lib/lang/it_mail_user_filter.lng @@ -16,6 +16,7 @@ $wb['is_txt'] = 'è'; $wb['begins_with_txt'] = 'Inizia con'; $wb['ends_with_txt'] = 'Termina con'; $wb['move_to_txt'] = 'Sposta in'; +$wb['regex_txt'] = 'Matches Regex'; $wb['delete_txt'] = 'Elimina'; $wb['mailbox_filter_txt'] = 'Mailbox filter'; $wb['header_txt'] = 'Header'; diff --git a/interface/web/mailuser/lib/lang/ja_mail_user_filter.lng b/interface/web/mailuser/lib/lang/ja_mail_user_filter.lng index a5fdf679cf..0df6e0b75b 100644 --- a/interface/web/mailuser/lib/lang/ja_mail_user_filter.lng +++ b/interface/web/mailuser/lib/lang/ja_mail_user_filter.lng @@ -17,6 +17,7 @@ $wb['is_txt'] = 'Is'; $wb['begins_with_txt'] = 'Begins with'; $wb['ends_with_txt'] = 'Ends with'; $wb['move_to_txt'] = 'Move to'; +$wb['regex_txt'] = 'Matches Regex'; $wb['delete_txt'] = 'Delete'; $wb['mailbox_filter_txt'] = 'Mailbox filter'; $wb['header_txt'] = 'Header'; diff --git a/interface/web/mailuser/lib/lang/nl_mail_user_filter.lng b/interface/web/mailuser/lib/lang/nl_mail_user_filter.lng index ba318014ab..91dfd85373 100644 --- a/interface/web/mailuser/lib/lang/nl_mail_user_filter.lng +++ b/interface/web/mailuser/lib/lang/nl_mail_user_filter.lng @@ -16,6 +16,7 @@ $wb['is_txt'] = "Is"; $wb['begins_with_txt'] = "Begint met"; $wb['ends_with_txt'] = "Endigt in"; $wb['move_to_txt'] = "Verplaatsen naar"; +$wb['regex_txt'] = 'Matches Regex'; $wb['delete_txt'] = "Verwijderen"; $wb['mailbox_filter_txt'] = "Mailbox filter"; $wb['header_txt'] = 'Header'; diff --git a/interface/web/mailuser/lib/lang/pl_mail_user_filter.lng b/interface/web/mailuser/lib/lang/pl_mail_user_filter.lng index a5fdf679cf..0df6e0b75b 100644 --- a/interface/web/mailuser/lib/lang/pl_mail_user_filter.lng +++ b/interface/web/mailuser/lib/lang/pl_mail_user_filter.lng @@ -17,6 +17,7 @@ $wb['is_txt'] = 'Is'; $wb['begins_with_txt'] = 'Begins with'; $wb['ends_with_txt'] = 'Ends with'; $wb['move_to_txt'] = 'Move to'; +$wb['regex_txt'] = 'Matches Regex'; $wb['delete_txt'] = 'Delete'; $wb['mailbox_filter_txt'] = 'Mailbox filter'; $wb['header_txt'] = 'Header'; diff --git a/interface/web/mailuser/lib/lang/pt_mail_user_filter.lng b/interface/web/mailuser/lib/lang/pt_mail_user_filter.lng index a5fdf679cf..0df6e0b75b 100644 --- a/interface/web/mailuser/lib/lang/pt_mail_user_filter.lng +++ b/interface/web/mailuser/lib/lang/pt_mail_user_filter.lng @@ -17,6 +17,7 @@ $wb['is_txt'] = 'Is'; $wb['begins_with_txt'] = 'Begins with'; $wb['ends_with_txt'] = 'Ends with'; $wb['move_to_txt'] = 'Move to'; +$wb['regex_txt'] = 'Matches Regex'; $wb['delete_txt'] = 'Delete'; $wb['mailbox_filter_txt'] = 'Mailbox filter'; $wb['header_txt'] = 'Header'; diff --git a/interface/web/mailuser/lib/lang/ro_mail_user_filter.lng b/interface/web/mailuser/lib/lang/ro_mail_user_filter.lng index a5fdf679cf..0df6e0b75b 100644 --- a/interface/web/mailuser/lib/lang/ro_mail_user_filter.lng +++ b/interface/web/mailuser/lib/lang/ro_mail_user_filter.lng @@ -17,6 +17,7 @@ $wb['is_txt'] = 'Is'; $wb['begins_with_txt'] = 'Begins with'; $wb['ends_with_txt'] = 'Ends with'; $wb['move_to_txt'] = 'Move to'; +$wb['regex_txt'] = 'Matches Regex'; $wb['delete_txt'] = 'Delete'; $wb['mailbox_filter_txt'] = 'Mailbox filter'; $wb['header_txt'] = 'Header'; diff --git a/interface/web/mailuser/lib/lang/ru_mail_user_filter.lng b/interface/web/mailuser/lib/lang/ru_mail_user_filter.lng index 1f2dc5ded1..590763ed43 100644 --- a/interface/web/mailuser/lib/lang/ru_mail_user_filter.lng +++ b/interface/web/mailuser/lib/lang/ru_mail_user_filter.lng @@ -16,6 +16,7 @@ $wb['is_txt'] = 'Равно'; $wb['begins_with_txt'] = 'Начинается с'; $wb['ends_with_txt'] = 'Заканчивается на'; $wb['move_to_txt'] = 'Переместить в'; +$wb['regex_txt'] = 'Matches Regex'; $wb['delete_txt'] = 'Удалить'; $wb['mailbox_filter_txt'] = 'Фильтр почтового ящика'; $wb['header_txt'] = 'Header'; diff --git a/interface/web/mailuser/lib/lang/se_mail_user_filter.lng b/interface/web/mailuser/lib/lang/se_mail_user_filter.lng index 590239681e..4f7e093d77 100644 --- a/interface/web/mailuser/lib/lang/se_mail_user_filter.lng +++ b/interface/web/mailuser/lib/lang/se_mail_user_filter.lng @@ -16,6 +16,7 @@ $wb['is_txt'] = 'Är'; $wb['begins_with_txt'] = 'Börjar med'; $wb['ends_with_txt'] = 'Slutar med'; $wb['move_to_txt'] = 'Flytta till'; +$wb['regex_txt'] = 'Matches Regex'; $wb['delete_txt'] = 'Radera'; $wb['mailbox_filter_txt'] = 'Mailbox filter'; $wb['header_txt'] = 'Header'; diff --git a/interface/web/mailuser/lib/lang/sk_mail_user_filter.lng b/interface/web/mailuser/lib/lang/sk_mail_user_filter.lng index a5fdf679cf..0df6e0b75b 100644 --- a/interface/web/mailuser/lib/lang/sk_mail_user_filter.lng +++ b/interface/web/mailuser/lib/lang/sk_mail_user_filter.lng @@ -17,6 +17,7 @@ $wb['is_txt'] = 'Is'; $wb['begins_with_txt'] = 'Begins with'; $wb['ends_with_txt'] = 'Ends with'; $wb['move_to_txt'] = 'Move to'; +$wb['regex_txt'] = 'Matches Regex'; $wb['delete_txt'] = 'Delete'; $wb['mailbox_filter_txt'] = 'Mailbox filter'; $wb['header_txt'] = 'Header'; diff --git a/interface/web/mailuser/lib/lang/tr_mail_user_filter.lng b/interface/web/mailuser/lib/lang/tr_mail_user_filter.lng index 0eb00905dc..b59a4afbab 100644 --- a/interface/web/mailuser/lib/lang/tr_mail_user_filter.lng +++ b/interface/web/mailuser/lib/lang/tr_mail_user_filter.lng @@ -16,6 +16,7 @@ $wb['is_txt'] = 'Şununla aynı'; $wb['begins_with_txt'] = 'Şununla başlayan'; $wb['ends_with_txt'] = 'Şununla biten'; $wb['move_to_txt'] = 'Şuraya taşı'; +$wb['regex_txt'] = 'Matches Regex'; $wb['delete_txt'] = 'Sil'; $wb['mailbox_filter_txt'] = 'E-posta kutusu süzgeci'; $wb['header_txt'] = 'Header'; -- GitLab