diff --git a/interface/web/admin/lib/lang/bg_system_config.lng b/interface/web/admin/lib/lang/bg_system_config.lng
new file mode 100644
index 0000000000000000000000000000000000000000..331747663b1dec95cfcf350276f6d2ac8fcbb463
--- /dev/null
+++ b/interface/web/admin/lib/lang/bg_system_config.lng
@@ -0,0 +1,15 @@
+<?php
+
+$wb['warning'] = 'Edit these values carefully! Do not remove the prefixes on a systems with more then one client.';
+$wb['dbname_prefix_txt'] = 'Database name prefix';
+$wb['dbuser_prefix_txt'] = 'Database user prefix';
+$wb['shelluser_prefix_txt'] = 'Shell user prefix';
+$wb['ftpuser_prefix_txt'] = 'FTP user prefix';
+$wb['dbname_prefix_error_regex'] = 'Char not allowed in database name prefix.';
+$wb['dbuser_prefix_error_regex'] = 'Char not allowed in database user prefix.';
+$wb['ftpuser_prefix_error_regex'] = 'Char not allowed in ftp user prefix.';
+$wb['shelluser_prefix_error_regex'] = 'Char not allowed in shell user prefix.';
+$wb['dblist_phpmyadmin_link_txt'] = 'Link to phpmyadmin in DB list';
+$wb['mailboxlist_webmail_link_txt'] = 'Link to webmail in Mailbox list';
+
+?>
\ No newline at end of file
diff --git a/interface/web/admin/lib/lang/de_system_config.lng b/interface/web/admin/lib/lang/de_system_config.lng
new file mode 100644
index 0000000000000000000000000000000000000000..331747663b1dec95cfcf350276f6d2ac8fcbb463
--- /dev/null
+++ b/interface/web/admin/lib/lang/de_system_config.lng
@@ -0,0 +1,15 @@
+<?php
+
+$wb['warning'] = 'Edit these values carefully! Do not remove the prefixes on a systems with more then one client.';
+$wb['dbname_prefix_txt'] = 'Database name prefix';
+$wb['dbuser_prefix_txt'] = 'Database user prefix';
+$wb['shelluser_prefix_txt'] = 'Shell user prefix';
+$wb['ftpuser_prefix_txt'] = 'FTP user prefix';
+$wb['dbname_prefix_error_regex'] = 'Char not allowed in database name prefix.';
+$wb['dbuser_prefix_error_regex'] = 'Char not allowed in database user prefix.';
+$wb['ftpuser_prefix_error_regex'] = 'Char not allowed in ftp user prefix.';
+$wb['shelluser_prefix_error_regex'] = 'Char not allowed in shell user prefix.';
+$wb['dblist_phpmyadmin_link_txt'] = 'Link to phpmyadmin in DB list';
+$wb['mailboxlist_webmail_link_txt'] = 'Link to webmail in Mailbox list';
+
+?>
\ No newline at end of file
diff --git a/interface/web/admin/lib/lang/es_system_config.lng b/interface/web/admin/lib/lang/es_system_config.lng
new file mode 100644
index 0000000000000000000000000000000000000000..331747663b1dec95cfcf350276f6d2ac8fcbb463
--- /dev/null
+++ b/interface/web/admin/lib/lang/es_system_config.lng
@@ -0,0 +1,15 @@
+<?php
+
+$wb['warning'] = 'Edit these values carefully! Do not remove the prefixes on a systems with more then one client.';
+$wb['dbname_prefix_txt'] = 'Database name prefix';
+$wb['dbuser_prefix_txt'] = 'Database user prefix';
+$wb['shelluser_prefix_txt'] = 'Shell user prefix';
+$wb['ftpuser_prefix_txt'] = 'FTP user prefix';
+$wb['dbname_prefix_error_regex'] = 'Char not allowed in database name prefix.';
+$wb['dbuser_prefix_error_regex'] = 'Char not allowed in database user prefix.';
+$wb['ftpuser_prefix_error_regex'] = 'Char not allowed in ftp user prefix.';
+$wb['shelluser_prefix_error_regex'] = 'Char not allowed in shell user prefix.';
+$wb['dblist_phpmyadmin_link_txt'] = 'Link to phpmyadmin in DB list';
+$wb['mailboxlist_webmail_link_txt'] = 'Link to webmail in Mailbox list';
+
+?>
\ No newline at end of file
diff --git a/interface/web/admin/lib/lang/fr_system_config.lng b/interface/web/admin/lib/lang/fr_system_config.lng
new file mode 100644
index 0000000000000000000000000000000000000000..331747663b1dec95cfcf350276f6d2ac8fcbb463
--- /dev/null
+++ b/interface/web/admin/lib/lang/fr_system_config.lng
@@ -0,0 +1,15 @@
+<?php
+
+$wb['warning'] = 'Edit these values carefully! Do not remove the prefixes on a systems with more then one client.';
+$wb['dbname_prefix_txt'] = 'Database name prefix';
+$wb['dbuser_prefix_txt'] = 'Database user prefix';
+$wb['shelluser_prefix_txt'] = 'Shell user prefix';
+$wb['ftpuser_prefix_txt'] = 'FTP user prefix';
+$wb['dbname_prefix_error_regex'] = 'Char not allowed in database name prefix.';
+$wb['dbuser_prefix_error_regex'] = 'Char not allowed in database user prefix.';
+$wb['ftpuser_prefix_error_regex'] = 'Char not allowed in ftp user prefix.';
+$wb['shelluser_prefix_error_regex'] = 'Char not allowed in shell user prefix.';
+$wb['dblist_phpmyadmin_link_txt'] = 'Link to phpmyadmin in DB list';
+$wb['mailboxlist_webmail_link_txt'] = 'Link to webmail in Mailbox list';
+
+?>
\ No newline at end of file
diff --git a/interface/web/admin/lib/lang/it_system_config.lng b/interface/web/admin/lib/lang/it_system_config.lng
new file mode 100644
index 0000000000000000000000000000000000000000..c38b6e1714f2964b6e066fce1899e89e56d02f44
--- /dev/null
+++ b/interface/web/admin/lib/lang/it_system_config.lng
@@ -0,0 +1,13 @@
+<?php
+$wb['warning'] = 'Edit these values carefully! Do not remove the prefixes on a systems with more then one client.';
+$wb['dbname_prefix_txt'] = 'Database name prefix';
+$wb['dbuser_prefix_txt'] = 'Database user prefix';
+$wb['shelluser_prefix_txt'] = 'Shell user prefix';
+$wb['ftpuser_prefix_txt'] = 'FTP user prefix';
+$wb['dbname_prefix_error_regex'] = 'Char not allowed in database name prefix.';
+$wb['dbuser_prefix_error_regex'] = 'Char not allowed in database user prefix.';
+$wb['ftpuser_prefix_error_regex'] = 'Char not allowed in ftp user prefix.';
+$wb['shelluser_prefix_error_regex'] = 'Char not allowed in shell user prefix.';
+$wb['dblist_phpmyadmin_link_txt'] = 'Link to phpmyadmin in DB list';
+$wb['mailboxlist_webmail_link_txt'] = 'Link to webmail in Mailbox list';
+?>
diff --git a/interface/web/admin/lib/lang/nl_system_config.lng b/interface/web/admin/lib/lang/nl_system_config.lng
new file mode 100644
index 0000000000000000000000000000000000000000..331747663b1dec95cfcf350276f6d2ac8fcbb463
--- /dev/null
+++ b/interface/web/admin/lib/lang/nl_system_config.lng
@@ -0,0 +1,15 @@
+<?php
+
+$wb['warning'] = 'Edit these values carefully! Do not remove the prefixes on a systems with more then one client.';
+$wb['dbname_prefix_txt'] = 'Database name prefix';
+$wb['dbuser_prefix_txt'] = 'Database user prefix';
+$wb['shelluser_prefix_txt'] = 'Shell user prefix';
+$wb['ftpuser_prefix_txt'] = 'FTP user prefix';
+$wb['dbname_prefix_error_regex'] = 'Char not allowed in database name prefix.';
+$wb['dbuser_prefix_error_regex'] = 'Char not allowed in database user prefix.';
+$wb['ftpuser_prefix_error_regex'] = 'Char not allowed in ftp user prefix.';
+$wb['shelluser_prefix_error_regex'] = 'Char not allowed in shell user prefix.';
+$wb['dblist_phpmyadmin_link_txt'] = 'Link to phpmyadmin in DB list';
+$wb['mailboxlist_webmail_link_txt'] = 'Link to webmail in Mailbox list';
+
+?>
\ No newline at end of file
diff --git a/interface/web/admin/lib/lang/ru_system_config.lng b/interface/web/admin/lib/lang/ru_system_config.lng
new file mode 100644
index 0000000000000000000000000000000000000000..331747663b1dec95cfcf350276f6d2ac8fcbb463
--- /dev/null
+++ b/interface/web/admin/lib/lang/ru_system_config.lng
@@ -0,0 +1,15 @@
+<?php
+
+$wb['warning'] = 'Edit these values carefully! Do not remove the prefixes on a systems with more then one client.';
+$wb['dbname_prefix_txt'] = 'Database name prefix';
+$wb['dbuser_prefix_txt'] = 'Database user prefix';
+$wb['shelluser_prefix_txt'] = 'Shell user prefix';
+$wb['ftpuser_prefix_txt'] = 'FTP user prefix';
+$wb['dbname_prefix_error_regex'] = 'Char not allowed in database name prefix.';
+$wb['dbuser_prefix_error_regex'] = 'Char not allowed in database user prefix.';
+$wb['ftpuser_prefix_error_regex'] = 'Char not allowed in ftp user prefix.';
+$wb['shelluser_prefix_error_regex'] = 'Char not allowed in shell user prefix.';
+$wb['dblist_phpmyadmin_link_txt'] = 'Link to phpmyadmin in DB list';
+$wb['mailboxlist_webmail_link_txt'] = 'Link to webmail in Mailbox list';
+
+?>
\ No newline at end of file
diff --git a/interface/web/admin/lib/lang/se_system_config.lng b/interface/web/admin/lib/lang/se_system_config.lng
new file mode 100644
index 0000000000000000000000000000000000000000..c38b6e1714f2964b6e066fce1899e89e56d02f44
--- /dev/null
+++ b/interface/web/admin/lib/lang/se_system_config.lng
@@ -0,0 +1,13 @@
+<?php
+$wb['warning'] = 'Edit these values carefully! Do not remove the prefixes on a systems with more then one client.';
+$wb['dbname_prefix_txt'] = 'Database name prefix';
+$wb['dbuser_prefix_txt'] = 'Database user prefix';
+$wb['shelluser_prefix_txt'] = 'Shell user prefix';
+$wb['ftpuser_prefix_txt'] = 'FTP user prefix';
+$wb['dbname_prefix_error_regex'] = 'Char not allowed in database name prefix.';
+$wb['dbuser_prefix_error_regex'] = 'Char not allowed in database user prefix.';
+$wb['ftpuser_prefix_error_regex'] = 'Char not allowed in ftp user prefix.';
+$wb['shelluser_prefix_error_regex'] = 'Char not allowed in shell user prefix.';
+$wb['dblist_phpmyadmin_link_txt'] = 'Link to phpmyadmin in DB list';
+$wb['mailboxlist_webmail_link_txt'] = 'Link to webmail in Mailbox list';
+?>
diff --git a/interface/web/client/lib/lang/bg_client.lng b/interface/web/client/lib/lang/bg_client.lng
index 3c89ed9f22d9f5dd24fcceefed79a9201e8fcb1b..672b26de95c1158dbeb616785e5da5f968de7fef 100644
--- a/interface/web/client/lib/lang/bg_client.lng
+++ b/interface/web/client/lib/lang/bg_client.lng
@@ -78,4 +78,6 @@ $wb['limit_dns_zone_error_notint'] = 'Макс. брой DNS записи тря
 $wb['default_dbserver_txt'] = 'DB сървър по подразбиране';
 $wb['limit_database_error_notint'] = 'Макс. брой бази данни трябва да е число.';
 $wb['username_error_regex'] = 'Потребителското име съдържа невалидни символи.';
