From c9d4ef4e593bde5a12d3eaa19b44ea5829866004 Mon Sep 17 00:00:00 2001
From: Marius Cramer <m.cramer@pixcept.de>
Date: Mon, 05 May 2014 02:25:31 -0400
Subject: [PATCH]  Merge branch 'stable-3.0.5' into 'stable-3.0.5'

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

diff --git a/interface/web/client/lib/lang/en.lng b/interface/web/client/lib/lang/en.lng
index dc03212..d901b7a 100644
--- a/interface/web/client/lib/lang/en.lng
+++ b/interface/web/client/lib/lang/en.lng
@@ -1,10 +1,27 @@
 <?php
-
 $wb['Client'] = 'Client';
 $wb['Address'] = 'Address';
 $wb['Limits'] = 'Limits';
 $wb['Add Client'] = 'Add Client';
 $wb['Edit Client'] = 'Edit Client';
 $wb['Clients'] = 'Clients';
-
+$wb['Templates'] = 'Templates';
+$wb['Limit-Templates'] = 'Limit-Templates';
+$wb['Add Reseller'] = 'Add Reseller';
+$wb['Edit Reseller'] = 'Edit Reseller';
+$wb['Resellers'] = 'Resellers';
+$wb["error_has_clients"] = 'This reseller has clients. Delete the clients of the reseller first.';
+$wb['add_additional_template_txt'] = 'Add additional template';
+$wb['delete_additional_template_txt'] = 'Delete additional template';
+$wb['Messaging'] = 'Messaging';
+$wb['Send email'] = 'Send Email';
+$wb['Edit Client Circle'] = 'Edit Client Circle';
+$wb['Domains'] = 'Domains';
+$wb['domain_txt'] = 'Domain';
+$wb['client_txt'] = 'Client';
+$wb['error_domain_in mailuse'] = 'This domain cannot be deleted, because it is in use as mail-domain';
+$wb['error_domain_in webuse'] = 'This domain cannot be deleted, because it is in use as web-domain';
+$wb['error_client_can_not_add_domain'] = 'You cannot add a new domain';
+$wb['domain_txt'] = 'Domain';
+$wb['error_client_group_id_empty'] = 'You have to select a customer<br>';
 ?>
\ No newline at end of file

--
Gitblit v1.9.1