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 9eb3325c72dcc1c433fd6b38c82c0e6f447c48a5..6929752c5afb0a0051fb343bc1946eeedc1dc2d5 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 54ae96d6928405c3340ae39329810eee1308092f..226b7e2722db81b3a60be7f29cfe783bde426f68 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 9bd358063506902d11edfd038366492f0cde857f..3f5357f73538dd57536be651102932b17ce7ce21 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 c9fb78fcee1ff581249ff128bd93c5c8578e0c5b..345b9c4fbb38d3de1c06b7fe074c0f15a9917e2f 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 f3957144ae0225257bccd6e72dd1c9984e0ed999..72710a9f7e72d3435023a6e73ea554ab7831ec83 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 4441ecf5e452a04ba0b909f08cae19c545f10077..33fd0106a8df7502e0c0b4fdb92c7a0f3b1b319b 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 750f3c1ae54f04cd67f345c913f771788407ebf1..a3db584920c97c0a95b53a8b05bc10fdb11c4489 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 bad797d6d5c8ef195cc5da3d89913c40a6bedd77..827f906345186d111bb3af2b77e2d494f7f0fb2c 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 95af45d96e51577b7f1c5fd1db3f3fe43889cf27..050d64aaf98fa3edbb6cc64fa473be7ab5aa16fd 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';
@@ -18,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';
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 1f0b071f193ccddfef0d00a1b8a15b46d365e8d9..d0bc6d6a288d921b8c79b35dd2467b1fb0e951a5 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 c8306f9838ece9c91db26e241b3ae531bbe04464..78fac01aee482c71c9f1b4b5c19a272fc22e5475 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 0cd888b2e543a6497ea56a6866fee48f7ef2cfac..9830059195a097af027fe3310186350ec891395c 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 ba55be63dcb89295da8d59729da755fad6bd1e02..6d4e0b8868c128e6a834d7bcd397c49dd0629bd9 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';
diff --git a/interface/web/mailuser/form/mail_user_autoresponder.tform.php b/interface/web/mailuser/form/mail_user_autoresponder.tform.php
index e642534c13fbf34250aedf51ba88173395857f93..fa4025b532f89f004f02fbb94059a1fe74fd8cf4 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/form/mail_user_filter.tform.php b/interface/web/mailuser/form/mail_user_filter.tform.php
index 9fdd8bdfc0ef45c9168a4c5c0d7a6cae694fa651..0f454fa6f751d3439188ac3053eb7f6858f4f720 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', 'regex'=>'regex_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' => '',
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 79f386a7dc9da88380ae34d006d729d79894b549..b913b5cfa13d256c5e55b7978669d18e56b6a3b4 100644
--- a/interface/web/mailuser/lib/lang/ar_mail_user_autoresponder.lng
+++ b/interface/web/mailuser/lib/lang/ar_mail_user_autoresponder.lng
@@ -6,8 +6,8 @@ $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'] = 'Betreff';
+$wb['autoresponder_subject_txt'] = 'Subject';
?>
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 9ac4be357efcb3ce2912c717d9e6f341e9f2941e..0df6e0b75bf88fda9af78ceecd9bb7d07e2ad87d 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,10 @@ $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';
+$wb['size_over_txt'] = 'Email size over (KB)';
+$wb['size_under_txt'] = 'Email size under (KB)';
?>
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 be4bad90504b47914b13a01b95158a862024839e..fc355eb9200d2793eb6e3af79e1dc7d18c8bcd84 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_autoresponder.lng b/interface/web/mailuser/lib/lang/bg_mail_user_autoresponder.lng
index 79f386a7dc9da88380ae34d006d729d79894b549..b913b5cfa13d256c5e55b7978669d18e56b6a3b4 100644
--- a/interface/web/mailuser/lib/lang/bg_mail_user_autoresponder.lng
+++ b/interface/web/mailuser/lib/lang/bg_mail_user_autoresponder.lng
@@ -6,8 +6,8 @@ $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'] = 'Betreff';
+$wb['autoresponder_subject_txt'] = 'Subject';
?>
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 9ac4be357efcb3ce2912c717d9e6f341e9f2941e..0df6e0b75bf88fda9af78ceecd9bb7d07e2ad87d 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,10 @@ $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';
+$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_spamfilter.lng b/interface/web/mailuser/lib/lang/bg_mail_user_spamfilter.lng
index be4bad90504b47914b13a01b95158a862024839e..fc355eb9200d2793eb6e3af79e1dc7d18c8bcd84 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_autoresponder.lng b/interface/web/mailuser/lib/lang/br_mail_user_autoresponder.lng
index 9de387d7988c1b3910083be4afd3d9e73ddb5981..3783bbcb7368e96d2d6b1dca99a67ec23f42064a 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/br_mail_user_filter.lng b/interface/web/mailuser/lib/lang/br_mail_user_filter.lng
index acefe8be6eeff36105556b42011eefd2fb2f67c1..88a727139136839d0e79ca7e3b3bbffb37efc396 100644
--- a/interface/web/mailuser/lib/lang/br_mail_user_filter.lng
+++ b/interface/web/mailuser/lib/lang/br_mail_user_filter.lng
@@ -17,5 +17,9 @@ $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)';
+$wb['size_under_txt'] = 'Email size under (KB)';
?>
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 eb369220412e340952738ed60bffcd81f943c356..360d47d9cc9855f876a078b2d7b8c2756fe920b4 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_autoresponder.lng b/interface/web/mailuser/lib/lang/ca_mail_user_autoresponder.lng
index 79f386a7dc9da88380ae34d006d729d79894b549..b913b5cfa13d256c5e55b7978669d18e56b6a3b4 100644
--- a/interface/web/mailuser/lib/lang/ca_mail_user_autoresponder.lng
+++ b/interface/web/mailuser/lib/lang/ca_mail_user_autoresponder.lng
@@ -6,8 +6,8 @@ $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'] = 'Betreff';
+$wb['autoresponder_subject_txt'] = 'Subject';
?>
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 9ac4be357efcb3ce2912c717d9e6f341e9f2941e..0df6e0b75bf88fda9af78ceecd9bb7d07e2ad87d 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,10 @@ $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';
+$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_spamfilter.lng b/interface/web/mailuser/lib/lang/ca_mail_user_spamfilter.lng
index 2b29913e5f50b9a91e43a10666b8ae2b0aa9add2..00ed8174f494712ea61ddedf8c60ce994849ddfb 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_autoresponder.lng b/interface/web/mailuser/lib/lang/cz_mail_user_autoresponder.lng
index ef3aeb42da522378dbd954257bc39bd9b13f3c34..20134a87b5bafc1c1291da2f8e34863bbd18b4be 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/cz_mail_user_filter.lng b/interface/web/mailuser/lib/lang/cz_mail_user_filter.lng
index 27b54c1bc7724861e10999d50b093593e8e7757b..010427341ed27597ab4bbe9f3192f65b4939fa92 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,10 @@ $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';
+$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_spamfilter.lng b/interface/web/mailuser/lib/lang/cz_mail_user_spamfilter.lng
index 2a53036be6267f69d2f15db97ab7b2087e026eb2..e6a50b96f8c3f1b9c45dc557c95eee25baddff41 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_autoresponder.lng b/interface/web/mailuser/lib/lang/de_mail_user_autoresponder.lng
index f8d4e46b12109005789a7d61fd8720d44ac508d9..af164c475d2ce2f35195a211b8ea001f1a3a4d7a 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/de_mail_user_filter.lng b/interface/web/mailuser/lib/lang/de_mail_user_filter.lng
index 1665ba14d22763412387e00b009f445090e78d4b..5c7d5c20d0bbd42993711cee5a3c92781a10af13 100644
--- a/interface/web/mailuser/lib/lang/de_mail_user_filter.lng
+++ b/interface/web/mailuser/lib/lang/de_mail_user_filter.lng
@@ -17,5 +17,9 @@ $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)';
+$wb['size_under_txt'] = 'Email size under (KB)';
?>
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 47ac53a006c373ca32e297350a4cc7929639f6db..d444899a8f8a86013861a657aa28e7628013be3a 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_autoresponder.lng b/interface/web/mailuser/lib/lang/dk_mail_user_autoresponder.lng
index 81bee87afb6a1a4f98d8e2c304d8174a01298d5a..e9cf7ba82a58a53eab81f4c19f5a70199744ad33 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/dk_mail_user_filter.lng b/interface/web/mailuser/lib/lang/dk_mail_user_filter.lng
index 0a92f580a10ab1548c4a3426f73e1a8cc8fece9b..e2325c6902c8117f2e777929cebe7323407a13c3 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,10 @@ $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';
+$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_spamfilter.lng b/interface/web/mailuser/lib/lang/dk_mail_user_spamfilter.lng
index f43190d492abf9b7f0a4d3ea87da4c30cfd98620..fb05b7565ce21b5dd5dfba2e7203f5ffe08e1294 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_autoresponder.lng b/interface/web/mailuser/lib/lang/el_mail_user_autoresponder.lng
index 79f386a7dc9da88380ae34d006d729d79894b549..b913b5cfa13d256c5e55b7978669d18e56b6a3b4 100644
--- a/interface/web/mailuser/lib/lang/el_mail_user_autoresponder.lng
+++ b/interface/web/mailuser/lib/lang/el_mail_user_autoresponder.lng
@@ -6,8 +6,8 @@ $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'] = 'Betreff';
+$wb['autoresponder_subject_txt'] = 'Subject';
?>
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 9ac4be357efcb3ce2912c717d9e6f341e9f2941e..0df6e0b75bf88fda9af78ceecd9bb7d07e2ad87d 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,10 @@ $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';
+$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_spamfilter.lng b/interface/web/mailuser/lib/lang/el_mail_user_spamfilter.lng
index be4bad90504b47914b13a01b95158a862024839e..fc355eb9200d2793eb6e3af79e1dc7d18c8bcd84 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_autoresponder.lng b/interface/web/mailuser/lib/lang/en_mail_user_autoresponder.lng
index a736abf69082154b13322b64dba298c66a1927c3..e0028159433081752c19a822a3d2954b71f5b9ec 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/en_mail_user_filter.lng b/interface/web/mailuser/lib/lang/en_mail_user_filter.lng
index c26150ba1d183e8cea68c1aa9e3d0d3fc246664d..fb587d43805d11f0367cdcfc795af9582e31eb60 100644
--- a/interface/web/mailuser/lib/lang/en_mail_user_filter.lng
+++ b/interface/web/mailuser/lib/lang/en_mail_user_filter.lng
@@ -18,5 +18,9 @@ $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)';
+$wb['size_under_txt'] = 'Email size under (KB)';
?>
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 8f95dd37a7f189f860cfaf8bf81a7b809272b3c4..030e4fce593a656d5d953ee6a8d55a1f1df79754 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_autoresponder.lng b/interface/web/mailuser/lib/lang/es_mail_user_autoresponder.lng
index 577951ea2b3e48d743ff96b83fed676c4f8afc45..04e55b28b9a688a0b38168f315e6dbf9b846f2f2 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 @@
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 31d7ba7c745979e7d380a11c91ff286e4b086ef1..2496d26f9343554b37b4bfe65f784fdbd7e51db5 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_autoresponder.lng b/interface/web/mailuser/lib/lang/fi_mail_user_autoresponder.lng
index 79f386a7dc9da88380ae34d006d729d79894b549..b913b5cfa13d256c5e55b7978669d18e56b6a3b4 100644
--- a/interface/web/mailuser/lib/lang/fi_mail_user_autoresponder.lng
+++ b/interface/web/mailuser/lib/lang/fi_mail_user_autoresponder.lng
@@ -6,8 +6,8 @@ $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'] = 'Betreff';
+$wb['autoresponder_subject_txt'] = 'Subject';
?>
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 9ac4be357efcb3ce2912c717d9e6f341e9f2941e..0df6e0b75bf88fda9af78ceecd9bb7d07e2ad87d 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,10 @@ $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';
+$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_spamfilter.lng b/interface/web/mailuser/lib/lang/fi_mail_user_spamfilter.lng
index be4bad90504b47914b13a01b95158a862024839e..fc355eb9200d2793eb6e3af79e1dc7d18c8bcd84 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_filter.lng b/interface/web/mailuser/lib/lang/fr_mail_user_filter.lng
index b630b05a796f592e64d7722dffef06db7bf8376b..d2b513b1556b933502763224c3b2ef0ec7c9a267 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,10 @@ $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';
+$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_spamfilter.lng b/interface/web/mailuser/lib/lang/fr_mail_user_spamfilter.lng
index f6bcd5d32d56d5e23febc29484310978311cf27d..1574f45f3f1f33650325d8688daa2b2ae2d9fa8f 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_autoresponder.lng b/interface/web/mailuser/lib/lang/hr_mail_user_autoresponder.lng
index bbb3b79bc4f1bb311b5a0bd6fff0c22d353d31e2..711cfde14f935cf63a83956e05e6cb11d6a21a10 100644
--- a/interface/web/mailuser/lib/lang/hr_mail_user_autoresponder.lng
+++ b/interface/web/mailuser/lib/lang/hr_mail_user_autoresponder.lng
@@ -6,8 +6,8 @@ $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'] = 'Sada';
-$wb['autoresponder_subject_txt'] = 'Betreff';
+$wb['autoresponder_subject_txt'] = 'Subject';
?>
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 b2793c38051161f8abb79e740d889c3bdf142ff1..dfb58bd3d2ed2f0c4deeb08204854a9d8f697666 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,10 @@ $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';
+$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_spamfilter.lng b/interface/web/mailuser/lib/lang/hr_mail_user_spamfilter.lng
index 7d7130e816f07ff0e613203d47b8877069f37a36..b2d208a09884a3808d04c06cebd129dceb6bf8b7 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_autoresponder.lng b/interface/web/mailuser/lib/lang/hu_mail_user_autoresponder.lng
index 79f386a7dc9da88380ae34d006d729d79894b549..b913b5cfa13d256c5e55b7978669d18e56b6a3b4 100644
--- a/interface/web/mailuser/lib/lang/hu_mail_user_autoresponder.lng
+++ b/interface/web/mailuser/lib/lang/hu_mail_user_autoresponder.lng
@@ -6,8 +6,8 @@ $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'] = 'Betreff';
+$wb['autoresponder_subject_txt'] = 'Subject';
?>
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 9ac4be357efcb3ce2912c717d9e6f341e9f2941e..0df6e0b75bf88fda9af78ceecd9bb7d07e2ad87d 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,10 @@ $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';
+$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_spamfilter.lng b/interface/web/mailuser/lib/lang/hu_mail_user_spamfilter.lng
index be4bad90504b47914b13a01b95158a862024839e..fc355eb9200d2793eb6e3af79e1dc7d18c8bcd84 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_autoresponder.lng b/interface/web/mailuser/lib/lang/id_mail_user_autoresponder.lng
index 79f386a7dc9da88380ae34d006d729d79894b549..b913b5cfa13d256c5e55b7978669d18e56b6a3b4 100644
--- a/interface/web/mailuser/lib/lang/id_mail_user_autoresponder.lng
+++ b/interface/web/mailuser/lib/lang/id_mail_user_autoresponder.lng
@@ -6,8 +6,8 @@ $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'] = 'Betreff';
+$wb['autoresponder_subject_txt'] = 'Subject';
?>
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 9ac4be357efcb3ce2912c717d9e6f341e9f2941e..0df6e0b75bf88fda9af78ceecd9bb7d07e2ad87d 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,10 @@ $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';
+$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_spamfilter.lng b/interface/web/mailuser/lib/lang/id_mail_user_spamfilter.lng
index be4bad90504b47914b13a01b95158a862024839e..fc355eb9200d2793eb6e3af79e1dc7d18c8bcd84 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_autoresponder.lng b/interface/web/mailuser/lib/lang/it_mail_user_autoresponder.lng
index caaac2e7c4d116ec1da199d82a8e9831fa60c8fa..0bc9b162f0f93e99ee468f432ab01d362774d7ec 100644
--- a/interface/web/mailuser/lib/lang/it_mail_user_autoresponder.lng
+++ b/interface/web/mailuser/lib/lang/it_mail_user_autoresponder.lng
@@ -6,8 +6,8 @@ $wb['autoresponder_txt'] = 'Attivo';
$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'] = 'Betreff';
+$wb['autoresponder_subject_txt'] = 'Subject';
?>
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 49c335860182218e8edcfb036e935e647f5a7958..a0b9e360c2875f47f9846ea00a77436949d4d8ed 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,10 @@ $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';
+$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_spamfilter.lng b/interface/web/mailuser/lib/lang/it_mail_user_spamfilter.lng
index 9d4c5496ea57b829cbbcc4e00b1ef1f6994c3d9e..fc355eb9200d2793eb6e3af79e1dc7d18c8bcd84 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_autoresponder.lng b/interface/web/mailuser/lib/lang/ja_mail_user_autoresponder.lng
index 79f386a7dc9da88380ae34d006d729d79894b549..b913b5cfa13d256c5e55b7978669d18e56b6a3b4 100644
--- a/interface/web/mailuser/lib/lang/ja_mail_user_autoresponder.lng
+++ b/interface/web/mailuser/lib/lang/ja_mail_user_autoresponder.lng
@@ -6,8 +6,8 @@ $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'] = 'Betreff';
+$wb['autoresponder_subject_txt'] = 'Subject';
?>
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 9ac4be357efcb3ce2912c717d9e6f341e9f2941e..0df6e0b75bf88fda9af78ceecd9bb7d07e2ad87d 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,10 @@ $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';
+$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_spamfilter.lng b/interface/web/mailuser/lib/lang/ja_mail_user_spamfilter.lng
index be4bad90504b47914b13a01b95158a862024839e..fc355eb9200d2793eb6e3af79e1dc7d18c8bcd84 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_filter.lng b/interface/web/mailuser/lib/lang/nl_mail_user_filter.lng
index 0092c288a06a1845afa038f398c497dd2129e7b1..91dfd85373130da5060cdb0bad5ff159bde4d5c1 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,10 @@ $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';
+$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_spamfilter.lng b/interface/web/mailuser/lib/lang/nl_mail_user_spamfilter.lng
index be4bad90504b47914b13a01b95158a862024839e..fc355eb9200d2793eb6e3af79e1dc7d18c8bcd84 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_autoresponder.lng b/interface/web/mailuser/lib/lang/pl_mail_user_autoresponder.lng
index 7a28409e5f440ea40a35f110191fc5d5f105aff4..79019190c66137724e818d10c861fce8e1303f84 100644
--- a/interface/web/mailuser/lib/lang/pl_mail_user_autoresponder.lng
+++ b/interface/web/mailuser/lib/lang/pl_mail_user_autoresponder.lng
@@ -6,7 +6,7 @@ $wb['autoresponder_txt'] = 'Aktywny';
$wb['autoresponder_start_date_txt'] = 'Start';
$wb['autoresponder_start_date_isfuture'] = 'Data startu nie może być z przeszłości';
$wb['autoresponder_end_date_txt'] = 'Koniec';
-$wb['autoresponder_end_date_isgreater'] = 'Data końcowa musi być ustawiona i być późniejsza niż startu.';
+$wb['autoresponder_end_date_isgreater'] = 'End date must be later than start date.';
$wb['autoresponder_active'] = 'Włącz autoresponder';
$wb['now_txt'] = 'Teraz';
$wb['autoresponder_subject_txt'] = 'Temat';
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 9ac4be357efcb3ce2912c717d9e6f341e9f2941e..0df6e0b75bf88fda9af78ceecd9bb7d07e2ad87d 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,10 @@ $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';
+$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_spamfilter.lng b/interface/web/mailuser/lib/lang/pl_mail_user_spamfilter.lng
index b371f3ea75110524e3387db7708d06df87426121..5a530c0c5edd1720770bb5e12afe77a2b91ef694 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_autoresponder.lng b/interface/web/mailuser/lib/lang/pt_mail_user_autoresponder.lng
index 79f386a7dc9da88380ae34d006d729d79894b549..b913b5cfa13d256c5e55b7978669d18e56b6a3b4 100644
--- a/interface/web/mailuser/lib/lang/pt_mail_user_autoresponder.lng
+++ b/interface/web/mailuser/lib/lang/pt_mail_user_autoresponder.lng
@@ -6,8 +6,8 @@ $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'] = 'Betreff';
+$wb['autoresponder_subject_txt'] = 'Subject';
?>
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 9ac4be357efcb3ce2912c717d9e6f341e9f2941e..0df6e0b75bf88fda9af78ceecd9bb7d07e2ad87d 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,10 @@ $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';
+$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_spamfilter.lng b/interface/web/mailuser/lib/lang/pt_mail_user_spamfilter.lng
index be4bad90504b47914b13a01b95158a862024839e..fc355eb9200d2793eb6e3af79e1dc7d18c8bcd84 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_autoresponder.lng b/interface/web/mailuser/lib/lang/ro_mail_user_autoresponder.lng
index 79f386a7dc9da88380ae34d006d729d79894b549..b913b5cfa13d256c5e55b7978669d18e56b6a3b4 100644
--- a/interface/web/mailuser/lib/lang/ro_mail_user_autoresponder.lng
+++ b/interface/web/mailuser/lib/lang/ro_mail_user_autoresponder.lng
@@ -6,8 +6,8 @@ $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'] = 'Betreff';
+$wb['autoresponder_subject_txt'] = 'Subject';
?>
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 9ac4be357efcb3ce2912c717d9e6f341e9f2941e..0df6e0b75bf88fda9af78ceecd9bb7d07e2ad87d 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,10 @@ $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';
+$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_spamfilter.lng b/interface/web/mailuser/lib/lang/ro_mail_user_spamfilter.lng
index be4bad90504b47914b13a01b95158a862024839e..fc355eb9200d2793eb6e3af79e1dc7d18c8bcd84 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_autoresponder.lng b/interface/web/mailuser/lib/lang/ru_mail_user_autoresponder.lng
index c7c864c5a513902aca615fe9e293d5ff09aaa668..0e5ec20601006535ba92bb1126e3af7d1f742042 100644
--- a/interface/web/mailuser/lib/lang/ru_mail_user_autoresponder.lng
+++ b/interface/web/mailuser/lib/lang/ru_mail_user_autoresponder.lng
@@ -6,7 +6,7 @@ $wb['autoresponder_txt'] = 'Активно';
$wb['autoresponder_start_date_txt'] = 'Запускать';
$wb['autoresponder_start_date_isfuture'] = 'Дата запуска не может быть в прошлом.';
$wb['autoresponder_end_date_txt'] = 'Останавливать';
-$wb['autoresponder_end_date_isgreater'] = 'Дата окончания должна быть позже даты запуска.';
+$wb['autoresponder_end_date_isgreater'] = 'End date must be later than start date.';
$wb['autoresponder_active'] = 'Включить автоответчик';
$wb['now_txt'] = 'Сейчас';
$wb['autoresponder_subject_txt'] = 'Тема';
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 d834e4057a0688ee6c2302933a9edf07d1aa0d43..590763ed43fa656a5b61a81793d842c205fa47da 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,10 @@ $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';
+$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_spamfilter.lng b/interface/web/mailuser/lib/lang/ru_mail_user_spamfilter.lng
index a4b7a48b7f8c5a80732a4ae7289a66a5aaa4509f..1a168b76107066136450eae9fe166925148d8a98 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_filter.lng b/interface/web/mailuser/lib/lang/se_mail_user_filter.lng
index da15d6f73b2e6e55713574c621590d632ee6416d..4f7e093d773f1fa72975e86856fd27d9f6c95d27 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,10 @@ $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';
+$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_spamfilter.lng b/interface/web/mailuser/lib/lang/se_mail_user_spamfilter.lng
index 7ec5f2a7d8671cc2ca146de36ed9918c2d4ca9bd..8cc318e71c6e38040a48b8e73fb67ba76ac92e80 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_autoresponder.lng b/interface/web/mailuser/lib/lang/sk_mail_user_autoresponder.lng
index 79f386a7dc9da88380ae34d006d729d79894b549..b913b5cfa13d256c5e55b7978669d18e56b6a3b4 100644
--- a/interface/web/mailuser/lib/lang/sk_mail_user_autoresponder.lng
+++ b/interface/web/mailuser/lib/lang/sk_mail_user_autoresponder.lng
@@ -6,8 +6,8 @@ $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'] = 'Betreff';
+$wb['autoresponder_subject_txt'] = 'Subject';
?>
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 9ac4be357efcb3ce2912c717d9e6f341e9f2941e..0df6e0b75bf88fda9af78ceecd9bb7d07e2ad87d 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,10 @@ $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';
+$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_spamfilter.lng b/interface/web/mailuser/lib/lang/sk_mail_user_spamfilter.lng
index be4bad90504b47914b13a01b95158a862024839e..fc355eb9200d2793eb6e3af79e1dc7d18c8bcd84 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_autoresponder.lng b/interface/web/mailuser/lib/lang/tr_mail_user_autoresponder.lng
index ab776ef9454e0a14e33387e9e4c9d3219fe411ff..06fbddd0bc227a3f45db566f552c2cc5d992a93b 100644
--- a/interface/web/mailuser/lib/lang/tr_mail_user_autoresponder.lng
+++ b/interface/web/mailuser/lib/lang/tr_mail_user_autoresponder.lng
@@ -6,7 +6,7 @@ $wb['autoresponder_txt'] = 'Etkin';
$wb['autoresponder_start_date_txt'] = 'Başlangıç';
$wb['autoresponder_start_date_isfuture'] = 'Başlangıç tarihi geçmiş zamanda olamaz.';
$wb['autoresponder_end_date_txt'] = 'Bitiş';
-$wb['autoresponder_end_date_isgreater'] = 'Bitiş tarihi başlangıç tarihinden sonra olmalıdır.';
+$wb['autoresponder_end_date_isgreater'] = 'End date must be later than start date.';
$wb['autoresponder_active'] = 'Etkinleştir';
$wb['now_txt'] = 'Şimdi';
$wb['autoresponder_subject_txt'] = 'Otoyanıt';
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 57db1979013af74c8877a86dda4283395f99ceee..b59a4afbab720cec2ca2098eee46bc88031ca9d1 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,10 @@ $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';
+$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_spamfilter.lng b/interface/web/mailuser/lib/lang/tr_mail_user_spamfilter.lng
index 3426385a2effcb7bb7a449896f768a4e03b772b2..25bd43520a4c75e28369eff8599e3ecab65a5bdd 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 abbea219376204ce922762129849da67122a4738..75649b5a707f3b89e5c4606d7019bc84c967bf0f 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':'';