+$wb['template_master_txt'] = 'Master';
+$wb['template_additional_txt'] = 'Addon';
 ?>
diff --git a/interface/web/client/lib/lang/bg_client_template.lng b/interface/web/client/lib/lang/bg_client_template.lng
new file mode 100644
index 0000000000000000000000000000000000000000..46765b68afb97829d1ab2d884bcb03872f8959df
--- /dev/null
+++ b/interface/web/client/lib/lang/bg_client_template.lng
@@ -0,0 +1,52 @@
+<?php
+
+$wb["limit_client_error_notint"] = 'Client Limit is not a number.';
+$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';
+$wb["limit_mailforward_txt"] = 'Max. number of email forwarders';
+$wb["limit_mailcatchall_txt"] = 'Max. number of email catchall accounts';
+$wb["limit_mailrouting_txt"] = 'Max. number of email routes';
+$wb["limit_mailfilter_txt"] = 'Max. number of email filters';
+$wb["limit_fetchmail_txt"] = 'Max. number of fetchmail accounts';
+$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_client_txt"] = 'limit_client';
+$wb["limit_domain_txt"] = 'limit_domain';
+$wb["limit_subdomain_txt"] = 'limit_subdomain';
+$wb["limit_webquota_txt"] = 'limit_webquota';
+$wb["limit_database_txt"] = 'limit_database';
+$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["limit_dns_zone_txt"] = 'Max. number of DNS zones';
+$wb["limit_dns_record_txt"] = 'Max. number DNS records';
+$wb["limit_shell_user_txt"] = 'Max. number of Shell users';
+$wb["limit_client_txt"] = 'Max. number of Clients';
+$wb["limit_maildomain_error_notint"] = 'The email domain limit must be a number.';
+$wb["limit_mailbox_error_notint"] = 'The mailbox limit must be a number.';
+$wb["limit_mailalias_error_notint"] = 'The email alias limit must be a number.';
+$wb["limit_mailforward_error_notint"] = 'The email forward limit must be a number.';
+$wb["limit_mailcatchall_error_notint"] = 'The email catchall limit must be a number.';
+$wb["limit_mailrouting_error_notint"] = 'The email routing limit must be a number.';
+$wb["limit_mailfilter_error_notint"] = 'The email filter limit must be a number.';
+$wb["limit_mailfetchmail_error_notint"] = 'The fetchmail limit must be a number.';
+$wb["limit_mailquota_error_notint"] = 'The email quota limit must be a number.';
+$wb["limit_spamfilter_wblist_error_notint"] = 'The spamfilter white / blacklist limit must be a number.';
+$wb["limit_spamfilter_user_error_notint"] = 'The spamfilter user limit must be a number.';
+$wb["limit_spamfilter_policy_error_notint"] = 'The spamfilter policy limit must be a number.';
+$wb["limit_web_domain_error_notint"] = 'The website limit must be a number.';
+$wb["limit_web_aliasdomain_error_notint"] = 'The website alias domain limit must be a number.';
+$wb["limit_web_subdomain_error_notint"] = 'The website subdomain limit must be a number.';
+$wb["limit_ftp_user_error_notint"] = 'The ftp user limit must be a number.';
+$wb["limit_shell_user_error_notint"] = 'The shell user limit must be a number.';
+$wb["limit_dns_zone_error_notint"] = 'The dns zone limit must be a number.';
+$wb["limit_dns_zone_error_notint"] = 'The dns record limit must be a number.';
+$wb["limit_client_error_notint"] = 'The sub client limit must be a number.';
+$wb["limit_database_txt"] = 'Max. number of Databases';
+$wb["limit_database_error_notint"] = 'The database limit must be a number.';
+$wb["error_template_name_empty"] = 'Please enter a Template name';
+?>
\ No newline at end of file
diff --git a/interface/web/client/lib/lang/bg_client_template_list.lng b/interface/web/client/lib/lang/bg_client_template_list.lng
new file mode 100644
index 0000000000000000000000000000000000000000..ac5218686174910f4725855b6c6959a3733513fa
--- /dev/null
+++ b/interface/web/client/lib/lang/bg_client_template_list.lng
@@ -0,0 +1,5 @@
+<?php
+$wb["list_head_txt"] = 'Client-Templates';
+$wb["template_type_txt"] = 'Type';
+$wb["template_name_txt"] = 'Template name';
+?>
diff --git a/interface/web/client/lib/lang/de_client.lng b/interface/web/client/lib/lang/de_client.lng
index ee75e5563cce72795252df692c39993e7c0980a9..b8ba535c8de9a91a9f92d032c7a15e685755e375 100644
--- a/interface/web/client/lib/lang/de_client.lng
+++ b/interface/web/client/lib/lang/de_client.lng
@@ -78,4 +78,6 @@ $wb['default_dbserver_txt'] = 'Default Database Server';
 $wb['limit_database_error_notint'] = 'The database limit must be a number.';
 $wb['username_error_regex'] = 'The Username contains invalid chracaters.';
 $wb['password_strength_txt'] = 'Password strength';
+$wb['template_master_txt'] = 'Master';
+$wb['template_additional_txt'] = 'Addon';
 ?>
diff --git a/interface/web/client/lib/lang/de_client_template.lng b/interface/web/client/lib/lang/de_client_template.lng
new file mode 100644
index 0000000000000000000000000000000000000000..46765b68afb97829d1ab2d884bcb03872f8959df
--- /dev/null
+++ b/interface/web/client/lib/lang/de_client_template.lng
@@ -0,0 +1,52 @@
+<?php
+
+$wb["limit_client_error_notint"] = 'Client Limit is not a number.';
+$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';
+$wb["limit_mailforward_txt"] = 'Max. number of email forwarders';
+$wb["limit_mailcatchall_txt"] = 'Max. number of email catchall accounts';
+$wb["limit_mailrouting_txt"] = 'Max. number of email routes';
+$wb["limit_mailfilter_txt"] = 'Max. number of email filters';
+$wb["limit_fetchmail_txt"] = 'Max. number of fetchmail accounts';
+$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_client_txt"] = 'limit_client';
+$wb["limit_domain_txt"] = 'limit_domain';
+$wb["limit_subdomain_txt"] = 'limit_subdomain';
+$wb["limit_webquota_txt"] = 'limit_webquota';
+$wb["limit_database_txt"] = 'limit_database';
+$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["limit_dns_zone_txt"] = 'Max. number of DNS zones';
+$wb["limit_dns_record_txt"] = 'Max. number DNS records';
+$wb["limit_shell_user_txt"] = 'Max. number of Shell users';
+$wb["limit_client_txt"] = 'Max. number of Clients';
+$wb["limit_maildomain_error_notint"] = 'The email domain limit must be a number.';
+$wb["limit_mailbox_error_notint"] = 'The mailbox limit must be a number.';
+$wb["limit_mailalias_error_notint"] = 'The email alias limit must be a number.';
+$wb["limit_mailforward_error_notint"] = 'The email forward limit must be a number.';
+$wb["limit_mailcatchall_error_notint"] = 'The email catchall limit must be a number.';
+$wb["limit_mailrouting_error_notint"] = 'The email routing limit must be a number.';
+$wb["limit_mailfilter_error_notint"] = 'The email filter limit must be a number.';
+$wb["limit_mailfetchmail_error_notint"] = 'The fetchmail limit must be a number.';
+$wb["limit_mailquota_error_notint"] = 'The email quota limit must be a number.';
+$wb["limit_spamfilter_wblist_error_notint"] = 'The spamfilter white / blacklist limit must be a number.';
+$wb["limit_spamfilter_user_error_notint"] = 'The spamfilter user limit must be a number.';
+$wb["limit_spamfilter_policy_error_notint"] = 'The spamfilter policy limit must be a number.';
+$wb["limit_web_domain_error_notint"] = 'The website limit must be a number.';
+$wb["limit_web_aliasdomain_error_notint"] = 'The website alias domain limit must be a number.';
+$wb["limit_web_subdomain_error_notint"] = 'The website subdomain limit must be a number.';
+$wb["limit_ftp_user_error_notint"] = 'The ftp user limit must be a number.';
+$wb["limit_shell_user_error_notint"] = 'The shell user limit must be a number.';
+$wb["limit_dns_zone_error_notint"] = 'The dns zone limit must be a number.';
+$wb["limit_dns_zone_error_notint"] = 'The dns record limit must be a number.';
+$wb["limit_client_error_notint"] = 'The sub client limit must be a number.';
+$wb["limit_database_txt"] = 'Max. number of Databases';
+$wb["limit_database_error_notint"] = 'The database limit must be a number.';
+$wb["error_template_name_empty"] = 'Please enter a Template name';
+?>
\ No newline at end of file
diff --git a/interface/web/client/lib/lang/de_client_template_list.lng b/interface/web/client/lib/lang/de_client_template_list.lng
new file mode 100644
index 0000000000000000000000000000000000000000..ac5218686174910f4725855b6c6959a3733513fa
--- /dev/null
+++ b/interface/web/client/lib/lang/de_client_template_list.lng
@@ -0,0 +1,5 @@
+<?php
+$wb["list_head_txt"] = 'Client-Templates';
+$wb["template_type_txt"] = 'Type';
+$wb["template_name_txt"] = 'Template name';
+?>
diff --git a/interface/web/client/lib/lang/es_client.lng b/interface/web/client/lib/lang/es_client.lng
index 692f79618049f96df874e7ade9cdd712a70c2e82..e134547be1d482e6bc568c44ee2128a399f0c251 100644
--- a/interface/web/client/lib/lang/es_client.lng
+++ b/interface/web/client/lib/lang/es_client.lng
@@ -78,4 +78,6 @@ $wb['limit_dns_zone_error_notint'] = 'El límite de zonas DNS debe ser un númer
 $wb['default_dbserver_txt'] = 'Servidor de bases de datos por defecto';
 $wb['limit_database_error_notint'] = 'El límite de bases de datos debe ser un número';
 $wb['username_error_regex'] = 'El usuario contiene carácteres no válidos';
