Commit fc0edb2f authored by Marius Cramer's avatar Marius Cramer
Browse files

Merge branch 'master' into 'master'

add mailfilter to resync

See merge request !202
parents 1fa1bcea a8ac8563
......@@ -42,4 +42,6 @@ $wb['do_clients_txt'] = 'Resynced clients and reseller';
$wb['no_results_txt'] = 'Nothing found';
$wb['btn_start_txt'] = 'Start';
$wb['btn_cancel_txt'] = 'Cancel';
$wb["do_mail_spamfilter_policy_txt"] = "Resynced Spamfilter Policies";
$wb["do_mail_spamfilter_txt"] = "Resynced Spamfilter";
?>
......@@ -42,4 +42,6 @@ $wb['do_clients_txt'] = 'Resynced clients and reseller';
$wb['no_results_txt'] = 'Nothing found';
$wb['btn_start_txt'] = 'Start';
$wb['btn_cancel_txt'] = 'Cancel';
$wb["do_mail_spamfilter_policy_txt"] = "Resynced Spamfilter Policies";
$wb["do_mail_spamfilter_txt"] = "Resynced Spamfilter";
?>
......@@ -42,4 +42,6 @@ $wb['do_clients_txt'] = 'Resynced clients and reseller';
$wb['no_results_txt'] = 'Nothing found';
$wb['btn_start_txt'] = 'Start';
$wb['btn_cancel_txt'] = 'Cancel';
$wb["do_mail_spamfilter_policy_txt"] = "Resynced Spamfilter Policies";
$wb["do_mail_spamfilter_txt"] = "Resynced Spamfilter";
?>
......@@ -42,4 +42,6 @@ $wb['do_clients_txt'] = 'Resynced clients and reseller';
$wb['no_results_txt'] = 'Nothing found';
$wb['btn_start_txt'] = 'Start';
$wb['btn_cancel_txt'] = 'Cancel';
$wb["do_mail_spamfilter_policy_txt"] = "Resynced Spamfilter Policies";
$wb["do_mail_spamfilter_txt"] = "Resynced Spamfilter";
?>
......@@ -42,4 +42,6 @@ $wb['do_clients_txt'] = 'Resynced Kunden und Reseller';
$wb['no_results_txt'] = 'Keine Daten vorhanden';
$wb['btn_start_txt'] = 'Start';
$wb['btn_cancel_txt'] = 'Cancel';
$wb["do_mail_spamfilter_policy_txt"] = "Resynced Spamfilter Policies";
$wb["do_mail_spamfilter_txt"] = "Resynced Spamfilter";
?>
......@@ -42,4 +42,6 @@ $wb['do_clients_txt'] = 'Resynced clients and reseller';
$wb['no_results_txt'] = 'Nothing found';
$wb['btn_start_txt'] = 'Start';
$wb['btn_cancel_txt'] = 'Cancel';
$wb["do_mail_spamfilter_policy_txt"] = "Resynced Spamfilter Policies";
$wb["do_mail_spamfilter_txt"] = "Resynced Spamfilter";
?>
......@@ -42,4 +42,6 @@ $wb['do_clients_txt'] = 'Resynced clients and reseller';
$wb['no_results_txt'] = 'Nothing found';
$wb['btn_start_txt'] = 'Start';
$wb['btn_cancel_txt'] = 'Cancel';
$wb["do_mail_spamfilter_policy_txt"] = "Resynced Spamfilter Policies";
$wb["do_mail_spamfilter_txt"] = "Resynced Spamfilter";
?>
......@@ -42,4 +42,6 @@ $wb['do_clients_txt'] = 'Resynced clients and reseller';
$wb['no_results_txt'] = 'Nothing found';
$wb['btn_start_txt'] = 'Start';
$wb['btn_cancel_txt'] = 'Cancel';
$wb["do_mail_spamfilter_policy_txt"] = "Resynced Spamfilter Policies";
$wb["do_mail_spamfilter_txt"] = "Resynced Spamfilter";
?>
......@@ -42,4 +42,6 @@ $wb['do_clients_txt'] = 'Resynced clients and reseller';
$wb['no_results_txt'] = 'Nothing found';
$wb['btn_start_txt'] = 'Start';
$wb['btn_cancel_txt'] = 'Cancel';
$wb["do_mail_spamfilter_policy_txt"] = "Resynced Spamfilter Policies";
$wb["do_mail_spamfilter_txt"] = "Resynced Spamfilter";
?>
......@@ -42,4 +42,6 @@ $wb['do_clients_txt'] = 'Resynced clients and reseller';
$wb['no_results_txt'] = 'Nothing found';
$wb['btn_start_txt'] = 'Start';
$wb['btn_cancel_txt'] = 'Cancel';
$wb["do_mail_spamfilter_policy_txt"] = "Resynced Spamfilter Policies";
$wb["do_mail_spamfilter_txt"] = "Resynced Spamfilter";
?>
......@@ -42,4 +42,6 @@ $wb['do_clients_txt'] = 'Resynced clients and reseller';
$wb['no_results_txt'] = 'Nothing found';
$wb['btn_start_txt'] = 'Start';
$wb['btn_cancel_txt'] = 'Cancel';
$wb["do_mail_spamfilter_policy_txt"] = "Resynced Spamfilter Policies";
$wb["do_mail_spamfilter_txt"] = "Resynced Spamfilter";
?>
......@@ -42,4 +42,6 @@ $wb['do_clients_txt'] = 'Resynced clients and reseller';
$wb['no_results_txt'] = 'Nothing found';
$wb['btn_start_txt'] = 'Start';
$wb['btn_cancel_txt'] = 'Cancel';
$wb["do_mail_spamfilter_policy_txt"] = "Resynced Spamfilter Policies";
$wb["do_mail_spamfilter_txt"] = "Resynced Spamfilter";
?>
......@@ -42,4 +42,6 @@ $wb['do_clients_txt'] = 'Resynced clients and reseller';
$wb['no_results_txt'] = 'Nothing found';
$wb['btn_start_txt'] = 'Start';
$wb['btn_cancel_txt'] = 'Cancel';
$wb["do_mail_spamfilter_policy_txt"] = "Resynced Spamfilter Policies";
$wb["do_mail_spamfilter_txt"] = "Resynced Spamfilter";
?>
......@@ -42,4 +42,6 @@ $wb['do_clients_txt'] = 'Resynced clients and reseller';
$wb['no_results_txt'] = 'Nothing found';
$wb['btn_start_txt'] = 'Start';
$wb['btn_cancel_txt'] = 'Cancel';
$wb["do_mail_spamfilter_policy_txt"] = "Resynced Spamfilter Policies";
$wb["do_mail_spamfilter_txt"] = "Resynced Spamfilter";
?>
......@@ -42,4 +42,6 @@ $wb['do_clients_txt'] = 'Resynced clients and reseller';
$wb['no_results_txt'] = 'Nothing found';
$wb['btn_start_txt'] = 'Start';
$wb['btn_cancel_txt'] = 'Cancel';
$wb["do_mail_spamfilter_policy_txt"] = "Resynced Spamfilter Policies";
$wb["do_mail_spamfilter_txt"] = "Resynced Spamfilter";
?>
......@@ -42,4 +42,6 @@ $wb['do_clients_txt'] = 'Resynced clients and reseller';
$wb['no_results_txt'] = 'Nothing found';
$wb['btn_start_txt'] = 'Start';
$wb['btn_cancel_txt'] = 'Cancel';
$wb["do_mail_spamfilter_policy_txt"] = "Resynced Spamfilter Policies";
$wb["do_mail_spamfilter_txt"] = "Resynced Spamfilter";
?>
......@@ -42,4 +42,6 @@ $wb['do_clients_txt'] = 'Resynced clients and reseller';
$wb['no_results_txt'] = 'Nothing found';
$wb['btn_start_txt'] = 'Start';
$wb['btn_cancel_txt'] = 'Cancel';
$wb["do_mail_spamfilter_policy_txt"] = "Resynced Spamfilter Policies";
$wb["do_mail_spamfilter_txt"] = "Resynced Spamfilter";
?>
......@@ -42,4 +42,6 @@ $wb['do_clients_txt'] = 'Resynced clients and reseller';
$wb['no_results_txt'] = 'Nothing found';
$wb['btn_start_txt'] = 'Start';
$wb['btn_cancel_txt'] = 'Cancel';
$wb["do_mail_spamfilter_policy_txt"] = "Resynced Spamfilter Policies";
$wb["do_mail_spamfilter_txt"] = "Resynced Spamfilter";
?>
......@@ -42,4 +42,6 @@ $wb['do_clients_txt'] = 'Resynced clients and reseller';
$wb['no_results_txt'] = 'Nothing found';
$wb['btn_start_txt'] = 'Start';
$wb['btn_cancel_txt'] = 'Cancel';
$wb["do_mail_spamfilter_policy_txt"] = "Resynced Spamfilter Policies";
$wb["do_mail_spamfilter_txt"] = "Resynced Spamfilter";
?>
......@@ -42,4 +42,6 @@ $wb['do_clients_txt'] = 'Resynced clients and reseller';
$wb['no_results_txt'] = 'Nothing found';
$wb['btn_start_txt'] = 'Start';
$wb['btn_cancel_txt'] = 'Cancel';
$wb["do_mail_spamfilter_policy_txt"] = "Resynced Spamfilter Policies";
$wb["do_mail_spamfilter_txt"] = "Resynced Spamfilter";
?>
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment