From 10b4c85a7686da07bddb5779f8ceea48acdf412e Mon Sep 17 00:00:00 2001
From: tbrehm <t.brehm@ispconfig.org>
Date: Thu, 03 Jan 2013 06:51:45 -0500
Subject: [PATCH] Merged revisons 3687-3748 from 3.0.5 stable branch.

---
 interface/web/client/lib/lang/en_client.lng |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/interface/web/client/lib/lang/en_client.lng b/interface/web/client/lib/lang/en_client.lng
index bae3df6..62ad841 100644
--- a/interface/web/client/lib/lang/en_client.lng
+++ b/interface/web/client/lib/lang/en_client.lng
@@ -12,7 +12,7 @@
 $wb["limit_mailquota_txt"] = 'Mailbox quota';
 $wb["limit_spamfilter_wblist_txt"] = 'Max. number of spamfilter white / blacklist filters';
 $wb["limit_spamfilter_user_txt"] = 'Max. number of spamfilter users';
-$wb["limit_spamfilter_policy_txt"] = 'Max. number of spamfilter policys';
+$wb["limit_spamfilter_policy_txt"] = 'Max. number of spamfilter policies';
 $wb["default_mailserver_txt"] = 'Default Mailserver';
 $wb["company_name_txt"] = 'Company name';
 $wb["contact_name_txt"] = 'Contact name';
@@ -142,4 +142,5 @@
 $wb["customer_no_error_unique"] = 'The customer no. must be unique (or empty).';
 $wb['paypal_email_error_isemail'] = 'Please enter a valid PayPal email address.';
 $wb['paypal_email_txt'] = 'PayPal Email';
+$wb['err_msg_master_tpl_set'] = 'All custom limit settings are ignored if any master template other than "custom" is selected.';
 ?>

--
Gitblit v1.9.1