+$wb['template_master_txt'] = 'Master';
+$wb['template_additional_txt'] = 'Addon';
 ?>
diff --git a/interface/web/client/lib/lang/es_client_template.lng b/interface/web/client/lib/lang/es_client_template.lng
new file mode 100644
index 0000000000000000000000000000000000000000..46765b68afb97829d1ab2d884bcb03872f8959df
--- /dev/null
+++ b/interface/web/client/lib/lang/es_client_template.lng
@@ -0,0 +1,52 @@
+<?php
+
+$wb["limit_client_error_notint"] = 'Client Limit is not a number.';
+$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';
+$wb["limit_mailforward_txt"] = 'Max. number of email forwarders';
+$wb["limit_mailcatchall_txt"] = 'Max. number of email catchall accounts';
+$wb["limit_mailrouting_txt"] = 'Max. number of email routes';
+$wb["limit_mailfilter_txt"] = 'Max. number of email filters';
+$wb["limit_fetchmail_txt"] = 'Max. number of fetchmail accounts';
+$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_client_txt"] = 'limit_client';
+$wb["limit_domain_txt"] = 'limit_domain';
+$wb["limit_subdomain_txt"] = 'limit_subdomain';
+$wb["limit_webquota_txt"] = 'limit_webquota';
+$wb["limit_database_txt"] = 'limit_database';
+$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["limit_dns_zone_txt"] = 'Max. number of DNS zones';
+$wb["limit_dns_record_txt"] = 'Max. number DNS records';
+$wb["limit_shell_user_txt"] = 'Max. number of Shell users';
+$wb["limit_client_txt"] = 'Max. number of Clients';
+$wb["limit_maildomain_error_notint"] = 'The email domain limit must be a number.';
+$wb["limit_mailbox_error_notint"] = 'The mailbox limit must be a number.';
+$wb["limit_mailalias_error_notint"] = 'The email alias limit must be a number.';
+$wb["limit_mailforward_error_notint"] = 'The email forward limit must be a number.';
+$wb["limit_mailcatchall_error_notint"] = 'The email catchall limit must be a number.';
+$wb["limit_mailrouting_error_notint"] = 'The email routing limit must be a number.';
+$wb["limit_mailfilter_error_notint"] = 'The email filter limit must be a number.';
+$wb["limit_mailfetchmail_error_notint"] = 'The fetchmail limit must be a number.';
+$wb["limit_mailquota_error_notint"] = 'The email quota limit must be a number.';
+$wb["limit_spamfilter_wblist_error_notint"] = 'The spamfilter white / blacklist limit must be a number.';
+$wb["limit_spamfilter_user_error_notint"] = 'The spamfilter user limit must be a number.';
+$wb["limit_spamfilter_policy_error_notint"] = 'The spamfilter policy limit must be a number.';
+$wb["limit_web_domain_error_notint"] = 'The website limit must be a number.';
+$wb["limit_web_aliasdomain_error_notint"] = 'The website alias domain limit must be a number.';
+$wb["limit_web_subdomain_error_notint"] = 'The website subdomain limit must be a number.';
+$wb["limit_ftp_user_error_notint"] = 'The ftp user limit must be a number.';
+$wb["limit_shell_user_error_notint"] = 'The shell user limit must be a number.';
+$wb["limit_dns_zone_error_notint"] = 'The dns zone limit must be a number.';
+$wb["limit_dns_zone_error_notint"] = 'The dns record limit must be a number.';
+$wb["limit_client_error_notint"] = 'The sub client limit must be a number.';
+$wb["limit_database_txt"] = 'Max. number of Databases';
+$wb["limit_database_error_notint"] = 'The database limit must be a number.';
+$wb["error_template_name_empty"] = 'Please enter a Template name';
+?>
\ No newline at end of file
diff --git a/interface/web/client/lib/lang/es_client_template_list.lng b/interface/web/client/lib/lang/es_client_template_list.lng
new file mode 100644
index 0000000000000000000000000000000000000000..ac5218686174910f4725855b6c6959a3733513fa
--- /dev/null
+++ b/interface/web/client/lib/lang/es_client_template_list.lng
@@ -0,0 +1,5 @@
+<?php
+$wb["list_head_txt"] = 'Client-Templates';
+$wb["template_type_txt"] = 'Type';
+$wb["template_name_txt"] = 'Template name';
+?>
diff --git a/interface/web/client/lib/lang/fr_client.lng b/interface/web/client/lib/lang/fr_client.lng
index 8f7661628a2aa7b0f3efc989c31f1ccac76c05e9..bb18418a386c50ac051b2685c5517a9c05eca7dd 100644
--- a/interface/web/client/lib/lang/fr_client.lng
+++ b/interface/web/client/lib/lang/fr_client.lng
@@ -1,85 +1,83 @@
 <?php
