From f382f091aa97d10056b4c433aa55298fece010d4 Mon Sep 17 00:00:00 2001
From: Marius Cramer <m.cramer@pixcept.de>
Date: Wed, 13 Aug 2014 07:16:30 -0400
Subject: [PATCH] Merge remote-tracking branch 'ispc/master'

---
 interface/web/client/lib/lang/en_client_template.lng |    5 +++++
 1 files changed, 5 insertions(+), 0 deletions(-)

diff --git a/interface/web/client/lib/lang/en_client_template.lng b/interface/web/client/lib/lang/en_client_template.lng
index 5d8c3f3..9aacf40 100644
--- a/interface/web/client/lib/lang/en_client_template.lng
+++ b/interface/web/client/lib/lang/en_client_template.lng
@@ -2,6 +2,7 @@
 $wb["template_type_txt"] = 'Template type';
 $wb["template_name_txt"] = 'Template name';
 $wb["limit_client_error_notint"] = 'Client Limit is not a number.';
+$wb["default_mailserver_txt"] = 'Default Mailserver';
 $wb["limit_maildomain_txt"] = 'Max. number of email domains';
 $wb["limit_mailbox_txt"] = 'Max. number of mailboxes';
 $wb["limit_mailalias_txt"] = 'Max. number of email aliases';
@@ -23,11 +24,14 @@
 $wb["limit_cron_txt"] = 'Max. number of cron jobs';
 $wb["limit_cron_type_txt"] = 'Max. type of cron jobs (chrooted and full implies url)';
 $wb["limit_cron_frequency_txt"] = 'Min. delay between executions';
+$wb["default_webserver_txt"] = 'Default Webserver';
 $wb["limit_web_domain_txt"] = 'Max. number of web domains';
 $wb["limit_web_aliasdomain_txt"] = 'Max. number of web aliasdomains';
 $wb["limit_web_subdomain_txt"] = 'Max. number of web subdomains';
 $wb["limit_ftp_user_txt"] = 'Max. number of FTP users';
+$wb["default_dnsserver_txt"] = 'Default DNS Server';
 $wb["limit_dns_zone_txt"] = 'Max. number of DNS zones';
+$wb["default_slave_dnsserver_txt"] = 'Default Secondary DNS Server';
 $wb["limit_dns_slave_zone_txt"] = 'Max. number of secondary DNS zones';
 $wb["limit_dns_record_txt"] = 'Max. number DNS records';
 $wb["limit_shell_user_txt"] = 'Max. number of Shell users';
@@ -57,6 +61,7 @@
 $wb["limit_dns_zone_error_notint"] = 'The dns zone limit must be a number.';
 $wb["limit_dns_slave_zone_error_notint"] = 'The dns slave zone limit must be a number.';
 $wb["limit_dns_record_error_notint"] = 'The dns record limit must be a number.';
+$wb["default_dbserver_txt"] = 'Default Database Server';
 $wb["limit_database_txt"] = 'Max. number of Databases';
 $wb["limit_database_error_notint"] = 'The database limit must be a number.';
 $wb["limit_cron_error_notint"] = 'The cron limit must be a number.';

--
Gitblit v1.9.1