Skip to content

Commit 40bf1a8

Browse files
author
Till Brehm
committed
Merge branch '5697-mailuser-filters' into 'stable-3.1'
Resolve "mail users have limited Email Filters" Closes #5697 See merge request ispconfig/ispconfig3!1110
2 parents 1299e73 + b187d95 commit 40bf1a8

File tree

88 files changed

+205
-79
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

88 files changed

+205
-79
lines changed

interface/web/mail/lib/lang/bg_mail_user_filter.lng

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ $wb['limit_mailfilter_txt'] = 'Максималният брой на емайл
1111
$wb['subject_txt'] = 'Тема';
1212
$wb['from_txt'] = 'От';
1313
$wb['to_txt'] = 'До';
14+
$wb['list_id_txt'] = 'List ID';
1415
$wb['contains_txt'] = 'Описание';
1516
$wb['is_txt'] = 'е';
1617
$wb['begins_with_txt'] = 'Начало с';

interface/web/mail/lib/lang/br_mail_user_filter.lng

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ $wb['limit_mailfilter_txt'] = 'O limite de filtros de e-mail foi alcançado.';
1111
$wb['subject_txt'] = 'Assunto';
1212
$wb['from_txt'] = 'De';
1313
$wb['to_txt'] = 'Para';
14+
$wb['list_id_txt'] = 'List ID';
1415
$wb['contains_txt'] = 'Contêm';
1516
$wb['is_txt'] = 'é';
1617
$wb['begins_with_txt'] = 'Iniciando com';

interface/web/mail/lib/lang/cz_mail_user_filter.lng

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ $wb['limit_mailfilter_txt'] = 'Byl dosažen max. počet e-mailový filtrovacích
1111
$wb['subject_txt'] = 'Předmět';
1212
$wb['from_txt'] = 'Odesílatel';
1313
$wb['to_txt'] = 'Příjemce (adresát)';
14+
$wb['list_id_txt'] = 'List ID';
1415
$wb['contains_txt'] = 'Obsahuje';
1516
$wb['is_txt'] = 'Je';
1617
$wb['begins_with_txt'] = 'Začíná na';

interface/web/mail/lib/lang/de_mail_user_filter.lng

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ $wb['limit_mailfilter_txt'] = 'Die maximale Anzahl an E-Mail Filtern für Ihr Ko
1111
$wb['subject_txt'] = 'Betreff';
1212
$wb['from_txt'] = 'Von';
1313
$wb['to_txt'] = 'An';
14+
$wb['list_id_txt'] = 'List ID';
1415
$wb['contains_txt'] = 'Enthält';
1516
$wb['is_txt'] = 'Ist';
1617
$wb['begins_with_txt'] = 'Beginnt mit';

interface/web/mail/lib/lang/el_mail_user_filter.lng

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ $wb['limit_mailfilter_txt'] = 'Έχετε φτάσει το μέγιστο πλ
1111
$wb['subject_txt'] = 'Θέμα';
1212
$wb['from_txt'] = 'Από';
1313
$wb['to_txt'] = 'Προς';
14+
$wb['list_id_txt'] = 'List ID';
1415
$wb['contains_txt'] = 'Περιλαμβάνει';
1516
$wb['is_txt'] = 'είναι';
1617
$wb['begins_with_txt'] = 'Ξεκινά με';

interface/web/mail/lib/lang/hr_mail_user_filter.lng

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ $wb['limit_mailfilter_txt'] = 'Iskorišten je maksimalni broj mail filtera.';
1111
$wb['subject_txt'] = 'Naslov';
1212
$wb['from_txt'] = 'Pošiljatelj';
1313
$wb['to_txt'] = 'Primatelj';
14+
$wb['list_id_txt'] = 'List ID';
1415
$wb['contains_txt'] = 'Sadrži';
1516
$wb['is_txt'] = 'Is';
1617
$wb['begins_with_txt'] = 'Počinje sa';

interface/web/mail/lib/lang/hu_mail_user_filter.lng

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ $wb['source_txt'] = 'Forrás';
99
$wb['subject_txt'] = 'Tárgy';
1010
$wb['from_txt'] = 'From';
1111
$wb['to_txt'] = 'To';
12+
$wb['list_id_txt'] = 'List ID';
1213
$wb['contains_txt'] = 'Tartalmazza';
1314
$wb['is_txt'] = 'Is';
1415
$wb['begins_with_txt'] = 'Begins with';

interface/web/mail/lib/lang/it_mail_user_filter.lng

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ $wb['limit_mailfilter_txt'] = 'The max. number of mailfilters is reached.';
1111
$wb['subject_txt'] = 'Oggetto';
1212
$wb['from_txt'] = 'Da';
1313
$wb['to_txt'] = 'A';
14+
$wb['list_id_txt'] = 'List ID';
1415
$wb['contains_txt'] = 'Contiene';
1516
$wb['is_txt'] = 'è';
1617
$wb['begins_with_txt'] = 'Inizia con';

interface/web/mail/lib/lang/nl_mail_user_filter.lng

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,14 +11,15 @@ $wb['limit_mailfilter_txt'] = 'Het max. aantal e-mail filters voor uw account is
1111
$wb['subject_txt'] = 'Onderwerp';
1212
$wb['from_txt'] = 'Afzender';
1313
$wb['to_txt'] = 'Bestemming';
14+
$wb['list_id_txt'] = 'List ID';
1415
$wb['contains_txt'] = 'Bevat';
1516
$wb['is_txt'] = 'Is';
1617
$wb['begins_with_txt'] = 'Begint met';
1718
$wb['ends_with_txt'] = 'Eindigt in';
1819
$wb['delete_txt'] = 'Verwijderen';
1920
$wb['move_stop_txt'] = 'Verplaatsen naar';
2021
$wb['header_txt'] = 'Header';
21-
$wb['size_over_txt'] = 'Email grootte bove (KB)';
22+
$wb['size_over_txt'] = 'Email grootte boven (KB)';
2223
$wb['size_under_txt'] = 'Email grootte onder (KB)';
2324
$wb['localpart_txt'] = 'Localpart';
2425
$wb['domain_txt'] = 'Domein';

interface/web/mail/lib/lang/pl_mail_user_filter.lng

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ $wb['limit_mailfilter_txt'] = 'Maks. ilość filtrów email jest przekroczona.';
1111
$wb['subject_txt'] = 'Temat';
1212
$wb['from_txt'] = 'Od';
1313
$wb['to_txt'] = 'Do';
14+
$wb['list_id_txt'] = 'List ID';
1415
$wb['contains_txt'] = 'Zawiera';
1516
$wb['is_txt'] = 'Jest';
1617
$wb['begins_with_txt'] = 'Zaczyna się od';

0 commit comments

Comments
 (0)