-$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';
-$wb["limit_mailforward_txt"] = 'Max. number of email forwarders';
-$wb["limit_mailcatchall_txt"] = 'Max. number of email catchall accounts';
-$wb["limit_mailrouting_txt"] = 'Max. number of email routes';
-$wb["limit_mailfilter_txt"] = 'Max. number of email filters';
-$wb["limit_fetchmail_txt"] = 'Max. number of fetchmail accounts';
-$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["default_mailserver_txt"] = 'Default Mailserver';
-$wb["btn_save_txt"] = 'Save';
-$wb["btn_cancel_txt"] = 'Cancel';
-$wb["company_name_txt"] = 'Company name';
-$wb["contact_name_txt"] = 'Contact name';
-$wb["username_txt"] = 'Username';
-$wb["password_txt"] = 'Password';
-$wb["password_strength_txt"] = 'Password strength';
-$wb["language_txt"] = 'Language';
-$wb["usertheme_txt"] = 'Theme';
-$wb["street_txt"] = 'Street';
-$wb["zip_txt"] = 'ZIP';
-$wb["city_txt"] = 'City';
-$wb["state_txt"] = 'State';
-$wb["country_txt"] = 'Country';
-$wb["telephone_txt"] = 'Telephone';
-$wb["mobile_txt"] = 'Mobile';
-$wb["fax_txt"] = 'Fax';
-$wb["email_txt"] = 'Email';
-$wb["internet_txt"] = 'Internet';
-$wb["icq_txt"] = 'ICQ';
-$wb["notes_txt"] = 'Notes';
-$wb["company_txt"] = 'Company';
-$wb["title_txt"] = 'Title';
-$wb["firstname_txt"] = 'Firstname';
-$wb["surname_txt"] = 'Surname';
-$wb["limit_client_txt"] = 'limit_client';
-$wb["limit_domain_txt"] = 'limit_domain';
-$wb["limit_subdomain_txt"] = 'limit_subdomain';
-$wb["limit_webquota_txt"] = 'limit_webquota';
-$wb["limit_database_txt"] = 'limit_database';
-$wb["ip_address_txt"] = 'ip_address';
-$wb["limit_client_error_notint"] = 'Client Limit is not a number.';
-$wb["firstname_error_empty"] = 'Firstname is empty.';
-$wb["contact_error_empty"] = 'Contact name is empty.';
-$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["limit_dns_record_txt"] = 'Max. number DNS records';
-$wb["limit_shell_user_txt"] = 'Max. number of Shell users';
-$wb["limit_client_txt"] = 'Max. number of Clients';
-$wb["username_error_empty"] = 'Username is empty.';
-$wb["username_error_unique"] = 'The username must be unique.';
-$wb["limit_maildomain_error_notint"] = 'The email domain limit must be a number.';
-$wb["limit_mailbox_error_notint"] = 'The mailbox limit must be a number.';
-$wb["limit_mailalias_error_notint"] = 'The email alias limit must be a number.';
-$wb["limit_mailforward_error_notint"] = 'The email forward limit must be a number.';
-$wb["limit_mailcatchall_error_notint"] = 'The email catchall limit must be a number.';
-$wb["limit_mailrouting_error_notint"] = 'The email routing limit must be a number.';
-$wb["limit_mailfilter_error_notint"] = 'The email filter limit must be a number.';
-$wb["limit_mailfetchmail_error_notint"] = 'The fetchmail limit must be a number.';
-$wb["limit_mailquota_error_notint"] = 'The email quota limit must be a number.';
-$wb["limit_spamfilter_wblist_error_notint"] = 'The spamfilter white / blacklist limit must be a number.';
-$wb["limit_spamfilter_user_error_notint"] = 'The spamfilter user limit must be a number.';
-$wb["limit_spamfilter_policy_error_notint"] = 'The spamfilter policy limit must be a number.';
-$wb["limit_web_domain_error_notint"] = 'The website limit must be a number.';
-$wb["limit_web_aliasdomain_error_notint"] = 'The website alias domain limit must be a number.';
-$wb["limit_web_subdomain_error_notint"] = 'The website subdomain limit must be a number.';
-$wb["limit_ftp_user_error_notint"] = 'The ftp user limit must be a number.';
-$wb["limit_shell_user_error_notint"] = 'The shell user limit must be a number.';
-$wb["limit_dns_zone_error_notint"] = 'The dns zone limit must be a number.';
-$wb["limit_dns_zone_error_notint"] = 'The dns record limit must be a number.';
-$wb["limit_client_error_notint"] = 'The sub client 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["username_error_regex"] = 'The Username contains invalid chracaters.';
+$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';
+$wb['limit_mailforward_txt'] = 'Max. number of email forwarders';
+$wb['limit_mailcatchall_txt'] = 'Max. number of email catchall accounts';
+$wb['limit_mailrouting_txt'] = 'Max. number of email routes';
+$wb['limit_mailfilter_txt'] = 'Max. number of email filters';
+$wb['limit_fetchmail_txt'] = 'Max. number of fetchmail accounts';
+$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['default_mailserver_txt'] = 'Default Mailserver';
+$wb['btn_save_txt'] = 'Save';
+$wb['btn_cancel_txt'] = 'Cancel';
+$wb['company_name_txt'] = 'Company name';
+$wb['contact_name_txt'] = 'Contact name';
+$wb['username_txt'] = 'Username';
+$wb['password_txt'] = 'Password';
+$wb['password_strength_txt'] = 'Password strength';
+$wb['language_txt'] = 'Language';
+$wb['usertheme_txt'] = 'Theme';
+$wb['street_txt'] = 'Street';
+$wb['zip_txt'] = 'ZIP';
+$wb['city_txt'] = 'City';
+$wb['state_txt'] = 'State';
+$wb['country_txt'] = 'Country';
+$wb['telephone_txt'] = 'Telephone';
+$wb['mobile_txt'] = 'Mobile';
+$wb['fax_txt'] = 'Fax';
+$wb['email_txt'] = 'Email';
+$wb['internet_txt'] = 'Internet';
+$wb['icq_txt'] = 'ICQ';
+$wb['notes_txt'] = 'Notes';
+$wb['company_txt'] = 'Company';
+$wb['title_txt'] = 'Title';
+$wb['firstname_txt'] = 'Firstname';
+$wb['surname_txt'] = 'Surname';
+$wb['limit_client_txt'] = 'Max. number of Clients';
+$wb['limit_domain_txt'] = 'limit_domain';
+$wb['limit_subdomain_txt'] = 'limit_subdomain';
+$wb['limit_webquota_txt'] = 'limit_webquota';
+$wb['limit_database_txt'] = 'Max. number of Databases';
+$wb['ip_address_txt'] = 'ip_address';
+$wb['limit_client_error_notint'] = 'The sub client limit must be a number.';
+$wb['firstname_error_empty'] = 'Firstname is empty.';
+$wb['contact_error_empty'] = 'Contact name is empty.';
+$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['limit_dns_record_txt'] = 'Max. number DNS records';
+$wb['limit_shell_user_txt'] = 'Max. number of Shell users';
+$wb['username_error_empty'] = 'Username is empty.';
+$wb['username_error_unique'] = 'The username must be unique.';
+$wb['limit_maildomain_error_notint'] = 'The email domain limit must be a number.';
+$wb['limit_mailbox_error_notint'] = 'The mailbox limit must be a number.';
+$wb['limit_mailalias_error_notint'] = 'The email alias limit must be a number.';
+$wb['limit_mailforward_error_notint'] = 'The email forward limit must be a number.';
+$wb['limit_mailcatchall_error_notint'] = 'The email catchall limit must be a number.';
+$wb['limit_mailrouting_error_notint'] = 'The email routing limit must be a number.';
+$wb['limit_mailfilter_error_notint'] = 'The email filter limit must be a number.';
+$wb['limit_mailfetchmail_error_notint'] = 'The fetchmail limit must be a number.';
+$wb['limit_mailquota_error_notint'] = 'The email quota limit must be a number.';
+$wb['limit_spamfilter_wblist_error_notint'] = 'The spamfilter white / blacklist limit must be a number.';
+$wb['limit_spamfilter_user_error_notint'] = 'The spamfilter user limit must be a number.';
+$wb['limit_spamfilter_policy_error_notint'] = 'The spamfilter policy limit must be a number.';
+$wb['limit_web_domain_error_notint'] = 'The website limit must be a number.';
+$wb['limit_web_aliasdomain_error_notint'] = 'The website alias domain limit must be a number.';
+$wb['limit_web_subdomain_error_notint'] = 'The website subdomain limit must be a number.';
+$wb['limit_ftp_user_error_notint'] = 'The ftp user limit must be a number.';
+$wb['limit_shell_user_error_notint'] = 'The shell user limit must be a number.';
+$wb['limit_dns_zone_error_notint'] = 'The dns record limit must be a number.';
+$wb['default_dbserver_txt'] = 'Default Database Server';
+$wb['limit_database_error_notint'] = 'The database limit must be a number.';
+$wb['username_error_regex'] = 'The Username contains invalid chracaters.';
+$wb['template_master_txt'] = 'Master';
+$wb['template_additional_txt'] = 'Addon';
 ?>
diff --git a/interface/web/client/lib/lang/fr_client_template.lng b/interface/web/client/lib/lang/fr_client_template.lng
new file mode 100644
index 0000000000000000000000000000000000000000..46765b68afb97829d1ab2d884bcb03872f8959df
--- /dev/null
+++ b/interface/web/client/lib/lang/fr_client_template.lng
@@ -0,0 +1,52 @@
+<?php
+
+$wb["limit_client_error_notint"] = 'Client Limit is not a number.';
+$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';
+$wb["limit_mailforward_txt"] = 'Max. number of email forwarders';
+$wb["limit_mailcatchall_txt"] = 'Max. number of email catchall accounts';
+$wb["limit_mailrouting_txt"] = 'Max. number of email routes';
+$wb["limit_mailfilter_txt"] = 'Max. number of email filters';
+$wb["limit_fetchmail_txt"] = 'Max. number of fetchmail accounts';
+$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_client_txt"] = 'limit_client';
+$wb["limit_domain_txt"] = 'limit_domain';
+$wb["limit_subdomain_txt"] = 'limit_subdomain';
+$wb["limit_webquota_txt"] = 'limit_webquota';
+$wb["limit_database_txt"] = 'limit_database';
+$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["limit_dns_zone_txt"] = 'Max. number of DNS zones';
+$wb["limit_dns_record_txt"] = 'Max. number DNS records';
+$wb["limit_shell_user_txt"] = 'Max. number of Shell users';
+$wb["limit_client_txt"] = 'Max. number of Clients';
+$wb["limit_maildomain_error_notint"] = 'The email domain limit must be a number.';
+$wb["limit_mailbox_error_notint"] = 'The mailbox limit must be a number.';
+$wb["limit_mailalias_error_notint"] = 'The email alias limit must be a number.';
+$wb["limit_mailforward_error_notint"] = 'The email forward limit must be a number.';
+$wb["limit_mailcatchall_error_notint"] = 'The email catchall limit must be a number.';
+$wb["limit_mailrouting_error_notint"] = 'The email routing limit must be a number.';
+$wb["limit_mailfilter_error_notint"] = 'The email filter limit must be a number.';
+$wb["limit_mailfetchmail_error_notint"] = 'The fetchmail limit must be a number.';
+$wb["limit_mailquota_error_notint"] = 'The email quota limit must be a number.';
+$wb["limit_spamfilter_wblist_error_notint"] = 'The spamfilter white / blacklist limit must be a number.';
+$wb["limit_spamfilter_user_error_notint"] = 'The spamfilter user limit must be a number.';
+$wb["limit_spamfilter_policy_error_notint"] = 'The spamfilter policy limit must be a number.';
+$wb["limit_web_domain_error_notint"] = 'The website limit must be a number.';
+$wb["limit_web_aliasdomain_error_notint"] = 'The website alias domain limit must be a number.';
+$wb["limit_web_subdomain_error_notint"] = 'The website subdomain limit must be a number.';
+$wb["limit_ftp_user_error_notint"] = 'The ftp user limit must be a number.';
+$wb["limit_shell_user_error_notint"] = 'The shell user limit must be a number.';
+$wb["limit_dns_zone_error_notint"] = 'The dns zone limit must be a number.';
+$wb["limit_dns_zone_error_notint"] = 'The dns record limit must be a number.';
+$wb["limit_client_error_notint"] = 'The sub client limit must be a number.';
+$wb["limit_database_txt"] = 'Max. number of Databases';
+$wb["limit_database_error_notint"] = 'The database limit must be a number.';
+$wb["error_template_name_empty"] = 'Please enter a Template name';
+?>
\ No newline at end of file
diff --git a/interface/web/client/lib/lang/fr_client_template_list.lng b/interface/web/client/lib/lang/fr_client_template_list.lng
new file mode 100644
index 0000000000000000000000000000000000000000..ac5218686174910f4725855b6c6959a3733513fa
--- /dev/null
+++ b/interface/web/client/lib/lang/fr_client_template_list.lng
@@ -0,0 +1,5 @@
+<?php
+$wb["list_head_txt"] = 'Client-Templates';
+$wb["template_type_txt"] = 'Type';
+$wb["template_name_txt"] = 'Template name';
+?>
diff --git a/interface/web/client/lib/lang/fr_clients_list.lng b/interface/web/client/lib/lang/fr_clients_list.lng
index 08f302ec3334d7c533fb7115b4ec05d1476051ea..ddf88bfa2610567fe855d84adf0ac4674c2dc1c8 100644
--- a/interface/web/client/lib/lang/fr_clients_list.lng
+++ b/interface/web/client/lib/lang/fr_clients_list.lng
@@ -1,8 +1,8 @@
 <?php
-$wb["list_head_txt"] = 'Clients';
-$wb["client_id_txt"] = 'ID';
-$wb["company_name_txt"] = 'Company name';
-$wb["contact_name_txt"] = 'Contact name';
-$wb["city_txt"] = 'City';
-$wb["country_txt"] = 'Country';
-?>
\ No newline at end of file
+$wb['list_head_txt'] = 'Clients';
+$wb['client_id_txt'] = 'ID';
+$wb['company_name_txt'] = 'Company name';
+$wb['contact_name_txt'] = 'Contact name';
+$wb['city_txt'] = 'City';
+$wb['country_txt'] = 'Country';
+?>
diff --git a/interface/web/client/lib/lang/it_client.lng b/interface/web/client/lib/lang/it_client.lng
index 34eb726d3c89cca1f3f5113e1008397eff330c40..efb82db2aa573f16eb05ef44c33dcbd1899ec790 100644
--- a/interface/web/client/lib/lang/it_client.lng
+++ b/interface/web/client/lib/lang/it_client.lng
@@ -78,4 +78,6 @@ $wb['default_dbserver_txt'] = 'Server Database predefinito';
 $wb['limit_database_error_notint'] = 'Il limite dei database deve essere un numero.';
 $wb['username_error_regex'] = 'Il nome utente contiene caratteri non validi.';
 $wb['password_strength_txt'] = 'Sicurezza della Password';
+$wb['template_master_txt'] = 'Master';
+$wb['template_additional_txt'] = 'Addon';
 ?>
diff --git a/interface/web/client/lib/lang/it_client_template.lng b/interface/web/client/lib/lang/it_client_template.lng
new file mode 100644
index 0000000000000000000000000000000000000000..6e1aff04a3a49757cffff140850da4a0ba86c3ba
--- /dev/null
+++ b/interface/web/client/lib/lang/it_client_template.lng
@@ -0,0 +1,47 @@
+<?php
+$wb['limit_client_error_notint'] = 'The sub client limit must be a number.';
+$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';
+$wb['limit_mailforward_txt'] = 'Max. number of email forwarders';
+$wb['limit_mailcatchall_txt'] = 'Max. number of email catchall accounts';
+$wb['limit_mailrouting_txt'] = 'Max. number of email routes';
+$wb['limit_mailfilter_txt'] = 'Max. number of email filters';
+$wb['limit_fetchmail_txt'] = 'Max. number of fetchmail accounts';
+$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_client_txt'] = 'Max. number of Clients';
+$wb['limit_domain_txt'] = 'limit_domain';
+$wb['limit_subdomain_txt'] = 'limit_subdomain';
+$wb['limit_webquota_txt'] = 'limit_webquota';
+$wb['limit_database_txt'] = 'Max. number of Databases';
+$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['limit_dns_zone_txt'] = 'Max. number of DNS zones';
+$wb['limit_dns_record_txt'] = 'Max. number DNS records';
+$wb['limit_shell_user_txt'] = 'Max. number of Shell users';
+$wb['limit_maildomain_error_notint'] = 'The email domain limit must be a number.';
+$wb['limit_mailbox_error_notint'] = 'The mailbox limit must be a number.';
+$wb['limit_mailalias_error_notint'] = 'The email alias limit must be a number.';
+$wb['limit_mailforward_error_notint'] = 'The email forward limit must be a number.';
+$wb['limit_mailcatchall_error_notint'] = 'The email catchall limit must be a number.';
+$wb['limit_mailrouting_error_notint'] = 'The email routing limit must be a number.';
+$wb['limit_mailfilter_error_notint'] = 'The email filter limit must be a number.';
+$wb['limit_mailfetchmail_error_notint'] = 'The fetchmail limit must be a number.';
+$wb['limit_mailquota_error_notint'] = 'The email quota limit must be a number.';
+$wb['limit_spamfilter_wblist_error_notint'] = 'The spamfilter white / blacklist limit must be a number.';
+$wb['limit_spamfilter_user_error_notint'] = 'The spamfilter user limit must be a number.';
+$wb['limit_spamfilter_policy_error_notint'] = 'The spamfilter policy limit must be a number.';
+$wb['limit_web_domain_error_notint'] = 'The website limit must be a number.';
+$wb['limit_web_aliasdomain_error_notint'] = 'The website alias domain limit must be a number.';
+$wb['limit_web_subdomain_error_notint'] = 'The website subdomain limit must be a number.';
+$wb['limit_ftp_user_error_notint'] = 'The ftp user limit must be a number.';
+$wb['limit_shell_user_error_notint'] = 'The shell user limit must be a number.';
+$wb['limit_dns_zone_error_notint'] = 'The dns record limit must be a number.';
+$wb['limit_database_error_notint'] = 'The database limit must be a number.';
+$wb['error_template_name_empty'] = 'Please enter a Template name';
+?>
diff --git a/interface/web/client/lib/lang/it_client_template_list.lng b/interface/web/client/lib/lang/it_client_template_list.lng
new file mode 100644
index 0000000000000000000000000000000000000000..b93a5f97bc98d1fa5883a22aa7909e442afa4410
--- /dev/null
+++ b/interface/web/client/lib/lang/it_client_template_list.lng
@@ -0,0 +1,5 @@
+<?php
+$wb['list_head_txt'] = 'Client-Templates';
+$wb['template_type_txt'] = 'Type';
+$wb['template_name_txt'] = 'Template name';
+?>
diff --git a/interface/web/client/lib/lang/nl_client.lng b/interface/web/client/lib/lang/nl_client.lng
index a095aeb8cff444c1d4cf4d74da5603c776886525..530511bd3fa0710d5e7782b618e9be6f906fde67 100644
--- a/interface/web/client/lib/lang/nl_client.lng
+++ b/interface/web/client/lib/lang/nl_client.lng
@@ -78,4 +78,6 @@ $wb['default_dbserver_txt'] = 'Standaard database server';
 $wb['limit_database_error_notint'] = 'De database limiet moet een nummerieke waarde zijn.';
 $wb['username_error_regex'] = 'De gebruikersnaam bevat ongeldige karakters.';
 $wb['password_strength_txt'] = 'Password strength';
+$wb['template_master_txt'] = 'Master';
+$wb['template_additional_txt'] = 'Addon';
 ?>
diff --git a/interface/web/client/lib/lang/nl_client_template.lng b/interface/web/client/lib/lang/nl_client_template.lng
new file mode 100644
index 0000000000000000000000000000000000000000..46765b68afb97829d1ab2d884bcb03872f8959df
--- /dev/null
+++ b/interface/web/client/lib/lang/nl_client_template.lng
@@ -0,0 +1,52 @@
+<?php
+
+$wb["limit_client_error_notint"] = 'Client Limit is not a number.';
+$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';
+$wb["limit_mailforward_txt"] = 'Max. number of email forwarders';
+$wb["limit_mailcatchall_txt"] = 'Max. number of email catchall accounts';
+$wb["limit_mailrouting_txt"] = 'Max. number of email routes';
+$wb["limit_mailfilter_txt"] = 'Max. number of email filters';
+$wb["limit_fetchmail_txt"] = 'Max. number of fetchmail accounts';
+$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_client_txt"] = 'limit_client';
+$wb["limit_domain_txt"] = 'limit_domain';
+$wb["limit_subdomain_txt"] = 'limit_subdomain';
+$wb["limit_webquota_txt"] = 'limit_webquota';
+$wb["limit_database_txt"] = 'limit_database';
+$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["limit_dns_zone_txt"] = 'Max. number of DNS zones';
+$wb["limit_dns_record_txt"] = 'Max. number DNS records';
+$wb["limit_shell_user_txt"] = 'Max. number of Shell users';
+$wb["limit_client_txt"] = 'Max. number of Clients';
+$wb["limit_maildomain_error_notint"] = 'The email domain limit must be a number.';
+$wb["limit_mailbox_error_notint"] = 'The mailbox limit must be a number.';
+$wb["limit_mailalias_error_notint"] = 'The email alias limit must be a number.';
+$wb["limit_mailforward_error_notint"] = 'The email forward limit must be a number.';
+$wb["limit_mailcatchall_error_notint"] = 'The email catchall limit must be a number.';
+$wb["limit_mailrouting_error_notint"] = 'The email routing limit must be a number.';
+$wb["limit_mailfilter_error_notint"] = 'The email filter limit must be a number.';
+$wb["limit_mailfetchmail_error_notint"] = 'The fetchmail limit must be a number.';
+$wb["limit_mailquota_error_notint"] = 'The email quota limit must be a number.';
+$wb["limit_spamfilter_wblist_error_notint"] = 'The spamfilter white / blacklist limit must be a number.';
+$wb["limit_spamfilter_user_error_notint"] = 'The spamfilter user limit must be a number.';
+$wb["limit_spamfilter_policy_error_notint"] = 'The spamfilter policy limit must be a number.';
+$wb["limit_web_domain_error_notint"] = 'The website limit must be a number.';
+$wb["limit_web_aliasdomain_error_notint"] = 'The website alias domain limit must be a number.';
+$wb["limit_web_subdomain_error_notint"] = 'The website subdomain limit must be a number.';
+$wb["limit_ftp_user_error_notint"] = 'The ftp user limit must be a number.';
+$wb["limit_shell_user_error_notint"] = 'The shell user limit must be a number.';
+$wb["limit_dns_zone_error_notint"] = 'The dns zone limit must be a number.';
+$wb["limit_dns_zone_error_notint"] = 'The dns record limit must be a number.';
+$wb["limit_client_error_notint"] = 'The sub client limit must be a number.';
+$wb["limit_database_txt"] = 'Max. number of Databases';
+$wb["limit_database_error_notint"] = 'The database limit must be a number.';
+$wb["error_template_name_empty"] = 'Please enter a Template name';
+?>
\ No newline at end of file
diff --git a/interface/web/client/lib/lang/nl_client_template_list.lng b/interface/web/client/lib/lang/nl_client_template_list.lng
new file mode 100644
index 0000000000000000000000000000000000000000..ac5218686174910f4725855b6c6959a3733513fa
--- /dev/null
+++ b/interface/web/client/lib/lang/nl_client_template_list.lng
@@ -0,0 +1,5 @@
+<?php
+$wb["list_head_txt"] = 'Client-Templates';
+$wb["template_type_txt"] = 'Type';
+$wb["template_name_txt"] = 'Template name';
+?>
diff --git a/interface/web/client/lib/lang/ru_client.lng b/interface/web/client/lib/lang/ru_client.lng
index 8325b1ed1183a3e4e586784a23652a6f67370d74..be4691a4abf5d72a67ee2664bf6e5062c0acc332 100644
--- a/interface/web/client/lib/lang/ru_client.lng
+++ b/interface/web/client/lib/lang/ru_client.lng
@@ -78,4 +78,6 @@ $wb['default_dbserver_txt'] = 'Default Database Сервер';
 $wb['limit_database_error_notint'] = 'The database limit must be a number.';
 $wb['password_strength_txt'] = 'Password strength';
 $wb['username_error_regex'] = 'The Username contains invalid chracaters.';
+$wb['template_master_txt'] = 'Master';
+$wb['template_additional_txt'] = 'Addon';
 ?>
diff --git a/interface/web/client/lib/lang/ru_client_template.lng b/interface/web/client/lib/lang/ru_client_template.lng
new file mode 100644
index 0000000000000000000000000000000000000000..46765b68afb97829d1ab2d884bcb03872f8959df
--- /dev/null
+++ b/interface/web/client/lib/lang/ru_client_template.lng
@@ -0,0 +1,52 @@
+<?php
+
+$wb["limit_client_error_notint"] = 'Client Limit is not a number.';
+$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';
+$wb["limit_mailforward_txt"] = 'Max. number of email forwarders';
+$wb["limit_mailcatchall_txt"] = 'Max. number of email catchall accounts';
+$wb["limit_mailrouting_txt"] = 'Max. number of email routes';
+$wb["limit_mailfilter_txt"] = 'Max. number of email filters';
+$wb["limit_fetchmail_txt"] = 'Max. number of fetchmail accounts';
+$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_client_txt"] = 'limit_client';
+$wb["limit_domain_txt"] = 'limit_domain';
+$wb["limit_subdomain_txt"] = 'limit_subdomain';
+$wb["limit_webquota_txt"] = 'limit_webquota';
+$wb["limit_database_txt"] = 'limit_database';
+$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["limit_dns_zone_txt"] = 'Max. number of DNS zones';
+$wb["limit_dns_record_txt"] = 'Max. number DNS records';
+$wb["limit_shell_user_txt"] = 'Max. number of Shell users';
+$wb["limit_client_txt"] = 'Max. number of Clients';
+$wb["limit_maildomain_error_notint"] = 'The email domain limit must be a number.';
+$wb["limit_mailbox_error_notint"] = 'The mailbox limit must be a number.';
+$wb["limit_mailalias_error_notint"] = 'The email alias limit must be a number.';
+$wb["limit_mailforward_error_notint"] = 'The email forward limit must be a number.';
+$wb["limit_mailcatchall_error_notint"] = 'The email catchall limit must be a number.';
+$wb["limit_mailrouting_error_notint"] = 'The email routing limit must be a number.';
+$wb["limit_mailfilter_error_notint"] = 'The email filter limit must be a number.';
+$wb["limit_mailfetchmail_error_notint"] = 'The fetchmail limit must be a number.';
+$wb["limit_mailquota_error_notint"] = 'The email quota limit must be a number.';
+$wb["limit_spamfilter_wblist_error_notint"] = 'The spamfilter white / blacklist limit must be a number.';
+$wb["limit_spamfilter_user_error_notint"] = 'The spamfilter user limit must be a number.';
+$wb["limit_spamfilter_policy_error_notint"] = 'The spamfilter policy limit must be a number.';
+$wb["limit_web_domain_error_notint"] = 'The website limit must be a number.';
+$wb["limit_web_aliasdomain_error_notint"] = 'The website alias domain limit must be a number.';
+$wb["limit_web_subdomain_error_notint"] = 'The website subdomain limit must be a number.';
+$wb["limit_ftp_user_error_notint"] = 'The ftp user limit must be a number.';
+$wb["limit_shell_user_error_notint"] = 'The shell user limit must be a number.';
+$wb["limit_dns_zone_error_notint"] = 'The dns zone limit must be a number.';
+$wb["limit_dns_zone_error_notint"] = 'The dns record limit must be a number.';
+$wb["limit_client_error_notint"] = 'The sub client limit must be a number.';
+$wb["limit_database_txt"] = 'Max. number of Databases';
+$wb["limit_database_error_notint"] = 'The database limit must be a number.';
+$wb["error_template_name_empty"] = 'Please enter a Template name';
+?>
\ No newline at end of file
diff --git a/interface/web/client/lib/lang/ru_client_template_list.lng b/interface/web/client/lib/lang/ru_client_template_list.lng
new file mode 100644
index 0000000000000000000000000000000000000000..ac5218686174910f4725855b6c6959a3733513fa
--- /dev/null
+++ b/interface/web/client/lib/lang/ru_client_template_list.lng
@@ -0,0 +1,5 @@
+<?php
+$wb["list_head_txt"] = 'Client-Templates';
+$wb["template_type_txt"] = 'Type';
+$wb["template_name_txt"] = 'Template name';
+?>
diff --git a/interface/web/client/lib/lang/se_client.lng b/interface/web/client/lib/lang/se_client.lng
index 8f7661628a2aa7b0f3efc989c31f1ccac76c05e9..bb18418a386c50ac051b2685c5517a9c05eca7dd 100644
--- a/interface/web/client/lib/lang/se_client.lng
+++ b/interface/web/client/lib/lang/se_client.lng
@@ -1,85 +1,83 @@
 <?php
-$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';
-$wb["limit_mailforward_txt"] = 'Max. number of email forwarders';
-$wb["limit_mailcatchall_txt"] = 'Max. number of email catchall accounts';
-$wb["limit_mailrouting_txt"] = 'Max. number of email routes';
-$wb["limit_mailfilter_txt"] = 'Max. number of email filters';
-$wb["limit_fetchmail_txt"] = 'Max. number of fetchmail accounts';
-$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["default_mailserver_txt"] = 'Default Mailserver';
-$wb["btn_save_txt"] = 'Save';
-$wb["btn_cancel_txt"] = 'Cancel';
-$wb["company_name_txt"] = 'Company name';
-$wb["contact_name_txt"] = 'Contact name';
-$wb["username_txt"] = 'Username';
-$wb["password_txt"] = 'Password';
-$wb["password_strength_txt"] = 'Password strength';
-$wb["language_txt"] = 'Language';
-$wb["usertheme_txt"] = 'Theme';
-$wb["street_txt"] = 'Street';
-$wb["zip_txt"] = 'ZIP';
-$wb["city_txt"] = 'City';
-$wb["state_txt"] = 'State';
-$wb["country_txt"] = 'Country';
-$wb["telephone_txt"] = 'Telephone';
-$wb["mobile_txt"] = 'Mobile';
-$wb["fax_txt"] = 'Fax';
-$wb["email_txt"] = 'Email';
-$wb["internet_txt"] = 'Internet';
-$wb["icq_txt"] = 'ICQ';
-$wb["notes_txt"] = 'Notes';
-$wb["company_txt"] = 'Company';
-$wb["title_txt"] = 'Title';
-$wb["firstname_txt"] = 'Firstname';
-$wb["surname_txt"] = 'Surname';
-$wb["limit_client_txt"] = 'limit_client';
-$wb["limit_domain_txt"] = 'limit_domain';
-$wb["limit_subdomain_txt"] = 'limit_subdomain';
-$wb["limit_webquota_txt"] = 'limit_webquota';
-$wb["limit_database_txt"] = 'limit_database';
-$wb["ip_address_txt"] = 'ip_address';
-$wb["limit_client_error_notint"] = 'Client Limit is not a number.';
-$wb["firstname_error_empty"] = 'Firstname is empty.';
-$wb["contact_error_empty"] = 'Contact name is empty.';
-$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["limit_dns_record_txt"] = 'Max. number DNS records';
-$wb["limit_shell_user_txt"] = 'Max. number of Shell users';
-$wb["limit_client_txt"] = 'Max. number of Clients';
-$wb["username_error_empty"] = 'Username is empty.';
-$wb["username_error_unique"] = 'The username must be unique.';
-$wb["limit_maildomain_error_notint"] = 'The email domain limit must be a number.';
-$wb["limit_mailbox_error_notint"] = 'The mailbox limit must be a number.';
-$wb["limit_mailalias_error_notint"] = 'The email alias limit must be a number.';
-$wb["limit_mailforward_error_notint"] = 'The email forward limit must be a number.';
-$wb["limit_mailcatchall_error_notint"] = 'The email catchall limit must be a number.';
-$wb["limit_mailrouting_error_notint"] = 'The email routing limit must be a number.';
-$wb["limit_mailfilter_error_notint"] = 'The email filter limit must be a number.';
-$wb["limit_mailfetchmail_error_notint"] = 'The fetchmail limit must be a number.';
-$wb["limit_mailquota_error_notint"] = 'The email quota limit must be a number.';
-$wb["limit_spamfilter_wblist_error_notint"] = 'The spamfilter white / blacklist limit must be a number.';
-$wb["limit_spamfilter_user_error_notint"] = 'The spamfilter user limit must be a number.';
-$wb["limit_spamfilter_policy_error_notint"] = 'The spamfilter policy limit must be a number.';
-$wb["limit_web_domain_error_notint"] = 'The website limit must be a number.';
-$wb["limit_web_aliasdomain_error_notint"] = 'The website alias domain limit must be a number.';
-$wb["limit_web_subdomain_error_notint"] = 'The website subdomain limit must be a number.';
-$wb["limit_ftp_user_error_notint"] = 'The ftp user limit must be a number.';
-$wb["limit_shell_user_error_notint"] = 'The shell user limit must be a number.';
-$wb["limit_dns_zone_error_notint"] = 'The dns zone limit must be a number.';
-$wb["limit_dns_zone_error_notint"] = 'The dns record limit must be a number.';
-$wb["limit_client_error_notint"] = 'The sub client 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["username_error_regex"] = 'The Username contains invalid chracaters.';
+$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';
+$wb['limit_mailforward_txt'] = 'Max. number of email forwarders';
+$wb['limit_mailcatchall_txt'] = 'Max. number of email catchall accounts';
+$wb['limit_mailrouting_txt'] = 'Max. number of email routes';
+$wb['limit_mailfilter_txt'] = 'Max. number of email filters';
+$wb['limit_fetchmail_txt'] = 'Max. number of fetchmail accounts';
+$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['default_mailserver_txt'] = 'Default Mailserver';
+$wb['btn_save_txt'] = 'Save';
+$wb['btn_cancel_txt'] = 'Cancel';
+$wb['company_name_txt'] = 'Company name';
+$wb['contact_name_txt'] = 'Contact name';
+$wb['username_txt'] = 'Username';
+$wb['password_txt'] = 'Password';
+$wb['password_strength_txt'] = 'Password strength';
+$wb['language_txt'] = 'Language';
+$wb['usertheme_txt'] = 'Theme';
+$wb['street_txt'] = 'Street';
+$wb['zip_txt'] = 'ZIP';
+$wb['city_txt'] = 'City';
+$wb['state_txt'] = 'State';
+$wb['country_txt'] = 'Country';
+$wb['telephone_txt'] = 'Telephone';
+$wb['mobile_txt'] = 'Mobile';
+$wb['fax_txt'] = 'Fax';
+$wb['email_txt'] = 'Email';
+$wb['internet_txt'] = 'Internet';
+$wb['icq_txt'] = 'ICQ';
+$wb['notes_txt'] = 'Notes';
+$wb['company_txt'] = 'Company';
+$wb['title_txt'] = 'Title';
+$wb['firstname_txt'] = 'Firstname';
+$wb['surname_txt'] = 'Surname';
+$wb['limit_client_txt'] = 'Max. number of Clients';
+$wb['limit_domain_txt'] = 'limit_domain';
+$wb['limit_subdomain_txt'] = 'limit_subdomain';
+$wb['limit_webquota_txt'] = 'limit_webquota';
+$wb['limit_database_txt'] = 'Max. number of Databases';
+$wb['ip_address_txt'] = 'ip_address';
+$wb['limit_client_error_notint'] = 'The sub client limit must be a number.';
+$wb['firstname_error_empty'] = 'Firstname is empty.';
+$wb['contact_error_empty'] = 'Contact name is empty.';
+$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['limit_dns_record_txt'] = 'Max. number DNS records';
+$wb['limit_shell_user_txt'] = 'Max. number of Shell users';
+$wb['username_error_empty'] = 'Username is empty.';
+$wb['username_error_unique'] = 'The username must be unique.';
+$wb['limit_maildomain_error_notint'] = 'The email domain limit must be a number.';
+$wb['limit_mailbox_error_notint'] = 'The mailbox limit must be a number.';
+$wb['limit_mailalias_error_notint'] = 'The email alias limit must be a number.';
+$wb['limit_mailforward_error_notint'] = 'The email forward limit must be a number.';
+$wb['limit_mailcatchall_error_notint'] = 'The email catchall limit must be a number.';
+$wb['limit_mailrouting_error_notint'] = 'The email routing limit must be a number.';
+$wb['limit_mailfilter_error_notint'] = 'The email filter limit must be a number.';
+$wb['limit_mailfetchmail_error_notint'] = 'The fetchmail limit must be a number.';
+$wb['limit_mailquota_error_notint'] = 'The email quota limit must be a number.';
+$wb['limit_spamfilter_wblist_error_notint'] = 'The spamfilter white / blacklist limit must be a number.';
+$wb['limit_spamfilter_user_error_notint'] = 'The spamfilter user limit must be a number.';
+$wb['limit_spamfilter_policy_error_notint'] = 'The spamfilter policy limit must be a number.';
+$wb['limit_web_domain_error_notint'] = 'The website limit must be a number.';
+$wb['limit_web_aliasdomain_error_notint'] = 'The website alias domain limit must be a number.';
+$wb['limit_web_subdomain_error_notint'] = 'The website subdomain limit must be a number.';
+$wb['limit_ftp_user_error_notint'] = 'The ftp user limit must be a number.';
+$wb['limit_shell_user_error_notint'] = 'The shell user limit must be a number.';
+$wb['limit_dns_zone_error_notint'] = 'The dns record limit must be a number.';
+$wb['default_dbserver_txt'] = 'Default Database Server';
+$wb['limit_database_error_notint'] = 'The database limit must be a number.';
+$wb['username_error_regex'] = 'The Username contains invalid chracaters.';
+$wb['template_master_txt'] = 'Master';
+$wb['template_additional_txt'] = 'Addon';
 ?>
diff --git a/interface/web/client/lib/lang/se_client_template.lng b/interface/web/client/lib/lang/se_client_template.lng
new file mode 100644
index 0000000000000000000000000000000000000000..6e1aff04a3a49757cffff140850da4a0ba86c3ba
--- /dev/null
+++ b/interface/web/client/lib/lang/se_client_template.lng
@@ -0,0 +1,47 @@
+<?php
+$wb['limit_client_error_notint'] = 'The sub client limit must be a number.';
+$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';
+$wb['limit_mailforward_txt'] = 'Max. number of email forwarders';
+$wb['limit_mailcatchall_txt'] = 'Max. number of email catchall accounts';
+$wb['limit_mailrouting_txt'] = 'Max. number of email routes';
+$wb['limit_mailfilter_txt'] = 'Max. number of email filters';
+$wb['limit_fetchmail_txt'] = 'Max. number of fetchmail accounts';
+$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_client_txt'] = 'Max. number of Clients';
+$wb['limit_domain_txt'] = 'limit_domain';
+$wb['limit_subdomain_txt'] = 'limit_subdomain';
+$wb['limit_webquota_txt'] = 'limit_webquota';
+$wb['limit_database_txt'] = 'Max. number of Databases';
+$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['limit_dns_zone_txt'] = 'Max. number of DNS zones';
+$wb['limit_dns_record_txt'] = 'Max. number DNS records';
+$wb['limit_shell_user_txt'] = 'Max. number of Shell users';
+$wb['limit_maildomain_error_notint'] = 'The email domain limit must be a number.';
+$wb['limit_mailbox_error_notint'] = 'The mailbox limit must be a number.';
+$wb['limit_mailalias_error_notint'] = 'The email alias limit must be a number.';
+$wb['limit_mailforward_error_notint'] = 'The email forward limit must be a number.';
+$wb['limit_mailcatchall_error_notint'] = 'The email catchall limit must be a number.';
+$wb['limit_mailrouting_error_notint'] = 'The email routing limit must be a number.';
+$wb['limit_mailfilter_error_notint'] = 'The email filter limit must be a number.';
+$wb['limit_mailfetchmail_error_notint'] = 'The fetchmail limit must be a number.';
+$wb['limit_mailquota_error_notint'] = 'The email quota limit must be a number.';
+$wb['limit_spamfilter_wblist_error_notint'] = 'The spamfilter white / blacklist limit must be a number.';
+$wb['limit_spamfilter_user_error_notint'] = 'The spamfilter user limit must be a number.';
+$wb['limit_spamfilter_policy_error_notint'] = 'The spamfilter policy limit must be a number.';
+$wb['limit_web_domain_error_notint'] = 'The website limit must be a number.';
+$wb['limit_web_aliasdomain_error_notint'] = 'The website alias domain limit must be a number.';
+$wb['limit_web_subdomain_error_notint'] = 'The website subdomain limit must be a number.';
+$wb['limit_ftp_user_error_notint'] = 'The ftp user limit must be a number.';
+$wb['limit_shell_user_error_notint'] = 'The shell user limit must be a number.';
+$wb['limit_dns_zone_error_notint'] = 'The dns record limit must be a number.';
+$wb['limit_database_error_notint'] = 'The database limit must be a number.';
+$wb['error_template_name_empty'] = 'Please enter a Template name';
+?>
diff --git a/interface/web/client/lib/lang/se_client_template_list.lng b/interface/web/client/lib/lang/se_client_template_list.lng
new file mode 100644
index 0000000000000000000000000000000000000000..b93a5f97bc98d1fa5883a22aa7909e442afa4410
--- /dev/null
+++ b/interface/web/client/lib/lang/se_client_template_list.lng
@@ -0,0 +1,5 @@
+<?php
+$wb['list_head_txt'] = 'Client-Templates';
+$wb['template_type_txt'] = 'Type';
+$wb['template_name_txt'] = 'Template name';
+?>
diff --git a/interface/web/client/lib/lang/se_clients_list.lng b/interface/web/client/lib/lang/se_clients_list.lng
index 08f302ec3334d7c533fb7115b4ec05d1476051ea..ddf88bfa2610567fe855d84adf0ac4674c2dc1c8 100644
--- a/interface/web/client/lib/lang/se_clients_list.lng
+++ b/interface/web/client/lib/lang/se_clients_list.lng
@@ -1,8 +1,8 @@
 <?php
-$wb["list_head_txt"] = 'Clients';
-$wb["client_id_txt"] = 'ID';
-$wb["company_name_txt"] = 'Company name';
-$wb["contact_name_txt"] = 'Contact name';
-$wb["city_txt"] = 'City';
-$wb["country_txt"] = 'Country';
-?>
\ No newline at end of file
+$wb['list_head_txt'] = 'Clients';
+$wb['client_id_txt'] = 'ID';
+$wb['company_name_txt'] = 'Company name';
+$wb['contact_name_txt'] = 'Contact name';
+$wb['city_txt'] = 'City';
+$wb['country_txt'] = 'Country';
+?>
diff --git a/interface/web/monitor/lib/lang/es_syslog_list.lng b/interface/web/monitor/lib/lang/es_syslog_list.lng
new file mode 100644
index 0000000000000000000000000000000000000000..96c1322bdc36fa75fba75d3ea0f2b7db8968f087
--- /dev/null
+++ b/interface/web/monitor/lib/lang/es_syslog_list.lng
@@ -0,0 +1,7 @@
+<?php
+$wb["list_head_txt"] = 'ISPConfig Log';
+$wb["tstamp_txt"] = 'Date';
+$wb["server_id_txt"] = 'Server';
+$wb["loglevel_txt"] = 'Loglevel';
+$wb["message_txt"] = 'Message';
+?>
\ No newline at end of file
diff --git a/interface/web/sites/lib/lang/bg_web_domain.lng b/interface/web/sites/lib/lang/bg_web_domain.lng
index 6a136ef14b501d3687fe8c5996c68c9b3549bb54..dfa0680e1790b62f9c8b6c4ccc2814b1479ae009 100644
--- a/interface/web/sites/lib/lang/bg_web_domain.lng
+++ b/interface/web/sites/lib/lang/bg_web_domain.lng
@@ -27,7 +27,6 @@ $wb['traffic_quota_txt'] = 'Traffic Quota';
 $wb['cgi_txt'] = 'CGI';
 $wb['ssi_txt'] = 'SSI';
 $wb['errordocs_txt'] = 'Собствени страници за грешки';
-$wb['is_subdomainwww_txt'] = 'www. поддомейн';
 $wb['ssl_txt'] = 'SSL';
 $wb['suexec_txt'] = 'SuEXEC';
 $wb['php_txt'] = 'PHP';
@@ -46,4 +45,5 @@ $wb['error_ssl_locality_empty'] = 'Не е посочен SSL Locality.';
 $wb['error_ssl_organisation_empty'] = 'Не е посочена SSL организация.';
 $wb['error_ssl_organisation_unit_empty'] = 'Не е посочен SSL Organisation Unit.';
 $wb['error_ssl_country_empty'] = 'Не е посочена SSL държава.';
+$wb['subdomain_txt'] = 'Auto-Subdomain';
 ?>
diff --git a/interface/web/sites/lib/lang/de_web_domain.lng b/interface/web/sites/lib/lang/de_web_domain.lng
index bb9aff49733553ebd2e4f7535ea5602d2e4dfa37..d877fcef455e0f38d6488dc0cfc40c587c94ebf3 100644
--- a/interface/web/sites/lib/lang/de_web_domain.lng
+++ b/interface/web/sites/lib/lang/de_web_domain.lng
@@ -40,10 +40,10 @@ $wb['domain_error_regex'] = 'Domain name invalid.';
 $wb['hd_quota_error_empty'] = 'Harddisk quota is empty.';
 $wb['traffic_quota_error_empty'] = 'Traffic quota is empty.';
 $wb['errordocs_txt'] = 'Own Error-Documents';
-$wb['is_subdomainwww_txt'] = 'www. Subdomain';
 $wb['error_ssl_state_empty'] = 'SSL State is empty.';
 $wb['error_ssl_locality_empty'] = 'SSL Locality is empty.';
 $wb['error_ssl_organisation_empty'] = 'SSL Organisation is empty.';
 $wb['error_ssl_organisation_unit_empty'] = 'SSL Organisation Unit is empty.';
 $wb['error_ssl_country_empty'] = 'SSL Country is empty.';
+$wb['subdomain_txt'] = 'Auto-Subdomain';
 ?>
diff --git a/interface/web/sites/lib/lang/es_web_domain.lng b/interface/web/sites/lib/lang/es_web_domain.lng
index e64645073007cf569d6196e191644939badfe150..f597541ffba26ea88c3ede00979c4e29448f9b49 100644
--- a/interface/web/sites/lib/lang/es_web_domain.lng
+++ b/interface/web/sites/lib/lang/es_web_domain.lng
@@ -27,7 +27,6 @@ $wb['traffic_quota_txt'] = 'Cuota de tráfico';
 $wb['cgi_txt'] = 'CGI';
 $wb['ssi_txt'] = 'SSI';
 $wb['errordocs_txt'] = 'Documentos de error propios';
-$wb['is_subdomainwww_txt'] = 'www. subdominio';
 $wb['ssl_txt'] = 'SSL';
 $wb['suexec_txt'] = 'SuEXEC';
 $wb['php_txt'] = 'PHP';
@@ -46,4 +45,5 @@ $wb['error_ssl_locality_empty'] = 'Localidad SSL está vacío';
 $wb['error_ssl_organisation_empty'] = 'Organización SSL está vacío';
 $wb['error_ssl_organisation_unit_empty'] = 'Unidad de organización de SSL está vacío';
 $wb['error_ssl_country_empty'] = 'País SSL está vacío';
+$wb['subdomain_txt'] = 'Auto-Subdomain';
 ?>
diff --git a/interface/web/sites/lib/lang/fr_web_domain.lng b/interface/web/sites/lib/lang/fr_web_domain.lng
index 37200b32c62bc763f8b34243591cc837f173497c..f5401650066a74ece78d04f9f10090656b8270d2 100644
--- a/interface/web/sites/lib/lang/fr_web_domain.lng
+++ b/interface/web/sites/lib/lang/fr_web_domain.lng
@@ -27,7 +27,6 @@ $wb['traffic_quota_txt'] = 'Traffic Quota';
 $wb['cgi_txt'] = 'CGI';
 $wb['ssi_txt'] = 'SSI';
 $wb['errordocs_txt'] = 'Own Error-Documents';
-$wb['is_subdomainwww_txt'] = 'www. Subdomain';
 $wb['ssl_txt'] = 'SSL';
 $wb['suexec_txt'] = 'SuEXEC';
 $wb['php_txt'] = 'PHP';
@@ -46,4 +45,5 @@ $wb['error_ssl_locality_empty'] = 'SSL Locality is empty.';
 $wb['error_ssl_organisation_empty'] = 'SSL Organisation is empty.';
 $wb['error_ssl_organisation_unit_empty'] = 'SSL Organisation Unit is empty.';
 $wb['error_ssl_country_empty'] = 'SSL Country is empty.';
+$wb['subdomain_txt'] = 'Auto-Subdomain';
 ?>
diff --git a/interface/web/sites/lib/lang/it_web_domain.lng b/interface/web/sites/lib/lang/it_web_domain.lng
index 37200b32c62bc763f8b34243591cc837f173497c..f5401650066a74ece78d04f9f10090656b8270d2 100644
--- a/interface/web/sites/lib/lang/it_web_domain.lng
+++ b/interface/web/sites/lib/lang/it_web_domain.lng
@@ -27,7 +27,6 @@ $wb['traffic_quota_txt'] = 'Traffic Quota';
 $wb['cgi_txt'] = 'CGI';
 $wb['ssi_txt'] = 'SSI';
 $wb['errordocs_txt'] = 'Own Error-Documents';
-$wb['is_subdomainwww_txt'] = 'www. Subdomain';
 $wb['ssl_txt'] = 'SSL';
 $wb['suexec_txt'] = 'SuEXEC';
 $wb['php_txt'] = 'PHP';
@@ -46,4 +45,5 @@ $wb['error_ssl_locality_empty'] = 'SSL Locality is empty.';
 $wb['error_ssl_organisation_empty'] = 'SSL Organisation is empty.';
 $wb['error_ssl_organisation_unit_empty'] = 'SSL Organisation Unit is empty.';
 $wb['error_ssl_country_empty'] = 'SSL Country is empty.';
+$wb['subdomain_txt'] = 'Auto-Subdomain';
 ?>
diff --git a/interface/web/sites/lib/lang/nl_web_domain.lng b/interface/web/sites/lib/lang/nl_web_domain.lng
index 19883d0fa6de881691a7d883232b1c762ee78b5d..5c992a6f6d2974e44d361fe6e544dc65a9f9f84f 100644
--- a/interface/web/sites/lib/lang/nl_web_domain.lng
+++ b/interface/web/sites/lib/lang/nl_web_domain.lng
@@ -40,10 +40,10 @@ $wb['domain_error_regex'] = 'Domeinnaam is ongeldig.';
 $wb['hd_quota_error_empty'] = 'Harddisk quota is leeg.';
 $wb['traffic_quota_error_empty'] = 'Verkeer quota is leeg.';
 $wb['errordocs_txt'] = 'Own Error-Documents';
-$wb['is_subdomainwww_txt'] = 'www. Subdomain';
 $wb['error_ssl_state_empty'] = 'SSL State is empty.';
 $wb['error_ssl_locality_empty'] = 'SSL Locality is empty.';
 $wb['error_ssl_organisation_empty'] = 'SSL Organisation is empty.';
 $wb['error_ssl_organisation_unit_empty'] = 'SSL Organisation Unit is empty.';
 $wb['error_ssl_country_empty'] = 'SSL Country is empty.';
+$wb['subdomain_txt'] = 'Auto-Subdomain';
 ?>
diff --git a/interface/web/sites/lib/lang/ru_web_domain.lng b/interface/web/sites/lib/lang/ru_web_domain.lng
index 56dbcba0203f4cf153d2a7427a4cee5edc825416..c88da5fbea6ca4218c4c112dae303faca83f9620 100644
--- a/interface/web/sites/lib/lang/ru_web_domain.lng
+++ b/interface/web/sites/lib/lang/ru_web_domain.lng
@@ -40,10 +40,10 @@ $wb['domain_error_regex'] = 'Имя домен неправильно.';
 $wb['hd_quota_error_empty'] = 'Harddisk quota is empty.';
 $wb['traffic_quota_error_empty'] = 'Traffic quota is empty.';
 $wb['errordocs_txt'] = 'Own Error-Documents';
-$wb['is_subdomainwww_txt'] = 'www. Subdomain';
 $wb['error_ssl_state_empty'] = 'SSL State is empty.';
 $wb['error_ssl_locality_empty'] = 'SSL Locality is empty.';
 $wb['error_ssl_organisation_empty'] = 'SSL Organisation is empty.';
 $wb['error_ssl_organisation_unit_empty'] = 'SSL Organisation Unit is empty.';
 $wb['error_ssl_country_empty'] = 'SSL Country is empty.';
+$wb['subdomain_txt'] = 'Auto-Subdomain';
 ?>
diff --git a/interface/web/sites/lib/lang/se_web_domain.lng b/interface/web/sites/lib/lang/se_web_domain.lng
index 37200b32c62bc763f8b34243591cc837f173497c..f5401650066a74ece78d04f9f10090656b8270d2 100644
--- a/interface/web/sites/lib/lang/se_web_domain.lng
+++ b/interface/web/sites/lib/lang/se_web_domain.lng
@@ -27,7 +27,6 @@ $wb['traffic_quota_txt'] = 'Traffic Quota';
 $wb['cgi_txt'] = 'CGI';
 $wb['ssi_txt'] = 'SSI';
 $wb['errordocs_txt'] = 'Own Error-Documents';
-$wb['is_subdomainwww_txt'] = 'www. Subdomain';
 $wb['ssl_txt'] = 'SSL';
 $wb['suexec_txt'] = 'SuEXEC';
 $wb['php_txt'] = 'PHP';
@@ -46,4 +45,5 @@ $wb['error_ssl_locality_empty'] = 'SSL Locality is empty.';
 $wb['error_ssl_organisation_empty'] = 'SSL Organisation is empty.';
 $wb['error_ssl_organisation_unit_empty'] = 'SSL Organisation Unit is empty.';
 $wb['error_ssl_country_empty'] = 'SSL Country is empty.';
+$wb['subdomain_txt'] = 'Auto-Subdomain';
 ?>